@tomorrowos/sdk 0.6.3 → 0.6.7

package/dist/tomorrowos.d.ts

@@ -53,6 +53,8 @@ export interface DeviceListItem {
         version: number;
         publishedAt: string;
     }>;
+    currentPlaylistId: string | null;
+    currentPlaylistName: string | null;
     latestErrorAt: string | null;
     latestErrorMessage: string | null;
 }
@@ -78,6 +80,7 @@ export declare class TomorrowOS extends EventEmitter {
     private readonly devices;
     private readonly pendingDeviceMeta;
     private readonly deviceLogs;
+    private readonly livePlaybackByDevice;
     private httpServer;
     private wss;
     private staticRoot;
@@ -109,6 +112,7 @@ export declare class TomorrowOS extends EventEmitter {
     };
     /** List paired devices with live connection + timing fields for the CMS panel. */
     listDevices(): Promise<DeviceListItem[]>;
+    private refreshLivePlaybackState;
     setDeviceName(deviceId: string, deviceName: string): Promise<{
         deviceId: string;
         deviceName: string;

package/dist/tomorrowos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tomorrowos.d.ts","sourceRoot":"","sources":["../src/tomorrowos.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tomorrowos.d.ts","sourceRoot":"","sources":["../src/tomorrowos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,IAAI,MAAM,MAAM,CAAC;AAYxB,OAAO,EAAE,eAAe,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,EAKV,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAc1B,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,eAAe,CAAC;IACvB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAkED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mEAAmE;IACnE,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,kBAAkB,EAAE,KAAK,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC,CAAC;IACH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAoKD,qBAAa,UAAW,SAAQ,YAAY;IAC1C,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAsC;IACxE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAClE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAGjC;IACJ,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,GAAG,CAAgC;IAC3C,OAAO,CAAC,UAAU,CAAuB;IACzC,OAAO,CAAC,eAAe,CAAgB;gBAE3B,OAAO,EAAE,iBAAiB;IAOtC,yFAAyF;IACnF,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QACxD,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;KACtC,CAAC;YAkBY,iBAAiB;IAY/B,6EAA6E;IACvE,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAiEhE,6EAA6E;IACvE,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC;IA4BvF,OAAO;uBACU,MAAM;sBA/FgC,MAAM;;2BAgGxC,MAAM;sBA9BgC,MAAM;sBAAY,OAAO;;MA+BlF;IAEF,kFAAkF;IAC5E,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YA+DhC,wBAAwB;IAwChC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QACjE,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAwBF,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,gBAAgB;YAkBV,+BAA+B;YAsC/B,iBAAiB;YASjB,iBAAiB;YAoCjB,kBAAkB;IAUhC,uFAAuF;IACvF,OAAO,CAAC,kBAAkB;YAmBZ,gBAAgB;YAMhB,uBAAuB;IAuCrC,MAAM,CAAC,QAAQ,EAAE,MAAM;oBAGD,CAAC,oBACT,MAAM,WACN,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;;IAU5E,OAAO,CAAC,mBAAmB;IA6D3B,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC,MAAM;YAqD7B,iBAAiB;YAiDjB,uBAAuB;IAqFrC,OAAO,CAAC,oBAAoB;YASd,yBAAyB;YAQzB,4BAA4B;YAa5B,iCAAiC;YA4BjC,wBAAwB;YAiBxB,cAAc;IAiD5B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,mBAAmB;YAOb,oBAAoB;YAuCpB,yBAAyB;YAgBzB,uBAAuB;YAcvB,UAAU;YAwUV,gBAAgB;IAqG9B,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,gBAAgB;CA4HzB"}

package/dist/tomorrowos.js

@@ -186,6 +186,7 @@ export class TomorrowOS extends EventEmitter {
     devices = new Map();
     pendingDeviceMeta = new Map();
     deviceLogs = new Map();
+    livePlaybackByDevice = new Map();
     httpServer = null;
     wss = null;
     staticRoot = null;
@@ -312,6 +313,13 @@ export class TomorrowOS extends EventEmitter {
             const connected = this.isDeviceConnected(deviceId);
             const reg = await this.store.getDeviceRegistry(deviceId);
             const assignments = await this.store.getDeviceAssignments(deviceId);
+            if (connected) {
+                await this.refreshLivePlaybackState(deviceId);
+            }
+            else {
+                this.livePlaybackByDevice.delete(deviceId);
+            }
+            const playback = this.livePlaybackByDevice.get(deviceId);
             let screenOnlineActive = false;
             let screenOnlineLabel = "Not active";
             if (connected && record.lastBootAt) {
@@ -333,6 +341,8 @@ export class TomorrowOS extends EventEmitter {
                     version: a.publishedVersion,
                     publishedAt: a.publishedAt
                 })),
+                currentPlaylistId: playback?.playlistId ?? null,
+                currentPlaylistName: playback?.playlistName ?? null,
                 connected,
                 deviceName: record.deviceName ?? null,
                 platform: record.platform ?? null,
@@ -352,6 +362,35 @@ export class TomorrowOS extends EventEmitter {
             };
         }));
     }
+    async refreshLivePlaybackState(deviceId) {
+        const ws = this.devices.get(deviceId);
+        if (!ws || ws.readyState !== WebSocket.OPEN)
+            return;
+        try {
+            const result = await this.sendCommandToSocket(ws, deviceId, "device.info.get", {}, 5_000);
+            if (result.status !== "success" || !result.data || typeof result.data !== "object") {
+                return;
+            }
+            const info = result.data;
+            const playback = info.currentPlayback && typeof info.currentPlayback === "object"
+                ? info.currentPlayback
+                : info;
+            const playlistId = typeof playback.activePlaylistId === "string" && playback.activePlaylistId.trim()
+                ? playback.activePlaylistId.trim()
+                : null;
+            const playlistName = typeof playback.activePlaylistName === "string" && playback.activePlaylistName.trim()
+                ? playback.activePlaylistName.trim()
+                : null;
+            this.livePlaybackByDevice.set(deviceId, {
+                playlistId,
+                playlistName,
+                updatedAt: new Date().toISOString()
+            });
+        }
+        catch {
+            // Best-effort only; keep previous value on intermittent timeouts.
+        }
+    }
     async setDeviceName(deviceId, deviceName) {
         const id = String(deviceId || "").trim();
         if (!id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomorrowos/sdk",
-  "version": "0.6.3",
+  "version": "0.6.7",
   "description": "TomorrowOS CMS server SDK - WebSocket transport, pairing, device commands, optional static CMS UI. Includes CLI (tomorrowos init / build) and starter templates.",
   "type": "module",
   "main": "./dist/index.js",

package/templates/cms-starter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-cms",
-  "version": "0.6.3",
+  "version": "0.6.7",
   "description": "CMS server on @tomorrowos/sdk. Add your UI (React, static files, etc.) alongside this server.",
   "private": true,
   "type": "module",
@@ -10,7 +10,7 @@
     "build-player": "tomorrowos build --platform tizen"
   },
   "dependencies": {
-    "@tomorrowos/sdk": "^0.6.3",
+    "@tomorrowos/sdk": "^0.6.7",
     "dotenv": "^17.2.3"
   },
   "devDependencies": {

package/templates/cms-starter/public/index.html

@@ -129,6 +129,12 @@
         <h2>Publish to device</h2>
         <p class="hint" id="publishModalHint">Select playlists to add to this device. Already-published playlists are not listed here.</p>
         <div id="publishChecklist" class="publish-checklist"></div>
+        <div id="publishStatusShell" class="publish-status hidden" aria-live="polite">
+          <div id="publishStatusText" class="publish-status-text">Working...</div>
+          <div class="upload-progress-track">
+            <div id="publishProgressBar" class="upload-progress-bar"></div>
+          </div>
+        </div>
         <div class="modal-actions">
           <button type="button" id="publishConfirmBtn" class="primary">Publish selected</button>
           <button type="button" data-close-modal="1">Cancel</button>

package/templates/cms-starter/public/methods.js

@@ -17,6 +17,7 @@ let editorItems = [];
 
 /** @type {string|null} */
 let publishModalDeviceId = null;
+let publishInProgress = false;
 /** @type {string|null} */
 let editingDeviceNameId = null;
 /** @type {string} */
@@ -138,8 +139,8 @@ function playlistHasRelativeMediaUrls(playlist) {
 
 /**
  * Base URL sent on publish only when needed.
- * - Hosted (e.g. Replit): use public origin only if items are still relative (/uploads/...).
- * - Local: use saved LAN override only when set; never default to rewriting otherwise.
+ * - Hosted (e.g. Replit): use public origin when items are relative (/uploads/...).
+ * - Local: prefer saved LAN override; otherwise fall back to current origin for dev.
  * - Returns null to omit mediaBaseUrl (playlist already has absolute https URLs).
  */
 function getPublishMediaBaseUrl(selectedPlaylists) {
@@ -152,7 +153,181 @@ function getPublishMediaBaseUrl(selectedPlaylists) {
   if (!isLocalPanelHost(window.location.hostname)) {
     return window.location.origin;
   }
-  return "";
+  // Local dev: same-origin fallback so panel publish/verify works without LAN override.
+  return window.location.origin;
+}
+
+/** Browser-side check URL — always same-origin so localhost panel can reach /uploads. */
+function resolveVerificationMediaUrl(url) {
+  const p = String(url || "").trim();
+  if (!p) return "";
+  if (p.startsWith("/")) return p;
+  try {
+    const parsed = new URL(p);
+    const path = parsed.pathname + parsed.search;
+    if (path.startsWith("/uploads/") || path.startsWith("/screenshots/")) {
+      return path;
+    }
+    return p;
+  } catch {
+    return p;
+  }
+}
+
+function resolvePublishMediaUrl(url, mediaBaseUrl) {
+  const p = String(url || "").trim();
+  if (!p) return "";
+  if (/^https?:\/\//i.test(p)) return p;
+  const base =
+    normalizeMediaBaseUrl(mediaBaseUrl) ||
+    getExplicitLanMediaBase() ||
+    window.location.origin;
+  if (!base) return "";
+  return `${base}${p.startsWith("/") ? p : `/${p}`}`;
+}
+
+async function verifyMediaAssetReachable(url) {
+  if (!url) return { ok: false, reason: "missing URL" };
+
+  const candidates = [];
+  const sameOriginPath = resolveVerificationMediaUrl(url);
+  if (sameOriginPath) candidates.push(sameOriginPath);
+  if (url && url !== sameOriginPath) candidates.push(url);
+
+  let lastReason = "unreachable";
+  for (const target of candidates) {
+    try {
+      // CMS static files are served on GET only (no HEAD / Range support).
+      const res = await fetch(target, { method: "GET", cache: "no-store" });
+      if (res.ok) return { ok: true };
+      lastReason = `HTTP ${res.status}`;
+    } catch (err) {
+      lastReason = err?.message || "network error";
+    }
+  }
+  return { ok: false, reason: lastReason };
+}
+
+async function verifyPlaylistsAssetsReady(playlists, mediaBaseUrl, onProgress) {
+  const tasks = [];
+  for (const pl of playlists) {
+    for (const item of pl.items || []) {
+      const name = String(item?.name || item?.url || "asset").split("/").pop() || "asset";
+      const resolvedUrl = resolveVerificationMediaUrl(item?.url);
+      tasks.push({
+        playlist: pl.name || pl.id,
+        name,
+        url: item?.url,
+        resolvedUrl
+      });
+    }
+  }
+
+  if (tasks.length === 0) {
+    return { ok: false, failures: [{ playlist: "—", name: "—", reason: "no assets in playlist" }] };
+  }
+
+  const failures = [];
+  let done = 0;
+  for (const task of tasks) {
+    onProgress?.(done, tasks.length, task.name);
+    if (!task.resolvedUrl) {
+      failures.push({
+        playlist: task.playlist,
+        name: task.name,
+        reason: "could not resolve media URL"
+      });
+    } else {
+      const result = await verifyMediaAssetReachable(task.resolvedUrl);
+      if (!result.ok) {
+        failures.push({
+          playlist: task.playlist,
+          name: task.name,
+          reason: result.reason || "unreachable"
+        });
+      }
+    }
+    done += 1;
+    onProgress?.(done, tasks.length, task.name);
+  }
+
+  return { ok: failures.length === 0, failures, total: tasks.length };
+}
+
+async function refreshPlaylistsForPublish() {
+  try {
+    const res = await fetch("/playlists");
+    let data = {};
+    try {
+      data = await res.json();
+    } catch {
+      data = {};
+    }
+    if (!res.ok || !Array.isArray(data.playlists)) return false;
+    playlistsCatalog = data.playlists;
+    renderPlaylistCatalog();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function resetPublishModalStatus() {
+  publishInProgress = false;
+  updatePublishStatusUi({ hidden: true });
+  const confirmBtn = document.getElementById("publishConfirmBtn");
+  if (confirmBtn) {
+    confirmBtn.disabled = false;
+    confirmBtn.textContent = "Publish selected";
+  }
+  const modal = document.getElementById("publishModal");
+  modal?.querySelectorAll("[data-close-modal]").forEach((el) => {
+    if (el instanceof HTMLButtonElement) el.disabled = false;
+  });
+  document
+    .querySelectorAll("#publishChecklist input[type=checkbox]")
+    .forEach((el) => {
+      if (el instanceof HTMLInputElement) el.disabled = false;
+    });
+}
+
+function setPublishModalBusy(busy) {
+  publishInProgress = busy;
+  const confirmBtn = document.getElementById("publishConfirmBtn");
+  if (confirmBtn) {
+    confirmBtn.disabled = busy;
+    confirmBtn.textContent = busy ? "Publishing..." : "Publish selected";
+  }
+  document
+    .querySelectorAll("#publishChecklist input[type=checkbox]")
+    .forEach((el) => {
+      if (el instanceof HTMLInputElement) el.disabled = busy;
+    });
+  document.querySelectorAll("#publishModal [data-close-modal]").forEach((el) => {
+    if (el instanceof HTMLButtonElement) el.disabled = busy;
+  });
+}
+
+function updatePublishStatusUi(status) {
+  const shell = document.getElementById("publishStatusShell");
+  const text = document.getElementById("publishStatusText");
+  const bar = document.getElementById("publishProgressBar");
+  if (!shell || !text || !bar) return;
+
+  if (!status || status.hidden) {
+    shell.classList.add("hidden");
+    shell.classList.remove("publish-status--error", "publish-status--success");
+    bar.style.width = "0%";
+    text.textContent = "";
+    return;
+  }
+
+  shell.classList.remove("hidden");
+  shell.classList.toggle("publish-status--error", !!status.isError);
+  shell.classList.toggle("publish-status--success", !!status.isSuccess);
+  text.textContent = status.text || "Working...";
+  const percent = Math.max(0, Math.min(100, Number(status.percent) || 0));
+  bar.style.width = `${percent}%`;
 }
 
 /** Resolve media URLs in the editor (save / thumbnails). */
@@ -664,6 +839,8 @@ function renderDeviceCards() {
 
     const header = document.createElement("div");
     header.className = "device-card-header";
+    const headerMain = document.createElement("div");
+    headerMain.className = "device-card-header-main";
     const led = document.createElement("span");
     led.className = `status-led ${device.connected ? "status-led--online" : "status-led--offline"}`;
     const title = document.createElement("h3");
@@ -672,9 +849,9 @@ function renderDeviceCards() {
     if (isEditingName) {
       const input = document.createElement("input");
       input.type = "text";
+      input.className = "device-card-title-input";
       input.value = editingDeviceNameValue || device.deviceName || "Screen";
       input.placeholder = "Device name";
-      input.style.minWidth = "12rem";
       input.addEventListener("input", (ev) => {
         editingDeviceNameValue = String(ev.target.value || "");
       });
@@ -691,12 +868,42 @@ function renderDeviceCards() {
     } else {
       title.textContent = device.deviceName || "Screen";
     }
-    header.appendChild(led);
-    header.appendChild(title);
+    headerMain.appendChild(led);
+    headerMain.appendChild(title);
+
+    const headerActions = document.createElement("div");
+    headerActions.className = "device-card-header-actions";
+    if (isEditingName) {
+      const saveBtn = document.createElement("button");
+      saveBtn.type = "button";
+      saveBtn.className = "primary";
+      saveBtn.textContent = "Save";
+      saveBtn.addEventListener("click", () =>
+        void submitInlineDeviceRename(device.deviceId)
+      );
+      const cancelBtn = document.createElement("button");
+      cancelBtn.type = "button";
+      cancelBtn.textContent = "Cancel";
+      cancelBtn.addEventListener("click", cancelInlineDeviceRename);
+      headerActions.appendChild(saveBtn);
+      headerActions.appendChild(cancelBtn);
+    } else {
+      const renameBtn = document.createElement("button");
+      renameBtn.type = "button";
+      renameBtn.textContent = "Rename";
+      renameBtn.addEventListener("click", () =>
+        startInlineDeviceRename(device.deviceId, device.deviceName)
+      );
+      headerActions.appendChild(renameBtn);
+    }
+    header.appendChild(headerMain);
+    header.appendChild(headerActions);
 
     const published = document.createElement("ul");
     published.className = "device-published-list";
     const pubs = Array.isArray(device.publishedPlaylists) ? device.publishedPlaylists : [];
+    const activePlaylistId = typeof device.currentPlaylistId === "string" ? device.currentPlaylistId : "";
+    const activePlaylistName = typeof device.currentPlaylistName === "string" ? device.currentPlaylistName : "";
     if (pubs.length === 0) {
       const li = document.createElement("li");
       li.textContent = "No playlists published";
@@ -705,7 +912,17 @@ function renderDeviceCards() {
       for (const p of pubs) {
         const li = document.createElement("li");
         const label = document.createElement("span");
+        label.className = "device-published-label";
         label.textContent = p.name;
+        const isPlaying =
+          (activePlaylistId && p.playlistId === activePlaylistId) ||
+          (!activePlaylistId && activePlaylistName && p.name === activePlaylistName);
+        if (isPlaying) {
+          const playingLight = document.createElement("span");
+          playingLight.className = "playlist-playing-light";
+          playingLight.title = "Currently playing";
+          label.appendChild(playingLight);
+        }
         const rm = document.createElement("button");
         rm.type = "button";
         rm.textContent = "Remove";
@@ -786,26 +1003,6 @@ function renderDeviceCards() {
     latestScreenshotBtn.textContent = "Last screen";
     latestScreenshotBtn.addEventListener("click", () => viewLatestScreenshot(device.deviceId));
 
-    const renameBtn = document.createElement("button");
-    renameBtn.type = "button";
-    if (isEditingName) {
-      renameBtn.className = "primary";
-      renameBtn.textContent = "Save";
-      renameBtn.addEventListener("click", () =>
-        void submitInlineDeviceRename(device.deviceId)
-      );
-    } else {
-      renameBtn.textContent = "Rename";
-      renameBtn.addEventListener("click", () =>
-        startInlineDeviceRename(device.deviceId, device.deviceName)
-      );
-    }
-
-    const cancelRenameBtn = document.createElement("button");
-    cancelRenameBtn.type = "button";
-    cancelRenameBtn.textContent = "Cancel";
-    cancelRenameBtn.addEventListener("click", cancelInlineDeviceRename);
-
     const unpairBtn = document.createElement("button");
     unpairBtn.type = "button";
     unpairBtn.className = "danger";
@@ -820,8 +1017,6 @@ function renderDeviceCards() {
     actions.appendChild(logsBtn);
     actions.appendChild(screenshotBtn);
     actions.appendChild(latestScreenshotBtn);
-    actions.appendChild(renameBtn);
-    if (isEditingName) actions.appendChild(cancelRenameBtn);
     actions.appendChild(unpairBtn);
 
     card.appendChild(header);
@@ -868,15 +1063,24 @@ function openPublishModal(deviceId) {
   }
 
   modal.classList.remove("hidden");
+  resetPublishModalStatus();
 }
 
 function closePublishModal() {
+  if (publishInProgress) return;
   publishModalDeviceId = null;
+  resetPublishModalStatus();
   document.getElementById("publishModal")?.classList.add("hidden");
 }
 
 async function confirmPublishModal() {
-  if (!publishModalDeviceId) return;
+  if (!publishModalDeviceId || publishInProgress) return;
+
+  if (uploadInProgress || uploadQueue.length > 0) {
+    alert("Wait for asset uploads to finish before publishing.");
+    return;
+  }
+
   const ids = [
     ...document.querySelectorAll("#publishChecklist input[type=checkbox]:checked")
   ].map((el) => el.value);
@@ -886,48 +1090,121 @@ async function confirmPublishModal() {
     return;
   }
 
-  const selectedPlaylists = ids
-    .map((id) => playlistsCatalog.find((p) => p.id === id))
-    .filter(Boolean);
+  const deviceId = publishModalDeviceId;
+  setPublishModalBusy(true);
+  updatePublishStatusUi({ hidden: false, text: "Refreshing playlists...", percent: 8 });
 
-  for (const pl of selectedPlaylists) {
-    if (!(pl.items || []).length) {
-      alert(`Playlist "${pl.name || pl.id}" has no assets. Save the playlist first.`);
+  try {
+    const refreshed = await refreshPlaylistsForPublish();
+    if (!refreshed) {
+      updatePublishStatusUi({
+        text: "Could not load playlists from the server.",
+        percent: 0,
+        isError: true
+      });
+      setPublishModalBusy(false);
+      alert("Could not load playlists from the server. Try again.");
       return;
     }
-  }
 
-  const mediaBaseUrl = getPublishMediaBaseUrl(selectedPlaylists);
-  if (mediaBaseUrl === "") {
-    alert(
-      "Local CMS: save a LAN URL under “CMS URL for screens” (e.g. http://192.168.1.105:3000) so TVs can load /uploads paths. On Replit/hosted CMS this field is not required."
+    const selectedPlaylists = ids
+      .map((id) => playlistsCatalog.find((p) => p.id === id))
+      .filter(Boolean);
+
+    if (selectedPlaylists.length !== ids.length) {
+      updatePublishStatusUi({
+        text: "A selected playlist is no longer available.",
+        percent: 0,
+        isError: true
+      });
+      setPublishModalBusy(false);
+      alert("A selected playlist was removed or changed. Close this dialog and open Publish again.");
+      return;
+    }
+
+    for (const pl of selectedPlaylists) {
+      if (!(pl.items || []).length) {
+        updatePublishStatusUi({
+          text: `Playlist "${pl.name || pl.id}" has no assets.`,
+          percent: 0,
+          isError: true
+        });
+        setPublishModalBusy(false);
+        alert(`Playlist "${pl.name || pl.id}" has no assets. Save the playlist first.`);
+        return;
+      }
+    }
+
+    const mediaBaseUrl = getPublishMediaBaseUrl(selectedPlaylists);
+
+    const verification = await verifyPlaylistsAssetsReady(
+      selectedPlaylists,
+      mediaBaseUrl,
+      (done, total, assetName) => {
+        const pct = 12 + Math.round((done / Math.max(total, 1)) * 68);
+        updatePublishStatusUi({
+          text: `Verifying assets (${done}/${total}): ${assetName}`,
+          percent: pct
+        });
+      }
     );
-    return;
-  }
 
-  const device = devicesCache.find((d) => d.deviceId === publishModalDeviceId);
-  const alreadyOnDevice = (device?.publishedPlaylists || []).map((p) => p.playlistId);
-  const playlistIds = [...new Set([...alreadyOnDevice, ...ids])];
+    if (!verification.ok) {
+      const lines = verification.failures
+        .map((f) => `• ${f.playlist} — ${f.name}: ${f.reason}`)
+        .join("\n");
+      updatePublishStatusUi({
+        text: `Could not load ${verification.failures.length} asset(s). Publishing blocked.`,
+        percent: 0,
+        isError: true
+      });
+      setPublishModalBusy(false);
+      alert(`Cannot publish until all playlist assets are reachable:\n\n${lines}`);
+      return;
+    }
 
-  const publishBody = { playlistIds };
-  if (mediaBaseUrl) publishBody.mediaBaseUrl = mediaBaseUrl;
+    updatePublishStatusUi({ text: "Publishing to device...", percent: 88 });
 
-  const res = await fetch(
-    `/device/${encodeURIComponent(publishModalDeviceId)}/assignments`,
-    {
+    const device = devicesCache.find((d) => d.deviceId === deviceId);
+    const alreadyOnDevice = (device?.publishedPlaylists || []).map((p) => p.playlistId);
+    const playlistIds = [...new Set([...alreadyOnDevice, ...ids])];
+
+    const publishBody = { playlistIds };
+    if (mediaBaseUrl) publishBody.mediaBaseUrl = mediaBaseUrl;
+
+    const res = await fetch(`/device/${encodeURIComponent(deviceId)}/assignments`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(publishBody)
+    });
+    const data = await res.json();
+    showResult({ deviceId, publish: data });
+
+    if (!res.ok) {
+      updatePublishStatusUi({
+        text: data.error || "Publish failed",
+        percent: 0,
+        isError: true
+      });
+      setPublishModalBusy(false);
+      alert(data.error || "Publish failed");
+      return;
     }
-  );
-  const data = await res.json();
-  showResult({ deviceId: publishModalDeviceId, publish: data });
-  if (!res.ok) {
-    alert(data.error || "Publish failed");
-    return;
+
+    updatePublishStatusUi({ text: "Published successfully!", percent: 100, isSuccess: true });
+    await fetchDevices();
+    await new Promise((resolve) => setTimeout(resolve, 900));
+    publishInProgress = false;
+    closePublishModal();
+  } catch (err) {
+    updatePublishStatusUi({
+      text: err?.message || "Publish failed",
+      percent: 0,
+      isError: true
+    });
+    setPublishModalBusy(false);
+    alert(err?.message || "Publish failed");
   }
-  closePublishModal();
-  await fetchDevices();
 }
 
 async function removePlaylistFromDevice(deviceId, playlistId) {

package/templates/cms-starter/public/panel.css

@@ -141,15 +141,45 @@ body {
 .device-card-header {
   display: flex;
   align-items: center;
-  gap: 0.5rem;
+  justify-content: space-between;
+  gap: 0.35rem;
   margin-bottom: 0.65rem;
 }
 
+.device-card-header-main {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  min-width: 0;
+  flex: 1;
+}
+
+.device-card-header-actions {
+  display: flex;
+  align-items: center;
+  gap: 0.35rem;
+  flex-shrink: 0;
+}
+
+.device-card-header-actions button {
+  font-size: 0.78rem;
+  padding: 0.35rem 0.6rem;
+}
+
 .device-card-title {
   margin: 0;
   font-size: 0.95rem;
   font-weight: 600;
   line-height: 1.2;
+  min-width: 0;
+  flex: 1;
+}
+
+.device-card-title-input {
+  width: 100%;
+  min-width: 0;
+  font-size: 0.95rem;
+  font-weight: 600;
 }
 
 .status-led {
@@ -455,6 +485,21 @@ button.danger {
   margin-bottom: 0.25rem;
 }
 
+.device-published-label {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.35rem;
+}
+
+.playlist-playing-light {
+  width: 9px;
+  height: 9px;
+  border-radius: 50%;
+  background: #12b76a;
+  box-shadow: 0 0 7px rgba(18, 183, 106, 0.65);
+  flex-shrink: 0;
+}
+
 .modal {
   position: fixed;
   inset: 0;
@@ -501,6 +546,48 @@ button.danger {
   font-size: 0.9rem;
 }
 
+.publish-status {
+  margin-top: 0.85rem;
+  padding: 0.55rem 0.6rem;
+  border: 1px solid #e4e1dc;
+  border-radius: 8px;
+  background: #fafaf9;
+}
+
+.publish-status-text {
+  font-size: 0.82rem;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 0.35rem;
+}
+
+.publish-status--error {
+  border-color: #fecdca;
+  background: #fff5f5;
+}
+
+.publish-status--error .publish-status-text {
+  color: #b42318;
+}
+
+.publish-status--success {
+  border-color: #abefc6;
+  background: #f3fcf6;
+}
+
+.publish-status--success .publish-status-text {
+  color: #067647;
+}
+
+.publish-status--success .upload-progress-bar {
+  background: #12b76a;
+}
+
+.modal-actions button:disabled {
+  opacity: 0.55;
+  cursor: not-allowed;
+}
+
 .modal-actions {
   display: flex;
   gap: 0.5rem;