From 85a189e2250e3b087e1b44ff7b09a0c79cfe1084 Mon Sep 17 00:00:00 2001
From: TokenSpender <nofob02@gmail.com>
Date: Sun, 3 May 2026 07:15:47 -0400
Subject: [PATCH] Fix deprecated ui.js, button.js and buttonGroup.js imports in
 comfyui-manager.js

---
 js/comfyui-manager.js | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/js/comfyui-manager.js b/js/comfyui-manager.js
index 53431657..17072110 100644
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@@ -1,6 +1,5 @@
 import { api } from "../../scripts/api.js";
 import { app } from "../../scripts/app.js";
-import { $el, ComfyDialog } from "../../scripts/ui.js";
 import {
 	SUPPORTED_OUTPUT_NODE_TYPES,
 	ShareDialog,
@@ -22,6 +21,27 @@ import { ModelManager } from "./model-manager.js";
 import { SnapshotManager } from "./snapshot.js";
 import { buildGuiFrame, createSettingsCombo } from "./comfyui-gui-builder.js";
 
+// === SHIM FOR NEW COMFYUI (removes ui.js, button.js + buttonGroup.js warnings) ===
+let $el, ComfyDialog, ComfyButton, ComfyButtonGroup;
+
+if (window?.comfyAPI?.ui) {
+	({ $el, ComfyDialog } = window.comfyAPI.ui);
+} else {
+	({ $el, ComfyDialog } = await import("../../scripts/ui.js"));
+}
+
+if (window?.comfyAPI?.button) {
+	ComfyButton = window.comfyAPI.button.ComfyButton;
+} else {
+	ComfyButton = (await import("../../scripts/ui/components/button.js")).ComfyButton;
+}
+
+if (window?.comfyAPI?.buttonGroup?.ComfyButtonGroup) {
+	ComfyButtonGroup = window.comfyAPI.buttonGroup.ComfyButtonGroup;
+} else {
+	ComfyButtonGroup = (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup;
+}
+
 let manager_version = await getVersion();
 
 var docStyle = document.createElement('style');
@@ -1567,8 +1587,9 @@ app.registerExtension({
 		try {
 			// new style Manager buttons
 			// unload models button into new style Manager button
-			let cmGroup = new (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup(
-				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+			// Use hoisted ComfyButton + ComfyButtonGroup from shim at top of file
+			let cmGroup = new ComfyButtonGroup(
+				new ComfyButton({
 					icon: "puzzle",
 					action: () => {
 						if(!manager_instance)
@@ -1579,7 +1600,7 @@ app.registerExtension({
 					content: "Manager",
 					classList: "comfyui-button comfyui-menu-mobile-collapse primary"
 				}).element,
-				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+				new ComfyButton({
 					icon: "star",
 					action: () => {
 						if(!manager_instance)
@@ -1592,21 +1613,21 @@ app.registerExtension({
 					},
 					tooltip: "Show favorite custom node list"
 				}).element,
-				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+				new ComfyButton({
 					icon: "vacuum-outline",
 					action: () => {
 						free_models();
 					},
 					tooltip: "Unload Models"
 				}).element,
-				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+				new ComfyButton({
 					icon: "vacuum",
 					action: () => {
 						free_models(true);
 					},
 					tooltip: "Free model and node cache"
 				}).element,
-				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+				new ComfyButton({
 					icon: "share",
 					action: () => {
 						if (share_option === 'openart') {