gonna break stuff now

server/src/services/turnService/display.js

@@ -1,3 +1,4 @@
+const { describeQueue } = require('./queueDisplay');
 const { TURN_DURATION_MS, IDLE_TIMEOUT_MS } = require('./constants');
 
 const labels = {
@@ -16,7 +17,7 @@ const labels = {
 };
 
 // Build this from visibility-filtered session data so private rover state stays private.
-function buildRoverTurn({ rover, mode, socketId, turnInfo, activeDriverId }) {
+function buildRoverTurn({ rover, mode, socketId, turnInfo, activeDriverId, users }) {
   const queue = turnInfo?.queue || [];
   // Direct ownership can arrive before queue details on load/reconnect.
   const currentDriverId = activeDriverId || turnInfo?.current || null;
@@ -26,6 +27,10 @@ function buildRoverTurn({ rover, mode, socketId, turnInfo, activeDriverId }) {
   const turnsAhead = enabled ? (userIndex - currentIndex + queue.length) % queue.length : null;
   return {
     target: { id: rover.id, name: rover.name, color: rover.color, fallback: rover.id },
+    ...describeQueue(queue, currentDriverId),
+    userLabels: Object.fromEntries(queue.map((id) => [id,
+      users.find((user) => user.socketId === id)?.nickname || id,
+    ])),
     enabled,
     isActive: turnsAhead === 0,
     turnsAhead,

server/src/services/turnService/index.js

@@ -1,6 +1,7 @@
 // turn Service
 // Purpose: Defines the turn Service module and the helpers/state used by this service unit.
 // Scope: Keeps runtime behavior unchanged while isolating responsibilities into a clear module boundary.
+const { describeQueue } = require('./queueDisplay');
 const io = require('../../globals/io');
 const { sendAlert } = require('../alertService');
 const { MODES, getMode, modeEvents } = require('../modeManager');
@@ -431,7 +432,7 @@ function getTurnQueues() {
   driverQueues.forEach((queue, roverId) => {
     payload[roverId] = {
       mode,
-      queue: Array.from(queue.queue),
+      ...describeQueue(Array.from(queue.queue), queue.current),
       current: queue.current,
       deadline: turnDeadlines.get(roverId) || null,
       idleDeadline: idleDeadlines.get(roverId) || null,

server/src/services/turnService/queueDisplay.js

@@ -0,0 +1,10 @@
+// Shared display ordering only; each service still owns its queue policy.
+function describeQueue(queue, currentId) {
+  const currentIndex = currentId ? queue.indexOf(currentId) : -1;
+  const nextId = queue.length > 1
+    ? queue[(currentIndex + 1) % queue.length]
+    : null;
+  return { queue, currentId, nextId };
+}
+
+module.exports = { describeQueue };