Add linux form factor.

2025-03-11 11:32:53 -07:00
25 changed files with 5528 additions and 9948 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,19 +7,15 @@ on:
    paths:
      - "pyproject.toml"

-permissions:
-  issues: write
-
 jobs:
  publish-node:
    name: Publish Custom Node to registry
    runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ltdrdata' }}
    steps:
      - name: Check out code
        uses: actions/checkout@v4
      - name: Publish Custom Node
-        uses: Comfy-Org/publish-node-action@v1
+        uses: Comfy-Org/publish-node-action@main
        with:
          ## Add your own personal access token to your Github Repository secrets and reference it here.
-          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
--- a/README.md
+++ b/README.md
@@ -314,6 +314,9 @@ The following settings are applied based on the section marked as `is_default`.
 * Use `aria2` as downloader
  * [howto](docs/en/use_aria2.md)

+* If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
+  * This option can be used if performance issues occur in a Colab+GDrive environment.
+

 ## Environment Variables

--- a/cm-cli.py
+++ b/cm-cli.py
@@ -1271,6 +1271,20 @@ def export_custom_node_ids(
                    print(f"{x['id']}@unknown", file=output_file)


+@app.command(
+    "migrate",
+    help="Migrate legacy node system to new node system",
+)
+def migrate(
+        user_directory: str = typer.Option(
+            None,
+            help="user directory"
+        )
+):
+    cmd_ctx.set_user_directory(user_directory)
+    asyncio.run(unified_manager.migrate_unmanaged_nodes())
+
+
 if __name__ == '__main__':
    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
    sys.exit(app())
--- a/custom-node-list.json
+++ b/custom-node-list.json
--- a/extension-node-map.json
+++ b/extension-node-map.json
--- a/github-stats.json
+++ b/github-stats.json
--- a/glob/manager_core.py
+++ b/glob/manager_core.py
@@ -43,7 +43,7 @@ import manager_downloader
 from node_package import InstalledNodePackage


-version_code = [3, 31, 6]
+version_code = [3, 30, 3]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')


@@ -53,11 +53,6 @@ DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/ma
 default_custom_nodes_path = None


-class InvalidChannel(Exception):
-    def __init__(self, channel):
-        self.channel = channel
-        super().__init__(channel)
-
 def get_default_custom_nodes_path():
    global default_custom_nodes_path
    if default_custom_nodes_path is None:
@@ -256,7 +251,6 @@ comfy_ui_revision = "Unknown"
 comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)

 channel_dict = None
-valid_channels = set()
 channel_list = None


@@ -361,7 +355,7 @@ def normalize_channel(channel):
    if channel_url:
        return channel_url

-    raise InvalidChannel(channel)
+    raise Exception(f"Invalid channel name '{channel}'")


 class ManagedResult:
@@ -768,9 +762,6 @@ class UnifiedManager:

    @staticmethod
    async def load_nightly(channel, mode):
-        if channel is None:
-            return {}
-
        res = {}

        channel_url = normalize_channel(channel)
@@ -779,11 +770,6 @@ class UnifiedManager:
                print(f"[bold red]ERROR: Invalid mode is specified `--mode {mode}`[/bold red]", file=sys.stderr)
                return {}

-        # validate channel - only the channel set by the user is allowed.
-        if channel_url not in valid_channels:
-            logging.error(f'[ComfyUI-Manager] An invalid channel was used: {channel_url}')
-            raise InvalidChannel(channel_url)
-
        json_obj = await get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url)
        for x in json_obj['custom_nodes']:
            try:
@@ -801,9 +787,8 @@ class UnifiedManager:
        return res

    async def get_custom_nodes(self, channel, mode):
-        if channel is None and mode is None:
-            channel = 'default'
-            mode = 'cache'
+        # default_channel = normalize_channel('default')
+        # cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.

        channel = normalize_channel(channel)
        cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.
@@ -812,6 +797,7 @@ class UnifiedManager:
            return cache

        channel = normalize_channel(channel)
+        print(f"nightly_channel: {channel}/{mode}")
        nodes = await self.load_nightly(channel, mode)

        res = {}
@@ -855,7 +841,6 @@ class UnifiedManager:
        install_script_path = os.path.join(repo_path, "install.py")
        requirements_path = os.path.join(repo_path, "requirements.txt")

-        res = True
        if lazy_mode:
            install_cmd = ["#LAZY-INSTALL-SCRIPT", sys.executable]
            return try_install_script(url, repo_path, install_cmd)
@@ -863,6 +848,7 @@ class UnifiedManager:
            if os.path.exists(requirements_path) and not no_deps:
                print("Install: pip packages")
                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
+                res = True
                lines = manager_util.robust_readlines(requirements_path)
                for line in lines:
                    package_name = remap_pip_package(line.strip())
@@ -873,14 +859,15 @@ class UnifiedManager:
                            res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)

                pip_fixer.fix_broken()
+                return res

            if os.path.exists(install_script_path) and install_script_path not in self.processed_install:
                self.processed_install.add(install_script_path)
                print("Install: install script")
                install_cmd = [sys.executable, "install.py"]
-                return res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
+                return try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)

-        return res
+        return True

    def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
@@ -892,6 +879,14 @@ class UnifiedManager:

        return True

+    def reserve_migration(self, moves):
+        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
+        with open(script_path, "a") as file:
+            obj = ["", "#LAZY-MIGRATION", moves]
+            file.write(f"{obj}\n")
+
+        return True
+
    def unified_fix(self, node_id, version_spec, instant_execution=False, no_deps=False):
        """
        fix dependencies
@@ -1420,11 +1415,7 @@ class UnifiedManager:
                version_spec = self.resolve_unspecified_version(node_id)

        if version_spec == 'unknown' or version_spec == 'nightly':
-            try:
-                custom_nodes = await self.get_custom_nodes(channel, mode)
-            except InvalidChannel as e:
-                return ManagedResult('fail').fail(f'Invalid channel is used: {e.channel}')
-
+            custom_nodes = await self.get_custom_nodes(channel, mode)
            the_node = custom_nodes.get(node_id)
            if the_node is not None:
                if version_spec == 'unknown':
@@ -1482,6 +1473,28 @@ class UnifiedManager:

        return res

+    async def migrate_unmanaged_nodes(self):
+        """
+        fix path for nightly and unknown nodes of unmanaged nodes
+        """
+        await self.reload('cache')
+        await self.get_custom_nodes('default', 'cache')
+
+        print("Migration: STAGE 1")
+        moves = []
+
+        # migrate nightly inactive
+        for x, v in self.nightly_inactive_nodes.items():
+            if v.endswith('@nightly'):
+                continue
+
+            new_path = os.path.join(get_default_custom_nodes_path(), '.disabled', f"{x}@nightly")
+            moves.append((v, new_path))
+
+        self.reserve_migration(moves)
+
+        print("DONE (Migration reserved)")
+

 unified_manager = UnifiedManager()

@@ -1551,14 +1564,8 @@ def get_installed_node_packs():
    return res


-def refresh_channel_dict():
-    if channel_dict is None:
-        get_channel_dict()
-        
-
 def get_channel_dict():
    global channel_dict
-    global valid_channels

    if channel_dict is None:
        channel_dict = {}
@@ -1572,7 +1579,6 @@ def get_channel_dict():
                channel_info = x.split("::")
                if len(channel_info) == 2:
                    channel_dict[channel_info[0]] = channel_info[1]
-                    valid_channels.add(channel_info[1])

    return channel_dict

@@ -1625,6 +1631,7 @@ def write_config():
        'model_download_by_agent': get_config()['model_download_by_agent'],
        'downgrade_blacklist': get_config()['downgrade_blacklist'],
        'security_level': get_config()['security_level'],
+        'skip_migration_check': get_config()['skip_migration_check'],
        'always_lazy_install': get_config()['always_lazy_install'],
        'network_mode': get_config()['network_mode'],
        'db_mode': get_config()['db_mode'],
@@ -1663,6 +1670,7 @@ def read_config():
                    'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
                    'model_download_by_agent': get_bool('model_download_by_agent', False),
                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
+                    'skip_migration_check': get_bool('skip_migration_check', False),
                    'always_lazy_install': get_bool('always_lazy_install', False),
                    'network_mode': default_conf.get('network_mode', 'public').lower(),
                    'security_level': default_conf.get('security_level', 'normal').lower(),
@@ -1686,6 +1694,7 @@ def read_config():
            'windows_selector_event_loop_policy': False,
            'model_download_by_agent': False,
            'downgrade_blacklist': '',
+            'skip_migration_check': False,
            'always_lazy_install': False,
            'network_mode': 'public',   # public | private | offline
            'security_level': 'normal', # strong | normal | normal- | weak
@@ -2090,7 +2099,7 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
        cnr = unified_manager.get_cnr_by_repo(url)
        if cnr:
            cnr_id = cnr['id']
-            return await unified_manager.install_by_id(cnr_id, version_spec='nightly', channel='default', mode='cache')
+            return await unified_manager.install_by_id(cnr_id, version_spec='nightly')
        else:
            repo_name = os.path.splitext(os.path.basename(url))[0]

@@ -3018,9 +3027,6 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
    enabled_repos = []
    disabled_repos = []
    skip_node_packs = []
-    switched_node_packs = []
-    installed_node_packs = []
-    failed = []

    await unified_manager.reload('cache')
    await unified_manager.get_custom_nodes('default', 'cache')
@@ -3066,13 +3072,8 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                disabled_repos.append(x)

            for x in todo_checkout:
-                ps = unified_manager.cnr_switch_version(x[0], x[1], instant_execution=True, no_deps=True, return_postinstall=False)
-                if ps.action == 'switch-cnr' and ps.result:
-                    switched_node_packs.append(f"{x[0]}@{x[1]}")
-                elif ps.action == 'skip':
-                    skip_node_packs.append(f"{x[0]}@{x[1]}")
-                elif not ps.result:
-                    failed.append(f"{x[0]}@{x[1]}")
+                unified_manager.cnr_switch_version(x[0], x[1], instant_execution=True, no_deps=True, return_postinstall=False)
+                checkout_repos.append(x[1])

            # install listed cnr nodes
            for k, v in cnr_info.items():
@@ -3080,9 +3081,7 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                    continue

                ps = await unified_manager.install_by_id(k, version_spec=v, instant_execution=True, return_postinstall=True)
-                if ps.action == 'install-cnr' and ps.result:
-                    installed_node_packs.append(f"{k}@{v}")
-
+                cloned_repos.append(k)
                if ps is not None and ps.result:
                    if hasattr(ps, 'postinstall'):
                        postinstalls.append(ps.postinstall)
@@ -3140,41 +3139,40 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                disabled_repos.append(x)

            for x in todo_enable:
-                res = unified_manager.unified_enable(x[0], 'nightly')
+                res = unified_manager.unified_enable(x, 'nightly')

                is_switched = False
                if res and res.target:
                    is_switched = repo_switch_commit(res.target, x[1])

                if is_switched:
-                    checkout_repos.append(f"{x[0]}@{x[1]}")
+                    checkout_repos.append(x)
                else:
-                    enabled_repos.append(x[0])
+                    enabled_repos.append(x)

            for x in todo_checkout:
                is_switched = repo_switch_commit(x[0], x[1])

                if is_switched:
-                    checkout_repos.append(f"{x[0]}@{x[1]}")
+                    checkout_repos.append(x)
+                else:
+                    skip_node_packs.append(x[0])

            for x in git_info.keys():
                normalized_url = git_utils.normalize_url(x)
                cnr = unified_manager.repo_cnr_map.get(normalized_url)
                if cnr is not None:
                    pack_id = cnr['id']
-                    res = await unified_manager.install_by_id(pack_id, 'nightly', instant_execution=True, no_deps=False, return_postinstall=False)
-                    if res.action == 'install-git' and res.result:
-                        cloned_repos.append(pack_id)
-                    elif res.action == 'skip':
-                        skip_node_packs.append(pack_id)
-                    elif not res.result:
-                        failed.append(pack_id)
+                    await unified_manager.install_by_id(pack_id, 'nightly', instant_execution=True, no_deps=False, return_postinstall=False)
+                    cloned_repos.append(pack_id)
                    processed_urls.append(x)

            for x in processed_urls:
                if x in git_info:
                    del git_info[x]

+            # remained nightly will be installed and migrated
+
    # for unknown restore
    todo_disable = []
    todo_enable = []
@@ -3221,15 +3219,15 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
            is_switched = repo_switch_commit(res.target, x[1])

        if is_switched:
-            checkout_repos.append(f"{x[0]}@{x[1]}")
+            checkout_repos.append(x)
        else:
-            enabled_repos.append(x[0])
+            enabled_repos.append(x)

    for x in todo_checkout:
        is_switched = repo_switch_commit(x[0], x[1])

        if is_switched:
-            checkout_repos.append(f"{x[0]}@{x[1]}")
+            checkout_repos.append(x)
        else:
            skip_node_packs.append(x[0])

@@ -3246,28 +3244,53 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
        unified_manager.repo_install(repo_url, to_path, instant_execution=True, no_deps=False, return_postinstall=False)
        cloned_repos.append(repo_name)

+    # reload
+    await unified_manager.migrate_unmanaged_nodes()
+
    # print summary
    for x in cloned_repos:
        print(f"[ INSTALLED ] {x}")
-    for x in installed_node_packs:
-        print(f"[ INSTALLED ] {x}")
    for x in checkout_repos:
        print(f"[  CHECKOUT ] {x}")
-    for x in switched_node_packs:
-        print(f"[  SWITCHED ] {x}")
    for x in enabled_repos:
        print(f"[  ENABLED  ] {x}")
    for x in disabled_repos:
        print(f"[  DISABLED ] {x}")
    for x in skip_node_packs:
-        print(f"[  SKIPPED  ] {x}")
-    for x in failed:
-        print(f"[  FAILED   ] {x}")
+        print(f"[  SKIPPED ] {x}")

    # if is_failed:
    #     print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")


+# check need to migrate
+need_to_migrate = False
+
+
+async def check_need_to_migrate():
+    global need_to_migrate
+
+    await unified_manager.reload('cache')
+    await unified_manager.load_nightly(channel='default', mode='cache')
+
+    legacy_custom_nodes = []
+
+    for x in unified_manager.active_nodes.values():
+        if x[0] == 'nightly' and not x[1].endswith('@nightly'):
+            legacy_custom_nodes.append(x[1])
+
+    for x in unified_manager.nightly_inactive_nodes.values():
+        if not x.endswith('@nightly'):
+            legacy_custom_nodes.append(x)
+
+    if len(legacy_custom_nodes) > 0:
+        print("\n--------------------- ComfyUI-Manager migration notice --------------------")
+        print("The following custom nodes were installed using the old management method and require migration:\n")
+        print("\n".join(legacy_custom_nodes))
+        print("---------------------------------------------------------------------------\n")
+        need_to_migrate = True
+
+
 def get_comfyui_versions(repo=None):
    if repo is None:
        repo = git.Repo(comfy_path)
--- a/glob/manager_server.py
+++ b/glob/manager_server.py
@@ -279,17 +279,8 @@ def get_model_dir(data, show_log=False):
    else:
        models_base = folder_paths.models_dir

-    # NOTE: Validate to prevent path traversal.
-    if any(char in data['filename'] for char in {'/', '\\', ':'}):
-        return None
-
    def resolve_custom_node(save_path):
        save_path = save_path[13:] # remove 'custom_nodes/'
-
-        # NOTE: Validate to prevent path traversal.
-        if save_path.startswith(os.path.sep) or ':' in save_path:
-            return None
-
        repo_name = save_path.replace('\\','/').split('/')[0] # get custom node repo name

        # NOTE: The creation of files within the custom node path should be removed in the future.
@@ -408,6 +399,7 @@ async def task_worker():

        try:
            node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
+
            if node_spec is None:
                logging.error(f"Cannot resolve install target: '{node_spec_str}'")
                return f"Cannot resolve install target: '{node_spec_str}'"
@@ -937,7 +929,6 @@ def check_model_installed(json_obj):

@routes.get("/externalmodel/getlist")
 async def fetch_externalmodel_list(request):
-    # The model list is only allowed in the default channel, yet.
    json_obj = await core.get_data_by_mode(request.rel_url.query["mode"], 'model-list.json')

    check_model_installed(json_obj)
@@ -1206,8 +1197,9 @@ async def install_custom_node(request):

    git_url = None

-    selected_version = json_data.get('selected_version')
-    if json_data['version'] != 'unknown' and selected_version != 'unknown':
+    if json_data['version'] != 'unknown':
+        selected_version = json_data.get('selected_version')
+
        if skip_post_install:
            if cnr_id in core.unified_manager.nightly_inactive_nodes or cnr_id in core.unified_manager.cnr_inactive_nodes:
                core.unified_manager.unified_enable(cnr_id)
@@ -1224,9 +1216,6 @@ async def install_custom_node(request):
            if git_url is None:
                logging.error(f"[ComfyUI-Manager] Following node pack doesn't provide `nightly` version: ${git_url}")
                return web.Response(status=404, text=f"Following node pack doesn't provide `nightly` version: ${git_url}")
-    elif json_data['version'] != 'unknown' and selected_version == 'unknown':
-        logging.error(f"[ComfyUI-Manager] Invalid installation request: {json_data}")
-        return web.Response(status=400, text="Invalid installation request")
    else:
        # unknown
        unknown_name = os.path.basename(json_data['files'][0])
@@ -1418,14 +1407,17 @@ async def disable_node(request):
    return web.Response(status=200)


-async def check_whitelist_for_model(item):
-    json_obj = await core.get_data_by_mode('cache', 'model-list.json')
+@routes.get("/manager/migrate_unmanaged_nodes")
+async def migrate_unmanaged_nodes(request):
+    logging.info("[ComfyUI-Manager] Migrating unmanaged nodes...")
+    await core.unified_manager.migrate_unmanaged_nodes()
+    logging.info("Done.")
+    return web.Response(status=200)

-    for x in json_obj.get('models', []):
-        if x['save_path'] == item['save_path'] and x['base'] == item['base'] and x['filename'] == item['filename']:
-            return True
-        
-    return False
+
+@routes.get("/manager/need_to_migrate")
+async def need_to_migrate(request):
+    return web.Response(text=str(core.need_to_migrate), status=200)


@routes.post("/manager/queue/install_model")
@@ -1436,11 +1428,6 @@ async def install_model(request):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
        return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")

-    # validate request
-    if not await check_whitelist_for_model(json_data):
-        logging.error(f"[ComfyUI-Manager] Invalid model install request is detected: {json_data}")
-        return web.Response(status=400, text="Invalid model install request is detected")
-
    if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'):
        models_json = await core.get_data_by_mode('cache', 'model-list.json', 'default')

@@ -1708,7 +1695,6 @@ cm_global.register_api('cm.try-install-custom-node', confirm_try_install)


 async def default_cache_update():
-    core.refresh_channel_dict()
    channel_url = core.get_config()['channel_url']
    async def get_cache(filename):
        try:
@@ -1748,6 +1734,11 @@ async def default_cache_update():

    logging.info("[ComfyUI-Manager] All startup tasks have been completed.")

+    # NOTE: hide migration button temporarily.
+    # if not core.get_config()['skip_migration_check']:
+    #     await core.check_need_to_migrate()
+    # else:
+    #     logging.info("[ComfyUI-Manager] Migration check is skipped...")

 threading.Thread(target=lambda: asyncio.run(default_cache_update())).start()

--- a/glob/manager_util.py
+++ b/glob/manager_util.py
@@ -36,9 +36,9 @@ def add_python_path_to_env():

 def make_pip_cmd(cmd):
    if use_uv:
-        return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
+        return [sys.executable, '-m', 'uv', 'pip'] + cmd
    else:
-        return [sys.executable, '-s', '-m', 'pip'] + cmd
+        return [sys.executable, '-m', 'pip'] + cmd


 # DON'T USE StrictVersion - cannot handle pre_release version
@@ -439,12 +439,10 @@ class PIPFixer:
                    lines = file.readlines()
                
                front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
-                if front_line is None:
-                    logging.info("[ComfyUI-Manager] Skipped fixing the 'comfyui-frontend-package' dependency because the ComfyUI is outdated.")
-                else:
-                    cmd = make_pip_cmd(['install', front_line])
-                    subprocess.check_output(cmd , universal_newlines=True)
-                    logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
+                cmd = make_pip_cmd(['install', front_line])
+                subprocess.check_output(cmd , universal_newlines=True)
+
+                logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
        except Exception as e:
            logging.error("[ComfyUI-Manager] Failed to restore comfyui-frontend-package")
            logging.error(e)
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@@ -13,7 +13,7 @@ import {
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import {
 	free_models, install_pip, install_via_git_url, manager_instance,
-	rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
+	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
 	infoToast, showTerminal, setNeedRestart
 } from "./common.js";
 import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
@@ -946,6 +946,28 @@ class ManagerMenuDialog extends ComfyDialog {
 				restart_stop_button,
 			];

+		let migration_btn =
+			$el("button.cm-button-orange", {
+				type: "button",
+				textContent: "Migrate to New Node System",
+				onclick: () => migrateAPI()
+			});
+
+		migration_btn.style.display = 'none';
+
+		res.push(migration_btn);
+
+		api.fetchApi('/manager/need_to_migrate')
+			.then(response => response.text())
+			.then(text => {
+				if (text === 'True') {
+					migration_btn.style.display = 'block';
+				}
+			})
+			.catch(error => {
+				console.error('Error checking migration status:', error);
+			});
+
 		return res;
 	}

--- a/js/common.js
+++ b/js/common.js
@@ -1,7 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
-import { getBestPosition, getPositionStyle, getRect } from './popover-helper.js';


 function internalCustomConfirm(message, confirmMessage, cancelMessage) {
@@ -182,6 +181,23 @@ export function rebootAPI() {
 }


+export async function migrateAPI() {
+	let confirmed = await customConfirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")
+	if (confirmed) {
+		try {
+			await api.fetchApi("/manager/migrate_unmanaged_nodes");
+			api.fetchApi("/manager/reboot");
+		}
+		catch(exception) {
+
+		}
+		return true;
+	}
+
+	return false;
+}
+
+
 export var manager_instance = null;

 export function setManagerInstance(obj) {
@@ -388,14 +404,12 @@ export async function fetchData(route, options) {
 	}
 }

-// https://cenfun.github.io/open-icons/
 export const icons = {
 	search: '<svg viewBox="0 0 24 24" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m21 21-4.486-4.494M19 10.5a8.5 8.5 0 1 1-17 0 8.5 8.5 0 0 1 17 0"/></svg>',
+	extensions: '<svg viewBox="64 64 896 896" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M843.5 737.4c-12.4-75.2-79.2-129.1-155.3-125.4S550.9 676 546 752c-153.5-4.8-208-40.7-199.1-113.7 3.3-27.3 19.8-41.9 50.1-49 18.4-4.3 38.8-4.9 57.3-3.2 1.7.2 3.5.3 5.2.5 11.3 2.7 22.8 5 34.3 6.8 34.1 5.6 68.8 8.4 101.8 6.6 92.8-5 156-45.9 159.2-132.7 3.1-84.1-54.7-143.7-147.9-183.6-29.9-12.8-61.6-22.7-93.3-30.2-14.3-3.4-26.3-5.7-35.2-7.2-7.9-75.9-71.5-133.8-147.8-134.4S189.7 168 180.5 243.8s40 146.3 114.2 163.9 149.9-23.3 175.7-95.1c9.4 1.7 18.7 3.6 28 5.8 28.2 6.6 56.4 15.4 82.4 26.6 70.7 30.2 109.3 70.1 107.5 119.9-1.6 44.6-33.6 65.2-96.2 68.6-27.5 1.5-57.6-.9-87.3-5.8-8.3-1.4-15.9-2.8-22.6-4.3-3.9-.8-6.6-1.5-7.8-1.8l-3.1-.6c-2.2-.3-5.9-.8-10.7-1.3-25-2.3-52.1-1.5-78.5 4.6-55.2 12.9-93.9 47.2-101.1 105.8-15.7 126.2 78.6 184.7 276 188.9 29.1 70.4 106.4 107.9 179.6 87 73.3-20.9 119.3-93.4 106.9-168.6M329.1 345.2a83.3 83.3 0 1 1 .01-166.61 83.3 83.3 0 0 1-.01 166.61M695.6 845a83.3 83.3 0 1 1 .01-166.61A83.3 83.3 0 0 1 695.6 845"/></svg>',
 	conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
 	passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
-	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>',
-	close: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 16 16"><g fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="m7.116 8-4.558 4.558.884.884L8 8.884l4.558 4.558.884-.884L8.884 8l4.558-4.558-.884-.884L8 7.116 3.442 2.558l-.884.884L7.116 8z"/></g></svg>',
-	arrowRight: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 20 20"><path fill="currentColor" fill-rule="evenodd" d="m2.542 2.154 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Zm9 0 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Z"/></svg>'
+	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
 }

 export function sanitizeHTML(str) {
@@ -489,166 +503,3 @@ export function restoreColumnWidth(gridId, columns) {
 	});

 }
-
-export function getTimeAgo(dateStr) {
-	const date = new Date(dateStr);
-
-	if (!date || !(date instanceof Date) || isNaN(date.getTime())) {
-		return "";
-	}
-
-	const units = [
-		{ max: 2760000, value: 60000, name: 'minute', past: 'a minute ago', future: 'in a minute' },
-		{ max: 72000000, value: 3600000, name: 'hour', past: 'an hour ago', future: 'in an hour' },
-		{ max: 518400000, value: 86400000, name: 'day', past: 'yesterday', future: 'tomorrow' },
-		{ max: 2419200000, value: 604800000, name: 'week', past: 'last week', future: 'in a week' },
-		{ max: 28512000000, value: 2592000000, name: 'month', past: 'last month', future: 'in a month' }
-	];
-    const diff = Date.now() - date.getTime();
-    // less than a minute
-    if (Math.abs(diff) < 60000)
-        return 'just now';
-    for (let i = 0; i < units.length; i++) {
-        if (Math.abs(diff) < units[i].max) {
-            return format(diff, units[i].value, units[i].name, units[i].past, units[i].future, diff < 0);
-        }
-    }
-    function format(diff, divisor, unit, past, future, isInTheFuture) {
-		const val = Math.round(Math.abs(diff) / divisor);
-		if (isInTheFuture)
-			return val <= 1 ? future : 'in ' + val + ' ' + unit + 's';
-		return val <= 1 ? past : val + ' ' + unit + 's ago';
-	}
-    return format(diff, 31536000000, 'year', 'last year', 'in a year', diff < 0);
-};
-
-export const loadCss = (cssFile) => {
-	const cssPath = import.meta.resolve(cssFile);
-	//console.log(cssPath);
-	const $link = document.createElement("link");
-	$link.setAttribute("rel", 'stylesheet');
-	$link.setAttribute("href", cssPath);
-	document.head.appendChild($link);
-};
-
-export const copyText = (text) => {
-	return new Promise((resolve) => {
-		let err;
-		try {
-			navigator.clipboard.writeText(text);
-		} catch (e) {
-			err = e;
-		}
-		if (err) {
-			resolve(false);
-		} else {
-			resolve(true);
-		}
-	});
-};
-
-function renderPopover($elem, target, options = {}) {
-	// async microtask
-	queueMicrotask(() => {
-		
-		const containerRect = getRect(window);
-		const targetRect = getRect(target);
-		const elemRect = getRect($elem);
-
-		const positionInfo = getBestPosition(
-			containerRect,
-			targetRect,
-			elemRect,
-			options.positions
-		);
-		const style = getPositionStyle(positionInfo, {
-			bgColor: options.bgColor,
-			borderColor: options.borderColor,
-			borderRadius: options.borderRadius
-		});
-
-		$elem.style.top = positionInfo.top + "px";
-		$elem.style.left = positionInfo.left + "px";
-		$elem.style.background = style.background;
-	
-	});
-}
-
-let $popover;
-export function hidePopover() {
-	if ($popover) {
-		$popover.remove();
-		$popover = null;
-	}
-}
-export function showPopover(target, text, className, options) {
-	hidePopover();
-	$popover = document.createElement("div");
-	$popover.className = ['cn-popover', className].filter(it => it).join(" ");
-	document.body.appendChild($popover);
-	$popover.innerHTML = text;
-	$popover.style.display = "block";
-	renderPopover($popover, target, {
-		borderRadius: 10,
-		... options
-	});
-}
-
-let $tooltip;
-export function hideTooltip(target) {
-	if ($tooltip) {
-		$tooltip.style.display = "none";
-		$tooltip.innerHTML = "";
-		$tooltip.style.top = "0px";
-		$tooltip.style.left = "0px";
-	}
-}
-export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {}) {
-	if (!$tooltip) {
-		$tooltip = document.createElement("div");
-		$tooltip.className = className;
-		$tooltip.style.cssText = `
-			pointer-events: none;
-			position: fixed;
-			z-index: 10001;
-			padding: 20px;
-			color: #1e1e1e;
-			max-width: 350px;
-			filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
-			${Object.keys(styleMap).map(k=>k+":"+styleMap[k]+";").join("")}
-		`;
-		document.body.appendChild($tooltip);
-	}
-
-	$tooltip.innerHTML = text;
-	$tooltip.style.display = "block";
-	renderPopover($tooltip, target, {
-		positions: ['top', 'bottom', 'right', 'center'],
-		bgColor: "#ffffff",
-		borderColor: "#cccccc",
-		borderRadius: 5
-	});
-}
-
-function initTooltip () {
-	const mouseenterHandler = (e) => {
-        const target = e.target;
-        const text = target.getAttribute('tooltip');
-        if (text) {
-            showTooltip(target, text);
-        }
-    };
-	const mouseleaveHandler = (e) => {
-        const target = e.target;
-        const text = target.getAttribute('tooltip');
-        if (text) {
-            hideTooltip(target);
-        }
-    };
-	document.body.removeEventListener('mouseenter', mouseenterHandler, true);
-	document.body.removeEventListener('mouseleave', mouseleaveHandler, true);
-	document.body.addEventListener('mouseenter', mouseenterHandler, true);
-    document.body.addEventListener('mouseleave', mouseleaveHandler, true);
-}
-
-initTooltip();
--- a/js/custom-nodes-manager.css
+++ b/js/custom-nodes-manager.css
@@ -1,699 +0,0 @@
-.cn-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 1099;
-	width: 80%;
-	height: 80%;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-	text-underline-offset: 3px;
-	outline: none;
-}
-
-.cn-manager .cn-flex-auto {
-	flex: auto;
-}
-
-.cn-manager button {
-	font-size: 16px;
-	color: var(--input-text);
-	background-color: var(--comfy-input-bg);
-	border-radius: 8px;
-	border-color: var(--border-color);
-	border-style: solid;
-	margin: 0;
-	padding: 4px 8px;
-	min-width: 100px;
-}
-
-.cn-manager button:disabled,
-.cn-manager input:disabled,
-.cn-manager select:disabled {
-	color: gray;
-}
-
-.cn-manager button:disabled {
-	background-color: var(--comfy-input-bg);
-}
-
-.cn-manager .cn-manager-restart {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.cn-manager .cn-manager-stop {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.cn-manager .cn-manager-back {
-	align-items: center;
-	justify-content: center;
-}
-
-.arrow-icon {
-	height: 1em;
-	width: 1em;
-	margin-right: 5px;
-	transform: translateY(2px);
-}
-
-.cn-icon {
-	display: block;
-	width: 16px;
-	height: 16px;
-}
-
-.cn-icon svg {
-	display: block;
-	margin: 0;
-	pointer-events: none;
-}
-
-.cn-manager-header {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 0 5px;
-}
-
-.cn-manager-header label {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-}
-
-.cn-manager-filter {
-	height: 28px;
-	line-height: 28px;
-}
-
-.cn-manager-keywords {
-	height: 28px;
-	line-height: 28px;
-	padding: 0 5px 0 26px;
-	background-size: 16px;
-	background-position: 5px center;
-	background-repeat: no-repeat;
-	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-}
-
-.cn-manager-status {
-	padding-left: 10px;
-}
-
-.cn-manager-grid {
-	flex: auto;
-	border: 1px solid var(--border-color);
-	overflow: hidden;
-	position: relative;
-}
-
-.cn-manager-selection {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cn-manager-message {
-	position: relative;
-}
-
-.cn-manager-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cn-manager-grid .tg-turbogrid {
-	font-family: var(--grid-font);
-	font-size: 15px;
-	background: var(--bg-color);
-}
-
-.cn-manager-grid .tg-turbogrid .tg-highlight::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	content: "";
-	display: block;
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box;
-	background-color: #80bdff11;
-	pointer-events: none;
-}
-
-.cn-manager-grid .cn-pack-name a {
-	color: skyblue;
-	text-decoration: none;
-	word-break: break-word;
-}
-
-.cn-manager-grid .cn-pack-desc a {
-	color: #5555FF;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.cn-manager-grid .tg-cell a:hover {
-	text-decoration: underline;
-}
-
-.cn-manager-grid .cn-pack-version {
-	line-height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100%;
-	gap: 5px;
-}
-
-.cn-manager-grid .cn-pack-nodes {
-	line-height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	gap: 5px;
-	cursor: pointer;
-	height: 100%;
-}
-
-.cn-manager-grid .cn-pack-nodes:hover {
-	text-decoration: underline;
-}
-
-.cn-manager-grid .cn-pack-conflicts {
-	color: orange;
-}
-
-.cn-popover {
-	position: fixed;
-	z-index: 10000;
-	padding: 20px;
-	color: #1e1e1e;
-	filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
-	overflow: hidden;
-}
-
-.cn-flyover {
-	position: absolute;
-    top: 0;
-	right: 0;
-    z-index: 1000;
-    display: none;
-    width: 50%;
-    height: 100%;
-    background-color: var(--comfy-menu-bg);
-    animation-duration: 0.2s;
-    animation-fill-mode: both;
-	flex-direction: column;
-}
-
-.cn-flyover::before {
-    position: absolute;
-    top: 0;
-    content: "";
-    z-index: 10;
-    display: block;
-    width: 10px;
-    height: 100%;
-    pointer-events: none;
-	left: -10px;
-    background-image: linear-gradient(to left, rgb(0 0 0 / 20%), rgb(0 0 0 / 0%));
-}
-
-.cn-flyover-header {
-	height: 45px;
-	display: flex;
-	align-items: center;
-	gap: 5px;
-	border-bottom: 1px solid var(--border-color);
-}
-
-.cn-flyover-close {
-	display: flex;
-	align-items: center;
-	padding: 0 10px;
-	justify-content: center;
-	cursor: pointer;
-	opacity: 0.8;
-	height: 100%;
-}
-
-.cn-flyover-close:hover {
-	opacity: 1;
-}
-
-.cn-flyover-close svg {
-	display: block;
-	margin: 0;
-	pointer-events: none;
-	width: 20px;
-	height: 20px;
-}
-
-.cn-flyover-title {
-	display: flex;
-	align-items: center;
-	font-weight: bold;
-	gap: 10px;
-	flex: auto;
-}
-
-.cn-flyover-body {
-	height: calc(100% - 45px);
-	overflow-y: auto;
-	position: relative;
-	background-color: var(--comfy-menu-secondary-bg);
-}
-
-@keyframes cn-slide-in-right {
-    from {
-        visibility: visible;
-        transform: translate3d(100%, 0, 0);
-    }
-
-    to {
-        transform: translate3d(0, 0, 0);
-    }
-}
-
-.cn-slide-in-right {
-    animation-name: cn-slide-in-right;
-}
-
-@keyframes cn-slide-out-right {
-    from {
-        transform: translate3d(0, 0, 0);
-    }
-
-    to {
-        visibility: hidden;
-        transform: translate3d(100%, 0, 0);
-    }
-}
-
-.cn-slide-out-right {
-    animation-name: cn-slide-out-right;
-}
-
-.cn-nodes-list {
-	width: 100%;
-}
-
-.cn-nodes-row {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-}
-
-.cn-nodes-row:nth-child(odd) {
-	background-color: rgb(0 0 0 / 5%);
-}
-
-.cn-nodes-row:hover {
-    background-color: rgb(0 0 0 / 10%);
-}
-
-.cn-nodes-sn {
-	text-align: right;
-	min-width: 35px;
-	color: var(--drag-text);
-	flex-shrink: 0;
-	font-size: 12px;
-	padding: 8px 5px;
-}
-
-.cn-nodes-name {
-	cursor: pointer;
-	white-space: nowrap;
-	flex-shrink: 0;
-	position: relative;
-	padding: 8px 5px;
-}
-
-.cn-nodes-name::after {
-	content: attr(action);
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	left: 100%;
-	transform: translate(5px, -50%);
-	font-size: 12px;
-	color: var(--drag-text);
-	background-color: var(--comfy-input-bg);
-	border-radius: 10px;
-	border: 1px solid var(--border-color);
-	padding: 3px 8px;
-	display: none;
-}
-
-.cn-nodes-name.action::after {
-	display: block;
-}
-
-.cn-nodes-name:hover {
-	text-decoration: underline;
-}
-
-.cn-nodes-conflict .cn-nodes-name,
-.cn-nodes-conflict .cn-icon {
-	color: orange;
-}
-
-.cn-conflicts-list {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 5px 0;
-}
-
-.cn-conflicts-list b {
-	font-weight: normal;
-	color: var(--descrip-text);
-}
-
-.cn-nodes-pack {
-	cursor: pointer;
-	color: skyblue;
-}
-
-.cn-nodes-pack:hover {
-	text-decoration: underline;
-}
-
-.cn-pack-badge {
-	font-size: 12px;
-	font-weight: normal;
-	background-color: var(--comfy-input-bg);
-	border-radius: 10px;
-	border: 1px solid var(--border-color);
-	padding: 3px 8px;
-	color: var(--error-text);
-}
-
-.cn-preview {
-	min-width: 300px;
-	max-width: 500px;
-	min-height: 120px;
-	overflow: hidden;
-  	font-size: 12px;
-	pointer-events: none;
-	padding: 12px;
-	color: var(--fg-color);
-}
-
-.cn-preview-header {
-	display: flex;
-	gap: 8px;
-	align-items: center;
-	border-bottom: 1px solid var(--comfy-input-bg);
-	padding: 5px 10px;
-}
-
-.cn-preview-dot {
-	width: 8px;
-	height: 8px;
-	border-radius: 50%;
-	background-color: grey;
-	position: relative;
-	filter: drop-shadow(1px 2px 3px rgb(0 0 0 / 30%));
-}
-
-.cn-preview-dot.cn-preview-optional::after {
-	content: "";
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	background-color: var(--comfy-input-bg);
-	border-radius: 50%;
-	width: 3px;
-  	height: 3px;
-}
-
-.cn-preview-dot.cn-preview-grid {
-	border-radius: 0;
-}
-
-.cn-preview-dot.cn-preview-grid::before {
-	content: '';
-	position: absolute;
-	border-left: 1px solid var(--comfy-input-bg);
-	border-right: 1px solid var(--comfy-input-bg);
-	width: 4px;
-	height: 100%;
-	left: 2px;
-	top: 0;
-	z-index: 1;
-}
-
-.cn-preview-dot.cn-preview-grid::after {
-	content: '';
-	position: absolute;
-	border-top: 1px solid var(--comfy-input-bg);
-	border-bottom: 1px solid var(--comfy-input-bg);
-	width: 100%;
-	height: 4px;
-	left: 0;
-	top: 2px;
-	z-index: 1;
-}
-
-.cn-preview-name {
-	flex: auto;
-	font-size: 14px;
-}
-
-.cn-preview-io {
-	display: flex;
-	justify-content: space-between;
-	padding: 10px 10px;
-}
-
-.cn-preview-column > div {
-	display: flex;
-	gap: 10px;
-	align-items: center;
-	height: 18px;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-.cn-preview-input {
-	justify-content: flex-start;
-}
-
-.cn-preview-output {
-	justify-content: flex-end;
-}
-
-.cn-preview-list {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	padding: 0 10px 10px 10px;
-}
-
-.cn-preview-switch {
-	position: relative;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	background: var(--bg-color);
-	border: 2px solid var(--border-color);
-	border-radius: 10px;
-	text-wrap: nowrap;
-	padding: 2px 20px;
-	gap: 10px;
-}
-
-.cn-preview-switch::before,
-.cn-preview-switch::after {
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	transform: translate(0, -50%);
-	color: var(--fg-color);
-	opacity: 0.8;
-}
-
-.cn-preview-switch::before {
-	content: "◀";
-	left: 5px;
-}
-
-.cn-preview-switch::after {
-	content: "▶";
-	right: 5px;
-}
-
-.cn-preview-value {
-	color: var(--descrip-text);
-}
-
-.cn-preview-string {
-	min-height: 30px;
-	max-height: 300px;
-	background: var(--bg-color);
-	color: var(--descrip-text);
-	border-radius: 3px;
-	padding: 3px 5px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-.cn-preview-description {
-	margin: 0px 10px 10px 10px;
-	padding: 6px;
-	background: var(--border-color);
-	color: var(--descrip-text);
-	border-radius: 5px;
-	font-style: italic;
-	word-break: break-word;
-}
-
-.cn-tag-list {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	margin-bottom: 5px;
-}
-
-.cn-tag-list > div {
-	background-color: var(--border-color);
-	border-radius: 5px;
-	padding: 0 5px;
-}
-
-.cn-install-buttons {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	padding: 3px;
-	align-items: center;
-	justify-content: center;
-	height: 100%;
-}
-
-.cn-selected-buttons {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-	padding-right: 20px;
-}
-
-.cn-manager .cn-btn-enable {
-	background-color: #333399;
-	color: white;
-}
-
-.cn-manager .cn-btn-disable {
-	background-color: #442277;
-	color: white;
-}
-
-.cn-manager .cn-btn-update {
-	background-color: #1155AA;
-	color: white;
-}
-
-.cn-manager .cn-btn-try-update {
-	background-color: Gray;
-	color: white;
-}
-
-.cn-manager .cn-btn-try-fix {
-	background-color: #6495ED;
-	color: white;
-}
-
-.cn-manager .cn-btn-import-failed {
-	background-color: #AA1111;
-    font-size: 10px;
-	font-weight: bold;
-	color: white;
-}
-
-.cn-manager .cn-btn-install {
-	background-color: black;
-	color: white;
-}
-
-.cn-manager .cn-btn-try-install {
-	background-color: Gray;
-	color: white;
-}
-
-.cn-manager .cn-btn-uninstall {
-	background-color: #993333;
-	color: white;
-}
-
-.cn-manager .cn-btn-reinstall {
-	background-color: #993333;
-	color: white;
-}
-
-.cn-manager .cn-btn-switch {
-	background-color: #448833;
-	color: white;
-
-}
-
-@keyframes cn-btn-loading-bg {
-	0% {
-		left: 0;
-	}
-	100% {
-		left: -105px;
-	}
-}
-
-.cn-manager button.cn-btn-loading {
-	position: relative;
-	overflow: hidden;
-	border-color: rgb(0 119 207 / 80%);
-	background-color: var(--comfy-input-bg);
-}
-
-.cn-manager button.cn-btn-loading::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	content: "";
-	width: 500px;
-	height: 100%;
-	background-image: repeating-linear-gradient(
-		-45deg,
-		rgb(0 119 207 / 30%),
-		rgb(0 119 207 / 30%) 10px,
-		transparent 10px,
-		transparent 15px
-	);
-	animation: cn-btn-loading-bg 2s linear infinite;
-}
-
-.cn-manager-light .cn-pack-name a {
-	color: blue;
-}
-
-.cn-manager-light .cm-warn-note {
-	background-color: #ccc !important;
-}
-
-.cn-manager-light .cn-btn-install {
-	background-color: #333;
-}
--- a/js/custom-nodes-manager.js
+++ b/js/custom-nodes-manager.js
--- a/js/model-manager.css
+++ b/js/model-manager.css
@@ -1,213 +0,0 @@
-.cmm-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 1099;
-	width: 80%;
-	height: 80%;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-}
-
-.cmm-manager .cmm-flex-auto {
-	flex: auto;
-}
-
-.cmm-manager button {
-	font-size: 16px;
-	color: var(--input-text);
-    background-color: var(--comfy-input-bg);
-    border-radius: 8px;
-    border-color: var(--border-color);
-    border-style: solid;
-    margin: 0;
-	padding: 4px 8px;
-	min-width: 100px;
-}
-
-.cmm-manager button:disabled,
-.cmm-manager input:disabled,
-.cmm-manager select:disabled {
-	color: gray;
-}
-
-.cmm-manager button:disabled {
-	background-color: var(--comfy-input-bg);
-}
-
-.cmm-manager .cmm-manager-refresh {
-	display: none;
-	background-color: #000080;
-	color: white;
-}
-
-.cmm-manager .cmm-manager-stop {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.cmm-manager-header {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 0 5px;
-}
-
-.cmm-manager-header label {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-}
-
-.cmm-manager-type,
-.cmm-manager-base,
-.cmm-manager-filter {
-	height: 28px;
-	line-height: 28px;
-}
-
-.cmm-manager-keywords {
-	height: 28px;
-	line-height: 28px;
-	padding: 0 5px 0 26px;
-	background-size: 16px;
-	background-position: 5px center;
-	background-repeat: no-repeat;
-	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-}
-
-.cmm-manager-status {
-	padding-left: 10px;
-}
-
-.cmm-manager-grid {
-	flex: auto;
-	border: 1px solid var(--border-color);
-	overflow: hidden;
-}
-
-.cmm-manager-selection {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cmm-manager-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cmm-manager-grid .tg-turbogrid {
-	font-family: var(--grid-font);
-	font-size: 15px;
-	background: var(--bg-color);
-}
-
-.cmm-manager-grid .cmm-node-name a {
-	color: skyblue;
-	text-decoration: none;
-	word-break: break-word;
-}
-
-.cmm-manager-grid .cmm-node-desc a {
-	color: #5555FF;
-    font-weight: bold;
-	text-decoration: none;
-}
-
-.cmm-manager-grid .tg-cell a:hover {
-	text-decoration: underline;
-}
-
-.cmm-icon-passed {
-	width: 20px;
-	height: 20px;
-	position: absolute;
-	left: calc(50% - 10px);
-	top: calc(50% - 10px);
-}
-
-.cmm-manager .cmm-btn-enable {
-	background-color: blue;
-	color: white;
-}
-
-.cmm-manager .cmm-btn-disable {
-	background-color: MediumSlateBlue;
-	color: white;
-}
-
-.cmm-manager .cmm-btn-install {
-	background-color: black;
-	color: white;
-}
-
-.cmm-btn-download {
-	width: 18px;
-	height: 18px;
-	position: absolute;
-	left: calc(50% - 10px);
-	top: calc(50% - 10px);
-	cursor: pointer;
-	opacity: 0.8;
-	color: #fff;
-}
-
-.cmm-btn-download:hover {
-	opacity: 1;
-}
-
-.cmm-manager-light .cmm-btn-download {
-	color: #000;
-}
-
-@keyframes cmm-btn-loading-bg {
-    0% {
-        left: 0;
-    }
-    100% {
-        left: -105px;
-    }
-}
-
-.cmm-manager button.cmm-btn-loading {
-    position: relative;
-    overflow: hidden;
-    border-color: rgb(0 119 207 / 80%);
-	background-color: var(--comfy-input-bg);
-}
-
-.cmm-manager button.cmm-btn-loading::after {
-    position: absolute;
-    top: 0;
-    left: 0;
-    content: "";
-    width: 500px;
-    height: 100%;
-    background-image: repeating-linear-gradient(
-        -45deg,
-        rgb(0 119 207 / 30%),
-        rgb(0 119 207 / 30%) 10px,
-        transparent 10px,
-        transparent 15px
-    );
-    animation: cmm-btn-loading-bg 2s linear infinite;
-}
-
-.cmm-manager-light .cmm-node-name a {
-	color: blue;
-}
-
-.cmm-manager-light .cm-warn-note {
-	background-color: #ccc !important;
-}
-
-.cmm-manager-light .cmm-btn-install {
-	background-color: #333;
-}
--- a/js/model-manager.js
+++ b/js/model-manager.js
@@ -3,17 +3,236 @@ import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
 	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
-	storeColumnWidth, restoreColumnWidth, loadCss
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
 import { api } from "../../scripts/api.js";

 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";

-loadCss("./model-manager.css");
-
 const gridId = "model";

+const pageCss = `
+.cmm-manager {
+	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	z-index: 1099;
+	width: 80%;
+	height: 80%;
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+	color: var(--fg-color);
+	font-family: arial, sans-serif;
+}
+
+.cmm-manager .cmm-flex-auto {
+	flex: auto;
+}
+
+.cmm-manager button {
+	font-size: 16px;
+	color: var(--input-text);
+    background-color: var(--comfy-input-bg);
+    border-radius: 8px;
+    border-color: var(--border-color);
+    border-style: solid;
+    margin: 0;
+	padding: 4px 8px;
+	min-width: 100px;
+}
+
+.cmm-manager button:disabled,
+.cmm-manager input:disabled,
+.cmm-manager select:disabled {
+	color: gray;
+}
+
+.cmm-manager button:disabled {
+	background-color: var(--comfy-input-bg);
+}
+
+.cmm-manager .cmm-manager-refresh {
+	display: none;
+	background-color: #000080;
+	color: white;
+}
+
+.cmm-manager .cmm-manager-stop {
+	display: none;
+	background-color: #500000;
+	color: white;
+}
+
+.cmm-manager-header {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 5px;
+	align-items: center;
+	padding: 0 5px;
+}
+
+.cmm-manager-header label {
+	display: flex;
+	gap: 5px;
+	align-items: center;
+}
+
+.cmm-manager-type,
+.cmm-manager-base,
+.cmm-manager-filter {
+	height: 28px;
+	line-height: 28px;
+}
+
+.cmm-manager-keywords {
+	height: 28px;
+	line-height: 28px;
+	padding: 0 5px 0 26px;
+	background-size: 16px;
+	background-position: 5px center;
+	background-repeat: no-repeat;
+	background-image: url("data:image/svg+xml;charset=utf8,${encodeURIComponent(icons.search.replace("currentColor", "#888"))}");
+}
+
+.cmm-manager-status {
+	padding-left: 10px;
+}
+
+.cmm-manager-grid {
+	flex: auto;
+	border: 1px solid var(--border-color);
+	overflow: hidden;
+}
+
+.cmm-manager-selection {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cmm-manager-message {
+	
+}
+
+.cmm-manager-footer {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cmm-manager-grid .tg-turbogrid {
+	font-family: var(--grid-font);
+	font-size: 15px;
+	background: var(--bg-color);
+}
+
+.cmm-manager-grid .cmm-node-name a {
+	color: skyblue;
+	text-decoration: none;
+	word-break: break-word;
+}
+
+.cmm-manager-grid .cmm-node-desc a {
+	color: #5555FF;
+    font-weight: bold;
+	text-decoration: none;
+}
+
+.cmm-manager-grid .tg-cell a:hover {
+	text-decoration: underline;
+}
+
+.cmm-icon-passed {
+	width: 20px;
+	height: 20px;
+	position: absolute;
+	left: calc(50% - 10px);
+	top: calc(50% - 10px);
+}
+
+.cmm-manager .cmm-btn-enable {
+	background-color: blue;
+	color: white;
+}
+
+.cmm-manager .cmm-btn-disable {
+	background-color: MediumSlateBlue;
+	color: white;
+}
+
+.cmm-manager .cmm-btn-install {
+	background-color: black;
+	color: white;
+}
+
+.cmm-btn-download {
+	width: 18px;
+	height: 18px;
+	position: absolute;
+	left: calc(50% - 10px);
+	top: calc(50% - 10px);
+	cursor: pointer;
+	opacity: 0.8;
+	color: #fff;
+}
+
+.cmm-btn-download:hover {
+	opacity: 1;
+}
+
+.cmm-manager-light .cmm-btn-download {
+	color: #000;
+}
+
+@keyframes cmm-btn-loading-bg {
+    0% {
+        left: 0;
+    }
+    100% {
+        left: -105px;
+    }
+}
+
+.cmm-manager button.cmm-btn-loading {
+    position: relative;
+    overflow: hidden;
+    border-color: rgb(0 119 207 / 80%);
+	background-color: var(--comfy-input-bg);
+}
+
+.cmm-manager button.cmm-btn-loading::after {
+    position: absolute;
+    top: 0;
+    left: 0;
+    content: "";
+    width: 500px;
+    height: 100%;
+    background-image: repeating-linear-gradient(
+        -45deg,
+        rgb(0 119 207 / 30%),
+        rgb(0 119 207 / 30%) 10px,
+        transparent 10px,
+        transparent 15px
+    );
+    animation: cmm-btn-loading-bg 2s linear infinite;
+}
+
+.cmm-manager-light .cmm-node-name a {
+	color: blue;
+}
+
+.cmm-manager-light .cm-warn-note {
+	background-color: #ccc !important;
+}
+
+.cmm-manager-light .cmm-btn-install {
+	background-color: #333;
+}
+
+`;
+
 const pageHtml = `
 <div class="cmm-manager-header">
 	<label>Filter
@@ -64,6 +283,14 @@ export class ModelManager {
 	}

 	init() {
+
+		if (!document.querySelector(`style[context="${this.id}"]`)) {
+			const $style = document.createElement("style");
+			$style.setAttribute("context", this.id);
+			$style.innerHTML = pageCss;
+			document.head.appendChild($style);
+		}
+
 		this.element = $el("div", {
 			parent: document.body,
 			className: "comfy-modal cmm-manager"
@@ -334,7 +561,7 @@ export class ModelManager {
 			sortable: false,
 			align: 'center',
 			formatter: (url, rowItem, columnItem) => {
-				return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
+				return `<a class="cmm-btn-download" title="Download file" href="${url}" target="_blank">${icons.download}</a>`;
 			}
 		}, {
 			id: 'size',
--- a/js/popover-helper.js
+++ b/js/popover-helper.js
@@ -1,619 +0,0 @@
-const hasOwn = function(obj, key) {
-    return Object.prototype.hasOwnProperty.call(obj, key);
-};
-
-const isNum = function(num) {
-    if (typeof num !== 'number' || isNaN(num)) {
-        return false;
-    }
-    const isInvalid = function(n) {
-        if (n === Number.MAX_VALUE || n === Number.MIN_VALUE || n === Number.NEGATIVE_INFINITY || n === Number.POSITIVE_INFINITY) {
-            return true;
-        }
-        return false;
-    };
-    if (isInvalid(num)) {
-        return false;
-    }
-    return true;
-};
-
-const toNum = (num) => {
-    if (typeof (num) !== 'number') {
-        num = parseFloat(num);
-    }
-    if (isNaN(num)) {
-        num = 0;
-    }
-    num = Math.round(num);
-    return num;
-};
-
-const clamp = function(value, min, max) {
-    return Math.max(min, Math.min(max, value));
-};
-
-const isWindow = (obj) => {
-    return Boolean(obj && obj === obj.window);
-};
-
-const isDocument = (obj) => {
-    return Boolean(obj && obj.nodeType === 9);
-};
-
-const isElement = (obj) => {
-    return Boolean(obj && obj.nodeType === 1);
-};
-
-// ===========================================================================================
-
-export const toRect = (obj) => {
-    if (obj) {
-        return {
-            left: toNum(obj.left || obj.x),
-            top: toNum(obj.top || obj.y),
-            width: toNum(obj.width),
-            height: toNum(obj.height)
-        };
-    }
-    return {
-        left: 0,
-        top: 0,
-        width: 0,
-        height: 0
-    };
-};
-
-export const getElement = (selector) => {
-    if (typeof selector === 'string' && selector) {
-        if (selector.startsWith('#')) {
-            return document.getElementById(selector.slice(1));
-        }
-        return document.querySelector(selector);
-    }
-
-    if (isDocument(selector)) {
-        return selector.body;
-    }
-    if (isElement(selector)) {
-        return selector;
-    }
-};
-
-export const getRect = (target, fixed) => {
-    if (!target) {
-        return toRect();
-    }
-
-    if (isWindow(target)) {
-        return {
-            left: 0,
-            top: 0,
-            width: window.innerWidth,
-            height: window.innerHeight
-        };
-    }
-
-    const elem = getElement(target);
-    if (!elem) {
-        return toRect(target);
-    }
-
-    const br = elem.getBoundingClientRect();
-    const rect = toRect(br);
-
-    // fix offset
-    if (!fixed) {
-        rect.left += window.scrollX;
-        rect.top += window.scrollY;
-    }
-
-    rect.width = elem.offsetWidth;
-    rect.height = elem.offsetHeight;
-
-    return rect;
-};
-
-// ===========================================================================================
-
-const calculators = {
-
-    bottom: (info, containerRect, targetRect) => {
-        info.space = containerRect.top + containerRect.height - targetRect.top - targetRect.height - info.height;
-        info.top = targetRect.top + targetRect.height;
-        info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
-    },
-
-    top: (info, containerRect, targetRect) => {
-        info.space = targetRect.top - info.height - containerRect.top;
-        info.top = targetRect.top - info.height;
-        info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
-    },
-
-    right: (info, containerRect, targetRect) => {
-        info.space = containerRect.left + containerRect.width - targetRect.left - targetRect.width - info.width;
-        info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
-        info.left = targetRect.left + targetRect.width;
-    },
-
-    left: (info, containerRect, targetRect) => {
-        info.space = targetRect.left - info.width - containerRect.left;
-        info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
-        info.left = targetRect.left - info.width;
-    }
-};
-
-// with order
-export const getDefaultPositions = () => {
-    return Object.keys(calculators);
-};
-
-const calculateSpace = (info, containerRect, targetRect) => {
-    const calculator = calculators[info.position];
-    calculator(info, containerRect, targetRect);
-    if (info.space >= 0) {
-        info.passed += 1;
-    }
-};
-
-// ===========================================================================================
-
-const calculateAlignOffset = (info, containerRect, targetRect, alignType, sizeType) => {
-
-    const popoverStart = info[alignType];
-    const popoverSize = info[sizeType];
-
-    const containerStart = containerRect[alignType];
-    const containerSize = containerRect[sizeType];
-
-    const targetStart = targetRect[alignType];
-    const targetSize = targetRect[sizeType];
-
-    const targetCenter = targetStart + targetSize * 0.5;
-
-    // size overflow
-    if (popoverSize > containerSize) {
-        const overflow = (popoverSize - containerSize) * 0.5;
-        info[alignType] = containerStart - overflow;
-        info.offset = targetCenter - containerStart + overflow;
-        return;
-    }
-
-    const space1 = popoverStart - containerStart;
-    const space2 = (containerStart + containerSize) - (popoverStart + popoverSize);
-
-    // both side passed, default to center
-    if (space1 >= 0 && space2 >= 0) {
-        if (info.passed) {
-            info.passed += 2;
-        }
-        info.offset = popoverSize * 0.5;
-        return;
-    }
-
-    // one side passed
-    if (info.passed) {
-        info.passed += 1;
-    }
-
-    if (space1 < 0) {
-        const min = containerStart;
-        info[alignType] = min;
-        info.offset = targetCenter - min;
-        return;
-    }
-
-    // space2 < 0
-    const max = containerStart + containerSize - popoverSize;
-    info[alignType] = max;
-    info.offset = targetCenter - max;
-
-};
-
-const calculateHV = (info, containerRect) => {
-    if (['top', 'bottom'].includes(info.position)) {
-        info.top = clamp(info.top, containerRect.top, containerRect.top + containerRect.height - info.height);
-        return ['left', 'width'];
-    }
-    info.left = clamp(info.left, containerRect.left, containerRect.left + containerRect.width - info.width);
-    return ['top', 'height'];
-};
-
-const calculateOffset = (info, containerRect, targetRect) => {
-
-    const [alignType, sizeType] = calculateHV(info, containerRect);
-
-    calculateAlignOffset(info, containerRect, targetRect, alignType, sizeType);
-
-    info.offset = clamp(info.offset, 0, info[sizeType]);
-
-};
-
-// ===========================================================================================
-
-const calculateDistance = (info, previousPositionInfo) => {
-    if (!previousPositionInfo) {
-        return;
-    }
-    // no change if position no change with previous
-    if (info.position === previousPositionInfo.position) {
-        return;
-    }
-    const ax = info.left + info.width * 0.5;
-    const ay = info.top + info.height * 0.5;
-    const bx = previousPositionInfo.left + previousPositionInfo.width * 0.5;
-    const by = previousPositionInfo.top + previousPositionInfo.height * 0.5;
-    const dx = Math.abs(ax - bx);
-    const dy = Math.abs(ay - by);
-    info.distance = Math.round(Math.sqrt(dx * dx + dy * dy));
-};
-
-// ===========================================================================================
-
-const calculatePositionInfo = (info, containerRect, targetRect, previousPositionInfo) => {
-    calculateSpace(info, containerRect, targetRect);
-    calculateOffset(info, containerRect, targetRect);
-    calculateDistance(info, previousPositionInfo);
-};
-
-// ===========================================================================================
-
-const calculateBestPosition = (containerRect, targetRect, infoMap, withOrder, previousPositionInfo) => {
-
-    // position space: +1
-    // align space:
-    //    two side passed: +2
-    //    one side passed: +1
-
-    const safePassed = 3;
-
-    if (previousPositionInfo) {
-        const prevInfo = infoMap[previousPositionInfo.position];
-        if (prevInfo) {
-            calculatePositionInfo(prevInfo, containerRect, targetRect);
-            if (prevInfo.passed >= safePassed) {
-                return prevInfo;
-            }
-            prevInfo.calculated = true;
-        }
-    }
-
-    const positionList = [];
-    Object.values(infoMap).forEach((info) => {
-        if (!info.calculated) {
-            calculatePositionInfo(info, containerRect, targetRect, previousPositionInfo);
-        }
-        positionList.push(info);
-    });
-
-    positionList.sort((a, b) => {
-        if (a.passed !== b.passed) {
-            return b.passed - a.passed;
-        }
-
-        if (withOrder && a.passed >= safePassed && b.passed >= safePassed) {
-            return a.index - b.index;
-        }
-
-        if (a.space !== b.space) {
-            return b.space - a.space;
-        }
-
-        return a.index - b.index;
-    });
-
-    // logTable(positionList);
-
-    return positionList[0];
-};
-
-// const logTable = (() => {
-//     let time_id;
-//     return (info) => {
-//         clearTimeout(time_id);
-//         time_id = setTimeout(() => {
-//             console.table(info);
-//         }, 10);
-//     };
-// })();
-
-// ===========================================================================================
-
-const getAllowPositions = (positions, defaultAllowPositions) => {
-    if (!positions) {
-        return;
-    }
-    if (Array.isArray(positions)) {
-        positions = positions.join(',');
-    }
-    positions = String(positions).split(',').map((it) => it.trim().toLowerCase()).filter((it) => it);
-    positions = positions.filter((it) => defaultAllowPositions.includes(it));
-    if (!positions.length) {
-        return;
-    }
-    return positions;
-};
-
-const isPositionChanged = (info, previousPositionInfo) => {
-    if (!previousPositionInfo) {
-        return true;
-    }
-
-    if (info.left !== previousPositionInfo.left) {
-        return true;
-    }
-
-    if (info.top !== previousPositionInfo.top) {
-        return true;
-    }
-
-    return false;
-};
-
-// ===========================================================================================
-
-// const log = (name, time) => {
-//     if (time > 0.1) {
-//         console.log(name, time);
-//     }
-// };
-
-export const getBestPosition = (containerRect, targetRect, popoverRect, positions, previousPositionInfo) => {
-
-    const defaultAllowPositions = getDefaultPositions();
-    let withOrder = true;
-    let allowPositions = getAllowPositions(positions, defaultAllowPositions);
-    if (!allowPositions) {
-        allowPositions = defaultAllowPositions;
-        withOrder = false;
-    }
-
-    // console.log('withOrder', withOrder);
-
-    // const start_time = performance.now();
-
-    const infoMap = {};
-    allowPositions.forEach((k, i) => {
-        infoMap[k] = {
-            position: k,
-            index: i,
-
-            top: 0,
-            left: 0,
-            width: popoverRect.width,
-            height: popoverRect.height,
-
-            space: 0,
-
-            offset: 0,
-            passed: 0,
-
-            distance: 0
-        };
-    });
-
-    // log('infoMap', performance.now() - start_time);
-
-
-    const bestPosition = calculateBestPosition(containerRect, targetRect, infoMap, withOrder, previousPositionInfo);
-
-    // check left/top
-    bestPosition.changed = isPositionChanged(bestPosition, previousPositionInfo);
-
-    return bestPosition;
-};
-
-// ===========================================================================================
-
-const getTemplatePath = (width, height, arrowOffset, arrowSize, borderRadius) => {
-    const p = (px, py) => {
-        return [px, py].join(',');
-    };
-
-    const px = function(num, alignEnd) {
-        const floor = Math.floor(num);
-        let n = num < floor + 0.5 ? floor + 0.5 : floor + 1.5;
-        if (alignEnd) {
-            n -= 1;
-        }
-        return n;
-    };
-
-    const pxe = function(num) {
-        return px(num, true);
-    };
-
-    const ls = [];
-
-    const innerLeft = px(arrowSize);
-    const innerRight = pxe(width - arrowSize);
-    arrowOffset = clamp(arrowOffset, innerLeft, innerRight);
-
-    const innerTop = px(arrowSize);
-    const innerBottom = pxe(height - arrowSize);
-
-    const startPoint = p(innerLeft, innerTop + borderRadius);
-    const arrowPoint = p(arrowOffset, 1);
-
-    const LT = p(innerLeft, innerTop);
-    const RT = p(innerRight, innerTop);
-
-    const AOT = p(arrowOffset - arrowSize, innerTop);
-    const RRT = p(innerRight - borderRadius, innerTop);
-
-    ls.push(`M${startPoint}`);
-    ls.push(`V${innerBottom - borderRadius}`);
-    ls.push(`Q${p(innerLeft, innerBottom)} ${p(innerLeft + borderRadius, innerBottom)}`);
-    ls.push(`H${innerRight - borderRadius}`);
-    ls.push(`Q${p(innerRight, innerBottom)} ${p(innerRight, innerBottom - borderRadius)}`);
-    ls.push(`V${innerTop + borderRadius}`);
-
-    if (arrowOffset < innerLeft + arrowSize + borderRadius) {
-        ls.push(`Q${RT} ${RRT}`);
-        ls.push(`H${arrowOffset + arrowSize}`);
-        ls.push(`L${arrowPoint}`);
-        if (arrowOffset < innerLeft + arrowSize) {
-            ls.push(`L${LT}`);
-            ls.push(`L${startPoint}`);
-        } else {
-            ls.push(`L${AOT}`);
-            ls.push(`Q${LT} ${startPoint}`);
-        }
-    } else if (arrowOffset > innerRight - arrowSize - borderRadius) {
-        if (arrowOffset > innerRight - arrowSize) {
-            ls.push(`L${RT}`);
-        } else {
-            ls.push(`Q${RT} ${p(arrowOffset + arrowSize, innerTop)}`);
-        }
-        ls.push(`L${arrowPoint}`);
-        ls.push(`L${AOT}`);
-        ls.push(`H${innerLeft + borderRadius}`);
-        ls.push(`Q${LT} ${startPoint}`);
-    } else {
-        ls.push(`Q${RT} ${RRT}`);
-        ls.push(`H${arrowOffset + arrowSize}`);
-        ls.push(`L${arrowPoint}`);
-        ls.push(`L${AOT}`);
-        ls.push(`H${innerLeft + borderRadius}`);
-        ls.push(`Q${LT} ${startPoint}`);
-    }
-    return ls.join('');
-};
-
-const getPathData = function(position, width, height, arrowOffset, arrowSize, borderRadius) {
-
-    const handlers = {
-
-        bottom: () => {
-            const d = getTemplatePath(width, height, arrowOffset, arrowSize, borderRadius);
-            return {
-                d,
-                transform: ''
-            };
-        },
-
-        top: () => {
-            const d = getTemplatePath(width, height, width - arrowOffset, arrowSize, borderRadius);
-            return {
-                d,
-                transform: `rotate(180,${width * 0.5},${height * 0.5})`
-            };
-        },
-
-        left: () => {
-            const d = getTemplatePath(height, width, arrowOffset, arrowSize, borderRadius);
-            const x = (width - height) * 0.5;
-            const y = (height - width) * 0.5;
-            return {
-                d,
-                transform: `translate(${x} ${y}) rotate(90,${height * 0.5},${width * 0.5})`
-            };
-        },
-
-        right: () => {
-            const d = getTemplatePath(height, width, height - arrowOffset, arrowSize, borderRadius);
-            const x = (width - height) * 0.5;
-            const y = (height - width) * 0.5;
-            return {
-                d,
-                transform: `translate(${x} ${y}) rotate(-90,${height * 0.5},${width * 0.5})`
-            };
-        }
-    };
-
-    return handlers[position]();
-};
-
-// ===========================================================================================
-
-// position style cache
-const styleCache = {
-    // position: '',
-    // top: {},
-    // bottom: {},
-    // left: {},
-    // right: {}
-};
-
-export const getPositionStyle = (info, options = {}) => {
-
-    const o = {
-        bgColor: '#fff',
-        borderColor: '#ccc',
-        borderRadius: 5,
-        arrowSize: 10
-    };
-    Object.keys(o).forEach((k) => {
-
-        if (hasOwn(options, k)) {
-            const d = o[k];
-            const v = options[k];
-
-            if (typeof d === 'string') {
-                // string
-                if (typeof v === 'string' && v) {
-                    o[k] = v;
-                }
-            } else {
-                // number
-                if (isNum(v) && v >= 0) {
-                    o[k] = v;
-                }
-
-            }
-
-        }
-    });
-
-    const key = [
-        info.width,
-        info.height,
-        info.offset,
-        o.arrowSize,
-        o.borderRadius,
-        o.bgColor,
-        o.borderColor
-    ].join('-');
-
-    const positionCache = styleCache[info.position];
-    if (positionCache && key === positionCache.key) {
-        const st = positionCache.style;
-        st.changed = styleCache.position !== info.position;
-        styleCache.position = info.position;
-        return st;
-    }
-
-    // console.log(options);
-
-    const data = getPathData(info.position, info.width, info.height, info.offset, o.arrowSize, o.borderRadius);
-    // console.log(data);
-
-    const viewBox = [0, 0, info.width, info.height].join(' ');
-    const svg = [
-        `<svg viewBox="${viewBox}" xmlns="http://www.w3.org/2000/svg">`,
-        `<path d="${data.d}" fill="${o.bgColor}" stroke="${o.borderColor}" transform="${data.transform}" />`,
-        '</svg>'
-    ].join('');
-
-    // console.log(svg);
-    const backgroundImage = `url("data:image/svg+xml;charset=utf8,${encodeURIComponent(svg)}")`;
-
-    const background = `${backgroundImage} center no-repeat`;
-
-    const padding = `${o.arrowSize + o.borderRadius}px`;
-
-    const style = {
-        background,
-        backgroundImage,
-        padding,
-        changed: true
-    };
-
-    styleCache.position = info.position;
-    styleCache[info.position] = {
-        key,
-        style
-    };
-
-    return style;
-};
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
@@ -11,106 +11,7 @@

        
        
-        {
-            "author": "Solankimayursinh",
-            "title": "PMSnodes",
-            "reference": "https://github.com/Solankimayursinh/PMSnodes",
-            "files": [
-                "https://github.com/Solankimayursinh/PMSnodes"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom nodes for ComfyUI to Load audio in Base64 format and Send Audio to Websocket in Base64 Format for creating API of Audio related AI\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "rhinoflavored",
-            "title": "comfyui_QT",
-            "reference": "https://github.com/rhinoflavored/comfyui_QT",
-            "files": [
-                "https://github.com/rhinoflavored/comfyui_QT"
-            ],
-            "install_type": "git-clone",
-            "description": "bunch of image manipulation nodes....\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "ricklove",
-            "title": "ComfyUI-AutoSeg-SAM2",
-            "reference": "https://github.com/ricklove/ComfyUI-AutoSeg-SAM2",
-            "files": [
-                "https://github.com/ricklove/ComfyUI-AutoSeg-SAM2"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: AutoSeg-SAM2 Batch Segmentation"
-        },
-        {
-            "author": "JoeAu",
-            "title": "ComfyUI-PythonNode [UNSAFE]",
-            "reference": "https://github.com/JoeAu/ComfyUI-PythonNode",
-            "files": [
-                "https://github.com/JoeAu/ComfyUI-PythonNode"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom ComfyUI node that allows users to execute arbitrary Python code with a single input (value) and output (result), enabling flexible processing of the input value using any Python code before assigning the final result to result. It also captures print() output and exceptions for debugging.[w/This node is an unsafe node that includes the capability to execute arbitrary python script.]"
-        },
-        {
-            "author": "smthemex",
-            "title": "ComfyUI_GPT_SoVITS_Lite",
-            "reference": "https://github.com/smthemex/ComfyUI_GPT_SoVITS_Lite",
-            "files": [
-                "https://github.com/smthemex/ComfyUI_GPT_SoVITS_Lite"
-            ],
-            "install_type": "git-clone",
-            "description": "[a/GPT_SoVITS](https://github.com/RVC-Boss/GPT-SoVITS) infer only for ComfyUI users\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "Nambi24",
-            "title": "ComfyUI-Save_Image",
-            "reference": "https://github.com/Nambi24/ComfyUI-Save_Image",
-            "files": [
-               "https://github.com/Nambi24/ComfyUI-Save_Image"
-            ],
-            "description": "NODES: Save Image With Subfolder, Extract Last Path Component\nNOTE: The files in the repo are not organized.",
-            "install_type": "git-clone"
-        },
-        {
-            "author": "sugarkwork",
-            "title": "comfyui_image_crop",
-            "reference": "https://github.com/sugarkwork/comfyui_image_crop",
-            "files": [
-               "https://github.com/sugarkwork/comfyui_image_crop"
-            ],
-            "description": "NODES: CropTransparent, RestoreCrop, ExpandMultiple, CropReapply",
-            "install_type": "git-clone"
-        },
-        {
-            "author": "AkiEvansDev",
-            "title": "ComfyUI-Tools",
-            "reference": "https://github.com/AkiEvansDev/ComfyUI-Tools",
-            "files": [
-                "https://github.com/AkiEvansDev/ComfyUI-Tools"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom nodes for basic actions."
-        },
-        {
-            "author": "silveroxides",
-            "title": "ComfyUI-ModelUtils [WIP]",
-            "reference": "https://github.com/silveroxides/ComfyUI-ModelUtils",
-            "files": [
-                "https://github.com/silveroxides/ComfyUI-ModelUtils"
-            ],
-            "install_type": "git-clone",
-            "description": "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
-        },
-        {
-            "author": "thisiseddy-ab",
-            "title": "ComfyUI-Edins-Ultimate-Pack",
-            "reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
-            "files": [
-                "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
-            ],
-            "install_type": "git-clone",
-            "description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
-        },
+        
        {
            "author": "longzoho",
            "title": "ComfyUI-Qdrant-Saver",
@@ -121,6 +22,16 @@
            "install_type": "git-clone",
            "description": "NODES: QDrant Saver Node"
        },
+        {
+            "author": "nova-florealis",
+            "title": "comfyui-alien",
+            "reference": "https://github.com/nova-florealis/comfyui-alien",
+            "files": [
+                "https://github.com/nova-florealis/comfyui-alien"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
+        },
        {
            "author": "RUFFY-369",
            "title": "ComfyUI-FeatureBank",
@@ -133,7 +44,7 @@
        },
        {
            "author": "Pablerdo",
-            "title": "ComfyUI-Sa2VAWrapper [WIP]",
+            "title": "ComfyUI-Sa2VAWrapper",
            "reference": "https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper",
            "files": [
                "https://github.com/Pablerdo/ComfyUI-Sa2VAWrapper"
@@ -1897,6 +1808,16 @@
            "install_type": "git-clone",
            "description": "a custom node for [a/Ultralight-Digital-Human](https://github.com/anliyuan/Ultralight-Digital-Human)\nNOTE: The files in the repo are not organized."
        },
+        {
+            "author": "vahidzxc",
+            "title": "ComfyUI-My-Handy-Nodes",
+            "reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
+            "files": [
+                "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:VahCropImage"
+        },
        {
            "author": "StartHua",
            "title": "Comfyui_Flux_Style_Ctr [WIP]",
@@ -4639,6 +4560,16 @@
            "install_type": "git-clone",
            "description": "Image manipulation nodes, Temperature control nodes, Tiling nodes, Primitive and operation nodes, ..."
        },
+        {
+            "author": "PluMaZero",
+            "title": "ComfyUI-SpaceFlower",
+            "reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
+            "files": [
+                "https://github.com/PluMaZero/ComfyUI-SpaceFlower"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
+        },
        {
            "author": "laksjdjf",
            "title": "ssd-1b-comfyui",
--- a/node_db/dev/extension-node-map.json
+++ b/node_db/dev/extension-node-map.json
@@ -359,98 +359,6 @@
            "title_aux": "ComfyUI-Upscayl"
        }
    ],
-    "https://github.com/AkiEvansDev/ComfyUI-Tools": [
-        [
-            "AE.AnySwitch",
-            "AE.AnyTypeSwitch",
-            "AE.BRIARemBG",
-            "AE.BRIARemBGAdvanced",
-            "AE.ChangeSamplerConfig",
-            "AE.CheckpointList",
-            "AE.CheckpointLoader",
-            "AE.CompareFloat",
-            "AE.CompareInt",
-            "AE.ControlNetApplyWithConfig",
-            "AE.ControlNetConfig",
-            "AE.DisplayAny",
-            "AE.ExtractControlNetConfig",
-            "AE.ExtractHiresFixConfig",
-            "AE.ExtractImg2ImgConfig",
-            "AE.ExtractOutpaintConfig",
-            "AE.ExtractSamplerConfig",
-            "AE.Float",
-            "AE.FloatList",
-            "AE.FloatSwitch",
-            "AE.FloatToInt",
-            "AE.GaussianBlurMask",
-            "AE.GetImageSize",
-            "AE.GetLatentSize",
-            "AE.GroupsMuter",
-            "AE.HiresFixConfig",
-            "AE.ImageAdjustment",
-            "AE.ImageBlank",
-            "AE.ImageBlendMask",
-            "AE.ImageBlendMode",
-            "AE.ImageCannyFilter",
-            "AE.ImageDragonFilter",
-            "AE.ImageHighPassFilter",
-            "AE.ImageLevels",
-            "AE.ImageLucySharpen",
-            "AE.ImagePixelate",
-            "AE.ImagePowerNoise",
-            "AE.ImageStyleFilter",
-            "AE.Img2ImgConfig",
-            "AE.InpaintWithModel",
-            "AE.Int",
-            "AE.IntList",
-            "AE.IntSwitch",
-            "AE.IntToFloat",
-            "AE.KSamplerHiresFixWithConfig",
-            "AE.KSamplerImg2ImgWithConfig",
-            "AE.KSamplerInpaintWithConfig",
-            "AE.KSamplerOutpaintWithConfig",
-            "AE.KSamplerOutpaintWithConfigAndImage",
-            "AE.KSamplerWithConfig",
-            "AE.LoadImageFromPath",
-            "AE.LoadInpaintModel",
-            "AE.LoraLoader",
-            "AE.LorasList",
-            "AE.LorasLoader",
-            "AE.MathFloat",
-            "AE.MathInt",
-            "AE.OutpaintConfig",
-            "AE.OutpaintWithModel",
-            "AE.OutpaintWithModelAndConfig",
-            "AE.Range",
-            "AE.RangeList",
-            "AE.SDXLConfig",
-            "AE.SDXLPrompt",
-            "AE.SDXLPromptWithHires",
-            "AE.SDXLRegionalPrompt",
-            "AE.SDXLRegionalPromptWithHires",
-            "AE.SamplerConfig",
-            "AE.SamplerList",
-            "AE.SaveImage",
-            "AE.SchedulerList",
-            "AE.Seed",
-            "AE.String",
-            "AE.StringConcat",
-            "AE.StringEquals",
-            "AE.StringLength",
-            "AE.StringList",
-            "AE.StringReplace",
-            "AE.StringSwitch",
-            "AE.Text",
-            "AE.ToString",
-            "AE.ToStringConcat",
-            "AE.UpscaleLatentBy",
-            "AE.VAEEncodeInpaintConditioning",
-            "AE.XYRange"
-        ],
-        {
-            "title_aux": "ComfyUI-Tools"
-        }
-    ],
    "https://github.com/AlexXi19/ComfyUI-OpenAINode": [
        [
            "ImageWithPrompt",
@@ -722,7 +630,6 @@
            "DevToolsErrorRaiseNodeWithMessage",
            "DevToolsExperimentalNode",
            "DevToolsLongComboDropdown",
-            "DevToolsMultiSelectNode",
            "DevToolsNodeWithBooleanInput",
            "DevToolsNodeWithForceInput",
            "DevToolsNodeWithOnlyOptionalInput",
@@ -1221,55 +1128,29 @@
    ],
    "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes": [
        [
+            "AIO_Tuner",
            "AIO_Tuner_Pipe",
-            "ApplyCondsExtraOpts",
-            "BashScriptNode",
+            "BasicAdvScheduler",
+            "Beta_Config",
            "BooleanFromPipe",
            "BooleanToPipe",
-            "COND_ExtraOpts",
-            "COND_ExtraOpts_2",
-            "COND_SET_STRENGTH_ExtraOpts",
-            "ChainTextEncode",
            "CkptPipe",
-            "CompareTorch",
-            "DynamicThresholding",
-            "DynamicThresholdingBasic",
            "EmptyLatentSize",
            "EmptyLatentSize64",
-            "ExecutePythonNode",
            "ExpMath",
            "ExpMathDual",
            "ExpMathQuad",
-            "InspectNode",
+            "LMS_Config",
            "LoadUnetAndClip",
            "LoraFluxParams",
-            "MergeExtraOpts",
            "ModelPipe1",
            "ModelPipe2",
-            "NoModel_CkptLoader",
-            "NoNegExtraOpts",
-            "Node_BOOL",
-            "Node_Float",
-            "Node_INT",
-            "Node_RandomRange",
-            "Node_String",
-            "Node_StringMultiline",
-            "SEED_ExtraOpts",
            "SamplerCustomAdvanced_Pipe",
            "SamplerSel",
            "SchedulerSel",
-            "SedOnString",
            "UnetClipLoraLoader",
            "UnetClipLoraLoaderBasic",
-            "VAE_ExtraOpts",
-            "ViewExtraOpts",
-            "batchsize_ExtraOpts",
-            "get_lora_metadata",
-            "mycombine",
-            "re_sub_str",
-            "splitcond",
-            "str_str",
-            "str_str_str_str"
+            "stopipe"
        ],
        {
            "title_aux": "ComfyUI_KurtHokke-Nodes"
@@ -1506,7 +1387,6 @@
            "Data_handle_Node",
            "DeepSeek_Node",
            "Delay_node",
-            "Delete_folder_Node",
            "DongShowTextNode",
            "Dong_Pixelate_Node",
            "Dong_Text_Node",
@@ -1525,7 +1405,6 @@
            "LibLib_upload_Node",
            "LogicToolsNode",
            "LoraIterator",
-            "Notice_Node",
            "PromptConcatNode",
            "RandomNumbersNode",
            "RenameNode",
@@ -1535,27 +1414,16 @@
            "TextToJsonNode",
            "TranslateAPINode",
            "ZIPwith7zNode",
-            "find_files_by_extension_Node",
            "img_understanding_Node",
            "klingai_video_Node",
            "path_join_Node",
            "save_img_NODE",
-            "set_api_Node",
-            "text_replace_node"
+            "set_api_Node"
        ],
        {
            "title_aux": "ComfyUI-tools-by-dong [UNSAFE]"
        }
    ],
-    "https://github.com/Nambi24/ComfyUI-Save_Image": [
-        [
-            "ExtractLastPathComponent",
-            "SaveImageNode"
-        ],
-        {
-            "title_aux": "ComfyUI-Save_Image"
-        }
-    ],
    "https://github.com/Northerner1/ComfyUI_North_Noise": [
        [
            "North_Noise"
@@ -1591,7 +1459,16 @@
            "GetCaptionFromImages"
        ],
        {
-            "title_aux": "ComfyUI-Sa2VAWrapper [WIP]"
+            "title_aux": "ComfyUI-Sa2VAWrapper"
+        }
+    ],
+    "https://github.com/PluMaZero/ComfyUI-SpaceFlower": [
+        [
+            "SpaceFlower_HangulPrompt",
+            "SpaceFlower_Prompt"
+        ],
+        {
+            "title_aux": "ComfyUI-SpaceFlower"
        }
    ],
    "https://github.com/Poseidon-fan/ComfyUI-fileCleaner": [
@@ -1816,6 +1693,7 @@
            "Test Node (Shinsplat)",
            "Text To Tokens (Shinsplat)",
            "Text To Tokens SD3 (Shinsplat)",
+            "Upscale WEBP (Shinsplat)",
            "Variables (Shinsplat)"
        ],
        {
@@ -1849,16 +1727,6 @@
            "title_aux": "ComfyUI-PIL"
        }
    ],
-    "https://github.com/Solankimayursinh/PMSnodes": [
-        [
-            "InputAnalyzer",
-            "LoadBase64Audio",
-            "PMSSendAudio"
-        ],
-        {
-            "title_aux": "PMSnodes"
-        }
-    ],
    "https://github.com/Soppatorsk/comfyui_img_to_ascii": [
        [
            "Img_to_ASCII"
@@ -1947,8 +1815,7 @@
        [
            "Example",
            "FluxImageUpscaler",
-            "FluxLoader",
-            "FluxTextPrompt"
+            "FluxLoader"
        ],
        {
            "title_aux": "comfyui_flux_collection_advanced [WIP]"
@@ -2255,7 +2122,6 @@
    "https://github.com/ammahmoudi/ComfyUI-Legendary-Nodes": [
        [
            "Legendary Dataset Saver",
-            "Legendary Image URL Loader",
            "Legendary Lora URL Loader"
        ],
        {
@@ -2318,7 +2184,6 @@
            "ImageToPrompt",
            "MiniMaxAIAPIClient",
            "MiniMaxImage2Video",
-            "MiniMaxImageGenerator",
            "MiniMaxPreviewVideo"
        ],
        {
@@ -3398,7 +3263,6 @@
    ],
    "https://github.com/grinlau18/ComfyUI_XISER_Nodes": [
        [
-            "XIS_CropImage",
            "XIS_Float_Slider",
            "XIS_FromListGet1Color",
            "XIS_FromListGet1Cond",
@@ -3410,12 +3274,10 @@
            "XIS_FromListGet1Model",
            "XIS_FromListGet1String",
            "XIS_INT_Slider",
-            "XIS_IfDataIsNone",
            "XIS_ImageMaskMirror",
            "XIS_InvertMask",
            "XIS_IsThereAnyData",
            "XIS_PromptsWithSwitches",
-            "XIS_ReorderImageMaskGroups",
            "XIS_ResizeImageOrMask",
            "XIS_ResizeToDivisible"
        ],
@@ -4106,7 +3968,6 @@
            "HyVideoSTG",
            "HyVideoSampler",
            "HyVideoTeaCache",
-            "HyVideoTextEmbedBridge",
            "HyVideoTextEmbedsLoad",
            "HyVideoTextEmbedsSave",
            "HyVideoTextEncode",
@@ -4176,7 +4037,6 @@
            "LoadWanVideoT5TextEncoder",
            "WanVideoBlockSwap",
            "WanVideoContextOptions",
-            "WanVideoControlEmbeds",
            "WanVideoDecode",
            "WanVideoEmptyEmbeds",
            "WanVideoEncode",
@@ -4184,16 +4044,13 @@
            "WanVideoFlowEdit",
            "WanVideoImageClipEncode",
            "WanVideoLatentPreview",
-            "WanVideoLoopArgs",
            "WanVideoLoraBlockEdit",
            "WanVideoLoraSelect",
            "WanVideoModelLoader",
-            "WanVideoSLG",
            "WanVideoSampler",
            "WanVideoTeaCache",
            "WanVideoTextEmbedBridge",
            "WanVideoTextEncode",
-            "WanVideoTinyVAELoader",
            "WanVideoTorchCompileSettings",
            "WanVideoVAELoader",
            "WanVideoVRAMManagement"
@@ -4230,7 +4087,6 @@
            "Custom_Save_Image",
            "Display_Any",
            "Image_Size_Extractor",
-            "Load_Image_Folder",
            "Mask_Blur_Plus",
            "Preview_Mask",
            "Preview_Mask_Plus",
@@ -4564,7 +4420,6 @@
            "polymath_SaveAbsolute",
            "polymath_chat",
            "polymath_concept_eraser",
-            "polymath_dsd_sampler",
            "polymath_helper",
            "polymath_scraper"
        ],
@@ -4972,26 +4827,32 @@
            "ClusterBroadcastTensor",
            "ClusterExecuteCurrentWorkflow",
            "ClusterExecuteWorkflow",
-            "ClusterFanInImages",
            "ClusterFanOutImage",
            "ClusterFanOutLatent",
            "ClusterFanOutMask",
-            "ClusterFinallyFree",
-            "ClusterFlattenBatchedImageList",
-            "ClusterFreeNow",
            "ClusterGatherImages",
            "ClusterGatherLatents",
            "ClusterGatherMasks",
            "ClusterGetInstanceWorkItemFromBatch",
            "ClusterInfo",
-            "ClusterListenTensorBroadcast",
-            "ClusterSplitBatchToList",
-            "ClusterStridedReorder"
+            "ClusterListenTensorBroadcast"
        ],
        {
            "title_aux": "ComfyUI_Cluster [WIP]"
        }
    ],
+    "https://github.com/nova-florealis/comfyui-alien": [
+        [
+            "ConvertMarkdown",
+            "ListDisplayNode",
+            "MarkdownConverterModule",
+            "TextOutput",
+            "TextToText"
+        ],
+        {
+            "title_aux": "comfyui-alien"
+        }
+    ],
    "https://github.com/oshtz/ComfyUI-oshtz-nodes": [
        [
            "EasyAspectRatioNode",
@@ -5224,84 +5085,6 @@
            "title_aux": "ComfyUI-ODE"
        }
    ],
-    "https://github.com/rhinoflavored/comfyui_QT": [
-        [
-            "CSVDataMatcher",
-            "QTAutoCropByNPS",
-            "QTExcelImageReader",
-            "QTExcelReader",
-            "QTRandomSelectString",
-            "QTStringWrappingByNumber",
-            "QT_Alpha_Yaxis_Node",
-            "QT_AntiAliasing_Node",
-            "QT_Batch_Anything_Node",
-            "QT_Center_Rotation",
-            "QT_Character_Height_Difference",
-            "QT_Character_Size_Node",
-            "QT_Color_Image_Loop",
-            "QT_Content_Location_Node",
-            "QT_Crop_Alpha",
-            "QT_Crop_Alpha_V2",
-            "QT_Curves_Node",
-            "QT_Dictionary_Node",
-            "QT_Elements_Into_List_Node",
-            "QT_Float_To_Int",
-            "QT_Image_Array",
-            "QT_Image_Array_Circle",
-            "QT_Image_Array_Rectangle",
-            "QT_Image_Overlay",
-            "QT_Image_Overlay_BOOLEAN",
-            "QT_Image_Overlay_Rotation",
-            "QT_Image_Overlay_V2",
-            "QT_Image_Overlay_V3",
-            "QT_Image_Sorting_Node",
-            "QT_Image_Upscale_And_Crop_Node",
-            "QT_Image_Upscale_And_Crop_Node_V2",
-            "QT_Image_Upscale_And_Crop_Node_V3",
-            "QT_Image_Upscale_Node",
-            "QT_Image_Vision_Center_Node",
-            "QT_Join_Image_List_Node",
-            "QT_Line_Break",
-            "QT_Line_Break_V2",
-            "QT_List_Length",
-            "QT_List_Picker",
-            "QT_List_To_String",
-            "QT_Mask_Mix_Node",
-            "QT_Merge_Into_List_Node",
-            "QT_Pageturn_Node",
-            "QT_Pattern_Fill",
-            "QT_Piecewise_Function_Node",
-            "QT_Polar_Coordinate_Conversion_Node",
-            "QT_Rounded_Corner",
-            "QT_SUPIR_Upscale",
-            "QT_Simple_Text_Image_V2",
-            "QT_Sorting_Node",
-            "QT_Split_List_Node",
-            "QT_Split_List_Node_V2",
-            "QT_Split_Mask_Node",
-            "QT_Split_String",
-            "QT_String_Horizontal_To_Vertical",
-            "QT_String_To_List",
-            "QT_Text_Input_Switch_Node",
-            "QT_Text_Overlay_V2",
-            "QT_Text_To_Bool_Node",
-            "QT_Tilt_Transform",
-            "QT_Translucent_Node",
-            "QT_Vertical_Text_Overlay",
-            "QT_Video_Combine_Node"
-        ],
-        {
-            "title_aux": "comfyui_QT"
-        }
-    ],
-    "https://github.com/ricklove/ComfyUI-AutoSeg-SAM2": [
-        [
-            "AutoSegSAM2Node"
-        ],
-        {
-            "title_aux": "ComfyUI-AutoSeg-SAM2"
-        }
-    ],
    "https://github.com/rishipandey125/ComfyUI-FramePacking": [
        [
            "Add Grid Boundaries",
@@ -5437,8 +5220,8 @@
        {
            "author": "shinich39",
            "description": "Javascript code will run when an event fires.",
-            "nickname": "comfyui-event-handler",
-            "title": "comfyui-event-handler",
+            "nickname": "event-handler",
+            "title": "event-handler",
            "title_aux": "comfyui-event-handler [USAFE]"
        }
    ],
@@ -5458,17 +5241,6 @@
            "title_aux": "ComfyUI_CheckPointLoader_Ext [WIP]"
        }
    ],
-    "https://github.com/silveroxides/ComfyUI-ModelUtils": [
-        [
-            "CLIPMetaKeys",
-            "CheckpointMetaKeys",
-            "LoRAMetaKeys",
-            "UNetMetaKeys"
-        ],
-        {
-            "title_aux": "ComfyUI-ModelUtils [WIP]"
-        }
-    ],
    "https://github.com/sizzlebop/comfyui-llm-prompt-enhancer": [
        [
            "PromptEnhancer"
@@ -5477,15 +5249,6 @@
            "title_aux": "ComfyUI LLM Prompt Enhancer [WIP]"
        }
    ],
-    "https://github.com/smthemex/ComfyUI_GPT_SoVITS_Lite": [
-        [
-            "GPT_SoVITS_LoadModel",
-            "GPT_SoVITS_Sampler"
-        ],
-        {
-            "title_aux": "ComfyUI_GPT_SoVITS_Lite"
-        }
-    ],
    "https://github.com/smthemex/ComfyUI_MangaNinjia": [
        [
            "MangaNinjiaLoader",
@@ -5599,17 +5362,6 @@
            "title_aux": "ComfyUI-Terminal [UNSAFE]"
        }
    ],
-    "https://github.com/sugarkwork/comfyui_image_crop": [
-        [
-            "CropReapply",
-            "CropTransparent",
-            "ExpandMultiple",
-            "RestoreCrop"
-        ],
-        {
-            "title_aux": "comfyui_image_crop"
-        }
-    ],
    "https://github.com/sugarkwork/comfyui_psd": [
        [
            "Convert PSD to Image",
@@ -5681,29 +5433,12 @@
    "https://github.com/thedivergentai/divergent_nodes": [
        [
            "CLIPTokenCounter",
-            "DataStoreNode",
-            "Text Line Reader",
-            "UTF8EncoderNode"
+            "DolphinVisionNode"
        ],
        {
            "title_aux": "Divergent Nodes [WIP]"
        }
    ],
-    "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack": [
-        [
-            "EUP - Custom Aspect Ratio",
-            "EUP - Iterative Latent Upscaler",
-            "EUP - Latent Merger",
-            "EUP - Latent Tiler",
-            "EUP - Pixel TiledKSample Upscaler Provider",
-            "EUP - Pixel TiledKSample Upscaler Provider Pipe",
-            "EUP - Tiled KSampler",
-            "EUP - Tiled KSampler Advanced"
-        ],
-        {
-            "title_aux": "ComfyUI-Edins-Ultimate-Pack"
-        }
-    ],
    "https://github.com/threadedblue/MLXnodes": [
        [
            "MLXImg2Img",
@@ -5809,6 +5544,14 @@
            "title_aux": "ComfyUI-Dist [WIP]"
        }
    ],
+    "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes": [
+        [
+            "VahCropImage"
+        ],
+        {
+            "title_aux": "ComfyUI-My-Handy-Nodes"
+        }
+    ],
    "https://github.com/var1ableX/ComfyUI_Accessories": [
        [
            "ACC_AnyCast",
@@ -5938,8 +5681,6 @@
            "AceIntegerX",
            "CheckpointLoaderBNB_X",
            "CheckpointLoaderNF4_X",
-            "ColorTransferNodeX",
-            "DeepSeekX",
            "DepthDisplaceX",
            "EmptyLatentX",
            "IfConditionX",
@@ -5949,12 +5690,8 @@
            "LoopCloseX",
            "LoopOpenX",
            "LoraBatchSamplerX",
-            "PixtralVisionX",
-            "PixtralX",
-            "RegionTesterNodeX",
            "RelightX",
            "RemoveBackgroundX",
-            "SaveImageX",
            "SelectiveDepthLoraBlocksX",
            "UnetLoaderBNB_X",
            "WhiteBalanceX"
@@ -5965,26 +5702,21 @@
    ],
    "https://github.com/yanhuifair/ComfyUI-FairLab": [
        [
-            "AppendTagsNode",
-            "BlacklistTagsNode",
            "CLIPTranslatedNode",
            "DownloadImageNode",
            "FillAlphaNode",
            "FixUTF8StringNode",
-            "FloatNode",
            "ImageResizeNode",
            "ImageToVideoNode",
-            "IntNode",
            "LoadImageFromDirectoryNode",
            "LoadImageFromURLNode",
-            "PrependTagsNode",
            "PrintAnyNode",
            "PrintImageNode",
            "SaveImageToDirectoryNode",
            "SaveStringToDirectoryNode",
            "SequenceStringListNode",
            "StringCombineNode",
-            "StringNode",
+            "StringFieldNode",
            "TranslateStringNode",
            "VideoToImageNode"
        ],
--- a/node_db/dev/github-stats.json
+++ b/node_db/dev/github-stats.json
--- a/node_db/legacy/custom-node-list.json
+++ b/node_db/legacy/custom-node-list.json
@@ -11,57 +11,6 @@
        


-        {
-            "author": "Makki_Shizu",
-            "title": "ComfyUI-SaveAnimatedGIF [DEPRECATED]",
-            "id": "SaveAnimatedGIF",
-            "reference": "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF",
-            "files": [
-                "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF"
-            ],
-            "install_type": "git-clone",
-            "description": "Save animated GIF format nodes in ComfyUI"
-        },
-        {
-            "author": "l1yongch1",
-            "title": "ComfyUI_PhiCaption [REMOVED]",
-            "reference": "https://github.com/l1yongch1/ComfyUI_PhiCaption",
-            "files": [
-                "https://github.com/l1yongch1/ComfyUI_PhiCaption"
-            ],
-            "install_type": "git-clone",
-            "description": "In addition to achieving conventional single-image, single-round reverse engineering, it can also achieve single-image multi-round and multi-image single-round reverse engineering. Moreover, the Phi model has a better understanding of prompts."
-        },
-        {
-            "author": "nova-florealis",
-            "title": "comfyui-alien [REMOVED]",
-            "reference": "https://github.com/nova-florealis/comfyui-alien",
-            "files": [
-                "https://github.com/nova-florealis/comfyui-alien"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
-        },
-        {
-            "author": "PluMaZero",
-            "title": "ComfyUI-SpaceFlower [REMOVED]",
-            "reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
-            "files": [
-                "https://github.com/PluMaZero/ComfyUI-SpaceFlower"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
-        },
-        {
-            "author": "vahidzxc",
-            "title": "ComfyUI-My-Handy-Nodes [REMOVED]",
-            "reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
-            "files": [
-                "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES:VahCropImage"
-        },
        {
            "author": "Samulebotin",
            "title": "ComfyUI-FreeVC_wrapper [REMOVED]",
--- a/node_db/new/custom-node-list.json
+++ b/node_db/new/custom-node-list.json
--- a/node_db/new/extension-node-map.json
+++ b/node_db/new/extension-node-map.json
--- a/node_db/tutorial/custom-node-list.json
+++ b/node_db/tutorial/custom-node-list.json
@@ -311,16 +311,6 @@
            ],
            "description": "ComfyUI node for creating some Turtle Graphic demos.", 
            "install_type": "git-clone"
-        },
-        {
-            "author": "cozy-comfyui",
-            "title": "cozy_ex_dynamic",
-            "reference": "https://github.com/cozy-comfyui/cozy_ex_dynamic",
-            "files": [
-                "https://github.com/cozy-comfyui/cozy_ex_dynamic"
-            ],
-            "description": "Dynamic Node examples for ComfyUI",
-            "install_type": "git-clone"
        }
    ]
 }
--- a/prestartup_script.py
+++ b/prestartup_script.py
@@ -21,25 +21,22 @@ import cm_global
 import manager_downloader
 import folder_paths

-manager_util.add_python_path_to_env()
-
-import datetime as dt
-
-if hasattr(dt, 'datetime'):
-    from datetime import datetime as dt_datetime
-    
+import datetime
+if hasattr(datetime, 'datetime'):
+    from datetime import datetime
    def current_timestamp():
-        return dt_datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+        return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
 else:
    # NOTE: Occurs in some Mac environments.
    import time
-    logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{dt.__file__}'")
-    
+    logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{datetime.__file__}'")
    def current_timestamp():
        return str(time.time()).split('.')[0]

 security_check.security_check()

+manager_util.add_python_path_to_env()
+
 cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']

@@ -692,6 +689,14 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
        file.write('\n'.join(list(extracted)))


+def execute_migration(moves):
+    import shutil
+    for x in moves:
+        if os.path.exists(x[0]) and not os.path.exists(x[1]):
+            shutil.move(x[0], x[1])
+            print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
+
+
 script_executed = False

 def execute_startup_script():
@@ -749,6 +754,9 @@ def execute_startup_script():
                        execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
                        execute_lazy_install_script(script[3], script[7])

+                    elif script[1] == "#LAZY-MIGRATION":
+                        execute_migration(script[2])
+
                    elif script[1] == "#LAZY-DELETE-NODEPACK":
                        execute_lazy_delete(script[2])

--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-manager"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.31.6"
+version = "3.30.3"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]