nit

Use module name without @Version in /customnode/installed object key

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main
+      - main-blocked
     paths:
       - "pyproject.toml"
 

.github/workflows/ruff.yml

@@ -0,0 +1,23 @@
+name: Python Linting
+
+on: [push, pull_request]
+
+jobs:
+  ruff:
+    name: Run Ruff
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Install Ruff
+      run: pip install ruff
+
+    - name: Run Ruff
+      run: ruff check .

.gitignore

@@ -1,6 +1,8 @@
 __pycache__/
 .idea/
 .vscode/
+.history/
+*.code-workspace
 .tmp
 .cache
 config.ini
@@ -13,3 +15,5 @@ channels.list
 comfyworkflows_sharekey
 github-stats-cache.json
 pip_overrides.json
+*.json
+check2.sh

README.md

@@ -204,7 +204,6 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 * Please submit a pull request to update either the custom-node-list.json or model-list.json file.
 
 * The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
-  * Or you can provide manually `node_list.json` file.
 
 ```
 NODE_CLASS_MAPPINGS = {
@@ -218,6 +217,7 @@ NODE_CLASS_MAPPINGS.update({
     "SemSegPreprocessor": Uniformer_SemSegPreprocessor,
 })
 ```
+  * Or you can provide manually `node_list.json` file.
 
 * When you write a docstring in the header of the .py file for the Node as follows, it will be used for managing the database in the Manager.
   * Currently, only the `nickname` is being used, but other parts will also be utilized in the future.
@@ -320,6 +320,9 @@ NODE_CLASS_MAPPINGS.update({
 * Use `aria2` as downloader
   * [howto](docs/en/use_aria2.md)
 
+* If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
+  * This option can be used if performance issues occur in a Colab+GDrive environment.
+
 ## Scanner
 When you run the `scan.sh` script:
 
@@ -363,10 +366,10 @@ When you run the `scan.sh` script:
   * `high` level risky features
     * `Install via git url`, `pip install`
     * Installation of custom nodes registered not in the `default channel`.
-    * Display terminal log
+    * Fix custom nodes
   
   * `middle` level risky features
-    * Uninstall/Update/Fix custom nodes
+    * Uninstall/Update
     * Installation of custom nodes registered in the `default channel`.
     * Restore/Remove Snapshot
     * Restart
@@ -391,7 +394,6 @@ When you run the `scan.sh` script:
 * https://github.com/SimithWang/comfyui-renameImages
 * https://github.com/Tcheko243/ComfyUI-Photographer-Alpha7-Nodes
 * https://github.com/Limbicnation/ComfyUINodeToolbox
-* https://github.com/chenpipi0807/pip_longsize
 * https://github.com/APZmedia/ComfyUI-APZmedia-srtTools
 
 ## Roadmap

__init__.py

@@ -1,12 +1,15 @@
 import os
+import sys
 
 cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
 
 if not os.path.exists(cli_mode_flag):
-    from .glob import manager_server
+    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+    import manager_server  # noqa: F401
+    import share_3rdparty  # noqa: F401
     WEB_DIRECTORY = "js"
 else:
-    print(f"\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
+    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
 
 NODE_CLASS_MAPPINGS = {}
 __all__ = ['NODE_CLASS_MAPPINGS']

check.sh

@@ -9,6 +9,7 @@ files=(
     "alter-list.json"
     "extension-node-map.json"
     "github-stats.json"
+    "extras.json"
     "node_db/new/custom-node-list.json"
     "node_db/new/model-list.json"
     "node_db/new/extension-node-map.json"

cm-cli.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+python cm-cli.py $*

extras.json

@@ -0,0 +1,25 @@
+{
+    "favorites": [
+        "comfyui_ipadapter_plus",
+        "comfyui-animatediff-evolved",
+        "comfyui_controlnet_aux",
+        "comfyui-impact-pack",
+        "comfyui-custom-scripts",
+        "comfyui-layerdiffuse",
+        "comfyui-liveportraitkj",
+        "aigodlike-comfyui-translation",
+        "comfyui-reactor-node",
+        "comfyui_instantid",
+        "sd-dynamic-thresholding",
+        "pr-was-node-suite-comfyui-47064894",
+        "comfyui-advancedliveportrait",
+        "comfyui_layerstyle",
+        "efficiency-nodes-comfyui",
+        "comfyui-crystools",
+        "comfyui-advanced-controlnet",
+        "comfyui-videohelpersuite",
+        "comfyui-kjnodes",
+        "comfy-mtb",
+        "comfyui_essentials"
+    ]
+}

git_helper.py

@@ -5,7 +5,6 @@ import traceback
 
 import git
 import configparser
-import re
 import json
 import yaml
 import requests
@@ -13,6 +12,14 @@ from tqdm.auto import tqdm
 from git.remote import RemoteProgress
 
 
+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(os.path.dirname(__file__), '..', '..'))
+
+
+
 def download_url(url, dest_folder, filename=None):
     # Ensure the destination folder exists
     if not os.path.exists(dest_folder):
@@ -41,7 +48,7 @@ nodelist_path = os.path.join(os.path.dirname(__file__), "custom-node-list.json")
 working_directory = os.getcwd()
 
 if os.path.basename(working_directory) != 'custom_nodes':
-    print(f"WARN: This script should be executed in custom_nodes dir")
+    print("WARN: This script should be executed in custom_nodes dir")
     print(f"DBG: INFO {working_directory}")
     print(f"DBG: INFO {sys.argv}")
     # exit(-1)
@@ -59,8 +66,10 @@ class GitProgress(RemoteProgress):
         self.pbar.refresh()
 
 
-def gitclone(custom_nodes_path, url, target_hash=None):
+def gitclone(custom_nodes_path, url, target_hash=None, repo_path=None):
     repo_name = os.path.splitext(os.path.basename(url))[0]
+
+    if repo_path is None:
         repo_path = os.path.join(custom_nodes_path, repo_name)
 
     # Clone the repository from the remote URL
@@ -94,7 +103,12 @@ def gitcheck(path, do_fetch=False):
 
         # Get the current commit hash and the commit hash of the remote branch
         commit_hash = repo.head.commit.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 CHECK: True")  # non default branch is treated as updatable
+            return
 
         # Compare the commit hashes to determine if the local repository is behind the remote repository
         if commit_hash != remote_commit_hash:
@@ -113,10 +127,7 @@ def gitcheck(path, do_fetch=False):
 
 
 def switch_to_default_branch(repo):
-    show_result = repo.git.remote("show", "origin")
+    default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
-    matches = re.search(r"\s*HEAD branch:\s*(.*)", show_result)
-    if matches:
-        default_branch = matches.group(1)
     repo.git.checkout(default_branch)
 
 
@@ -128,6 +139,7 @@ def gitpull(path):
     # Pull the latest changes from the remote repository
     repo = git.Repo(path)
     if repo.is_dirty():
+        print(f"STASH: '{path}' is dirty.")
         repo.git.stash()
 
     commit_hash = repo.head.commit.hexsha
@@ -141,6 +153,11 @@ def gitpull(path):
         remote_name = current_branch.tracking_branch().remote_name
         remote = repo.remote(name=remote_name)
 
+        if f'{remote_name}/{branch_name}' not in repo.refs:
+            switch_to_default_branch(repo)
+            current_branch = repo.active_branch
+            branch_name = current_branch.name
+
         remote.fetch()
         remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
 
@@ -166,9 +183,7 @@ def gitpull(path):
 
 
 def checkout_comfyui_hash(target_hash):
-    repo_path = os.path.abspath(os.path.join(working_directory, '..'))  # ComfyUI dir
+    repo = git.Repo(comfy_path)
-
-    repo = git.Repo(repo_path)
     commit_hash = repo.head.commit.hexsha
 
     if commit_hash != target_hash:
@@ -191,7 +206,7 @@ def checkout_custom_node_hash(git_custom_node_infos):
         repo_name_to_url[repo_name] = url
 
     for path in os.listdir(working_directory):
-        if path.endswith("ComfyUI-Manager"):
+        if '@' in path or path.endswith("ComfyUI-Manager"):
             continue
 
         fullpath = os.path.join(working_directory, path)
@@ -250,6 +265,9 @@ def checkout_custom_node_hash(git_custom_node_infos):
 
     # clone missing
     for k, v in git_custom_node_infos.items():
+        if 'ComfyUI-Manager' in k:
+            continue
+
         if not v['disabled']:
             repo_name = k.split('/')[-1]
             if repo_name.endswith('.git'):
@@ -258,7 +276,7 @@ def checkout_custom_node_hash(git_custom_node_infos):
             path = os.path.join(working_directory, repo_name)
             if not os.path.exists(path):
                 print(f"CLONE: {path}")
-                gitclone(working_directory, k, v['hash'])
+                gitclone(working_directory, k, target_hash=v['hash'])
 
 
 def invalidate_custom_node_file(file_custom_node_infos):
@@ -308,19 +326,18 @@ def invalidate_custom_node_file(file_custom_node_infos):
                     download_url(url, working_directory)
 
 
-def apply_snapshot(target):
+def apply_snapshot(path):
     try:
-        path = os.path.join(os.path.dirname(__file__), 'snapshots', f"{target}")
         if os.path.exists(path):
-            if not target.endswith('.json') and not target.endswith('.yaml'):
+            if not path.endswith('.json') and not path.endswith('.yaml'):
                 print(f"Snapshot file not found: `{path}`")
                 print("APPLY SNAPSHOT: False")
                 return None
 
             with open(path, 'r', encoding="UTF-8") as snapshot_file:
-                if target.endswith('.json'):
+                if path.endswith('.json'):
                     info = json.load(snapshot_file)
-                elif target.endswith('.yaml'):
+                elif path.endswith('.yaml'):
                     info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
                     info = info['custom_nodes']
                 else:
@@ -425,7 +442,11 @@ setup_environment()
 
 try:
     if sys.argv[1] == "--clone":
-        gitclone(sys.argv[2], sys.argv[3])
+        repo_path = None
+        if len(sys.argv) > 4:
+            repo_path = sys.argv[4]
+
+        gitclone(sys.argv[2], sys.argv[3], repo_path=repo_path)
     elif sys.argv[1] == "--check":
         gitcheck(sys.argv[2], False)
     elif sys.argv[1] == "--fetch":

glob/cnr_utils.py

@@ -0,0 +1,100 @@
+import requests
+from dataclasses import dataclass
+from typing import List
+import manager_util
+
+base_url = "https://api.comfy.org"
+
+
+async def get_cnr_data(page=1, limit=1000, cache_mode=True):
+    try:
+        uri = f'{base_url}/nodes?page={page}&limit={limit}'
+        json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
+
+        for v in json_obj['nodes']:
+            if 'latest_version' not in v:
+                v['latest_version'] = dict(version='nightly')
+
+        return json_obj['nodes']
+    except:
+        res = {}
+        print("Cannot connect to comfyregistry.")
+
+    return res
+
+
+@dataclass
+class NodeVersion:
+    changelog: str
+    dependencies: List[str]
+    deprecated: bool
+    id: str
+    version: str
+    download_url: str
+
+
+def map_node_version(api_node_version):
+    """
+    Maps node version data from API response to NodeVersion dataclass.
+
+    Args:
+        api_data (dict): The 'node_version' part of the API response.
+
+    Returns:
+        NodeVersion: An instance of NodeVersion dataclass populated with data from the API.
+    """
+    return NodeVersion(
+        changelog=api_node_version.get(
+            "changelog", ""
+        ),  # Provide a default value if 'changelog' is missing
+        dependencies=api_node_version.get(
+            "dependencies", []
+        ),  # Provide a default empty list if 'dependencies' is missing
+        deprecated=api_node_version.get(
+            "deprecated", False
+        ),  # Assume False if 'deprecated' is not specified
+        id=api_node_version[
+            "id"
+        ],  # 'id' should be mandatory; raise KeyError if missing
+        version=api_node_version[
+            "version"
+        ],  # 'version' should be mandatory; raise KeyError if missing
+        download_url=api_node_version.get(
+            "downloadUrl", ""
+        ),  # Provide a default value if 'downloadUrl' is missing
+    )
+
+
+def install_node(node_id, version=None):
+    """
+    Retrieves the node version for installation.
+
+    Args:
+      node_id (str): The unique identifier of the node.
+      version (str, optional): Specific version of the node to retrieve. If omitted, the latest version is returned.
+
+    Returns:
+      NodeVersion: Node version data or error message.
+    """
+    if version is None:
+        url = f"{base_url}/nodes/{node_id}/install"
+    else:
+        url = f"{base_url}/nodes/{node_id}/install?version={version}"
+
+    response = requests.get(url)
+    if response.status_code == 200:
+        # Convert the API response to a NodeVersion object
+        return map_node_version(response.json())
+    else:
+        return None
+
+
+def all_versions_of_node(node_id):
+    url = f"https://api.comfy.org/nodes/{node_id}/versions"
+
+    response = requests.get(url)
+    if response.status_code == 200:
+        return response.json()
+    else:
+        return None
+

glob/manager_downloader.py

@@ -1,5 +1,7 @@
 import os
 from urllib.parse import urlparse
+import urllib
+import sys
 
 aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
 HF_ENDPOINT = os.getenv('HF_ENDPOINT')
@@ -14,12 +16,32 @@ if aria2 is not None:
     aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
 
 
+def basic_download_url(url, dest_folder, filename):
+    import requests
+
+    # Ensure the destination folder exists
+    if not os.path.exists(dest_folder):
+        os.makedirs(dest_folder)
+
+    # Full path to save the file
+    dest_path = os.path.join(dest_folder, filename)
+
+    # Download the file
+    response = requests.get(url, stream=True)
+    if response.status_code == 200:
+        with open(dest_path, 'wb') as file:
+            for chunk in response.iter_content(chunk_size=1024):
+                if chunk:
+                    file.write(chunk)
+    else:
+        raise Exception(f"Failed to download file from {url}")
+
+
 def download_url(model_url: str, model_dir: str, filename: str):
     if aria2:
         return aria2_download_url(model_url, model_dir, filename)
     else:
         from torchvision.datasets.utils import download_url as torchvision_download_url
-
         return torchvision_download_url(model_url, model_dir, filename)
 
 
@@ -68,3 +90,26 @@ def aria2_download_url(model_url: str, model_dir: str, filename: str):
                 progress_bar.update(download.completed_length - progress_bar.n)
                 time.sleep(1)
                 download.update()
+
+
+def download_url_with_agent(url, save_path):
+    try:
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'}
+
+        req = urllib.request.Request(url, headers=headers)
+        response = urllib.request.urlopen(req)
+        data = response.read()
+
+        if not os.path.exists(os.path.dirname(save_path)):
+            os.makedirs(os.path.dirname(save_path))
+
+        with open(save_path, 'wb') as f:
+            f.write(data)
+
+    except Exception as e:
+        print(f"Download error: {url} / {e}", file=sys.stderr)
+        return False
+
+    print("Installation was successful.")
+    return True

glob/manager_util.py

@@ -1,8 +1,24 @@
-try:
+import aiohttp
-    from distutils.version import StrictVersion
+import json
-except:
+import threading
-    print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
+import os
-    class StrictVersion:
+from datetime import datetime
+import subprocess
+import sys
+import re
+
+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')
+
+
+# DON'T USE StrictVersion - cannot handle pre_release version
+# try:
+#     from distutils.version import StrictVersion
+# except:
+#     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
+class StrictVersion:
     def __init__(self, version_string):
         self.version_string = version_string
         self.major = 0
@@ -61,3 +77,235 @@ except:
     def __ne__(self, other):
         return not self == other
 
+
+def simple_hash(input_string):
+    hash_value = 0
+    for char in input_string:
+        hash_value = (hash_value * 31 + ord(char)) % (2**32)
+
+    return hash_value
+
+
+def is_file_created_within_one_day(file_path):
+    if not os.path.exists(file_path):
+        return False
+
+    file_creation_time = os.path.getctime(file_path)
+    current_time = datetime.now().timestamp()
+    time_difference = current_time - file_creation_time
+
+    return time_difference <= 86400
+
+
+async def get_data(uri, silent=False):
+    if not silent:
+        print(f"FETCH DATA from: {uri}", end="")
+
+    if uri.startswith("http"):
+        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+            async with session.get(uri) as resp:
+                json_text = await resp.text()
+    else:
+        with cache_lock:
+            with open(uri, "r", encoding="utf-8") as f:
+                json_text = f.read()
+
+    json_obj = json.loads(json_text)
+
+    if not silent:
+        print(" [DONE]")
+
+    return json_obj
+
+
+async def get_data_with_cache(uri, silent=False, cache_mode=True):
+    cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
+    cache_uri = os.path.join(cache_dir, cache_uri+'.json')
+
+    if cache_mode and is_file_created_within_one_day(cache_uri):
+        json_obj = await get_data(cache_uri, silent=silent)
+    else:
+        json_obj = await get_data(uri, silent=silent)
+
+        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:
+                    print(f"[ComfyUI-Manager] default cache updated: {uri}")
+
+    return json_obj
+
+
+def sanitize_tag(x):
+    return x.replace('<', '&lt;').replace('>', '&gt;')
+
+
+def extract_package_as_zip(file_path, extract_path):
+    import zipfile
+    try:
+        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}")
+        return extracted_files
+    except zipfile.BadZipFile:
+        print(f"File '{file_path}' is not a zip or is corrupted.")
+        return None
+
+
+pip_map = None
+
+
+def get_installed_packages(renew=False):
+    global pip_map
+
+    if renew or pip_map is None:
+        try:
+            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
+
+            pip_map = {}
+            for line in result.split('\n'):
+                x = line.strip()
+                if x:
+                    y = line.split()
+                    if y[0] == 'Package' or y[0].startswith('-'):
+                        continue
+
+                    pip_map[y[0]] = y[1]
+        except subprocess.CalledProcessError:
+            print("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
+            return set()
+
+    return pip_map
+
+
+def clear_pip_cache():
+    global pip_map
+    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',
+}
+
+
+class PIPFixer:
+    def __init__(self, prev_pip_versions):
+        self.prev_pip_versions = { **prev_pip_versions }
+
+    def torch_rollback(self):
+        spec = self.prev_pip_versions['torch'].split('+')
+        if len(spec) > 0:
+            platform = spec[1]
+        else:
+            cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
+            subprocess.check_output(cmd, universal_newlines=True)
+            print(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)
+
+        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")
+        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}")
+
+        subprocess.check_output(cmd, universal_newlines=True)
+
+    def fix_broken(self):
+        new_pip_versions = get_installed_packages(True)
+
+        # remove `comfy` python package
+        try:
+            if 'comfy' in new_pip_versions:
+                cmd = [sys.executable, '-m', 'pip', '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.")
+        except Exception as e:
+            print("[manager-core] Failed to uninstall `comfy` python package")
+            print(e)
+
+        # fix torch - reinstall torch packages if version is changed
+        try:
+            if 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)
+
+        # fix opencv
+        try:
+            ocp = new_pip_versions.get('opencv-contrib-python')
+            ocph = new_pip_versions.get('opencv-contrib-python-headless')
+            op = new_pip_versions.get('opencv-python')
+            oph = new_pip_versions.get('opencv-python-headless')
+
+            versions = [ocp, ocph, op, oph]
+            versions = [StrictVersion(x) for x in versions if x is not None]
+            versions.sort(reverse=True)
+
+            if len(versions) > 0:
+                # upgrade to maximum version
+                targets = []
+                cur = versions[0]
+                if ocp is not None and StrictVersion(ocp) != cur:
+                    targets.append('opencv-contrib-python')
+                if ocph is not None and StrictVersion(ocph) != cur:
+                    targets.append('opencv-contrib-python-headless')
+                if op is not None and StrictVersion(op) != cur:
+                    targets.append('opencv-python')
+                if oph is not None and StrictVersion(oph) != cur:
+                    targets.append('opencv-python-headless')
+
+                if len(targets) > 0:
+                    for x in targets:
+                        cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
+                        subprocess.check_output(cmd, universal_newlines=True)
+
+                    print(f"[manager-core] 'opencv' dependencies were fixed: {targets}")
+        except Exception as e:
+            print("[manager-core] Failed to restore opencv")
+            print(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)
+        except Exception as e:
+            print("[manager-core] Failed to restore numpy")
+            print(e)
+
+
+def sanitize(data):
+    return data.replace("<", "&lt;").replace(">", "&gt;")
+
+
+def sanitize_filename(input_string):
+    result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
+    return result_string

glob/security_check.py

@@ -29,12 +29,37 @@ Detailed information: https://old.reddit.com/r/comfyui/comments/1dbls5n/psa_if_y
 2. Remove files: lolMiner*, 4G_Ethash_Linux_Readme.txt, mine* in ComfyUI dir.
 
 (Reinstall ComfyUI is recommended.)
+    """,
+    "ultralytics==8.3.41": f"""
+Execute following commands:
+    {sys.executable} -m pip uninstall ultralytics
+    {sys.executable} -m pip install ultralytics==8.3.40
+    
+And kill and remove /tmp/ultralytics_runner
+
+
+The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
+https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
+    """,
+    "ultralytics==8.3.42": f"""
+Execute following commands:
+    {sys.executable} -m pip uninstall ultralytics
+    {sys.executable} -m pip install ultralytics==8.3.40
+
+And kill and remove /tmp/ultralytics_runner
+
+
+The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
+https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
     """
              }
 
     node_blacklist = {"ComfyUI_LLMVISION": "ComfyUI_LLMVISION"}
 
-    pip_blacklist = {"AppleBotzz": "ComfyUI_LLMVISION"}
+    pip_blacklist = {
+        "AppleBotzz": "ComfyUI_LLMVISION",
+        "ultralytics==8.3.41": "ultralytics==8.3.41"
+    }
 
     file_blacklist = {
         "ComfyUI_LLMVISION": ["%LocalAppData%\\rundll64.exe"],
@@ -84,7 +109,7 @@ Detailed information: https://old.reddit.com/r/comfyui/comments/1dbls5n/psa_if_y
 
         for x in detected:
             print(f"\n======== TARGET: {x} =========")
-            print(f"\nTODO:")
+            print("\nTODO:")
             print(guide.get(x))
 
         exit(-1)

glob/share_3rdparty.py

@@ -0,0 +1,384 @@
+import mimetypes
+import manager_core as core
+import os
+from aiohttp import web
+import aiohttp
+import json
+import hashlib
+
+import folder_paths
+from server import PromptServer
+
+
+def extract_model_file_names(json_data):
+    """Extract unique file names from the input JSON data."""
+    file_names = set()
+    model_filename_extensions = {'.safetensors', '.ckpt', '.pt', '.pth', '.bin'}
+
+    # Recursively search for file names in the JSON data
+    def recursive_search(data):
+        if isinstance(data, dict):
+            for value in data.values():
+                recursive_search(value)
+        elif isinstance(data, list):
+            for item in data:
+                recursive_search(item)
+        elif isinstance(data, str) and '.' in data:
+            file_names.add(os.path.basename(data))  # file_names.add(data)
+
+    recursive_search(json_data)
+    return [f for f in list(file_names) if os.path.splitext(f)[1] in model_filename_extensions]
+
+
+def find_file_paths(base_dir, file_names):
+    """Find the paths of the files in the base directory."""
+    file_paths = {}
+
+    for root, dirs, files in os.walk(base_dir):
+        # Exclude certain directories
+        dirs[:] = [d for d in dirs if d not in ['.git']]
+
+        for file in files:
+            if file in file_names:
+                file_paths[file] = os.path.join(root, file)
+    return file_paths
+
+
+def compute_sha256_checksum(filepath):
+    """Compute the SHA256 checksum of a file, in chunks"""
+    sha256 = hashlib.sha256()
+    with open(filepath, 'rb') as f:
+        for chunk in iter(lambda: f.read(4096), b''):
+            sha256.update(chunk)
+    return sha256.hexdigest()
+
+
+@PromptServer.instance.routes.get("/manager/share_option")
+async def share_option(request):
+    if "value" in request.rel_url.query:
+        core.get_config()['share_option'] = request.rel_url.query['value']
+        core.write_config()
+    else:
+        return web.Response(text=core.get_config()['share_option'], status=200)
+
+    return web.Response(status=200)
+
+
+def get_openart_auth():
+    if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
+        return None
+    try:
+        with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
+            openart_key = f.read().strip()
+        return openart_key if openart_key else None
+    except:
+        return None
+
+
+def get_matrix_auth():
+    if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
+        return None
+    try:
+        with open(os.path.join(core.manager_files_path, "matrix_auth"), "r") as f:
+            matrix_auth = f.read()
+            homeserver, username, password = matrix_auth.strip().split("\n")
+            if not homeserver or not username or not password:
+                return None
+        return {
+            "homeserver": homeserver,
+            "username": username,
+            "password": password,
+        }
+    except:
+        return None
+
+
+def get_comfyworkflows_auth():
+    if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
+        return None
+    try:
+        with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
+            share_key = f.read()
+            if not share_key.strip():
+                return None
+        return share_key
+    except:
+        return None
+
+
+def get_youml_settings():
+    if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
+        return None
+    try:
+        with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
+            youml_settings = f.read().strip()
+        return youml_settings if youml_settings else None
+    except:
+        return None
+
+
+def set_youml_settings(settings):
+    with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
+        f.write(settings)
+
+
+@PromptServer.instance.routes.get("/manager/get_openart_auth")
+async def api_get_openart_auth(request):
+    # print("Getting stored Matrix credentials...")
+    openart_key = get_openart_auth()
+    if not openart_key:
+        return web.Response(status=404)
+    return web.json_response({"openart_key": openart_key})
+
+
+@PromptServer.instance.routes.post("/manager/set_openart_auth")
+async def api_set_openart_auth(request):
+    json_data = await request.json()
+    openart_key = json_data['openart_key']
+    with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
+        f.write(openart_key)
+    return web.Response(status=200)
+
+
+@PromptServer.instance.routes.get("/manager/get_matrix_auth")
+async def api_get_matrix_auth(request):
+    # print("Getting stored Matrix credentials...")
+    matrix_auth = get_matrix_auth()
+    if not matrix_auth:
+        return web.Response(status=404)
+    return web.json_response(matrix_auth)
+
+
+@PromptServer.instance.routes.get("/manager/youml/settings")
+async def api_get_youml_settings(request):
+    youml_settings = get_youml_settings()
+    if not youml_settings:
+        return web.Response(status=404)
+    return web.json_response(json.loads(youml_settings))
+
+
+@PromptServer.instance.routes.post("/manager/youml/settings")
+async def api_set_youml_settings(request):
+    json_data = await request.json()
+    set_youml_settings(json.dumps(json_data))
+    return web.Response(status=200)
+
+
+@PromptServer.instance.routes.get("/manager/get_comfyworkflows_auth")
+async def api_get_comfyworkflows_auth(request):
+    # Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
+    # in the same directory as the ComfyUI base folder
+    # print("Getting stored Comfyworkflows.com auth...")
+    comfyworkflows_auth = get_comfyworkflows_auth()
+    if not comfyworkflows_auth:
+        return web.Response(status=404)
+    return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
+
+
+@PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
+async def set_esheep_workflow_and_images(request):
+    json_data = await request.json()
+    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
+        json.dump(json_data, file, indent=4)
+        return web.Response(status=200)
+
+
+@PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
+async def get_esheep_workflow_and_images(request):
+    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
+        data = json.load(file)
+        return web.Response(status=200, text=json.dumps(data))
+
+
+def set_matrix_auth(json_data):
+    homeserver = json_data['homeserver']
+    username = json_data['username']
+    password = json_data['password']
+    with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
+        f.write("\n".join([homeserver, username, password]))
+
+
+def set_comfyworkflows_auth(comfyworkflows_sharekey):
+    with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
+        f.write(comfyworkflows_sharekey)
+
+
+def has_provided_matrix_auth(matrix_auth):
+    return matrix_auth['homeserver'].strip() and matrix_auth['username'].strip() and matrix_auth['password'].strip()
+
+
+def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
+    return comfyworkflows_sharekey.strip()
+
+
+@PromptServer.instance.routes.post("/manager/share")
+async def share_art(request):
+    # get json data
+    json_data = await request.json()
+
+    matrix_auth = json_data['matrix_auth']
+    comfyworkflows_sharekey = json_data['cw_auth']['cw_sharekey']
+
+    set_matrix_auth(matrix_auth)
+    set_comfyworkflows_auth(comfyworkflows_sharekey)
+
+    share_destinations = json_data['share_destinations']
+    credits = json_data['credits']
+    title = json_data['title']
+    description = json_data['description']
+    is_nsfw = json_data['is_nsfw']
+    prompt = json_data['prompt']
+    potential_outputs = json_data['potential_outputs']
+    selected_output_index = json_data['selected_output_index']
+
+    try:
+        output_to_share = potential_outputs[int(selected_output_index)]
+    except:
+        # for now, pick the first output
+        output_to_share = potential_outputs[0]
+
+    assert output_to_share['type'] in ('image', 'output')
+    output_dir = folder_paths.get_output_directory()
+
+    if output_to_share['type'] == 'image':
+        asset_filename = output_to_share['image']['filename']
+        asset_subfolder = output_to_share['image']['subfolder']
+
+        if output_to_share['image']['type'] == 'temp':
+            output_dir = folder_paths.get_temp_directory()
+    else:
+        asset_filename = output_to_share['output']['filename']
+        asset_subfolder = output_to_share['output']['subfolder']
+
+    if asset_subfolder:
+        asset_filepath = os.path.join(output_dir, asset_subfolder, asset_filename)
+    else:
+        asset_filepath = os.path.join(output_dir, asset_filename)
+
+    # get the mime type of the asset
+    assetFileType = mimetypes.guess_type(asset_filepath)[0]
+
+    share_website_host = "UNKNOWN"
+    if "comfyworkflows" in share_destinations:
+        share_website_host = "https://comfyworkflows.com"
+        share_endpoint = f"{share_website_host}/api"
+
+        # get presigned urls
+        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+            async with session.post(
+                    f"{share_endpoint}/get_presigned_urls",
+                    json={
+                        "assetFileName": asset_filename,
+                        "assetFileType": assetFileType,
+                        "workflowJsonFileName": 'workflow.json',
+                        "workflowJsonFileType": 'application/json',
+                    },
+            ) as resp:
+                assert resp.status == 200
+                presigned_urls_json = await resp.json()
+                assetFilePresignedUrl = presigned_urls_json["assetFilePresignedUrl"]
+                assetFileKey = presigned_urls_json["assetFileKey"]
+                workflowJsonFilePresignedUrl = presigned_urls_json["workflowJsonFilePresignedUrl"]
+                workflowJsonFileKey = presigned_urls_json["workflowJsonFileKey"]
+
+        # upload asset
+        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+            async with session.put(assetFilePresignedUrl, data=open(asset_filepath, "rb")) as resp:
+                assert resp.status == 200
+
+        # upload workflow json
+        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+            async with session.put(workflowJsonFilePresignedUrl, data=json.dumps(prompt['workflow']).encode('utf-8')) as resp:
+                assert resp.status == 200
+
+        model_filenames = extract_model_file_names(prompt['workflow'])
+        model_file_paths = find_file_paths(folder_paths.base_path, model_filenames)
+
+        models_info = {}
+        for filename, filepath in model_file_paths.items():
+            models_info[filename] = {
+                "filename": filename,
+                "sha256_checksum": compute_sha256_checksum(filepath),
+                "relative_path": os.path.relpath(filepath, folder_paths.base_path),
+            }
+
+        # make a POST request to /api/upload_workflow with form data key values
+        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+            form = aiohttp.FormData()
+            if comfyworkflows_sharekey:
+                form.add_field("shareKey", comfyworkflows_sharekey)
+            form.add_field("source", "comfyui_manager")
+            form.add_field("assetFileKey", assetFileKey)
+            form.add_field("assetFileType", assetFileType)
+            form.add_field("workflowJsonFileKey", workflowJsonFileKey)
+            form.add_field("sharedWorkflowWorkflowJsonString", json.dumps(prompt['workflow']))
+            form.add_field("sharedWorkflowPromptJsonString", json.dumps(prompt['output']))
+            form.add_field("shareWorkflowCredits", credits)
+            form.add_field("shareWorkflowTitle", title)
+            form.add_field("shareWorkflowDescription", description)
+            form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
+            form.add_field("currentSnapshot", json.dumps(core.get_current_snapshot()))
+            form.add_field("modelsInfo", json.dumps(models_info))
+
+            async with session.post(
+                    f"{share_endpoint}/upload_workflow",
+                    data=form,
+            ) as resp:
+                assert resp.status == 200
+                upload_workflow_json = await resp.json()
+                workflowId = upload_workflow_json["workflowId"]
+
+    # check if the user has provided Matrix credentials
+    if "matrix" in share_destinations:
+        comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
+        filename = os.path.basename(asset_filepath)
+        content_type = assetFileType
+
+        try:
+            from matrix_client.api import MatrixHttpApi
+            from matrix_client.client import MatrixClient
+
+            homeserver = 'matrix.org'
+            if matrix_auth:
+                homeserver = matrix_auth.get('homeserver', 'matrix.org')
+            homeserver = homeserver.replace("http://", "https://")
+            if not homeserver.startswith("https://"):
+                homeserver = "https://" + homeserver
+
+            client = MatrixClient(homeserver)
+            try:
+                token = client.login(username=matrix_auth['username'], password=matrix_auth['password'])
+                if not token:
+                    return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
+            except:
+                return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
+
+            matrix = MatrixHttpApi(homeserver, token=token)
+            with open(asset_filepath, 'rb') as f:
+                mxc_url = matrix.media_upload(f.read(), content_type, filename=filename)['content_uri']
+
+            workflow_json_mxc_url = matrix.media_upload(prompt['workflow'], 'application/json', filename='workflow.json')['content_uri']
+
+            text_content = ""
+            if title:
+                text_content += f"{title}\n"
+            if description:
+                text_content += f"{description}\n"
+            if credits:
+                text_content += f"\ncredits: {credits}\n"
+            matrix.send_message(comfyui_share_room_id, text_content)
+            matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
+            matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
+        except:
+            import traceback
+            traceback.print_exc()
+            return web.json_response({"error": "An error occurred when sharing your art to Matrix."}, content_type='application/json', status=500)
+
+    return web.json_response({
+        "comfyworkflows": {
+            "url": None if "comfyworkflows" not in share_destinations else f"{share_website_host}/workflows/{workflowId}",
+        },
+        "matrix": {
+            "success": None if "matrix" not in share_destinations else True
+        }
+    }, content_type='application/json', status=200)

js/cm-api.js

@@ -4,7 +4,7 @@ import { sleep } from "./common.js";
 
 async function tryInstallCustomNode(event) {
 	let msg = '-= [ComfyUI Manager] extension installation request =-\n\n';
-	msg += `The '${event.detail.sender}' extension requires the installation of the '${event.detail.title}' extension. `;
+	msg += `The '${event.detail.sender}' extension requires the installation of the '${event.detail.target.title}' extension. `;
 
 	if(event.detail.target.installed == 'Disabled') {
 		msg += 'However, the extension is currently disabled. Would you like to enable it and reboot?'

js/comfyui-manager.js

@@ -11,7 +11,7 @@ import {
 	showYouMLShareDialog
 } from "./comfyui-share-common.js";
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
-import { free_models, install_pip, install_via_git_url, manager_instance, rebootAPI, setManagerInstance, show_message } from "./common.js";
+import { free_models, install_pip, install_via_git_url, manager_instance, rebootAPI, migrateAPI, setManagerInstance, show_message } 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";
@@ -202,9 +202,44 @@ docStyle.innerHTML = `
 }
 `;
 
+function is_legacy_front() {
+    let compareVersion = '1.2.49';
+    try {
+        const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
+        if (typeof frontendVersion !== 'string') {
+            return false;
+        }
+
+        function parseVersion(versionString) {
+            const parts = versionString.split('.').map(Number);
+            return parts.length === 3 && parts.every(part => !isNaN(part)) ? parts : null;
+        }
+
+        const currentVersion = parseVersion(frontendVersion);
+        const comparisonVersion = parseVersion(compareVersion);
+
+        if (!currentVersion || !comparisonVersion) {
+            return false;
+        }
+
+        for (let i = 0; i < 3; i++) {
+            if (currentVersion[i] > comparisonVersion[i]) {
+                return false;
+            } else if (currentVersion[i] < comparisonVersion[i]) {
+                return true;
+            }
+        }
+
+        return false;
+    } catch {
+        return true;
+    }
+}
+
 document.head.appendChild(docStyle);
 
 var update_comfyui_button = null;
+var switch_comfyui_button = null;
 var fetch_updates_button = null;
 var update_all_button = null;
 var badge_mode = "none";
@@ -253,6 +288,18 @@ const style = `
 	color: white !important;
 }
 
+
+.cm-button-orange {
+	width: 310px;
+	height: 30px;
+	position: relative;
+	overflow: hidden;
+	font-size: 17px !important;
+	font-weight: bold;
+	background-color: orange !important;
+	color: black !important;
+}
+
 .cm-experimental-button {
 	width: 290px;
 	height: 30px;
@@ -561,6 +608,154 @@ async function updateComfyUI() {
 	}
 }
 
+function showVersionSelectorDialog(versions, current, onSelect) {
+		const dialog = new ComfyDialog();
+		dialog.element.style.zIndex = 100003;
+		dialog.element.style.width = "300px";
+		dialog.element.style.padding = "0";
+		dialog.element.style.backgroundColor = "#2a2a2a";
+		dialog.element.style.border = "1px solid #3a3a3a";
+		dialog.element.style.borderRadius = "8px";
+		dialog.element.style.boxSizing = "border-box";
+		dialog.element.style.overflow = "hidden";
+
+		const contentStyle = {
+			width: "300px",
+			display: "flex",
+			flexDirection: "column",
+			alignItems: "center",
+			padding: "20px",
+			boxSizing: "border-box",
+			gap: "15px"
+		};
+
+		let selectedVersion = versions[0];
+
+		const versionList = $el("select", {
+			multiple: true,
+			size: Math.min(10, versions.length),
+			style: {
+				width: "260px",
+				height: "auto",
+				backgroundColor: "#383838",
+				color: "#ffffff",
+				border: "1px solid #4a4a4a",
+				borderRadius: "4px",
+				padding: "5px",
+				boxSizing: "border-box"
+			}
+		},
+		versions.map((v, index) => $el("option", {
+			value: v,
+			textContent: v,
+			selected: v === current
+		}))
+		);
+
+		versionList.addEventListener('change', (e) => {
+			selectedVersion = e.target.value;
+			Array.from(e.target.options).forEach(opt => {
+				opt.selected = opt.value === selectedVersion;
+			});
+		});
+
+		const content = $el("div", {
+			style: contentStyle
+		}, [
+			$el("h3", {
+				textContent: "Select Version",
+				style: {
+					color: "#ffffff",
+					backgroundColor: "#1a1a1a",
+					padding: "10px 15px",
+					margin: "0 0 10px 0",
+					width: "260px",
+					textAlign: "center",
+					borderRadius: "4px",
+					boxSizing: "border-box",
+					whiteSpace: "nowrap",
+					overflow: "hidden",
+					textOverflow: "ellipsis"
+				}
+			}),
+			versionList,
+			$el("div", {
+				style: {
+					display: "flex",
+					justifyContent: "space-between",
+					width: "260px",
+					gap: "10px"
+				}
+			}, [
+				$el("button", {
+					textContent: "Cancel",
+					onclick: () => dialog.close(),
+					style: {
+						flex: "1",
+						padding: "8px",
+						backgroundColor: "#4a4a4a",
+						color: "#ffffff",
+						border: "none",
+						borderRadius: "4px",
+						cursor: "pointer",
+						whiteSpace: "nowrap",
+						overflow: "hidden",
+						textOverflow: "ellipsis"
+					}
+				}),
+				$el("button", {
+					textContent: "Select",
+					onclick: () => {
+						if (selectedVersion) {
+							onSelect(selectedVersion);
+							dialog.close();
+						} else {
+							alert("Please select a version.");
+						}
+					},
+					style: {
+						flex: "1",
+						padding: "8px",
+						backgroundColor: "#4CAF50",
+						color: "#ffffff",
+						border: "none",
+						borderRadius: "4px",
+						cursor: "pointer",
+						whiteSpace: "nowrap",
+						overflow: "hidden",
+						textOverflow: "ellipsis"
+					}
+				}),
+			])
+		]);
+
+		dialog.show(content);
+}
+
+async function switchComfyUI() {
+    let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
+
+    if(res.status == 200) {
+        let obj = await res.json();
+
+        let versions = [];
+        let default_version;
+
+        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.');
+    }
+}
+
+
 async function fetchUpdates(update_check_checkbox) {
 	let prev_text = fetch_updates_button.innerText;
 	fetch_updates_button.innerText = "Fetching updates...";
@@ -711,6 +906,14 @@ class ManagerMenuDialog extends ComfyDialog {
 					() => updateComfyUI()
 			});
 
+		switch_comfyui_button =
+			$el("button.cm-button", {
+				type: "button",
+				textContent: "Switch ComfyUI",
+				onclick:
+					() => switchComfyUI()
+			});
+
 		fetch_updates_button =
 			$el("button.cm-button", {
 				type: "button",
@@ -781,6 +984,7 @@ class ManagerMenuDialog extends ComfyDialog {
 				$el("br", {}, []),
 				update_all_button,
 				update_comfyui_button,
+				switch_comfyui_button,
 				fetch_updates_button,
 
 				$el("br", {}, []),
@@ -804,6 +1008,28 @@ class ManagerMenuDialog extends ComfyDialog {
 				}),
 			];
 
+		let migration_btn =
+			$el("button.cm-button-orange", {
+				type: "button",
+				textContent: "Migrate to New Node System",
+				onclick: () => migrateAPI()
+			});
+
+		migration_btn.style.display = 'none';
+
+		res.push(migration_btn);
+
+		api.fetchApi('/manager/need_to_migrate')
+			.then(response => response.text())
+			.then(text => {
+				if (text === 'True') {
+					migration_btn.style.display = 'block';
+				}
+			})
+			.catch(error => {
+				console.error('Error checking migration status:', error);
+			});
+
 		return res;
 	}
 
@@ -842,7 +1068,9 @@ class ManagerMenuDialog extends ComfyDialog {
 		});
 
 		// nickname
-		let badge_combo = document.createElement("select");
+		let badge_combo = "";
+		if(is_legacy_front()) {
+            badge_combo = document.createElement("select");
             badge_combo.setAttribute("title", "Configure the content to be displayed on the badge at the top right corner of the node. The ID is the identifier of the node. If 'hide built-in' is selected, both unknown nodes and built-in nodes will be omitted, making them indistinguishable");
             badge_combo.className = "cm-menu-combo";
             badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
@@ -860,6 +1088,7 @@ class ManagerMenuDialog extends ComfyDialog {
                 badge_mode = event.target.value;
                 app.graph.setDirtyCanvas(true);
             });
+		}
 
 		// channel
 		let channel_combo = document.createElement("select");
@@ -945,6 +1174,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		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)' }, []));
@@ -1044,6 +1274,10 @@ class ManagerMenuDialog extends ComfyDialog {
 							LiteGraph.closeAllContextMenus();
 							const menu = new LiteGraph.ContextMenu(
 								[
+									{
+										title: "ComfyUI Docs",
+										callback: () => { window.open("https://docs.comfy.org/", "comfyui-official-manual"); },
+									},
 									{
 										title: "Comfy Custom Node How To",
 										callback: () => { window.open("https://github.com/chrisgoringe/Comfy-Custom-Node-How-To/wiki/aaa_index", "comfyui-community-manual1"); },
@@ -1095,7 +1329,7 @@ class ManagerMenuDialog extends ComfyDialog {
 						textContent: 'Workflow Gallery',
 						style: {
 							'text-align': 'center',
-							'color': 'white',
+							'color': 'var(--input-text)',
 							'font-size': '18px',
 							'margin': 0,
 							'padding': 0,
@@ -1106,7 +1340,7 @@ class ManagerMenuDialog extends ComfyDialog {
 							textContent: `(${localStorage.getItem("wg_last_visited") ? localStorage.getItem("wg_last_visited").split('/')[2] : ''})`,
 							style: {
 								'text-align': 'center',
-								'color': 'white',
+								'color': 'var(--input-text)',
 								'font-size': '12px',
 								'margin': 0,
 								'padding': 0,
@@ -1234,15 +1468,6 @@ class ManagerMenuDialog extends ComfyDialog {
 						modifyButtonStyle(url);
 					},
 				},
-				{
-					title: "Open 'flowt.ai'",
-					callback: () => {
-						const url = "https://flowt.ai/";
-						localStorage.setItem("wg_last_visited", url);
-						window.open(url, url);
-						modifyButtonStyle(url);
-					},
-				},
 				{
 					title: "Open 'esheep'",
 					callback: () => {
@@ -1307,7 +1532,6 @@ app.registerExtension({
 
 		try {
 			// new style Manager buttons
-
 			// unload models button into new style Manager button
 			let cmGroup = new (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup(
 				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
@@ -1321,6 +1545,19 @@ app.registerExtension({
 					content: "Manager",
 					classList: "comfyui-button comfyui-menu-mobile-collapse primary"
 				}).element,
+				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+					icon: "star",
+					action: () => {
+						if(!manager_instance)
+							setManagerInstance(new ManagerMenuDialog());
+
+                        if(!CustomNodesManager.instance) {
+                            CustomNodesManager.instance = new CustomNodesManager(app, self);
+                        }
+                        CustomNodesManager.instance.show(CustomNodesManager.ShowMode.FAVORITES);
+					},
+					tooltip: "Show favorite custom node list"
+				}).element,
 				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
 					icon: "vacuum-outline",
 					action: () => {
@@ -1411,6 +1648,7 @@ app.registerExtension({
 	},
 
 	async nodeCreated(node, app) {
+	    if(is_legacy_front()) {
             if(!node.badge_enabled) {
                 node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
                 let orig = node.onDrawForeground;
@@ -1422,14 +1660,17 @@ app.registerExtension({
                 };
                 node.badge_enabled = true;
             }
+		}
 	},
 
 	async loadedGraphNode(node, app) {
+	    if(is_legacy_front()) {
             if(!node.badge_enabled) {
                 const orig = node.onDrawForeground;
                 node.getNickname = function () { return getNickname(node, node.type.trim()) };
                 node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
             }
+		}
 	},
 
 	_addExtraNodeContextMenu(node, app) {
@@ -1438,7 +1679,7 @@ app.registerExtension({
 		node.prototype.getExtraMenuOptions = function (_, options) {
 			origGetExtraMenuOptions?.apply?.(this, arguments);
 
-			if (node.category.startsWith('group nodes/')) {
+			if (node.category.startsWith('group nodes>')) {
 				options.push({
 					content: "Save As Component",
 					callback: (obj) => {

js/comfyui-share-common.js

@@ -315,7 +315,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "comfyworkflows",
 				textContent: "ComfyWorkflows",
 				website: "https://comfyworkflows.com",
-				description: "Share & browse thousands of ComfyUI workflows and art 🎨<br/><br/><a style='color:white;' href='https://comfyworkflows.com' target='_blank'>ComfyWorkflows.com</a>",
+				description: "Share & browse thousands of ComfyUI workflows and art 🎨<br/><br/><a style='color:var(--input-text);' href='https://comfyworkflows.com' target='_blank'>ComfyWorkflows.com</a>",
 				onclick: () => {
 				  showShareDialog('comfyworkflows').then((suc) => {
 				    suc && this.close();
@@ -326,7 +326,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "esheep",
 				textContent: "eSheep",
 				website: "https://www.esheep.com",
-				description: "Share & download thousands of ComfyUI workflows on <a style='color:white;' href='https://www.esheep.com' target='_blank'>esheep.com</a>",
+				description: "Share & download thousands of ComfyUI workflows on <a style='color:var(--input-text);' href='https://www.esheep.com' target='_blank'>esheep.com</a>",
 				onclick: () => {
 					shareToEsheep();
 				  	this.close();
@@ -336,7 +336,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "Copus",
 				textContent: "Copus",
 				website: "https://www.copus.io",
-				description: "🔴 Permanently store and secure ownership of your workflow on the open-source platform: <a style='color:white;' href='https://copus.io' target='_blank'>Copus.io</a>",
+				description: "🔴 Earn simple. Get paid from your ComfyUI workflows—no revenue sharing. Ever.",
 				onclick: () => {
 					showCopusShareDialog();
 				  this.close();
@@ -356,7 +356,8 @@ export class ShareDialogChooser extends ComfyDialog {
 			});
 
 			buttons.forEach(b => {
-				const button = $el("button", {
+				const button = $el("button", 
+					{
 					type: "button",
 					textContent: b.textContent,
 					onclick: b.onclick,
@@ -369,8 +370,14 @@ export class ShareDialogChooser extends ComfyDialog {
 						'padding': '5px 5px',
 						'margin-bottom': '5px',
 						'transition': 'background-color 0.3s',
+						'position':'relative'
 					}
-				});
+				},
+				[
+					$el("span", { style: { 
+					 } }),
+				]
+			);
 				button.addEventListener('mouseover', () => {
 					button.style.backgroundColor = '#007BFF'; // Change color on hover
 				});
@@ -382,18 +389,40 @@ export class ShareDialogChooser extends ComfyDialog {
 					innerHTML: b.description,
 					style: {
 						'text-align': 'left',
-						color: 'white',
+						color: 'var(--input-text)',
 						'font-size': '14px',
 						'margin-bottom': '0',
 					},
 				});
 
+				const copus_ui =$el("div", { style: { 
+					'position': 'absolute',
+					'height': '100%',
+					'left': '-25px',
+					'top': '-26px',
+					'width': '100%',
+					'z-index':'-1',
+					'background':'url("https://static.copus.io/images/client/202412/test/f28ac6ef8f4c6f3d5d50856a272ed02c.png")',
+					'background-repeat': 'no-repeat',
+				} });
+				const copus_ui_bottom =$el("div", { style: { 
+					'position': 'absolute',
+					'height': '100%',
+					'left': '25px',
+					'bottom': '-26px',
+					'width': '100%',
+					'transform':'scale(-1, -1)',
+					'z-index':'-1',
+					'background':'url("https://static.copus.io/images/client/202412/test/f28ac6ef8f4c6f3d5d50856a272ed02c.png")',
+					'background-repeat': 'no-repeat',
+				} });
+
 				const websiteLink = $el("a", {
 					textContent: "🌐 Website",
 					href: b.website,
 					target: "_blank",
 					style: {
-						color: 'white',
+						color: 'var(--input-text)',
 						'margin-left': '10px',
 						'font-size': '12px',
 						'text-decoration': 'none',
@@ -417,7 +446,6 @@ export class ShareDialogChooser extends ComfyDialog {
 						'margin-bottom': '10px',
 					}
 				}, [button, websiteLink]);
-
 				const column = $el("div", {
 					style: {
 						'flex-basis': '100%',
@@ -426,8 +454,17 @@ export class ShareDialogChooser extends ComfyDialog {
 						'border': '1px solid #ddd',
 						'border-radius': '5px',
 						'box-shadow': '0 2px 4px rgba(0, 0, 0, 0.1)',
+						'position':'relative'
 					}
-				}, [buttonLinkContainer, description]);
+				}, [buttonLinkContainer, description
+					, 
+					b.key ==='Copus' ?
+					copus_ui
+					:'',
+					b.key ==='Copus' ?
+					copus_ui_bottom
+					:'',
+				]);
 
 				container.appendChild(column);
 			});
@@ -440,7 +477,7 @@ export class ShareDialogChooser extends ComfyDialog {
 		      textContent: 'Choose a platform to share your workflow',
 			    style: {
 				  'text-align': 'center',
-				  'color': 'white',
+				  'color': 'var(--input-text)',
 				  'font-size': '18px',
 				  'margin-bottom': '10px',
 				},
@@ -686,7 +723,7 @@ export class ShareDialog extends ComfyDialog {
 				$el("div", {}, [
 					$el("p", {
 						size: 3, color: "white", style: {
-							color: 'white'
+							color: 'var(--input-text)'
 						}
 					}, [`Select where to share your art:`]),
 					this.matrix_destination_checkbox,
@@ -701,7 +738,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.credits_input,
@@ -712,7 +749,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.title_input,
@@ -723,7 +760,7 @@ export class ShareDialog extends ComfyDialog {
 					size: 3,
 					color: "white",
 					style: {
-						color: 'white'
+						color: 'var(--input-text)'
 					}
 				}, []),
 				this.description_input,
@@ -989,7 +1026,7 @@ export class ShareDialog extends ComfyDialog {
 			}
 			const radio_button_text = $el("label", {
 				// style: {
-				// 	color: 'white'
+				// 	color: 'var(--input-text)'
 				// }
 			}, [output.title])
 			radio_button.style.color = "var(--fg-color)";
@@ -1028,7 +1065,7 @@ export class ShareDialog extends ComfyDialog {
 			color: "white",
 			style: {
 				'text-align': 'center',
-				color: 'white',
+				color: 'var(--input-text)',
 				backgroundColor: 'black',
 				padding: '10px',
 				'margin-top': '0px',
@@ -1040,7 +1077,7 @@ export class ShareDialog extends ComfyDialog {
 				color: "white",
 				style: {
 					'text-align': 'center',
-					color: 'white',
+					color: 'var(--input-text)',
 					'margin-bottom': '5px',
 					'font-style': 'italic',
 					'font-size': '12px',

js/comfyui-share-copus.js

@@ -4,10 +4,10 @@ const env = "prod";
 
 let DEFAULT_HOMEPAGE_URL = "https://copus.io";
 
-let API_ENDPOINT = "https://api.client.prod.copus.io/copus-client";
+let API_ENDPOINT = "https://api.client.prod.copus.io";
 
 if (env !== "prod") {
-  API_ENDPOINT = "https://api.dev.copus.io/copus-client";
+  API_ENDPOINT = "https://api.test.copus.io";
   DEFAULT_HOMEPAGE_URL = "https://test.copus.io";
 }
 
@@ -61,6 +61,7 @@ export class CopusShareDialog extends ComfyDialog {
       [$el("div.comfy-modal-content", {}, [...this.createButtons()])]
     );
     this.selectedOutputIndex = 0;
+    this.selectedOutput_lock = 0;
     this.selectedNodeId = null;
     this.uploadedImages = [];
     this.allFilesImages = [];
@@ -190,10 +191,36 @@ export class CopusShareDialog extends ComfyDialog {
       type: "text",
       placeholder: "Subtitle (Optional)",
       style: inputStyle,
-      maxLength: "70",
+      maxLength: "350",
       oninput: () => {
         const titleNum = this.SubTitleInput.value.length;
-        subTitleNumDom.textContent = `${titleNum}/70`;
+        subTitleNumDom.textContent = `${titleNum}/350`;
+      },
+    });
+    this.LockInput = $el("input", {
+      type: "text",
+      placeholder: "",
+      style:  {
+        width: "100px",
+        padding: "7px",
+        borderRadius: "4px",
+        border: "1px solid #ddd",
+        boxSizing: "border-box",
+      },
+      oninput: (event) => {
+        let input = event.target.value;
+        // Use a regular expression to match a number with up to two decimal places
+        const regex = /^\d*\.?\d{0,2}$/;
+        if (!regex.test(input)) {
+          // If the input doesn't match, remove the last entered character
+          event.target.value = input.slice(0, -1);
+        }
+        const numericValue = parseFloat(input);
+        if (numericValue > 9999) {
+          input = "9999";
+        }
+        // Update the input field with the valid value
+        event.target.value = input;
       },
     });
     this.descriptionInput = $el("textarea", {
@@ -297,7 +324,7 @@ export class CopusShareDialog extends ComfyDialog {
           color: "#999",
         },
       },
-      ["0/70"]
+      ["0/350"]
     );
     const descriptionNumDom = $el(
       "label",
@@ -333,6 +360,59 @@ export class CopusShareDialog extends ComfyDialog {
       // descriptionNumDom,
     ]);
     // switch  between outputs section and additional inputs section
+    this.radioButtons_lock = [];
+
+    this.radioButtonsCheck_lock = $el("input", {
+      type: "radio",
+      name: "output_type_lock",
+      value: "0",
+      id: "blockchain1_lock",
+      checked: true,
+    });
+    this.radioButtonsCheckOff_lock = $el("input", {
+      type: "radio",
+      name: "output_type_lock",
+      value: "1",
+      id: "blockchain_lock",
+    });
+
+    const blockChainSection_lock = $el("div", { style: sectionStyle }, [
+      $el("label", { style: labelStyle }, ["6️⃣ Pay to download"]),
+      $el(
+        "label",
+        {
+          style: {
+            marginTop: "10px",
+            display: "flex",
+            alignItems: "center",
+            cursor: "pointer",
+          },
+        },
+        [
+          this.radioButtonsCheck_lock,
+          $el("div", { style: { marginLeft: "5px" ,display:'flex',alignItems:'center'} }, [
+            $el("span", { style: { marginLeft: "5px" } }, ["ON"]),
+            $el("span", { style: { marginLeft: "20px",marginRight:'10px' ,color:'#fff'} }, ["Price US$"]),
+            this.LockInput
+          ]),
+        ]
+      ),
+      $el(
+        "label",
+        { style: { display: "flex", alignItems: "center", cursor: "pointer" } },
+        [
+          this.radioButtonsCheckOff_lock,
+          $el("span", { style: { marginLeft: "5px" } }, ["OFF"]),
+        ]
+      ),
+      
+      $el(
+        "p",
+        { style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
+        ["Get paid from your workflow. You can change the price and withdraw your earnings on Copus."]
+      ),
+    ]);
+
     this.radioButtons = [];
 
     this.radioButtonsCheck = $el("input", {
@@ -350,7 +430,7 @@ export class CopusShareDialog extends ComfyDialog {
     });
 
     const blockChainSection = $el("div", { style: sectionStyle }, [
-      $el("label", { style: labelStyle }, ["6️⃣ Store on blockchain "]),
+      $el("label", { style: labelStyle }, ["7️⃣ Store on blockchain "]),
       $el(
         "label",
         {
@@ -380,6 +460,8 @@ export class CopusShareDialog extends ComfyDialog {
         ["Secure ownership with a permanent & decentralized storage"]
       ),
     ]);
+
+
     // Message Section
     this.message = $el(
       "div",
@@ -441,6 +523,7 @@ export class CopusShareDialog extends ComfyDialog {
       SubtitleSection,
       DescriptionSection,
       // contestSection,
+      blockChainSection_lock,
       blockChainSection,
       this.message,
       buttonsSection,
@@ -543,6 +626,8 @@ export class CopusShareDialog extends ComfyDialog {
       subTitle: this.SubTitleInput.value,
       content: this.descriptionInput.value,
       storeOnChain: this.radioButtonsCheck.checked ? true : false,
+      lockState:this.radioButtonsCheck_lock.checked ? 2 : 0,
+      unlockPrice:this.LockInput.value,
     };
 
     if (!this.keyInput.value) {
@@ -557,6 +642,12 @@ export class CopusShareDialog extends ComfyDialog {
       throw new Error("Title is required");
     }
 
+    if(this.radioButtonsCheck_lock.checked){
+      if (!this.LockInput.value){
+        throw new Error("Price is required");
+      }
+    }
+
     if (!this.uploadedImages.length) {
       if (this.selectedFile) {
         await this.uploadThumbnail(this.selectedFile);

js/comfyui-share-openart.js

@@ -199,7 +199,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       color: "white",
       style: {
         'text-align': 'center',
-        color: 'white',
+        color: 'var(--input-text)',
         margin: '0 0 10px 0',
       }
     });
@@ -733,7 +733,7 @@ export class OpenArtShareDialog extends ComfyDialog {
         size: 2,
         color: "white",
         style: {
-          color: 'white',
+          color: 'var(--input-text)',
           margin: '0 0 5px 0',
           fontSize: '12px',
         },

js/common.js

@@ -12,6 +12,10 @@ export async function sleep(ms) {
 }
 
 export function rebootAPI() {
+	if ('electronAPI' in window) {
+      		window.electronAPI.restartApp();
+      		return true;
+    	}
 	if (confirm("Are you sure you'd like to reboot the server?")) {
 		try {
 			api.fetchApi("/manager/reboot");
@@ -25,6 +29,23 @@ export function rebootAPI() {
 	return false;
 }
 
+
+export async function migrateAPI() {
+	if (confirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")) {
+		try {
+			await api.fetchApi("/manager/migrate_unmanaged_nodes");
+			api.fetchApi("/manager/reboot");
+		}
+		catch(exception) {
+
+		}
+		return true;
+	}
+
+	return false;
+}
+
+
 export var manager_instance = null;
 
 export function setManagerInstance(obj) {

js/components-manager.js

@@ -4,6 +4,8 @@ import { sleep, show_message } from "./common.js";
 import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
 import { ComfyDialog, $el } from "../../scripts/ui.js";
 
+const SEPARATOR = ">"
+
 let pack_map = {};
 let rpack_map = {};
 
@@ -20,7 +22,7 @@ export function getPureName(node) {
 		let purename = node.comfyClass.substring(category.length+1);
 		return purename;
 	}
-	else if(node.comfyClass.startsWith('workflow/')) {
+	else if(node.comfyClass.startsWith('workflow/') || node.comfyClass.startsWith(`workflow${SEPARATOR}`)) {
 		return node.comfyClass.substring(9);
 	}
 	else {
@@ -76,7 +78,7 @@ export async function load_components() {
 
 				let category = data.packname;
 				if(data.category) {
-					category += "/" + data.category;
+					category += SEPARATOR + data.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -100,7 +102,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.packname;
 				if(nodeData.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -139,7 +141,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.packname;
 				if(nodeData.workflow.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -174,7 +176,7 @@ export async function load_components() {
 			try {
 				let category = nodeData.workflow.packname;
 				if(nodeData.workflow.category) {
-					category += "/" + nodeData.category;
+					category += SEPARATOR + nodeData.category;
 				}
 				if(category == '') {
 					category = 'components';
@@ -234,7 +236,7 @@ async function save_as_component(node, version, author, prefix, nodename, packna
 
 		let category = body.workflow.packname;
 		if(body.workflow.category) {
-			category += "/" + body.workflow.category;
+			category += SEPARATOR + body.workflow.category;
 		}
 		if(category == '') {
 			category = 'components';
@@ -266,7 +268,7 @@ async function import_component(component_name, component, mode) {
 
 	let category = component.packname;
 	if(component.category) {
-		category += "/" + component.category;
+		category += SEPARATOR + component.category;
 	}
 	if(category == '') {
 		category = 'components';
@@ -403,7 +405,7 @@ function handle_import_components(components) {
 	}
 
 	if(cnt == 1 && last_name) {
-		const node = LiteGraph.createNode(`workflow/${last_name}`);
+		const node = LiteGraph.createNode(`workflow${SEPARATOR}${last_name}`);
 		node.pos = [app.canvas.graph_mouse[0], app.canvas.graph_mouse[1]];
 		app.canvas.graph.add(node, false);
 	}
@@ -786,7 +788,7 @@ app.graphToPrompt = async function () {
 			// get used group nodes
 			let used_group_nodes = new Set();
 			for(let node of p.workflow.nodes) {
-				if(node.type.startsWith('workflow/')) {
+				if(node.type.startsWith(`workflow/`) || node.type.startsWith(`workflow${SEPARATOR}`)) {
 					used_group_nodes.add(node.type.substring(9));
 				}
 			}

js/custom-nodes-manager.js

@@ -1,8 +1,10 @@
 import { app } from "../../scripts/app.js";
-import { $el } from "../../scripts/ui.js";
+import { ComfyDialog, $el } from "../../scripts/ui.js";
+import { api } from "../../scripts/api.js";
+
 import {
 	manager_instance, rebootAPI, install_via_git_url,
-	fetchData, md5, icons 
+	fetchData, md5, icons, show_message
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
@@ -10,7 +12,7 @@ import TG from "./turbogrid.esm.js";
 
 const pageCss = `
 .cn-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
 	z-index: 10001;
 	width: 80%;
 	height: 80%;
@@ -212,17 +214,17 @@ const pageCss = `
 }
 
 .cn-manager .cn-btn-enable {
-	background-color: blue;
+	background-color: #333399;
 	color: white;
 }
 
 .cn-manager .cn-btn-disable {
-	background-color: MediumSlateBlue;
+	background-color: #442277;
 	color: white;
 }
 
 .cn-manager .cn-btn-update {
-	background-color: blue;
+	background-color: #1155AA;
 	color: white;
 }
 
@@ -247,10 +249,21 @@ const pageCss = `
 }
 
 .cn-manager .cn-btn-uninstall {
-	background-color: red;
+	background-color: #993333;
 	color: white;
 }
 
+.cn-manager .cn-btn-reinstall {
+	background-color: #993333;
+	color: white;
+}
+
+.cn-manager .cn-btn-switch {
+	background-color: #448833;
+	color: white;
+
+}
+
 @keyframes cn-btn-loading-bg {
 	0% {
 		left: 0;
@@ -312,7 +325,7 @@ const pageHtml = `
 <div class="cn-manager-selection"></div>
 <div class="cn-manager-message"></div>
 <div class="cn-manager-footer">
-	<button class="cn-manager-close">Close</button>
+	<button class="cn-manager-back">◀ Back</button>
 	<button class="cn-manager-restart">Restart</button>
 	<div class="cn-flex-auto"></div>
 	<button class="cn-manager-check-update">Check Update</button>
@@ -325,6 +338,7 @@ const ShowMode = {
 	NORMAL: "Normal",
 	UPDATE: "Update",
 	MISSING: "Missing",
+	FAVORITES: "Favorites",
 	ALTERNATIVES: "Alternatives"
 };
 
@@ -356,7 +370,6 @@ export class CustomNodesManager {
 	}
 
 	init() {
-
 		if (!document.querySelector(`style[context="${this.id}"]`)) {
 			const $style = document.createElement("style");
 			$style.setAttribute("context", this.id);
@@ -374,6 +387,130 @@ export class CustomNodesManager {
 		this.initGrid();
 	}
 
+	showVersionSelectorDialog(versions, onSelect) {
+		const dialog = new ComfyDialog();
+		dialog.element.style.zIndex = 100003;
+		dialog.element.style.width = "300px";
+		dialog.element.style.padding = "0";
+		dialog.element.style.backgroundColor = "#2a2a2a";
+		dialog.element.style.border = "1px solid #3a3a3a";
+		dialog.element.style.borderRadius = "8px";
+		dialog.element.style.boxSizing = "border-box";
+		dialog.element.style.overflow = "hidden";
+
+		const contentStyle = {
+			width: "300px",
+			display: "flex",
+			flexDirection: "column",
+			alignItems: "center",
+			padding: "20px",
+			boxSizing: "border-box",
+			gap: "15px"
+		};
+
+		let selectedVersion = versions[0];
+
+		const versionList = $el("select", {
+			multiple: true,
+			size: Math.min(10, versions.length),
+			style: {
+				width: "260px",
+				height: "auto",
+				backgroundColor: "#383838",
+				color: "#ffffff",
+				border: "1px solid #4a4a4a",
+				borderRadius: "4px",
+				padding: "5px",
+				boxSizing: "border-box"
+			}
+		},
+		versions.map((v, index) => $el("option", {
+			value: v,
+			textContent: v,
+			selected: index === 0
+		}))
+		);
+
+		versionList.addEventListener('change', (e) => {
+			selectedVersion = e.target.value;
+			Array.from(e.target.options).forEach(opt => {
+				opt.selected = opt.value === selectedVersion;
+			});
+		});
+
+		const content = $el("div", {
+			style: contentStyle
+		}, [
+			$el("h3", {
+				textContent: "Select Version",
+				style: {
+					color: "#ffffff",
+					backgroundColor: "#1a1a1a",
+					padding: "10px 15px",
+					margin: "0 0 10px 0",
+					width: "260px",
+					textAlign: "center",
+					borderRadius: "4px",
+					boxSizing: "border-box",
+					whiteSpace: "nowrap",
+					overflow: "hidden",
+					textOverflow: "ellipsis"
+				}
+			}),
+			versionList,
+			$el("div", {
+				style: {
+					display: "flex",
+					justifyContent: "space-between",
+					width: "260px",
+					gap: "10px"
+				}
+			}, [
+				$el("button", {
+					textContent: "Cancel",
+					onclick: () => dialog.close(),
+					style: {
+						flex: "1",
+						padding: "8px",
+						backgroundColor: "#4a4a4a",
+						color: "#ffffff",
+						border: "none",
+						borderRadius: "4px",
+						cursor: "pointer",
+						whiteSpace: "nowrap",
+						overflow: "hidden",
+						textOverflow: "ellipsis"
+					}
+				}),
+				$el("button", {
+					textContent: "Select",
+					onclick: () => {
+						if (selectedVersion) {
+							onSelect(selectedVersion);
+							dialog.close();
+						} else {
+							alert("Please select a version.");
+						}
+					},
+					style: {
+						flex: "1",
+						padding: "8px",
+						backgroundColor: "#4CAF50",
+						color: "#ffffff",
+						border: "none",
+						borderRadius: "4px",
+						cursor: "pointer",
+						whiteSpace: "nowrap",
+						overflow: "hidden",
+						textOverflow: "ellipsis"
+					}
+				}),
+			])
+		]);
+
+		dialog.show(content);
+	}
+
 	initFilter() {
 		const $filter  = this.element.querySelector(".cn-manager-filter");
 		const filterList = [{
@@ -382,23 +519,31 @@ export class CustomNodesManager {
 			hasData: true
 		}, {
 			label: "Installed",
-			value: "True",
+			value: "installed",
+			hasData: true
+		}, {
+			label: "Enabled",
+			value: "enabled",
 			hasData: true
 		}, {
 			label: "Disabled",
-			value: "Disabled",
+			value: "disabled",
 			hasData: true
 		}, {
 			label: "Import Failed",
-			value: "Fail",
+			value: "import-fail",
 			hasData: true
 		}, {
 			label: "Not Installed",
-			value: "False",
+			value: "not-installed",
 			hasData: true
 		}, {
-			label: "Unknown",
+			label: "ComfyRegistry",
-			value: "None",
+			value: "cnr",
+			hasData: true
+		}, {
+			label: "Non-ComfyRegistry",
+			value: "unknown",
 			hasData: true
 		}, {
 			label: "Update",
@@ -408,6 +553,10 @@ export class CustomNodesManager {
 			label: "Missing",
 			value: ShowMode.MISSING,
 			hasData: false
+		}, {
+			label: "Favorites",
+			value: ShowMode.FAVORITES,
+			hasData: false
 		}, {
 			label: "Alternatives of A1111",
 			value: ShowMode.ALTERNATIVES,
@@ -423,16 +572,15 @@ export class CustomNodesManager {
 		return this.filterList.find(it => it.value === filter)
 	}
 
-	getInstallButtons(installed, title) {
+	getActionButtons(action, rowItem, is_selected_button) {
-
 		const buttons = {
 			"enable": {
 				label: "Enable",
-				mode: "toggle_active"
+				mode: "enable"
 			},
 			"disable": {
 				label: "Disable",
-				mode: "toggle_active"
+				mode: "disable"
 			},
 
 			"update": {
@@ -449,45 +597,63 @@ export class CustomNodesManager {
 				mode: "fix"
 			},
 
+			"reinstall": {
+				label: "Reinstall",
+				mode: "reinstall"
+			},
+
 			"install": {
 				label: "Install",
 				mode: "install"
 			},
+
 			"try-install": {
 				label: "Try install",
 				mode: "install"
 			},
+
 			"uninstall": {
 				label: "Uninstall",
 				mode: "uninstall"
+			},
+
+			"switch": {
+				label: "Switch Ver",
+				mode: "switch"
 			}
 		}
 
 		const installGroups = {
-			"Disabled": ["enable", "uninstall"],
+			"disabled": ["enable", "switch", "uninstall"],
-			"Update": ["update", "disable", "uninstall"],
+			"updatable": ["update", "switch", "disable", "uninstall"],
-			"Fail": ["try-fix", "uninstall"],
+			"import-fail": ["try-fix", "switch", "disable", "uninstall"],
-			"True": ["try-update", "disable", "uninstall"],
+			"enabled": ["try-update", "switch", "disable", "uninstall"],
-			"False": ["install"],
+			"not-installed": ["install"],
-			'None': ["try-install"]
+			'unknown': ["try-install"],
+			"invalid-installation": ["reinstall"],
 		}
 
 		if (!manager_instance.update_check_checkbox.checked) {
-			installGroups.True = installGroups.True.filter(it => it !== "try-update");
+			installGroups.enabled = installGroups.enabled.filter(it => it !== "try-update");
 		}
 
-		if (title === "ComfyUI-Manager") {
+		if (rowItem?.title === "ComfyUI-Manager") {
-			installGroups.True = installGroups.True.filter(it => it !== "disable");
+			installGroups.enabled = installGroups.enabled.filter(it => it !== "disable" && it !== "uninstall" && it !== "switch");
+		}
+
+		let list = installGroups[action];
+
+		if(is_selected_button || rowItem?.version === "unknown") {
+			list = list.filter(it => it !== "switch");
 		}
 
-		const list = installGroups[installed];
 		if (!list) {
 			return "";
 		}
 
 		return list.map(id => {
 			const bt = buttons[id];
-			return `<button class="cn-btn-${id}" group="${installed}" mode="${bt.mode}">${bt.label}</button>`;
+			return `<button class="cn-btn-${id}" group="${action}" mode="${bt.mode}">${bt.label}</button>`;
 		}).join("");
 	}
 
@@ -554,8 +720,11 @@ export class CustomNodesManager {
 				}
 			},
 
-			".cn-manager-close": {
+			".cn-manager-back": {
-				click: (e) => this.close()
+				click: (e) => {
+				    this.close()
+				    manager_instance.show();
+				}
 			},
 
 			".cn-manager-restart": {
@@ -614,13 +783,9 @@ export class CustomNodesManager {
 		
 		let prevViewRowsLength = -1;
 		grid.bind('onUpdated', (e, d) => {
-
 			const viewRows = grid.viewRows;
-			if (viewRows.length !== prevViewRowsLength) {
             prevViewRowsLength = viewRows.length;
             this.showStatus(`${prevViewRowsLength.toLocaleString()} custom nodes`);
-			}
-
 		});
 
 		grid.bind('onSelectChanged', (e, changes) => {
@@ -630,8 +795,17 @@ export class CustomNodesManager {
 		grid.bind('onClick', (e, d) => {
 			const btn = this.getButton(d.e.target);
 			if (btn) {
+				const item = this.grid.getRowItemBy("hash", d.rowItem.hash);
+
+				const { target, label, mode} = btn;
+				if((mode === "install" || mode === "switch" || mode == "enable") && item.originalData.version != 'unknown') {
+					// install after select version via dialog if item is cnr node
+					this.installNodeWithVersion(d.rowItem, btn, mode == 'enable');
+				}
+				else {
 					this.installNodes([d.rowItem.hash], btn, d.rowItem.title);
 				}
+			}
 		});
 
 		grid.setOption({
@@ -651,7 +825,7 @@ export class CustomNodesManager {
 			bindContainerResize: true,
 
 			cellResizeObserver: (rowItem, columnItem) => {
-				const autoHeightColumns = ['title', 'installed', 'description', "alternatives"];
+				const autoHeightColumns = ['title', 'action', 'description', "alternatives"];
 				return autoHeightColumns.includes(columnItem.id)
 			},
 
@@ -696,11 +870,11 @@ export class CustomNodesManager {
 			theme: colorPalette === "light" ? "" : "dark"
 		};
 
-		const rows = this.custom_nodes || [];
+		const rows = this.custom_nodes || {};
-		rows.forEach((item, i) => {
+		for(let nodeKey in rows) {
-			item.id = i + 1;
+			let item = rows[nodeKey];
-			const nodeKey = item.files[0];
 			const extensionInfo = this.extension_mappings[nodeKey];
+
 			if(extensionInfo) {
 				const { extensions, conflicts } = extensionInfo;
 				if (extensions.length) {
@@ -712,7 +886,7 @@ export class CustomNodesManager {
 					item.conflictsList = conflicts;
 				}
 			}
-		});
+		}
 
 		const columns = [{
 			id: 'id',
@@ -727,22 +901,55 @@ export class CustomNodesManager {
 			maxWidth: 500,
 			classMap: 'cn-node-name',
 			formatter: (title, rowItem, columnItem) => {
-				return `${rowItem.installed === 'Fail' ? '<font color="red"><B>(IMPORT FAILED)</B></font>' : ''}
+			    var prefix = '';
-					<a href=${rowItem.reference} target="_blank"><b>${title}</b></a>`;
+			    if(rowItem.action === 'invalid-installation') {
+			        prefix = '<font color="red"><B>(INVALID)</B></font>';
+			    }
+
+			    else if(rowItem.action === 'import-fail') {
+			        prefix = '<font color="red"><B>(IMPORT FAILED)</B></font>';
+			    }
+
+				return `${prefix}<a href=${rowItem.reference} target="_blank"><b>${title}</b></a>`;
 			}
 		}, {
-			id: 'installed',
+			id: 'version',
-			name: 'Install',
+			name: 'Version',
+			width: 200,
+			minWidth: 100,
+			maxWidth: 500,
+			classMap: 'cn-node-desc',
+			formatter: (version, rowItem, columnItem) => {
+				if(version == undefined) {
+					return `undef`;
+				}
+				else {
+					if(rowItem.cnr_latest && version != rowItem.cnr_latest) {
+						if(version == 'nightly') {
+							return `${version} [${rowItem.cnr_latest}]`;
+						}
+						else {
+							return `${version} [↑${rowItem.cnr_latest}]`;
+						}
+					}
+					else {
+						return `${version}`;
+					}
+				}
+			}
+		}, {
+			id: 'action',
+			name: 'Action',
 			width: 130,
 			minWidth: 110,
 			maxWidth: 200,
 			sortable: false,
 			align: 'center',
-			formatter: (installed, rowItem, columnItem) => {
+			formatter: (action, rowItem, columnItem) => {
 				if (rowItem.restart) {
 					return `<font color="red">Restart Required</span>`;
 				}
-				const buttons = this.getInstallButtons(installed, rowItem.title);
+				const buttons = this.getActionButtons(action, rowItem);
 				return `<div class="cn-install-buttons">${buttons}</div>`;
 			}
 		}, {
@@ -845,14 +1052,35 @@ export class CustomNodesManager {
 			}
 		}];
 
-		this.grid.setData({
+		let rows_values = Object.keys(rows).map(key => rows[key]);
-			options,
+
-			rows,
+		rows_values =
-			columns
+			rows_values.sort((a, b) => {
+				if (a.version == 'unknown' && b.version != 'unknown') return 1;
+				if (a.version != 'unknown' && b.version == 'unknown') return -1;
+
+				if (a.stars !== b.stars) {
+					return b.stars - a.stars;
+				}
+
+				if (a.last_update !== b.last_update) {
+					return new Date(b.last_update) - new Date(a.last_update);
+				}
+
+				return 0;
 			});
 
-		this.grid.render();
+		this.grid.setData({
+			options: options,
+			rows: rows_values,
+			columns: columns
+		});
 
+		for(let i=0; i<rows_values.length; i++) {
+			rows_values[i].id = i+1;
+		}
+
+		this.grid.render();
 	}
 
 	updateGrid() {
@@ -877,7 +1105,7 @@ export class CustomNodesManager {
 
 		const selectedMap = {};
 		selectedList.forEach(item => {
-			let type = item.installed;
+			let type = item.action;
 			if (item.restart) {
 				type = "Restart Required";
 			}
@@ -895,7 +1123,7 @@ export class CustomNodesManager {
 			const filterItem = this.getFilterItem(v);
 			list.push(`<div class="cn-selected-buttons">
 				<span>Selected <b>${selectedMap[v].length}</b> ${filterItem ? filterItem.label : v}</span>
-				${this.grid.hasMask ? "" : this.getInstallButtons(v)}
+				${this.grid.hasMask ? "" : this.getActionButtons(v, null, true)}
 			</div>`);
 		});
 
@@ -913,8 +1141,61 @@ export class CustomNodesManager {
 		}
 	}
 
-	async installNodes(list, btn, title) {
+	async installNodeWithVersion(rowItem, btn, is_enable) {
+		let hash = rowItem.hash;
+		let title = rowItem.title;
 
+		const item = this.grid.getRowItemBy("hash", hash);
+
+		let node_id = item.originalData.id;
+
+		this.showLoading();
+		let res;
+		if(is_enable) {
+			res = await api.fetchApi(`/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
+		}
+		else {
+			res = await api.fetchApi(`/customnode/versions/${node_id}`, { cache: "no-store" });
+		}
+		this.hideLoading();
+
+		if(res.status == 200) {
+			let obj = await res.json();
+
+			let versions = [];
+			let default_version;
+			let version_cnt = 0;
+
+			if(!is_enable) {
+				if(rowItem.originalData.active_version != 'nightly') {
+					versions.push('nightly');
+					default_version = 'nightly';
+					version_cnt++;
+				}
+
+				if(rowItem.cnr_latest != rowItem.originalData.active_version) {
+					versions.push('latest');
+				}
+			}
+
+			for(let v of obj) {
+				if(rowItem.originalData.active_version != v.version) {
+					default_version = v.version;
+					versions.push(v.version);
+					version_cnt++;
+				}
+			}
+
+            this.showVersionSelectorDialog(versions, (selected_version) => {
+                this.installNodes([hash], btn, title, selected_version);
+            });
+		}
+		else {
+			show_message('Failed to fetch versions from ComfyRegistry.');
+		}
+	}
+
+	async installNodes(list, btn, title, selected_version) {
 		const { target, label, mode} = btn;
 
 		if(mode === "uninstall") {
@@ -924,14 +1205,19 @@ export class CustomNodesManager {
 			}
 		}
 
+		if(mode === "reinstall") {
+			title = title || `${list.length} custom nodes`;
+			if (!confirm(`Are you sure reinstall ${title}?`)) {
+				return;
+			}
+		}
+
 		target.classList.add("cn-btn-loading");
-		this.showLoading();
 		this.showError("");
 
 		let needRestart = false;
 		let errorMsg = "";
 		for (const hash of list) {
-
 			const item = this.grid.getRowItemBy("hash", hash);
 			if (!item) {
 				errorMsg = `Not found custom node: ${hash}`;
@@ -949,9 +1235,28 @@ export class CustomNodesManager {
 			this.showStatus(`${label} ${item.title} ...`);
 
 			const data = item.originalData;
-			const res = await fetchData(`/customnode/${mode}`, {
+			data.selected_version = selected_version;
+			data.channel = this.channel;
+			data.mode = this.mode;
+
+			let install_mode = mode;
+			if(mode == 'switch') {
+				install_mode = 'install';
+			}
+
+			// don't post install if install_mode == 'enable'
+			data.skip_post_install = install_mode == 'enable';
+			let api_mode = install_mode;
+			if(install_mode == 'enable') {
+				api_mode = 'install';
+			}
+
+			if(install_mode == 'reinstall') {
+				api_mode = 'reinstall';
+			}
+
+			const res = await api.fetchApi(`/customnode/${api_mode}`, {
 				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify(data)
 			});
 
@@ -974,13 +1279,12 @@ export class CustomNodesManager {
 			this.grid.setRowSelected(item, false);
 			item.restart = true;
 			this.restartMap[item.hash] = true;
-			this.grid.updateCell(item, "installed");
+			this.grid.updateCell(item, "action");
 
 			//console.log(res.data);
 
 		}
 
-		this.hideLoading();
 		target.classList.remove("cn-btn-loading");
 
 		if (errorMsg) {
@@ -1064,26 +1368,28 @@ export class CustomNodesManager {
 		const mappings = res.data;
 
 		// build regex->url map
-		const regex_to_url = [];
+		const regex_to_pack = [];
-		this.custom_nodes.forEach(node => {
+		for(let k in this.custom_nodes) {
+			let node = this.custom_nodes[k];
+
 			if(node.nodename_pattern) {
-				regex_to_url.push({
+				regex_to_pack.push({
 					regex: new RegExp(node.nodename_pattern),
 					url: node.files[0]
 				});
 			}
-		});
+		}
 
 		// build name->url map
-		const name_to_urls = {};
+		const name_to_packs = {};
 		for (const url in mappings) {
 			const names = mappings[url];
 
 			for(const name in names[0]) {
-				let v = name_to_urls[names[0][name]];
+				let v = name_to_packs[names[0][name]];
 				if(v == undefined) {
 					v = [];
-					name_to_urls[names[0][name]] = v;
+					name_to_packs[names[0][name]] = v;
 				}
 				v.push(url);
 			}
@@ -1106,47 +1412,52 @@ export class CustomNodesManager {
 
 		for (let i in nodes) {
 			const node_type = nodes[i].type;
-			if(node_type.startsWith('workflow/'))
+			if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
 				continue;
 
 			if (!registered_nodes.has(node_type)) {
-				const urls = name_to_urls[node_type.trim()];
+				const packs = name_to_packs[node_type.trim()];
-				if(urls)
+				if(packs)
-					urls.forEach(url => {
+					packs.forEach(url => {
 						missing_nodes.add(url);
 					});
 				else {
-					for(let j in regex_to_url) {
+					for(let j in regex_to_pack) {
-						if(regex_to_url[j].regex.test(node_type)) {
+						if(regex_to_pack[j].regex.test(node_type)) {
-							missing_nodes.add(regex_to_url[j].url);
+							missing_nodes.add(regex_to_pack[j].url);
 						}
 					}
 				}
 			}
 		}
 
-		const resUnresolved = await fetchData(`/component/get_unresolved`);
-		const unresolved = resUnresolved.data;
-		if (unresolved && unresolved.nodes) {
-			unresolved.nodes.forEach(node_type => {
-				const url = name_to_urls[node_type];
-				if(url) {
-					missing_nodes.add(url);
-				}
-			});
-		}
-
 		const hashMap = {};
-		this.custom_nodes.forEach(item => {
+		for(let k in this.custom_nodes) {
-			if (item.files.some(file => missing_nodes.has(file))) {
+			let item = this.custom_nodes[k];
+
+			if(missing_nodes.has(item.id)) {
 				hashMap[item.hash] = true;
 			}
-		});
+			else if (item.files?.some(file => missing_nodes.has(file))) {
+				hashMap[item.hash] = true;
+			}
+		}
+
+		return hashMap;
+	}
+
+	async getFavorites() {
+		const hashMap = {};
+		for(let k in this.custom_nodes) {
+			let item = this.custom_nodes[k];
+			if(item.is_favorite)
+			    hashMap[item.hash] = true;
+		}
+
 		return hashMap;
 	}
 
 	async getAlternatives() {
-
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading alternatives (${mode}) ...`);
 		const res = await fetchData(`/customnode/alternatives?mode=${mode}`);
@@ -1156,27 +1467,28 @@ export class CustomNodesManager {
 		}
 
 		const hashMap = {};
-		const { items } = res.data;
+		const items = res.data;
 
-		items.forEach(item => {
+		for(let i in items) {
+			let item = items[i];
+			let custom_node = this.custom_nodes[i];
 
-			const custom_node = this.custom_nodes.find(node => node.files.find(file => file === item.id));
 			if (!custom_node) {
 				console.log(`Not found custom node: ${item.id}`);
-				return;
+				continue;
 			}
 
 			const tags = `${item.tags}`.split(",").map(tag => {
 				return `<div>${tag.trim()}</div>`;
-			}).join("")
+			}).join("");
 
 			hashMap[custom_node.hash] = {
 				alternatives: `<div class="cn-tag-list">${tags}</div> ${item.description}`
 			}
 
-		});
+		}
 	
-		return hashMap
+		return hashMap;
 	}
 
 	async loadData(show_mode = ShowMode.NORMAL) {
@@ -1198,18 +1510,19 @@ export class CustomNodesManager {
 			return
 		}
 		
-		const { channel, custom_nodes} = res.data;
+		const { channel, node_packs } = res.data;
 		this.channel = channel;
-		this.custom_nodes = custom_nodes;
+		this.mode = mode;
+		this.custom_nodes = node_packs;
 
 		if(this.channel !== 'default') {
 			this.element.querySelector(".cn-manager-channel").innerHTML = `Channel: ${this.channel} (Incomplete list)`;
 		}
 
-		for (const item of custom_nodes) {
+		for (const k in node_packs) {
+			let item = node_packs[k];
 			item.originalData = JSON.parse(JSON.stringify(item));
-			const message = item.title + item.files[0];
+			item.hash = md5(k);
-			item.hash = md5(message);
 		}
 
 		const filterItem = this.getFilterItem(this.show_mode);
@@ -1217,24 +1530,44 @@ export class CustomNodesManager {
 			let hashMap;
 			if(this.show_mode == ShowMode.UPDATE) {
 				hashMap = {};
-				custom_nodes.forEach(it => {
+				for (const k in node_packs) {
-					if (it.installed === "Update") {
+					let it = node_packs[k];
+					if (it['update-state'] === "true") {
 						hashMap[it.hash] = true;
 					}
-				});
+				}
 			} else if(this.show_mode == ShowMode.MISSING) {
 				hashMap = await this.getMissingNodes();
 			} else if(this.show_mode == ShowMode.ALTERNATIVES) {
 				hashMap = await this.getAlternatives();
+			} else if(this.show_mode == ShowMode.FAVORITES) {
+				hashMap = await this.getFavorites();
 			}
 			filterItem.hashMap = hashMap;
 			filterItem.hasData = true;
 		}
 
-		custom_nodes.forEach(nodeItem => {
+		for(let k in node_packs) {
+			let nodeItem = node_packs[k];
+
 			if (this.restartMap[nodeItem.hash]) {
 				nodeItem.restart = true;
 			}
+
+			if(nodeItem['update-state'] == "true") {
+				nodeItem.action = 'updatable';
+			}
+			else if(nodeItem['import-fail']) {
+				nodeItem.action = 'import-fail';
+			}
+			else {
+				nodeItem.action = nodeItem.state;
+			}
+
+            if(nodeItem['invalid-installation']) {
+                nodeItem.action = 'invalid-installation';
+            }
+
 			const filterTypes = new Set();
 			this.filterList.forEach(filterItem => {
 				const { value, hashMap } = filterItem;
@@ -1243,29 +1576,55 @@ export class CustomNodesManager {
 					if (hashData) {
 						filterTypes.add(value);
 						if (value === ShowMode.UPDATE) {
-							nodeItem.installed = "Update";
+							nodeItem['update-state'] = "true";
+						}
+						if (value === ShowMode.MISSING) {
+							nodeItem['missing-node'] = "true";
 						}
 						if (typeof hashData === "object") {
 							Object.assign(nodeItem, hashData);
 						}
 					}
 				} else {
-					if (nodeItem.installed === value) {
+					if (nodeItem.state === value) {
 						filterTypes.add(value);
 					}
-					const map = {
+
-						"Update": "True",
+					switch(nodeItem.state) {
-						"Disabled": "True",
+						case "enabled":
-						"Fail": "True",
+							filterTypes.add("enabled");
-						"None": "False"
+						case "disabled":
+							filterTypes.add("installed");
+							break;
+
+						case "not-installed":
+							filterTypes.add("not-installed");
+							break;
 					}
-					if (map[nodeItem.installed]) {
+
-						filterTypes.add(map[nodeItem.installed]);
+					if(nodeItem.version != 'unknown') {
+						filterTypes.add("cnr");
+					}
+					else {
+						filterTypes.add("unknown");
+					}
+
+					if(nodeItem['update-state'] == 'true') {
+						filterTypes.add("updatable");
+					}
+
+					if(nodeItem['import-fail']) {
+						filterTypes.add("import-fail");
+					}
+
+					if(nodeItem['invalid-installation']) {
+						filterTypes.add("invalid-installation");
 					}
 				}
 			});
+
 			nodeItem.filterTypes = Array.from(filterTypes);
-		});
+		}
 
 		this.renderGrid();
 

js/model-manager.js

@@ -235,7 +235,7 @@ const pageHtml = `
 <div class="cmm-manager-selection"></div>
 <div class="cmm-manager-message"></div>
 <div class="cmm-manager-footer">
-	<button class="cmm-manager-close">Close</button>
+	<button class="cmm-manager-back">Back</button>
 	<div class="cmm-flex-auto"></div>
 </div>
 `;
@@ -365,10 +365,12 @@ export class ModelManager {
 				}
 			},
 
-			".cmm-manager-close": {
+			".cmm-manager-back": {
-				click: (e) => this.close()
+				click: (e) => {
+				    this.close()
+				    manager_instance.show();
+				}
 			},
-
 		};
 		Object.keys(eventsMap).forEach(selector => {
 			const target = this.element.querySelector(selector);

js/node_fixer.js

@@ -101,7 +101,7 @@ function connect_inputs(nearest_inputs, node) {
 	}
 }
 
-function node_info_copy(src, dest, connect_both) {
+function node_info_copy(src, dest, connect_both, copy_shape) {
 	// copy input connections
 	for(let i in src.inputs) {
 		let input = src.inputs[i];
@@ -142,9 +142,11 @@ function node_info_copy(src, dest, connect_both) {
 		}
 	}
 
+	if(copy_shape) {
 		dest.color = src.color;
 		dest.bgcolor = src.bgcolor;
-	dest.size = src.size;
+		dest.size = max(src.size, dest.size);
+	}
 
 	app.graph.afterChange();
 }
@@ -162,6 +164,7 @@ app.registerExtension({
 
 			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) )
@@ -169,7 +172,11 @@ app.registerExtension({
 
 						let src_node = lookup_nearest_nodes(node);
 						if(src_node)
-							node_info_copy(src_node, node, double_click_policy == "copy-all");
+						{
+							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":

js/terminal.js

@@ -1,81 +0,0 @@
-import {app} from "../../scripts/app.js";
-import {ComfyWidgets} from "../../scripts/widgets.js";
-// Node that add notes to your project
-
-let terminal_node;
-let log_mode = false;
-
-app.registerExtension({
-	name: "Comfy.Manager.Terminal",
-
-	registerCustomNodes() {
-		class TerminalNode {
-			color = "#222222";
-			bgcolor = "#000000";
-			groupcolor = LGraphCanvas.node_colors.black.groupcolor;
-			constructor() {
-				this.logs = [];
-
-				if (!this.properties) {
-					this.properties = {};
-					this.properties.text="";
-				}
-
-				ComfyWidgets.STRING(this, "", ["", {default:this.properties.text, multiline: true}], app)
-				ComfyWidgets.BOOLEAN(this, "mode", ["", {default:true, label_on:'Logging', label_off:'Stop'}], app)
-				ComfyWidgets.INT(this, "lines", ["", {default:500, min:10, max:10000, steps:1}], app)
-
-				let self = this;
-				Object.defineProperty(this.widgets[1], 'value', {
-					set: (v) => {
-						api.fetchApi(`/manager/terminal?mode=${v}`, {});
-						log_mode = v;
-					},
-					get: () => {
-						return log_mode;
-					}
-				});
-
-				this.serialize_widgets = false;
-				this.isVirtualNode = true;
-
-				if(terminal_node) {
-					try {
-						terminal_node.widgets[0].value = 'The output of this node is disabled because another terminal node has appeared.';
-					}
-					catch {}
-				}
-				terminal_node = this;
-			}
-		}
-
-		// Load default visibility
-		LiteGraph.registerNodeType(
-			"Terminal Log //CM",
-			Object.assign(TerminalNode, {
-				title_mode: LiteGraph.NORMAL_TITLE,
-				title: "Terminal Log (Manager)",
-				collapsable: true,
-			})
-		);
-
-		TerminalNode.category = "utils";
-	},
-});
-
-
-import { api } from "../../scripts/api.js";
-
-function terminalFeedback(event) {
-	if(terminal_node) {
-		terminal_node.logs.push(event.detail.data);
-		if(terminal_node.logs.length > terminal_node.widgets[2].value) {
-			terminal_node.logs.shift();
-			if(terminal_node.logs[0] == '' || terminal_node.logs[0] == '\n')
-				terminal_node.logs.shift();
-		}
-		terminal_node.widgets[0].value = [...terminal_node.logs].reverse().join('').trim();
-	}
-}
-
-api.addEventListener("manager-terminal-feedback", terminalFeedback);

js/workflow-metadata.js

@@ -0,0 +1,84 @@
+/**
+ * Attaches metadata to the workflow on save
+ * - custom node pack version to all custom nodes used in the workflow
+ *
+ * Example metadata:
+ "extra": {
+    "node_versions": {
+      "comfy-core": "v0.3.8-4-g0b2eb7f",
+      "comfyui-easy-use": "1.2.5"
+    }
+  },
+ */
+
+import { app } from "../../scripts/app.js";
+import { api } from "../../scripts/api.js";
+
+class WorkflowMetadataExtension {
+  constructor() {
+    this.name = "Comfy.CustomNodesManager.WorkflowMetadata";
+    this.installedNodeVersions = {};
+    this.comfyCoreVersion = null;
+  }
+
+  /**
+   * Get the installed node versions
+   * @returns {Promise<Record<string, string>>} The mapping from node name to version
+   * version can either be a git commit hash or a semantic version such as "1.0.0"
+   */
+  async getInstalledNodeVersions() {
+    const res = await api.fetchApi("/customnode/installed");
+    return await res.json();
+  }
+
+  /**
+   * Get the node versions for the given graph
+   * @param {LGraph} graph The graph to get the node versions for
+   * @returns {Promise<Record<string, string>>} The mapping from node name to version
+   */
+  getGraphNodeVersions(graph) {
+    const nodeVersions = {};
+    for (const node of graph.nodes) {
+      const nodeData = node.constructor.nodeData;
+      // Frontend only nodes don't have nodeData
+      if (!nodeData) {
+        continue;
+      }
+      const modules = nodeData.python_module.split(".");
+
+      if (modules[0] === "custom_nodes") {
+        const nodePackageName = modules[1].split("@")[0];
+        const nodeVersion = this.installedNodeVersions[nodePackageName];
+        nodeVersions[nodePackageName] = nodeVersion;
+      } else if (["nodes", "comfy_extras"].includes(modules[0])) {
+        nodeVersions["comfy-core"] = this.comfyCoreVersion;
+      } else {
+        console.warn(`Unknown node source: ${nodeData.python_module}`);
+      }
+    }
+    return nodeVersions;
+  }
+
+  async init() {
+    const extension = this;
+    this.installedNodeVersions = await this.getInstalledNodeVersions();
+    this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
+
+    // Attach metadata when app.graphToPrompt is called.
+    const originalSerialize = LGraph.prototype.serialize;
+    LGraph.prototype.serialize = function () {
+      const workflow = originalSerialize.apply(this, arguments);
+
+      // Add metadata to the workflow
+      if (!workflow.extra) {
+        workflow.extra = {};
+      }
+      const graph = this;
+      workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
+
+      return workflow;
+    };
+  }
+}
+
+app.registerExtension(new WorkflowMetadataExtension());

json-checker.py

@@ -3,10 +3,12 @@ import argparse
 
 def check_json_syntax(file_path):
     try:
-        with open(file_path, 'r') as file:
+        with open(file_path, 'r', encoding='utf-8') as file:
             json_str = file.read()
             json.loads(json_str)
             print(f"[ OK ] {file_path}")
+    except UnicodeDecodeError as e:
+        print(f"Unicode decode error: {e}")
     except json.JSONDecodeError as e:
         print(f"[FAIL] {file_path}\n\n       {e}\n")
     except FileNotFoundError:

node_db/forked/custom-node-list.json

@@ -1,5 +1,65 @@
 {
     "custom_nodes": [
+        {
+            "author": "BlenderNeko",
+            "title": "ltdrdata/ComfyUI_TiledKSampler",
+            "reference": "https://github.com/ltdrdata/ComfyUI_TiledKSampler",
+            "files": [
+                "https://github.com/ltdrdata/ComfyUI_TiledKSampler"
+            ],
+            "install_type": "git-clone",
+            "description": "PR for [a/https://github.com/BlenderNeko/ComfyUI_TiledKSampler/pull/59](https://github.com/BlenderNeko/ComfyUI_TiledKSampler/pull/59)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "ComfyUI-leo-Hamer",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-Hamer",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-Hamer"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice Hamer-ComfyUI by leo\nNOTE:base on [a/hamer](https://github.com/geopavlakos/hamer)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "ComfyUI-leo-GVHMR",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-GVHMR",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-GVHMR"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice Hamer-ComfyUI by leo\nNOTE:base on [a/GVHMR](https://github.com/zju3dv/GVHMR)"
+        },
+        {
+            "author": "leeooo001",
+            "title": "RealisDance-ComfyUI",
+            "reference": "https://github.com/leeooo001/ComfyUI-leo-RealisDance",
+            "files": [
+                "https://github.com/leeooo001/ComfyUI-leo-RealisDance"
+            ],
+            "install_type": "git-clone",
+            "description": "Unoffice RealisDance-ComfyUI by leo\nNOTE:base on [a/RealisDance](https://github.com/damo-cv/RealisDance), modified on [a/RealisDanceComfyui](https://github.com/AIFSH/RealisDance-ComfyUI)"
+        },
+        {
+            "author": "jags111",
+            "title": "NyaamZ/efficiency-nodes-ED",
+            "reference": "https://github.com/NyaamZ/efficiency-nodes-ED",
+            "files": [
+                "https://github.com/NyaamZ/efficiency-nodes-ED"
+            ],
+            "install_type": "git-clone",
+            "description": "This forked repo supports efficiency-nodes-comfyui. Additional features."
+        },
+        {
+            "author": "SeaArtLab",
+            "title": "zer0int/ComfyUI-Long-CLIP",
+            "reference": "https://github.com/zer0int/ComfyUI-Long-CLIP",
+            "files": [
+                "https://github.com/zer0int/ComfyUI-Long-CLIP"
+            ],
+            "install_type": "git-clone",
+            "description": "This forked repo supports FLUX.1 not only SD1.5, SDXL."
+        },
         {
             "author": "meimeilook",
             "title": "ComfyUI_IPAdapter_plus.old [backward compatbility]",
@@ -49,6 +109,16 @@
             ],
             "install_type": "git-clone",
             "description": "This is a development respository for debugging migration of StableSR to ComfyUI\n\nNOTE:Forked from [https://github.com/gameltb/Comfyui-StableSR]\nPut the StableSR [a/webui_786v_139.ckpt](https://huggingface.co/Iceclear/StableSR/resolve/main/webui_768v_139.ckpt) model into Comyfui/models/stablesr/, Put the StableSR [a/stablesr_768v_000139.ckpt](https://huggingface.co/Iceclear/StableSR/resolve/main/stablesr_768v_000139.ckpt) model into Comyfui/models/checkpoints/"
+        },
+        {
+            "author": "city96",
+            "title": "Efficient-Large-Model/Extra Models for ComfyUI",
+            "reference": "https://github.com/Efficient-Large-Model/ComfyUI_ExtraModels",
+            "files": [
+                "https://github.com/Efficient-Large-Model/ComfyUI_ExtraModels"
+            ],
+            "install_type": "git-clone",
+            "description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
         }
     ]
 }

node_db/legacy/custom-node-list.json

@@ -10,6 +10,516 @@
         },
         
 
+        
+        {
+            "author": "jefferyharrell",
+            "title": "ComfyUI-JHXMP [REMOVED]",
+            "reference": "https://github.com/jefferyharrell/ComfyUI-JHXMP",
+            "files": [
+                "https://github.com/jefferyharrell/ComfyUI-JHXMP"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Save Image With XMP Metadata"
+        },
+        {
+            "author": "viperyl",
+            "title": "ComfyUI-BiRefNet [NOT MAINTAINED]",
+            "id": "comfyui-birefnet",
+            "reference": "https://github.com/viperyl/ComfyUI-BiRefNet",
+            "files": [
+                "https://github.com/viperyl/ComfyUI-BiRefNet"
+            ],
+            "install_type": "git-clone",
+            "description": "Bilateral Reference Network achieves SOTA result in multi Salient Object Segmentation dataset, this repo pack BiRefNet as ComfyUI nodes, and make this SOTA model easier use for everyone."
+        },
+        {
+            "author": "asagi4",
+            "title": "ComfyUI prompt control (LEGACY VERSION)",
+            "reference": "https://github.com/asagi4/comfyui-prompt-control-legacy",
+            "files": [
+                "https://github.com/asagi4/comfyui-prompt-control-legacy"
+            ],
+            "install_type": "git-clone",
+            "description": "WARNING: These nodes exist only to reproduce old workflows. They are unmaintained See https://github.com/asagi4/comfyui-prompt-control for the revised, current version of prompt control."
+        },
+        {
+            "author": "doomy23",
+            "title": "ComfyUI-D00MYsNodes [REMOVED]",
+            "reference": "https://github.com/doomy23/ComfyUI-D00MYsNodes",
+            "files": [
+                "https://github.com/doomy23/ComfyUI-D00MYsNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: Images_Converter, Show_Text, Strings_From_List, Save_Text, Random_Images, Load_Images_From_Paths, JSPaint."
+        },
+        {
+            "author": "kadirnar",
+            "title": "comfyui_hub [REMOVED]",
+            "reference": "https://github.com/kadirnar/comfyui_hub",
+            "files": [
+                "https://github.com/kadirnar/comfyui_hub"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of nodes randomly selected and gathered, related to noise. NOTE: SD-Advanced-Noise, noise_latent_perlinpinpin, comfy-plasma"
+        },
+        {
+            "author": "SaltAI",
+            "title": "SaltAI_AudioViz [REMOVED]",
+            "id": "saltai-audioviz",
+            "reference": "https://github.com/get-salt-AI/SaltAI_AudioViz",
+            "files": [
+                "https://github.com/get-salt-AI/SaltAI_AudioViz"
+            ],
+            "install_type": "git-clone",
+            "description": "SaltAI AudioViz contains ComfyUI nodes for generating complex audio reactive visualizations"
+        },
+        {
+            "author": "SaltAI",
+            "title": "SaltAI-Open-Resources [REMOVED]",
+            "id": "saltai-open-resource",
+            "reference": "https://github.com/get-salt-AI/SaltAI",
+            "pip": ["numba"],
+            "files": [
+                "https://github.com/get-salt-AI/SaltAI"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository is a collection of open-source nodes and workflows for ComfyUI, a dev tool that allows users to create node-based workflows often powered by various AI models to do pretty much anything.\nOur mission is to seamlessly connect people and organizations with the world’s foremost AI innovations, anywhere, anytime. Our vision is to foster a flourishing AI ecosystem where the world’s best developers can build and share their work, thereby redefining how software is made, pushing innovation forward, and ensuring as many people as possible can benefit from the positive promise of AI technologies.\nWe believe that ComfyUI is a powerful tool that can help us achieve our mission and vision, by enabling anyone to explore the possibilities and limitations of AI models in a visual and interactive way, without coding if desired.\nWe hope that by sharing our nodes and workflows, we can inspire and empower more people to create amazing AI-powered content with ComfyUI."
+        },
+        {
+            "author": "SaltAI",
+            "title": "SaltAI_Language_Toolkit [REMOVED]",
+            "id": "saltai_language_toolkit",
+            "reference": "https://github.com/get-salt-AI/SaltAI_Language_Toolkit",
+            "files": [
+                "https://github.com/get-salt-AI/SaltAI_Language_Toolkit"
+            ],
+            "install_type": "git-clone",
+            "description": "The project integrates the Retrieval Augmented Generation (RAG) tool [a/Llama-Index](https://www.llamaindex.ai/), [a/Microsoft's AutoGen](https://microsoft.github.io/autogen/), and [a/LlaVA-Next](https://github.com/LLaVA-VL/LLaVA-NeXT) with ComfyUI's adaptable node interface, enhancing the functionality and user experience of the platform."
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-Sana [DEPRECATED]",
+            "reference": "https://github.com/zmwv823/ComfyUI-Sana",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI-Sana"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial custom-node for [a/SANA: Efficient High-Resolution Image Synthesis with Linear Diffusion Transformer](https://github.com/NVlabs/Sana)\n[w/A init node with lots of bugs, do not try unless interested.]"
+        },
+        {
+            "author": "ACE-innovate",
+            "title": "seg-node [REMOVED]",
+            "reference": "https://github.com/ACE-innovate/seg-node",
+            "files": [
+                "https://github.com/ACE-innovate/seg-node"
+            ],
+            "install_type": "git-clone",
+            "description": "hf cloth seg custom node for comfyui\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "zefu-lu",
+            "title": "ComfyUI_InstantX_SD35_Large_IPAdapter [REMOVED]",
+            "id": "comfyui-instantx-sd3-5-large-ipadapter",
+            "reference": "https://github.com/zefu-lu/ComfyUI-InstantX-SD3_5-Large-IPAdapter",
+            "files": [
+                "https://github.com/zefu-lu/ComfyUI-InstantX-SD3_5-Large-IPAdapter"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom ComfyUI node for using InstantX SD3.5-Large IPAdapter"
+        },
+        {
+            "author": "HentaiGirlfriendDotCom",
+            "title": "comfyui-highlight-connections [REMOVED]",
+            "reference": "https://github.com/HentaiGirlfriendDotCom/comfyui-highlight-connections",
+            "files": [
+                "https://github.com/HentaiGirlfriendDotCom/comfyui-highlight-connections"
+            ],
+            "install_type": "git-clone",
+            "description": "A node that can be dropped into a group. When a node is then clicked within that group, all nodes and connections in that group get greyed out and the connections from the clicked node go bright red."
+        },
+        {
+            "author": "huangyangke",
+            "title": "ComfyUI-Kolors-IpadapterFaceId [DEPRECATED]",
+            "reference": "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId",
+            "files": [
+                "https://github.com/huangyangke/ComfyUI-Kolors-IpadapterFaceId"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:kolors_ipadapter_faceid\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI_Ctrlora [DEPRECATED]",
+            "reference": "https://github.com/zmwv823/ComfyUI_Ctrlora",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI_Ctrlora"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial custom_node for [a/xyfJASON/ctrlora](https://github.com/xyfJASON/ctrlora)."
+        },
+        {
+            "author": "Fannovel16",
+            "title": "ComfyUI Loopchain [DEPRECATED]",
+            "id": "loopchain",
+            "reference": "https://github.com/Fannovel16/ComfyUI-Loopchain",
+            "files": [
+                "https://github.com/Fannovel16/ComfyUI-Loopchain"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of nodes which can be useful for animation in ComfyUI. The main focus of this extension is implementing a mechanism called loopchain. A loopchain in this case is the chain of nodes only executed repeatly in the workflow. If a node chain contains a loop node from this extension, it will become a loop chain."
+        },
+        {
+            "author": "DonBaronFactory",
+            "title": "ComfyUI-Cre8it-Nodes [DEPRECATED]",
+            "reference": "https://github.com/DonBaronFactory/ComfyUI-Cre8it-Nodes",
+            "files": [
+                "https://github.com/DonBaronFactory/ComfyUI-Cre8it-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:CRE8IT Serial Prompter, CRE8IT Apply Serial Prompter, CRE8IT Image Sizer. A few simple nodes to facilitate working wiht ComfyUI Workflows"
+        },
+        {
+            "author": "thecooltechguy",
+            "title": "ComfyUI-ComfyRun [DEPRECATED/UNSAFE]",
+            "reference": "https://github.com/thecooltechguy/ComfyUI-ComfyRun",
+            "files": [
+                "https://github.com/thecooltechguy/ComfyUI-ComfyRun"
+            ],
+            "install_type": "git-clone",
+            "description": "The easiest way to run & share any ComfyUI workflow [a/https://comfyrun.com](https://comfyrun.com)\nNOTE: Vulnerability discovered. Not being managed."
+        },
+        {
+            "author": "Cardoso-topdev",
+            "title": "comfyui_meshanything_v1 [REMOVED]",
+            "reference": "https://github.com/Cardoso-topdev/comfyui_meshanything_v1",
+            "files": [
+                "https://github.com/Cardoso-topdev/comfyui_meshanything_v1"
+            ],
+            "install_type": "git-clone",
+            "description": "MeshAnything V2: Artist-Created Mesh Generation With Adjacent Mesh Tokenization"
+        },
+        {
+            "author": "palant",
+            "title": "Extended Save Image for ComfyUI [DEPRECATED]",
+            "reference": "https://github.com/palant/extended-saveimage-comfyui",
+            "files": [
+                "https://github.com/palant/extended-saveimage-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node is largely identical to the usual Save Image but allows saving images also in JPEG and WEBP formats, the latter with both lossless and lossy compression. Metadata is embedded in the images as usual, and the resulting images can be used to load a workflow."
+        },
+        {
+            "author": "1038lab",
+            "title": "ComfyUI-GPT2P [REMOVED]",
+            "id": "gpt2p",
+            "reference": "https://github.com/1038lab/ComfyUI-GPT2P",
+            "files": [
+                "https://github.com/1038lab/ComfyUI-GPT2P"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Node - Hugging Face repositories GTP2 Prompt"
+        },
+        {
+            "author": "yushan777",
+            "title": "Y7 Nodes for ComfyUI [REMOVED]",
+            "id": "y7nodes",
+            "reference": "https://github.com/yushan777/ComfyUI-Y7Nodes",
+            "files": [
+                "https://github.com/yushan777/ComfyUI-Y7Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:Count_Tokens_(Y7)"
+        },
+        {
+            "author": "city96",
+            "title": "SD-Advanced-Noise [DEPRECATED]",
+            "id": "adv-noise",
+            "reference": "https://github.com/city96/SD-Advanced-Noise",
+            "files": [
+                "https://github.com/city96/SD-Advanced-Noise"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: LatentGaussianNoise, MathEncode. An experimental custom node that generates latent noise directly by utilizing the linear characteristics of the latent space."
+        },
+        {
+            "author": "shockz0rz",
+            "title": "InterpolateEverything [DEPRECATED]",
+            "id": "interpolate-everything",
+            "reference": "https://github.com/shockz0rz/ComfyUI_InterpolateEverything",
+            "files": [
+                "https://github.com/shockz0rz/ComfyUI_InterpolateEverything"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: Interpolate Poses, Interpolate Lineart, ... Custom nodes for interpolating between, well, everything in the Stable Diffusion ComfyUI."
+        },
+        {
+            "author": "svdC1",
+            "title": "LoRa Dataset Tools [REMOVED]",
+            "reference": "https://github.com/svdC1/comfy-ui-lora-dataset-tools",
+            "files": [
+                "https://github.com/svdC1/comfy-ui-lora-dataset-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Directory Loader, Filter Images Without Faces, Detect Faces and Draw Detection Box"
+        },
+        {
+            "author": "MiddleKD",
+            "title": "ComfyUI-default-workflow-setter [REMOVED]",
+            "reference": "https://github.com/MiddleKD/ComfyUI-default-workflow-setter",
+            "files": [
+                "https://github.com/MiddleKD/ComfyUI-default-workflow-setter"
+            ],
+            "install_type": "git-clone",
+            "description": "Default workflow setter"
+        },
+        {
+            "author": "Firetheft",
+            "title": "ComfyUI-Flux-Prompt-Tools [REMOVED]",
+            "reference": "https://github.com/Firetheft/ComfyUI-Flux-Prompt-Tools",
+            "files": [
+                "https://github.com/Firetheft/ComfyUI-Flux-Prompt-Tools"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Flux Prompt Enhance, Flux Prompt Gemini Flash, Flux Prompt Generator, MiniCPM V2.6 Int4"
+        },
+        {
+            "author": "jtydhr88",
+            "title": "ComfyUI Unique3D [DEPRECATED]",
+            "id": "unique3d",
+            "reference": "https://github.com/jtydhr88/ComfyUI-Unique3D",
+            "files": [
+                "https://github.com/jtydhr88/ComfyUI-Unique3D"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Unique3D is custom nodes that running AiuniAI/Unique3D into ComfyUI[w/Please follow readme to install with ComfyUI embedded python.]"
+        },
+        {
+            "author": "mpiquero7164",
+            "title": "SaveImgPrompt [DEPRECATED]",
+            "id": "save-imgprompt",
+            "reference": "https://github.com/mpiquero7164/ComfyUI-SaveImgPrompt",
+            "files": [
+                "https://github.com/mpiquero7164/ComfyUI-SaveImgPrompt"
+            ],
+            "install_type": "git-clone",
+            "description": "Save a png or jpeg and option to save prompt/workflow in a text or json file for each image in Comfy + Workflow loading."
+        },
+        {
+            "author": "guoyk93",
+            "title": "y.k.'s ComfyUI node suite [DEPRECATED]",
+            "id": "yks",
+            "reference": "https://github.com/yankeguo-deprecated/yk-node-suite-comfyui",
+            "files": [
+                "https://github.com/yankeguo-deprecated/yk-node-suite-comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: YKImagePadForOutpaint, YKMaskToImage"
+        },
+        {
+            "author": "adityathiru",
+            "title": "ComfyUI LLMs [REMOVED]",
+            "reference": "https://github.com/adityathiru/ComfyUI-LLMs",
+            "files": [
+                "https://github.com/adityathiru/ComfyUI-LLMs"
+            ],
+            "install_type": "git-clone",
+            "description": "Goal: To enable folks to rapidly build complex workflows with LLMs\nNOTE:☠️ This is experimental and not recommended to use in a production environment (yet!)"
+        },
+        {
+            "author": "DannyStone1999",
+            "title": "ComfyUI-Depth2Mask [REMOVED]",
+            "reference": "https://github.com/DannyStone1999/ComfyUI-Depth2Mask",
+            "files": [
+                "https://github.com/DannyStone1999/ComfyUI-Depth2Mask/raw/main/Depth2Mask.py"
+            ],
+            "install_type": "copy",
+            "description": "Nodes:Depth2Mask"
+        },
+        {
+            "author": "syaofox",
+            "title": "ComfyUI_FoxTools [REMOVED]",
+            "reference": "https://github.com/syaofox/ComfyUI_FoxTools",
+            "files": [
+                "https://github.com/syaofox/ComfyUI_FoxTools"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:BatchImageFromList, Load Face Occlusion Model, Create Face Mask, Simple FaceAlign, Cacul FaceAlign, Gen Blurbord, Face Align, Face Rotate, ImageAdd, LoadImageList, SaveImage Plus, RegTextFind"
+        },
+        {
+            "author": "AIFSH",
+            "title": "SeedVC-ComfyUI [REMOVED]",
+            "reference": "https://github.com/AIFSH/SeedVC-ComfyUI",
+            "files": [
+                "https://github.com/AIFSH/SeedVC-ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "a custom node for [a/seed-vc](https://github.com/Plachtaa/seed-vc)"
+        },
+        {
+            "author": "jazhang00",
+            "title": "ComfyUI Node for Slicedit [REMOVED]",
+            "reference": "https://github.com/jazhang00/ComfyUI-Slicedit",
+            "files": [
+                "https://github.com/jazhang00/ComfyUI-Slicedit"
+            ],
+            "install_type": "git-clone",
+            "description": "Slicedit main page: [a/https://matankleiner.github.io/slicedit/](https://matankleiner.github.io/slicedit/). Use Slicedit with ComfyUI."
+        },
+        {
+            "author": "rklaffehn",
+            "title": "rk-comfy-nodes [REMOVED]",
+            "id": "rknodes",
+            "reference": "https://github.com/rklaffehn/rk-comfy-nodes",
+            "files": [
+                "https://github.com/rklaffehn/rk-comfy-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: RK_CivitAIMetaChecker, RK_CivitAIAddHashes."
+        },
+        {
+            "author": "Extraltodeus",
+            "title": "CLIP-Token-Injection [REMOVED]",
+            "reference": "https://github.com/Extraltodeus/CLIP-Token-Injection",
+            "files": [
+                "https://github.com/Extraltodeus/CLIP-Token-Injection"
+            ],
+            "install_type": "git-clone",
+            "description": "These nodes are to edit the text vectors of CLIP models, so to customize how the prompts will be interpreted. You could see it as either customisation, 'one token prompt' up to some limitation and a way to mess with how the text will be interpreted. The edited CLIP can then be saved, or as well the edited tokens themselves. The shared example weights does not contain any image-knowledge but the text vector of the words affected."
+        },
+        {
+            "author": "openart",
+            "title": "openart-comfyui-deploy [REMOVED]",
+            "id": "openart-comfyui-deploy",
+            "reference": "https://github.com/kulsisme/openart-comfyui-deploy",
+            "files": [
+                "https://github.com/kulsisme/openart-comfyui-deploy"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: External Boolean (ComfyUI Deploy), External Checkpoint (ComfyUI Deploy), External Image (ComfyUI Deploy), External Video (ComfyUI Deploy x VHS), OpenArt Text, Image Websocket Output (ComfyDeploy), ..."
+        },
+        {
+            "author": "mittimi",
+            "title": "ComfyUI_mittimiLoadPreset [DEPRECATED]",
+            "id": "comfyui-mittimi-load-preset",
+            "reference": "https://github.com/mittimi/ComfyUI_mittimiLoadPreset",
+            "files": [
+                "https://github.com/mittimi/ComfyUI_mittimiLoadPreset"
+            ],
+            "install_type": "git-clone",
+            "description": "The system selects and loads preset."
+        },
+        {
+            "author": "jinljin",
+            "title": "ComfyUI-Talking-Head [REMOVED]",
+            "reference": "https://github.com/jinljin/ComfyUI-ElevenlabsAndDID-Combine",
+            "files": [
+                "https://github.com/jinljin/ComfyUI-ElevenlabsAndDID-Combine"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI-Talking-Head"
+        },
+        {
+            "author": "jh-leon-kim",
+            "title": "ComfyUI-JHK-utils [REMOVED]",
+            "id": "jhk",
+            "reference": "https://github.com/jh-leon-kim/ComfyUI-JHK-utils",
+            "files": [
+                "https://github.com/jh-leon-kim/ComfyUI-JHK-utils"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:JHK_Utils_LoadEmbed, JHK_Utils_string_merge, JHK_Utils_ImageRemoveBackground"
+        },
+        {
+            "author": "ilovejohnwhite",
+            "title": "TatToolkit [REMOVED]",
+            "reference": "https://github.com/ilovejohnwhite/UncleBillyGoncho",
+            "files": [
+                "https://github.com/ilovejohnwhite/UncleBillyGoncho"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:UWU TTK Preprocessor, Pixel Perfect Resolution, Generation Resolution From Image, Generation Resolution From Latent, Enchance And Resize Hint Images, ..."
+        },
+        {
+            "author": "hzchet",
+            "title": "ComfyUI_QueueGeneration [REMOVED]",
+            "reference": "https://github.com/hzchet/ComfyUI_QueueGeneration",
+            "files": [
+                "https://github.com/hzchet/ComfyUI_QueueGeneration"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Queue Img2Vid Generation"
+        },
+        {
+            "author": "ader47",
+            "title": "ComfyUI-MeshHamer [REMOVED]",
+            "reference": "https://github.com/ader47/comfyui_meshhamer",
+            "files": [
+                "https://github.com/ader47/comfyui_meshhamer"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:MeshHamer Hand Refiner. See also: [a/HaMeR: Hand Mesh Recovery](https://github.com/geopavlakos/hamer/tree/main)"
+        },
+        {
+            "author": "SEkINVR",
+            "title": "ComfyUI-Animator",
+            "reference": "https://github.com/SEkINVR/ComfyUI-Animator [REMOVED]",
+            "files": [
+                "https://github.com/SEkINVR/ComfyUI-Animator"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node for ComfyUI provides full-body animation capabilities, including facial rigging, various lighting styles, and green screen output."
+        },
+        {
+            "author": "ZHO-ZHO-ZHO",
+            "title": "ComfyUI-AnyText [NOT MAINTAINED]",
+            "reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-AnyText",
+            "files": [
+                "https://github.com/ZHO-ZHO-ZHO/ComfyUI-AnyText"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial implementation of [a/AnyText](https://github.com/tyxsspa/AnyText/tree/825bcc54687206b15bd7e28ba1a8b095989d58e3) for ComfyUI（EXP）"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-pkg39 [DEPRECATED]",
+            "reference": "https://github.com/shinich39/comfyui-pkg39",
+            "files": [
+                "https://github.com/shinich39/comfyui-pkg39"
+            ],
+            "install_type": "git-clone",
+            "description": "This package has created for generate image from generated image and embedded workflow."
+        },
+        {
+            "author": "dnl13",
+            "title": "ComfyUI-dnl13-seg [DEPRECATED]",
+            "reference": "https://github.com/dnl13/ComfyUI-dnl13-seg",
+            "files": [
+                "https://github.com/dnl13/ComfyUI-dnl13-seg"
+            ],
+            "install_type": "git-clone",
+            "description": "After discovering @storyicon implementation here of Segment Anything, I realized its potential as a powerful tool for ComfyUI if implemented correctly. I delved into the SAM and Dino models. The following is my own adaptation of sam_hq for ComfyUI."
+        },
+        {
+            "author": "1038lab",
+            "title": "ComfyUI-latentSizeSelector [REMOVED]",
+            "id": "ComfyUI-latentSizeSelector",
+            "reference": "https://github.com/1038lab/ComfyUI_LatentSizeSelector",
+            "files": [
+                "https://github.com/1038lab/ComfyUI_LatentSizeSelector"
+            ],
+            "install_type": "git-clone",
+            "description": "You'll get a new node Latent Size Selector, you can pick the x and y sizes from a list."
+        },
+        {
+            "author": "hy134300",
+            "title": "ComfyUI-PhotoMaker-V2 [REMOVED]",
+            "reference": "https://github.com/hy134300/ComfyUI-PhotoMaker-V2",
+            "files": [
+                "https://github.com/hy134300/ComfyUI-PhotoMaker-V2"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes for PhotoMaker-V2"
+        },
         {
             "author": "neverbiasu",
             "title": "ComfyUI ImageCaptioner [REMOVED]",

node_db/tutorial/custom-node-list.json

@@ -90,16 +90,6 @@
             "install_type": "git-clone",
             "description": "Nodes:WW_ImageResize"
         },
-        {
-            "author": "bmz55",
-            "title": "bmz nodes",
-            "reference": "https://github.com/bmz55/comfyui-bmz-nodes",
-            "files": [
-                "https://github.com/bmz55/comfyui-bmz-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Load Images From Dir With Name (Inspire - BMZ), Count Images In Dir (BMZ), Get Level Text (BMZ), Get Level Float (BMZ)"
-        },
         {
             "author": "azure-dragon-ai",
             "title": "ComfyUI-HPSv2-Nodes",
@@ -150,36 +140,6 @@
             "install_type": "git-clone",
             "description": "This module provides an annotation @ComfyFunc to streamline adding custom node types in ComfyUI. It processes your function's signature to create a wrapped function and custom node definition required for ComfyUI, eliminating all the boilerplate code. In most cases you can just add a @ComfyFunc(\"category\") annotation to your existing function."
         },
-        {
-            "author": "MokkaBoss1",
-            "title": "Woman_in_a_dress",
-            "reference": "https://github.com/MokkaBoss1/Woman_in_a_dress",
-            "files": [
-                "https://github.com/MokkaBoss1/Woman_in_a_dress/raw/main/Woman_In_A_Dress.py"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Woman_in_a_dress"
-        },
-        {
-            "author": "shinich39",
-            "title": "comfyui-concat-text-39",
-            "reference": "https://github.com/shinich39/comfyui-concat-text-39",
-            "files": [
-                "https://github.com/shinich39/comfyui-concat-text-39"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Concatenate multiple text nodes."
-        },
-        {
-            "author": "nilor-corp",
-            "title": "nilor-nodes",
-            "reference": "https://github.com/nilor-corp/nilor-nodes",
-            "files": [
-                "https://github.com/nilor-corp/nilor-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes:Nilor Floats, Nilor Int To List Of Bools, Nilor Bool From List Of Bools, Nilor Int From List Of Ints, Nilor List of Ints, Nilor Count Images In Directory"
-        },
         {
             "author": "OuticNZ",
             "title": "ComfyUI-Simple-Of-Complex",
@@ -260,6 +220,26 @@
             ],
             "install_type": "git-clone",
             "description": "The primitive node and dummy input are required because comfy doesn't accept requests with identical graphs. You'll also need a show text node. I like the one from ComfyUI-Custom-Scripts. I got the generic tetris remake from claude so it may or may not be ripped from somewhere else."
+        },
+        {
+            "author": "FlyMyAI",
+            "title": "ComfyUI-ExampleNode",
+            "reference": "https://github.com/FlyMyAI/ComfyUI-ExampleNode",
+            "files": [
+                "https://github.com/FlyMyAI/ComfyUI-ExampleNode"
+            ],
+            "install_type": "git-clone",
+            "description": "Node to provide convenient ComfyUI standard, supported by flymy_comfyui."
+        },
+        {
+            "author": "Wanghanying",
+            "title": "ComfyUI_RAGDemo",
+            "reference": "https://github.com/Wanghanying/ComfyUI_RAGDemo",
+            "files": [
+                "https://github.com/Wanghanying/ComfyUI_RAGDemo"
+            ],
+            "install_type": "git-clone",
+            "description": "RAG Demo for LLM"
         }
     ]
 }

node_db/tutorial/extension-node-map.json

@@ -1 +1,546 @@
-{}
+{
+    "https://github.com/BadCafeCode/execution-inversion-demo-comfyui": [
+        [
+            "AccumulateNode",
+            "AccumulationGetItemNode",
+            "AccumulationGetLengthNode",
+            "AccumulationHeadNode",
+            "AccumulationSetItemNode",
+            "AccumulationTailNode",
+            "AccumulationToListNode",
+            "BoolOperationNode",
+            "ComponentInput",
+            "ComponentMetadata",
+            "ComponentOutput",
+            "DebugPrint",
+            "ExecutionBlocker",
+            "FloatConditions",
+            "ForLoopClose",
+            "ForLoopOpen",
+            "IntConditions",
+            "IntMathOperation",
+            "InversionDemoAdvancedPromptNode",
+            "InversionDemoLazyConditional",
+            "InversionDemoLazyIndexSwitch",
+            "InversionDemoLazyMixImages",
+            "InversionDemoLazySwitch",
+            "ListToAccumulationNode",
+            "MakeListNode",
+            "StringConditions",
+            "ToBoolNode",
+            "WhileLoopClose",
+            "WhileLoopOpen"
+        ],
+        {
+            "title_aux": "execution-inversion-demo-comfyui"
+        }
+    ],
+    "https://github.com/BetaDoggo/ComfyUI-Tetris": [
+        [
+            "Tetris"
+        ],
+        {
+            "title_aux": "ComfyUI Tetris"
+        }
+    ],
+    "https://github.com/BoosterCore/ComfyUI-BC-Experimental": [
+        [
+            "ClipTextEncodeBC",
+            "ClipTextEncodeBCA",
+            "FluxEmptyLatentSize",
+            "LoraWithTriggerWord",
+            "SaveAnyText",
+            "SimpleText"
+        ],
+        {
+            "title_aux": "ComfyUI-BC-Experimental"
+        }
+    ],
+    "https://github.com/FlyMyAI/ComfyUI-ExampleNode": [
+        [
+            "ExampleT2IFMANode"
+        ],
+        {
+            "title_aux": "ComfyUI-ExampleNode"
+        }
+    ],
+    "https://github.com/IvanRybakov/comfyui-node-int-to-string-convertor": [
+        [
+            "Int To String"
+        ],
+        {
+            "title_aux": "comfyui-node-int-to-string-convertor"
+        }
+    ],
+    "https://github.com/LarryJane491/Custom-Node-Base": [
+        [
+            "My First Node"
+        ],
+        {
+            "title_aux": "Custom-Node-Base"
+        }
+    ],
+    "https://github.com/OuticNZ/ComfyUI-Simple-Of-Complex": [
+        [
+            "Pipe From Parameters",
+            "Pipe To Parameters",
+            "Prompt Tidy",
+            "Text Switch 2 Way",
+            "Text With Context"
+        ],
+        {
+            "title_aux": "ComfyUI-Simple-Of-Complex"
+        }
+    ],
+    "https://github.com/Suzie1/ComfyUI_Guide_To_Making_Custom_Nodes": [
+        [
+            "Concatenate Hello World",
+            "Hello World Overlay Text",
+            "Print Hello World"
+        ],
+        {
+            "title_aux": "Guide To Making Custom Nodes in ComfyUI"
+        }
+    ],
+    "https://github.com/Wanghanying/ComfyUI_RAGDemo": [
+        [
+            "testRAG"
+        ],
+        {
+            "title_aux": "ComfyUI_RAGDemo"
+        }
+    ],
+    "https://github.com/azure-dragon-ai/ComfyUI-HPSv2-Nodes": [
+        [
+            "GetImageSize",
+            "HaojihuiHPSv2ImageProcessor",
+            "HaojihuiHPSv2ImageScore",
+            "HaojihuiHPSv2ImageScores",
+            "HaojihuiHPSv2Loader",
+            "HaojihuiHPSv2SaveAnimatedWEBP",
+            "HaojihuiHPSv2SaveImage",
+            "HaojihuiHPSv2SaveWEBP",
+            "HaojihuiHPSv2SaveWebpImage",
+            "HaojihuiHPSv2TextProcessor",
+            "SaveImageWebp",
+            "ScaleShort"
+        ],
+        {
+            "title_aux": "ComfyUI-HPSv2-Nodes"
+        }
+    ],
+    "https://github.com/bamboodia/BAM_Nodes": [
+        [
+            "BAM Crop To Ratio",
+            "BAM Empty Latent By Ratio",
+            "BAM Get Shortest Side",
+            "BAM OnOff INT",
+            "BAM Random Float",
+            "BAM Random Image From Folder"
+        ],
+        {
+            "title_aux": "BAM Nodes"
+        }
+    ],
+    "https://github.com/boricuapab/ComfyUI_BoricuapabWFNodePack": [
+        [
+            "BoricuapabWF Concatenate Hello World",
+            "BoricuapabWF Integer",
+            "BoricuapabWF Print Hello Puerto Rican World",
+            "BoricuapabWF Print Puerto Rican"
+        ],
+        {
+            "title_aux": "ComfyUI_BoricuapabWFNodePack"
+        }
+    ],
+    "https://github.com/comfyanonymous/ComfyUI": [
+        [
+            "AddNoise",
+            "AlignYourStepsScheduler",
+            "BasicGuider",
+            "BasicScheduler",
+            "BetaSamplingScheduler",
+            "CFGGuider",
+            "CLIPAttentionMultiply",
+            "CLIPLoader",
+            "CLIPMergeAdd",
+            "CLIPMergeSimple",
+            "CLIPMergeSubtract",
+            "CLIPSave",
+            "CLIPSetLastLayer",
+            "CLIPTextEncode",
+            "CLIPTextEncodeControlnet",
+            "CLIPTextEncodeFlux",
+            "CLIPTextEncodeHunyuanDiT",
+            "CLIPTextEncodeSD3",
+            "CLIPTextEncodeSDXL",
+            "CLIPTextEncodeSDXLRefiner",
+            "CLIPVisionEncode",
+            "CLIPVisionLoader",
+            "Canny",
+            "CheckpointLoader",
+            "CheckpointLoaderSimple",
+            "CheckpointSave",
+            "ConditioningAverage",
+            "ConditioningCombine",
+            "ConditioningConcat",
+            "ConditioningSetArea",
+            "ConditioningSetAreaPercentage",
+            "ConditioningSetAreaStrength",
+            "ConditioningSetMask",
+            "ConditioningSetTimestepRange",
+            "ConditioningZeroOut",
+            "ControlNetApply",
+            "ControlNetApplyAdvanced",
+            "ControlNetApplySD3",
+            "ControlNetInpaintingAliMamaApply",
+            "ControlNetLoader",
+            "CropMask",
+            "DiffControlNetLoader",
+            "DifferentialDiffusion",
+            "DiffusersLoader",
+            "DisableNoise",
+            "DualCFGGuider",
+            "DualCLIPLoader",
+            "EmptyImage",
+            "EmptyLatentAudio",
+            "EmptyLatentImage",
+            "EmptyMochiLatentVideo",
+            "EmptySD3LatentImage",
+            "ExponentialScheduler",
+            "FeatherMask",
+            "FlipSigmas",
+            "FluxGuidance",
+            "FreeU",
+            "FreeU_V2",
+            "GITSScheduler",
+            "GLIGENLoader",
+            "GLIGENTextBoxApply",
+            "GrowMask",
+            "HyperTile",
+            "HypernetworkLoader",
+            "ImageBatch",
+            "ImageBlend",
+            "ImageBlur",
+            "ImageColorToMask",
+            "ImageCompositeMasked",
+            "ImageCrop",
+            "ImageFromBatch",
+            "ImageInvert",
+            "ImageOnlyCheckpointLoader",
+            "ImageOnlyCheckpointSave",
+            "ImagePadForOutpaint",
+            "ImageQuantize",
+            "ImageScale",
+            "ImageScaleBy",
+            "ImageScaleToTotalPixels",
+            "ImageSharpen",
+            "ImageToMask",
+            "ImageUpscaleWithModel",
+            "InpaintModelConditioning",
+            "InstructPixToPixConditioning",
+            "InvertMask",
+            "JoinImageWithAlpha",
+            "KSampler",
+            "KSamplerAdvanced",
+            "KSamplerSelect",
+            "KarrasScheduler",
+            "LaplaceScheduler",
+            "LatentAdd",
+            "LatentApplyOperation",
+            "LatentApplyOperationCFG",
+            "LatentBatch",
+            "LatentBatchSeedBehavior",
+            "LatentBlend",
+            "LatentComposite",
+            "LatentCompositeMasked",
+            "LatentCrop",
+            "LatentFlip",
+            "LatentFromBatch",
+            "LatentInterpolate",
+            "LatentMultiply",
+            "LatentOperationSharpen",
+            "LatentOperationTonemapReinhard",
+            "LatentRotate",
+            "LatentSubtract",
+            "LatentUpscale",
+            "LatentUpscaleBy",
+            "LoadAudio",
+            "LoadImage",
+            "LoadImageMask",
+            "LoadLatent",
+            "LoraLoader",
+            "LoraLoaderModelOnly",
+            "LoraSave",
+            "MaskComposite",
+            "MaskToImage",
+            "ModelMergeAdd",
+            "ModelMergeBlocks",
+            "ModelMergeFlux1",
+            "ModelMergeSD1",
+            "ModelMergeSD2",
+            "ModelMergeSD35_Large",
+            "ModelMergeSD3_2B",
+            "ModelMergeSDXL",
+            "ModelMergeSimple",
+            "ModelMergeSubtract",
+            "ModelSamplingAuraFlow",
+            "ModelSamplingContinuousEDM",
+            "ModelSamplingContinuousV",
+            "ModelSamplingDiscrete",
+            "ModelSamplingFlux",
+            "ModelSamplingSD3",
+            "ModelSamplingStableCascade",
+            "ModelSave",
+            "Morphology",
+            "PatchModelAddDownscale",
+            "PerpNeg",
+            "PerpNegGuider",
+            "PerturbedAttentionGuidance",
+            "PhotoMakerEncode",
+            "PhotoMakerLoader",
+            "PolyexponentialScheduler",
+            "PorterDuffImageComposite",
+            "PreviewAudio",
+            "PreviewImage",
+            "RandomNoise",
+            "RebatchImages",
+            "RebatchLatents",
+            "RepeatImageBatch",
+            "RepeatLatentBatch",
+            "RescaleCFG",
+            "SDTurboScheduler",
+            "SD_4XUpscale_Conditioning",
+            "SV3D_Conditioning",
+            "SVD_img2vid_Conditioning",
+            "SamplerCustom",
+            "SamplerCustomAdvanced",
+            "SamplerDPMAdaptative",
+            "SamplerDPMPP_2M_SDE",
+            "SamplerDPMPP_2S_Ancestral",
+            "SamplerDPMPP_3M_SDE",
+            "SamplerDPMPP_SDE",
+            "SamplerEulerAncestral",
+            "SamplerEulerAncestralCFGPP",
+            "SamplerEulerCFGpp",
+            "SamplerLCMUpscale",
+            "SamplerLMS",
+            "SaveAnimatedPNG",
+            "SaveAnimatedWEBP",
+            "SaveAudio",
+            "SaveImage",
+            "SaveImageWebsocket",
+            "SaveLatent",
+            "SelfAttentionGuidance",
+            "SetLatentNoiseMask",
+            "SetUnionControlNetType",
+            "SkipLayerGuidanceSD3",
+            "SolidMask",
+            "SplitImageWithAlpha",
+            "SplitSigmas",
+            "SplitSigmasDenoise",
+            "StableCascade_EmptyLatentImage",
+            "StableCascade_StageB_Conditioning",
+            "StableCascade_StageC_VAEEncode",
+            "StableCascade_SuperResolutionControlnet",
+            "StableZero123_Conditioning",
+            "StableZero123_Conditioning_Batched",
+            "StubConstantImage",
+            "StubFloat",
+            "StubImage",
+            "StubInt",
+            "StubMask",
+            "StyleModelApply",
+            "StyleModelLoader",
+            "TestAccumulateNode",
+            "TestAccumulationGetItemNode",
+            "TestAccumulationGetLengthNode",
+            "TestAccumulationHeadNode",
+            "TestAccumulationSetItemNode",
+            "TestAccumulationTailNode",
+            "TestAccumulationToListNode",
+            "TestBoolOperationNode",
+            "TestCustomIsChanged",
+            "TestCustomValidation1",
+            "TestCustomValidation2",
+            "TestCustomValidation3",
+            "TestCustomValidation4",
+            "TestCustomValidation5",
+            "TestDynamicDependencyCycle",
+            "TestExecutionBlocker",
+            "TestFloatConditions",
+            "TestForLoopClose",
+            "TestForLoopOpen",
+            "TestIntConditions",
+            "TestIntMathOperation",
+            "TestIsChangedWithConstants",
+            "TestLazyMixImages",
+            "TestListToAccumulationNode",
+            "TestMakeListNode",
+            "TestMixedExpansionReturns",
+            "TestStringConditions",
+            "TestToBoolNode",
+            "TestVariadicAverage",
+            "TestWhileLoopClose",
+            "TestWhileLoopOpen",
+            "ThresholdMask",
+            "TomePatchModel",
+            "TorchCompileModel",
+            "TripleCLIPLoader",
+            "UNETLoader",
+            "UNetCrossAttentionMultiply",
+            "UNetSelfAttentionMultiply",
+            "UNetTemporalAttentionMultiply",
+            "UpscaleModelLoader",
+            "VAEDecode",
+            "VAEDecodeAudio",
+            "VAEDecodeTiled",
+            "VAEEncode",
+            "VAEEncodeAudio",
+            "VAEEncodeForInpaint",
+            "VAEEncodeTiled",
+            "VAELoader",
+            "VAESave",
+            "VPScheduler",
+            "VideoLinearCFGGuidance",
+            "VideoTriangleCFGGuidance",
+            "WebcamCapture",
+            "unCLIPCheckpointLoader",
+            "unCLIPConditioning"
+        ],
+        {
+            "title_aux": "ComfyUI"
+        }
+    ],
+    "https://github.com/dynamixar/Atluris": [
+        [
+            "RandomLine"
+        ],
+        {
+            "title_aux": "Atluris"
+        }
+    ],
+    "https://github.com/ecjojo/ecjojo-example-nodes": [
+        [
+            "BiggerNote_Example",
+            "DisplayTextNode_Example",
+            "EmptyNode_Example",
+            "ExampleNode_Example",
+            "FilePrefixNode_Example",
+            "HelloWorldNode_Example",
+            "RandomSizeNode_Example",
+            "StringNode_Example",
+            "TextOverlayNode_Example"
+        ],
+        {
+            "title_aux": "ecjojo_example_nodes"
+        }
+    ],
+    "https://github.com/et118/ComfyUI-ElGogh-Nodes": [
+        [
+            "ElGoghCLIPSetLastLayer",
+            "ElGoghCheckpointLoaderSimple",
+            "ElGoghEmptyLatentImage",
+            "ElGoghKSamplerAdvanced",
+            "ElGoghNegativePrompt",
+            "ElGoghPositivePrompt",
+            "ElGoghPrimaryLoraLoader",
+            "ElGoghSecondaryLoraLoader",
+            "ElGoghSendWebsocketNSFWBool",
+            "ElGoghTertiaryLoraLoader",
+            "ElGoghVAELoader"
+        ],
+        {
+            "title_aux": "ComfyUI-ElGogh-Nodes"
+        }
+    ],
+    "https://github.com/foxtrot-roger/comfyui-custom-nodes": [
+        [
+            "RF_Tutorial"
+        ],
+        {
+            "title_aux": "comfyui-custom-nodes"
+        }
+    ],
+    "https://github.com/jtong/comfyui-jtong-workflow": [
+        [
+            "Example",
+            "high_workflow_caller",
+            "jtong.Highend",
+            "jtong.Highway"
+        ],
+        {
+            "author": "Trung0246",
+            "description": "Random nodes for ComfyUI I made to solve my struggle with ComfyUI (ex: pipe, process). Have varying quality.",
+            "nickname": "ComfyUI-0246",
+            "title": "ComfyUI-0246",
+            "title_aux": "comfyui-jtong-workflow"
+        }
+    ],
+    "https://github.com/kappa54m/ComfyUI_Usability": [
+        [
+            "KLoadImageByPath",
+            "KLoadImageByPathAdvanced",
+            "KLoadImageDedup"
+        ],
+        {
+            "title_aux": "ComfyUI-HPSv2-Nodes"
+        }
+    ],
+    "https://github.com/mira-6/mira-wildcard-node": [
+        [
+            "MiraWildcard"
+        ],
+        {
+            "author": "mira-6",
+            "description": "Single-node wildcard implementation.",
+            "nickname": "mira-wildcard-node",
+            "title": "mira-wildcard-node",
+            "title_aux": "mira-wildcard-node"
+        }
+    ],
+    "https://github.com/sonyeon-sj/ComfyUI-easy_ImageSize_Selecter": [
+        [
+            "ImageSizer",
+            "promptSelecter"
+        ],
+        {
+            "title_aux": "ComfyUI-easy_ImageSize_Selecter"
+        }
+    ],
+    "https://github.com/thinkthinking/ComfyUI-Ye": [
+        [
+            "CheckpointLoader|Ye",
+            "OllamaVision|Ye",
+            "PrintHelloWorld|Ye",
+            "Signature|Ye"
+        ],
+        {
+            "title_aux": "ComfyUI-Ye"
+        }
+    ],
+    "https://github.com/wailovet/ComfyUI-WW": [
+        [
+            "WW_AccumulationPreviewImages",
+            "WW_AppendString",
+            "WW_CurrentPreviewImages",
+            "WW_ImageResize",
+            "WW_PreviewTextNode",
+            "WW_RandString"
+        ],
+        {
+            "title_aux": "ComfyUI-WW"
+        }
+    ],
+    "https://github.com/yowipr/ComfyUI-Manual": [
+        [
+            "EXAMPLE",
+            "M_Layer",
+            "M_Output",
+            "M_RenderArea"
+        ],
+        {
+            "title_aux": "ComfyUI-Manual"
+        }
+    ]
+}

node_db/tutorial/scan.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
-source ../../../../venv/bin/activate
+rm ~/.tmp/dev/*.py > /dev/null 2>&1
-rm .tmp/*.py > /dev/null
+python ../../scanner.py ~/.tmp/tutorial
-python ../../scanner.py

notebooks/comfyui_colab_with_manager.ipynb

@@ -66,10 +66,10 @@
     "\n",
     "!echo -= Install dependencies =-\n",
     "!pip3 install accelerate\n",
-        "!pip3 install einops transformers>=4.25.1 safetensors>=0.3.0 aiohttp pyyaml Pillow scipy tqdm psutil\n",
+    "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
     "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
     "!pip3 install torchsde\n",
-        "!pip3 install kornia>=0.7.1 spandrel\n",
+    "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
     "\n",
     "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
     "  %cd custom_nodes\n",
@@ -78,6 +78,7 @@
     "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
     "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
     "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
     "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
     "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
     "\n",
@@ -228,8 +229,8 @@
    },
    "outputs": [],
    "source": [
-        "!wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
+    "!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
-        "!dpkg -i cloudflared-linux-amd64.deb\n",
+    "!dpkg -i ~/cloudflared-linux-amd64.deb\n",
     "\n",
     "import subprocess\n",
     "import threading\n",

prestartup_script.py

@@ -1,4 +1,3 @@
-import datetime
 import os
 import subprocess
 import sys
@@ -15,11 +14,15 @@ glob_path = os.path.join(os.path.dirname(__file__), "glob")
 sys.path.append(glob_path)
 
 import security_check
-from manager_util import *
+import manager_util
 import cm_global
+import manager_downloader
+from datetime import datetime
+import folder_paths
 
 security_check.security_check()
 
+cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 
 
@@ -70,19 +73,23 @@ cm_global.register_api('cm.register_message_collapse', register_message_collapse
 cm_global.register_api('cm.is_import_failed_extension', is_import_failed_extension)
 
 
-comfyui_manager_path = os.path.dirname(__file__)
+comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
-custom_nodes_path = os.path.abspath(os.path.join(comfyui_manager_path, ".."))
+
-startup_script_path = os.path.join(comfyui_manager_path, "startup-scripts")
+custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
-restore_snapshot_path = os.path.join(startup_script_path, "restore-snapshot.json")
+manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
+manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
+
 git_script_path = os.path.join(comfyui_manager_path, "git_helper.py")
-pip_overrides_path = os.path.join(comfyui_manager_path, "pip_overrides.json")
+cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
 
 
 cm_global.pip_overrides = {}
-if os.path.exists(pip_overrides_path):
+if os.path.exists(manager_pip_overrides_path):
-    with open(pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
+    with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
         cm_global.pip_overrides = json.load(json_file)
         cm_global.pip_overrides['numpy'] = 'numpy<2'
+        cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40'  # for security
 
 
 def remap_pip_package(pkg):
@@ -97,36 +104,6 @@ def remap_pip_package(pkg):
 std_log_lock = threading.Lock()
 
 
-class TerminalHook:
-    def __init__(self):
-        self.hooks = {}
-
-    def add_hook(self, k, v):
-        self.hooks[k] = v
-
-    def remove_hook(self, k):
-        if k in self.hooks:
-            del self.hooks[k]
-
-    def write_stderr(self, msg):
-        for v in self.hooks.values():
-            try:
-                v.write_stderr(msg)
-            except Exception:
-                pass
-
-    def write_stdout(self, msg):
-        for v in self.hooks.values():
-            try:
-                v.write_stdout(msg)
-            except Exception:
-                pass
-
-
-terminal_hook = TerminalHook()
-sys.__comfyui_manager_terminal_hook = terminal_hook
-
-
 def handle_stream(stream, prefix):
     stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
     for msg in stream:
@@ -172,15 +149,18 @@ try:
         postfix = ""
 
     # Logger setup
+    log_path_base = None
     if enable_file_logging:
-        if os.path.exists(f"comfyui{postfix}.log"):
+        log_path_base = os.path.join(folder_paths.user_directory, 'comfyui')
-            if os.path.exists(f"comfyui{postfix}.prev.log"):
-                if os.path.exists(f"comfyui{postfix}.prev2.log"):
-                    os.remove(f"comfyui{postfix}.prev2.log")
-                os.rename(f"comfyui{postfix}.prev.log", f"comfyui{postfix}.prev2.log")
-            os.rename(f"comfyui{postfix}.log", f"comfyui{postfix}.prev.log")
 
-        log_file = open(f"comfyui{postfix}.log", "w", encoding="utf-8", errors="ignore")
+        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"):
+                    os.remove(f"{log_path_base}{postfix}.prev2.log")
+                os.rename(f"{log_path_base}{postfix}.prev.log", f"{log_path_base}{postfix}.prev2.log")
+            os.rename(f"{log_path_base}{postfix}.log", f"{log_path_base}{postfix}.prev.log")
+
+        log_file = open(f"{log_path_base}{postfix}.log", "w", encoding="utf-8", errors="ignore")
 
     log_lock = threading.Lock()
 
@@ -201,7 +181,7 @@ try:
         write_stderr = wrapper_stderr
 
     pat_tqdm = r'\d+%.*\[(.*?)\]'
-    pat_import_fail = r'seconds \(IMPORT FAILED\):.*[/\\]custom_nodes[/\\](.*)$'
+    pat_import_fail = r'seconds \(IMPORT FAILED\):(.*)$'
 
     is_start_mode = True
 
@@ -234,7 +214,7 @@ try:
             if is_start_mode:
                 match = re.search(pat_import_fail, message)
                 if match:
-                    import_failed_extensions.add(match.group(1))
+                    import_failed_extensions.add(match.group(1).strip())
 
                 if 'Starting server' in message:
                     is_start_mode = False
@@ -256,7 +236,7 @@ try:
 
         def sync_write(self, message, file_only=False):
             with log_lock:
-                timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')[:-3]
+                timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
                 if self.last_char != '\n':
                     log_file.write(message)
                 else:
@@ -269,11 +249,9 @@ try:
                     if self.is_stdout:
                         write_stdout(message)
                         original_stdout.flush()
-                        terminal_hook.write_stderr(message)
                     else:
                         write_stderr(message)
                         original_stderr.flush()
-                        terminal_hook.write_stdout(message)
 
         def flush(self):
             log_file.flush()
@@ -322,7 +300,7 @@ try:
             if is_start_mode:
                 match = re.search(pat_import_fail, message)
                 if match:
-                    import_failed_extensions.add(match.group(1))
+                    import_failed_extensions.add(match.group(1).strip())
 
                 if 'Starting server' in message:
                     is_start_mode = False
@@ -339,37 +317,36 @@ except Exception as e:
 
 
 try:
-    import git
+    import git  # noqa: F401
 except ModuleNotFoundError:
     my_path = os.path.dirname(__file__)
     requirements_path = os.path.join(my_path, "requirements.txt")
 
-    print(f"## ComfyUI-Manager: installing dependencies. (GitPython)")
+    print("## ComfyUI-Manager: installing dependencies. (GitPython)")
     try:
         result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
-    except subprocess.CalledProcessError as e:
+    except subprocess.CalledProcessError:
-        print(f"## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+        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])
-        except subprocess.CalledProcessError as e:
+        except subprocess.CalledProcessError:
-            print(f"## [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)")
+            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)")
 
 try:
-    import git
+    print("## ComfyUI-Manager: installing dependencies done.")
-    print(f"## ComfyUI-Manager: installing dependencies done.")
 except:
     # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
-    print(f"## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+    print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
 
 
-print("** ComfyUI startup time:", datetime.datetime.now())
+print("** ComfyUI startup time:", datetime.now())
 print("** Platform:", platform.system())
 print("** Python version:", sys.version)
 print("** Python executable:", sys.executable)
 print("** ComfyUI Path:", comfy_path)
 
-if enable_file_logging:
+if log_path_base is not None:
-    print("** Log path:", os.path.abspath('comfyui.log'))
+    print("** Log path:", os.path.abspath(f'{log_path_base}.log'))
 else:
     print("** Log path: file logging is disabled")
 
@@ -404,7 +381,7 @@ def check_bypass_ssl():
         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 ComfyUI-Manager/config.ini)")
+            print("[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see ComfyUI-Manager/config.ini)")
             ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
     except Exception:
         pass
@@ -415,31 +392,8 @@ check_bypass_ssl()
 
 # Perform install
 processed_install = set()
-script_list_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "startup-scripts", "install-scripts.txt")
+script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
-pip_map = None
+pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
-
-
-def get_installed_packages():
-    global pip_map
-
-    if pip_map is None:
-        try:
-            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
-
-            pip_map = {}
-            for line in result.split('\n'):
-                x = line.strip()
-                if x:
-                    y = line.split()
-                    if y[0] == 'Package' or y[0].startswith('-'):
-                        continue
-
-                    pip_map[y[0]] = y[1]
-        except subprocess.CalledProcessError as e:
-            print(f"[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
-            return set()
-
-    return pip_map
 
 
 def is_installed(name):
@@ -448,25 +402,28 @@ def is_installed(name):
     if name.startswith('#'):
         return True
 
-    pattern = r'([^<>!=]+)([<>!=]=?)(.*)'
+    pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
     match = re.search(pattern, name)
 
     if match:
         name = match.group(1)
 
+    if name in cm_global.pip_blacklist:
+        return True
+
     if name in cm_global.pip_downgrade_blacklist:
-        pips = get_installed_packages()
+        pips = manager_util.get_installed_packages()
 
         if match is None:
             if name in pips:
                 return True
         elif match.group(2) in ['<=', '==', '<']:
             if name in pips:
-                if StrictVersion(pips[name]) >= StrictVersion(match.group(3)):
+                if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
                     print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
                     return True
 
-    pkg = get_installed_packages().get(name.lower())
+    pkg = manager_util.get_installed_packages().get(name.lower())
     if pkg is None:
         return False  # update if not installed
 
@@ -474,9 +431,9 @@ def is_installed(name):
         return True   # don't update if version is not specified
 
     if match.group(2) in ['>', '>=']:
-        if StrictVersion(pkg) < StrictVersion(match.group(3)):
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
             return False
-        elif StrictVersion(pkg) > StrictVersion(match.group(3)):
+        elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
             print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
 
     return True       # prevent downgrade
@@ -507,58 +464,21 @@ if os.path.exists(restore_snapshot_path):
                     else:
                         print(prefix, msg, end="")
 
-        print(f"[ComfyUI-Manager] Restore snapshot.")
+        print("[ComfyUI-Manager] Restore snapshot.")
-        cmd_str = [sys.executable, git_script_path, '--apply-snapshot', restore_snapshot_path]
-
         new_env = os.environ.copy()
         new_env["COMFYUI_PATH"] = comfy_path
-        exit_code = process_wrap(cmd_str, custom_nodes_path, handler=msg_capture, env=new_env)
 
-        repository_name = ''
+        cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
-        for url in cloned_repos:
+        exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
-            try:
-                repository_name = url.split("/")[-1].strip()
-                repo_path = os.path.join(custom_nodes_path, repository_name)
-                repo_path = os.path.abspath(repo_path)
-
-                requirements_path = os.path.join(repo_path, 'requirements.txt')
-                install_script_path = os.path.join(repo_path, 'install.py')
-
-                this_exit_code = 0
-
-                if os.path.exists(requirements_path):
-                    with open(requirements_path, 'r', encoding="UTF-8", errors="ignore") as file:
-                        for line in file:
-                            package_name = remap_pip_package(line.strip())
-                            if package_name and not is_installed(package_name):
-                                if not package_name.startswith('#'):
-                                    install_cmd = [sys.executable, "-m", "pip", "install", package_name]
-                                    this_exit_code += process_wrap(install_cmd, repo_path)
-
-                if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
-                    processed_install.add(f'{repo_path}/install.py')
-                    install_cmd = [sys.executable, install_script_path]
-                    print(f">>> {install_cmd} / {repo_path}")
-
-                    new_env = os.environ.copy()
-                    new_env["COMFYUI_PATH"] = comfy_path
-                    this_exit_code += process_wrap(install_cmd, repo_path, env=new_env)
-
-                if this_exit_code != 0:
-                    print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
-
-            except Exception as e:
-                print(e)
-                print(f"[ComfyUI-Manager] Restoring '{repository_name}' is failed.")
 
         if exit_code != 0:
-            print(f"[ComfyUI-Manager] Restore snapshot failed.")
+            print("[ComfyUI-Manager] Restore snapshot failed.")
         else:
-            print(f"[ComfyUI-Manager] Restore snapshot done.")
+            print("[ComfyUI-Manager] Restore snapshot done.")
 
     except Exception as e:
         print(e)
-        print(f"[ComfyUI-Manager] Restore snapshot failed.")
+        print("[ComfyUI-Manager] Restore snapshot failed.")
 
     os.remove(restore_snapshot_path)
 
@@ -575,7 +495,12 @@ def execute_lazy_install_script(repo_path, executable):
             for line in requirements_file:
                 package_name = remap_pip_package(line.strip())
                 if package_name and not is_installed(package_name):
-                    install_cmd = [executable, "-m", "pip", "install", 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()]
+                    else:
+                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+
                     process_wrap(install_cmd, repo_path)
 
     if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
@@ -588,6 +513,65 @@ def execute_lazy_install_script(repo_path, executable):
         process_wrap(install_cmd, repo_path, env=new_env)
 
 
+def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom_nodes_path):
+    import uuid
+    import shutil
+
+    # 1. download
+    archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip"  # should be unpredictable name - security precaution
+    download_path = os.path.join(custom_nodes_path, archive_name)
+    manager_downloader.download_url(zip_url, custom_nodes_path, archive_name)
+
+    # 2. extract files into <node_id>@<cur_ver>
+    extracted = manager_util.extract_package_as_zip(download_path, from_path)
+    os.remove(download_path)
+
+    if extracted is None:
+        if len(os.listdir(from_path)) == 0:
+            shutil.rmtree(from_path)
+
+        print(f'Empty archive file: {target}')
+        return False
+
+
+    # 3. calculate garbage files (.tracking - extracted)
+    tracking_info_file = os.path.join(from_path, '.tracking')
+    prev_files = set()
+    with open(tracking_info_file, 'r') as f:
+        for line in f:
+            prev_files.add(line.strip())
+    garbage = prev_files.difference(extracted)
+    garbage = [os.path.join(custom_nodes_path, x) for x in garbage]
+
+    # 4-1. remove garbage files
+    for x in garbage:
+        if os.path.isfile(x):
+            os.remove(x)
+
+    # 4-2. remove garbage dir if empty
+    for x in garbage:
+        if os.path.isdir(x):
+            if not os.listdir(x):
+                os.rmdir(x)
+
+    # 5. rename dir name <node_id>@<prev_ver> ==> <node_id>@<cur_ver>
+    print(f"'{from_path}' is moved to '{to_path}'")
+    shutil.move(from_path, to_path)
+
+    # 6. create .tracking file
+    tracking_info_file = os.path.join(to_path, '.tracking')
+    with open(tracking_info_file, "w", encoding='utf-8') as file:
+        file.write('\n'.join(list(extracted)))
+
+
+def execute_migration(moves):
+    import shutil
+    for x in moves:
+        if os.path.exists(x[0]) and not os.path.exists(x[1]):
+            shutil.move(x[0], x[1])
+            print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
+
+
 # Check if script_list_path exists
 if os.path.exists(script_list_path):
     print("\n#######################################################################")
@@ -609,6 +593,13 @@ if os.path.exists(script_list_path):
                     if script[1] == "#LAZY-INSTALL-SCRIPT":
                         execute_lazy_install_script(script[0], script[2])
 
+                    elif script[1] == "#LAZY-CNR-SWITCH-SCRIPT":
+                        execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
+                        execute_lazy_install_script(script[3], script[7])
+
+                    elif script[1] == "#LAZY-MIGRATION":
+                        execute_migration(script[2])
+
                 elif os.path.exists(script[0]):
                     if script[1] == "#FORCE":
                         del script[1]
@@ -638,8 +629,11 @@ if os.path.exists(script_list_path):
     print("\n[ComfyUI-Manager] Startup script completed.")
     print("#######################################################################\n")
 
+pip_fixer.fix_broken()
+
 del processed_install
-del pip_map
+del pip_fixer
+manager_util.clear_pip_cache()
 
 
 def check_windows_event_loop_policy():
@@ -655,7 +649,7 @@ def check_windows_event_loop_policy():
                 import asyncio
                 import asyncio.windows_events
                 asyncio.set_event_loop_policy(asyncio.windows_events.WindowsSelectorEventLoopPolicy())
-                print(f"[ComfyUI-Manager] Windows event loop policy mode enabled")
+                print("[ComfyUI-Manager] Windows event loop policy mode enabled")
             except Exception as e:
                 print(f"[ComfyUI-Manager] WARN: Windows initialization fail: {e}")
     except Exception:

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

ruff.toml

@@ -0,0 +1,12 @@
+# Disable all rules by default
+lint.ignore = ["ALL"]
+
+# Enable specific rules
+lint.select = [
+    "S307",  # suspicious-eval-usage
+    # The "F" series in Ruff stands for "Pyflakes" rules, which catch various Python syntax errors and undefined names.
+    # See all rules here: https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "F",
+]
+
+exclude = ["*.ipynb"]

scan.sh

@@ -3,5 +3,9 @@ rm ~/.tmp/default/*.py > /dev/null 2>&1
 python scanner.py ~/.tmp/default $*
 cp extension-node-map.json node_db/new/.
 
-echo Integrity check
+echo "Integrity check"
-./check.sh
+if [ -f "check2.sh" ]; then
+    ./check2.sh
+else
+    ./check.sh
+fi

scanner.py

@@ -69,7 +69,7 @@ def extract_nodes(code_text):
 
     try:
         if parse_cnt % 100 == 0:
-            print(f".", end="", flush=True)
+            print(".", end="", flush=True)
         parse_cnt += 1
 
         code_text = re.sub(r'\\[^"\']', '', code_text)
@@ -245,7 +245,10 @@ def get_py_urls_from_json(json_file):
 
 
 def clone_or_pull_git_repository(git_url):
-    repo_name = git_url.split("/")[-1].split(".")[0]
+    repo_name = git_url.split("/")[-1]
+    if repo_name.endswith(".git"):
+        repo_name = repo_name[:-4]
+        
     repo_dir = os.path.join(temp_dir, repo_name)
 
     if os.path.exists(repo_dir):
@@ -512,7 +515,7 @@ def gen_json(node_info):
             nodes.sort()
             data[git_url] = (nodes, metadata_in_url)
 
-    json_path = f"extension-node-map.json"
+    json_path = "extension-node-map.json"
     with open(json_path, "w", encoding='utf-8') as file:
         json.dump(data, file, indent=4, sort_keys=True)