diff --git a/README.md b/README.md
index 754491d..e70f264 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
   <a href="https://taterassistant.com">taterassistant.com</a>
 </h3>
 
-Train custom microWakeWord models in Docker with NVIDIA/CUDA acceleration, generated Piper samples, device-captured samples, reviewed false-wake negatives, live training logs, and prebuilt Tater firmware flashing.
+Train custom microWakeWord models in Docker with NVIDIA/CUDA acceleration, generated Piper samples, device-captured samples, reviewed false-wake negatives, live training logs, and local wake-word links for Tater Native satellites.
 
 Real samples come from device-captured wake audio, close misses, or manual uploads. Every saved sample is normalized to `16 kHz / mono / 16-bit PCM WAV` before training.
 
@@ -22,7 +22,7 @@ docker pull ghcr.io/tatertotterson/microwakeword:latest
 Tagged releases also publish matching immutable image tags:
 
 ```bash
-docker pull ghcr.io/tatertotterson/microwakeword:v10
+docker pull ghcr.io/tatertotterson/microwakeword:v11
 ```
 
 RTX 50-series / Blackwell GPUs use a separate image with CUDA 12.8 and a
@@ -30,7 +30,7 @@ Python 3.13 TensorFlow build for `sm_120`:
 
 ```bash
 docker pull ghcr.io/tatertotterson/microwakeword:blackwell
-docker pull ghcr.io/tatertotterson/microwakeword:v10-blackwell
+docker pull ghcr.io/tatertotterson/microwakeword:v11-blackwell
 ```
 
 Use the Blackwell image only for RTX 50-series cards. It includes the
@@ -51,19 +51,19 @@ docker run -d \
   ghcr.io/tatertotterson/microwakeword:latest
 ```
 
-Use a version tag such as `ghcr.io/tatertotterson/microwakeword:v10` when you want to pin a known release instead of tracking `latest`.
+Use a version tag such as `ghcr.io/tatertotterson/microwakeword:v11` when you want to pin a known release instead of tracking `latest`.
 For RTX 50-series cards, use `ghcr.io/tatertotterson/microwakeword:blackwell`
-or a pinned tag such as `ghcr.io/tatertotterson/microwakeword:v10-blackwell`
+or a pinned tag such as `ghcr.io/tatertotterson/microwakeword:v11-blackwell`
 in the same `docker run` command.
 
 The flags:
 
 - `--gpus all` enables GPU acceleration.
-- `--network host` lets the container receive mDNS/zeroconf traffic for device auto-detect.
+- `--network host` exposes the trainer server directly so satellites can send captured audio and load trained wake-word files.
 - `-e REC_PORT=8789` sets the trainer web UI and captured-audio port. Change this value if `8789` is already in use.
-- `-v $(pwd):/data` persists models, downloaded voices, datasets, samples, and firmware caches.
+- `-v $(pwd):/data` persists models, downloaded voices, datasets, samples, and generated wake-word artifacts.
 
-Host networking is recommended for the Firmware tab's mDNS device discovery. Manual IP flashing and captured-audio uploads can still work without host networking if the trainer port is reachable, but auto-detect may not see devices from Docker bridge networking.
+If you do not use host networking, publish the trainer port and make sure satellites can reach it from your LAN.
 
 Open:
 
@@ -80,8 +80,8 @@ If you change `REC_PORT`, open that port instead and use the same port in the sa
 - `Trainer` starts a wake-word session, shows positive/negative sample counts, and launches training.
 - `Captured Audio` reviews clips sent by Tater Native or ESPHome sats, including wake hits, close misses, and false wakes.
 - `Samples` plays, removes, clears, and manually imports personal or negative samples.
-- `Firmware` pulls verified prebuilt Tater firmware images from GitHub and flashes supported satellites over OTA.
-- Popup consoles show colorized training and firmware logs while long-running jobs are active.
+- `Wake Words` lists locally trained JSON/model links for live wake-word switching in Tater.
+- Popup consoles show colorized training logs while long-running jobs are active.
 
 ---
 
@@ -207,23 +207,16 @@ After those assets are prepared, later runs reuse the local copies unless the mo
 
 ---
 
-## Firmware Flashing
+## Trained Wake Words
 
-The `Firmware` tab flashes prebuilt Tater firmware for supported satellites.
+The `Wake Words` tab lists locally trained wake-word packages from `/data/trained_wake_words/`.
 
-- Downloads the latest prebuilt firmware manifest plus OTA and USB factory images from [`TaterTotterson/Tater-Native-Firmware`](https://github.com/TaterTotterson/Tater-Native-Firmware).
-- Verifies downloaded images by size and SHA before upload.
-- Auto-detects compatible devices with mDNS when the container is running with host networking.
-- Allows manual IP or hostname entry if discovery does not find the device.
-- Saves the selected OTA target for each firmware family.
-- Flashes the prebuilt factory image over Browser USB for first installs or recovery when opened in Chrome or Edge.
-- Leaves Wi-Fi, Tater server, and pairing setup to the satellite setup portal after USB flash.
-- Lists locally trained wake words from `/data/trained_wake_words/` for live model switching.
-- Streams download, verification, and OTA upload progress in a colorized firmware console.
+- Copy the JSON URL into the Tater Native satellite settings to switch wake words live.
+- Open the JSON or model links directly for quick inspection.
+- The JSON includes the matching model path plus Tater tuning metadata.
+- No firmware flashing happens from this trainer app anymore.
 
-> **Tater only:** these native firmware images connect to Tater. They are not Home Assistant or ESPHome satellite firmware.
-
-You usually only flash for firmware updates. New satellites, or devices not already running Tater Native Firmware `v1`, need one USB flash first before OTA updates and live wake-word switching are available.
+Use the main Tater app for satellite firmware updates and USB flashing.
 
 ---
 
@@ -236,14 +229,14 @@ Successful runs produce timestamped training output folders such as:
 /data/output/<timestamp>-<wake_word>-<samples>-<steps>/<wake_word>.json
 ```
 
-The trainer also syncs firmware-ready artifacts into:
+The trainer also syncs Tater-ready wake-word artifacts into:
 
 ```text
 /data/trained_wake_words/<wake_word>.tflite
 /data/trained_wake_words/<wake_word>.json
 ```
 
-The firmware tab uses `/data/trained_wake_words/` to populate the wake-word dropdown.
+The `Wake Words` tab uses `/data/trained_wake_words/` to populate the local wake-word links.
 
 The JSON keeps the standard microWakeWord fields for compatibility:
 
@@ -296,7 +289,6 @@ That removes:
 - cached datasets
 - training environments
 - trained models
-- downloaded firmware images
 
 ---
 
@@ -306,7 +298,7 @@ That removes:
 - Negative samples are optional but useful for reducing false wakes.
 - The UI server is `trainer_server.py`.
 - The launcher is `run.sh`.
-- Firmware capture settings live in Tater for Tater Native satellites, and on device entities for older ESPHome satellites.
+- Trainer capture settings live in Tater for Tater Native satellites, and on device entities for older ESPHome satellites.
 
 ---
 
diff --git a/cli/calibrate_detector.py b/cli/calibrate_detector.py
index 5cd56da..aad90d9 100644
--- a/cli/calibrate_detector.py
+++ b/cli/calibrate_detector.py
@@ -18,14 +18,14 @@ from microwakeword.data import FeatureHandler
 from microwakeword.inference import Model
 
 
-DEFAULT_WINDOW_SIZES = [3, 4, 5, 6, 7]
-DEFAULT_TARGET_FAPH = float(os.environ.get("MWW_CALIBRATION_TARGET_FAPH", "1.0"))
+DEFAULT_WINDOW_SIZES = [4, 5, 6, 7]
+DEFAULT_TARGET_FAPH = float(os.environ.get("MWW_CALIBRATION_TARGET_FAPH", "0.25"))
 DEFAULT_COOLDOWN_SLICES = int(os.environ.get("MWW_CALIBRATION_COOLDOWN_SLICES", "25"))
 DEFAULT_POSITIVE_SKIP_SLICES = int(
     os.environ.get("MWW_CALIBRATION_POSITIVE_SKIP_SLICES", "25")
 )
 DEFAULT_CUTOFF_STEP = float(os.environ.get("MWW_CALIBRATION_CUTOFF_STEP", "0.01"))
-DEFAULT_CUTOFF_MIN = float(os.environ.get("MWW_CALIBRATION_CUTOFF_MIN", "0.00"))
+DEFAULT_CUTOFF_MIN = float(os.environ.get("MWW_CALIBRATION_CUTOFF_MIN", "0.85"))
 DEFAULT_CUTOFF_MAX = float(os.environ.get("MWW_CALIBRATION_CUTOFF_MAX", "1.00"))
 
 
diff --git a/cli/wake_word_sample_trainer b/cli/wake_word_sample_trainer
index c25c290..1719ed1 100644
--- a/cli/wake_word_sample_trainer
+++ b/cli/wake_word_sample_trainer
@@ -302,11 +302,11 @@ TRAIN_ARGS=(
   --test_tflite_streaming_quantized 1
   --use_weights best_weights
   mixednet
-  --pointwise_filters "64,64,64,64"
+  --pointwise_filters "128,128,128,128"
   --repeat_in_block "1,1,1,1"
   --mixconv_kernel_sizes "[5], [7,11], [9,15], [23]"
   --residual_connection "0,0,0,0"
-  --first_conv_filters 32
+  --first_conv_filters 64
   --first_conv_kernel_size 5
   --stride 2
 )
@@ -386,6 +386,7 @@ fi
 TRAINING_DONE="false"
 
 echo "🏋️ Starting model training and TFLite export (this is the longest stage)…"
+echo "🧠 Model quality: high_accuracy_plus"
 if run_attempt "Attempt 1/3: GPU training (default runtime profile)" ; then
   echo "✅ Training complete (GPU path)."
   TRAINING_DONE="true"
@@ -495,8 +496,9 @@ from pathlib import Path
 json_path = Path(os.environ["JSON_PATH"])
 calibration_path = Path(os.environ.get("CALIBRATION_PATH", ""))
 language = (os.environ.get("LANGUAGE", "en") or "en").strip().lower()
-probability_cutoff = 0.97
-sliding_window_size = 5
+probability_cutoff = 0.85
+sliding_window_size = 4
+strict_min_close_miss_threshold = 0.68
 calibration = {}
 
 if calibration_path.exists():
@@ -515,7 +517,10 @@ probability_cutoff = round(probability_cutoff, 3)
 sliding_window_size = max(1, min(10, int(sliding_window_size)))
 selected_metrics = calibration.get("selected_metrics") if isinstance(calibration.get("selected_metrics"), dict) else {}
 evaluation = calibration.get("evaluation") if isinstance(calibration.get("evaluation"), dict) else {}
-close_miss_threshold = max(0.01, min(0.99, round(max(0.01, probability_cutoff - 0.19), 3)))
+close_miss_threshold = max(
+    0.01,
+    min(0.99, round(max(strict_min_close_miss_threshold, probability_cutoff - 0.17), 3)),
+)
 
 meta = {
     "type": "micro",
diff --git a/run.sh b/run.sh
index b65d833..ea9f41f 100644
--- a/run.sh
+++ b/run.sh
@@ -30,7 +30,6 @@ install_ui_deps() {
     "fastapi==${FASTAPI_VERSION}" \
     "uvicorn[standard]==${UVICORN_VERSION}" \
     "python-multipart==${PY_MULTIPART_VERSION}" \
-    "zeroconf>=0.132.2" \
     "silero-vad>=5.0.0" \
     "numpy>=1.24.0"
 }
@@ -79,7 +78,6 @@ exact = {
 minimum = {
     "silero-vad": "5.0.0",
     "numpy": "1.24.0",
-    "zeroconf": "0.132.2",
 }
 present = ("torch",)
 
diff --git a/static/index.html b/static/index.html
index 634c0aa..d95bf0a 100644
--- a/static/index.html
+++ b/static/index.html
@@ -348,6 +348,13 @@
       font-size: 13px;
     }
 
+    .runtimeWakeWordActions {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      flex-wrap: wrap;
+    }
+
     .runtimeWakeWordLinks {
       display: grid;
       gap: 10px;
@@ -370,6 +377,12 @@
       margin-bottom: 4px;
     }
 
+    .runtimeWakeWordUrls {
+      display: grid;
+      gap: 3px;
+      margin-top: 6px;
+    }
+
     .runtimeWakeWordUrl {
       display: block;
       overflow: hidden;
@@ -968,157 +981,6 @@
       margin-top: 2px;
     }
 
-    .firmwareLogModal {
-      position: fixed;
-      inset: 0;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding: 20px;
-      background: rgba(0, 0, 0, 0.64);
-      opacity: 0;
-      visibility: hidden;
-      pointer-events: none;
-      z-index: 12000;
-    }
-
-    .firmwareLogModal.active {
-      visibility: visible;
-      pointer-events: auto;
-      animation: firmwareLogBackdropIn 280ms ease-out both;
-    }
-
-    .firmwareLogDialog {
-      width: min(1320px, 98vw);
-      height: min(94vh, 1040px);
-      display: flex;
-      flex-direction: column;
-      gap: 12px;
-      padding: 18px;
-      border-radius: 22px;
-      border: 1px solid rgba(255,255,255,0.12);
-      background:
-        linear-gradient(180deg, rgba(17, 20, 28, 0.88), rgba(8, 10, 16, 0.96)),
-        rgba(8, 10, 16, 0.88);
-      box-shadow: 0 28px 84px rgba(0,0,0,0.58);
-      backdrop-filter: blur(18px) saturate(1.12);
-      overflow: hidden;
-      opacity: 0;
-      transform: translateY(14px) scale(0.97);
-    }
-
-    .firmwareLogModal.active .firmwareLogDialog {
-      animation: firmwareLogDialogIn 300ms cubic-bezier(0.2, 0.8, 0.2, 1) both;
-    }
-
-    .firmwareLogHeader {
-      display: flex;
-      justify-content: space-between;
-      align-items: flex-start;
-      gap: 16px;
-    }
-
-    .firmwareLogTitle {
-      margin: 0;
-      font-size: 18px;
-    }
-
-    .firmwareLogMeta {
-      margin: 6px 0 0;
-      color: var(--muted);
-      font-size: 13px;
-    }
-
-    .firmwareLogStatus {
-      color: #b7c7e6;
-      font-size: 13px;
-    }
-
-    .firmwareLogConsole {
-      flex: 1 1 auto;
-      min-height: 0;
-      overflow: auto;
-      border: 1px solid rgba(255,138,42,0.22);
-      border-radius: 16px;
-      padding: 12px 14px;
-      background:
-        linear-gradient(180deg, rgba(15, 18, 25, 0.98), rgba(10, 12, 18, 0.98)),
-        radial-gradient(circle at top, rgba(255,138,42,0.08), transparent 40%);
-      box-shadow:
-        inset 0 1px 0 rgba(255,255,255,0.05),
-        inset 0 -1px 0 rgba(0,0,0,0.35);
-      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
-      font-size: 13px;
-      line-height: 1.45;
-      color: #dbe8ff;
-    }
-
-    .firmwareLogLine {
-      display: grid;
-      grid-template-columns: auto minmax(0, 1fr);
-      gap: 10px;
-      align-items: start;
-      padding: 2px 0;
-    }
-
-    .firmwareLogLevel {
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      min-width: 58px;
-      border-radius: 999px;
-      padding: 2px 8px;
-      font-size: 11px;
-      font-weight: 800;
-      letter-spacing: 0.04em;
-      border: 1px solid rgba(255,255,255,0.12);
-      white-space: nowrap;
-    }
-
-    .firmwareLogMessage {
-      white-space: pre-wrap;
-      word-break: break-word;
-    }
-
-    .firmwareLogLine.tone-info .firmwareLogLevel {
-      background: rgba(70, 120, 255, 0.16);
-      border-color: rgba(108, 152, 255, 0.28);
-      color: #bdd3ff;
-    }
-
-    .firmwareLogLine.tone-warn .firmwareLogLevel {
-      background: rgba(245, 167, 36, 0.14);
-      border-color: rgba(245, 167, 36, 0.32);
-      color: #ffd696;
-    }
-
-    .firmwareLogLine.tone-error .firmwareLogLevel {
-      background: rgba(226, 76, 76, 0.15);
-      border-color: rgba(255, 111, 111, 0.34);
-      color: #ffc1c1;
-    }
-
-    .firmwareLogLine.tone-debug .firmwareLogLevel {
-      background: rgba(92, 214, 178, 0.14);
-      border-color: rgba(92, 214, 178, 0.28);
-      color: #bffff0;
-    }
-
-    .firmwareLogEmpty {
-      color: var(--muted);
-    }
-
-    @keyframes firmwareLogBackdropIn {
-      from { opacity: 0; }
-      to { opacity: 1; }
-    }
-
-    @keyframes firmwareLogDialogIn {
-      from { opacity: 0; transform: translateY(14px) scale(0.97); }
-      62% { transform: translateY(-3px) scale(1.01); }
-      to { opacity: 1; transform: translateY(0) scale(1); }
-    }
-
     .consoleMuted { color: #93a0b5; }
     .consoleText { color: #d8e2f1; }
     .consoleCmd { color: #89d4ff; }
@@ -1263,22 +1125,6 @@
         height: min(82vh, 760px);
         padding: 14px;
       }
-      .firmwareLogModal {
-        padding: 12px;
-      }
-      .firmwareLogDialog {
-        width: 100%;
-        height: 88vh;
-        padding: 14px;
-      }
-      .firmwareLogHeader {
-        flex-direction: column;
-        align-items: stretch;
-      }
-      .firmwareLogLine {
-        grid-template-columns: 1fr;
-        gap: 4px;
-      }
       .consoleHeader {
         flex-direction: column;
         align-items: stretch;
@@ -1311,14 +1157,14 @@
         <div class="logo"></div>
         <div>
           <h1>microWakeWord Trainer Studio</h1>
-          <p>Train wake words, review captured clips, and flash Tater Native firmware from one local workspace.</p>
+          <p>Train wake words, review captured clips, and publish live model URLs for Tater Native satellites.</p>
         </div>
       </div>
     </div>
 
     <div class="tabs">
       <button id="tabTrainer" class="tabBtn active" type="button">Trainer</button>
-      <button id="tabFirmware" class="tabBtn" type="button">Firmware</button>
+      <button id="tabFirmware" class="tabBtn" type="button">Wake Words</button>
       <button id="tabCaptured" class="tabBtn" type="button">Captured Audio</button>
       <button id="tabSamples" class="tabBtn" type="button">Samples</button>
     </div>
@@ -1552,22 +1398,22 @@
       <div class="card firmwareHero">
         <div class="row space">
           <div>
-            <div class="firmwareKicker">Firmware Studio</div>
-            <h3>Prebuilt Tater Firmware Flasher</h3>
-            <p>Flash only for firmware updates. If this is a new satellite or it is not already on Tater Native Firmware <code>v1</code>, do one USB flash first, then use this tab for fast OTA updates.</p>
-            <div class="firmwareSteps" aria-label="Firmware flashing steps">
-              <span class="firmwareStepChip"><b>1</b> Pick firmware</span>
-              <span class="firmwareStepChip"><b>2</b> Select target</span>
-              <span class="firmwareStepChip"><b>3</b> Flash OTA or USB</span>
+            <div class="firmwareKicker">Wake Word Catalog</div>
+            <h3>Trained Wake Words</h3>
+            <p>Every completed training run publishes a local JSON package and model file. Copy the JSON URL into the native satellite settings in Tater to switch wake words live.</p>
+            <div class="firmwareSteps" aria-label="Wake word publishing steps">
+              <span class="firmwareStepChip"><b>1</b> Train model</span>
+              <span class="firmwareStepChip"><b>2</b> Copy JSON URL</span>
+              <span class="firmwareStepChip"><b>3</b> Paste in Tater</span>
             </div>
           </div>
-          <span id="firmwareStatus" class="pill">Flasher idle</span>
+          <span id="firmwareStatus" class="pill">Catalog idle</span>
         </div>
       </div>
 
       <div class="card firmwareTaterOnlyNotice">
-        <strong>Tater only</strong>
-        <span>These native firmware images connect to Tater. They are not Home Assistant or ESPHome satellite firmware.</span>
+        <strong>Tater Native</strong>
+        <span>These generated wake-word URLs are for Tater Native satellites and are loaded from the satellite settings in Tater.</span>
       </div>
 
       <div class="card runtimeWakeWordCard">
@@ -1576,89 +1422,19 @@
             <span class="runtimeWakeWordBadge">v1</span>
             <div>
               <div class="firmwareKicker">Live Model Switching</div>
-              <h3>Tater Native satellites can swap wake words live</h3>
-              <p>No reflash is needed after training. Copy a trained wake word JSON URL below and paste it into the native satellite settings in Tater.</p>
+              <h3>Copy trained wake-word URLs</h3>
+              <p>The JSON file points Tater and the satellite at the matching model plus trainer tuning values.</p>
             </div>
           </div>
-          <span class="pill ok">No reflash needed</span>
+          <div class="runtimeWakeWordActions">
+            <span class="pill ok">No reflash needed</span>
+            <button id="refreshWakeWordsBtn" type="button">Refresh</button>
+          </div>
         </div>
         <div id="runtimeWakeWordLinks" class="runtimeWakeWordLinks">
           <div class="emptyState">Train a wake word first, then its live model URL will appear here.</div>
         </div>
       </div>
-
-      <div class="firmwareLayout">
-        <section class="card firmwarePanel stack">
-          <div class="firmwarePanelHeader">
-            <div class="firmwarePanelTitle">
-              <span class="firmwareStepBadge">1</span>
-              <div>
-                <h3>Firmware Image</h3>
-                <p>Choose a prebuilt Tater firmware image from the Tater Native Firmware releases.</p>
-              </div>
-            </div>
-          </div>
-          <label class="field">
-            <strong>Firmware Family</strong>
-            <select id="firmwareTemplate">
-              <option value="">Loading firmware images...</option>
-            </select>
-          </label>
-        </section>
-
-        <section class="card firmwarePanel stack">
-          <div class="firmwarePanelHeader">
-            <div class="firmwarePanelTitle">
-              <span class="firmwareStepBadge">2</span>
-              <div>
-                <h3>Target Device</h3>
-                <p>Auto-detect a device or enter the OTA target manually.</p>
-              </div>
-            </div>
-            <span id="firmwareDetectStatus" class="pill">Not scanned</span>
-          </div>
-          <div class="row">
-            <button id="refreshFirmwareBtn" type="button">Auto-detect Tater satellites</button>
-          </div>
-          <div class="firmwareTargetGrid">
-            <label class="field">
-              <strong>Detected Device</strong>
-              <select id="firmwareDeviceSelect">
-                <option value="">Choose target...</option>
-                <option value="__browser_usb_flash__">Browser USB Flash (new/recovery)</option>
-              </select>
-            </label>
-            <label class="field">
-              <strong>Device IP or Hostname</strong>
-              <input id="firmwareHost" type="text" placeholder="e.g. 10.4.20.139 or tatervpe.local" />
-            </label>
-            <label class="field">
-              <strong>OTA Port</strong>
-              <input id="firmwarePort" type="number" min="1" max="65535" value="3232" />
-            </label>
-          </div>
-        </section>
-      </div>
-
-      <div id="firmwareFields" class="firmwareFields stack" hidden></div>
-
-      <section class="card firmwareActionsPanel">
-        <div class="firmwarePanelTitle">
-          <span class="firmwareStepBadge">3</span>
-          <div>
-            <h3>Flash Firmware</h3>
-            <p>The console shows download, verification, OTA upload, USB flash, and reboot progress.</p>
-          </div>
-        </div>
-        <div class="row firmwareActions">
-          <button id="flashFirmwareBtn" class="primary" type="button" disabled>Flash OTA Update</button>
-          <button id="usbFirmwareBtn" type="button" disabled>Browser USB Flash</button>
-          <button id="saveFirmwareSettingsBtn" type="button">Save target</button>
-          <button id="cleanFirmwareBtn" type="button">Clear downloaded images</button>
-          <button id="openFirmwareConsoleBtn" type="button">Open firmware console</button>
-        </div>
-        <div class="usbFlashHint">Use Browser USB Flash for new satellites, recovery, or devices not already running Tater Native Firmware v1. After USB flash, join the satellite setup hotspot and finish Wi-Fi, Tater server, and pairing in the device setup page. Chrome or Edge must be used on localhost or HTTPS.</div>
-      </section>
     </div>
   </div>
 
@@ -1677,22 +1453,6 @@
     </div>
   </div>
 
-  <div id="firmwareLogModal" class="firmwareLogModal" aria-hidden="true">
-    <div id="firmwareLogDialog" class="firmwareLogDialog" role="dialog" aria-modal="true" aria-labelledby="firmwareLogTitle">
-      <div class="firmwareLogHeader">
-        <div>
-          <h3 id="firmwareLogTitle" class="firmwareLogTitle">Prebuilt Firmware Flash</h3>
-          <p id="firmwareLogMeta" class="firmwareLogMeta">Firmware output will appear here.</p>
-        </div>
-        <button id="closeFirmwareLogBtn" type="button">Close</button>
-      </div>
-      <div id="firmwareLogStatus" class="firmwareLogStatus">Waiting for firmware output...</div>
-      <div id="firmwareLogConsole" class="firmwareLogConsole" role="log" aria-live="polite" aria-label="Firmware flash log">
-        <div class="firmwareLogEmpty">No firmware flash started yet.</div>
-      </div>
-    </div>
-  </div>
-
   <div id="trimOverlay" class="trimOverlay" aria-hidden="true">
     <div id="trimDialog" class="trimDialog" role="dialog" aria-modal="true">
       <div class="trimHeader">
@@ -1737,20 +1497,14 @@
     selectedFiles: [],
     captured: { items: [], captured_count: 0, negative_count: 0, personal_count: 0 },
     samples: { personal: [], negative: [], personal_count: 0, negative_count: 0, activeBucket: "personal", pages: { personal: 0, negative: 0 } },
-    firmware: { devices: [], templates: [], wakeWords: [], flashing: null, logLines: [], activeTemplateKey: "" },
-    browserUsb: { ports: {}, esptoolJsModule: null, esptoolJsLoadPromise: null },
+    firmware: { wakeWords: [] },
     uploadBusy: false,
     reviewBusy: false,
     firmwareBusy: false,
     trainingPoller: null,
-    firmwarePoller: null,
     activeView: "trainer",
   };
   const SAMPLE_PAGE_SIZE = 50;
-  let firmwareProfileSaveTimer = null;
-  let firmwareProfileReloadTimer = null;
-  let wakeSoundPreviewAudio = null;
-  let wakeSoundPreviewButton = null;
 
   // --- Trim Waveform Module ---
   const TrimWaveform = {
@@ -2355,352 +2109,6 @@
     }
   }
 
-  function firmwareLogTone(line) {
-    const text = String(line || "").trim();
-    const lower = text.toLowerCase();
-    const bracketMatch = text.match(/^\[[^\]]+\]\[([A-Z])\]/);
-    const token = bracketMatch?.[1] || "";
-    if (token === "E" || text.includes("✗") || lower.includes("traceback") || lower.includes("error") || lower.includes("failed") || lower.includes("crashed")) {
-      return "error";
-    }
-    if (token === "W" || text.includes("⚠") || lower.includes("warning") || lower.includes("warn")) {
-      return "warn";
-    }
-    if (token === "D" || token === "V" || lower.includes("[debug]")) {
-      return "debug";
-    }
-    return "info";
-  }
-
-  function firmwareLogLevel(line) {
-    const tone = firmwareLogTone(line);
-    if (tone === "error") return "ERROR";
-    if (tone === "warn") return "WARN";
-    if (tone === "debug") return "DEBUG";
-    return "INFO";
-  }
-
-  function renderFirmwareLogLines(lines, reset = true) {
-    const consoleEl = $("firmwareLogConsole");
-    const rows = Array.isArray(lines) ? lines.filter((line) => String(line || "").trim()) : [];
-    const shouldStick = reset || isNearBottom(consoleEl, 28);
-    if (reset) {
-      consoleEl.innerHTML = "";
-    }
-    if (!rows.length) {
-      consoleEl.innerHTML = `<div class="firmwareLogEmpty">Waiting for firmware flash output...</div>`;
-    } else {
-      consoleEl.innerHTML = rows.map((line) => {
-        const tone = firmwareLogTone(line);
-        return `
-          <div class="firmwareLogLine tone-${tone}">
-            <span class="firmwareLogLevel">${firmwareLogLevel(line)}</span>
-            <span class="firmwareLogMessage">${escapeHtml(line)}</span>
-          </div>
-        `;
-      }).join("");
-    }
-    if (shouldStick) {
-      consoleEl.scrollTop = consoleEl.scrollHeight;
-    }
-  }
-
-  function setFirmwareLogStatus(text) {
-    $("firmwareLogStatus").textContent = String(text || "Waiting for firmware output...").trim() || "Waiting for firmware output...";
-  }
-
-  function appendFirmwareLog(line, statusText = "") {
-    const text = String(line || "").trim();
-    if (!text) return;
-    uiState.firmware.logLines = [...(uiState.firmware.logLines || []), text].slice(-500);
-    renderFirmwareLogLines(uiState.firmware.logLines, true);
-    if (statusText) {
-      setFirmwareLogStatus(statusText);
-    }
-  }
-
-  function appendFirmwareLogs(lines, statusText = "") {
-    (Array.isArray(lines) ? lines : []).forEach((line) => appendFirmwareLog(line));
-    if (statusText) {
-      setFirmwareLogStatus(statusText);
-    }
-  }
-
-  function openFirmwareConsole(wobble = true, text = null, statusText = "") {
-    const template = selectedFirmwareTemplate();
-    const host = ($("firmwareHost").value || "").trim();
-    const port = ($("firmwarePort").value || "3232").trim();
-    $("firmwareLogTitle").textContent = "Prebuilt Firmware Flash";
-    $("firmwareLogMeta").textContent = [
-      template?.label || template?.value || "Firmware",
-      host ? `${host}:${port || "3232"}` : "",
-    ].filter(Boolean).join(" • ") || "Firmware output will appear here.";
-    if (text !== null) {
-      renderFirmwareLogLines(String(text).split("\n"), true);
-    } else {
-      renderFirmwareLogLines(uiState.firmware.logLines || [], true);
-    }
-    setFirmwareLogStatus(statusText || "Prebuilt firmware download, verification, and upload output appears here.");
-    const modal = $("firmwareLogModal");
-    const dialog = $("firmwareLogDialog");
-    modal.classList.add("active");
-    modal.setAttribute("aria-hidden", "false");
-    dialog.setAttribute("tabindex", "-1");
-    try {
-      dialog.focus({ preventScroll: true });
-    } catch (_) {
-      dialog.focus();
-    }
-    if (wobble) {
-      dialog.style.animation = "none";
-      void dialog.offsetWidth;
-      dialog.style.animation = "";
-    }
-  }
-
-  function closeFirmwareConsole() {
-    $("firmwareLogModal").classList.remove("active");
-    $("firmwareLogModal").setAttribute("aria-hidden", "true");
-  }
-
-  function waitForPaint() {
-    return new Promise((resolve) => {
-      if (typeof requestAnimationFrame === "function") {
-        requestAnimationFrame(() => resolve());
-      } else {
-        setTimeout(resolve, 0);
-      }
-    });
-  }
-
-  function sleep(ms) {
-    return new Promise((resolve) => setTimeout(resolve, Math.max(0, Number(ms) || 0)));
-  }
-
-  function browserUsbPortLabel(port) {
-    if (!port || typeof port.getInfo !== "function") {
-      return "USB serial device";
-    }
-    const info = port.getInfo() || {};
-    const vendor = Number(info.usbVendorId || 0);
-    const product = Number(info.usbProductId || 0);
-    if (!vendor && !product) {
-      return "USB serial device";
-    }
-    const hex = (value) => value.toString(16).padStart(4, "0");
-    return `USB ${hex(vendor)}:${hex(product)}`;
-  }
-
-  async function browserUsbSelectPort(selector = "") {
-    if (!window.isSecureContext || !navigator.serial) {
-      throw new Error("Browser USB flash needs Chrome or Edge on HTTPS or localhost. Open the trainer URL in Chrome or Edge.");
-    }
-    const port = await navigator.serial.requestPort();
-    const key = String(selector || "default").trim() || "default";
-    uiState.browserUsb.ports[key] = port;
-    return port;
-  }
-
-  function browserUsbStoredPort(selector = "") {
-    const key = String(selector || "default").trim() || "default";
-    return uiState.browserUsb.ports?.[key] || null;
-  }
-
-  function normalizeEsptoolJsModule(module) {
-    if (module?.ESPLoader && module?.Transport) {
-      return module;
-    }
-    if (module?.default?.ESPLoader && module?.default?.Transport) {
-      return module.default;
-    }
-    return null;
-  }
-
-  async function ensureEsptoolJsLoaded() {
-    if (uiState.browserUsb.esptoolJsModule) {
-      return uiState.browserUsb.esptoolJsModule;
-    }
-    if (uiState.browserUsb.esptoolJsLoadPromise instanceof Promise) {
-      return uiState.browserUsb.esptoolJsLoadPromise;
-    }
-    const moduleUrls = [
-      "https://esm.sh/esptool-js@0.5.7?bundle",
-      "https://unpkg.com/esptool-js@0.5.7/bundle.js",
-      "https://cdn.jsdelivr.net/npm/esptool-js@0.5.7/bundle.js",
-    ];
-    uiState.browserUsb.esptoolJsLoadPromise = (async () => {
-      const errors = [];
-      for (const moduleUrl of moduleUrls) {
-        try {
-          const module = normalizeEsptoolJsModule(await import(moduleUrl));
-          if (module) {
-            uiState.browserUsb.esptoolJsModule = module;
-            return module;
-          }
-          errors.push(`${moduleUrl}: missing ESPLoader/Transport exports`);
-        } catch (error) {
-          errors.push(`${moduleUrl}: ${String(error?.message || error || "load failed")}`);
-        }
-      }
-      throw new Error(`Could not load esptool-js. ${errors.join(" | ")}`);
-    })();
-    return uiState.browserUsb.esptoolJsLoadPromise;
-  }
-
-  async function fetchFirmwareBinary(binaryUrl) {
-    const response = await fetch(binaryUrl, { credentials: "same-origin" });
-    if (!response.ok) {
-      throw new Error(`Firmware download failed: HTTP ${response.status}`);
-    }
-    return new Uint8Array(await response.arrayBuffer());
-  }
-
-  function uint8ArrayToBinaryString(bytes) {
-    const chunks = [];
-    const chunkSize = 0x8000;
-    for (let offset = 0; offset < bytes.length; offset += chunkSize) {
-      chunks.push(String.fromCharCode(...bytes.subarray(offset, offset + chunkSize)));
-    }
-    return chunks.join("");
-  }
-
-  async function browserUsbWithTimeout(promise, timeoutMs, message) {
-    let timeoutId = 0;
-    try {
-      return await Promise.race([
-        promise,
-        new Promise((_resolve, reject) => {
-          timeoutId = setTimeout(() => reject(new Error(message)), Math.max(1, Number(timeoutMs) || 1));
-        }),
-      ]);
-    } finally {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
-    }
-  }
-
-  async function browserUsbSetSignals(port, signals, timeoutMs = 1200) {
-    if (!port || typeof port.setSignals !== "function") {
-      return false;
-    }
-    await browserUsbWithTimeout(
-      port.setSignals(signals),
-      timeoutMs,
-      "Timed out setting USB serial control signals."
-    );
-    return true;
-  }
-
-  async function browserUsbHardResetAfterFlash(transport, loader, port) {
-    try {
-      appendFirmwareLog("Resetting device after USB flash.");
-      if (transport && typeof transport.setRTS === "function") {
-        await transport.setRTS(true);
-      } else {
-        await browserUsbSetSignals(port, { dataTerminalReady: false, requestToSend: true, break: false });
-      }
-      await sleep(100);
-      if (loader && typeof loader.after === "function") {
-        await loader.after();
-      }
-      await sleep(1000);
-      return true;
-    } catch (error) {
-      appendFirmwareLog(`USB reset warning: ${String(error?.message || error)}`);
-      return false;
-    }
-  }
-
-  async function flashBrowserUsbPort(port, artifact) {
-    const module = await ensureEsptoolJsLoaded();
-    const { ESPLoader, Transport } = module;
-    if (!ESPLoader || !Transport) {
-      throw new Error("esptool-js did not expose ESPLoader/Transport.");
-    }
-    const binaryUrl = String(artifact?.binary_url || "").trim();
-    if (!binaryUrl) {
-      throw new Error("Browser flash binary URL is missing.");
-    }
-
-    const transport = new Transport(port);
-    const terminal = {
-      clean() {},
-      writeLine(data) {
-        const text = String(data || "").trim();
-        if (text) appendFirmwareLog(text);
-      },
-      write(data) {
-        const text = String(data || "").trim();
-        if (text) appendFirmwareLog(text);
-      },
-    };
-    const loader = new ESPLoader({
-      transport,
-      baudrate: 115200,
-      terminal,
-      debugLogging: false,
-    });
-
-    let lastProgress = -1;
-    try {
-      appendFirmwareLog(`Connecting to ${browserUsbPortLabel(port)}...`, "Connecting to selected USB device...");
-      const chipName = await loader.main();
-      appendFirmwareLog(`Connected to ${chipName || "ESP device"}.`);
-
-      setFirmwareLogStatus("Downloading prepared factory firmware...");
-      const firmwareData = await fetchFirmwareBinary(binaryUrl);
-      appendFirmwareLog(`Firmware downloaded (${firmwareData.byteLength} bytes).`);
-
-      const eraseAll = artifact?.erase_all !== false;
-      if (eraseAll) {
-        appendFirmwareLog("Erasing flash and writing factory image at offset 0x0.");
-      } else {
-        appendFirmwareLog("Writing factory image at offset 0x0.");
-      }
-      const flashOptions = {
-        fileArray: [{ data: firmwareData, address: 0 }],
-        flashMode: String(artifact?.flash_mode || "dio"),
-        flashFreq: String(artifact?.flash_freq || "40m"),
-        flashSize: String(artifact?.flash_size || "4MB"),
-        eraseAll,
-        compress: true,
-        reportProgress: (_fileIndex, written, total) => {
-          const pct = total > 0 ? Math.floor((written / total) * 100) : 0;
-          if (pct >= lastProgress + 5 || pct === 100) {
-            lastProgress = pct;
-            appendFirmwareLog(`USB flash progress: ${pct}% (${written}/${total} bytes)`, `Flashing over USB... ${pct}%`);
-          }
-        },
-      };
-      try {
-        await loader.writeFlash(flashOptions);
-      } catch (error) {
-        const message = String(error?.message || error || "");
-        if (!message.includes("charCodeAt")) {
-          throw error;
-        }
-        appendFirmwareLog("Retrying flash with binary-string firmware format.");
-        await loader.writeFlash({
-          ...flashOptions,
-          eraseAll: false,
-          fileArray: [{ data: uint8ArrayToBinaryString(firmwareData), address: 0 }],
-        });
-      }
-      appendFirmwareLog("USB flash complete.");
-      const resetWorked = await browserUsbHardResetAfterFlash(transport, loader, port);
-      if (!resetWorked) {
-        appendFirmwareLog("If the device does not restart, unplug and reconnect USB once to leave bootloader mode.");
-      }
-    } finally {
-      try {
-        await transport.disconnect();
-      } catch (_error) {
-        // Ignore disconnect cleanup failures.
-      }
-    }
-  }
-
   function closeConsole() {
     $("consoleOverlay").classList.remove("open");
     $("consoleOverlay").setAttribute("aria-hidden", "true");
@@ -2713,121 +2121,6 @@
       : "No files selected";
   }
 
-  const FIRMWARE_USB_DEVICE_VALUE = "__browser_usb_flash__";
-
-  function firmwareUsbSelected() {
-    return $("firmwareDeviceSelect").value === FIRMWARE_USB_DEVICE_VALUE;
-  }
-
-  function renderFirmwareDevices(devices, message) {
-    const list = Array.isArray(devices) ? devices : [];
-    uiState.firmware.devices = list;
-
-    $("firmwareDeviceSelect").innerHTML = [
-      `<option value="">Choose target...</option>`,
-      `<option value="${FIRMWARE_USB_DEVICE_VALUE}">Browser USB Flash (new/recovery)</option>`,
-      ...list.map((device, index) => {
-        const label = `${device.name || device.host} (${device.host}:${device.port || 3232})`;
-        return `<option value="${index}">${escapeHtml(label)}</option>`;
-      }),
-    ].join("");
-
-    if (!list.length) {
-      setPill($("firmwareDetectStatus"), message || "No devices detected", "warn");
-      if (!($("firmwareHost").value || "").trim()) {
-        $("firmwareDeviceSelect").value = FIRMWARE_USB_DEVICE_VALUE;
-        applySelectedFirmwareDevice().catch((error) => {
-          setPill($("firmwareStatus"), "USB settings failed", "warn");
-          console.warn("USB settings load failed", error);
-        });
-      }
-      return;
-    }
-
-    setPill($("firmwareDetectStatus"), `${list.length} detected`, "ok");
-    if (!($("firmwareHost").value || "").trim() && !firmwareUsbSelected()) {
-      $("firmwareDeviceSelect").value = "0";
-      applySelectedFirmwareDevice().catch((error) => {
-        setPill($("firmwareStatus"), "Device settings failed", "warn");
-        console.warn("Device settings load failed", error);
-      });
-    }
-  }
-
-  async function refreshFirmwareDevices() {
-    setPill($("firmwareDetectStatus"), "Scanning mDNS...", "warn");
-    const data = await api("/api/firmware/devices", { method: "GET" });
-    renderFirmwareDevices(data.devices, data.message);
-    syncButtons();
-    return data;
-  }
-
-  async function applySelectedFirmwareDevice() {
-    const indexText = $("firmwareDeviceSelect").value;
-    if (indexText === "") return;
-    if (indexText === FIRMWARE_USB_DEVICE_VALUE) {
-      $("firmwareHost").value = "";
-      $("firmwarePort").value = "3232";
-      setPill($("firmwareStatus"), "Browser USB selected", "ok");
-      await refreshFirmwareTemplates();
-      syncButtons();
-      return;
-    }
-    const device = uiState.firmware.devices[Number(indexText)];
-    if (!device) return;
-    await flushFirmwareProfileSave();
-    $("firmwareHost").value = device.host || "";
-    $("firmwarePort").value = device.port || 3232;
-    setPill($("firmwareStatus"), "Loading device settings...", "warn");
-    const data = await refreshFirmwareTemplates();
-    if (!Array.isArray(data?.warnings) || !data.warnings.length) {
-      setPill($("firmwareStatus"), "Device settings loaded", "ok");
-    }
-    syncButtons();
-  }
-
-  function selectedFirmwareTemplate() {
-    const key = $("firmwareTemplate").value;
-    const match = (uiState.firmware.templates || []).find((item) => String(item.value || "") === key);
-    if (match) return match;
-    if (!key) return null;
-    const label = $("firmwareTemplate").selectedOptions?.[0]?.textContent || key;
-    return { value: key, label };
-  }
-
-  function applyFirmwareTemplateTarget(template = selectedFirmwareTemplate()) {
-    if (!template) return;
-    if (firmwareUsbSelected()) return;
-    if (template.target_host) {
-      $("firmwareHost").value = template.target_host;
-    }
-    if (template.target_port) {
-      $("firmwarePort").value = template.target_port;
-    }
-  }
-
-  function renderFirmwareTemplates(payload) {
-    const templates = Array.isArray(payload?.templates) ? payload.templates : [];
-    const previousTemplateKey = $("firmwareTemplate").value || uiState.firmware.activeTemplateKey || "";
-    uiState.firmware.templates = templates;
-    uiState.firmware.wakeWords = Array.isArray(payload?.wake_words) ? payload.wake_words : [];
-    renderRuntimeWakeWordLinks();
-    $("firmwareTemplate").innerHTML = templates.length
-      ? templates.map((item) => {
-          const version = item.firmware_version ? ` ${item.firmware_version}` : "";
-          return `<option value="${escapeAttr(item.value)}">${escapeHtml((item.label || item.value) + version)}</option>`;
-        }).join("")
-      : `<option value="">No firmware images found</option>`;
-    if (previousTemplateKey && templates.some((item) => String(item.value || "") === previousTemplateKey)) {
-      $("firmwareTemplate").value = previousTemplateKey;
-    } else if (payload?.active_template_key) {
-      $("firmwareTemplate").value = payload.active_template_key;
-    }
-    uiState.firmware.activeTemplateKey = $("firmwareTemplate").value;
-    renderFirmwareFields();
-    applyFirmwareTemplateTarget();
-  }
-
   function renderRuntimeWakeWordLinks() {
     const container = $("runtimeWakeWordLinks");
     if (!container) return;
@@ -2836,6 +2129,7 @@
       .map((item) => ({
         label: String(item.label || item.wake_word || item.wake_word_name || item.key || "Trained wake word"),
         url: String(item.json_url || "").trim(),
+        modelUrl: String(item.model_url || "").trim(),
         threshold: item.threshold,
         slidingWindow: item.sliding_window,
         closeMissThreshold: item.close_miss_threshold,
@@ -2865,7 +2159,10 @@
       <div class="runtimeWakeWordItem">
         <div>
           <strong>${escapeHtml(item.label)}</strong>
-          <a class="runtimeWakeWordUrl" href="${escapeAttr(item.url)}" target="_blank" rel="noreferrer">${escapeHtml(item.url)}</a>
+          <div class="runtimeWakeWordUrls">
+            <a class="runtimeWakeWordUrl" href="${escapeAttr(item.url)}" target="_blank" rel="noreferrer">JSON: ${escapeHtml(item.url)}</a>
+            ${item.modelUrl ? `<a class="runtimeWakeWordUrl" href="${escapeAttr(item.modelUrl)}" target="_blank" rel="noreferrer">Model: ${escapeHtml(item.modelUrl)}</a>` : ""}
+          </div>
           ${meta.length ? `<div class="runtimeWakeWordMeta">${meta.join("")}</div>` : ""}
         </div>
         <button type="button" data-runtime-wake-url="${escapeAttr(item.url)}">Copy URL</button>
@@ -2874,6 +2171,27 @@
     }).join("");
   }
 
+  async function refreshTrainedWakeWords() {
+    uiState.firmwareBusy = true;
+    setPill($("firmwareStatus"), "Loading wake words...", "warn");
+    syncButtons();
+    try {
+      const data = await api("/api/trained_wake_words/catalog", { method: "GET" });
+      const wakeWords = Array.isArray(data?.wake_words) ? data.wake_words : [];
+      uiState.firmware.wakeWords = wakeWords;
+      renderRuntimeWakeWordLinks();
+      setPill(
+        $("firmwareStatus"),
+        wakeWords.length ? `${wakeWords.length} trained wake word${wakeWords.length === 1 ? "" : "s"}` : "No trained wake words",
+        wakeWords.length ? "ok" : "warn"
+      );
+      return data;
+    } finally {
+      uiState.firmwareBusy = false;
+      syncButtons();
+    }
+  }
+
   async function copyTextToClipboard(text) {
     const value = String(text || "");
     if (!value) return false;
@@ -2893,513 +2211,6 @@
     return copied;
   }
 
-  function renderFirmwareFields() {
-    resetWakeSoundPreview();
-    $("firmwareFields").innerHTML = "";
-  }
-
-  function renderFirmwareField(field) {
-    const key = String(field.key || "");
-    const label = String(field.label || key || "Value");
-    const type = String(field.type || "text");
-    const value = field.value ?? "";
-    const placeholder = field.placeholder ? ` placeholder="${escapeAttr(field.placeholder)}"` : "";
-    const description = field.description ? `<span class="muted">${escapeHtml(field.description)}</span>` : "";
-    const options = Array.isArray(field.options) ? field.options : [];
-    if (field.read_only) {
-      return `
-        <label class="field">
-          <strong>${escapeHtml(label)}</strong>
-          <span class="readOnlyValue">${escapeHtml(value || "(from YAML)")}</span>
-          ${description}
-        </label>
-      `;
-    }
-    if (type === "wake_word_select") {
-      const optionHtml = options.length
-        ? options.map((option) => {
-            const optionValue = String(option.key || "");
-            const selected = optionValue && optionValue === String(value || "") ? " selected" : "";
-            return `
-              <option value="${escapeAttr(optionValue)}"${selected}
-                data-wake-word-name="${escapeAttr(option.wake_word_name || optionValue)}"
-                data-wake-word-url="${escapeAttr(option.json_url || "")}">
-                ${escapeHtml(option.label || optionValue)}
-              </option>
-            `;
-          }).join("")
-        : "";
-      return `
-        <label class="field">
-          <strong>${escapeHtml(label)}</strong>
-          <select data-firmware-field="${escapeAttr(key)}" data-wake-word-select ${options.length ? "" : "disabled"}>
-            <option value="">${escapeHtml(placeholder || "Choose a trained wake word...")}</option>
-            ${optionHtml}
-          </select>
-          ${description}
-        </label>
-      `;
-    }
-    if (type === "wake_sound_select") {
-      const optionHtml = options.length
-        ? options.map((option) => {
-            const optionValue = String(option.value || "");
-            const selected = optionValue && optionValue === String(value || "") ? " selected" : "";
-            return `
-              <option value="${escapeAttr(optionValue)}"${selected}>
-                ${escapeHtml(option.label || optionValue)}
-              </option>
-            `;
-          }).join("")
-        : "";
-      return `
-        <label class="field">
-          <strong>${escapeHtml(label)}</strong>
-          <select data-firmware-field="${escapeAttr(key)}" data-wake-sound-select ${options.length ? "" : "disabled"}>
-            ${optionHtml || `<option value="__custom__">Custom URL</option>`}
-          </select>
-          ${description}
-        </label>
-      `;
-    }
-    if (type === "checkbox") {
-      return `
-        <label class="field">
-          <strong>${escapeHtml(label)}</strong>
-          <span class="row">
-            <input data-firmware-field="${escapeAttr(key)}" type="checkbox" ${value ? "checked" : ""} style="width:auto;" />
-            <span class="muted">Enabled</span>
-          </span>
-          ${description}
-        </label>
-      `;
-    }
-    return `
-      <label class="field">
-        <strong>${escapeHtml(label)}</strong>
-        <input data-firmware-field="${escapeAttr(key)}" type="${type === "password" ? "password" : "text"}" value="${escapeAttr(value)}"${placeholder} autocomplete="off" />
-        ${description}
-      </label>
-    `;
-  }
-
-  function renderWakeSoundPreviewControl() {
-    return `
-      <div class="wakeSoundPreviewRow">
-        <button type="button" data-wake-sound-preview>Play Selected Sound</button>
-        <span class="wakeSoundPreviewStatus" data-wake-sound-preview-status></span>
-      </div>
-    `;
-  }
-
-  function syncRenderedWakeWordSelection() {
-    const select = document.querySelector("select[data-wake-word-select]");
-    if (select && select.value) {
-      applyWakeWordSelection(select, { silent: true });
-    }
-  }
-
-  function applyWakeWordSelection(select, options = {}) {
-    const option = select?.selectedOptions?.[0];
-    if (!option || !select.value) return;
-    const wakeWordName = option.dataset.wakeWordName || "";
-    const wakeWordUrl = option.dataset.wakeWordUrl || "";
-    const nameInput = document.querySelector('[data-firmware-field="wake_word_name"]');
-    const urlInput = document.querySelector('[data-firmware-field="wake_word_model_url"]');
-    if (nameInput && wakeWordName) {
-      nameInput.value = wakeWordName;
-    }
-    if (urlInput && wakeWordUrl) {
-      urlInput.value = wakeWordUrl;
-    }
-    if (!options.silent) {
-      setPill($("firmwareStatus"), "Wake word selected", "ok");
-      scheduleFirmwareProfileSave();
-    }
-    syncButtons();
-  }
-
-  function syncRenderedWakeSoundSelection({ fromPicker = false } = {}) {
-    const select = document.querySelector("select[data-wake-sound-select]");
-    const urlInput = document.querySelector('[data-firmware-field="wake_word_triggered_sound_file"]');
-    if (!(select instanceof HTMLSelectElement) || !(urlInput instanceof HTMLInputElement)) return;
-    if (fromPicker) {
-      const selectedUrl = String(select.value || "").trim();
-      if (selectedUrl && selectedUrl !== "__custom__") {
-        urlInput.value = selectedUrl;
-      }
-      return;
-    }
-    const currentUrl = String(urlInput.value || "").trim();
-    const optionValues = Array.from(select.options).map((option) => String(option.value || "").trim());
-    if (currentUrl && optionValues.includes(currentUrl)) {
-      select.value = currentUrl;
-    } else if (optionValues.includes("__custom__")) {
-      select.value = "__custom__";
-    }
-  }
-
-  function applyWakeSoundSelection(select, options = {}) {
-    syncRenderedWakeSoundSelection({ fromPicker: true });
-    if (!options.silent) {
-      setPill($("firmwareStatus"), "Wake sound selected", "ok");
-      scheduleFirmwareProfileSave();
-    }
-    syncButtons();
-  }
-
-  function resetWakeSoundPreview(message = "") {
-    if (wakeSoundPreviewAudio instanceof HTMLAudioElement) {
-      try {
-        wakeSoundPreviewAudio.pause();
-        wakeSoundPreviewAudio.currentTime = 0;
-      } catch (_error) {
-        // Browser cleanup can fail if the media element is already gone.
-      }
-    }
-    if (wakeSoundPreviewButton instanceof HTMLButtonElement && document.body.contains(wakeSoundPreviewButton)) {
-      wakeSoundPreviewButton.disabled = false;
-      wakeSoundPreviewButton.textContent = "Play Selected Sound";
-      const section = wakeSoundPreviewButton.closest(".firmwareSettingsSection");
-      const status = section?.querySelector?.("[data-wake-sound-preview-status]");
-      if (status instanceof HTMLElement) {
-        status.textContent = message;
-      }
-    }
-    wakeSoundPreviewAudio = null;
-    wakeSoundPreviewButton = null;
-  }
-
-  function getWakeSoundPreviewUrl() {
-    const urlInput = document.querySelector('[data-firmware-field="wake_word_triggered_sound_file"]');
-    const picker = document.querySelector("select[data-wake-sound-select]");
-    const urlValue = String(urlInput instanceof HTMLInputElement ? urlInput.value || "" : "").trim();
-    if (urlValue) return urlValue;
-    const pickerValue = String(picker instanceof HTMLSelectElement ? picker.value || "" : "").trim();
-    return pickerValue && pickerValue !== "__custom__" ? pickerValue : "";
-  }
-
-  async function handleWakeSoundPreview(button) {
-    const status = button.closest(".firmwareSettingsSection")?.querySelector?.("[data-wake-sound-preview-status]");
-    if (wakeSoundPreviewAudio instanceof HTMLAudioElement && wakeSoundPreviewButton === button && !wakeSoundPreviewAudio.paused) {
-      resetWakeSoundPreview("Stopped.");
-      return;
-    }
-
-    const url = getWakeSoundPreviewUrl();
-    if (!url) {
-      if (status instanceof HTMLElement) status.textContent = "Choose a wake sound or enter a URL first.";
-      return;
-    }
-
-    resetWakeSoundPreview();
-    const audio = new Audio(url);
-    audio.preload = "auto";
-    wakeSoundPreviewAudio = audio;
-    wakeSoundPreviewButton = button;
-    button.disabled = true;
-    button.textContent = "Loading...";
-    if (status instanceof HTMLElement) status.textContent = "Loading preview...";
-
-    const finish = (message) => {
-      if (wakeSoundPreviewAudio !== audio) return;
-      if (button instanceof HTMLButtonElement && document.body.contains(button)) {
-        button.disabled = false;
-        button.textContent = "Play Selected Sound";
-      }
-      if (status instanceof HTMLElement) status.textContent = message;
-      wakeSoundPreviewAudio = null;
-      wakeSoundPreviewButton = null;
-    };
-
-    audio.addEventListener("ended", () => finish("Finished."));
-    audio.addEventListener("error", () => finish("Could not play this wake sound."));
-
-    try {
-      await audio.play();
-      if (wakeSoundPreviewAudio === audio) {
-        button.disabled = false;
-        button.textContent = "Stop";
-        if (status instanceof HTMLElement) status.textContent = "Playing...";
-      }
-    } catch (error) {
-      finish("Playback blocked or unavailable.");
-    }
-  }
-
-  function firmwareTemplateQuery() {
-    const params = new URLSearchParams();
-    if (firmwareUsbSelected()) {
-      return "";
-    }
-    const host = ($("firmwareHost").value || "").trim();
-    const port = ($("firmwarePort").value || "3232").trim();
-    if (host) params.set("target_host", host);
-    if (port) params.set("target_port", port);
-    const query = params.toString();
-    return query ? `?${query}` : "";
-  }
-
-  async function refreshFirmwareTemplates() {
-    const data = await api(`/api/firmware/templates${firmwareTemplateQuery()}`, { method: "GET" });
-    renderFirmwareTemplates(data);
-    if (Array.isArray(data.warnings) && data.warnings.length) {
-      setPill($("firmwareStatus"), "Template warning", "warn");
-    }
-    syncButtons();
-    return data;
-  }
-
-  function collectFirmwareValues() {
-    const values = {};
-    document.querySelectorAll("[data-firmware-field]").forEach((field) => {
-      const key = String(field.dataset.firmwareField || "");
-      if (!key) return;
-      if (field instanceof HTMLInputElement && field.type === "checkbox") {
-        values[key] = field.checked;
-      } else {
-        values[key] = field.value || "";
-      }
-    });
-    const wakeSoundChoice = String(values.wake_sound_catalog || "").trim();
-    if (wakeSoundChoice && wakeSoundChoice !== "__custom__") {
-      values.wake_word_triggered_sound_file = wakeSoundChoice;
-    }
-    return values;
-  }
-
-  async function saveFirmwareProfileNow({ templateKey = null, quiet = false } = {}) {
-    const key = String(templateKey || $("firmwareTemplate").value || "").trim();
-    if (!key) return null;
-    const values = collectFirmwareValues();
-    values.__target_host = ($("firmwareHost").value || "").trim();
-    values.__target_port = ($("firmwarePort").value || "3232").trim();
-    const result = await api("/api/firmware/profile", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ template_key: key, values }),
-    });
-    if (!quiet && !uiState.firmwareBusy) {
-      setPill($("firmwareStatus"), "Settings saved", "ok");
-    }
-    return result;
-  }
-
-  function scheduleFirmwareProfileSave() {
-    if (firmwareProfileSaveTimer) {
-      clearTimeout(firmwareProfileSaveTimer);
-    }
-    firmwareProfileSaveTimer = setTimeout(async () => {
-      firmwareProfileSaveTimer = null;
-      try {
-        await saveFirmwareProfileNow({ quiet: false });
-      } catch (error) {
-        if (!uiState.firmwareBusy) {
-          setPill($("firmwareStatus"), "Settings save failed", "warn");
-        }
-      }
-    }, 550);
-  }
-
-  function scheduleFirmwareProfileReload() {
-    if (firmwareProfileSaveTimer) {
-      clearTimeout(firmwareProfileSaveTimer);
-      firmwareProfileSaveTimer = null;
-    }
-    if (firmwareProfileReloadTimer) {
-      clearTimeout(firmwareProfileReloadTimer);
-    }
-    firmwareProfileReloadTimer = setTimeout(async () => {
-      firmwareProfileReloadTimer = null;
-      try {
-        await refreshFirmwareTemplates();
-      } catch (error) {
-        setPill($("firmwareStatus"), "Device settings failed", "warn");
-      }
-    }, 650);
-  }
-
-  function flushFirmwareProfileSave(templateKey = null) {
-    if (firmwareProfileSaveTimer) {
-      clearTimeout(firmwareProfileSaveTimer);
-      firmwareProfileSaveTimer = null;
-    }
-    if (firmwareProfileReloadTimer) {
-      clearTimeout(firmwareProfileReloadTimer);
-      firmwareProfileReloadTimer = null;
-    }
-    return saveFirmwareProfileNow({ templateKey, quiet: true }).catch(() => null);
-  }
-
-  async function startFirmwareFlash() {
-    const host = ($("firmwareHost").value || "").trim();
-    const port = ($("firmwarePort").value || "3232").trim();
-    const template = selectedFirmwareTemplate();
-    if (!template) {
-      alert("Choose a firmware family first.");
-      return;
-    }
-    if (!host) {
-      alert("Enter the device IP or hostname first.");
-      return;
-    }
-    if (template.prebuilt_firmware && !template.prebuilt_firmware.available) {
-      alert(template.prebuilt_firmware.error || "No prebuilt OTA image is available for this firmware family.");
-      return;
-    }
-    const wakeSoundSelect = document.querySelector("select[data-wake-sound-select]");
-    if (wakeSoundSelect instanceof HTMLSelectElement) {
-      syncRenderedWakeSoundSelection({ fromPicker: true });
-    }
-
-    const ok = confirm(`Flash prebuilt ${template.label || template.value} firmware to ${host}:${port || "3232"}?\n\nOnly continue if this device is already running Tater Native Firmware v1. New devices need one USB flash first.`);
-    if (!ok) return;
-
-    uiState.firmwareBusy = true;
-    uiState.firmware.logLines = [
-      "===== Prebuilt Firmware Flash Console =====",
-      `→ Target: ${host}:${port || "3232"}`,
-      "→ Contacting trainer server to prepare the OTA image...",
-    ];
-    setPill($("firmwareStatus"), "Starting firmware flash...", "warn");
-    openFirmwareConsole(true, uiState.firmware.logLines.join("\n"), "Starting prebuilt firmware flash...");
-    syncButtons();
-    await flushFirmwareProfileSave();
-    await waitForPaint();
-
-    try {
-      const status = await api("/api/firmware/build_flash", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          template_key: template.value,
-          host,
-          port: port || "3232",
-          values: collectFirmwareValues(),
-        }),
-      });
-      uiState.firmware.flashing = status;
-      uiState.firmware.logLines = (status.log_lines || []).length
-        ? status.log_lines
-        : [...uiState.firmware.logLines, "✓ Flash session started. Waiting for firmware output..."];
-      openFirmwareConsole(false, uiState.firmware.logLines.join("\n") || "(waiting for flash output)", status.message || "Firmware session started.");
-      pollFirmwareFlash(status.session_id);
-    } catch (error) {
-      uiState.firmwareBusy = false;
-      setPill($("firmwareStatus"), "Flash failed to start", "err");
-      uiState.firmware.logLines = [String(error.message || error)];
-      openFirmwareConsole(false, uiState.firmware.logLines.join("\n"), "Firmware flash failed to start.");
-      syncButtons();
-      alert("Flash failed to start: " + error.message);
-    }
-  }
-
-  async function startUsbFirmwareFlash() {
-    const template = selectedFirmwareTemplate();
-    if (!template) {
-      alert("Choose a firmware family first.");
-      return;
-    }
-    const factory = template.prebuilt_firmware?.artifacts?.factory || {};
-    if (!factory.path) {
-      alert("No prebuilt USB factory image is available for this firmware family.");
-      return;
-    }
-    if (!window.isSecureContext || !navigator.serial) {
-      alert("Browser USB flash needs Chrome or Edge on HTTPS or localhost. Open the trainer URL in Chrome or Edge.");
-      return;
-    }
-    const ok = confirm(`USB flash the prebuilt ${template.label || template.value} factory firmware?\n\nThis is for new satellites, recovery, or devices not already running Tater Native Firmware v1. It erases flash and writes the factory image over USB. After flashing, finish Wi-Fi and pairing from the satellite setup page.`);
-    if (!ok) return;
-
-    let port;
-    try {
-      port = browserUsbStoredPort(template.value) || await browserUsbSelectPort(template.value);
-    } catch (error) {
-      alert("USB device selection failed: " + error.message);
-      return;
-    }
-
-    uiState.firmwareBusy = true;
-    uiState.firmware.logLines = [
-      "===== Browser USB Firmware Flash Console =====",
-      `Firmware: ${template.label || template.value}`,
-      `USB device: ${browserUsbPortLabel(port)}`,
-      "Preparing verified factory image...",
-    ];
-    setPill($("firmwareStatus"), "Preparing USB flash...", "warn");
-    openFirmwareConsole(true, uiState.firmware.logLines.join("\n"), "Preparing browser USB flash...");
-    syncButtons();
-    await waitForPaint();
-
-    try {
-      const artifact = await api("/api/firmware/browser_flash", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          template_key: template.value,
-        }),
-      });
-      appendFirmwareLogs(artifact.entries || [], "Factory image ready. Starting USB flash...");
-      await flashBrowserUsbPort(port, artifact);
-      appendFirmwareLog("Browser USB flash finished.", "Browser USB flash finished.");
-      appendFirmwareLog("Use the satellite setup hotspot to configure Wi-Fi, Tater server, and pairing.");
-      setPill($("firmwareStatus"), "USB flash finished", "ok");
-    } catch (error) {
-      appendFirmwareLog(`Browser USB flash failed: ${String(error.message || error)}`, "Browser USB flash failed.");
-      setPill($("firmwareStatus"), "USB flash failed", "err");
-      alert("Browser USB flash failed: " + error.message);
-    } finally {
-      uiState.firmwareBusy = false;
-      syncButtons();
-    }
-  }
-
-  async function pollFirmwareFlash(sessionId) {
-    if (uiState.firmwarePoller || !sessionId) return;
-    uiState.firmwarePoller = true;
-
-    try {
-      for (;;) {
-        const status = await api(`/api/firmware/flash_status/${encodeURIComponent(sessionId)}`, { method: "GET" });
-        uiState.firmware.flashing = status;
-        const lines = status.log_lines || [];
-        uiState.firmware.logLines = lines;
-        renderFirmwareLogLines(lines.length ? lines : ["(waiting for flash output)"], true);
-
-        if (status.running) {
-          setPill($("firmwareStatus"), status.message || "Firmware flash running", "warn");
-          setFirmwareLogStatus(status.message || "Firmware flash running.");
-        } else {
-          uiState.firmwareBusy = false;
-          if (status.exit_code === 0) {
-            setPill($("firmwareStatus"), "Firmware flashed successfully", "ok");
-            setFirmwareLogStatus("Firmware flashed successfully.");
-          } else {
-            setPill($("firmwareStatus"), `Firmware flash failed (${status.exit_code})`, "err");
-            setFirmwareLogStatus(`Firmware flash failed (${status.exit_code}).`);
-          }
-          syncButtons();
-          break;
-        }
-
-        syncButtons();
-        await new Promise((resolve) => setTimeout(resolve, 1200));
-      }
-    } catch (error) {
-      uiState.firmwareBusy = false;
-      setPill($("firmwareStatus"), "Flash status lost", "err");
-      uiState.firmware.logLines = [
-        ...(uiState.firmware.logLines || []),
-        `✗ Flash status lost: ${error.message || error}`,
-      ];
-      openFirmwareConsole(false, uiState.firmware.logLines.join("\n"), "Firmware status polling failed.");
-      syncButtons();
-    } finally {
-      uiState.firmwarePoller = null;
-    }
-  }
-
   function renderLanguageOptions(languages, preferredLanguage) {
     const select = $("language");
     const current = preferredLanguage || select.value || "en";
@@ -3426,12 +2237,6 @@
     const sampleCount = Number(uiState.samples?.personal_count ?? uiState.session?.takes_received ?? 0);
     const hasConsole = Boolean(training.running || training.exit_code !== null || (training.log_lines || []).length);
     const negativeCount = Number(uiState.samples?.negative_count ?? uiState.captured?.negative_count ?? 0);
-    const firmwareHost = ($("firmwareHost").value || "").trim();
-    const firmwareTemplate = ($("firmwareTemplate").value || "").trim();
-    const firmwareSelection = selectedFirmwareTemplate();
-    const firmwareAvailable = !firmwareSelection?.prebuilt_firmware || Boolean(firmwareSelection.prebuilt_firmware.available);
-    const usbSelected = firmwareUsbSelected();
-
     $("ttsBtn").disabled = !hasPhrase || uiState.uploadBusy;
     $("uploadBtn").disabled = !hasSession || !hasSelected || uiState.uploadBusy;
     $("clearBtn").disabled = sampleCount === 0 || uiState.uploadBusy || uiState.reviewBusy;
@@ -3441,12 +2246,10 @@
     $("refreshCapturedBtn").disabled = uiState.reviewBusy;
     $("clearNegativeBtn").disabled = uiState.reviewBusy || negativeCount === 0;
     $("refreshSamplesBtn").disabled = uiState.reviewBusy || uiState.uploadBusy;
-    $("refreshFirmwareBtn").disabled = uiState.firmwareBusy;
-    $("saveFirmwareSettingsBtn").disabled = uiState.firmwareBusy || usbSelected || !firmwareHost || !firmwareTemplate;
-    $("cleanFirmwareBtn").disabled = uiState.firmwareBusy;
-    $("openFirmwareConsoleBtn").disabled = false;
-    $("flashFirmwareBtn").disabled = uiState.firmwareBusy || usbSelected || !firmwareHost || !firmwareTemplate || !firmwareAvailable;
-    $("usbFirmwareBtn").disabled = uiState.firmwareBusy || !firmwareTemplate || !firmwareSelection?.prebuilt_firmware?.artifacts?.factory?.path;
+    const refreshWakeWordsBtn = $("refreshWakeWordsBtn");
+    if (refreshWakeWordsBtn) {
+      refreshWakeWordsBtn.disabled = uiState.firmwareBusy;
+    }
   }
 
   function refreshSessionUI(session) {
@@ -3713,18 +2516,10 @@
   });
   $("tabFirmware").addEventListener("click", () => {
     setActiveView("firmware");
-    refreshFirmwareTemplates().catch((error) => {
-      setPill($("firmwareStatus"), "Firmware list failed", "err");
-      uiState.firmware.logLines = [`Firmware list load failed: ${error.message}`];
-      setConsoleLogAutoScroll($("trainLog"), uiState.firmware.logLines.join("\n"));
+    refreshTrainedWakeWords().catch((error) => {
+      setPill($("firmwareStatus"), "Wake word list failed", "err");
+      alert("Wake word list failed: " + error.message);
     });
-    if (!uiState.firmware.devices.length) {
-      refreshFirmwareDevices().catch((error) => {
-        setPill($("firmwareDetectStatus"), "Scan failed", "err");
-        uiState.firmware.logLines = [`Device scan failed: ${error.message}`];
-        setConsoleLogAutoScroll($("trainLog"), uiState.firmware.logLines.join("\n"));
-      });
-    }
   });
 
   $("runtimeWakeWordLinks").addEventListener("click", async (event) => {
@@ -3736,7 +2531,7 @@
       if (!copied) throw new Error("Clipboard unavailable");
       const previousText = button.textContent || "Copy URL";
       button.textContent = "Copied";
-      setPill($("firmwareStatus"), "Model URL copied", "ok");
+      setPill($("firmwareStatus"), "JSON URL copied", "ok");
       setTimeout(() => {
         button.textContent = previousText;
       }, 1200);
@@ -3752,107 +2547,14 @@
     syncButtons();
   });
 
-  $("firmwareHost").addEventListener("input", () => {
-    syncButtons();
-    scheduleFirmwareProfileReload();
-  });
-  $("firmwarePort").addEventListener("input", () => {
-    syncButtons();
-    scheduleFirmwareProfileReload();
-  });
-  $("firmwareTemplate").addEventListener("change", () => {
-    flushFirmwareProfileSave(uiState.firmware.activeTemplateKey);
-    uiState.firmware.activeTemplateKey = $("firmwareTemplate").value;
-    renderFirmwareFields();
-    applyFirmwareTemplateTarget();
-    syncButtons();
-  });
-  $("firmwareFields").addEventListener("input", (event) => {
-    if (event.target?.matches?.('[data-firmware-field="wake_word_triggered_sound_file"]')) {
-      resetWakeSoundPreview();
-      syncRenderedWakeSoundSelection();
-    }
-    syncButtons();
-    scheduleFirmwareProfileSave();
-  });
-  $("firmwareFields").addEventListener("click", (event) => {
-    const button = event.target.closest("button[data-wake-sound-preview]");
-    if (!button) return;
-    handleWakeSoundPreview(button).catch(() => {
-      const status = button.closest(".firmwareSettingsSection")?.querySelector?.("[data-wake-sound-preview-status]");
-      if (status instanceof HTMLElement) {
-        status.textContent = "Preview failed.";
-      }
-    });
-  });
-  $("firmwareFields").addEventListener("change", (event) => {
-    const select = event.target.closest("select[data-wake-word-select]");
-    if (select) {
-      applyWakeWordSelection(select);
-      return;
-    }
-    const wakeSoundSelect = event.target.closest("select[data-wake-sound-select]");
-    if (wakeSoundSelect) {
-      resetWakeSoundPreview();
-      applyWakeSoundSelection(wakeSoundSelect);
-      return;
-    }
-    syncButtons();
-    scheduleFirmwareProfileSave();
-  });
-  $("firmwareDeviceSelect").addEventListener("change", () => {
-    applySelectedFirmwareDevice().catch((error) => {
-      setPill($("firmwareStatus"), "Device settings failed", "warn");
-      alert("Device settings failed: " + error.message);
-    });
-  });
-  $("refreshFirmwareBtn").addEventListener("click", async () => {
+  $("refreshWakeWordsBtn").addEventListener("click", async () => {
     try {
-      await refreshFirmwareDevices();
+      await refreshTrainedWakeWords();
     } catch (error) {
-      setPill($("firmwareDetectStatus"), "Scan failed", "err");
-      alert("Device scan failed: " + error.message);
+      setPill($("firmwareStatus"), "Wake word list failed", "err");
+      alert("Wake word list failed: " + error.message);
     }
   });
-  $("flashFirmwareBtn").addEventListener("click", startFirmwareFlash);
-  $("usbFirmwareBtn").addEventListener("click", startUsbFirmwareFlash);
-  $("saveFirmwareSettingsBtn").addEventListener("click", async () => {
-    const host = ($("firmwareHost").value || "").trim();
-    const template = ($("firmwareTemplate").value || "").trim();
-    if (!template) {
-      alert("Choose a firmware family first.");
-      return;
-    }
-    if (!host) {
-      alert("Enter the device IP or hostname first so settings can be saved for this device.");
-      return;
-    }
-    try {
-      setPill($("firmwareStatus"), "Saving device settings...", "warn");
-      await saveFirmwareProfileNow({ quiet: true });
-      setPill($("firmwareStatus"), "Target saved", "ok");
-    } catch (error) {
-      setPill($("firmwareStatus"), "Settings save failed", "err");
-      alert("Settings save failed: " + error.message);
-    } finally {
-      syncButtons();
-    }
-  });
-  $("cleanFirmwareBtn").addEventListener("click", async () => {
-    try {
-      setPill($("firmwareStatus"), "Clearing downloaded images...", "warn");
-      const result = await api("/api/firmware/clean", { method: "POST" });
-      setPill($("firmwareStatus"), result.message || "Downloaded images cleared", "ok");
-    } catch (error) {
-      setPill($("firmwareStatus"), "Clean failed", "err");
-      alert("Clean failed: " + error.message);
-    } finally {
-      syncButtons();
-    }
-  });
-  $("openFirmwareConsoleBtn").addEventListener("click", () => {
-    openFirmwareConsole(true, (uiState.firmware.logLines || []).join("\n") || "(no firmware flash started)", uiState.firmwareBusy ? "Firmware flash running." : "No active firmware flash.");
-  });
 
   $("openConsoleBtn").addEventListener("click", () => {
     setConsoleLogAutoScroll($("trainLog"), (uiState.training?.log_lines || []).join("\n") || "(no training started)");
@@ -3863,16 +2565,6 @@
     closeConsole();
   });
 
-  $("closeFirmwareLogBtn").addEventListener("click", () => {
-    closeFirmwareConsole();
-  });
-
-  $("firmwareLogModal").addEventListener("click", (event) => {
-    if (event.target === $("firmwareLogModal")) {
-      closeFirmwareConsole();
-    }
-  });
-
   $("consoleOverlay").addEventListener("click", (event) => {
     if (event.target === $("consoleOverlay")) {
       closeConsole();
@@ -3882,7 +2574,6 @@
   document.addEventListener("keydown", (event) => {
     if (event.key === "Escape") {
       closeConsole();
-      closeFirmwareConsole();
     }
   });
 
@@ -4086,10 +2777,10 @@
     } catch (_) {}
 
     try {
-      await refreshFirmwareTemplates();
+      await refreshTrainedWakeWords();
     } catch (error) {
-      setPill($("firmwareStatus"), "Firmware list failed", "err");
-      uiState.firmware.logLines = [`Firmware list load failed: ${error.message}`];
+      setPill($("firmwareStatus"), "Wake word list failed", "err");
+      uiState.firmware.logLines = [`Wake word list load failed: ${error.message}`];
     }
 
     try {
diff --git a/trainer_server.py b/trainer_server.py
index 25ec18a..7211d4a 100644
--- a/trainer_server.py
+++ b/trainer_server.py
@@ -2,28 +2,23 @@
 
 # trainer_server.py
 import contextlib
-import copy
-import gzip
-import hashlib
 import io
 import os
 import re
 import json
 import shutil
-import socket
 import subprocess
 import sys
 import tempfile
 import threading
 import time
-import uuid
 import wave
 from array import array
 from datetime import datetime, timezone
 from math import isfinite, log10
 from pathlib import Path
 from typing import Dict, Any, List, Callable, Optional, Tuple
-from urllib.parse import quote, urlparse
+from urllib.parse import quote
 from urllib.request import Request as URLRequest, urlopen
 
 from fastapi import FastAPI, UploadFile, File, Form, Header, Request
@@ -78,67 +73,6 @@ TARGET_CHANNELS = 1
 TARGET_SAMPLE_WIDTH_BYTES = 2
 CAPTURE_GAIN_PROFILE = "capture_rms_v1"
 
-# Firmware build/flash cache lives inside /data so Docker runs can reuse downloads.
-FIRMWARE_CACHE_DIR = Path(os.environ.get("FIRMWARE_CACHE_DIR", str(DATA_DIR / ".cache" / "firmware_flasher"))).resolve()
-FIRMWARE_DEFAULT_OTA_PORT = int(os.environ.get("TATER_NATIVE_OTA_PORT", os.environ.get("ESPHOME_OTA_PORT", "3232")))
-FIRMWARE_DISCOVERY_SECONDS = float(
-    os.environ.get("TATER_NATIVE_DISCOVERY_SECONDS", os.environ.get("ESPHOME_DISCOVERY_SECONDS", "2.5"))
-)
-FIRMWARE_MAX_LOG_LINES = int(os.environ.get("FIRMWARE_MAX_LOG_LINES", "500"))
-FIRMWARE_GITHUB_OWNER = os.environ.get("FIRMWARE_GITHUB_OWNER", "TaterTotterson")
-FIRMWARE_GITHUB_REPO = os.environ.get("FIRMWARE_GITHUB_REPO", "microWakeWords")
-FIRMWARE_GITHUB_REF = os.environ.get("FIRMWARE_GITHUB_REF", "main")
-FIRMWARE_PREBUILT_GITHUB_OWNER = os.environ.get("FIRMWARE_PREBUILT_GITHUB_OWNER", "TaterTotterson")
-FIRMWARE_PREBUILT_GITHUB_REPO = os.environ.get("FIRMWARE_PREBUILT_GITHUB_REPO", "Tater-Native-Firmware")
-FIRMWARE_PREBUILT_GITHUB_REF = os.environ.get("FIRMWARE_PREBUILT_GITHUB_REF", "main")
-WAKE_SOUND_CATALOG_CACHE_TTL_SECONDS = int(os.environ.get("WAKE_SOUND_CATALOG_CACHE_TTL_SECONDS", "600"))
-FIRMWARE_PREBUILT_DIR = FIRMWARE_CACHE_DIR / "prebuilt_firmware"
-FIRMWARE_DOWNLOAD_TIMEOUT_SECONDS = float(os.environ.get("FIRMWARE_DOWNLOAD_TIMEOUT_SECONDS", "120"))
-FIRMWARE_JSON_CACHE_TTL_SECONDS = float(os.environ.get("FIRMWARE_JSON_CACHE_TTL_SECONDS", "900"))
-FIRMWARE_OTA_BLOCK_SIZE = int(os.environ.get("FIRMWARE_OTA_BLOCK_SIZE", "8192"))
-FIRMWARE_PROFILE_FILE = Path(
-    os.environ.get("FIRMWARE_PROFILE_FILE", str(FIRMWARE_CACHE_DIR / "profiles.json"))
-).resolve()
-FIRMWARE_WEB_FLASH_DIR = FIRMWARE_CACHE_DIR / "web_flash"
-WAKE_SOUND_MANIFEST_PATHS = ("wake_sound_manifest.json", "wake-sound-manifest.json")
-WAKE_SOUND_CATALOG_CACHE: Dict[str, Any] = {"ts": 0.0, "payload": {}}
-WAKE_SOUND_CATALOG_LOCK = threading.Lock()
-FIRMWARE_JSON_CACHE: Dict[str, Dict[str, Any]] = {}
-FIRMWARE_JSON_CACHE_LOCK = threading.Lock()
-TRAIN_LOG_TAIL_LINES = int(os.environ.get("REC_TRAIN_LOG_TAIL_LINES", "400"))
-TRAIN_LOG_MAX_BYTES = int(os.environ.get("REC_TRAIN_LOG_MAX_BYTES", str(512 * 1024)))
-
-FIRMWARE_TEMPLATE_SPECS = (
-    {
-        "key": "voicepe",
-        "label": "Voice PE",
-        "description": "Tater Native firmware for Voice PE satellites",
-        "flash_size": "16MB",
-    },
-    {
-        "key": "satellite1",
-        "label": "Satellite1",
-        "description": "Tater Native firmware for Satellite1 devices",
-        "flash_size": "16MB",
-    },
-    {
-        "key": "respeaker_xvf3800",
-        "label": "ReSpeaker XVF3800",
-        "description": "Tater Native firmware for ReSpeaker XVF3800 devices",
-        "flash_size": "8MB",
-    },
-    {
-        "key": "s3_box",
-        "label": "ESP32-S3-BOX-3 Display",
-        "description": "Tater Native firmware for ESP32-S3-BOX-3 display satellites",
-        "flash_size": "16MB",
-    },
-)
-FIRMWARE_PREBUILT_LATEST_URL = os.environ.get(
-    "FIRMWARE_PREBUILT_LATEST_URL",
-    f"https://github.com/{FIRMWARE_PREBUILT_GITHUB_OWNER}/{FIRMWARE_PREBUILT_GITHUB_REPO}/releases/latest/download/latest.json",
-)
-FIRMWARE_PREBUILT_TEMPLATE_KEYS = {str(spec.get("key") or "").lower() for spec in FIRMWARE_TEMPLATE_SPECS}
 
 app = FastAPI(title="microWakeWord Personal Samples")
 
@@ -185,9 +119,6 @@ PIPER_CATALOG_CACHE: Dict[str, Any] = {
     "fetched_at": 0.0,
     "entries": None,
 }
-FIRMWARE_LOCK = threading.Lock()
-FIRMWARE_SESSIONS: Dict[str, Dict[str, Any]] = {}
-ANSI_ESCAPE_RE = re.compile(r"\x1B(?:\[[0-?]*[ -/]*[@-~]|[@-Z\\-_])")
 
 # --- Silero VAD (lazy-loaded) ---
 _silero_vad_model = None
@@ -271,7 +202,7 @@ def _list_captured_sample_names() -> List[str]:
 
 
 def _sync_trained_wake_word_artifacts() -> None:
-    """Mirror generated output artifacts into /data/trained_wake_words for firmware flashing."""
+    """Mirror generated output artifacts into /data/trained_wake_words for live wake-word links."""
     TRAINED_WAKE_WORDS_DIR.mkdir(parents=True, exist_ok=True)
     candidate_jsons: list[Path] = []
 
@@ -1496,1391 +1427,6 @@ def _run_training_background(safe_word: str, language: str, allow_no_personal: b
             STATE["training"]["running"] = False
 
 
-# -------------------- Firmware flasher --------------------
-def _template_default_string(raw_value: Any) -> str:
-    if isinstance(raw_value, dict) and raw_value.get("__secret__"):
-        return ""
-    if isinstance(raw_value, bool):
-        return "true" if raw_value else "false"
-    if raw_value is None:
-        return ""
-    return str(raw_value)
-
-
-def _humanize_key(key: str) -> str:
-    token = str(key or "").strip()
-    if not token:
-        return "Value"
-    special = {
-        "ha": "HA",
-        "ip": "IP",
-        "id": "ID",
-        "ssid": "SSID",
-        "wifi": "Wi-Fi",
-        "xmos": "XMOS",
-        "fw": "FW",
-    }
-    return " ".join(special.get(part.lower(), part.capitalize()) for part in token.replace("_", " ").split())
-
-
-def _firmware_template_spec(template_key: str) -> Dict[str, Any]:
-    token = (template_key or "").strip().lower()
-    for spec in FIRMWARE_TEMPLATE_SPECS:
-        if str(spec.get("key") or "").lower() == token:
-            return dict(spec)
-    raise ValueError("Unknown firmware template.")
-
-
-def _firmware_template_flash_size(template_key: Any) -> str:
-    try:
-        spec = _firmware_template_spec(_text(template_key))
-    except Exception:
-        spec = {}
-    flash_size = _text(spec.get("flash_size")).upper()
-    return flash_size if flash_size in {"4MB", "8MB", "16MB", "32MB"} else "8MB"
-
-
-def _firmware_raw_url(path: str) -> str:
-    clean = str(path or "").strip().lstrip("/")
-    return f"https://raw.githubusercontent.com/{FIRMWARE_GITHUB_OWNER}/{FIRMWARE_GITHUB_REPO}/{FIRMWARE_GITHUB_REF}/{clean}"
-
-
-def _fetch_text_url(url: str, timeout: float = 20) -> str:
-    req = URLRequest(url, headers={"User-Agent": "microWakeWord-Trainer/1.0"})
-    with urlopen(req, timeout=timeout) as response:
-        charset = response.headers.get_content_charset() or "utf-8"
-        return response.read().decode(charset, errors="replace")
-
-
-def _text(value: Any) -> str:
-    if value is None:
-        return ""
-    return str(value).strip()
-
-
-def _lower(value: Any) -> str:
-    return _text(value).lower()
-
-
-def _as_int(value: Any, default: int = 0, *, minimum: int | None = None) -> int:
-    try:
-        parsed = int(value)
-    except Exception:
-        parsed = default
-    if minimum is not None:
-        parsed = max(minimum, parsed)
-    return parsed
-
-
-def _sanitize_token(value: Any) -> str:
-    token = re.sub(r"[^A-Za-z0-9_.-]+", "_", _text(value)).strip("._-")
-    return (token[:96] or "default").lower()
-
-
-def _prebuilt_firmware_raw_url(path_or_url: Any) -> str:
-    token = _text(path_or_url)
-    if not token:
-        return ""
-    parsed = urlparse(token)
-    if parsed.scheme and parsed.netloc:
-        return token
-    clean = token.lstrip("/")
-    quoted = "/".join(quote(part) for part in clean.split("/") if part)
-    return (
-        f"https://raw.githubusercontent.com/"
-        f"{FIRMWARE_PREBUILT_GITHUB_OWNER}/{FIRMWARE_PREBUILT_GITHUB_REPO}/{FIRMWARE_PREBUILT_GITHUB_REF}/{quoted}"
-    )
-
-
-def _fetch_json_url(url: str, *, timeout: float = 20, force_refresh: bool = False) -> Dict[str, Any]:
-    now = time.time()
-    with FIRMWARE_JSON_CACHE_LOCK:
-        cached = FIRMWARE_JSON_CACHE.get(url)
-        if (
-            not force_refresh
-            and isinstance(cached, dict)
-            and isinstance(cached.get("payload"), dict)
-            and (now - float(cached.get("ts") or 0.0)) < FIRMWARE_JSON_CACHE_TTL_SECONDS
-        ):
-            return copy.deepcopy(cached["payload"])
-
-    req = URLRequest(
-        url,
-        headers={
-            "User-Agent": "microWakeWord-Trainer/1.0",
-            "Accept": "application/json, */*",
-            "Cache-Control": "no-cache" if force_refresh else "max-age=60",
-        },
-    )
-    with urlopen(req, timeout=timeout) as response:
-        charset = response.headers.get_content_charset() or "utf-8"
-        payload = json.loads(response.read().decode(charset, errors="replace"))
-    if not isinstance(payload, dict):
-        raise RuntimeError(f"Remote JSON did not parse into an object: {url}")
-    with FIRMWARE_JSON_CACHE_LOCK:
-        FIRMWARE_JSON_CACHE[url] = {"ts": now, "payload": copy.deepcopy(payload)}
-    return payload
-
-
-def _load_prebuilt_firmware_manifest(*, force_refresh: bool = False) -> Dict[str, Any]:
-    latest_payload = _fetch_json_url(
-        FIRMWARE_PREBUILT_LATEST_URL,
-        timeout=20,
-        force_refresh=force_refresh,
-    )
-    manifest_ref = _text(latest_payload.get("manifest"))
-    if not manifest_ref:
-        raise RuntimeError("Prebuilt firmware latest.json is missing a manifest path.")
-
-    manifest_url = _prebuilt_firmware_raw_url(manifest_ref)
-    manifest_payload = _fetch_json_url(manifest_url, timeout=20, force_refresh=force_refresh)
-    devices = manifest_payload.get("devices")
-    if not isinstance(devices, list):
-        raise RuntimeError("Prebuilt firmware manifest is missing its devices list.")
-
-    payload = copy.deepcopy(manifest_payload)
-    payload["version"] = _text(manifest_payload.get("version")) or _text(latest_payload.get("version"))
-    payload["latest_url"] = FIRMWARE_PREBUILT_LATEST_URL
-    payload["manifest_url"] = manifest_url
-    payload["manifest_path"] = manifest_ref
-    payload["devices_by_key"] = {
-        _lower(row.get("key")): dict(row)
-        for row in devices
-        if isinstance(row, dict) and _text(row.get("key"))
-    }
-    return payload
-
-
-def _prebuilt_firmware_info(template_key: Any, *, force_refresh: bool = False) -> Dict[str, Any]:
-    key = _lower(template_key)
-    if key not in FIRMWARE_PREBUILT_TEMPLATE_KEYS:
-        return {"available": False, "template_key": key, "reason": "not_prebuilt"}
-    try:
-        manifest = _load_prebuilt_firmware_manifest(force_refresh=force_refresh)
-    except Exception as exc:
-        return {
-            "available": False,
-            "template_key": key,
-            "reason": "manifest_unavailable",
-            "error": _text(exc) or exc.__class__.__name__,
-        }
-
-    devices_by_key = manifest.get("devices_by_key") if isinstance(manifest.get("devices_by_key"), dict) else {}
-    device = devices_by_key.get(key) if isinstance(devices_by_key.get(key), dict) else None
-    if not isinstance(device, dict):
-        return {
-            "available": False,
-            "template_key": key,
-            "reason": "missing_device",
-            "version": _text(manifest.get("version")),
-            "manifest_url": _text(manifest.get("manifest_url")),
-        }
-
-    artifacts = device.get("artifacts") if isinstance(device.get("artifacts"), dict) else {}
-    return {
-        "available": bool(artifacts.get("ota") or artifacts.get("factory")),
-        "template_key": key,
-        "version": _text(manifest.get("version")),
-        "manifest_url": _text(manifest.get("manifest_url")),
-        "latest_url": _text(manifest.get("latest_url")),
-        "device": copy.deepcopy(device),
-        "artifacts": copy.deepcopy(artifacts),
-    }
-
-
-def _prebuilt_artifact_ui_summary(prebuilt: Dict[str, Any]) -> Dict[str, Any]:
-    artifacts = prebuilt.get("artifacts") if isinstance(prebuilt.get("artifacts"), dict) else {}
-    ota_artifact = artifacts.get("ota") if isinstance(artifacts.get("ota"), dict) else None
-    return {
-        "available": bool(isinstance(ota_artifact, dict) and _text(ota_artifact.get("path"))),
-        "version": _text(prebuilt.get("version")),
-        "manifest_url": _text(prebuilt.get("manifest_url")),
-        "latest_url": _text(prebuilt.get("latest_url")),
-        "error": _text(prebuilt.get("error")),
-        "artifacts": {
-            kind: {
-                "kind": _text(row.get("kind") or kind),
-                "path": _text(row.get("path")),
-                "size_bytes": _as_int(row.get("size_bytes"), 0, minimum=0),
-                "sha256": _text(row.get("sha256")),
-            }
-            for kind, row in artifacts.items()
-            if isinstance(row, dict)
-        },
-    }
-
-
-def _prebuilt_artifact_meta(prebuilt: Dict[str, Any], kind: str) -> Dict[str, Any]:
-    artifacts = prebuilt.get("artifacts") if isinstance(prebuilt.get("artifacts"), dict) else {}
-    artifact = artifacts.get(_lower(kind)) if isinstance(artifacts.get(_lower(kind)), dict) else None
-    if not isinstance(artifact, dict) or not _text(artifact.get("path")):
-        raise RuntimeError(f"No prebuilt {kind} firmware artifact is available for this target.")
-    return dict(artifact)
-
-
-def _prebuilt_cache_path(template_key: Any, version: Any, artifact: Dict[str, Any]) -> Path:
-    name = Path(_text(artifact.get("path"))).name or f"{_sanitize_token(template_key)}-{_text(artifact.get('kind')) or 'firmware'}.bin"
-    return FIRMWARE_PREBUILT_DIR / _sanitize_token(version or "latest") / _sanitize_token(template_key) / name
-
-
-def _prebuilt_binary_is_valid(path: Path, artifact: Dict[str, Any]) -> bool:
-    if not path.is_file():
-        return False
-    expected_size = _as_int(artifact.get("size_bytes"), 0, minimum=0)
-    if expected_size and int(path.stat().st_size) != expected_size:
-        return False
-    expected_sha = _lower(artifact.get("sha256"))
-    if expected_sha and hashlib.sha256(path.read_bytes()).hexdigest().lower() != expected_sha:
-        return False
-    return True
-
-
-def _download_prebuilt_firmware_binary(
-    template_key: Any,
-    prebuilt: Dict[str, Any],
-    kind: str,
-    *,
-    force_refresh: bool = False,
-) -> Dict[str, Any]:
-    artifact = _prebuilt_artifact_meta(prebuilt, kind)
-    target_path = _prebuilt_cache_path(template_key, prebuilt.get("version"), artifact)
-    url = _prebuilt_firmware_raw_url(artifact.get("path"))
-    if not url:
-        raise RuntimeError("Prebuilt firmware URL is missing.")
-    if not force_refresh and _prebuilt_binary_is_valid(target_path, artifact):
-        return {"path": target_path, "artifact": artifact, "url": url, "cached": True}
-
-    target_path.parent.mkdir(parents=True, exist_ok=True)
-    tmp_path = target_path.with_name(f".{target_path.name}.{uuid.uuid4().hex}.tmp")
-    req = URLRequest(
-        url,
-        headers={
-            "User-Agent": "microWakeWord-Trainer/1.0",
-            "Accept": "application/octet-stream, */*",
-            "Cache-Control": "no-cache",
-            "Pragma": "no-cache",
-        },
-    )
-    try:
-        with urlopen(req, timeout=FIRMWARE_DOWNLOAD_TIMEOUT_SECONDS) as response:
-            tmp_path.write_bytes(response.read())
-        if not _prebuilt_binary_is_valid(tmp_path, artifact):
-            raise RuntimeError(f"Downloaded prebuilt firmware failed verification: {target_path.name}.")
-        tmp_path.replace(target_path)
-    except Exception:
-        with contextlib.suppress(Exception):
-            tmp_path.unlink()
-        raise
-    return {"path": target_path, "artifact": artifact, "url": url, "cached": False}
-
-
-def _browser_flash_artifact_id(template_key: Any) -> str:
-    return "_".join(
-        part
-        for part in [
-            _sanitize_token(template_key),
-            str(int(time.time())),
-            uuid.uuid4().hex[:8],
-        ]
-        if part
-    )
-
-
-def _create_browser_flash_artifact(template_key: Any, prebuilt: Dict[str, Any], binary_path: Path) -> Dict[str, Any]:
-    artifact_id = _browser_flash_artifact_id(template_key)
-    artifact_dir = FIRMWARE_WEB_FLASH_DIR / artifact_id
-    artifact_dir.mkdir(parents=True, exist_ok=True)
-
-    target_binary_name = "firmware.bin"
-    target_binary_path = artifact_dir / target_binary_name
-    shutil.copy2(binary_path, target_binary_path)
-    return {
-        "artifact_id": artifact_id,
-        "binary_url": f"/api/firmware/browser_flash/{artifact_id}/{target_binary_name}",
-        "binary_name": target_binary_name,
-        "template_key": _text(template_key),
-        "firmware_version": _text(prebuilt.get("version")),
-        "source_binary": str(binary_path),
-        "binary_size": int(target_binary_path.stat().st_size),
-        "erase_all": True,
-        "flash_size": _firmware_template_flash_size(template_key),
-        "flash_mode": "dio",
-        "flash_freq": "40m",
-    }
-
-
-def _browser_flash_artifact_path(artifact_id: str, relative_path: str) -> Path:
-    artifact = _sanitize_token(artifact_id)
-    if not artifact:
-        raise KeyError("Browser flash artifact is missing.")
-    rel = Path(_text(relative_path))
-    if rel.is_absolute() or any(part in {"", ".", ".."} for part in rel.parts):
-        raise KeyError("Browser flash artifact path is invalid.")
-    root = (FIRMWARE_WEB_FLASH_DIR / artifact).resolve()
-    target = (root / rel).resolve()
-    if root not in target.parents and target != root:
-        raise KeyError("Browser flash artifact path is invalid.")
-    if not target.is_file():
-        raise KeyError("Browser flash artifact file was not found.")
-    return target
-
-
-class _NativeOTAError(RuntimeError):
-    pass
-
-
-def _native_ota_check(data: bytes, expected: set[int] | None = None) -> None:
-    error_messages = {
-        0x80: "Invalid magic byte.",
-        0x81: "Device could not prepare flash memory for update.",
-        0x82: "OTA authentication failed.",
-        0x83: "Writing OTA data to flash failed.",
-        0x84: "Finishing OTA update failed.",
-        0x85: "Manual reset is required before this OTA update.",
-        0x86: "Current flash configuration does not match this firmware.",
-        0x87: "New firmware flash configuration does not match this device.",
-        0x89: "The OTA partition is too small for this firmware.",
-        0x8A: "The OTA partition could not be found. Recover with USB flashing.",
-        0x8B: "OTA MD5 mismatch. Retry or recover with USB flashing.",
-        0x8D: "Firmware signature verification failed.",
-        0x8E: "This OTA type is not supported by the device.",
-        0xFF: "Unknown OTA error from device.",
-    }
-    if not data:
-        raise _NativeOTAError("Device closed the OTA connection without responding.")
-    code = int(data[0])
-    if code in error_messages:
-        raise _NativeOTAError(error_messages[code])
-    if expected is not None and code not in expected:
-        expected_text = ", ".join(f"0x{item:02X}" for item in sorted(expected))
-        raise _NativeOTAError(f"Unexpected OTA response 0x{code:02X}; expected {expected_text}.")
-
-
-def _native_ota_receive(sock: socket.socket, amount: int, label: str, expected: set[int] | None = None) -> bytes:
-    data = b""
-    while len(data) < amount:
-        try:
-            chunk = sock.recv(amount - len(data))
-        except OSError as exc:
-            raise _NativeOTAError(f"OTA receive failed while reading {label}: {exc}") from exc
-        if not chunk:
-            raise _NativeOTAError(f"OTA connection closed while reading {label}.")
-        data += chunk
-        if len(data) == 1:
-            _native_ota_check(data, expected)
-    if len(data) > 1 and expected is not None:
-        _native_ota_check(data[:1], expected)
-    return data
-
-
-def _native_ota_send(sock: socket.socket, data: bytes | str | int | List[int], label: str) -> None:
-    if isinstance(data, str):
-        payload = data.encode("utf-8")
-    elif isinstance(data, int):
-        payload = bytes([data])
-    elif isinstance(data, list):
-        payload = bytes(data)
-    else:
-        payload = data
-    try:
-        sock.sendall(payload)
-    except OSError as exc:
-        raise _NativeOTAError(f"OTA send failed while writing {label}: {exc}") from exc
-
-
-def _native_ota_upload(
-    host: str,
-    port: int,
-    binary_path: Path,
-    *,
-    progress_callback: Callable[[int, int, int], None] | None = None,
-) -> str:
-    if not host:
-        raise _NativeOTAError("OTA target host is missing.")
-    if not binary_path.is_file():
-        raise _NativeOTAError(f"OTA firmware file was not found: {binary_path}.")
-
-    upload_contents = binary_path.read_bytes()
-    sock: socket.socket | None = None
-    try:
-        sock = socket.create_connection((host, int(port or FIRMWARE_DEFAULT_OTA_PORT)), timeout=20.0)
-        sock.settimeout(20.0)
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-        _native_ota_send(sock, bytes([0x6C, 0x26, 0xF7, 0x5C, 0x45]), "magic bytes")
-        version_response = _native_ota_receive(sock, 2, "OTA version", {0x00})
-        version = int(version_response[1])
-        if version not in {1, 2}:
-            raise _NativeOTAError(f"Device uses unsupported OTA protocol version {version}.")
-
-        _native_ota_send(sock, 0x01 | 0x04, "client features")
-        feature_response = _native_ota_receive(sock, 1, "server features")
-        extended_proto = False
-        server_features = 0
-        first_feature = int(feature_response[0])
-        if first_feature == 0x48:
-            extended_proto = True
-            server_features = int(_native_ota_receive(sock, 1, "server feature flags")[0])
-        elif first_feature == 0x46:
-            server_features = 0x01
-
-        auth_response = int(_native_ota_receive(sock, 1, "OTA auth", {0x01, 0x02, 0x41})[0])
-        if auth_response != 0x41:
-            raise _NativeOTAError("Device requested OTA authentication, but Tater prebuilt OTA has no password configured.")
-
-        sock.settimeout(90.0)
-        if extended_proto:
-            _native_ota_send(sock, 0x00, "OTA app update type")
-        if server_features & 0x01:
-            upload_contents = gzip.compress(upload_contents, compresslevel=9)
-
-        upload_size = len(upload_contents)
-        _native_ota_send(
-            sock,
-            [
-                (upload_size >> 24) & 0xFF,
-                (upload_size >> 16) & 0xFF,
-                (upload_size >> 8) & 0xFF,
-                upload_size & 0xFF,
-            ],
-            "binary size",
-        )
-        _native_ota_receive(sock, 1, "update prepare", {0x42})
-        _native_ota_send(sock, hashlib.md5(upload_contents).hexdigest(), "binary md5")
-        _native_ota_receive(sock, 1, "md5 check", {0x43})
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 0)
-
-        sent = 0
-        last_percent = -1
-        while sent < upload_size:
-            chunk = upload_contents[sent : sent + FIRMWARE_OTA_BLOCK_SIZE]
-            _native_ota_send(sock, chunk, "firmware chunk")
-            sent += len(chunk)
-            if version >= 2:
-                _native_ota_receive(sock, 1, "chunk acknowledgement", {0x47})
-            percent = int((sent / upload_size) * 100) if upload_size else 100
-            if callable(progress_callback) and (percent >= last_percent + 5 or percent == 100):
-                last_percent = percent
-                progress_callback(percent, sent, upload_size)
-
-        sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-        _native_ota_receive(sock, 1, "receive result", {0x44})
-        _native_ota_receive(sock, 1, "update end", {0x45})
-        _native_ota_send(sock, 0x00, "end acknowledgement")
-        return host
-    except OSError as exc:
-        raise _NativeOTAError(f"OTA connection to {host}:{int(port or FIRMWARE_DEFAULT_OTA_PORT)} failed: {exc}") from exc
-    finally:
-        if sock is not None:
-            with contextlib.suppress(Exception):
-                sock.close()
-
-
-def _load_firmware_template_text(spec: Dict[str, Any]) -> tuple[str, str]:
-    rel_path = str(spec.get("path") or "").strip()
-    url = _firmware_raw_url(rel_path)
-    try:
-        return _fetch_text_url(url, timeout=20), url
-    except Exception as exc:
-        raise RuntimeError(f"Could not download firmware template from {url}: {exc}") from exc
-
-
-def _wake_sound_label_from_slug(slug: str) -> str:
-    text = str(slug or "").strip()
-    if not text:
-        return "Wake Sound"
-    return re.sub(r"[_\-.]+", " ", text).strip().title() or "Wake Sound"
-
-
-def _wake_sound_entries_from_manifest(payload: Any) -> List[Dict[str, str]]:
-    rows: List[Any] = []
-    if isinstance(payload, list):
-        rows = list(payload)
-    elif isinstance(payload, dict):
-        for key in ("entries", "wake_sounds", "sounds", "audio", "items"):
-            candidate = payload.get(key)
-            if isinstance(candidate, list):
-                rows = list(candidate)
-                break
-
-    entries: List[Dict[str, str]] = []
-    seen = set()
-    for row in rows:
-        if not isinstance(row, dict):
-            continue
-        url = str(
-            row.get("url")
-            or row.get("download_url")
-            or row.get("audio_url")
-            or row.get("sound_url")
-            or row.get("wake_sound_url")
-            or row.get("wake_word_triggered_sound_file")
-            or ""
-        ).strip()
-        path = str(row.get("path") or "").strip()
-        if not url and path:
-            url = _firmware_raw_url(path)
-        if not url or url in seen:
-            continue
-        seen.add(url)
-        slug = str(row.get("slug") or row.get("name") or row.get("key") or Path(path or url).stem).strip()
-        entries.append(
-            {
-                "value": url,
-                "label": str(row.get("label") or row.get("title") or _wake_sound_label_from_slug(slug)).strip(),
-            }
-        )
-    return sorted(entries, key=lambda item: (item["label"].lower(), item["value"]))
-
-
-def _load_wake_sound_catalog() -> Dict[str, Any]:
-    now = time.time()
-    with WAKE_SOUND_CATALOG_LOCK:
-        cached_ts = float(WAKE_SOUND_CATALOG_CACHE.get("ts") or 0.0)
-        cached_payload = WAKE_SOUND_CATALOG_CACHE.get("payload")
-        if isinstance(cached_payload, dict) and (now - cached_ts) < WAKE_SOUND_CATALOG_CACHE_TTL_SECONDS:
-            return copy.deepcopy(cached_payload)
-
-    warnings: List[str] = []
-    for manifest_path in WAKE_SOUND_MANIFEST_PATHS:
-        manifest_url = _firmware_raw_url(manifest_path)
-        try:
-            payload = json.loads(_fetch_text_url(manifest_url, timeout=20))
-            entries = _wake_sound_entries_from_manifest(payload)
-            if entries:
-                catalog = {"entries": entries, "warning": "", "source_label": manifest_url}
-                with WAKE_SOUND_CATALOG_LOCK:
-                    WAKE_SOUND_CATALOG_CACHE["ts"] = now
-                    WAKE_SOUND_CATALOG_CACHE["payload"] = copy.deepcopy(catalog)
-                return catalog
-        except Exception as exc:
-            warnings.append(f"{manifest_path}: {exc}")
-
-    catalog = {
-        "entries": [],
-        "warning": warnings[0] if warnings else "Wake sound catalog unavailable.",
-        "source_label": "",
-    }
-    with WAKE_SOUND_CATALOG_LOCK:
-        WAKE_SOUND_CATALOG_CACHE["ts"] = now
-        WAKE_SOUND_CATALOG_CACHE["payload"] = copy.deepcopy(catalog)
-    return catalog
-
-
-def _wake_sound_picker_options(catalog: Dict[str, Any]) -> List[Dict[str, str]]:
-    entries = catalog.get("entries") if isinstance(catalog.get("entries"), list) else []
-    return [{"value": "__custom__", "label": "Custom URL"}, *[dict(row) for row in entries if isinstance(row, dict)]]
-
-
-def _extract_substitution_sections(raw_text: str) -> Dict[str, str]:
-    section_map: Dict[str, str] = {}
-    in_substitutions = False
-    current_section = "Firmware"
-
-    for line in raw_text.splitlines():
-        if not in_substitutions:
-            if re.match(r"^\s*substitutions:\s*$", line):
-                in_substitutions = True
-            continue
-        if line and not line.startswith((" ", "\t")):
-            break
-        stripped = line.strip()
-        if not stripped:
-            continue
-        if stripped.startswith("#"):
-            comment = stripped[1:].strip()
-            if comment and set(comment) > {"-"} and len(comment) <= 48 and re.search(r"[A-Za-z]", comment):
-                current_section = comment.title() if comment.isupper() else comment
-            continue
-        match = re.match(r"^([A-Za-z0-9_]+)\s*:", stripped)
-        if match:
-            section_map[match.group(1)] = current_section
-    return section_map
-
-
-def _load_firmware_profiles() -> Dict[str, Dict[str, str]]:
-    with contextlib.suppress(Exception):
-        if FIRMWARE_PROFILE_FILE.exists():
-            parsed = json.loads(FIRMWARE_PROFILE_FILE.read_text(encoding="utf-8"))
-            if isinstance(parsed, dict):
-                return {
-                    str(key): {str(k): str(v) for k, v in value.items()}
-                    for key, value in parsed.items()
-                    if isinstance(value, dict)
-                }
-    return {}
-
-
-def _save_firmware_profile(profile_key: str, values: Dict[str, str]) -> None:
-    FIRMWARE_PROFILE_FILE.parent.mkdir(parents=True, exist_ok=True)
-    profiles = _load_firmware_profiles()
-    profiles[profile_key] = {str(key): str(value) for key, value in values.items() if str(key)}
-    FIRMWARE_PROFILE_FILE.write_text(json.dumps(profiles, indent=2, sort_keys=True), encoding="utf-8")
-
-
-def _firmware_profile_target(raw_host: Any = "", raw_port: Any = "") -> tuple[str, str]:
-    host = str(raw_host or "").strip()
-    port = str(raw_port or "").strip()
-    if "://" in host:
-        parsed = urlparse(host)
-        host = parsed.hostname or ""
-        if not port and parsed.port:
-            port = str(parsed.port)
-    host = host.strip().strip("/")
-    if host.count(":") == 1 and not port:
-        maybe_host, maybe_port = host.rsplit(":", 1)
-        if maybe_port.isdigit():
-            host = maybe_host
-            port = maybe_port
-    host = host.strip("[]").strip().lower()
-    if not host:
-        return "", ""
-    with contextlib.suppress(Exception):
-        parsed_port = int(port or FIRMWARE_DEFAULT_OTA_PORT)
-        if parsed_port == 6053:
-            parsed_port = FIRMWARE_DEFAULT_OTA_PORT
-        port = str(parsed_port)
-    if not port:
-        port = str(FIRMWARE_DEFAULT_OTA_PORT)
-    return host, port
-
-
-def _firmware_profile_key_for_target(raw_host: Any = "", raw_port: Any = "") -> str:
-    host, port = _firmware_profile_target(raw_host, raw_port)
-    return f"device:{host}:{port}" if host else ""
-
-
-def _firmware_profile_key(template_key: Any = "", raw_host: Any = "", raw_port: Any = "") -> str:
-    target_key = _firmware_profile_key_for_target(raw_host, raw_port)
-    template = str(template_key or "").strip().lower()
-    if target_key and template:
-        return f"{target_key}:template:{template}"
-    return target_key or template
-
-
-def _firmware_cache_slug(*parts: Any) -> str:
-    raw = "__".join(str(part or "").strip() for part in parts if str(part or "").strip())
-    slug = re.sub(r"[^A-Za-z0-9_.-]+", "_", raw).strip("._-")
-    return (slug[:96] or "default").lower()
-
-
-def _firmware_build_cache_path(
-    template_key: str,
-    normalized: Dict[str, str],
-    host: str,
-    port: Any = None,
-    identity_key: str = "",
-    friendly_key: str = "",
-) -> Path:
-    normalized_host, normalized_port = _firmware_profile_target(host, port)
-    template_slug = _firmware_cache_slug(template_key, "template")
-    identity_key = str(identity_key or "").strip()
-    friendly_key = str(friendly_key or "").strip()
-    device_identity = (
-        (normalized.get(identity_key) if identity_key else "")
-        or (normalized.get(friendly_key) if friendly_key else "")
-        or normalized.get("node_name")
-        or normalized.get("device_name")
-        or normalized.get("friendly_name")
-        or normalized.get("name")
-        or normalized_host
-        or "device"
-    )
-    target_slug = _firmware_cache_slug(device_identity, normalized_host, normalized_port)
-    return FIRMWARE_CACHE_DIR / "builds" / template_slug / target_slug
-
-
-def _load_firmware_profile(template_key: str, profile_key: str = "") -> Dict[str, str]:
-    profiles = _load_firmware_profiles()
-    profile = profiles.get(profile_key) if profile_key else None
-    if isinstance(profile, dict):
-        return dict(profile)
-    if profile_key and ":template:" in profile_key:
-        legacy_device_key = profile_key.split(":template:", 1)[0]
-        legacy_device = profiles.get(legacy_device_key)
-        if isinstance(legacy_device, dict):
-            return dict(legacy_device)
-    legacy = profiles.get(template_key)
-    return dict(legacy) if isinstance(legacy, dict) else {}
-
-
-def _firmware_profile_values_for_template(profile: Dict[str, Any], substitutions: Dict[str, Any]) -> Dict[str, str]:
-    keep_keys = {str(key or "").strip() for key in substitutions.keys()}
-    keep_keys.update({"__target_host", "__target_port", "wake_sound_catalog", "wake_word_choice"})
-    return {
-        key: str(profile.get(key) or "")
-        for key in keep_keys
-        if key and key in profile
-    }
-
-
-def _normalize_firmware_profile_update(template_key: str, values: Dict[str, Any], profile_key: str = "") -> Dict[str, str]:
-    ctx = _load_firmware_template_context(template_key, profile_key)
-    spec = ctx["spec"]
-    profile = ctx.get("profile") if isinstance(ctx.get("profile"), dict) else {}
-    substitutions = ctx["substitutions"]
-    normalized = _firmware_profile_values_for_template(profile, substitutions)
-    fixed_keys = set(spec.get("fixed_keys") or set())
-    identity_key = str(spec.get("identity_key") or "").strip()
-    if identity_key:
-        fixed_keys.add(identity_key)
-
-    for key in substitutions.keys():
-        key_text = str(key or "").strip()
-        if not key_text:
-            continue
-        default = _template_default_string(substitutions.get(key_text))
-        if key_text in fixed_keys:
-            normalized[key_text] = default
-            continue
-        if key_text == "wifi_password":
-            raw_password = str(values.get(key_text) or "").strip()
-            if raw_password:
-                normalized[key_text] = raw_password
-            elif key_text not in normalized:
-                normalized[key_text] = ""
-            continue
-        if key_text == "hidden_ssid":
-            if key_text in values:
-                normalized[key_text] = "true" if _parse_bool(values.get(key_text)) else "false"
-            elif key_text not in normalized:
-                normalized[key_text] = "true" if str(default).lower() == "true" else "false"
-            continue
-        if key_text == "wake_word_model_url":
-            if key_text in values:
-                normalized[key_text] = _local_trained_wake_word_url(values.get(key_text))
-            elif key_text not in normalized:
-                normalized[key_text] = ""
-            continue
-        if key_text in values:
-            normalized[key_text] = str(values.get(key_text) or "").strip()
-        elif key_text not in normalized:
-            normalized[key_text] = default
-
-    wake_word_choice = str(values.get("wake_word_choice") or "").strip()
-    if wake_word_choice:
-        normalized["wake_word_choice"] = wake_word_choice
-    wake_sound_choice = str(values.get("wake_sound_catalog") or "").strip()
-    if wake_sound_choice:
-        normalized["wake_sound_catalog"] = wake_sound_choice
-        if wake_sound_choice != "__custom__" and "wake_word_triggered_sound_file" in substitutions:
-            normalized["wake_word_triggered_sound_file"] = wake_sound_choice
-
-    target_host = str(values.get("__target_host") or "").strip()
-    target_port = str(values.get("__target_port") or "").strip()
-    if target_port == "6053":
-        target_port = str(FIRMWARE_DEFAULT_OTA_PORT)
-    if target_host:
-        normalized["__target_host"] = target_host
-    if target_port:
-        normalized["__target_port"] = target_port
-
-    return normalized
-
-
-def _local_trained_wake_word_url(value: Any) -> str:
-    url = str(value or "").strip()
-    return url if "/api/trained_wake_words/" in url else ""
-
-
-def _selected_trained_wake_word(
-    trained_wake_words: List[Dict[str, Any]],
-    profile: Dict[str, Any],
-    substitutions: Dict[str, Any],
-) -> Dict[str, Any] | None:
-    if not trained_wake_words:
-        return None
-
-    saved_choice = str(profile.get("wake_word_choice") or "").strip()
-    current_wake_word_name = str(
-        profile.get("wake_word_name") or _template_default_string(substitutions.get("wake_word_name"))
-    ).strip()
-    current_wake_word_url = str(profile.get("wake_word_model_url") or "").strip()
-
-    def match(predicate):
-        return next((row for row in trained_wake_words if predicate(row)), None)
-
-    return (
-        match(lambda row: str(row.get("key") or "") == saved_choice)
-        or match(lambda row: str(row.get("json_url") or "") == current_wake_word_url)
-        or match(lambda row: str(row.get("model_url") or "") == current_wake_word_url)
-        or match(lambda row: str(row.get("wake_word_name") or "") == current_wake_word_name)
-        or trained_wake_words[0]
-    )
-
-
-def _load_firmware_template_context(template_key: str, profile_key: str = "") -> Dict[str, Any]:
-    spec = _firmware_template_spec(template_key)
-    raw_text, source_label = _load_firmware_template_text(spec)
-    parsed = yaml.load(raw_text, Loader=_FirmwareYamlLoader)
-    if not isinstance(parsed, dict):
-        raise RuntimeError(f"Firmware template {spec.get('label') or template_key} did not parse into a YAML mapping.")
-    substitutions = parsed.get("substitutions") if isinstance(parsed.get("substitutions"), dict) else {}
-    if not substitutions:
-        raise RuntimeError(f"Firmware template {spec.get('label') or template_key} has no substitutions.")
-    return {
-        "spec": spec,
-        "raw_text": raw_text,
-        "source_label": source_label,
-        "template_doc": parsed,
-        "substitutions": dict(substitutions),
-        "sections": _extract_substitution_sections(raw_text),
-        "profile": _load_firmware_profile(str(spec.get("key") or ""), profile_key),
-    }
-
-
-def _firmware_template_fields(template_key: str, base_url: str = "", profile_key: str = "") -> List[Dict[str, Any]]:
-    ctx = _load_firmware_template_context(template_key, profile_key)
-    spec = ctx["spec"]
-    profile = ctx.get("profile") if isinstance(ctx.get("profile"), dict) else {}
-    fields: List[Dict[str, Any]] = []
-    fixed_keys = set(spec.get("fixed_keys") or set())
-    identity_key = str(spec.get("identity_key") or "").strip()
-    if identity_key:
-        fixed_keys.add(identity_key)
-    hidden_keys = {"ha_voice_ip"} | set(spec.get("auto_keys") or set())
-    trained_wake_words = _list_trained_wake_words(base_url)
-    wake_sound_catalog = _load_wake_sound_catalog()
-    selected_wake_word_row = _selected_trained_wake_word(trained_wake_words, profile, ctx["substitutions"])
-    selected_wake_word = str(selected_wake_word_row.get("key") or "") if selected_wake_word_row else ""
-    wake_picker_added = False
-    wake_sound_picker_added = False
-
-    for key, raw_value in ctx["substitutions"].items():
-        key_text = str(key or "").strip()
-        if not key_text or key_text in hidden_keys:
-            continue
-
-        if key_text in {"wake_word_name", "wake_word_model_url"} and not wake_picker_added:
-            fields.append(
-                {
-                    "key": "wake_word_choice",
-                    "label": "Trained Wake Word",
-                    "type": "wake_word_select",
-                    "value": selected_wake_word,
-                    "placeholder": "Choose a trained wake word...",
-                    "description": (
-                        "Select a locally trained wake word to fill the name and model URL below."
-                        if trained_wake_words
-                        else "No locally trained wake words found yet. Train one first, then return here."
-                    ),
-                    "options": trained_wake_words,
-                    "section": "Micro Wake Word",
-                }
-            )
-            wake_picker_added = True
-
-        if key_text == "wake_word_triggered_sound_file" and not wake_sound_picker_added:
-            wake_sound_entries = wake_sound_catalog.get("entries") if isinstance(wake_sound_catalog.get("entries"), list) else []
-            current_sound_url = str(profile.get(key_text) or _template_default_string(raw_value) or "").strip()
-            saved_sound_choice = str(profile.get("wake_sound_catalog") or "").strip()
-            available_sound_urls = {str(row.get("value") or "") for row in wake_sound_entries if isinstance(row, dict)}
-            if saved_sound_choice in available_sound_urls or saved_sound_choice == "__custom__":
-                picker_value = saved_sound_choice
-            else:
-                picker_value = current_sound_url if current_sound_url in available_sound_urls else "__custom__"
-            description = (
-                f"Choose from {len(wake_sound_entries)} prebuilt wake sounds, or leave this on Custom URL and paste your own audio URL below."
-                if wake_sound_entries
-                else "Prebuilt wake-sound catalog is unavailable right now. You can still paste any custom audio URL below."
-            )
-            if wake_sound_catalog.get("warning") and not wake_sound_entries:
-                description = f"{description} {wake_sound_catalog['warning']}".strip()
-            fields.append(
-                {
-                    "key": "wake_sound_catalog",
-                    "label": "Prebuilt Wake Sound",
-                    "type": "wake_sound_select",
-                    "value": picker_value,
-                    "options": _wake_sound_picker_options(wake_sound_catalog),
-                    "description": description,
-                    "section": "Wake Sound",
-                }
-            )
-            wake_sound_picker_added = True
-
-        default = _template_default_string(raw_value)
-        saved = str(profile.get(key_text) or "")
-        field_type = "text"
-        read_only = key_text in fixed_keys
-        value = default if read_only else (saved or default)
-        placeholder = ""
-        description = ""
-        label = _humanize_key(key_text)
-
-        if read_only:
-            label = "Device Name" if key_text == identity_key else label
-            description = "Locked to the selected firmware YAML."
-        elif key_text == "wifi_password":
-            field_type = "password"
-            value = ""
-            placeholder = "Leave blank to keep saved password" if saved else "Required before flashing"
-            description = "Required for the first build. Leave blank later to keep the saved value."
-        elif key_text == "hidden_ssid":
-            field_type = "checkbox"
-            value = str(saved or default).lower() == "true"
-        elif key_text == "wifi_ssid":
-            placeholder = "Your Wi-Fi SSID"
-            description = "Required before build + flash."
-        elif key_text == "wake_word_model_url":
-            value = str(selected_wake_word_row.get("json_url") or "") if selected_wake_word_row else ""
-            placeholder = "Train or select a local wake word first"
-            description = "Filled from the local trained wake-word picker."
-        elif key_text == "wake_word_name":
-            if selected_wake_word_row:
-                value = str(selected_wake_word_row.get("wake_word_name") or selected_wake_word_row.get("key") or "")
-            placeholder = "hey_tater"
-        elif key_text == "wake_word_triggered_sound_file":
-            placeholder = "https://.../wake-sound.mp3"
-            description = "Pick a prebuilt wake sound above or paste any custom audio URL."
-        section = ctx["sections"].get(key_text) or "Firmware"
-        if key_text == "wake_word_triggered_sound_file":
-            section = "Wake Sound"
-        elif key_text in {"wake_word_name", "wake_word_model_url"}:
-            section = "Micro Wake Word"
-        elif key_text.endswith("_sound_file"):
-            section = "Sounds"
-
-        fields.append(
-            {
-                "key": key_text,
-                "label": label,
-                "type": field_type,
-                "value": value,
-                "placeholder": placeholder,
-                "description": description,
-                "read_only": read_only,
-                "section": section,
-            }
-        )
-    return fields
-
-
-def _esphome_pythonpath() -> str:
-    existing = os.environ.get("PYTHONPATH", "")
-    candidates = []
-    env_repo = os.environ.get("ESPHOME_REPO_DIR")
-    if env_repo:
-        candidates.extend(Path(part).expanduser() for part in env_repo.split(os.pathsep) if part)
-    candidates.append(ROOT_DIR.parent / "esphome")
-
-    paths = [str(path) for path in candidates if (path / "esphome").is_dir()]
-    if existing:
-        paths.append(existing)
-    return os.pathsep.join(paths)
-
-
-def _render_firmware_config(
-    template_key: str,
-    values: Dict[str, Any],
-    host: str,
-    session_id: str,
-    port: Any = None,
-) -> tuple[Path, Dict[str, str], Path]:
-    profile_key = _firmware_profile_key(template_key, host, port)
-    ctx = _load_firmware_template_context(template_key, profile_key)
-    spec = ctx["spec"]
-    profile = ctx.get("profile") if isinstance(ctx.get("profile"), dict) else {}
-    substitutions = ctx["substitutions"]
-    normalized = _firmware_profile_values_for_template(profile, substitutions)
-    fixed_keys = set(spec.get("fixed_keys") or set())
-    identity_key = str(spec.get("identity_key") or "").strip()
-    if identity_key:
-        fixed_keys.add(identity_key)
-
-    for key in substitutions.keys():
-        key_text = str(key or "").strip()
-        if not key_text:
-            continue
-        raw_value = values.get(key_text)
-        if key_text in fixed_keys:
-            normalized[key_text] = _template_default_string(substitutions.get(key_text))
-        elif key_text == "wifi_password":
-            normalized[key_text] = str(raw_value or "").strip() or str(profile.get(key_text) or "")
-        elif key_text == "hidden_ssid":
-            normalized[key_text] = "true" if bool(raw_value) else "false"
-        elif key_text == "ha_voice_ip":
-            normalized[key_text] = host
-        elif key_text == "wake_word_model_url":
-            normalized[key_text] = _local_trained_wake_word_url(raw_value)
-        else:
-            normalized[key_text] = str(raw_value if raw_value is not None else "").strip() or _template_default_string(
-                substitutions.get(key_text)
-            )
-    wake_sound_choice = str(values.get("wake_sound_catalog") or "").strip()
-    if wake_sound_choice and wake_sound_choice != "__custom__" and "wake_word_triggered_sound_file" in substitutions:
-        normalized["wake_word_triggered_sound_file"] = wake_sound_choice
-
-    missing = []
-    if not normalized.get("wifi_ssid"):
-        missing.append("Wi-Fi SSID")
-    if not normalized.get("wifi_password"):
-        missing.append("Wi-Fi password")
-    if not host:
-        missing.append("device IP or hostname")
-    if "wake_word_model_url" in substitutions and not normalized.get("wake_word_model_url"):
-        missing.append("local trained wake word")
-    if missing:
-        raise RuntimeError(f"Missing required firmware values: {', '.join(missing)}.")
-
-    config = copy.deepcopy(ctx["template_doc"])
-    config["substitutions"] = {key: str(normalized.get(key, "")) for key in substitutions.keys()}
-    build_path = _firmware_build_cache_path(
-        str(spec.get("key") or template_key),
-        normalized,
-        host,
-        port,
-        str(spec.get("identity_key") or ""),
-        str(spec.get("friendly_key") or ""),
-    )
-    esphome_block = config.get("esphome") if isinstance(config.get("esphome"), dict) else None
-    if isinstance(esphome_block, dict):
-        esphome_block["build_path"] = str(build_path)
-        config["esphome"] = esphome_block
-
-    session_dir = FIRMWARE_CACHE_DIR / "configs" / session_id
-    session_dir.mkdir(parents=True, exist_ok=True)
-    config_path = session_dir / f"{build_path.parent.name}__{build_path.name}.yaml"
-    config_path.write_text(yaml.dump(config, Dumper=_FirmwareYamlDumper, sort_keys=False, allow_unicode=True), encoding="utf-8")
-    normalized_host, normalized_port = _firmware_profile_target(host, port)
-    if normalized_host:
-        normalized["__target_host"] = normalized_host
-        normalized["__target_port"] = normalized_port
-    _save_firmware_profile(profile_key or str(spec.get("key") or template_key), normalized)
-    return config_path, normalized, build_path
-
-
-def _firmware_session_payload(session_id: str) -> Dict[str, Any]:
-    with FIRMWARE_LOCK:
-        session = FIRMWARE_SESSIONS.get(session_id)
-        if not isinstance(session, dict):
-            return {"ok": False, "error": "Firmware flash session not found."}
-        return {
-            "ok": True,
-            "session_id": session_id,
-            "running": bool(session.get("running")),
-            "exit_code": session.get("exit_code"),
-            "host": session.get("host"),
-            "port": session.get("port"),
-            "filename": session.get("filename"),
-            "message": session.get("message") or "",
-            "log_lines": list(session.get("log_lines") or []),
-            "started_at": session.get("started_at"),
-            "finished_at": session.get("finished_at"),
-        }
-
-
-def _clean_terminal_text(value: Any) -> str:
-    text_value = str(value or "")
-    if not text_value:
-        return ""
-    clean = ANSI_ESCAPE_RE.sub("", text_value).replace("\r", "")
-    clean = "".join(ch for ch in clean if ch == "\t" or ord(ch) >= 32)
-    return clean.strip()
-
-
-def _append_firmware_log(session_id: str, line: str):
-    clean = _clean_terminal_text(line)
-    if not clean:
-        return
-    with FIRMWARE_LOCK:
-        session = FIRMWARE_SESSIONS.get(session_id)
-        if not isinstance(session, dict):
-            return
-        lines: List[str] = session.setdefault("log_lines", [])
-        lines.append(clean)
-        if len(lines) > FIRMWARE_MAX_LOG_LINES:
-            del lines[: len(lines) - FIRMWARE_MAX_LOG_LINES]
-
-
-def _firmware_runner_env(*, include_esphome_pythonpath: bool = False) -> Dict[str, str]:
-    FIRMWARE_HOME_DIR.mkdir(parents=True, exist_ok=True)
-    FIRMWARE_XDG_CACHE_DIR.mkdir(parents=True, exist_ok=True)
-    FIRMWARE_PLATFORMIO_DIR.mkdir(parents=True, exist_ok=True)
-    FIRMWARE_ESPHOME_DATA_DIR.mkdir(parents=True, exist_ok=True)
-    env = os.environ.copy()
-    env.pop("PYTHONPATH", None)
-    env["PYTHONUNBUFFERED"] = "1"
-    env["HOME"] = str(FIRMWARE_HOME_DIR)
-    env["XDG_CACHE_HOME"] = str(FIRMWARE_XDG_CACHE_DIR)
-    env["ESPHOME_DATA_DIR"] = str(FIRMWARE_ESPHOME_DATA_DIR)
-    env["PLATFORMIO_CORE_DIR"] = str(FIRMWARE_PLATFORMIO_DIR)
-    env["PLATFORMIO_CACHE_DIR"] = str(FIRMWARE_PLATFORMIO_DIR / "cache")
-    if include_esphome_pythonpath:
-        pythonpath = _esphome_pythonpath()
-        if pythonpath:
-            env["PYTHONPATH"] = pythonpath
-    return env
-
-
-def _normalize_firmware_filename(raw_name: str) -> str:
-    name = Path(raw_name or "firmware.bin").name
-    name = re.sub(r"[^A-Za-z0-9._-]+", "_", name).strip("._")
-    return name or "firmware.bin"
-
-
-def _parse_flash_target(raw_host: str, raw_port: Any = None) -> tuple[str, int]:
-    host_text = (raw_host or "").strip()
-    if not host_text:
-        raise ValueError("Device IP or hostname is required.")
-
-    if "://" in host_text:
-        parsed = urlparse(host_text)
-        host_text = parsed.hostname or ""
-        if raw_port in (None, "") and parsed.port:
-            raw_port = parsed.port
-
-    host_text = host_text.strip().strip("/")
-    if "/" in host_text:
-        host_text = host_text.split("/", 1)[0].strip()
-
-    if host_text.count(":") == 1:
-        maybe_host, maybe_port = host_text.rsplit(":", 1)
-        if maybe_port.isdigit():
-            host_text = maybe_host.strip("[]")
-            raw_port = maybe_port
-
-    host_text = host_text.strip("[]").strip()
-    if not host_text:
-        raise ValueError("Device IP or hostname is required.")
-    if not re.match(r"^[A-Za-z0-9_.:-]+$", host_text):
-        raise ValueError("Device host contains unsupported characters.")
-
-    try:
-        port = int(raw_port or FIRMWARE_DEFAULT_OTA_PORT)
-    except Exception as exc:
-        raise ValueError("OTA port must be a number.") from exc
-    if port < 1 or port > 65535:
-        raise ValueError("OTA port must be between 1 and 65535.")
-    return host_text, port
-
-
-def _run_firmware_flash_background(session_id: str):
-    with FIRMWARE_LOCK:
-        session = FIRMWARE_SESSIONS.get(session_id)
-        if not isinstance(session, dict):
-            return
-        host = str(session.get("host") or "")
-        port = int(session.get("port") or FIRMWARE_DEFAULT_OTA_PORT)
-        firmware_path = str(session.get("firmware_path") or "")
-
-    _append_firmware_log(session_id, "===== Firmware Flash Console =====")
-    _append_firmware_log(session_id, f"→ Device: {host}:{port}")
-    _append_firmware_log(session_id, f"→ OTA image: {Path(firmware_path).name}")
-
-    try:
-        with FIRMWARE_LOCK:
-            live = FIRMWARE_SESSIONS.get(session_id)
-            if isinstance(live, dict):
-                live["message"] = "Firmware upload running."
-
-        def progress(percent: int, sent: int, total: int) -> None:
-            _append_firmware_log(session_id, f"→ OTA upload progress: {percent}% ({sent}/{total} bytes)")
-
-        uploaded_host = _native_ota_upload(host, port, Path(firmware_path), progress_callback=progress)
-        _append_firmware_log(session_id, f"✓ Firmware flash finished to {uploaded_host or host}")
-        with FIRMWARE_LOCK:
-            live = FIRMWARE_SESSIONS.get(session_id)
-            if isinstance(live, dict):
-                live["running"] = False
-                live["exit_code"] = 0
-                live["finished_at"] = datetime.now(timezone.utc).isoformat()
-                live["message"] = "Firmware uploaded successfully."
-    except Exception as exc:
-        _append_firmware_log(session_id, f"✗ Firmware flash crashed: {exc!r}")
-        with FIRMWARE_LOCK:
-            live = FIRMWARE_SESSIONS.get(session_id)
-            if isinstance(live, dict):
-                live["running"] = False
-                live["exit_code"] = 999
-                live["finished_at"] = datetime.now(timezone.utc).isoformat()
-                live["message"] = f"Firmware upload crashed: {exc}"
-
-
-def _run_firmware_build_flash_background(session_id: str):
-    with FIRMWARE_LOCK:
-        session = FIRMWARE_SESSIONS.get(session_id)
-        if not isinstance(session, dict):
-            return
-        host = str(session.get("host") or "")
-        port = int(session.get("port") or FIRMWARE_DEFAULT_OTA_PORT)
-        template_key = str(session.get("template_key") or "")
-        template_label = str(session.get("template_label") or template_key)
-
-    _append_firmware_log(session_id, "===== Prebuilt Firmware Flash Console =====")
-    _append_firmware_log(session_id, f"→ Firmware: {template_label}")
-    _append_firmware_log(session_id, f"→ Device: {host}:{port}")
-    _append_firmware_log(session_id, "→ Loading latest prebuilt firmware manifest...")
-
-    try:
-        prebuilt = _prebuilt_firmware_info(template_key, force_refresh=True)
-        if not bool(prebuilt.get("available")):
-            raise RuntimeError(_text(prebuilt.get("error")) or "No prebuilt OTA image is available for this firmware target.")
-        firmware_version = _text(prebuilt.get("version")) or "latest"
-        _append_firmware_log(session_id, f"→ Latest firmware: {firmware_version}")
-        _append_firmware_log(session_id, "→ Downloading or reusing verified OTA image...")
-        binary = _download_prebuilt_firmware_binary(template_key, prebuilt, "ota")
-        cached_text = "cached" if bool(binary.get("cached")) else "downloaded"
-        _append_firmware_log(session_id, f"→ OTA image {cached_text}: {Path(binary['path']).name}")
-        with FIRMWARE_LOCK:
-            live = FIRMWARE_SESSIONS.get(session_id)
-            if isinstance(live, dict):
-                live["message"] = "Firmware upload running."
-                live["filename"] = Path(binary["path"]).name
-                live["firmware_version"] = firmware_version
-
-        def progress(percent: int, sent: int, total: int) -> None:
-            _append_firmware_log(session_id, f"→ OTA upload progress: {percent}% ({sent}/{total} bytes)")
-
-        uploaded_host = _native_ota_upload(host, port, Path(binary["path"]), progress_callback=progress)
-        _append_firmware_log(session_id, f"✓ Prebuilt firmware uploaded successfully to {uploaded_host or host}")
-        with FIRMWARE_LOCK:
-            live = FIRMWARE_SESSIONS.get(session_id)
-            if isinstance(live, dict):
-                live["running"] = False
-                live["exit_code"] = 0
-                live["finished_at"] = datetime.now(timezone.utc).isoformat()
-                live["message"] = "Firmware uploaded successfully."
-    except Exception as exc:
-        _append_firmware_log(session_id, f"✗ Prebuilt firmware flash failed: {exc!r}")
-        with FIRMWARE_LOCK:
-            live = FIRMWARE_SESSIONS.get(session_id)
-            if isinstance(live, dict):
-                live["running"] = False
-                live["exit_code"] = 999
-                live["finished_at"] = datetime.now(timezone.utc).isoformat()
-                live["message"] = f"Firmware flash failed: {exc}"
-
-
-def _dedupe_discovered_devices(devices: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
-    seen = set()
-    clean_devices: List[Dict[str, Any]] = []
-    for item in devices:
-        host = str(item.get("host") or "").strip()
-        name = str(item.get("name") or host or "Tater satellite").strip()
-        if not host:
-            continue
-        key = (host.lower(), int(item.get("port") or FIRMWARE_DEFAULT_OTA_PORT))
-        if key in seen:
-            continue
-        seen.add(key)
-        clean_devices.append(
-            {
-                "name": name,
-                "host": host,
-                "port": int(item.get("port") or FIRMWARE_DEFAULT_OTA_PORT),
-                "source": item.get("source") or "mdns",
-            }
-        )
-    return sorted(clean_devices, key=lambda row: (str(row.get("name") or "").lower(), str(row.get("host") or "")))
-
-
-def _discover_with_zeroconf(timeout_seconds: float) -> List[Dict[str, Any]]:
-    try:
-        from zeroconf import ServiceBrowser, ServiceListener, Zeroconf
-    except Exception:
-        return []
-
-    devices: List[Dict[str, Any]] = []
-
-    class Listener(ServiceListener):
-        def add_service(self, zeroconf, service_type, name):
-            info = zeroconf.get_service_info(service_type, name, timeout=1000)
-            if info is None:
-                return
-            addresses = []
-            for raw in getattr(info, "addresses", []) or []:
-                try:
-                    family = socket.AF_INET6 if len(raw) == 16 else socket.AF_INET
-                    addresses.append(socket.inet_ntop(family, raw))
-                except Exception:
-                    continue
-            host = addresses[0] if addresses else str(getattr(info, "server", "") or "").rstrip(".")
-            label = name.replace(service_type, "").rstrip(".") or host
-            devices.append(
-                {
-                    "name": label,
-                    "host": host,
-                    "port": FIRMWARE_DEFAULT_OTA_PORT,
-                    "source": "zeroconf",
-                }
-            )
-
-        def update_service(self, zeroconf, service_type, name):
-            self.add_service(zeroconf, service_type, name)
-
-        def remove_service(self, zeroconf, service_type, name):
-            return None
-
-    zeroconf = Zeroconf()
-    try:
-        ServiceBrowser(zeroconf, "_esphomelib._tcp.local.", Listener())
-        time.sleep(max(0.5, timeout_seconds))
-    finally:
-        zeroconf.close()
-    return _dedupe_discovered_devices(devices)
-
-
-def _discover_with_dns_sd(timeout_seconds: float) -> List[Dict[str, Any]]:
-    if not shutil.which("dns-sd"):
-        return []
-    try:
-        proc = subprocess.Popen(
-            ["dns-sd", "-B", "_esphomelib._tcp", "local"],
-            stdout=subprocess.PIPE,
-            stderr=subprocess.STDOUT,
-            text=True,
-        )
-    except Exception:
-        return []
-
-    try:
-        time.sleep(max(0.5, timeout_seconds))
-        proc.terminate()
-        output, _ = proc.communicate(timeout=1.5)
-    except Exception:
-        with contextlib.suppress(Exception):
-            proc.kill()
-        output = ""
-
-    devices: List[Dict[str, Any]] = []
-    for line in (output or "").splitlines():
-        if " Add " not in f" {line} " or "_esphomelib._tcp" not in line:
-            continue
-        parts = line.split(None, 6)
-        if len(parts) < 7:
-            continue
-        instance = parts[-1].strip()
-        if not instance or instance.lower().startswith("local."):
-            continue
-        hostname = f"{re.sub(r'[^A-Za-z0-9_-]+', '-', instance).strip('-')}.local"
-        host = hostname
-        try:
-            host = socket.gethostbyname(hostname)
-        except Exception:
-            pass
-        devices.append(
-            {
-                "name": instance,
-                "host": host,
-                "port": FIRMWARE_DEFAULT_OTA_PORT,
-                "source": "dns-sd",
-            }
-        )
-    return _dedupe_discovered_devices(devices)
-
-
-def _discover_esphome_devices() -> tuple[List[Dict[str, Any]], str]:
-    devices = _discover_with_zeroconf(FIRMWARE_DISCOVERY_SECONDS)
-    if devices:
-        return devices, f"Found {len(devices)} Tater native satellite{'' if len(devices) == 1 else 's'} with mDNS."
-
-    devices = _discover_with_dns_sd(FIRMWARE_DISCOVERY_SECONDS)
-    if devices:
-        return devices, f"Found {len(devices)} Tater native satellite{'' if len(devices) == 1 else 's'} with dns-sd."
-
-    return [], "No Tater native satellites were auto-detected. Enter the device IP or hostname manually."
-
-
 # -------------------- Routes --------------------
 @app.get("/", response_class=HTMLResponse)
 def index():
@@ -3388,71 +1934,6 @@ def discard_captured_audio(file_name: str):
     return {"ok": True, "captured_count": len(_list_captured_sample_names())}
 
 
-@app.get("/api/firmware/devices")
-def firmware_devices():
-    devices, message = _discover_esphome_devices()
-    return {"ok": True, "devices": devices, "message": message}
-
-
-@app.get("/api/firmware/templates")
-def firmware_templates(request: Request, target_host: str = "", target_port: str = ""):
-    templates = []
-    base_url = _request_base_url(request)
-    wake_words = _list_trained_wake_words(base_url)
-    selected_host, selected_port = _firmware_profile_target(target_host, target_port)
-    for spec in FIRMWARE_TEMPLATE_SPECS:
-        key = str(spec.get("key") or "")
-        profile_key = _firmware_profile_key(key, target_host, target_port)
-        profile = _load_firmware_profile(key, profile_key)
-        row_target_host = selected_host or str(profile.get("__target_host") or "")
-        row_target_port = selected_port or str(profile.get("__target_port") or "")
-        if row_target_port == "6053":
-            row_target_port = str(FIRMWARE_DEFAULT_OTA_PORT)
-        prebuilt = _prebuilt_firmware_info(key)
-        prebuilt_summary = _prebuilt_artifact_ui_summary(prebuilt)
-        row = {
-            "value": key,
-            "label": str(spec.get("label") or key),
-            "description": str(spec.get("description") or ""),
-            "source_url": _text(prebuilt.get("manifest_url")),
-            "target_host": row_target_host,
-            "target_port": row_target_port,
-            "fields": [],
-            "prebuilt_firmware_available": bool(prebuilt_summary.get("available")),
-            "prebuilt_firmware": prebuilt_summary,
-            "firmware_version": _text(prebuilt.get("version")),
-        }
-        templates.append(row)
-    active = next((row["value"] for row in templates if row.get("prebuilt_firmware_available")), "")
-    return {
-        "ok": True,
-        "templates": templates,
-        "active_template_key": active or (templates[0]["value"] if templates else ""),
-        "wake_words": wake_words,
-        "warnings": [],
-    }
-
-
-@app.post("/api/firmware/profile")
-def firmware_profile(payload: Dict[str, Any]):
-    body = payload if isinstance(payload, dict) else {}
-    try:
-        template_key = str(body.get("template_key") or "").strip()
-        _firmware_template_spec(template_key)
-        values = body.get("values") if isinstance(body.get("values"), dict) else {}
-        profile_key = _firmware_profile_key(template_key, values.get("__target_host"), values.get("__target_port"))
-        host, port = _firmware_profile_target(values.get("__target_host"), values.get("__target_port"))
-        saved = {}
-        if host:
-            saved["__target_host"] = host
-        if port:
-            saved["__target_port"] = port
-        _save_firmware_profile(profile_key or template_key, saved)
-    except Exception as e:
-        return JSONResponse({"ok": False, "error": str(e)}, status_code=400)
-    return {"ok": True, "template_key": template_key, "profile_key": profile_key or template_key, "saved_fields": sorted(saved.keys())}
-
-
 @app.get("/api/trained_wake_words/catalog")
 def trained_wake_words_catalog(request: Request):
     return {"ok": True, "wake_words": _list_trained_wake_words(_request_base_url(request))}
@@ -3471,175 +1952,6 @@ def trained_wake_word_artifact(filename: str):
     return FileResponse(str(artifact_path), media_type=media_type, filename=artifact_path.name)
 
 
-@app.post("/api/firmware/build_flash")
-def firmware_build_flash(payload: Dict[str, Any]):
-    body = payload if isinstance(payload, dict) else {}
-    try:
-        target_host, target_port = _parse_flash_target(str(body.get("host") or ""), body.get("port"))
-        template_key = str(body.get("template_key") or "").strip()
-        template_spec = _firmware_template_spec(template_key)
-        prebuilt = _prebuilt_firmware_info(template_key)
-        if not bool(prebuilt.get("available")):
-            raise RuntimeError(_text(prebuilt.get("error")) or "No prebuilt OTA image is available for this firmware target.")
-    except Exception as e:
-        return JSONResponse({"ok": False, "error": str(e)}, status_code=400)
-
-    values = body.get("values") if isinstance(body.get("values"), dict) else {}
-    with contextlib.suppress(Exception):
-        profile_key = _firmware_profile_key(template_key, target_host, target_port)
-        _save_firmware_profile(profile_key or template_key, {"__target_host": target_host, "__target_port": str(target_port)})
-    session_id = f"fw_{uuid.uuid4().hex}"
-    session = {
-        "id": session_id,
-        "mode": "prebuilt_ota_flash",
-        "running": True,
-        "exit_code": None,
-        "host": target_host,
-        "port": target_port,
-        "template_key": template_key,
-        "template_label": str(template_spec.get("label") or template_key),
-        "firmware_version": _text(prebuilt.get("version")),
-        "filename": "",
-        "values": values,
-        "message": "Preparing prebuilt firmware flash.",
-        "log_lines": [],
-        "started_at": datetime.now(timezone.utc).isoformat(),
-        "finished_at": None,
-        "pid": None,
-    }
-    with FIRMWARE_LOCK:
-        FIRMWARE_SESSIONS[session_id] = session
-
-    worker = threading.Thread(target=_run_firmware_build_flash_background, args=(session_id,), daemon=True)
-    worker.start()
-    return _firmware_session_payload(session_id)
-
-
-@app.post("/api/firmware/browser_flash")
-def firmware_browser_flash(payload: Dict[str, Any]):
-    body = payload if isinstance(payload, dict) else {}
-    try:
-        template_key = str(body.get("template_key") or "").strip()
-        template_spec = _firmware_template_spec(template_key)
-        prebuilt = _prebuilt_firmware_info(template_key, force_refresh=True)
-        if not bool(prebuilt.get("available")):
-            raise RuntimeError(_text(prebuilt.get("error")) or "No prebuilt firmware image is available for this firmware target.")
-        _prebuilt_artifact_meta(prebuilt, "factory")
-        binary = _download_prebuilt_firmware_binary(template_key, prebuilt, "factory", force_refresh=True)
-        artifact = _create_browser_flash_artifact(template_key, prebuilt, Path(binary["path"]))
-        template_label = str(template_spec.get("label") or template_key)
-        cached_text = "cached" if bool(binary.get("cached")) else "downloaded"
-        return {
-            "ok": True,
-            "template_key": template_key,
-            "template_label": template_label,
-            "firmware_version": _text(prebuilt.get("version")),
-            "message": f"Prepared prebuilt USB firmware for {template_label}.",
-            "entries": [
-                f"Using prebuilt {template_label} factory firmware {_text(prebuilt.get('version')) or 'latest'}.",
-                f"Factory image {cached_text}: {Path(binary['path']).name}",
-                f"Browser flash binary ready: {artifact['binary_name']} ({artifact['binary_size']} bytes)",
-            ],
-            **artifact,
-        }
-    except Exception as e:
-        return JSONResponse({"ok": False, "error": str(e)}, status_code=400)
-
-
-@app.get("/api/firmware/browser_flash/{artifact_id}/{filename}")
-def firmware_browser_flash_binary(artifact_id: str, filename: str):
-    try:
-        target = _browser_flash_artifact_path(artifact_id, filename)
-    except KeyError as exc:
-        return JSONResponse({"ok": False, "error": str(exc)}, status_code=404)
-    return FileResponse(
-        str(target),
-        media_type="application/octet-stream",
-        filename=target.name,
-    )
-
-
-@app.post("/api/firmware/clean")
-def firmware_clean():
-    active = []
-    with FIRMWARE_LOCK:
-        for session in FIRMWARE_SESSIONS.values():
-            if isinstance(session, dict) and bool(session.get("running")):
-                active.append(str(session.get("host") or session.get("template_key") or "firmware session"))
-    if active:
-        return JSONResponse({"ok": False, "error": f"Wait for active firmware session(s) to finish: {', '.join(active[:3])}."}, status_code=400)
-
-    removed = []
-    for child in ("prebuilt_firmware", "uploads", "web_flash"):
-        path = FIRMWARE_CACHE_DIR / child
-        if path.exists():
-            shutil.rmtree(path, ignore_errors=True)
-            removed.append(child)
-    return {
-        "ok": True,
-        "removed": removed,
-        "message": "Cleaned downloaded firmware images." if removed else "No downloaded firmware images needed cleaning.",
-    }
-
-
-@app.post("/api/firmware/flash")
-async def firmware_flash(
-    file: UploadFile = File(...),
-    host: str = Form(...),
-    port: str | None = Form(None),
-    password: str | None = Form(None),
-):
-    try:
-        target_host, target_port = _parse_flash_target(host, port)
-    except Exception as e:
-        return JSONResponse({"ok": False, "error": str(e)}, status_code=400)
-
-    original_name = file.filename or "firmware.bin"
-    filename = _normalize_firmware_filename(original_name)
-    if not filename.lower().endswith(".bin"):
-        return JSONResponse({"ok": False, "error": "Firmware upload must be a compiled .bin file."}, status_code=400)
-
-    data = await file.read()
-    if not data:
-        return JSONResponse({"ok": False, "error": "Firmware file is empty."}, status_code=400)
-
-    session_id = f"fw_{uuid.uuid4().hex}"
-    session_dir = FIRMWARE_CACHE_DIR / "uploads" / session_id
-    session_dir.mkdir(parents=True, exist_ok=True)
-    firmware_path = session_dir / filename
-    firmware_path.write_bytes(data)
-
-    session = {
-        "id": session_id,
-        "running": True,
-        "exit_code": None,
-        "host": target_host,
-        "port": target_port,
-        "password": password or "",
-        "filename": filename,
-        "firmware_path": str(firmware_path),
-        "message": "Preparing firmware upload.",
-        "log_lines": [],
-        "started_at": datetime.now(timezone.utc).isoformat(),
-        "finished_at": None,
-        "pid": None,
-    }
-    with FIRMWARE_LOCK:
-        FIRMWARE_SESSIONS[session_id] = session
-
-    worker = threading.Thread(target=_run_firmware_flash_background, args=(session_id,), daemon=True)
-    worker.start()
-    return _firmware_session_payload(session_id)
-
-
-@app.get("/api/firmware/flash_status/{session_id}")
-def firmware_flash_status(session_id: str):
-    payload = _firmware_session_payload(session_id)
-    if not payload.get("ok"):
-        return JSONResponse(payload, status_code=404)
-    return payload
-
-
 @app.post("/api/train")
 def train_now(payload: Dict[str, Any] = None):
     payload = payload or {}