Update README with new features and improvements

Added new features including a compact topbar layout and side panel button toggles.

README.md

@@ -11,8 +11,10 @@ A lightweight, high-performance ComfyUI extension that replaces the cluttered st
 * **Quick Save Buttons**: Dedicated interactive shortcuts appear on hover, allowing you to instantly download generation outputs or export exact workflow JSON files with a single click.
 * **Compact Adaptive Design**: A clean, smart layout that automatically balances single or multi-column grids based on your sidebar width. It maximizes viewable content and respects your active screen area without wasting precious space.
 * **Live Queue Tracking**: Stay informed on your server state. Includes a visual progress bar that tracks generations dynamically and displays the exact node title currently being executed.
+* **[NEW]** A compact topbar layout displaying both workflow tabs and the control panel on a single unified top bar. See the 'Comfy Layout' toggle in the settings.
+* **[NEW]** Added toggles to hide buttons you don't need from the side panel.
 
-<img width="287" height="685" alt="image" src="https://github.com/user-attachments/assets/ab414a37-d585-4bcb-aade-cf20ab5b24d8" />
+<img width="385" height="336" alt="image" src="https://github.com/user-attachments/assets/743fbf85-9281-4561-9dd0-cd9af4d8c0e4" />
 
 
 ## 🛠️ Installation

js/layout.js

@@ -0,0 +1,349 @@
+// layout.js - Variant 1 (Media Queries) with Properties Panel Toggle Fix, Indicator Filter & Sidebar Visibility
+import { app } from "/scripts/app.js";
+
+const STYLE_ID = "comfy-sidebar-classic-layout-override";
+
+const CLASSIC_LAYOUT_CSS_MEDIA = `
+/* Style and align the custom plugins bar (Manager, LoRA, etc.) */
+[class*="actionbar"]:not(.actionbar),
+[class*="actionbar-buttons"],
+.actionbar-buttons {
+    position: fixed !important;
+    top: -5px !important; 
+    right: 4px !important; 
+    left: auto !important;
+    transform: none !important;
+    z-index: 1010 !important;
+
+    /* Nuke the background rectangle, border, and shadows */
+    background: transparent !important;
+    border: none !important;
+    box-shadow: none !important;
+    padding: 0 !important;
+    margin: 0 !important;
+    display: flex !important;
+    align-items: center !important;
+}
+
+/* Base rules: Large/Wide desktop screens (>= 1600px width) */
+.p-tabview-nav-content,
+[class*="tabview"] {
+    padding-left: 150px !important;
+    padding-right: 580px !important; 
+}
+
+/* Medium desktop screens (between 1200px and 1599px width) */
+@media (max-width: 1599px) {
+    .p-tabview-nav-content,
+    [class*="tabview"] {
+        padding-left: 100px !important;
+        padding-right: 420px !important; 
+    }
+}
+
+/* Standard laptops / small monitors (between 900px and 1199px width) */
+@media (max-width: 1199px) {
+    .p-tabview-nav-content,
+    [class*="tabview"] {
+        padding-left: 40px !important;
+        padding-right: 280px !important; 
+    }
+}
+
+/* Very narrow or heavily zoomed displays (< 900px width) */
+@media (max-width: 899px) {
+    .p-tabview-nav-content,
+    [class*="tabview"] {
+        padding-left: 10px !important;
+        padding-right: 180px !important; 
+    }
+}
+`;
+
+export function applyClassicLayout(enable) {
+    let styleEl = document.getElementById(STYLE_ID);
+    
+    if (enable) {
+        if (app.ui && app.ui.settings) {
+            app.ui.settings.setSettingValue("Comfy.Workflow.WorkflowTabsPosition", "Topbar");
+        }
+
+        if (!styleEl) {
+            styleEl = document.createElement("style");
+            styleEl.id = STYLE_ID;
+            document.head.appendChild(styleEl);
+        }
+        styleEl.textContent = CLASSIC_LAYOUT_CSS_MEDIA;
+
+    } else {
+        if (styleEl) styleEl.remove();
+        
+        if (app.ui && app.ui.settings) {
+            app.ui.settings.setSettingValue("Comfy.Workflow.WorkflowTabsPosition", "Sidebar");
+        }
+    }
+}
+
+/* --- Properties Panel Toggle Inline Correction --- */
+
+let savedButtonData = null;
+
+function findOriginalButton() {
+    const icon = document.querySelector('[class*="lucide--panel-right"], [class*="lucide--panel-left"]');
+    if (icon) {
+        const btn = icon.closest('button, [role="button"], .comfyui-menu-item, .p-button');
+        if (btn && !btn.classList.contains("comfy-sidebar-custom-properties-toggle")) {
+            return btn;
+        }
+    }
+    return null;
+}
+
+function findTopbarContainer() {
+    const container = document.querySelector('[class*="actionbar-buttons"], .actionbar-buttons, [class*="actionbar"]');
+    if (container) return container;
+    
+    const orig = findOriginalButton();
+    if (orig && orig.parentNode) return orig.parentNode;
+    
+    const buttons = document.querySelectorAll("button, .p-button");
+    for (const btn of buttons) {
+        if (btn.classList.contains("comfy-sidebar-custom-properties-toggle")) continue;
+        const title = (btn.getAttribute("title") || btn.getAttribute("aria-label") || "").toLowerCase();
+        if (title.includes("run") || title.includes("queue") || title.includes("manager")) {
+            if (btn.parentNode) return btn.parentNode;
+        }
+    }
+    return null;
+}
+
+function isPropertiesPanelOpen() {
+    const icon = document.querySelector('[class*="lucide--panel-right"], [class*="lucide--panel-left"]');
+    return !!(icon && icon.className.includes("lucide--panel-left"));
+}
+
+function findActiveQueueIndicator() {
+    const container = findTopbarContainer();
+    if (!container) return null;
+    
+    const buttons = container.querySelectorAll("button, .p-button, .comfyui-menu-item");
+    for (const btn of buttons) {
+        if (btn.classList.contains("comfy-sidebar-custom-properties-toggle")) continue;
+        
+        const text = (btn.textContent || "").toLowerCase();
+        if (text.includes("active") || text.includes("queued") || text.includes("running") || text.includes("pending")) {
+            return btn;
+        }
+    }
+    return null;
+}
+
+function updateSidebarTabsVisibility() {
+    const sidebar = document.querySelector('.comfyui-sidebar, .comfy-sidebar, .sidebar, [class*="sidebar-nav"], [class*="sidebar"]');
+    if (!sidebar) return;
+
+    // Direct mapping from tab settings to their unique class-based HTML icon tags
+    const tabIconSelectors = {
+        "Assets": '[class*="comfy--image-ai-edit"]',
+        "Nodes": '[class*="comfy--node"]',
+        "Models": '[class*="comfy--ai-model"]',
+        "Workflows": '[class*="comfy--workflow"]',
+        "Apps": '[class*="lucide--panels-top-left"]',
+        "NodesMap": '[class*="pi-sitemap"]',
+        "Templates": '[class*="comfy--template"]'
+    };
+
+    Object.entries(tabIconSelectors).forEach(([tab, selector]) => {
+        const shouldHide = app.ui?.settings?.getSettingValue(`Comfy Sidebar.Hide Sidebar Tabs.${tab}`) ?? false;
+        
+        // Find the specific icon element inside the sidebar
+        const icon = sidebar.querySelector(selector);
+        if (icon) {
+            // Find its closest parent button or tab item wrapper
+            const tabBtn = icon.closest('.comfyui-sidebar-tab, button, [role="tab"], li, a, .comfyui-sidebar-item') || icon;
+            
+            if (shouldHide) {
+                if (tabBtn.style.display !== "none") {
+                    tabBtn.style.setProperty("display", "none", "important");
+                }
+            } else {
+                if (tabBtn.style.display === "none") {
+                    tabBtn.style.removeProperty("display");
+                }
+            }
+        }
+    });
+
+    // 4. Handle "Override Stock Job History Tab" using its exact icon selector
+    const hideStockHistory = app.ui?.settings?.getSettingValue("Comfy Sidebar.Hide Sidebar Tabs.Override Stock Job History Tab") ?? false;
+    const historyIcon = sidebar.querySelector('[class*="lucide--history"]');
+    if (historyIcon) {
+        const historyBtn = historyIcon.closest('.comfyui-sidebar-tab, button, [role="tab"], li, a, .comfyui-sidebar-item') || historyIcon;
+        if (hideStockHistory) {
+            if (historyBtn.style.display !== "none") {
+                historyBtn.style.setProperty("display", "none", "important");
+            }
+        } else {
+            if (historyBtn.style.display === "none") {
+                historyBtn.style.removeProperty("display");
+            }
+        }
+    }
+}
+
+export function setupPropertiesPanelToggleFix() {
+    const style = document.createElement("style");
+    style.textContent = `
+        /* Hide native button completely */
+        .comfy-sidebar-hide-original-properties-btn {
+            display: none !important;
+        }
+
+        /* Spacing when the properties panel is CLOSED */
+        .comfy-sidebar-custom-properties-toggle {
+            margin-left: -8px !important;
+            margin-right: 0px !important;
+            display: inline-flex !important;
+            align-items: center !important;
+            justify-content: center !important;
+            padding: 0 !important; /* Forces perfect centering of the icon */
+        }
+
+        /* Spacing when the properties panel is OPEN */
+        .comfy-sidebar-custom-properties-toggle.comfy-panel-open {
+            margin-left: 0px !important;
+            margin-right: 0px !important;
+            display: inline-flex !important;
+            align-items: center !important;
+            justify-content: center !important;
+            padding: 0 !important; /* Forces perfect centering of the icon */
+        }
+    `;
+    document.head.appendChild(style);
+
+    function frameLoop() {
+        const isClassicLayoutEnabled = app.ui?.settings?.getSettingValue("Comfy Sidebar.Classic Layout") ?? false;
+
+        // If Classic Layout is disabled, cleanly restore stock elements and exit early
+        if (!isClassicLayoutEnabled) {
+            const originalBtn = findOriginalButton();
+            if (originalBtn && originalBtn.classList.contains("comfy-sidebar-hide-original-properties-btn")) {
+                originalBtn.classList.remove("comfy-sidebar-hide-original-properties-btn");
+            }
+
+            const customBtn = document.querySelector(".comfy-sidebar-custom-properties-toggle");
+            if (customBtn) {
+                customBtn.remove();
+            }
+
+            const indicator = findActiveQueueIndicator();
+            if (indicator && indicator.style.display === "none") {
+                indicator.style.removeProperty("display");
+            }
+
+            updateSidebarTabsVisibility();
+
+            requestAnimationFrame(frameLoop);
+            return;
+        }
+
+        // --- Active Classic Layout Toggle Correction ---
+        const originalBtn = findOriginalButton();
+        const container = findTopbarContainer();
+        const openState = isPropertiesPanelOpen();
+
+        // 1. Capture original template data when native button is alive
+        if (originalBtn) {
+            if (!originalBtn.classList.contains("comfy-sidebar-hide-original-properties-btn")) {
+                originalBtn.classList.add("comfy-sidebar-hide-original-properties-btn");
+            }
+
+            savedButtonData = {
+                className: originalBtn.className.replace("comfy-sidebar-hide-original-properties-btn", "").trim(),
+                innerHTML: originalBtn.innerHTML,
+                tagName: originalBtn.tagName,
+                attributes: Array.from(originalBtn.attributes).map(attr => ({
+                    name: attr.name,
+                    value: attr.value
+                }))
+            };
+        }
+
+        let customBtn = document.querySelector(".comfy-sidebar-custom-properties-toggle");
+
+        // 2. Build and insert our custom button inside topbar
+        if (!customBtn && savedButtonData && container) {
+            customBtn = document.createElement(savedButtonData.tagName);
+            
+            customBtn.className = savedButtonData.className + " comfy-sidebar-custom-properties-toggle";
+            customBtn.innerHTML = savedButtonData.innerHTML;
+
+            for (const attr of savedButtonData.attributes) {
+                if (attr.name !== "class" && attr.name !== "id" && attr.name !== "style") {
+                    customBtn.setAttribute(attr.name, attr.value);
+                }
+            }
+
+            // Standard inline rendering
+            Object.assign(customBtn.style, {
+                position: "relative",
+                zIndex: "1000", 
+                margin: "0",
+                boxSizing: "border-box",
+                opacity: "1",
+                pointerEvents: "auto",
+                display: "inline-flex"
+            });
+
+            customBtn.addEventListener("click", (e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                
+                const nativeBtn = findOriginalButton();
+                if (nativeBtn) nativeBtn.click();
+            });
+
+            container.appendChild(customBtn);
+        } else if (customBtn && container && container.lastChild !== customBtn) {
+            container.appendChild(customBtn);
+        }
+
+        // 3. Keep the state-specific CSS classes synchronized
+        if (customBtn) {
+            if (openState) {
+                if (!customBtn.classList.contains("comfy-panel-open")) {
+                    customBtn.classList.add("comfy-panel-open");
+                }
+            } else {
+                if (customBtn.classList.contains("comfy-panel-open")) {
+                    customBtn.classList.remove("comfy-panel-open");
+                }
+            }
+            customBtn.style.display = "inline-flex";
+        }
+
+        // 4. Handle "0 active" indicator visibility based on user settings (Sub-grouped Path)
+        const hideQueueIndicator = app.ui?.settings?.getSettingValue("Comfy Sidebar.Hide Sidebar Tabs.Override Stock Job History Tab") ?? false;
+        const indicator = findActiveQueueIndicator();
+        if (indicator) {
+            if (hideQueueIndicator) {
+                if (indicator.style.display !== "none") {
+                    indicator.style.setProperty("display", "none", "important");
+                }
+            } else {
+                if (indicator.style.display === "none") {
+                    indicator.style.removeProperty("display");
+                }
+            }
+        }
+
+        // 5. Update Sidebar tab elements visibility
+        updateSidebarTabsVisibility();
+
+        // Run checking loop continuously synced with screen refresh cycles
+        requestAnimationFrame(frameLoop);
+    }
+
+    // Start loop synced with the screen rendering rate
+    requestAnimationFrame(frameLoop);
+}

js/queue.js

@@ -92,6 +92,20 @@ export function setupApiListeners() {
     api.addEventListener("status", syncQueue);
     
     api.addEventListener("execution_start", (e) => {
+        // Auto-sweep cancelled and errored jobs if setting is enabled
+        if (app.ui.settings.getSettingValue("Comfy Sidebar.Auto Clear Interrupted") ?? false) {
+            const toDelete = [];
+            for (const [p, s] of promptStates.entries()) {
+                if (s.status === "cancelled" || s.status === "error") {
+                    toDelete.push(p);
+                    promptStates.delete(p);
+                }
+            }
+            if (toDelete.length > 0) {
+                api.fetchApi("/history", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ delete: toDelete }) }).catch(()=>{});
+            }
+        }
+
         const pid = e.detail.prompt_id;
         State.currentlyActivePromptId = pid; 
         const activeWorkspaceWorkflow = app.graph.serialize();

js/sidebar.js

@@ -1,8 +1,10 @@
+// sidebar.js
 import { app } from "/scripts/app.js";
 import { injectStyles } from "./styles.js";
 import { setupDragAndDrop } from "./dragdrop.js";
 import { setupSidebarUI, applySidebarOverride, findOurSidebarButton, setSyncQueue, updateSidebarBadge, renderDOM } from "./ui.js";
 import { setupApiListeners, initSessionAndHistory, syncQueue, setUIDependencies } from "./queue.js";
+import { applyClassicLayout, setupPropertiesPanelToggleFix } from "./layout.js"; // Import properties panel fix
 
 app.registerExtension({
     name: "ComfySidebar.ClassicRestore",
@@ -12,12 +14,51 @@ app.registerExtension({
         app.ui.settings.addSetting({ id: "Comfy Sidebar.Keep Object Aspect Ratio", name: "If disabled, cards in the queue will be cropped to the same size.", type: "boolean", defaultValue: true });
         app.ui.settings.addSetting({ id: "Comfy Sidebar.Show Pending Count Only", name: "If disabled, each queued job will have a separate individual card", type: "boolean", defaultValue: true });
         app.ui.settings.addSetting({ id: "Comfy Sidebar.Show Working Node Name", name: "Shows the name of the node which is currently in the process", type: "boolean", defaultValue: true });
-        app.ui.settings.addSetting({ id: "Comfy Sidebar.Override Stock Job History Tab", name: "Replaces the stock Job History sidebar with Comfy Queue", type: "boolean", defaultValue: false });
+        
+        // Settings toggle for Auto-clear Interrupted runs
+        app.ui.settings.addSetting({ id: "Comfy Sidebar.Auto Clear Interrupted", name: "Auto-clear cancelled & failed jobs on new generation", type: "boolean", defaultValue: false });
+
+        // Add settings to hide individual sidebar tabs under a shared sub-category group
+        const sidebarTabs = ["Assets", "Nodes", "Models", "Workflows", "Apps", "NodesMap", "Templates"];
+        sidebarTabs.forEach(tab => {
+            app.ui.settings.addSetting({
+                id: `Comfy Sidebar.Hide Sidebar Tabs.${tab}`,
+                name: `Hide Tab: ${tab}`,
+                type: "boolean",
+                defaultValue: false
+            });
+        });
+
+        // Group the Stock History Tab override into the same sub-category group
+        app.ui.settings.addSetting({ 
+            id: "Comfy Sidebar.Hide Sidebar Tabs.Override Stock Job History Tab", 
+            name: "Replaces the stock Job History sidebar with Comfy Queue", 
+            type: "boolean", 
+            defaultValue: false 
+        });
+
+        // Add the toggle setting for Classic / Comfy Layout
+        app.ui.settings.addSetting({
+            id: "Comfy Sidebar.Comfy Layout",
+            name: "Places the controls and the open workflow tabs on a single unified top bar",
+            type: "boolean",
+            defaultValue: false,
+            onChange: (value) => {
+                applyClassicLayout(value);
+            }
+        });
     },
 
     async setup() {
         if (!app.extensionManager || !app.extensionManager.registerSidebarTab) return;
 
+        // Apply saved layout configuration on startup
+        const isClassicLayoutEnabled = app.ui.settings.getSettingValue("Comfy Sidebar.Comfy Layout") ?? false;
+        applyClassicLayout(isClassicLayoutEnabled);
+
+        // Run properties panel toggle correction
+        setupPropertiesPanelToggleFix();
+
         // Safely resolve circular dependencies using Dependency Injection Hooks
         setSyncQueue(syncQueue);
         setUIDependencies(renderDOM, updateSidebarBadge);

js/styles.js

@@ -1,3 +1,4 @@
+// styles.js
 export function injectStyles() {
     const style = document.createElement("style");
     style.textContent = `
@@ -15,13 +16,43 @@ export function injectStyles() {
         .comfy-sidebar-card.pending { --border-color: #6c757d; --hover-color: #adb5bd; }
         .comfy-sidebar-card.cancelled { --border-color: #ffc107; --hover-color: #ffe082; }
         .comfy-sidebar-card.error { --border-color: #dc3545; --hover-color: #f87171; }
-        .comfy-sidebar-card.pending .pi-times { display: none !important; }
-        .comfy-sidebar-card.pending:hover .pi-times { display: flex !important; }
+        
+        .comfy-sidebar-card.pending .comfy-sidebar-queue-cancel-btn,
+        .comfy-sidebar-card.active .comfy-sidebar-queue-cancel-btn { 
+            display: none !important; 
+        }
+
+        .comfy-sidebar-card.pending:hover .comfy-sidebar-queue-cancel-btn,
+        .comfy-sidebar-card.active:hover .comfy-sidebar-queue-cancel-btn { 
+            display: flex !important; 
+        }
+        
         .comfy-sidebar-card-timer {
             position: absolute; top: 6px; left: 8px; font-size: 10px;
             font-family: monospace; opacity: 0.7; background: rgba(0, 0, 0, 0.6);
             padding: 2px 4px; border-radius: 3px; pointer-events: none; z-index: 5; color: #fff;
         }
+
+        /* --- Custom Queue Cancel Button to Mimic ComfyUI Native Destructive Button --- */
+        .comfy-sidebar-queue-cancel-btn {
+            display: none;
+            align-items: center !important;
+            justify-content: center !important;
+            width: 32px !important;
+            height: 32px !important;
+            background-color: #7f1d1d !important; /* Native deep red */
+            color: #e2e8f0 !important; /* Native slate white icon */
+            font-size: 11px !important; /* Muted native cross size */
+            border-radius: 6px !important; /* Native corner rounding */
+            cursor: pointer !important;
+            transition: background-color 0.15s ease, color 0.15s ease !important;
+            box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3) !important;
+        }
+
+        .comfy-sidebar-queue-cancel-btn:hover {
+            background-color: #991b1b !important; /* Slightly brighter red on hover */
+            color: #ffffff !important;
+        }
     `;
     document.head.appendChild(style);
 }

js/ui.js

@@ -85,7 +85,7 @@ export const findStandardQueueButton = () => {
 };
 
 export const applySidebarOverride = () => {
-    const overrideStock = app.ui.settings.getSettingValue("Comfy Sidebar.Override Stock Job History Tab") ?? false;
+    const overrideStock = app.ui.settings.getSettingValue("Comfy Sidebar.Hide Sidebar Tabs.Override Stock Job History Tab") ?? false;
     const stdBtn = findStandardQueueButton();
     const ourBtn = findOurSidebarButton();
     
@@ -146,45 +146,70 @@ export function setupSidebarUI() {
     titleGroup.appendChild(title);
     standardHeader.appendChild(titleGroup);
 
-    const clearHistoryBtn = document.createElement("button");
-    clearHistoryBtn.textContent = "Clear History";
-    Object.assign(clearHistoryBtn.style, {
-        background: "transparent", color: "var(--desc-color, #aaa)", border: "1px solid var(--border-color, #555)",
-        borderRadius: "3px", padding: "3px 8px", cursor: "pointer", fontSize: "11px", fontWeight: "bold", transition: "all 0.15s ease-in-out"
-    });
+    // Dynamic Compact Actions Group
+    const actionsGroup = document.createElement("div");
+    Object.assign(actionsGroup.style, { display: "flex", gap: "6px", alignItems: "center" });
 
-    let clearHistoryTimeout = null, isClearHistoryPending = false;
-    const resetClearHistoryBtn = () => {
-        isClearHistoryPending = false;
-        clearHistoryBtn.textContent = "Clear History";
-        Object.assign(clearHistoryBtn.style, { color: "var(--desc-color, #aaa)", background: "transparent", borderColor: "var(--border-color, #555)", boxShadow: "none" });
-        if (clearHistoryTimeout) { clearTimeout(clearHistoryTimeout); clearHistoryTimeout = null; }
+    const createActionBtn = (iconClass, tooltip, hoverColor, onClickFn) => {
+        const btn = document.createElement("button");
+        btn.className = iconClass;
+        btn.title = tooltip;
+        Object.assign(btn.style, {
+            background: "transparent", color: "var(--desc-color, #aaa)", border: "1px solid var(--border-color, #555)",
+            borderRadius: "3px", padding: "4px 8px", cursor: "pointer", fontSize: "13px", transition: "all 0.15s ease-in-out"
+        });
+
+        let timeout = null, isPending = false;
+        const reset = () => {
+            isPending = false;
+            Object.assign(btn.style, { color: "var(--desc-color, #aaa)", background: "transparent", borderColor: "var(--border-color, #555)", boxShadow: "none" });
+            if (timeout) { clearTimeout(timeout); timeout = null; }
+        };
+
+        btn.onmouseenter = () => { if (!isPending) { btn.style.borderColor = "var(--fg-color, #eee)"; btn.style.color = "var(--fg-color, #eee)"; } };
+        btn.onmouseleave = () => { if (!isPending) { btn.style.borderColor = "var(--border-color, #555)"; btn.style.color = "var(--desc-color, #aaa)"; } };
+
+        btn.onclick = async (ev) => {
+            ev.stopPropagation();
+            if (!isPending) {
+                isPending = true;
+                Object.assign(btn.style, { color: "#fff", background: hoverColor, borderColor: hoverColor, boxShadow: `0 0 8px ${hoverColor}80` });
+                timeout = setTimeout(reset, 1500); // 1.5s to confirm
+            } else {
+                reset();
+                await onClickFn();
+            }
+        };
+        return btn;
     };
 
-    clearHistoryBtn.addEventListener("mouseenter", () => {
-        if (!isClearHistoryPending) { clearHistoryBtn.style.borderColor = "var(--fg-color, #eee)"; clearHistoryBtn.style.color = "var(--fg-color, #eee)"; }
-    });
-    clearHistoryBtn.addEventListener("mouseleave", () => {
-        if (!isClearHistoryPending) { clearHistoryBtn.style.borderColor = "var(--border-color, #555)"; clearHistoryBtn.style.color = "var(--desc-color, #aaa)"; }
-    });
-
-    clearHistoryBtn.onclick = async (ev) => {
-        ev.stopPropagation();
-        if (!isClearHistoryPending) {
-            isClearHistoryPending = true;
-            clearHistoryBtn.textContent = "Confirm?";
-            Object.assign(clearHistoryBtn.style, { color: "#fff", background: "#dc3545", borderColor: "#dc3545", boxShadow: "0 0 8px rgba(220, 53, 69, 0.6)" });
-            clearHistoryTimeout = setTimeout(resetClearHistoryBtn, 1500);
-        } else {
-            resetClearHistoryBtn();
-            for (const [pid, state] of promptStates.entries()) {
-                if (state.status !== "pending" && state.status !== "active") { promptStates.delete(pid); cardElements.delete(pid); }
+    const btnClearInterrupted = createActionBtn("pi pi-eraser", "Clear Cancelled & Failed", "#ffc107", async () => {
+        const toDelete = [];
+        for (const [pid, state] of promptStates.entries()) {
+            if (state.status === "cancelled" || state.status === "error") {
+                toDelete.push(pid);
+                promptStates.delete(pid);
             }
-            try { await api.fetchApi("/history", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ clear: true }) }); } catch (err) {}
+        }
+        if (toDelete.length > 0) {
+            try { await api.fetchApi("/history", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ delete: toDelete }) }); } catch (err) {}
             renderDOM();
         }
-    };
-    standardHeader.appendChild(clearHistoryBtn);
+    });
+
+    const btnClearAll = createActionBtn("pi pi-trash", "Clear All History", "#dc3545", async () => {
+        for (const [pid, state] of promptStates.entries()) {
+            if (state.status !== "pending" && state.status !== "active") {
+                promptStates.delete(pid);
+            }
+        }
+        try { await api.fetchApi("/history", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ clear: true }) }); } catch (err) {}
+        renderDOM();
+    });
+
+    actionsGroup.appendChild(btnClearInterrupted);
+    actionsGroup.appendChild(btnClearAll);
+    standardHeader.appendChild(actionsGroup);
 
     const searchContainer = document.createElement("div");
     Object.assign(searchContainer.style, { display: "none", width: "100%", alignItems: "center", background: "var(--comfy-input-bg, #181818)", border: "1px solid var(--border-color, #555)", borderRadius: "4px", padding: "2px 8px", boxSizing: "border-box", height: "26px" });
@@ -257,12 +282,23 @@ export function renderDOM() {
             if (!cardObj) {
                 const card = document.createElement("div");
                 const timerEl = document.createElement("div"); timerEl.className = "comfy-sidebar-card-timer";
-                const cancelX = document.createElement("span"); cancelX.className = "pi pi-times";
-                Object.assign(cancelX.style, { position: "absolute", top: "4px", right: "4px", color: "#dc3545", cursor: "pointer", fontSize: "20px", display: "none", zIndex: "10", background: "rgba(0,0,0,0.85)", padding: "8px 12px", borderRadius: "4px", transition: "color 0.2s" });
+                const cancelX = document.createElement("span"); 
+                cancelX.className = "pi pi-times comfy-sidebar-queue-cancel-btn";
+                Object.assign(cancelX.style, { 
+                    position: "absolute", 
+                    top: "4px", 
+                    right: "4px", 
+                    display: "none", 
+                    zIndex: "10" 
+                });
                 const sBadge = document.createElement("div");
-                Object.assign(sBadge.style, { position: "absolute", top: "6px", right: "8px", fontSize: "9px", fontWeight: "bold", padding: "2px 6px", borderRadius: "2px", textTransform: "uppercase", display: "none", pointerEvents: "none" });
+                Object.assign(sBadge.style, { position: "absolute", top: "6px", right: "8px", fontSize: "9px", fontWeight: "bold", padding: "2px 6px", borderRadius: "2px", textTransform: "uppercase", display: "none", pointerEvents: "none", zIndex: "10" });
                 const grid = document.createElement("div"); grid.style.display = "flex"; grid.style.flexDirection = "column"; grid.style.gap = "6px";
-                const p = document.createElement("div"); Object.assign(p.style, { fontSize: "11px", opacity: "0.5", textAlign: "center", padding: "12px", marginTop: "12px", userSelect: "none" });
+                const p = document.createElement("div"); 
+                Object.assign(p.style, { 
+                    fontSize: "11px", opacity: "0.5", textAlign: "center", padding: "12px", marginTop: "12px", userSelect: "none",
+                    display: "-webkit-box", WebkitLineClamp: "15", WebkitBoxOrient: "vertical", overflow: "hidden", wordBreak: "break-word"
+                });
                 const pt = document.createElement("div"); Object.assign(pt.style, { width: "100%", height: "4px", background: "#333", borderRadius: "2px", marginTop: "8px", overflow: "hidden", display: "none" });
                 const pb = document.createElement("div"); Object.assign(pb.style, { width: `0%`, height: "100%", background: "#3b82f6", transition: "width 0.1s linear" });
                 pt.appendChild(pb);
@@ -271,7 +307,16 @@ export function renderDOM() {
                 
                 const btnImg = document.createElement("span"); btnImg.className = "pi pi-image"; Object.assign(btnImg.style, { cursor: "pointer", fontSize: "20px", color: "#aaa" });
                 const btnJson = document.createElement("span"); btnJson.className = "pi pi-file"; Object.assign(btnJson.style, { cursor: "pointer", fontSize: "20px", color: "#aaa" });
-                const btnDel = document.createElement("span"); btnDel.className = "pi pi-trash"; Object.assign(btnDel.style, { cursor: "pointer", fontSize: "20px", color: "#dc3545", transition: "all 0.1s ease-in-out" });
+                const btnDel = document.createElement("span"); 
+                btnDel.className = "pi pi-trash"; 
+                Object.assign(btnDel.style, { 
+                    cursor: "pointer", 
+                    fontSize: "20px", 
+                    color: "#dc3545", 
+                    transition: "all 0.1s ease-in-out",
+                    padding: "2px",
+                    transform: "scale(1)"
+                });
                 hoverPanel.append(btnImg, btnJson, btnDel);
                 card.append(timerEl, cancelX, sBadge, grid, p, pt, statusText, hoverPanel);
                 
@@ -315,8 +360,21 @@ export function renderDOM() {
 
             if (state.status === "pending" && !showPendingSummary) {
                 cardObj.cancelBtn.style.display = "flex";
-                cardObj.cancelBtn.onclick = async (ev) => { ev.stopPropagation(); await api.fetchApi("/queue", { method: "POST", body: JSON.stringify({ delete: [state.pid] }) }); await syncQueueFn(); };
-            } else cardObj.cancelBtn.style.display = "none";
+                cardObj.cancelBtn.onclick = async (ev) => { 
+                    ev.stopPropagation(); 
+                    await api.fetchApi("/queue", { method: "POST", body: JSON.stringify({ delete: [state.pid] }) }); 
+                    await syncQueueFn(); 
+                };
+            } else if (state.status === "active") {
+                cardObj.cancelBtn.style.display = "flex";
+                cardObj.cancelBtn.onclick = async (ev) => { 
+                    ev.stopPropagation(); 
+                    await api.interrupt(); // Natively interrupts current execution
+                    await syncQueueFn(); 
+                };
+            } else {
+                cardObj.cancelBtn.style.display = "none";
+            }
 
             if (state.images && state.images.length > 0) {
                 cardObj.btnImg.style.display = "inline";
@@ -329,14 +387,36 @@ export function renderDOM() {
             } else cardObj.btnJson.style.display = "none";
 
             let deleteTimeout = null, isDeletePending = false;
-            const resetDeleteBtn = () => { isDeletePending = false; Object.assign(cardObj.btnDel.style, { color: "#dc3545", background: "none", padding: "0" }); cardObj.btnDel.title = "Delete Element from History"; if (deleteTimeout) { clearTimeout(deleteTimeout); deleteTimeout = null; } };
+            const resetDeleteBtn = () => { 
+                isDeletePending = false; 
+                Object.assign(cardObj.btnDel.style, { 
+                    color: "#dc3545", 
+                    background: "none", 
+                    padding: "2px", 
+                    transform: "scale(1)" 
+                }); 
+                cardObj.btnDel.title = "Delete Element from History"; 
+                if (deleteTimeout) { clearTimeout(deleteTimeout); deleteTimeout = null; } 
+            };
+            
             cardObj.btnDel.onclick = async (ev) => {
                 ev.stopPropagation();
                 if (!isDeletePending) {
-                    isDeletePending = true; Object.assign(cardObj.btnDel.style, { color: "#fff", background: "#dc3545", borderRadius: "4px", padding: "2px" }); cardObj.btnDel.title = "Click again to confirm deletion";
+                    isDeletePending = true; 
+                    Object.assign(cardObj.btnDel.style, { 
+                        color: "#fff", 
+                        background: "#dc3545", 
+                        borderRadius: "4px", 
+                        padding: "2px", 
+                        transform: "scale(1.2)" 
+                    }); 
+                    cardObj.btnDel.title = "Click again to confirm deletion";
                     deleteTimeout = setTimeout(resetDeleteBtn, 1000);
                 } else {
-                    resetDeleteBtn(); promptStates.delete(state.pid); await api.fetchApi("/history", { method: "POST", body: JSON.stringify({ delete: [state.pid] }) }); renderDOM();
+                    resetDeleteBtn(); 
+                    promptStates.delete(state.pid); 
+                    await api.fetchApi("/history", { method: "POST", body: JSON.stringify({ delete: [state.pid] }) }); 
+                    renderDOM();
                 }
             };
 
@@ -346,13 +426,39 @@ export function renderDOM() {
                     cardObj.grid.innerHTML = ""; cardObj.firstImgElement = null; cardObj.placeholder.style.display = "block";
                 } else {
                     cardObj.placeholder.style.display = "none";
-                    if (cardObj.grid.children.length === state.images.length) {
+// Check if we can reuse elements (count matches AND tag types match)
+                    let canReuse = cardObj.grid.children.length === state.images.length;
+                    if (canReuse) {
                         state.images.forEach((img, idx) => {
                             const src = img.url ? img.url : `/view?filename=${encodeURIComponent(img.filename)}&type=${img.type}&subfolder=${encodeURIComponent(img.subfolder)}`;
-                            const thumb = cardObj.grid.children[idx];
-                            if (thumb.src !== src) {
-                                if (src.startsWith("blob:")) { const tempImg = new Image(); tempImg.onload = () => { const oldBlob = thumb._lastBlob; thumb.src = src; thumb._lastBlob = src; if (oldBlob && oldBlob !== src) try { URL.revokeObjectURL(oldBlob); } catch(e){} }; tempImg.src = src; }
-                                else thumb.src = src;
+                            const wrapper = cardObj.grid.children[idx];
+                            // Fallback in case the DOM still has old unwrapped elements
+                            const mediaEl = (wrapper.tagName === "IMG" || wrapper.tagName === "VIDEO") ? wrapper : wrapper.querySelector("img, video");
+                            if (!mediaEl || isVideoFormat(src) !== (mediaEl.tagName.toLowerCase() === "video")) canReuse = false;
+                        });
+                    }
+
+                    if (canReuse) {
+                        state.images.forEach((img, idx) => {
+                            let src = img.url ? img.url : `/view?filename=${encodeURIComponent(img.filename)}&type=${img.type}&subfolder=${encodeURIComponent(img.subfolder)}`;
+                            const isVideo = isVideoFormat(src);
+                            if (isVideo) src = src + "#t=0.001"; // Keep the first-frame trick on update
+
+                            const wrapper = cardObj.grid.children[idx];
+                            const mediaEl = (wrapper.tagName === "IMG" || wrapper.tagName === "VIDEO") ? wrapper : wrapper.querySelector("img, video");
+                            
+                            if (mediaEl.getAttribute("src") !== src && mediaEl.src !== src) {
+                                if (src.startsWith("blob:") && !isVideo) { 
+                                    const tempImg = new Image(); 
+                                    tempImg.onload = () => { 
+                                        const oldBlob = mediaEl._lastBlob; 
+                                        mediaEl.src = src; 
+                                        mediaEl._lastBlob = src; 
+                                        if (oldBlob && oldBlob !== src) try { URL.revokeObjectURL(oldBlob); } catch(e){} 
+                                    }; 
+                                    tempImg.src = src; 
+                                }
+                                else mediaEl.src = src;
                             }
                         });
                     } else {
@@ -360,9 +466,42 @@ export function renderDOM() {
                         state.images.forEach(img => {
                             const src = img.url ? img.url : `/view?filename=${encodeURIComponent(img.filename)}&type=${img.type}&subfolder=${encodeURIComponent(img.subfolder)}`;
                             const isVideo = isVideoFormat(src);
+                            
+                            // Container to hold both the media and the play icon
+                            const wrapper = document.createElement("div");
+                            Object.assign(wrapper.style, { position: "relative", width: "100%", display: "block" });
+
                             const thumb = isVideo ? document.createElement("video") : document.createElement("img");
                             Object.assign(thumb.style, { width: "100%", borderRadius: "2px", display: "block", cursor: "zoom-in" });
-                            if (isVideo) { thumb.autoplay = true; thumb.loop = true; thumb.muted = true; thumb.playsInline = true; }
+                            
+                            if (isVideo) { 
+                                thumb.muted = true; 
+                                thumb.playsInline = true; 
+                                thumb.preload = "metadata";
+                                thumb.loop = true;
+                                
+                                // Create the Play Icon overlay with perfectly centered scalable SVG
+                                const playIcon = document.createElement("div");
+                                Object.assign(playIcon.style, {
+                                    position: "absolute", top: "0", left: "0", width: "100%", height: "100%",
+                                    pointerEvents: "none", zIndex: "5", transition: "opacity 0.2s ease"
+                                });
+                                
+                                // The radius 16.65 ensures the circle is exactly 1/3 of the shorter edge.
+                                // The polygon coordinates are an optically centered equilateral triangle.
+                                playIcon.innerHTML = `
+                                    <svg viewBox="0 0 100 100" preserveAspectRatio="xMidYMid meet" style="width: 100%; height: 100%; filter: drop-shadow(0 4px 6px rgba(0,0,0,0.3));">
+                                        <circle cx="50" cy="50" r="16.65" fill="rgba(0, 0, 0, 0.55)" />
+                                        <polygon points="45.7,42.5 45.7,57.5 58.7,50" fill="rgba(255, 255, 255, 0.9)" />
+                                    </svg>
+                                `;
+                                wrapper.appendChild(playIcon);
+
+                                // Play on Hover, Pause on Leave, and fade out the play button
+                                thumb.onmouseenter = () => { playIcon.style.opacity = "0"; thumb.play().catch(()=>{}); };
+                                thumb.onmouseleave = () => { playIcon.style.opacity = "1"; thumb.pause(); };
+                            }
+                            
                             if (!keepAspect) { thumb.style.aspectRatio = "1 / 1"; thumb.style.objectFit = "cover"; }
                             thumb.setAttribute("draggable", "false"); 
                             
@@ -370,11 +509,14 @@ export function renderDOM() {
                                 thumb.onload = () => { if (keepAspect && thumb.naturalWidth && thumb.naturalHeight) thumb.style.aspectRatio = `${thumb.naturalWidth} / ${thumb.naturalHeight}`; };
                                 if (src.startsWith("blob:")) { const tempImg = new Image(); tempImg.onload = () => { thumb.src = src; thumb._lastBlob = src; }; tempImg.src = src; } else thumb.src = src;
                             } else {
-                                thumb.onloadedmetadata = () => { if (keepAspect && thumb.videoWidth && thumb.videoHeight) thumb.style.aspectRatio = `${thumb.videoWidth} / ${thumb.videoHeight}`; }; thumb.src = src;
+                                thumb.onloadedmetadata = () => { if (keepAspect && thumb.videoWidth && thumb.videoHeight) thumb.style.aspectRatio = `${thumb.videoWidth} / ${thumb.videoHeight}`; }; 
+                                thumb.src = src + "#t=0.001";
                             }
                             thumb.onclick = (ev) => { ev.stopPropagation(); showFullscreenPreview(state.images.map(i => i.url ? i.url : `/view?filename=${encodeURIComponent(i.filename)}&type=${i.type}&subfolder=${encodeURIComponent(i.subfolder)}`)); };
+                            
+                            wrapper.insertBefore(thumb, wrapper.firstChild);
                             if (!cardObj.firstImgElement) cardObj.firstImgElement = thumb;
-                            cardObj.grid.appendChild(thumb);
+                            cardObj.grid.appendChild(wrapper);
                         });
                     }
                 }
@@ -383,9 +525,9 @@ export function renderDOM() {
 
             if (state.images.length === 0) {
                 if (state.texts && state.texts.length > 0) {
-                    cardObj.placeholder.textContent = state.texts.join("\n"); Object.assign(cardObj.placeholder.style, { whiteSpace: "pre-wrap", textAlign: "left", fontSize: "10px", opacity: "0.8" });
+                    cardObj.placeholder.textContent = state.texts.join("\n"); Object.assign(cardObj.placeholder.style, { whiteSpace: "pre-wrap", textAlign: "left" });
                 } else {
-                    cardObj.placeholder.textContent = state.progressText || "No Outputs"; Object.assign(cardObj.placeholder.style, { whiteSpace: "normal", textAlign: "center", fontSize: "11px", opacity: "0.5" });
+                    cardObj.placeholder.textContent = state.progressText || "No Outputs"; Object.assign(cardObj.placeholder.style, { whiteSpace: "normal", textAlign: "center" });
                 }
             }