fixed: robust rmtree for windows environment

- reserve for deletion upon restart if a permission error occurs during rmtree https://github.com/ltdrdata/ComfyUI-Manager/issues/1579
update DB
2025-03-03 21:34:38 +09:00 · 2025-03-03 18:27:15 +09:00 · 2025-03-03 17:58:22 +09:00 · 2025-03-02 17:42:31 +09:00 · 2025-03-02 17:28:53 +09:00 · 2025-03-02 17:07:00 +09:00
35 changed files with 10082 additions and 5415 deletions
--- a/README.md
+++ b/README.md
@@ -149,6 +149,7 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
 * Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
 * Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
 * Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
+* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
 * Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
 * Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
 * Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
@@ -301,7 +302,10 @@ The following settings are applied based on the section marked as `is_default`.
 * Custom pip mapping
  * When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
    * Please refer to the `pip_overrides.json.template` file.
-    
+
+* Prevent the installation of specific pip packages
+  * List the package names one per line in the `pip_blacklist.list` file.
+
 * Use `aria2` as downloader
  * [howto](docs/en/use_aria2.md)

@@ -309,6 +313,29 @@ The following settings are applied based on the section marked as `is_default`.
  * This option can be used if performance issues occur in a Colab+GDrive environment.


+## Environment Variables
+
+The following features can be configured using environment variables:
+
+* **COMFYUI_PATH**: The installation path of ComfyUI
+* **GITHUB_ENDPOINT**: Reverse proxy configuration for environments with limited access to GitHub
+* **HF_ENDPOINT**: Reverse proxy configuration for environments with limited access to Hugging Face
+
+
+### Example 1:
+Redirecting `https://github.com/ltdrdata/ComfyUI-Impact-Pack` to `https://mirror.ghproxy.com/https://github.com/ltdrdata/ComfyUI-Impact-Pack`
+
+```
+GITHUB_ENDPOINT=https://mirror.ghproxy.com/https://github.com
+```
+
+#### Example 2:
+Changing `https://huggingface.co/path/to/somewhere` to `https://some-hf-mirror.com/path/to/somewhere`
+
+```
+HF_ENDPOINT=https://some-hf-mirror.com 
+```
+
 ## Scanner
 When you run the `scan.sh` script:

--- a/init.py
+++ b/init.py
@@ -3,13 +3,14 @@ import sys

 cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')

-print("[DBG] point14")
-
 if not os.path.exists(cli_mode_flag):
    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
    import manager_server  # noqa: F401
    import share_3rdparty  # noqa: F401
-    WEB_DIRECTORY = "js"
+    import cm_global
+
+    if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
+        WEB_DIRECTORY = "js"
 else:
    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")

--- a/cm-cli.py
+++ b/cm-cli.py
@@ -32,6 +32,7 @@ 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(manager_util.comfyui_manager_path, '..', '..'))

+# This should be placed here
 sys.path.append(comfy_path)

 import utils.extra_config
@@ -42,7 +43,7 @@ import cnr_utils

 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))

-cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
+cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 cm_global.pip_overrides = {'numpy': 'numpy<2'}

@@ -51,6 +52,14 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides
        cm_global.pip_overrides = json.load(json_file)


+if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list")):
+    with open(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list"), 'r', encoding="UTF-8", errors="ignore") as f:
+        for x in f.readlines():
+            y = x.strip()
+            if y != '':
+                cm_global.pip_blacklist.add(y)
+
+
 def check_comfyui_hash():
    repo = git.Repo(comfy_path)
    core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
@@ -67,7 +76,7 @@ core.check_invalid_nodes()
 def read_downgrade_blacklist():
    try:
        import configparser
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
        config.read(core.manager_config.path)
        default_conf = config['default']

@@ -136,6 +145,18 @@ class Ctx:
                cm_global.pip_overrides = json.load(json_file)
                cm_global.pip_overrides = {'numpy': 'numpy<2'}

+        if os.path.exists(core.manager_pip_blacklist_path):
+            with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+                for x in f.readlines():
+                    y = x.strip()
+                    if y != '':
+                        cm_global.pip_blacklist.add(y)
+
+    def update_custom_nodes_dir(self, target_dir):
+        import folder_paths
+        a, b = folder_paths.folder_names_and_paths['custom_nodes']
+        folder_paths.folder_names_and_paths['custom_nodes'] = [os.path.abspath(target_dir)], set()
+
    @staticmethod
    def get_startup_scripts_path():
        return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
@@ -1021,7 +1042,17 @@ def save_snapshot(
        ] = True,
 ):
    cmd_ctx.set_user_directory(user_directory)
-    path = core.save_snapshot_with_postfix('snapshot', output, not full_snapshot)
+
+    if(not output.endswith('.json') and not output.endswith('.yaml')):
+        print("ERROR: output path should be either '.json' or '.yaml' file.")
+        raise typer.Exit(code=1)
+    
+    dir_path = os.path.dirname(output)
+    if(dir_path != '' and not os.path.exists(dir_path)):
+        print(f"ERROR: {output} path not exists.")
+        raise typer.Exit(code=1)
+        
+    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
    print(f"Current snapshot is saved as `{path}`")


@@ -1049,10 +1080,17 @@ def restore_snapshot(
        user_directory: str = typer.Option(
            None,
            help="user directory"
+        ),
+        restore_to: Optional[str] = typer.Option(
+            None,
+            help="Manually specify the installation path for the custom node. Ignore user directory."
        )
 ):
    cmd_ctx.set_user_directory(user_directory)

+    if restore_to:
+        cmd_ctx.update_custom_nodes_dir(restore_to)
+
    extras = []
    if pip_non_url:
        extras.append('--pip-non-url')
--- a/custom-node-list.json
+++ b/custom-node-list.json
--- a/docs/en/cm-cli.md
+++ b/docs/en/cm-cli.md
@@ -121,8 +121,9 @@ ComfyUI-Loopchain
  * If no file exists at the snapshot path, it is implicitly assumed to be in ComfyUI-Manager/snapshots.
  * `--pip-non-url`: Restore for pip packages registered on PyPI.
  * `--pip-non-local-url`: Restore for pip packages registered at web URLs.
-  * `--pip-local-url`: Restore for pip packages specified by local paths. 
-
+  * `--pip-local-url`: Restore for pip packages specified by local paths.
+  * `--user-directory`: Set the user directory.
+  * `--restore-to`: The path where the restored custom nodes will be installed. (When this option is applied, only the custom nodes installed in the target path are recognized as installed.)

 ### 5. CLI Only Mode

--- a/docs/ko/cm-cli.md
+++ b/docs/ko/cm-cli.md
@@ -123,7 +123,8 @@ ComfyUI-Loopchain
  * `--pip-non-url`: PyPI 에 등록된 pip 패키지들에 대해서 복구를 수행
  * `--pip-non-local-url`: web URL에 등록된 pip 패키지들에 대해서 복구를 수행
  * `--pip-local-url`: local 경로를 지정하고 있는 pip 패키지들에 대해서 복구를 수행 
-
+  * `--user-directory`: 사용자 디렉토리 설정
+  * `--restore-to`: 복구될 커스텀 노드가 설치될 경로. (이 옵션을 적용할 경우 오직 대상 경로에 설치된 custom nodes 만 설치된 것으로 인식함.)

 ### 5. CLI only mode

--- a/extension-node-map.json
+++ b/extension-node-map.json
--- a/git_helper.py
+++ b/git_helper.py
@@ -154,14 +154,27 @@ def switch_to_default_branch(repo):
        repo.git.checkout(default_branch)
        return True
    except:
+        # try checkout master
+        # try checkout main if failed
        try:
            repo.git.checkout(repo.heads.master)
+            return True
        except:
            try:
                if remote_name is not None:
                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
+                    return True
            except:
-                pass
+                try:
+                    repo.git.checkout(repo.heads.main)
+                    return True
+                except:
+                    try:
+                        if remote_name is not None:
+                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
+                            return True
+                    except:
+                        pass

    print("[ComfyUI Manager] Failed to switch to the default branch")
    return False
--- a/github-stats.json
+++ b/github-stats.json
--- a/glob/cm_global.py
+++ b/glob/cm_global.py
@@ -112,4 +112,6 @@ def add_on_revision_detected(k, f):
        variables['cm.on_revision_detected_handler'].append((k, f))


-error_dict = {}
+error_dict = {}
+
+disable_front = False
--- a/glob/cnr_utils.py
+++ b/glob/cnr_utils.py
@@ -173,7 +173,10 @@ def read_cnr_info(fullpath):

            project = data.get('project', {})
            name = project.get('name').strip().lower()
-            version = project.get('version')
+
+            # normalize version
+            # for example: 2.5 -> 2.5.0
+            version = str(manager_util.StrictVersion(project.get('version')))

            urls = project.get('urls', {})
            repository = urls.get('Repository')
--- a/glob/git_utils.py
+++ b/glob/git_utils.py
@@ -2,6 +2,9 @@ import os
 import configparser


+GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
+
+
 def is_git_repo(path: str) -> bool:
    """ Check if the path is a git repository. """
    # NOTE: Checking it through `git.Repo` must be avoided.
@@ -37,7 +40,8 @@ def git_url(fullpath):
    if not os.path.exists(git_config_path):
        return None

-    config = configparser.ConfigParser()
+    # Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
+    config = configparser.ConfigParser(strict=False)
    config.read(git_config_path)

    for k, v in config.items():
@@ -46,16 +50,36 @@ def git_url(fullpath):

    return None

+
 def normalize_url(url) -> str:
-    url = url.replace("git@github.com:", "https://github.com/")
-    if url.endswith('.git'):
-        url = url[:-4]
+    github_id = normalize_to_github_id(url)
+    if github_id is not None:
+        url = f"https://github.com/{github_id}"

    return url

-def normalize_url_http(url) -> str:
-    url = url.replace("https://github.com/", "git@github.com:")
-    if url.endswith('.git'):
-        url = url[:-4]

-    return url
+def normalize_to_github_id(url) -> str:
+    if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
+        author = os.path.basename(os.path.dirname(url))
+
+        if author.startswith('git@github.com:'):
+            author = author.split(':')[1]
+
+        repo_name = os.path.basename(url)
+        if repo_name.endswith('.git'):
+            repo_name = repo_name[:-4]
+
+        return f"{author}/{repo_name}"
+
+    return None
+
+
+def get_url_for_clone(url):
+    url = normalize_url(url)
+
+    if GITHUB_ENDPOINT is not None and url.startswith('https://github.com/'):
+        url = GITHUB_ENDPOINT + url[18:] # url[18:] -> remove `https://github.com`
+
+    return url
+    
--- a/glob/manager_core.py
+++ b/glob/manager_core.py
@@ -42,7 +42,7 @@ import manager_downloader
 from node_package import InstalledNodePackage


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


@@ -177,6 +177,7 @@ manager_channel_list_path = None
 manager_startup_script_path:str = None
 manager_snapshot_path = None
 manager_pip_overrides_path = None
+manager_pip_blacklist_path = None
 manager_components_path = None

 def update_user_directory(user_dir):
@@ -186,6 +187,7 @@ def update_user_directory(user_dir):
    global manager_startup_script_path
    global manager_snapshot_path
    global manager_pip_overrides_path
+    global manager_pip_blacklist_path
    global manager_components_path

    manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
@@ -203,6 +205,7 @@ def update_user_directory(user_dir):
    manager_config_path = os.path.join(manager_files_path, 'config.ini')
    manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
    manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
    manager_components_path = os.path.join(manager_files_path, "components")
    manager_util.cache_dir = os.path.join(manager_files_path, "cache")

@@ -345,6 +348,7 @@ class ManagedResult:
        self.msg = None
        self.target = None
        self.postinstall = lambda: True
+        self.ver = None

    def append(self, item):
        self.items.append(item)
@@ -366,6 +370,10 @@ class ManagedResult:
        self.postinstall = postinstall
        return self

+    def with_ver(self, ver):
+        self.ver = ver
+        return self
+

 class UnifiedManager:
    def __init__(self):
@@ -497,6 +505,8 @@ class UnifiedManager:
    def resolve_from_path(self, fullpath):
        url = git_utils.git_url(fullpath)
        if url:
+            url = git_utils.normalize_url(url)
+
            cnr = self.get_cnr_by_repo(url)
            commit_hash = git_utils.get_commit_hash(fullpath)
            if cnr:
@@ -513,7 +523,10 @@ class UnifiedManager:
            if info:
                cnr = self.cnr_map.get(info['id'])
                if cnr:
-                    return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
+                    # normalize version
+                    # for example: 2.5 -> 2.5.0
+                    ver = str(manager_util.StrictVersion(info['version']))
+                    return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                else:
                    return None
            else:
@@ -525,6 +538,8 @@ class UnifiedManager:

        if node_package.is_disabled and node_package.is_unknown:
            url = git_utils.git_url(node_package.fullpath)
+            if url is not None:
+                url = git_utils.normalize_url(url)
            self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)

        if node_package.is_disabled and node_package.is_nightly:
@@ -535,6 +550,8 @@ class UnifiedManager:

        if node_package.is_enabled and node_package.is_unknown:
            url = git_utils.git_url(node_package.fullpath)
+            if url is not None:
+                url = git_utils.normalize_url(url)
            self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)

        if node_package.is_from_cnr and node_package.is_disabled:
@@ -786,6 +803,7 @@ class UnifiedManager:
                    node_id = v['id']
                else:
                    node_id = v['files'][0].split('/')[-1]
+                    v['repository'] = v['files'][0]
                res[node_id] = v
            elif len(v['files']) > 1:
                res[v['files'][0]] = v  # A custom node composed of multiple url is treated as a single repository with one representative path
@@ -812,14 +830,14 @@ class UnifiedManager:
                print("Install: pip packages")
                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
                res = True
-                with open(requirements_path, "r") as requirements_file:
-                    for line in requirements_file:
-                        package_name = remap_pip_package(line.strip())
-                        if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
-                            self.processed_install.add(package_name)
-                            install_cmd = manager_util.make_pip_cmd(["install", package_name])
-                            if package_name.strip() != "" and not package_name.startswith('#'):
-                                res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
+                lines = manager_util.robust_readlines(requirements_path)
+                for line in lines:
+                    package_name = remap_pip_package(line.strip())
+                    if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
+                        self.processed_install.add(package_name)
+                        install_cmd = manager_util.make_pip_cmd(["install", package_name])
+                        if package_name.strip() != "" and not package_name.startswith('#'):
+                            res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)

                pip_fixer.fix_broken()
                return res
@@ -979,7 +997,7 @@ class UnifiedManager:

        return result

-    def unified_enable(self, node_id, version_spec=None):
+    def unified_enable(self, node_id: str, version_spec=None):
        """
        priority if version_spec == None
        1. CNR latest in disk
@@ -991,6 +1009,9 @@ class UnifiedManager:

        result = ManagedResult('enable')

+        if 'comfyui-manager' in node_id.lower():
+            return result.fail(f"ignored: enabling '{node_id}'")
+
        if version_spec is None:
            version_spec = self.resolve_unspecified_version(node_id, guess_mode='inactive')
            if version is None:
@@ -1045,8 +1066,8 @@ class UnifiedManager:

        # update cache
        if version_spec == 'unknown':
+            self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
            del self.unknown_inactive_nodes[node_id]
-            self.unknown_active_nodes[node_id] = to_path
            return result.with_target(to_path)
        elif version_spec == 'nightly':
            del self.nightly_inactive_nodes[node_id]
@@ -1056,9 +1077,12 @@ class UnifiedManager:
        self.active_nodes[node_id] = version_spec, to_path
        return result.with_target(to_path)

-    def unified_disable(self, node_id, is_unknown):
+    def unified_disable(self, node_id: str, is_unknown):
        result = ManagedResult('disable')

+        if 'comfyui-manager' in node_id.lower():
+            return result.fail(f"ignored: disabling '{node_id}'")
+
        if is_unknown:
            version_spec = 'unknown'
        else:
@@ -1114,6 +1138,9 @@ class UnifiedManager:
        """
        result = ManagedResult('uninstall')

+        if 'comfyui-manager' in node_id.lower():
+            return result.fail(f"ignored: uninstalling '{node_id}'")
+
        if is_unknown:
            # remove from actives
            repo_and_path = self.unknown_active_nodes.get(node_id)
@@ -1146,14 +1173,14 @@ class UnifiedManager:
        ver_and_path = self.active_nodes.get(node_id)

        if ver_and_path is not None and os.path.exists(ver_and_path[1]):
-            shutil.rmtree(ver_and_path[1])
+            try_rmtree(node_id, ver_and_path[1])
            result.items.append(ver_and_path)
            del self.active_nodes[node_id]

        # remove from nightly inactives
        fullpath = self.nightly_inactive_nodes.get(node_id)
        if fullpath is not None and os.path.exists(fullpath):
-            shutil.rmtree(fullpath)
+            try_rmtree(node_id, fullpath)
            result.items.append(('nightly', fullpath))
            del self.nightly_inactive_nodes[node_id]

@@ -1161,7 +1188,7 @@ class UnifiedManager:
        ver_map = self.cnr_inactive_nodes.get(node_id)
        if ver_map is not None:
            for key, fullpath in ver_map.items():
-                shutil.rmtree(fullpath)
+                try_rmtree(node_id, fullpath)
                result.items.append((key, fullpath))
            del self.cnr_inactive_nodes[node_id]

@@ -1170,9 +1197,12 @@ class UnifiedManager:

        return result

-    def cnr_install(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
+    def cnr_install(self, node_id: str, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
        result = ManagedResult('install-cnr')

+        if 'comfyui-manager' in node_id.lower():
+            return result.fail(f"ignored: installing '{node_id}'")
+
        node_info = cnr_utils.install_node(node_id, version_spec)
        if node_info is None or not node_info.download_url:
            return result.fail(f'not available node: {node_id}@{version_spec}')
@@ -1217,25 +1247,29 @@ class UnifiedManager:

        return result

-    def repo_install(self, url, repo_path, instant_execution=False, no_deps=False, return_postinstall=False):
+    def repo_install(self, url: str, repo_path: str, instant_execution=False, no_deps=False, return_postinstall=False):
        result = ManagedResult('install-git')
        result.append(url)

+        if 'comfyui-manager' in url.lower():
+            return result.fail(f"ignored: installing '{url}'")
+
        if not is_valid_url(url):
            return result.fail(f"Invalid git url: {url}")

        if url.endswith("/"):
            url = url[:-1]
        try:
-            print(f"Download: git clone '{url}'")
-
            # Clone the repository from the remote URL
+            clone_url = git_utils.get_url_for_clone(url)
+            print(f"Download: git clone '{clone_url}'")
+
            if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                if res != 0:
-                    return result.fail(f"Failed to clone repo: {url}")
+                    return result.fail(f"Failed to clone repo: {clone_url}")
            else:
-                repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
+                repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
                repo.git.clear_cache()
                repo.close()

@@ -1249,7 +1283,8 @@ class UnifiedManager:
                    return result.fail(f"Failed to execute install script: {url}")

        except Exception as e:
-            return result.fail(f"Install(git-clone) error: {url} / {e}")
+            traceback.print_exc()
+            return result.fail(f"Install(git-clone) error[2]: {url} / {e}")

        print("Installation was successful.")
        return result
@@ -1330,16 +1365,16 @@ class UnifiedManager:
            version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')

        if version_spec is None:
-            return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}')
+            return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec)

        if version_spec == 'nightly':
-            return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly')
+            return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly')
        elif version_spec == 'unknown':
-            return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown')
+            return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown')
        else:
-            return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
+            return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')

-    async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
+    async def install_by_id(self, node_id: str, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
        """
        priority if version_spec == None
        1. CNR latest
@@ -1348,6 +1383,9 @@ class UnifiedManager:
        remark: latest version_spec is not allowed. Must be resolved before call.
        """

+        if 'comfyui-manager' in node_id.lower():
+            return ManagedResult('skip').fail(f"ignored: installing '{node_id}'")
+
        repo_url = None
        if version_spec is None:
            if self.is_enabled(node_id):
@@ -1385,7 +1423,7 @@ class UnifiedManager:
            res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
            if res.result:
                if version_spec == 'unknown':
-                    self.unknown_active_nodes[node_id] = to_path
+                    self.unknown_active_nodes[node_id] = repo_url, to_path
                elif version_spec == 'nightly':
                    cnr_utils.generate_cnr_id(to_path, node_id)
                    self.active_nodes[node_id] = 'nightly', to_path
@@ -1452,7 +1490,7 @@ def identify_node_pack_from_path(fullpath):
        # cnr
        cnr = cnr_utils.read_cnr_info(fullpath)
        if cnr is not None:
-            return module_name, cnr['version'], cnr['id']
+            return module_name, cnr['version'], cnr['id'], None

        return None
    else:
@@ -1460,10 +1498,18 @@ def identify_node_pack_from_path(fullpath):
        cnr_id = cnr_utils.read_cnr_id(fullpath)
        commit_hash = git_utils.get_commit_hash(fullpath)

+        github_id = git_utils.normalize_to_github_id(repo_url)
+        if github_id is None:
+            try:
+                github_id = os.path.basename(repo_url)
+            except:
+                logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
+                github_id = module_name
+
        if cnr_id is not None:
-            return module_name, commit_hash, cnr_id
+            return module_name, commit_hash, cnr_id, github_id
        else:
-            return module_name, commit_hash, ''
+            return module_name, commit_hash, '', github_id


 def get_installed_node_packs():
@@ -1481,7 +1527,7 @@ def get_installed_node_packs():

            is_disabled = not y.endswith('.disabled')

-            res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
+            res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': is_disabled }

        disabled_dirs = os.path.join(x, '.disabled')
        if os.path.exists(disabled_dirs):
@@ -1494,7 +1540,7 @@ def get_installed_node_packs():
                if info is None:
                    continue

-                res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
+                res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'aux_id': info[3], 'enabled': False }

    return res

@@ -1550,7 +1596,7 @@ manager_funcs = ManagerFuncs()


 def write_config():
-    config = configparser.ConfigParser()
+    config = configparser.ConfigParser(strict=False)

    config['default'] = {
        'preview_method': manager_funcs.get_current_preview_method(),
@@ -1561,13 +1607,15 @@ def write_config():
        'bypass_ssl': get_config()['bypass_ssl'],
        "file_logging": get_config()['file_logging'],
        'component_policy': get_config()['component_policy'],
+        'update_policy': get_config()['update_policy'],
        'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
        'model_download_by_agent': get_config()['model_download_by_agent'],
        'downgrade_blacklist': get_config()['downgrade_blacklist'],
        'security_level': get_config()['security_level'],
        'skip_migration_check': get_config()['skip_migration_check'],
        'always_lazy_install': get_config()['always_lazy_install'],
-        'network_mode': get_config()['network_mode']
+        'network_mode': get_config()['network_mode'],
+        'db_mode': get_config()['db_mode'],
    }

    directory = os.path.dirname(manager_config_path)
@@ -1580,19 +1628,9 @@ def write_config():

 def read_config():
    try:
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
        config.read(manager_config_path)
        default_conf = config['default']
-
-        # policy migration: disable_unsecure_features -> security_level
-        if 'disable_unsecure_features' in default_conf:
-            if default_conf['disable_unsecure_features'].lower() == 'true':
-                security_level = 'strong'
-            else:
-                security_level = 'normal'
-        else:
-            security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
-
        manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False

        def get_bool(key, default_value):
@@ -1600,26 +1638,27 @@ def read_config():

        return {
                    'http_channel_enabled': get_bool('http_channel_enabled', False),
-                    'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()),
+                    'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
                    'git_exe': default_conf.get('git_exe', ''),
                    'use_uv': get_bool('use_uv', False),
                    'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
                    'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
-                    'share_option': default_conf.get('share_option', 'all'),
+                    'share_option': default_conf.get('share_option', 'all').lower(),
                    'bypass_ssl': get_bool('bypass_ssl', False),
                    'file_logging': get_bool('file_logging', True),
-                    'component_policy': default_conf.get('component_policy', 'workflow'),
+                    'component_policy': default_conf.get('component_policy', 'workflow').lower(),
+                    'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
                    'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
                    'model_download_by_agent': get_bool('model_download_by_agent', False),
-                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', ''),
+                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
                    'skip_migration_check': get_bool('skip_migration_check', False),
                    'always_lazy_install': get_bool('always_lazy_install', False),
-                    'network_mode': default_conf.get('network_mode', 'public'),
-                    'security_level': security_level,
+                    'network_mode': default_conf.get('network_mode', 'public').lower(),
+                    'security_level': default_conf.get('security_level', 'normal').lower(),
+                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
               }

    except Exception:
-        traceback.print_exc()
        manager_util.use_uv = False
        return {
            'http_channel_enabled': False,
@@ -1632,6 +1671,7 @@ def read_config():
            'bypass_ssl': False,
            'file_logging': True,
            'component_policy': 'workflow',
+            'update_policy': 'stable-comfyui',
            'windows_selector_event_loop_policy': False,
            'model_download_by_agent': False,
            'downgrade_blacklist': '',
@@ -1639,6 +1679,7 @@ def read_config():
            'always_lazy_install': False,
            'network_mode': 'public',   # public | private | offline
            'security_level': 'normal', # strong | normal | normal- | weak
+            'db_mode': 'cache',         # local | cache | remote
        }


@@ -1683,31 +1724,55 @@ def switch_to_default_branch(repo):
        repo.git.checkout(default_branch)
        return True
    except:
+        # try checkout master
+        # try checkout main if failed
        try:
            repo.git.checkout(repo.heads.master)
+            return True
        except:
            try:
                if remote_name is not None:
                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
+                    return True
            except:
-                pass
+                try:
+                    repo.git.checkout(repo.heads.main)
+                    return True
+                except:
+                    try:
+                        if remote_name is not None:
+                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
+                            return True
+                    except:
+                        pass

    print("[ComfyUI Manager] Failed to switch to the default branch")
    return False


+def reserve_script(repo_path, install_cmds):
+    if not os.path.exists(manager_startup_script_path):
+        os.makedirs(manager_startup_script_path)
+
+    script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
+    with open(script_path, "a") as file:
+        obj = [repo_path] + install_cmds
+        file.write(f"{obj}\n")
+
+
+def try_rmtree(title, fullpath):
+    try:
+        shutil.rmtree(fullpath)
+    except Exception as e:
+        logging.warning(f"[ComfyUI-Manager] An error occurred while deleting '{fullpath}', so it has been scheduled for deletion upon restart.\nEXCEPTION: {e}")
+        reserve_script(title, ["#LAZY-DELETE-NODEPACK", fullpath])
+
+
 def try_install_script(url, repo_path, install_cmd, instant_execution=False):
    if not instant_execution and (
            (len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
    ):
-        if not os.path.exists(manager_startup_script_path):
-            os.makedirs(manager_startup_script_path)
-
-        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
-        with open(script_path, "a") as file:
-            obj = [repo_path] + install_cmd
-            file.write(f"{obj}\n")
-
+        reserve_script(repo_path, install_cmd)
        return True
    else:
        if len(install_cmd) == 5 and install_cmd[2:4] == ['pip', 'install']:
@@ -1724,7 +1789,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):

        if platform.system() != "Windows":
            try:
-                if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
+                if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
                    print("\n\n###################################################################")
                    print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
                    print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
@@ -2041,12 +2106,14 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
            print(f"CLONE into '{repo_path}'")

            # Clone the repository from the remote URL
+            clone_url = git_utils.get_url_for_clone(url)
+
            if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                if res != 0:
-                    return result.fail(f"Failed to clone '{url}' into  '{repo_path}'")
+                    return result.fail(f"Failed to clone '{clone_url}' into  '{repo_path}'")
            else:
-                repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
+                repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
                repo.git.clear_cache()
                repo.close()

@@ -2056,8 +2123,8 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=

    except Exception as e:
        traceback.print_exc()
-        print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
-        return result.fail(f"Install(git-clone) error: {url} / {e}")
+        print(f"Install(git-clone) error[1]: {url} / {e}", file=sys.stderr)
+        return result.fail(f"Install(git-clone)[1] error: {url} / {e}")


 def git_pull(path):
@@ -2156,7 +2223,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
                return False

        except Exception as e:
-            print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
+            print(f"Fix(git-clone) error: {url} / {e}", file=sys.stderr)
            return False

    print(f"Attempt to fixing '{files}' is done.")
@@ -2340,6 +2407,39 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
    return True


+def update_to_stable_comfyui(repo_path):
+    try:
+        repo = git.Repo(repo_path)
+        try:
+            repo.git.checkout(repo.heads.master)
+        except:
+            logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
+            for branch in repo.branches:
+                logging.error('\t'+branch.name)
+            return "fail", None
+
+        versions, current_tag, _ = get_comfyui_versions(repo)
+        
+        if len(versions) == 0 or (len(versions) == 1 and versions[0] == 'nightly'):
+            logging.info("[ComfyUI-Manager] Unable to update to the stable ComfyUI version.")
+            return "fail", None
+            
+        if versions[0] == 'nightly':
+            latest_tag = versions[1]
+        else:
+            latest_tag = versions[0]
+
+        if current_tag == latest_tag:
+            return "skip", None
+        else:
+            logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
+            repo.git.checkout(latest_tag)
+            return 'updated', latest_tag
+    except:
+        traceback.print_exc()
+        return "fail", None
+            
+
 def update_path(repo_path, instant_execution=False, no_deps=False):
    if not os.path.exists(os.path.join(repo_path, '.git')):
        return "fail"
@@ -2347,9 +2447,12 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
    # version check
    repo = git.Repo(repo_path)

+    is_switched = False
    if repo.head.is_detached:
        if not switch_to_default_branch(repo):
            return "fail"
+        else:
+            is_switched = True

    current_branch = repo.active_branch
    branch_name = current_branch.name
@@ -2388,6 +2491,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
        git_pull(repo_path)
        execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
        return "updated"
+    elif is_switched:
+        return "updated"
    else:
        return "skipped"

@@ -2698,9 +2803,6 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
        if ext == 'https://github.com/comfyanonymous/ComfyUI':
            pass
        elif ext is not None:
-            if 'Fooocus' in ext:
-                print(f">> {node_name}")
-
            used_exts.add(ext)
        else:
            unknown_nodes.add(node_name)
@@ -2971,7 +3073,18 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                        print("cm-cli: unexpected [0001]")

        # for nightly restore
-        git_info = info.get('git_custom_nodes')
+        _git_info = info.get('git_custom_nodes')
+        git_info = {}
+
+        # normalize github repo
+        for k, v in _git_info.items():
+            # robust filter out comfyui-manager while restoring snapshot
+            if 'comfyui-manager' in k.lower():
+                continue
+
+            norm_k = git_utils.normalize_url(k)
+            git_info[norm_k] = v
+
        if git_info is not None:
            todo_disable = []
            todo_enable = []
@@ -2984,20 +3097,13 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):

                if v[0] == 'nightly' and cnr_repo_map.get(k):
                    repo_url = cnr_repo_map.get(k)
+                    normalized_url = git_utils.normalize_url(repo_url)

-                    normalized_url1 = git_utils.normalize_url(repo_url)
-                    normalized_url2 = git_utils.normalize_url_http(repo_url)
-
-                    if normalized_url1 not in git_info and normalized_url2 not in git_info:
+                    if normalized_url not in git_info:
                        todo_disable.append(k)
                    else:
-                        if normalized_url1 in git_info:
-                            commit_hash = git_info[normalized_url1]['hash']
-                            todo_checkout.append((v[1], commit_hash))
-
-                        if normalized_url2 in git_info:
-                            commit_hash = git_info[normalized_url2]['hash']
-                            todo_checkout.append((v[1], commit_hash))
+                        commit_hash = git_info[normalized_url]['hash']
+                        todo_checkout.append((v[1], commit_hash))

            for k, v in unified_manager.nightly_inactive_nodes.items():
                if 'comfyui-manager' in k:
@@ -3005,18 +3111,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):

                if cnr_repo_map.get(k):
                    repo_url = cnr_repo_map.get(k)
-                    normalized_url1 = git_utils.normalize_url(repo_url)
-                    normalized_url2 = git_utils.normalize_url_http(repo_url)
+                    normalized_url = git_utils.normalize_url(repo_url)

-                    if normalized_url1 in git_info:
-                        commit_hash = git_info[normalized_url1]['hash']
+                    if normalized_url in git_info:
+                        commit_hash = git_info[normalized_url]['hash']
                        todo_enable.append((k, commit_hash))
-                        processed_urls.append(normalized_url1)
-
-                    if normalized_url2 in git_info:
-                        commit_hash = git_info[normalized_url2]['hash']
-                        todo_enable.append((k, commit_hash))
-                        processed_urls.append(normalized_url2)
+                        processed_urls.append(normalized_url)

            for x in todo_disable:
                unified_manager.unified_disable(x, False)
@@ -3069,21 +3169,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
        if repo_url is None:
            continue

-        normalized_url1 = git_utils.normalize_url(repo_url)
-        normalized_url2 = git_utils.normalize_url_http(repo_url)
+        normalized_url = git_utils.normalize_url(repo_url)

-        if normalized_url1 not in git_info and normalized_url2 not in git_info:
+        if normalized_url not in git_info:
            todo_disable.append(k2)
        else:
-            if normalized_url1 in git_info:
-                commit_hash = git_info[normalized_url1]['hash']
-                todo_checkout.append((k2, commit_hash))
-                processed_urls.append(normalized_url1)
-
-            if normalized_url2 in git_info:
-                commit_hash = git_info[normalized_url2]['hash']
-                todo_checkout.append((k2, commit_hash))
-                processed_urls.append(normalized_url2)
+            commit_hash = git_info[normalized_url]['hash']
+            todo_checkout.append((k2, commit_hash))
+            processed_urls.append(normalized_url)

    for k2, v2 in unified_manager.unknown_inactive_nodes.items():
        repo_url = resolve_giturl_from_path(v2[1])
@@ -3091,18 +3184,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
        if repo_url is None:
            continue

-        normalized_url1 = git_utils.normalize_url(repo_url)
-        normalized_url2 = git_utils.normalize_url_http(repo_url)
+        normalized_url = git_utils.normalize_url(repo_url)

-        if normalized_url1 in git_info:
-            commit_hash = git_info[normalized_url1]['hash']
+        if normalized_url in git_info:
+            commit_hash = git_info[normalized_url]['hash']
            todo_enable.append((k2, commit_hash))
-            processed_urls.append(normalized_url1)
-
-        if normalized_url2 in git_info:
-            commit_hash = git_info[normalized_url2]['hash']
-            todo_enable.append((k2, commit_hash))
-            processed_urls.append(normalized_url2)
+            processed_urls.append(normalized_url)

    for x in todo_disable:
        unified_manager.unified_disable(x, True)
@@ -3188,17 +3275,26 @@ async def check_need_to_migrate():
        need_to_migrate = True


-def get_comfyui_versions():
-    repo = git.Repo(comfy_path)
-    versions = [x.name for x in repo.tags if x.name.startswith('v')]
-    versions.reverse()  # nearest tag
+def get_comfyui_versions(repo=None):
+    if repo is None:
+        repo = git.Repo(comfy_path)

+    try:
+        remote = get_remote_name(repo)   
+        repo.remotes[remote].fetch()    
+    except:
+        logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
+
+    versions = [x.name for x in repo.tags if x.name.startswith('v')]
+
+    # nearest tag
+    versions = sorted(versions, key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
    versions = versions[:4]

    current_tag = repo.git.describe('--tags')

    if current_tag not in versions:
-        versions = sorted(versions + [current_tag], reverse=True)
+        versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
        versions = versions[:4]

    main_branch = repo.heads.master
@@ -3211,16 +3307,18 @@ def get_comfyui_versions():
        versions[0] = 'nightly'
        current_tag = 'nightly'

-    return versions, current_tag
+    return versions, current_tag, latest_tag


 def switch_comfyui(tag):
    repo = git.Repo(comfy_path)

    if tag == 'nightly':
-        repo.git.checkout('main')
-        repo.remotes.origin.pull()
-        print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version")
+        repo.git.checkout('master')
+        tracking_branch = repo.active_branch.tracking_branch()
+        remote_name = tracking_branch.remote_name
+        repo.remotes[remote_name].pull()
+        print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
    else:
        repo.git.checkout(tag)
        print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
@@ -3235,7 +3333,7 @@ def resolve_giturl_from_path(fullpath):
    if not os.path.exists(git_config_path):
        return "unknown"

-    config = configparser.ConfigParser()
+    config = configparser.ConfigParser(strict=False)
    config.read(git_config_path)

    for k, v in config.items():
--- a/glob/manager_downloader.py
+++ b/glob/manager_downloader.py
@@ -11,6 +11,7 @@ from tqdm.auto import tqdm
 aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
 HF_ENDPOINT = os.getenv('HF_ENDPOINT')

+
 if aria2 is not None:
    secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
    url = urlparse(aria2)
--- a/glob/manager_server.py
+++ b/glob/manager_server.py
@@ -55,8 +55,14 @@ def handle_stream(stream, prefix):
 from comfy.cli_args import args
 import latent_preview

+def is_loopback(address):
+    import ipaddress
+    try:
+        return ipaddress.ip_address(address).is_loopback
+    except ValueError:
+        return False

-is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
+is_local_mode = is_loopback(args.listen)


 model_dir_name_map = {
@@ -85,11 +91,11 @@ def is_allowed_security_level(level):
        return False
    elif level == 'high':
        if is_local_mode:
-            return core.get_config()['security_level'].lower() in ['weak', 'normal-']
+            return core.get_config()['security_level'] in ['weak', 'normal-']
        else:
-            return core.get_config()['security_level'].lower() == 'weak'
+            return core.get_config()['security_level'] == 'weak'
    elif level == 'middle':
-        return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
+        return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
    else:
        return True

@@ -181,6 +187,11 @@ set_preview_method(core.get_config()['preview_method'])
 def set_component_policy(mode):
    core.get_config()['component_policy'] = mode

+def set_update_policy(mode):
+    core.get_config()['update_policy'] = mode
+
+def set_db_mode(mode):
+    core.get_config()['db_mode'] = mode

 def print_comfyui_version():
    global comfy_ui_hash
@@ -203,7 +214,7 @@ def print_comfyui_version():
        comfyui_tag = core.get_comfyui_tag()

        try:
-            if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
+            if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
                logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
        except:
            pass
@@ -410,40 +421,65 @@ async def task_worker():
            traceback.print_exc()
            return f"Installation failed:\n{node_spec_str}"

-    async def do_update(item) -> str:
+    async def do_update(item):
        ui_id, node_name, node_ver = item

        try:
            res = core.unified_manager.unified_update(node_name, node_ver)

+            if res.ver == 'unknown':
+                url = core.unified_manager.unknown_active_nodes[node_name][0]
+                title = os.path.basename(url)
+            else:
+                url = core.unified_manager.cnr_map[node_name].get('repository')
+                title = core.unified_manager.cnr_map[node_name]['name']
+
            manager_util.clear_pip_cache()

+            if url is not None:
+                base_res = {'url': url, 'title': title}
+            else:
+                base_res = {'title': title}
+
            if res.result:
                if res.action == 'skip':
-                    return 'skip'
+                    base_res['msg'] = 'skip'
+                    return base_res
                else:
-                    return 'success'
+                    base_res['msg'] = 'success'
+                    return base_res

+            base_res['msg'] = f"An error occurred while updating '{node_name}'."
            logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
+            return base_res
        except Exception:
            traceback.print_exc()

-        return f"An error occurred while updating '{node_name}'."
+        return {'msg':f"An error occurred while updating '{node_name}'."}

-    async def do_update_comfyui() -> str:
+    async def do_update_comfyui(is_stable) -> str:
        try:
            repo_path = os.path.dirname(folder_paths.__file__)
-            res = core.update_path(repo_path)
-
+            latest_tag = None
+            if is_stable:
+                res, latest_tag = core.update_to_stable_comfyui(repo_path)
+            else:
+                res = core.update_path(repo_path)
+                
            if res == "fail":
-                logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
-                return "The installed ComfyUI does not have a Git repository."
+                logging.error("ComfyUI update failed")
+                return "fail"
            elif res == "updated":
-                logging.info("ComfyUI is updated.")
-                return "success"
+                if is_stable:
+                    logging.info("ComfyUI is updated to latest stable version.")
+                    return "success-stable-"+latest_tag
+                else:
+                    logging.info("ComfyUI is updated to latest nightly version.")
+                    return "success-nightly"
            else:  # skipped
                logging.info("ComfyUI is up-to-date.")
                return "skip"
+
        except Exception:
            traceback.print_exc()

@@ -575,7 +611,7 @@ async def task_worker():
            elif kind == 'update-main':
                msg = await do_update(item)
            elif kind == 'update-comfyui':
-                msg = await do_update_comfyui()
+                msg = await do_update_comfyui(item[1])
            elif kind == 'fix':
                msg = await do_fix(item)
            elif kind == 'uninstall':
@@ -599,7 +635,11 @@ async def task_worker():
                nodepack_result[ui_id] = msg
                ui_target = "main"
            elif kind == 'update-comfyui':
+                nodepack_result['comfyui'] = msg
                ui_target = "main"
+            elif kind == 'update':
+                nodepack_result[ui_id] = msg['msg']
+                ui_target = "nodepack_manager"
            else:
                nodepack_result[ui_id] = msg
                ui_target = "nodepack_manager"
@@ -704,6 +744,15 @@ async def update_all(request):
        update_item = k, k, v[0]
        task_queue.put(("update-main", update_item))

+    for k, v in core.unified_manager.unknown_active_nodes.items():
+        if k == 'comfyui-manager':
+            # skip updating comfyui-manager if desktop version
+            if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
+                continue
+
+        update_item = k, k, 'unknown'
+        task_queue.put(("update-main", update_item))
+
    return web.Response(status=200)


@@ -770,7 +819,7 @@ async def fetch_customnode_list(request):
    """
    provide unified custom node list
    """
-    if "skip_update" in request.rel_url.query and request.rel_url.query["skip_update"] == "true":
+    if request.rel_url.query.get("skip_update", '').lower() == "true":
        skip_update = True
    else:
        skip_update = False
@@ -787,7 +836,7 @@ async def fetch_customnode_list(request):
    core.populate_github_stats(node_packs, await json_obj_github)
    core.populate_favorites(node_packs, await json_obj_extras)

-    check_state_of_git_node_pack(node_packs, False, do_update_check=not skip_update)
+    check_state_of_git_node_pack(node_packs, not skip_update, do_update_check=not skip_update)

    for v in node_packs.values():
        populate_markdown(v)
@@ -1149,7 +1198,15 @@ async def install_custom_node(request):
    git_url = None

    if json_data['version'] != 'unknown':
-        selected_version = json_data.get('selected_version', 'latest')
+        selected_version = json_data.get('selected_version')
+
+        if skip_post_install:
+            if cnr_id in core.unified_manager.nightly_inactive_nodes or cnr_id in core.unified_manager.cnr_inactive_nodes:
+                core.unified_manager.unified_enable(cnr_id)
+                return web.Response(status=200)
+        elif selected_version is None:
+            selected_version = 'latest'
+
        if selected_version != 'nightly':
            risky_level = 'low'
            node_spec_str = f"{cnr_id}@{selected_version}"
@@ -1302,14 +1359,15 @@ async def update_custom_node(request):

@routes.get("/manager/queue/update_comfyui")
 async def update_comfyui(request):
-    task_queue.put(("update-comfyui", ('comfyui',)))
+    is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
+    task_queue.put(("update-comfyui", ('comfyui', is_stable)))
    return web.Response(status=200)


@routes.get("/comfyui_manager/comfyui_versions")
 async def comfyui_versions(request):
    try:
-        res, current = core.get_comfyui_versions()
+        res, current, latest = core.get_comfyui_versions()
        return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
    except Exception as e:
        logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
@@ -1400,7 +1458,19 @@ async def preview_method(request):
    return web.Response(status=200)


-@routes.get("/manager/component/policy")
+@routes.get("/manager/db_mode")
+async def db_mode(request):
+    if "value" in request.rel_url.query:
+        set_db_mode(request.rel_url.query['value'])
+        core.write_config()
+    else:
+        return web.Response(text=core.get_config()['db_mode'], status=200)
+
+    return web.Response(status=200)
+
+
+
+@routes.get("/manager/policy/component")
 async def component_policy(request):
    if "value" in request.rel_url.query:
        set_component_policy(request.rel_url.query['value'])
@@ -1411,6 +1481,17 @@ async def component_policy(request):
    return web.Response(status=200)


+@routes.get("/manager/policy/update")
+async def update_policy(request):
+    if "value" in request.rel_url.query:
+        set_update_policy(request.rel_url.query['value'])
+        core.write_config()
+    else:
+        return web.Response(text=core.get_config()['update_policy'], status=200)
+
+    return web.Response(status=200)
+
+
@routes.get("/manager/channel_url_list")
 async def channel_url_list(request):
    channels = core.get_channel_dict()
@@ -1466,7 +1547,11 @@ async def get_notice(request):
                    markdown_content = match.group(1)
                    version_tag = core.get_comfyui_tag()
                    if version_tag is None:
-                        markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
+                        version_tag = os.environ.get('__COMFYUI_DESKTOP_VERSION__')
+                        if version_tag is not None:
+                            markdown_content += f"<HR>ComfyUI: {version_tag} [Desktop]"
+                        else:
+                            markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
                    else:
                        markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
                                             f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")
@@ -1516,6 +1601,9 @@ def restart(self):

    if sys.platform.startswith('win32'):
        cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
+    elif sys_argv[0].endswith("__main__.py"):  # this is a python module
+        module_name = os.path.basename(os.path.dirname(sys_argv[0]))
+        cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
    else:
        cmds = [sys.executable] + sys_argv

@@ -1608,20 +1696,24 @@ cm_global.register_api('cm.try-install-custom-node', confirm_try_install)
 async def default_cache_update():
    channel_url = core.get_config()['channel_url']
    async def get_cache(filename):
-        if core.get_config()['default_cache_as_channel_url']:
-            uri = f"{channel_url}/{filename}"
-        else:
-            uri = f"{core.DEFAULT_CHANNEL}/{filename}"
+        try:
+            if core.get_config()['default_cache_as_channel_url']:
+                uri = f"{channel_url}/{filename}"
+            else:
+                uri = f"{core.DEFAULT_CHANNEL}/{filename}"

-        cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
-        cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
+            cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
+            cache_uri = os.path.join(manager_util.cache_dir, cache_uri)

-        json_obj = await manager_util.get_data(uri, True)
+            json_obj = await manager_util.get_data(uri, True)

-        with manager_util.cache_lock:
-            with open(cache_uri, "w", encoding='utf-8') as file:
-                json.dump(json_obj, file, indent=4, sort_keys=True)
-                logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
+            with manager_util.cache_lock:
+                with open(cache_uri, "w", encoding='utf-8') as file:
+                    json.dump(json_obj, file, indent=4, sort_keys=True)
+                    logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
+        except Exception as e:
+            logging.error(f"[ComfyUI-Manager] Failed to perform initial fetching '{filename}': {e}")
+            traceback.print_exc()

    if core.get_config()['network_mode'] != 'offline':
        a = get_cache("custom-node-list.json")
--- a/glob/manager_util.py
+++ b/glob/manager_util.py
@@ -12,6 +12,7 @@ import subprocess
 import sys
 import re
 import logging
+import platform


 cache_lock = threading.Lock()
@@ -21,6 +22,16 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also up

 use_uv = False

+
+def add_python_path_to_env():
+    if platform.system() != "Windows":
+        sep = ':'
+    else:
+        sep = ';'
+
+    os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
+
+
 def make_pip_cmd(cmd):
    if use_uv:
        return [sys.executable, '-m', 'uv', 'pip'] + cmd
@@ -269,27 +280,18 @@ class PIPFixer:
        self.prev_pip_versions = { **prev_pip_versions }

    def torch_rollback(self):
-        print("[DBG] point(torch_rollback) 1")
        spec = self.prev_pip_versions['torch'].split('+')
-        print("[DBG] point(torch_rollback) 2")
        if len(spec) > 0:
            platform = spec[1]
        else:
-            print("[DBG] point(torch_rollback) 3")
            cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
            subprocess.check_output(cmd, universal_newlines=True)
-            print("[DBG] point(torch_rollback) 4")
            logging.error(cmd)
-            print("[DBG] point(torch_rollback) 5")
            return

-        print("[DBG] point(torch_rollback) 6")
        torch_ver = StrictVersion(spec[0])
-        print("[DBG] point(torch_rollback) 7")
        torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
-        print("[DBG] point(torch_rollback) 8")
        torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
-        print("[DBG] point(torch_rollback) 9")

        if torch_torchvision_torchaudio_ver is None:
            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
@@ -301,64 +303,46 @@ class PIPFixer:
                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
            logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")

-        print("[DBG] point(torch_rollback) 10")
        subprocess.check_output(cmd, universal_newlines=True)
-        print("[DBG] point(torch_rollback) 11")

    def fix_broken(self):
-        print("[DBG] point9-1")
        new_pip_versions = get_installed_packages(True)

-        print("[DBG] point9-2")
        # remove `comfy` python package
        try:
-            print("[DBG] point9-3")
            if 'comfy' in new_pip_versions:
-                print("[DBG] point9-3-1")
                cmd = make_pip_cmd(['uninstall', 'comfy'])
                subprocess.check_output(cmd, universal_newlines=True)

                logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
-            print("[DBG] point9-4")
        except Exception as e:
-            print("[DBG] point9-5")
            logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
            logging.error(e)

        # fix torch - reinstall torch packages if version is changed
-        print("[DBG] point9-6")
        try:
-            print("[DBG] point9-7")
            if 'torch' not in self.prev_pip_versions or 'torchvision' not in self.prev_pip_versions or 'torchaudio' not in self.prev_pip_versions:
-                print("[DBG] point9-8")
                logging.error("[ComfyUI-Manager] PyTorch is not installed")
            elif self.prev_pip_versions['torch'] != new_pip_versions['torch'] \
                or self.prev_pip_versions['torchvision'] != new_pip_versions['torchvision'] \
                or self.prev_pip_versions['torchaudio'] != new_pip_versions['torchaudio']:
-                    print("[DBG] point9-9")
                    self.torch_rollback()
-                    print("[DBG] point9-10")
        except Exception as e:
-            print("[DBG] point9-11")
            logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
            logging.error(e)

        # fix opencv
        try:
-            print("[DBG] point9-12")
            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')

-            print("[DBG] point9-13")
            versions = [ocp, ocph, op, oph]
            versions = [StrictVersion(x) for x in versions if x is not None]
            versions.sort(reverse=True)

-            print("[DBG] point9-14")
            if len(versions) > 0:
-                print("[DBG] point9-15")
                # upgrade to maximum version
                targets = []
                cur = versions[0]
@@ -371,40 +355,27 @@ class PIPFixer:
                if oph is not None and StrictVersion(oph) != cur:
                    targets.append('opencv-python-headless')

-                print("[DBG] point9-16")
                if len(targets) > 0:
-                    print("[DBG] point9-17")
                    for x in targets:
-                        cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
+                        cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
                        subprocess.check_output(cmd, universal_newlines=True)

                    logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
-                    print("[DBG] point9-18")
        except Exception as e:
-            print("[DBG] point9-19")
            logging.error("[ComfyUI-Manager] Failed to restore opencv")
            logging.error(e)
-            print("[DBG] point9-20")

        # fix numpy
        try:
-            print("[DBG] point9-21")
            np = new_pip_versions.get('numpy')
-            print("[DBG] point9-22")
            if np is not None:
-                print("[DBG] point9-23")
                if StrictVersion(np) >= StrictVersion('2'):
-                    print("[DBG] point9-24")
                    cmd = make_pip_cmd(['install', "numpy<2"])
                    subprocess.check_output(cmd , universal_newlines=True)
-                    print("[DBG] point9-25")
        except Exception as e:
-            print("[DBG] point9-26")
            logging.error("[ComfyUI-Manager] Failed to restore numpy")
            logging.error(e)

-        print("[DBG] point9-28")
-

 def sanitize(data):
    return data.replace("<", "&lt;").replace(">", "&gt;")
@@ -413,3 +384,23 @@ def sanitize(data):
 def sanitize_filename(input_string):
    result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
    return result_string
+
+
+def robust_readlines(fullpath):
+    import chardet
+    try:
+        with open(fullpath, "r") as f:
+            return f.readlines()
+    except:
+        encoding = None
+        with open(fullpath, "rb") as f:
+            raw_data = f.read()
+            result = chardet.detect(raw_data)
+            encoding = result['encoding']
+
+        if encoding is not None:
+            with open(fullpath, "r", encoding=encoding) as f:
+                return f.readlines()
+
+        print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
+        return []
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@@ -21,6 +21,8 @@ import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
 import { SnapshotManager } from "./snapshot.js";

+let manager_version = await getVersion();
+
 var docStyle = document.createElement('style');
 docStyle.innerHTML = `
 .comfy-toast {
@@ -42,7 +44,7 @@ docStyle.innerHTML = `

 #cm-manager-dialog {
 	width: 1000px;
-	height: 450px;
+	height: 455px;
 	box-sizing: content-box;
 	z-index: 1000;
 	overflow-y: auto;
@@ -139,7 +141,7 @@ docStyle.innerHTML = `

 .cm-notice-board {
 	width: 290px;
-	height: 210px;
+	height: 230px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -225,12 +227,12 @@ 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 restart_stop_button = null;
+var update_policy_combo = null;

 let share_option = 'all';
-var is_updating_all = false;
+var is_updating = false;


 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -477,6 +479,8 @@ async function updateComfyUI() {
 	const response = await api.fetchApi('/manager/queue/update_comfyui');

 	showTerminal();
+
+	is_updating = true;
 	await api.fetchApi('/manager/queue/start');
 }

@@ -605,8 +609,14 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 }

 async function switchComfyUI() {
+	switch_comfyui_button.disabled = true;
+	switch_comfyui_button.style.backgroundColor = "gray";
+	
 	let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });

+	switch_comfyui_button.disabled = false;
+	switch_comfyui_button.style.backgroundColor = "";
+
 	if(res.status == 200) {
 		let obj = await res.json();

@@ -619,6 +629,15 @@ async function switchComfyUI() {
 		}

 		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
+			if(selected_version == 'nightly') {
+				update_policy_combo.value = 'nightly-comfyui';
+				api.fetchApi('/manager/policy/update?value=nightly-comfyui');
+			}
+			else {
+				update_policy_combo.value = 'stable-comfyui';
+				api.fetchApi('/manager/policy/update?value=stable-comfyui');
+			}
+
 			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
 			if (response.status == 200) {
 				infoToast(`ComfyUI version is switched to ${selected_version}`);
@@ -633,57 +652,6 @@ async function switchComfyUI() {
 	}
 }

-
-async function fetchUpdates(update_check_checkbox) {
-	let prev_text = fetch_updates_button.innerText;
-	fetch_updates_button.innerText = "Fetching updates...";
-	fetch_updates_button.disabled = true;
-	fetch_updates_button.style.backgroundColor = "gray";
-
-	try {
-		var mode = manager_instance.datasrc_combo.value;
-
-		const response = await api.fetchApi(`/customnode/fetch_updates?mode=${mode}`);
-
-		if (response.status != 200 && response.status != 201) {
-			show_message('Failed to fetch updates.');
-			return false;
-		}
-
-		if (response.status == 201) {
-			show_message("There is an updated extension available.<BR><BR><P><B>NOTE:<BR>Fetch Updates is not an update.<BR>Please update from <button id='cm-install-customnodes-button'>Install Custom Nodes</button> </B></P>");
-
-			const button = document.getElementById('cm-install-customnodes-button');
-			button.addEventListener("click",
-				async function() {
-					app.ui.dialog.close();
-
-					if(!CustomNodesManager.instance) {
-						CustomNodesManager.instance = new CustomNodesManager(app, self);
-					}
-					await CustomNodesManager.instance.show(CustomNodesManager.ShowMode.UPDATE);
-				}
-			);
-
-			update_check_checkbox.checked = false;
-		}
-		else {
-			show_message('All extensions are already up-to-date with the latest versions.');
-		}
-
-		return true;
-	}
-	catch (exception) {
-		show_message(`Failed to update custom nodes / ${exception}`);
-		return false;
-	}
-	finally {
-		fetch_updates_button.disabled = false;
-		fetch_updates_button.innerText = prev_text;
-		fetch_updates_button.style.backgroundColor = "";
-	}
-}
-
 async function onQueueStatus(event) {
 	const isElectron = 'electronAPI' in window;

@@ -694,39 +662,72 @@ async function onQueueStatus(event) {
 	else if(event.detail.status == 'done') {
 		reset_action_buttons();

-		if(!is_updating_all)  {
+		if(!is_updating)  {
 			return;
 		}

+		is_updating = false;
+
 		let success_list = [];
 		let failed_list = [];
+		let comfyui_state = null;

 		for(let k in event.detail.nodepack_result){
 			let v = event.detail.nodepack_result[k];

-			if(v == 'success')
-				success_list.push(k);
-			else if(v == 'skip') {
-				// do nothing
+			if(k == 'comfyui') {
+				comfyui_state = v;
+				continue;
 			}
-			else
+
+			if(v.msg == 'success') {
+				success_list.push(k);
+			}
+			else if(v.msg != 'skip')
 				failed_list.push(k);
 		}

 		let msg = "";
 		
-		if(success_list.length == 0) {
+		if(success_list.length == 0 && comfyui_state.startsWith('skip')) {
 			if(failed_list.length == 0) {
-				msg += "All custom nodes are already up to date.";
+				msg += "You are already up to date.";
 			}
 		}
 		else {
 			msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
-			msg += "The following custom nodes have been updated:<ul>";
-			for(let x in success_list) {
-				msg += '<li>'+success_list[x]+'</li>';
+
+			if(comfyui_state == 'success-nightly') {
+				msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
+				infoToast("ComfyUI has been updated to the latest nightly version.");
+			}
+			else if(comfyui_state.startsWith('success-stable')) {
+				const ver = comfyui_state.split("-").pop();
+				msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
+				infoToast(`ComfyUI has been updated to ${ver}`);
+			}
+			else if(comfyui_state == 'skip') {
+				msg += "ComfyUI is already up to date.<BR><BR>"
+			}
+			else if(comfyui_state != null) {
+				msg += "Failed to update ComfyUI.<BR><BR>"
+			}
+
+			if(success_list.length > 0) {
+				msg += "The following custom nodes have been updated:<ul>";
+				for(let x in success_list) {
+					let k = success_list[x];
+					let url = event.detail.nodepack_result[k].url;
+					let title = event.detail.nodepack_result[k].title;
+					if(url) {
+						msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
+					}
+					else {
+						msg += `<li>${k}</li>`;
+					}
+				}
+				msg += "</ul>";
 			}
-			msg += "</ul>";

 			setNeedRestart(true);
 		}
@@ -734,7 +735,15 @@ async function onQueueStatus(event) {
 		if(failed_list.length > 0) {
 			msg += '<br>The update for the following custom nodes has failed:<ul>';
 			for(let x in failed_list) {
-				msg += '<li>'+failed_list[x]+'</li>';
+				let k = failed_list[x];
+				let url = event.detail.nodepack_result[k].url;
+				let title = event.detail.nodepack_result[k].title;
+				if(url) {
+					msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
+				}
+				else {
+					msg += `<li>${k}</li>`;
+				}
 			}

 			msg += '</ul>'
@@ -755,8 +764,7 @@ async function onQueueStatus(event) {
 api.addEventListener("cm-queue-status", onQueueStatus);


-async function updateAll(update_comfyui, manager_dialog) {
-	let prev_text = update_all_button.innerText;
+async function updateAll(update_comfyui) {
 	update_all_button.innerText = "Updating...";

 	set_inprogress_mode();
@@ -776,7 +784,7 @@ async function updateAll(update_comfyui, manager_dialog) {
 		customAlert('Another task is already in progress. Please stop the ongoing task first.');
 	}
 	else if(response.status == 200) {
-		is_updating_all = true;
+		is_updating = true;
 		await api.fetchApi('/manager/queue/start');
 	}
 }
@@ -839,14 +847,6 @@ class ManagerMenuDialog extends ComfyDialog {
 					() => switchComfyUI()
 			});

-		fetch_updates_button =
-			$el("button.cm-button", {
-				type: "button",
-				textContent: "Fetch Updates",
-				onclick:
-					() => fetchUpdates(this.update_check_checkbox)
-			});
-
 		restart_stop_button =
 			$el("button.cm-button-red", {
 				type: "button",
@@ -860,7 +860,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					type: "button",
 					textContent: "Update All Custom Nodes",
 					onclick:
-						() => updateAll(false, self)
+						() => updateAll(false)
 				});
 		}
 		else {
@@ -869,7 +869,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					type: "button",
 					textContent: "Update All",
 					onclick:
-						() => updateAll(true, self)
+						() => updateAll(true)
 				});
 		}

@@ -899,7 +899,19 @@ class ManagerMenuDialog extends ComfyDialog {
 						}
 				}),

+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Custom Nodes In Workflow",
+					onclick:
+						() => {
+							if(!CustomNodesManager.instance) {
+								CustomNodesManager.instance = new CustomNodesManager(app, self);
+							}
+							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
+						}
+				}),
 				
+				$el("br", {}, []),
 				$el("button.cm-button", {
 					type: "button",
 					textContent: "Model Manager",
@@ -928,7 +940,7 @@ class ManagerMenuDialog extends ComfyDialog {
 				update_all_button,
 				update_comfyui_button,
 				switch_comfyui_button,
-				fetch_updates_button,
+				// fetch_updates_button,

 				$el("br", {}, []),
 				restart_stop_button,
@@ -960,13 +972,9 @@ class ManagerMenuDialog extends ComfyDialog {
 	}

 	createControlsLeft() {
-		let self = this;
+		const isElectron = 'electronAPI' in window;

-		this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
-		const uc_checkbox_text = $el("label",{for:"skip_update_check"},[" Skip update check"])
-		uc_checkbox_text.style.color = "var(--fg-color)";
-		uc_checkbox_text.style.cursor = "pointer";
-		this.update_check_checkbox.checked = true;
+		let self = this;

 		// db mode
 		this.datasrc_combo = document.createElement("select");
@@ -976,6 +984,14 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));

+		api.fetchApi('/manager/db_mode')
+			.then(response => response.text())
+			.then(data => { this.datasrc_combo.value = data; });
+
+		this.datasrc_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
+		});
+
 		// preview method
 		let preview_combo = document.createElement("select");
 		preview_combo.setAttribute("title", "Configure how latent variables will be decoded during preview in the sampling process.");
@@ -1038,25 +1054,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
 		}

-		// default ui state
-		let component_policy_combo = document.createElement("select");
-		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
-		component_policy_combo.className = "cm-menu-combo";
-		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
-		api.fetchApi('/manager/component/policy')
-			.then(response => response.text())
-			.then(data => {
-				component_policy_combo.value = data;
-				set_component_policy(data);
-			});
-
-		component_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
-			set_component_policy(event.target.value);
-		});
-
 		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
@@ -1076,14 +1073,51 @@ class ManagerMenuDialog extends ComfyDialog {
 			}
 		});

+		let component_policy_combo = document.createElement("select");
+		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
+		component_policy_combo.className = "cm-menu-combo";
+		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
+		api.fetchApi('/manager/policy/component')
+			.then(response => response.text())
+			.then(data => {
+				component_policy_combo.value = data;
+				set_component_policy(data);
+			});
+
+		component_policy_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
+			set_component_policy(event.target.value);
+		});
+
+		update_policy_combo = document.createElement("select");
+
+		if(isElectron)
+			update_policy_combo.style.display = 'none';
+		
+		update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
+		update_policy_combo.className = "cm-menu-combo";
+		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
+		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
+		api.fetchApi('/manager/policy/update')
+			.then(response => response.text())
+			.then(data => {
+				update_policy_combo.value = data;
+			});
+
+		update_policy_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
+		});
+
 		return [
-			$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
 			$el("br", {}, []),
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
 			share_combo,
 			component_policy_combo,
+			update_policy_combo,
 			$el("br", {}, []),

 			$el("br", {}, []),
@@ -1110,11 +1144,6 @@ class ManagerMenuDialog extends ComfyDialog {
 									install_pip(url, self);
 								}
 							}
-					}),
-					$el("button.cm-experimental-button", {
-						type: "button",
-						textContent: "Unload models",
-						onclick: () => { free_models(); }
 					})
 				]),
 		];
@@ -1243,7 +1272,7 @@ class ManagerMenuDialog extends ComfyDialog {
 				$el("div.comfy-modal-content",
 					[
 						$el("tr.cm-title", {}, [
-								$el("font", {size:6, color:"white"}, [`ComfyUI Manager Menu`])]
+								$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
 							),
 						$el("br", {}, []),
 						$el("div.cm-menu-container",
@@ -1385,13 +1414,12 @@ async function getVersion() {
 	return await version.text();
 }

-
 app.registerExtension({
 	name: "Comfy.ManagerMenu",

 	aboutPageBadges: [
 		{
-			label: `ComfyUI-Manager ${await getVersion()}`,
+			label: `ComfyUI-Manager ${manager_version}`,
 			url: 'https://github.com/ltdrdata/ComfyUI-Manager',
 			icon: 'pi pi-th-large'
 		}
--- a/js/components-manager.js
+++ b/js/components-manager.js
@@ -709,7 +709,7 @@ app.handleFile = handleFile;

 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/manager/component/policy')
+	api.fetchApi('/manager/policy/component')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }
--- a/js/custom-nodes-manager.js
+++ b/js/custom-nodes-manager.js
@@ -363,6 +363,7 @@ const pageHtml = `
 	<button class="cn-manager-restart">Restart</button>
 	<button class="cn-manager-stop">Stop</button>
 	<div class="cn-flex-auto"></div>
+	<button class="cn-manager-used-in-workflow">Used In Workflow</button>
 	<button class="cn-manager-check-update">Check Update</button>
 	<button class="cn-manager-check-missing">Check Missing</button>
 	<button class="cn-manager-install-url">Install via Git URL</button>
@@ -374,7 +375,8 @@ const ShowMode = {
 	UPDATE: "Update",
 	MISSING: "Missing",
 	FAVORITES: "Favorites",
-	ALTERNATIVES: "Alternatives"
+	ALTERNATIVES: "Alternatives",
+	IN_WORKFLOW: "In Workflow",
 };

 export class CustomNodesManager {
@@ -586,6 +588,10 @@ export class CustomNodesManager {
 			label: "Update",
 			value: ShowMode.UPDATE,
 			hasData: false
+		}, {
+			label: "In Workflow",
+			value: ShowMode.IN_WORKFLOW,
+			hasData: false
 		}, {
 			label: "Missing",
 			value: ShowMode.MISSING,
@@ -670,7 +676,7 @@ export class CustomNodesManager {
 			"invalid-installation": ["reinstall"],
 		}

-		if (!manager_instance.update_check_checkbox.checked) {
+		if (!installGroups.updatable) {
 			installGroups.enabled = installGroups.enabled.filter(it => it !== "try-update");
 		}

@@ -726,7 +732,7 @@ export class CustomNodesManager {
 					const value = e.target.value
 					this.filter = value;
 					const item = this.getFilterItem(value);
-					if (item && !item.hasData) {
+					if (item && (!item.hasData)) {
 						this.loadData(value);
 						return;
 					}
@@ -779,6 +785,14 @@ export class CustomNodesManager {
 				}
 			},

+			".cn-manager-used-in-workflow": {
+				click: (e) => {
+					e.target.classList.add("cn-btn-loading");
+					this.setFilter(ShowMode.IN_WORKFLOW);
+					this.loadData(ShowMode.IN_WORKFLOW);
+				}
+			},
+
 			".cn-manager-check-update": {
 				click: (e) => {
 					e.target.classList.add("cn-btn-loading");
@@ -1529,7 +1543,128 @@ export class CustomNodesManager {
 		return extension_mappings;
 	}

+	getNodesInWorkflow() {
+		let usedGroupNodes = new Set();
+		let allUsedNodes = {};
+
+		for(let k in app.graph._nodes) {
+			let node = app.graph._nodes[k];
+
+			if(node.type.startsWith('workflow>')) {
+				usedGroupNodes.add(node.type.slice(9));
+				continue;
+			}
+
+			allUsedNodes[node.type] = node;
+		}
+
+		for(let k of usedGroupNodes) {
+			let subnodes = app.graph.extra.groupNodes[k]?.nodes;
+
+			if(subnodes) {
+				for(let k2 in subnodes) {
+					let node = subnodes[k2];
+					allUsedNodes[node.type] = node;
+				}
+			}
+		}
+
+		return allUsedNodes;
+	}
+
 	async getMissingNodes() {
+		let unresolved_missing_nodes = new Set();
+		let hashMap = {};
+		let allUsedNodes = this.getNodesInWorkflow();
+		
+		const registered_nodes = new Set();
+		for (let i in LiteGraph.registered_node_types) {
+			registered_nodes.add(LiteGraph.registered_node_types[i].type);
+		}
+
+		let unresolved_aux_ids = {};
+		let outdated_comfyui = false;
+		let unresolved_cnr_list = [];
+
+		for(let k in allUsedNodes) {
+			let node = allUsedNodes[k];
+
+			if(!registered_nodes.has(node.type)) {
+				// missing node
+				if(node.properties.cnr_id) {
+					if(node.properties.cnr_id == 'comfy-core') {
+						outdated_comfyui = true;
+					}
+
+					let item = this.custom_nodes[node.properties.cnr_id];
+					if(item) {
+						hashMap[item.hash] = true;
+					}
+					else {
+						console.log(`CM: cannot find '${node.properties.cnr_id}' from cnr list.`);
+						unresolved_aux_ids[node.properties.cnr_id] = node.type;
+						unresolved_cnr_list.push(node.properties.cnr_id);
+					}
+				}
+				else if(node.properties.aux_id) {
+					unresolved_aux_ids[node.properties.aux_id] = node.type;
+				}
+				else {
+					unresolved_missing_nodes.add(node.type);
+				}
+			}
+		}
+
+
+		if(unresolved_cnr_list.length > 0) {
+			let error_msg = "Failed to find the following ComfyRegistry list.\nThe cache may be outdated, or the nodes may have been removed from ComfyRegistry.<HR>";
+			for(let i in unresolved_cnr_list) {
+				error_msg += '<li>'+unresolved_cnr_list[i]+'</li>';
+			}
+
+			show_message(error_msg);
+		}
+
+		if(outdated_comfyui) {
+			customAlert('ComfyUI is outdated, so some built-in nodes cannot be used.');
+		}
+
+		if(Object.keys(unresolved_aux_ids).length > 0) {
+			// building aux_id to nodepack map
+			let aux_id_to_pack = {};
+			for(let k in this.custom_nodes) {
+				let nodepack = this.custom_nodes[k];
+				let aux_id;
+				if(nodepack.repository?.startsWith('https://github.com')) {
+					aux_id = nodepack.repository.split('/').slice(-2).join('/');
+					aux_id_to_pack[aux_id] = nodepack;
+				}
+				else if(nodepack.repository) {
+					aux_id = nodepack.repository.split('/').slice(-1);
+					aux_id_to_pack[aux_id] = nodepack;
+				}
+			}
+
+			// resolving aux_id
+			for(let k in unresolved_aux_ids) {
+				let nodepack = aux_id_to_pack[k];
+				if(nodepack) {
+					hashMap[nodepack.hash] = true;
+				}
+				else {
+					unresolved_missing_nodes.add(unresolved_aux_ids[k]);
+				}
+			}
+		}
+
+		if(unresolved_missing_nodes.size > 0) {
+			await this.getMissingNodesLegacy(hashMap, unresolved_missing_nodes);
+		}
+
+		return hashMap;
+	}
+
+	async getMissingNodesLegacy(hashMap, missing_nodes) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading missing nodes (${mode}) ...`);
 		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
@@ -1568,50 +1703,29 @@ export class CustomNodesManager {
 			}
 		}

-		const registered_nodes = new Set();
-		for (let i in LiteGraph.registered_node_types) {
-			registered_nodes.add(LiteGraph.registered_node_types[i].type);
-		}
-
-		const missing_nodes = new Set();
-		const workflow = app.graph.serialize();
-		const group_nodes = workflow.extra && workflow.extra.groupNodes ? workflow.extra.groupNodes : [];
-		let nodes = workflow.nodes;
-
-		for (let i in group_nodes) {
-			let group_node = group_nodes[i];
-			nodes = nodes.concat(group_node.nodes);
-		}
-
-		for (let i in nodes) {
-			const node_type = nodes[i].type;
-			if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
-				continue;
-
-			if (!registered_nodes.has(node_type)) {
-				const packs = name_to_packs[node_type.trim()];
-				if(packs)
-					packs.forEach(url => {
-						missing_nodes.add(url);
-					});
-				else {
-					for(let j in regex_to_pack) {
-						if(regex_to_pack[j].regex.test(node_type)) {
-							missing_nodes.add(regex_to_pack[j].url);
-						}
+		let unresolved_missing_nodes = new Set();
+		for (let node_type of missing_nodes) {
+			const packs = name_to_packs[node_type.trim()];
+			if(packs)
+				packs.forEach(url => {
+					unresolved_missing_nodes.add(url);
+				});
+			else {
+				for(let j in regex_to_pack) {
+					if(regex_to_pack[j].regex.test(node_type)) {
+						unresolved_missing_nodes.add(regex_to_pack[j].url);
 					}
 				}
 			}
 		}

-		const hashMap = {};
 		for(let k in this.custom_nodes) {
 			let item = this.custom_nodes[k];

-			if(missing_nodes.has(item.id)) {
+			if(unresolved_missing_nodes.has(item.id)) {
 				hashMap[item.hash] = true;
 			}
-			else if (item.files?.some(file => missing_nodes.has(file))) {
+			else if (item.files?.some(file => unresolved_missing_nodes.has(file))) {
 				hashMap[item.hash] = true;
 			}
 		}
@@ -1630,6 +1744,41 @@ export class CustomNodesManager {
 		return hashMap;
 	}

+	async getNodepackInWorkflow() {
+		let allUsedNodes = this.getNodesInWorkflow();
+
+		// building aux_id to nodepack map
+		let aux_id_to_pack = {};
+		for(let k in this.custom_nodes) {
+			let nodepack = this.custom_nodes[k];
+			let aux_id;
+			if(nodepack.repository?.startsWith('https://github.com')) {
+				aux_id = nodepack.repository.split('/').slice(-2).join('/');
+				aux_id_to_pack[aux_id] = nodepack;
+			}
+			else if(nodepack.repository) {
+				aux_id = nodepack.repository.split('/').slice(-1);
+				aux_id_to_pack[aux_id] = nodepack;
+			}
+		}
+
+		const hashMap = {};
+		for(let k in allUsedNodes) {
+			var item;
+			if(allUsedNodes[k].properties.cnr_id) {
+				item = this.custom_nodes[allUsedNodes[k].properties.cnr_id];
+			}
+			else if(allUsedNodes[k].properties.aux_id) {
+				item = aux_id_to_pack[allUsedNodes[k].properties.aux_id];
+			}
+
+			if(item)
+			    hashMap[item.hash] = true;
+		}
+
+		return hashMap;
+	}
+
 	async getAlternatives() {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading alternatives (${mode}) ...`);
@@ -1678,11 +1827,16 @@ export class CustomNodesManager {
 		this.showStatus(`Loading custom nodes (${mode}) ...`);

 		const skip_update = this.show_mode === ShowMode.UPDATE ? "" : "&skip_update=true";
+
+		if(this.show_mode === ShowMode.UPDATE) {
+			infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
+		}
+
 		const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
 		if (res.error) {
 			this.showError("Failed to get custom node list.");
 			this.hideLoading();
-			return
+			return;
 		}
 		
 		const { channel, node_packs } = res.data;
@@ -1725,9 +1879,14 @@ export class CustomNodesManager {
 				hashMap = await this.getAlternatives();
 			} else if(this.show_mode == ShowMode.FAVORITES) {
 				hashMap = await this.getFavorites();
+			} else if(this.show_mode == ShowMode.IN_WORKFLOW) {
+				hashMap = await this.getNodepackInWorkflow();
 			}
 			filterItem.hashMap = hashMap;
-			filterItem.hasData = true;
+
+			if(this.show_mode != ShowMode.IN_WORKFLOW) {
+				filterItem.hasData = true;
+			}
 		}

 		for(let k in node_packs) {
@@ -1779,7 +1938,6 @@ export class CustomNodesManager {
 						case "disabled":
 							filterTypes.add("installed");
 							break;
-
 						case "not-installed":
 							filterTypes.add("not-installed");
 							break;
--- a/js/workflow-metadata.js
+++ b/js/workflow-metadata.js
@@ -3,12 +3,21 @@
 * - 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"
-    }
-  },
+ * "nodes": {
+ *   "1": {
+ *     type: "CheckpointLoaderSimple",
+ *     ...
+ *     properties: {
+ *       cnr_id: "comfy-core",
+ *       version: "0.3.8",
+ *     },
+ *   },
+ * }
+ *
+ * @typedef {Object} NodeInfo
+ * @property {string} ver - Version (git hash or semantic version)
+ * @property {string} cnr_id - ComfyRegistry node ID
+ * @property {boolean} enabled - Whether the node is enabled
 */

 import { app } from "../../scripts/app.js";
@@ -23,7 +32,7 @@ class WorkflowMetadataExtension {

  /**
   * Get the installed nodes info
-   * @returns {Promise<Record<string, {ver: string, cnr_id: string, enabled: boolean}>>} The mapping from node name to its info.
+   * @returns {Promise<Record<string, NodeInfo>>} The mapping from node name to its info.
   * ver can either be a git commit hash or a semantic version such as "1.0.0"
   * cnr_id is the id of the node in the ComfyRegistry
   * enabled is true if the node is enabled, false if it is disabled
@@ -33,61 +42,42 @@ class WorkflowMetadataExtension {
    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];
-        const nodeInfo =
-          this.installedNodes[nodePackageName] ??
-          this.installedNodes[nodePackageName.toLowerCase()];
-        if (nodeInfo) {
-          nodeVersions[nodePackageName] = nodeInfo.ver;
-        }
-      } 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.installedNodes = await this.getInstalledNodes();
    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);
+  /**
+   * Called when any node is created
+   * @param {LGraphNode} node The newly created node
+   */
+  nodeCreated(node) {
+    try {
+      // nodeData doesn't exist if node is missing or node is frontend only node
+      if (!node?.constructor?.nodeData?.python_module) return;

-      // Add metadata to the workflow
-      if (!workflow.extra) {
-        workflow.extra = {};
+      const nodeProperties = (node.properties ??= {});
+      const modules = node.constructor.nodeData.python_module.split(".");
+      const moduleType = modules[0];
+
+      if (moduleType === "custom_nodes") {
+        const nodePackageName = modules[1];
+        const { cnr_id, aux_id, ver } =
+          this.installedNodes[nodePackageName] ??
+          this.installedNodes[nodePackageName.toLowerCase()] ??
+          {};
+
+        if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
+        if (cnr_id) nodeProperties.cnr_id = cnr_id;
+        else nodeProperties.aux_id = aux_id;
+        if (ver) nodeProperties.ver = ver;
+      } else if (["nodes", "comfy_extras"].includes(moduleType)) {
+        nodeProperties.cnr_id = "comfy-core";
+        nodeProperties.ver = this.comfyCoreVersion;
      }
-      const graph = this;
-      try {
-        workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
-      } catch (e) {
-        console.error(e);
-      }
-
-      return workflow;
-    };
+    } catch (e) {
+      console.error(e);
+    }
  }
 }

--- a/model-list.json
+++ b/model-list.json
@@ -4685,6 +4685,28 @@
      "filename": "<huggingface>",
      "url": "deepseek-ai/Janus-Pro-7B",
      "size": "14.85GB"
+    },
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.fp16.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
+      "size": "167MB"
+    },
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
+      "size": "335MB"
    }
  ]
 }
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
@@ -12,7 +12,377 @@
        
        
        
-
+        {
+            "author": "StoryWalker",
+            "title": "comfyui_flux_collection_advanced [WIP]",
+            "reference": "https://github.com/StoryWalker/comfyui_flux_collection_advanced",
+            "files": [
+                "https://github.com/StoryWalker/comfyui_flux_collection_advanced"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a collection focused in give a little more flexibility in the use of Flux models."
+        },
+        {
+            "author": "KurtHokke",
+            "title": "ComfyUI_KurtHokke-Nodes",
+            "reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
+            "files": [
+                "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI_KurtHokke-Nodes"
+        },
+        {
+            "author": "OSAnimate",
+            "title": "ComfyUI-SpriteSheetMaker [WIP]",
+            "reference": "https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker",
+            "files": [
+                "https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker"
+            ],
+            "install_type": "git-clone",
+            "description": "The sprite sheet maker node is a simple way to create sprite sheets and image grids."
+        },
+        {
+            "author": "BuffMcBigHuge",
+            "title": "ComfyUI-Buff-Nodes [WIP]",
+            "reference": "https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes",
+            "files": [
+                "https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Assorted Nodes by BuffMcBigHuge"
+        },
+        {
+            "author": "ritikvirus",
+            "title": "ComfyUI Terminal Command Node [UNSAFE]",
+            "reference": "https://github.com/ritikvirus/comfyui-terminal-modal-node",
+            "files": [
+                "https://github.com/ritikvirus/comfyui-terminal-modal-node"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository provides a custom ComfyUI node that lets you execute arbitrary terminal commands directly from the ComfyUI interface. [w/This extension allows remote command execution.]"
+        },
+        {
+            "author": "pixuai",
+            "title": "ComfyUI-PixuAI",
+            "reference": "https://github.com/pixuai/ComfyUI-PixuAI",
+            "files": [
+                "https://github.com/pixuai/ComfyUI-PixuAI"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of ComfyUI nodes designed to streamline prompt creation, organization, and discovery - making your workflows faster and more intuitive."
+        },
+        {
+            "author": "techidsk",
+            "title": "comfyui_molook_nodes [WIP]",
+            "reference": "https://github.com/techidsk/comfyui_molook_nodes",
+            "files": [
+                "https://github.com/techidsk/comfyui_molook_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Some extra nodes"
+        },
+        {
+            "author": "Northerner1",
+            "title": "ComfyUI_North_Noise [WIP]",
+            "reference": "https://github.com/Northerner1/ComfyUI_North_Noise",
+            "files": [
+                "https://github.com/Northerner1/ComfyUI_North_Noise"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: North Noise"
+        },
+        {
+            "author": "ManuShamil",
+            "title": "ComfyUI_BodyEstimation_Nodes",
+            "reference": "https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes",
+            "files": [
+                "https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: CogitareLabsPoseIDExtractor"
+        },
+        {
+            "author": "MockbaTheBorg",
+            "title": "ComfyUI-Mockba",
+            "reference": "https://github.com/MockbaTheBorg/ComfyUI-Mockba",
+            "files": [
+                "https://github.com/MockbaTheBorg/ComfyUI-Mockba"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Image Batch/Flip/Rotate/Subtract/Dither, Barcode, Select, ..."
+        },
+        {
+            "author": "jcomeme",
+            "title": "AsunaroTools",
+            "reference": "https://github.com/jcomeme/ComfyUI-AsunaroTools",
+            "files": [
+                "https://github.com/jcomeme/ComfyUI-AsunaroTools"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI"
+        },
+        {
+            "author": "ZHO-ZHO-ZHO",
+            "title": "ComfyUI Wan2.1 [WIP]",
+            "reference": "https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO",
+            "files": [
+                "https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO"
+            ],
+            "install_type": "git-clone",
+            "description": "It’s estimated that ComfyUI itself will support it soon, so go ahead and give it a try!"
+        },
+        {
+            "author": "kijai",
+            "title": "ComfyUI-WanVideoWrapper [WIP]",
+            "reference": "https://github.com/kijai/ComfyUI-WanVideoWrapper",
+            "files": [
+               "https://github.com/kijai/ComfyUI-WanVideoWrapper"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI diffusers wrapper nodes for WanVideo"
+        },
+        {
+            "author": "ltdrdata",
+            "title": "comfyui-unsafe-torch [UNSAFE]",
+            "reference": "https://github.com/ltdrdata/comfyui-unsafe-torch",
+            "files": [
+               "https://github.com/ltdrdata/comfyui-unsafe-torch"
+            ],
+            "install_type": "git-clone",
+            "description": "disable torch.load's `weigths_only`"
+        },
+        {
+            "author": "IfnotFr",
+            "title": "⚡ ComfyUI Connect [WIP]",
+            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
+            "files": [
+                "https://github.com/IfnotFr/ComfyUI-Connect"
+            ],
+            "install_type": "git-clone",
+            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
+        },
+        {
+            "author": "muvich3n",
+            "title": "ComfyUI-Crop-Border",
+            "reference": "https://github.com/muvich3n/ComfyUI-Crop-Border",
+            "files": [
+               "https://github.com/muvich3n/ComfyUI-Crop-Border"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Crop Image Borders"
+        },
+        {
+            "author": "masmullin2000",
+            "title": "ComfyUI-MMYolo",
+            "reference": "https://github.com/masmullin2000/ComfyUI-MMYolo",
+            "files": [
+               "https://github.com/masmullin2000/ComfyUI-MMYolo"
+            ],
+            "install_type": "git-clone",
+            "description": "A comfy node to find faces and output a mask"
+        },
+        {
+            "author": "Yeonri",
+            "title": "ComfyUI_LLM_Are_You_Listening [WIP]",
+            "reference": "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening",
+            "files": [
+               "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: AYL_Node, AYL_GGUF_Node, AYL_API_Node\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "altkeyproject",
+            "title": "Dream Painter [WIP]",
+            "reference": "https://github.com/alt-key-project/comfyui-dream-painter",
+            "files": [
+               "https://github.com/alt-key-project/comfyui-dream-painter"
+            ],
+            "install_type": "git-clone",
+            "description": "Provide utilities for 2D image generation and processing."
+        },
+        {
+            "author": "kimara-ai",
+            "title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
+            "reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
+            "files": [
+               "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
+        },
+        {
+            "author": "krisshen2021",
+            "title": "comfyui_OpenRouterNodes [WIP]",
+            "reference": "https://github.com/krisshen2021/comfyui_OpenRouterNodes",
+            "files": [
+                "https://github.com/krisshen2021/comfyui_OpenRouterNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "LLM custom nodes for comfyui\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "Velour-Fog",
+            "title": "comfy-latent-nodes [UNSAFE]",
+            "reference": "https://github.com/Velour-Fog/comfy-latent-nodes",
+            "files": [
+                "https://github.com/Velour-Fog/comfy-latent-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI nodes to save and load a latent to a specified directory. Saves time for doing operations on a latent such as upscaling without having to re-trigger the creation of the original latent.[w/This node can write files to an arbitrary path.]"
+        },
+        {
+            "author": "jgbyte",
+            "title": "ComfyUI-RandomCube [WIP]",
+            "reference": "https://github.com/jgbyte/ComfyUI-RandomCube",
+            "files": [
+                "https://github.com/jgbyte/ComfyUI-RandomCube"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: RandomCubeGrid"
+        },
+        {
+            "author": "thot-experiment",
+            "title": "comfy-live-preview [WIP]",
+            "reference": "https://github.com/thot-experiment/comfy-live-preview",
+            "files": [
+                "https://github.com/thot-experiment/comfy-live-preview"
+            ],
+            "install_type": "git-clone",
+            "description": "external live preview plugin for ComfyUI"
+        },
+        {
+            "author": "AhBumm",
+            "title": "ComfyUI-Upscayl",
+            "reference": "https://github.com/AhBumm/ComfyUI-Upscayl",
+            "files": [
+                "https://github.com/AhBumm/ComfyUI-Upscayl"
+            ],
+            "nodename_pattern": "\\(BillBum\\)$",
+            "install_type": "git-clone",
+            "description": "NODES: Upscayl Upscaler"
+        },
+        {
+            "author": "NEZHA625",
+            "title": "ComfyUI-tools-by-dong [UNSAFE]",
+            "reference": "https://github.com/NEZHA625/ComfyUI-tools-by-dong",
+            "files": [
+                "https://github.com/NEZHA625/ComfyUI-tools-by-dong"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: HuggingFaceUploadNode, ImageDownloader, LoraIterator, FileMoveNode, InputDetectionNode, ...\nNOTE: The files in the repo are not organized.[w/This node pack includes nodes that can modify arbitrary files.]"
+        },
+        {
+            "author": "if-ai",
+            "title": "ComfyUI-IF_Zonos [WIP]",
+            "reference": "https://github.com/if-ai/ComfyUI-IF_Zonos",
+            "files": [
+                "https://github.com/if-ai/ComfyUI-IF_Zonos"
+            ],
+            "install_type": "git-clone",
+            "description": "Zonos for ComfyUI"
+        },
+        {
+            "author": "grinlau18",
+            "title": "Xiser_Nodes [WIP]",
+            "reference": "https://github.com/grinlau18/ComfyUI_XISER_Nodes",
+            "files": [
+                "https://github.com/grinlau18/ComfyUI_XISER_Nodes"
+             ],
+             "install_type": "git-clone",
+             "description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "LAOGOU-666",
+            "title": "Comfyui_StartPatch [UNSAFE]",
+            "reference": "https://github.com/LAOGOU-666/Comfyui_StartPatch",
+            "files": [
+                "https://github.com/LAOGOU-666/Comfyui_StartPatch"
+             ],
+             "install_type": "git-clone",
+             "description": "This patch plugin optimizes the node information processing mechanism of the ComfyUI server, significantly improving server performance and response speed. It greatly reduces the browser page initialization waiting time. [w/Since this patch modifies key functions of ComfyUI, it is highly likely to cause compatibility issues.]"
+        },
+        {
+            "author": "badmike",
+            "title": "Prompt Factory [CONFLICT]",
+            "reference": "https://github.com/badmike/comfyui-prompt-factory",
+            "files": [
+                "https://github.com/badmike/comfyui-prompt-factory"
+            ],
+            "install_type": "git-clone",
+            "description": "A modular system that adds randomness to prompt generation [w/This node pack is causing a name conflict with https://github.com/satche/comfyui-prompt-factory]"
+        },
+        {
+            "author": "owengillett",
+            "title": "ComfyUI-tilefusion",
+            "reference": "https://github.com/owengillett/ComfyUI-tilefusion",
+            "files": [
+                "https://github.com/owengillett/ComfyUI-tilefusion"
+             ],
+             "install_type": "git-clone",
+             "description": "Helper nodes for generating seamless tiles."
+        },
+        {
+            "author": "Scaryplasmon",
+            "title": "ComfTrellis [WIP]",
+            "reference": "https://github.com/Scaryplasmon/ComfTrellis",
+            "files": [
+                "https://github.com/Scaryplasmon/ComfTrellis"
+             ],
+             "install_type": "git-clone",
+             "description": "1 click install to run Trellis in ComfyUI\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "fangziheng2321",
+            "title": "comfyuinode_chopmask [WIP]",
+            "reference": "https://github.com/fangziheng2321/comfyuinode_chopmask",
+            "files": [
+                "https://github.com/fangziheng2321/comfyuinode_chopmask"
+             ],
+             "install_type": "git-clone",
+             "description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "D1-3105",
+            "title": "ComfyUI-VideoStream",
+            "reference": "https://github.com/D1-3105/ComfyUI-VideoStream",
+            "files": [
+                "https://github.com/D1-3105/ComfyUI-VideoStream"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: FloWWeaverExportSingleFrameGRPC"
+        },
+        {
+            "author": "gmorks",
+            "title": "ComfyUI Animagine prompt [WIP]",
+            "reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
+            "files": [
+                "https://github.com/gmorks/ComfyUI-Animagine-Prompt"
+             ],
+             "install_type": "git-clone",
+             "description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "wirytiox",
+            "title": "ComfyUI-Qwen [CONFLICT]",
+            "reference": "https://github.com/mr-krak3n/ComfyUI-Qwen",
+            "files": [
+                "https://github.com/mr-krak3n/ComfyUI-Qwen"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository contains custom nodes for ComfyUI, designed to facilitate working with language models such as Qwen2.5 and DeepSeek. [w/This node pack is causing a name conflict with https://github.com/ZHO-ZHO-ZHO/ComfyUI-Qwen]"
+        },
+        {
+            "author": "hiusdev",
+            "title": "ComfyUI_Lah_Toffee",
+            "reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
+            "files": [
+                "https://github.com/hiusdev/ComfyUI_Lah_Toffee"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Lah LoadVideoRandom"
+        },
        {
            "author": "hdfhssg",
            "title": "ComfyUI_pxtool [WIP]",
@@ -23,16 +393,6 @@
            "install_type": "git-clone",
            "description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
        },
-        {
-            "author": "dasilva333",
-            "title": "ComfyUI_MarkdownImage [WIP]",
-            "reference": "https://github.com/dasilva333/ComfyUI_MarkdownImage",
-            "files": [
-                "https://github.com/dasilva333/ComfyUI_MarkdownImage"
-            ],
-            "install_type": "git-clone",
-            "description": "Create an image using html and markdown in ComfyUI\nNOTE: The files in the repo are not organized."
-        },
        {
            "author": "franky519",
            "title": "comfyui-redux-style",
@@ -83,16 +443,6 @@
            "install_type": "git-clone",
            "description": "NODES: Load TIFF"
        },
-        {
-            "author": "greengerong",
-            "title": "ComfyUI-Lumina-Video [WIP]",
-            "reference": "https://github.com/greengerong/ComfyUI-Lumina-Video",
-            "files": [
-                "https://github.com/greengerong/ComfyUI-Lumina-Video"
-            ],
-            "install_type": "git-clone",
-            "description": "This is a video generation plugin implementation for ComfyUI based on the Lumina Video model."
-        },
        {
            "author": "tc888",
            "title": "ComfyUI_Save_Flux_Image",
@@ -306,13 +656,13 @@
        },
        {
            "author": "HuangYuChuh",
-            "title": "ComfyUI-DeepSeek_Toolkit [WIP]",
-            "reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit",
+            "title": "ComfyUI-DeepSeek-Toolkit [WIP]",
+            "reference": "https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit",
            "files": [
-                "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit"
+                "https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit"
            ],
            "install_type": "git-clone",
-            "description": "ComfyUI-DeepSeek_Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
+            "description": "ComfyUI-DeepSeek-Toolkit is a deep learning toolkit for ComfyUI that integrates the DeepSeek Janus model, offering functionalities for image generation and image understanding.\nNOTE: The files in the repo are not organized."
        },
        {
            "author": "comfyuiblog",
@@ -722,7 +1072,7 @@
                "https://github.com/yanhuifair/ComfyUI-FairLab"
            ],
            "install_type": "git-clone",
-            "description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize"
+            "description": "NODES: CLIP Text Encode Translated, Translate String, Load Image From Folder, Save String To Folder, Fix UTF-8 String, String Combine, String Field, Download Image, Save Images To Folder, Save Image To Folder, Image Resize, ..."
        },
        {
            "author": "nomcycle",
@@ -955,16 +1305,6 @@
            "install_type": "git-clone",
            "description": "NODES: File Mv, File Path, File Dir.\n[w/This is dangerous as it provides the ability to manipulate arbitrary user files.]"
        },
-        {
-            "author": "scottmudge",
-            "title": "ComfyUI_BiscuitNodes",
-            "reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
-            "files": [
-                "https://github.com/scottmudge/ComfyUI_BiscuitNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Load Image From Path Using File Selector"
-        },
        {
            "author": "JissiChoi",
            "title": "ComfyUI-Jissi-List [WIP]",
@@ -1621,16 +1961,6 @@
            "install_type": "git-clone",
            "description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
        },
-        {
-            "author": "attashe",
-            "title": "ComfyUI-FluxRegionAttention [WIP]",
-            "reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
-            "files": [
-                "https://github.com/attashe/ComfyUI-FluxRegionAttention"
-            ],
-            "install_type": "git-clone",
-            "description": "Implement Region Attention for Flux model"
-        },
        {
            "author": "aria1th",
            "title": "ComfyUI-SkipCFGSigmas",
--- a/node_db/dev/extension-node-map.json
+++ b/node_db/dev/extension-node-map.json
@@ -169,6 +169,7 @@
            "PD_ImageConcanate",
            "PD_Image_Crop_Location",
            "PD_RemoveColorWords",
+            "ReadTxtFiles",
            "json_group_fontsize"
        ],
        {
@@ -178,7 +179,6 @@
    "https://github.com/807502278/ComfyUI_TensorRT_Merge": [
        [
            "BiRefNet2_tensort",
-            "BiRefNet_ModelLoader_TRT",
            "BiRefNet_TRT",
            "Building_TRT",
            "Custom_Building_TRT",
@@ -189,6 +189,7 @@
            "UpscalerTensorrt",
            "YoloNasPoseTensorrt",
            "load_BiRefNet2_tensort",
+            "load_BiRefNet_TRT",
            "load_DepthAnything_Tensorrt",
            "load_Dwpos_Tensorrt"
        ],
@@ -370,6 +371,15 @@
            "title_aux": "comfyui-textools [WIP]"
        }
    ],
+    "https://github.com/AhBumm/ComfyUI-Upscayl": [
+        [
+            "Upscayl Upscaler"
+        ],
+        {
+            "nodename_pattern": "\\(BillBum\\)$",
+            "title_aux": "ComfyUI-Upscayl"
+        }
+    ],
    "https://github.com/AlexXi19/ComfyUI-OpenAINode": [
        [
            "ImageWithPrompt",
@@ -573,6 +583,16 @@
            "title_aux": "ComfyUI_bd_customNodes"
        }
    ],
+    "https://github.com/BuffMcBigHuge/ComfyUI-Buff-Nodes": [
+        [
+            "ConsoleOutput",
+            "FilePathSelectorFromDirectory",
+            "StringProcessor"
+        ],
+        {
+            "title_aux": "ComfyUI-Buff-Nodes [WIP]"
+        }
+    ],
    "https://github.com/Chargeuk/ComfyUI-vts-nodes": [
        [
            "VTS Clean Text",
@@ -633,6 +653,7 @@
            "DevToolsNodeWithBooleanInput",
            "DevToolsNodeWithForceInput",
            "DevToolsNodeWithOnlyOptionalInput",
+            "DevToolsNodeWithOptionalComboInput",
            "DevToolsNodeWithOptionalInput",
            "DevToolsNodeWithOutputList",
            "DevToolsNodeWithSeedInput",
@@ -658,6 +679,14 @@
            "title_aux": "ComfyUI OpenAI Nodes"
        }
    ],
+    "https://github.com/D1-3105/ComfyUI-VideoStream": [
+        [
+            "FloWWeaverExportSingleFrameGRPC"
+        ],
+        {
+            "title_aux": "ComfyUI-VideoStream"
+        }
+    ],
    "https://github.com/DataCTE/ComfyUI-DataVoid-nodes": [
        [
            "IPAAdapterFaceIDBatch",
@@ -733,7 +762,6 @@
    "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit": [
        [
            "GetBooruPost",
-            "TagEncode",
            "TagWikiFetch"
        ],
        {
@@ -935,17 +963,19 @@
            "title_aux": "comfyui_HavocsCall_Custom_Nodes"
        }
    ],
-    "https://github.com/HuangYuChuh/ComfyUI-DeepSeek_Toolkit": [
+    "https://github.com/HuangYuChuh/ComfyUI-DeepSeek-Toolkit": [
        [
+            "DeepSeekImageAnalyst",
            "DeepSeekImageGeneration",
-            "DeepSeekImageUnderstanding",
            "DeepSeekModelLoader",
+            "GoogleDriveUpload",
            "ImagePreprocessor",
            "LLM_Loader",
-            "OpenAICompatibleLoader"
+            "OpenAICompatibleLoader",
+            "VideoFileUploader"
        ],
        {
-            "title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]"
+            "title_aux": "ComfyUI-DeepSeek-Toolkit [WIP]"
        }
    ],
    "https://github.com/IfnotFr/ComfyUI-Ifnot-Pack": [
@@ -1011,6 +1041,7 @@
            "ImNodeTitleOverride",
            "ImSetActionKeywordMapping",
            "MergeNode",
+            "Molmo7BDbnbBatch",
            "MuteNode",
            "NewNode",
            "Node2String",
@@ -1181,6 +1212,7 @@
    ],
    "https://github.com/LotzF/ComfyUI-Simple-Chat-GPT-completion": [
        [
+            "AzureChatGptCompletion",
            "ChatGPTCompletion"
        ],
        {
@@ -1269,6 +1301,14 @@
            "title_aux": "comfy-tif-support"
        }
    ],
+    "https://github.com/ManuShamil/ComfyUI_BodyEstimation_Nodes": [
+        [
+            "CogitareLabsPoseIDExtractor"
+        ],
+        {
+            "title_aux": "ComfyUI_BodyEstimation_Nodes"
+        }
+    ],
    "https://github.com/Matrix-King-Studio/ComfyUI-MoviePy": [
        [
            "AudioDurationNode",
@@ -1300,6 +1340,41 @@
            "title_aux": "ComfyUI_mickster_nodes [WIP]"
        }
    ],
+    "https://github.com/MockbaTheBorg/ComfyUI-Mockba": [
+        [
+            "mb Barcode",
+            "mb CLIP Text Encoder",
+            "mb Debug",
+            "mb Demux",
+            "mb Empty Latent Image",
+            "mb Eval",
+            "mb Exec",
+            "mb File to Image",
+            "mb File to Text",
+            "mb Hash Generator",
+            "mb Image Batch",
+            "mb Image Dimensions",
+            "mb Image Dither",
+            "mb Image Flip",
+            "mb Image Load",
+            "mb Image Load from URL",
+            "mb Image Preview",
+            "mb Image Rotate",
+            "mb Image Size",
+            "mb Image Subtract",
+            "mb Image to File",
+            "mb KSampler",
+            "mb Select",
+            "mb String",
+            "mb Text",
+            "mb Text or File",
+            "mb Text to File",
+            "mb Textbox"
+        ],
+        {
+            "title_aux": "ComfyUI-Mockba"
+        }
+    ],
    "https://github.com/MrAdamBlack/CheckProgress": [
        [
            "CHECK_PROGRESS"
@@ -1316,16 +1391,62 @@
            "title_aux": "ComfyUI-APG_ImYourCFGNow"
        }
    ],
+    "https://github.com/NEZHA625/ComfyUI-tools-by-dong": [
+        [
+            "A1111_FLUX_DATA_NODE",
+            "CategorizeNode",
+            "Delay_node",
+            "Downloader",
+            "FileMoveNode",
+            "FolderIteratorNODE",
+            "Get_cookies_Node",
+            "Get_json_value_Node",
+            "HashCalculationsNode",
+            "HuggingFaceUploadNode",
+            "IMG2URLNode",
+            "Image2GIFNode",
+            "ImageDownloader",
+            "InputDetectionNode",
+            "LLM_Node",
+            "LibLib_upload_Node",
+            "LogicToolsNode",
+            "LoraIterator",
+            "RandomNumbersNode",
+            "RenameNode",
+            "ResolutionNode",
+            "SaveTXTNode",
+            "SetAppidNode",
+            "TextToJsonNode",
+            "TranslateAPINode",
+            "ZIPwith7zNode",
+            "img_understanding_Node",
+            "path_join_Node",
+            "save_img_NODE",
+            "set_api_Node"
+        ],
+        {
+            "title_aux": "ComfyUI-tools-by-dong [UNSAFE]"
+        }
+    ],
    "https://github.com/Northerner1/ComfyUI_North_Noise": [
        [
-            "North_Unsampler"
+            "North_Noise"
        ],
        {
            "title_aux": "ComfyUI_North_Noise [WIP]"
        }
    ],
+    "https://github.com/OSAnimate/ComfyUI-SpriteSheetMaker": [
+        [
+            "SpriteSheetMaker"
+        ],
+        {
+            "title_aux": "ComfyUI-SpriteSheetMaker [WIP]"
+        }
+    ],
    "https://github.com/PATATAJEC/Patatajec-Nodes": [
        [
+            "FilePrefixSwitcher",
            "HyvidSwitcher",
            "ImageSequenceFromBatch",
            "MidiReader",
@@ -1425,9 +1546,12 @@
    ],
    "https://github.com/RobeSantoro/ComfyUI-RobeNodes": [
        [
+            "Boolean Primitive \ud83d\udc24",
+            "Image Input Switch \ud83d\udc24",
            "List Image Path \ud83d\udc24",
            "List Model Path \ud83d\udc24",
-            "List Video Path \ud83d\udc24"
+            "List Video Path \ud83d\udc24",
+            "Peaks Weights Generator \ud83d\udc24"
        ],
        {
            "title_aux": "Comfy UI Robe Nodes [UNSAFE]"
@@ -1477,6 +1601,18 @@
            "title_aux": "ComfyUI_Save2Discord"
        }
    ],
+    "https://github.com/Scaryplasmon/ComfTrellis": [
+        [
+            "LoadTrellisModel",
+            "RembgSquare",
+            "SaveGLBFile",
+            "TrellisGrid",
+            "TrellisInference"
+        ],
+        {
+            "title_aux": "ComfTrellis [WIP]"
+        }
+    ],
    "https://github.com/SeedV/ComfyUI-SeedV-Nodes": [
        [
            "ALL_Model_UnLoader(SEEDV)",
@@ -1484,7 +1620,9 @@
            "CheckpointLoaderSimpleShared //SeedV",
            "ControlNetLoaderAdvancedShared",
            "LoraLoader //SeedV",
-            "Script"
+            "Script",
+            "Switch_Any(SEEDV)",
+            "TCD_Sampler(SEEDV)"
        ],
        {
            "title_aux": "ComfyUI-SeedV-Nodes [UNSAFE]"
@@ -1645,6 +1783,16 @@
            "title_aux": "Comfyui_leffa"
        }
    ],
+    "https://github.com/StoryWalker/comfyui_flux_collection_advanced": [
+        [
+            "Example",
+            "FluxImageUpscaler",
+            "FluxLoader"
+        ],
+        {
+            "title_aux": "comfyui_flux_collection_advanced [WIP]"
+        }
+    ],
    "https://github.com/TSFSean/ComfyUI-TSFNodes": [
        [
            "GyroOSC"
@@ -1684,6 +1832,15 @@
            "title_aux": "plugin-utils-nodes"
        }
    ],
+    "https://github.com/Velour-Fog/comfy-latent-nodes": [
+        [
+            "CustomLoadLatent",
+            "CustomSaveLatent"
+        ],
+        {
+            "title_aux": "comfy-latent-nodes [UNSAFE]"
+        }
+    ],
    "https://github.com/Video3DGenResearch/comfyui-batch-input-node": [
        [
            "BatchImageAndPrompt",
@@ -1737,6 +1894,16 @@
            "title_aux": "visuallabs_comfyui_nodes"
        }
    ],
+    "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening": [
+        [
+            "AYL_API_Node",
+            "AYL_GGUF_Node",
+            "AYL_Node"
+        ],
+        {
+            "title_aux": "ComfyUI_LLM_Are_You_Listening [WIP]"
+        }
+    ],
    "https://github.com/ZHO-ZHO-ZHO/ComfyUI-AuraSR-ZHO": [
        [
            "AuraSR_Lterative_Zho",
@@ -1764,6 +1931,15 @@
            "title_aux": "ComfyUI-PuLID-ZHO [WIP]"
        }
    ],
+    "https://github.com/ZHO-ZHO-ZHO/ComfyUI-Wan-ZHO": [
+        [
+            "WanT2V_Generation_Zho",
+            "WanT2V_ModelLoader_Zho"
+        ],
+        {
+            "title_aux": "ComfyUI Wan2.1 [WIP]"
+        }
+    ],
    "https://github.com/a-One-Fan/ComfyUI-Blenderesque-Nodes": [
        [
            "BlenderAlphaConvert",
@@ -1842,6 +2018,39 @@
            "title_aux": "alexisrolland/ComfyUI-AuraSR"
        }
    ],
+    "https://github.com/alt-key-project/comfyui-dream-painter": [
+        [
+            "Bitmap AND [DPaint]",
+            "Bitmap Crop Center [DPaint]",
+            "Bitmap Dimensions [DPaint]",
+            "Bitmap Edge Detect [DPaint]",
+            "Bitmap Expand Canvas [DPaint]",
+            "Bitmap Invert [DPaint]",
+            "Bitmap OR [DPaint]",
+            "Bitmap Resize [DPaint]",
+            "Bitmap Rotate [DPaint]",
+            "Bitmap To Image & Mask [DPaint]",
+            "Bitmap XOR [DPaint]",
+            "Draw Shape As Bitmap [DPaint]",
+            "Image To Bitmap [DPaint]",
+            "Random Number Generator [DPaint]",
+            "Shape Center & Fit [DPaint]",
+            "Shape Combiner [DPaint]",
+            "Shape Copycat Tool [DPaint]",
+            "Shape Find Bounds [DPaint]",
+            "Shape Flip [DPaint]",
+            "Shape Grid [DPaint]",
+            "Shape Resize [DPaint]",
+            "Shape Rotate [DPaint]",
+            "Shape of Circular Rays [DPaint]",
+            "Shape of N-Polygon [DPaint]",
+            "Shape of Rectangle [DPaint]",
+            "Shape of Star [DPaint]"
+        ],
+        {
+            "title_aux": "Dream Painter [WIP]"
+        }
+    ],
    "https://github.com/alt-key-project/comfyui-dream-video-batches": [
        [
            "Blended Transition [DVB]",
@@ -1934,20 +2143,6 @@
            "title_aux": "comfyui_segformer_b2_sleeves"
        }
    ],
-    "https://github.com/attashe/ComfyUI-FluxRegionAttention": [
-        [
-            "BBoxToMaskNode",
-            "BoundingBoxNode",
-            "CLIPDebug",
-            "FluxRegionBBOX",
-            "FluxRegionMask",
-            "RegionAttention",
-            "VisualizeBBoxesNode"
-        ],
-        {
-            "title_aux": "ComfyUI-FluxRegionAttention [WIP]"
-        }
-    ],
    "https://github.com/backearth1/Comfyui-MiniMax-Video": [
        [
            "ImageToPrompt",
@@ -2348,6 +2543,7 @@
            "CLIPTextEncodeControlnet",
            "CLIPTextEncodeFlux",
            "CLIPTextEncodeHunyuanDiT",
+            "CLIPTextEncodeLumina2",
            "CLIPTextEncodePixArtAlpha",
            "CLIPTextEncodeSD3",
            "CLIPTextEncodeSDXL",
@@ -2456,6 +2652,7 @@
            "LoadAudio",
            "LoadImage",
            "LoadImageMask",
+            "LoadImageOutput",
            "LoadLatent",
            "LoraLoader",
            "LoraLoaderModelOnly",
@@ -2463,6 +2660,7 @@
            "Mahiro",
            "MaskComposite",
            "MaskToImage",
+            "ModelComputeDtype",
            "ModelMergeAdd",
            "ModelMergeAuraflow",
            "ModelMergeBlocks",
@@ -2503,6 +2701,7 @@
            "RandomNoise",
            "RebatchImages",
            "RebatchLatents",
+            "RenormCFG",
            "RepeatImageBatch",
            "RepeatLatentBatch",
            "RescaleCFG",
@@ -2528,6 +2727,7 @@
            "SaveImage",
            "SaveImageWebsocket",
            "SaveLatent",
+            "SaveWEBM",
            "SelfAttentionGuidance",
            "SetFirstSigma",
            "SetLatentNoiseMask",
@@ -2603,6 +2803,7 @@
            "VPScheduler",
            "VideoLinearCFGGuidance",
            "VideoTriangleCFGGuidance",
+            "WanImageToVideo",
            "WebcamCapture",
            "unCLIPCheckpointLoader",
            "unCLIPConditioning"
@@ -2670,15 +2871,6 @@
            "title_aux": "VoidCustomNodes"
        }
    ],
-    "https://github.com/dasilva333/ComfyUI_MarkdownImage": [
-        [
-            "CreateDialogImage",
-            "CreateMarkdownImage"
-        ],
-        {
-            "title_aux": "ComfyUI_MarkdownImage [WIP]"
-        }
-    ],
    "https://github.com/denislov/Comfyui_AutoSurvey": [
        [
            "AddDoc2Knowledge",
@@ -2889,6 +3081,14 @@
            "title_aux": "ComfyUI-Showrunner-Utils"
        }
    ],
+    "https://github.com/fangziheng2321/comfyuinode_chopmask": [
+        [
+            "cus_chopmask"
+        ],
+        {
+            "title_aux": "comfyuinode_chopmask [WIP]"
+        }
+    ],
    "https://github.com/flowtyone/comfyui-flowty-lcm": [
        [
            "LCMSampler"
@@ -2972,6 +3172,16 @@
            "title_aux": "comfyui_median_filter"
        }
    ],
+    "https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
+        [
+            "AnimaginePrompt",
+            "MultilineTextInput",
+            "TextFileLoader"
+        ],
+        {
+            "title_aux": "ComfyUI Animagine prompt [WIP]"
+        }
+    ],
    "https://github.com/go-package-lab/ComfyUI-Tools-Video-Combine": [
        [
            "Tools:CopyFile",
@@ -2998,16 +3208,6 @@
            "title_aux": "loki-comfyui-node"
        }
    ],
-    "https://github.com/greengerong/ComfyUI-Lumina-Video": [
-        [
-            "LuminaVideoModelLoader",
-            "LuminaVideoSampler",
-            "LuminaVideoVAEDecode"
-        ],
-        {
-            "title_aux": "ComfyUI-Lumina-Video [WIP]"
-        }
-    ],
    "https://github.com/grimli333/ComfyUI_Grim": [
        [
            "GenerateFileName",
@@ -3017,6 +3217,26 @@
            "title_aux": "ComfyUI_Grim"
        }
    ],
+    "https://github.com/grinlau18/ComfyUI_XISER_Nodes": [
+        [
+            "XIS_Float_Slider",
+            "XIS_FromListGet1Color",
+            "XIS_FromListGet1Cond",
+            "XIS_FromListGet1Float",
+            "XIS_FromListGet1Image",
+            "XIS_FromListGet1Int",
+            "XIS_FromListGet1Latent",
+            "XIS_FromListGet1Mask",
+            "XIS_FromListGet1Model",
+            "XIS_FromListGet1String",
+            "XIS_INT_Slider",
+            "XIS_PromptsWithSwitches",
+            "XIS_ResizeImageOrMask"
+        ],
+        {
+            "title_aux": "Xiser_Nodes [WIP]"
+        }
+    ],
    "https://github.com/haodman/ComfyUI_Rain": [
        [
            "Rain_ImageSize",
@@ -3055,6 +3275,7 @@
        [
            "ACE_AnyInputSwitchBool",
            "ACE_AnyInputToAny",
+            "ACE_AudioCrop",
            "ACE_AudioLoad",
            "ACE_AudioPlay",
            "ACE_AudioSave",
@@ -3065,12 +3286,14 @@
            "ACE_ImageFaceCrop",
            "ACE_ImageGetSize",
            "ACE_ImageLoadFromCloud",
+            "ACE_ImageMakeSlieshow",
            "ACE_ImagePixelate",
            "ACE_ImageQA",
            "ACE_ImageRemoveBackground",
            "ACE_ImageSaveToCloud",
            "ACE_Integer",
            "ACE_MaskBlur",
+            "ACE_OpenAI_GPT_Chat",
            "ACE_Seed",
            "ACE_Text",
            "ACE_TextConcatenate",
@@ -3079,10 +3302,13 @@
            "ACE_TextInputSwitch4Way",
            "ACE_TextInputSwitch8Way",
            "ACE_TextList",
+            "ACE_TextLoad",
            "ACE_TextPreview",
+            "ACE_TextSave",
            "ACE_TextSelector",
            "ACE_TextToResolution",
            "ACE_TextTranslate",
+            "ACE_VideoConcat",
            "ACE_VideoLoad",
            "ACE_VideoPreview"
        ],
@@ -3092,10 +3318,12 @@
    ],
    "https://github.com/hdfhssg/ComfyUI_pxtool": [
        [
+            "ArtistLoader",
            "CivitaiHelper",
            "DanbooruCharacterTag",
            "E621CharacterTag",
            "NegativeTag",
+            "PX_Seed",
            "QualityTag",
            "RandomArtists",
            "RandomArtistsAdvanced",
@@ -3105,6 +3333,14 @@
            "title_aux": "ComfyUI_pxtool [WIP]"
        }
    ],
+    "https://github.com/hiusdev/ComfyUI_Lah_Toffee": [
+        [
+            "LoadVideoRandom"
+        ],
+        {
+            "title_aux": "ComfyUI_Lah_Toffee"
+        }
+    ],
    "https://github.com/horidream/ComfyUI-Horidream": [
        [
            "PassThroughWithSound"
@@ -3237,6 +3473,14 @@
            "title_aux": "comfyui-hydit"
        }
    ],
+    "https://github.com/if-ai/ComfyUI-IF_Zonos": [
+        [
+            "IF_ZonosTTS"
+        ],
+        {
+            "title_aux": "ComfyUI-IF_Zonos [WIP]"
+        }
+    ],
    "https://github.com/ilovejohnwhite/Tracer": [
        [
            "BillyGoatNode",
@@ -3306,6 +3550,27 @@
            "title_aux": "ComfyUI PaintingCoderUtils Nodes [WIP]"
        }
    ],
+    "https://github.com/jcomeme/ComfyUI-AsunaroTools": [
+        [
+            "AsunaroAnd",
+            "AsunaroAutomaticSexPrompter",
+            "AsunaroBatchImageLoader",
+            "AsunaroIfBiggerThanZero",
+            "AsunaroIfContain",
+            "AsunaroIfSame",
+            "AsunaroImageLoader",
+            "AsunaroIntToStr",
+            "AsunaroOr",
+            "AsunaroPromptStripper",
+            "AsunaroRandomDice",
+            "AsunaroSave",
+            "AsunaroTextConcatenator",
+            "AsunaroWildCard"
+        ],
+        {
+            "title_aux": "AsunaroTools"
+        }
+    ],
    "https://github.com/jgbrblmd/ComfyUI-ComfyFluxSize": [
        [
            "ComfyFluxSize"
@@ -3314,6 +3579,14 @@
            "title_aux": "ComfyUI-ComfyFluxSize [WIP]"
        }
    ],
+    "https://github.com/jgbyte/ComfyUI-RandomCube": [
+        [
+            "RandomCubeGrid"
+        ],
+        {
+            "title_aux": "ComfyUI-RandomCube [WIP]"
+        }
+    ],
    "https://github.com/jimmm-ai/TimeUi-a-ComfyUi-Timeline-Node": [
        [
            "jimmm.ai.TimelineUI"
@@ -3421,6 +3694,7 @@
    ],
    "https://github.com/jonnydolake/ComfyUI-AIR-Nodes": [
        [
+            "ExtractBlackLines",
            "ForceMinimumBatchSize",
            "ImageCompositeChained",
            "LineDetection",
@@ -3488,6 +3762,8 @@
    ],
    "https://github.com/kandy/ComfyUI-KAndy": [
        [
+            "KAndyBatch2Index",
+            "KAndyBatchIndex",
            "KAndyCivitImagesAPI",
            "KAndyCivitPromptAPI",
            "KAndyImageSave",
@@ -3593,6 +3869,7 @@
            "DownloadAndLoadHy3DDelightModel",
            "DownloadAndLoadHy3DPaintModel",
            "Hy3DApplyTexture",
+            "Hy3DBPT",
            "Hy3DBakeFromMultiview",
            "Hy3DCameraConfig",
            "Hy3DDelightImage",
@@ -3707,6 +3984,33 @@
            "title_aux": "ComfyUI-VideoNoiseWarp [WIP]"
        }
    ],
+    "https://github.com/kijai/ComfyUI-WanVideoWrapper": [
+        [
+            "LoadWanVideoClipTextEncoder",
+            "LoadWanVideoT5TextEncoder",
+            "WanVideoBlockSwap",
+            "WanVideoContextOptions",
+            "WanVideoDecode",
+            "WanVideoEmptyEmbeds",
+            "WanVideoEncode",
+            "WanVideoEnhanceAVideo",
+            "WanVideoImageClipEncode",
+            "WanVideoLatentPreview",
+            "WanVideoLoraBlockEdit",
+            "WanVideoLoraSelect",
+            "WanVideoModelLoader",
+            "WanVideoSampler",
+            "WanVideoTeaCache",
+            "WanVideoTextEmbedBridge",
+            "WanVideoTextEncode",
+            "WanVideoTorchCompileSettings",
+            "WanVideoVAELoader",
+            "WanVideoVRAMManagement"
+        ],
+        {
+            "title_aux": "ComfyUI-WanVideoWrapper [WIP]"
+        }
+    ],
    "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Advanced-Watermarks": [
        [
            "KimaraAIBatchImages",
@@ -3726,13 +4030,26 @@
    ],
    "https://github.com/kk8bit/KayTool": [
        [
+            "AIO_Translater",
            "Abc_Math",
            "Baidu_Translater",
+            "BiRefNet_Loader",
            "Color_Adjustment",
            "Custom_Save_Image",
            "Display_Any",
            "Image_Size_Extractor",
-            "Strong_Prompt"
+            "Mask_Blur_Plus",
+            "Preview_Mask",
+            "Preview_Mask_Plus",
+            "RemBG_Loader",
+            "Remove_BG",
+            "Slider_10",
+            "Slider_100",
+            "Slider_1000",
+            "Strong_Prompt",
+            "Tencent_Translater",
+            "Text",
+            "To_Int"
        ],
        {
            "title_aux": "KayTool"
@@ -3765,6 +4082,17 @@
            "title_aux": "ComfyUI Flow Control [UNSTABLE]"
        }
    ],
+    "https://github.com/krisshen2021/comfyui_OpenRouterNodes": [
+        [
+            "OpenRouterOAINode_Infer",
+            "OpenRouterOAINode_Models",
+            "OpenRouterOAINode_hunyuanPrompt",
+            "OpenRouterOAINode_txt2imgPrompt"
+        ],
+        {
+            "title_aux": "comfyui_OpenRouterNodes [WIP]"
+        }
+    ],
    "https://github.com/kuschanow/ComfyUI-SD-Slicer": [
        [
            "SdSlicer"
@@ -3936,6 +4264,9 @@
            "HYCreateRegionalCond",
            "HYFetaEnhance",
            "HYFlowEditGuider",
+            "HYFlowEditGuiderAdv",
+            "HYFlowEditGuiderCFG",
+            "HYFlowEditGuiderCFGAdv",
            "HYFlowEditSampler",
            "HYForwardODESampler",
            "HYInverseModelSamplingPred",
@@ -4028,7 +4359,13 @@
    ],
    "https://github.com/lum3on/comfyui_LLM_Polymath": [
        [
+            "ConceptEraserNode",
+            "UCEEraserNode",
+            "polymath_SaveAbsolute",
+            "polymath_UCE_concept_eraser",
            "polymath_chat",
+            "polymath_concept_eraser",
+            "polymath_helper",
            "polymath_scraper"
        ],
        {
@@ -4099,6 +4436,14 @@
            "title_aux": "ComfyUI mashb1t nodes"
        }
    ],
+    "https://github.com/masmullin2000/ComfyUI-MMYolo": [
+        [
+            "MMFace_Finder"
+        ],
+        {
+            "title_aux": "ComfyUI-MMYolo"
+        }
+    ],
    "https://github.com/mehbebe/ComfyLoraGallery": [
        [
            "LoraGallery"
@@ -4236,6 +4581,16 @@
            "title_aux": "ComfyUI-Simple-Image-Tools [WIP]"
        }
    ],
+    "https://github.com/mr-krak3n/ComfyUI-Qwen": [
+        [
+            "DeepSeekResponseParser",
+            "QwenLoader",
+            "QwenSampler"
+        ],
+        {
+            "title_aux": "ComfyUI-Qwen [CONFLICT]"
+        }
+    ],
    "https://github.com/mut-ex/comfyui-gligengui-node": [
        [
            "GLIGEN_GUI"
@@ -4252,6 +4607,14 @@
            "title_aux": "ComfyUI-Claude-I2T"
        }
    ],
+    "https://github.com/muvich3n/ComfyUI-Crop-Border": [
+        [
+            "CropImageBorder"
+        ],
+        {
+            "title_aux": "ComfyUI-Crop-Border"
+        }
+    ],
    "https://github.com/myAiLemon/MagicAutomaticPicture": [
        [
            "EditableStringNode",
@@ -4405,9 +4768,17 @@
    ],
    "https://github.com/nomcycle/ComfyUI_Cluster": [
        [
-            "ClusterFanInImages",
-            "ClusterFanInLatents",
-            "ClusterInstanceIndex"
+            "ClusterBroadcastTensor",
+            "ClusterExecuteCurrentWorkflow",
+            "ClusterExecuteWorkflow",
+            "ClusterFanOutImage",
+            "ClusterFanOutLatent",
+            "ClusterFanOutMask",
+            "ClusterGatherImages",
+            "ClusterGatherLatents",
+            "ClusterGatherMasks",
+            "ClusterInstanceIndex",
+            "ClusterListenTensorBroadcast"
        ],
        {
            "title_aux": "ComfyUI_Cluster [WIP]"
@@ -4443,6 +4814,14 @@
            "title_aux": "comfyui-keshigom_custom"
        }
    ],
+    "https://github.com/owengillett/ComfyUI-tilefusion": [
+        [
+            "VideoGridCombine"
+        ],
+        {
+            "title_aux": "ComfyUI-tilefusion"
+        }
+    ],
    "https://github.com/oyvindg/ComfyUI-TrollSuite": [
        [
            "BinaryImageMask",
@@ -4541,6 +4920,14 @@
            "title_aux": "ComyUI-Tupham"
        }
    ],
+    "https://github.com/pixuai/ComfyUI-PixuAI": [
+        [
+            "PromptSearch"
+        ],
+        {
+            "title_aux": "ComfyUI-PixuAI"
+        }
+    ],
    "https://github.com/poisenbery/NudeNet-Detector-Provider": [
        [
            "NudeNetDetectorProvider"
@@ -4655,6 +5042,14 @@
            "title_aux": "ComfyUI_HEXtoRGB"
        }
    ],
+    "https://github.com/ritikvirus/comfyui-terminal-modal-node": [
+        [
+            "terminal_node"
+        ],
+        {
+            "title_aux": "ComfyUI Terminal Command Node [UNSAFE]"
+        }
+    ],
    "https://github.com/rouxianmantou/comfyui-rxmt-nodes": [
        [
            "CheckValueTypeNode",
@@ -4681,14 +5076,6 @@
            "title_aux": "ComfyUI_YoloNasObjectDetection_Tensorrt [WIP]"
        }
    ],
-    "https://github.com/scottmudge/ComfyUI_BiscuitNodes": [
-        [
-            "LoadImagePrompted"
-        ],
-        {
-            "title_aux": "ComfyUI_BiscuitNodes"
-        }
-    ],
    "https://github.com/sdfxai/SDFXBridgeForComfyUI": [
        [
            "SDFXClipTextEncode"
@@ -4946,6 +5333,15 @@
            "title_aux": "ComfyUI_Save_Flux_Image"
        }
    ],
+    "https://github.com/techidsk/comfyui_molook_nodes": [
+        [
+            "MaskExpand(Molook)",
+            "OpenAIProvider(Molook)"
+        ],
+        {
+            "title_aux": "comfyui_molook_nodes [WIP]"
+        }
+    ],
    "https://github.com/techzuhaib/ComfyUI-CacheImageNode": [
        [
            "CacheImageNode"
@@ -5211,6 +5607,7 @@
        [
            "CLIPTranslatedNode",
            "DownloadImageNode",
+            "FillAlphaNode",
            "FixUTF8StringNode",
            "ImageResizeNode",
            "ImageToVideoNode",
--- a/node_db/dev/github-stats.json
+++ b/node_db/dev/github-stats.json
--- a/node_db/forked/custom-node-list.json
+++ b/node_db/forked/custom-node-list.json
@@ -129,6 +129,16 @@
            ],
            "install_type": "git-clone",
            "description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
+        },
+        {
+            "author": "Pablerdo",
+            "title": "ComfyUI-PSNodes",
+            "reference": "https://github.com/Pablerdo/ComfyUI-PSNodes",
+            "files": [
+                "https://github.com/Pablerdo/ComfyUI-PSNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
        }
    ]
 }
--- a/node_db/legacy/custom-node-list.json
+++ b/node_db/legacy/custom-node-list.json
@@ -10,6 +10,68 @@
        },
        

+
+        {
+            "author": "scottmudge",
+            "title": "ComfyUI_BiscuitNodes [REMOVED]",
+            "reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
+            "files": [
+                "https://github.com/scottmudge/ComfyUI_BiscuitNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Load Image From Path Using File Selector"
+        },
+        {
+            "author": "thanhduong0213929",
+            "title": "ComfyUI-DeepUnlock [REMOVED]",
+            "reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
+            "files": [
+                "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
+            ],
+            "install_type": "git-clone",
+            "description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
+        },
+        {
+            "author": "pathway8-sudo",
+            "title": "RMBG [REMOVED]",
+            "reference": "https://github.com/pathway8-sudo/RMBG",
+            "files": [
+                "https://github.com/pathway8-sudo/RMBG"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
+        },
+        {
+            "author": "iris-Neko",
+            "title": "ComfyUI_ascii_art [REMOVED]",
+            "reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
+            "files": [
+                "https://github.com/iris-Neko/ComfyUI_ascii_art"
+             ],
+             "install_type": "git-clone",
+             "description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
+        },
+        {
+            "author": "apesplat",
+            "title": "ezXY scripts and nodes [NOT MAINTAINED]",
+            "id": "ezxy",
+            "reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
+            "files": [
+                "https://github.com/GMapeSplat/ComfyUI_ezXY"
+            ],
+            "install_type": "git-clone",
+            "description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
+        },
+        {
+            "author": "mie",
+            "title": "ComfyUI_JanusProCaption [REMOVED]",
+            "reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
+            "files": [
+                "https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
+            ],
+            "install_type": "git-clone",
+            "description": "Describe image or create caption files using Janus Pro Model"
+        },
        {
            "author": "Njbx",
            "title": "ComfyUI-blockswap [REMOVED]",
--- a/node_db/new/custom-node-list.json
+++ b/node_db/new/custom-node-list.json
--- a/node_db/new/extension-node-map.json
+++ b/node_db/new/extension-node-map.json
--- a/node_db/new/model-list.json
+++ b/node_db/new/model-list.json
@@ -1,5 +1,28 @@
 {
  "models": [
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.fp16.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
+      "size": "167MB"
+    },
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
+      "size": "335MB"
+    },
+    
    {
      "name": "deepseek-ai/Janus-Pro-1B",
      "type": "Janus-Pro",
--- a/node_db/tutorial/custom-node-list.json
+++ b/node_db/tutorial/custom-node-list.json
@@ -291,6 +291,26 @@
            ],
            "install_type": "git-clone",
            "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
+        },
+        {
+            "author": "xhiroga",
+            "title": "ComfyUI-TypeScript-CustomNode",
+            "reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
+            "files": [
+                "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
+            ],
+            "install_type": "git-clone",
+            "description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
+        },
+        {
+            "author": "zentrocdot",
+            "title": "ComfyUI-Turtle_Graphics_Demos",
+            "reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
+            "files": [
+                "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
+            ],
+            "description": "ComfyUI node for creating some Turtle Graphic demos.", 
+            "install_type": "git-clone"
        }
    ]
 }
--- a/prestartup_script.py
+++ b/prestartup_script.py
@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 import sys
 import atexit
@@ -34,7 +35,9 @@ else:

 security_check.security_check()

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


@@ -82,6 +85,7 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
 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")
+manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
 restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
 manager_config_path = os.path.join(manager_files_path, 'config.ini')

@@ -94,7 +98,7 @@ def read_config():
    global default_conf
    try:
        import configparser
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
        config.read(manager_config_path)
        default_conf = config['default']
    except Exception:
@@ -122,6 +126,14 @@ if os.path.exists(manager_pip_overrides_path):
        cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40'  # for security


+if os.path.exists(manager_pip_blacklist_path):
+    with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+        for x in f.readlines():
+            y = x.strip()
+            if y != '':
+                cm_global.pip_blacklist.add(y)
+
+
 def remap_pip_package(pkg):
    if pkg in cm_global.pip_overrides:
        res = cm_global.pip_overrides[pkg]
@@ -421,29 +433,33 @@ except Exception as e:
    print(f"[ComfyUI-Manager] Logging failed: {e}")


-try:
-    import git   # noqa: F401
-    import toml  # noqa: F401
-    import rich  # noqa: F401
-except ModuleNotFoundError:
-    my_path = os.path.dirname(__file__)
-    requirements_path = os.path.join(my_path, "requirements.txt")
-
-    print("## ComfyUI-Manager: installing dependencies. (GitPython)")
+def ensure_dependencies():
    try:
-        result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
-    except subprocess.CalledProcessError:
-        print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
-        try:
-            result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
-        except subprocess.CalledProcessError:
-            print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
+        import git     # noqa: F401
+        import toml    # noqa: F401
+        import rich    # noqa: F401
+        import chardet # noqa: F401
+    except ModuleNotFoundError:
+        my_path = os.path.dirname(__file__)
+        requirements_path = os.path.join(my_path, "requirements.txt")

-try:
-    print("## 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("## [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-Manager: installing dependencies. (GitPython)")
+        try:
+            subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
+        except subprocess.CalledProcessError:
+            print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+            try:
+                subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
+            except subprocess.CalledProcessError:
+                print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
+
+    try:
+        print("## 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("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+
+ensure_dependencies()


 print("** ComfyUI startup time:", current_timestamp())
@@ -475,7 +491,6 @@ def read_downgrade_blacklist():

 read_downgrade_blacklist()

-print("[DBG] point1")

 def check_bypass_ssl():
    try:
@@ -488,14 +503,12 @@ def check_bypass_ssl():

 check_bypass_ssl()

-print("[DBG] point2")

 # Perform install
 processed_install = set()
 script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
 pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())

-print("[DBG] point3")

 def is_installed(name):
    name = name.strip()
@@ -547,7 +560,6 @@ def is_installed(name):

    return True       # prevent downgrade

-print("[DBG] point4")

 if os.path.exists(restore_snapshot_path):
    try:
@@ -597,24 +609,23 @@ if os.path.exists(restore_snapshot_path):
 def execute_lazy_install_script(repo_path, executable):
    global processed_install

-    print("[DBG] point5")
-
    install_script_path = os.path.join(repo_path, "install.py")
    requirements_path = os.path.join(repo_path, "requirements.txt")

    if os.path.exists(requirements_path):
        print(f"Install: pip packages for '{repo_path}'")
-        with open(requirements_path, "r") as requirements_file:
-            for line in requirements_file:
-                package_name = remap_pip_package(line.strip())
-                if package_name and not is_installed(package_name):
-                    if '--index-url' in package_name:
-                        s = package_name.split('--index-url')
-                        install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
-                    else:
-                        install_cmd = manager_util.make_pip_cmd(["install", package_name])

-                    process_wrap(install_cmd, repo_path)
+        lines = manager_util.robust_readlines(requirements_path)
+        for line in lines:
+            package_name = remap_pip_package(line.strip())
+            if package_name and not is_installed(package_name):
+                if '--index-url' in package_name:
+                    s = package_name.split('--index-url')
+                    install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
+                else:
+                    install_cmd = manager_util.make_pip_cmd(["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:
        processed_install.add(f'{repo_path}/install.py')
@@ -631,8 +642,6 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
    import uuid
    import shutil

-    print("[DBG] point6")
-
    # 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)
@@ -682,22 +691,49 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom

 def execute_migration(moves):
    import shutil
-
-    print("[DBG] point7")
-
    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]}'")


-print("[DBG] point8")
+script_executed = False

-# Check if script_list_path exists
-if os.path.exists(script_list_path):
+def execute_startup_script():
+    global script_executed
    print("\n#######################################################################")
    print("[ComfyUI-Manager] Starting dependency installation/(de)activation for the extension\n")

+    custom_nodelist_cache = None
+
+    def get_custom_node_paths():
+        nonlocal custom_nodelist_cache
+        if custom_nodelist_cache is None:
+            custom_nodelist_cache = set()
+            for base in folder_paths.get_folder_paths('custom_nodes'):
+                for x in os.listdir(base):
+                    fullpath = os.path.join(base, x)
+                    if os.path.isdir(fullpath):
+                        custom_nodelist_cache.add(fullpath)
+
+        return custom_nodelist_cache
+
+    def execute_lazy_delete(path):
+        # Validate to prevent arbitrary paths from being deleted
+        if path not in get_custom_node_paths():
+            logging.error(f"## ComfyUI-Manager: The scheduled '{path}' is not a custom node path, so the deletion has been canceled.")
+            return
+
+        if not os.path.exists(path):
+            logging.info(f"## ComfyUI-Manager: SKIP-DELETE => '{path}' (already deleted)")
+            return
+
+        try:
+            shutil.rmtree(path)
+            logging.info(f"## ComfyUI-Manager: DELETE => '{path}'")
+        except Exception as e:
+            logging.error(f"## ComfyUI-Manager: Failed to delete '{path}' ({e})")
+
    executed = set()
    # Read each line from the file and convert it to a list using eval
    with open(script_list_path, 'r', encoding="UTF-8", errors="ignore") as file:
@@ -721,6 +757,9 @@ if os.path.exists(script_list_path):
                    elif script[1] == "#LAZY-MIGRATION":
                        execute_migration(script[2])

+                    elif script[1] == "#LAZY-DELETE-NODEPACK":
+                        execute_lazy_delete(script[2])
+
                elif os.path.exists(script[0]):
                    if script[1] == "#FORCE":
                        del script[1]
@@ -729,7 +768,7 @@ if os.path.exists(script_list_path):
                            continue

                    print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}")
-                    print(f"\n## Execute install/(de)activation script for '{script[0]}'")
+                    print(f"\n## Execute management script for '{script[0]}'")

                    new_env = os.environ.copy()
                    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
@@ -737,37 +776,61 @@ if os.path.exists(script_list_path):
                    exit_code = process_wrap(script[1:], script[0], env=new_env)

                    if exit_code != 0:
-                        print(f"install/(de)activation script failed: {script[0]}")
+                        print(f"management script failed: {script[0]}")
                else:
                    print(f"\n## ComfyUI-Manager: CANCELED => {script[1:]}")

            except Exception as e:
-                print(f"[ERROR] Failed to execute install/(de)activation script: {line} / {e}")
+                print(f"[ERROR] Failed to execute management script: {line} / {e}")

    # Remove the script_list_path file
    if os.path.exists(script_list_path):
+        script_executed = True
        os.remove(script_list_path)
        
    print("\n[ComfyUI-Manager] Startup script completed.")
    print("#######################################################################\n")

-print("[DBG] point9")
+
+# Check if script_list_path exists
+if os.path.exists(script_list_path):
+    execute_startup_script()
+

 pip_fixer.fix_broken()

-print("[DBG] point10")
-
 del processed_install
 del pip_fixer
 manager_util.clear_pip_cache()

-print("[DBG] point11")
+if script_executed:
+    # Restart
+    print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
+
+    if '__COMFY_CLI_SESSION__' in os.environ:
+        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
+            pass
+
+        print("--------------------------------------------------------------------------\n")
+        exit(0)
+    else:
+        sys_argv = sys.argv.copy()
+
+        if sys.platform.startswith('win32'):
+            cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
+        else:
+            cmds = [sys.executable] + sys_argv
+
+        print(f"Command: {cmds}", flush=True)
+        print("--------------------------------------------------------------------------\n")
+
+        os.execv(sys.executable, cmds)
+

 def check_windows_event_loop_policy():
-    print("[DBG] point12")
    try:
        import configparser
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
        config.read(manager_config_path)
        default_conf = config['default']

@@ -782,10 +845,6 @@ def check_windows_event_loop_policy():
    except Exception:
        pass

-print("[DBG] point13")

 if platform.system() == 'Windows':
    check_windows_event_loop_policy()
-
-
-print("[DBG] point14")
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,9 +1,9 @@
 [project]
 name = "comfyui-manager"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.21"
+version = "3.27.8"
 license = { file = "LICENSE.txt" }
-dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
+dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]

 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ rich
 typing-extensions
 toml
 uv
+chardet
--- a/scripts/install-comfyui-venv-win.bat
+++ b/scripts/install-comfyui-venv-win.bat
@@ -6,7 +6,7 @@ python -m venv venv
 call venv/Scripts/activate
 python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
 python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/ComfyUI-Manager/requirements.txt
+python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
 cd ..
 echo "cd ComfyUI" >> run_gpu.bat
 echo "call venv/Scripts/activate" >> run_gpu.bat
--- a/scripts/install-manager-for-portable-version.bat
+++ b/scripts/install-manager-for-portable-version.bat
@@ -1,2 +1,3 @@
 .\python_embeded\python.exe -s -m pip install gitpython
 .\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
+.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt
Author	SHA1	Message	Date
Dr.Lt.Data	1248bd0413	fixed: robust rmtree for windows environment - reserve for deletion upon restart if a permission error occurs during rmtree https://github.com/ltdrdata/ComfyUI-Manager/issues/1579	2025-03-03 21:34:38 +09:00
Dr.Lt.Data	c150eec2b6	update DB	2025-03-03 18:27:15 +09:00
Dr.Lt.Data	c7248c2d47	improve: PIPFixer - now add numpy restriction when fixing opencv	2025-03-03 17:58:22 +09:00
Dr.Lt.Data	e71e68e298	modified: better error log when failed to update comfyui https://github.com/ltdrdata/ComfyUI-Manager/issues/1576	2025-03-02 17:42:31 +09:00
Dr.Lt.Data	6969557693	fixed: stuck if cnr node cannot be resolved https://github.com/ltdrdata/ComfyUI-Manager/issues/1596#issuecomment-2692415656	2025-03-02 17:28:53 +09:00
Dr.Lt.Data	f6be5ad839	modified: verbose reporting when initial fecthing is failed. https://github.com/ltdrdata/ComfyUI-Manager/issues/1594	2025-03-02 17:07:00 +09:00
Dr.Lt.Data	cebe3664fd	update DB	2025-03-02 16:08:30 +09:00
mango1010	cdab465c90	Added my custom node to the list (#1598 )	2025-03-02 15:26:48 +09:00
keit	144384655c	Add ComfyUI-Image-Toolkit node (#1600 )	2025-03-02 15:25:41 +09:00
Dr.Lt.Data	0e213d6dab	update DB	2025-03-01 01:59:34 +09:00
SirWillance	21294a4e4a	Add Force of Will Suite Light to custom-node-list.json for Beginner-Friendly ComfyUI Prompt Refinement (#1592 ) * Update custom-node-list.json * Update custom-node-list.json * Update custom-node-list.json --------- Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>	2025-03-01 01:48:15 +09:00
Dr.Lt.Data	3ba4d44d9e	update DB	2025-03-01 01:47:28 +09:00
Dr.Lt.Data	1f86ef5a37	update DB	2025-03-01 01:44:35 +09:00
Yuan-Man	fac60da333	Add ComfyUI-PhotoDoodle node (#1591 )	2025-03-01 01:14:20 +09:00
Dr.Lt.Data	5a5a37dfee	fixed: robust initial caching https://github.com/comfyanonymous/ComfyUI/issues/7003#issuecomment-2690687621 modified: store `db_mode` setting to `config.ini` https://github.com/ltdrdata/ComfyUI-Manager/issues/1582#issuecomment-2687332355 remove: fetch updates / skip updates - 'updates' filter will trigger fetching https://github.com/ltdrdata/ComfyUI-Manager/issues/1584 added: support for `disable_front` or `DISABLE_COMFYUI_MANAGER_FRONT`	2025-03-01 01:06:17 +09:00
Dr.Lt.Data	0d487bc14f	update DB	2025-02-27 20:52:07 +09:00
Dr.Lt.Data	a52b4eb5ed	update DB	2025-02-27 08:55:00 +09:00
Dr.Lt.Data	f1b7f5f52f	fixed: Fixed the issue where attempting to install the nightly version resulted in installing the latest version instead.	2025-02-26 21:50:31 +09:00
Dr.Lt.Data	5ef58652bf	remove useless code	2025-02-26 21:19:22 +09:00
Dr.Lt.Data	e26a9e75c6	update DB	2025-02-26 21:05:12 +09:00
Dr.Lt.Data	b0035ff4a7	update DB	2025-02-25 23:00:39 +09:00
orange90	94b6f9b2fe	Update custom-node-list.json: (#1577 ) * added ComfyUI-Regex-Runner node	2025-02-25 22:44:31 +09:00
Dr.Lt.Data	cad1482b3f	update doc	2025-02-25 22:27:21 +09:00
Dr.Lt.Data	ea7aafb3e6	fixed: When enabling the selected items, it fixed an issue where it performed a latest installation instead of enabling the previously disabled ones. fixed: robust skipping installing/uninstalling/enabling of ComfyUI-Manager	2025-02-25 22:19:07 +09:00
Alexander Piskun	42b15ad4a5	restart action: support running as Python module (#1578 )	2025-02-25 17:16:36 +09:00
Dr.Lt.Data	d3d613cca9	improved: cm-cli.sh - add `--restore-to` option to `restore-snapshot` command	2025-02-25 12:38:29 +09:00
Dr.Lt.Data	86893d999a	fixed: Added the Python executable path to the PATH environment variable, preventing potential issues caused by a missing PATH. https://github.com/ltdrdata/ComfyUI-Manager/issues/1554	2025-02-25 12:18:31 +09:00
Dr.Lt.Data	4fd17b0bf5	improved: advanced missing node detection based on embedded info https://github.com/ltdrdata/ComfyUI-Manager/issues/1445 feat: Custom Nodes In Workflow https://github.com/ltdrdata/ComfyUI-Manager/issues/990 https://github.com/ltdrdata/ComfyUI-Manager/issues/127 improved: show version on main dialog modified: aux_id - use github_id if possible removed: `fetch updates` button	2025-02-24 21:18:42 +09:00
Dr.Lt.Data	76d2206058	update DB	2025-02-24 21:00:14 +09:00
LAOGOU	51e8b608dc	Update custom-node-list.json (#1575 ) * Add Comfyui-Transform and LG_HotReload custom nodes * Update custom-node-list.json	2025-02-24 20:31:45 +09:00
Dr.Lt.Data	a68330fb8f	rollback wip code	2025-02-23 11:25:30 +09:00
Dr.Lt.Data	2449ad5c69	update DB	2025-02-23 11:08:07 +09:00
Dr.Lt.Data	064c812df3	update DB	2025-02-22 20:04:13 +09:00
bymyself	48d5ec9e66	Retain workflow versions when serializing node_versions (#1563 ) * retain initial node_versions on serialize * give precedence to workflow version * set version info on node * move patch to setup hook * switch to nodeCreated	2025-02-22 17:42:36 +09:00
Dr.Lt.Data	914419fd1e	update DB	2025-02-22 17:37:06 +09:00
The Dave	f005fc8ca0	added daves_nodes to custom node list for pull request (#1574 )	2025-02-22 16:58:37 +09:00
RiceRound	43b7960de2	Add RiceRound Cloud Node (#1572 )	2025-02-22 11:11:59 +09:00
Blueprint Coding	2ed1e58032	Update custom-node-list.json to match my node ID to Comfy registry ID (#1570 )	2025-02-22 11:11:35 +09:00
Dr.Lt.Data	c63b212700	update DB	2025-02-20 12:33:06 +09:00
Dr.Lt.Data	e9df78c0e7	improved: When user do `Switch ComfyUI`, update the policy accordingly.	2025-02-20 12:20:04 +09:00
Dr.Lt.Data	b0daf81185	update dependencies in pyproject.toml	2025-02-19 22:09:30 +09:00
Dr.Lt.Data	cee4fdcbb0	fixed: apply ConfigParser(strict=False) to other callsites https://github.com/ltdrdata/ComfyUI-Manager/pull/1561	2025-02-19 22:07:47 +09:00
Vanisper	df3cdfccb0	fix(git_utils): allow duplicate vscode-merge-base sections with strict=False (#1561 ) - Set ConfigParser strict mode to False - Resolves issue #1529 by permitting section duplicates - Allow `vscode-merge-base` to appear multiple times in `.git/config`	2025-02-19 22:05:04 +09:00
Dr.Lt.Data	894042cd0e	update DB	2025-02-19 22:02:10 +09:00
jmjoy	8123287952	Update model-list.json (#1564 )	2025-02-19 21:40:20 +09:00
puke	bc677705d8	Update custom-node-list.json (#1562 )	2025-02-19 21:39:41 +09:00
Dr.Lt.Data	5dd8ea8aab	feat: update policy for updating ComfyUI https://github.com/ltdrdata/ComfyUI-Manager/issues/1552 fixed: comfyui versions should be based on commit date https://github.com/ltdrdata/ComfyUI-Manager/issues/1566 fixed: invalid identifying of nightly node packs which has `git@github.com:...` url fixed: switch comfyui should be based on `master` branch instead of `main` branch fixed: switch_to_default_branch - more robust switching refactor: endpoints for policies	2025-02-19 21:34:13 +09:00
Dr.Lt.Data	41172be796	modified: don't show outdated ComfyUI message if desktop mode modified: use __COMFYUI_DESKTOP_VERSION__ in notice board if desktop mode	2025-02-19 07:41:54 +09:00
Dr.Lt.Data	ad1b4a9a86	feat: reverse proxy https://github.com/ltdrdata/ComfyUI-Manager/pull/795/files	2025-02-18 23:41:44 +09:00
Dr.Lt.Data	e0e3ec02b3	update DB	2025-02-18 21:08:19 +09:00
Dr.Lt.Data	a6cc392473	fix typo	2025-02-17 22:34:16 +09:00
Dr.Lt.Data	36f48b8656	feat: custom pip_blacklist https://github.com/ltdrdata/ComfyUI-Manager/issues/1560	2025-02-17 22:32:26 +09:00
Dr.Lt.Data	3d883ca37d	update DB	2025-02-17 22:06:07 +09:00
Dr.Lt.Data	34ed81ca64	update DB	2025-02-17 21:40:48 +09:00
mohseni-mr	a9e0880572	Added ComfyUI Mohseni Kit to ComfyUI Manager (#1559 )	2025-02-17 21:39:48 +09:00
Dr.Lt.Data	9500e1c3c4	update DB	2025-02-17 21:39:30 +09:00
Blueprint Coding	d81aa9cbbc	Update custom-node-list.json (#1557 ) Added my custom nodes: "The AI Doctors Clinical Tools" description: "MultiInt and MultiText nodes. The MultiInt node allows management of multiple int values with configurable steps, +/- buttons, drag change, & customized labels. The MultiText node offers similar functionality for string values."	2025-02-17 21:38:37 +09:00
Dr.Lt.Data	21d4b25c2d	update DB	2025-02-17 21:38:02 +09:00
CY-CHENYUE	0080783a11	Update custom-node-list.json (#1555 )	2025-02-17 21:37:08 +09:00
Dr.Lt.Data	2c3f44a3f8	fixed: cm-cli.py - missing 'utils' module if COMYUI_PatH is set https://github.com/ltdrdata/ComfyUI-Manager/issues/1556	2025-02-17 07:43:35 +09:00
Dr.Lt.Data	3ddf414097	fixed: Modify the import of `chardet` to be lazy. - "Prevent `chardet` from being imported in `manager_util` before automatic dependency installation."** https://github.com/ltdrdata/ComfyUI-Manager/issues/1554	2025-02-16 20:29:29 +09:00
Dr.Lt.Data	59fb63f1f7	ruff fix	2025-02-16 14:42:58 +09:00
Dr.Lt.Data	fa1b514440	improved: Update All - Show link on the result board fixed: Update All - Updates for unknown nodes were not being applied fixed: corner case crash whilte install/updating https://github.com/ltdrdata/ComfyUI-Manager/issues/1168	2025-02-16 14:25:57 +09:00
Dr.Lt.Data	1579c58876	fixed: ensure chardet dependency https://github.com/ltdrdata/ComfyUI-Manager/discussions/1553	2025-02-16 13:04:56 +09:00
Dr.Lt.Data	153d044331	update DB	2025-02-16 10:30:18 +09:00
wirytiox	f2496f7054	Update custom-node-list.json (#1551 )	2025-02-16 10:11:11 +09:00
Sssnap	99022f4f3d	Update custom-node-list.json (#1549 ) * Update custom-node-list.json * Update custom-node-list.json --------- Co-authored-by: Dr.Lt.Data <128333288+ltdrdata@users.noreply.github.com>	2025-02-16 10:10:57 +09:00
Dr.Lt.Data	60a5e4f261	fixed: address abnormal encoding of 'requirements.txt' improved: better error message https://github.com/ltdrdata/ComfyUI-Manager/issues/1513	2025-02-16 10:05:29 +09:00
Dr.Lt.Data	661586d3b6	update DB	2025-02-15 17:42:39 +09:00
Dr.Lt.Data	abc26cf906	fixed: pre_startup - restart if script is executed fixed: normalize cnr versions via StrictVersion - 2.5 and 2.5.0 were regarded as different version	2025-02-15 17:27:09 +09:00
Dr.Lt.Data	12351bada7	improved: is_local_mode - use ipaddress module instead of string match refactor: get_config() - ensure lowercase option when returning dict https://github.com/ltdrdata/ComfyUI-Manager/issues/1546	2025-02-15 10:02:25 +09:00
Dr.Lt.Data	a6816d53d7	update DB	2025-02-15 09:47:42 +09:00
Dr.Lt.Data	3b0709f5f2	improved: cm-cli.py save-snapshot - validate output path fixed: Update all - Properly display the results of the ComfyUI update. fixed: Update all - An issue where the action results of the custom nodes manager were reflected in the main dialog. https://github.com/ltdrdata/ComfyUI-Manager/issues/1548	2025-02-15 09:23:04 +09:00
Dr.Lt.Data	d7af7e2917	update DB	2025-02-14 07:43:16 +09:00