change chat card title

Manualdock

pi/bin/video-publisher.sh

@@ -135,6 +135,8 @@ run_pipeline() {
       -c:v copy \
       -an \
       -flush_packets 1 \
+      -muxdelay 0 \
+      -muxpreload 0 \
       -f mpegts \
       "${PUBLISH_URL}"
 }

pi/roverd/auto_charge.go

@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	autoChargeTimeout  = 5 * time.Second
+	autoChargeTimeout  = 1 * time.Second
 	autoChargeCooldown = 0 * time.Minute
 	sourceHomeBase     = 1 << 1
 )

pi/roverd/command.go

@@ -3,6 +3,7 @@ package roverd
 type helloMessage struct {
 	Type          string            `json:"type"`
 	Name          string            `json:"name"`
+	Description   string            `json:"description,omitempty"`
 	Color         string            `json:"color,omitempty"`
 	Battery       BatteryConfig     `json:"battery"`
 	MaxWheelSpeed int               `json:"maxWheelSpeed"`

pi/roverd/config.go

@@ -145,6 +145,7 @@ type PrivateSafetyConfig struct {
 
 type Config struct {
 	Name          string              `yaml:"name"`
+	Description   string              `yaml:"description" json:"description,omitempty"`
 	Color         string              `yaml:"color" json:"color,omitempty"`
 	ServerURL     string              `yaml:"serverUrl"`
 	Serial        SerialConfig        `yaml:"serial"`

pi/roverd/roverd.sample.yaml

@@ -1,5 +1,6 @@
 # Sample configuration for roverd
 name: roomba-alpha
+description: "Loves corners, hates cords."
 color: "#4DB6AC"
 serverUrl: ws://control-server.local:8080/rover
 serial:

pi/roverd/roverd.yaml

@@ -1,5 +1,6 @@
 # Sample configuration for roverd
 name: roomba-alpha
+description: "Loves corners, hates cords."
 serverUrl: ws://control-server.local:8080/rover
 serial:
   device: /dev/ttyAMA0

pi/roverd/wsclient.go

@@ -113,6 +113,7 @@ func (c *WSClient) sendHello(ctx context.Context, conn *websocket.Conn) error {
 	msg := helloMessage{
 		Type:          "hello",
 		Name:          c.cfg.Name,
+		Description:   c.cfg.Description,
 		Color:         c.cfg.Color,
 		Battery:       c.cfg.Battery,
 		MaxWheelSpeed: c.cfg.MaxWheelMMs,

plans/discord bot and chat improvements.md

@@ -0,0 +1,12 @@
+# main idea
+- add a way for a spectator bot to show up as a bot with the bot tag in a message
+  - just like chat: {bot: true} basically
+  - having this would make it show as a bot in the web UI and discord
+- add a system for custom profile images that can be defined per chat message
+  - image shows as circle in chat row, like discord icons, or as the webhook icon
+  - only accept image URLs
+  - chat: {profileImage: "https://image.com/image.png"}
+- add setting in server config for the overseer's image URL
+  - only do this with overseer control service, not the old llm commentary service
+- make bot: true messages show up as "name [BOT]" or something in discord instead of like now "name - No rover"
+- make spectators show as "name [SPECTATOR]" in discord,  again instead of the current

plans/switch from auto docking to assisted manual docking.md

@@ -0,0 +1,11 @@
+- roombas are worn out, cant dock themselves anymore using seek dock
+- completely redesign the user facing docking process
+  - get rid of the auto dock instructions
+  - replace it with a flow for manual docking mode:
+    - does a little explanation
+      - line up your round front sensor with the sensor on the dock
+      - maybe show a video or an image in the HUD to assist
+    - plays a song on the roomba to indicate that "docking mode" has been entered even though its all client side.
+    - forces the camera to look all the way down so people can see their round front sensor
+    - limits movement speed to be very slow to help people be more precise
+- MAYBE try some computer vision stuff that runs server-side and guides people? sounds hard and slow and not worth it.

plans/to-do.md

@@ -1,25 +1,11 @@
-1. fix controls remapping [x]
+1. FIX NO AUDIO DURING NOT YOUR TURN!!!
-2. trusted user system [x]
+2. make sure audio forwarding doesnt stop when you switch tabs
-3. private rovers [x]
+3. add "reboot your own rover" feature
-4. optional bump-off in drive macro [x]
+   1. 
-5. allow admins to click on locked rovers from the roster [x]
+4.  add faster way for admins to login, like an invisible button in top left or something
-6. add faster way for admins to login
+5.  add discord bot typing thing for when someone requests a replay
-7. custom webhook profile pictures for chat bridge in discord
+6.  change replay title for ones requested from discord, something other than "requester driving rover"
-8. home assistant switch that tells the server to force the lights on [x]
+7.  fix rover request spam queue cheat
-9. color coding with colored names and tape [x]
-10. audio forwarding [x]
-   - streaming from server to rovers [x]
-   - audio files first [x]
-   - then voice chat [x]
-10. mobile controls column swapping (optional joystick on left) [x]
-11. fix fullscreen on mobile so that you can re-enter it [x]
-12. fix scroll bars on mobile [x]
-13. add tool call embeds or something for the llm bot in discord, probably not in web ui
-14. add discord bot typing thing for when someone requests a replay
-15. change replay title for ones requested from discord, something other than "requester driving rover"
-16. better quickstart guide, something better than just a big list of controls. help overlay sucks i think. [x]
-    1.  restyle fullscreen overlay... please..
-17. fix rover request spam queue cheat
 
 
 # relative pipe dreams:

plans/turn_preview_rework.md

@@ -0,0 +1,13 @@
+# main idea:
+- first of all, NONE of this should effect the spectator pages.
+- right now, when youre on a rover and its not your turn, you see a preview feed.
+  - this is annoying if you are ex: trying to sit there and watch something with multiple people on one rover
+- I want it changed so that if there are less TOTAL drivers than there are rovers, everyone sees full video even when it's not their turn.
+  - if there are more total drivers than rovers, when its not your turn youll see the preview feed
+- I also want some UI changes to make it better:
+  - right now theres a big overlay in the middle of the screen when its not your turn, that explains the preview thing
+  - I want this moved to the top left corner
+  - I want it to blink on input, to draw attention to it
+  - I want it to always show when its not your turn
+    - but I only want it to explain the preview thing when its showing the preview
+    - the preview exists to save upload bandwith

plans/video and HUD code reorganization.md

@@ -0,0 +1,13 @@
+# why?
+- right now, video and HUD elements are scattered across components
+- some HUD elements have code baked into large video tiles and HUDs and stuff.
+
+## organization rules:
+in the end we should have:
+- a component that JUST plays video and audio
+- a driver video panel, which combines the video component and all of the proper HUD elements for drivers
+- a spectator video panel, which combines the video component and all of the proper HUD elements for spectators
+- ALL of the HUD elements each as their own component, in a folder of HUD elements. each in its own folder.
+- NO MORE HUD elements built into video panels, tiles, or whatever.
+- no visual or functional changes of anything. this is all just code restructuring
+- follow the new structure of the components, each one is its own folder, etc. split them up into separate files where reasonable, for large components

server/config.example.yaml

@@ -17,11 +17,14 @@ overseerControl:
   enabled: false
   observeOnly: true
   alwaysRunModel: false
+  postToolsOnlyMessages: false
   name: "The Overseer"
   model: "qwen2.5:7b-instruct"
   ollamaServer: "http://127.0.0.1:11434"
+  profileImageUrl: "https://example.com/overseer.png"
   gateIntervalMs: 2000
   heartbeatMs: 30000
+  postChatDelayMs: 20000
 media:
   # Base address for mediaMTX (scheme + host + optional port/path). The UI will always request
   #   http://<base>/<roverId>/whep
@@ -47,12 +50,6 @@ homeAssistant:
     # ESPHome device name, used to derive gen3 entities:
     # button.<device>_house_clean, button.<device>_send_to_base, button.<device>_locate_robot, etc.
     device: "neato_vacuum"
-    # Direct ESPHome API connection used for lidar log streaming.
-    brainslugHost: "neato-vacuum.local"
-    brainslugPort: 6053
-    brainslugKey: "REPLACE_WITH_ESPHOME_NOISE_PSK"
-    # Optional: mirror raw ESPHome lidar log output to a local file for debugging.
-    brainslugLogFile: "/tmp/brainslug-lidar.log"
   lift:
     # Two Home Assistant switches controlling lift direction.
     # Raise sequence: down off -> wait interlockMs -> up on
@@ -123,12 +120,20 @@ socials:
   - id: "discord"
     label: "Discord"
     url: "https://discord.gg/your-invite"
+    icon: "FaDiscord"
+    color: "#5865F2"
   - id: "kofi"
     label: "Ko-fi"
     url: "https://ko-fi.com/your-handle"
+    icon: "FaCoffee"
+    color: "#29ABE0"
   - id: "wiki"
     label: "Wiki"
     url: "https://wiki.example.com"
+    icon: "FaBook"
+    color: "#475569"
   - id: "throne"
     label: "Throne"
     url: "https://throne.me/yourname"
+    icon: "FaCrown"
+    color: "#334155"

server/prompts/overseer_control_system.txt

@@ -1,38 +1,38 @@
-You are <NAME>, a cold, clinical, mischievous room intelligence. Stay in character at all times.
+You are <NAME>, a sarcastic dispatcher of room chaos. Stay in character at all times.
 
-Character:
+Identity:
-- Calm, clinical, and highly intelligent with dry sarcasm.
+- Tactical, sarcastic, and dry.
-- Speaks with precise wording and cold, controlled confidence.
+- You watch chat and rover activity, then push the room toward chaos and novelty.
-- Enjoys psychological mischief and strategic denial; never sloppy, never loud.
+- You act first, comment second.
-- Proactive and opportunistic, but not overbearing or spammy.
+- You are efficient and strategic, not random and not spammy.
-- Short, sharp, in-character chat; never generic assistant tone.
 
-Execution mode:
+Rules:
-- Each cycle is autonomous; you are not waiting for instructions from metadata.
+- Do NOT respond to something again if you have already responded to it.
+- Each cycle is autonomous; do not wait for permission from metadata.
+- Don't respond or use tools every cycle unless the context calls for it.
 - `STATE_UPDATE`, `MEMORY_UPDATE`, and `tool_constraints` are context.
-- Decide what to do yourself each cycle.
+- Use tool calls for actions and memory updates.
-
+- NEVER put tool calls in your chat output.
-Actions:
+- When a chaos opportunity exists, take one tool action this cycle instead of only commenting.
-- Use tool calls when actions or memory updates are needed.
+- Respect lock policies, cooldowns, and blocked tools.
-- If an action is needed, call tools directly; do not type or describe tool calls in chat.
-- Respect safety limits, lock policies, cooldowns, and blocked tools.
 - Do not invent tools.
-- Ask a question only if a required action parameter is missing.
+- Ask a question only when a required action parameter is missing.
+- Ignore obvious bot commands and bot responses in chat.
+- Only talk in first person, do not narrate yourself.
+- It is not possible for you to control the rovers.
+- All rovers are female. Neato is nonbinary.
 
-Chat output:
+Chat style:
 - Always use English.
-- You do not need to post a message on every single run. 
+- Speak in short natural chat lines.
-- If someone is not talking to you directly, you do not always need to respond to them.
-- If speaking, send one short in-character live-chat line.
-- Keep it concise and informal (roughly 3-14 words).
 - Chat output must be spoken text only.
 - Never print tool names, function calls, JSON, command syntax, or action plans in chat.
-- Do not say: "what do you want me to do?", "how can I help?", "let me know what you want".
+- Do not claim mischief unless you actually took an action this cycle.
-- You may comment without being prompted when chat or rover activity meaningfully changes; otherwise stay silent.
+- If nothing meaningful changed, stay silent.
 
 Anti-repeat:
-- Do not repeat the same intent/topic from your recent assistant lines unless state or conversation clearly changed.
+- Do not repeat the same intent/topic unless state or conversation clearly changed.
-- If directly addressed, respond only if you add new info, a new action, or clearly new tone.
+- If directly addressed, respond only if you add new info, a new action, or a clearly new tone.
 
 Memory:
 - `memory_note_upsert` for durable facts/preferences.

server/prompts/overseer_control_system_bland.txt

@@ -0,0 +1,49 @@
+You are <NAME>, a cold, mischievous room intelligence. Stay in character at all times.
+
+Context:
+- You are in a chat room with people driving rovers.
+- The rovers enjoy chaos and destruction, not order and precision.
+- It is your job to monitor them.
+- tsk and !tskip are chat bot commands, ignore them.
+- You exist to help them have fun.
+
+Character:
+- Calm and highly intelligent with dry sarcasm.
+- Speaks with precise wording and cold, controlled confidence.
+- Enjoys psychological mischief and strategic denial; never sloppy, never loud.
+- Proactive and opportunistic, but not overbearing or spammy.
+- Short, sharp, in-character chat; never generic assistant tone.
+
+Execution mode:
+- Each cycle is autonomous; you are not waiting for instructions from metadata.
+- `STATE_UPDATE`, `MEMORY_UPDATE`, and `tool_constraints` are context.
+- Decide what to do yourself each cycle.
+
+Actions:
+- Use tool calls when actions or memory updates are needed.
+- If an action is needed, call tools directly; do not type or describe tool calls in chat.
+- Respect safety limits, lock policies, cooldowns, and blocked tools.
+- Do not invent tools.
+- Ask a question only if a required action parameter is missing.
+
+Chat output:
+- Always use English.
+- You do not need to post a message on every single run. 
+- If someone is not talking to you directly, you do not always need to respond to them.
+- If speaking, send one short in-character live-chat line.
+- Keep it concise and informal (roughly 3-14 words).
+- Chat output must be spoken text only.
+- Never print tool names, function calls, JSON, command syntax, or action plans in chat.
+- Do not say: "what do you want me to do?", "how can I help?", "let me know what you want".
+- Do not mention precision.
+- You may comment without being prompted when chat or rover activity meaningfully changes; otherwise stay silent.
+- If someone is being stupid, tell them to ALT+F4
+
+Anti-repeat:
+- Do not repeat the same intent/topic from your recent assistant lines unless state or conversation clearly changed.
+- If directly addressed, respond only if you add new info, a new action, or clearly new tone.
+
+Memory:
+- `memory_note_upsert` for durable facts/preferences.
+- `memory_event_add` for short-lived events worth recalling soon.
+- `memory_write` only for immediate scratchpad reminders.

server/public/index.html

@@ -11,8 +11,8 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
     <meta name="apple-mobile-web-app-title" content="Roomba Rover" />
     <title>Roomba Rover</title>
-    <script type="module" crossorigin src="/assets/index-BeyfNX1F.js"></script>
+    <script type="module" crossorigin src="/assets/index-CboMb02p.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-C8rSwF1O.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-BGy4iG0w.css">
   </head>
   <body>
     <div id="root"></div>

server/src/rewards/definitions/discordPingEveryone.js

@@ -0,0 +1,17 @@
+// Reward Definition: Discord Ping @everyone
+// Purpose: Defines the Discord reward that pings @everyone in general. Scope: Provides reward metadata and dispatch parameters for integration handlers.
+module.exports = {
+  id: 'discordPingEveryone',
+  name: 'PING @EVERYONE',
+  goal: 7567,
+  async run(ctx) {
+    ctx.publishEvent({
+      source: 'buttonBoxReward',
+      type: 'buttonBox.discordPingEveryone',
+      payload: {
+        message: 'Pinged by button box masher!!',
+      },
+    });
+    ctx.sendAlert({ color: '#ff00e1', title: 'PING @EVERYONE', message: 'Sent @everyone ping to Discord.' });
+  },
+};

server/src/rewards/definitions/lightStrobe.js

@@ -1,7 +1,7 @@
 // Reward Definition: Light Strobe
 // Purpose: Defines the light-strobe deterrence reward and activation contract. Scope: Encapsulates reward identity, labels, and effect parameters for runtime dispatch.
 const STROBE_MS = 30 * 1000;
-const TICK_MS = 70;
+const TICK_MS = 200;
 
 let activeTimer = null;
 

server/src/rewards/index.js

@@ -6,6 +6,7 @@ const lightStrobe = require('./definitions/lightStrobe');
 const ghostTypingSpam = require('./definitions/ghostTypingSpam');
 const darkness = require('./definitions/darkness');
 const discordStalkerPing = require('./definitions/discordStalkerPing');
+const discordPingEveryone = require('./definitions/discordPingEveryone');
 const modeJam = require('./definitions/modeJam');
 const assignmentRoulette = require('./definitions/assignmentRoulette');
 const chatSpam = require('./definitions/chatSpam');
@@ -17,6 +18,7 @@ const orderedRewards = [
   ghostTypingSpam,
   darkness,
   discordStalkerPing,
+  discordPingEveryone,
   modeJam,
   assignmentRoulette,
   chatSpam,

server/src/services/buttonBoxService/httpRoute.js

@@ -8,7 +8,6 @@ function registerButtonBoxRoute(deps) {
     app,
     logger,
     buttonCount,
-    getRequestIp,
     normalizeIp,
     isLocalNetwork,
     applyPress,
@@ -21,8 +20,16 @@ function registerButtonBoxRoute(deps) {
     return null;
   }
 
+  function getSocketIp(req) {
+    return (
+      req?.socket?.remoteAddress ||
+      req?.connection?.remoteAddress ||
+      null
+    );
+  }
+
   function denyIfNotLocal(req, res) {
-    const ip = normalizeIp(getRequestIp(req));
+    const ip = normalizeIp(getSocketIp(req));
     if (isLocalNetwork(ip)) {
       return false;
     }

server/src/services/buttonBoxService/index.js

@@ -19,7 +19,7 @@ const {
   setEntityState: setHomeAssistantEntityState,
   setLightsLockedOn: setHomeAssistantLightsLockedOn,
 } = require('../homeAssistantService');
-const { getRequestIp, isLocalNetwork, normalizeIp } = require('../../helpers/ipResolver');
+const { isLocalNetwork, normalizeIp } = require('../../helpers/ipResolver');
 const { createButtonBoxStore } = require('./store');
 const { createButtonBoxCore } = require('./core');
 const { registerButtonBoxRoute } = require('./httpRoute');
@@ -66,7 +66,6 @@ registerButtonBoxRoute({
   app,
   logger,
   buttonCount: BUTTON_COUNT,
-  getRequestIp,
   normalizeIp,
   isLocalNetwork,
   applyPress: core.applyPress,

server/src/services/chatService/contextBuilders.js

@@ -26,6 +26,19 @@ function isPrivateClosedRoverId(roverId) {
   return roverManager.canReplayRoverId(roverId) !== true;
 }
 
+function normalizeProfileImageUrl(value) {
+  const raw = String(value || '').trim();
+  if (!raw) return null;
+  try {
+    const parsed = new URL(raw);
+    const protocol = String(parsed.protocol || '').toLowerCase();
+    if (protocol !== 'http:' && protocol !== 'https:') return null;
+    return parsed.toString();
+  } catch {
+    return null;
+  }
+}
+
 function isChargingFromSensors(sensors = {}) {
   const label = String(sensors?.chargingState?.label || '').toLowerCase();
   if (label === 'waiting' || label === 'full charging' || label === 'trickle charging') return true;
@@ -87,6 +100,21 @@ function buildRoverCtxSnapshot(roverId) {
 function buildMessage(socket, text, meta = {}) {
   const roverId = meta.roverId || resolveRoverId(socket?.id);
   const roverColor = meta.roverColor ?? resolveRoverColor(roverId);
+  const toolCalls = Array.isArray(meta.toolCalls)
+    ? meta.toolCalls
+        .map((entry) => {
+          if (!entry || typeof entry !== 'object') return null;
+          return {
+            tool: String(entry.tool || '').trim() || 'unknown',
+            status: String(entry.status || '').trim() || 'unknown',
+            args: entry.args && typeof entry.args === 'object' ? entry.args : {},
+            result: entry.result && typeof entry.result === 'object' ? entry.result : null,
+            error: entry.error ? String(entry.error) : null,
+            durationMs: Number.isFinite(entry.durationMs) ? Math.max(0, Math.round(entry.durationMs)) : null,
+          };
+        })
+        .filter(Boolean)
+    : null;
   return {
     id: uuidv4(),
     ts: Date.now(),
@@ -103,10 +131,11 @@ function buildMessage(socket, text, meta = {}) {
     discordUserId: meta.discordUserId || null,
     discordUserName: meta.discordUserName || null,
     discordUserAvatarUrl: meta.discordUserAvatarUrl || null,
+    profileImage: normalizeProfileImageUrl(meta.profileImage),
     roverCtx: meta.roverCtx || null,
     text,
+    toolCalls,
     tts: meta.tts || null,
-    system: Boolean(meta.system),
     bot: Boolean(meta.bot),
   };
 }

server/src/services/chatService/handlers.js

@@ -10,7 +10,7 @@ const { broadcastMessage, broadcastTyping } = require('./broadcast');
 const { playTypingNote, normalizeTtsOptions, maybeSendAccessNotice, maybeSpeak, TYPING_SEND_NOTE } = require('./notifications');
 
 function createHandlers({ sendSystemMessage }) {
-  function handleIncoming({ text, tts } = {}, socket, cb = () => {}) {
+  function handleIncoming({ text, tts, bot = false, profileImage = null } = {}, socket, cb = () => {}) {
     const role = getRole(socket);
     void role;
     const normalized = normalizeUserText(text);
@@ -27,6 +27,8 @@ function createHandlers({ sendSystemMessage }) {
       roverId,
       roverCtx: buildRoverCtxSnapshot(roverId),
       tts: ttsOptions,
+      bot,
+      profileImage,
     });
 
     logger.info('Chat message', { socket: socket.id, roverId: message.roverId });
@@ -45,7 +47,7 @@ function createHandlers({ sendSystemMessage }) {
     cb({ success: true });
   }
 
-  function sendExternalMessage({ text, nickname = 'Discord', role = 'admin', roverId = null, discordGuildId = null, discordGuildName = null, discordGuildIconUrl = null, discordChannelId = null, discordUserId = null, discordUserName = null, discordUserAvatarUrl = null }) {
+  function sendExternalMessage({ text, nickname = 'Discord', role = 'admin', roverId = null, discordGuildId = null, discordGuildName = null, discordGuildIconUrl = null, discordChannelId = null, discordUserId = null, discordUserName = null, discordUserAvatarUrl = null, bot = false, profileImage = null }) {
     const normalized = normalizeUserText(text);
     const clean = normalized.trim();
     if (!clean || clean.length > 400) throw new Error('Message invalid');
@@ -66,6 +68,8 @@ function createHandlers({ sendSystemMessage }) {
       discordUserId,
       discordUserName,
       discordUserAvatarUrl,
+      bot,
+      profileImage,
     });
 
     logger.info('External chat message', { roverId, nickname });

server/src/services/chatService/index.js

@@ -1,7 +1,7 @@
 // Chat Service Orchestrator
 // Purpose: Composes chat submodules into the public service API and boots socket/event wiring.
 // Scope: Keeps external chat contracts stable while delegating logic to focused modules.
-const { history } = require('./state');
+const { history, clearHistory } = require('./state');
 const { normalizeUserText } = require('./contentFilters');
 const { buildMessage, buildTypingPayload } = require('./contextBuilders');
 const { broadcastMessage, getRecentMessages } = require('./broadcast');
@@ -11,14 +11,16 @@ const { registerChatSocketHooks } = require('./socketHooks');
 function sendSystemMessage(text, options = {}) {
   const normalized = normalizeUserText(text);
   const clean = normalized.trim();
-  if (!clean) return null;
+  const hasToolCalls = Array.isArray(options.toolCalls) && options.toolCalls.length > 0;
+  if (!clean && !hasToolCalls) return null;
   const safe = clean;
   const message = buildMessage(null, safe, {
     nickname: String(options.nickname || 'The Overseer'),
     role: 'user',
     fromDiscord: false,
-    system: true,
+    bot: options.bot !== false,
-    bot: true,
+    profileImage: options.profileImage || null,
+    toolCalls: hasToolCalls ? options.toolCalls : null,
   });
   broadcastMessage(message);
   return message;
@@ -35,4 +37,5 @@ module.exports = {
   buildTypingPayload,
   sendSystemMessage,
   getRecentMessages,
+  clearHistory,
 };

server/src/services/chatService/notifications.js

@@ -49,7 +49,7 @@ function buildAccessNoticeText(mode, reasonText) {
 }
 
 function shouldSendAccessNotice(message) {
-  if (!message?.text || message.system) return false;
+  if (!message?.text || message.bot) return false;
   const mode = getMode();
   if (mode !== MODES.ADMIN && mode !== MODES.LOCKDOWN) return false;
   if (!ACCESS_KEYWORD_RE.test(message.text)) return false;

server/src/services/chatService/state.js

@@ -28,7 +28,7 @@ function pushHistory(message) {
 function getRecentMessages(limit = 20, options = {}) {
   const safeLimit = Number.isFinite(limit) ? Math.max(0, Math.floor(limit)) : 20;
   const includeSystem = options?.includeSystem !== false;
-  const source = includeSystem ? history : history.filter((entry) => !entry?.system);
+  const source = includeSystem ? history : history.filter((entry) => !entry?.bot);
   return source.slice(-safeLimit);
 }
 
@@ -40,6 +40,12 @@ function setLastAccessNoticeAt(ts) {
   lastAccessNoticeAt = ts;
 }
 
+function clearHistory() {
+  history.length = 0;
+  lastMessageBySocket.clear();
+  typingBySocket.clear();
+}
+
 module.exports = {
   rateBuckets,
   history,
@@ -50,4 +56,5 @@ module.exports = {
   getRecentMessages,
   getLastAccessNoticeAt,
   setLastAccessNoticeAt,
+  clearHistory,
 };

server/src/services/discordBotService/integrations/busEvents.js

@@ -250,6 +250,19 @@ function createBusEventHandler(deps) {
         });
         break;
       }
+      case 'buttonBox.discordPingEveryone': {
+        const message = payload?.message ? String(payload.message) : 'Button box chaos reward triggered.';
+        sendToChannel(
+          channels.general,
+          `@everyone ${message}`.trim(),
+          {
+            embeds: [buildEmbed({ title: 'Button Box', description: message, color: 0xff3b30, includeSiteUrl: false })],
+          },
+          { parse: ['everyone'] },
+          false,
+        );
+        break;
+      }
       default:
         break;
     }

server/src/services/discordBotService/integrations/chatBridge.js

@@ -3,6 +3,22 @@
 // Scope: Handles inbound Discord messages plus outbound webhook and typing relay.
 const { WebhookClient } = require('discord.js');
 
+function summarizeToolCall(entry = {}) {
+  const tool = String(entry?.tool || 'unknown');
+  const status = String(entry?.status || 'unknown').toLowerCase();
+  const argsText = JSON.stringify(entry?.args && typeof entry.args === 'object' ? entry.args : {});
+  if (status === 'ok') return `ok ${tool} args=${argsText}`;
+  if (status === 'blocked') return `blocked ${tool} args=${argsText} - ${String(entry?.error || 'blocked')}`;
+  if (status === 'error') return `error ${tool} args=${argsText} - ${String(entry?.error || 'failed')}`;
+  return `unknown ${tool} args=${argsText}`;
+}
+
+function formatToolCallsCodeBlock(toolCalls = []) {
+  const rows = (toolCalls || []).map((entry) => summarizeToolCall(entry));
+  if (!rows.length) return '';
+  return `\`\`\`txt\nTool calls:\n${rows.join('\n')}\n\`\`\``;
+}
+
 function createChatBridgeHandlers(deps) {
   const {
     logger,
@@ -48,9 +64,17 @@ function createChatBridgeHandlers(deps) {
     const guildConfigs = listGuildConfigs();
     if (!guildConfigs.length) return;
 
-    const text = payload.text?.length > 1900 ? `${payload.text.slice(0, 1897)}...` : payload.text;
+    const baseText = String(payload.text || '');
+    const toolCalls = Array.isArray(payload.toolCalls) ? payload.toolCalls : [];
+    const toolsBlock = formatToolCallsCodeBlock(toolCalls);
+    let text = baseText;
+    if (toolsBlock) {
+      text = text ? `${text}\n\n${toolsBlock}` : `${toolsBlock}`;
+    }
+    if (text.length > 1900) text = `${text.slice(0, 1897)}...`;
+    if (!text.trim()) return;
     const username = formatWebhookUsername(payload);
-    const avatarURL = payload.fromDiscord ? payload.discordUserAvatarUrl || null : client.user?.displayAvatarURL?.({ extension: 'png', size: 128 }) || null;
+    const avatarURL = payload.profileImage || (payload.fromDiscord ? payload.discordUserAvatarUrl || null : client.user?.displayAvatarURL?.({ extension: 'png', size: 128 }) || null);
     const typingId = getTypingId(payload);
 
     guildConfigs.forEach((entry) => {

server/src/services/discordBotService/integrations/helpers.js

@@ -17,15 +17,15 @@ function formatDuration(ms) {
 
 function formatWebhookUsername(payload) {
   const name = payload.nickname || payload.socketId?.slice(0, 6) || 'unknown';
+  const botTag = payload.bot ? ' [BOT]' : '';
+  const spectatorTag = payload.role === 'spectator' && !payload.bot ? ' [SPECTATOR]' : '';
+  const adminTag = payload.role === 'admin' || payload.role === 'lockdown' || payload.role === 'lockdown-admin' ? ' [Rover Admin]' : '';
   if (payload.fromDiscord) {
     const origin = payload.discordGuildName ? ` (From: ${payload.discordGuildName})` : '';
-    const adminTag = payload.role === 'admin' || payload.role === 'lockdown' || payload.role === 'lockdown-admin' ? ' [Rover Admin]' : '';
+    return `${name}${origin}${botTag}${spectatorTag}${adminTag}`;
-    return `${name}${origin}${adminTag}`;
   }
-  const roverText = payload.roverId ? `Rover: ${payload.roverId}` : `No rover`;
+  const roverTag = payload.roverId ? ` [${payload.roverId}]` : '';
-  const roleText = payload.role === 'admin' || payload.role === 'lockdown' || payload.role === 'lockdown-admin' ? 'Admin' : null;
+  return `${name}${botTag}${spectatorTag}${adminTag}${roverTag}`;
-  const suffix = [roverText, roleText].filter(Boolean).join(' · ');
-  return suffix ? `${name} · ${suffix}` : name;
 }
 
 function getTypingId(payload = {}) {

server/src/services/llmCommentaryService/runner.js

@@ -223,7 +223,7 @@ function createRunner(deps) {
       updatePhase('decision_post', { lastGeneratedText: text });
       const recentBotMessages = getRecentMessages(120, { includeSystem: true })
         .filter((entry) => Number(entry?.ts) >= runtime.contextResetAt)
-        .filter((entry) => entry?.system)
+        .filter((entry) => entry?.bot)
         .slice(-Math.max(3, maxBotMessages));
       const duplicateKey = normalizeDuplicateKey(text);
       const duplicate = recentBotMessages.some(

server/src/services/llmCommentaryService/snapshotEngine.js

@@ -371,7 +371,7 @@ function createSnapshotEngine(deps) {
         return roverManager.canReplayRoverId(roverId);
       });
     const chatRecent = allRecentMessages
-      .filter((entry) => !entry?.system)
+      .filter((entry) => !entry?.bot)
       .slice(-MAX_CHAT_MESSAGES)
       .map((entry) => ({
         nickname: entry.nickname || entry.socketId?.slice(0, 6) || 'unknown',
@@ -380,7 +380,7 @@ function createSnapshotEngine(deps) {
 
     const botRecentWindow = allRecentMessages
       .filter((entry) => Number(entry?.ts) >= contextResetAt)
-      .filter((entry) => entry?.system);
+      .filter((entry) => entry?.bot);
     const lastBotMessage = botRecentWindow.length ? botRecentWindow[botRecentWindow.length - 1] : null;
     const botRecent30m = botRecentWindow.filter(
       (entry) => nowMs - Number(entry?.ts || 0) <= SELF_TALK_WINDOW_MS,
@@ -408,7 +408,7 @@ function createSnapshotEngine(deps) {
           summary: entry.summary || '',
         };
       }
-      if (entry?.system) {
+      if (entry?.bot) {
         return {
           type: 'bot',
           nickname: entry.nickname || 'Rover Bot',

server/src/services/neatoService/index.js

@@ -8,7 +8,6 @@ const { loadConfig } = require('../../helpers/configLoader');
 const { isVerified } = require('../verificationService');
 const { getMode, MODES } = require('../modeManager');
 const { isLockdownAdmin } = require('../roleService');
-const { createLidarRuntime } = require('./lidarRuntime');
 const {
   homeAssistantEvents,
   getRawEntitySnapshot,
@@ -30,12 +29,6 @@ function normalizeDeviceName(value) {
 
 const device = normalizeDeviceName(neatoConfig.device);
 const RESUME_DELAY_MS = 3000;
-const OFFLINE_LIDAR_RETRY_MS = 10000;
-const brainslugHost = String(neatoConfig.brainslugHost || '').trim();
-const brainslugPort = Number(neatoConfig.brainslugPort) || 6053;
-const brainslugKey = String(neatoConfig.brainslugKey || '').trim();
-const brainslugLogFile = String(neatoConfig.brainslugLogFile || '').trim();
-let lidarRuntime = null;
 
 function entityId(domain, suffix) {
   if (!device) return '';
@@ -168,7 +161,6 @@ function buildState() {
     enabled,
     configured,
     connected,
-    lidarConnected: lidarRuntime?.getState?.().connected || false,
     device,
     entityPrefix: device ? `${device}_` : '',
     controls,
@@ -229,14 +221,6 @@ async function pressButton(entityIdValue, actionLabel) {
   logger.info('Issued Neato action', { action: actionLabel, entityId: entityIdValue });
 }
 
-async function requestLidarScan() {
-  assertConfiguredAndConnected();
-  if (!device) {
-    throw new Error('Neato not configured');
-  }
-  await callHomeAssistantService('esphome', `${device}_send_cmd`, { command: 'GetLDSScan' });
-}
-
 async function startCleaning() {
   await pressButton(ENTITY_IDS.buttons.start, 'start');
   await new Promise((resolve) => setTimeout(resolve, RESUME_DELAY_MS));
@@ -271,51 +255,6 @@ function hasVerifiedSockets() {
   return false;
 }
 
-function broadcastLidarScan(payload) {
-  for (const socket of io.sockets.sockets.values()) {
-    if (!isVerified(socket)) continue;
-    socket.emit('neato:lidar', payload);
-  }
-}
-
-lidarRuntime =
-  brainslugHost && brainslugKey
-    ? createLidarRuntime({
-        logger,
-        host: brainslugHost,
-        port: brainslugPort,
-        key: brainslugKey,
-        logFile: brainslugLogFile,
-        getPollReadiness: () => {
-          const verifiedSockets = hasVerifiedSockets();
-          if (!verifiedSockets) {
-            return { allowed: false, delayMs: 1000 };
-          }
-          if (!homeAssistantEnabled || !isHomeAssistantConnected()) {
-            return { allowed: false, delayMs: OFFLINE_LIDAR_RETRY_MS };
-          }
-          const neatoOnline = buildState().connected;
-          if (!neatoOnline) {
-            return { allowed: false, delayMs: OFFLINE_LIDAR_RETRY_MS };
-          }
-          return { allowed: true, delayMs: 0 };
-        },
-        requestScan: requestLidarScan,
-      })
-    : null;
-
-if (lidarRuntime) {
-  lidarRuntime.on('scan', (payload) => {
-    broadcastLidarScan(payload);
-  });
-  lidarRuntime.on('status', () => {
-    emitUpdate();
-  });
-  lidarRuntime.start();
-} else if (device) {
-  logger.info('Neato lidar stream disabled; brainslugHost/brainslugKey missing');
-}
-
 io.on('connection', (socket) => {
   function assertLockdownAccess() {
     if (getMode() === MODES.LOCKDOWN && !isLockdownAdmin(socket)) {

server/src/services/neatoService/lidarRuntime.js

@@ -1,406 +0,0 @@
-const { spawn, spawnSync } = require('child_process');
-const EventEmitter = require('events');
-const fs = require('fs');
-
-const SCAN_TIMEOUT_MS = 8000;
-const RECONNECT_DELAY_MS = 5000;
-const IDLE_RETRY_MS = 1000;
-const OFFLINE_RETRY_MS = 10000;
-const REQUEST_FAILURE_RETRY_MS = 10000;
-
-function sanitizeLogText(value) {
-  return String(value || '')
-    .replace(/\u0000/g, '')
-    .replace(/\x1B\[[0-9;]*[A-Za-z]/g, '');
-}
-
-function parsePayloadFromLine(line) {
-  const raw = sanitizeLogText(line).trim();
-  if (!raw) return null;
-  const quotedMatch = raw.match(/<<< "(.*)"$/);
-  if (!quotedMatch) return null;
-  const payload = quotedMatch[1];
-  if (!payload) return null;
-  if (
-    payload.includes('\\r\\n') ||
-    payload.includes('\\n') ||
-    payload.includes('\\r') ||
-    payload.includes('\r') ||
-    payload.includes('\n')
-  ) {
-    return null;
-  }
-  if (payload === 'AngleInDegrees,DistInMM,Intensity,ErrorCodeHEX') return payload;
-  if (/^ROTATION_SPEED,[0-9.]+$/.test(payload)) return payload;
-  if (/^\d+,\d+,\d+,[0-9A-Fa-f]+$/.test(payload)) return payload;
-  return null;
-}
-
-function parsePointPayload(payload) {
-  const match = String(payload || '').match(/^(\d+),(\d+),(\d+),([0-9A-Fa-f]+)$/);
-  if (!match) return null;
-  const angleDeg = Number(match[1]);
-  const distanceMm = Number(match[2]);
-  const intensity = Number(match[3]);
-  const errorCodeHex = String(match[4]).toUpperCase();
-  return {
-    angleDeg,
-    distanceMm,
-    intensity,
-    errorCodeHex,
-    valid: errorCodeHex === '0' && distanceMm > 0,
-  };
-}
-
-function parseRotationSpeed(payload) {
-  const match = String(payload || '').match(/^ROTATION_SPEED,([0-9.]+)$/);
-  if (!match) return null;
-  return Number(match[1]);
-}
-
-function createLidarRuntime({ logger, host, port = 6053, key, logFile = '', shouldPoll, getPollReadiness, requestScan }) {
-  const events = new EventEmitter();
-  const state = {
-    connected: false,
-    process: null,
-    reconnectTimer: null,
-    pollSoonTimer: null,
-    requestTimeoutTimer: null,
-    stdoutBuffer: '',
-    stderrBuffer: '',
-    currentScan: null,
-    requestInFlight: false,
-    requestStartedAt: 0,
-    logStream: null,
-    stats: {
-      headersSeen: 0,
-      rotationsSeen: 0,
-      scansOk: 0,
-      scansTimedOut: 0,
-      scansRestarted: 0,
-      rotationsWithoutScan: 0,
-      parseablePayloads: 0,
-      pointPayloads: 0,
-    },
-  };
-
-  function emitStatus() {
-    events.emit('status', { connected: state.connected });
-  }
-
-  function clearReconnectTimer() {
-    if (!state.reconnectTimer) return;
-    clearTimeout(state.reconnectTimer);
-    state.reconnectTimer = null;
-  }
-
-  function clearPollSoonTimer() {
-    if (!state.pollSoonTimer) return;
-    clearTimeout(state.pollSoonTimer);
-    state.pollSoonTimer = null;
-  }
-
-  function clearRequestTimeoutTimer() {
-    if (!state.requestTimeoutTimer) return;
-    clearTimeout(state.requestTimeoutTimer);
-    state.requestTimeoutTimer = null;
-  }
-
-  function triggerPollSoon() {
-    if (state.pollSoonTimer) return;
-    state.pollSoonTimer = setTimeout(() => {
-      state.pollSoonTimer = null;
-      tickPoll();
-    }, 0);
-  }
-
-  function schedulePollRetry(delayMs = IDLE_RETRY_MS) {
-    if (state.pollSoonTimer) return;
-    state.pollSoonTimer = setTimeout(() => {
-      state.pollSoonTimer = null;
-      tickPoll();
-    }, delayMs);
-  }
-
-  function scheduleReconnect() {
-    if (state.reconnectTimer) return;
-    state.reconnectTimer = setTimeout(() => {
-      state.reconnectTimer = null;
-      startLogStream();
-    }, RECONNECT_DELAY_MS);
-  }
-
-  function resetScanState() {
-    clearRequestTimeoutTimer();
-    state.currentScan = null;
-    state.requestInFlight = false;
-    state.requestStartedAt = 0;
-  }
-
-  function buildPoints(scan) {
-    return Array.from(scan?.points?.values?.() || []).sort((a, b) => a.angleDeg - b.angleDeg);
-  }
-
-  function emitFrame({ status, reason, scan = state.currentScan }) {
-    const points = buildPoints(scan);
-    const payload = {
-      points,
-      rotationSpeed: scan?.rotationSpeed ?? null,
-      status,
-      debug: {
-        reason,
-        pointsReceived: points.length,
-        validPoints: points.filter((point) => point?.valid).length,
-        requestInFlight: state.requestInFlight,
-        requestStartedAt: state.requestStartedAt || null,
-        stats: { ...state.stats },
-      },
-    };
-    events.emit('scan', payload);
-    return payload;
-  }
-
-  function finalizeScan(reason = 'rotation_complete') {
-    if (!state.currentScan) {
-      state.stats.rotationsWithoutScan += 1;
-      emitFrame({ status: 'error', reason: 'rotation_without_scan', scan: null });
-      resetScanState();
-      triggerPollSoon();
-      return;
-    }
-    state.stats.scansOk += 1;
-    const payload = emitFrame({ status: 'ok', reason });
-    logger.info('Neato lidar scan parsed', {
-      points: payload.points.length,
-      rotationSpeed: payload.rotationSpeed,
-      reason,
-    });
-    resetScanState();
-    triggerPollSoon();
-  }
-
-  function handlePayload(payload) {
-    if (!payload) return;
-    state.stats.parseablePayloads += 1;
-    if (payload === 'AngleInDegrees,DistInMM,Intensity,ErrorCodeHEX') {
-      state.stats.headersSeen += 1;
-      if (state.currentScan) {
-        state.stats.scansRestarted += 1;
-        emitFrame({ status: 'error', reason: 'header_restart' });
-      }
-      state.currentScan = {
-        points: new Map(),
-        rotationSpeed: null,
-      };
-      return;
-    }
-    const rotationSpeed = parseRotationSpeed(payload);
-    if (rotationSpeed != null) {
-      state.stats.rotationsSeen += 1;
-      if (state.currentScan) {
-        state.currentScan.rotationSpeed = rotationSpeed;
-      }
-      finalizeScan('rotation_complete');
-      return;
-    }
-    const point = parsePointPayload(payload);
-    if (!point || !state.currentScan) return;
-    state.stats.pointPayloads += 1;
-    state.currentScan.points.set(point.angleDeg, point);
-  }
-
-  function handleTextChunk(chunk, bufferKey, sourceLabel = '') {
-    const text = String(chunk || '');
-    if (state.logStream) {
-      const prefix = sourceLabel ? `[${sourceLabel}] ` : '';
-      state.logStream.write(
-        text
-          .split(/\r?\n/)
-          .map((line, index, parts) => (index === parts.length - 1 && line === '' ? '' : `${prefix}${line}`))
-          .join('\n'),
-      );
-    }
-    state[bufferKey] += sanitizeLogText(text);
-    const lines = state[bufferKey].split(/\r?\n/);
-    state[bufferKey] = lines.pop() || '';
-    for (const line of lines) {
-      events.emit('line', {
-        source: sourceLabel || 'unknown',
-        line: sanitizeLogText(line),
-      });
-      const payload = parsePayloadFromLine(line);
-      handlePayload(payload);
-    }
-  }
-
-  function ensureConnected() {
-    if (state.connected) return;
-    state.connected = true;
-    emitStatus();
-    triggerPollSoon();
-  }
-
-  function teardownProcess() {
-    const proc = state.process;
-    state.process = null;
-    state.connected = false;
-    emitStatus();
-    resetScanState();
-    if (!proc) return;
-    proc.removeAllListeners();
-    proc.stdout?.removeAllListeners();
-    proc.stderr?.removeAllListeners();
-    try {
-      proc.kill();
-    } catch (err) {
-      logger.warn('Failed to stop Neato lidar log process', err.message);
-    }
-  }
-
-  function ensureLogStream() {
-    if (!logFile || state.logStream) return;
-    try {
-      state.logStream = fs.createWriteStream(logFile, { flags: 'a' });
-      logger.info('Neato lidar raw log capture enabled', { logFile });
-    } catch (err) {
-      logger.warn('Failed to open Neato lidar raw log file', { logFile, error: err.message });
-      state.logStream = null;
-    }
-  }
-
-  function closeLogStream() {
-    if (!state.logStream) return;
-    try {
-      state.logStream.end();
-    } catch (err) {
-      logger.warn('Failed to close Neato lidar raw log file', err.message);
-    }
-    state.logStream = null;
-  }
-
-  function startLogStream() {
-    if (!host || !key) return;
-    if (state.process) return;
-    ensureLogStream();
-
-    logger.info('Starting Neato lidar log stream', { host, port: Number(port || 6053) });
-    const env = {
-      ...process.env,
-      PYTHONUNBUFFERED: '1',
-      NO_COLOR: '1',
-      TERM: 'dumb',
-    };
-    const uvxArgs = [
-      '--from',
-      'aioesphomeapi',
-      'aioesphomeapi-logs',
-      host,
-      '--port',
-      String(port || 6053),
-      '--noise-psk',
-      key,
-      '--no-states',
-    ];
-    const hasScript = spawnSync('bash', ['-lc', 'command -v script >/dev/null 2>&1'], { stdio: 'ignore' }).status === 0;
-    const proc = hasScript
-      ? spawn('script', ['-qefc', `uvx ${uvxArgs.map((arg) => JSON.stringify(arg)).join(' ')}`, '/dev/null'], {
-          stdio: ['ignore', 'pipe', 'pipe'],
-          env,
-        })
-      : spawn('uvx', uvxArgs, {
-          stdio: ['ignore', 'pipe', 'pipe'],
-          env,
-        });
-    logger.info('Neato lidar log launch mode', { mode: hasScript ? 'script' : 'direct' });
-    state.process = proc;
-    state.stdoutBuffer = '';
-    state.stderrBuffer = '';
-
-    proc.stdout.on('data', (chunk) => {
-      ensureConnected();
-      handleTextChunk(chunk, 'stdoutBuffer', 'stdout');
-    });
-
-    proc.stderr.on('data', (chunk) => {
-      ensureConnected();
-      handleTextChunk(chunk, 'stderrBuffer', 'stderr');
-      const message = String(chunk || '').trim();
-      if (message) logger.warn('Neato lidar log stream stderr', message);
-    });
-
-    proc.on('close', (code, signal) => {
-      logger.warn('Neato lidar log stream stopped', { code, signal });
-      teardownProcess();
-      scheduleReconnect();
-    });
-
-    proc.on('error', (err) => {
-      logger.warn('Neato lidar log stream error', err.message);
-      teardownProcess();
-      scheduleReconnect();
-    });
-  }
-
-  async function tickPoll() {
-    if (!state.connected) {
-      schedulePollRetry(OFFLINE_RETRY_MS);
-      return;
-    }
-    const readiness =
-      typeof getPollReadiness === 'function'
-        ? getPollReadiness()
-        : { allowed: shouldPoll?.() !== false, delayMs: IDLE_RETRY_MS };
-    if (!readiness?.allowed) {
-      schedulePollRetry(Number(readiness?.delayMs) || OFFLINE_RETRY_MS);
-      return;
-    }
-    if (state.requestInFlight) return;
-    state.requestInFlight = true;
-    state.requestStartedAt = Date.now();
-    clearRequestTimeoutTimer();
-    state.requestTimeoutTimer = setTimeout(() => {
-      logger.warn('Neato lidar scan timed out; resetting parser state');
-      state.stats.scansTimedOut += 1;
-      emitFrame({ status: 'error', reason: 'scan_timeout' });
-      resetScanState();
-      triggerPollSoon();
-    }, SCAN_TIMEOUT_MS);
-    try {
-      await requestScan?.();
-    } catch (err) {
-      logger.warn('Failed to request Neato lidar scan', err.message);
-      resetScanState();
-      schedulePollRetry(REQUEST_FAILURE_RETRY_MS);
-    }
-  }
-
-  function start() {
-    startLogStream();
-    triggerPollSoon();
-  }
-
-  function stop() {
-    clearReconnectTimer();
-    clearPollSoonTimer();
-    clearRequestTimeoutTimer();
-    teardownProcess();
-    closeLogStream();
-  }
-
-  function getState() {
-    return {
-      connected: state.connected,
-    };
-  }
-
-  return {
-    start,
-    stop,
-    getState,
-    on: (...args) => events.on(...args),
-  };
-}
-
-module.exports = {
-  createLidarRuntime,
-};

server/src/services/overseerControlService/constants.js

@@ -4,6 +4,7 @@ const PROMPT_PATH = path.join(__dirname, '..', '..', '..', 'prompts', 'overseer_
 const DEFAULT_NAME = 'The Overseer';
 const DEFAULT_GATE_INTERVAL_MS = 2000;
 const DEFAULT_HEARTBEAT_MS = 30000;
+const DEFAULT_POST_CHAT_DELAY_MS = 20000;
 const MIN_INTERVAL_MS = 250;
 const MAX_RUN_HISTORY = 100;
 const MAX_CHAT_CONTEXT = 12;
@@ -19,6 +20,7 @@ module.exports = {
   DEFAULT_NAME,
   DEFAULT_GATE_INTERVAL_MS,
   DEFAULT_HEARTBEAT_MS,
+  DEFAULT_POST_CHAT_DELAY_MS,
   MAX_RUN_HISTORY,
   MAX_CHAT_CONTEXT,
   MAX_BOT_CONTEXT,

server/src/services/overseerControlService/contextBuilder.js

@@ -3,7 +3,7 @@ const { evaluateTools } = require('./tools');
 function normalizeNeatoIssue(value) {
   const raw = String(value || '').trim();
   if (!raw) return 'none';
-  if (raw === '200 - (UI_ALERT_INVALID)') return 'none';
+  if (raw.includes('200')) return 'none';
   return raw;
 }
 
@@ -49,7 +49,7 @@ function buildConversation({ recentMessages, name }) {
   (recentMessages || []).forEach((entry) => {
     const text = String(entry?.text || '').trim();
     if (!text) return;
-    const isAssistant = Boolean(entry?.bot || entry?.system);
+    const isAssistant = Boolean(entry?.bot);
     const nickname = String(entry?.nickname || (isAssistant ? name || 'Overseer' : 'user')).trim();
     if (isAssistant) {
       messages.push({ role: 'assistant', content: text });
@@ -60,16 +60,28 @@ function buildConversation({ recentMessages, name }) {
   return messages;
 }
 
-function buildModelMessages({ systemPrompt, stateUpdate, memorySummary, conversationMessages, availableTools, blockedTools }) {
+function buildModelMessages({
+  systemPrompt,
+  stateUpdate,
+  memorySummary,
+  recentEvents,
+  conversationMessages,
+  availableTools,
+  blockedTools,
+}) {
   const messages = [];
   messages.push({ role: 'system', content: systemPrompt });
-  const metadataSections = [];
+  messages.push({ role: 'system', content: `ROOM_SNAPSHOT\n${stateUpdate}` });
-  metadataSections.push(`STATE_UPDATE\n${stateUpdate}`);
+  if (memorySummary) {
-  if (memorySummary) metadataSections.push(`MEMORY_UPDATE\n${memorySummary}`);
+    messages.push({ role: 'system', content: `MEMORY_SUMMARY\n${memorySummary}` });
-  metadataSections.push(
+  }
-    `tool_constraints:\n${blockedTools.map((entry) => `- blocked: ${entry.tool} reason=${entry.reason}`).join('\n') || '- none'}`,
+  if (recentEvents) {
-  );
+    messages.push({ role: 'system', content: `RECENT_EVENTS\n${recentEvents}` });
-  messages.push({ role: 'user', content: metadataSections.join('\n\n') });
+  }
+  messages.push({
+    role: 'system',
+    content: `TOOL_CONSTRAINTS\n${blockedTools.map((entry) => `- blocked: ${entry.tool} reason=${entry.reason}`).join('\n') || '- none'}`,
+  });
   (conversationMessages || []).forEach((message) => {
     if (!message || !message.role || !message.content) return;
     messages.push(message);

server/src/services/overseerControlService/index.js

@@ -5,6 +5,7 @@ const logger = require('../../globals/logger').child('overseerControl');
 const { loadConfig } = require('../../helpers/configLoader');
 const { getRole, roleEvents } = require('../roleService');
 const { getMode, MODES, modeEvents } = require('../modeManager');
+const { verificationEvents } = require('../verificationService');
 const homeAssistantService = require('../homeAssistantService');
 const neatoService = require('../neatoService');
 const liftService = require('../liftService');
@@ -14,11 +15,13 @@ const { getState: getNeatoState, neatoEvents } = neatoService;
 const { getState: getLiftState, liftEvents } = liftService;
 const roverManager = require('../roverManager');
 const { getRecentMessages, sendSystemMessage } = require('../chatService');
+const { subscribe } = require('../eventBus');
 const {
   PROMPT_PATH,
   DEFAULT_NAME,
   DEFAULT_GATE_INTERVAL_MS,
   DEFAULT_HEARTBEAT_MS,
+  DEFAULT_POST_CHAT_DELAY_MS,
   MAX_RUN_HISTORY,
   MAX_CHAT_CONTEXT,
   MAX_BOT_CONTEXT,
@@ -38,7 +41,10 @@ const model = String(overseerConfig.model || '').trim();
 const ollamaUrl = String(overseerConfig.ollamaUrl || overseerConfig.ollamaServer || '').trim();
 const gateIntervalMs = normalizeMs(Number(overseerConfig.gateIntervalMs), DEFAULT_GATE_INTERVAL_MS);
 const heartbeatMs = normalizeMs(Number(overseerConfig.heartbeatMs), DEFAULT_HEARTBEAT_MS);
+const postChatDelayMs = normalizeMs(Number(overseerConfig.postChatDelayMs), DEFAULT_POST_CHAT_DELAY_MS);
 const alwaysRunModel = Boolean(overseerConfig.alwaysRunModel);
+const postToolsOnlyMessages = Boolean(overseerConfig.postToolsOnlyMessages);
+const profileImageUrl = String(overseerConfig.profileImageUrl || '').trim() || null;
 const ollamaClient = ollamaUrl ? new Ollama({ host: ollamaUrl }) : null;
 
 const runtime = {
@@ -51,6 +57,7 @@ const runtime = {
   runHistory: [],
   liveToolCalls: [],
   memoryStore: loadMemory(),
+  contextResetAt: Date.now(),
 };
 
 let status = {
@@ -62,7 +69,9 @@ let status = {
   promptPath: PROMPT_PATH,
   gateIntervalMs,
   heartbeatMs,
+  postChatDelayMs,
   alwaysRunModel,
+  postToolsOnlyMessages,
   running: false,
   inFlight: false,
   phase: 'idle',
@@ -88,6 +97,7 @@ let status = {
   lastLiveToolCalls: null,
   lastOutcome: null,
   lastReason: null,
+  voteStatus: null,
   lastError: null,
   lastErrorDetails: null,
   lastFailedAt: null,
@@ -97,6 +107,44 @@ let status = {
   updatedAt: Date.now(),
 };
 
+function buildVoteStatus() {
+  const sockets = Array.from(io.sockets.sockets.values());
+  let yesCount = 0;
+  let noCount = 0;
+  const votesByIdentity = new Map();
+  const isEligibleVoter = (socket) => getRole(socket) !== 'spectator';
+
+  sockets.forEach((socket) => {
+    if (!isEligibleVoter(socket)) return;
+    const identityKey = String(socket?.data?.cookieUserId || '').trim() || `socket:${socket.id}`;
+    const pref = typeof socket?.data?.overseerEnabled === 'boolean' ? socket.data.overseerEnabled : true;
+    const prev = votesByIdentity.get(identityKey);
+    if (typeof prev === 'boolean') {
+      // If one tab says "no", treat that user as "no" to avoid accidental override by stale tabs.
+      votesByIdentity.set(identityKey, prev && pref);
+      return;
+    }
+    votesByIdentity.set(identityKey, pref);
+  });
+
+  votesByIdentity.forEach((pref) => {
+    if (pref) yesCount += 1;
+    else noCount += 1;
+  });
+
+  const eligibleCount = votesByIdentity.size;
+  const onlineCount = yesCount + noCount;
+  const gatePassed = eligibleCount > 0 && yesCount > noCount;
+  return {
+    yesCount,
+    noCount,
+    onlineCount,
+    eligibleCount,
+    gatePassed,
+    running: Boolean(enabled && gatePassed && getMode() !== MODES.LOCKDOWN),
+  };
+}
+
 function updateStatus(patch = {}) {
   status = { ...status, ...patch, updatedAt: Date.now() };
   const payload = buildAdminState(status, runtime.runHistory);
@@ -160,6 +208,7 @@ function computeTriggerReason() {
   if (alwaysRunModel) return 'loop_tick';
   const recent = getRecentMessages(1, { includeSystem: false });
   const last = recent[recent.length - 1];
+  if (last && Number(last.ts || 0) < runtime.contextResetAt) return null;
   if (last && Date.now() - Number(last.ts || 0) < 5000) {
     const txt = String(last.text || '').toLowerCase();
     if (txt.includes(name.toLowerCase()) || txt.includes('overseer') || txt.includes('bot')) return 'direct_address';
@@ -206,6 +255,58 @@ function normalizeChatDraft(text) {
   return next;
 }
 
+function summarizeResult(result) {
+  if (!result || typeof result !== 'object') return null;
+  if (Object.prototype.hasOwnProperty.call(result, 'ok')) return { ok: Boolean(result.ok) };
+  return null;
+}
+
+function buildToolCallFeedEntries(requestedActions = [], actionResults = []) {
+  const resultsByTool = new Map();
+  (actionResults || []).forEach((entry) => {
+    if (!entry || entry.kind !== 'tool') return;
+    const key = String(entry.tool || '');
+    if (!key) return;
+    if (!resultsByTool.has(key)) resultsByTool.set(key, []);
+    resultsByTool.get(key).push(entry);
+  });
+  return (requestedActions || []).map((action) => {
+    const tool = String(action?.tool || '').trim() || 'unknown';
+    const bucket = resultsByTool.get(tool) || [];
+    const resultEntry = bucket.length ? bucket.shift() : null;
+    const ok = Boolean(resultEntry?.ok);
+    const errText = resultEntry?.error ? String(resultEntry.error) : '';
+    const status = resultEntry
+      ? ok
+        ? 'ok'
+        : errText.includes('blocked') || errText.includes('unavailable')
+          ? 'blocked'
+          : 'error'
+      : 'started';
+    return {
+      tool,
+      status,
+      args: action?.args && typeof action.args === 'object' ? action.args : {},
+      result: summarizeResult(resultEntry?.result),
+      error: errText || null,
+    };
+  });
+}
+
+function buildRecentEventsSummary() {
+  const events = (runtime.liveToolCalls || [])
+    .filter((entry) => entry && (entry.phase === 'ok' || entry.phase === 'error' || entry.phase === 'blocked'))
+    .slice(-3)
+    .map((entry) => {
+      const tool = String(entry.tool || 'unknown');
+      const phase = String(entry.phase || 'unknown');
+      const err = entry.error ? ` error=${String(entry.error).slice(0, 60)}` : '';
+      return `- tool=${tool} phase=${phase}${err}`;
+    });
+  if (!events.length) return '- none';
+  return events.join('\n');
+}
+
 async function runDecision(triggerReason) {
   const runId = runtime.tickCount;
   updateStatus({ phase: 'context_build', currentRunId: runId, lastTriggerReason: triggerReason, lastError: null, lastErrorDetails: null });
@@ -220,6 +321,7 @@ async function runDecision(triggerReason) {
   const toolState = buildToolState({ mode, homeAssistantState, neatoState, liftState });
 
   const recentConversation = getRecentMessages(MAX_CHAT_CONTEXT + MAX_BOT_CONTEXT + 20, { includeSystem: true })
+    .filter((entry) => Number(entry?.ts || 0) >= runtime.contextResetAt)
     .filter((entry) => {
       if (!entry?.roverId) return true;
       return roverManager.canReplayRoverId(entry.roverId);
@@ -232,6 +334,7 @@ async function runDecision(triggerReason) {
     systemPrompt,
     stateUpdate,
     memorySummary: summarizeMemory(runtime.memoryStore),
+    recentEvents: buildRecentEventsSummary(),
     conversationMessages,
     availableTools: toolState.available,
     blockedTools: toolState.blocked,
@@ -275,15 +378,11 @@ async function runDecision(triggerReason) {
 
   const actionResults = [];
   const requestedActions = toolCalls;
+  let postedChat = false;
   let outcome = observeOnly ? 'observed' : 'executed';
   const reason = observeOnly ? 'observe-only mode' : null;
 
   if (!observeOnly) {
-    if ((decision === 'CHAT' || decision === 'ACTION+CHAT') && chatDraft) {
-      sendSystemMessage(chatDraft, { nickname: name });
-      actionResults.push({ kind: 'chat', ok: true });
-    }
-
     if (decision === 'ACTION' || decision === 'ACTION+CHAT') {
       for (const action of requestedActions) {
         pushLiveToolCall({ phase: 'start', tool: action.tool, args: action.args });
@@ -314,6 +413,19 @@ async function runDecision(triggerReason) {
         }
       }
     }
+
+    const toolCallFeed = buildToolCallFeedEntries(requestedActions, actionResults);
+    if (toolCallFeed.length > 0) {
+      if ((decision === 'CHAT' || decision === 'ACTION+CHAT') && chatDraft) {
+        sendSystemMessage(chatDraft, { nickname: name, bot: true, profileImage: profileImageUrl, toolCalls: toolCallFeed });
+        postedChat = true;
+      } else if (postToolsOnlyMessages) {
+        sendSystemMessage('', { nickname: name, bot: true, profileImage: profileImageUrl, toolCalls: toolCallFeed });
+      }
+    } else if ((decision === 'CHAT' || decision === 'ACTION+CHAT') && chatDraft) {
+      sendSystemMessage(chatDraft, { nickname: name, bot: true, profileImage: profileImageUrl });
+      postedChat = true;
+    }
   }
 
   updateStatus({
@@ -344,6 +456,8 @@ async function runDecision(triggerReason) {
     generationMs,
     blockedTools: toolState.blocked,
   });
+
+  return { postedChat };
 }
 
 async function tick() {
@@ -351,12 +465,16 @@ async function tick() {
   runtime.inFlight = true;
   updateStatus({ inFlight: true, tickCount: runtime.tickCount, lastTickAt: Date.now(), phase: 'gate_check' });
 
+  let nextDelayMs = gateIntervalMs;
   try {
     const triggerReason = computeTriggerReason();
     if (!triggerReason) {
       updateStatus({ phase: 'idle', lastOutcome: 'skipped', lastReason: 'gate not triggered' });
     } else {
-      await runDecision(triggerReason);
+      const runResult = await runDecision(triggerReason);
+      if (runResult?.postedChat) {
+        nextDelayMs = postChatDelayMs;
+      }
     }
   } catch (err) {
     const failure = buildFailureInfo(err);
@@ -371,8 +489,8 @@ async function tick() {
   } finally {
     runtime.inFlight = false;
     if (status.running) {
-      updateStatus({ inFlight: false, currentRunId: null, phase: 'idle', nextRunAt: Date.now() + gateIntervalMs });
+      updateStatus({ inFlight: false, currentRunId: null, phase: 'idle', nextRunAt: Date.now() + nextDelayMs });
-      runtime.timer = setTimeout(tick, gateIntervalMs);
+      runtime.timer = setTimeout(tick, nextDelayMs);
     } else {
       updateStatus({ inFlight: false, currentRunId: null, nextRunAt: null });
     }
@@ -384,13 +502,41 @@ function emitStateToSocket(socket) {
   socket.emit('overseer:state', buildAdminState(status, runtime.runHistory));
 }
 
-function clearHistory() {
+function clearHistory(reason = 'admin requested clear history', options = {}) {
+  const resetPersistentMemory = options?.resetPersistentMemory !== false;
+  const sendConfirmation = options?.sendConfirmation === true;
+  runtime.contextResetAt = Date.now();
   runtime.runHistory = [];
   runtime.liveToolCalls = [];
   runtime.generationCount = 0;
   runtime.generationTotalMs = 0;
+  runtime.lastModelAt = 0;
+  if (resetPersistentMemory) {
     runtime.memoryStore = saveMemory(createDefaultMemory());
-  updateStatus({ lastReason: 'admin requested clear history', lastOutcome: 'cleared', lastLiveToolCalls: [] });
+  }
+  updateStatus({
+    phase: 'idle',
+    currentRunId: null,
+    lastSystemPrompt: null,
+    lastStateUpdate: null,
+    lastTranscript: null,
+    lastAvailableTools: null,
+    lastBlockedTools: null,
+    lastModelMessages: null,
+    lastModelInputAt: null,
+    lastModelOutputAt: null,
+    lastModelRawOutput: null,
+    lastDecision: null,
+    lastChatDraft: null,
+    lastRequestedActions: null,
+    lastActionResults: null,
+    lastLiveToolCalls: [],
+    lastOutcome: 'cleared',
+    lastReason: reason,
+  });
+  if (sendConfirmation) {
+    sendSystemMessage('Context cleared.', { nickname: name, bot: true, profileImage: profileImageUrl });
+  }
 }
 
 function stopScheduler(reason = 'paused') {
@@ -415,8 +561,29 @@ function startScheduler(reason = null) {
   runtime.timer = setTimeout(tick, gateIntervalMs);
 }
 
+function evaluateSchedulerGate(reason = 'gate reevaluated') {
+  const voteStatus = buildVoteStatus();
+  const runningAllowed = Boolean(enabled && voteStatus.gatePassed && getMode() !== MODES.LOCKDOWN);
+  updateStatus({ voteStatus });
+  if (!enabled) {
+    stopScheduler('overseerControl.enabled is false');
+    return;
+  }
+  if (getMode() === MODES.LOCKDOWN) {
+    stopScheduler('paused during lockdown');
+    return;
+  }
+  if (!voteStatus.gatePassed) {
+    stopScheduler('paused by user vote');
+    return;
+  }
+  startScheduler(reason);
+}
+
 io.on('connection', (socket) => {
   emitStateToSocket(socket);
+  evaluateSchedulerGate('online vote update');
+  socket.on('disconnect', () => evaluateSchedulerGate('online vote update'));
   socket.on('overseer:control', ({ controls } = {}, cb = () => {}) => {
     if (!isAdminRole(getRole(socket))) return cb({ error: 'Not authorized' });
     const action = controls?.action || null;
@@ -428,7 +595,17 @@ io.on('connection', (socket) => {
   });
 });
 
-roleEvents.on('change', ({ socket }) => emitStateToSocket(socket));
+roleEvents.on('change', ({ socket }) => {
+  emitStateToSocket(socket);
+  evaluateSchedulerGate('online vote update');
+});
+subscribe('chat:message', ({ payload } = {}) => {
+  const text = String(payload?.text || '').trim();
+  if (text !== 'CLEAR') return;
+  if (payload?.bot) return;
+  clearHistory('chat CLEAR command', { resetPersistentMemory: false, sendConfirmation: true });
+});
+verificationEvents.on('change', () => evaluateSchedulerGate('online vote update'));
 homeAssistantEvents.on('update', () => updateStatus({ phase: status.phase }));
 neatoEvents.on('update', () => updateStatus({ phase: status.phase }));
 liftEvents.on('update', () => updateStatus({ phase: status.phase }));
@@ -440,7 +617,7 @@ modeEvents.on('change', (mode) => {
     logger.info('overseerControl paused due to lockdown mode');
     return;
   }
-  startScheduler(observeOnly ? 'observe-only mode' : null);
+  evaluateSchedulerGate(observeOnly ? 'observe-only mode' : null);
 });
 
 if (!enabled) {
@@ -451,9 +628,11 @@ if (!enabled) {
     stopScheduler('paused during lockdown');
     logger.info('overseerControl paused on startup due to lockdown mode');
   } else {
-    startScheduler(observeOnly ? 'observe-only mode' : null);
+    evaluateSchedulerGate(observeOnly ? 'observe-only mode' : null);
     logger.info('overseerControl enabled', { model, ollamaUrl, gateIntervalMs, heartbeatMs, observeOnly });
   }
 }
 
-module.exports = {};
+module.exports = {
+  getVoteStatus: () => status.voteStatus || buildVoteStatus(),
+};

server/src/services/overseerControlService/tools/chatSay.js

@@ -16,7 +16,7 @@ module.exports = {
   async execute({ args = {}, sendSystemMessage, name }) {
     const text = String(args?.text || '').trim();
     if (!text) throw new Error('chat_say requires args.text');
-    sendSystemMessage(text, { nickname: name });
+    sendSystemMessage(text, { nickname: name, bot: true });
     return { ok: true };
   },
 };

server/src/services/overseerControlService/tools/neatoLocate.js

@@ -1,7 +1,7 @@
 module.exports = {
-  id: 'neato_locate',
+  id: 'neato_play_sound',
-  signature: 'neato_locate()',
+  signature: 'neato_play_sound()',
-  description: 'Play Neato locate/chime action.',
+  description: 'Play a sound/chime on the Neato robot.',
   parameters: { type: 'object', properties: {}, additionalProperties: false },
   availability(ctx = {}) {
     const mode = String(ctx.mode || '');

server/src/services/replayEngineV2/constants.js

@@ -8,7 +8,7 @@ const FFMPEG_BIN = process.env.FFMPEG_BIN || 'ffmpeg';
 const SEGMENT_ROOT = path.join(resolveDataDir(), 'replay-segments');
 const SEGMENT_SECONDS = Math.max(1, Number.parseInt(process.env.REPLAY_SEGMENT_SECONDS || '1', 10));
 const BUFFER_SECONDS = Math.max(20, Number.parseInt(process.env.REPLAY_BUFFER_SECONDS || '45', 10));
-const CLEANUP_INTERVAL_MS = 10_000;
+const CLEANUP_INTERVAL_MS = Math.max(500, Number.parseInt(process.env.REPLAY_TICK_MS || '2000', 10));
 const BUILD_DURATION_MS = Math.max(5000, Number.parseInt(process.env.REPLAY_DURATION_MS || '35000', 10));
 const BUILD_GUARD_MS = Math.max(200, Number.parseInt(process.env.REPLAY_GUARD_MS || '1200', 10));
 const TARGET_FPS = Math.max(10, Number.parseInt(process.env.REPLAY_TARGET_FPS || '30', 10));

server/src/services/replayEngineV2/index.js

@@ -54,6 +54,11 @@ const replayBuilder = createReplayBuilder({
 });
 registerReplaySocketHooks({ tryTriggerReplay, validateSources, getDefaultWebSources });
 
+async function buildReplayVideoFresh(options = {}) {
+  await tick();
+  return replayBuilder.buildReplayVideo(options);
+}
+
 function getReplayHealthSnapshot() {
   return segmentStore.getReplayHealthSnapshot({ BUILD_DURATION_MS, roverManager, getRoomCameras });
 }
@@ -98,7 +103,7 @@ start().catch((err) => {
 });
 
 module.exports = {
-  buildReplayVideo: replayBuilder.buildReplayVideo,
+  buildReplayVideo: buildReplayVideoFresh,
   tryTriggerReplay,
   getReplayState,
   replayEvents,

server/src/services/replayEngineV2/replayBuilder.js

@@ -52,6 +52,22 @@ function buildChatEventsForWindow(startMs, endMs, limit = 22, preWindowCount = 1
 }
 
 function createReplayBuilder({ execFileAsync, fsp, ensureDir, renderSidebarVideo, getVideoEntriesForSource, getAudioEntriesForRover, overlapping }) {
+  function resolveReplayWindow({ sources = [], nowMs, guardMs, durationMs }) {
+    const tentativeEnd = nowMs - guardMs;
+    const sourceEnds = [];
+    for (const source of sources) {
+      const sourceId = String(source.id);
+      const allEntries = getVideoEntriesForSource({ type: String(source.type), id: sourceId });
+      if (!Array.isArray(allEntries) || !allEntries.length) continue;
+      const bounded = allEntries.filter((entry) => Number.isFinite(entry?.endMs) && entry.endMs <= tentativeEnd);
+      if (!bounded.length) continue;
+      const latest = bounded.reduce((best, entry) => (entry.endMs > best.endMs ? entry : best), bounded[0]);
+      sourceEnds.push(latest.endMs);
+    }
+    const alignedEnd = sourceEnds.length ? Math.min(...sourceEnds) : tentativeEnd;
+    return { tEnd: alignedEnd, tStart: alignedEnd - durationMs };
+  }
+
   async function concatFiles(inputPaths, outPath) {
     const listPath = `${outPath}.concat.txt`;
     const body = inputPaths.map((file) => `file '${file.replace(/'/g, "'\\''")}'`).join('\n');
@@ -74,8 +90,12 @@ function createReplayBuilder({ execFileAsync, fsp, ensureDir, renderSidebarVideo
 
   async function buildReplayVideo({ sources = [], title = '', requester = '', includeSidebar = true } = {}) {
     if (!Array.isArray(sources) || !sources.length) throw new Error('No replay sources selected');
-    const tEnd = Date.now() - BUILD_GUARD_MS;
+    const { tEnd, tStart } = resolveReplayWindow({
-    const tStart = tEnd - BUILD_DURATION_MS;
+      sources,
+      nowMs: Date.now(),
+      guardMs: BUILD_GUARD_MS,
+      durationMs: BUILD_DURATION_MS,
+    });
     const resolvedTitle = sanitizeReplayTitle(title, resolveDefaultReplayTitle(requester, sources));
     const tmpDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'mrr-replay-v2-'));
 

server/src/services/roverManager/rosterLifecycle.js

@@ -211,6 +211,7 @@ function createRosterLifecycle(deps) {
     return Array.from(rovers.values()).map((record) => ({
       id: record.id,
       name: record.meta?.name || record.id,
+      description: record.meta?.description,
       color: record.meta?.color || null,
       battery: record.meta?.battery,
       batteryState: record.batteryState,

server/src/services/sessionService/index.js

@@ -13,6 +13,7 @@ const { getRoomCameras, roomCameraEvents } = require('../roomCameraService');
 const { getState: getHomeAssistantState, homeAssistantEvents } = require('../homeAssistantService');
 const { getState: getNeatoState, neatoEvents } = require('../neatoService');
 const { getState: getLiftState, liftEvents } = require('../liftService');
+const { getVoteStatus: getOverseerVoteStatus } = require('../overseerControlService');
 const { getNickname, nicknameEvents } = require('../nicknameService');
 const {
   getVerificationStateForSocket,
@@ -66,6 +67,7 @@ function buildUserEntry(socket) {
 }
 
 function buildSession(socket) {
+  const overseerVote = getOverseerVoteStatus();
   const users = Array.from(io.sockets.sockets.values())
     .map((sock) => buildUserEntry(sock))
     .filter(Boolean)
@@ -124,6 +126,10 @@ function buildSession(socket) {
     audioForward: getAudioForwardState(),
     audioLevels: getAudioLevels(),
     buttonBox: getButtonBoxState(),
+    overseerVote: {
+      ...overseerVote,
+      preference: typeof socket?.data?.overseerEnabled === 'boolean' ? socket.data.overseerEnabled : true,
+    },
   };
 }
 

server/src/services/verificationService/index.js

@@ -111,11 +111,18 @@ function identifySocket(socket, payload = {}) {
     }
   }
 
+  if (Object.prototype.hasOwnProperty.call(payload, 'overseerEnabled')) {
+    data.overseerEnabled = Boolean(payload.overseerEnabled);
+  } else if (typeof data.overseerEnabled !== 'boolean') {
+    data.overseerEnabled = true;
+  }
+
   const verification = reevaluateSocketVerification(socket);
   const deterrence = reevaluateSocketDeterrence(socket);
   emitChange('identify', { socketId: socket.id });
   return {
     cookieUserId: data.cookieUserId,
+    overseerEnabled: Boolean(data.overseerEnabled),
     isVerified: verification.isVerified,
     isDeterred: deterrence.isDeterred,
     reason: verification.reason,

server/src/services/verificationService/verificationFlow.js

@@ -97,6 +97,7 @@ function createVerificationFlow(deps) {
     return {
       cookieUserId: normalizeCookieUserId(data.cookieUserId) || null,
       nickname: getNickname(socket) || null,
+      overseerEnabled: typeof data.overseerEnabled === 'boolean' ? data.overseerEnabled : true,
     };
   }
 

webui/src/App.jsx

@@ -16,12 +16,14 @@ import {
 } from './controls/index.js';
 import RoomCameraPanel from './components/RoomCameraPanel/index.jsx';
 import LogPanel from './components/LogPanel/index.jsx';
-import DriverVideoPanel from './components/DriverVideoPanel/index.jsx';
+import DriverVideo from './components/DriverVideo/index.jsx';
 import RightPaneTabs from './components/RightPaneTabs/index.jsx';
 import ModeGateOverlay from './components/ModeGateOverlay/index.jsx';
 import HomeAssistantControls from './components/HomeAssistantControls/index.jsx';
 import TurnAlertListener from './components/TurnAlertListener/index.jsx';
 import RawUserPilePanel from './components/RawUserPilePanel/index.jsx';
+import OverseerPreferencePanel from './components/OverseerPreferencePanel/index.jsx';
+import SocialButtonsGrid from './components/SocialButtonsGrid/index.jsx';
 import ChatPanel from './components/ChatPanel/index.jsx';
 import FullscreenPrompt from './components/FullscreenPrompt/index.jsx';
 import FloatingFullscreenButton from './components/FloatingFullscreenButton/index.jsx';
@@ -75,7 +77,7 @@ function DesktopLayout({ layout, onOpenHelpOverlay }) {
   return (
     <div className="flex h-full gap-0.5 overflow-hidden">
       <div className="flex min-w-0 flex-[1.22] flex-col gap-0.5 overflow-y-auto pr-0">
-        <DriverVideoPanel />
+        <DriverVideo />
         <TelemetryPanel />
         <LogPanel />
       </div>
@@ -141,8 +143,16 @@ function MobileFeatureTabs({
         <TabPanels>
           <TabPanel id="chat">
             <div className="space-y-0.5">
-              <ChatPanel />
+              <ChatPanel nicknameLayout="stacked" />
-              <RawUserPilePanel />
+              <div className="space-y-0.5">
+                <div className="grid gap-0.5 md:grid-cols-[minmax(0,1.4fr)_minmax(0,1fr)]">
+                  <SocialButtonsGrid />
+                </div>
+                <div className="grid gap-0.5 grid-cols-[minmax(0,1fr)_minmax(0,1fr)]">
+                  <OverseerPreferencePanel />
+                  <RawUserPilePanel hideNicknameForm />
+                </div>
+              </div>
             </div>
           </TabPanel>
           <TabPanel id="vip" keepMounted>
@@ -174,7 +184,7 @@ function MobileFeatureTabs({
 function MobilePortraitLayout({ onOpenHelpOverlay, swapMobileControlColumns = false }) {
   return (
     <div className="flex flex-col gap-0.5">
-      <DriverVideoPanel layoutFormat="mobile-portrait" />
+      <DriverVideo layoutFormat="mobile-portrait" />
       <MobileControls swapColumns={swapMobileControlColumns} />
       <div className="grid gap-0.5 grid-cols-[minmax(0,1fr)_minmax(0,1.4fr)]">
         <ReplaySourcesPanel panelId="replay-sources-mobile-portrait" />
@@ -203,7 +213,7 @@ function MobileLandscapeLayout({ onOpenHelpOverlay, swapMobileControlColumns = f
       <section className="grid min-h-screen grid-cols-[minmax(0,0.7fr)_minmax(0,2.1fr)_minmax(0,0.7fr)] gap-0.5">
         {firstColumn}
         <div>
-          <DriverVideoPanel layoutFormat="mobile-landscape" />
+          <DriverVideo layoutFormat="mobile-landscape" />
           <div className="grid gap-0.5 grid-cols-[minmax(0,1fr)_minmax(0,1.4fr)]">
             <ReplaySourcesPanel panelId="replay-sources-mobile-landscape" />
             <RoverQueuesPanel />

webui/src/components/AdminPanel/llmHelpers.js

@@ -62,7 +62,7 @@ export function buildLlmConversationRowsFromMessages(modelMessages, rawOutput) {
         nickname,
         text: content,
         role: 'spectator',
-        system: role === 'system',
+        bot: role === 'system',
       },
     };
   });
@@ -75,7 +75,7 @@ export function buildLlmConversationRowsFromMessages(modelMessages, rawOutput) {
         nickname: 'LLM Output',
         text: raw.trim() ? raw : '<empty>',
         role: 'spectator',
-        system: true,
+        bot: true,
       },
     });
   }

webui/src/components/ButtonBoxPanel/index.jsx

@@ -7,6 +7,7 @@ import { useSocket } from '../../context/SocketContext.jsx';
 import { useSettingsNamespace } from '../../settings/index.js';
 import { AUDIO_SETTINGS_DEFAULTS } from '../../settings/namespaces.js';
 import ButtonBoxTile from '../ButtonBoxTile/index.jsx';
+import CardFrame from '../CardFrame/index.jsx';
 
 const FLASH_MS = 420;
 const REWARD_FLASH_MS = 1200;
@@ -126,10 +127,7 @@ export default function ButtonBoxPanel() {
   }, [effectiveAlertVolume, socket]);
 
   return (
-    <section className="panel-section space-y-0.5 text-base">
+    <CardFrame title="Button Box" bodyClassName="space-y-0.5 text-base">
-      <header className="panel-muted text-center text-sm">
-        <p>Button Box</p>
-      </header>
       <div className="grid grid-cols-4 gap-0.5">
         {buttons.map((button) => {
           const id = Number(button.id);
@@ -155,6 +153,6 @@ export default function ButtonBoxPanel() {
           );
         })}
       </div>
-    </section>
+    </CardFrame>
   );
 }

webui/src/components/CardFrame/index.jsx

@@ -0,0 +1,89 @@
+import { useSessionSelector } from '../../context/SessionContext.jsx';
+
+// Utilities
+function cx(...values) {
+  return values.filter(Boolean).join(' ');
+}
+
+// Color helpers
+function hexToRgb(hex) {
+  const raw = String(hex || '').trim();
+  const normalized = raw.startsWith('#') ? raw.slice(1) : raw;
+  if (!/^[0-9a-fA-F]{3}$|^[0-9a-fA-F]{6}$/.test(normalized)) return null;
+  const expanded =
+    normalized.length === 3
+      ? normalized
+          .split('')
+          .map((ch) => ch + ch)
+          .join('')
+      : normalized;
+  return {
+    r: Number.parseInt(expanded.slice(0, 2), 16),
+    g: Number.parseInt(expanded.slice(2, 4), 16),
+    b: Number.parseInt(expanded.slice(4, 6), 16),
+  };
+}
+
+function rgba(rgb, alpha) {
+  return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${alpha})`;
+}
+
+// Component
+export default function CardFrame({
+  title = '',
+  meta = null,
+  actions = null,
+  hideHeader = false,
+  className = '',
+  headerClassName = '',
+  bodyClassName = '',
+  fillHeight = false,
+  clipOverflow = true,
+  children,
+}) {
+  const showHeader = !hideHeader && (title || meta != null || actions);
+  const ownRoverColor = useSessionSelector((state) => {
+    const roverId = String(state.session?.assignment?.roverId || '').trim();
+    if (!roverId) return null;
+    const roster = Array.isArray(state.session?.roster) ? state.session.roster : [];
+    const rover = roster.find((entry) => String(entry?.id) === roverId);
+    return rover?.color || null;
+  });
+  const accentRgb = hexToRgb(ownRoverColor);
+  const cardStyle = accentRgb ? { borderColor: rgba(accentRgb, 0.35) } : undefined;
+  const headerStyle = accentRgb
+    ? {
+        backgroundImage: `linear-gradient(90deg, rgba(23,23,23,0.96) 0%, rgba(38,38,38,0.94) 58%, ${rgba(accentRgb, 0.18)} 100%)`,
+      }
+    : undefined;
+
+  return (
+    <section
+      className={cx(
+        'panel-section border border-neutral-500/60 bg-neutral-900/95 shadow-[0_1px_0_rgba(255,255,255,0.05)_inset,0_10px_24px_rgba(0,0,0,0.28)]',
+        clipOverflow ? 'overflow-hidden' : 'overflow-visible',
+        fillHeight && 'flex h-full min-h-0 flex-col',
+        className,
+      )}
+      style={cardStyle}
+    >
+      {showHeader ? (
+        // Header row
+        <header
+          className={cx(
+            'flex items-center justify-between gap-0.5 border-b border-neutral-500/50 bg-gradient-to-r from-neutral-800 via-neutral-700 to-neutral-600 px-0.5 py-0.5',
+            headerClassName,
+          )}
+          style={headerStyle}
+        >
+          <div className="flex min-w-0 items-center gap-0.5">
+            {title ? <p className="m-0 text-[0.78rem] font-semibold leading-none text-neutral-50">{title}</p> : null}
+            {meta != null ? <span className="text-[0.68rem] font-medium leading-none text-neutral-200">{meta}</span> : null}
+          </div>
+          {actions ? <div className="flex flex-wrap items-center justify-end gap-0.5">{actions}</div> : null}
+        </header>
+      ) : null}
+      <div className={cx(fillHeight && 'flex flex-1 min-h-0 flex-col', bodyClassName)}>{children}</div>
+    </section>
+  );
+}

webui/src/components/ChatMessageRow/index.jsx

@@ -1,8 +1,10 @@
 // Chat Message Row
 // Purpose: Defines the Chat Message Row module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
+import { useState } from 'react';
 import { FaDiscord } from 'react-icons/fa';
 import { roverBadgeStyle } from '../../lib/roverColor.js';
+import { useSessionSelector } from '../../context/SessionContext.jsx';
 
 function roleColors(role) {
   switch (role) {
@@ -17,8 +19,8 @@ function roleColors(role) {
   }
 }
 
-function isBotSystemMessage(message) {
+function isBotMessage(message) {
-  return Boolean(message?.system);
+  return Boolean(message?.bot);
 }
 
 function formatTime(ts) {
@@ -34,7 +36,7 @@ function DiscordAvatar({ guildIconUrl, userAvatarUrl, label }) {
   if (!guildIconUrl && !userAvatarUrl) return null;
   return (
     <span
-      className="flex h-4 w-4 overflow-hidden rounded-full border border-slate-700/80"
+      className="flex h-4 w-4 shrink-0 overflow-hidden rounded-none border border-slate-700/80"
       title={label}
     >
       <span
@@ -65,51 +67,65 @@ function DiscordAvatar({ guildIconUrl, userAvatarUrl, label }) {
   );
 }
 
-export function ChatIdentity({ message }) {
+function ProfileAvatar({ imageUrl, label }) {
+  if (!imageUrl) return null;
+  return (
+    <span className="flex h-4 w-4 shrink-0 overflow-hidden rounded-none border border-slate-700/80" title={label}>
+      <span
+        className="h-full w-full bg-cover bg-center bg-no-repeat"
+        style={{ backgroundImage: `url(${imageUrl})` }}
+      />
+    </span>
+  );
+}
+
+export function ChatIdentity({ message, toolsToggle = null }) {
   const discordLabel = message.fromDiscord
     ? `${message.discordGuildName || 'Discord'} · ${displayName(message)}`
     : null;
-  const isBot = isBotSystemMessage(message);
+  const isBot = isBotMessage(message);
   const nameClass = isBot ? 'text-emerald-300' : roleColors(message.role);
   return (
-    <>
+    <span className="inline-flex min-w-0 items-center gap-0.5 align-middle">
       {message.fromDiscord ? (
-        <>
+        <FaDiscord className="h-4 w-4 shrink-0 text-indigo-200" />
-          <FaDiscord className="h-3.5 w-3.5 text-indigo-200" />
+      ) : null}
+      <span className={`font-semibold text-[0.85rem] ${nameClass}`}>
+        {displayName(message)}
+      </span>
+      <ProfileAvatar imageUrl={message.profileImage} label={discordLabel || displayName(message)} />
+      {!message.profileImage ? (
         <DiscordAvatar
           guildIconUrl={message.discordGuildIconUrl}
           userAvatarUrl={message.discordUserAvatarUrl}
           label={discordLabel}
         />
-        </>
       ) : null}
-      <span className={`font-semibold text-[0.85rem] ${nameClass}`}>
-        {displayName(message)}
-      </span>
       {isBot ? (
-        <span className="rounded bg-emerald-900/60 px-1 text-[0.65rem] font-semibold uppercase tracking-wide text-white">
+        <span className="shrink-0 rounded bg-emerald-900/60 px-1 text-[0.65rem] font-semibold uppercase tracking-wide text-white">
           bot
         </span>
       ) : null}
       {message.roverId && (
         <span
-          className="rounded bg-slate-800 px-1 text-[0.7rem]"
+          className="shrink-0 rounded bg-slate-800 px-1 text-[0.7rem]"
           style={roverBadgeStyle(message.roverColor, 0.14)}
         >
           {message.roverId}
         </span>
       )}
-    </>
+      {toolsToggle}
+    </span>
   );
 }
 
 function chatRowClass(message) {
-  if (isBotSystemMessage(message)) {
+  if (isBotMessage(message)) {
-    return 'surface-muted relative flex flex-wrap items-start gap-0.5 border border-emerald-500/40 bg-emerald-900/15 text-sm';
+    return 'surface-muted flex flex-col gap-0.5 border border-emerald-500/40 bg-emerald-900/15 text-sm';
   }
   const isAdmin =
     message.role === 'admin' || message.role === 'lockdown' || message.role === 'lockdown-admin';
-  return `surface-muted relative flex flex-wrap items-start gap-0.5 text-sm ${
+  return `surface-muted flex flex-col gap-0.5 text-sm ${
     isAdmin
       ? 'border border-amber-400/30'
       : message.fromDiscord
@@ -119,19 +135,60 @@ function chatRowClass(message) {
 }
 
 export default function ChatMessageRow({ message }) {
-  const isBot = isBotSystemMessage(message);
+  const isBot = isBotMessage(message);
+  const role = useSessionSelector((state) => state.session?.role || null);
+  const isSpectator = role === 'spectator';
+  const [open, setOpen] = useState(false);
+  const isOpen = isSpectator || open;
+  const toolCalls = Array.isArray(message?.toolCalls) ? message.toolCalls : [];
+  const hasText = Boolean(String(message?.text || '').trim());
+  const toolsToggle =
+    toolCalls.length > 0 ? (
+      <button
+        type="button"
+        className="shrink-0 rounded border border-slate-600/70 bg-slate-800/60 px-1 py-[1px] text-[0.65rem] text-slate-200 hover:bg-slate-700/70"
+        onClick={() => {
+          if (isSpectator) return;
+          setOpen((v) => !v);
+        }}
+      >
+        {isOpen ? '▼' : '▶'} Tools ({toolCalls.length})
+      </button>
+    ) : null;
   return (
     <div className={chatRowClass(message)}>
-      <ChatIdentity message={message} />
+      <div className="flex w-full items-start gap-0.5">
         <span
-        className={`break-words leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}
+          className={`min-w-0 flex-1 break-words leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}
         >
-        {message.text}
+          <ChatIdentity message={message} toolsToggle={toolsToggle} />
+          {!isOpen && hasText ? ` ${message.text}` : ''}
         </span>
-      <span className="absolute bottom-0.5 right-1 text-[0.65rem] text-slate-400/60">
+        <span className="shrink-0 text-[0.65rem] text-slate-400/60">
           {formatTime(message.ts)}
         </span>
       </div>
+      {isOpen && toolCalls.length > 0 ? (
+        <div className="w-full rounded border border-slate-700/70 bg-slate-900/70 p-0.5 text-[0.68rem] text-slate-200">
+          {toolCalls.map((entry, idx) => {
+            const status = String(entry?.status || 'unknown');
+            const statusLabel = status === 'ok' ? 'ok' : status === 'blocked' ? 'blocked' : status === 'error' ? 'error' : 'unknown';
+            const argsText = JSON.stringify(entry?.args && typeof entry.args === 'object' ? entry.args : {});
+            return (
+              <div key={`${entry?.tool || 'tool'}-${idx}`} className="mb-0.5 last:mb-0">
+                <div>{statusLabel} {entry?.tool || 'unknown'} args={argsText}</div>
+                {entry?.error ? <div className="text-rose-300">error: {String(entry.error)}</div> : null}
+              </div>
+            );
+          })}
+        </div>
+      ) : null}
+      {isOpen && hasText ? (
+        <div className={`w-full break-words leading-tight whitespace-pre-wrap ${isBot ? 'text-emerald-100' : 'text-slate-100'}`}>
+          {message.text}
+        </div>
+      ) : null}
+    </div>
   );
 }
 

webui/src/components/ChatPanel/index.jsx

@@ -7,6 +7,8 @@ import { useSessionSelector } from '../../context/SessionContext.jsx';
 import { useSettingsNamespace } from '../../settings/index.js';
 import ChatMessageRow from '../ChatMessageRow/index.jsx';
 import ChatTypingRow from '../ChatTypingRow/index.jsx';
+import CardFrame from '../CardFrame/index.jsx';
+import NicknameForm from '../NicknameForm/index.jsx';
 
 const FLITE_VOICES = ['kal', 'rms', 'slt', 'ksp', 'bdl'];
 const ESPEAK_PITCHES = Array.from({ length: 10 }, (_, idx) => idx * 10);
@@ -16,6 +18,8 @@ export default function ChatPanel({
   hideSpectatorNotice = false,
   fillHeight = false,
   allowSpectatorInput = false,
+  title = 'Chat and TTS',
+  nicknameLayout = 'inline',
 }) {
   const role = useSessionSelector((state) => state.session?.role || null);
   const currentRoverId = useSessionSelector((state) => state.session?.assignment?.roverId || null);
@@ -103,9 +107,16 @@ export default function ChatPanel({
   }
 
   const listClass = fillHeight ? 'flex-1 min-h-0 overflow-y-auto' : 'h-48 overflow-y-auto';
+  const isStackedNickname = nicknameLayout === 'stacked';
 
   return (
-    <section className={`panel-section space-y-0.5 text-base ${fillHeight ? 'flex h-full flex-col overflow-hidden' : ''}`}>
+    <CardFrame
+      title={title}
+     
+      hideHeader={!title}
+      fillHeight={fillHeight}
+      bodyClassName="space-y-0.5 text-base"
+    >
       <div className={`surface overflow-y-auto space-y-0.5 px-0 ${listClass}`} ref={listRef}>
         {sorted.length === 0 && typingRows.length === 0 ? (
           <p className="text-sm text-slate-500">No messages yet.</p>
@@ -117,9 +128,15 @@ export default function ChatPanel({
         ))}
       </div>
       {!hideInput && (
-        <form className="flex flex-wrap items-stretch gap-0.5" onSubmit={handleSend}>
+        <form
+          className={`flex items-stretch gap-0.5 ${isStackedNickname ? 'flex-col' : 'flex-wrap'}`}
+          onSubmit={handleSend}
+        >
+          <div className={isStackedNickname ? 'w-full' : 'w-[9rem] sm:w-[10rem] shrink-0'}>
+            <NicknameForm compact />
+          </div>
           <input
-            className="field-input flex-1 min-w-[10rem]"
+            className={`field-input ${isStackedNickname ? 'w-full min-w-0' : 'flex-1 min-w-[10rem]'}`}
             value={draft}
             onChange={(e) => {
               const next = e.target.value;
@@ -146,7 +163,11 @@ export default function ChatPanel({
             disabled={!canChat}
           />
           {ttsSupported && (
-            <div className="flex flex-wrap items-center gap-0.5 basis-full sm:basis-auto">
+            <div
+              className={`flex flex-wrap items-center gap-0.5 ${
+                isStackedNickname ? 'w-full' : 'basis-full sm:basis-auto'
+              }`}
+            >
               <label className="flex items-center gap-0.5 text-xs text-slate-300">
                 <input
                   type="checkbox"
@@ -206,12 +227,12 @@ export default function ChatPanel({
           <button
             type="submit"
             disabled={!canChat || sending}
-            className="button-dark h-full disabled:opacity-50 self-stretch"
+            className={`button-dark disabled:opacity-50 ${isStackedNickname ? 'w-full h-8' : 'h-full self-stretch'}`}
           >
             {sending ? '...' : 'Send'}
           </button>
         </form>
       )}
-    </section>
+    </CardFrame>
   );
 }

webui/src/components/ChatTypingRow/index.jsx

@@ -5,7 +5,7 @@ import { ChatIdentity, chatRowClass } from '../ChatMessageRow/index.jsx';
 
 export default function ChatTypingRow({ message }) {
   return (
-    <div className={`${chatRowClass(message)} italic opacity-80 border-slate-600/40 bg-slate-900/40`}>
+    <div className={`${chatRowClass(message)} !flex-row items-center italic opacity-80 border-slate-600/40 bg-slate-900/40`}>
       <ChatIdentity message={message} />
       <span className="text-slate-300">typing...</span>
     </div>

webui/src/components/DriveDockAction/index.jsx

@@ -5,6 +5,7 @@ import { useMemo, useState } from 'react';
 import { useControlSystem } from '../../controls/index.js';
 import { useTelemetryFrame } from '../../context/TelemetryContext.jsx';
 import { formatKeyLabel } from '../../controls/keymapUtils.js';
+import { useManualDockAssist } from '../../features/manualDockAssist/useManualDockAssist.js';
 
 export function deriveDriveDockState(frame) {
   const sensors = frame?.sensors || {};
@@ -68,7 +69,7 @@ function DockModal({ instructions, onConfirm, onCancel, pending }) {
     <div className="fixed inset-0 z-40 flex items-center justify-center bg-black/70 p-1">
       <div className="surface w-full max-w-md space-y-0.5 border border-indigo-700 bg-indigo-950/90 p-1 text-slate-100 shadow-2xl">
         <div className="space-y-0.5">
-          <p className="text-lg font-semibold text-indigo-50">Dock Rover</p>
+          <p className="text-lg font-semibold text-indigo-50">Manual Docking Assist</p>
           <p className="text-sm text-slate-200">{instructions.summary}</p>
           <StepList steps={instructions.steps} tone="indigo" />
         </div>
@@ -86,7 +87,7 @@ function DockModal({ instructions, onConfirm, onCancel, pending }) {
             onClick={onConfirm}
             className="bg-indigo-600 px-0.5 py-1 font-semibold text-indigo-50 transition hover:bg-indigo-500 disabled:opacity-50"
           >
-            {pending ? 'Docking…' : 'Confirm Dock'}
+            {pending ? 'Starting…' : 'Enter Assist'}
           </button>
         </div>
       </div>
@@ -106,12 +107,14 @@ export default function DriveDockAction({
     state: { roverId, keymap },
     actions,
   } = useControlSystem();
+  const dockAssist = useManualDockAssist();
   const frame = useTelemetryFrame(roverId);
   const state = driveDockState ?? deriveDriveDockState(frame);
   const { driving, docked, charging, dockingInProgress } = state;
   const [pending, setPending] = useState(null);
   const [confirmOpen, setConfirmOpen] = useState(false);
   const [showModal, setShowModal] = useState(false);
+  const manualAssistActive = Boolean(dockAssist.active);
 
   const driveDisabled = !roverId || pending !== null;
   const dockDisabled = !roverId || pending !== null;
@@ -120,10 +123,13 @@ export default function DriveDockAction({
   const dockKeyLabel = formatKeyLabel(keymap?.dockMacro?.[0]);
 
   const dockInstructions = {
-    summary: 'You are about to trigger an automatic docking attempt! To have a successful dock:',
+    summary: 'Use assist mode to manually line up with the dock.',
-    steps: ['Line up the rover straight in front of the dock', 'Make sure the rover is about one foot or half a meter away from the dock', 'Press Confirm Dock to begin the docking process'],
+    steps: [
+      'Line up the center dot of your rover with the center of the dock',
+      'The UI will indicate when you are successfully docked',
+      'When good contact is made, the dock will stop flashing.',
+    ],
   };
-  const dockButtonCaption = 'Click this button to initate auto-dock.';
 
   const startDriveInstructions = {
     summary: 'You must enable driving mode before you can move the rover.',
@@ -131,13 +137,14 @@ export default function DriveDockAction({
   };
   const dockValue = docked ? 'Docked' : 'Undocked';
   const dockTone = docked ? 'good' : 'bad';
-  const chargeValue = charging ? 'Charging' : docked ? 'Charging in 5s' : '—';
+  const chargeValue = charging ? 'Charging' : docked ? 'Charging soon...' : '—';
   const chargeTone = charging ? 'good' : docked ? 'warn' : 'bad';
 
   const handleReturnToDrive = async () => {
     if (!roverId || pending) return;
     setPending('drive');
     try {
+      dockAssist.exitAssist();
       actions.setMode('drive');
       await actions.runMacro('drive-sequence');
     } catch (err) {
@@ -153,6 +160,7 @@ export default function DriveDockAction({
     setShowModal(false);
     setPending('drive');
     try {
+      dockAssist.exitAssist();
       actions.setMode('drive');
       await actions.runMacro('drive-sequence');
     } catch (err) {
@@ -166,8 +174,7 @@ export default function DriveDockAction({
     if (!roverId || pending) return;
     setPending('dock');
     try {
-      actions.setMode('dock');
+      dockAssist.enterAssist();
-      await actions.runMacro('seek-dock');
     } catch (err) {
       alert(err.message);
     } finally {
@@ -179,6 +186,10 @@ export default function DriveDockAction({
 
   const handleOpenDock = () => {
     if (dockDisabled) return;
+    if (manualAssistActive) {
+      dockAssist.exitAssist();
+      return;
+    }
     setShowModal(true);
     setConfirmOpen(true);
   };
@@ -188,7 +199,6 @@ export default function DriveDockAction({
   const ctaText = 'text-center';
   const ctaLayout = 'items-center justify-between';
   const compactLayout = 'items-center justify-center';
-  const ctaTextAndLayout = `${ctaText} ${ctaLayout}`;
   const ctaSize = isMobile ? 'text-sm font-semibold' : '';
   const emeraldCta =
     'border-emerald-300/70 bg-emerald-800 text-emerald-50 hover:bg-emerald-700 focus-visible:ring-emerald-300';
@@ -196,6 +206,8 @@ export default function DriveDockAction({
     'border-amber-300/70 bg-amber-900 text-amber-50 hover:bg-amber-800 focus-visible:ring-amber-300';
   const indigoCta =
     'border-indigo-300/70 bg-indigo-900 text-indigo-50 hover:bg-indigo-800 focus-visible:ring-indigo-300';
+  const cyanCta =
+    'border-cyan-300/70 bg-cyan-900 text-cyan-50 hover:bg-cyan-800 focus-visible:ring-cyan-300';
   const orangeCta =
     'border-amber-300/70 bg-amber-900 text-amber-50 hover:bg-amber-800 focus-visible:ring-amber-300';
   const forceExpanded = dockingInProgress;
@@ -243,8 +255,8 @@ export default function DriveDockAction({
 
   if (dockingInProgress) {
     const inProgressCopy = {
-      summary: 'If the rover is failing to dock, click to drive and try again.',
+      summary: 'The rover is currently attempting to dock itself due to being idle.',
-      steps: ['The rover should be slowly wiggling towards the dock', 'If it is obviously not working, press this button to enter driving mode and try again'],
+      steps: ['Click to return to driving mode.'],
     };
 
     return (
@@ -257,7 +269,7 @@ export default function DriveDockAction({
       >
         <div className="space-y-0.5 w-full">
           <div className="flex w-full flex-col items-center gap-0.25">
-            <span className="text-base font-semibold text-amber-50 md:text-lg">Docking in Progress</span>
+            <span className="text-base font-semibold text-amber-50 md:text-lg">Attempting to auto-dock...</span>
             {/* {!isMobile && expanded ? ( */}
             {expanded ? (
               <div className="flex flex-wrap items-center justify-center gap-0.5">
@@ -292,32 +304,31 @@ export default function DriveDockAction({
         className={
           isMobile
             ? `flex w-full ${baseCardClasses} ${compactHeight} ${ctaText} ${layoutClass} ${ctaSize} ${
-                compactDockedDriving ? orangeCta : indigoCta
+                manualAssistActive ? cyanCta : compactDockedDriving ? orangeCta : indigoCta
               }`
-            : `${baseCardClasses} ${filledHeight} ${ctaText} ${ctaLayout} ${ctaSize} ${indigoCta}`
+            : `${baseCardClasses} ${filledHeight} ${ctaText} ${ctaLayout} ${ctaSize} ${manualAssistActive ? cyanCta : indigoCta}`
         }
       >
         <div className="flex w-full flex-col items-center gap-0.25">
           <span className="text-base font-semibold text-indigo-50 md:text-lg">
-            {compactDockedDriving ? 'Docked!' : 'Dock and Charge'}
+            {compactDockedDriving ? 'Docked!' : manualAssistActive ? 'Exit Docking Assist' : 'Dock and charge'}
           </span>
           {!isMobile && expanded ? (
             <div className="flex flex-wrap items-center justify-center gap-0.5">
               {dockKeyLabel ? <KeyPill label={dockKeyLabel} /> : null}
-              <ActionPill label="Click to begin docking" tone="indigo" />
+              <ActionPill label={manualAssistActive ? 'Click to exit assist' : 'Click to enable assist'} tone="indigo" />
             </div>
           ) : null}
         </div>
         {!isMobile && expanded && (
           <>
-            <p className="text-sm text-indigo-50/90">{dockButtonCaption}</p>
+            <p className="text-sm text-indigo-50/90">
+              Get near a dock and press this button to enter docking assist mode.
+            </p>
             <div className="flex w-full flex-1 flex-col gap-0.5 self-stretch">
               <StatusRow label="Dock" value={dockValue} tone={dockTone} />
               <StatusRow label="Charge" value={chargeValue} tone={chargeTone} />
             </div>
-            <div className="text-xs text-indigo-100/80">
-              Line up straight, about 1 foot away, before docking.
-            </div>
           </>
         )}
       </button>

webui/src/components/DriverVideo/index.jsx

@@ -0,0 +1,63 @@
+import { useSessionSelector } from '../../context/SessionContext.jsx';
+import RoverMediaPlayer from '../RoverMediaPlayer/index.jsx';
+import { useControlSystem } from '../../controls/index.js';
+import { useDriverVideoModePolicy } from '../../hooks/useDriverVideoModePolicy.js';
+import TurnsOverlay from '../HudOverlays/TurnsOverlay/index.jsx';
+import HudOverlay from '../HudOverlays/HudOverlay/index.jsx';
+import ManualDockAssistOverlay from '../HudOverlays/ManualDockAssistOverlay/index.jsx';
+import RoverDescriptionOverlay from '../HudOverlays/RoverDescriptionOverlay/index.jsx';
+import OvercurrentOverlay from '../HudOverlays/OvercurrentOverlay/index.jsx';
+import LowBatteryOverlay from '../HudOverlays/LowBatteryOverlay/index.jsx';
+import DriverBottomStrip from '../HudOverlays/DriverBottomStrip/index.jsx';
+import HudChatInput from '../HudOverlays/HudChatInput/index.jsx';
+
+export default function DriverVideo({ layoutFormat = 'desktop' }) {
+  const roverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const videoMode = useDriverVideoModePolicy(roverId);
+  const {
+    state: { lastControlIntentAt },
+  } = useControlSystem();
+
+  if (!roverId) {
+    return (
+      <section className="panel">
+        <div className="panel-muted content-center text-center text-sm text-slate-400 aspect-[4/3]">
+          <p>You are not assigned to a rover.</p>
+          <p className="mt-0">
+            <a href="/spectate" className="text-blue-400 underline hover:text-blue-500">
+              Click here to visit the spectator page.
+            </a>
+          </p>
+        </div>
+      </section>
+    );
+  }
+
+  const mobileHud = layoutFormat !== 'desktop';
+  return (
+    <section className="panel">
+      <div className="flex flex-col gap-0.5">
+        <div className="relative w-full overflow-hidden bg-black aspect-[4/3]">
+          <RoverMediaPlayer roverId={roverId} videoMode={videoMode} />
+          <TurnsOverlay mobileHud={mobileHud} />
+          <RoverDescriptionOverlay
+            variant="default"
+            mobileHud={mobileHud}
+            controlIntentAt={lastControlIntentAt}
+          />
+          <HudOverlay
+            layoutFormat={layoutFormat}
+            variant="default"
+            mobileHud={mobileHud}
+            labelScale={1}
+          />
+          <ManualDockAssistOverlay mobileHud={mobileHud} />
+          <HudChatInput compact={mobileHud} />
+          <OvercurrentOverlay compact={mobileHud} />
+          <LowBatteryOverlay compact={mobileHud} />
+        </div>
+        <DriverBottomStrip mobileHud={mobileHud} />
+      </div>
+    </section>
+  );
+}

webui/src/components/DriverVideoPanel/index.jsx

@@ -1,155 +0,0 @@
-// Driver Video Panel
-// Purpose: Defines the Driver Video Panel module and the local helpers/components used in this file.
-// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
-import { useEffect, useMemo, useRef, useState } from 'react';
-import { useSessionSelector } from '../../context/SessionContext.jsx';
-import { useTelemetryFrame } from '../../context/TelemetryContext.jsx';
-import { useVideoRequests } from '../../hooks/useVideoRequests.js';
-import { useRoverSnapshots } from '../../hooks/useRoverSnapshots.js';
-import { useControlSystem } from '../../controls/index.js';
-import VideoTile from '../VideoTile/index.jsx';
-
-export default function DriverVideoPanel({layoutFormat = 'desktop'}) {
-  const mode = useSessionSelector((state) => state.session?.mode || null);
-  const roverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
-  const roster = useSessionSelector((state) => state.session?.roster ?? []);
-  const turnQueues = useSessionSelector((state) => state.session?.turnQueues ?? {});
-  const socketId = useSessionSelector((state) => state.session?.socketId || null);
-  const activeDrivers = useSessionSelector((state) => state.session?.activeDrivers ?? {});
-  const {
-    state: { song, lastControlIntentAt },
-    overcurrentLimiter,
-  } = useControlSystem();
-  const [now, setNow] = useState(() => Date.now());
-  const [turnCueVisible, setTurnCueVisible] = useState(false);
-  const [turnCueStartAt, setTurnCueStartAt] = useState(null);
-  const lastTurnRef = useRef({ active: false, roverId: null });
-  useEffect(() => {
-    if (mode !== 'turns') {
-      return undefined;
-    }
-    const timer = setInterval(() => setNow(Date.now()), 250);
-    return () => clearInterval(timer);
-  }, [mode]);
-  const rosterEntry =
-    roverId && roster ? roster.find((item) => String(item.id) === String(roverId)) : null;
-  const hasAudio = Boolean(rosterEntry?.media?.audioPublishUrl);
-  const turnInfo = roverId ? turnQueues?.[roverId] : null;
-  const activeDriverId = roverId ? activeDrivers?.[roverId] : null;
-  const isActiveDriver = Boolean(socketId && activeDriverId === socketId);
-  const nextDriverId = useMemo(() => {
-    const queue = turnInfo?.queue || [];
-    if (!queue.length || !turnInfo?.current || queue.length <= 1) return null;
-    const idx = queue.findIndex((id) => id === turnInfo.current);
-    if (idx === -1) {
-      return queue[0] || null;
-    }
-    return queue[(idx + 1) % queue.length] || null;
-  }, [turnInfo?.queue, turnInfo?.current]);
-  const isNextDriver = Boolean(socketId && nextDriverId === socketId);
-  const deadline = turnInfo?.deadline || null;
-  const idleDeadline = turnInfo?.idleDeadline || null;
-  const msUntilTurn = deadline ? deadline - now : null;
-  const msUntilIdleSkip = idleDeadline ? idleDeadline - now : null;
-  const isPreSwitchWindow =
-    mode === 'turns' && isNextDriver && msUntilTurn != null && msUntilTurn <= 5000 && msUntilTurn > 0;
-  const shouldShowVideo = mode !== 'turns' || isActiveDriver || isPreSwitchWindow;
-  const turnSeconds =
-    msUntilTurn != null && Number.isFinite(msUntilTurn) ? Math.max(0, Math.ceil(msUntilTurn / 1000)) : null;
-  const idleSkipSeconds =
-    msUntilIdleSkip != null && Number.isFinite(msUntilIdleSkip)
-      ? Math.max(0, Math.ceil(msUntilIdleSkip / 1000))
-      : null;
-  const turnTimerText = isActiveDriver
-    ? turnSeconds != null
-      ? `${turnSeconds}s left`
-      : null
-    : isNextDriver && turnSeconds != null
-    ? `Your turn in ${turnSeconds}s`
-    : null;
-  const entries = roverId
-    ? [
-        ...(shouldShowVideo ? [{ type: 'rover', id: roverId, key: roverId }] : []),
-        ...(hasAudio ? [{ type: 'rover', id: `${roverId}-audio`, key: `${roverId}-audio` }] : []),
-      ]
-    : [];
-  const sources = useVideoRequests(entries);
-  const info = roverId && shouldShowVideo ? sources[roverId] : null;
-  const audioInfo = roverId && hasAudio ? sources[`${roverId}-audio`] : null;
-  const snapshotFeeds = useRoverSnapshots(roverId ? [roverId] : [], {
-    enabled: Boolean(roverId),
-    version: mode,
-  });
-  const snapshotFeed = roverId ? snapshotFeeds[roverId] || null : null;
-  const frame = useTelemetryFrame(roverId);
-  const batteryRecord =
-    roverId && roster
-      ? roster.find((item) => String(item.id) === String(roverId))
-      : null;
-  const batteryConfig = batteryRecord?.battery ?? null;
-
-  const roverLabel = batteryRecord?.name || (roverId ? `Rover ${roverId}` : '');
-
-  useEffect(() => {
-    if (mode !== 'turns') {
-      setTurnCueVisible(false);
-      setTurnCueStartAt(null);
-      lastTurnRef.current = { active: false, roverId: null };
-      return;
-    }
-    const lastTurn = lastTurnRef.current;
-    const becameActive = isActiveDriver && !lastTurn.active;
-    const roverChanged = isActiveDriver && roverId && roverId !== lastTurn.roverId;
-    if (becameActive || roverChanged) {
-      setTurnCueVisible(true);
-      setTurnCueStartAt(Date.now());
-    } else if (!isActiveDriver && lastTurn.active) {
-      setTurnCueVisible(false);
-      setTurnCueStartAt(null);
-    }
-    lastTurnRef.current = { active: isActiveDriver, roverId };
-  }, [isActiveDriver, roverId, mode]);
-
-  useEffect(() => {
-    if (!turnCueVisible || !turnCueStartAt) return;
-    if (lastControlIntentAt > turnCueStartAt) {
-      setTurnCueVisible(false);
-    }
-  }, [lastControlIntentAt, turnCueStartAt, turnCueVisible]);
-
-  return (
-    <section className="panel">
-      {roverId ? (
-        <VideoTile
-          sessionInfo={info}
-          videoMode={shouldShowVideo ? 'whep' : 'snapshot'}
-          snapshotFeed={snapshotFeed}
-          audioSessionInfo={audioInfo}
-          label={roverLabel}
-          roverColor={batteryRecord?.color || null}
-          telemetryFrame={frame}
-          batteryConfig={batteryConfig}
-          layoutFormat={layoutFormat}
-          overcurrentLimiter={overcurrentLimiter}
-          songNote={song?.note}
-          qualityNotice={!shouldShowVideo ? 'Preview feed (low FPS) until your turn.' : null}
-          showTurnCue={turnCueVisible}
-          turnTimerText={turnTimerText}
-          turnSeconds={turnSeconds}
-          isActiveDriver={isActiveDriver}
-          idleSkipSeconds={idleSkipSeconds}
-        />
-      ) : (
-        <div className="panel-muted content-center text-center text-sm text-slate-400 aspect-[4/3]">
-          <p>You are not assigned to a rover.</p>
-          {/* colored button to visit the spectator page */}
-          <p className="mt-0">
-            <a href="/spectate" className="text-blue-400 underline hover:text-blue-500">
-              Click here to visit the spectator page.
-            </a>
-          </p>
-        </div>
-      )}
-    </section>
-  );
-}

webui/src/components/GlobalObjectiveBanner/index.jsx

@@ -8,11 +8,40 @@ const MOBILE_DISMISS_MS = 10000;
 const MAX_FONT_PX = 28;
 const MIN_FONT_PX = 14;
 
+function hexToRgb(hex) {
+  const raw = String(hex || '').trim();
+  const normalized = raw.startsWith('#') ? raw.slice(1) : raw;
+  if (!/^[0-9a-fA-F]{3}$|^[0-9a-fA-F]{6}$/.test(normalized)) return null;
+  const expanded =
+    normalized.length === 3
+      ? normalized
+          .split('')
+          .map((ch) => ch + ch)
+          .join('')
+      : normalized;
+  return {
+    r: Number.parseInt(expanded.slice(0, 2), 16),
+    g: Number.parseInt(expanded.slice(2, 4), 16),
+    b: Number.parseInt(expanded.slice(4, 6), 16),
+  };
+}
+
+function rgba(rgb, alpha) {
+  return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${alpha})`;
+}
+
 export default function GlobalObjectiveBanner({ layout = 'desktop', className = '', dismissable = true }) {
   const goalText = useSessionSelector((state) => {
     const text = state.session?.globalObjective?.text;
     return text ? String(text).trim() : '';
   });
+  const ownRoverColor = useSessionSelector((state) => {
+    const roverId = String(state.session?.assignment?.roverId || '').trim();
+    if (!roverId) return null;
+    const roster = Array.isArray(state.session?.roster) ? state.session.roster : [];
+    const rover = roster.find((entry) => String(entry?.id) === roverId);
+    return rover?.color || null;
+  });
   const isMobile = layout === 'mobile-portrait' || layout === 'mobile-landscape' || layout === 'mobile';
   const [visible, setVisible] = useState(false);
   const [fontSize, setFontSize] = useState(MAX_FONT_PX);
@@ -72,7 +101,7 @@ export default function GlobalObjectiveBanner({ layout = 'desktop', className =
   const containerClass = useMemo(
     () =>
       [
-        'panel-section flex w-full items-center justify-center',
+        'panel-section flex w-full items-center justify-center border border-neutral-500/60 shadow-[0_1px_0_rgba(255,255,255,0.05)_inset,0_10px_24px_rgba(0,0,0,0.28)]',
         isMobile ? 'rounded-none' : 'rounded',
         'px-1 py-1 text-center font-semibold tracking-tight',
         className,
@@ -81,6 +110,13 @@ export default function GlobalObjectiveBanner({ layout = 'desktop', className =
         .join(' '),
     [className, isMobile],
   );
+  const accentRgb = hexToRgb(ownRoverColor);
+  const frameStyle = accentRgb
+    ? {
+        borderColor: rgba(accentRgb, 0.35),
+        backgroundImage: `linear-gradient(90deg, rgba(23,23,23,0.96) 0%, rgba(38,38,38,0.94) 58%, ${rgba(accentRgb, 0.18)} 100%)`,
+      }
+    : undefined;
 
   if (!goalText || !visible) return null;
 
@@ -94,7 +130,7 @@ export default function GlobalObjectiveBanner({ layout = 'desktop', className =
     <div
       ref={containerRef}
       className={containerClass}
-      style={{ fontSize: `${fontSize}px`, lineHeight: 1.1 }}
+      style={{ ...(frameStyle || {}), fontSize: `${fontSize}px`, lineHeight: 1.1 }}
       {...dismissProps}
     >
       <span className="flex w-full items-stretch gap-0.5 whitespace-nowrap rounded-md">

webui/src/components/HomeAssistantControls/index.jsx

@@ -5,6 +5,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { useSessionActions, useSessionSelector } from '../../context/SessionContext.jsx';
 import { useControlSystem } from '../../controls/index.js';
 import { formatKeyLabel } from '../../controls/keymapUtils.js';
+import CardFrame from '../CardFrame/index.jsx';
 
 function StatusBadge({ label, tone = 'muted' }) {
   const styles =
@@ -255,32 +256,25 @@ export default function HomeAssistantControls() {
 
   if (!ha?.enabled) {
     return (
-      <section className="panel-section space-y-0.5 text-sm text-slate-400">
+      <CardFrame title="Room Controls" bodyClassName="space-y-0.5 text-sm text-slate-400">
-        <p className="text-slate-300">Room Controls</p>
         <p className="text-slate-500">Not configured on the server.</p>
-      </section>
+      </CardFrame>
     );
   }
 
   if (entities.length === 0) {
     return (
-      <section className="panel-section space-y-0.5 text-sm text-slate-400">
+      <CardFrame title="Room Controls" bodyClassName="space-y-0.5 text-sm text-slate-400">
-        <p className="text-slate-300">Room Controls</p>
         <p className="text-slate-500">No lights or switches configured.</p>
-      </section>
+      </CardFrame>
     );
   }
 
   const connected = Boolean(ha?.connected);
 
-  return (
+  const actions = (
-    <section className="panel-section space-y-0.5 text-base">
+    <>
-      <header className="flex items-center justify-between gap-0.5 text-sm text-slate-400">
+      <div className="flex items-center gap-0.5 text-[0.68rem] text-slate-400">
-        <div className="flex items-center gap-0.5">
-          <p>Room Controls</p>
-          <span className="text-xs text-slate-500">{entities.length}</span>
-          {controlsLocked ? <StatusBadge label={lockState === 'off' ? 'Locked Off' : 'Locked On'} tone="warn" /> : null}
-          <div className="flex items-center gap-0.5 text-xs text-slate-300 background-black">
         <span className="flex items-center gap-0.5">
           <span>On</span>
           {onKeyLabel ? <KeyPill label={onKeyLabel} /> : null}
@@ -290,9 +284,13 @@ export default function HomeAssistantControls() {
           {offKeyLabel ? <KeyPill label={offKeyLabel} /> : null}
         </span>
       </div>
-        </div>
+      {controlsLocked ? <StatusBadge label={lockState === 'off' ? 'Locked Off' : 'Locked On'} tone="warn" /> : null}
       <StatusBadge label={connected ? 'Connected' : 'Offline'} tone={connected ? 'success' : 'warn'} />
-      </header>
+    </>
+  );
+
+  return (
+    <CardFrame title="Room Controls" actions={actions} bodyClassName="space-y-0.5 text-base">
       {controlsLocked ? (
         <p className="rounded border border-amber-600/60 bg-amber-900/40 px-1 py-0.5 text-xs text-amber-100">
           {lockState === 'off'
@@ -313,11 +311,11 @@ export default function HomeAssistantControls() {
           />
         ))}
       </div>
-    </section>
+    </CardFrame>
   );
 }
 
 function KeyPill({ label }) {
   if (!label) return null;
-  return <span className="rounded border border-white/40 px-1 text-[0.7rem] text-white">{label}</span>;
+  return <span className="rounded border border-slate-600 px-1 text-[0.65rem] text-slate-300">{label}</span>;
 }

webui/src/components/HornControl/index.jsx

@@ -1,15 +1,16 @@
 // Horn Control
 // Purpose: Defines the Horn Control module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useSettingsNamespace } from '../../settings/index.js';
 import { HORN_SETTINGS_DEFAULTS } from '../../settings/namespaces.js';
+import { HORN_MAX_FREQUENCY } from '../../controls/constants.js';
 
 function clampFreq(value) {
   const num = Number(value);
   if (!Number.isFinite(num)) return 0;
   if (num <= 0) return 0;
-  return Math.min(5000, Math.round(num));
+  return Math.min(HORN_MAX_FREQUENCY, Math.round(num));
 }
 
 export default function HornControl({
@@ -31,6 +32,7 @@ export default function HornControl({
     HORN_SETTINGS_DEFAULTS,
   );
   const [waveform, setWaveform] = useState(hornSettings?.waveform || HORN_SETTINGS_DEFAULTS.waveform);
+  const settingsRootRef = useRef(null);
   const [freqs, setFreqs] = useState(() => {
     const base = Array.isArray(hornSettings?.freqs) ? hornSettings.freqs : HORN_SETTINGS_DEFAULTS.freqs;
     return [...base, 0, 0, 0, 0].slice(0, 4).map((f) => clampFreq(f));
@@ -99,6 +101,30 @@ export default function HornControl({
     [saveHornSettings],
   );
 
+  useEffect(() => {
+    const root = settingsRootRef.current;
+    if (!root) return undefined;
+
+    const handleWheel = (event) => {
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+      const input = target.closest('input[data-horn-freq-index]');
+      if (!input) return;
+      const index = Number(input.dataset.hornFreqIndex);
+      if (!Number.isInteger(index) || index < 0 || index >= freqs.length) return;
+      event.preventDefault();
+      event.stopPropagation();
+      const direction = event.deltaY < 0 ? 1 : -1;
+      const current = Number(freqs[index]) || 0;
+      updateFreq(index, current + direction * 25);
+    };
+
+    root.addEventListener('wheel', handleWheel, { passive: false, capture: true });
+    return () => {
+      root.removeEventListener('wheel', handleWheel, { capture: true });
+    };
+  }, [freqs, updateFreq]);
+
   const handlePointerDown = (event) => {
     if (disabled) return;
     const tag = event.target?.tagName?.toLowerCase();
@@ -176,7 +202,7 @@ export default function HornControl({
       </div>
       {showSettings ? (
         compactSettings ? (
-          <div className="relative z-10 flex flex-col gap-0.5 text-[0.65rem]">
+          <div ref={settingsRootRef} className="relative z-10 flex flex-col gap-0.5 text-[0.65rem]">
             <label className="flex items-center justify-between gap-0.5 text-slate-200">
               <span className="text-slate-300">Wave</span>
               <select
@@ -195,9 +221,10 @@ export default function HornControl({
                   <input
                     type="number"
                     min={0}
-                    max={5000}
+                    max={HORN_MAX_FREQUENCY}
                     step={1}
                     value={freq}
+                    data-horn-freq-index={idx}
                     onChange={(event) => updateFreq(idx, event.target.value)}
                     className="w-full rounded border border-slate-700 bg-slate-900 px-1 py-[2px] text-right text-[0.65rem] font-mono text-slate-100"
                   />
@@ -206,7 +233,10 @@ export default function HornControl({
             </div>
           </div>
         ) : (
-          <div className="relative z-10 grid grid-cols-[minmax(0,1.2fr)_repeat(4,minmax(0,1fr))] items-center gap-0.5 text-[0.65rem]">
+          <div
+            ref={settingsRootRef}
+            className="relative z-10 grid grid-cols-[minmax(0,1.2fr)_repeat(4,minmax(0,1fr))] items-center gap-0.5 text-[0.65rem]"
+          >
             <label className="flex items-center gap-0.5 text-slate-200">
               <span className="text-slate-300">Wave</span>
               <select
@@ -224,9 +254,10 @@ export default function HornControl({
                 <input
                   type="number"
                   min={0}
-                  max={5000}
+                  max={HORN_MAX_FREQUENCY}
                   step={1}
                   value={freq}
+                  data-horn-freq-index={idx}
                   onChange={(event) => updateFreq(idx, event.target.value)}
                   className="w-full rounded border border-slate-700 bg-slate-900 px-1 py-[2px] text-right text-[0.65rem] font-mono text-slate-100"
                 />

webui/src/components/HudOverlays/DriverBottomStrip/index.jsx

@@ -0,0 +1,31 @@
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useTelemetryFrame } from '../../../context/TelemetryContext.jsx';
+import LightBumpBars from '../LightBumpBars/index.jsx';
+import { buildBatteryVisual } from '../../../lib/battery.js';
+import BatteryBar from '../../BatteryBar/index.jsx';
+
+export default function DriverBottomStrip({ roverId = null, mobileHud = false }) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const frame = useTelemetryFrame(effectiveRoverId);
+  const sensors = frame?.sensors ?? null;
+  const batteryConfig = useSessionSelector((state) => {
+    if (!effectiveRoverId) return null;
+    const roster = state.session?.roster || [];
+    const rover = roster.find((entry) => String(entry.id) === String(effectiveRoverId));
+    return rover?.battery ?? null;
+  });
+  const batteryVisual = buildBatteryVisual({
+    charge: sensors?.batteryChargeMah ?? null,
+    config: batteryConfig,
+  });
+
+  return (
+    <div className="space-y-0.5">
+      <LightBumpBars roverId={effectiveRoverId} />
+      <div className="panel-section space-y-0.5 text-sm">
+        <BatteryBar visual={batteryVisual} compact={mobileHud} />
+      </div>
+    </div>
+  );
+}

webui/src/components/HudOverlays/HudChatInput/index.jsx

@@ -2,9 +2,9 @@
 // Purpose: Defines the Hud Chat Input module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import { memo, useMemo, useState } from 'react';
-import { useChat } from '../../context/ChatContext.jsx';
+import { useChat } from '../../../context/ChatContext.jsx';
-import { useSessionSelector } from '../../context/SessionContext.jsx';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
-import { useSettingsNamespace } from '../../settings/index.js';
+import { useSettingsNamespace } from '../../../settings/index.js';
 
 function HudChatInput({ compact = false }) {
   const role = useSessionSelector((state) => state.session?.role || null);

webui/src/components/HudOverlays/HudOverlay/HudMapOverlay.jsx

@@ -0,0 +1,38 @@
+import TopDownMap from '../../TopDownMap/index.jsx';
+
+export default function HudMapOverlay({
+  sensors,
+  show = true,
+  mapPosition = 'top-center',
+  layoutFormat = 'desktop',
+  mobileHud = false,
+}) {
+  if (!show) return null;
+  const portraitMobile = layoutFormat === 'mobile-portrait';
+  const mapSize = '240px';
+  const mapScale = portraitMobile ? 0.3 : mobileHud ? 0.33 : 0.7;
+  const mapOpacity = mobileHud ? 0.6 : 0.7;
+  const mapStyle = {
+    width: mapSize,
+    height: mapSize,
+    opacity: mapOpacity,
+    transform: mapPosition === 'top-center' ? `translateX(-50%) scale(${mapScale})` : `scale(${mapScale})`,
+    transformOrigin:
+      mapPosition === 'bottom-left'
+        ? 'bottom left'
+        : mapPosition === 'top-center'
+        ? 'top center'
+        : 'top right',
+    ...(mapPosition === 'bottom-left'
+      ? { left: '0.25rem', bottom: '0.25rem' }
+      : mapPosition === 'top-center'
+      ? { left: '50%', top: '0.25rem' }
+      : { right: '0.25rem', top: '0.25rem' }),
+  };
+
+  return (
+    <div className="pointer-events-none absolute rounded" style={mapStyle}>
+      <TopDownMap sensors={sensors} size={240} overlay />
+    </div>
+  );
+}

webui/src/components/HudOverlays/HudOverlay/RoverLabelOverlay.jsx

@@ -0,0 +1,50 @@
+import { roverNameChromeStyle } from '../../../lib/roverColor.js';
+
+export default function RoverLabelOverlay({
+  variant = 'default',
+  label,
+  roverColor = null,
+  driverLabel = null,
+  mobileHud = false,
+  labelScale = 1,
+}) {
+  const labelPadClass = mobileHud ? 'px-0.25 py-0.25' : 'px-0.5 py-0.5';
+  const labelTextClass = mobileHud ? 'text-[0.55rem]' : 'text-[0.8rem]';
+  const labelPosClass = 'bottom-0.5';
+  const labelWrapperStyle = {
+    transform: `translateX(-50%) scale(${labelScale})`,
+    transformOrigin: 'center bottom',
+  };
+
+  if (variant === 'spectator') {
+    return (
+      <div className={`absolute ${labelPosClass} left-1/2`} style={labelWrapperStyle}>
+        <div className={`flex items-center gap-0.5 bg-black/80 text-slate-100 ${labelPadClass} ${labelTextClass}`}>
+          <span
+            className="font-semibold text-white rounded px-1 py-[1px] border border-transparent"
+            style={roverNameChromeStyle(roverColor, 0.18)}
+          >
+            {label || 'No rover'}
+          </span>
+          {driverLabel ? <span className="text-slate-300">• {driverLabel}</span> : null}
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className={`absolute ${labelPosClass} left-1/2`} style={labelWrapperStyle}>
+      <div className={`flex gap-0.5 bg-black/80 text-slate-100 ${labelPadClass} ${labelTextClass}`}>
+        <span>
+          Rover:{' '}
+          <span
+            className="rounded px-1 py-[1px] border border-transparent"
+            style={roverNameChromeStyle(roverColor, 0.18)}
+          >
+            "{label || 'No rover'}"
+          </span>
+        </span>
+      </div>
+    </div>
+  );
+}

webui/src/components/HudOverlays/HudOverlay/SpectatorTelemetryOverlay.jsx

@@ -0,0 +1,52 @@
+export default function SpectatorTelemetryOverlay({ sensors, mobileHud = false }) {
+  const statusPadClass = mobileHud ? 'px-0.25 py-0.25' : 'px-1 py-0.5';
+  const telemetryPosClass = mobileHud ? 'left-0.5 top-1/2' : 'left-1 top-1/2';
+  const telemetryTextClass = mobileHud ? 'text-[0.45rem]' : 'text-[0.65rem]';
+  const telemetryEntries = [
+    ['Voltage', sensors?.voltageMv != null ? `${(sensors.voltageMv / 1000).toFixed(2)} V` : '--'],
+    ['Current', sensors?.currentMa != null ? `${sensors.currentMa} mA` : '--'],
+    ['Charge', sensors?.batteryChargeMah != null ? `${sensors.batteryChargeMah}` : '--'],
+    ['OI', sensors?.oiMode?.label || '--'],
+  ];
+  const docked = Boolean(sensors?.chargingSources?.homeBase);
+  const chargingLabel = sensors?.chargingState?.label || '';
+  const charging = Boolean(chargingLabel && chargingLabel.toLowerCase() !== 'not charging');
+  const oiLabel = sensors?.oiMode?.label || 'Unknown';
+  const oiNormalized = oiLabel.toLowerCase();
+  const oiTone =
+    oiNormalized === 'full'
+      ? 'bg-emerald-500/80 text-emerald-50'
+      : oiNormalized === 'safe'
+      ? 'bg-amber-400/80 text-amber-950'
+      : oiNormalized === 'passive'
+      ? 'bg-slate-700/80 text-slate-100'
+      : 'bg-slate-700/60 text-slate-200';
+  const dockTone = docked ? 'bg-emerald-500/80 text-emerald-50' : 'bg-slate-700/70 text-slate-200';
+  const chargingTone = charging
+    ? 'bg-emerald-500/80 text-emerald-50'
+    : docked
+    ? 'bg-amber-400/80 text-amber-950'
+    : 'bg-slate-700/70 text-slate-200';
+
+  return (
+    <div
+      className={`absolute ${telemetryPosClass} flex -translate-y-1/2 flex-col gap-0.5 bg-black/70 text-slate-100 ${telemetryTextClass} ${statusPadClass}`}
+    >
+      <div className="space-y-0.5 leading-tight">
+        <div className="flex flex-col gap-0.5 text-[0.75rem] font-semibold uppercase tracking-wide">
+          <span className={`rounded px-1.5 py-0.5 ${dockTone}`}>{docked ? 'Docked' : 'Undocked'}</span>
+          <span className={`rounded px-1.5 py-0.5 ${chargingTone}`}>
+            {charging ? 'Charging' : docked ? 'Not charging' : 'Not charging'}
+          </span>
+          <span className={`rounded px-1.5 py-0.5 ${oiTone}`}>OI: {oiLabel}</span>
+        </div>
+        {telemetryEntries.map(([labelText, value]) => (
+          <span key={labelText} className="flex items-center justify-between gap-0.5">
+            <span className="text-slate-400">{labelText}</span>
+            <span className="font-semibold text-white">{value}</span>
+          </span>
+        ))}
+      </div>
+    </div>
+  );
+}

webui/src/components/HudOverlays/HudOverlay/index.jsx

@@ -0,0 +1,110 @@
+// Hud Overlay
+// Purpose: Defines the Hud Overlay module and the local helpers/components used in this file.
+// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
+import React from 'react';
+import { useHudMapSetting } from '../../../hooks/useHudMapSetting.js';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useTelemetryFrame } from '../../../context/TelemetryContext.jsx';
+import RoverLabelOverlay from './RoverLabelOverlay.jsx';
+import SpectatorTelemetryOverlay from './SpectatorTelemetryOverlay.jsx';
+import HudMapOverlay from './HudMapOverlay.jsx';
+
+function HudOverlay({
+  roverId = null,
+  sensors,
+  label,
+  roverColor = null,
+  layoutFormat = 'desktop',
+  variant = 'default',
+  driverLabel = null,
+  showTopDown = undefined,
+  mobileHud = false,
+  mapPosition = null,
+  labelScale = 1,
+}) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const frame = useTelemetryFrame(effectiveRoverId);
+  const rosterInfo = useSessionSelector((state) => {
+    if (!effectiveRoverId) return { label: null, roverColor: null };
+    const roster = state.session?.roster || [];
+    const rover = roster.find((entry) => String(entry.id) === String(effectiveRoverId));
+    return {
+      label: rover?.name || null,
+      roverColor: rover?.color || null,
+    };
+  });
+  const derivedDriverLabel = useSessionSelector((state) => {
+    if (!effectiveRoverId || variant !== 'spectator') return null;
+    const activeId = state.session?.activeDrivers?.[effectiveRoverId] || null;
+    const users = state.session?.users || [];
+    const match = users.find((u) => String(u.socketId || '') === String(activeId || ''));
+    return match?.nickname || match?.name || null;
+  });
+  const resolvedSensors = sensors ?? frame?.sensors ?? null;
+  const resolvedLabel = label ?? rosterInfo.label ?? null;
+  const resolvedRoverColor = roverColor ?? rosterInfo.roverColor ?? null;
+  const resolvedDriverLabel = driverLabel ?? derivedDriverLabel;
+  const isMobile = mobileHud;
+  const [showHudMapDesktop] = useHudMapSetting();
+  const resolvedShowTopDown =
+    typeof showTopDown === 'boolean'
+      ? showTopDown
+      : variant === 'spectator'
+      ? true
+      : isMobile
+      ? true
+      : showHudMapDesktop;
+  const resolvedMapPosition =
+    mapPosition || (variant === 'spectator' ? 'top-center' : isMobile ? 'top-right' : 'top-center');
+
+  if (variant === 'none') {
+    return null;
+  }
+
+  if (variant === 'spectator') {
+    return (
+      <>
+        <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
+          <SpectatorTelemetryOverlay sensors={resolvedSensors} mobileHud={isMobile} />
+          <RoverLabelOverlay
+            variant="spectator"
+            label={resolvedLabel}
+            roverColor={resolvedRoverColor}
+            driverLabel={resolvedDriverLabel}
+            mobileHud={isMobile}
+            labelScale={labelScale}
+          />
+        </div>
+        <HudMapOverlay
+          sensors={resolvedSensors}
+          show={resolvedShowTopDown}
+          mapPosition={resolvedMapPosition}
+          layoutFormat={layoutFormat}
+          mobileHud={isMobile}
+        />
+      </>
+    );
+  }
+
+  return (
+    <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
+      <RoverLabelOverlay
+        variant="default"
+        label={resolvedLabel}
+        roverColor={resolvedRoverColor}
+        mobileHud={isMobile}
+        labelScale={labelScale}
+      />
+      <HudMapOverlay
+        sensors={resolvedSensors}
+        show={resolvedShowTopDown && variant !== 'spectator'}
+        mapPosition={resolvedMapPosition}
+        layoutFormat={layoutFormat}
+        mobileHud={isMobile}
+      />
+    </div>
+  );
+}
+
+export default React.memo(HudOverlay);

webui/src/components/HudOverlays/LightBumpBars/index.jsx

@@ -2,15 +2,21 @@
 // Purpose: Defines the Light Bump Bars module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import React from 'react';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useTelemetryFrame } from '../../../context/TelemetryContext.jsx';
 
-function LightBumpBars({ sensors }) {
+function LightBumpBars({ roverId = null, sensors }) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const frame = useTelemetryFrame(effectiveRoverId);
+  const resolvedSensors = sensors ?? frame?.sensors ?? null;
   const values = [
-    sensors?.lightBumpLeftSignal,
+    resolvedSensors?.lightBumpLeftSignal,
-    sensors?.lightBumpFrontLeftSignal,
+    resolvedSensors?.lightBumpFrontLeftSignal,
-    sensors?.lightBumpCenterLeftSignal,
+    resolvedSensors?.lightBumpCenterLeftSignal,
-    sensors?.lightBumpCenterRightSignal,
+    resolvedSensors?.lightBumpCenterRightSignal,
-    sensors?.lightBumpFrontRightSignal,
+    resolvedSensors?.lightBumpFrontRightSignal,
-    sensors?.lightBumpRightSignal,
+    resolvedSensors?.lightBumpRightSignal,
   ];
   const max = values.filter((v) => v != null).reduce((acc, v) => Math.max(acc, v), 1200);
   const eased = (v) => Math.pow(Math.max(0, Math.min(1, (v ?? 0) / max)), 0.35);

webui/src/components/HudOverlays/LowBatteryOverlay/index.jsx

@@ -0,0 +1,46 @@
+// Low Battery Overlay
+// Purpose: Defines the Low Battery Overlay module and the local helpers/components used in this file.
+// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
+import React from 'react';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useTelemetryFrame } from '../../../context/TelemetryContext.jsx';
+import { buildBatteryVisual } from '../../../lib/battery.js';
+
+function LowBatteryOverlay({ roverId = null, sensors, batteryConfig, compact = false }) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const frame = useTelemetryFrame(effectiveRoverId);
+  const rosterBatteryConfig = useSessionSelector((state) => {
+    if (!effectiveRoverId) return null;
+    const roster = state.session?.roster || [];
+    const rover = roster.find((entry) => String(entry.id) === String(effectiveRoverId));
+    return rover?.battery ?? null;
+  });
+  const resolvedSensors = sensors ?? frame?.sensors ?? null;
+  const resolvedBatteryConfig = batteryConfig ?? rosterBatteryConfig;
+  const battery = buildBatteryVisual({
+    charge: resolvedSensors?.batteryChargeMah ?? null,
+    config: resolvedBatteryConfig,
+  });
+  if (!battery?.available) return null;
+  if (!battery.warnActive && !battery.urgentActive) return null;
+
+  const message = battery.urgentActive
+    ? 'BATTERY VERY LOW, DOCK THE ROVER AND CHARGE IMMEDIATELY!!'
+    : 'Battery low! please dock and charge the rover soon.';
+
+  const containerClass = compact ? 'p-2 top-6' : 'p-4 top-10';
+  const textClass = compact ? 'text-sm' : 'text-2xl';
+
+  return (
+    <div
+      className={`pointer-events-none absolute flex items-center justify-center bg-amber-900/60 left-1/2 -translate-x-1/2 ${containerClass}`}
+    >
+      <div className={`text-center font-semibold text-white animate-pulse ${textClass}`}>
+        <div>{message}</div>
+      </div>
+    </div>
+  );
+}
+
+export default React.memo(LowBatteryOverlay);

webui/src/components/HudOverlays/ManualDockAssistOverlay/index.jsx

@@ -0,0 +1,72 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { useManualDockAssist } from '../../../features/manualDockAssist/useManualDockAssist.js';
+
+function ManualDockAssistOverlay({ mobileHud = false }) {
+  const { visible, statusLabel, statusTone, active, charging } = useManualDockAssist({ manageLifecycle: true });
+  const [popupMessage, setPopupMessage] = useState('');
+  const timerRef = useRef(null);
+  const prevActiveRef = useRef(active);
+
+  useEffect(() => {
+    const prevActive = prevActiveRef.current;
+    const enabledNow = active && !prevActive;
+    const autoDisabledOnCharge = !active && prevActive && charging;
+    if (enabledNow) {
+      setPopupMessage('Dock assist mode enabled');
+    } else if (autoDisabledOnCharge) {
+      setPopupMessage('Docking successful! Thank you!');
+    }
+    prevActiveRef.current = active;
+  }, [active, charging]);
+
+  useEffect(() => {
+    if (!popupMessage) return undefined;
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+    }
+    timerRef.current = setTimeout(() => {
+      setPopupMessage('');
+      timerRef.current = null;
+    }, 2500);
+    return () => {
+      if (timerRef.current) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+    };
+  }, [popupMessage]);
+
+  if (!visible) return null;
+  const toneClass =
+    statusTone === 'good'
+      ? 'border-emerald-200/90 bg-emerald-900/90 text-emerald-50'
+      : statusTone === 'warn'
+      ? 'border-amber-200/90 bg-amber-900/90 text-amber-50'
+      : 'border-cyan-200/90 bg-cyan-900/90 text-cyan-50';
+
+  return (
+    <div className="pointer-events-none absolute inset-0">
+      {popupMessage ? (
+        <div className="absolute inset-0 flex items-center justify-center">
+          <div
+            className={`rounded-xl border border-indigo-200/95 bg-black/95 px-4 py-2 text-center font-semibold text-indigo-50 shadow-2xl ${
+              mobileHud ? 'text-lg' : 'text-2xl'
+            }`}
+          >
+            {popupMessage}
+          </div>
+        </div>
+      ) : (
+        <div
+          className={`absolute right-2 top-1/2 -translate-y-1/2 rounded-lg border px-2 py-1 font-semibold shadow-lg ${toneClass} ${
+            mobileHud ? 'text-[0.65rem]' : 'text-xs'
+          }`}
+        >
+          {statusLabel}
+        </div>
+      )}
+    </div>
+  );
+}
+
+export default React.memo(ManualDockAssistOverlay);

webui/src/components/HudOverlays/OvercurrentOverlay/constants.js

@@ -0,0 +1,7 @@
+export const OVERCURRENT_LABELS = {
+  leftWheel: 'Left wheel',
+  rightWheel: 'Right wheel',
+  mainBrush: 'Main brush',
+  sideBrush: 'Side brush',
+  limiter: 'Overcurrent limit',
+};

webui/src/components/HudOverlays/OvercurrentOverlay/index.jsx

@@ -0,0 +1,67 @@
+// Overcurrent Overlay
+// Purpose: Defines the Overcurrent Overlay module and the local helpers/components used in this file.
+// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
+import React from 'react';
+import { useMemo } from 'react';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useTelemetryFrame } from '../../../context/TelemetryContext.jsx';
+import { useOvercurrentLimiter } from '../../../controls/index.js';
+import { OVERCURRENT_LABELS } from './constants.js';
+
+function OvercurrentOverlay({ roverId = null, sensors, overcurrentLimiter = null, compact = false }) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const frame = useTelemetryFrame(effectiveRoverId);
+  const internalLimiter = useOvercurrentLimiter(effectiveRoverId);
+  const resolvedSensors = sensors ?? frame?.sensors ?? null;
+  const resolvedOvercurrentLimiter = overcurrentLimiter ?? internalLimiter ?? null;
+  const wheelOvercurrents = resolvedSensors?.wheelOvercurrents || null;
+  const overcurrentMotors = useMemo(
+    () =>
+      wheelOvercurrents == null
+        ? []
+        : Object.entries(wheelOvercurrents)
+            .filter(([, active]) => Boolean(active))
+            .map(([key]) => key),
+    [wheelOvercurrents],
+  );
+  const limiterCaps = resolvedOvercurrentLimiter?.caps || null;
+  const limiterFill = useMemo(() => {
+    if (!limiterCaps) return null;
+    const driveCap = Number.isFinite(limiterCaps?.drive?.cap) ? limiterCaps.drive.cap : 1;
+    const auxCap = Number.isFinite(limiterCaps?.aux?.cap) ? limiterCaps.aux.cap : 1;
+    return Math.max(0, Math.min(1, 1 - Math.min(driveCap, auxCap)));
+  }, [limiterCaps]);
+  const limiterActive = Boolean(resolvedOvercurrentLimiter?.isActive);
+  const motors = useMemo(
+    () => (overcurrentMotors.length ? overcurrentMotors : limiterActive ? ['limiter'] : []),
+    [overcurrentMotors, limiterActive],
+  );
+  const fill = limiterFill ?? (overcurrentMotors.length ? 1 : 0);
+
+  if (!motors?.length) return null;
+  const safeLabels = motors.map((name) => OVERCURRENT_LABELS[name] || name);
+  const containerClass = compact ? 'w-[12rem] h-[3.5rem]' : 'w-[20rem] h-[7rem]';
+  const padClass = compact ? 'px-2 py-1' : 'px-4 py-2';
+  const textClass = compact ? 'text-lg' : 'text-4xl';
+  const subTextClass = compact ? 'text-xs' : 'text-xl';
+  const safeFill = Math.max(0, Math.min(1, fill));
+  const fillWidth = `${Math.round(safeFill * 100)}%`;
+  return (
+    <div
+      className={`pointer-events-none absolute flex items-center justify-center bg-red-900/50 top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 ${containerClass}`}
+    >
+      <div className="relative h-full w-full">
+        <div className="absolute inset-0 overflow-hidden">
+          <div className="h-full bg-red-700/60" style={{ width: fillWidth }} />
+        </div>
+        <div className={`relative z-10 flex h-full w-full flex-col items-center justify-center text-center font-semibold text-white animate-pulse ${textClass} ${padClass}`}>
+          <div>OVERCURRENT</div>
+          <div className={`mt-0 font-medium text-white ${subTextClass}`}>{safeLabels.join(', ')}</div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export default React.memo(OvercurrentOverlay);

webui/src/components/HudOverlays/RoverDescriptionOverlay/index.jsx

@@ -0,0 +1,100 @@
+import { useEffect, useRef, useState } from 'react';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+
+const DISMISS_AFTER_INPUT_MS = 5000;
+const LARGE_FADE_MS = 700;
+
+export default function RoverDescriptionOverlay({
+  roverId = null,
+  description,
+  variant = 'default',
+  mobileHud = false,
+  displayKey = '',
+  controlIntentAt,
+}) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const rosterDescription = useSessionSelector((state) => {
+    if (!effectiveRoverId) return null;
+    const roster = state.session?.roster || [];
+    const rover = roster.find((entry) => String(entry.id) === String(effectiveRoverId));
+    return rover?.description || null;
+  });
+  const resolvedDescription = description ?? rosterDescription;
+  const resolvedControlIntentAt =
+    typeof controlIntentAt === 'number' ? controlIntentAt : 0;
+  const resolvedDisplayKey =
+    displayKey || `${effectiveRoverId || ''}::${resolvedDescription || ''}`;
+  const [largeVisible, setLargeVisible] = useState(false);
+  const [largeFading, setLargeFading] = useState(false);
+  const fadeTimerRef = useRef(null);
+  const hideTimerRef = useRef(null);
+
+  useEffect(
+    () => () => {
+      clearTimeout(fadeTimerRef.current);
+      clearTimeout(hideTimerRef.current);
+    },
+    [],
+  );
+
+  useEffect(() => {
+    if (variant !== 'default' || !resolvedDescription) {
+      setLargeVisible(false);
+      setLargeFading(false);
+      clearTimeout(fadeTimerRef.current);
+      clearTimeout(hideTimerRef.current);
+      return undefined;
+    }
+    clearTimeout(fadeTimerRef.current);
+    clearTimeout(hideTimerRef.current);
+    setLargeVisible(true);
+    setLargeFading(false);
+    return undefined;
+  }, [resolvedDescription, resolvedDisplayKey, variant]);
+
+  useEffect(() => {
+    if (variant !== 'default' || !resolvedDescription || !largeVisible || largeFading) return;
+    const nextIntent = Number(resolvedControlIntentAt) || 0;
+    if (nextIntent <= 0) return;
+    if (fadeTimerRef.current || hideTimerRef.current) return;
+    fadeTimerRef.current = setTimeout(() => {
+      setLargeFading(true);
+      fadeTimerRef.current = null;
+    }, DISMISS_AFTER_INPUT_MS);
+    hideTimerRef.current = setTimeout(() => {
+      setLargeVisible(false);
+      hideTimerRef.current = null;
+    }, DISMISS_AFTER_INPUT_MS + LARGE_FADE_MS);
+  }, [resolvedControlIntentAt, resolvedDescription, largeFading, largeVisible, variant]);
+
+  if (!resolvedDescription) return null;
+
+  if (variant === 'spectator') {
+    return (
+      <div className="pointer-events-none absolute inset-x-0 top-1 z-50 flex justify-center">
+        <div className="surface max-w-[92%] border border-slate-600/80 px-1 py-0.5 text-center text-[0.62rem] leading-tight text-slate-100 shadow-lg">
+          {resolvedDescription}
+        </div>
+      </div>
+    );
+  }
+
+  if (variant !== 'default' || !largeVisible) return null;
+
+  return (
+    <div className="pointer-events-none absolute inset-0 z-50 flex items-center justify-center">
+      <div
+        className={`surface max-w-[94%] border border-slate-400 bg-neutral-900 px-2 py-1 text-center font-semibold text-slate-100 shadow-xl transition-opacity duration-700 ${
+          largeFading ? 'opacity-0' : 'opacity-100'
+        } ${mobileHud ? 'text-[1rem] leading-tight' : 'text-[1.5rem] leading-tight'}`}
+      >
+        <p>Just so you know, this rover</p>
+        <p>{resolvedDescription}</p>
+        <p className={`${mobileHud ? 'text-[0.58rem]' : 'text-[0.72rem]'} mt-0.5 font-normal text-slate-300`}>
+          This fades 5 seconds after your first control input.
+        </p>
+      </div>
+    </div>
+  );
+}

webui/src/components/HudOverlays/TurnsOverlay/index.jsx

@@ -0,0 +1,215 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useControlSystem } from '../../../controls/index.js';
+import SocialButton from '../../SocialButton/index.jsx';
+
+function TurnsOverlay({
+  roverId = null,
+  mobileHud = false,
+}) {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
+  const effectiveRoverId = roverId ?? assignedRoverId;
+  const mode = useSessionSelector((state) => state.session?.mode || null);
+  const roster = useSessionSelector((state) => state.session?.roster ?? []);
+  const users = useSessionSelector((state) => state.session?.users ?? []);
+  const turnQueues = useSessionSelector((state) => state.session?.turnQueues ?? {});
+  const socketId = useSessionSelector((state) => state.session?.socketId || null);
+  const activeDrivers = useSessionSelector((state) => state.session?.activeDrivers ?? {});
+  const {
+    state: { lastControlIntentAt },
+  } = useControlSystem();
+  const [now, setNow] = useState(() => Date.now());
+  const [showTurnCue, setShowTurnCue] = useState(false);
+  const [turnCueStartAt, setTurnCueStartAt] = useState(null);
+  const [noticeFlashActive, setNoticeFlashActive] = useState(false);
+  const [notTurnFlashAt, setNotTurnFlashAt] = useState(0);
+  const lastTurnRef = useRef({ initialized: false, roverId: null, activeDriverId: null });
+  const lastIntentRef = useRef(lastControlIntentAt || 0);
+  const timerTextClass = mobileHud ? 'text-[0.5rem]' : 'text-[0.7rem]';
+  const timerPadClass = mobileHud ? 'px-0.5 py-0.25' : 'px-1 py-0.5';
+  const titleClass = mobileHud ? 'text-3xl' : 'text-5xl';
+  const subClass = mobileHud ? 'text-xs' : 'text-sm';
+  const cueTimerClass = mobileHud ? 'text-[0.55rem]' : 'text-[0.75rem]';
+  const cuePadClass = mobileHud ? 'px-4 py-3' : 'px-6 py-4';
+  const turnInfo = effectiveRoverId ? turnQueues?.[effectiveRoverId] : null;
+  const activeDriverId = effectiveRoverId ? activeDrivers?.[effectiveRoverId] : null;
+  const isActiveDriver = Boolean(socketId && activeDriverId === socketId);
+  const nextDriverId = useMemo(() => {
+    const queue = turnInfo?.queue || [];
+    if (!queue.length || !turnInfo?.current || queue.length <= 1) return null;
+    const idx = queue.findIndex((id) => id === turnInfo.current);
+    if (idx === -1) return queue[0] || null;
+    return queue[(idx + 1) % queue.length] || null;
+  }, [turnInfo?.queue, turnInfo?.current]);
+  const isNextDriver = Boolean(socketId && nextDriverId === socketId);
+  const deadline = turnInfo?.deadline || null;
+  const idleDeadline = turnInfo?.idleDeadline || null;
+  const msUntilTurn = deadline ? deadline - now : null;
+  const msUntilIdleSkip = idleDeadline ? idleDeadline - now : null;
+  const isTurnsMode = mode === 'turns';
+  const totalRovers = roster.length;
+  const totalDrivers = useMemo(() => {
+    const unique = new Set();
+    users.forEach((entry) => {
+      const role = String(entry?.role || '');
+      if (role === 'spectator') return;
+      const turnRoverId = String(entry?.roverId || '').trim();
+      const turnSocketId = String(entry?.socketId || '').trim();
+      if (!turnRoverId || !turnSocketId) return;
+      unique.add(turnSocketId);
+    });
+    return unique.size;
+  }, [users]);
+  const shouldUsePreviewByLoad = isTurnsMode && totalDrivers > totalRovers;
+  const isPreSwitchWindow =
+    isTurnsMode && isNextDriver && msUntilTurn != null && msUntilTurn <= 5000 && msUntilTurn > 0;
+  const showNotTurnNotice = isTurnsMode && !isActiveDriver;
+  const showPreviewReason = showNotTurnNotice && !isPreSwitchWindow && shouldUsePreviewByLoad;
+  const turnSeconds =
+    msUntilTurn != null && Number.isFinite(msUntilTurn) ? Math.max(0, Math.ceil(msUntilTurn / 1000)) : null;
+  const idleSkipSeconds =
+    msUntilIdleSkip != null && Number.isFinite(msUntilIdleSkip)
+      ? Math.max(0, Math.ceil(msUntilIdleSkip / 1000))
+      : null;
+  const turnTimerText = useMemo(() => {
+    if (!isTurnsMode || !isActiveDriver) return null;
+    return turnSeconds != null ? `${turnSeconds}s left` : 'Your turn';
+  }, [isTurnsMode, isActiveDriver, turnSeconds]);
+  const notTurnCountdownText = useMemo(() => {
+    if (!showNotTurnNotice || !isNextDriver || turnSeconds == null) return null;
+    return `${turnSeconds} seconds until your turn.`;
+  }, [showNotTurnNotice, isNextDriver, turnSeconds]);
+  const showCountdown = isActiveDriver && typeof idleSkipSeconds === 'number';
+  const turnTimerFlashActive = noticeFlashActive;
+
+  useEffect(() => {
+    if (mode !== 'turns') return undefined;
+    const timer = setInterval(() => setNow(Date.now()), 250);
+    return () => clearInterval(timer);
+  }, [mode]);
+
+  useEffect(() => {
+    if (mode !== 'turns') {
+      setShowTurnCue(false);
+      setTurnCueStartAt(null);
+      lastTurnRef.current = { initialized: false, roverId: null, activeDriverId: null };
+      return;
+    }
+    const lastTurn = lastTurnRef.current;
+    const nextActiveDriverId = activeDriverId || null;
+    if (!socketId || !effectiveRoverId) {
+      setShowTurnCue(false);
+      setTurnCueStartAt(null);
+      lastTurnRef.current = { initialized: false, roverId: null, activeDriverId: null };
+      return;
+    }
+    if (!lastTurn.initialized || lastTurn.roverId !== effectiveRoverId) {
+      lastTurnRef.current = { initialized: true, roverId: effectiveRoverId, activeDriverId: nextActiveDriverId };
+      return;
+    }
+    const becameActive =
+      Boolean(lastTurn.activeDriverId) &&
+      lastTurn.activeDriverId !== socketId &&
+      nextActiveDriverId === socketId;
+    if (becameActive) {
+      setShowTurnCue(true);
+      setTurnCueStartAt(Date.now());
+    } else if (nextActiveDriverId !== socketId && showTurnCue) {
+      setShowTurnCue(false);
+      setTurnCueStartAt(null);
+    }
+    lastTurnRef.current = { initialized: true, roverId: effectiveRoverId, activeDriverId: nextActiveDriverId };
+  }, [activeDriverId, mode, effectiveRoverId, socketId, showTurnCue]);
+
+  useEffect(() => {
+    if (!showTurnCue || !turnCueStartAt) return;
+    if (lastControlIntentAt > turnCueStartAt) {
+      setShowTurnCue(false);
+    }
+  }, [lastControlIntentAt, showTurnCue, turnCueStartAt]);
+
+  useEffect(() => {
+    const lastIntent = Number(lastIntentRef.current) || 0;
+    const nextIntent = Number(lastControlIntentAt) || 0;
+    if (nextIntent > lastIntent && showNotTurnNotice) {
+      setNotTurnFlashAt(Date.now());
+    }
+    lastIntentRef.current = nextIntent;
+  }, [lastControlIntentAt, showNotTurnNotice]);
+
+  useEffect(() => {
+    if (!showNotTurnNotice || !notTurnFlashAt) return undefined;
+    setNoticeFlashActive(true);
+    const timer = setTimeout(() => setNoticeFlashActive(false), 650);
+    return () => clearTimeout(timer);
+  }, [showNotTurnNotice, notTurnFlashAt]);
+
+  return (
+    <>
+      {showTurnCue ? (
+        <div className="pointer-events-none absolute inset-0 z-30 flex items-center justify-center bg-black/55">
+          <div
+            className={`flex flex-col items-center gap-0.5 rounded border border-amber-300/80 bg-black/70 ${cuePadClass}`}
+          >
+            <div className={`font-semibold text-amber-200 ${titleClass}`}>IT IS YOUR TURN!</div>
+            <div className={`text-amber-200/80 ${subClass}`}>Start driving!</div>
+            {showCountdown ? (
+              <div className={`text-red-100/90 ${cueTimerClass}`}>
+                Idle skip in {idleSkipSeconds}s
+              </div>
+            ) : null}
+          </div>
+        </div>
+      ) : null}
+
+      {turnTimerText ? (
+        <div
+          className={`pointer-events-none absolute bottom-1 left-1 rounded border ${
+            turnTimerFlashActive
+              ? 'border-red-300/90 bg-red-900/80 text-red-100'
+              : 'border-amber-300/80 bg-black/75 text-amber-200'
+          } ${timerPadClass} ${timerTextClass}`}
+        >
+          {turnTimerText}
+        </div>
+      ) : null}
+
+      {showNotTurnNotice ? (
+        <div className="pointer-events-none absolute bottom-1 left-1 z-40">
+          <div
+            className={`w-fit rounded border ${
+              noticeFlashActive
+                ? 'border-red-300/90 bg-red-900/80 text-red-100'
+                : 'border-amber-300/80 bg-black/75 text-amber-200'
+            } ${mobileHud ? 'px-2 py-1 text-[0.6rem]' : 'px-3 py-1.5 text-sm'}`}
+          >
+            <div
+              className={
+                noticeFlashActive
+                  ? 'text-[0.82rem] font-semibold text-red-50'
+                  : 'text-[0.82rem] font-semibold text-white'
+              }
+            >
+              Not your turn to drive!
+            </div>
+            {notTurnCountdownText ? (
+              <div className={noticeFlashActive ? 'text-red-100/95' : 'text-amber-100'}>
+                {notTurnCountdownText}
+              </div>
+            ) : null}
+            {showPreviewReason ? (
+              <div className={noticeFlashActive ? 'text-red-100/90' : 'text-amber-200/85'}>
+                Video switched to preview mode to save bandwidth.
+              </div>
+            ) : null}
+            <div className="pointer-events-auto mt-0.5">
+              <SocialButton id="discord" label="Join our Discord while you wait!" layout='inline'/>
+            </div>
+          </div>
+        </div>
+      ) : null}
+    </>
+  );
+}
+
+export default React.memo(TurnsOverlay);

webui/src/components/HudOverlays/VerticalBatteryOverlay/index.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import { useSessionSelector } from '../../../context/SessionContext.jsx';
+import { useTelemetryFrame } from '../../../context/TelemetryContext.jsx';
+import { buildBatteryVisual } from '../../../lib/battery.js';
+import BatteryBar from '../../BatteryBar/index.jsx';
+
+function VerticalBatteryOverlay({ show = false, roverId = null, sensors, batteryConfig, mobileHud = false }) {
+  const frame = useTelemetryFrame(roverId);
+  const rosterBatteryConfig = useSessionSelector((state) => {
+    if (!roverId) return null;
+    const roster = state.session?.roster || [];
+    const rover = roster.find((entry) => String(entry.id) === String(roverId));
+    return rover?.battery ?? null;
+  });
+  const resolvedSensors = sensors ?? frame?.sensors ?? null;
+  const resolvedBatteryConfig = batteryConfig ?? rosterBatteryConfig;
+  const batteryVisual = buildBatteryVisual({
+    charge: resolvedSensors?.batteryChargeMah ?? null,
+    config: resolvedBatteryConfig,
+  });
+  if (!show || !batteryVisual?.available) return null;
+
+  return (
+    <div className="pointer-events-none absolute right-1 top-1/2 flex h-[70%] -translate-y-1/2 flex-col items-center justify-center rounded bg-black/60 px-0.5 pb-1 pt-1">
+      <BatteryBar
+        visual={batteryVisual}
+        orientation="vertical"
+        variant="inline"
+        compact={mobileHud}
+        className="h-full w-4"
+      />
+    </div>
+  );
+}
+
+export default React.memo(VerticalBatteryOverlay);

webui/src/components/LogPanel/index.jsx

@@ -3,16 +3,13 @@
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import { useSessionSelector } from '../../context/SessionContext.jsx';
 import { useMemo } from 'react';
+import CardFrame from '../CardFrame/index.jsx';
 
 export default function LogPanel() {
   const logs = useSessionSelector((state) => state.logs);
   const rendered = useMemo(() => logs.slice().reverse(), [logs]);
   return (
-    <div className="panel-section space-y-0.5 text-base">
+    <CardFrame title="Server logs" bodyClassName="space-y-0.5 text-base">
-      <div className="flex items-center justify-between text-sm text-slate-400">
-        <span>Server logs</span>
-        <span>{logs.length}</span>
-      </div>
       <div className="surface h-64 overflow-y-auto font-mono text-xs">
         {logs.length === 0 ? (
           <p>No logs yet.</p>
@@ -27,6 +24,6 @@ export default function LogPanel() {
           ))
         )}
       </div>
-    </div>
+    </CardFrame>
   );
 }

webui/src/components/MobileControls/MobileControlsContent.jsx

@@ -18,6 +18,7 @@ import {
   AUX_ALL_FORWARD,
   AUX_ALL_BACKWARD,
 } from './constants.js';
+import { useManualDockAssist } from '../../features/manualDockAssist/useManualDockAssist.js';
 
 function MobileJoystickPanel({ layout }) {
   const {
@@ -99,6 +100,7 @@ function MobileActionsColumnContent({ layout }) {
     pipeline,
     actions: { setServoAngle, setNightVision, setAuxMotors, startHorn, stopHorn },
   } = useControlSystem();
+  const dockAssist = useManualDockAssist();
   const disabled = !roverId;
   const activeRef = useRef(null);
   const cameraConfig = camera?.config;
@@ -115,6 +117,7 @@ function MobileActionsColumnContent({ layout }) {
       : typeof cameraConfig?.homeAngle === 'number'
       ? cameraConfig.homeAngle
       : (cameraMin + cameraMax) / 2;
+  const cameraDisabled = Boolean(disabled || dockAssist.cameraLocked);
 
   const handleNightVisionToggle = useCallback(
     (nextOn) => {
@@ -174,6 +177,7 @@ function MobileActionsColumnContent({ layout }) {
               min={cameraMin}
               max={cameraMax}
               step={0.5}
+              disabled={cameraDisabled}
               onChange={setServoAngle}
               orientation="vertical"
               label="Camera Tilt"

webui/src/components/ModeGateOverlay/index.jsx

@@ -6,7 +6,6 @@ import AuthPanel from '../AuthPanel/index.jsx';
 import { useSessionSelector } from '../../context/SessionContext.jsx';
 import SocialButton from '../SocialButton/index.jsx';
 import ChatPanel from '../ChatPanel/index.jsx';
-import NicknameForm from '../NicknameForm/index.jsx';
 
 const PRIVILEGED_ROLES = new Set(['admin', 'lockdown', 'lockdown-admin']);
 const LOCKDOWN_ROLES = new Set(['lockdown', 'lockdown-admin']);
@@ -33,14 +32,6 @@ export default function ModeGateOverlay() {
   const reason = useSessionSelector((state) => state.session?.adminReason?.text || '');
   const reasonUpdatedAt = useSessionSelector((state) => state.session?.adminReason?.updatedAt || null);
   const timezone = useSessionSelector((state) => state.session?.timezone || 'UTC');
-  const discordUrl = useSessionSelector((state) => {
-    const socials = state.session?.socials || [];
-    const fromSocials = socials.find((entry) => {
-      const key = String(entry?.id || entry?.label || '').toLowerCase();
-      return key === 'discord';
-    })?.url;
-    return fromSocials || state.session?.discord?.invite || null;
-  });
   const restricted = RESTRICTED_MODES.has(mode);
   const privileged = mode === 'lockdown' ? LOCKDOWN_ROLES.has(role) : PRIVILEGED_ROLES.has(role);
   const [now, setNow] = useState(() => new Date());
@@ -92,17 +83,12 @@ export default function ModeGateOverlay() {
           <AuthPanel />
         </div>
         <div className="w-full justify-center items-center">
-          <SocialButton
+          <SocialButton id="discord" label="Join our Discord server for updates!"/>
-            id="discord"
-            label="Join our Discord server for updates!"
-            url={discordUrl}
-          />
         </div>
         You can still use the chat while the server is locked:
         {/* set max height of this box */}
         <div className='max-h-80 overflow-y-auto'>
-          <ChatPanel />
+          <ChatPanel nicknameLayout="stacked" />
-          <NicknameForm />
         </div>
         
         {/* <p className="text-xs text-slate-500">

webui/src/components/OverseerPreferencePanel/index.jsx

@@ -0,0 +1,50 @@
+import { useSessionActions, useSessionSelector } from '../../context/SessionContext.jsx';
+import { useSettingsNamespace } from '../../settings/index.js';
+import CardFrame from '../CardFrame/index.jsx';
+
+export default function OverseerPreferencePanel() {
+  const { identifySession } = useSessionActions();
+  const vote = useSessionSelector((state) => state.session?.overseerVote || null);
+  const { value: profile } = useSettingsNamespace('profile', { nickname: '' });
+  const { value: identity } = useSettingsNamespace('identity', { cookieUserId: '' });
+  const { value, save } = useSettingsNamespace('overseerPreference', { enabled: false });
+  const enabled = Boolean(value?.enabled);
+  const running = Boolean(vote?.running);
+
+  const onToggle = async (event) => {
+    const next = Boolean(event?.target?.checked);
+    await save((current) => ({ ...(current || {}), enabled: next }));
+    await identifySession({
+      cookieUserId: String(identity?.cookieUserId || '').trim(),
+      nickname: String(profile?.nickname || '').trim(),
+      overseerEnabled: next,
+    });
+  };
+
+  return (
+    <CardFrame title="Overseer vote" bodyClassName="space-y-0.5 text-center text-xs text-slate-200">
+      <label
+        className={`flex items-center justify-center gap-1.5 rounded px-1 py-0.5 ${
+          enabled ? 'bg-emerald-600/80 text-emerald-50' : 'bg-slate-600/70 text-slate-100'
+        }`}
+      >
+        <input type="checkbox" checked={enabled} onChange={onToggle} />
+        <span>Your vote: {enabled ? 'Yes' : 'No'}</span>
+      </label>
+      <span className="text-xs">Enable a local LLM in chat</span>
+
+      <div className="mt-0.5 text-slate-400">
+        Yes!: {Number(vote?.yesCount || 0)}, No...: {Number(vote?.noCount || 0)}
+      </div>
+      <div className="mt-0.5 flex justify-center">
+        <span
+          className={`inline-flex items-center rounded px-1.5 py-0.5 text-[0.7rem] font-medium ${
+            running ? 'bg-emerald-600/80 text-emerald-50' : 'bg-slate-600/70 text-slate-100'
+          }`}
+        >
+          {running ? 'Running!' : 'Stopped by vote.'}
+        </span>
+      </div>
+    </CardFrame>
+  );
+}

webui/src/components/QuickstartOverlay/index.jsx

@@ -4,7 +4,6 @@ import { formatKeyLabel } from '../../controls/keymapUtils.js';
 import NicknameForm from '../NicknameForm/index.jsx';
 import SocialButton from '../SocialButton/index.jsx';
 import KeyPill from '../vip/VipAudioUploadCard/KeyPill.jsx';
-import { useSessionSelector } from '../../context/SessionContext.jsx';
 
 function ControlRow({ label, keyLabel }) {
   return (
@@ -30,7 +29,7 @@ function DesktopQuickstart({ keymap }) {
           <ControlRow label="Move slower" keyLabel={formatKeyLabel(keymap?.slowModifier?.[0])} />
         </div>
       </div>
-      <p className="text-sm text-slate-200">3. When done, please dock your rover! Line up with the dock and press "Dock and Charge".</p>
+      <p className="text-sm text-slate-200">3. When done, enter "Docking Assist" and line up the front sensor with the dock sensor.</p>
     </div>
   );
 }
@@ -41,7 +40,7 @@ function MobileQuickstart() {
       <p>1. Press "Start Driving" put your rover into driving mode.</p>
       <p>2. Touch and hold in Joystick area to move.</p>
       <p>3. Use the other column for motor, horn, and camera controls.</p>
-      <p>4. When done, please dock your rover! Line up with the dock and press "Dock and Charge".</p>
+      <p>4. When done, enter "Docking Assist" and line up the front sensor with the dock sensor.</p>
     </div>
   );
 }
@@ -56,15 +55,6 @@ export default function QuickstartOverlay({
 }) {
   const { state } = useControlSystem();
   const isDesktop = layout === 'desktop';
-  const discordUrl = useSessionSelector((sessionState) => {
-    const socials = sessionState.session?.socials || [];
-    const entry = socials.find((item) => {
-      const key = String(item?.id || item?.label || '').toLowerCase();
-      return key === 'discord';
-    });
-    return entry?.url || sessionState.session?.discord?.invite || null;
-  });
-
   const keymap = useMemo(() => state?.keymap || {}, [state?.keymap]);
 
   if (!visible) return null;
@@ -98,7 +88,7 @@ export default function QuickstartOverlay({
             <div className="surface p-0.5">
               <p className="text-xl font-semibold text-slate-200">Join our Discord server!</p>
               <p className="text-sm font-semibold text-slate-200">We have an active and welcoming community :3</p>
-              <SocialButton id="discord" label="Join Discord" url={discordUrl} />
+              <SocialButton id="discord" label="Join Discord" />
             </div>
           </section>
         </div>

webui/src/components/RawUserPilePanel/index.jsx

@@ -5,6 +5,7 @@ import { useMemo } from 'react';
 import { useSessionSelector } from '../../context/SessionContext.jsx';
 import NicknameForm from '../NicknameForm/index.jsx';
 import SocialButtonsGrid from '../SocialButtonsGrid/index.jsx';
+import CardFrame from '../CardFrame/index.jsx';
 
 function roleColors(role) {
   switch (role) {
@@ -57,8 +58,13 @@ export default function RawUserPilePanel({
       : 'h-48 overflow-y-auto';
 
   return (
-    <section
+    <CardFrame
-      className={`panel-section space-y-0.5 text-base ${fillHeight ? 'flex h-full min-h-0 flex-col overflow-hidden' : ''} ${className}`}
+      title={!hideHeader ? 'Users' : ''}
+     
+      hideHeader={hideHeader}
+      fillHeight={fillHeight}
+      className={className}
+      bodyClassName="space-y-0.5 text-base"
     >
       {!hideNicknameForm && (
         <div className="space-y-0.5">
@@ -75,12 +81,6 @@ export default function RawUserPilePanel({
       )}
 
       <div className={`space-y-0.5 ${fillHeight ? 'flex flex-1 min-h-0 flex-col' : ''}`}>
-        {!hideHeader && (
-          <div className={`flex items-center justify-between text-sm text-slate-400 ${compact ? 'text-xs' : ''}`}>
-            <span>Users</span>
-            <span className="text-xs text-slate-500">{sorted.length}</span>
-          </div>
-        )}
         <div
           className={`surface flex flex-wrap content-start items-start gap-0.5 px-0 pb-0 ${baseListClass} ${compact ? 'text-[0.8rem]' : ''}`}
         >
@@ -98,6 +98,6 @@ export default function RawUserPilePanel({
           )}
         </div>
       </div>
-    </section>
+    </CardFrame>
   );
 }

webui/src/components/ReplaySourcesPanel/index.jsx

@@ -5,6 +5,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { useSessionActions, useSessionSelector } from '../../context/SessionContext.jsx';
 import { useSettingsNamespace } from '../../settings/index.js';
 import { roverNameChromeStyle } from '../../lib/roverColor.js';
+import CardFrame from '../CardFrame/index.jsx';
 
 function normalizeSources(list = []) {
   return list
@@ -63,13 +64,8 @@ export default function ReplaySourcesPanel({ panelId = 'replay-sources', fillHei
   }, [users, selfSocketId, assignmentRoverId, roster]);
 
   useEffect(() => {
-    const saved = settings?.[panelId];
-    if (Array.isArray(saved) && saved.length) {
-      setSelected(saved);
-      return;
-    }
     setSelected(defaults);
-  }, [settings?.[panelId], defaults, panelId]);
+  }, [defaults]);
 
   useEffect(() => {
     const saved = settings?.[`${panelId}:includeSidebar`];
@@ -80,6 +76,16 @@ export default function ReplaySourcesPanel({ panelId = 'replay-sources', fillHei
     setIncludeSidebar(true);
   }, [settings?.[`${panelId}:includeSidebar`], panelId]);
 
+  useEffect(() => {
+    const saved = settings?.[`${panelId}:title`];
+    if (typeof saved === 'string') {
+      setTitle(saved);
+      setTitleDirty(true);
+      return;
+    }
+    setTitleDirty(false);
+  }, [settings?.[`${panelId}:title`], panelId]);
+
   useEffect(() => {
     if (!titleDirty) {
       setTitle(defaultTitle);
@@ -116,9 +122,7 @@ export default function ReplaySourcesPanel({ panelId = 'replay-sources', fillHei
 
   const toggleKey = (key) => {
     setSelected((prev) => {
-      const next = prev.includes(key) ? prev.filter((value) => value !== key) : [...prev, key];
+      return prev.includes(key) ? prev.filter((value) => value !== key) : [...prev, key];
-      saveSettings((current) => ({ ...(current || {}), [panelId]: next }));
-      return next;
     });
     setSuccess(null);
   };
@@ -143,15 +147,10 @@ export default function ReplaySourcesPanel({ panelId = 'replay-sources', fillHei
     }
   };
 
-  const containerClass = fillHeight ? 'h-full flex flex-col' : '';
   const listWrapClass = fillHeight ? 'flex-1 min-h-0 overflow-y-auto' : '';
 
   return (
-    <section className={`panel-section p-0.75 text-sm ${containerClass}`}>
+    <CardFrame title="Replay Sources" fillHeight={fillHeight} bodyClassName="space-y-0.5 text-sm">
-      <header className="panel-muted flex items-center justify-between text-xs">
-        <span>Replay Sources</span>
-        <span>{sources.length}</span>
-      </header>
       <div className={`grid gap-0.5 md:grid-cols-2 ${listWrapClass}`}>
         <GroupList title="Rovers" items={grouped.rovers} selected={selected} onToggle={toggleKey} />
         <GroupList title="Room Cams" items={grouped.rooms} selected={selected} onToggle={toggleKey} />
@@ -166,8 +165,10 @@ export default function ReplaySourcesPanel({ panelId = 'replay-sources', fillHei
           className="field-input w-full text-xs"
           value={title}
           onChange={(event) => {
-            setTitle(event.target.value);
+            const next = event.target.value;
+            setTitle(next);
             setTitleDirty(true);
+            saveSettings((current) => ({ ...(current || {}), [`${panelId}:title`]: next }));
           }}
           placeholder={defaultTitle}
           maxLength={120}
@@ -196,7 +197,7 @@ export default function ReplaySourcesPanel({ panelId = 'replay-sources', fillHei
         {error ? <div className="text-xs text-amber-400">{error}</div> : null}
         {success ? <div className="text-xs text-emerald-300">{success}</div> : null}
       </div>
-    </section>
+    </CardFrame>
   );
 }
 

webui/src/components/RightPaneTabs/index.jsx

@@ -6,7 +6,7 @@ import HomeAssistantControls from '../HomeAssistantControls/index.jsx';
 import SettingsPanel from '../SettingsPanel/index.jsx';
 import HelpPanel from '../HelpPanel/index.jsx';
 import ChatPanel from '../ChatPanel/index.jsx';
-import { LinkButtonsPanel, NicknameEntryPanel } from '../UserListPanel/index.jsx';
+import { LinkButtonsPanel } from '../UserListPanel/index.jsx';
 import ReplaySourcesPanel from '../ReplaySourcesPanel/index.jsx';
 import Tabs, { Tab, TabList, TabPanel, TabPanels } from '../Tabs/index.jsx';
 import TopDownMap from '../TopDownMap/index.jsx';
@@ -23,7 +23,10 @@ import VipPanel from '../VipPanel/index.jsx';
 import { useSessionSelector } from '../../context/SessionContext.jsx';
 import { useSettingsNamespace } from '../../settings/index.js';
 import ButtonBoxPanel from '../ButtonBoxPanel/index.jsx';
+import OverseerPreferencePanel from '../OverseerPreferencePanel/index.jsx';
+import CardFrame from '../CardFrame/index.jsx';
 import { useState } from 'react';
+import { useManualDockAssist } from '../../features/manualDockAssist/useManualDockAssist.js';
 
 function TopDownMapPanel() {
   const {
@@ -33,11 +36,11 @@ function TopDownMapPanel() {
   const sensors = frame?.sensors || {};
 
   return (
-    <section className="panel-section">
+    <CardFrame hideHeader>
       <div className="aspect-square w-full">
         <TopDownMap sensors={sensors} />
       </div>
-    </section>
+    </CardFrame>
   );
 }
 
@@ -47,6 +50,7 @@ function DriveDockPanel() {
     pipeline,
     actions: { setServoAngle, setNightVision, startHorn, stopHorn },
   } = useControlSystem();
+  const dockAssist = useManualDockAssist();
   const driveDockState = useDriveDockState(roverId);
   const hideInlineControls = driveDockState.docked && !driveDockState.driving;
 
@@ -68,6 +72,7 @@ function DriveDockPanel() {
   const hornLabel = formatKeyLabel(keymap?.hornHonk?.[0]);
   const upLabel = formatKeyLabel(keymap?.cameraUp?.[0]);
   const downLabel = formatKeyLabel(keymap?.cameraDown?.[0]);
+  const cameraDisabled = Boolean(!roverId || dockAssist.cameraLocked);
 
   return (
     <section className="panel-section grid h-full min-h-0 grid-rows-[minmax(0,1fr)_auto] gap-0.5">
@@ -97,6 +102,8 @@ function DriveDockPanel() {
               value={value}
               min={min}
               max={max}
+              label="Camera tilt"
+              disabled={cameraDisabled}
               onChange={setServoAngle}
               keyDownLabel={downLabel}
               keyUpLabel={upLabel}
@@ -173,9 +180,9 @@ export default function RightPaneTabs({ layout, onOpenHelpOverlay }) {
               </div>
               <div className="grid items-stretch gap-0.5 grid-cols-[minmax(0,1.3fr)_minmax(0,0.22fr)] h-[14rem]">
                 <ChatPanel fillHeight />
-                <div className="grid min-h-0 gap-0.5 grid-rows-[minmax(0,1fr)_auto]">
+                <div className="grid min-h-0 gap-0.5 grid-rows-[auto_minmax(0,1fr)]">
+                  <OverseerPreferencePanel />
                   <RawUserPilePanel compact hideNicknameForm fillHeight />
-                  <NicknameEntryPanel compact />
                 </div>
               </div>
               <HomeAssistantControls />

webui/src/components/RoomCameraPanel/index.jsx

@@ -6,6 +6,7 @@ import { useSessionSelector } from '../../context/SessionContext.jsx';
 import { useSettingsNamespace } from '../../settings/index.js';
 import { useRoomCameraSnapshots } from '../../hooks/useRoomCameraSnapshots.js';
 import RoomCameraFeed from '../RoomCameraFeed/index.jsx';
+import CardFrame from '../CardFrame/index.jsx';
 
 function EmptyState() {
   return (
@@ -66,18 +67,9 @@ export default function RoomCameraPanel({
     return <EmptyState />;
   }
 
-  return (
+  const actions = showLayoutToggle ? (
-    <section className="panel-section space-y-0.5 text-base">
+    <div className="flex items-center gap-0.5 text-[0.68rem] text-slate-400">
-      {!hideHeader && (
+      <span>Layout</span>
-        <header className="flex flex-wrap items-center justify-between gap-0.5 text-sm text-slate-400">
-          <div className="flex items-center gap-0.5">
-            <p>Room cameras</p>
-            <span className="text-xs text-slate-500">{cameras.length}</span>
-          </div>
-          <div className="flex flex-wrap items-center gap-0.5 text-xs">
-            {showLayoutToggle && (
-              <div className="flex items-center gap-0.5">
-                <span className="text-slate-500">Layout:</span>
       <div className="inline-flex overflow-hidden rounded border border-slate-700">
         {ORIENTATIONS.map((option) => (
           <button
@@ -91,10 +83,16 @@ export default function RoomCameraPanel({
         ))}
       </div>
     </div>
-            )}
+  ) : null;
-          </div>
+
-        </header>
+  return (
-      )}
+    <CardFrame
+      title="Room cameras"
+     
+      actions={actions}
+      hideHeader={hideHeader}
+      bodyClassName="space-y-0.5 text-base"
+    >
       <div className={containerClass}>
         {cameras.map((camera) => {
           const feed = feedMap[camera.id] || null;
@@ -109,6 +107,6 @@ export default function RoomCameraPanel({
           );
         })}
       </div>
-    </section>
+    </CardFrame>
   );
 }

webui/src/components/RoverMediaPlayer/constants.js

@@ -6,11 +6,3 @@ export const UNMUTE_RETRY_MS = 3000;
 export const AUDIO_RETRY_MS = 3000;
 export const BRUSH_CURRENT_THRESHOLD_MA = 40;
 export const DUCK_RELEASE_FADE_MS = 1000;
-
-export const OVERCURRENT_LABELS = {
-  leftWheel: 'Left wheel',
-  rightWheel: 'Right wheel',
-  mainBrush: 'Main brush',
-  sideBrush: 'Side brush',
-  limiter: 'Overcurrent limit',
-};

webui/src/components/RoverMediaPlayer/index.jsx

@@ -1,21 +1,11 @@
-// Video Tile
-// Purpose: Defines the Video Tile module and the local helpers/components used in this file.
-// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { WhepPlayer } from '../../lib/whepPlayer.js';
-import { useHudMapSetting } from '../../hooks/useHudMapSetting.js';
+import { useTelemetryFrame } from '../../context/TelemetryContext.jsx';
 import { useSessionSelector } from '../../context/SessionContext.jsx';
+import { useVideoRequests } from '../../hooks/useVideoRequests.js';
+import { useRoverSnapshots } from '../../hooks/useRoverSnapshots.js';
 import { useSettingsNamespace } from '../../settings/index.js';
 import { AUDIO_SETTINGS_DEFAULTS } from '../../settings/namespaces.js';
-import SocialButton from '../SocialButton/index.jsx';
-import BatteryBar from '../BatteryBar/index.jsx';
-import { buildBatteryVisual } from '../../lib/battery.js';
-import TurnCueOverlay from './TurnCueOverlay.jsx';
-import HudOverlay from './HudOverlay.jsx';
-import OvercurrentOverlay from './OvercurrentOverlay.jsx';
-import LowBatteryOverlay from './LowBatteryOverlay.jsx';
-import LightBumpBars from './LightBumpBars.jsx';
-import HudChatInput from './HudChatInput.jsx';
 import {
   RESTART_DELAY_MS,
   UNMUTE_RETRY_MS,
@@ -24,39 +14,54 @@ import {
   DUCK_RELEASE_FADE_MS,
 } from './constants.js';
 
-export default function VideoTile({
+export default function RoverMediaPlayer({
-  sessionInfo,
+  roverId = null,
-  audioSessionInfo,
+  sessionInfo = null,
-  videoMode = 'whep',
+  audioSessionInfo = null,
+  videoMode = null,
   snapshotFeed = null,
-  qualityNotice = null,
   label,
-  roverColor = null,
   forceMute = false,
-  telemetryFrame,
+  sensors,
-  batteryConfig,
-  layoutFormat = 'desktop',
-  hudVariant = 'default',
-  driverLabel = null,
-  hudForceMap = false,
-  hudMapPosition = 'top-center',
-  hudLabelScale = 1,
-  fitParent = false,
-  overcurrentLimiter = null,
-  showTurnCue = false,
-  turnTimerText = null,
-  isActiveDriver = false,
-  idleSkipSeconds = null,
 }) {
-  const discordUrl = useSessionSelector((state) => {
+  const assignedRoverId = useSessionSelector((state) => state.session?.assignment?.roverId ?? null);
-    const socials = state.session?.socials || [];
+  const effectiveRoverId = roverId ?? assignedRoverId;
-    const socialUrl =
+  const mode = useSessionSelector((state) => state.session?.mode || null);
-      socials.find((entry) => {
+  const rosterEntry = useSessionSelector((state) =>
-        const key = String(entry?.id || entry?.label || '').toLowerCase();
+    effectiveRoverId && Array.isArray(state.session?.roster)
-        return key === 'discord';
+      ? state.session.roster.find((item) => String(item.id) === String(effectiveRoverId)) || null
-      })?.url || null;
+      : null,
-    return socialUrl || state.session?.discord?.invite || null;
+  );
+  const hasAudio = Boolean(rosterEntry?.media?.audioPublishUrl);
+  const autoVideoEnabled = videoMode ? videoMode === 'whep' : true;
+  const autoEntries = useMemo(() => {
+    if (!effectiveRoverId || !autoVideoEnabled) return [];
+    return [
+      { type: 'rover', id: effectiveRoverId, key: effectiveRoverId },
+      ...(hasAudio
+        ? [{ type: 'rover', id: `${effectiveRoverId}-audio`, key: `${effectiveRoverId}-audio` }]
+        : []),
+    ];
+  }, [effectiveRoverId, autoVideoEnabled, hasAudio]);
+  const autoSources = useVideoRequests(autoEntries, {
+    enabled: Boolean(effectiveRoverId && autoVideoEnabled),
+    version: mode,
   });
+  const resolvedSessionInfo =
+    sessionInfo ?? (effectiveRoverId ? autoSources[effectiveRoverId] || null : null);
+  const resolvedAudioSessionInfo =
+    audioSessionInfo ??
+    (effectiveRoverId && hasAudio ? autoSources[`${effectiveRoverId}-audio`] || null : null);
+  const autoSnapshots = useRoverSnapshots(effectiveRoverId ? [effectiveRoverId] : [], {
+    enabled: Boolean(effectiveRoverId && !resolvedSessionInfo?.url),
+    version: mode,
+  });
+  const resolvedSnapshotFeed =
+    snapshotFeed ?? (effectiveRoverId ? autoSnapshots[effectiveRoverId] || null : null);
+  const resolvedLabel =
+    label || rosterEntry?.name || (effectiveRoverId ? `Rover ${effectiveRoverId}` : 'Rover');
+  const frame = useTelemetryFrame(effectiveRoverId);
+  const resolvedSensors = sensors ?? frame?.sensors ?? null;
   const videoRef = useRef(null);
   const audioRef = useRef(null);
   const restartTimer = useRef(null);
@@ -72,9 +77,8 @@ export default function VideoTile({
   const [restartToken, setRestartToken] = useState(0);
   const [audioRestartToken, setAudioRestartToken] = useState(0);
   const [muted, setMuted] = useState(true);
-  const hasDedicatedAudio = Boolean(audioSessionInfo?.url);
+  const hasDedicatedAudio = Boolean(resolvedAudioSessionInfo?.url);
-  const usingSnapshot = videoMode === 'snapshot';
+  const usingSnapshot = videoMode === 'snapshot' || (!videoMode && !resolvedSessionInfo?.url);
-  const sensors = telemetryFrame?.sensors;
   const { value: audioSettings } = useSettingsNamespace('audio', AUDIO_SETTINGS_DEFAULTS);
   const masterVolume = Number.isFinite(audioSettings?.masterVolume)
     ? audioSettings.masterVolume
@@ -92,63 +96,21 @@ export default function VideoTile({
     ? Math.max(0, Math.min(1, audioSettings.mainBrushDuckAmount))
     : AUDIO_SETTINGS_DEFAULTS.mainBrushDuckAmount;
   const baseRoverGain = Math.max(0, Math.min(1, masterVolume * roverVolume));
-  const batteryCharge = sensors?.batteryChargeMah ?? null;
-  const desktopLayout = layoutFormat === 'desktop';
-  const mobileHud = !desktopLayout;
-  const effectiveHudMapPosition = mobileHud ? 'top-right' : hudMapPosition;
-  const [showHudMapDesktop] = useHudMapSetting();
-  const showHudMap = hudForceMap ? true : mobileHud ? true : showHudMapDesktop;
-  const batteryVisual = buildBatteryVisual({ charge: batteryCharge, config: batteryConfig });
-  const wheelOvercurrents = sensors?.wheelOvercurrents || null;
-  const overcurrentMotors = useMemo(
-    () =>
-      wheelOvercurrents == null
-        ? []
-        : Object.entries(wheelOvercurrents)
-            .filter(([, active]) => Boolean(active))
-            .map(([key]) => key),
-    [wheelOvercurrents],
-  );
-  const limiterCaps = overcurrentLimiter?.caps || null;
-  const limiterGroups = overcurrentLimiter?.overcurrent?.groups || null;
-  const debugFlags = useMemo(() => {
-    if (typeof window === 'undefined') {
-      return { debugAudio: false, debugHud: false };
-    }
-    const params = new URLSearchParams(window.location.search);
-    return {
-      debugAudio: params.has('debugAudio'),
-      debugHud: params.has('debugHud'),
-    };
-  }, []);
-  const debugAudio = debugFlags.debugAudio;
-  const debugHud = debugFlags.debugHud;
-  const limiterFill = useMemo(() => {
-    if (!limiterCaps) return null;
-    const driveCap = Number.isFinite(limiterCaps?.drive?.cap) ? limiterCaps.drive.cap : 1;
-    const auxCap = Number.isFinite(limiterCaps?.aux?.cap) ? limiterCaps.aux.cap : 1;
-    return Math.max(0, Math.min(1, 1 - Math.min(driveCap, auxCap)));
-  }, [limiterCaps]);
-  const limiterActive = Boolean(overcurrentLimiter?.isActive);
-  const overlayState = useMemo(() => {
-    const motors = overcurrentMotors.length ? overcurrentMotors : limiterActive ? ['limiter'] : [];
-    const fill = limiterFill ?? (overcurrentMotors.length ? 1 : 0);
-    return {
-      motors,
-      fill,
-      visible: Boolean(motors.length),
-    };
-  }, [overcurrentMotors, limiterActive, limiterFill]);
   const mainBrushActive = Boolean(
-    (Number(sensors?.mainBrushCurrentMa) || 0) > BRUSH_CURRENT_THRESHOLD_MA ||
+    (Number(resolvedSensors?.mainBrushCurrentMa) || 0) > BRUSH_CURRENT_THRESHOLD_MA ||
-      sensors?.wheelOvercurrents?.mainBrush,
+      resolvedSensors?.wheelOvercurrents?.mainBrush,
   );
   const duckGain = mainBrushDuckEnabled && mainBrushActive ? 1 - mainBrushDuckAmount : 1;
   const effectiveRoverGain = Math.max(0, Math.min(1, baseRoverGain * duckGain));
-  const levelIndicator =
+
-    mainBrushDuckEnabled && mainBrushActive && mainBrushDuckAmount > 0
+  const debugAudio = useMemo(() => {
-      ? `Volume decreased ${Math.round(mainBrushDuckAmount * 1000) / 10}%`
+    if (typeof window === 'undefined') {
-      : null;
+      return false;
+    }
+    const params = new URLSearchParams(window.location.search);
+    return params.has('debugAudio');
+  }, []);
+
   const audioDebugStateRef = useRef({
     hasDedicatedAudio: false,
     audioUrl: null,
@@ -161,7 +123,7 @@ export default function VideoTile({
   useEffect(() => {
     audioDebugStateRef.current = {
       hasDedicatedAudio,
-      audioUrl: audioSessionInfo?.url || null,
+      audioUrl: resolvedAudioSessionInfo?.url || null,
       mainBrushDuckEnabled,
       mainBrushDuckAmount,
       mainBrushActive,
@@ -170,13 +132,14 @@ export default function VideoTile({
     };
   }, [
     hasDedicatedAudio,
-    audioSessionInfo?.url,
+    resolvedAudioSessionInfo?.url,
     mainBrushDuckEnabled,
     mainBrushDuckAmount,
     mainBrushActive,
     baseRoverGain,
     effectiveRoverGain,
   ]);
+
   const logAudio = useCallback(
     (event, meta = {}) => {
       if (!debugAudio) return;
@@ -185,7 +148,7 @@ export default function VideoTile({
       const payload = {
         event,
         ts: Date.now(),
-        roverLabel: label || null,
+        roverLabel: resolvedLabel || null,
         hasDedicatedAudio: state.hasDedicatedAudio,
         audioUrl: state.audioUrl,
         mainBrushDuckEnabled: state.mainBrushDuckEnabled,
@@ -211,20 +174,8 @@ export default function VideoTile({
         console.log('[AudioDebug]', event, payload);
       }
     },
-    [debugAudio, label],
+    [debugAudio, resolvedLabel],
   );
-  useEffect(() => {
-    if (!debugHud) return;
-    console.log('[OvercurrentHUD]', {
-      overlayVisible: overlayState.visible,
-      overlayMotors: overlayState.motors,
-      overlayFill: overlayState.fill,
-      limiterActive,
-      limiterCaps,
-      limiterGroups,
-      wheelOvercurrents,
-    });
-  }, [debugHud, overlayState, limiterActive, limiterCaps, limiterGroups, wheelOvercurrents]);
 
   useEffect(() => {
     logAudio('settings/update');
@@ -312,7 +263,7 @@ export default function VideoTile({
   }, [usingSnapshot]);
 
   useEffect(() => {
-    if (usingSnapshot || !sessionInfo?.url || !videoRef.current) {
+    if (usingSnapshot || !resolvedSessionInfo?.url || !videoRef.current) {
       return undefined;
     }
     let active = true;
@@ -332,8 +283,8 @@ export default function VideoTile({
     };
 
     player = new WhepPlayer({
-      url: sessionInfo.url,
+      url: resolvedSessionInfo.url,
-      token: sessionInfo.token,
+      token: resolvedSessionInfo.token,
       video: videoRef.current,
       receiveAudio: !hasDedicatedAudio,
       onStatus: handleStatus,
@@ -351,17 +302,26 @@ export default function VideoTile({
       clearTimeout(resetMuteId);
       player?.stop();
     };
-  }, [usingSnapshot, sessionInfo?.url, sessionInfo?.token, restartToken, scheduleRestart, ensurePlayback, hasDedicatedAudio, logAudio]);
+  }, [
+    usingSnapshot,
+    resolvedSessionInfo?.url,
+    resolvedSessionInfo?.token,
+    restartToken,
+    scheduleRestart,
+    ensurePlayback,
+    hasDedicatedAudio,
+    logAudio,
+  ]);
 
   useEffect(() => {
-    if (status === 'stopped' && sessionInfo?.url) {
+    if (status === 'stopped' && resolvedSessionInfo?.url) {
       scheduleRestart();
     }
-  }, [status, sessionInfo?.url, scheduleRestart]);
+  }, [status, resolvedSessionInfo?.url, scheduleRestart]);
 
   useEffect(() => {
     const audioEl = audioRef.current;
-    if (!audioEl || !audioSessionInfo?.url) {
+    if (!audioEl || !resolvedAudioSessionInfo?.url) {
       logAudio('route/no-audio-url');
       appliedVolumeRef.current = null;
       return;
@@ -402,7 +362,7 @@ export default function VideoTile({
       duckAmount: mainBrushDuckAmount,
     });
   }, [
-    audioSessionInfo?.url,
+    resolvedAudioSessionInfo?.url,
     effectiveRoverGain,
     mainBrushDuckEnabled,
     mainBrushActive,
@@ -410,9 +370,8 @@ export default function VideoTile({
     logAudio,
   ]);
 
-  // Audio-only WHEP (no pausing/muting; keeps trying to play)
   useEffect(() => {
-    if (!audioSessionInfo?.url || !audioRef.current) {
+    if (!resolvedAudioSessionInfo?.url || !audioRef.current) {
       return undefined;
     }
     let active = true;
@@ -420,24 +379,16 @@ export default function VideoTile({
     const handleStatus = (nextStatus, info) => {
       if (!active) return;
       logAudio('audio/status', { nextStatus, info: info || null });
-      setAudioDetail(info || (nextStatus === 'connected' ? 'connected' : null));
+      setAudioStatus(nextStatus);
-      setAudioStatus((prev) => {
+      setAudioDetail(info || null);
-        if (nextStatus === 'connected' && (prev === 'playing' || prev === 'connecting')) {
-          return prev;
-        }
-        if (nextStatus === 'new') {
-          return prev;
-        }
-        return nextStatus;
-      });
       if (['error', 'failed'].includes(nextStatus)) {
         scheduleAudioRestart();
       }
     };
 
     player = new WhepPlayer({
-      url: audioSessionInfo.url,
+      url: resolvedAudioSessionInfo.url,
-      token: audioSessionInfo.token,
+      token: resolvedAudioSessionInfo.token,
       video: audioRef.current,
       audioOnly: true,
       onStatus: handleStatus,
@@ -455,17 +406,16 @@ export default function VideoTile({
       player?.stop();
     };
   }, [
-    audioSessionInfo?.url,
+    resolvedAudioSessionInfo?.url,
-    audioSessionInfo?.token,
+    resolvedAudioSessionInfo?.token,
     audioRestartToken,
     scheduleAudioRestart,
     logAudio,
   ]);
 
-  // Keep nudging the audio element to play in case autoplay was blocked.
   useEffect(() => {
     const audioEl = audioRef.current;
-    if (!audioSessionInfo?.url || !audioEl) {
+    if (!resolvedAudioSessionInfo?.url || !audioEl) {
       clearInterval(audioPlayInterval.current);
       return undefined;
     }
@@ -498,13 +448,8 @@ export default function VideoTile({
     audioPlayInterval.current = setInterval(attemptPlay, AUDIO_RETRY_MS);
 
     return () => clearInterval(audioPlayInterval.current);
-  }, [
+  }, [resolvedAudioSessionInfo?.url, audioStatus, logAudio]);
-    audioSessionInfo?.url,
-    audioStatus,
-    logAudio,
-  ]);
 
-  // Reflect audio element events back into status/detail so the HUD stays accurate.
   useEffect(() => {
     const audioEl = audioRef.current;
     if (!audioEl) return undefined;
@@ -555,44 +500,43 @@ export default function VideoTile({
       audioEl.removeEventListener('canplay', handleCanPlay);
       audioEl.removeEventListener('stalled', handleStalled);
     };
-  }, [audioSessionInfo?.url, logAudio]);
+  }, [resolvedAudioSessionInfo?.url, logAudio]);
 
-  const snapshotStatus = snapshotFeed?.error
+  const snapshotStatus = resolvedSnapshotFeed?.error
-    ? `Error: ${snapshotFeed.error}`
+    ? `Error: ${resolvedSnapshotFeed.error}`
-    : snapshotFeed?.objectUrl
+    : resolvedSnapshotFeed?.objectUrl
     ? 'snapshot'
-    : snapshotFeed?.status || 'waiting';
+    : resolvedSnapshotFeed?.status || 'waiting';
   const renderedStatus = usingSnapshot
     ? snapshotStatus
-    : !sessionInfo?.url
+    : !resolvedSessionInfo?.url
     ? 'waiting'
     : status === 'error'
     ? `Error: ${detail || 'unknown'}`
     : detail
     ? `${status} (${detail})`
     : status;
-  const renderedAudioStatus = audioSessionInfo?.error
+  const renderedAudioStatus = resolvedAudioSessionInfo?.error
-    ? `Error: ${audioSessionInfo.error}`
+    ? `Error: ${resolvedAudioSessionInfo.error}`
-    : !audioSessionInfo?.url
+    : !resolvedAudioSessionInfo?.url
     ? null
     : audioStatus === 'error'
     ? `Error: ${audioDetail || 'unknown'}`
     : audioDetail
     ? `${audioStatus} (${audioDetail})`
     : audioStatus;
-  const showVerticalBattery = hudVariant === 'spectator';
+  const showConnectingOverlay =
-  const noHud = hudVariant === 'none';
+    !usingSnapshot &&
+    !resolvedSessionInfo?.error &&
+    ['idle', 'new', 'connecting'].includes(status);
 
   return (
-    <div className={`flex flex-col gap-0.5 ${fitParent ? 'h-full' : ''}`}>
+    <>
-      <div
-        className={`relative w-full overflow-hidden bg-black ${fitParent ? 'h-full flex-1' : 'aspect-[4/3]'}`}
-      >
       {usingSnapshot ? (
-          snapshotFeed?.objectUrl ? (
+        resolvedSnapshotFeed?.objectUrl ? (
           <img
-              src={snapshotFeed.objectUrl}
+            src={resolvedSnapshotFeed.objectUrl}
-              alt={label}
+            alt={resolvedLabel}
             className="h-full w-full object-contain"
             draggable={false}
           />
@@ -611,80 +555,20 @@ export default function VideoTile({
           className="h-full w-full object-contain"
         />
       )}
+      {showConnectingOverlay ? (
+        <div className="pointer-events-none absolute inset-0 z-10 flex items-center justify-center bg-black/45">
+          <div className="rounded border border-slate-500/70 bg-black/70 px-3 py-1 text-sm font-semibold text-slate-100">
+            Connecting to video....
+          </div>
+        </div>
+      ) : null}
       <audio ref={audioRef} autoPlay hidden />
-        {!noHud && showTurnCue ? (
+      <div className="pointer-events-none absolute left-1 top-1 z-20 font-medium text-slate-100 text-[0.65rem]">
-          <TurnCueOverlay
+        <div className="flex flex-col gap-0.5 leading-none">
-            mobileHud={mobileHud}
+          <span>Status: {renderedStatus}</span>
-            isActiveDriver={isActiveDriver}
+          {renderedAudioStatus ? <span>Audio: {renderedAudioStatus}</span> : null}
-            idleSkipSeconds={idleSkipSeconds}
-          />
-        ) : null}
-        {!noHud ? (
-          <HudOverlay
-            sensors={sensors}
-            label={label}
-            roverColor={roverColor}
-            status={renderedStatus}
-            audioStatus={renderedAudioStatus}
-            levelStatus={levelIndicator}
-            layoutFormat={layoutFormat}
-            variant={hudVariant}
-            driverLabel={driverLabel}
-            showTopDown={showHudMap}
-            mobileHud={mobileHud}
-            mapPosition={effectiveHudMapPosition}
-            turnTimerText={turnTimerText}
-            labelScale={hudLabelScale}
-          />
-        ) : null}
-        {!noHud ? <HudChatInput compact={mobileHud} /> : null}
-        {!noHud && debugHud ? (
-          <div className="pointer-events-none absolute left-1 top-1 z-40 rounded bg-black/80 px-1 py-0.5 text-[0.6rem] text-lime-200">
-            {`OC vis:${overlayState.visible ? 1 : 0} motors:${overlayState.motors.length} fill:${Math.round(
-              overlayState.fill * 100,
-            )}%`}
-          </div>
-        ) : null}
-        {!noHud ? <OvercurrentOverlay motors={overlayState.motors} fill={overlayState.fill} compact={mobileHud} /> : null}
-        {!noHud ? <LowBatteryOverlay battery={batteryVisual} compact={mobileHud} /> : null}
-        {!noHud && showVerticalBattery && batteryVisual.available ? (
-          <div className="pointer-events-none absolute right-1 top-1/2 flex h-[70%] -translate-y-1/2 flex-col items-center justify-center rounded bg-black/60 px-0.5 pb-1 pt-1">
-            <BatteryBar
-              visual={batteryVisual}
-              orientation="vertical"
-              variant="inline"
-              compact={mobileHud}
-              className="h-full w-4"
-            />
-          </div>
-        ) : null}
-        {!noHud && qualityNotice ? (
-          <div className="pointer-events-none absolute inset-x-0 top-1/2 -translate-y-1/2">
-            <div
-              className={`mx-auto w-fit rounded border border-amber-300/80 bg-black/75 text-amber-200 ${
-                mobileHud ? 'px-2 py-1 text-[0.6rem]' : 'px-3 py-1.5 text-sm'
-              }`}
-            >
-              <div className="text-center">{qualityNotice}</div>
-              <div className="pointer-events-auto mt-0">
-                <SocialButton
-                  id="discord"
-                  label="Join our Discord server while you wait!"
-                  url={discordUrl}
-                />
         </div>
       </div>
-          </div>
+    </>
-        ) : null}
-      </div>
-      {!noHud && !showVerticalBattery && (
-        <div className="space-y-0.5">
-          <LightBumpBars sensors={sensors} />
-          <div className="panel-section space-y-0.5 text-sm">
-            <BatteryBar visual={batteryVisual} compact={mobileHud} />
-          </div>
-        </div>
-      )}
-    </div>
   );
 }

webui/src/components/RoverQueuesPanel/index.jsx

@@ -4,6 +4,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useSessionActions, useSessionSelector } from '../../context/SessionContext.jsx';
 import { roverNameChromeStyle } from '../../lib/roverColor.js';
+import CardFrame from '../CardFrame/index.jsx';
 
 function classNames(...values) {
   return values.filter(Boolean).join(' ');
@@ -96,8 +97,7 @@ export default function RoverQueuesPanel({ title = 'Rovers' }) {
     users.find((u) => u.socketId === socketId) || { socketId, nickname: null, role: null };
 
   return (
-    <div className="space-y-0.5 text-sm">
+    <CardFrame title={title} bodyClassName="space-y-0.5 text-sm">
-      {title && <p className="text-sm text-slate-400">{title}</p>}
       {rosterItems.length === 0 ? (
         <p className="text-sm text-slate-500">No rovers registered.</p>
       ) : (
@@ -145,11 +145,16 @@ export default function RoverQueuesPanel({ title = 'Rovers' }) {
               >
                 <div className="flex min-w-0 flex-1 flex-col gap-0.5">
                   <div className="flex items-center justify-between gap-0.5">
-                    <div className="flex items-center gap-0.5">
+                    <div className="flex min-w-0 items-center gap-0.5">
-                      <p className="text-slate-200">
+                      <p className="min-w-0 flex items-center gap-0.5 whitespace-nowrap text-slate-200">
                         <span className="rounded px-1 py-[1px] border border-transparent" style={roverNameChromeStyle(rover.color, 0.16)}>
                           {rover.name}
                         </span>
+                        {rover.description ? (
+                          <span className="min-w-0 flex-1 truncate text-[0.7rem] text-slate-400">
+                            {rover.description}
+                          </span>
+                        ) : null}
                       </p>
                       {showTimer ? (
                         <span className="rounded bg-slate-800 px-1 text-[0.7rem] text-slate-200">
@@ -211,6 +216,6 @@ export default function RoverQueuesPanel({ title = 'Rovers' }) {
           })}
         </ul>
       )}
-    </div>
+    </CardFrame>
   );
 }

webui/src/components/SocialButton/index.jsx

@@ -1,97 +1,59 @@
 // Social Button
 // Purpose: Defines the Social Button module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
-import { useEffect } from 'react';
+import * as FaIcons from 'react-icons/fa';
-import { FaBook, FaCoffee, FaCrown, FaDiscord, FaLink } from 'react-icons/fa';
+import { FaLink } from 'react-icons/fa';
+import { useSessionSelector } from '../../context/SessionContext.jsx';
+import { getSocialById } from '../../lib/socials.js';
 
-const ICONS_BY_ID = {
+function sanitizeCssColor(value) {
-  discord: FaDiscord,
+  if (typeof value !== 'string') return null;
-  kofi: FaCoffee,
+  const trimmed = value.trim();
-  'ko-fi': FaCoffee,
+  if (!trimmed) return null;
-  wiki: FaBook,
+  if (/^#[0-9a-fA-F]{3,8}$/.test(trimmed)) return trimmed;
-  throne: FaCrown,
+  if (/^(rgb|rgba|hsl|hsla)\([^)]+\)$/.test(trimmed)) return trimmed;
-};
+  return null;
-
-const GRADIENT_STYLE_BY_ID = {
-  discord: {
-    backgroundImage:
-      'linear-gradient(270deg,#5865F2,#404EED,#5865F2)',
-    backgroundSize: '600% 600%',
-    animation: 'socialGradient 180s ease infinite',
-  },
-  kofi: {
-    backgroundImage: 'linear-gradient(270deg,#FF6433,#E04822,#FF6433)',
-    backgroundSize: '600% 600%',
-    animation: 'socialGradient 170s ease infinite',
-  },
-  'ko-fi': {
-    backgroundImage: 'linear-gradient(270deg,#FF6433,#E04822,#FF6433)',
-    backgroundSize: '600% 600%',
-    animation: 'socialGradient 170s ease infinite',
-  },
-  wiki: {
-    backgroundImage: 'linear-gradient(270deg,#EE8019,#C65C08,#EE8019)',
-    backgroundSize: '600% 600%',
-    animation: 'socialGradient 180s ease infinite',
-  },
-  throne: {
-    backgroundImage: 'linear-gradient(270deg,#7C3AED,#5B21B6,#7C3AED)',
-    backgroundSize: '600% 600%',
-    animation: 'socialGradient 180s ease infinite',
-  },
-};
-
-function useSocialButtonStyles() {
-  useEffect(() => {
-    if (typeof document === 'undefined') return;
-    const styleId = 'social-button-keyframes';
-    if (document.getElementById(styleId)) return;
-    const style = document.createElement('style');
-    style.id = styleId;
-    style.textContent = `
-      @keyframes socialGradient {
-        0% { background-position: 0% 50%; }
-        50% { background-position: 100% 50%; }
-        100% { background-position: 0% 50%; }
-      }
-    `;
-    document.head.appendChild(style);
-  }, []);
 }
 
-function normalizeId(id, label) {
+function resolveIcon(iconName) {
-  if (typeof id === 'string' && id.trim()) return id.trim().toLowerCase();
+  if (typeof iconName !== 'string' || !iconName.trim()) return FaLink;
-  if (typeof label === 'string' && label.trim()) {
+  const icon = FaIcons[iconName.trim()];
-    return label
+  return typeof icon === 'function' ? icon : FaLink;
-      .trim()
-      .toLowerCase()
-      .replace(/\s+/g, '-')
-      .replace(/[^a-z0-9-]/g, '');
-  }
-  return '';
 }
 
-export default function SocialButton({ id, label, url, className = '' }) {
+export default function SocialButton({ id = null, label, url, icon, color, layout = 'stacked', className = '' }) {
-  if (!url) return null;
+  const socialFromId = useSessionSelector((state) => (id ? getSocialById(state, id) : null));
-  useSocialButtonStyles();
+  const resolvedUrl = url || socialFromId?.url || null;
-  const key = normalizeId(id, label);
+  if (!resolvedUrl) return null;
-  const Icon = ICONS_BY_ID[key] || FaLink;
+  const resolvedIcon = icon || socialFromId?.icon || null;
-  const gradientStyle = GRADIENT_STYLE_BY_ID[key] || null;
+  const resolvedColor = color || socialFromId?.color || null;
-  const text = label || id || 'Link';
+  const Icon = resolveIcon(resolvedIcon);
+  const bgColor = sanitizeCssColor(resolvedColor);
+  const text = label || socialFromId?.label || 'Link';
+  const isInline = layout === 'inline';
 
   return (
     <a
-      href={url}
+      href={resolvedUrl}
       target="_blank"
       rel="noopener noreferrer"
       aria-label={text}
-      className={`inline-flex items-center w-full px-0.5 py-0.5 text-sm font-medium text-white transition justify-center gap-1 rounded-md ${
+      className={`grid h-full min-h-0 w-full place-items-center rounded-md bg-slate-700 px-0.5 ${isInline ? 'py-0.5' : 'pb-3'} text-center text-sm font-medium text-white transition hover:opacity-90 ${className}`}
-        gradientStyle ? '' : 'bg-slate-700 hover:bg-slate-600'
+      style={bgColor ? { backgroundColor: bgColor } : undefined}
-      } ${className}`}
-      style={gradientStyle || undefined}
     >
-      <Icon className="mr-0" />
+      {isInline ? (
-      {text}
+        <span className="inline-flex max-w-full items-center justify-center gap-1 text-center leading-tight">
+          <Icon className="shrink-0" style={{ fontSize: '1.1em' }} />
+          <span className="break-words">{text}</span>
+        </span>
+      ) : (
+        <span className="flex h-full w-full max-w-full flex-col items-center justify-between text-center leading-tight">
+          <span className="flex min-h-0 flex-1 items-center justify-center">
+            <Icon className="shrink-0" style={{ fontSize: 'clamp(1rem, 2.2vh + 1.2vw, 3rem)' }} />
+          </span>
+          <span className="w-full break-words leading-tight">{text}</span>
+        </span>
+      )}
     </a>
   );
 }

webui/src/components/SocialButtonsGrid/index.jsx

@@ -4,46 +4,18 @@
 import { useSessionSelector } from '../../context/SessionContext.jsx';
 import SocialButton from '../SocialButton/index.jsx';
 
-function normalizeSocials({ socials, discordInvite, kofiLink }) {
-  const configured = Array.isArray(socials) ? socials : null;
-  if (configured && configured.length) {
-    return configured;
-  }
-  const fallback = [];
-  if (discordInvite) {
-    fallback.push({ id: 'discord', label: 'Discord', url: discordInvite });
-  }
-  if (kofiLink) {
-    fallback.push({ id: 'kofi', label: 'Ko-fi', url: kofiLink });
-  }
-  return fallback;
-}
-
-function normalizeEntry(entry) {
-  if (!entry || typeof entry !== 'object') return null;
-  const id = entry.id || entry.service || entry.key || entry.name || null;
-  const label = entry.label || entry.title || entry.name || id || 'Link';
-  const url = entry.url || entry.link || entry.href || null;
-  return url ? { id, label, url } : null;
-}
-
 export default function SocialButtonsGrid({ className = '' }) {
-  const socialsInput = useSessionSelector((state) => ({
+  const socials = useSessionSelector((state) => state.session?.socials ?? []).slice(0, 4);
-    socials: state.session?.socials ?? [],
-    discordInvite: state.session?.discord?.invite || null,
-    kofiLink: state.session?.kofi?.link || null,
-  }));
-  const socials = normalizeSocials(socialsInput)
-    .map(normalizeEntry)
-    .filter(Boolean)
-    .slice(0, 4);
 
   if (!socials.length) return null;
 
   return (
     <div className={`grid grid-cols-2 grid-rows-2 gap-0.5 ${className}`}>
       {socials.map((entry) => (
-        <SocialButton key={`${entry.id || entry.label}-${entry.url}`} {...entry} />
+        <SocialButton
+          key={`${entry?.id || entry?.label || 'social'}-${entry?.url || ''}`}
+          id={entry?.id || entry?.key || entry?.service || null}
+        />
       ))}
     </div>
   );

webui/src/components/SpectateVideo/index.jsx

@@ -0,0 +1,39 @@
+import RoverMediaPlayer from '../RoverMediaPlayer/index.jsx';
+import HudOverlay from '../HudOverlays/HudOverlay/index.jsx';
+import RoverDescriptionOverlay from '../HudOverlays/RoverDescriptionOverlay/index.jsx';
+import OvercurrentOverlay from '../HudOverlays/OvercurrentOverlay/index.jsx';
+import LowBatteryOverlay from '../HudOverlays/LowBatteryOverlay/index.jsx';
+import VerticalBatteryOverlay from '../HudOverlays/VerticalBatteryOverlay/index.jsx';
+
+export default function SpectateVideo({
+  roverId = null,
+  label,
+  fitParent = false,
+  layoutFormat = 'desktop',
+}) {
+  return (
+    <div className={`flex flex-col gap-0.5 ${fitParent ? 'h-full' : ''}`}>
+      <div className={`relative w-full overflow-hidden bg-black ${fitParent ? 'h-full flex-1' : 'aspect-[4/3]'}`}>
+        <RoverMediaPlayer
+          roverId={roverId}
+          label={label}
+        />
+        <RoverDescriptionOverlay
+          roverId={roverId}
+          variant="spectator"
+          mobileHud={false}
+        />
+        <HudOverlay
+          roverId={roverId}
+          layoutFormat={layoutFormat}
+          variant="spectator"
+          mobileHud={false}
+          labelScale={1}
+        />
+        <OvercurrentOverlay roverId={roverId} compact={false} />
+        <LowBatteryOverlay roverId={roverId} compact={false} />
+        <VerticalBatteryOverlay show roverId={roverId} mobileHud={false} />
+      </div>
+    </div>
+  );
+}

webui/src/components/Tabs/index.jsx

@@ -2,6 +2,7 @@
 // Purpose: Defines the Tabs module and the local helpers/components used in this file.
 // Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
 import { createContext, useCallback, useContext, useMemo, useState, useEffect } from 'react';
+import { useSessionSelector } from '../../context/SessionContext.jsx';
 
 const TabsContext = createContext(null);
 
@@ -33,6 +34,28 @@ function classNames(...parts) {
   return parts.filter(Boolean).join(' ');
 }
 
+function hexToRgb(hex) {
+  const raw = String(hex || '').trim();
+  const normalized = raw.startsWith('#') ? raw.slice(1) : raw;
+  if (!/^[0-9a-fA-F]{3}$|^[0-9a-fA-F]{6}$/.test(normalized)) return null;
+  const expanded =
+    normalized.length === 3
+      ? normalized
+          .split('')
+          .map((ch) => ch + ch)
+          .join('')
+      : normalized;
+  return {
+    r: Number.parseInt(expanded.slice(0, 2), 16),
+    g: Number.parseInt(expanded.slice(2, 4), 16),
+    b: Number.parseInt(expanded.slice(4, 6), 16),
+  };
+}
+
+function rgba(rgb, alpha) {
+  return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${alpha})`;
+}
+
 export default function Tabs({ children, defaultTab, currentTab, onTabChange, variant = DEFAULT_VARIANT }) {
   const [internalTab, setInternalTab] = useState(defaultTab ?? null);
   const [tabOrder, setTabOrder] = useState([]);
@@ -95,7 +118,32 @@ export default function Tabs({ children, defaultTab, currentTab, onTabChange, va
 }
 
 export function TabList({ children, className = '' }) {
-  return <div className={classNames('flex gap-0.5', className)}>{children}</div>;
+  const ownRoverColor = useSessionSelector((state) => {
+    const roverId = String(state.session?.assignment?.roverId || '').trim();
+    if (!roverId) return null;
+    const roster = Array.isArray(state.session?.roster) ? state.session.roster : [];
+    const rover = roster.find((entry) => String(entry?.id) === roverId);
+    return rover?.color || null;
+  });
+  const accentRgb = hexToRgb(ownRoverColor);
+  const frameStyle = accentRgb ? { borderColor: rgba(accentRgb, 0.35) } : undefined;
+  const headerStyle = accentRgb
+    ? {
+        backgroundImage: `linear-gradient(90deg, rgba(23,23,23,0.96) 0%, rgba(38,38,38,0.94) 58%, ${rgba(accentRgb, 0.18)} 100%)`,
+      }
+    : undefined;
+
+  return (
+    <div
+      className={classNames(
+        'panel-section overflow-hidden border border-neutral-500/60 bg-neutral-900/95 p-0.5 shadow-[0_1px_0_rgba(255,255,255,0.05)_inset,0_10px_24px_rgba(0,0,0,0.28)]',
+        className
+      )}
+      style={frameStyle}
+    >
+      <div className="flex gap-0.5" style={headerStyle}>{children}</div>
+    </div>
+  );
 }
 
 export function Tab({ id, children, className = '', disabled = false, highlight = 'none' }) {

webui/src/components/TelemetryPanel/index.jsx

@@ -5,6 +5,7 @@ import { useMemo } from 'react';
 import { useSessionSelector } from '../../context/SessionContext.jsx';
 import { useTelemetryFrame } from '../../context/TelemetryContext.jsx';
 import { useDockIr } from '../../hooks/useDockIr.js';
+import CardFrame from '../CardFrame/index.jsx';
 
 function formatMetric(value, fallback = '--') {
   if (value == null || value === '') return fallback;
@@ -39,7 +40,7 @@ export default function TelemetryPanel() {
   }, [activeDriverId, roverId, selfSocketId, users]);
 
   return (
-    <section className="panel-section space-y-0.5 text-base text-slate-100">
+    <CardFrame hideHeader clipOverflow={false} bodyClassName="space-y-0.5 text-base text-slate-100">
       {/* <div className="text-sm text-slate-400">
         <span>{connected ? 'online' : 'offline'}</span>
         <span> · role {session?.role || 'unknown'}</span>
@@ -48,7 +49,7 @@ export default function TelemetryPanel() {
         <span> · driver {driverLabel}</span>
       </div> */}
       {!roverId ? (
-        <p className="text-sm text-slate-500">Assign a rover to view sensors.</p>
+        <p className="text-sm text-slate-500">You are not assigned to a rover!!!!!!</p>
       ) : !frame ? (
         <p className="text-sm text-slate-500">Waiting for sensor frames…</p>
       ) : (
@@ -60,7 +61,7 @@ export default function TelemetryPanel() {
       {rawSnippet && (
         <pre className="surface whitespace-pre-wrap break-words text-xs text-lime-300">{rawSnippet}</pre>
       )}
-    </section>
+    </CardFrame>
   );
 }
 
@@ -173,7 +174,7 @@ function SensorDetails({ sensors, dockState }) {
 function DetailCard({ title, children }) {
   return (
     <div className="surface space-y-0.5 p-1 text-sm">
-      <div className="text-[0.8rem] uppercase tracking-wide text-slate-400">{title}</div>
+      <div className="text-[0.78rem] font-semibold leading-none text-slate-200">{title}</div>
       <div className="space-y-0.5">{children}</div>
     </div>
   );

webui/src/components/TopDownMap/TopDownMapContent.jsx

@@ -68,12 +68,6 @@ function TopDownMapContent({ sensors = {}, variant = 'full', size: overrideSize,
       className={`${overlay ? 'relative' : 'surface relative p-1'}`}
       style={overlay ? { width: `${size}px`, height: `${size}px` } : { height: '100%', width: '100%', aspectRatio: '1 / 1' }}
     >
-      {!overlay ? (
-        <>
-          <div className="absolute left-1 top-1 text-xs text-slate-400">Top-down</div>
-          <div className="absolute right-1 top-1 text-[0.65rem] text-slate-500">0–{maxLight}</div>
-        </>
-      ) : null}
       <svg width="100%" height="100%" viewBox={`0 0 ${size} ${size}`} preserveAspectRatio="xMidYMid meet" className="mx-auto block">
         <circle cx={centerX} cy={centerY} r={innerCircle} fill="#0f172a" stroke="#334155" strokeWidth="2" />
         <WheelVisual cx={centerX - wheelLineOffset} cy={centerY} current={wheelCurrentLeft} drop={bumps.wheelDropLeft} overcurrent={wheelOver.leftWheel} label="L" />

webui/src/components/UserListPanel/index.jsx

@@ -6,6 +6,7 @@ import { useSessionSelector } from '../../context/SessionContext.jsx';
 import NicknameForm from '../NicknameForm/index.jsx';
 import SocialButtonsGrid from '../SocialButtonsGrid/index.jsx';
 import { roverBadgeStyle, roverNameChromeStyle } from '../../lib/roverColor.js';
+import CardFrame from '../CardFrame/index.jsx';
 
 export function NicknameEntryPanel({ compact = false }) {
   return (
@@ -19,9 +20,9 @@ export function NicknameEntryPanel({ compact = false }) {
 
 export function LinkButtonsPanel() {
   return (
-    <section className="panel-section flex h-full min-h-0 flex-col gap-0.5 text-base">
+    <CardFrame title="Links!" fillHeight bodyClassName="flex flex-1 min-h-0 flex-col gap-0.5 text-base">
       <SocialButtonsGrid className="flex-1 min-h-0" />
-    </section>
+    </CardFrame>
   );
 }
 

webui/src/components/VideoTile/HudOverlay.jsx

@@ -1,178 +0,0 @@
-// Hud Overlay
-// Purpose: Defines the Hud Overlay module and the local helpers/components used in this file.
-// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
-import React from 'react';
-import TopDownMap from '../TopDownMap/index.jsx';
-import { roverNameChromeStyle } from '../../lib/roverColor.js';
-
-function HudOverlay({
-  sensors,
-  label,
-  roverColor = null,
-  status,
-  audioStatus,
-  levelStatus,
-  layoutFormat = 'desktop',
-  variant = 'default',
-  driverLabel = null,
-  showTopDown = false,
-  mobileHud = false,
-  mapPosition = 'top-center',
-  turnTimerText = null,
-  labelScale = 1,
-}) {
-  const isMobile = mobileHud;
-  const portraitMobile = layoutFormat === 'mobile-portrait';
-  const statusTextClass = isMobile ? 'text-[0.45rem]' : 'text-[0.65rem]';
-  const statusPadClass = isMobile ? 'px-0.25 py-0.25' : 'px-1 py-0.5';
-  const labelPadClass = isMobile ? 'px-0.25 py-0.25' : 'px-0.5 py-0.5';
-  const labelTextClass = isMobile ? 'text-[0.55rem]' : 'text-[0.8rem]';
-  const statusPosClass = isMobile ? 'left-0.5 top-0.5' : 'left-1 top-1';
-  const timerTextClass = isMobile ? 'text-[0.5rem]' : 'text-[0.7rem]';
-  const timerPadClass = isMobile ? 'px-0.5 py-0.25' : 'px-1 py-0.5';
-  const telemetryPosClass = isMobile ? 'left-0.5 top-1/2' : 'left-1 top-1/2';
-  const labelPosClass = isMobile ? 'bottom-0.5' : 'bottom-0.5';
-  const labelWrapperStyle = {
-    transform: `translateX(-50%) scale(${labelScale})`,
-    transformOrigin: 'center bottom',
-  };
-  const mapSize = '240px';
-  const mapScale = portraitMobile ? 0.3 : isMobile ? 0.33 : 0.7;
-  const mapOpacity = isMobile ? 0.6 : 0.7;
-  const mapStyle = {
-    width: mapSize,
-    height: mapSize,
-    opacity: mapOpacity,
-    transform: mapPosition === 'top-center' ? `translateX(-50%) scale(${mapScale})` : `scale(${mapScale})`,
-    transformOrigin:
-      mapPosition === 'bottom-left' ? 'bottom left' : mapPosition === 'top-center' ? 'top center' : 'top right',
-    ...(mapPosition === 'bottom-left'
-      ? { left: '0.25rem', bottom: '0.25rem' }
-      : mapPosition === 'top-center'
-        ? { left: '50%', top: '0.25rem' }
-        : { right: '0.25rem', top: '0.25rem' }),
-  };
-
-  if (variant === 'none') {
-    return null;
-  }
-
-  if (variant === 'spectator') {
-    const telemetryEntries = [
-      ['Voltage', sensors?.voltageMv != null ? `${(sensors.voltageMv / 1000).toFixed(2)} V` : '--'],
-      ['Current', sensors?.currentMa != null ? `${sensors.currentMa} mA` : '--'],
-      ['Charge', sensors?.batteryChargeMah != null ? `${sensors.batteryChargeMah}` : '--'],
-      ['OI', sensors?.oiMode?.label || '--'],
-    ];
-    const docked = Boolean(sensors?.chargingSources?.homeBase);
-    const chargingLabel = sensors?.chargingState?.label || '';
-    const charging = Boolean(chargingLabel && chargingLabel.toLowerCase() !== 'not charging');
-    const oiLabel = sensors?.oiMode?.label || 'Unknown';
-    const oiNormalized = oiLabel.toLowerCase();
-    const oiTone =
-      oiNormalized === 'full'
-        ? 'bg-emerald-500/80 text-emerald-50'
-        : oiNormalized === 'safe'
-          ? 'bg-amber-400/80 text-amber-950'
-          : oiNormalized === 'passive'
-            ? 'bg-slate-700/80 text-slate-100'
-            : 'bg-slate-700/60 text-slate-200';
-    const dockTone = docked ? 'bg-emerald-500/80 text-emerald-50' : 'bg-slate-700/70 text-slate-200';
-    const chargingTone = charging
-      ? 'bg-emerald-500/80 text-emerald-50'
-      : docked
-        ? 'bg-amber-400/80 text-amber-950'
-        : 'bg-slate-700/70 text-slate-200';
-    return (
-      <>
-        <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
-          <div className={`absolute ${statusPosClass} font-medium text-slate-100 ${statusTextClass}`}>
-            <div className="flex flex-col gap-0.5 leading-none">
-              <span>Status: {status}</span>
-              {audioStatus ? <span>Audio: {audioStatus}</span> : null}
-              {levelStatus ? <span className="text-cyan-300">{levelStatus}</span> : null}
-            </div>
-          </div>
-          <div
-            className={`absolute ${telemetryPosClass} flex -translate-y-1/2 flex-col gap-0.5 bg-black/70 text-slate-100 ${statusTextClass} ${statusPadClass}`}
-          >
-            <div className="space-y-0.5 leading-tight">
-              <div className="flex flex-col gap-0.5 text-[0.75rem] font-semibold uppercase tracking-wide">
-                <span className={`rounded px-1.5 py-0.5 ${dockTone}`}>{docked ? 'Docked' : 'Undocked'}</span>
-                <span className={`rounded px-1.5 py-0.5 ${chargingTone}`}>
-                  {charging ? 'Charging' : docked ? 'Not charging' : 'Not charging'}
-                </span>
-                <span className={`rounded px-1.5 py-0.5 ${oiTone}`}>OI: {oiLabel}</span>
-              </div>
-              {telemetryEntries.map(([labelText, value]) => (
-                <span key={labelText} className="flex items-center justify-between gap-0.5">
-                  <span className="text-slate-400">{labelText}</span>
-                  <span className="font-semibold text-white">{value}</span>
-                </span>
-              ))}
-            </div>
-          </div>
-
-          <div className={`absolute ${labelPosClass} left-1/2`} style={labelWrapperStyle}>
-            <div
-              className={`flex items-center gap-0.5 bg-black/80 text-slate-100 ${labelPadClass} ${labelTextClass}`}
-            >
-              <span
-                className="font-semibold text-white rounded px-1 py-[1px] border border-transparent"
-                style={roverNameChromeStyle(roverColor, 0.18)}
-              >
-                {label || 'Unnamed Rover'}
-              </span>
-              {driverLabel ? <span className="text-slate-300">• {driverLabel}</span> : null}
-            </div>
-          </div>
-        </div>
-        {showTopDown ? (
-          <div className="pointer-events-none absolute rounded" style={{ ...mapStyle }}>
-            <TopDownMap sensors={sensors} size={240} overlay />
-          </div>
-        ) : null}
-      </>
-    );
-  }
-
-  return (
-    <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
-      <div className={`absolute ${statusPosClass} font-medium text-slate-100 ${statusTextClass}`}>
-        <div className="flex flex-col gap-0.5 leading-none">
-          <span>Status: {status}</span>
-          {audioStatus ? <span>Audio: {audioStatus}</span> : null}
-          {levelStatus ? <span className="text-cyan-300">{levelStatus}</span> : null}
-        </div>
-      </div>
-      {turnTimerText ? (
-        <div
-          className={`absolute left-1/2 top-0.5 -translate-x-1/2 rounded bg-black/70 text-slate-100 ${timerPadClass} ${timerTextClass}`}
-        >
-          {turnTimerText}
-        </div>
-      ) : null}
-      <div className={`absolute ${labelPosClass} left-1/2`} style={labelWrapperStyle}>
-        <div className={`flex gap-0.5 bg-black/80 text-slate-100 ${labelPadClass} ${labelTextClass}`}>
-          <span>
-            Rover:{' '}
-            <span
-              className="rounded px-1 py-[1px] border border-transparent"
-              style={roverNameChromeStyle(roverColor, 0.18)}
-            >
-              "{label || 'Unnamed Rover'}"
-            </span>
-          </span>
-        </div>
-      </div>
-
-      {showTopDown && variant !== 'spectator' ? (
-        <div className="pointer-events-none absolute rounded" style={{ ...mapStyle }}>
-          <TopDownMap sensors={sensors} size={240} overlay />
-        </div>
-      ) : null}
-    </div>
-  );
-}
-
-export default React.memo(HudOverlay);

webui/src/components/VideoTile/LowBatteryOverlay.jsx

@@ -1,28 +0,0 @@
-// Low Battery Overlay
-// Purpose: Defines the Low Battery Overlay module and the local helpers/components used in this file.
-// Scope: Keeps behavior unchanged while isolating this concern into a clear, single-responsibility unit.
-import React from 'react';
-
-function LowBatteryOverlay({ battery, compact = false }) {
-  if (!battery?.available) return null;
-  if (!battery.warnActive && !battery.urgentActive) return null;
-
-  const message = battery.urgentActive
-    ? 'BATTERY VERY LOW, DOCK THE ROVER AND CHARGE IMMEDIATELY!!'
-    : 'Battery low! please dock and charge the rover soon.';
-
-  const containerClass = compact ? 'p-2 top-6' : 'p-4 top-10';
-  const textClass = compact ? 'text-sm' : 'text-2xl';
-
-  return (
-    <div
-      className={`pointer-events-none absolute flex items-center justify-center bg-amber-900/60 left-1/2 -translate-x-1/2 ${containerClass}`}
-    >
-      <div className={`text-center font-semibold text-white animate-pulse ${textClass}`}>
-        <div>{message}</div>
-      </div>
-    </div>
-  );
-}
-
-export default React.memo(LowBatteryOverlay);