From cc9c10226e81d0019b516a4f091b0a4df9e3ebd5 Mon Sep 17 00:00:00 2001
From: Josh Wright <josh@thewrightserver.net>
Date: Sat, 10 Oct 2026 00:19:48 -0400
Subject: [PATCH] Use shared form controls and enforce UI patterns (Refs #110)

---
 docs/development/ui-patterns.md               |  13 +-
 scripts/check-ui-styles.mjs                   | 117 +++++++++++++---
 src/lib/ui/components/ActivityLog.svelte      | 100 ++++++--------
 src/lib/ui/components/AddHostDrawer.svelte    |  30 ++---
 src/lib/ui/components/BetaPlanBuilder.svelte  | 126 ++++++++----------
 src/lib/ui/components/BetaTestProgress.svelte |  34 +++--
 src/lib/ui/components/BlueprintBuilder.svelte |  67 ++++------
 src/lib/ui/components/CapacitySamples.svelte  |  31 ++---
 src/lib/ui/components/CommandPalette.svelte   |  60 +++------
 src/lib/ui/components/ConfigEditor.svelte     |  28 ++--
 src/lib/ui/components/ConfigInspector.svelte  |  34 ++---
 src/lib/ui/components/ConfigLibrary.svelte    |  93 +++++++------
 src/lib/ui/components/ConfigTextEditor.svelte |  68 +++++-----
 .../ui/components/DeployServerDialog.svelte   |  26 ++--
 .../ui/components/FleetActionsDialog.svelte   |  23 ++--
 src/lib/ui/components/LifecycleDialog.svelte  |  26 ++--
 src/lib/ui/components/LogPanel.svelte         |  20 +--
 src/lib/ui/components/MatchHistory.svelte     |  86 ++++++------
 .../ui/components/NativeHostSelection.svelte  |  45 +++----
 src/lib/ui/components/OperationHistory.svelte |  36 ++---
 .../ui/components/PluginGithubImport.svelte   |  59 +++-----
 .../ui/components/ProvisioningActivity.svelte |  45 ++-----
 src/lib/ui/components/RetentionTools.svelte   |  29 ++--
 .../ui/components/ScriptUploadDrawer.svelte   |  40 +++---
 src/lib/ui/components/SettingsEditor.svelte   | 113 ++++++++--------
 .../components/capacity/RebalancePanel.svelte |  72 ++++------
 src/lib/ui/components/primitives/Field.svelte |  42 +++++-
 src/lib/ui/components/primitives/Input.svelte |  77 +++++------
 .../ui/components/primitives/Select.svelte    |  56 ++++----
 src/lib/ui/field-context.ts                   |   2 +-
 src/lib/ui/library.css                        |  19 +--
 src/lib/ui/styles/components.css              |  10 +-
 src/routes/+page.svelte                       |  53 +++-----
 src/routes/account/+page.svelte               |  92 ++++++-------
 src/routes/autoscaling/+page.svelte           |  68 ++++------
 src/routes/betas/+page.svelte                 |  40 ++----
 src/routes/betas/new/+page.svelte             |  70 +++++-----
 src/routes/campaigns/+page.svelte             |  51 +++----
 src/routes/game-files/+page.svelte            |  16 +--
 src/routes/hosts/+page.svelte                 |  60 ++++-----
 src/routes/hosts/[id]/+page.svelte            |  63 +++------
 src/routes/leaderboard/+page.svelte           |  63 +++++----
 .../leaderboard/players/[guid]/+page.svelte   |  44 +++---
 src/routes/login/+page.svelte                 |  33 ++---
 src/routes/maintenance/+page.svelte           |  37 +++--
 src/routes/plugins/+page.svelte               |  52 ++++----
 src/routes/provisioning/+page.svelte          |  58 ++++----
 src/routes/scripts/+page.svelte               |  44 +++---
 src/routes/server-keys/+page.svelte           |  71 +++++-----
 src/routes/settings/users/+page.svelte        |  75 ++++++-----
 src/routes/setup/+page.svelte                 |  63 ++++-----
 tests/fixtures/FormControls.svelte            |  68 ++++++++++
 tests/unit/ui-form-controls.test.ts           |  61 +++++++++
 tests/unit/ui-style-check.test.js             |  71 ++++++++++
 54 files changed, 1431 insertions(+), 1449 deletions(-)
 create mode 100644 tests/fixtures/FormControls.svelte
 create mode 100644 tests/unit/ui-form-controls.test.ts
 create mode 100644 tests/unit/ui-style-check.test.js

diff --git a/docs/development/ui-patterns.md b/docs/development/ui-patterns.md
index b0e0b4d..917a4e2 100644
--- a/docs/development/ui-patterns.md
+++ b/docs/development/ui-patterns.md
@@ -8,7 +8,18 @@ Primitives live in its `primitives` directory.
 - Use `SectionHeader` for page titles and primary actions. The page owns spacing
   between sections.
 - Use `Field` with `Input`, `Select` or `Textarea` for labels, help and errors.
-  Give controls distinct `ariaLabel` values when several share one field.
+  Give controls distinct `ariaLabel` values when several share one field. Use
+  `hiddenLabel` on `Field` for compact filters with a visually hidden label.
+  `Input` and `Select` forward native validation, accessibility and event props;
+  use `bind:element` when a workflow needs to focus the native control. `Select`
+  accepts either `options` or child `option` / `optgroup` elements and preserves
+  the bound value's type. Keep layout on the field or its parent; controls own
+  their appearance.
+- `npm run check:styles` rejects raw selects and text-like inputs outside their
+  primitives, including search, password, numeric and date/time fields. Native
+  checkboxes, radios, file pickers, hidden inputs, range/color pickers and input
+  buttons are allowed. The check parses Svelte markup, so comments and examples
+  in scripts are ignored.
 - Pair `Tabs` with a labeled panel. Use `ListFooter` for long lists.
 - Use `StatusBadge` for workflow states and `ServerIdentity` for server names.
   Keep raw IDs available for copying and troubleshooting.
diff --git a/scripts/check-ui-styles.mjs b/scripts/check-ui-styles.mjs
index b197887..f79c34c 100644
--- a/scripts/check-ui-styles.mjs
+++ b/scripts/check-ui-styles.mjs
@@ -1,32 +1,107 @@
 import { readdir, readFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import path from 'node:path';
+import { parse } from 'svelte/compiler';
 
-const root = fileURLToPath(new URL('../src/', import.meta.url));
-const failures = [];
-async function visit(directory) {
-    for (const entry of await readdir(directory, { withFileTypes: true })) {
-        const file = path.join(directory, entry.name);
-        if (entry.isDirectory()) await visit(file);
-        else if (/\.(svelte|css)$/.test(entry.name) && entry.name !== 'tokens.css') {
-            const source = await readFile(file, 'utf8');
-            for (const match of source.matchAll(/font-size\s*:\s*[\d.]+px\b/g)) {
-                const line = source.slice(0, match.index).split('\n').length;
+const nativeInputTypes = new Set([
+    'checkbox',
+    'radio',
+    'file',
+    'hidden',
+    'range',
+    'color',
+    'button',
+    'submit',
+    'reset',
+    'image'
+]);
+
+/**
+ * @param {string} source
+ * @param {string} filename
+ */
+export function checkFormControls(source, filename) {
+    if (
+        !filename.endsWith('.svelte') ||
+        /(?:^|\/)primitives\/(?:Input|Select)\.svelte$/.test(filename)
+    )
+        return [];
+    /** @type {string[]} */
+    const failures = [];
+    /** @param {unknown} node */
+    function visit(node) {
+        if (!node || typeof node !== 'object') return;
+        if ('type' in node && node.type === 'RegularElement') {
+            const element = /** @type {import('svelte/compiler').AST.RegularElement} */ (node);
+            const type = element.attributes.find(
+                (attribute) => attribute.type === 'Attribute' && attribute.name === 'type'
+            );
+            const value =
+                type?.type === 'Attribute' && type.value !== true
+                    ? Array.isArray(type.value)
+                        ? type.value[0]
+                        : type.value
+                    : undefined;
+            const inputType =
+                value?.type === 'Text'
+                    ? value.data
+                    : value?.expression.type === 'Literal'
+                      ? value.expression.value
+                      : undefined;
+            if (
+                element.name === 'select' ||
+                (element.name === 'input' &&
+                    (typeof inputType !== 'string' || !nativeInputTypes.has(inputType)))
+            ) {
+                const line = source.slice(0, element.start).split('\n').length;
                 failures.push(
-                    `${path.relative(process.cwd(), file)}:${line}: use a shared type token (12 px minimum): ${match[0]}`
+                    `${filename}:${line}: use Field with ${element.name === 'select' ? 'Select' : 'Input'} instead of raw <${element.name}>`
                 );
             }
         }
+        for (const value of Object.values(node)) {
+            if (Array.isArray(value)) value.forEach(visit);
+            else if (value && typeof value === 'object') visit(value);
+        }
     }
+    visit(parse(source, { modern: true }).fragment);
+    return failures;
 }
-await visit(root);
-const tokens = await readFile(path.join(root, 'lib/ui/styles/tokens.css'), 'utf8');
-for (const match of tokens.matchAll(
-    /--text-(?:xs|sm|base|md|lg|xl|2xl|3xl|input):\s*([\d.]+)px/g
-)) {
-    if (Number(match[1]) < 12) failures.push(`Type tokens must be at least 12 px: ${match[0]}`);
+
+async function main() {
+    const root = fileURLToPath(new URL('../src/', import.meta.url));
+    /** @type {string[]} */
+    const failures = [];
+    /** @param {string} directory */
+    async function visit(directory) {
+        for (const entry of await readdir(directory, { withFileTypes: true })) {
+            const file = path.join(directory, entry.name);
+            if (entry.isDirectory()) await visit(file);
+            else if (/\.(svelte|css)$/.test(entry.name) && entry.name !== 'tokens.css') {
+                const source = await readFile(file, 'utf8');
+                const filename = path.relative(process.cwd(), file);
+                failures.push(...checkFormControls(source, filename));
+                for (const match of source.matchAll(/font-size\s*:\s*[\d.]+px\b/g)) {
+                    const line = source.slice(0, match.index).split('\n').length;
+                    failures.push(
+                        `${filename}:${line}: use a shared type token (12 px minimum): ${match[0]}`
+                    );
+                }
+            }
+        }
+    }
+    await visit(root);
+    const tokens = await readFile(path.join(root, 'lib/ui/styles/tokens.css'), 'utf8');
+    for (const match of tokens.matchAll(
+        /--text-(?:xs|sm|base|md|lg|xl|2xl|3xl|input):\s*([\d.]+)px/g
+    )) {
+        if (Number(match[1]) < 12) failures.push(`Type tokens must be at least 12 px: ${match[0]}`);
+    }
+    if (failures.length) {
+        console.error(failures.join('\n'));
+        process.exitCode = 1;
+    } else console.log('UI styles: shared form controls, font sizes and 12 px minimum verified.');
 }
-if (failures.length) {
-    console.error(failures.join('\n'));
-    process.exitCode = 1;
-} else console.log('UI styles: shared font sizes and 12 px minimum verified.');
+
+if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url))
+    await main();
diff --git a/src/lib/ui/components/ActivityLog.svelte b/src/lib/ui/components/ActivityLog.svelte
index ffd3022..c0cf66e 100644
--- a/src/lib/ui/components/ActivityLog.svelte
+++ b/src/lib/ui/components/ActivityLog.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { untrack } from 'svelte';
     import { page } from '$app/stores';
     import { goto } from '$app/navigation';
@@ -187,59 +190,59 @@
     <h2 class="sr-only" id={headingId}>Activity history</h2>
     {#snippet filterFields(suffix: string)}
         <div class="filters">
-            <label for={`activity-type${suffix}`}
-                >Type<select
+            <Field forId={`activity-type${suffix}`} label="Type">
+                <Select
                     id={`activity-type${suffix}`}
                     value={filters.type ?? ''}
                     onchange={(event) => update({ type: event.currentTarget.value })}
                     ><option value="">All types</option>{#each typeOptions as [value, label]}<option
                             {value}>{label}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
-            <label for={`activity-state${suffix}`}
-                >State<select
+            <Field forId={`activity-state${suffix}`} label="State">
+                <Select
                     id={`activity-state${suffix}`}
                     value={filters.state ?? ''}
                     onchange={(event) => update({ state: event.currentTarget.value })}
                     ><option value="">All states</option
                     >{#each Object.entries(activityStates) as [value, label]}<option {value}
                             >{label}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
-            {#if source === undefined}<label for={`activity-source${suffix}`}
-                    >Source<select
+            {#if source === undefined}<Field forId={`activity-source${suffix}`} label="Source">
+                    <Select
                         id={`activity-source${suffix}`}
                         value={filters.source ?? ''}
                         onchange={(event) => update({ source: event.currentTarget.value })}
                         ><option value="">All sources</option
                         >{#each sourceOptions as [value, label]}<option {value}>{label}</option
-                            >{/each}</select
-                    ></label
+                            >{/each}</Select
+                    ></Field
                 >{/if}
-            {#if server === undefined}<label for={`activity-server${suffix}`}
-                    >Server<select
+            {#if server === undefined}<Field forId={`activity-server${suffix}`} label="Server">
+                    <Select
                         id={`activity-server${suffix}`}
                         value={filters.server ?? ''}
                         onchange={(event) => update({ server: event.currentTarget.value })}
                         ><option value="">All servers</option>{#each serverOptions as name}<option
                                 value={name}>{serverTitle(name)}</option
-                            >{/each}</select
-                    ></label
+                            >{/each}</Select
+                    ></Field
                 >{/if}
-            <label for={`activity-host${suffix}`}
-                >Host<select
+            <Field forId={`activity-host${suffix}`} label="Host">
+                <Select
                     id={`activity-host${suffix}`}
                     value={filters.host ?? ''}
                     onchange={(event) => update({ host: event.currentTarget.value })}
                     ><option value="">All hosts</option>{#each hostOptions as [value, label]}<option
                             {value}>{label}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
-            <label for={`activity-days${suffix}`}
-                >Date range<select
+            <Field forId={`activity-days${suffix}`} label="Date range">
+                <Select
                     id={`activity-days${suffix}`}
                     value={String(filters.days ?? 0)}
                     onchange={(event) => update({ days: event.currentTarget.value })}
@@ -249,8 +252,8 @@
                     ><option value="90">Last 90 days</option
                     >{#if filters.days && ![1, 7, 30, 90].includes(filters.days)}<option
                             value={String(filters.days)}>Last {filters.days} days</option
-                        >{/if}</select
-                ></label
+                        >{/if}</Select
+                ></Field
             >
             <form
                 class="search"
@@ -260,14 +263,14 @@
                     submitSearch();
                 }}
             >
-                <label for={`activity-search${suffix}`}
-                    >Search activity<input
+                <Field forId={`activity-search${suffix}`} label="Search activity">
+                    <Input
                         id={`activity-search${suffix}`}
                         type="search"
                         bind:value={search}
-                        maxlength="200"
+                        maxlength={200}
                         placeholder="Server, host, or activity…"
-                    /></label
+                    /></Field
                 ><Button type="submit" size="sm">Search</Button>
             </form>
         </div>
@@ -377,15 +380,15 @@
                     ? `${data.offset + 1}–${data.offset + data.rows.length} of ${data.total}`
                     : 'No activities on this page'}</span
             >
-            <label
-                >Per page<select
+            <Field label="Per page">
+                <Select
                     aria-label="Activities per page"
                     value={data.limit}
                     onchange={(event) => update({ limit: event.currentTarget.value })}
                     >{#each [...new Set( [25, 50, 100, data.limit] )].sort((a, b) => a - b) as size}<option
                             value={size}>{size}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
             {#if data.total > data.limit || data.offset > 0}<nav aria-label="Activity pages">
                     <Button
@@ -418,25 +421,7 @@
         align-items: end;
         gap: var(--space-3);
     }
-    label {
-        display: grid;
-        gap: 6px;
-        color: var(--text-secondary);
-        font-size: var(--text-xs);
-        min-width: 0;
-    }
-    select,
-    input {
-        width: 100%;
-        min-height: 40px;
-        padding: 8px 10px;
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        font: inherit;
-        font-size: var(--text-sm);
-    }
+
     .search {
         grid-column: span 2;
         display: flex;
@@ -444,7 +429,8 @@
         gap: var(--space-2);
         min-width: 0;
     }
-    .search label {
+
+    .search :global(.field) {
         flex: 1;
     }
     .context,
@@ -549,15 +535,7 @@
     .pagination {
         justify-content: space-between;
     }
-    .pagination label {
-        display: flex;
-        align-items: center;
-        gap: var(--space-2);
-    }
-    .pagination select {
-        width: auto;
-        min-height: 36px;
-    }
+
     .pagination nav {
         display: flex;
         gap: var(--space-2);
diff --git a/src/lib/ui/components/AddHostDrawer.svelte b/src/lib/ui/components/AddHostDrawer.svelte
index 5ad382c..7603d8b 100644
--- a/src/lib/ui/components/AddHostDrawer.svelte
+++ b/src/lib/ui/components/AddHostDrawer.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { timeFormat } from '$ui/stores/time-zone.js';
     import Dialog from './primitives/Dialog.svelte';
     import Button from './primitives/Button.svelte';
@@ -89,34 +91,34 @@
             </p>
             <form onsubmit={add}>
                 <fieldset disabled={busy}>
-                    <label
-                        >Friendly name<input
+                    <Field label="Friendly name">
+                        <Input
                             required
-                            maxlength="200"
+                            maxlength={200}
                             bind:value={name}
                             placeholder="Game host 1"
-                        /></label
+                        /></Field
                     >
                     <details>
                         <summary>Advanced settings</summary>
                         <div class="ports">
-                            <label
-                                >First game port<input
+                            <Field label="First game port">
+                                <Input
                                     type="number"
                                     required
                                     min="1"
                                     max="65535"
                                     bind:value={portMin}
-                                /></label
+                                /></Field
                             >
-                            <label
-                                >Last game port<input
+                            <Field label="Last game port">
+                                <Input
                                     type="number"
                                     required
                                     min={portMin}
                                     max="65535"
                                     bind:value={portMax}
-                                /></label
+                                /></Field
                             >
                         </div>
                     </details>
@@ -150,12 +152,7 @@
     .muted {
         font-size: var(--text-xs);
     }
-    label {
-        display: grid;
-        gap: 8px;
-        font-size: var(--text-sm);
-    }
-    input,
+
     textarea {
         box-sizing: border-box;
         width: 100%;
@@ -186,7 +183,6 @@
         flex-wrap: wrap;
         gap: 12px;
     }
-    input:focus-visible,
     textarea:focus-visible,
     summary:focus-visible {
         outline: 2px solid var(--accent-primary);
diff --git a/src/lib/ui/components/BetaPlanBuilder.svelte b/src/lib/ui/components/BetaPlanBuilder.svelte
index abac76c..d869df3 100644
--- a/src/lib/ui/components/BetaPlanBuilder.svelte
+++ b/src/lib/ui/components/BetaPlanBuilder.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { onMount, tick } from 'svelte';
     import {
         builtInPlans,
@@ -192,9 +195,8 @@
             {/each}
         </div>
         {#if savedPresets.length}
-            <label class="saved-picker"
-                >Or use a saved preset
-                <select
+            <Field class="saved-picker" label="Or use a saved preset">
+                <Select
                     value={savedPresets.some((p) => p.name === matchingPreset?.name)
                         ? matchingPreset?.name
                         : ''}
@@ -203,8 +205,8 @@
                     <option value="" disabled>Choose a saved plan…</option>
                     {#each savedPresets as preset}<option value={preset.name}>{preset.name}</option
                         >{/each}
-                </select>
-            </label>
+                </Select>
+            </Field>
         {/if}
     {/if}
     {#if message}<div class="feedback" role="status" aria-live="polite">{message}</div>{/if}
@@ -274,22 +276,21 @@
                         <summary>Edit requirement <span>{requirementLabels[r.kind]}</span></summary>
                         <div class="editor-fields">
                             <div class="fields">
-                                <label
-                                    >Description<input
+                                <Field label="Description">
+                                    <Input
                                         id={`plan-${r.id}-label`}
                                         aria-invalid={!!fieldError(`${r.id}-label`)}
                                         aria-describedby={`error-${r.id}-label`}
                                         bind:value={r.label}
-                                        maxlength="200"
+                                        maxlength={200}
                                         required
                                     /><span class="error" id={`error-${r.id}-label`}
                                         >{fieldError(`${r.id}-label`) ?? ''}</span
-                                    ></label
+                                    ></Field
                                 >
                                 {#if r.kind !== 'manual'}
-                                    <label
-                                        >{targetLabel(r.kind)}
-                                        <input
+                                    <Field label={targetLabel(r.kind)}>
+                                        <Input
                                             id={`plan-${r.id}-target`}
                                             aria-invalid={!!fieldError(`${r.id}-target`)}
                                             aria-describedby={`error-${r.id}-target`}
@@ -318,11 +319,11 @@
                                         <span class="error" id={`error-${r.id}-target`}
                                             >{fieldError(`${r.id}-target`) ?? ''}</span
                                         >
-                                    </label>
+                                    </Field>
                                 {/if}
                                 {#if ['round', 'matches', 'populated-minutes', 'player-hours', 'sustained-population'].includes(r.kind)}
-                                    <label
-                                        >Minimum players<input
+                                    <Field label="Minimum players">
+                                        <Input
                                             id={`plan-${r.id}-minPlayers`}
                                             aria-invalid={!!fieldError(`${r.id}-minPlayers`)}
                                             aria-describedby={`error-${r.id}-minPlayers`}
@@ -333,12 +334,12 @@
                                             required
                                         /><span class="error" id={`error-${r.id}-minPlayers`}
                                             >{fieldError(`${r.id}-minPlayers`) ?? ''}</span
-                                        ></label
+                                        ></Field
                                     >
                                 {/if}
                                 {#if r.kind === 'matches'}
-                                    <label
-                                        >Minimum round in the same game<input
+                                    <Field label="Minimum round in the same game">
+                                        <Input
                                             id={`plan-${r.id}-minRound`}
                                             aria-invalid={!!fieldError(`${r.id}-minRound`)}
                                             aria-describedby={`error-${r.id}-minRound`}
@@ -349,12 +350,12 @@
                                             required
                                         /><span class="error" id={`error-${r.id}-minRound`}
                                             >{fieldError(`${r.id}-minRound`) ?? ''}</span
-                                        ></label
+                                        ></Field
                                     >
                                 {/if}
                                 {#if r.kind === 'matches'}
-                                    <label
-                                        >Minimum match duration (minutes)<input
+                                    <Field label="Minimum match duration (minutes)">
+                                        <Input
                                             id={`plan-${r.id}-minMinutes`}
                                             aria-invalid={!!fieldError(`${r.id}-minMinutes`)}
                                             aria-describedby={`error-${r.id}-minMinutes`}
@@ -365,7 +366,7 @@
                                             required
                                         /><span class="error" id={`error-${r.id}-minMinutes`}
                                             >{fieldError(`${r.id}-minMinutes`) ?? ''}</span
-                                        ></label
+                                        ></Field
                                     >
                                 {/if}
                             </div>
@@ -402,12 +403,12 @@
             {/each}
         </div>
         <div class="add-row">
-            <label
-                >Add another check<select bind:value={addKind}
+            <Field label="Add another check">
+                <Select bind:value={addKind}
                     >{#each requirementKinds as kind}<option value={kind}
                             >{requirementLabels[kind]}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
             <button
                 type="button"
@@ -434,8 +435,8 @@
                             Servers step.
                         </p>
                     {:else}
-                        <label
-                            >Qualifying servers<select bind:value={plan.scope}>
+                        <Field label="Qualifying servers">
+                            <Select bind:value={plan.scope}>
                                 <option value="all">Every selected server</option><option
                                     value="quorum">At least N selected servers</option
                                 >
@@ -445,10 +446,10 @@
                                 <option value="map-game"
                                     >At least one per selected game/map combination</option
                                 >
-                            </select></label
+                            </Select></Field
                         >
-                        {#if plan.scope === 'quorum'}<label
-                                >Required servers<input
+                        {#if plan.scope === 'quorum'}<Field label="Required servers">
+                                <Input
                                     id="plan-quorum"
                                     aria-invalid={!!fieldError('quorum')}
                                     aria-describedby="error-quorum"
@@ -461,11 +462,11 @@
                                 /><span class="error" id="error-quorum"
                                     >{fieldError('quorum') ??
                                         `${serverCount ?? 0} servers selected`}</span
-                                ></label
+                                ></Field
                             >{/if}
                     {/if}
-                    <label
-                        >Servers per wave (0 = all at once)<input
+                    <Field label="Servers per wave (0 = all at once)">
+                        <Input
                             id="plan-waveSize"
                             aria-invalid={!!fieldError('waveSize')}
                             aria-describedby="error-waveSize"
@@ -476,7 +477,7 @@
                             required
                         /><span class="error" id="error-waveSize"
                             >{fieldError('waveSize') ?? ''}</span
-                        ></label
+                        ></Field
                     >
                 </div>
                 <p>
@@ -496,8 +497,8 @@
             >
             <div class="policy-body">
                 <div class="fields">
-                    <label
-                        >Testing window (hours from opening)<input
+                    <Field label="Testing window (hours from opening)">
+                        <Input
                             id="plan-timeoutHours"
                             aria-invalid={!!fieldError('timeoutHours')}
                             aria-describedby="error-timeoutHours"
@@ -509,20 +510,20 @@
                             required
                         /><span class="error" id="error-timeoutHours"
                             >{fieldError('timeoutHours') ?? ''}</span
-                        ></label
+                        ></Field
                     >
-                    <label
-                        >On test failure<select bind:value={plan.failureAction}
+                    <Field label="On test failure">
+                        <Select bind:value={plan.failureAction}
                             ><option value="fail">Mark failed and hold</option><option value="pause"
                                 >Pause for investigation</option
-                            ><option value="rollback">Roll back automatically</option></select
-                        ></label
+                            ><option value="rollback">Roll back automatically</option></Select
+                        ></Field
                     >
-                    <label
-                        >Rollback activation<select bind:value={plan.rollbackRestart}
+                    <Field label="Rollback activation">
+                        <Select bind:value={plan.rollbackRestart}
                             ><option value="when-empty">Restore and restart when empty</option
-                            ><option value="manual">Hold changes for manual resume</option></select
-                        ></label
+                            ><option value="manual">Hold changes for manual resume</option></Select
+                        ></Field
                     >
                 </div>
                 <p>
@@ -541,12 +542,12 @@
                 ><span class="edit-hint">Save</span></summary
             >
             <div class="policy-body fields">
-                <label
-                    >Preset name<input
+                <Field label="Preset name">
+                    <Input
                         bind:value={presetName}
-                        maxlength="80"
+                        maxlength={80}
                         placeholder="My gameplay check"
-                    /></label
+                    /></Field
                 >
                 <button
                     type="button"
@@ -808,19 +809,15 @@
         gap: 12px;
         align-items: end;
     }
-    .add-row label {
+
+    .builder .add-row > :global(.field) {
         flex: 1 1 220px;
     }
-    label {
-        display: grid;
-        gap: 7px;
+
+    .builder :global(.field) {
         flex: 1 1 180px;
         min-width: 0;
-        font-size: var(--text-xs);
-        color: var(--text-secondary);
     }
-    input,
-    select,
     button {
         color: var(--text-primary);
         background: var(--surface-sunken);
@@ -830,14 +827,7 @@
         min-width: 0;
         font: inherit;
     }
-    input,
-    select {
-        width: 100%;
-        font-size: var(--text-sm);
-        min-height: 40px;
-        box-sizing: border-box;
-        border-color: var(--border-control);
-    }
+
     button {
         cursor: pointer;
     }
@@ -846,9 +836,7 @@
         cursor: default;
     }
     button:focus-visible,
-    summary:focus-visible,
-    input:focus-visible,
-    select:focus-visible {
+    summary:focus-visible {
         outline: 2px solid var(--accent-primary-hover);
         outline-offset: 3px;
     }
diff --git a/src/lib/ui/components/BetaTestProgress.svelte b/src/lib/ui/components/BetaTestProgress.svelte
index 3900e65..c9b84ad 100644
--- a/src/lib/ui/components/BetaTestProgress.svelte
+++ b/src/lib/ui/components/BetaTestProgress.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { serverTitle } from '$ui/server-labels.js';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { timeFormat } from '$ui/stores/time-zone.js';
@@ -413,27 +416,27 @@
                 current progress uses only the current attempt.
             </p>
             <div class="filters">
-                <label
-                    >Server<select bind:value={evidenceServer}
+                <Field label="Server">
+                    <Select bind:value={evidenceServer}
                         ><option value="">All servers</option
                         >{#each [...new Set(test.evidence.map((event) => event.server))] as server}<option
                                 value={server}>{serverTitle(server)}</option
-                            >{/each}</select
-                    ></label
-                ><label
-                    >Event type<select bind:value={evidenceKind}
+                            >{/each}</Select
+                    ></Field
+                ><Field label="Event type">
+                    <Select bind:value={evidenceKind}
                         ><option value="">All events</option><option value="gameplay"
                             >Gameplay reports</option
                         ><option value="health">Health observations</option><option
                             value="manual-sign-off">Tester sign-offs</option
-                        ></select
-                    ></label
-                ><label
-                    >Search evidence<input
+                        ></Select
+                    ></Field
+                ><Field label="Search evidence">
+                    <Input
                         type="search"
                         bind:value={evidenceQuery}
                         placeholder="Round, map, tester, observation…"
-                    /></label
+                    /></Field
                 >
             </div>
             {#each filteredEvidence.slice(0, evidenceLimit) as event (event.id)}<article
@@ -683,14 +686,15 @@
     .signoff label {
         flex: 1 1 240px;
     }
+    .signoff :global(.field) {
+        flex: 1 1 240px;
+    }
     label {
         display: grid;
         gap: 6px;
         font-size: var(--text-sm);
         color: var(--text-secondary);
     }
-    input,
-    select,
     textarea {
         min-height: 40px;
         padding: 8px 10px;
@@ -714,6 +718,10 @@
         flex: 1 1 180px;
         min-width: 0;
     }
+    .filters :global(.field) {
+        flex: 1 1 180px;
+        min-width: 0;
+    }
     .evidence {
         display: grid;
         gap: 8px;
diff --git a/src/lib/ui/components/BlueprintBuilder.svelte b/src/lib/ui/components/BlueprintBuilder.svelte
index 864d0ae..1112e05 100644
--- a/src/lib/ui/components/BlueprintBuilder.svelte
+++ b/src/lib/ui/components/BlueprintBuilder.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { isDialogBackdrop } from '$ui/dialog.js';
     import Button from './primitives/Button.svelte';
     import type { BlueprintSummary } from '$lib/deployment-plan.js';
@@ -184,21 +187,21 @@
                 }}
             >
                 <div class="identity">
-                    <label
-                        >Collection name<input
+                    <Field label="Collection name">
+                        <Input
                             bind:value={name}
-                            maxlength="80"
+                            maxlength={80}
                             placeholder="Friday Zombies"
                             required
                             disabled={busy}
-                        /></label
-                    ><label
-                        >Description (optional)<input
+                        /></Field
+                    ><Field label="Description (optional)">
+                        <Input
                             bind:value={description}
-                            maxlength="500"
+                            maxlength={500}
                             placeholder="Our weekend lineup"
                             disabled={busy}
-                        /></label
+                        /></Field
                     >
                 </div>
                 <div class="lineup">
@@ -211,8 +214,8 @@
                     {#each rows as row, index (row.key)}
                         <div class="map-row">
                             <span class="number">{String(index + 1).padStart(2, '0')}</span>
-                            <label
-                                >Game<select
+                            <Field label="Game">
+                                <Select
                                     aria-label={`Game ${index + 1}`}
                                     bind:value={row.game}
                                     disabled={busy}
@@ -222,11 +225,11 @@
                                                 ?.slug ?? '')}
                                     ><option value="t5">Black Ops I</option><option value="t6"
                                         >Black Ops II</option
-                                    ></select
-                                ></label
+                                    ></Select
+                                ></Field
                             >
-                            <label
-                                >Map<select
+                            <Field label="Map">
+                                <Select
                                     aria-label={`Map ${index + 1}`}
                                     aria-invalid={duplicate(row) || undefined}
                                     aria-describedby={duplicate(row)
@@ -242,13 +245,13 @@
                                                     other.game === row.game &&
                                                     other.mapSlug === map.slug
                                             )}>{map.friendly}</option
-                                        >{/each}</select
+                                        >{/each}</Select
                                 >{#if duplicate(row)}<span class="error" id={`map-error-${row.key}`}
                                         >Already selected. Choose another map.</span
-                                    >{/if}</label
+                                    >{/if}</Field
                             >
-                            <label
-                                >Target lobbies<input
+                            <Field label="Target lobbies">
+                                <Input
                                     aria-label={`Lobbies ${index + 1}`}
                                     aria-invalid={!(
                                         Number.isInteger(row.count) &&
@@ -263,7 +266,7 @@
                                     bind:value={row.count}
                                     required
                                     disabled={busy}
-                                /><span id={`count-hint-${row.key}`}>1–15</span></label
+                                /><span id={`count-hint-${row.key}`}>1–15</span></Field
                             >
                             <button
                                 type="button"
@@ -371,24 +374,7 @@
         grid-template-columns: 1fr 1fr;
         gap: 16px;
     }
-    label {
-        display: grid;
-        gap: 7px;
-        font-size: var(--text-xs);
-        min-width: 0;
-    }
-    input,
-    select {
-        width: 100%;
-        min-width: 0;
-        box-sizing: border-box;
-        padding: 11px;
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        background: var(--surface-sunken);
-        color: inherit;
-        font: inherit;
-    }
+
     .lineup {
         border-block: 1px solid var(--border-subtle);
         padding: 20px 0;
@@ -457,8 +443,11 @@
             display: none;
             font-variant-numeric: tabular-nums;
         }
-        .map-row label:first-of-type,
-        .map-row label:nth-of-type(2) {
+
+        .map-row > :global(.field:first-of-type) {
+            grid-column: 1 / -1;
+        }
+        .map-row > :global(.field:nth-of-type(2)) {
             grid-column: 1 / -1;
         }
         .actions {
diff --git a/src/lib/ui/components/CapacitySamples.svelte b/src/lib/ui/components/CapacitySamples.svelte
index 0ac766c..942ac9d 100644
--- a/src/lib/ui/components/CapacitySamples.svelte
+++ b/src/lib/ui/components/CapacitySamples.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import type { CapacitySamplePage } from '$lib/hosts.js';
     import Button from './primitives/Button.svelte';
@@ -59,18 +61,18 @@
             measurements from other hosts used by fleet allowances.
         </p>
         <div class="controls">
-            <label
-                >Source<select bind:value={scope} onchange={() => (page = 1)}
+            <Field label="Source">
+                <Select bind:value={scope} onchange={() => (page = 1)}
                     ><option value="host">This host</option><option value="fleet"
                         >Entire fleet</option
-                    ></select
-                ></label
+                    ></Select
+                ></Field
             >
-            <label
-                >Phase<select bind:value={phase} onchange={() => (page = 1)}
+            <Field label="Phase">
+                <Select bind:value={phase} onchange={() => (page = 1)}
                     ><option value="all">All phases</option><option value="startup">Starting</option
-                    ><option value="running">Running</option></select
-                ></label
+                    ><option value="running">Running</option></Select
+                ></Field
             >
             <Button
                 size="sm"
@@ -182,18 +184,7 @@
     nav {
         align-items: center;
     }
-    label {
-        display: grid;
-        gap: 6px;
-        font-size: var(--text-sm);
-    }
-    select {
-        padding: 8px;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-    }
+
     .table-wrap {
         max-width: 100%;
         overflow: auto;
diff --git a/src/lib/ui/components/CommandPalette.svelte b/src/lib/ui/components/CommandPalette.svelte
index 25ce3cf..7544c2e 100644
--- a/src/lib/ui/components/CommandPalette.svelte
+++ b/src/lib/ui/components/CommandPalette.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
     import { tick } from 'svelte';
     import { goto } from '$app/navigation';
     import type { UserRole } from '$lib/auth.js';
@@ -154,23 +156,24 @@
     description="Jump to a page, server, host, player, or match."
 >
     <div class="palette">
-        <label class="sr-only" for={`${id}-search`}>Search Electric Cherry</label>
-        <input
-            bind:this={input}
-            bind:value={query}
-            id={`${id}-search`}
-            type="search"
-            maxlength="100"
-            placeholder="Search Electric Cherry…"
-            role="combobox"
-            aria-autocomplete="list"
-            aria-expanded={open}
-            aria-controls={`${id}-results`}
-            aria-activedescendant={items.length ? `${id}-option-${activeIndex}` : undefined}
-            aria-describedby={`${id}-hint`}
-            autocomplete="off"
-            onkeydown={keydown}
-        />
+        <Field label="Search Electric Cherry" forId={`${id}-search`} hiddenLabel>
+            <Input
+                bind:element={input}
+                bind:value={query}
+                id={`${id}-search`}
+                type="search"
+                maxlength={100}
+                placeholder="Search Electric Cherry…"
+                role="combobox"
+                aria-autocomplete="list"
+                aria-expanded={open}
+                aria-controls={`${id}-results`}
+                aria-activedescendant={items.length ? `${id}-option-${activeIndex}` : undefined}
+                aria-describedby={`${id}-hint`}
+                autocomplete="off"
+                onkeydown={keydown}
+            /></Field
+        >
         <p class="hint" id={`${id}-hint`}>
             Try a lobby, player name, or #match number. <span>↑ ↓ to choose · Enter to open</span>
         </p>
@@ -228,17 +231,7 @@
         gap: var(--space-3);
         min-width: 0;
     }
-    input {
-        width: 100%;
-        min-height: 44px;
-        padding: var(--space-3);
-        font: inherit;
-        font-size: var(--text-base);
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-    }
+
     .hint,
     .status,
     .error {
@@ -296,15 +289,4 @@
     .error {
         color: var(--state-warning);
     }
-    .sr-only {
-        position: absolute;
-        width: 1px;
-        height: 1px;
-        padding: 0;
-        margin: -1px;
-        overflow: hidden;
-        clip-path: inset(50%);
-        white-space: nowrap;
-        border: 0;
-    }
 </style>
diff --git a/src/lib/ui/components/ConfigEditor.svelte b/src/lib/ui/components/ConfigEditor.svelte
index 8f625fa..8007377 100644
--- a/src/lib/ui/components/ConfigEditor.svelte
+++ b/src/lib/ui/components/ConfigEditor.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { onMount } from 'svelte';
     import { confirmAction } from '$ui/confirm.js';
     import { beforeNavigate, goto } from '$app/navigation';
@@ -230,8 +233,8 @@
             {#if dirty}<span class="draft-tag">Unsaved draft</span>{/if}
         </div>
         <div class="version-toolbar">
-            <label
-                >Starting version<select
+            <Field label="Starting version">
+                <Select
                     aria-label="Starting version"
                     value={selected}
                     onchange={changeVersion}
@@ -240,8 +243,8 @@
                             >v{version.version}{version.id === currentVersionId
                                 ? ' · promoted'
                                 : ''}{version.id === versions[0]?.id ? ' · latest' : ''}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
             <label class="file-button"
                 >Import .cfg<input
@@ -274,12 +277,12 @@
                 overlay={kind === 'config'}
                 disabled={saving || runningBetaId !== null}
             />
-            <label class="notes-label"
-                >Version notes<input
+            <Field class="notes-label" label="Version notes">
+                <Input
                     bind:value={notes}
                     placeholder="What changed, and why?"
                     disabled={saving || runningBetaId !== null}
-                /></label
+                /></Field
             >
             <div class="actions ui-sticky-actions">
                 <span class="muted"
@@ -355,13 +358,15 @@
     .version-toolbar > label:first-child {
         flex: 1;
     }
+    .version-toolbar > :global(.field:first-child) {
+        flex: 1;
+    }
     label {
         display: grid;
         gap: 8px;
         color: var(--text-secondary);
         font-size: var(--text-xs);
     }
-    select,
     input:not([type='file']) {
         width: 100%;
         box-sizing: border-box;
@@ -373,7 +378,6 @@
         font: var(--text-sm) var(--font-body);
     }
     input:focus-visible,
-    select:focus-visible,
     .file-button:focus-within {
         outline: 2px solid var(--accent-primary);
         outline-offset: 2px;
@@ -394,9 +398,10 @@
         width: 100%;
         cursor: pointer;
     }
-    .notes-label {
+    .editor-panel :global(.notes-label) {
         margin-top: 20px;
     }
+
     .actions {
         margin-top: 16px;
     }
@@ -441,8 +446,7 @@
             padding: 16px;
         }
     }
-    input:not([type='checkbox']):not([type='file']),
-    select {
+    input:not([type='checkbox']):not([type='file']) {
         border-color: var(--border-control);
     }
 </style>
diff --git a/src/lib/ui/components/ConfigInspector.svelte b/src/lib/ui/components/ConfigInspector.svelte
index 2ab4915..9f2c863 100644
--- a/src/lib/ui/components/ConfigInspector.svelte
+++ b/src/lib/ui/components/ConfigInspector.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { onMount } from 'svelte';
     import { serverTitle } from '$ui/server-labels.js';
     import type { ConfigInspection, ConfigServer, ConfigSource } from '$lib/config-workbench.js';
@@ -191,8 +194,8 @@
             ? 'Your draft composed with the other promoted configs. Saving creates an untested version.'
             : 'The intended file from promoted configs and the selected map. Live files and active betas may differ.'}
     </p>
-    {#if !fixedServer}<label class="server-label"
-            >Server<select
+    {#if !fixedServer}<Field class="server-label" label="Server">
+            <Select
                 aria-label="Server"
                 bind:value={selected}
                 disabled={!!fixedServer || !eligible.length}
@@ -201,7 +204,7 @@
                         >{serverTitle(server.name)}</option
                     >{/each}
                 {#if !eligible.length}<option value="">No matching servers</option>{/if}
-            </select></label
+            </Select></Field
         >{/if}
     {#if error}<div class="error" role="alert">
             {error}{inspection ? ' Showing the last completed preview.' : ''}
@@ -274,11 +277,13 @@
             ></textarea>
         {:else}
             <div class="filters">
-                <input
-                    aria-label="Search effective settings"
-                    bind:value={query}
-                    placeholder="Search settings or sources…"
-                /><label class="check"
+                <Field label="Search effective settings" hiddenLabel class="search"
+                    ><Input
+                        aria-label="Search effective settings"
+                        bind:value={query}
+                        placeholder="Search settings or sources…"
+                    /></Field
+                ><label class="check"
                     ><input type="checkbox" bind:checked={onlyOverrides} /> Overrides ({overlaps})</label
                 >
             </div>
@@ -379,13 +384,12 @@
         font-size: var(--text-sm);
         margin: 12px 0 20px;
     }
-    .server-label {
+    .inspector :global(.server-label) {
         display: grid;
         gap: 8px;
         font-size: var(--text-xs);
         color: var(--text-secondary);
     }
-    select,
     input:not([type='checkbox']) {
         width: 100%;
         box-sizing: border-box;
@@ -396,7 +400,6 @@
         padding: 10px 12px;
         font: var(--text-sm) var(--font-body);
     }
-    select:focus-visible,
     input:focus-visible,
     button:focus-visible,
     summary:focus-visible,
@@ -480,12 +483,13 @@
         color: var(--text-secondary);
         margin-left: 6px;
     }
+    .filters > :global(.search) {
+        flex: 1 1 180px;
+    }
     .filters {
         margin: 16px 0 8px;
     }
-    .filters > input {
-        flex: 1 1 180px;
-    }
+
     .check {
         font-size: var(--text-xs);
         color: var(--text-secondary);
@@ -532,6 +536,7 @@
         color: var(--text-secondary);
         margin-top: 6px;
     }
+
     .source-label::before {
         content: '▸';
     }
@@ -610,7 +615,6 @@
         }
     }
     input:not([type='checkbox']):not([type='file']),
-    select,
     textarea {
         border-color: var(--border-control);
     }
diff --git a/src/lib/ui/components/ConfigLibrary.svelte b/src/lib/ui/components/ConfigLibrary.svelte
index 1a04fc1..323caae 100644
--- a/src/lib/ui/components/ConfigLibrary.svelte
+++ b/src/lib/ui/components/ConfigLibrary.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
     import { page } from '$app/stores';
     import { contextHref } from '$lib/navigation-context.js';
     import { onMount } from 'svelte';
@@ -247,28 +250,35 @@
             <ConfigInspector />
         {:else}
             {#if loading || artifacts.length || error}<div class="library-toolbar">
-                    <input
-                        type="search"
-                        class="search"
-                        aria-label="Search configs"
-                        bind:value={query}
-                        placeholder="Search configs, maps, or servers…"
-                    />
-                    <select aria-label="Filter by game" bind:value={game}
-                        ><option value="">All games</option>{#each gameOptions as option}<option
-                                value={option}>{gameTitle(option)}</option
-                            >{/each}</select
+                    <Field label="Search configs" hiddenLabel class="search"
+                        ><Input
+                            type="search"
+                            aria-label="Search configs"
+                            bind:value={query}
+                            placeholder="Search configs, maps, or servers…"
+                        /></Field
                     >
-                    <select aria-label="Filter by scope" bind:value={scope}
-                        ><option value="">All scopes</option><option value="game">Game</option
-                        ><option value="map">Map</option></select
+                    <Field label="Filter by game" hiddenLabel
+                        ><Select aria-label="Filter by game" bind:value={game}
+                            ><option value="">All games</option>{#each gameOptions as option}<option
+                                    value={option}>{gameTitle(option)}</option
+                                >{/each}</Select
+                        ></Field
                     >
-                    <select aria-label="Filter by status" bind:value={status}
-                        ><option value="">All statuses</option><option value="pending"
-                            >Awaiting promotion</option
-                        ><option value="promoted">Has promoted version</option><option value="beta"
-                            >Active beta</option
-                        ><option value="failed">Test failed</option></select
+                    <Field label="Filter by scope" hiddenLabel
+                        ><Select aria-label="Filter by scope" bind:value={scope}
+                            ><option value="">All scopes</option><option value="game">Game</option
+                            ><option value="map">Map</option></Select
+                        ></Field
+                    >
+                    <Field label="Filter by status" hiddenLabel
+                        ><Select aria-label="Filter by status" bind:value={status}
+                            ><option value="">All statuses</option><option value="pending"
+                                >Awaiting promotion</option
+                            ><option value="promoted">Has promoted version</option><option
+                                value="beta">Active beta</option
+                            ><option value="failed">Test failed</option></Select
+                        ></Field
                     >
                     {#if filtered.length && (query || game || scope || status)}<Button
                             size="sm"
@@ -390,15 +400,15 @@
             >
         </div>
         <div class="form-grid">
-            <label
-                >Name<input
+            <Field label="Name">
+                <Input
                     bind:value={name}
                     placeholder={kind === 'config' ? 'No AFK timeout' : 'Black Ops I baseline'}
                     required
                     disabled={saving}
-                /></label
-            ><label
-                >Game<select
+                /></Field
+            ><Field label="Game">
+                <Select
                     aria-label="Game"
                     bind:value={scopeGame}
                     onchange={() => (scopeMap = '')}
@@ -406,16 +416,16 @@
                     disabled={saving}
                     ><option value="" disabled>Choose a game</option
                     >{#each gameOptions as option}<option value={option}>{gameTitle(option)}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
-            {#if kind === 'config'}<label
-                    >Apply to<select aria-label="Apply to" bind:value={scopeType} disabled={saving}
+            {#if kind === 'config'}<Field label="Apply to">
+                    <Select aria-label="Apply to" bind:value={scopeType} disabled={saving}
                         ><option value="game">Whole game</option><option value="map">One map</option
-                        ></select
-                    ></label
-                >{#if scopeType === 'map'}<label
-                        >Map<select
+                        ></Select
+                    ></Field
+                >{#if scopeType === 'map'}<Field label="Map">
+                        <Select
                             aria-label="Map"
                             bind:value={scopeMap}
                             required
@@ -423,8 +433,8 @@
                             ><option value="" disabled>Choose a map</option
                             >{#each scopeOptions.mapsByGame[scopeGame] ?? [] as option}<option
                                     value={option}>{option}</option
-                                >{/each}</select
-                        ></label
+                                >{/each}</Select
+                        ></Field
                     >{/if}{/if}
         </div>
         {#if baselineExists}<p class="warning">
@@ -442,12 +452,12 @@
             /></label
         >
         <ConfigTextEditor bind:text overlay={kind === 'config'} disabled={saving} />
-        <label class="notes"
-            >Notes<input
+        <Field class="notes" label="Notes">
+            <Input
                 bind:value={notes}
                 placeholder="What is this config for?"
                 disabled={saving}
-            /></label
+            /></Field
         >
         {#if createError}<div class="error" role="alert">{createError}</div>{/if}
         <div class="dialog-actions">
@@ -504,13 +514,11 @@
     }
     button:focus-visible,
     input:focus-visible,
-    select:focus-visible,
     a:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: 3px;
     }
-    input,
-    select {
+    input {
         box-sizing: border-box;
         min-width: 0;
         background: var(--surface-sunken);
@@ -653,8 +661,7 @@
     .loading {
         padding: 24px 0;
     }
-    input:not([type='checkbox']):not([type='file']),
-    select {
+    input:not([type='checkbox']):not([type='file']) {
         border-color: var(--border-control);
     }
 </style>
diff --git a/src/lib/ui/components/ConfigTextEditor.svelte b/src/lib/ui/components/ConfigTextEditor.svelte
index b5f22a7..9191262 100644
--- a/src/lib/ui/components/ConfigTextEditor.svelte
+++ b/src/lib/ui/components/ConfigTextEditor.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
     import {
         addConfigSetting,
         changeConfigValue,
@@ -69,44 +71,50 @@
         ></textarea>
     {:else}
         <div class="settings">
-            <input
-                class="search"
-                aria-label="Find a setting"
-                bind:value={search}
-                placeholder="Find a setting…"
-            />
+            <Field label="Find a setting" hiddenLabel class="search"
+                ><Input
+                    aria-label="Find a setting"
+                    bind:value={search}
+                    placeholder="Find a setting…"
+                /></Field
+            >
             <p class="hint">
                 Edit values and inline comments. Other commands and formatting stay in the raw file.
             </p>
             {#each visible as entry (entry.index)}
-                <label class="setting"
-                    ><span><code>{entry.key}</code><small>Line {entry.index + 1}</small></span>
-                    <input
+                <Field class="setting"
+                    >{#snippet label()}<span
+                            ><code>{entry.key}</code><small>Line {entry.index + 1}</small></span
+                        >{/snippet}
+                    <Input
+                        mono
                         value={entry.value}
                         {disabled}
                         aria-label={`${entry.key}, line ${entry.index + 1}`}
                         oninput={(e) =>
                             (text = changeConfigValue(text, entry.index, e.currentTarget.value))}
                     />
-                </label>
+                </Field>
             {:else}<p class="hint">
                     {entries.length ? 'No matching settings.' : 'Add your first setting below.'}
                 </p>{/each}
             <div class="add-setting">
-                <label
-                    >Setting name<input
+                <Field label="Setting name">
+                    <Input
+                        mono
                         bind:value={newKey}
                         onkeydown={addOnEnter}
                         placeholder="g_inactivity"
                         {disabled}
-                    /></label
-                ><label
-                    >Value<input
+                    /></Field
+                ><Field label="Value">
+                    <Input
+                        mono
                         bind:value={newValue}
                         onkeydown={addOnEnter}
                         placeholder="0"
                         {disabled}
-                    /></label
+                    /></Field
                 ><Button
                     size="sm"
                     onclick={addSetting}
@@ -170,7 +178,6 @@
         color: var(--text-secondary);
     }
     button:focus-visible,
-    input:focus-visible,
     textarea:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: -2px;
@@ -189,8 +196,7 @@
         font: var(--text-sm)/1.8 var(--font-mono);
         tab-size: 4;
     }
-    textarea:disabled,
-    input:disabled {
+    textarea:disabled {
         opacity: 0.65;
     }
     .settings {
@@ -198,17 +204,8 @@
         max-height: 520px;
         overflow: auto;
     }
-    input {
-        box-sizing: border-box;
-        background: var(--surface);
-        color: var(--text-primary);
-        border: 1px solid var(--border-strong);
-        border-radius: var(--radius-sm);
-        padding: 9px 12px;
-        font: var(--text-sm) var(--font-mono);
-        width: 100%;
-    }
-    .setting {
+
+    .settings :global(.setting) {
         display: grid;
         grid-template-columns: minmax(140px, 1fr) minmax(0, 1.4fr);
         align-items: center;
@@ -216,7 +213,7 @@
         padding: 12px 0;
         border-top: 1px solid var(--border-subtle);
     }
-    .setting span {
+    .settings :global(.setting span) {
         min-width: 0;
         overflow-wrap: anywhere;
     }
@@ -228,11 +225,9 @@
         border-top: 1px solid var(--border-strong);
         padding-top: 16px;
     }
-    .add-setting label {
+
+    .add-setting :global(.field) {
         flex: 1 1 140px;
-        display: grid;
-        gap: 6px;
-        font-size: var(--text-sm);
     }
     code {
         font: var(--text-sm) var(--font-mono);
@@ -259,7 +254,7 @@
         margin: 6px 0;
     }
     @media (max-width: 600px) {
-        .setting {
+        .settings :global(.setting) {
             grid-template-columns: 1fr;
             gap: 8px;
         }
@@ -267,7 +262,6 @@
             display: none;
         }
     }
-    input:not([type='checkbox']):not([type='file']),
     textarea {
         border-color: var(--border-control);
     }
diff --git a/src/lib/ui/components/DeployServerDialog.svelte b/src/lib/ui/components/DeployServerDialog.svelte
index 1b4711b..0e0ad6b 100644
--- a/src/lib/ui/components/DeployServerDialog.svelte
+++ b/src/lib/ui/components/DeployServerDialog.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { onMount, onDestroy, tick } from 'svelte';
     import { goto } from '$app/navigation';
     import Dialog from './primitives/Dialog.svelte';
@@ -246,9 +248,9 @@
             <p class="muted" role="status">Loading maps…</p>
         {:else}
             <div class="fields">
-                <label
-                    >Game<select
-                        bind:this={gameSelect}
+                <Field label="Game">
+                    <Select
+                        bind:element={gameSelect}
                         bind:value={game}
                         disabled={launching || unconfirmedLaunch}
                         onchange={(event) => {
@@ -260,16 +262,16 @@
                         <option value="t5">Black Ops I</option><option value="t6"
                             >Black Ops II</option
                         >
-                    </select></label
+                    </Select></Field
                 >
-                <label
-                    >Map<select
+                <Field label="Map">
+                    <Select
                         bind:value={mapSlug}
                         disabled={launching || unconfirmedLaunch}
                         onchange={selectionChanged}
                     >
                         {#each maps as map}<option value={map.slug}>{map.friendly}</option>{/each}
-                    </select></label
+                    </Select></Field
                 >
             </div>
 
@@ -414,15 +416,7 @@
         grid-template-columns: 1fr 1.3fr;
         gap: 14px;
     }
-    label {
-        display: grid;
-        gap: 8px;
-        color: var(--text-secondary);
-        font-size: var(--text-sm);
-    }
-    select {
-        width: 100%;
-    }
+
     .summary {
         display: grid;
         gap: 8px;
diff --git a/src/lib/ui/components/FleetActionsDialog.svelte b/src/lib/ui/components/FleetActionsDialog.svelte
index e38e611..2eefa8b 100644
--- a/src/lib/ui/components/FleetActionsDialog.svelte
+++ b/src/lib/ui/components/FleetActionsDialog.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { untrack } from 'svelte';
     import { currentRound, freshServer, type FleetServer } from '$lib/fleet-overview.js';
     import { actionLabels } from '$lib/provisioning.js';
@@ -130,10 +132,10 @@
     wide
 >
     <div class="fields">
-        <label class="action"
-            >Action<select bind:value={action} disabled={busy} onchange={chooseAction}>
+        <Field class="action" label="Action">
+            <Select bind:value={action} disabled={busy} onchange={chooseAction}>
                 {#each fleetActions as value}<option {value}>{actionLabels[value]}</option>{/each}
-            </select></label
+            </Select></Field
         >
         <p>{descriptions[action]}</p>
         {#if error}<p class="ui-error" role="alert">{error}</p>{/if}
@@ -236,23 +238,14 @@
 
 <style>
     .fields,
-    .action {
+    .fields :global(.action) {
         display: grid;
         gap: var(--space-4);
     }
-    .action {
+    .fields :global(.action) {
         gap: var(--space-2);
     }
-    select {
-        width: 100%;
-        min-height: 40px;
-        padding: 10px;
-        border: 1px solid var(--border-strong);
-        border-radius: var(--radius-sm);
-        background: var(--surface);
-        color: var(--text-primary);
-        font: inherit;
-    }
+
     p,
     ul {
         margin: 0;
diff --git a/src/lib/ui/components/LifecycleDialog.svelte b/src/lib/ui/components/LifecycleDialog.svelte
index 21529a9..31699db 100644
--- a/src/lib/ui/components/LifecycleDialog.svelte
+++ b/src/lib/ui/components/LifecycleDialog.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { untrack } from 'svelte';
     import { goto } from '$app/navigation';
     import { currentRound, freshServer, type FleetServer } from '$lib/fleet-overview.js';
@@ -145,20 +147,16 @@
 <Dialog bind:open {title} {busy}>
     <div class="fields">
         {#if !initialServer}
-            <label
-                >Server <select
-                    bind:value={server}
-                    disabled={busy || loading}
-                    onchange={chooseServer}
-                >
+            <Field label="Server">
+                <Select bind:value={server} disabled={busy || loading} onchange={chooseServer}>
                     <option value="">{loading ? 'Loading servers…' : 'Choose a server'}</option>
                     {#each servers as item (item.name)}<option value={item.name}
                             >{serverTitle(item.name)}</option
                         >{/each}
-                </select></label
+                </Select></Field
             >
-            <label
-                >Action <select
+            <Field label="Action">
+                <Select
                     bind:value={action}
                     disabled={busy || !server || loading}
                     onchange={() => {
@@ -172,7 +170,7 @@
                         >{/if}
                     {#each available as value}<option {value}>{actionLabels[value]}</option>{/each}
                     {#if server}<option value="destroy">Destroy server</option>{/if}
-                </select></label
+                </Select></Field
             >
         {/if}
         {#if loading}<p role="status">Checking the latest server status…</p>
@@ -219,13 +217,7 @@
         display: grid;
         gap: 8px;
     }
-    select {
-        padding: 10px;
-        border: 1px solid var(--border-strong);
-        border-radius: var(--radius-sm);
-        background: var(--surface);
-        color: var(--text-primary);
-    }
+
     p {
         margin: 0;
         line-height: 1.6;
diff --git a/src/lib/ui/components/LogPanel.svelte b/src/lib/ui/components/LogPanel.svelte
index 641b8a3..1617e9f 100644
--- a/src/lib/ui/components/LogPanel.svelte
+++ b/src/lib/ui/components/LogPanel.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { tick, untrack, onMount, onDestroy } from 'svelte';
     import { page } from '$app/stores';
     import { goto } from '$app/navigation';
@@ -193,12 +195,8 @@
         retryDisabled={loading}
     />
     <div class="log-tools">
-        <label class="log-search"
-            >Search loaded lines<input
-                type="search"
-                bind:value={query}
-                placeholder="Find text in this log"
-            /></label
+        <Field class="log-search" label="Search loaded lines">
+            <Input type="search" bind:value={query} placeholder="Find text in this log" /></Field
         >
         <details class="log-actions">
             <summary>More</summary>
@@ -302,7 +300,7 @@
     .log-tools {
         align-items: end;
     }
-    .log-search {
+    .log-tools :global(.log-search) {
         display: grid;
         gap: 6px;
         flex: 1;
@@ -310,14 +308,6 @@
         font-size: var(--text-xs);
         color: var(--text-secondary);
     }
-    .log-search input {
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        padding: 9px 12px;
-        font: inherit;
-    }
     .copy-status {
         margin: 0;
         font-size: var(--text-xs);
diff --git a/src/lib/ui/components/MatchHistory.svelte b/src/lib/ui/components/MatchHistory.svelte
index 0e79fb1..9574b6b 100644
--- a/src/lib/ui/components/MatchHistory.svelte
+++ b/src/lib/ui/components/MatchHistory.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { untrack } from 'svelte';
     import { page } from '$app/stores';
@@ -129,17 +132,17 @@
 <section class="history" aria-label="Match history">
     {#snippet filterFields(suffix: string)}
         <div class="filters">
-            {#if server === undefined}<label for={`match-game${suffix}`}
-                    >Game<select
+            {#if server === undefined}<Field forId={`match-game${suffix}`} label="Game">
+                    <Select
                         id={`match-game${suffix}`}
                         value={filters.game}
                         onchange={(event) => update({ game: event.currentTarget.value, map: '' })}
                         ><option value="">All games</option><option value="t5">Black Ops I</option
-                        ><option value="t6">Black Ops II</option></select
-                    ></label
+                        ><option value="t6">Black Ops II</option></Select
+                    ></Field
                 >{/if}
-            <label for={`match-map${suffix}`}
-                >Map<select
+            <Field forId={`match-map${suffix}`} label="Map">
+                <Select
                     id={`match-map${suffix}`}
                     value={filters.map}
                     onchange={(event) => update({ map: event.currentTarget.value })}
@@ -153,7 +156,7 @@
                                 ? ` · ${map.game === 't5' ? 'BO1' : 'BO2'}`
                                 : ''}</option
                         >{/each}
-                </select></label
+                </Select></Field
             >
             {#if server === undefined}<form
                     role="search"
@@ -163,32 +166,32 @@
                         if (suffix) filtersOpen = false;
                     }}
                 >
-                    <label for={`match-search${suffix}`}
-                        >Server<input
+                    <Field forId={`match-search${suffix}`} label="Server">
+                        <Input
                             id={`match-search${suffix}`}
                             type="search"
                             bind:value={search}
-                            maxlength="100"
+                            maxlength={100}
                             placeholder="Find a server…"
                             aria-describedby={`match-search-help${suffix}`}
-                        /></label
+                        /></Field
                     >
                     <span id={`match-search-help${suffix}`} class="sr-only"
                         >Press Enter to search by server name.</span
                     >
                 </form>{/if}
-            <label for={`match-days${suffix}`}
-                >Date range<select
+            <Field forId={`match-days${suffix}`} label="Date range">
+                <Select
                     id={`match-days${suffix}`}
                     value={String(filters.days)}
                     onchange={(event) => update({ days: event.currentTarget.value })}
                     ><option value="0">All time</option><option value="7">Last 7 days</option
                     ><option value="30">Last 30 days</option><option value="90">Last 90 days</option
-                    ></select
-                ></label
+                    ></Select
+                ></Field
             >
-            <label for={`match-status${suffix}`}
-                >Status<select
+            <Field forId={`match-status${suffix}`} label="Status">
+                <Select
                     id={`match-status${suffix}`}
                     value={filters.status}
                     onchange={(event) => update({ status: event.currentTarget.value })}
@@ -196,28 +199,28 @@
                         >Completed</option
                     ><option value="active">In progress</option><option value="interrupted"
                         >Interrupted</option
-                    ></select
-                ></label
+                    ></Select
+                ></Field
             >
             {#if suffix}
-                <label for={`match-sort${suffix}`}
-                    >Sort by<select
+                <Field forId={`match-sort${suffix}`} label="Sort by">
+                    <Select
                         id={`match-sort${suffix}`}
                         value={filters.sort}
                         onchange={(event) => update({ sort: event.currentTarget.value })}
                         >{#each sorts as item}<option value={item.key}>{item.label}</option
-                            >{/each}</select
-                    ></label
+                            >{/each}</Select
+                    ></Field
                 >
-                <label for={`match-order${suffix}`}
-                    >Order<select
+                <Field forId={`match-order${suffix}`} label="Order">
+                    <Select
                         id={`match-order${suffix}`}
                         value={filters.direction}
                         onchange={(event) => update({ direction: event.currentTarget.value })}
                         ><option value="desc">Highest or newest first</option><option value="asc"
                             >Lowest or oldest first</option
-                        ></select
-                    ></label
+                        ></Select
+                    ></Field
                 >
             {/if}
         </div>
@@ -460,30 +463,19 @@
         flex-wrap: wrap;
         gap: var(--space-3);
     }
-    label,
     form {
         flex: 1;
         min-width: 145px;
     }
-    label {
-        display: flex;
+    .filters :global(.field) {
+        flex: 1;
+        min-width: 145px;
+    }
+
+    .filters :global(.field) {
         flex-direction: column;
-        gap: 6px;
-        color: var(--text-secondary);
-        font-size: var(--text-xs);
-    }
-    input,
-    select {
-        width: 100%;
-        min-height: 40px;
-        padding: 8px 10px;
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        font: inherit;
-        font-size: var(--text-sm);
     }
+
     summary {
         cursor: pointer;
         color: var(--text-secondary);
@@ -640,10 +632,12 @@
             display: grid;
             grid-template-columns: minmax(0, 1fr);
         }
-        .filters > label,
         .filters > form {
             min-width: 0;
         }
+        .filters > :global(.field) {
+            min-width: 0;
+        }
         .context {
             gap: var(--space-1) var(--space-2);
         }
diff --git a/src/lib/ui/components/NativeHostSelection.svelte b/src/lib/ui/components/NativeHostSelection.svelte
index 3adc94b..ec6ebe4 100644
--- a/src/lib/ui/components/NativeHostSelection.svelte
+++ b/src/lib/ui/components/NativeHostSelection.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { gameTitle } from '$ui/server-labels.js';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import type { Host, NativeDeploymentSelection } from '$lib/hosts.js';
@@ -148,36 +150,36 @@
 </script>
 
 {#snippet runtimeFields()}
-    <label
-        >{compact ? 'Runtime image' : 'Plutainer runtime image'}<input
+    <Field label={compact ? 'Runtime image' : 'Plutainer runtime image'}>
+        <Input
             required
             bind:value={selection.image}
             {disabled}
             oninput={() => onchange?.()}
-        /></label
+        /></Field
     >
     {#if compact}<p>Custom images must be prepared on a host before it can run this server.</p>{/if}
 {/snippet}
 
 {#snippet networkFields()}
-    <label
-        >Local bind address<input
+    <Field label="Local bind address">
+        <Input
             bind:value={selection.bindAddress}
             placeholder="Host default"
             {disabled}
             oninput={() => onchange?.()}
-        /></label
+        /></Field
     >
-    <label
-        >Public / NAT address<input
+    <Field label="Public / NAT address">
+        <Input
             bind:value={selection.publicAddress}
             placeholder="Host default"
             {disabled}
             oninput={() => onchange?.()}
-        /></label
+        /></Field
     >
-    <label
-        >Public / NAT port<input
+    <Field label="Public / NAT port">
+        <Input
             type="number"
             min="1"
             max="65535"
@@ -185,7 +187,7 @@
             placeholder="Same as local port"
             {disabled}
             oninput={() => onchange?.()}
-        /></label
+        /></Field
     >
     <p>Public mapping does not change the local Docker port reservation.</p>
 {/snippet}
@@ -317,21 +319,7 @@
         font-size: var(--text-sm);
         margin: 0;
     }
-    label {
-        display: grid;
-        gap: 7px;
-        font-size: var(--text-sm);
-    }
-    input {
-        width: 100%;
-        box-sizing: border-box;
-        padding: 11px;
-        color: var(--text-primary);
-        background: var(--surface);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        font: inherit;
-    }
+
     p {
         color: var(--text-secondary);
         font-size: var(--text-xs);
@@ -360,7 +348,8 @@
         cursor: pointer;
         font-size: var(--text-sm);
     }
-    details label {
+
+    details :global(.field) {
         margin-top: 14px;
     }
     details p {
diff --git a/src/lib/ui/components/OperationHistory.svelte b/src/lib/ui/components/OperationHistory.svelte
index 8836bcc..e51a162 100644
--- a/src/lib/ui/components/OperationHistory.svelte
+++ b/src/lib/ui/components/OperationHistory.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import type { ActivityEvent, OperationStep } from '$lib/operation-flow.js';
     import Button from './primitives/Button.svelte';
@@ -54,19 +57,19 @@
         >
         {#if events.length}
             <div class="tools">
-                <label
-                    >Search activity<input
+                <Field label="Search activity">
+                    <Input
                         type="search"
                         bind:value={query}
                         oninput={() => (limit = 25)}
                         placeholder="Server, stage, or message"
-                    /></label
-                ><label
-                    >Order<select bind:value={newestFirst}
+                    /></Field
+                ><Field label="Order">
+                    <Select bind:value={newestFirst}
                         ><option value={true}>Newest first</option><option value={false}
                             >Oldest first</option
-                        ></select
-                    ></label
+                        ></Select
+                    ></Field
                 >
             </div>
             <ol class="timeline">
@@ -133,25 +136,12 @@
         gap: 12px;
         margin-bottom: 20px;
     }
-    label {
-        display: grid;
-        gap: 6px;
-        font-size: var(--text-xs);
-        color: var(--text-secondary);
-    }
-    label:first-child {
+
+    .tools > :global(.field:first-child) {
         flex: 1;
         min-width: 180px;
     }
-    input,
-    select {
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        padding: 9px 12px;
-        border-radius: var(--radius-sm);
-        font: inherit;
-    }
+
     .time,
     .muted {
         color: var(--text-secondary);
diff --git a/src/lib/ui/components/PluginGithubImport.svelte b/src/lib/ui/components/PluginGithubImport.svelte
index 06a7d8e..fb5c760 100644
--- a/src/lib/ui/components/PluginGithubImport.svelte
+++ b/src/lib/ui/components/PluginGithubImport.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { timeFormat } from '$ui/stores/time-zone.js';
     import { onMount, onDestroy } from 'svelte';
     import { goto } from '$app/navigation';
@@ -184,9 +187,8 @@
             <p>Import a release below to track updates for this plugin.</p>
         {/if}
         <form onsubmit={preview} class="lookup">
-            <label
-                >Repository or release URL
-                <input
+            <Field label="Repository or release URL">
+                <Input
                     type="url"
                     bind:value={url}
                     oninput={() => {
@@ -197,7 +199,7 @@
                     placeholder="https://github.com/alicealys/t6-gsc-utils/releases/tag/v3.1.0"
                     disabled={busy || disabled}
                 />
-            </label>
+            </Field>
             <Button
                 type="submit"
                 loading={busy && !release}
@@ -228,29 +230,29 @@
                     </p>
                 {:else}
                     <div class="fields">
-                        <label
-                            >DLL asset<select bind:value={assetId} disabled={busy || disabled}>
+                        <Field label="DLL asset">
+                            <Select bind:value={assetId} disabled={busy || disabled}>
                                 <option value="" disabled>Choose a DLL…</option>
                                 {#each release.assets as asset}<option value={String(asset.id)}
                                         >{asset.name} · {(asset.size / 1024).toFixed(1)} KB</option
                                     >{/each}
-                            </select></label
+                            </Select></Field
                         >
                         {#if !pluginId}
-                            <label
-                                >Plugin name<input
+                            <Field label="Plugin name">
+                                <Input
                                     bind:value={name}
                                     disabled={busy}
                                     placeholder="t6-gsc-utils"
-                                /></label
+                                /></Field
                             >
-                            <label
-                                >Deploy scope<select bind:value={game} disabled={busy}
+                            <Field label="Deploy scope">
+                                <Select bind:value={game} disabled={busy}
                                     ><option value="">Unscoped — select servers in a beta</option
                                     ><option value="t5">Black Ops I</option><option value="t6"
                                         >Black Ops II</option
-                                    ></select
-                                ></label
+                                    ></Select
+                                ></Field
                             >
                         {/if}
                     </div>
@@ -334,30 +336,11 @@
         gap: var(--space-3);
         flex-wrap: wrap;
     }
-    .lookup label {
+
+    .lookup :global(.field) {
         flex: 1 1 300px;
     }
-    label {
-        display: grid;
-        gap: var(--space-2);
-        font-size: var(--text-sm);
-    }
-    input,
-    select {
-        width: 100%;
-        min-width: 0;
-        padding: 10px 12px;
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-strong);
-        border-radius: var(--radius-md);
-        color: var(--text-primary);
-        font: inherit;
-    }
-    input:focus-visible,
-    select:focus-visible {
-        outline: 2px solid var(--accent-primary);
-        outline-offset: 2px;
-    }
+
     .fields {
         display: grid;
         gap: var(--space-3);
@@ -404,8 +387,4 @@
         font: var(--text-xs) var(--font-mono);
         margin-top: var(--space-2);
     }
-    input:not([type='checkbox']):not([type='file']),
-    select {
-        border-color: var(--border-control);
-    }
 </style>
diff --git a/src/lib/ui/components/ProvisioningActivity.svelte b/src/lib/ui/components/ProvisioningActivity.svelte
index 1e610d2..37fb350 100644
--- a/src/lib/ui/components/ProvisioningActivity.svelte
+++ b/src/lib/ui/components/ProvisioningActivity.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { timestampISO } from '$lib/time-zone.js';
     import { timeFormat } from '$ui/stores/time-zone.js';
     import { onDestroy } from 'svelte';
@@ -125,23 +128,23 @@
                     void load();
                 }}
             >
-                <label class="search"
-                    >Search activity<input
+                <Field class="search" label="Search activity">
+                    <Input
                         type="search"
                         bind:value={query}
                         placeholder="Find a stage or message"
-                    /></label
+                    /></Field
                 >
-                <label
-                    >Order<select
+                <Field label="Order">
+                    <Select
                         bind:value={order}
                         onchange={() => {
                             void load();
                         }}
                         ><option value="newest">Newest first</option><option value="oldest"
                             >Oldest first</option
-                        ></select
-                    ></label
+                        ></Select
+                    ></Field
                 >
                 <Button type="submit" disabled={loading}>Search</Button>
             </form>
@@ -270,31 +273,11 @@
         align-items: end;
         gap: var(--space-3);
     }
-    .tools label {
-        display: grid;
-        gap: var(--space-2);
-        font-size: var(--text-xs);
-        color: var(--text-secondary);
-    }
-    .search {
+
+    .tools :global(.search) {
         flex: 1 1 160px;
     }
-    input,
-    select {
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        padding: 10px;
-        font: inherit;
-        min-height: 40px;
-        width: 100%;
-    }
-    input:focus-visible,
-    select:focus-visible {
-        outline: 2px solid var(--border-focus);
-        outline-offset: 2px;
-    }
+
     .new-events {
         display: flex;
         align-items: center;
@@ -333,7 +316,7 @@
         .tools {
             align-items: stretch;
         }
-        .tools .search {
+        .tools :global(.search) {
             flex-basis: 100%;
         }
     }
diff --git a/src/lib/ui/components/RetentionTools.svelte b/src/lib/ui/components/RetentionTools.svelte
index 200c2d5..62ef49f 100644
--- a/src/lib/ui/components/RetentionTools.svelte
+++ b/src/lib/ui/components/RetentionTools.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import type { FleetSettings } from '$lib/fleet-settings.js';
     let { settings }: { settings: FleetSettings } = $props();
     import Button from './primitives/Button.svelte';
@@ -141,12 +144,14 @@
         retry requests for that campaign; unfinished recovery still prevents cleanup.
     </p>
     <div class="record">
-        <label
-            >Category<select bind:value={category}
-                >{#each categories as value}<option {value}>{value}</option>{/each}</select
-            ></label
+        <Field label="Category">
+            <Select bind:value={category}
+                >{#each categories as value}<option {value}>{value}</option>{/each}</Select
+            ></Field
+        >
+        <Field label="Record ID">
+            <Input bind:value={recordId} maxlength={200} /></Field
         >
-        <label>Record ID<input bind:value={recordId} maxlength="200" /></label>
         <Button disabled={busy || !recordId} onclick={() => control({ protected: true })}
             >Protect record</Button
         >
@@ -179,19 +184,7 @@
     code {
         overflow-wrap: anywhere;
     }
-    label {
-        display: grid;
-        gap: 8px;
-    }
-    select,
-    input {
-        font: inherit;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        padding: 8px;
-    }
+
     .table-wrap {
         overflow-x: auto;
         margin: 16px 0;
diff --git a/src/lib/ui/components/ScriptUploadDrawer.svelte b/src/lib/ui/components/ScriptUploadDrawer.svelte
index b3298d0..4e056ca 100644
--- a/src/lib/ui/components/ScriptUploadDrawer.svelte
+++ b/src/lib/ui/components/ScriptUploadDrawer.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { goto } from '$app/navigation';
     import { tick } from 'svelte';
     import { plural } from '$ui/plural.js';
@@ -306,8 +309,8 @@
                             <a href="/scripts/{item.result.scriptId}">View script →</a>
                         </p>
                     {:else}
-                        <label
-                            >Destination<select
+                        <Field label="Destination">
+                            <Select
                                 bind:value={item.target}
                                 disabled={busy || item.inspecting}
                                 onchange={() => (item.error = '')}
@@ -320,10 +323,10 @@
                                             ? ' · beta active'
                                             : ''}</option
                                     >{/each}
-                            </select></label
+                            </Select></Field
                         >
-                        {#if item.target === 'new'}<label
-                                >Script name<input bind:value={item.name} disabled={busy} /></label
+                        {#if item.target === 'new'}<Field label="Script name">
+                                <Input bind:value={item.name} disabled={busy} /></Field
                             >
                         {:else if item.target !== ''}{@const s = scripts.find(
                                 (s) => s.id === item.target
@@ -362,8 +365,8 @@
                     ></textarea></label
                 >
                 {#if hasNew}
-                    <label
-                        >Scope for new scripts<select
+                    <Field label="Scope for new scripts">
+                        <Select
                             bind:value={scopeType}
                             disabled={busy}
                             onchange={() => {
@@ -372,28 +375,28 @@
                             }}
                             ><option value="none">Unscoped · choose beta targets</option><option
                                 value="game">Game</option
-                            ><option value="map">Map</option></select
-                        ></label
+                            ><option value="map">Map</option></Select
+                        ></Field
                     >
                     {#if scopeType !== 'none'}
-                        <label
-                            >Game<select
+                        <Field label="Game">
+                            <Select
                                 bind:value={scopeGame}
                                 disabled={busy || !scopeLoaded}
                                 onchange={() => (scopeMap = '')}
                                 ><option value="">Choose a game…</option
                                 >{#each scopeOptions.games as g}<option value={g}
                                         >{gameTitle(g)}</option
-                                    >{/each}</select
-                            ></label
+                                    >{/each}</Select
+                            ></Field
                         >
-                        {#if scopeType === 'map'}<label
-                                >Map<select bind:value={scopeMap} disabled={busy || !scopeGame}
+                        {#if scopeType === 'map'}<Field label="Map">
+                                <Select bind:value={scopeMap} disabled={busy || !scopeGame}
                                     ><option value="">Choose a map…</option
                                     >{#each scopeOptions.mapsByGame[scopeGame] ?? [] as m}<option
                                             value={m}>{mapLabel(m)}</option
-                                        >{/each}</select
-                                ></label
+                                        >{/each}</Select
+                                ></Field
                             >{/if}
                         {#if scopeValue}<p class="note">
                                 {matches.length} matching servers: {matches
@@ -548,7 +551,6 @@
         color: var(--text-secondary);
     }
     input,
-    select,
     textarea {
         box-sizing: border-box;
         width: 100%;
@@ -565,7 +567,6 @@
         resize: vertical;
     }
     input:focus-visible,
-    select:focus-visible,
     textarea:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: 2px;
@@ -622,7 +623,6 @@
         }
     }
     input:not([type='checkbox']):not([type='file']),
-    select,
     textarea {
         border-color: var(--border-control);
     }
diff --git a/src/lib/ui/components/SettingsEditor.svelte b/src/lib/ui/components/SettingsEditor.svelte
index 9571ca8..db04521 100644
--- a/src/lib/ui/components/SettingsEditor.svelte
+++ b/src/lib/ui/components/SettingsEditor.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
     import { untrack } from 'svelte';
     import { beforeNavigate, goto } from '$app/navigation';
     import { confirmAction } from '$ui/confirm.js';
@@ -155,18 +158,18 @@
 <svelte:window onbeforeunload={beforeUnload} />
 <div class="settings-layout">
     <aside class="section-rail">
-        <label class="search-label" for="settings-search">Find a setting</label>
-        <input
-            id="settings-search"
-            type="search"
-            placeholder="Search settings"
-            bind:value={query}
-            disabled={saving}
-            oninput={() => (reviewInvalid = false)}
-        />
-        <label class="mobile-section"
-            >Section
-            <select
+        <Field label="Find a setting" forId="settings-search">
+            <Input
+                id="settings-search"
+                type="search"
+                placeholder="Search settings"
+                bind:value={query}
+                disabled={saving}
+                oninput={() => (reviewInvalid = false)}
+            /></Field
+        >
+        <Field class="mobile-section" label="Section">
+            <Select
                 aria-label="Settings section"
                 value={selectedGroup}
                 disabled={saving}
@@ -177,8 +180,8 @@
                             ? ` · ${changed.filter((key) => group.keys.includes(key)).length} changed`
                             : ''}</option
                     >{/each}
-            </select>
-        </label>
+            </Select>
+        </Field>
         <nav class="group-links" aria-label="Settings sections">
             {#each settingsGroups as group}
                 {@const count = changed.filter((key) => group.keys.includes(key)).length}
@@ -263,30 +266,37 @@
                                             >
                                             <td class="value-cell">
                                                 <div class="numeric-value">
-                                                    {#if unlimited}<input
-                                                            id={`setting-${key}`}
-                                                            type="number"
-                                                            disabled
-                                                            placeholder="—"
-                                                            aria-describedby={`setting-${key}-help setting-${key}-default`}
-                                                        />
-                                                    {:else}<input
-                                                            id={`setting-${key}`}
-                                                            type="number"
-                                                            min={Math.max(1, settingMinimum(key))}
-                                                            max={key.endsWith('Days')
-                                                                ? 36500
-                                                                : undefined}
-                                                            step="1"
-                                                            required
-                                                            bind:value={draft[key]}
-                                                            aria-invalid={!!validation}
-                                                            aria-describedby={`setting-${key}-help setting-${key}-default${validation ? ` setting-${key}-error` : ''}`}
-                                                            oninput={() => {
-                                                                error = '';
-                                                                notice = '';
-                                                            }}
-                                                        />{/if}
+                                                    {#if unlimited}<Field
+                                                            ><Input
+                                                                id={`setting-${key}`}
+                                                                type="number"
+                                                                disabled
+                                                                placeholder="—"
+                                                                aria-describedby={`setting-${key}-help setting-${key}-default`}
+                                                            /></Field
+                                                        >
+                                                    {:else}<Field
+                                                            ><Input
+                                                                id={`setting-${key}`}
+                                                                type="number"
+                                                                min={Math.max(
+                                                                    1,
+                                                                    settingMinimum(key)
+                                                                )}
+                                                                max={key.endsWith('Days')
+                                                                    ? 36500
+                                                                    : undefined}
+                                                                step="1"
+                                                                required
+                                                                bind:value={draft[key]}
+                                                                aria-invalid={!!validation}
+                                                                aria-describedby={`setting-${key}-help setting-${key}-default${validation ? ` setting-${key}-error` : ''}`}
+                                                                oninput={() => {
+                                                                    error = '';
+                                                                    notice = '';
+                                                                }}
+                                                            /></Field
+                                                        >{/if}
                                                     <span class="unit">{settingUnit(key)}</span>
                                                 </div>
                                                 {#if zeroMode}<label
@@ -393,13 +403,7 @@
         gap: var(--space-2);
         min-width: 0;
     }
-    .search-label {
-        font-size: var(--text-sm);
-        color: var(--text-secondary);
-    }
-    #settings-search {
-        width: 100%;
-    }
+
     .group-links {
         display: grid;
         gap: var(--space-1);
@@ -521,17 +525,15 @@
         flex-wrap: wrap;
         gap: var(--space-1);
     }
-    .numeric-value input {
-        width: 88px;
-        min-height: 32px;
-        padding: 5px var(--space-2);
-        font-family: var(--font-numeric);
-        font-variant-numeric: tabular-nums;
-    }
+
     input:disabled {
         color: var(--text-tertiary);
         opacity: 0.75;
     }
+    .numeric-value > :global(.field) {
+        width: 100px;
+        flex: 0 0 auto;
+    }
     .unit {
         color: var(--text-secondary);
         font-size: var(--text-xs);
@@ -646,7 +648,7 @@
     .notice {
         color: var(--state-online);
     }
-    .mobile-section,
+    .section-rail :global(.mobile-section),
     .mobile-label {
         display: none;
     }
@@ -680,7 +682,7 @@
         .group-links {
             display: none;
         }
-        .mobile-section {
+        .section-rail :global(.mobile-section) {
             display: grid;
             grid-template-columns: auto minmax(0, 1fr);
             align-items: center;
@@ -688,9 +690,6 @@
             font-size: var(--text-sm);
             color: var(--text-secondary);
         }
-        .mobile-section select {
-            width: 100%;
-        }
         .table-wrap {
             overflow: visible;
         }
diff --git a/src/lib/ui/components/capacity/RebalancePanel.svelte b/src/lib/ui/components/capacity/RebalancePanel.svelte
index fed8b03..3541108 100644
--- a/src/lib/ui/components/capacity/RebalancePanel.svelte
+++ b/src/lib/ui/components/capacity/RebalancePanel.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { onMount, untrack } from 'svelte';
     import type {
         RebalancePreview,
@@ -254,15 +257,15 @@
                         {/each}
                     </div>
                     <div class="settings">
-                        <label
-                            >Game<select bind:value={game} onchange={editSettings}
+                        <Field label="Game">
+                            <Select bind:value={game} onchange={editSettings}
                                 ><option value="all">All games</option><option value="t5"
                                     >Black Ops I</option
-                                ><option value="t6">Black Ops II</option></select
-                            ></label
+                                ><option value="t6">Black Ops II</option></Select
+                            ></Field
                         >
-                        <label
-                            >Maximum moves<input
+                        <Field class="max-moves" label="Maximum moves">
+                            <Input
                                 type="number"
                                 min="1"
                                 max="20"
@@ -270,7 +273,7 @@
                                 required
                                 bind:value={maxMoves}
                                 oninput={editSettings}
-                            /></label
+                            /></Field
                         >
                         <Button
                             type="submit"
@@ -301,16 +304,20 @@
         <section class="runs" aria-labelledby="rebalance-runs-title">
             <div class="heading">
                 <h3 id="rebalance-runs-title">Rebalance runs</h3>
-                {#if report.runs.length}<label class="run-picker"
-                        ><span class="sr-only">Select rebalance run</span><select
+                {#if report.runs.length}<Field
+                        class="run-picker"
+                        hiddenLabel
+                        label="Select rebalance run"
+                    >
+                        <Select
                             value={run?.id ?? ''}
                             onchange={(event) => (selectedRun = event.currentTarget.value)}
                             >{#each report.runs as item (item.id)}<option value={item.id}
                                     >{$timeFormat.dateTime(item.createdAt)} · {rebalanceRunLabels[
                                         item.state
                                     ]}</option
-                                >{/each}</select
-                        ></label
+                                >{/each}</Select
+                        ></Field
                     >{/if}
             </div>
             {#if preferredRun && !report.runs.some((item) => item.id === preferredRun)}<p
@@ -422,37 +429,18 @@
         opacity: 0.65;
         cursor: default;
     }
+    .settings > :global(.max-moves) {
+        width: 110px;
+    }
     .settings {
         justify-content: flex-start;
         align-items: end;
     }
-    .settings label {
-        display: grid;
-        gap: 8px;
-        font-size: var(--text-xs);
-    }
-    .settings input {
-        width: 110px;
-    }
-    select,
-    input[type='number'] {
-        box-sizing: border-box;
-        padding: 9px 12px;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        font: var(--text-sm) var(--font-body);
-        min-width: 0;
-    }
-    input:disabled,
-    select:disabled {
+
+    input:disabled {
         opacity: 0.6;
     }
-    .run-picker {
-        max-width: 100%;
-    }
-    .run-picker select {
+    .heading :global(.run-picker) {
         max-width: 100%;
     }
     .runs {
@@ -490,19 +478,11 @@
         text-decoration: underline;
     }
     button:focus-visible,
-    input:focus-visible,
-    select:focus-visible {
+    input:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: 3px;
     }
-    .sr-only {
-        position: absolute;
-        width: 1px;
-        height: 1px;
-        overflow: hidden;
-        clip-path: inset(50%);
-        white-space: nowrap;
-    }
+
     @media (max-width: 600px) {
         .panel {
             padding: 16px;
diff --git a/src/lib/ui/components/primitives/Field.svelte b/src/lib/ui/components/primitives/Field.svelte
index edda4a4..a73593c 100644
--- a/src/lib/ui/components/primitives/Field.svelte
+++ b/src/lib/ui/components/primitives/Field.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
     import { setContext, type Snippet } from 'svelte';
+    import type { HTMLAttributes } from 'svelte/elements';
     import { fieldContext, type FieldContext } from '../../field-context.js';
 
-    interface Props {
-        label?: string;
+    interface Props extends Omit<HTMLAttributes<HTMLDivElement>, 'children'> {
+        label?: string | Snippet;
+        hiddenLabel?: boolean;
         hint?: string | null;
         error?: string | null;
         required?: boolean;
@@ -11,11 +13,21 @@
         children?: Snippet;
     }
 
-    let { label, hint = null, error = null, required = false, forId, children }: Props = $props();
+    let {
+        label,
+        hiddenLabel = false,
+        hint = null,
+        error = null,
+        required = false,
+        forId,
+        children,
+        class: className,
+        ...attributes
+    }: Props = $props();
     const id = $props.id();
     setContext<FieldContext>(fieldContext, {
         get labelId() {
-            return `${id}-label`;
+            return label ? `${id}-label` : undefined;
         },
         get messageId() {
             return error || hint ? `${id}-message` : undefined;
@@ -42,10 +54,15 @@
     }
 </script>
 
-<div class="field" use:connectLabel>
+<div {...attributes} class={['field', className]} use:connectLabel>
     {#if label}
-        <label class="label" id={`${id}-label`} for={forId ?? `${id}-control`}>
-            {label}
+        <label
+            class="label"
+            class:sr-only={hiddenLabel}
+            id={`${id}-label`}
+            for={forId ?? `${id}-control`}
+        >
+            {#if typeof label === 'string'}{label}{:else}{@render label()}{/if}
             {#if required}<span class="req" aria-hidden="true">*</span>{/if}
         </label>
     {/if}
@@ -60,6 +77,17 @@
 </div>
 
 <style>
+    .sr-only {
+        position: absolute;
+        width: 1px;
+        height: 1px;
+        padding: 0;
+        margin: -1px;
+        overflow: hidden;
+        clip-path: inset(50%);
+        white-space: nowrap;
+        border: 0;
+    }
     .field {
         display: flex;
         flex-direction: column;
diff --git a/src/lib/ui/components/primitives/Input.svelte b/src/lib/ui/components/primitives/Input.svelte
index a6698b5..ad72082 100644
--- a/src/lib/ui/components/primitives/Input.svelte
+++ b/src/lib/ui/components/primitives/Input.svelte
@@ -1,61 +1,54 @@
-<script lang="ts">
+<script lang="ts" generics="Value extends string | number | undefined = string">
     import { getContext } from 'svelte';
+    import type { HTMLInputAttributes } from 'svelte/elements';
     import { fieldContext, type FieldContext } from '../../field-context.js';
     const field = getContext<FieldContext | undefined>(fieldContext);
-    interface Props {
-        value?: string;
-        type?: 'text' | 'search' | 'email' | 'number' | 'url' | 'password' | 'file';
-        placeholder?: string;
-        id?: string;
-        name?: string;
-        required?: boolean;
-        disabled?: boolean;
-        readonly?: boolean;
-        autocomplete?: import('svelte/elements').FullAutoFill;
+
+    interface Props extends Omit<HTMLInputAttributes, 'value' | 'type'> {
+        value?: Value;
+        type?:
+            | 'text'
+            | 'search'
+            | 'email'
+            | 'number'
+            | 'url'
+            | 'password'
+            | 'file'
+            | 'tel'
+            | 'time'
+            | 'date'
+            | 'datetime-local'
+            | 'month'
+            | 'week';
         mono?: boolean;
-        onchange?: (e: Event) => void;
-        oninput?: (e: Event) => void;
-        accept?: string;
         ariaLabel?: string;
+        element?: HTMLInputElement;
     }
 
     let {
-        value = $bindable(''),
+        value = $bindable(),
+        element = $bindable(),
         type = 'text',
-        placeholder,
-        id,
-        name,
-        required = false,
-        disabled = false,
-        readonly = false,
-        autocomplete,
         mono = false,
-        onchange,
-        oninput,
-        accept,
-        ariaLabel
+        ariaLabel,
+        class: className,
+        ...attributes
     }: Props = $props();
 </script>
 
 <input
-    class="input"
-    class:mono
+    {...attributes}
+    class={['input', className, { mono }]}
     {type}
-    {id}
-    {name}
-    {placeholder}
-    {required}
-    {disabled}
-    {readonly}
-    {autocomplete}
-    {accept}
-    aria-label={ariaLabel}
-    aria-labelledby={ariaLabel ? undefined : field?.labelId}
-    aria-describedby={field?.messageId}
-    aria-invalid={field?.invalid || undefined}
+    aria-label={ariaLabel ?? attributes['aria-label']}
+    aria-labelledby={attributes['aria-labelledby'] ??
+        (ariaLabel || attributes['aria-label'] ? undefined : field?.labelId)}
+    aria-describedby={[attributes['aria-describedby'], field?.messageId]
+        .filter(Boolean)
+        .join(' ') || undefined}
+    aria-invalid={attributes['aria-invalid'] ?? (field?.invalid || undefined)}
+    bind:this={element}
     bind:value
-    {onchange}
-    {oninput}
 />
 
 <style>
diff --git a/src/lib/ui/components/primitives/Select.svelte b/src/lib/ui/components/primitives/Select.svelte
index ae3fd7c..817fd51 100644
--- a/src/lib/ui/components/primitives/Select.svelte
+++ b/src/lib/ui/components/primitives/Select.svelte
@@ -1,51 +1,48 @@
-<script lang="ts">
-    import { getContext } from 'svelte';
+<script lang="ts" generics="Value = string">
+    import { getContext, type Snippet } from 'svelte';
+    import type { HTMLSelectAttributes } from 'svelte/elements';
     import { fieldContext, type FieldContext } from '../../field-context.js';
     const field = getContext<FieldContext | undefined>(fieldContext);
     interface Option {
-        value: string;
+        value: Value;
         label: string;
         disabled?: boolean;
     }
 
-    interface Props {
-        value?: string;
-        options: Option[];
-        id?: string;
-        name?: string;
-        required?: boolean;
-        disabled?: boolean;
+    interface Props extends Omit<HTMLSelectAttributes, 'value' | 'children' | 'multiple'> {
+        value?: Value;
+        options?: Option[];
+        children?: Snippet;
         placeholder?: string;
-        onchange?: (e: Event) => void;
         ariaLabel?: string;
+        element?: HTMLSelectElement;
     }
 
     let {
-        value = $bindable(''),
-        options,
-        id,
-        name,
-        required = false,
-        disabled = false,
+        value = $bindable(),
+        element = $bindable(),
+        options = [],
+        children,
         placeholder,
-        onchange,
-        ariaLabel
+        ariaLabel,
+        class: className,
+        ...attributes
     }: Props = $props();
 </script>
 
 <div class="wrap">
     <select
-        class="select"
-        {id}
-        {name}
-        {required}
-        {disabled}
-        aria-label={ariaLabel}
-        aria-labelledby={ariaLabel ? undefined : field?.labelId}
-        aria-describedby={field?.messageId}
-        aria-invalid={field?.invalid || undefined}
+        {...attributes}
+        class={['select', className]}
+        aria-label={ariaLabel ?? attributes['aria-label']}
+        aria-labelledby={attributes['aria-labelledby'] ??
+            (ariaLabel || attributes['aria-label'] ? undefined : field?.labelId)}
+        aria-describedby={[attributes['aria-describedby'], field?.messageId]
+            .filter(Boolean)
+            .join(' ') || undefined}
+        aria-invalid={attributes['aria-invalid'] ?? (field?.invalid || undefined)}
+        bind:this={element}
         bind:value
-        {onchange}
     >
         {#if placeholder}
             <option value="" disabled>{placeholder}</option>
@@ -53,6 +50,7 @@
         {#each options as o (o.value)}
             <option value={o.value} disabled={o.disabled}>{o.label}</option>
         {/each}
+        {@render children?.()}
     </select>
     <span class="chev" aria-hidden="true">▾</span>
 </div>
diff --git a/src/lib/ui/field-context.ts b/src/lib/ui/field-context.ts
index 4267318..518c9ac 100644
--- a/src/lib/ui/field-context.ts
+++ b/src/lib/ui/field-context.ts
@@ -1,6 +1,6 @@
 export const fieldContext = Symbol('field');
 export interface FieldContext {
-    readonly labelId: string;
+    readonly labelId: string | undefined;
     readonly messageId: string | undefined;
     readonly invalid: boolean;
 }
diff --git a/src/lib/ui/library.css b/src/lib/ui/library.css
index 52e62d8..da2b1e8 100644
--- a/src/lib/ui/library.css
+++ b/src/lib/ui/library.css
@@ -8,20 +8,8 @@
     flex: 1 1 260px;
     min-width: 0;
 }
-.library-toolbar input,
-.library-toolbar select {
-    box-sizing: border-box;
-    width: 100%;
-    min-height: 40px;
-    padding: 9px 12px;
-    border: 1px solid var(--border-control);
-    border-radius: var(--radius-sm);
-    background: var(--surface-sunken);
-    color: var(--text-primary);
-    font: var(--text-sm) var(--font-body);
-}
-.library-toolbar > select {
-    width: auto;
+.library-toolbar > .field:not(.search) {
+    flex: 0 1 auto;
 }
 .library-table {
     overflow-x: auto;
@@ -93,8 +81,7 @@
     outline-offset: 3px;
 }
 @media (max-width: 640px) {
-    .library-toolbar > select,
-    .library-toolbar > label {
+    .library-toolbar > .field:not(.search) {
         flex: 1 1 140px;
     }
     .library-toolbar .search {
diff --git a/src/lib/ui/styles/components.css b/src/lib/ui/styles/components.css
index 751d785..d9263b3 100644
--- a/src/lib/ui/styles/components.css
+++ b/src/lib/ui/styles/components.css
@@ -47,11 +47,10 @@ dialog::backdrop {
     align-items: center;
     gap: var(--space-3);
 }
-.ui-toolbar .search,
-.ui-toolbar > input[type='search'] {
+.ui-toolbar > .search {
     flex: 1 1 240px;
 }
-.ui-toolbar select {
+.ui-toolbar > .field:not(.search) {
     flex: 0 1 auto;
 }
 .ui-summary {
@@ -114,12 +113,11 @@ dialog::backdrop {
     white-space: nowrap;
 }
 @media (max-width: 600px) {
-    .ui-toolbar .search,
-    .ui-toolbar > input[type='search'] {
+    .ui-toolbar > .search {
         flex-basis: 100%;
         width: 100%;
     }
-    .ui-toolbar select {
+    .ui-toolbar > .field:not(.search) {
         flex: 1 1 130px;
     }
     .ui-sticky-actions {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index b4c45d7..fe20af4 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,4 +1,7 @@
 <script module lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     const serverTitleCollator = new Intl.Collator(undefined, { numeric: true });
 </script>
 
@@ -443,12 +446,8 @@
         {/if}
         <div class="toolbar">
             <div class="search-row">
-                <label class="search"
-                    ><span class="sr-only">Search servers, maps, or players</span><input
-                        type="search"
-                        bind:value={query}
-                        placeholder="Search fleet…"
-                    /></label
+                <Field class="search" hiddenLabel label="Search servers, maps, or players">
+                    <Input type="search" bind:value={query} placeholder="Search fleet…" /></Field
                 >
                 <button
                     class="control"
@@ -459,27 +458,27 @@
                 >
             </div>
             {#if viewOptionsOpen}<div id="fleet-view-options" class="view-options">
-                    <label
-                        >Game<select bind:value={game}
+                    <Field label="Game">
+                        <Select bind:value={game}
                             ><option value="">All games</option><option value="t5"
                                 >Black Ops I</option
-                            ><option value="t6">Black Ops II</option></select
-                        ></label
+                            ><option value="t6">Black Ops II</option></Select
+                        ></Field
                     >
-                    <label
-                        >Group by<select bind:value={grouping}
+                    <Field label="Group by">
+                        <Select bind:value={grouping}
                             ><option value="none">None</option><option value="map">Map</option
-                            ><option value="game">Game</option></select
-                        ></label
+                            ><option value="game">Game</option></Select
+                        ></Field
                     >
-                    <label
-                        >Sort by<select bind:value={sort}
+                    <Field label="Sort by">
+                        <Select bind:value={sort}
                             ><option value="duration">Longest match</option><option value="players"
                                 >Most players</option
                             ><option value="round">Highest round</option><option value="name"
                                 >Lobby name</option
-                            ></select
-                        ></label
+                            ></Select
+                        ></Field
                     >
                     <div class="view-toggle" role="group" aria-label="Display mode">
                         <button
@@ -698,8 +697,7 @@
         font-size: var(--text-xs);
     }
     button,
-    input,
-    select {
+    input {
         font: inherit;
     }
     button {
@@ -750,15 +748,11 @@
         gap: var(--space-3);
         align-items: center;
     }
-    .search {
+    .search-row :global(.search) {
         flex: 1;
         min-width: 0;
     }
-    .search input {
-        width: 100%;
-    }
-    input,
-    select {
+    input {
         color: var(--text-primary);
         background: var(--surface-sunken);
         border: 1px solid var(--border-control);
@@ -790,12 +784,9 @@
         background: var(--surface);
         border-radius: var(--radius-md);
     }
-    .view-options label {
-        display: grid;
-        gap: var(--space-2);
+
+    .view-options :global(.field) {
         flex: 1 1 130px;
-        color: var(--text-secondary);
-        font-size: var(--text-xs);
     }
     .chips,
     .view-toggle {
diff --git a/src/routes/account/+page.svelte b/src/routes/account/+page.svelte
index 46aafc0..c54dce6 100644
--- a/src/routes/account/+page.svelte
+++ b/src/routes/account/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
     import { onMount } from 'svelte';
     import { timeFormat, timeZone, timeZonePersistenceError } from '$ui/stores/time-zone.js';
     import { availableTimeZones, DEFAULT_TIME_ZONE } from '$lib/time-zone.js';
@@ -105,53 +108,57 @@
                 </p>{/if}
             <form onsubmit={changePassword} aria-busy={busy}>
                 <fieldset disabled={busy || signingOut}>
-                    <input
-                        type="text"
-                        class="password-username"
-                        value={user.username}
-                        autocomplete="username"
-                        aria-label="Username"
-                        readonly
-                        tabindex="-1"
-                    />
-                    <label for="current-password"
-                        >{user.mustChangePassword ? 'Temporary password' : 'Current password'}<input
+                    <Field label="Username" hiddenLabel class="password-username"
+                        ><Input
+                            type="text"
+                            value={user.username}
+                            autocomplete="username"
+                            aria-label="Username"
+                            readonly
+                            tabindex={-1}
+                        /></Field
+                    >
+                    <Field
+                        forId="current-password"
+                        label={user.mustChangePassword ? 'Temporary password' : 'Current password'}
+                    >
+                        <Input
                             id="current-password"
                             name="currentPassword"
                             type="password"
                             autocomplete="current-password"
                             required
-                            maxlength="128"
+                            maxlength={128}
                             bind:value={currentPassword}
-                        /></label
+                        /></Field
                     >
-                    <label for="new-password"
-                        >New password<input
+                    <Field forId="new-password" label="New password">
+                        <Input
                             id="new-password"
                             name="newPassword"
                             type="password"
                             autocomplete="new-password"
                             required
-                            minlength="8"
-                            maxlength="128"
+                            minlength={8}
+                            maxlength={128}
                             bind:value={newPassword}
                             aria-describedby="new-password-help"
-                        /></label
+                        /></Field
                     >
                     <p id="new-password-help" class="hint">
                         Use 8–128 characters and a password you do not use elsewhere.
                     </p>
-                    <label for="confirm-password"
-                        >Confirm new password<input
+                    <Field forId="confirm-password" label="Confirm new password">
+                        <Input
                             id="confirm-password"
                             name="confirmPassword"
                             type="password"
                             autocomplete="new-password"
                             required
-                            minlength="8"
-                            maxlength="128"
+                            minlength={8}
+                            maxlength={128}
                             bind:value={confirmPassword}
-                        /></label
+                        /></Field
                     >
                     <div>
                         <Button
@@ -169,16 +176,15 @@
         </section>
         <section class="panel" aria-labelledby="display-heading">
             <h2 id="display-heading">Display preferences</h2>
-            <label class="timezone"
-                >Timezone
-                <select bind:value={$timeZone} aria-describedby="timezone-help">
+            <Field class="timezone" label="Timezone">
+                <Select bind:value={$timeZone} aria-describedby="timezone-help">
                     {#each zones as zone}<option value={zone}
                             >{zone.replaceAll('_', ' ')}{zone === DEFAULT_TIME_ZONE
                                 ? ' (default)'
                                 : ''}</option
                         >{/each}
-                </select>
-            </label>
+                </Select>
+            </Field>
             <p id="timezone-help">
                 Dates and times throughout the app use this timezone, including daylight saving
                 changes. Saved automatically in this browser.
@@ -193,23 +199,14 @@
 </section>
 
 <style>
-    .timezone {
+    .panel :global(.timezone) {
         display: grid;
         gap: 8px;
         margin-top: 16px;
         font-size: var(--text-sm);
         max-width: 420px;
     }
-    .timezone select {
-        width: 100%;
-        padding: 10px 12px;
-        font: inherit;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-    }
-    .timezone ~ p {
+    .panel :global(.timezone ~ p) {
         font-size: var(--text-sm);
         color: var(--text-secondary);
     }
@@ -263,21 +260,8 @@
         gap: 18px;
         min-width: 0;
     }
-    label {
-        display: grid;
-        gap: 8px;
-        font-size: var(--text-sm);
-    }
-    input {
-        width: 100%;
-        padding: 12px;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        font: inherit;
-    }
-    .password-username {
+
+    .panel :global(.password-username) {
         position: absolute;
         width: 1px;
         height: 1px;
diff --git a/src/routes/autoscaling/+page.svelte b/src/routes/autoscaling/+page.svelte
index d5dd58a..6080ce5 100644
--- a/src/routes/autoscaling/+page.svelte
+++ b/src/routes/autoscaling/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { onMount } from 'svelte';
     import { page } from '$app/state';
     import { confirmAction } from '$ui/confirm.js';
@@ -215,8 +218,8 @@
             >
                 <fieldset disabled={busy}>
                     <div class="fields">
-                        <label
-                            >Game<select
+                        <Field label="Game">
+                            <Select
                                 bind:value={settings.game}
                                 disabled={!!editing}
                                 onchange={() => {
@@ -225,60 +228,60 @@
                                 }}
                                 ><option value="t5">Black Ops I</option><option value="t6"
                                     >Black Ops II</option
-                                ></select
-                            ></label
+                                ></Select
+                            ></Field
                         >
-                        <label
-                            >Scope<select bind:value={settings.mapSlug} disabled={!!editing}
+                        <Field label="Scope">
+                            <Select bind:value={settings.mapSlug} disabled={!!editing}
                                 ><option value="*">Every map in this game</option
                                 >{#each zombieMaps(settings.game) as map}<option value={map.slug}
                                         >{map.friendly}</option
-                                    >{/each}</select
-                            ></label
+                                    >{/each}</Select
+                            ></Field
                         >
-                        <label
-                            >Autoscaling<select bind:value={settings.mode}
+                        <Field label="Autoscaling">
+                            <Select bind:value={settings.mode}
                                 ><option value="off">Off</option
                                 >{#if report.removalAvailable}<option value="create-destroy"
                                         >On</option
-                                    >{/if}</select
-                            ></label
+                                    >{/if}</Select
+                            ></Field
                         >
-                        <label
-                            >Minimum running lobbies<input
+                        <Field label="Minimum running lobbies">
+                            <Input
                                 type="number"
                                 min="1"
                                 max="20"
                                 required
                                 bind:value={settings.minimum}
-                            /></label
+                            /></Field
                         >
-                        <label
-                            >Maximum lobbies<input
+                        <Field label="Maximum lobbies">
+                            <Input
                                 type="number"
                                 min="1"
                                 max="20"
                                 required
                                 bind:value={settings.maximum}
-                            /></label
+                            /></Field
                         >
-                        <label
-                            >Empty spare target<input
+                        <Field label="Empty spare target">
+                            <Input
                                 type="number"
                                 min="1"
                                 max="20"
                                 required
                                 bind:value={settings.spares}
-                            /></label
+                            /></Field
                         >
-                        <label
-                            >Empty duration in minutes<input
+                        <Field label="Empty duration in minutes">
+                            <Input
                                 type="number"
                                 min="1"
                                 max="1440"
                                 required
                                 bind:value={settings.emptyMinutes}
-                            /></label
+                            /></Field
                         >
                     </div>
                     {#if settings.mapSlug === '*'}<p>
@@ -356,22 +359,7 @@
         gap: 16px;
         margin-bottom: 20px;
     }
-    label {
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-        font-size: var(--text-sm);
-    }
-    input,
-    select {
-        padding: 10px;
-        min-width: 0;
-        color: var(--text-primary);
-        background: var(--surface);
-        border: 1px solid var(--border-subtle);
-        border-radius: var(--radius-md);
-        font: inherit;
-    }
+
     fieldset {
         border: 0;
         padding: 0;
diff --git a/src/routes/betas/+page.svelte b/src/routes/betas/+page.svelte
index 9e53447..d6b456f 100644
--- a/src/routes/betas/+page.svelte
+++ b/src/routes/betas/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { page } from '$app/stores';
     import { contextHref } from '$lib/navigation-context.js';
@@ -158,8 +161,8 @@
                 ariaLabel="Beta views"
             />
         </div>
-        <label class="search"
-            >Search<input
+        <Field class="search" label="Search">
+            <Input
                 type="search"
                 bind:value={search}
                 oninput={() => {
@@ -167,11 +170,11 @@
                     saveContext();
                 }}
                 placeholder="Name, beta number, file, or server"
-                maxlength="200"
-            /></label
+                maxlength={200}
+            /></Field
         >
-        <label
-            >Status<select
+        <Field label="Status">
+            <Select
                 bind:value={status}
                 onchange={() => {
                     pageNumber = 1;
@@ -187,7 +190,7 @@
                 {:else}<option value="promoted">Promoted</option><option value="rolled-back"
                         >Rolled back</option
                     >{/if}
-            </select></label
+            </Select></Field
         >
         {#if betas.length && (search || status)}<Button
                 variant="ghost"
@@ -320,27 +323,12 @@
         align-self: flex-end;
         max-width: 100%;
     }
-    label {
-        display: grid;
-        gap: 6px;
-        font-size: var(--text-xs);
-        color: var(--text-secondary);
-    }
-    .search {
+
+    .toolbar :global(.search) {
         flex: 1;
         min-width: 240px;
     }
-    input,
-    select {
-        padding: 10px 12px;
-        min-height: 40px;
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        font: inherit;
-        font-size: var(--text-sm);
-    }
+
     .table-scroll {
         overflow-x: auto;
     }
@@ -444,7 +432,7 @@
         td {
             padding: 12px 8px;
         }
-        .search {
+        .toolbar :global(.search) {
             flex-basis: 100%;
         }
         .pagination {
diff --git a/src/routes/betas/new/+page.svelte b/src/routes/betas/new/+page.svelte
index c1f1f90..d08ec0c 100644
--- a/src/routes/betas/new/+page.svelte
+++ b/src/routes/betas/new/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { countLabel } from '$ui/plural.js';
     import { page } from '$app/stores';
     import { contextHref, safeReturnHref } from '$lib/navigation-context.js';
@@ -667,29 +670,30 @@
         <form onsubmit={openBeta} class="beta-form">
             <h2 bind:this={stepHeading} tabindex="-1">{steps[step]}</h2>
             {#if step === 0}
-                <label
-                    >Beta label (optional)<input
+                <Field label="Beta label (optional)">
+                    <Input
                         bind:value={betaLabel}
-                        maxlength="120"
+                        maxlength={120}
                         placeholder="For example, Town balance update"
                     /><span class="muted"
                         >Shown in the beta list so others can identify this test.</span
-                    ></label
+                    ></Field
                 >
                 <div class="picks">
                     {#each picks as pick, index (pick.key)}<section class="pick-row">
-                            <label
-                                >File {index + 1}<select
+                            <Field
+                                >{#snippet label()}File {index + 1}{/snippet}
+                                <Select
                                     bind:value={pick.scriptId}
                                     onchange={() => onPickFile(index)}
                                     ><option value={null}>Choose a file</option
                                     >{#each eligibleFor(index) as file}<option value={file.id}
                                             >[{file.kind}] {file.name}</option
-                                        >{/each}</select
-                                ></label
+                                        >{/each}</Select
+                                ></Field
                             >
-                            <label
-                                >Exact version<select
+                            <Field label="Exact version">
+                                <Select
                                     bind:value={pick.versionId}
                                     disabled={pick.scriptId === null ||
                                         loadingVersions.has(pick.key)}
@@ -702,8 +706,8 @@
                                                 0,
                                                 8
                                             )} · {version.state.replaceAll('-', ' ')}</option
-                                        >{/each}</select
-                                ></label
+                                        >{/each}</Select
+                                ></Field
                             >
                             <Button
                                 ariaLabel={`Remove file ${index + 1}`}
@@ -742,8 +746,8 @@
                             At launch, Electric Cherry chooses compatible servers with the fewest
                             current players. Every requested instance must pass the test plan.
                         </p>
-                        <label class="instance-count"
-                            >Instances per game<input
+                        <Field class="instance-count" label="Instances per game">
+                            <Input
                                 type="number"
                                 min="1"
                                 max="1000"
@@ -756,7 +760,7 @@
                                             : event.currentTarget.valueAsNumber)}
                             /><span class="muted"
                                 >The same number applies to every game in this beta.</span
-                            ></label
+                            ></Field
                         >
                         <p class="muted">
                             {applicableGames
@@ -812,14 +816,14 @@
                         </fieldset>
                         {#if selectionMode === 'manual' && candidateServers.length}
                             <div class="filters">
-                                <label
-                                    >Find servers<input
+                                <Field label="Find servers">
+                                    <Input
                                         type="search"
                                         bind:value={search}
                                         placeholder="Name, map, lobby…"
-                                    /></label
-                                ><label
-                                    >Game<select bind:value={serverGame}
+                                    /></Field
+                                ><Field label="Game">
+                                    <Select bind:value={serverGame}
                                         ><option value="">All games</option
                                         >{#each [...new Set(fleetServers
                                                     .map((s) => s.game)
@@ -829,16 +833,16 @@
                                                     : game === 't6'
                                                       ? 'Black Ops II'
                                                       : game}</option
-                                            >{/each}</select
-                                    ></label
-                                ><label
-                                    >Availability<select bind:value={availability}
+                                            >{/each}</Select
+                                    ></Field
+                                ><Field label="Availability">
+                                    <Select bind:value={availability}
                                         ><option value="">All servers</option><option value="empty"
                                             >Confirmed empty</option
                                         ><option value="occupied">Occupied</option><option
                                             value="unknown">Unknown / stale / offline</option
-                                        ></select
-                                    ></label
+                                        ></Select
+                                    ></Field
                                 >
                             </div>
                             <div class="actions">
@@ -999,8 +1003,7 @@
 </div>
 
 <style>
-    .beta-form input:not([type='checkbox']):not([type='radio']),
-    .beta-form select {
+    .beta-form input:not([type='checkbox']):not([type='radio']) {
         border-color: var(--border-control);
     }
     .page,
@@ -1081,8 +1084,7 @@
         color: var(--text-secondary);
         min-width: 0;
     }
-    input:not([type='checkbox']):not([type='radio']),
-    select {
+    input:not([type='checkbox']):not([type='radio']) {
         width: 100%;
         min-height: 40px;
         padding: 9px 12px;
@@ -1108,7 +1110,7 @@
         display: grid;
         gap: 16px;
     }
-    .instance-count {
+    .automatic-selection :global(.instance-count) {
         max-width: 400px;
     }
     .advanced-selection {
@@ -1148,7 +1150,8 @@
     .filters {
         align-items: end;
     }
-    .filters label {
+
+    .filters :global(.field) {
         flex: 1 1 180px;
     }
     .draft-status,
@@ -1217,7 +1220,8 @@
         .pick-row {
             grid-template-columns: minmax(0, 1fr) auto;
         }
-        .pick-row label:first-child {
+
+        .pick-row > :global(.field:first-child) {
             grid-column: 1/-1;
         }
         .steps {
diff --git a/src/routes/campaigns/+page.svelte b/src/routes/campaigns/+page.svelte
index 004972b..bfc94b4 100644
--- a/src/routes/campaigns/+page.svelte
+++ b/src/routes/campaigns/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { contextHref } from '$lib/navigation-context.js';
     import { timeFormat } from '$ui/stores/time-zone.js';
@@ -102,31 +105,31 @@
 <div class="page">
     <SectionHeader title="Campaigns" />
     <div class="toolbar">
-        <label class="search"
-            >Search<input
+        <Field class="search" label="Search">
+            <Input
                 type="search"
                 bind:value={query}
                 oninput={() => saveContext(true)}
                 placeholder="Script, campaign, or server"
-                maxlength="100"
-            /></label
+                maxlength={100}
+            /></Field
         >
-        <label
-            >Status<select bind:value={status} onchange={() => saveContext(true)}>
+        <Field label="Status">
+            <Select bind:value={status} onchange={() => saveContext(true)}>
                 <option value="">All statuses</option><option value="progress">In progress</option
                 ><option value="attention">Needs attention</option><option value="complete"
                     >Complete</option
                 ><option value="rolled-back">Rolled back</option><option value="inactive"
                     >Inactive</option
                 >
-            </select></label
+            </Select></Field
         >
-        <label
-            >Type<select bind:value={action} onchange={() => saveContext(true)}>
+        <Field label="Type">
+            <Select bind:value={action} onchange={() => saveContext(true)}>
                 <option value="">All types</option><option value="promote">Promote</option><option
                     value="rollback">Rollback</option
                 ><option value="drift">Maintenance repair</option>
-            </select></label
+            </Select></Field
         >
         {#if filtered}<Button variant="ghost" onclick={clearFilters}>Clear filters</Button>{/if}
     </div>
@@ -254,29 +257,12 @@
         flex-wrap: wrap;
         gap: 12px;
     }
-    label {
-        display: grid;
-        gap: 6px;
-        font-size: var(--text-xs);
-        color: var(--text-secondary);
-    }
-    .search {
+
+    .toolbar :global(.search) {
         flex: 1;
         min-width: 220px;
     }
-    input,
-    select {
-        padding: 10px 12px;
-        min-height: 40px;
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        font: inherit;
-        font-size: var(--text-sm);
-    }
-    input:focus-visible,
-    select:focus-visible,
+
     .timestamp:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: 2px;
@@ -438,10 +424,11 @@
         td {
             padding: 12px 8px;
         }
-        .search {
+        .toolbar :global(.search) {
             flex-basis: 100%;
         }
-        .toolbar > label:not(.search) {
+
+        .toolbar > :global(.field:not(.search)) {
             flex: 1;
         }
     }
diff --git a/src/routes/game-files/+page.svelte b/src/routes/game-files/+page.svelte
index f03dfa3..1c7dac9 100644
--- a/src/routes/game-files/+page.svelte
+++ b/src/routes/game-files/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { gameTitle } from '$ui/server-labels.js';
     import BackLink from '$ui/components/BackLink.svelte';
@@ -716,15 +718,15 @@
                 downloaded automatically.
             </p>
             <div class="download">
-                <label
-                    >Host<select bind:value={targets[item.id]}
+                <Field label="Host">
+                    <Select bind:value={targets[item.id]}
                         ><option value="">Select host</option>{#each onlineHosts as host}<option
                                 value={host.id}
                                 >{host.name} · {formatGameBytes(
                                     Number(host.inventory.storageAvailable ?? 0)
                                 )} free</option
-                            >{/each}</select
-                    ></label
+                            >{/each}</Select
+                    ></Field
                 ><Button
                     size="sm"
                     disabled={busy || !targets[item.id]}
@@ -783,8 +785,7 @@
         gap: 6px;
         font-size: var(--text-sm);
     }
-    input,
-    select {
+    input {
         width: 100%;
         min-width: 0;
         box-sizing: border-box;
@@ -794,8 +795,7 @@
         border: 1px solid var(--border-strong);
         border-radius: var(--radius-sm);
     }
-    input:disabled,
-    select:disabled {
+    input:disabled {
         opacity: 0.7;
     }
     input[type='file'] {
diff --git a/src/routes/hosts/+page.svelte b/src/routes/hosts/+page.svelte
index 0875364..6074c6e 100644
--- a/src/routes/hosts/+page.svelte
+++ b/src/routes/hosts/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
     import { onMount, untrack } from 'svelte';
     import { page } from '$app/stores';
     import { pollVisible } from '$ui/poll.js';
@@ -109,21 +112,26 @@
                 >{/if}
         </div>
         {#if filtersVisible}<div class="filters">
-                <input
-                    type="search"
-                    aria-label="Search hosts"
-                    placeholder="Search hosts…"
-                    bind:value={search}
-                />
-                <select aria-label="Filter hosts by status" bind:value={status}
-                    ><option value="">All statuses</option><option value="attention"
-                        >Needs attention</option
-                    ><option value="offline">Offline</option><option value="preparing"
-                        >Preparing</option
-                    ><option value="draining">Draining</option><option value="disabled"
-                        >Disabled</option
-                    ><option value="deleting">Deleting</option><option value="ready">Ready</option
-                    ></select
+                <Field label="Search hosts" hiddenLabel class="search"
+                    ><Input
+                        type="search"
+                        aria-label="Search hosts"
+                        placeholder="Search hosts…"
+                        bind:value={search}
+                    /></Field
+                >
+                <Field label="Filter hosts by status" hiddenLabel
+                    ><Select aria-label="Filter hosts by status" bind:value={status}
+                        ><option value="">All statuses</option><option value="attention"
+                            >Needs attention</option
+                        ><option value="offline">Offline</option><option value="preparing"
+                            >Preparing</option
+                        ><option value="draining">Draining</option><option value="disabled"
+                            >Disabled</option
+                        ><option value="deleting">Deleting</option><option value="ready"
+                            >Ready</option
+                        ></Select
+                    ></Field
                 >
                 {#if search || status}<Button
                         variant="ghost"
@@ -170,27 +178,15 @@
         font: inherit;
         padding: 4px;
     }
-    input,
-    select {
-        box-sizing: border-box;
-        padding: 10px 12px;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        font: var(--text-sm) var(--font-body);
-    }
-    input {
-        flex: 1 1 240px;
-        min-width: 0;
-        max-width: 440px;
-    }
-    input:focus-visible,
-    select:focus-visible,
+
     button:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: 3px;
     }
+    .filters > :global(.search) {
+        flex: 1 1 240px;
+        max-width: 440px;
+    }
     .empty {
         padding: 24px;
         text-align: center;
diff --git a/src/routes/hosts/[id]/+page.svelte b/src/routes/hosts/[id]/+page.svelte
index b717bb0..f76448a 100644
--- a/src/routes/hosts/[id]/+page.svelte
+++ b/src/routes/hosts/[id]/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { timeFormat } from '$ui/stores/time-zone.js';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import Breadcrumbs from '$ui/components/primitives/Breadcrumbs.svelte';
@@ -468,11 +470,8 @@
                                 }}
                             >
                                 <fieldset disabled={busy || cleaning}>
-                                    <label
-                                        >Plutainer image<input
-                                            required
-                                            bind:value={runtimeImage}
-                                        /></label
+                                    <Field label="Plutainer image">
+                                        <Input required bind:value={runtimeImage} /></Field
                                     ><Button type="submit" disabled={busy || !host.connected}
                                         >Pull runtime image</Button
                                     >
@@ -509,50 +508,43 @@
                     <h2>Host configuration</h2>
                     {#if canManage}<form onsubmit={save}>
                             <fieldset disabled={busy || cleaning}>
-                                <label
-                                    >Friendly name<input
-                                        required
-                                        maxlength="200"
-                                        bind:value={name}
-                                    /></label
+                                <Field label="Friendly name">
+                                    <Input required maxlength={200} bind:value={name} /></Field
                                 >
                                 <div class="fields">
-                                    <label
-                                        >First game port<input
+                                    <Field label="First game port">
+                                        <Input
                                             type="number"
                                             min="1"
                                             max="65535"
                                             required
                                             bind:value={portMin}
-                                        /></label
-                                    ><label
-                                        >Last game port<input
+                                        /></Field
+                                    ><Field label="Last game port">
+                                        <Input
                                             type="number"
                                             min={portMin}
                                             max="65535"
                                             required
                                             bind:value={portMax}
-                                        /></label
+                                        /></Field
                                     >
                                 </div>
-                                <label
-                                    >Local bind address<input
-                                        required
-                                        bind:value={bindAddress}
-                                    /></label
-                                ><label
-                                    >Public / NAT address<input
+                                <Field label="Local bind address">
+                                    <Input required bind:value={bindAddress} /></Field
+                                ><Field label="Public / NAT address">
+                                    <Input
                                         bind:value={publicAddress}
                                         placeholder="Optional public hostname or address"
-                                    /></label
-                                ><label
-                                    >Minimum free game storage (GiB)<input
+                                    /></Field
+                                ><Field label="Minimum free game storage (GiB)">
+                                    <Input
                                         type="number"
                                         min="0"
                                         step="0.1"
                                         required
                                         bind:value={minimumFreeGB}
-                                    /></label
+                                    /></Field
                                 ><Button type="submit" disabled={busy}>Save settings</Button>
                             </fieldset>
                         </form>{:else}<dl>
@@ -745,20 +737,7 @@
         padding: 0;
         margin: 0;
     }
-    label {
-        display: grid;
-        gap: 8px;
-        font-size: var(--text-sm);
-    }
-    input {
-        width: 100%;
-        min-width: 0;
-        padding: 10px;
-        color: var(--text-primary);
-        background: var(--surface-sunken);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-    }
+
     .fields > * {
         flex: 1;
         min-width: 120px;
diff --git a/src/routes/leaderboard/+page.svelte b/src/routes/leaderboard/+page.svelte
index eb4d246..57448b8 100644
--- a/src/routes/leaderboard/+page.svelte
+++ b/src/routes/leaderboard/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Field from '$ui/components/primitives/Field.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Select from '$ui/components/primitives/Select.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     let { data: initial }: { data: import('./$types').PageData } = $props();
     import { onMount, untrack } from 'svelte';
@@ -262,9 +265,8 @@
 
     {#snippet filterFields(suffix: string)}
         <div class="filters">
-            <div class="field">
-                <label for={`leaderboard-game${suffix}`}>Game</label>
-                <select
+            <Field label="Game" forId={`leaderboard-game${suffix}`}>
+                <Select
                     id={`leaderboard-game${suffix}`}
                     value={game}
                     onchange={(event) =>
@@ -273,11 +275,10 @@
                     <option value="">All games</option>{#each games as item (item.key)}<option
                             value={item.key}>{item.label}</option
                         >{/each}
-                </select>
-            </div>
-            <div class="field">
-                <label for={`leaderboard-map${suffix}`}>Map</label>
-                <select
+                </Select>
+            </Field>
+            <Field label="Map" forId={`leaderboard-map${suffix}`}>
+                <Select
                     id={`leaderboard-map${suffix}`}
                     value={map}
                     onchange={(event) => updateFilters({ map: event.currentTarget.value })}
@@ -291,11 +292,10 @@
                                 ? ` · ${item.game === 't5' ? 'BO1' : 'BO2'}`
                                 : ''}</option
                         >{/each}
-                </select>
-            </div>
-            <div class="field">
-                <label for={`leaderboard-players${suffix}`}>Players</label>
-                <select
+                </Select>
+            </Field>
+            <Field label="Players" forId={`leaderboard-players${suffix}`}>
+                <Select
                     id={`leaderboard-players${suffix}`}
                     value={players}
                     onchange={(event) => updateFilters({ players: event.currentTarget.value })}
@@ -304,14 +304,13 @@
                     <option value="">All squad sizes</option>{#each squadSizes as size}<option
                             value={size.key}>{size.label}</option
                         >{/each}
-                </select><span id={`players-help${suffix}`} class="sr-only"
+                </Select><span id={`players-help${suffix}`} class="sr-only"
                     >Players recorded at the start of each match. Matches with unknown starting
                     counts appear only under All squad sizes.</span
                 >
-            </div>
-            <div class="field">
-                <label for={`leaderboard-metric${suffix}`}>Rank by</label>
-                <select
+            </Field>
+            <Field label="Rank by" forId={`leaderboard-metric${suffix}`}>
+                <Select
                     id={`leaderboard-metric${suffix}`}
                     value={metric}
                     onchange={(event) => updateFilters({ metric: event.currentTarget.value })}
@@ -319,8 +318,8 @@
                     {#each leaderboardMetrics as item (item.key)}<option value={item.key}
                             >{item.label}</option
                         >{/each}
-                </select>
-            </div>
+                </Select>
+            </Field>
             <form
                 class="search"
                 onsubmit={(event) => {
@@ -330,15 +329,16 @@
                 }}
                 role="search"
             >
-                <label for={`leaderboard-search${suffix}`}>Find a player</label>
-                <input
-                    id={`leaderboard-search${suffix}`}
-                    type="search"
-                    bind:value={search}
-                    maxlength="100"
-                    placeholder="Name or GUID"
-                    aria-describedby={`search-help${suffix}`}
-                /><span id={`search-help${suffix}`} class="sr-only"
+                <Field label="Find a player" forId={`leaderboard-search${suffix}`}>
+                    <Input
+                        id={`leaderboard-search${suffix}`}
+                        type="search"
+                        bind:value={search}
+                        maxlength={100}
+                        placeholder="Name or GUID"
+                        aria-describedby={`search-help${suffix}`}
+                    /></Field
+                ><span id={`search-help${suffix}`} class="sr-only"
                     >Press Enter to search. Player ranks are preserved.</span
                 >
             </form>
@@ -700,7 +700,6 @@
     .search {
         grid-column: 1 / -1;
     }
-    .field,
     .search {
         display: flex;
         flex-direction: column;
@@ -712,12 +711,10 @@
         font-size: var(--text-xs);
     }
     input,
-    select,
     button {
         font: inherit;
     }
-    input,
-    select {
+    input {
         min-height: 42px;
         width: 100%;
         padding: 9px 12px;
diff --git a/src/routes/leaderboard/players/[guid]/+page.svelte b/src/routes/leaderboard/players/[guid]/+page.svelte
index efafa37..7a433a7 100644
--- a/src/routes/leaderboard/players/[guid]/+page.svelte
+++ b/src/routes/leaderboard/players/[guid]/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { playerCompletionLabel } from '$ui/player-match.js';
     import { onMount } from 'svelte';
@@ -389,17 +391,17 @@
     description="Choose the leaderboard ranking and match history. Lifetime records stay unchanged."
 >
     <div class="scope-controls" aria-busy={filtering}>
-        <label
-            >Game<select
+        <Field label="Game">
+            <Select
                 value={scope.game}
                 onchange={(event) => void updateScope({ game: event.currentTarget.value, map: '' })}
                 ><option value="">All games</option><option value="t5">Black Ops I</option><option
                     value="t6">Black Ops II</option
-                ></select
-            ></label
+                ></Select
+            ></Field
         >
-        <label
-            >Map<select
+        <Field label="Map">
+            <Select
                 value={scope.map}
                 onchange={(event) => void updateScope({ map: event.currentTarget.value })}
                 ><option value="">All maps</option
@@ -408,26 +410,26 @@
                     >{/if}{#each filteredMaps as map (`${map.game}:${map.key}`)}<option
                         value={map.key}
                         >{map.name}{!scope.game ? ` · ${gameName(map.game)}` : ''}</option
-                    >{/each}</select
-            ></label
+                    >{/each}</Select
+            ></Field
         >
-        <label
-            >Players<select
+        <Field label="Players">
+            <Select
                 value={scope.players ?? ''}
                 onchange={(event) => void updateScope({ players: event.currentTarget.value })}
                 ><option value="">All squad sizes</option><option value="1">Solo</option><option
                     value="2">Duo</option
-                ><option value="3">Trio</option><option value="4">Four players</option></select
-            ></label
+                ><option value="3">Trio</option><option value="4">Four players</option></Select
+            ></Field
         >
-        <label
-            >Rank by<select
+        <Field label="Rank by">
+            <Select
                 value={scope.metric}
                 onchange={(event) => void updateScope({ metric: event.currentTarget.value })}
                 >{#each leaderboardMetrics as metric}<option value={metric.key}
                         >{metric.label}</option
-                    >{/each}</select
-            ></label
+                    >{/each}</Select
+            ></Field
         >
     </div>
     {#snippet actions()}<Button onclick={() => (filterOpen = false)}>Done</Button>{/snippet}
@@ -608,15 +610,7 @@
         display: grid;
         gap: var(--space-4);
     }
-    .scope-controls label {
-        display: grid;
-        gap: var(--space-2);
-        color: var(--text-secondary);
-        font-size: var(--text-sm);
-    }
-    .scope-controls select {
-        width: 100%;
-    }
+
     .mobile-records {
         display: none;
     }
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index f5b9adc..99f5fe3 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { page } from '$app/stores';
     import Button from '$ui/components/primitives/Button.svelte';
     import SectionHeader from '$ui/components/primitives/SectionHeader.svelte';
@@ -51,28 +53,28 @@
     {#if error}<p class="error" role="alert">{error}</p>{/if}
     <form onsubmit={login} aria-busy={busy}>
         <fieldset disabled={busy}>
-            <label for="username"
-                >Username<input
+            <Field forId="username" label="Username">
+                <Input
                     id="username"
                     name="username"
                     autocomplete="username"
                     autocapitalize="none"
                     spellcheck="false"
                     required
-                    maxlength="64"
+                    maxlength={64}
                     bind:value={username}
-                /></label
+                /></Field
             >
-            <label for="password"
-                >Password<input
+            <Field forId="password" label="Password">
+                <Input
                     id="password"
                     name="password"
                     type="password"
                     autocomplete="current-password"
                     required
-                    maxlength="128"
+                    maxlength={128}
                     bind:value={password}
-                /></label
+                /></Field
             >
             <Button type="submit" variant="primary" loading={busy} disabled={busy}>Sign in</Button>
         </fieldset>
@@ -102,20 +104,7 @@
         padding: 0;
         min-width: 0;
     }
-    label {
-        display: grid;
-        gap: 8px;
-        font-size: var(--text-sm);
-    }
-    input {
-        width: 100%;
-        padding: 12px;
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        font: inherit;
-    }
+
     .help,
     .setup-link {
         color: var(--text-secondary);
diff --git a/src/routes/maintenance/+page.svelte b/src/routes/maintenance/+page.svelte
index f5e5387..f0bc657 100644
--- a/src/routes/maintenance/+page.svelte
+++ b/src/routes/maintenance/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import ActivityLog from '$ui/components/ActivityLog.svelte';
     import BackLink from '$ui/components/BackLink.svelte';
@@ -381,12 +384,9 @@
                         <label class="toggle"
                             ><input type="checkbox" bind:checked={scheduleEnabled} /> Daily fleet restart</label
                         >
-                        <label
-                            >Queue time ({$timeZone})<input
-                                type="time"
-                                bind:value={scheduleTime}
-                                required
-                            /></label
+                        <Field
+                            >{#snippet label()}Queue time ({$timeZone}){/snippet}
+                            <Input type="time" bind:value={scheduleTime} required /></Field
                         >
                         <Button type="submit" disabled={busy}>Save schedule</Button>
                     </form>
@@ -490,30 +490,30 @@
                     {/if}
                 {/if}
                 <div class="filters">
-                    <label
-                        >Capability<select bind:value={kind} onchange={() => saveContext()}
+                    <Field label="Capability">
+                        <Select bind:value={kind} onchange={() => saveContext()}
                             ><option value="all">All capabilities</option><option value="health"
                                 >Health recovery</option
                             ><option value="drift">Configuration drift</option><option
                                 value="updates">Plutonium updates</option
-                            ><option value="schedule">Scheduled restarts</option></select
-                        ></label
+                            ><option value="schedule">Scheduled restarts</option></Select
+                        ></Field
                     >
-                    <label
-                        >Server<input
+                    <Field label="Server">
+                        <Input
                             bind:value={server}
                             oninput={() => saveContext()}
                             placeholder="Filter servers"
-                        /></label
+                        /></Field
                     >
-                    {#if view === 'activity'}<label
-                            >Status<select bind:value={status} onchange={() => saveContext()}
+                    {#if view === 'activity'}<Field label="Status">
+                            <Select bind:value={status} onchange={() => saveContext()}
                                 ><option value="all">All activity</option><option value="active"
                                     >Active</option
                                 ><option value="attention">Needs attention</option><option
                                     value="done">Finished</option
-                                ></select
-                            ></label
+                                ></Select
+                            ></Field
                         >{/if}
                 </div>
                 {#if view === 'overview' && ['all', 'updates'].includes(kind)}
@@ -808,8 +808,7 @@
         display: flex;
         align-items: center;
     }
-    input:not([type='checkbox']),
-    select {
+    input:not([type='checkbox']) {
         color: inherit;
         background: var(--surface-sunken);
         padding: 9px;
diff --git a/src/routes/plugins/+page.svelte b/src/routes/plugins/+page.svelte
index c44388b..61688e7 100644
--- a/src/routes/plugins/+page.svelte
+++ b/src/routes/plugins/+page.svelte
@@ -303,31 +303,37 @@
             {flash}<Button size="sm" onclick={load}>Retry</Button>
         </div>{/if}
     {#if loading || plugins.length || flash}<div class="library-toolbar">
-            <input
-                class="search"
-                type="search"
-                aria-label="Search plugins"
-                bind:value={search}
-                placeholder="Search names or files…"
-            />
-            <select aria-label="Filter plugins by game" bind:value={game}
-                ><option value="">All games</option><option value="t5">Black Ops I</option><option
-                    value="t6">Black Ops II</option
-                ></select
+            <Field label="Search plugins" hiddenLabel class="search"
+                ><Input
+                    type="search"
+                    aria-label="Search plugins"
+                    bind:value={search}
+                    placeholder="Search names or files…"
+                /></Field
             >
-            <select aria-label="Filter plugins by status" bind:value={status}
-                ><option value="">All statuses</option><option value="untested"
-                    >Needs testing</option
-                ><option value="testing">Beta active</option><option value="test-failed"
-                    >Test failed</option
-                ><option value="tested">Test passed</option><option value="promoted"
-                    >Promoted</option
-                ><option value="empty">No versions</option></select
+            <Field label="Filter plugins by game" hiddenLabel
+                ><Select aria-label="Filter plugins by game" bind:value={game}
+                    ><option value="">All games</option><option value="t5">Black Ops I</option
+                    ><option value="t6">Black Ops II</option></Select
+                ></Field
             >
-            <select aria-label="Sort plugins" bind:value={sort}
-                ><option value="name">Name A–Z</option><option value="recent"
-                    >Recently uploaded</option
-                ></select
+            <Field label="Filter plugins by status" hiddenLabel
+                ><Select aria-label="Filter plugins by status" bind:value={status}
+                    ><option value="">All statuses</option><option value="untested"
+                        >Needs testing</option
+                    ><option value="testing">Beta active</option><option value="test-failed"
+                        >Test failed</option
+                    ><option value="tested">Test passed</option><option value="promoted"
+                        >Promoted</option
+                    ><option value="empty">No versions</option></Select
+                ></Field
+            >
+            <Field label="Sort plugins" hiddenLabel
+                ><Select aria-label="Sort plugins" bind:value={sort}
+                    ><option value="name">Name A–Z</option><option value="recent"
+                        >Recently uploaded</option
+                    ></Select
+                ></Field
             >
         </div>{/if}
     {#if game}<p class="filter-hint">
diff --git a/src/routes/provisioning/+page.svelte b/src/routes/provisioning/+page.svelte
index 2d93c35..443145f 100644
--- a/src/routes/provisioning/+page.svelte
+++ b/src/routes/provisioning/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import BackLink from '$ui/components/BackLink.svelte';
     import { timeFormat } from '$ui/stores/time-zone.js';
     import { onMount, untrack } from 'svelte';
@@ -302,14 +305,14 @@
                 panelId="deployment-panel"
             />
         </div>
-        <label class="search"
-            >Server<input
+        <Field class="search" label="Server">
+            <Input
                 type="search"
                 bind:value={search}
                 oninput={() => saveContext(true)}
                 placeholder="Search server or lobby"
-                maxlength="100"
-            /></label
+                maxlength={100}
+            /></Field
         >
         <div class="desktop-filters">
             {@render filterFields()}
@@ -322,15 +325,15 @@
         </div>
     </div>
     {#snippet filterFields()}
-        <label
-            >Operation<select bind:value={action} onchange={() => saveContext(true)}
+        <Field label="Operation">
+            <Select bind:value={action} onchange={() => saveContext(true)}
                 ><option value="all">All operations</option
                 >{#each provisioningActions as value}<option {value}>{actionLabels[value]}</option
-                    >{/each}</select
-            ></label
+                    >{/each}</Select
+            ></Field
         >
-        <label
-            >Status<select bind:value={historyState} onchange={() => saveContext(true)}
+        <Field label="Status">
+            <Select bind:value={historyState} onchange={() => saveContext(true)}
                 ><option value="all">All statuses</option><option value="pending"
                     >Waiting / queued</option
                 ><option value="running">In progress</option><option value="awaiting-health"
@@ -341,16 +344,16 @@
                     >Interrupted</option
                 ><option value="warning">Warnings</option><option value="cancelled"
                     >Cancelled</option
-                ></select
-            ></label
+                ></Select
+            ></Field
         >
-        <label
-            >Source<select bind:value={source} onchange={() => saveContext(true)}
+        <Field label="Source">
+            <Select bind:value={source} onchange={() => saveContext(true)}
                 ><option value="all">All sources</option
                 >{#each provisioningListSources as value}<option {value}
                         >{provisioningSourceLabels[value]}</option
-                    >{/each}</select
-            ></label
+                    >{/each}</Select
+            ></Field
         >
     {/snippet}
     <Dialog
@@ -636,27 +639,12 @@
         display: grid;
         gap: 16px;
     }
-    label {
-        display: grid;
-        gap: 6px;
-        font-size: var(--text-xs);
-        color: var(--text-secondary);
-    }
-    .search {
+
+    .toolbar :global(.search) {
         flex: 1;
         min-width: 220px;
     }
-    input,
-    select {
-        padding: 10px 12px;
-        min-height: 40px;
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-sm);
-        font: inherit;
-        font-size: var(--text-sm);
-    }
+
     .queue-heading,
     .queue-tools,
     .pagination {
@@ -789,7 +777,7 @@
         table {
             min-width: 820px;
         }
-        .search {
+        .toolbar :global(.search) {
             flex-basis: 100%;
         }
         th,
diff --git a/src/routes/scripts/+page.svelte b/src/routes/scripts/+page.svelte
index f96b723..8982449 100644
--- a/src/routes/scripts/+page.svelte
+++ b/src/routes/scripts/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import { page } from '$app/stores';
     import { contextHref } from '$lib/navigation-context.js';
     import { onMount } from 'svelte';
@@ -213,41 +216,39 @@
     </SectionHeader>
     <section class="library" aria-label="Script library">
         {#if loading || scripts.length || error}<div class="library-toolbar">
-                <label class="search"
-                    ><span class="sr-only">Search scripts</span><input
+                <Field class="search" hiddenLabel label="Search scripts">
+                    <Input
                         type="search"
                         bind:value={search}
                         placeholder="Search names, files, or maps…"
-                    /></label
+                    /></Field
                 >
-                <label
-                    ><span class="sr-only">Filter by game</span><select
-                        bind:value={game}
-                        onchange={() => (map = '')}
+                <Field hiddenLabel label="Filter by game">
+                    <Select bind:value={game} onchange={() => (map = '')}
                         ><option value="">All games</option><option value="t5">Black Ops I</option
-                        ><option value="t6">Black Ops II</option></select
-                    ></label
+                        ><option value="t6">Black Ops II</option></Select
+                    ></Field
                 >
-                <label
-                    ><span class="sr-only">Filter by map</span><select bind:value={map}
+                <Field hiddenLabel label="Filter by map">
+                    <Select bind:value={map}
                         ><option value="">All maps</option>{#each maps as m}<option value={m}
                                 >{mapLabel(m)}</option
-                            >{/each}</select
-                    ></label
+                            >{/each}</Select
+                    ></Field
                 >
-                <label
-                    ><span class="sr-only">Filter by status</span><select bind:value={status}
+                <Field hiddenLabel label="Filter by status">
+                    <Select bind:value={status}
                         >{#each tabs as tab}<option value={tab.value}
                                 >{tab.value === 'all' ? 'All statuses' : tab.label}</option
-                            >{/each}<option value="empty">No versions</option></select
-                    ></label
+                            >{/each}<option value="empty">No versions</option></Select
+                    ></Field
                 >
-                <label
-                    ><span class="sr-only">Sort scripts</span><select bind:value={sort}
+                <Field hiddenLabel label="Sort scripts">
+                    <Select bind:value={sort}
                         ><option value="attention">Needs attention first</option><option
                             value="recent">Recently uploaded</option
-                        ><option value="name">Name A–Z</option></select
-                    ></label
+                        ><option value="name">Name A–Z</option></Select
+                    ></Field
                 >
             </div>
             <div class="list-heading">
@@ -408,7 +409,6 @@
     }
     button:focus-visible,
     input:focus-visible,
-    select:focus-visible,
     a:focus-visible {
         outline: 2px solid var(--accent-primary);
         outline-offset: 3px;
diff --git a/src/routes/server-keys/+page.svelte b/src/routes/server-keys/+page.svelte
index 2e55d60..663ddc5 100644
--- a/src/routes/server-keys/+page.svelte
+++ b/src/routes/server-keys/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { onMount } from 'svelte';
     import { page } from '$app/stores';
@@ -173,27 +174,31 @@
             {/each}
         </div>{/if}
     <div class="ui-toolbar">
-        <input
-            type="search"
-            aria-label="Search keys"
-            bind:value={search}
-            oninput={(event) => {
-                search = event.currentTarget.value;
-                limit = 25;
-                saveSearch();
-            }}
-            placeholder="Search labels or assigned servers…"
-        />
-        <select
-            aria-label="Filter keys by game"
-            bind:value={gameFilter}
-            onchange={() => {
-                limit = 25;
-                saveSearch();
-            }}
-            ><option value="">All games</option><option value="t5">Black Ops I</option><option
-                value="t6">Black Ops II</option
-            ></select
+        <Field label="Search keys" hiddenLabel class="search"
+            ><Input
+                type="search"
+                aria-label="Search keys"
+                bind:value={search}
+                oninput={(event) => {
+                    search = event.currentTarget.value;
+                    limit = 25;
+                    saveSearch();
+                }}
+                placeholder="Search labels or assigned servers…"
+            /></Field
+        >
+        <Field label="Filter keys by game" hiddenLabel
+            ><Select
+                aria-label="Filter keys by game"
+                bind:value={gameFilter}
+                onchange={() => {
+                    limit = 25;
+                    saveSearch();
+                }}
+                ><option value="">All games</option><option value="t5">Black Ops I</option><option
+                    value="t6">Black Ops II</option
+                ></Select
+            ></Field
         >
     </div>
     {#if error && !open}<div role="alert" class="ui-error">
@@ -250,11 +255,11 @@
 <Dialog bind:open title="Add key" {busy}>
     {#if error}<p role="alert" class="error">{error}</p>{/if}
     <form onsubmit={save}>
-        <label
-            >Game<select bind:value={game} disabled={busy}
+        <Field label="Game">
+            <Select bind:value={game} disabled={busy}
                 ><option value="t5">Black Ops I</option><option value="t6">Black Ops II</option
-                ></select
-            ></label
+                ></Select
+            ></Field
         >
         <Field
             label="Label (optional)"
@@ -319,6 +324,7 @@
         display: block;
         margin-top: 6px;
     }
+
     .assignment {
         margin-top: 8px;
     }
@@ -331,22 +337,11 @@
     p {
         color: var(--text-secondary);
     }
-    form,
-    label {
+    form {
         display: grid;
         gap: var(--space-4);
     }
-    label {
-        gap: 8px;
-        font-size: var(--text-base);
-    }
-    select {
-        padding: 10px;
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        background: var(--surface-sunken);
-        color: inherit;
-    }
+
     .actions {
         display: flex;
         gap: var(--space-2);
diff --git a/src/routes/settings/users/+page.svelte b/src/routes/settings/users/+page.svelte
index 0855657..86dfe75 100644
--- a/src/routes/settings/users/+page.svelte
+++ b/src/routes/settings/users/+page.svelte
@@ -1,4 +1,7 @@
 <script lang="ts">
+    import Select from '$ui/components/primitives/Select.svelte';
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import RelativeTime from '$ui/components/RelativeTime.svelte';
     import { onMount } from 'svelte';
     import { page } from '$app/stores';
@@ -361,58 +364,54 @@
     <form onsubmit={create} aria-busy={busy}>
         <fieldset disabled={busy}>
             {#if formError}<p class="error" role="alert">{formError}</p>{/if}
-            <label for="new-username"
-                >Username<input
+            <Field forId="new-username" label="Username">
+                <Input
                     id="new-username"
                     name="username"
                     required
-                    minlength="3"
-                    maxlength="64"
+                    minlength={3}
+                    maxlength={64}
                     pattern={'[a-zA-Z0-9][a-zA-Z0-9_.\\-]{2,63}'}
                     autocomplete="off"
                     autocapitalize="none"
                     spellcheck="false"
                     bind:value={username}
                     aria-describedby="new-username-help"
-                /></label
+                /></Field
             >
             <p class="hint" id="new-username-help">
                 3–64 characters: letters, numbers, periods, underscores, and hyphens. Start with a
                 letter or number.
             </p>
-            <label for="new-name"
-                >Display name<input
+            <Field forId="new-name" label="Display name">
+                <Input
                     id="new-name"
                     name="displayName"
                     required
-                    maxlength="100"
+                    maxlength={100}
                     autocomplete="off"
                     bind:value={displayName}
-                /></label
+                /></Field
             >
-            <label for="new-role"
-                >Role<select
-                    id="new-role"
-                    name="role"
-                    bind:value={role}
-                    aria-describedby="new-role-help"
+            <Field forId="new-role" label="Role">
+                <Select id="new-role" name="role" bind:value={role} aria-describedby="new-role-help"
                     >{#each roles as item}<option value={item.value}>{item.label}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
             <p class="hint" id="new-role-help">{roleDescription}</p>
-            <label for="temporary-password"
-                >Temporary password<input
+            <Field forId="temporary-password" label="Temporary password">
+                <Input
                     id="temporary-password"
                     name="password"
                     type={showPassword ? 'text' : 'password'}
                     required
-                    minlength="8"
-                    maxlength="128"
+                    minlength={8}
+                    maxlength={128}
                     autocomplete="new-password"
                     bind:value={password}
                     aria-describedby="temporary-help"
-                /></label
+                /></Field
             >
             <p class="hint" id="temporary-help">
                 8–128 characters. Save it before adding the user; it will not be displayed again.
@@ -445,25 +444,25 @@
     <form onsubmit={save} aria-busy={busy}>
         <fieldset disabled={busy}>
             {#if formError}<p class="error" role="alert">{formError}</p>{/if}
-            <label for="edit-name"
-                >Display name<input
+            <Field forId="edit-name" label="Display name">
+                <Input
                     id="edit-name"
                     name="displayName"
                     required
-                    maxlength="100"
+                    maxlength={100}
                     autocomplete="off"
                     bind:value={displayName}
-                /></label
+                /></Field
             >
-            <label for="edit-role"
-                >Role<select
+            <Field forId="edit-role" label="Role">
+                <Select
                     id="edit-role"
                     name="role"
                     bind:value={role}
                     aria-describedby="edit-role-help"
                     >{#each roles as item}<option value={item.value}>{item.label}</option
-                        >{/each}</select
-                ></label
+                        >{/each}</Select
+                ></Field
             >
             <p class="hint" id="edit-role-help">{roleDescription}</p>
             <label class="checkbox"
@@ -476,17 +475,20 @@
                     Use <a href="/account">My account</a> to change your own password. Changes to your
                     access can sign you out.
                 </p>
-            {:else}<label for="reset-password"
-                    >New temporary password <span class="optional">(optional)</span><input
+            {:else}<Field forId="reset-password"
+                    >{#snippet label()}New temporary password <span class="optional"
+                            >(optional)</span
+                        >{/snippet}
+                    <Input
                         id="reset-password"
                         name="password"
                         type={showPassword ? 'text' : 'password'}
-                        minlength="8"
-                        maxlength="128"
+                        minlength={8}
+                        maxlength={128}
                         autocomplete="new-password"
                         bind:value={password}
                         aria-describedby="reset-help"
-                    /></label
+                    /></Field
                 >
                 <p class="hint" id="reset-help">
                     Leave blank to keep the current password. A reset requires the user to choose a
@@ -663,8 +665,7 @@
         gap: 8px;
         font-size: var(--text-sm);
     }
-    input:not([type='checkbox']),
-    select {
+    input:not([type='checkbox']) {
         width: 100%;
         padding: 11px;
         color: var(--text-primary);
diff --git a/src/routes/setup/+page.svelte b/src/routes/setup/+page.svelte
index 0265c4e..ead611a 100644
--- a/src/routes/setup/+page.svelte
+++ b/src/routes/setup/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+    import Input from '$ui/components/primitives/Input.svelte';
+    import Field from '$ui/components/primitives/Field.svelte';
     import Button from '$ui/components/primitives/Button.svelte';
     import SectionHeader from '$ui/components/primitives/SectionHeader.svelte';
     let token = $state('');
@@ -54,78 +56,78 @@
     {#if error}<p class="error" role="alert">{error}</p>{/if}
     <form onsubmit={setup} aria-busy={busy}>
         <fieldset disabled={busy}>
-            <label for="setup-token"
-                >Setup token<input
+            <Field forId="setup-token" label="Setup token">
+                <Input
                     id="setup-token"
                     name="token"
                     type="password"
                     required
-                    minlength="32"
+                    minlength={32}
                     autocomplete="off"
                     spellcheck="false"
                     bind:value={token}
                     aria-describedby="token-help"
-                /></label
+                /></Field
             >
             <p id="token-help" class="hint">
                 Provided through the controller’s <code>EC_SETUP_TOKEN</code> setting.
             </p>
-            <label for="setup-username"
-                >Username<input
+            <Field forId="setup-username" label="Username">
+                <Input
                     id="setup-username"
                     name="username"
                     required
-                    minlength="3"
-                    maxlength="64"
+                    minlength={3}
+                    maxlength={64}
                     pattern={'[a-zA-Z0-9][a-zA-Z0-9_.\\-]{2,63}'}
                     autocomplete="username"
                     autocapitalize="none"
                     spellcheck="false"
                     bind:value={username}
                     aria-describedby="username-help"
-                /></label
+                /></Field
             >
             <p id="username-help" class="hint">
                 3–64 characters. Start with a letter or number; periods, underscores, and hyphens
                 are allowed.
             </p>
-            <label for="setup-name"
-                >Display name<input
+            <Field forId="setup-name" label="Display name">
+                <Input
                     id="setup-name"
                     name="displayName"
                     required
-                    maxlength="100"
+                    maxlength={100}
                     autocomplete="name"
                     bind:value={displayName}
-                /></label
+                /></Field
             >
-            <label for="setup-password"
-                >Password<input
+            <Field forId="setup-password" label="Password">
+                <Input
                     id="setup-password"
                     name="password"
                     type="password"
                     required
-                    minlength="8"
-                    maxlength="128"
+                    minlength={8}
+                    maxlength={128}
                     autocomplete="new-password"
                     bind:value={password}
                     aria-describedby="password-help"
-                /></label
+                /></Field
             >
             <p id="password-help" class="hint">
                 Use 8–128 characters. A long, unique passphrase works well.
             </p>
-            <label for="setup-confirm"
-                >Confirm password<input
+            <Field forId="setup-confirm" label="Confirm password">
+                <Input
                     id="setup-confirm"
                     name="confirmPassword"
                     type="password"
                     required
-                    minlength="8"
-                    maxlength="128"
+                    minlength={8}
+                    maxlength={128}
                     autocomplete="new-password"
                     bind:value={confirmPassword}
-                /></label
+                /></Field
             >
             <Button type="submit" variant="primary" disabled={busy} loading={busy}
                 >Create administrator</Button
@@ -153,20 +155,7 @@
         padding: 0;
         min-width: 0;
     }
-    label {
-        display: grid;
-        gap: 8px;
-        font-size: var(--text-sm);
-    }
-    input {
-        width: 100%;
-        padding: 12px;
-        background: var(--surface-sunken);
-        color: var(--text-primary);
-        border: 1px solid var(--border-control);
-        border-radius: var(--radius-md);
-        font: inherit;
-    }
+
     .help,
     .hint {
         font-size: var(--text-sm);
diff --git a/tests/fixtures/FormControls.svelte b/tests/fixtures/FormControls.svelte
new file mode 100644
index 0000000..fe8851d
--- /dev/null
+++ b/tests/fixtures/FormControls.svelte
@@ -0,0 +1,68 @@
+<script lang="ts">
+    import Field from '../../src/lib/ui/components/primitives/Field.svelte';
+    import Input from '../../src/lib/ui/components/primitives/Input.svelte';
+    import Select from '../../src/lib/ui/components/primitives/Select.svelte';
+
+    let count = $state<number | undefined>(3);
+    let order = $state(false);
+    let version = $state<number | null>(null);
+    let password = $state('');
+    let showPassword = $state(false);
+    let element = $state<HTMLInputElement>();
+    let selected = $state<HTMLSelectElement>();
+    let inputEvents = $state(0);
+    let changes = $state('');
+</script>
+
+<form onsubmit={(event) => event.preventDefault()}>
+    <Field label="Lobbies" forId="count" hint="Choose one to five lobbies.">
+        <Input
+            id="count"
+            type="number"
+            min={1}
+            max={5}
+            step={1}
+            required
+            bind:value={count}
+            bind:element
+            oninput={(event) => (inputEvents = event.currentTarget.valueAsNumber)}
+            aria-describedby="count-extra"
+        />
+    </Field>
+    <p id="count-extra">A separate explanation.</p>
+    <Field label="Order" forId="order">
+        <Select
+            id="order"
+            bind:value={order}
+            bind:element={selected}
+            onchange={(event) => (changes = event.currentTarget.value)}
+        >
+            <option value={true}>Newest</option>
+            <option value={false}>Oldest</option>
+        </Select>
+    </Field>
+    <Field label="Version" forId="version">
+        <Select id="version" bind:value={version}>
+            <option value={null} disabled>Choose a version</option>
+            <optgroup label="Published"
+                ><option value={2}>Version 2</option><option value={7}>Version 7</option></optgroup
+            >
+        </Select>
+    </Field>
+    <Field label="Password" forId="password" error="Use at least eight characters.">
+        <Input
+            id="password"
+            type={showPassword ? 'text' : 'password'}
+            bind:value={password}
+            minlength={8}
+            maxlength={128}
+            autocomplete="new-password"
+            required
+        />
+    </Field>
+    <Field><Input ariaLabel="Standalone search" /></Field>
+    <button type="button" onclick={() => (showPassword = !showPassword)}>Show password</button>
+    <button type="button" onclick={() => element?.focus()}>Focus count</button>
+    <button type="button" onclick={() => selected?.focus()}>Focus order</button>
+    <output id="values">{JSON.stringify({ count, order, version, inputEvents, changes })}</output>
+</form>
diff --git a/tests/unit/ui-form-controls.test.ts b/tests/unit/ui-form-controls.test.ts
new file mode 100644
index 0000000..44030ca
--- /dev/null
+++ b/tests/unit/ui-form-controls.test.ts
@@ -0,0 +1,61 @@
+import { expect, it } from 'vitest';
+import { render } from 'svelte/server';
+import FormControls from '../fixtures/FormControls.svelte';
+import Select from '../../src/lib/ui/components/primitives/Select.svelte';
+
+it('preserves native constraints and combines field help with explicit descriptions', () => {
+    const body = render(FormControls).body;
+    const count = body.match(/<input[^>]*id="count"[^>]*>/)?.[0] ?? '';
+    expect(count).toContain('type="number"');
+    expect(count).toContain('min="1"');
+    expect(count).toContain('max="5"');
+    expect(count).toContain('step="1"');
+    expect(count).toContain('required');
+    expect(count).toContain('value="3"');
+    const descriptions = count.match(/aria-describedby="([^"]+)"/)?.[1].split(' ') ?? [];
+    expect(descriptions).toHaveLength(2);
+    for (const id of descriptions) expect(body).toContain(`id="${id}"`);
+    expect(descriptions).toContain('count-extra');
+    const password = body.match(/<input[^>]*id="password"[^>]*>/)?.[0] ?? '';
+    expect(password).toContain('minlength="8"');
+    expect(password).toContain('maxlength="128"');
+    expect(password).toContain('autocomplete="new-password"');
+    expect(password).toContain('aria-invalid="true"');
+    const errorId = password.match(/aria-describedby="([^"]+)"/)?.[1];
+    expect(body).toContain(`id="${errorId}"`);
+    const standalone = body.match(/<input[^>]*aria-label="Standalone search"[^>]*>/)?.[0] ?? '';
+    expect(standalone).not.toContain('aria-labelledby');
+});
+
+it('renders typed child options, groups and the shared chevron with the selected value', () => {
+    const body = render(FormControls).body;
+    expect(body).toMatch(/<option[^>]*value="false"[^>]*selected[^>]*>Oldest<\/option>/);
+    expect(body).toMatch(/<option[^>]*disabled[^>]*selected[^>]*>Choose a version<\/option>/);
+    expect(body).toContain('<optgroup label="Published">');
+    expect(body.match(/aria-hidden="true">▾/g)).toHaveLength(2);
+});
+
+it('retains the options API, placeholders and explicitly supplied accessibility attributes', () => {
+    const body = render(Select<number>, {
+        props: {
+            value: 2,
+            options: [
+                { value: 1, label: 'One', disabled: true },
+                { value: 2, label: 'Two' }
+            ],
+            placeholder: 'Choose',
+            disabled: true,
+            name: 'quantity',
+            'aria-label': 'Quantity',
+            'aria-describedby': 'quantity-help',
+            'aria-invalid': true
+        }
+    }).body;
+    expect(body).toMatch(/<option value="" disabled[^>]*>Choose<\/option>/);
+    expect(body).toMatch(/<option[^>]*value="1"[^>]*disabled[^>]*>One<\/option>/);
+    expect(body).toMatch(/<option[^>]*value="2"[^>]*selected[^>]*>Two<\/option>/);
+    expect(body).toContain('aria-label="Quantity"');
+    expect(body).toContain('aria-describedby="quantity-help"');
+    expect(body).toContain('aria-invalid="true"');
+    expect(body).toMatch(/<select[^>]*disabled/);
+});
diff --git a/tests/unit/ui-style-check.test.js b/tests/unit/ui-style-check.test.js
new file mode 100644
index 0000000..4297c36
--- /dev/null
+++ b/tests/unit/ui-style-check.test.js
@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest';
+import { checkFormControls } from '../../scripts/check-ui-styles.mjs';
+
+const filename = 'src/routes/example/+page.svelte';
+
+describe('shared form control guard', () => {
+    it.each([
+        '',
+        ' type="text"',
+        ' type="search"',
+        ' type="password"',
+        ' type="email"',
+        ' type="url"',
+        ' type="tel"',
+        ' type="number"',
+        ' type="time"',
+        ' type={visible ? "text" : "password"}'
+    ])('rejects raw input%s with a useful location', (attributes) => {
+        expect(checkFormControls(`<div>\n<input${attributes} />\n</div>`, filename)).toEqual([
+            `${filename}:2: use Field with Input instead of raw <input>`
+        ]);
+    });
+
+    it('finds selects nested in blocks without confusing event expressions for markup', () => {
+        const source =
+            '{#if ready}<select onchange={(event) => choose(event.currentTarget.value)}><option>One</option></select>{/if}';
+        expect(checkFormControls(source, filename)).toEqual([
+            `${filename}:1: use Field with Select instead of raw <select>`
+        ]);
+    });
+
+    it('allows native controls that do not use the text field presentation', () => {
+        const source = [
+            'checkbox',
+            'radio',
+            'file',
+            'hidden',
+            'range',
+            'color',
+            'button',
+            'submit',
+            'reset',
+            'image'
+        ]
+            .map((type) => `<input type="${type}" />`)
+            .join('\n');
+        expect(checkFormControls(source, filename)).toEqual([]);
+        expect(checkFormControls('<input type={"checkbox"} />', filename)).toEqual([]);
+    });
+
+    it('ignores comments, script strings and shared components', () => {
+        const source =
+            '<script>const example = "<input>";</script><!-- <select></select> --><Field label="Search"><Input type="search" /></Field><Select options={[]} />';
+        expect(checkFormControls(source, filename)).toEqual([]);
+    });
+
+    it('allows raw controls only in their implementing primitives', () => {
+        expect(
+            checkFormControls('<input />', 'src/lib/ui/components/primitives/Input.svelte')
+        ).toEqual([]);
+        expect(
+            checkFormControls('<select></select>', 'src/lib/ui/components/primitives/Select.svelte')
+        ).toEqual([]);
+        expect(
+            checkFormControls('<input />', 'src/lib/ui/components/primitives/Field.svelte')
+        ).toHaveLength(1);
+        expect(checkFormControls('<input />', 'src/lib/ui/components/Input.svelte')).toHaveLength(
+            1
+        );
+    });
+});