fix rebase error

src/composables/useCoreCommands.ts

@@ -858,6 +858,27 @@ export function useCoreCommands(): ComfyCommand[] {
           })
           return
         }
+        await api.freeMemory({ freeExecutionCache: false })
+      }
+    },
+    {
+      id: 'Comfy.Memory.UnloadModelsAndExecutionCache',
+      icon: 'mdi mdi-vacuum-outline',
+      label: 'Unload Models and Execution Cache',
+      versionAdded: '1.16.4',
+      function: async () => {
+        if (!useSettingStore().get('Comfy.Memory.AllowManualUnload')) {
+          useToastStore().add({
+            severity: 'error',
+            summary: t('g.error'),
+            detail: t('g.commandProhibited', {
+              command: 'Comfy.Memory.UnloadModelsAndExecutionCache'
+            }),
+            life: 3000
+          })
+          return
+        }
+        await api.freeMemory({ freeExecutionCache: true })
       }
     }
   ]

tests-ui/tests/composables/useUpdateAvailableNodes.test.ts

@@ -84,9 +84,11 @@ describe('useUpdateAvailableNodes', () => {
       }
     })
 
-    mockIsSemVer.mockImplementation((version: string) => {
+    mockIsSemVer.mockImplementation(
-      return !version.includes('nightly')
+      (version: string): version is `${number}.${number}.${number}` => {
-    })
+        return !version.includes('nightly')
+      }
+    )
 
     mockCompareVersions.mockImplementation(
       (latest: string | undefined, installed: string | undefined) => {