fixed: pre_startup - restart if script is executed

fixed: normalize cnr versions via StrictVersion
- 2.5 and 2.5.0 were regarded as different version

README.md

@@ -2,9 +2,12 @@
 
 **ComfyUI-Manager** is an extension designed to enhance the usability of [ComfyUI](https://github.com/comfyanonymous/ComfyUI). It offers management functions to **install, remove, disable, and enable** various custom nodes of ComfyUI. Furthermore, this extension provides a hub feature and convenience functions to access a wide range of information within ComfyUI.
 
-![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/dialog.jpg)
+![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
 ## NOTICE
+* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
+* V3.10: `double-click feature` is removed
+  * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
 * V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
 * You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.
 
@@ -25,6 +28,7 @@ To install ComfyUI-Manager in addition to an existing installation of ComfyUI, y
 - standalone version  
 - select option: use windows default console window
 2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
+- Don't click. Right click the link and use save as...
 3. double click `install-manager-for-portable-version.bat` batch file
 
 ![portable-install](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/portable-install.jpg)
@@ -50,6 +54,7 @@ python -m venv venv
 pip install comfy-cli
 comfy install
 ```
+* See also: https://github.com/Comfy-Org/comfy-cli
 
 
 ### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
@@ -58,6 +63,7 @@ To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you c
 * **prerequisite: python-is-python3, python3-venv, git**
 
 1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
+- Don't click. Right click the link and use save as...
 - ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
 2. `chmod +x install-comfyui-venv-linux.sh`
 3. `./install-comfyui-venv-linux.sh`
@@ -90,7 +96,7 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
 2. If you click on 'Install Custom Nodes' or 'Install Models', an installer dialog will open.
 
-    ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/dialog.jpg)
+    ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
     * There are three DB modes: `DB: Channel (1day cache)`, `DB: Local`, and `DB: Channel (remote)`. 
       * `Channel (1day cache)` utilizes Channel cache information with a validity period of one day to quickly display the list.
@@ -146,7 +152,15 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
 * Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
 * Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
 * Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
-  
+
+
+## `extra_model_paths.yaml` Configuration
+The following settings are applied based on the section marked as `is_default`.
+
+* `custom_nodes`: Path for installing custom nodes
+    * Importing does not need to adhere to the path set as `is_default`, but this is the path where custom nodes are installed by the `ComfyUI Nodes Manager`.
+* `download_model_base`: Path for downloading models
+
 
 ## Snapshot-Manager
 * When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
@@ -174,17 +188,18 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
 
 ## Custom node support guide
 
+* **NOTICE:**
+    - You should no longer assume that the GitHub repository name will match the subdirectory name under `custom_nodes`. The name of the subdirectory under `custom_nodes` will now use the normalized name from the `name` field in `pyproject.toml`.
+    - Avoid relying on directory names for imports whenever possible.
+
 * https://docs.comfy.org/registry/overview
+* https://github.com/Comfy-Org/rfcs
 
-
-* **Special purpose files** (optional)
+**Special purpose files** (optional)
+  * `pyproject.toml` - Spec file for comfyregistry.
   * `node_list.json` - When your custom nodes pattern of NODE_CLASS_MAPPINGS is not conventional, it is used to manually provide a list of nodes for reference. ([example](https://github.com/melMass/comfy_mtb/raw/main/node_list.json))
   * `requirements.txt` - When installing, this pip requirements will be installed automatically 
   * `install.py` - When installing, it is automatically called
-  * `uninstall.py` - When uninstalling, it is automatically called
-  * `disable.py` - When disabled, it is automatically called
-    * When installing a custom node setup `.js` file, it is recommended to write this script for disabling.
-  * `enable.py` - When enabled, it is automatically called
   * **All scripts are executed from the root path of the corresponding custom node.**
 
 
@@ -232,6 +247,32 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
 ![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
 
 
+# Config
+* You can modify the `config.ini` file to apply the settings for ComfyUI-Manager.
+    * The path to the `config.ini` used by ComfyUI-Manager is displayed in the startup log messages.
+    * See also: [https://github.com/ltdrdata/ComfyUI-Manager#paths]
+* Configuration options:
+    ```
+    [default]
+    git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
+    use_uv = <Use uv instead of pip for dependency installation.>
+    default_cache_as_channel_url = <Determines whether to retrieve the DB designated as channel_url at startup>
+    bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
+    file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
+    windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
+    model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
+    downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
+    security_level = <Set the security level => strong|normal|normal-|weak>
+    always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
+    network_mode = <Set the network mode => public|private|offline>
+    ```
+
+    * network_mode:
+      - public: An environment that uses a typical public network.
+      - private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
+      - offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
+
+
 ## Additional Feature
 * Logging to file feature
   * This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
@@ -267,6 +308,7 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
 * 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.
 
+
 ## Scanner
 When you run the `scan.sh` script:
 
@@ -290,6 +332,7 @@ When you run the `scan.sh` script:
 * if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.
   * Edit `config.ini` file: add `bypass_ssl = True`
 
+
 ## Security policy
   * Edit `config.ini` file: add `security_level = <LEVEL>`
     * `strong`

cm-cli.py

@@ -20,12 +20,16 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
 
 import manager_util
 
+# read env vars
+# COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
+# `comfy_path` should be resolved before importing manager_core
 comfy_path = os.environ.get('COMFYUI_PATH')
 if comfy_path is None:
     try:
         import folder_paths
         comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
     except:
+        print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
         comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
 sys.path.append(comfy_path)
@@ -36,15 +40,7 @@ import manager_core as core
 from manager_core import unified_manager
 import cnr_utils
 
-
-
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
-comfy_path = os.environ.get('COMFYUI_PATH')
-
-if comfy_path is None:
-    print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
-    comfy_path = os.path.abspath(os.path.join(comfyui_manager_path, '..', '..'))
-
 
 cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
@@ -95,7 +91,8 @@ class Ctx:
         self.no_deps = False
         self.mode = 'cache'
         self.user_directory = None
-        self.custom_nodes_paths = [os.path.join(core.comfy_path, 'custom_nodes')]
+        self.custom_nodes_paths = [os.path.join(core.comfy_base_path, 'custom_nodes')]
+        self.manager_files_directory = os.path.dirname(__file__)
         
         if Ctx.folder_paths is None:
             try:
@@ -118,7 +115,7 @@ class Ctx:
         if channel is not None:
             self.channel = channel
 
-        asyncio.run(unified_manager.reload(cache_mode=self.mode == 'cache', dont_wait=False))
+        asyncio.run(unified_manager.reload(cache_mode=self.mode, dont_wait=False))
         asyncio.run(unified_manager.load_nightly(self.channel, self.mode))
 
     def set_no_deps(self, no_deps):
@@ -537,7 +534,7 @@ def get_all_installed_node_specs():
         res.append(node_spec_str)
         processed.add(k)
 
-    for k, _ in unified_manager.cnr_inactive_nodes.keys():
+    for k in unified_manager.cnr_inactive_nodes.keys():
         if k in processed:
             continue
 
@@ -546,7 +543,7 @@ def get_all_installed_node_specs():
             node_spec_str = f"{k}@{str(latest[0])}"
             res.append(node_spec_str)
 
-    for k, _ in unified_manager.nightly_inactive_nodes.keys():
+    for k in unified_manager.nightly_inactive_nodes.keys():
         if k in processed:
             continue
 
@@ -624,7 +621,10 @@ def install(
     cmd_ctx.set_user_directory(user_directory)
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for_each_nodes(nodes, act=install_node)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Reinstall custom nodes")
@@ -659,7 +659,10 @@ def reinstall(
     cmd_ctx.set_user_directory(user_directory)
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for_each_nodes(nodes, act=reinstall_node)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Uninstall custom nodes")
@@ -711,12 +714,15 @@ def update(
     if 'all' in nodes:
         asyncio.run(auto_save_snapshot())
 
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+
     for x in nodes:
         if x.lower() in ['comfyui', 'comfy', 'all']:
             update_comfyui()
             break
 
     update_parallel(nodes)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Disable custom nodes")
@@ -809,7 +815,9 @@ def fix(
     if 'all' in nodes:
         asyncio.run(auto_save_snapshot())
 
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for_each_nodes(nodes, fix_node, allow_all=True)
+    pip_fixer.fix_broken()
 
 
 @app.command("show-versions", help="Show all available versions of the node")
@@ -1004,17 +1012,32 @@ def save_snapshot(
         user_directory: str = typer.Option(
             None,
             help="user directory"
-        )
+        ),
+        full_snapshot: Annotated[
+            bool,
+            typer.Option(
+                show_default=False, help="If the snapshot should include custom node, ComfyUI version and pip versions (default), or only custom node details"
+            ),
+        ] = True,
 ):
     cmd_ctx.set_user_directory(user_directory)
 
-    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output))
+    if(not output.endswith('.json') and not output.endswith('.yaml')):
+        print("ERROR: output path should be either '.json' or '.yaml' file.")
+        raise typer.Exit(code=1)
+    
+    dir_path = os.path.dirname(output)
+    if(dir_path != '' and not os.path.exists(dir_path)):
+        print(f"ERROR: {output} path not exists.")
+        raise typer.Exit(code=1)
+        
+    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
     print(f"Current snapshot is saved as `{path}`")
 
 
 @app.command("restore-snapshot", help="Restore snapshot from snapshot file")
 def restore_snapshot(
-        snapshot_name: str,
+        snapshot_name: str, 
         pip_non_url: Optional[bool] = typer.Option(
             default=None,
             show_default=False,
@@ -1060,12 +1083,14 @@ def restore_snapshot(
             print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
             exit(1)
 
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     try:
         asyncio.run(core.restore_snapshot(snapshot_path, extras))
     except Exception:
         print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
         traceback.print_exc()
         raise typer.Exit(code=1)
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1089,11 +1114,14 @@ def restore_dependencies(
 
     total = len(node_paths)
     i = 1
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     for x in node_paths:
         print("----------------------------------------------------------------------------------------------------")
         print(f"Restoring [{i}/{total}]: {x}")
         unified_manager.execute_install_script('', x, instant_execution=True)
         i += 1
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1105,7 +1133,10 @@ def post_install(
         )
 ):
     path = os.path.expanduser(path)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
     unified_manager.execute_install_script('', path, instant_execution=True)
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1147,6 +1178,8 @@ def install_deps(
                 print(f"[bold red]Invalid json file: {deps}[/bold red]")
                 exit(1)
 
+
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
             for k in json_obj['custom_nodes'].keys():
                 state = core.simple_check_custom_node(k)
                 if state == 'installed':
@@ -1155,6 +1188,7 @@ def install_deps(
                     asyncio.run(core.gitclone_install(k, instant_execution=True))
                 else:  # disabled
                     core.gitclone_set_active([k], False)
+            pip_fixer.fix_broken()
 
         print("Dependency installation and activation complete.")
 

extras.json

@@ -9,7 +9,7 @@
         "comfyui-layerdiffuse",
         "comfyui-liveportraitkj",
         "aigodlike-comfyui-translation",
-        "comfyui-reactor-node",
+        "comfyui-reactor",
         "comfyui_instantid",
         "sd-dynamic-thresholding",
         "pr-was-node-suite-comfyui-47064894",

git_helper.py

@@ -195,7 +195,11 @@ def gitpull(path):
             branch_name = current_branch.name
 
         remote.fetch()
-        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        if f'{remote_name}/{branch_name}' in repo.refs:
+            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        else:
+            print("CUSTOM NODE PULL: Fail")  # update fail
+            return
 
         if commit_hash == remote_commit_hash:
             print("CUSTOM NODE PULL: None")  # there is no update
@@ -385,12 +389,13 @@ def apply_snapshot(path):
                 git_custom_node_infos = info['git_custom_nodes']
                 file_custom_node_infos = info['file_custom_nodes']
 
-                checkout_comfyui_hash(comfyui_hash)
+                if comfyui_hash:
+                    checkout_comfyui_hash(comfyui_hash)
                 checkout_custom_node_hash(git_custom_node_infos)
                 invalidate_custom_node_file(file_custom_node_infos)
 
                 print("APPLY SNAPSHOT: True")
-                if 'pips' in info:
+                if 'pips' in info and info['pips']:
                     return info['pips']
                 else:
                     return None

glob/cm_global.py

@@ -110,3 +110,6 @@ def add_on_revision_detected(k, f):
             traceback.print_exc()
     else:
         variables['cm.on_revision_detected_handler'].append((k, f))
+
+
+error_dict = {}

glob/cnr_utils.py

@@ -5,6 +5,8 @@ import manager_util
 import toml
 import os
 import asyncio
+import json
+import time
 
 base_url = "https://api.comfy.org"
 
@@ -13,33 +15,64 @@ lock = asyncio.Lock()
 
 is_cache_loading = False
 
-async def get_cnr_data(page=1, limit=1000, cache_mode=True, dont_wait=True):
+async def get_cnr_data(cache_mode=True, dont_wait=True):
+    try:
+        return await _get_cnr_data(cache_mode, dont_wait)
+    except asyncio.TimeoutError:
+        print("A timeout occurred during the fetch process from ComfyRegistry.")
+        return await _get_cnr_data(cache_mode=True, dont_wait=True)  # timeout fallback
+
+async def _get_cnr_data(cache_mode=True, dont_wait=True):
     global is_cache_loading
 
-    uri = f'{base_url}/nodes?page={page}&limit={limit}'
+    uri = f'{base_url}/nodes'
 
-    def touch(json_obj):
-        for v in json_obj['nodes']:
+    async def fetch_all():
+        remained = True
+        page = 1
+
+        full_nodes = {}
+        while remained:
+            sub_uri = f'{base_url}/nodes?page={page}&limit=30'
+            sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True), timeout=30)
+            remained = page < sub_json_obj['totalPages']
+
+            for x in sub_json_obj['nodes']:
+                full_nodes[x['id']] = x
+
+            if page % 5 == 0:
+                print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
+
+            page += 1
+            time.sleep(0.5)
+
+        print("FETCH ComfyRegistry Data [DONE]")
+
+        for v in full_nodes.values():
             if 'latest_version' not in v:
                 v['latest_version'] = dict(version='nightly')
 
+        return {'nodes': list(full_nodes.values())}
 
     if cache_mode:
-        if dont_wait:
-            json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode, dont_wait=True)  # fallback
-
-            if 'nodes' in json_obj:
-                touch(json_obj)
-                return json_obj['nodes']
-            else:
-                return {}
-
         is_cache_loading = True
+        cache_state = manager_util.get_cache_state(uri)
+
+        if dont_wait:
+            if cache_state == 'not-cached':
+                return {}
+            else:
+                print("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
+                with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
+                    return json.load(json_file)['nodes']
+
+        if cache_state == 'cached':
+            with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
+                return json.load(json_file)['nodes']
 
     try:
-        json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
-        touch(json_obj)
-
+        json_obj = await fetch_all()
+        manager_util.save_to_cache(uri, json_obj)
         return json_obj['nodes']
     except:
         res = {}
@@ -140,7 +173,10 @@ def read_cnr_info(fullpath):
 
             project = data.get('project', {})
             name = project.get('name').strip().lower()
-            version = project.get('version')
+
+            # normalize version
+            # for example: 2.5 -> 2.5.0
+            version = str(manager_util.StrictVersion(project.get('version')))
 
             urls = project.get('urls', {})
             repository = urls.get('Repository')

glob/manager_core.py

@@ -4,6 +4,7 @@ description:
 """
 
 import json
+import logging
 import os
 import sys
 import subprocess
@@ -41,7 +42,7 @@ import manager_downloader
 from node_package import InstalledNodePackage
 
 
-version_code = [3, 7]
+version_code = [3, 21, 3]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -81,13 +82,18 @@ def get_comfyui_tag():
 
 
 def get_script_env():
-    copied = os.environ.copy()
+    new_env = os.environ.copy()
     git_exe = get_config().get('git_exe')
     if git_exe is not None:
-        copied['GIT_EXE_PATH'] = git_exe
-    copied['COMFYUI_PATH'] = comfy_path
+        new_env['GIT_EXE_PATH'] = git_exe
 
-    return copied
+    if 'COMFYUI_PATH' not in new_env:
+        new_env['COMFYUI_PATH'] = comfy_path
+
+    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+        new_env['COMFYUI_FOLDERS_BASE_PATH'] = comfy_path
+
+    return new_env
 
 
 invalid_nodes = {}
@@ -112,7 +118,7 @@ def check_invalid_nodes():
             sys.path.append(comfy_path)
             import folder_paths
         except:
-            raise Exception(f"Invalid COMFYUI_PATH: {comfy_path}")
+            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {comfy_path}")
 
     def check(root):
         global invalid_nodes
@@ -122,7 +128,6 @@ def check_invalid_nodes():
             if subdir in ['.disabled', '__pycache__']:
                 continue
 
-
             package = unified_manager.installed_node_packages.get(subdir)
             if not package:
                 continue
@@ -148,7 +153,10 @@ def check_invalid_nodes():
         print("\n---------------------------------------------------------------------------\n")
 
 
+# read env vars
 comfy_path = os.environ.get('COMFYUI_PATH')
+comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
+
 if comfy_path is None:
     try:
         import folder_paths
@@ -156,6 +164,9 @@ if comfy_path is None:
     except:
         comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
+if comfy_base_path is None:
+    comfy_base_path = comfy_path
+
 
 channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
 git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py")
@@ -163,7 +174,7 @@ git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py
 manager_files_path = None
 manager_config_path = None
 manager_channel_list_path = None
-manager_startup_script_path = None
+manager_startup_script_path:str = None
 manager_snapshot_path = None
 manager_pip_overrides_path = None
 manager_components_path = None
@@ -314,6 +325,8 @@ def normalize_channel(channel):
         return None
     elif channel.startswith('https://'):
         return channel
+    elif channel.startswith('http://') and get_config()['http_channel_enabled'] == True:
+        return channel
 
     tmp_dict = get_channel_dict()
     channel_url = tmp_dict.get(channel)
@@ -368,6 +381,16 @@ class UnifiedManager:
         self.custom_node_map_cache = {}    # (channel, mode) -> augmented custom node list json
         self.processed_install = set()
 
+    def get_module_name(self, x):
+        info = self.active_nodes.get(x)
+        if info is None:
+            for url, fullpath in self.unknown_active_nodes.values():
+                if url == x:
+                    return os.path.basename(fullpath)
+        else:
+            return os.path.basename(info[1])
+
+        return None
 
     def get_cnr_by_repo(self, url):
         return self.repo_cnr_map.get(git_utils.normalize_url(url))
@@ -490,7 +513,10 @@ class UnifiedManager:
             if info:
                 cnr = self.cnr_map.get(info['id'])
                 if cnr:
-                    return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
+                    # normalize version
+                    # for example: 2.5 -> 2.5.0
+                    ver = str(manager_util.StrictVersion(info['version']))
+                    return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                 else:
                     return None
             else:
@@ -501,8 +527,8 @@ class UnifiedManager:
         self.installed_node_packages[node_package.id] = node_package
 
         if node_package.is_disabled and node_package.is_unknown:
-            # NOTE: unknown package does not have an url.
-            self.unknown_inactive_nodes[node_package.id] = ('', node_package.fullpath)
+            url = git_utils.git_url(node_package.fullpath)
+            self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
 
         if node_package.is_disabled and node_package.is_nightly:
             self.nightly_inactive_nodes[node_package.id] = node_package.fullpath
@@ -511,8 +537,8 @@ class UnifiedManager:
             self.active_nodes[node_package.id] = node_package.version, node_package.fullpath
 
         if node_package.is_enabled and node_package.is_unknown:
-            # NOTE: unknown package does not have an url.
-            self.unknown_active_nodes[node_package.id] = ('', node_package.fullpath)
+            url = git_utils.git_url(node_package.fullpath)
+            self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
 
         if node_package.is_from_cnr and node_package.is_disabled:
             self.add_to_cnr_inactive_nodes(node_package.id, node_package.version, node_package.fullpath)
@@ -672,12 +698,14 @@ class UnifiedManager:
         self.unknown_active_nodes = {}    # node_id -> repo url * fullpath
         self.active_nodes = {}            # node_id -> node_version * fullpath
 
+        if get_config()['network_mode'] != 'public':
+            dont_wait = True
+
         # reload 'cnr_map' and 'repo_cnr_map'
-        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode, dont_wait=dont_wait)
+        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
 
         for x in cnrs:
             self.cnr_map[x['id']] = x
-
             if 'repository' in x:
                 normalized_url = git_utils.normalize_url(x['repository'])
                 self.repo_cnr_map[normalized_url] = x
@@ -711,14 +739,17 @@ class UnifiedManager:
 
         json_obj = await get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url)
         for x in json_obj['custom_nodes']:
-            for y in x['files']:
-                if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
-                    repo_name = y.split('/')[-1]
-                    res[repo_name] = (x, False)
+            try:
+                for y in x['files']:
+                    if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
+                        repo_name = y.split('/')[-1]
+                        res[repo_name] = (x, False)
 
-            if 'id' in x:
-                if x['id'] not in res:
-                    res[x['id']] = (x, True)
+                if 'id' in x:
+                    if x['id'] not in res:
+                        res[x['id']] = (x, True)
+            except:
+                logging.error(f"[ComfyUI-Manager] broken item:{x}")
 
         return res
 
@@ -726,7 +757,6 @@ class UnifiedManager:
         # 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.
 
@@ -753,6 +783,8 @@ class UnifiedManager:
                     v['title'] = cnr['name']
                     v['description'] = cnr['description']
                     v['health'] = '-'
+                    if 'repository' in cnr:
+                        v['repository'] = cnr['repository']
                     added_cnr.add(cnr['id'])
                     node_id = v['id']
                 else:
@@ -788,7 +820,7 @@ class UnifiedManager:
                         package_name = remap_pip_package(line.strip())
                         if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
                             self.processed_install.add(package_name)
-                            install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                            install_cmd = manager_util.make_pip_cmd(["install", package_name])
                             if package_name.strip() != "" and not package_name.startswith('#'):
                                 res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
@@ -828,7 +860,11 @@ class UnifiedManager:
 
         result = ManagedResult('fix')
 
-        info = self.active_nodes.get(node_id)
+        if version_spec == 'unknown':
+            info = self.unknown_active_nodes.get(node_id)
+        else:
+            info = self.active_nodes.get(node_id)
+
         if info is None or not os.path.exists(info[1]):
             return result.fail(f'not found: {node_id}@{version_spec}')
 
@@ -893,7 +929,7 @@ class UnifiedManager:
 
         archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip"  # should be unpredictable name - security precaution
         download_path = os.path.join(get_default_custom_nodes_path(), archive_name)
-        manager_downloader.download_url(node_info.download_url, get_default_custom_nodes_path(), archive_name)
+        manager_downloader.basic_download_url(node_info.download_url, get_default_custom_nodes_path(), archive_name)
 
         # 2. extract files into <node_id>
         install_path = self.active_nodes[node_id][1]
@@ -1252,8 +1288,8 @@ class UnifiedManager:
             remote.fetch()
         except Exception as e:
             if 'detected dubious' in str(e):
-                print("[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository")
-                safedir_path = comfy_path.replace('\\', '/')
+                print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{repo_path}' repository")
+                safedir_path = repo_path.replace('\\', '/')
                 subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
                 try:
                     remote.fetch()
@@ -1264,7 +1300,10 @@ class UnifiedManager:
                           "-----------------------------------------------------------------------------------------\n")
 
         commit_hash = repo.head.commit.hexsha
-        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        if f'{remote_name}/{branch_name}' in repo.refs:
+            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        else:
+            return result.fail(f"Not updatable branch: {branch_name}")
 
         if commit_hash != remote_commit_hash:
             git_pull(repo_path)
@@ -1328,7 +1367,7 @@ class UnifiedManager:
                 if version_spec == 'unknown':
                     repo_url = the_node['files'][0]
                 else:  # nightly
-                    repo_url = the_node['reference']
+                    repo_url = the_node['repository']
             else:
                 result = ManagedResult('install')
                 return result.fail(f"Node '{node_id}@{version_spec}' not found in [{channel}, {mode}]")
@@ -1515,21 +1554,23 @@ manager_funcs = ManagerFuncs()
 
 def write_config():
     config = configparser.ConfigParser()
+
     config['default'] = {
         'preview_method': manager_funcs.get_current_preview_method(),
-        'git_exe':  get_config()['git_exe'],
+        'git_exe': get_config()['git_exe'],
+        'use_uv': get_config()['use_uv'],
         'channel_url': get_config()['channel_url'],
         'share_option': get_config()['share_option'],
         'bypass_ssl': get_config()['bypass_ssl'],
         "file_logging": get_config()['file_logging'],
-        'default_ui': get_config()['default_ui'],
         'component_policy': get_config()['component_policy'],
-        'double_click_policy': get_config()['double_click_policy'],
         'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
         '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']
     }
 
     directory = os.path.dirname(manager_config_path)
@@ -1545,49 +1586,51 @@ def read_config():
         config = configparser.ConfigParser()
         config.read(manager_config_path)
         default_conf = config['default']
+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
 
-        # policy migration: disable_unsecure_features -> security_level
-        if 'disable_unsecure_features' in default_conf:
-            if default_conf['disable_unsecure_features'].lower() == 'true':
-                security_level = 'strong'
-            else:
-                security_level = 'normal'
-        else:
-            security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
+        def get_bool(key, default_value):
+            return default_conf[key].lower() == 'true' if key in default_conf else False
 
         return {
-                    'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
-                    'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
-                    'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
-                    'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
-                    'bypass_ssl': default_conf['bypass_ssl'].lower() == 'true' if 'bypass_ssl' in default_conf else False,
-                    'file_logging': default_conf['file_logging'].lower() == 'true' if 'file_logging' in default_conf else True,
-                    'default_ui': default_conf['default_ui'] if 'default_ui' in default_conf else 'none',
-                    'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow',
-                    'double_click_policy': default_conf['double_click_policy'] if 'double_click_policy' in default_conf else 'copy-all',
-                    'windows_selector_event_loop_policy': default_conf['windows_selector_event_loop_policy'].lower() == 'true' if 'windows_selector_event_loop_policy' in default_conf else False,
-                    'model_download_by_agent': default_conf['model_download_by_agent'].lower() == 'true' if 'model_download_by_agent' in default_conf else False,
-                    'downgrade_blacklist': default_conf['downgrade_blacklist'] if 'downgrade_blacklist' in default_conf else '',
-                    'skip_migration_check': default_conf['skip_migration_check'].lower() == 'true' if 'skip_migration_check' in default_conf else False,
-                    'security_level': security_level
+                    'http_channel_enabled': get_bool('http_channel_enabled', False),
+                    'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
+                    'git_exe': default_conf.get('git_exe', ''),
+                    'use_uv': get_bool('use_uv', False),
+                    'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
+                    'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
+                    'share_option': default_conf.get('share_option', 'all').lower(),
+                    'bypass_ssl': get_bool('bypass_ssl', False),
+                    'file_logging': get_bool('file_logging', True),
+                    'component_policy': default_conf.get('component_policy', 'workflow').lower(),
+                    '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(),
                }
 
     except Exception:
+        manager_util.use_uv = False
         return {
+            'http_channel_enabled': False,
             'preview_method': manager_funcs.get_current_preview_method(),
             'git_exe': '',
+            'use_uv': False,
             'channel_url': DEFAULT_CHANNEL,
+            'default_cache_as_channel_url': False,
             'share_option': 'all',
             'bypass_ssl': False,
             'file_logging': True,
-            'default_ui': 'none',
             'component_policy': 'workflow',
-            'double_click_policy': 'copy-all',
             'windows_selector_event_loop_policy': False,
             'model_download_by_agent': False,
             'downgrade_blacklist': '',
             'skip_migration_check': False,
-            'security_level': 'normal',
+            'always_lazy_install': False,
+            'network_mode': 'public',   # public | private | offline
+            'security_level': 'normal', # strong | normal | normal- | weak
         }
 
 
@@ -1596,6 +1639,8 @@ def get_config():
 
     if cached_config is None:
         cached_config = read_config()
+        if cached_config['http_channel_enabled']:
+            print("[ComfyUI-Manager] Warning: http channel enabled, make sure server in secure env")
 
     return cached_config
 
@@ -1644,7 +1689,9 @@ def switch_to_default_branch(repo):
 
 
 def try_install_script(url, repo_path, install_cmd, instant_execution=False):
-    if not instant_execution and ((len(install_cmd) > 0 and install_cmd[0].startswith('#')) or (platform.system() == "Windows" and comfy_ui_commit_datetime.date() >= comfy_ui_required_commit_datetime.date())):
+    if not instant_execution and (
+            (len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
+    ):
         if not os.path.exists(manager_startup_script_path):
             os.makedirs(manager_startup_script_path)
 
@@ -1659,6 +1706,10 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
             if is_blacklisted(install_cmd[4]):
                 print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'")
                 return True
+        elif len(install_cmd) == 6 and install_cmd[3:5] == ['pip', 'install']:  # uv mode
+            if is_blacklisted(install_cmd[5]):
+                print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[5]}'")
+                return True
 
         print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
         code = manager_funcs.run_script(install_cmd, cwd=repo_path)
@@ -1775,9 +1826,9 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
                     if package_name and not package_name.startswith('#'):
                         if '--index-url' in package_name:
                             s = package_name.split('--index-url')
-                            install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
+                            install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
                         else:
-                            install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                            install_cmd = manager_util.make_pip_cmd(["install", package_name])
 
                         if package_name.strip() != "" and not package_name.startswith('#'):
                             try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
@@ -1859,7 +1910,10 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
                 current_branch = repo.active_branch
                 branch_name = current_branch.name
 
-            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+            if f'{remote_name}/{branch_name}' in repo.refs:
+                remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+            else:
+                return False, False
 
             if commit_hash == remote_commit_hash:
                 repo.close()
@@ -2034,9 +2088,10 @@ async def get_data_by_mode(mode, filename, channel_url=None):
         channel_url = get_channel_dict()[channel_url]
 
     try:
+        local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
+
         if mode == "local":
-            uri = os.path.join(manager_util.comfyui_manager_path, filename)
-            json_obj = await manager_util.get_data(uri)
+            json_obj = await manager_util.get_data(local_uri)
         else:
             if channel_url is None:
                 uri = get_config()['channel_url'] + '/' + filename
@@ -2046,19 +2101,25 @@ async def get_data_by_mode(mode, filename, channel_url=None):
             cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
             cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
-            if mode == "cache":
-                if manager_util.is_file_created_within_one_day(cache_uri):
+            if get_config()['network_mode'] == 'offline':
+                # offline network mode
+                if os.path.exists(cache_uri):
+                    json_obj = await manager_util.get_data(cache_uri)
+                else:
+                    local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
+                    if os.path.exists(local_uri):
+                        json_obj = await manager_util.get_data(local_uri)
+                    else:
+                        json_obj = {}  # fallback
+            else:
+                # public network mode
+                if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
                     json_obj = await manager_util.get_data(cache_uri)
                 else:
                     json_obj = await manager_util.get_data(uri)
                     with manager_util.cache_lock:
                         with open(cache_uri, "w", encoding='utf-8') as file:
                             json.dump(json_obj, file, indent=4, sort_keys=True)
-            else:
-                json_obj = await manager_util.get_data(uri)
-                with manager_util.cache_lock:
-                    with open(cache_uri, "w", encoding='utf-8') as file:
-                        json.dump(json_obj, file, indent=4, sort_keys=True)
     except Exception as e:
         print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
         uri = os.path.join(manager_util.comfyui_manager_path, filename)
@@ -2095,7 +2156,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
 
 
 def pip_install(packages):
-    install_cmd = ['#FORCE', sys.executable, "-m", "pip", "install", '-U'] + packages
+    install_cmd = ['#FORCE'] + manager_util.make_pip_cmd(["install", '-U']) + packages
     try_install_script('pip install via manager', '..', install_cmd)
 
 
@@ -2296,8 +2357,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
         remote.fetch()
     except Exception as e:
         if 'detected dubious' in str(e):
-            print("[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository")
-            safedir_path = comfy_path.replace('\\', '/')
+            print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{repo_path}' repository")
+            safedir_path = repo_path.replace('\\', '/')
             subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
             try:
                 remote.fetch()
@@ -2309,7 +2370,11 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
                 return "fail"
 
     commit_hash = repo.head.commit.hexsha
-    remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+
+    if f'{remote_name}/{branch_name}' in repo.refs:
+        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+    else:
+        return "fail"
 
     if commit_hash != remote_commit_hash:
         git_pull(repo_path)
@@ -2388,7 +2453,8 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
 
 def get_installed_pip_packages():
     # extract pip package infos
-    pips = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'], text=True).split('\n')
+    cmd = manager_util.make_pip_cmd(['freeze'])
+    pips = subprocess.check_output(cmd, text=True).split('\n')
 
     res = {}
     for x in pips:
@@ -2404,7 +2470,7 @@ def get_installed_pip_packages():
     return res
 
 
-async def get_current_snapshot():
+async def get_current_snapshot(custom_nodes_only = False):
     await unified_manager.reload('cache')
     await unified_manager.get_custom_nodes('default', 'cache')
 
@@ -2415,8 +2481,10 @@ async def get_current_snapshot():
         print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
         return {}
 
-    repo = git.Repo(repo_path)
-    comfyui_commit_hash = repo.head.commit.hexsha
+    comfyui_commit_hash = None
+    if not custom_nodes_only:
+        repo = git.Repo(repo_path)
+        comfyui_commit_hash = repo.head.commit.hexsha
 
     git_custom_nodes = {}
     cnr_custom_nodes = {}
@@ -2453,8 +2521,21 @@ async def get_current_snapshot():
                         cnr_custom_nodes[info['id']] = info['ver']
                     else:
                         repo = git.Repo(fullpath)
+
+                        if repo.head.is_detached:
+                            remote_name = get_remote_name(repo)
+                        else:
+                            current_branch = repo.active_branch
+
+                            if current_branch.tracking_branch() is None:
+                                remote_name = get_remote_name(repo)
+                            else:
+                                remote_name = current_branch.tracking_branch().remote_name
+
                         commit_hash = repo.head.commit.hexsha
-                        url = repo.remotes.origin.url
+
+                        url = repo.remotes[remote_name].url
+
                         git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
                 except:
                     print(f"Failed to extract snapshots for the custom node '{path}'.")
@@ -2469,7 +2550,7 @@ async def get_current_snapshot():
 
                 file_custom_nodes.append(item)
 
-    pip_packages = get_installed_pip_packages()
+    pip_packages = None if custom_nodes_only else get_installed_pip_packages()
 
     return {
         'comfyui': comfyui_commit_hash,
@@ -2480,7 +2561,7 @@ async def get_current_snapshot():
     }
 
 
-async def save_snapshot_with_postfix(postfix, path=None):
+async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = False):
     if path is None:
         now = datetime.now()
 
@@ -2492,7 +2573,7 @@ async def save_snapshot_with_postfix(postfix, path=None):
         file_name = path.replace('\\', '/').split('/')[-1]
         file_name = file_name.split('.')[-2]
 
-    snapshot = await get_current_snapshot()
+    snapshot = await get_current_snapshot(custom_nodes_only)
     if path.endswith('.json'):
         with open(path, "w") as json_file:
             json.dump(snapshot, json_file, indent=4)
@@ -2659,8 +2740,8 @@ def map_to_unified_keys(json_obj):
     return res
 
 
-async def get_unified_total_nodes(channel, mode):
-    await unified_manager.reload(mode)
+async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
+    await unified_manager.reload(regsitry_cache_mode)
 
     res = await unified_manager.get_custom_nodes(channel, mode)
 
@@ -2743,6 +2824,7 @@ async def get_unified_total_nodes(channel, mode):
             author = cnr['publisher']['name']
             title = cnr['name']
             reference = f"https://registry.comfy.org/nodes/{cnr['id']}"
+            repository = cnr.get('repository', '')
             install_type = "cnr"
             description = cnr.get('description', '')
 
@@ -2774,7 +2856,7 @@ async def get_unified_total_nodes(channel, mode):
             if ver is None:
                 ver = cnr['latest_version']['version']
 
-            item = dict(author=author, title=title, reference=reference, install_type=install_type,
+            item = dict(author=author, title=title, reference=reference, repository=repository, install_type=install_type,
                         description=description, state=state, updatable=updatable, version=ver)
 
             if active_version:
@@ -2790,15 +2872,18 @@ async def get_unified_total_nodes(channel, mode):
 
 def populate_github_stats(node_packs, json_obj_github):
     for k, v in node_packs.items():
-        url = v['reference']
-        if url in json_obj_github:
-            v['stars'] = json_obj_github[url]['stars']
-            v['last_update'] = json_obj_github[url]['last_update']
-            v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
-        else:
-            v['stars'] = -1
-            v['last_update'] = -1
-            v['trust'] = False
+        try:
+            url = v['reference']
+            if url in json_obj_github:
+                v['stars'] = json_obj_github[url]['stars']
+                v['last_update'] = json_obj_github[url]['last_update']
+                v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
+            else:
+                v['stars'] = -1
+                v['last_update'] = -1
+                v['trust'] = False
+        except:
+            logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
 
 
 def populate_favorites(node_packs, json_obj_extras):

glob/manager_downloader.py

@@ -2,6 +2,11 @@ import os
 from urllib.parse import urlparse
 import urllib
 import sys
+import logging
+import requests
+from huggingface_hub import HfApi
+from tqdm.auto import tqdm
+
 
 aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
 HF_ENDPOINT = os.getenv('HF_ENDPOINT')
@@ -16,7 +21,11 @@ if aria2 is not None:
     aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
 
 
-def basic_download_url(url, dest_folder, filename):
+def basic_download_url(url, dest_folder: str, filename: str):
+    '''
+    Download file from url to dest_folder with filename
+    using requests library.
+    '''
     import requests
 
     # Ensure the destination folder exists
@@ -40,6 +49,7 @@ def basic_download_url(url, dest_folder, filename):
 def download_url(model_url: str, model_dir: str, filename: str):
     if HF_ENDPOINT:
         model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
+        logging.info(f"model_url replaced by HF_ENDPOINT, new = {model_url}")
     if aria2:
         return aria2_download_url(model_url, model_dir, filename)
     else:
@@ -111,4 +121,38 @@ def download_url_with_agent(url, save_path):
         return False
 
     print("Installation was successful.")
-    return True
+    return True
+
+# NOTE: snapshot_download doesn't provide file size tqdm.
+def download_repo_in_bytes(repo_id, local_dir):
+    api = HfApi()
+    repo_info = api.repo_info(repo_id=repo_id, files_metadata=True)
+
+    os.makedirs(local_dir, exist_ok=True)
+
+    total_size = 0
+    for file_info in repo_info.siblings:
+        if file_info.size is not None:
+            total_size += file_info.size
+
+    pbar = tqdm(total=total_size, unit="B", unit_scale=True, desc="Downloading")
+
+    for file_info in repo_info.siblings:
+        out_path = os.path.join(local_dir, file_info.rfilename)
+        os.makedirs(os.path.dirname(out_path), exist_ok=True)
+
+        if file_info.size is None:
+            continue
+
+        download_url = f"https://huggingface.co/{repo_id}/resolve/main/{file_info.rfilename}"
+
+        with requests.get(download_url, stream=True) as r, open(out_path, "wb") as f:
+            r.raise_for_status()
+            for chunk in r.iter_content(chunk_size=65536):
+                if chunk:
+                    f.write(chunk)
+                    pbar.update(len(chunk))
+
+    pbar.close()
+
+

glob/manager_server.py

@@ -18,9 +18,14 @@ import manager_core as core
 import manager_util
 import cm_global
 import logging
+import asyncio
+import queue
+
+import manager_downloader
 
 
 logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
+logging.info("[ComfyUI-Manager] network_mode: " + core.get_config()['network_mode'])
 
 comfy_ui_hash = "-"
 comfyui_tag = None
@@ -28,10 +33,10 @@ comfyui_tag = None
 SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
 SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
 SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
 
 routes = PromptServer.instance.routes
 
-
 def handle_stream(stream, prefix):
     stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
     for msg in stream:
@@ -50,8 +55,35 @@ def handle_stream(stream, prefix):
 from comfy.cli_args import args
 import latent_preview
 
+def is_loopback(address):
+    import ipaddress
+    try:
+        return ipaddress.ip_address(address).is_loopback
+    except ValueError:
+        return False
 
-is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
+is_local_mode = is_loopback(args.listen)
+
+
+model_dir_name_map = {
+    "checkpoints": "checkpoints",
+    "checkpoint": "checkpoints",
+    "unclip": "checkpoints",
+    "text_encoders": "text_encoders",
+    "clip": "text_encoders",
+    "vae": "vae",
+    "lora": "loras",
+    "t2i-adapter": "controlnet",
+    "t2i-style": "controlnet",
+    "controlnet": "controlnet",
+    "clip_vision": "clip_vision",
+    "gligen": "gligen",
+    "upscale": "upscale_models",
+    "embedding": "embeddings",
+    "embeddings": "embeddings",
+    "unet": "diffusion_models",
+    "diffusion_model": "diffusion_models",
+}
 
 
 def is_allowed_security_level(level):
@@ -59,11 +91,11 @@ def is_allowed_security_level(level):
         return False
     elif level == 'high':
         if is_local_mode:
-            return core.get_config()['security_level'].lower() in ['weak', 'normal-']
+            return core.get_config()['security_level'] in ['weak', 'normal-']
         else:
-            return core.get_config()['security_level'].lower() == 'weak'
+            return core.get_config()['security_level'] == 'weak'
     elif level == 'middle':
-        return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
+        return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
     else:
         return True
 
@@ -74,7 +106,7 @@ async def get_risky_level(files, pip_packages):
 
     all_urls = set()
     for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
-        all_urls.update(x['files'])
+        all_urls.update(x.get('files', []))
 
     for x in files:
         if x not in all_urls:
@@ -82,8 +114,7 @@ async def get_risky_level(files, pip_packages):
 
     all_pip_packages = set()
     for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
-        if "pip" in x:
-            all_pip_packages.update(x['pip'])
+        all_pip_packages.update(x.get('pip', []))
 
     for p in pip_packages:
         if p not in all_pip_packages:
@@ -147,24 +178,16 @@ def set_preview_method(method):
     else:
         args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
 
-    core.get_config()['preview_method'] = args.preview_method
+    core.get_config()['preview_method'] = method
 
 
 set_preview_method(core.get_config()['preview_method'])
 
 
-def set_default_ui_mode(mode):
-    core.get_config()['default_ui'] = mode
-
-
 def set_component_policy(mode):
     core.get_config()['component_policy'] = mode
 
 
-def set_double_click_policy(mode):
-    core.get_config()['double_click_policy'] = mode
-
-
 def print_comfyui_version():
     global comfy_ui_hash
     global comfyui_tag
@@ -278,43 +301,9 @@ def get_model_dir(data, show_log=False):
             else:
                 base_model = os.path.join(models_base, data['save_path'])
     else:
-        model_type = data['type']
-        if model_type == "checkpoints" or model_type == "checkpoint":
-            base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
-        elif model_type == "unclip":
-            base_model = folder_paths.folder_names_and_paths["checkpoints"][0][0]
-        elif model_type == "clip" or model_type == "text_encoders":
-            if folder_paths.folder_names_and_paths.get("text_encoders"):
-                base_model = folder_paths.folder_names_and_paths["text_encoders"][0][0]
-            else:
-                if show_log:
-                    logging.info("[ComfyUI-Manager] Your ComfyUI is outdated version.")
-                base_model = folder_paths.folder_names_and_paths["clip"][0][0]  # outdated version
-        elif model_type == "VAE":
-            base_model = folder_paths.folder_names_and_paths["vae"][0][0]
-        elif model_type == "lora":
-            base_model = folder_paths.folder_names_and_paths["loras"][0][0]
-        elif model_type == "T2I-Adapter":
-            base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
-        elif model_type == "T2I-Style":
-            base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
-        elif model_type == "controlnet":
-            base_model = folder_paths.folder_names_and_paths["controlnet"][0][0]
-        elif model_type == "clip_vision":
-            base_model = folder_paths.folder_names_and_paths["clip_vision"][0][0]
-        elif model_type == "gligen":
-            base_model = folder_paths.folder_names_and_paths["gligen"][0][0]
-        elif model_type == "upscale":
-            base_model = folder_paths.folder_names_and_paths["upscale_models"][0][0]
-        elif model_type == "embeddings":
-            base_model = folder_paths.folder_names_and_paths["embeddings"][0][0]
-        elif model_type == "unet" or model_type == "diffusion_model":
-            if folder_paths.folder_names_and_paths.get("diffusion_models"):
-                base_model = folder_paths.folder_names_and_paths["diffusion_models"][0][1]
-            else:
-                if show_log:
-                    logging.info("[ComfyUI-Manager] Your ComfyUI is outdated version.")
-                base_model = folder_paths.folder_names_and_paths["unet"][0][0]  # outdated version
+        model_dir_name = model_dir_name_map.get(data['type'].lower())
+        if model_dir_name is not None:
+            base_model = folder_paths.folder_names_and_paths[model_dir_name][0][0]
         else:
             base_model = os.path.join(models_base, "etc")
 
@@ -326,7 +315,10 @@ def get_model_path(data, show_log=False):
     if base_model is None:
         return None
     else:
-        return os.path.join(base_model, data['filename'])
+        if data['filename'] == '<huggingface>':
+            return os.path.join(base_model, os.path.basename(data['url']))
+        else:
+            return os.path.join(base_model, data['filename'])
 
 
 def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False):
@@ -385,6 +377,247 @@ def nickname_filter(json_obj):
     return json_obj
 
 
+task_queue = queue.Queue()
+nodepack_result = {}
+model_result = {}
+tasks_in_progress = set()
+task_worker_lock = threading.Lock()
+
+async def task_worker():
+    global task_queue
+    global nodepack_result
+    global model_result
+    global tasks_in_progress
+
+    async def do_install(item) -> str:
+        ui_id, node_spec_str, channel, mode, skip_post_install = item
+
+        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}'"
+
+            node_name, version_spec, is_specified = node_spec
+            res = await core.unified_manager.install_by_id(node_name, version_spec, channel, mode, return_postinstall=skip_post_install)
+            # discard post install if skip_post_install mode
+
+            if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
+                logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
+                return res.msg
+
+            elif not res.result:
+                logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
+                return res.msg
+
+            return 'success'
+        except Exception:
+            traceback.print_exc()
+            return f"Installation failed:\n{node_spec_str}"
+
+    async def do_update(item) -> str:
+        ui_id, node_name, node_ver = item
+
+        try:
+            res = core.unified_manager.unified_update(node_name, node_ver)
+
+            manager_util.clear_pip_cache()
+
+            if res.result:
+                if res.action == 'skip':
+                    return 'skip'
+                else:
+                    return 'success'
+
+            logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
+        except Exception:
+            traceback.print_exc()
+
+        return f"An error occurred while updating '{node_name}'."
+
+    async def do_update_comfyui() -> str:
+        try:
+            repo_path = os.path.dirname(folder_paths.__file__)
+            res = core.update_path(repo_path)
+
+            if res == "fail":
+                logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
+                return "The installed ComfyUI does not have a Git repository."
+            elif res == "updated":
+                logging.info("ComfyUI is updated.")
+                return "success"
+            else:  # skipped
+                logging.info("ComfyUI is up-to-date.")
+                return "skip"
+        except Exception:
+            traceback.print_exc()
+
+        return "An error occurred while updating 'comfyui'."
+
+    async def do_fix(item) -> str:
+        ui_id, node_name, node_ver = item
+
+        try:
+            res = core.unified_manager.unified_fix(node_name, node_ver)
+
+            if res.result:
+                return 'success'
+            else:
+                logging.error(res.msg)
+
+            logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
+        except Exception:
+            traceback.print_exc()
+
+        return f"An error occurred while fixing '{node_name}@{node_ver}'."
+
+    async def do_uninstall(item) -> str:
+        ui_id, node_name, is_unknown = item
+
+        try:
+            res = core.unified_manager.unified_uninstall(node_name, is_unknown)
+
+            if res.result:
+                return 'success'
+
+            logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
+        except Exception:
+            traceback.print_exc()
+
+        return f"An error occurred while uninstalling '{node_name}'."
+
+    async def do_disable(item) -> str:
+        ui_id, node_name, is_unknown = item
+
+        try:
+            res = core.unified_manager.unified_disable(node_name, is_unknown)
+
+            if res:
+                return 'success'
+
+        except Exception:
+            traceback.print_exc()
+
+        return f"Failed to disable: '{node_name}'"
+
+    async def do_install_model(item) -> str:
+        ui_id, json_data = item
+
+        model_path = get_model_path(json_data)
+        model_url = json_data['url']
+
+        res = False
+
+        try:
+            if model_path is not None:
+                logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
+
+                if json_data['filename'] == '<huggingface>':
+                    if os.path.exists(os.path.join(model_path, os.path.dirname(json_data['url']))):
+                        logging.error(f"[ComfyUI-Manager] the model path already exists: {model_path}")
+                        return f"The model path already exists: {model_path}"
+
+                    logging.info(f"[ComfyUI-Manager] Downloading '{model_url}' into '{model_path}'")
+                    manager_downloader.download_repo_in_bytes(repo_id=model_url, local_dir=model_path)
+
+                    return 'success'
+
+                elif not core.get_config()['model_download_by_agent'] and (
+                        model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
+                    model_dir = get_model_dir(json_data, True)
+                    download_url(model_url, model_dir, filename=json_data['filename'])
+                    if model_path.endswith('.zip'):
+                        res = core.unzip(model_path)
+                    else:
+                        res = True
+
+                    if res:
+                        return 'success'
+                else:
+                    res = download_url_with_agent(model_url, model_path)
+                    if res and model_path.endswith('.zip'):
+                        res = core.unzip(model_path)
+            else:
+                logging.error(f"[ComfyUI-Manager] Model installation error: invalid model type - {json_data['type']}")
+
+            if res:
+                return 'success'
+
+        except Exception as e:
+            logging.error(f"[ComfyUI-Manager] ERROR: {e}", file=sys.stderr)
+
+        return f"Model installation error: {model_url}"
+
+    stats = {}
+
+    while True:
+        done_count = len(nodepack_result) + len(model_result)
+        total_count = done_count + task_queue.qsize()
+
+        if task_queue.empty():
+            logging.info(f"\n[ComfyUI-Manager] Queued works are completed.\n{stats}")
+
+            logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
+            PromptServer.instance.send_sync("cm-queue-status",
+                                            {'status': 'done',
+                                             'nodepack_result': nodepack_result, 'model_result': model_result,
+                                             'total_count': total_count, 'done_count': done_count})
+            nodepack_result = {}
+            task_queue = queue.Queue()
+            return  # terminate worker thread
+
+        with task_worker_lock:
+            kind, item = task_queue.get()
+            tasks_in_progress.add((kind, item[0]))
+
+        try:
+            if kind == 'install':
+                msg = await do_install(item)
+            elif kind == 'install-model':
+                msg = await do_install_model(item)
+            elif kind == 'update':
+                msg = await do_update(item)
+            elif kind == 'update-main':
+                msg = await do_update(item)
+            elif kind == 'update-comfyui':
+                msg = await do_update_comfyui()
+            elif kind == 'fix':
+                msg = await do_fix(item)
+            elif kind == 'uninstall':
+                msg = await do_uninstall(item)
+            elif kind == 'disable':
+                msg = await do_disable(item)
+            else:
+                msg = "Unexpected kind: " + kind
+        except Exception:
+            traceback.print_exc()
+            msg = f"Exception: {(kind, item)}"
+
+        with task_worker_lock:
+            tasks_in_progress.remove((kind, item[0]))
+
+            ui_id = item[0]
+            if kind == 'install-model':
+                model_result[ui_id] = msg
+                ui_target = "model_manager"
+            elif kind == 'update-main':
+                nodepack_result[ui_id] = msg
+                ui_target = "main"
+            elif kind == 'update-comfyui':
+                nodepack_result['comfyui'] = msg
+                ui_target = "main"
+            else:
+                nodepack_result[ui_id] = msg
+                ui_target = "nodepack_manager"
+
+        stats[kind] = stats.get(kind, 0) + 1
+
+        PromptServer.instance.send_sync("cm-queue-status",
+                                        {'status': 'in_progress', 'target': item[0], 'ui_target': ui_target,
+                                         'total_count': total_count, 'done_count': done_count})
+
+
 @routes.get("/customnode/getmappings")
 async def fetch_customnode_mappings(request):
     """
@@ -448,49 +681,37 @@ async def fetch_updates(request):
         return web.Response(status=400)
 
 
-@routes.get("/customnode/update_all")
+@routes.get("/manager/queue/update_all")
 async def update_all(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
-    try:
-        await core.save_snapshot_with_postfix('autosave')
+    with task_worker_lock:
+        is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
+        if is_processing:
+            return web.Response(status=401)
+        
+    await core.save_snapshot_with_postfix('autosave')
 
-        if request.rel_url.query["mode"] == "local":
-            channel = 'local'
-        else:
-            channel = core.get_config()['channel_url']
+    if request.rel_url.query["mode"] == "local":
+        channel = 'local'
+    else:
+        channel = core.get_config()['channel_url']
 
-        await core.unified_manager.reload(request.rel_url.query["mode"])
-        await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
+    await core.unified_manager.reload(request.rel_url.query["mode"])
+    await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
 
-        updated_cnr = []
-        for k, v in core.unified_manager.active_nodes.items():
-            if v[0] != 'nightly':
-                res = core.unified_manager.unified_update(k, v[0])
-                if res.action == 'switch-cnr' and res:
-                    updated_cnr.append(k)
+    for k, v in core.unified_manager.active_nodes.items():
+        if k == 'comfyui-manager':
+            # skip updating comfyui-manager if desktop version
+            if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
+                continue
 
-        res = core.unified_manager.fetch_or_pull_git_repo(is_pull=True)
+        update_item = k, k, v[0]
+        task_queue.put(("update-main", update_item))
 
-        res['updated'] += updated_cnr
-
-        for x in res['failed']:
-            logging.error(f"PULL FAILED: {x}")
-
-        if len(res['updated']) == 0 and len(res['failed']) == 0:
-            status = 200
-        else:
-            status = 201
-
-        logging.info("\nDone.")
-        return web.json_response(res, status=status, content_type='application/json')
-    except:
-        traceback.print_exc()
-        return web.Response(status=400)
-    finally:
-        manager_util.clear_pip_cache()
+    return web.Response(status=200)
 
 
 def convert_markdown_to_html(input_text):
@@ -566,7 +787,7 @@ async def fetch_customnode_list(request):
     else:
         channel = core.get_config()['channel_url']
 
-    node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"])
+    node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"], 'cache')
     json_obj_github = core.get_data_by_mode(request.rel_url.query["mode"], 'github-stats.json', 'default')
     json_obj_extras = core.get_data_by_mode(request.rel_url.query["mode"], 'extras.json', 'default')
 
@@ -609,24 +830,59 @@ async def fetch_customnode_alternatives(request):
 
 
 def check_model_installed(json_obj):
-    def process_model(item):
-        model_path = get_model_path(item, False)
-        item['installed'] = 'None'
+    def is_exists(model_dir_name, filename, url):
+        if filename == '<huggingface>':
+            filename = os.path.basename(url)
 
-        if model_path is not None:
-            if model_path.endswith('.zip'):
-                if os.path.exists(model_path[:-4]):
-                    item['installed'] = 'True'
-                else:
-                    item['installed'] = 'False'
-            elif os.path.exists(model_path):
+        dirs = folder_paths.get_folder_paths(model_dir_name)
+
+        for x in dirs:
+            if os.path.exists(os.path.join(x, filename)):
+                return True
+
+        return False
+
+    model_dir_names = ['checkpoints', 'loras', 'vae', 'text_encoders', 'diffusion_models', 'clip_vision', 'embeddings',
+                       'diffusers', 'vae_approx', 'controlnet', 'gligen', 'upscale_models', 'hypernetworks',
+                       'photomaker', 'classifiers']
+
+    total_models_files = set()
+    for x in model_dir_names:
+        for y in folder_paths.get_filename_list(x):
+            total_models_files.add(y)
+
+    def process_model_phase(item):
+        if 'diffusion' not in item['filename'] and 'pytorch' not in item['filename'] and 'model' not in item['filename']:
+            # non-general name case
+            if item['filename'] in total_models_files:
                 item['installed'] = 'True'
+                return
+
+        if item['save_path'] == 'default':
+            model_dir_name = model_dir_name_map.get(item['type'].lower())
+            if model_dir_name is not None:
+                item['installed'] = str(is_exists(model_dir_name, item['filename'], item['url']))
             else:
                 item['installed'] = 'False'
+        else:
+            model_dir_name = item['save_path'].split('/')[0]
+            if model_dir_name in folder_paths.folder_names_and_paths:
+                if is_exists(model_dir_name, item['filename'], item['url']):
+                    item['installed'] = 'True'
+
+            if 'installed' not in item:
+                if item['filename'] == '<huggingface>':
+                    filename = os.path.basename(item['url'])
+                else:
+                    filename = item['filename']
+
+                fullpath = os.path.join(folder_paths.models_dir, item['save_path'], filename)
+
+                item['installed'] = 'True' if os.path.exists(fullpath) else 'False'
 
     with concurrent.futures.ThreadPoolExecutor(8) as executor:
         for item in json_obj['models']:
-            executor.submit(process_model, item)
+            executor.submit(process_model_phase, item)
 
 
 @routes.get("/externalmodel/getlist")
@@ -839,13 +1095,52 @@ async def get_disabled_versions(request):
     return web.Response(status=400)
 
 
-@routes.post("/customnode/reinstall")
+@routes.post("/customnode/import_fail_info")
+async def import_fail_info(request):
+    json_data = await request.json()
+
+    if 'cnr_id' in json_data:
+        module_name = core.unified_manager.get_module_name(json_data['cnr_id'])
+    else:
+        module_name = core.unified_manager.get_module_name(json_data['url'])
+
+    if module_name is not None:
+        info = cm_global.error_dict.get(module_name)
+        if info is not None:
+            return web.json_response(info)
+
+    return web.Response(status=400)
+
+
+@routes.post("/manager/queue/reinstall")
 async def reinstall_custom_node(request):
     await uninstall_custom_node(request)
     await install_custom_node(request)
 
 
-@routes.post("/customnode/install")
+@routes.get("/manager/queue/reset")
+async def reset_queue(request):
+    global task_queue
+    task_queue = queue.Queue()
+    return web.Response(status=200)
+
+
+@routes.get("/manager/queue/status")
+async def queue_count(request):
+    global task_queue
+
+    with task_worker_lock:
+        done_count = len(nodepack_result) + len(model_result)
+        in_progress_count = len(tasks_in_progress)
+        total_count = done_count + in_progress_count + task_queue.qsize()
+        is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
+
+    return web.json_response({
+        'total_count': total_count, 'done_count': done_count, 'in_progress_count': in_progress_count,
+        'is_processing': is_processing})
+
+
+@routes.post("/manager/queue/install")
 async def install_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -867,7 +1162,7 @@ async def install_custom_node(request):
             node_spec_str = f"{cnr_id}@{selected_version}"
         else:
             node_spec_str = f"{cnr_id}@nightly"
-            git_url = [json_data.get('reference')]
+            git_url = [json_data.get('repository')]
             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}")
@@ -888,26 +1183,33 @@ async def install_custom_node(request):
         logging.error(SECURITY_MESSAGE_GENERAL)
         return web.Response(status=404, text="A security error has occurred. Please check the terminal logs")
 
-    node_spec = core.unified_manager.resolve_node_spec(node_spec_str)
+    install_item = json_data.get('ui_id'), node_spec_str, json_data['channel'], json_data['mode'], skip_post_install
+    task_queue.put(("install", install_item))
 
-    if node_spec is None:
-        return web.Response(status=400, text=f"Cannot resolve install target: '{node_spec_str}'")
-
-    node_name, version_spec, is_specified = node_spec
-    res = await core.unified_manager.install_by_id(node_name, version_spec, json_data['channel'], json_data['mode'], return_postinstall=skip_post_install)
-    # discard post install if skip_post_install mode
-
-    if res.action not in ['skip', 'enable', 'install-git', 'install-cnr', 'switch-cnr']:
-        logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
-        return web.Response(status=400, text=res.msg)
-    elif not res.result:
-        logging.error(f"[ComfyUI-Manager] Installation failed:\n{res.msg}")
-        return web.Response(status=400, text=res.msg)
-
-    return web.Response(status=200, text="Installation success.")
+    return web.Response(status=200)
 
 
-@routes.post("/customnode/fix")
+task_worker_thread:threading.Thread = None
+
+@routes.get("/manager/queue/start")
+async def queue_start(request):
+    global nodepack_result
+    global model_result
+    global task_worker_thread
+
+    if task_worker_thread is not None and task_worker_thread.is_alive():
+        return web.Response(status=201) # already in-progress
+
+    nodepack_result = {}
+    model_result = {}
+
+    task_worker_thread = threading.Thread(target=lambda: asyncio.run(task_worker()))
+    task_worker_thread.start()
+
+    return web.Response(status=200)
+
+
+@routes.post("/manager/queue/fix")
 async def fix_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_GENERAL)
@@ -923,14 +1225,10 @@ async def fix_custom_node(request):
         # unknown
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_fix(node_name, node_ver)
+    update_item = json_data.get('ui_id'), node_name, json_data['version']
+    task_queue.put(("fix", update_item))
 
-    if res.result:
-        logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
-        return web.json_response({}, content_type='application/json')
-
-    logging.error(f"\nERROR: An error occurred while fixing '{node_name}@{node_ver}'.")
-    return web.Response(status=400, text=f"An error occurred while fixing '{node_name}@{node_ver}'.")
+    return web.Response(status=200)
 
 
 @routes.post("/customnode/install/git_url")
@@ -965,7 +1263,7 @@ async def install_custom_node_pip(request):
     return web.Response(status=200)
 
 
-@routes.post("/customnode/uninstall")
+@routes.post("/manager/queue/uninstall")
 async def uninstall_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -982,17 +1280,13 @@ async def uninstall_custom_node(request):
         is_unknown = True
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_uninstall(node_name, is_unknown)
+    uninstall_item = json_data.get('ui_id'), node_name, is_unknown
+    task_queue.put(("uninstall", uninstall_item))
 
-    if res.result:
-        logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
-        return web.json_response({}, content_type='application/json')
-
-    logging.error(f"\nERROR: An error occurred while uninstalling '{node_name}'.")
-    return web.Response(status=400, text=f"An error occurred while uninstalling '{node_name}'.")
+    return web.Response(status=200)
 
 
-@routes.post("/customnode/update")
+@routes.post("/manager/queue/update")
 async def update_custom_node(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1007,36 +1301,16 @@ async def update_custom_node(request):
         # unknown
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_update(node_name, json_data['version'])
+    update_item = json_data.get('ui_id'), node_name, json_data['version']
+    task_queue.put(("update", update_item))
 
-    manager_util.clear_pip_cache()
-
-    if res.result:
-        logging.info("\nAfter restarting ComfyUI, please refresh the browser.")
-        return web.json_response({}, content_type='application/json')
-
-    logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
-    return web.Response(status=400, text=f"An error occurred while updating '{node_name}'.")
+    return web.Response(status=200)
 
 
-@routes.get("/comfyui_manager/update_comfyui")
+@routes.get("/manager/queue/update_comfyui")
 async def update_comfyui(request):
-    logging.info("Update ComfyUI")
-
-    try:
-        repo_path = os.path.dirname(folder_paths.__file__)
-        res = core.update_path(repo_path)
-        if res == "fail":
-            logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
-            return web.Response(status=400)
-        elif res == "updated":
-            return web.Response(status=201)
-        else:  # skipped
-            return web.Response(status=200)
-    except Exception as e:
-        logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
-
-    return web.Response(status=400)
+    task_queue.put(("update-comfyui", ('comfyui',)))
+    return web.Response(status=200)
 
 
 @routes.get("/comfyui_manager/comfyui_versions")
@@ -1063,7 +1337,7 @@ async def comfyui_switch_version(request):
     return web.Response(status=400)
 
 
-@routes.post("/customnode/disable")
+@routes.post("/manager/queue/disable")
 async def disable_node(request):
     json_data = await request.json()
 
@@ -1076,12 +1350,10 @@ async def disable_node(request):
         is_unknown = True
         node_name = os.path.basename(json_data['files'][0])
 
-    res = core.unified_manager.unified_disable(node_name, is_unknown)
+    update_item = json_data.get('ui_id'), node_name, is_unknown
+    task_queue.put(("disable", update_item))
 
-    if res:
-        return web.json_response({}, content_type='application/json')
-
-    return web.Response(status=400, text="Failed to disable")
+    return web.Response(status=200)
 
 
 @routes.get("/manager/migrate_unmanaged_nodes")
@@ -1097,18 +1369,16 @@ async def need_to_migrate(request):
     return web.Response(text=str(core.need_to_migrate), status=200)
 
 
-@routes.post("/model/install")
+@routes.post("/manager/queue/install_model")
 async def install_model(request):
     json_data = await request.json()
 
-    model_path = get_model_path(json_data)
-
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
-        return web.Response(status=403)
+        return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
 
     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')
+        models_json = await core.get_data_by_mode('cache', 'model-list.json', 'default')
 
         is_belongs_to_whitelist = False
         for x in models_json['models']:
@@ -1117,40 +1387,13 @@ async def install_model(request):
                 break
 
         if not is_belongs_to_whitelist:
-            logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
-            return web.Response(status=403)
+            logging.error(SECURITY_MESSAGE_NORMAL_MINUS_MODEL)
+            return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
 
-    res = False
+    install_item = json_data.get('ui_id'), json_data
+    task_queue.put(("install-model", install_item))
 
-    try:
-        if model_path is not None:
-            logging.info(f"Install model '{json_data['name']}' into '{model_path}'")
-
-            model_url = json_data['url']
-            if not core.get_config()['model_download_by_agent'] and (
-                    model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
-                model_dir = get_model_dir(json_data, True)
-                download_url(model_url, model_dir, filename=json_data['filename'])
-                if model_path.endswith('.zip'):
-                    res = core.unzip(model_path)
-                else:
-                    res = True
-
-                if res:
-                    return web.json_response({}, content_type='application/json')
-            else:
-                res = download_url_with_agent(model_url, model_path)
-                if res and model_path.endswith('.zip'):
-                    res = core.unzip(model_path)
-        else:
-            logging.error(f"Model installation error: invalid model type - {json_data['type']}")
-
-        if res:
-            return web.json_response({}, content_type='application/json')
-    except Exception as e:
-        logging.error(f"[ERROR] {e}", file=sys.stderr)
-
-    return web.Response(status=400)
+    return web.Response(status=200)
 
 
 @routes.get("/manager/preview_method")
@@ -1164,17 +1407,6 @@ async def preview_method(request):
     return web.Response(status=200)
 
 
-@routes.get("/manager/default_ui")
-async def default_ui_mode(request):
-    if "value" in request.rel_url.query:
-        set_default_ui_mode(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['default_ui'], status=200)
-
-    return web.Response(status=200)
-
-
 @routes.get("/manager/component/policy")
 async def component_policy(request):
     if "value" in request.rel_url.query:
@@ -1186,17 +1418,6 @@ async def component_policy(request):
     return web.Response(status=200)
 
 
-@routes.get("/manager/dbl_click/policy")
-async def dbl_click_policy(request):
-    if "value" in request.rel_url.query:
-        set_double_click_policy(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['double_click_policy'], status=200)
-
-    return web.Response(status=200)
-
-
 @routes.get("/manager/channel_url_list")
 async def channel_url_list(request):
     channels = core.get_channel_dict()
@@ -1390,12 +1611,15 @@ def confirm_try_install(sender, custom_node_url, msg):
 
 cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
 
-import asyncio
-
 
 async def default_cache_update():
+    channel_url = core.get_config()['channel_url']
     async def get_cache(filename):
-        uri = f"{core.DEFAULT_CHANNEL}/{filename}"
+        if core.get_config()['default_cache_as_channel_url']:
+            uri = f"{channel_url}/{filename}"
+        else:
+            uri = f"{core.DEFAULT_CHANNEL}/{filename}"
+
         cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
         cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
@@ -1406,17 +1630,23 @@ async def default_cache_update():
                 json.dump(json_obj, file, indent=4, sort_keys=True)
                 logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
 
-    a = get_cache("custom-node-list.json")
-    b = get_cache("extension-node-map.json")
-    c = get_cache("model-list.json")
-    d = get_cache("alter-list.json")
-    e = get_cache("github-stats.json")
+    if core.get_config()['network_mode'] != 'offline':
+        a = get_cache("custom-node-list.json")
+        b = get_cache("extension-node-map.json")
+        c = get_cache("model-list.json")
+        d = get_cache("alter-list.json")
+        e = get_cache("github-stats.json")
 
-    await asyncio.gather(a, b, c, d, e)
+        await asyncio.gather(a, b, c, d, e)
 
-    # load at least once
-    await core.unified_manager.reload('cache', dont_wait=False)
-    await core.unified_manager.get_custom_nodes('default', 'cache')
+        if core.get_config()['network_mode'] == 'private':
+            logging.info("[ComfyUI-Manager] The private comfyregistry is not yet supported in `network_mode=private`.")
+        else:
+            # load at least once
+            await core.unified_manager.reload('remote', dont_wait=False)
+            await core.unified_manager.get_custom_nodes(channel_url, 'remote')
+
+    logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
 
     # NOTE: hide migration button temporarily.
     # if not core.get_config()['skip_migration_check']:
@@ -1437,3 +1667,4 @@ cm_global.register_extension('ComfyUI-Manager',
                                  'nodes': {},
                                  'description': 'This extension provides the ability to manage custom nodes in ComfyUI.', })
 
+

glob/manager_util.py

@@ -19,6 +19,14 @@ cache_lock = threading.Lock()
 comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
 
+use_uv = False
+
+def make_pip_cmd(cmd):
+    if use_uv:
+        return [sys.executable, '-m', 'uv', 'pip'] + cmd
+    else:
+        return [sys.executable, '-m', 'pip'] + cmd
+
 
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
@@ -122,7 +130,12 @@ async def get_data(uri, silent=False):
             with open(uri, "r", encoding="utf-8") as f:
                 json_text = f.read()
 
-    json_obj = json.loads(json_text)
+    try:
+        json_obj = json.loads(json_text)
+    except Exception as e:
+        logging.error(f"[ComfyUI-Manager] An error occurred while fetching '{uri}': {e}")
+
+        return {}
 
     if not silent:
         print(" [DONE]")
@@ -130,9 +143,34 @@ async def get_data(uri, silent=False):
     return json_obj
 
 
-async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
+def get_cache_path(uri):
     cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
-    cache_uri = os.path.join(cache_dir, cache_uri+'.json')
+    return os.path.join(cache_dir, cache_uri+'.json')
+
+
+def get_cache_state(uri):
+    cache_uri = get_cache_path(uri)
+
+    if not os.path.exists(cache_uri):
+        return "not-cached"
+    elif is_file_created_within_one_day(cache_uri):
+        return "cached"
+
+    return "expired"
+
+
+def save_to_cache(uri, json_obj, silent=False):
+    cache_uri = get_cache_path(uri)
+
+    with cache_lock:
+        with open(cache_uri, "w", encoding='utf-8') as file:
+            json.dump(json_obj, file, indent=4, sort_keys=True)
+            if not silent:
+                logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
+
+
+async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
+    cache_uri = get_cache_path(uri)
 
     if cache_mode and dont_wait:
         # NOTE: return the cache if possible, even if it is expired, so do not cache
@@ -154,7 +192,7 @@ async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=Fals
             with open(cache_uri, "w", encoding='utf-8') as file:
                 json.dump(json_obj, file, indent=4, sort_keys=True)
                 if not silent:
-                    print(f"[ComfyUI-Manager] default cache updated: {uri}")
+                    logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
 
     return json_obj
 
@@ -169,10 +207,10 @@ def extract_package_as_zip(file_path, extract_path):
         with zipfile.ZipFile(file_path, "r") as zip_ref:
             zip_ref.extractall(extract_path)
             extracted_files = zip_ref.namelist()
-        print(f"Extracted zip file to {extract_path}")
+        logging.info(f"Extracted zip file to {extract_path}")
         return extracted_files
     except zipfile.BadZipFile:
-        print(f"File '{file_path}' is not a zip or is corrupted.")
+        logging.error(f"File '{file_path}' is not a zip or is corrupted.")
         return None
 
 
@@ -184,7 +222,7 @@ def get_installed_packages(renew=False):
 
     if renew or pip_map is None:
         try:
-            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
+            result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)
 
             pip_map = {}
             for line in result.split('\n'):
@@ -196,7 +234,7 @@ def get_installed_packages(renew=False):
 
                     pip_map[y[0]] = y[1]
         except subprocess.CalledProcessError:
-            print("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
+            logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
             return set()
 
     return pip_map
@@ -207,21 +245,22 @@ def clear_pip_cache():
     pip_map = None
 
 
-torch_torchvision_version_map = {
-    '2.5.1': '0.20.1',
-    '2.5.0': '0.20.0',
-    '2.4.1': '0.19.1',
-    '2.4.0': '0.19.0',
-    '2.3.1': '0.18.1',
-    '2.3.0': '0.18.0',
-    '2.2.2': '0.17.2',
-    '2.2.1': '0.17.1',
-    '2.2.0': '0.17.0',
-    '2.1.2': '0.16.2',
-    '2.1.1': '0.16.1',
-    '2.1.0': '0.16.0',
-    '2.0.1': '0.15.2',
-    '2.0.0': '0.15.1',
+torch_torchvision_torchaudio_version_map = {
+    '2.6.0': ('0.21.0', '2.6.0'),
+    '2.5.1': ('0.20.0', '2.5.0'),
+    '2.5.0': ('0.20.0', '2.5.0'),
+    '2.4.1': ('0.19.1', '2.4.1'),
+    '2.4.0': ('0.19.0', '2.4.0'),
+    '2.3.1': ('0.18.1', '2.3.1'),
+    '2.3.0': ('0.18.0', '2.3.0'),
+    '2.2.2': ('0.17.2', '2.2.2'),
+    '2.2.1': ('0.17.1', '2.2.1'),
+    '2.2.0': ('0.17.0', '2.2.0'),
+    '2.1.2': ('0.16.2', '2.1.2'),
+    '2.1.1': ('0.16.1', '2.1.1'),
+    '2.1.0': ('0.16.0', '2.1.0'),
+    '2.0.1': ('0.15.2', '2.0.1'),
+    '2.0.0': ('0.15.1', '2.0.0'),
 }
 
 
@@ -234,25 +273,24 @@ class PIPFixer:
         if len(spec) > 0:
             platform = spec[1]
         else:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
+            cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
             subprocess.check_output(cmd, universal_newlines=True)
-            print(cmd)
+            logging.error(cmd)
             return
 
         torch_ver = StrictVersion(spec[0])
         torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
-        torchvision_ver = torch_torchvision_version_map.get(torch_ver)
+        torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
 
-        if torchvision_ver is None:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
-                   'torch', 'torchvision', 'torchaudio',
-                   '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
-            print("[manager-core] restore PyTorch to nightly version")
+        if torch_torchvision_torchaudio_ver is None:
+            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
+                                '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
+            logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
         else:
-            cmd = [sys.executable, '-m', 'pip', 'install',
-                   f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}",
-                   '--index-url', f"https://download.pytorch.org/whl/{platform}"]
-            print(f"[manager-core] restore PyTorch to {torch_ver}+{platform}")
+            torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
+            cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
+                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
+            logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
 
         subprocess.check_output(cmd, universal_newlines=True)
 
@@ -262,23 +300,25 @@ class PIPFixer:
         # remove `comfy` python package
         try:
             if 'comfy' in new_pip_versions:
-                cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
+                cmd = make_pip_cmd(['uninstall', 'comfy'])
                 subprocess.check_output(cmd, universal_newlines=True)
 
-                print("[manager-core] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
+                logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
         except Exception as e:
-            print("[manager-core] Failed to uninstall `comfy` python package")
-            print(e)
+            logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
+            logging.error(e)
 
         # fix torch - reinstall torch packages if version is changed
         try:
-            if self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
+            if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
+                logging.error("[ComfyUI-Manager] PyTorch is not installed")
+            elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
                 or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
                 or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
                     self.torch_rollback()
         except Exception as e:
-            print("[manager-core] Failed to restore PyTorch")
-            print(e)
+            logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
+            logging.error(e)
 
         # fix opencv
         try:
@@ -306,23 +346,24 @@ class PIPFixer:
 
                 if len(targets) > 0:
                     for x in targets:
-                        cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
+                        cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
                         subprocess.check_output(cmd, universal_newlines=True)
 
-                    print(f"[manager-core] 'opencv' dependencies were fixed: {targets}")
+                    logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
         except Exception as e:
-            print("[manager-core] Failed to restore opencv")
-            print(e)
+            logging.error("[ComfyUI-Manager] Failed to restore opencv")
+            logging.error(e)
 
         # fix numpy
         try:
             np = new_pip_versions.get('numpy')
             if np is not None:
                 if StrictVersion(np) >= StrictVersion('2'):
-                    subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
+                    cmd = make_pip_cmd(['install', "numpy<2"])
+                    subprocess.check_output(cmd , universal_newlines=True)
         except Exception as e:
-            print("[manager-core] Failed to restore numpy")
-            print(e)
+            logging.error("[ComfyUI-Manager] Failed to restore numpy")
+            logging.error(e)
 
 
 def sanitize(data):

js/comfyui-manager.js

@@ -13,11 +13,12 @@ import {
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import {
 	free_models, install_pip, install_via_git_url, manager_instance,
-	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js";
+	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";
 import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
-import { set_double_click_policy } from "./node_fixer.js";
 import { SnapshotManager } from "./snapshot.js";
 
 var docStyle = document.createElement('style');
@@ -41,7 +42,7 @@ docStyle.innerHTML = `
 
 #cm-manager-dialog {
 	width: 1000px;
-	height: 520px;
+	height: 450px;
 	box-sizing: content-box;
 	z-index: 1000;
 	overflow-y: auto;
@@ -138,7 +139,7 @@ docStyle.innerHTML = `
 
 .cm-notice-board {
 	width: 290px;
-	height: 270px;
+	height: 210px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -226,7 +227,11 @@ var update_comfyui_button = null;
 var switch_comfyui_button = null;
 var fetch_updates_button = null;
 var update_all_button = null;
+var restart_stop_button = null;
+
 let share_option = 'all';
+var is_updating_all = false;
+
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
 const style = `
@@ -425,102 +430,54 @@ async function init_notice(notice) {
 
 await init_share_option();
 
-async function fetchNicknames() {
-	const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
-	const mappings = await response1.json();
 
-	let result = {};
-	let nickname_patterns = [];
+async function set_inprogress_mode() {
+	update_comfyui_button.disabled = true;
+	update_comfyui_button.style.backgroundColor = "gray";
 
-	for (let i in mappings) {
-		let item = mappings[i];
-		var nickname;
-		if (item[1].nickname) {
-			nickname = item[1].nickname;
-		}
-		else if (item[1].title) {
-			nickname = item[1].title;
-		}
-		else {
-			nickname = item[1].title_aux;
-		}
+	update_all_button.disabled = true;
+	update_all_button.style.backgroundColor = "gray";
 
-		for (let j in item[0]) {
-			result[item[0][j]] = nickname;
-		}
+	switch_comfyui_button.disabled = true;
+	switch_comfyui_button.style.backgroundColor = "gray";
 
-		if(item[1].nodename_pattern) {
-			nickname_patterns.push([item[1].nodename_pattern, nickname]);
-		}
-	}
-
-	return [result, nickname_patterns];
+	restart_stop_button.innerText = 'Stop';
 }
 
-const [nicknames, nickname_patterns] = await fetchNicknames();
 
-function getNickname(node, nodename) {
-	if(node.nickname) {
-		return node.nickname;
+async function reset_action_buttons() {
+	const isElectron = 'electronAPI' in window;
+
+	if(isElectron) {
+		update_all_button.innerText = "Update All Custom Nodes";
 	}
 	else {
-		if (nicknames[nodename]) {
-			node.nickname = nicknames[nodename];
-		}
-		else if(node.getInnerNodes) {
-			let pure_name = getPureName(node);
-			let groupNode = app.graph.extra?.groupNodes?.[pure_name];
-			if(groupNode) {
-				let packname = groupNode.packname;
-				node.nickname = packname;
-			}
-			return node.nickname;
-		}
-		else {
-			for(let i in nickname_patterns) {
-				let item = nickname_patterns[i];
-				if(nodename.match(item[0])) {
-					node.nickname = item[1];
-				}
-			}
-		}
-
-		return node.nickname;
+		update_all_button.innerText = "Update All";
 	}
+
+	update_comfyui_button.innerText = "Update ComfyUI";
+	switch_comfyui_button.innerText = "Switch ComfyUI";
+	restart_stop_button.innerText = 'Restart';
+
+	update_comfyui_button.disabled = false;
+	update_all_button.disabled = false;
+	switch_comfyui_button.disabled = false;
+
+	update_comfyui_button.style.backgroundColor = "";
+	update_all_button.style.backgroundColor = "";
+	switch_comfyui_button.style.backgroundColor = "";
 }
 
 async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
-	update_comfyui_button.disabled = true;
-	update_comfyui_button.style.backgroundColor = "gray";
 
-	try {
-		const response = await api.fetchApi('/comfyui_manager/update_comfyui');
+	set_inprogress_mode();
 
-		if (response.status == 400) {
-			show_message('Failed to update ComfyUI.');
-			return false;
-		}
+	const response = await api.fetchApi('/manager/queue/update_comfyui');
 
-		if (response.status == 201) {
-			show_message('ComfyUI has been successfully updated.');
-		}
-		else {
-			show_message('ComfyUI is already up to date with the latest version.');
-		}
-
-		return true;
-	}
-	catch (exception) {
-		show_message(`Failed to update ComfyUI / ${exception}`);
-		return false;
-	}
-	finally {
-		update_comfyui_button.disabled = false;
-		update_comfyui_button.innerText = prev_text;
-		update_comfyui_button.style.backgroundColor = "";
-	}
+	showTerminal();
+	await api.fetchApi('/manager/queue/start');
 }
 
 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -648,26 +605,32 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 }
 
 async function switchComfyUI() {
-    let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
+	let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
 
-    if(res.status == 200) {
-        let obj = await res.json();
+	if(res.status == 200) {
+		let obj = await res.json();
 
-        let versions = [];
-        let default_version;
+		let versions = [];
+		let default_version;
 
-        for(let v of obj.versions) {
-            default_version = v;
-            versions.push(v);
-        }
+		for(let v of obj.versions) {
+			default_version = v;
+			versions.push(v);
+		}
 
-        showVersionSelectorDialog(versions, obj.current, (selected_version) => {
-            api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
-        });
-    }
-    else {
-        show_message('Failed to fetch ComfyUI versions.');
-    }
+		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
+			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
+			if (response.status == 200) {
+				infoToast(`ComfyUI version is switched to ${selected_version}`);
+			}
+			else {
+				customAlert('Failed to switch ComfyUI version.');
+			}
+		});
+	}
+	else {
+		customAlert('Failed to fetch ComfyUI versions.');
+	}
 }
 
 
@@ -721,70 +684,121 @@ async function fetchUpdates(update_check_checkbox) {
 	}
 }
 
-async function updateAll(update_check_checkbox, manager_dialog) {
-	let prev_text = update_all_button.innerText;
-	update_all_button.innerText = "Updating all...(ComfyUI)";
-	update_all_button.disabled = true;
-	update_all_button.style.backgroundColor = "gray";
+async function onQueueStatus(event) {
+	const isElectron = 'electronAPI' in window;
 
-	try {
-		var mode = manager_instance.datasrc_combo.value;
+	if(event.detail.status == 'in_progress') {
+		set_inprogress_mode();
+		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
+	}
+	else if(event.detail.status == 'done') {
+		reset_action_buttons();
 
-		update_all_button.innerText = "Updating all...";
-		const response1 = await api.fetchApi('/comfyui_manager/update_comfyui');
-		const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
-
-		if (response2.status == 403) {
-			show_message('This action is not allowed with this security level configuration.');
-			return false;
+		if(!is_updating_all)  {
+			return;
 		}
 
-		if (response1.status == 400 || response2.status == 400) {
-			show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
-			return false;
+		is_updating_all = false;
+
+		let success_list = [];
+		let failed_list = [];
+		let comfyui_state = null;
+
+		for(let k in event.detail.nodepack_result){
+			let v = event.detail.nodepack_result[k];
+
+			if(v == 'success') {
+				if(k == 'comfyui')
+					comfyui_state = 'success';
+				else
+					success_list.push(k);
+			}
+			else if(v == 'skip') {
+				if(k == 'comfyui')
+					comfyui_state = 'skip';
+			}
+			else
+				failed_list.push(k);
 		}
 
-		if(response1.status == 201 || response2.status == 201) {
-			const update_info = await response2.json();
-
-			let failed_list = "";
-			if(update_info.failed.length > 0) {
-				failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
+		let msg = "";
+		
+		if(success_list.length == 0 && comfyui_state != 'success') {
+			if(failed_list.length == 0) {
+				msg += "All custom nodes are already up to date.";
 			}
-
-			let updated_list = "";
-			if(update_info.updated.length > 0) {
-				updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
-			}
-
-			show_message(
-				"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
-				+failed_list
-				+updated_list
-				);
-
-			const rebootButton = document.getElementById('cm-reboot-button5');
-			rebootButton.addEventListener("click",
-				function() {
-					if(rebootAPI()) {
-						manager_dialog.close();
-					}
-				});
 		}
 		else {
-			show_message('ComfyUI and all extensions are already up-to-date with the latest versions.');
+			msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
+
+			if(comfyui_state == 'success') {
+				msg += "ComfyUI is updated.<BR><BR>";
+			}
+			else if(comfyui_state == 'skip') {
+				msg += "ComfyUI is already up-to-date.<BR><BR>"
+			}
+
+			if(success_list.length > 0) {
+				msg += "The following custom nodes have been updated:<ul>";
+				for(let x in success_list) {
+					if(success_list[x] == 'comfyui')
+						continue;
+
+					msg += '<li>'+success_list[x]+'</li>';
+				}
+				msg += "</ul>";
+			}
+
+			setNeedRestart(true);
+		}
+		
+		if(failed_list.length > 0) {
+			msg += '<br>The update for the following custom nodes has failed:<ul>';
+			for(let x in failed_list) {
+				msg += '<li>'+failed_list[x]+'</li>';
+			}
+
+			msg += '</ul>'
 		}
 
-		return true;
+		show_message(msg);
+
+		const rebootButton = document.getElementById('cm-reboot-button5');
+		rebootButton?.addEventListener("click",
+			function() {
+				if(rebootAPI()) {
+					manager_dialog.close();
+				}
+			});
 	}
-	catch (exception) {
-		show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
-		return false;
+}
+
+api.addEventListener("cm-queue-status", onQueueStatus);
+
+
+async function updateAll(update_comfyui, manager_dialog) {
+	let prev_text = update_all_button.innerText;
+	update_all_button.innerText = "Updating...";
+
+	set_inprogress_mode();
+
+	var mode = manager_instance.datasrc_combo.value;
+
+	showTerminal();
+
+	if(update_comfyui) {
+		update_all_button.innerText = "Updating ComfyUI...";
+		await api.fetchApi('/manager/queue/update_comfyui');
 	}
-	finally {
-		update_all_button.disabled = false;
-		update_all_button.innerText = prev_text;
-		update_all_button.style.backgroundColor = "";
+
+	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
+
+	if (response.status == 401) {
+		customAlert('Another task is already in progress. Please stop the ongoing task first.');
+	}
+	else if(response.status == 200) {
+		is_updating_all = true;
+		await api.fetchApi('/manager/queue/start');
 	}
 }
 
@@ -808,15 +822,29 @@ const isOutputNode = (node) => {
 	return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
 }
 
+function restartOrStop() {
+	if(restart_stop_button.innerText == 'Restart'){
+		rebootAPI();
+	}
+	else {
+		api.fetchApi('/manager/queue/reset');
+		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
+	}
+}
+
 // -----------
 class ManagerMenuDialog extends ComfyDialog {
 	createControlsMid() {
 		let self = this;
-
+		const isElectron = 'electronAPI' in window;
+		
 		update_comfyui_button =
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Update ComfyUI",
+				style: {
+					display: isElectron ? 'none' : 'block'
+				},
 				onclick:
 					() => updateComfyUI()
 			});
@@ -825,6 +853,9 @@ class ManagerMenuDialog extends ComfyDialog {
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Switch ComfyUI",
+				style: {
+					display: isElectron ? 'none' : 'block'
+				},
 				onclick:
 					() => switchComfyUI()
 			});
@@ -837,14 +868,32 @@ class ManagerMenuDialog extends ComfyDialog {
 					() => fetchUpdates(this.update_check_checkbox)
 			});
 
-		update_all_button =
-			$el("button.cm-button", {
+		restart_stop_button =
+			$el("button.cm-button-red", {
 				type: "button",
-				textContent: "Update All",
-				onclick:
-					() => updateAll(this.update_check_checkbox, self)
+				textContent: "Restart",
+				onclick: () => restartOrStop()
 			});
 
+		if(isElectron) {
+			update_all_button =
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Update All Custom Nodes",
+					onclick:
+						() => updateAll(false, self)
+				});
+		}
+		else {
+			update_all_button =
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Update All",
+					onclick:
+						() => updateAll(true, self)
+				});
+		}
+
 		const res =
 			[
 				$el("button.cm-button", {
@@ -903,24 +952,7 @@ class ManagerMenuDialog extends ComfyDialog {
 				fetch_updates_button,
 
 				$el("br", {}, []),
-				$el("button.cm-button", {
-					type: "button",
-					textContent: "Alternatives of A1111",
-					onclick:
-						() => {
-							if(!CustomNodesManager.instance) {
-								CustomNodesManager.instance = new CustomNodesManager(app, self);
-							}
-							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
-						}
-				}),
-
-				$el("br", {}, []),
-				$el("button.cm-button-red", {
-					type: "button",
-					textContent: "Restart",
-					onclick: () => rebootAPI()
-				}),
+				restart_stop_button,
 			];
 
 		let migration_btn =
@@ -1009,21 +1041,6 @@ class ManagerMenuDialog extends ComfyDialog {
 				}
 			});
 
-		// default ui state
-		let default_ui_combo = document.createElement("select");
-		default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
-		default_ui_combo.className = "cm-menu-combo";
-		default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
-		api.fetchApi('/manager/default_ui')
-			.then(response => response.text())
-			.then(data => { default_ui_combo.value = data; });
-
-		default_ui_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
-		});
-
 
 		// share
 		let share_combo = document.createElement("select");
@@ -1061,28 +1078,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			set_component_policy(event.target.value);
 		});
 
-		let dbl_click_policy_combo = document.createElement("select");
-		dbl_click_policy_combo.setAttribute("title", "Sets the behavior when you double-click the title area of a node.");
-		dbl_click_policy_combo.className = "cm-menu-combo";
-		dbl_click_policy_combo.appendChild($el('option', { value: 'none', text: 'Double-Click: None' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-all', text: 'Double-Click: Copy All Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-full', text: 'Double-Click: Copy All Connections and shape' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-input', text: 'Double-Click: Copy Input Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'possible-input', text: 'Double-Click: Possible Input Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'dual', text: 'Double-Click: Possible(left) + Copy(right)' }, []));
-
-		api.fetchApi('/manager/dbl_click/policy')
-			.then(response => response.text())
-			.then(data => {
-				dbl_click_policy_combo.value = data;
-				set_double_click_policy(data);
-			});
-
-		dbl_click_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/dbl_click/policy?value=${event.target.value}`);
-			set_double_click_policy(event.target.value);
-		});
-
 		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
@@ -1108,10 +1103,8 @@ class ManagerMenuDialog extends ComfyDialog {
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
-			default_ui_combo,
 			share_combo,
 			component_policy_combo,
-			dbl_click_policy_combo,
 			$el("br", {}, []),
 
 			$el("br", {}, []),
@@ -1292,10 +1285,22 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
 	}
 
+	get isVisible() {
+		return this.element?.style?.display !== "none";
+	}
+
 	show() {
 		this.element.style.display = "block";
 	}
 
+	toggleVisibility() {
+		if (this.isVisible) {
+			this.close();
+		} else {
+			this.show();
+		}
+	}
+
 	handleWorkflowGalleryButtonClick(e) {
 		e.preventDefault();
 		e.stopPropagation();
@@ -1413,6 +1418,41 @@ app.registerExtension({
 		}
 	],
 
+	commands: [
+	{
+		id: "Comfy.Manager.Menu.ToggleVisibility",
+		label: "Toggle Manager Menu Visibility",
+		icon: "mdi mdi-puzzle",
+		function: () => {
+			if (!manager_instance) {
+				setManagerInstance(new ManagerMenuDialog());
+				manager_instance.show();
+			} else {
+				manager_instance.toggleVisibility();
+			}
+		},
+	},
+	{
+		id: "Comfy.Manager.CustomNodesManager.ToggleVisibility",
+		label: "Toggle Custom Nodes Manager Visibility",
+		icon: "pi pi-server",
+		function: () => {
+			if (CustomNodesManager.instance?.isVisible) {
+				CustomNodesManager.instance.close();
+				return;
+			}
+
+			if (!manager_instance) {
+				setManagerInstance(new ManagerMenuDialog());
+			}
+			if (!CustomNodesManager.instance) {
+				CustomNodesManager.instance = new CustomNodesManager(app, self);
+			}
+			CustomNodesManager.instance.show(CustomNodesManager.ShowMode.NORMAL);
+		},
+	}
+	],
+
 	init() {
 		$el("style", {
 			textContent: style,
@@ -1607,27 +1647,3 @@ app.registerExtension({
 		}
 	},
 });
-
-
-async function set_default_ui()
-{
-	let res = await api.fetchApi('/manager/default_ui');
-	if(res.status == 200) {
-		let mode = await res.text();
-		switch(mode) {
-		case 'history':
-			app.ui.queue.hide();
-			app.ui.history.show();
-			break;
-		case 'queue':
-			app.ui.queue.show();
-			app.ui.history.hide();
-			break;
-		default:
-			// do nothing
-			break;
-		}
-	}
-}
-
-set_default_ui();

js/common.js

@@ -130,6 +130,20 @@ export function customAlert(message) {
 	}
 }
 
+export function infoToast(summary, message) {
+	try {
+		app.extensionManager.toast.add({
+			severity: 'info',
+			summary: summary,
+			detail: message,
+			life: 3000
+		})
+	}
+	catch {
+		// do nothing
+	}
+}
+
 
 export async function customPrompt(title, message) {
 	try {
@@ -397,3 +411,95 @@ export const icons = {
 	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>'
 }
+
+export function sanitizeHTML(str) {
+	return str
+		.replace(/&/g, "&amp;")
+		.replace(/</g, "&lt;")
+		.replace(/>/g, "&gt;")
+		.replace(/"/g, "&quot;")
+		.replace(/'/g, "&#039;");
+}
+
+export function showTerminal() {
+	try {
+		const panel = app.extensionManager.bottomPanel;
+		const isTerminalVisible = panel.bottomPanelVisible && panel.activeBottomPanelTab.id === 'logs-terminal';
+		if (!isTerminalVisible)
+			panel.toggleBottomPanelTab('logs-terminal');
+	}
+	catch(exception) {
+		// do nothing
+	}
+}
+
+let need_restart = false;
+
+export function setNeedRestart(value) {
+	need_restart = value;
+}
+
+async function onReconnected(event) {
+	if(need_restart) {
+		setNeedRestart(false);
+
+		const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
+		if (!confirmed) {
+			return;
+		}
+
+		window.location.reload(true);
+	}
+}
+
+api.addEventListener('reconnected', onReconnected);
+
+const storeId = "comfyui-manager-grid";
+let timeId;
+export function storeColumnWidth(gridId, columnItem) {
+	clearTimeout(timeId);
+	timeId = setTimeout(() => {
+		let data = {};
+		const dataStr = localStorage.getItem(storeId);
+		if (dataStr) {
+			try {
+				data = JSON.parse(dataStr);
+			} catch (e) {}
+		}
+
+		if (!data[gridId]) {
+			data[gridId] =  {};
+		}
+
+		data[gridId][columnItem.id] = columnItem.width;
+
+		localStorage.setItem(storeId, JSON.stringify(data));
+
+	}, 200)
+}
+
+export function restoreColumnWidth(gridId, columns) {
+	const dataStr = localStorage.getItem(storeId);
+	if (!dataStr) {
+		return;
+	}
+	let data;
+	try {
+		data = JSON.parse(dataStr);
+	} catch (e) {}
+	if(!data) {
+		return;
+	}
+	const widthMap = data[gridId];
+	if (!widthMap) {
+		return;
+	}
+
+	columns.forEach(columnItem => {
+		const w = widthMap[columnItem.id];
+		if (w) {
+			columnItem.width = w;
+		}
+	});
+
+}

js/custom-nodes-manager.js

@@ -4,12 +4,16 @@ import { api } from "../../scripts/api.js";
 
 import {
 	manager_instance, rebootAPI, install_via_git_url,
-	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt
+	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
+	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
 
+const gridId = "node";
+
 const pageCss = `
 .cn-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -55,6 +59,12 @@ const pageCss = `
 	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;
@@ -250,6 +260,13 @@ const pageCss = `
 	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;
@@ -337,13 +354,14 @@ const pageHtml = `
 <div class="cn-manager-selection"></div>
 <div class="cn-manager-message"></div>
 <div class="cn-manager-footer">
-<button class="cn-manager-back">
-    <svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    </svg>
-    Back
-</button>
+	<button class="cn-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
 	<button class="cn-manager-restart">Restart</button>
+	<button class="cn-manager-stop">Stop</button>
 	<div class="cn-flex-auto"></div>
 	<button class="cn-manager-check-update">Check Update</button>
 	<button class="cn-manager-check-missing">Check Missing</button>
@@ -384,6 +402,8 @@ export class CustomNodesManager {
 		this.restartMap = {};
 
 		this.init();
+
+        api.addEventListener("cm-queue-status", this.onQueueStatus);
 	}
 
 	init() {
@@ -746,10 +766,16 @@ export class CustomNodesManager {
 
 			".cn-manager-restart": {
 				click: () => {
-					if(rebootAPI()) {
-						this.close();
-						this.manager_dialog.close();
-					}
+					this.close();
+					this.manager_dialog.close();
+					rebootAPI();
+				}
+			},
+
+			".cn-manager-stop": {
+				click: () => {
+					api.fetchApi('/manager/queue/reset');
+					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
 
@@ -809,6 +835,10 @@ export class CustomNodesManager {
 			this.renderSelected();
 		});
 
+		grid.bind("onColumnWidthChanged", (e, columnItem) => {
+			storeColumnWidth(gridId, columnItem)
+		});
+
 		grid.bind('onClick', (e, d) => {
 			const btn = this.getButton(d.e.target);
 			if (btn) {
@@ -872,6 +902,38 @@ export class CustomNodesManager {
 		return this.filter === ShowMode.ALTERNATIVES
 	}
 
+	async handleImportFail(rowItem) {
+		var info;
+		if(rowItem.version == 'unknown'){
+			info = {
+				'url': rowItem.originalData.files[0]
+			};
+		}
+		else{
+			info = {
+				'cnr_id': rowItem.originalData.id
+			};
+		}
+
+		const response = await api.fetchApi(`/customnode/import_fail_info`, {
+									method: 'POST',
+									headers: { 'Content-Type': 'application/json' },
+									body: JSON.stringify(info)
+								});
+
+		let res = await response.json();
+
+		let title = `<FONT COLOR=GREEN><B>Error message occurred while importing the '${rowItem.title}' module.</B></FONT><BR><HR><BR>`
+
+		if(res.code == 400)
+		{
+			show_message(title+'The information is not available.')
+		}
+		else {
+			show_message(title+sanitizeHTML(res['msg']).replace(/ /g, '&nbsp;').replace(/\n/g, '<BR>'));
+		}
+	}
+
 	renderGrid() {
 
 		// update theme
@@ -905,6 +967,7 @@ export class CustomNodesManager {
 			}
 		}
 
+		let self = this;
 		const columns = [{
 			id: 'id',
 			name: 'ID',
@@ -918,16 +981,32 @@ export class CustomNodesManager {
 			maxWidth: 500,
 			classMap: 'cn-node-name',
 			formatter: (title, rowItem, columnItem) => {
-			    var prefix = '';
-			    if(rowItem.action === 'invalid-installation') {
-			        prefix = '<font color="red"><B>(INVALID)</B></font>';
-			    }
+				const container = document.createElement('div');
 
-			    else if(rowItem.action === 'import-fail') {
-			        prefix = '<font color="red"><B>(IMPORT FAILED)</B></font>';
-			    }
+				if (rowItem.action === 'invalid-installation') {
+					const invalidTag = document.createElement('span');
+					invalidTag.style.color = 'red';
+					invalidTag.innerHTML = '<b>(INVALID)</b>';
+					container.appendChild(invalidTag);
+				} else if (rowItem.action === 'import-fail') {
+					const button = document.createElement('button');
+					button.className = 'cn-btn-import-failed';
+					button.innerText = 'IMPORT FAILED ↗';
+					button.onclick = () => self.handleImportFail(rowItem);
+					container.appendChild(button);
+					container.appendChild(document.createElement('br'));
+				}
 
-				return `${prefix}<a href=${rowItem.reference} target="_blank"><b>${title}</b></a>`;
+				const link = document.createElement('a');
+				if(rowItem.originalData.repository)
+					link.href = rowItem.originalData.repository;
+				else
+					link.href = rowItem.reference;
+				link.target = '_blank';
+				link.innerHTML = `<b>${title}</b>`;
+				container.appendChild(link);
+
+				return container;
 			}
 		}, {
 			id: 'version',
@@ -1087,6 +1166,8 @@ export class CustomNodesManager {
 				return 0;
 			});
 
+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options: options,
 			rows: rows_values,
@@ -1148,7 +1229,7 @@ export class CustomNodesManager {
 	}
 
 	focusInstall(item, mode) {
-		const cellNode = this.grid.getCellNode(item, "installed");
+		const cellNode = this.grid.getCellNode(item, "action");
 		if (cellNode) {
 			const cellBtn = cellNode.querySelector(`button[mode="${mode}"]`);
 			if (cellBtn) {
@@ -1213,6 +1294,13 @@ export class CustomNodesManager {
 	}
 
 	async installNodes(list, btn, title, selected_version) {
+		let stats = await api.fetchApi('/manager/queue/status');
+		stats = await stats.json();
+		if(stats.is_processing) {
+			customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
+			return;
+		}
+
 		const { target, label, mode} = btn;
 
 		if(mode === "uninstall") {
@@ -1238,8 +1326,15 @@ export class CustomNodesManager {
 
 		let needRestart = false;
 		let errorMsg = "";
+
+		await api.fetchApi('/manager/queue/reset');
+
+		let target_items = [];
+
 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
+			target_items.push(item);
+
 			if (!item) {
 				errorMsg = `Not found custom node: ${hash}`;
 				break;
@@ -1259,6 +1354,7 @@ export class CustomNodesManager {
 			data.selected_version = selected_version;
 			data.channel = this.channel;
 			data.mode = this.mode;
+			data.ui_id = hash;
 
 			let install_mode = mode;
 			if(mode == 'switch') {
@@ -1276,50 +1372,105 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}
 
-			const res = await api.fetchApi(`/customnode/${api_mode}`, {
+			const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
 				method: 'POST',
 				body: JSON.stringify(data)
 			});
 
 			if (res.status != 200) {
+				errorMsg = `'${item.title}': `;
 
-				errorMsg = `${item.title} ${mode} failed: `;
 				if(res.status == 403) {
-					errorMsg += `This action is not allowed with this security level configuration.`;
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
 				} else if(res.status == 404) {
-					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.`;
+					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.\n`;
 				} else {
-					errorMsg += await res.text();
+					errorMsg += await res.text() + '\n';
 				}
 
 				break;
 			}
-
-			needRestart = true;
-
-			this.grid.setRowSelected(item, false);
-			item.restart = true;
-			this.restartMap[item.hash] = true;
-			this.grid.updateCell(item, "action");
-
-			//console.log(res.data);
-
 		}
 
+		this.install_context = {btn: btn, targets: target_items};
+
+		if(errorMsg) {
+			this.showError(errorMsg);
+			show_message("[Installation Errors]\n"+errorMsg);
+
+			// reset
+			for(let k in target_items) {
+				const item = target_items[k];
+				this.grid.updateCell(item, "action");
+			}
+		}
+		else {
+			await api.fetchApi('/manager/queue/start');
+			this.showStop();
+			showTerminal();
+		}
+	}
+
+	async onQueueStatus(event) {
+		let self = CustomNodesManager.instance;
+		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
+			const hash = event.detail.target;
+
+			const item = self.grid.getRowItemBy("hash", hash);
+
+			item.restart = true;
+			self.restartMap[item.hash] = true;
+			self.grid.updateCell(item, "action");
+			self.grid.setRowSelected(item, false);
+		}
+		else if(event.detail.status == 'done') {
+			self.hideStop();
+			self.onQueueCompleted(event.detail);
+		}
+	}
+
+	async onQueueCompleted(info) {
+		let result = info.nodepack_result;
+
+		if(result.length == 0) {
+			return;
+		}
+
+		let self = CustomNodesManager.instance;
+
+		if(!self.install_context) {
+			return;
+		}
+
+		const { target, label, mode } = self.install_context.btn;
 		target.classList.remove("cn-btn-loading");
 
+		let errorMsg = "";
+
+		for(let hash in result){
+			let v = result[hash];
+
+			if(v != 'success' && v != 'skip')
+				errorMsg += v+'\n';
+		}
+
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "action");
+		}
+
 		if (errorMsg) {
-			this.showError(errorMsg);
+			self.showError(errorMsg);
 			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			this.showStatus(`${label} ${list.length} custom node(s) successfully`);
+			self.showStatus(`${label} ${result.length} custom node(s) successfully`);
 		}
 
-		if (needRestart) {
-			this.showRestart();
-			this.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red")
-		}
+		self.showRestart();
+		self.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red");
 
+		infoToast(`[ComfyUI-Manager] All node pack tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
+		self.install_context = undefined;
 	}
 
 	// ===========================================================================================
@@ -1514,6 +1665,8 @@ export class CustomNodesManager {
 	}
 
 	async loadData(show_mode = ShowMode.NORMAL) {
+		const isElectron = 'electronAPI' in window;
+
 		this.show_mode = show_mode;
 		console.log("Show mode:", show_mode);
 
@@ -1533,6 +1686,11 @@ export class CustomNodesManager {
 		}
 		
 		const { channel, node_packs } = res.data;
+
+		if(isElectron) {
+			delete node_packs['comfyui-manager'];
+		}
+
 		this.channel = channel;
 		this.mode = mode;
 		this.custom_nodes = node_packs;
@@ -1700,9 +1858,9 @@ export class CustomNodesManager {
 	}
 
 	setDisabled(disabled) {
-
 		const $close = this.element.querySelector(".cn-manager-close");
 		const $restart = this.element.querySelector(".cn-manager-restart");
+		const $stop = this.element.querySelector(".cn-manager-stop");
 
 		const list = [
 			".cn-manager-header input",
@@ -1714,7 +1872,7 @@ export class CustomNodesManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close && it !== $restart;
+			return it !== $close && it !== $restart && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -1733,6 +1891,15 @@ export class CustomNodesManager {
 
 	showRestart() {
 		this.element.querySelector(".cn-manager-restart").style.display = "block";
+		setNeedRestart(true);
+	}
+
+	showStop() {
+		this.element.querySelector(".cn-manager-stop").style.display = "block";
+	}
+
+	hideStop() {
+		this.element.querySelector(".cn-manager-stop").style.display = "none";
 	}
 
 	setFilter(filterValue) {
@@ -1762,4 +1929,8 @@ export class CustomNodesManager {
 	close() {
 		this.element.style.display = "none";
 	}
+
+	get isVisible() {
+		return this.element?.style?.display !== "none";
+	}
 }

js/model-manager.js

@@ -1,12 +1,17 @@
+import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
-	fetchData, md5, icons 
+	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
+import { api } from "../../scripts/api.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
 
+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";
@@ -46,6 +51,18 @@ const pageCss = `
 	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;
@@ -235,7 +252,14 @@ const pageHtml = `
 <div class="cmm-manager-selection"></div>
 <div class="cmm-manager-message"></div>
 <div class="cmm-manager-footer">
-	<button class="cmm-manager-back">Back</button>
+	<button class="cmm-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
+	<button class="cmm-manager-refresh">Refresh</button>
+	<button class="cmm-manager-stop">Stop</button>
 	<div class="cmm-flex-auto"></div>
 </div>
 `;
@@ -254,6 +278,8 @@ export class ModelManager {
 		this.keywords = '';
 
 		this.init();
+
+		api.addEventListener("cm-queue-status", this.onQueueStatus);
 	}
 
 	init() {
@@ -365,12 +391,25 @@ export class ModelManager {
 				}
 			},
 
+			".cmm-manager-refresh": {
+				click: () => {
+					app.refreshComboInNodes();
+				}
+			},
+
+			".cmm-manager-stop": {
+				click: () => {
+					api.fetchApi('/manager/queue/reset');
+					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
+				}
+			},
+
 			".cmm-manager-back": {
 				click: (e) => {
 				    this.close()
 				    manager_instance.show();
 				}
-			},
+			}
 		};
 		Object.keys(eventsMap).forEach(selector => {
 			const target = this.element.querySelector(selector);
@@ -402,6 +441,10 @@ export class ModelManager {
             this.renderSelected();
         });
 
+		grid.bind("onColumnWidthChanged", (e, columnItem) => {
+			storeColumnWidth(gridId, columnItem)
+		});
+
 		grid.bind('onClick', (e, d) => {
 			const { rowItem } = d;
 			const target = d.e.target;
@@ -553,6 +596,8 @@ export class ModelManager {
 			width: 200
 		}];
 
+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options,
 			rows,
@@ -595,17 +640,27 @@ export class ModelManager {
 	}
 
 	async installModels(list, btn) {
-		
+		let stats = await api.fetchApi('/manager/queue/status');
+
+		stats = await stats.json();
+		if(stats.is_processing) {
+			customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
+			return;
+		}
+
 		btn.classList.add("cmm-btn-loading");
-		this.showLoading();
 		this.showError("");
 
-		let needRestart = false;
+		let needRefresh = false;
 		let errorMsg = "";
 
+		await api.fetchApi('/manager/queue/reset');
+
+		let target_items = [];
+
 		for (const item of list) {
-			
 			this.grid.scrollRowIntoView(item);
+			target_items.push(item);
 
 			if (!this.focusInstall(item)) {
 				this.grid.onNextUpdated(() => {
@@ -616,48 +671,112 @@ export class ModelManager {
 			this.showStatus(`Install ${item.name} ...`);
 
 			const data = item.originalData;
-			const res = await fetchData('/model/install', {
+			data.ui_id = item.hash;
+
+			const res = await api.fetchApi(`/manager/queue/install_model`, {
 				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify(data)
 			});
 
+			if (res.status != 200) {
+				errorMsg = `'${item.name}': `;
 
-			if (res.error) {
-				errorMsg = `Install failed: ${item.name} ${res.error.message}`;
-				break;;
+				if(res.status == 403) {
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
+		}
 
-			needRestart = true;
+		this.install_context = {btn: btn, targets: target_items};
 
-			this.grid.setRowSelected(item, false);
+		if(errorMsg) {
+			this.showError(errorMsg);
+			show_message("[Installation Errors]\n"+errorMsg);
+
+			// reset
+			for(let k in target_items) {
+				const item = target_items[k];
+				this.grid.updateCell(item, "installed");
+			}
+		}
+		else {
+			await api.fetchApi('/manager/queue/start');
+			this.showStop();
+			showTerminal();
+		}
+	}
+
+	async onQueueStatus(event) {
+		let self = ModelManager.instance;
+
+		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'model_manager') {
+			const hash = event.detail.target;
+
+			const item = self.grid.getRowItemBy("hash", hash);
 
 			item.refresh = true;
+			self.grid.setRowSelected(item, false);
 			item.selectable = false;
-			this.grid.updateCell(item, "installed");
-			this.grid.updateCell(item, "tg-column-select");
+//			self.grid.updateCell(item, "tg-column-select");
+			self.grid.updateRow(item);
+		}
+		else if(event.detail.status == 'done') {
+			self.hideStop();
+			self.onQueueCompleted(event.detail);
+		}
+	}
 
-			this.showStatus(`Install ${item.name} successfully`);
+	async onQueueCompleted(info) {
+		let result = info.model_result;
 
+		if(result.length == 0) {
+			return;
 		}
 
-		this.hideLoading();
+		let self = ModelManager.instance;
+
+		if(!self.install_context) {
+			return;
+		}
+
+		let btn = self.install_context.btn;
+
+		self.hideLoading();
 		btn.classList.remove("cmm-btn-loading");
 
+		let errorMsg = "";
+
+		for(let hash in result){
+			let v = result[hash];
+
+			if(v != 'success')
+				errorMsg += v + '\n';
+		}
+
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "installed");
+		}
+
 		if (errorMsg) {
-			this.showError(errorMsg);
+			self.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			this.showStatus(`Install ${list.length} models successfully`);
+			self.showStatus(`Install ${result.length} models successfully`);
 		}
 
-		if (needRestart) {
-			this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red")
-		}
+		self.showRefresh();
+		self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red")
 
+		infoToast('Tasks done', `[ComfyUI-Manager] All model downloading tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
+		self.install_context = undefined;
 	}
 
 	getModelList(models) {
-
 		const typeMap = new Map();
 		const baseMap = new Map();
 
@@ -826,7 +945,7 @@ export class ModelManager {
 	}
 
 	showLoading() {
-		this.setDisabled(true);
+//		this.setDisabled(true);
 		if (this.grid) {
 			this.grid.showLoading();
 			this.grid.showMask({
@@ -836,7 +955,7 @@ export class ModelManager {
 	}
 
 	hideLoading() {
-		this.setDisabled(false);
+//		this.setDisabled(false);
 		if (this.grid) {
 			this.grid.hideLoading();
 			this.grid.hideMask();
@@ -844,8 +963,9 @@ export class ModelManager {
 	}
 
 	setDisabled(disabled) {
-
 		const $close = this.element.querySelector(".cmm-manager-close");
+		const $refresh = this.element.querySelector(".cmm-manager-refresh");
+		const $stop = this.element.querySelector(".cmm-manager-stop");
 
 		const list = [
 			".cmm-manager-header input",
@@ -857,7 +977,7 @@ export class ModelManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close;
+			return it !== $close && it !== $refresh && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -874,6 +994,18 @@ export class ModelManager {
 
 	}
 
+	showRefresh() {
+		this.element.querySelector(".cmm-manager-refresh").style.display = "block";
+	}
+
+	showStop() {
+		this.element.querySelector(".cmm-manager-stop").style.display = "block";
+	}
+
+	hideStop() {
+		this.element.querySelector(".cmm-manager-stop").style.display = "none";
+	}
+
 	setKeywords(keywords = "") {
 		this.keywords = keywords;
 		this.element.querySelector(".cmm-manager-keywords").value = keywords;

js/node_fixer.js

@@ -1,16 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 
-let double_click_policy = "copy-all";
-
-api.fetchApi('/manager/dbl_click/policy')
-	.then(response => response.text())
-	.then(data => set_double_click_policy(data));
-
-export function set_double_click_policy(mode) {
-	double_click_policy = mode;
-}
-
 function addMenuHandler(nodeType, cb) {
 	const getOpts = nodeType.prototype.getExtraMenuOptions;
 	nodeType.prototype.getExtraMenuOptions = function () {
@@ -153,62 +143,6 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
 
 app.registerExtension({
 	name: "Comfy.Manager.NodeFixer",
-
-	async nodeCreated(node, app) {
-		let orig_dblClick = node.onDblClick;
-		node.onDblClick = function (e, pos, self) {
-			orig_dblClick?.apply?.(this, arguments);
-
-			if((!node.inputs && !node.outputs) || pos[1] > 0)
-				return;
-
-			switch(double_click_policy) {
-				case "copy-all":
-				case "copy-full":
-				case "copy-input":
-					{
-						if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
-							return;
-
-						let src_node = lookup_nearest_nodes(node);
-						if(src_node)
-						{
-							let both_connection = double_click_policy != "copy-input";
-							let copy_shape = double_click_policy == "copy-full";
-							node_info_copy(src_node, node, both_connection, copy_shape);
-						}
-					}
-					break;
-				case "possible-input":
-					{
-						let nearest_inputs = lookup_nearest_inputs(node);
-						if(nearest_inputs)
-							connect_inputs(nearest_inputs, node);
-					}
-					break;
-				case "dual":
-					{
-						if(pos[0] < node.size[0]/2) {
-							// left: possible-input
-							let nearest_inputs = lookup_nearest_inputs(node);
-							if(nearest_inputs)
-								connect_inputs(nearest_inputs, node);
-						}
-						else {
-							// right: copy-all
-							if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
-								return;
-
-							let src_node = lookup_nearest_nodes(node);
-							if(src_node)
-								node_info_copy(src_node, node, true);
-						}
-					}
-					break;
-			}
-		}
-	},
-
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({

model-list.json

@@ -209,28 +209,6 @@
       "url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors",
       "size": "3.53GB"
     },
-    {
-      "name": "Inswapper-fp16 (face swap)",
-      "type": "insightface",
-      "base": "inswapper",
-      "save_path": "insightface",
-      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
-      "reference": "https://github.com/facefusion/facefusion-assets",
-      "filename": "inswapper_128_fp16.onnx",
-      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
-      "size": "277.7MB"
-    },
-    {
-      "name": "Inswapper (face swap)",
-      "type": "insightface",
-      "base": "inswapper",
-      "save_path": "insightface",
-      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
-      "reference": "https://github.com/facefusion/facefusion-assets",
-      "filename": "inswapper_128.onnx",
-      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
-      "size": "555.3MB"
-    },
     {
       "name": "Deepbump",
       "type": "deepbump",
@@ -310,7 +288,7 @@
     },
     {
       "name": "negative_hand Negative Embedding",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "If you use this embedding with negatives, you can solve the issue of damaging your hands.",
@@ -321,7 +299,7 @@
     },
     {
       "name": "bad_prompt Negative Embedding",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "The idea behind this embedding was to somehow train the negative prompt as an embedding, thus unifying the basis of the negative prompt into one word or embedding.",
@@ -332,7 +310,7 @@
     },
     {
       "name": "Deep Negative V1.75",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "These embedding learn what disgusting compositions and color patterns are, including faulty human anatomy, offensive color schemes, upside-down spatial structures, and more. Placing it in the negative can go a long way to avoiding these things.",
@@ -343,7 +321,7 @@
     },
     {
       "name": "EasyNegative",
-      "type": "embeddings",
+      "type": "embedding",
       "base": "SD1.5",
       "save_path": "embeddings/SD1.5",
       "description": "This embedding should be used in your NEGATIVE prompt. Adjust the strength as desired (seems to scale well without any distortions), the strength required may vary based on positive and negative prompts.",
@@ -488,7 +466,7 @@
       "name": "stabilityai/Stable Cascade: text_encoder (CLIP)",
       "type": "clip",
       "base": "Stable Cascade",
-      "save_path": "clip/Stable-Cascade",
+      "save_path": "text_encoders/Stable-Cascade",
       "description": "Stable Cascade: text_encoder",
       "reference": "https://huggingface.co/stabilityai/stable-cascade",
       "filename": "model.safetensors",
@@ -877,11 +855,67 @@
       "size": "5.16GB"
     },
 
+    {
+      "name": "comfyanonymous/cosmos_cv8x8x8_1.0.safetensors",
+      "type": "VAE",
+      "base": "Cosmos-1.0",
+      "save_path": "default",
+      "description": "VAE model for Cosmos 1.0",
+      "reference": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/tree/main",
+      "filename": "cosmos_cv8x8x8_1.0.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/resolve/main/vae/cosmos_cv8x8x8_1.0.safetensors",
+      "size": "211MB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "size": "28.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "size": "28.5GB"
+    },
+
     {
       "name": "google-t5/t5-base",
       "type": "clip",
       "base": "t5-base",
-      "save_path": "clip/t5-base",
+      "save_path": "text_encoders/t5-base",
       "description": "T5 Base: Text-To-Text Transfer Transformer. This model can be loaded via CLIPLoader for Stable Audio workflow.",
       "reference": "https://huggingface.co/google-t5/t5-base",
       "filename": "model.safetensors",
@@ -892,7 +926,7 @@
       "name": "google-t5/t5-v1_1-xxl_encoderonly-fp16",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
       "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
       "filename": "google_t5-v1_1-xxl_encoderonly-fp16.safetensors",
@@ -903,7 +937,7 @@
       "name": "google-t5/t5-v1_1-xxl_encoderonly-fp8_e4m3fn",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
       "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
       "filename": "google_t5-v1_1-xxl_encoderonly-fp8_e4m3fn.safetensors",
@@ -916,7 +950,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q3_K_L.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q3_K_L quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q3_K_L.gguf",
@@ -927,7 +961,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q3_K_M.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q3_K_M quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q3_K_M.gguf",
@@ -938,7 +972,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q3_K_S.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q3_K_S quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q3_K_S.gguf",
@@ -949,7 +983,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q4_K_M.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q4_K_M quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q4_K_M.gguf",
@@ -960,7 +994,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q4_K_S.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q4_K_S quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q4_K_S.gguf",
@@ -971,7 +1005,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q5_K_M.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q5_K_M quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q5_K_M.gguf",
@@ -982,7 +1016,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q5_K_S.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q5_K_S quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q5_K_S.gguf",
@@ -993,7 +1027,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q6_K.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q6_K quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q6_K.gguf",
@@ -1004,7 +1038,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-Q8_0.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (Q8_0 quantized)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-Q8_0.gguf",
@@ -1015,7 +1049,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-f16.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (float 16)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-f16.gguf",
@@ -1026,7 +1060,7 @@
       "name": "city96/t5-v1_1-xxl-encoder-f32.gguf",
       "type": "clip",
       "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
       "description": "t5xxl Text Encoder GGUF model. (float 32)",
       "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
       "filename": "t5-v1_1-xxl-encoder-f32.gguf",
@@ -1665,17 +1699,6 @@
       "url": "https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors",
       "size": "774.5MB"
     },
-    {
-      "name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
-      "type": "controlnet",
-      "base": "SDXL",
-      "save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
-      "description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
-      "reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
-      "filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
-      "url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
-      "size": "46.2MB"
-    },
     {
       "name": "SDXL-controlnet: OpenPose (v2)",
       "type": "controlnet",
@@ -2259,6 +2282,18 @@
       "url": "https://huggingface.co/CiaraRowles/TemporalDiff/resolve/main/temporaldiff-v1-animatediff.ckpt",
       "size": "1.67GB"
     },
+    {
+      "name": "Leoxing/pia.ckpt",
+      "type": "animatediff-pia",
+      "base": "SD1.x",
+      "save_path": "animatediff_models",
+      "description": "AnimateDiff-PIA Model",
+      "reference": "https://huggingface.co/Leoxing/PIA/tree/main",
+      "filename": "pia.ckpt",
+      "url": "https://huggingface.co/Leoxing/PIA/resolve/main/pia.ckpt",
+      "size": "1.67GB"
+    },
+
     {
       "name": "animatediff/v2_lora_PanLeft.ckpt (ComfyUI-AnimateDiff-Evolved) (Updated path)",
       "type": "motion lora",
@@ -2746,39 +2781,6 @@
 
 
 
-    {
-      "name": "pfg-novel-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-novel-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
-      "size": "23.6MB"
-    },
-    {
-      "name": "pfg-wd14-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-wd14-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
-      "size": "31.5MB"
-    },
-    {
-      "name": "pfg-wd15beta2-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-wd15beta2-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
-      "size": "31.5MB"
-    },
     {
       "name": "GFPGANv1.4.pth",
       "type": "GFPGAN",
@@ -2944,50 +2946,6 @@
       "url": "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors",
       "size": "2.50GB"
     },
-    {
-      "name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
-      "type": "efficient_sam",
-      "base": "efficient_sam",
-      "save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
-      "description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
-      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
-      "filename": "efficient_sam_s_cpu.jit",
-      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
-      "size": "106.0MB"
-    },
-    {
-      "name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
-      "type": "efficient_sam",
-      "base": "efficient_sam",
-      "save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
-      "description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
-      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
-      "filename": "efficient_sam_s_gpu.jit",
-      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
-      "size": "106.0MB"
-    },
-    {
-      "name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
-      "type": "Shape Predictor",
-      "base": "DLIB",
-      "save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
-      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
-      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
-      "filename": "shape_predictor_68_face_landmarks.dat",
-      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
-      "size": "99.7MB"
-    },
-    {
-      "name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
-      "type": "Face Recognition",
-      "base": "DLIB",
-      "save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
-      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
-      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
-      "filename": "dlib_face_recognition_resnet_model_v1.dat",
-      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
-      "size": "22.5MB"
-    },
     {
       "name": "InstanceDiffusion/fusers",
       "type": "InstanceDiffusion",
@@ -3362,50 +3320,6 @@
       "url": "https://huggingface.co/lllyasviel/ic-light/resolve/main/iclight_sd15_fcon.safetensors",
       "size": "1.72GB"
     },
-    {
-      "name": "ID-Animator/animator.ckpt",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models",
-      "description": "ID-Animator checkpoint",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "animator.ckpt",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
-      "size": "247.3MB"
-    },
-    {
-      "name": "ID-Animator/mm_sd_v15_v2.ckpt",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models/animatediff_models",
-      "description": "AnimateDiff checkpoint for ID-Animator",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "mm_sd_v15_v2.ckpt",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
-      "size": "1.82GB"
-    },
-    {
-      "name": "ID-Animator/image_encoder",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models/image_encoder",
-      "description": "CLIP Image encoder for ID-Animator",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "model.safetensors",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
-      "size": "2.53GB"
-    },
-    {
-      "name": "TencentARC/CustomNet",
-      "type": "CustomNet",
-      "base": "CustomNet",
-      "save_path": "custom_nodes/ComfyUI_CustomNet/pretrain",
-      "description": "CustomNet pretrained model for ComfyUI_CustomNet",
-      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
-      "filename": "customnet_v1.pt",
-      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
-      "size": "5.71GB"
-    },
     {
       "name": "TTPlanet/TTPLanet_SDXL_Controlnet_Tile_Realistic v2 (fp16)",
       "type": "controlnet",
@@ -3494,17 +3408,6 @@
       "url": "https://huggingface.co/ViperYX/RGT/resolve/main/RGT_S/RGT_S_x4.pth",
       "size": "136.0MB"
     },
-    {
-      "name": "Doubiiu/ToonCrafter model checkpoint",
-      "type": "checkpoint",
-      "base": "ToonCrafter",
-      "save_path": "custom_nodes/ComfyUI-ToonCrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
-      "description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
-      "reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
-      "filename": "model.ckpt",
-      "url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
-      "size": "10.5GB"
-    },
 
     {
       "name": "InstantX/FLUX.1-dev Controlnet (Union)",
@@ -4397,23 +4300,11 @@
       "size": "12.7GB"
     },
 
-    {
-      "name": "BAAI/SegGPT",
-      "type": "SegGPT",
-      "base": "SegGPT",
-      "save_path": "custom_nodes/comfyui-SegGPT",
-      "description": "SegGPT",
-      "reference": "https://huggingface.co/BAAI/SegGPT",
-      "filename": "seggpt_vit_large.pth",
-      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
-      "size": "1.48GB"
-    },
-
     {
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -4424,7 +4315,7 @@
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -4725,6 +4616,75 @@
       "filename": "ip_adapter.safetensors",
       "url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors",
       "size": "982MB"
+    },
+
+    {
+      "name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
+      "type": "efficient_sam",
+      "base": "efficient_sam",
+      "save_path": "yolo_world",
+      "description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
+      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
+      "filename": "efficient_sam_s_cpu.jit",
+      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
+      "size": "106.0MB"
+    },
+    {
+      "name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
+      "type": "efficient_sam",
+      "base": "efficient_sam",
+      "save_path": "yolo_world",
+      "description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
+      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
+      "filename": "efficient_sam_s_gpu.jit",
+      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
+      "size": "106.0MB"
+    },
+
+    {
+      "name": "TencentARC/CustomNet V1",
+      "type": "CustomNet",
+      "base": "CustomNet",
+      "save_path": "checkpoints/customnet",
+      "description": "CustomNet pretrained model for ComfyUI_CustomNet",
+      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
+      "filename": "customnet_v1.pt",
+      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
+      "size": "5.71GB"
+    },
+    {
+      "name": "TencentARC/CustomNet Inpaint V1",
+      "type": "CustomNet",
+      "base": "CustomNet",
+      "save_path": "checkpoints/customnet",
+      "description": "CustomNet Inpaint pretrained model for ComfyUI_CustomNet",
+      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
+      "filename": "customnet_inpaint_v1.pt",
+      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
+      "size": "5.71GB"
+    },
+
+    {
+      "name": "deepseek-ai/Janus-Pro-1B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-1B",
+      "size": "7.8GB"
+    },
+    {
+      "name": "deepseek-ai/Janus-Pro-7B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-7B",
+      "size": "14.85GB"
     }
   ]
 }

node_db/dev/custom-node-list.json

@@ -10,6 +10,600 @@
         },
 
         
+        
+        
+
+        {
+            "author": "hiusdev",
+            "title": "ComfyUI_Lah_Toffee",
+            "reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
+            "files": [
+                "https://github.com/hiusdev/ComfyUI_Lah_Toffee"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Lah LoadVideoRandom"
+        },
+        {
+            "author": "hdfhssg",
+            "title": "ComfyUI_pxtool [WIP]",
+            "reference": "https://github.com/hdfhssg/ComfyUI_pxtool",
+            "files": [
+                "https://github.com/hdfhssg/ComfyUI_pxtool"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "dasilva333",
+            "title": "ComfyUI_MarkdownImage [WIP]",
+            "reference": "https://github.com/dasilva333/ComfyUI_MarkdownImage",
+            "files": [
+                "https://github.com/dasilva333/ComfyUI_MarkdownImage"
+            ],
+            "install_type": "git-clone",
+            "description": "Create an image using html and markdown in ComfyUI\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "franky519",
+            "title": "comfyui-redux-style",
+            "reference": "https://github.com/franky519/comfyui-redux-style",
+            "files": [
+                "https://github.com/franky519/comfyui-redux-style"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Style Model Grid, Style Model Apply, Style Model Advanced"
+        },
+        {
+            "author": "rishipandey125",
+            "title": "ComfyUI-FramePacking [WIP]",
+            "reference": "https://github.com/rishipandey125/ComfyUI-FramePacking",
+            "files": [
+                "https://github.com/rishipandey125/ComfyUI-FramePacking"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Add Grid Boundaries, Pack Frames, Unpack Frames, Resize Frame"
+        },
+        {
+            "author": "Northerner1",
+            "title": "ComfyUI_North_Noise [WIP]",
+            "reference": "https://github.com/Northerner1/ComfyUI_North_Noise",
+            "files": [
+                "https://github.com/Northerner1/ComfyUI_North_Noise"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Unsampler"
+        },
+        {
+            "author": "kimara-ai",
+            "title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
+            "reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
+            "files": [
+                "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
+        },
+        {
+            "author": "tc8M4lF3s88",
+            "title": "comfy-tif-support",
+            "reference": "https://github.com/M4lF3s/comfy-tif-support",
+            "files": [
+                "https://github.com/M4lF3s/comfy-tif-support"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Load TIFF"
+        },
+        {
+            "author": "greengerong",
+            "title": "ComfyUI-Lumina-Video [WIP]",
+            "reference": "https://github.com/greengerong/ComfyUI-Lumina-Video",
+            "files": [
+                "https://github.com/greengerong/ComfyUI-Lumina-Video"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a video generation plugin implementation for ComfyUI based on the Lumina Video model."
+        },
+        {
+            "author": "tc888",
+            "title": "ComfyUI_Save_Flux_Image",
+            "reference": "https://github.com/tc888/ComfyUI_Save_Flux_Image",
+            "files": [
+                "https://github.com/tc888/ComfyUI_Save_Flux_Image"
+            ],
+            "install_type": "git-clone",
+            "description": "Customized version of comfyui-image-save tailored for saving Flux images"
+        },
+        {
+            "author": "var1ableX",
+            "title": "ComfyUI_Accessories",
+            "reference": "https://github.com/var1ableX/ComfyUI_Accessories",
+            "files": [
+                "https://github.com/var1ableX/ComfyUI_Accessories"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Get Mask Dimensions, Get Random Dimensions, Is Mask Empty/Image, Any Cast, Make List From Text"
+        },
+        {
+            "author": "xinyiSS",
+            "title": "CombineMasksNode",
+            "reference": "https://github.com/xinyiSS/CombineMasksNode",
+            "files": [
+                "https://github.com/xinyiSS/CombineMasksNode"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Combine Masks Node"
+        },
+        {
+            "author": "osuiso-depot",
+            "title": "comfyui-keshigom_custom",
+            "reference": "https://github.com/osuiso-depot/comfyui-keshigom_custom",
+            "files": [
+                "https://github.com/osuiso-depot/comfyui-keshigom_custom"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: RegexpChopper, FLIP-W/H Selector, FLIP-W/H SelectorConst, TextFind, ckpt_Loader_Simple, True-or-False, myStringNode"
+        },
+        {
+            "author": "LucipherDev",
+            "title": "ComfyUI-Sentinel [WIP]",
+            "reference": "https://github.com/LucipherDev/ComfyUI-Sentinel",
+            "files": [
+                "https://github.com/LucipherDev/ComfyUI-Sentinel"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Extension for Advanced Security. Implements login, multi-user registration, IP filtering, and user-specific input/output directories.[w/WARN:While ComfyUI Sentinel enhances security for ComfyUI, it does not guarantee absolute protection. Security is about risk mitigation, not elimination. Users are responsible for implementing their own security measures.]"
+        },
+        {
+            "author": "threadedblue",
+            "title": "MLXnodes [WIP]",
+            "reference": "https://github.com/threadedblue/MLXnodes",
+            "files": [
+                "https://github.com/threadedblue/MLXnodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A port of MLX Examples to ComfyUI custom_nodes. These are intended to run on a macOS M1.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "jschoormans",
+            "title": "Comfy-InterestingPixels [WIP]",
+            "reference": "https://github.com/jschoormans/Comfy-InterestingPixels",
+            "files": [
+                "https://github.com/jschoormans/Comfy-InterestingPixels"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Shareable Image Slider, Random Palette\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "jschoormans",
+            "title": "ComfyUI-TexturePacker [WIP]",
+            "reference": "https://github.com/kijai/ComfyUI-TexturePacker",
+            "files": [
+                "https://github.com/jschoormans/Comfy-InterestingPixels"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI node to use PyTexturePacker\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "lum3on",
+            "title": "comfyui_LLM_Polymath [WIP]",
+            "reference": "https://github.com/lum3on/comfyui_LLM_Polymath",
+            "files": [
+                "https://github.com/lum3on/comfyui_LLM_Polymath"
+            ],
+            "install_type": "git-clone",
+            "description": "An advanced chat node, that integrates large language models to automate data processes and enhance prompt responses through real-time web search and image handling. It supports both OpenAI's GPT-like models and a local Ollama API. Custom node finder and smart assistant tools provide tailored workflow recommendations for efficient integration. Additionally, the node dynamically augments prompts and offers flexible output compression options.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "MickeyJ",
+            "title": "ComfyUI_mickster_nodes [WIP]",
+            "reference": "https://github.com/MickeyJ/ComfyUI_mickster_nodes",
+            "files": [
+                "https://github.com/MickeyJ/ComfyUI_mickster_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI, focusing on image handling and LoRA training."
+        },
+        {
+            "author": "thedivergentai",
+            "title": "Divergent Nodes [WIP]",
+            "reference": "https://github.com/thedivergentai/divergent_nodes",
+            "files": [
+                "https://github.com/thedivergentai/divergent_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node for counting CLIP tokens in text input."
+        },
+        {
+            "author": "gold24park",
+            "title": "loki-comfyui-node",
+            "reference": "https://github.com/gold24park/loki-comfyui-node",
+            "files": [
+                "https://github.com/gold24park/loki-comfyui-node"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Get Image Luminance, Get Dominant Color, Overlay Text"
+        },
+        {
+            "author": "hayden-fr",
+            "title": "ComfyUI-Image-Browsing [USAFE]",
+            "id": "image-browsing",
+            "reference": "https://github.com/hayden-fr/ComfyUI-Image-Browsing",
+            "files": [
+                "https://github.com/hayden-fr/ComfyUI-Image-Browsing"
+            ],
+            "install_type": "git-clone",
+            "description": "Image Browsing: browsing, download and delete."
+        },
+        {
+            "author": "molbal",
+            "title": "comfy-url-fetcher [WIP]",
+            "reference": "https://github.com/molbal/comfy-url-fetcher",
+            "files": [
+                "https://github.com/molbal/comfy-url-fetcher"
+            ],
+            "install_type": "git-clone",
+            "description": "Fetches URLs"
+        },
+        {
+            "author": "myAiLemon",
+            "title": "MagicAutomaticPicture [WIP]",
+            "reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
+            "files": [
+                "https://github.com/myAiLemon/MagicAutomaticPicture"
+            ],
+            "install_type": "git-clone",
+            "description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
+        },
+        {
+            "author": "neverbiasu",
+            "title": "ComfyUI_Output_as_Input",
+            "reference": "https://github.com/a-und-b/ComfyUI_Output_as_Input",
+            "files": [
+                "https://github.com/a-und-b/ComfyUI_Output_as_Input"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a simple custom ComfyUI node that allows you to easily use recent output images as input in your workflows. It does not allow image uploads on purpose and does not require any additional dependencies.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "neverbiasu",
+            "title": "ComfyUI-DeepSeek",
+            "reference": "https://github.com/neverbiasu/ComfyUI-DeepSeek",
+            "files": [
+                "https://github.com/neverbiasu/ComfyUI-DeepSeek"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: DeepSeek Caller"
+        },
+        {
+            "author": "Krish-701",
+            "title": "RK_Comfyui",
+            "reference": "https://github.com/Krish-701/RK_Comfyui",
+            "files": [
+                "https://github.com/Krish-701/RK_Comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: RK Excel File State Looper, RK Accumulate Text, RK Advanced Script Finder, RK CSV File State Looper, RK Read Excel Row, RK Sequential Image Viewer, RK Concatenate Text, RK Write Text, RK Save Image, RK Seed Loop"
+        },
+        {
+            "author": "mikebilly",
+            "title": "transparent-background-comfyui",
+            "reference": "https://github.com/mikebilly/Transparent-background-comfyUI",
+            "files": [
+                "https://github.com/mikebilly/Transparent-background-comfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Transparentbackground RemBg"
+        },
+        {
+            "author": "UD1sto",
+            "title": "plugin-utils-nodes",
+            "reference": "https://github.com/UD1sto/plugin-utils-nodes",
+            "files": [
+                "https://github.com/UD1sto/plugin-utils-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Compare Images (SimHash), Image Selector, Temporal Consistency, Update Image Reference, Frame Blend."
+        },
+        {
+            "author": "Kayarte",
+            "title": "Time Series Nodes for ComfyUI [Experimental]",
+            "reference": "https://github.com/Kayarte/Time-Series-Nodes-for-ComfyUI",
+            "files": [
+                "https://github.com/Kayarte/Time-Series-Nodes-for-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "Basic nodes for time series analysis in ComfyUI. Currently in early development."
+        },
+        {
+            "author": "HuangYuChuh",
+            "title": "ComfyUI-DeepSeek_Toolkit [WIP]",
+            "reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit",
+            "files": [
+                "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI-DeepSeek_Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "comfyuiblog",
+            "title": "deepseek_prompt_generator_comfyui [WIP]",
+            "reference": "https://github.com/comfyuiblog/deepseek_prompt_generator_comfyui",
+            "files": [
+                "https://github.com/comfyuiblog/deepseek_prompt_generator_comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "Prompt Expansion for Stable Diffusion, using Deepseek API.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "risunobushi",
+            "title": "ComfyUI_HEXtoRGB",
+            "reference": "https://github.com/risunobushi/ComfyUI_HEXtoRGB",
+            "files": [
+                "https://github.com/risunobushi/ComfyUI_HEXtoRGB"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Hex to RGB Converter"
+        },
+        {
+            "author": "EmanueleUniroma2",
+            "title": "ComfyUI-FLAC-to-WAV [WIP]",
+            "reference": "https://github.com/EmanueleUniroma2/ComfyUI-FLAC-to-WAV",
+            "files": [
+                "https://github.com/EmanueleUniroma2/ComfyUI-FLAC-to-WAV"
+             ],
+             "install_type": "git-clone",
+             "description": "A custom node to convert flac files to wav inside comfy UI\nComfyUI Custom Node: FLAC to WAV Converter Welcome to the ComfyUI Custom Node: FLAC to WAV Converter repository! This project provides a custom node for ComfyUI that allows you to easily convert .flac audio files to .wav format, making it simpler to work with a variety of audio tools and applications.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "eyekayem",
+            "title": "comfyui_runway_gen3",
+            "reference": "https://github.com/eyekayem/comfyui_runway_gen3",
+            "files": [
+                "https://github.com/eyekayem/comfyui_runway_gen3"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Runway Video Gen, Runway Video Preview"
+        },
+        {
+            "author": "StartHua",
+            "title": "Comfyui_CXH_joy_caption [SECURITY SCREENING]",
+            "reference": "https://github.com/StartHua/Comfyui_CXH_joy_caption",
+            "files": [
+                "https://github.com/StartHua/Comfyui_CXH_joy_caption"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:Joy_caption_load, Joy_caption\nNOTE:This node pack has been transitioned to a security screening status due to policy."
+        },
+        {
+            "author": "kijai",
+            "title": "ComfyUI-ComfyUI-Hunyuan3DWrapper [WIP]",
+            "reference": "https://github.com/kijai/ComfyUI-Hunyuan3DWrapper",
+            "files": [
+                "https://github.com/kijai/ComfyUI-Hunyuan3DWrapper"
+            ],
+            "install_type": "git-clone",
+            "description": "Wrapper nodes for https://github.com/Tencent/Hunyuan3D-2, additional installation steps needed, please check the github repository"
+        },
+        {
+            "author": "7BEII",
+            "title": "comfyui-promptbymood [WIP]",
+            "reference": "https://github.com/7BEII/Comfyui_PDuse",
+            "files": [
+                "https://github.com/7BEII/Comfyui_PDuse"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: PD_json_group_fontsize, PD_Incremental_JSON, PD_removeword, PD_Image Crop Location, PD_ImageConcanate, PD_FileName_refixer\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "RLW-Chars",
+            "title": "comfyui-promptbymood [WIP]",
+            "reference": "https://github.com/RLW-Chars/comfyui-promptbymood",
+            "files": [
+                "https://github.com/RLW-Chars/comfyui-promptbymood"
+            ],
+            "install_type": "git-clone",
+            "description": "A plugin for ComfyUI to create random prompts.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "mohamedsobhi777",
+            "title": "ComfyUI-FramerComfy [WIP]",
+            "reference": "https://github.com/mohamedsobhi777/ComfyUI-FramerComfy",
+            "files": [
+                "https://github.com/mohamedsobhi777/ComfyUI-FramerComfy"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: FramerComfy Input String/Number/Image/Float/Boolean/Image, ...\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "naderzare",
+            "title": "comfyui-inodes",
+            "reference": "https://github.com/naderzare/comfyui-inodes",
+            "files": [
+                "https://github.com/naderzare/comfyui-inodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: If-Else, Multiline Split, Azure AI API"
+        },
+        {
+            "author": "sizzlebop",
+            "title": "ComfyUI LLM Prompt Enhancer [WIP]",
+            "reference": "https://github.com/sizzlebop/comfyui-llm-prompt-enhancer",
+            "files": [
+                "https://github.com/sizzlebop/comfyui-llm-prompt-enhancer"
+            ],
+            "install_type": "git-clone",
+            "description": "A powerful custom node for ComfyUI that enhances your prompts using various Language Learning Models (LLMs). This node supports multiple LLM providers and offers various enhancement styles to help you create better, more detailed prompts for image generation.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "a-One-Fan",
+            "title": "ComfyUI-Blenderesque-Nodes [WIP]",
+            "reference": "https://github.com/a-One-Fan/ComfyUI-Blenderesque-Nodes",
+            "files": [
+                "https://github.com/a-One-Fan/ComfyUI-Blenderesque-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Blender-like nodes for ComfyUI."
+        },
+        {
+            "author": "yanhuifair",
+            "title": "comfyui-deepseek [WIP]",
+            "reference": "https://github.com/yanhuifair/comfyui-deepseek",
+            "files": [
+                "https://github.com/yanhuifair/comfyui-deepseek"
+            ],
+            "install_type": "git-clone",
+            "description": "nodes for deepseek api\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "807502278",
+            "title": "ComfyUI_TensorRT_Merge [WIP]",
+            "reference": "https://github.com/807502278/ComfyUI_TensorRT_Merge",
+            "files": [
+                "https://github.com/807502278/ComfyUI_TensorRT_Merge"
+            ],
+            "install_type": "git-clone",
+            "description": "Non diffusion models supported by TensorRT, merged Comfyui plugin, added onnx automatic download and trt model conversion nodes."
+        },
+        {
+            "author": "IfnotFr",
+            "title": "ComfyUI-Ifnot-Pack",
+            "reference": "https://github.com/IfnotFr/ComfyUI-Ifnot-Pack",
+            "files": [
+                "https://github.com/IfnotFr/ComfyUI-Ifnot-Pack"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Face Crop, [w/A pack of custom nodes used in my projects. Not intended to be used by other persons as the usage is not documented. But if something interests you in this repository, go for it !]"
+        },
+        {
+            "author": "KihongK",
+            "title": "ComfyUI-RoysNodes [WIP]",
+            "reference": "https://github.com/KihongK/comfyui-roysnodes",
+            "files": [
+                "https://github.com/KihongK/comfyui-roysnodes"
+            ],
+            "install_type": "git-clone",
+            "description": "WIP custom nodes for Creation of AI images & videos"
+        },
+        {
+            "author": "catboxanon",
+            "title": "ComfyUI-Pixelsmith [WIP]",
+            "reference": "https://github.com/catboxanon/ComfyUI-Pixelsmith",
+            "files": [
+                "https://github.com/catboxanon/ComfyUI-Pixelsmith"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Pixelsmith"
+        },
+        {
+            "author": "smthemex",
+            "title": "ComfyUI_MangaNinjia [WIP]",
+            "reference": "https://github.com/smthemex/ComfyUI_MangaNinjia",
+            "files": [
+                "https://github.com/smthemex/ComfyUI_MangaNinjia"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI_MangaNinjia is a ComfyUI node of MangaNinja which  is a Line Art Colorization with Precise Reference Following method.\nNOTE: invalid pyproject.toml file."
+        },
+        {
+            "author": "hunterssl",
+            "title": "ComfyUI_SSLNodes",
+            "reference": "https://github.com/hunterssl/ComfyUI_SSLNodes",
+            "files": [
+                "https://github.com/hunterssl/ComfyUI_SSLNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: SSL Load Json, SSL Get Json Keys Count, SSL Load Checkpoint By Name, SSL Random Num In Loop, SSL Save Image Outside"
+        },
+        {
+            "author": "ammahmoudi",
+            "title": "ComfyUI-Legendary-Nodes",
+            "reference": "https://github.com/ammahmoudi/ComfyUI-Legendary-Nodes",
+            "files": [
+                "https://github.com/ammahmoudi/ComfyUI-Legendary-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Legendary Lora URL Loader, Legendary Lora URL Loader"
+        },
+        {
+            "author": "yichengup",
+            "title": "Comfyui-NodeSpark",
+            "reference": "https://github.com/yichengup/Comfyui-NodeSpark",
+            "files": [
+                "https://github.com/yichengup/Comfyui-NodeSpark"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Image Circle Warp, Image Stretch, Image Wave Warp, Liquify Effect"
+        },
+        {
+            "author": "kijai",
+            "title": "ComfyUI-VideoNoiseWarp [WIP]",
+            "reference": "https://github.com/kijai/ComfyUI-VideoNoiseWarp",
+            "files": [
+                "https://github.com/kijai/ComfyUI-VideoNoiseWarp"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes to generate noise from video for [a/https://github.com/Eyeline-Research/Go-with-the-Flow](https://github.com/Eyeline-Research/Go-with-the-Flow)"
+        },
+        {
+            "author": "muvich3n",
+            "title": "ComfyUI-Claude-I2T",
+            "reference": "https://github.com/muvich3n/ComfyUI-Claude-I2T",
+            "files": [
+                "https://github.com/muvich3n/ComfyUI-Claude-I2T"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Claude Image to Prompt Generator"
+        },
+        {
+            "author": "maekawataiki",
+            "title": "ComfyUI-ALB-Login",
+            "reference": "https://github.com/maekawataiki/ComfyUI-ALB-Login",
+            "files": [
+                "https://github.com/maekawataiki/ComfyUI-ALB-Login"
+            ],
+            "install_type": "git-clone",
+            "description": "Auth library to inspect token provided by ALB to protect ComfyUI."
+        },
+        {
+            "author": "ArmandAlbert",
+            "title": "Kwai_font_comfyui",
+            "reference": "https://github.com/ArmandAlbert/Kwai_font_comfyui",
+            "files": [
+                "https://github.com/ArmandAlbert/Kwai_font_comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Kwaifont_Resnet50_Runner, Kwaifont_Resnet50_Loader, Kwaifont_Resnet101_Runner, Kwaifont_Resnet101_Loader, Kwaifont_Image_Cropper"
+        },
+        {
+            "author": "SpatialDeploy",
+            "title": "ComfyUI-Voxels [WIP]",
+            "reference": "https://github.com/SpatialDeploy/ComfyUI-Voxels",
+            "files": [
+                "https://github.com/SpatialDeploy/ComfyUI-Voxels"
+            ],
+            "install_type": "git-clone",
+            "description": "Tools for creating voxel based videos"
+        },
+        {
+            "author": "PATATAJEC",
+            "title": "Patatajec-Nodes [WIP]",
+            "reference": "https://github.com/PATATAJEC/Patatajec-Nodes",
+            "files": [
+                "https://github.com/PATATAJEC/Patatajec-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: HyVid Switcher\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "sourceful-official",
+            "title": "comfyui-sourceful-official",
+            "reference": "https://github.com/sourceful-official/comfyui-sourceful-official",
+            "files": [
+               "https://github.com/sourceful-official/comfyui-sourceful-official"
+            ],
+            "description": "NODES: SourcefulOfficialComfyuiIncontextThreePanels, FalFluxLoraSourcefulOfficial, FalIcLightV2SourcefulOfficial",
+            "install_type": "git-clone"
+        },
         {
             "author": "Alvaroeai",
             "title": "ComfyUI-SunoAI-Mds",
@@ -30,16 +624,6 @@
             "install_type": "git-clone",
             "description": "ComfyUI wrapper nodes for [a/Mochi](https://github.com/genmoai/models) video generator"
         },
-        {
-            "author": "sourceful-official",
-            "title": "comfyui-cog-comfyui-incontext-three-panels",
-            "reference": "https://github.com/sourceful-official/comfyui-cog-comfyui-incontext-three-panels",
-            "files": [
-               "https://github.com/sourceful-official/comfyui-cog-comfyui-incontext-three-panels"
-            ],
-            "description": "NODES: SourcefulOfficialComfyuiIncontextThreePanels",
-            "install_type": "git-clone"
-        },
         {
             "author": "Symbiomatrix",
             "title": "Comfyui-Sort-Files",
@@ -98,7 +682,7 @@
                 "https://github.com/5x00/ComfyUI-Prompt-Plus"
             ],
             "install_type": "git-clone",
-            "description": "Prompt Plus is a collection of LLM and VLM nodes that make prompting easier for image and video generation."
+            "description": "Prompt Plus is a collection of LLM and VLM nodes that make prompting easier for image and video generation.\nNOTE: The files in the repo are not organized."
         },
         {
             "author": "aria1th",
@@ -160,16 +744,6 @@
             "install_type": "git-clone",
             "description": "Very early W.I.P of clustered ComfyUI inference."
         },
-        {
-            "author": "5x00",
-            "title": "ComfyUI-LLM-Concat [WIP]",
-            "reference": "https://github.com/5x00/ComfyUI-LLM-Concat",
-            "files": [
-                "https://github.com/5x00/ComfyUI-LLM-Concat"
-            ],
-            "install_type": "git-clone",
-            "description": "Simple ComfyUI node to combine strings using ChatGPT / Claude. Can be helpful to combine multiple keywords into a single prompt.\nNOTE: The files in the repo are not organized."
-        },
         {
             "author": "waynepimpzhang",
             "title": "FindBrightestSpot [WIP]",
@@ -238,7 +812,7 @@
                 "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit"
             ],
             "install_type": "git-clone",
-            "description": "for now: just custom node(s) to fetch tags from a given danbooru (soon e621 too) post link\ncurrently only supports danbooru-style urls + api response formats\nthis repo is a rewrite of: [a/https://github.com/yffyhk/comfyui_auto_danbooru](https://github.com/yffyhk/comfyui_auto_danbooru)"
+            "description": "WIP. Nodes: Fetch e621/danbooru image and/or tags etc from a given URL; Get the Wiki entry for a tag through a button press."
         },
         {
             "author": "Grey3016",
@@ -379,7 +953,7 @@
                 "https://github.com/warshanks/Shank-Tools"
             ],
             "install_type": "git-clone",
-            "description": "NODES: Tile Calculator"
+            "description": "NODES: Tile Calculator, Resolution Divider, Height & Width"
         },
         {
             "author": "BaronVonBoolean",
@@ -500,7 +1074,7 @@
                 "https://github.com/jonnydolake/ComfyUI-AIR-Nodes"
             ],
             "install_type": "git-clone",
-            "description": "NODES: String List To Prompt Schedule, Force Minimum Batch Size, Target Location (Crop), Target Location (Paste)"
+            "description": "NODES: String List To Prompt Schedule, Force Minimum Batch Size, Target Location (Crop), Target Location (Paste), Image Composite Chained, Match Image Count To Mask Count, Random Character Prompts, Parallax Test, Easy Parallax, Parallax GPU Test"
         },
         {
             "author": "watarika",
@@ -1037,16 +1611,6 @@
             "install_type": "git-clone",
             "description": "NODES:Mask Size Calculator (MagicAI), Universal Mask Converter (MagicAI), Python Execution (MagicAI), Extract JSON From Text Node(MagicAI)\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
         },
-        {
-            "author": "T8star1984",
-            "title": "comfyui-purgevram",
-            "reference": "https://github.com/T8star1984/comfyui-purgevram",
-            "files": [
-                "https://github.com/T8star1984/comfyui-purgevram"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
-        },
         {
             "author": "Laser-one",
             "title": "ComfyUI-align-pose",
@@ -1215,7 +1779,7 @@
                 "https://github.com/Poukpalaova/ComfyUI-FRED-Nodes"
             ],
             "install_type": "git-clone",
-            "description": "This repository contains custom nodes for ComfyUI. This is a work in progress (WIP).\nNOTE: The files in the repo are not organized."
+            "description": "Multiple nodes that ease the process.\nNOTE: The files in the repo are not organized."
         },
         {
             "author": "blurymind",
@@ -1255,7 +1819,7 @@
                 "https://github.com/rouxianmantou/comfyui-rxmt-nodes"
             ],
             "install_type": "git-clone",
-            "description": "NODES:Check Value Type"
+            "description": "NODES:Check Value Type, Why Prompt Text"
         },
         {
             "author": "SirVeggie",
@@ -1348,11 +1912,11 @@
             "description": "for preprocessing images, presented in a visual way. It also calculates the corresponding image area."
         },
         {
-            "author": "void15700",
+            "author": "cwebbi1",
             "title": "VoidCustomNodes",
-            "reference": "https://github.com/void15700/VoidCustomNodes",
+            "reference": "https://github.com/cwebbi1/VoidCustomNodes",
             "files": [
-                "https://github.com/void15700/VoidCustomNodes"
+                "https://github.com/cwebbi1/VoidCustomNodes"
             ],
             "install_type": "git-clone",
             "description": "NODES:Prompt Parser, String Combiner"
@@ -1418,17 +1982,6 @@
             "install_type": "copy",
             "description": "This platform extension provides ZhipuAI nodes, enabling you to configure a workflow for online video generation."
         },
-        {
-            "author": "jetchopper",
-            "title": "ComfyUI-GeneraNodes",
-            "id": "genera",
-            "reference": "https://github.com/evolox/ComfyUI-GeneraNodes",
-            "files": [
-                "https://github.com/evolox/ComfyUI-GeneraNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Genera custom nodes and extensions"
-        },
         {
             "author": "HavocsCall",
             "title": "comfyui_HavocsCall_Custom_Nodes",
@@ -1650,16 +2203,6 @@
             "install_type": "git-clone",
             "description": "ComfyUI-OpenAINode is a user-friendly node that serves as an interface to the OpenAI Models.[w/Repo name conflict with Electrofried/ComfyUI-OpenAINode]"
         },
-        {
-            "author": "hgabha",
-            "title": "WWAA-CustomNodes",
-            "reference": "https://github.com/hgabha/WWAA-CustomNodes",
-            "files": [
-                "https://github.com/hgabha/WWAA-CustomNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom Nodes for ComfyUI made by the team at [a/WeirdWonderfulAI.Art](https://weirdwonderfulai.art/) These are developed based on the needs where there was a gap to make our workflows better. You are welcome to use it as you see fit."
-        },
         {
             "author": "IgPoly",
             "title": "ComfyUI-igTools",
@@ -1899,7 +2442,7 @@
                 "https://github.com/jimstudt/ComfyUI-Jims-Nodes"
             ],
             "install_type": "git-clone",
-            "description": "Zoom and Enhance Nodes, Text Dictionary Nodes"
+            "description": "NODES: Zoom and Enhance Nodes, Text To String List, Choose String, Define Word, Lookup Word, Substitute Words, Dictionary to JSON, JSON file to Dictionary, JSON to Dictionary, Load Image And Info From Path, CubbyHack, Image to Solid Background"
         },
         {
             "author": "hananbeer",
@@ -2250,17 +2793,6 @@
             "install_type": "git-clone",
             "description": "Stable Diffusion is an image generation technique based on diffusion models. Its core idea involves simulating diffusion processes by iteratively adding noise and using neural networks to predict and remove the noise, thereby generating high-quality images. This approach is not limited to image generation; with appropriate network architecture and training data, it can be adapted for various other tasks. The application of neural networks extends beyond image generation. By adjusting network structures and loss functions, neural networks can also perform tasks such as classification and regression. This flexibility makes neural networks a powerful tool for handling a wide range of machine learning tasks. This project aims to expand custom neural network layers (such as linear layers, convolutional layers, etc.) within ComfyUI and provide simplified task training functionalities. Through this project, users can easily construct custom neural network layers and perform training in ComfyUI using a graphical interface."
         },
-        {
-            "author": "alexgenovese",
-            "title": "comfyui_CfgPlusPlus [WIP]",
-            "id": "cfgpp",
-            "reference": "https://gitea.com/NotEvilGirl/cfgpp",
-            "files": [
-                "https://gitea.com/NotEvilGirl/cfgpp"
-            ],
-            "install_type": "git-clone",
-            "description": "CFG++ implemented according to [a/https://cfgpp-diffusion.github.io](https://cfgpp-diffusion.github.io). Basically modified DDIM sampler that makes sampling work at low CFG values (0 ~ 2). Read the CFG++ paper for more details"
-        },
         {
             "author": "Fucci-Mateo",
             "title": "ComfyUI-Airtable [WIP]",
@@ -3407,16 +3939,6 @@
             "install_type": "git-clone",
             "description": "Unofficial ComfyUI extension of clip-interrogator"
         },
-        {
-            "author": "prismwastaken",
-            "title": "prism-tools",
-            "reference": "https://github.com/prismwastaken/prism-comfyui-tools",
-            "files": [
-                "https://github.com/prismwastaken/prism-comfyui-tools"
-            ],
-            "install_type": "git-clone",
-            "description": "prism-tools"
-        },
         {
             "author": "poisenbery",
             "title": "NudeNet-Detector-Provider [WIP]",

node_db/forked/custom-node-list.json

@@ -1,5 +1,15 @@
 {
     "custom_nodes": [
+        {
+            "author": "PramaLLC",
+            "title": "ComfyUI BEN - Background Erase Network",
+            "reference": "https://github.com/PramaLLC/BEN2_ComfyUI",
+            "files": [
+                "https://github.com/PramaLLC/BEN2_ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "Remove backgrounds from images with [a/BEN2](https://huggingface.co/PramaLLC/BEN2) in ComfyUI\nOriginal repo: [a/https://github.com/DoctorDiffusion/ComfyUI-BEN](https://github.com/DoctorDiffusion/ComfyUI-BEN)"
+        },
         {
             "author": "BlenderNeko",
             "title": "ltdrdata/ComfyUI_TiledKSampler",

node_db/legacy/custom-node-list.json

@@ -10,7 +10,171 @@
         },
         
 
-        
+        {
+            "author": "Njbx",
+            "title": "ComfyUI-blockswap [REMOVED]",
+            "reference": "https://github.com/Njbx/ComfyUI-blockswap",
+            "files": [
+                "https://github.com/Njbx/ComfyUI-blockswap"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Block Swap"
+        },
+        {
+            "author": "T8star1984",
+            "title": "comfyui-purgevram [REMOVED]",
+            "reference": "https://github.com/T8star1984/comfyui-purgevram",
+            "files": [
+                "https://github.com/T8star1984/comfyui-purgevram"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-VideoDiffusion [REMOVED]",
+            "reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI-VideoDiffusion"
+            ],
+            "install_type": "git-clone",
+            "description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
+        },
+        {
+            "author": "NyaamZ",
+            "title": "Get Booru Tag ExtendeD [REMOVED]",
+            "reference": "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED",
+            "files": [
+               "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED"
+            ],
+            "description": "Get tag from Booru site.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "lingha",
+            "title": "comfyui_kj [REMOVED]",
+            "id": "comfyui_kj",
+            "reference": "https://github.com/XieChengYuan/comfyui_kj",
+            "files": [
+                "https://github.com/XieChengYuan/comfyui_kj"
+            ],
+            "install_type": "git-clone",
+            "description": "comfyui_kj, A tool that can package workflows into projects and publish them to a WeChat Mini Program named Kaji, allowing charges to be collected from users."
+        },
+        {
+            "author": "myAiLemon",
+            "title": "MagicGetPromptAutomatically",
+            "reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
+            "files": [
+                "https://github.com/myAiLemon/MagicGetPromptAutomatically"
+            ],
+            "install_type": "git-clone",
+            "description": "A plug-in that can automatically generate pictures and save txt files in comfyui"
+        },
+        {
+            "author": "ryanontheinside",
+            "title": "ComfyUI_ScavengerHunt [REMOVED]",
+            "reference": "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt",
+            "files": [
+                "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Compare Image Similarity (ResNet), Compare Image Similarity (CLIP), Compare Image Types\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "vpakarinen",
+            "title": "ComfyUI-GenerationTimer [REMOVED]",
+            "reference": "https://github.com/vpakarinen/ComfyUI-GenerationTimer",
+            "files": [
+                "https://github.com/vpakarinen/ComfyUI-GenerationTimer"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Generation Timer, Image Timer, Timer Display"
+        },
+        {
+            "author": "RedRayz",
+            "title": "ComfyUI-Danbooru-To-WD [REMOVED]",
+            "id": "danbooru2wd",
+            "reference": "https://github.com/RedRayz/ComfyUI-Danbooru-To-WD",
+            "files": [
+                "https://github.com/RedRayz/ComfyUI-Danbooru-To-WD"
+            ],
+            "install_type": "git-clone",
+            "description": "Converts booru tags to a format suitable for Waifu Diffusion(or Danbooru based models)."
+        },
+        {
+            "author": "alexgenovese",
+            "title": "comfyui_CfgPlusPlus [REMOVED]",
+            "id": "cfgpp",
+            "reference": "https://gitea.com/NotEvilGirl/cfgpp",
+            "files": [
+                "https://gitea.com/NotEvilGirl/cfgpp"
+            ],
+            "install_type": "git-clone",
+            "description": "CFG++ implemented according to [a/https://cfgpp-diffusion.github.io](https://cfgpp-diffusion.github.io). Basically modified DDIM sampler that makes sampling work at low CFG values (0 ~ 2). Read the CFG++ paper for more details"
+        },
+        {
+            "author": "hosterosi",
+            "title": "ComfyUI OpenAI Node",
+            "reference": "https://github.com/hosterosi/ComfyUI_OpenAI [REMOVED]",
+            "files": [
+                "https://github.com/hosterosi/ComfyUI_OpenAI"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node for ComfyUI allows users to input multiline text and select a specific line by its number. The node processes the input and returns the selected line along with its index."
+        },
+        {
+            "author": "Gourieff",
+            "title": "ReActor Node for ComfyUI [DISABLED]",
+            "id": "reactor",
+            "reference": "https://github.com/Gourieff/comfyui-reactor-node",
+            "files": [
+                "https://github.com/Gourieff/comfyui-reactor-node"
+            ],
+            "install_type": "git-clone",
+            "description": "The Fast and Simple 'roop-like' Face Swap Extension Node for ComfyUI, based on ReActor (ex Roop-GE) SD-WebUI Face Swap Extension"
+        },
+        {
+            "author": "prismwastaken",
+            "title": "prism-tools [REMOVED]",
+            "reference": "https://github.com/prismwastaken/prism-comfyui-tools",
+            "files": [
+                "https://github.com/prismwastaken/prism-comfyui-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "prism-tools"
+        },
+        {
+            "author": "42lux",
+            "title": "ComfyUI-safety-checker [DEPRECATED]",
+            "reference": "https://github.com/42lux/ComfyUI-safety-checker",
+            "files": [
+                "https://github.com/42lux/ComfyUI-safety-checker"
+            ],
+            "install_type": "git-clone",
+            "description": "A NSFW/Safety Checker Node for ComfyUI."
+        },
+        {
+            "author": "riverolls",
+            "title": "ComfyUI-FJDH",
+            "reference": "https://github.com/riverolls/ComfyUI-FJDH [REMOVED]",
+            "files": [
+                "https://github.com/riverolls/ComfyUI-FJDH"
+            ],
+            "install_type": "git-clone",
+            "description": "bbox tools, image tools, mask generators, point tools"
+        },
+        {
+            "author": "jetchopper",
+            "title": "ComfyUI-GeneraNodes",
+            "id": "genera",
+            "reference": "https://github.com/evolox/ComfyUI-GeneraNodes [REMOVED]",
+            "files": [
+                "https://github.com/evolox/ComfyUI-GeneraNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Genera custom nodes and extensions"
+        },
         {
             "author": "Pos13",
             "title": "Cyclist [DEPRECATED]",

node_db/legacy/model-list.json

@@ -1,3 +1,148 @@
 {
-  "models": []
+  "models": [
+    {
+      "name": "Inswapper-fp16 (face swap) [REMOVED]",
+      "type": "insightface",
+      "base": "inswapper",
+      "save_path": "insightface",
+      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
+      "reference": "https://github.com/facefusion/facefusion-assets",
+      "filename": "inswapper_128_fp16.onnx",
+      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
+      "size": "277.7MB"
+    },
+    {
+      "name": "Inswapper (face swap) [REMOVED]",
+      "type": "insightface",
+      "base": "inswapper",
+      "save_path": "insightface",
+      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
+      "reference": "https://github.com/facefusion/facefusion-assets",
+      "filename": "inswapper_128.onnx",
+      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
+      "size": "555.3MB"
+    },
+    {
+      "name": "pfg-novel-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-novel-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
+      "size": "23.6MB"
+    },
+    {
+      "name": "pfg-wd14-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-wd14-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
+      "size": "31.5MB"
+    },
+    {
+      "name": "pfg-wd15beta2-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-wd15beta2-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
+      "size": "31.5MB"
+    },
+    {
+      "name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
+      "type": "Shape Predictor",
+      "base": "DLIB",
+      "save_path": "custom_nodes/comfyui_faceanalysis/dlib",
+      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
+      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
+      "filename": "shape_predictor_68_face_landmarks.dat",
+      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
+      "size": "99.7MB"
+    },
+    {
+      "name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
+      "type": "Face Recognition",
+      "base": "DLIB",
+      "save_path": "custom_nodes/comfyui_faceanalysis/dlib",
+      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
+      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
+      "filename": "dlib_face_recognition_resnet_model_v1.dat",
+      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
+      "size": "22.5MB"
+    },
+    {
+      "name": "ID-Animator/animator.ckpt",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models",
+      "description": "ID-Animator checkpoint",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "animator.ckpt",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
+      "size": "247.3MB"
+    },
+    {
+      "name": "ID-Animator/mm_sd_v15_v2.ckpt",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models/animatediff_models",
+      "description": "AnimateDiff checkpoint for ID-Animator",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "mm_sd_v15_v2.ckpt",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
+      "size": "1.82GB"
+    },
+    {
+      "name": "ID-Animator/image_encoder",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models/image_encoder",
+      "description": "CLIP Image encoder for ID-Animator",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "model.safetensors",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
+      "size": "2.53GB"
+    },
+    {
+      "name": "Doubiiu/ToonCrafter model checkpoint",
+      "type": "checkpoint",
+      "base": "ToonCrafter",
+      "save_path": "custom_nodes/comfyui-tooncrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
+      "description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
+      "reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
+      "filename": "model.ckpt",
+      "url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
+      "size": "10.5GB"
+    },
+
+    {
+      "name": "BAAI/SegGPT",
+      "type": "SegGPT",
+      "base": "SegGPT",
+      "save_path": "custom_nodes/comfyui-seggpt",
+      "description": "SegGPT",
+      "reference": "https://huggingface.co/BAAI/SegGPT",
+      "filename": "seggpt_vit_large.pth",
+      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
+      "size": "1.48GB"
+    },
+    {
+      "name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
+      "type": "controlnet",
+      "base": "SDXL",
+      "save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
+      "description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
+      "reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
+      "filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
+      "url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
+      "size": "46.2MB"
+    }
+  ]
 }

node_db/new/model-list.json

@@ -1,5 +1,96 @@
 {
   "models": [
+    {
+      "name": "deepseek-ai/Janus-Pro-1B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-1B",
+      "size": "7.8GB"
+    },
+    {
+      "name": "deepseek-ai/Janus-Pro-7B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-7B",
+      "size": "14.85GB"
+    },
+
+    {
+      "name": "Leoxing/pia.ckpt",
+      "type": "animatediff-pia",
+      "base": "SD1.x",
+      "save_path": "animatediff_models",
+      "description": "AnimateDiff-PIA Model",
+      "reference": "https://huggingface.co/Leoxing/PIA/tree/main",
+      "filename": "pia.ckpt",
+      "url": "https://huggingface.co/Leoxing/PIA/resolve/main/pia.ckpt",
+      "size": "1.67GB"
+    },
+
+    {
+      "name": "comfyanonymous/cosmos_cv8x8x8_1.0.safetensors",
+      "type": "VAE",
+      "base": "Cosmos-1.0",
+      "save_path": "default",
+      "description": "VAE model for Cosmos 1.0",
+      "reference": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/tree/main",
+      "filename": "cosmos_cv8x8x8_1.0.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/resolve/main/vae/cosmos_cv8x8x8_1.0.safetensors",
+      "size": "211MB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "size": "28.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "size": "28.5GB"
+    },
+
     {
       "name": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
       "type": "clip",
@@ -507,7 +598,7 @@
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -518,7 +609,7 @@
       "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
       "type": "clip",
       "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
       "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
       "reference": "https://huggingface.co/zer0int",
       "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -561,18 +652,6 @@
       "size": "1.39GB"
     },
 
-    {
-      "name": "BAAI/SegGPT",
-      "type": "SegGPT",
-      "base": "SegGPT",
-      "save_path": "custom_nodes/comfyui-SegGPT",
-      "description": "SegGPT",
-      "reference": "https://huggingface.co/BAAI/SegGPT",
-      "filename": "seggpt_vit_large.pth",
-      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
-      "size": "1.48GB"
-    },
-
     {
       "name": "DMD2 LoRA (4steps)",
       "type": "lora",
@@ -594,140 +673,6 @@
       "filename": "dmd2_sdxl_4step_lora_fp16.safetensors",
       "url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors",
       "size": "394MB"
-    },
-
-    {
-      "name": "Hyper-SD LoRA (1step) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (1step) - SD1.5",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-1step-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-1step-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (2steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (2steps) - SD1.5",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-2steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-2steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (4steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (4steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-4steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (8steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (8steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-8steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD CFG LoRA (8steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-CFG-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (12steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD CFG LoRA (12steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-12steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-12steps-CFG-lora.safetensors",
-      "size": "269MB"
-    },
-
-    {
-      "name": "Hyper-SD LoRA (1step) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (1step) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-1step-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-1step-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (2steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (2steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-2steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-2steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (4steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (4steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-4steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (8steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (8steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-8steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD CFG LoRA (8steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-CFG-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (12steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD CFG LoRA (12steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-12steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-12steps-CFG-lora.safetensors",
-      "size": "787MB"
     }
   ]
 }

node_db/tutorial/custom-node-list.json

@@ -291,6 +291,16 @@
             ],
             "install_type": "git-clone",
             "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
+        },
+        {
+            "author": "xhiroga",
+            "title": "ComfyUI-TypeScript-CustomNode",
+            "reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
+            "files": [
+                "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
+            ],
+            "install_type": "git-clone",
+            "description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
         }
     ]
 }

prestartup_script.py

@@ -9,6 +9,7 @@ import platform
 import json
 import ast
 import logging
+import traceback
 
 glob_path = os.path.join(os.path.dirname(__file__), "glob")
 sys.path.append(glob_path)
@@ -19,13 +20,14 @@ import cm_global
 import manager_downloader
 import folder_paths
 
-try:
+import datetime
+if hasattr(datetime, 'datetime'):
     from datetime import datetime
     def current_timestamp():
         return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
-except:
+else:
+    # NOTE: Occurs in some Mac environments.
     import time
-    import datetime
     logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{datetime.__file__}'")
     def current_timestamp():
         return str(time.time()).split('.')[0]
@@ -56,26 +58,19 @@ def is_import_failed_extension(name):
     return name in import_failed_extensions
 
 
-def check_file_logging():
-    global enable_file_logging
-    try:
-        import configparser
-        config = configparser.ConfigParser()
-        config.read(manager_config_path)
-        default_conf = config['default']
-
-        if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
-            enable_file_logging = False
-    except Exception:
-        pass
-
-
-check_file_logging()
-
 comfy_path = os.environ.get('COMFYUI_PATH')
+comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
+
+if comfy_path is None:
+    # legacy env var
+    comfy_path = os.environ.get('COMFYUI_PATH')
+
 if comfy_path is None:
     comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
 
+if comfy_base_path is None:
+    comfy_base_path = comfy_path
+
 sys.__comfyui_manager_register_message_collapse = register_message_collapse
 sys.__comfyui_manager_is_import_failed_extension = is_import_failed_extension
 cm_global.register_api('cm.register_message_collapse', register_message_collapse)
@@ -93,6 +88,32 @@ manager_config_path = os.path.join(manager_files_path, 'config.ini')
 cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
 
 
+default_conf = {}
+
+def read_config():
+    global default_conf
+    try:
+        import configparser
+        config = configparser.ConfigParser()
+        config.read(manager_config_path)
+        default_conf = config['default']
+    except Exception:
+        pass
+
+def read_uv_mode():
+    if 'use_uv' in default_conf:
+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
+
+def check_file_logging():
+    global enable_file_logging
+    if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
+        enable_file_logging = False
+
+
+read_config()
+read_uv_mode()
+check_file_logging()
+
 cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
 if os.path.exists(manager_pip_overrides_path):
     with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
@@ -146,6 +167,48 @@ def process_wrap(cmd_str, cwd_path, handler=None, env=None):
     return process.wait()
 
 
+original_stdout = sys.stdout
+
+
+def try_get_custom_nodes(x):
+    for custom_nodes_dir in folder_paths.get_folder_paths('custom_nodes'):
+        if x.startswith(custom_nodes_dir):
+            relative_path = os.path.relpath(x, custom_nodes_dir)
+            next_segment = relative_path.split(os.sep)[0]
+            if next_segment.lower() != 'comfyui-manager':
+                return next_segment, os.path.join(custom_nodes_dir, next_segment)
+    return None
+
+
+def extract_origin_module():
+    stack = traceback.extract_stack()[:-2]
+    for frame in reversed(stack):
+        info = try_get_custom_nodes(frame.filename)
+        if info is None:
+            continue
+        else:
+            return info
+    return None
+
+def extract_origin_module_from_strings(file_paths):
+    for filepath in file_paths:
+        info = try_get_custom_nodes(filepath)
+        if info is None:
+            continue
+        else:
+            return info
+    return None
+
+
+def finalize_startup():
+    res = {}
+    for k, v in cm_global.error_dict.items():
+        if v['path'] in import_failed_extensions:
+            res[k] = v
+
+    cm_global.error_dict = res
+
+
 try:
     if '--port' in sys.argv:
         port_index = sys.argv.index('--port')
@@ -162,6 +225,9 @@ try:
     if enable_file_logging:
         log_path_base = os.path.join(folder_paths.user_directory, 'comfyui')
 
+        if not os.path.exists(folder_paths.user_directory):
+            os.makedirs(folder_paths.user_directory)
+
         if os.path.exists(f"{log_path_base}{postfix}.log"):
             if os.path.exists(f"{log_path_base}{postfix}.prev.log"):
                 if os.path.exists(f"{log_path_base}{postfix}.prev2.log"):
@@ -225,8 +291,16 @@ try:
                 if match:
                     import_failed_extensions.add(match.group(1).strip())
 
-                if 'Starting server' in message:
-                    is_start_mode = False
+                if not self.is_stdout:
+                    origin_info = extract_origin_module()
+                    if origin_info is not None:
+                        name, origin_path = origin_info
+                        
+                        if name != 'comfyui-manager':
+                            if name not in cm_global.error_dict:
+                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
+
+                            cm_global.error_dict[name]['msg'] += message
 
             if not self.is_stdout:
                 match = re.search(pat_tqdm, message)
@@ -311,12 +385,34 @@ try:
                 if match:
                     import_failed_extensions.add(match.group(1).strip())
 
+                if 'Traceback' in message:
+                    file_lists = self._extract_file_paths(message)
+                    origin_info = extract_origin_module_from_strings(file_lists)
+                    if origin_info is not None:
+                        name, origin_path = origin_info
+                        
+                        if name != 'comfyui-manager':
+                            if name not in cm_global.error_dict:
+                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
+
+                            cm_global.error_dict[name]['msg'] += message
+
                 if 'Starting server' in message:
                     is_start_mode = False
+                    finalize_startup()
 
             if stderr_wrapper:
                 stderr_wrapper.sync_write(message+'\n', file_only=True)
 
+        def _extract_file_paths(self, msg):
+            file_paths = []
+            for line in msg.split('\n'):
+                match = re.findall(r'File \"(.*?)\", line \d+', line)
+                for x in match:
+                    if not x.startswith('<'):
+                        file_paths.extend(match)
+            return file_paths
+
 
     logging.getLogger().addHandler(LoggingHandler())
 
@@ -326,19 +422,20 @@ except Exception as e:
 
 
 try:
-    import git  # noqa: F401
+    import git   # noqa: F401
     import toml  # noqa: F401
+    import rich  # noqa: F401
 except ModuleNotFoundError:
     my_path = os.path.dirname(__file__)
     requirements_path = os.path.join(my_path, "requirements.txt")
 
     print("## ComfyUI-Manager: installing dependencies. (GitPython)")
     try:
-        result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
+        result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
     except subprocess.CalledProcessError:
         print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
         try:
-            result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
+            result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
         except subprocess.CalledProcessError:
             print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
 
@@ -354,6 +451,7 @@ print("** Platform:", platform.system())
 print("** Python version:", sys.version)
 print("** Python executable:", sys.executable)
 print("** ComfyUI Path:", comfy_path)
+print("** ComfyUI Base Folder Path:", comfy_base_path)
 print("** User directory:", folder_paths.user_directory)
 print("** ComfyUI-Manager config path:", manager_config_path)
 
@@ -366,11 +464,6 @@ else:
 
 def read_downgrade_blacklist():
     try:
-        import configparser
-        config = configparser.ConfigParser()
-        config.read(manager_config_path)
-        default_conf = config['default']
-
         if 'downgrade_blacklist' in default_conf:
             items = default_conf['downgrade_blacklist'].split(',')
             items = [x.strip() for x in items if x != '']
@@ -385,19 +478,13 @@ read_downgrade_blacklist()
 
 def check_bypass_ssl():
     try:
-        import configparser
         import ssl
-        config = configparser.ConfigParser()
-        config.read(manager_config_path)
-        default_conf = config['default']
-
         if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
             print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
             ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
     except Exception:
         pass
 
-
 check_bypass_ssl()
 
 
@@ -485,7 +572,8 @@ if os.path.exists(restore_snapshot_path):
 
         print("[ComfyUI-Manager] Restore snapshot.")
         new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
+        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
 
         cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
         exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
@@ -516,9 +604,9 @@ def execute_lazy_install_script(repo_path, executable):
                 if package_name and not is_installed(package_name):
                     if '--index-url' in package_name:
                         s = package_name.split('--index-url')
-                        install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
+                        install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
                     else:
-                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                        install_cmd = manager_util.make_pip_cmd(["install", package_name])
 
                     process_wrap(install_cmd, repo_path)
 
@@ -528,7 +616,8 @@ def execute_lazy_install_script(repo_path, executable):
         install_cmd = [executable, "install.py"]
 
         new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
+        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
         process_wrap(install_cmd, repo_path, env=new_env)
 
 
@@ -590,6 +679,7 @@ def execute_migration(moves):
             shutil.move(x[0], x[1])
             print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
 
+script_executed = False
 
 # Check if script_list_path exists
 if os.path.exists(script_list_path):
@@ -630,7 +720,8 @@ if os.path.exists(script_list_path):
                     print(f"\n## Execute install/(de)activation script for '{script[0]}'")
 
                     new_env = os.environ.copy()
-                    new_env["COMFYUI_PATH"] = comfy_path
+                    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+                        new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
                     exit_code = process_wrap(script[1:], script[0], env=new_env)
 
                     if exit_code != 0:
@@ -643,6 +734,7 @@ if os.path.exists(script_list_path):
 
     # Remove the script_list_path file
     if os.path.exists(script_list_path):
+        script_executed = True
         os.remove(script_list_path)
         
     print("\n[ComfyUI-Manager] Startup script completed.")
@@ -654,6 +746,29 @@ del processed_install
 del pip_fixer
 manager_util.clear_pip_cache()
 
+if script_executed:
+    # Restart
+    print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
+
+    if '__COMFY_CLI_SESSION__' in os.environ:
+        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
+            pass
+
+        print("--------------------------------------------------------------------------\n")
+        exit(0)
+    else:
+        sys_argv = sys.argv.copy()
+
+        if sys.platform.startswith('win32'):
+            cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
+        else:
+            cmds = [sys.executable] + sys_argv
+
+        print(f"Command: {cmds}", flush=True)
+        print("--------------------------------------------------------------------------\n")
+
+        os.execv(sys.executable, cmds)
+
 
 def check_windows_event_loop_policy():
     try:

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.7"
+version = "3.21.3"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
 

requirements.txt

@@ -6,4 +6,5 @@ huggingface-hub>0.20
 typer
 rich
 typing-extensions
-toml
+toml
+uv

scripts/install-comfyui-venv-linux.sh

@@ -6,7 +6,7 @@ python -m venv venv
 source venv/bin/activate
 python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
 python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/ComfyUI-Manager/requirements.txt
+python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
 cd ..
 echo "#!/bin/bash" > run_gpu.sh
 echo "cd ComfyUI" >> run_gpu.sh