move legacy option to startup arg

Author: christian-byrne

src/composables/useCoreCommands.ts

@@ -12,6 +12,7 @@ import {
 import { t } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
+import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useWorkflowService } from '@/services/workflowService'
@@ -604,8 +605,26 @@ export function useCoreCommands(): ComfyCommand[] {
       icon: 'pi pi-objects-column',
       label: 'Custom Nodes (Beta)',
       versionAdded: '1.12.10',
-      function: () => {
-        dialogService.showManagerDialog()
+      function: async () => {
+        const isLegacyManagerUI =
+          await useComfyManagerService().isLegacyManagerUI()
+        if (isLegacyManagerUI) {
+          try {
+            await useCommandStore().execute(
+              'Comfy.Manager.Menu.ToggleVisibility' // This command is registered by legacy manager FE extension
+            )
+          } catch (error) {
+            useToastStore().add({
+              severity: 'error',
+              summary: t('g.error'),
+              detail: t('manager.legacyMenuNotAvailable'),
+              life: 3000
+            })
+            dialogService.showManagerDialog()
+          }
+        } else {
+          dialogService.showManagerDialog()
+        }
       }
     },
     {
@@ -617,44 +636,6 @@ export function useCoreCommands(): ComfyCommand[] {
         dialogService.showManagerProgressDialog()
       }
     },
-    {
-      id: 'Comfy.Manager.CustomNodesManager.ShowLegacyCustomNodesMenu',
-      icon: 'pi pi-bars',
-      label: 'Custom Nodes (Legacy)',
-      versionAdded: '1.16.4',
-      function: async () => {
-        try {
-          await useCommandStore().execute(
-            'Comfy.Manager.CustomNodesManager.ToggleVisibility'
-          )
-        } catch (error) {
-          useToastStore().add({
-            severity: 'error',
-            summary: t('g.error'),
-            detail: t('manager.legacyMenuNotAvailable'),
-            life: 3000
-          })
-        }
-      }
-    },
-    {
-      id: 'Comfy.Manager.ShowLegacyManagerMenu',
-      icon: 'mdi mdi-puzzle',
-      label: 'Manager Menu (Legacy)',
-      versionAdded: '1.16.4',
-      function: async () => {
-        try {
-          await useCommandStore().execute('Comfy.Manager.Menu.ToggleVisibility')
-        } catch (error) {
-          useToastStore().add({
-            severity: 'error',
-            summary: t('g.error'),
-            detail: t('manager.legacyMenuNotAvailable'),
-            life: 3000
-          })
-        }
-      }
-    },
     {
       id: 'Comfy.Memory.UnloadModels',
       icon: 'mdi mdi-vacuum-outline',

src/constants/coreMenuCommands.ts

@@ -21,14 +21,7 @@ export const CORE_MENU_COMMANDS = [
   ],
   [['Edit'], ['Comfy.ClearWorkflow']],
   [['Edit'], ['Comfy.OpenClipspace']],
-  [
-    ['Manager'],
-    [
-      'Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu',
-      'Comfy.Manager.ShowLegacyManagerMenu',
-      'Comfy.Manager.CustomNodesManager.ShowLegacyCustomNodesMenu'
-    ]
-  ],
+  [['Manager'], ['Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu']],
   [
     ['Help'],
     [

src/locales/en/main.json

@@ -113,7 +113,7 @@
   },
   "manager": {
     "title": "Custom Nodes Manager",
-    "legacyMenuNotAvailable": "Legacy manager menu is not available in this version of ComfyUI. Please use the new manager menu instead.",
+    "legacyMenuNotAvailable": "Legacy manager menu is not available, defaulting to the new manager menu.",
     "failed": "Failed ({count})",
     "noNodesFound": "No nodes found",
     "noNodesFoundDescription": "The pack's nodes either could not be parsed, or the pack is a frontend extension only and doesn't have any nodes.",
@@ -644,9 +644,7 @@
     "ComfyUI Issues": "ComfyUI Issues",
     "Interrupt": "Interrupt",
     "Load Default Workflow": "Load Default Workflow",
-    "Custom Nodes (Beta)": "Custom Nodes (Beta)",
-    "Custom Nodes (Legacy)": "Custom Nodes (Legacy)",
-    "Manager Menu (Legacy)": "Manager Menu (Legacy)",
+    "Custom Nodes (Beta)": "Custom Nodes Manager",
     "Toggle Progress Dialog": "Toggle Progress Dialog",
     "Unload Models": "Unload Models",
     "Unload Models and Execution Cache": "Unload Models and Execution Cache",

src/services/comfyManagerService.ts

@@ -32,7 +32,8 @@ enum ManagerRoute {
   GET_NODES = 'v2/customnode/getmappings',
   GET_PACKS = 'v2/customnode/getlist',
   IMPORT_FAIL_INFO = 'v2/customnode/import_fail_info',
-  REBOOT = 'v2/manager/reboot'
+  REBOOT = 'v2/manager/reboot',
+  IS_LEGACY_MANAGER_UI = 'v2/manager/is_legacy_manager_ui'
 }
 
 const managerApiClient = axios.create({
@@ -247,6 +248,15 @@ export const useComfyManagerService = () => {
     )
   }
 
+  const isLegacyManagerUI = async (signal?: AbortSignal) => {
+    const errorContext = 'Checking if user set Manager to use the legacy UI'
+
+    return executeRequest<boolean>(
+      () => managerApiClient.get(ManagerRoute.IS_LEGACY_MANAGER_UI, { signal }),
+      { errorContext }
+    )
+  }
+
   return {
     // State
     isLoading,
@@ -268,6 +278,7 @@ export const useComfyManagerService = () => {
     updateAllPacks,
 
     // System operations
-    rebootComfyUI
+    rebootComfyUI,
+    isLegacyManagerUI
   }
 }