improve: pip fixer - support missing comfyui_frontend_package fixing

update db
update DB
2025-03-05 12:55:39 +09:00 · 2025-03-05 08:15:03 +09:00 · 2025-03-04 22:24:05 +09:00 · 2025-03-04 22:07:15 +09:00 · 2025-03-04 22:05:03 +09:00 · 2025-03-04 21:35:24 +09:00
25 changed files with 8369 additions and 4799 deletions
--- a/init.py
+++ b/init.py
@@ -7,7 +7,10 @@ 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
@@ -61,13 +61,17 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist


 def check_comfyui_hash():
-    repo = git.Repo(comfy_path)
-    core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
+    try:
+        repo = git.Repo(comfy_path)
+        core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
+        core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
+    except:
+        print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
+        core.comfy_ui_revision = 0
+        core.comfy_ui_commit_datetime = 0

    cm_global.variables['comfyui.revision'] = core.comfy_ui_revision

-    core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
-

 check_comfyui_hash()  # This is a preparation step for manager_core
 core.check_invalid_nodes()
@@ -152,6 +156,11 @@ class Ctx:
                    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")
@@ -245,7 +254,7 @@ def fix_node(node_spec_str, is_all=False, cnt_msg=''):
    res = unified_manager.unified_fix(node_name, version_spec, no_deps=cmd_ctx.no_deps)

    if not res.result:
-        print(f"ERROR: f{res.msg}")
+        print(f"[bold red]ERROR: f{res.msg}[/bold red]")


 def uninstall_node(node_spec_str: str, is_all: bool = False, cnt_msg: str = ''):
@@ -638,7 +647,7 @@ def install(
    cmd_ctx.set_channel_mode(channel, mode)
    cmd_ctx.set_no_deps(no_deps)

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
    for_each_nodes(nodes, act=install_node)
    pip_fixer.fix_broken()

@@ -676,7 +685,7 @@ def reinstall(
    cmd_ctx.set_channel_mode(channel, mode)
    cmd_ctx.set_no_deps(no_deps)

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
    for_each_nodes(nodes, act=reinstall_node)
    pip_fixer.fix_broken()

@@ -730,7 +739,7 @@ def update(
    if 'all' in nodes:
        asyncio.run(auto_save_snapshot())

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)

    for x in nodes:
        if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -831,7 +840,7 @@ def fix(
    if 'all' in nodes:
        asyncio.run(auto_save_snapshot())

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
    for_each_nodes(nodes, fix_node, allow_all=True)
    pip_fixer.fix_broken()

@@ -1038,13 +1047,17 @@ def save_snapshot(
 ):
    cmd_ctx.set_user_directory(user_directory)

+    if output is None:
+        print("[bold red]ERROR: missing output path[/bold red]")
+        raise typer.Exit(code=1)
+        
    if(not output.endswith('.json') and not output.endswith('.yaml')):
-        print("ERROR: output path should be either '.json' or '.yaml' file.")
+        print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
        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.")
+        print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
        raise typer.Exit(code=1)
        
    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
@@ -1075,10 +1088,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')
@@ -1099,7 +1119,7 @@ def restore_snapshot(
            print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
            exit(1)

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
    try:
        asyncio.run(core.restore_snapshot(snapshot_path, extras))
    except Exception:
@@ -1131,7 +1151,7 @@ def restore_dependencies(
    total = len(node_paths)
    i = 1

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
    for x in node_paths:
        print("----------------------------------------------------------------------------------------------------")
        print(f"Restoring [{i}/{total}]: {x}")
@@ -1150,7 +1170,7 @@ def post_install(
 ):
    path = os.path.expanduser(path)

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
    unified_manager.execute_install_script('', path, instant_execution=True)
    pip_fixer.fix_broken()

@@ -1195,7 +1215,7 @@ def install_deps(
                exit(1)


-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
            for k in json_obj['custom_nodes'].keys():
                state = core.simple_check_custom_node(k)
                if state == 'installed':
--- 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/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/git_utils.py
+++ b/glob/git_utils.py
@@ -52,6 +52,14 @@ def git_url(fullpath):


 def normalize_url(url) -> str:
+    github_id = normalize_to_github_id(url)
+    if github_id is not None:
+        url = f"https://github.com/{github_id}"
+
+    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))

@@ -62,9 +70,9 @@ def normalize_url(url) -> str:
        if repo_name.endswith('.git'):
            repo_name = repo_name[:-4]

-        url = f"https://github.com/{author}/{repo_name}"
+        return f"{author}/{repo_name}"

-    return url
+    return None


 def get_url_for_clone(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, 25, 1]
+version_code = [3, 28]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')


@@ -828,7 +828,7 @@ class UnifiedManager:
        else:
            if os.path.exists(requirements_path) and not no_deps:
                print("Install: pip packages")
-                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
                res = True
                lines = manager_util.robust_readlines(requirements_path)
                for line in lines:
@@ -997,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
@@ -1009,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:
@@ -1074,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:
@@ -1132,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)
@@ -1164,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]

@@ -1179,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]

@@ -1188,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}')
@@ -1235,10 +1247,13 @@ 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}")

@@ -1359,7 +1374,7 @@ class UnifiedManager:
        else:
            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
@@ -1368,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):
@@ -1472,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:
@@ -1480,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():
@@ -1501,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):
@@ -1514,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

@@ -1588,7 +1614,8 @@ def write_config():
        '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)
@@ -1628,6 +1655,7 @@ def read_config():
                    'always_lazy_install': get_bool('always_lazy_install', False),
                    'network_mode': default_conf.get('network_mode', 'public').lower(),
                    'security_level': default_conf.get('security_level', 'normal').lower(),
+                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
               }

    except Exception:
@@ -1651,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
        }


@@ -1721,18 +1750,29 @@ def switch_to_default_branch(repo):
    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']:
@@ -1843,7 +1883,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
    else:
        if os.path.exists(requirements_path) and not no_deps:
            print("Install: pip packages")
-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)
            with open(requirements_path, "r") as requirements_file:
                for line in requirements_file:
                    #handle comments
@@ -2370,7 +2410,14 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
 def update_to_stable_comfyui(repo_path):
    try:
        repo = git.Repo(repo_path)
-        repo.git.checkout(repo.heads.master)
+        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'):
@@ -2543,15 +2590,12 @@ async def get_current_snapshot(custom_nodes_only = False):
    # Get ComfyUI hash
    repo_path = comfy_path

-    if not os.path.exists(os.path.join(repo_path, '.git')):
-        print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
-        return {}
-
    comfyui_commit_hash = None
    if not custom_nodes_only:
-        repo = git.Repo(repo_path)
-        comfyui_commit_hash = repo.head.commit.hexsha
-
+        if os.path.exists(os.path.join(repo_path, '.git')):
+            repo = git.Repo(repo_path)
+            comfyui_commit_hash = repo.head.commit.hexsha
+        
    git_custom_nodes = {}
    cnr_custom_nodes = {}
    file_custom_nodes = []
@@ -3031,6 +3075,10 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):

        # 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

@@ -3264,7 +3312,9 @@ def switch_comfyui(tag):

    if tag == 'nightly':
        repo.git.checkout('master')
-        repo.remotes.origin.pull()
+        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)
--- a/glob/manager_server.py
+++ b/glob/manager_server.py
@@ -190,6 +190,9 @@ def set_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
    global comfyui_tag
@@ -447,7 +450,7 @@ async def task_worker():
                    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}'.")
+            logging.error(f"\nERROR: An error occurred while updating '{node_name}'. (res.result={res.result}, res.action={res.action})")
            return base_res
        except Exception:
            traceback.print_exc()
@@ -464,8 +467,8 @@ async def task_worker():
                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":
                if is_stable:
                    logging.info("ComfyUI is updated to latest stable version.")
@@ -816,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
@@ -833,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)
@@ -1195,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}"
@@ -1447,6 +1458,18 @@ async def preview_method(request):
    return web.Response(status=200)


+@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:
@@ -1578,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

@@ -1670,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
@@ -265,8 +276,9 @@ torch_torchvision_torchaudio_version_map = {


 class PIPFixer:
-    def __init__(self, prev_pip_versions):
+    def __init__(self, prev_pip_versions, comfyui_path):
        self.prev_pip_versions = { **prev_pip_versions }
+        self.comfyui_path = comfyui_path

    def torch_rollback(self):
        spec = self.prev_pip_versions['torch'].split('+')
@@ -346,7 +358,7 @@ class PIPFixer:

                if len(targets) > 0:
                    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}")
@@ -365,6 +377,22 @@ class PIPFixer:
            logging.error("[ComfyUI-Manager] Failed to restore numpy")
            logging.error(e)

+        # fix missing frontend
+        try:
+            front = new_pip_versions.get('comfyui_frontend_package')
+            if front is None:
+                requirements_path = os.path.join(self.comfyui_path, 'requirements.txt')
+
+                with open(requirements_path, 'r') as file:
+                    lines = file.readlines()
+                
+                front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
+                cmd = make_pip_cmd(['install', front_line])
+                subprocess.check_output(cmd , universal_newlines=True)
+        except Exception as e:
+            logging.error("[ComfyUI-Manager] Failed to restore comfyui_frontend_package")
+            logging.error(e)
+

 def sanitize(data):
    return data.replace("<", "&lt;").replace(">", "&gt;")
--- 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,9 +227,9 @@ 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 = false;
@@ -627,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}`);
@@ -641,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;

@@ -729,7 +689,7 @@ async function onQueueStatus(event) {

 		let msg = "";
 		
-		if(success_list.length == 0 && !comfyui_state.startsWith('success')) {
+		if(success_list.length == 0 && comfyui_state.startsWith('skip')) {
 			if(failed_list.length == 0) {
 				msg += "You are already up to date.";
 			}
@@ -804,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();
@@ -888,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",
@@ -909,7 +860,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					type: "button",
 					textContent: "Update All Custom Nodes",
 					onclick:
-						() => updateAll(false, self)
+						() => updateAll(false)
 				});
 		}
 		else {
@@ -918,7 +869,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					type: "button",
 					textContent: "Update All",
 					onclick:
-						() => updateAll(true, self)
+						() => updateAll(true)
 				});
 		}

@@ -948,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",
@@ -977,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,
@@ -1013,12 +976,6 @@ class ManagerMenuDialog extends ComfyDialog {

 		let self = this;

-		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;
-
 		// db mode
 		this.datasrc_combo = document.createElement("select");
 		this.datasrc_combo.setAttribute("title", "Configure where to retrieve node/model information. If set to 'local,' the channel is ignored, and if set to 'channel (remote),' it fetches the latest information each time the list is opened.");
@@ -1027,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.");
@@ -1126,27 +1091,26 @@ class ManagerMenuDialog extends ComfyDialog {
 			set_component_policy(event.target.value);
 		});

-		let update_policy_combo = document.createElement("select");
+		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: Stable ComfyUI' }, []));
-		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: Nightly ComfyUI' }, []));
+		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) {
+		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,
@@ -1308,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",
@@ -1450,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/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
@@ -1068,18 +1068,28 @@
      "size": "19.1GB"
    },
    
-
    {
-      "name": "comfyanonymous/clip_l",
+      "name": "Comfy-Org/clip_l",
      "type": "clip",
      "base": "clip",
      "save_path": "default",
-      "description": "clip_l model",
-      "reference": "https://huggingface.co/comfyanonymous/flux_text_encoders/tree/main",
+      "description": "clip_l model (for SD1.x, SD2.x, SDXL, SD3.5, FLUX.1, HunyuanVideo, ...) ",
+      "reference": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8",
      "filename": "clip_l.safetensors",
-      "url": "https://huggingface.co/comfyanonymous/flux_text_encoders/resolve/main/clip_l.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/text_encoders/clip_l.safetensors",
      "size": "246MB"
    },
+    {
+      "name": "Comfy-Org/clip_g",
+      "type": "clip",
+      "base": "clip",
+      "save_path": "default",
+      "description": "clip_g model (for SDXL, SD3.5)",
+      "reference": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8",
+      "filename": "clip_g.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/stable-diffusion-3.5-fp8/resolve/main/text_encoders/clip_g.safetensors",
+      "size": "1.39GB"
+    },

    {
      "name": "v1-5-pruned-emaonly.ckpt",
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
@@ -12,8 +12,246 @@
        
        
        
-
-
+        {
+            "author": "Elypha",
+            "title": "ComfyUI-Prompt-Helper [WIP]",
+            "reference": "https://github.com/Elypha/ComfyUI-Prompt-Helper",
+            "files": [
+                "https://github.com/Elypha/ComfyUI-Prompt-Helper"
+            ],
+            "install_type": "git-clone",
+            "description": "Concat conditions and prompts for ComfyUI"
+        },
+        {
+            "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.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "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]",
@@ -165,16 +403,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",
@@ -225,16 +453,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",
@@ -448,13 +666,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",
@@ -864,7 +1082,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",
@@ -1097,16 +1315,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]",
@@ -1821,7 +2029,7 @@
                "https://github.com/oshtz/ComfyUI-oshtz-nodes"
            ],
            "install_type": "git-clone",
-            "description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node"
+            "description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node\nNOTE: The files in the repo are not organized."
        },
        {
            "author": "m-ai-studio",
@@ -2659,13 +2867,14 @@
        },
        {
            "author": "chrisdreid",
-            "title": "ComfyUI_EnvAutopsyAPI [UNSAFE]",
+            "title": "ComfyUI_EnvAutopsyAPI Debugger [UNSAFE]",
+            "id": "chrisdreid",
            "reference": "https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI",
            "files": [
                "https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI"
            ],
            "install_type": "git-clone",
-            "description": "ComfyUI_EnvAutopsyAPI is a powerful debugging tool designed for ComfyUI that provides in-depth analysis of your environment and dependencies through an API interface. This tool allows you to inspect environment variables, pip packages, and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server. MUST READ [a/THIS](https://github.com/chrisdreid/ComfyUI_EnvAutopsyAPI#%EF%B8%8F-warning-security-risk-%EF%B8%8F) before install.]"
+            "description": "A powerful debugging tool designed to provide in-depth analysis of your environment and dependencies by exposing API endpoints. This tool allows you to inspect environment variables, pip packages, python info and dependency trees, making it easier to diagnose and resolve issues in your ComfyUI setup.[w/This tool may expose sensitive system information if used on a public server]"
        },
        {
            "author": "Futureversecom",
--- 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"
        ],
        {
@@ -582,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",
@@ -642,7 +653,9 @@
            "DevToolsNodeWithBooleanInput",
            "DevToolsNodeWithForceInput",
            "DevToolsNodeWithOnlyOptionalInput",
+            "DevToolsNodeWithOptionalComboInput",
            "DevToolsNodeWithOptionalInput",
+            "DevToolsNodeWithOutputCombo",
            "DevToolsNodeWithOutputList",
            "DevToolsNodeWithSeedInput",
            "DevToolsNodeWithStringInput",
@@ -809,6 +822,23 @@
            "title_aux": "ComfyUI-MusicGen [WIP]"
        }
    ],
+    "https://github.com/Elypha/ComfyUI-Prompt-Helper": [
+        [
+            "PromptHelper_CombineConditioning",
+            "PromptHelper_ConcatConditioning",
+            "PromptHelper_ConcatString",
+            "PromptHelper_EncodeMultiStringCombine",
+            "PromptHelper_FormatString",
+            "PromptHelper_LoadPreset",
+            "PromptHelper_LoadPresetAdvanced",
+            "PromptHelper_String",
+            "PromptHelper_StringMultiLine",
+            "PromptHelper_WeightedPrompt"
+        ],
+        {
+            "title_aux": "ComfyUI-Prompt-Helper [WIP]"
+        }
+    ],
    "https://github.com/EmanueleUniroma2/ComfyUI-FLAC-to-WAV": [
        [
            "AudioToWavConverter"
@@ -951,10 +981,10 @@
            "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",
@@ -963,7 +993,7 @@
            "VideoFileUploader"
        ],
        {
-            "title_aux": "ComfyUI-DeepSeek_Toolkit [WIP]"
+            "title_aux": "ComfyUI-DeepSeek-Toolkit [WIP]"
        }
    ],
    "https://github.com/IfnotFr/ComfyUI-Ifnot-Pack": [
@@ -1029,6 +1059,7 @@
            "ImNodeTitleOverride",
            "ImSetActionKeywordMapping",
            "MergeNode",
+            "Molmo7BDbnbBatch",
            "MuteNode",
            "NewNode",
            "Node2String",
@@ -1199,6 +1230,7 @@
    ],
    "https://github.com/LotzF/ComfyUI-Simple-Chat-GPT-completion": [
        [
+            "AzureChatGptCompletion",
            "ChatGPTCompletion"
        ],
        {
@@ -1287,6 +1319,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",
@@ -1318,6 +1358,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"
@@ -1338,11 +1413,15 @@
        [
            "A1111_FLUX_DATA_NODE",
            "CategorizeNode",
+            "Delay_node",
+            "Downloader",
            "FileMoveNode",
            "FolderIteratorNODE",
+            "Get_cookies_Node",
            "Get_json_value_Node",
            "HashCalculationsNode",
            "HuggingFaceUploadNode",
+            "IMG2URLNode",
            "Image2GIFNode",
            "ImageDownloader",
            "InputDetectionNode",
@@ -1358,7 +1437,9 @@
            "TextToJsonNode",
            "TranslateAPINode",
            "ZIPwith7zNode",
+            "img_understanding_Node",
            "path_join_Node",
+            "save_img_NODE",
            "set_api_Node"
        ],
        {
@@ -1367,14 +1448,23 @@
    ],
    "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",
@@ -1474,6 +1564,8 @@
    ],
    "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",
@@ -1546,7 +1638,9 @@
            "CheckpointLoaderSimpleShared //SeedV",
            "ControlNetLoaderAdvancedShared",
            "LoraLoader //SeedV",
-            "Script"
+            "Script",
+            "Switch_Any(SEEDV)",
+            "TCD_Sampler(SEEDV)"
        ],
        {
            "title_aux": "ComfyUI-SeedV-Nodes [UNSAFE]"
@@ -1707,6 +1801,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"
@@ -1746,6 +1850,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",
@@ -1799,6 +1912,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",
@@ -1826,6 +1949,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",
@@ -1904,6 +2036,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]",
@@ -2412,6 +2577,7 @@
            "ConditioningConcat",
            "ConditioningSetArea",
            "ConditioningSetAreaPercentage",
+            "ConditioningSetAreaPercentageVideo",
            "ConditioningSetAreaStrength",
            "ConditioningSetMask",
            "ConditioningSetTimestepRange",
@@ -2656,6 +2822,7 @@
            "VPScheduler",
            "VideoLinearCFGGuidance",
            "VideoTriangleCFGGuidance",
+            "WanImageToVideo",
            "WebcamCapture",
            "unCLIPCheckpointLoader",
            "unCLIPConditioning"
@@ -2723,15 +2890,6 @@
            "title_aux": "VoidCustomNodes"
        }
    ],
-    "https://github.com/dasilva333/ComfyUI_MarkdownImage": [
-        [
-            "CreateDialogImage",
-            "CreateMarkdownImage"
-        ],
-        {
-            "title_aux": "ComfyUI_MarkdownImage [WIP]"
-        }
-    ],
    "https://github.com/denislov/Comfyui_AutoSurvey": [
        [
            "AddDoc2Knowledge",
@@ -3035,7 +3193,9 @@
    ],
    "https://github.com/gmorks/ComfyUI-Animagine-Prompt": [
        [
-            "AnimaginePrompt"
+            "AnimaginePrompt",
+            "MultilineTextInput",
+            "TextFileLoader"
        ],
        {
            "title_aux": "ComfyUI Animagine prompt [WIP]"
@@ -3067,16 +3227,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",
@@ -3089,8 +3239,18 @@
    "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_PromptsWithSwitches",
+            "XIS_ResizeImageOrMask"
        ],
        {
            "title_aux": "Xiser_Nodes [WIP]"
@@ -3134,6 +3294,7 @@
        [
            "ACE_AnyInputSwitchBool",
            "ACE_AnyInputToAny",
+            "ACE_AudioCrop",
            "ACE_AudioLoad",
            "ACE_AudioPlay",
            "ACE_AudioSave",
@@ -3144,12 +3305,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",
@@ -3158,10 +3321,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"
        ],
@@ -3403,6 +3569,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"
@@ -3411,6 +3598,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"
@@ -3518,6 +3713,7 @@
    ],
    "https://github.com/jonnydolake/ComfyUI-AIR-Nodes": [
        [
+            "ExtractBlackLines",
            "ForceMinimumBatchSize",
            "ImageCompositeChained",
            "LineDetection",
@@ -3807,6 +4003,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",
@@ -3826,13 +4049,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"
@@ -3865,6 +4101,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"
@@ -4036,7 +4283,9 @@
            "HYCreateRegionalCond",
            "HYFetaEnhance",
            "HYFlowEditGuider",
+            "HYFlowEditGuiderAdv",
            "HYFlowEditGuiderCFG",
+            "HYFlowEditGuiderCFGAdv",
            "HYFlowEditSampler",
            "HYForwardODESampler",
            "HYInverseModelSamplingPred",
@@ -4129,8 +4378,11 @@
    ],
    "https://github.com/lum3on/comfyui_LLM_Polymath": [
        [
+            "ConceptEraserNode",
            "polymath_SaveAbsolute",
            "polymath_chat",
+            "polymath_concept_eraser",
+            "polymath_helper",
            "polymath_scraper"
        ],
        {
@@ -4201,6 +4453,14 @@
            "title_aux": "ComfyUI mashb1t nodes"
        }
    ],
+    "https://github.com/masmullin2000/ComfyUI-MMYolo": [
+        [
+            "MMFace_Finder"
+        ],
+        {
+            "title_aux": "ComfyUI-MMYolo"
+        }
+    ],
    "https://github.com/mehbebe/ComfyLoraGallery": [
        [
            "LoraGallery"
@@ -4364,6 +4624,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",
@@ -4517,9 +4785,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]"
@@ -4527,6 +4803,7 @@
    ],
    "https://github.com/oshtz/ComfyUI-oshtz-nodes": [
        [
+            "EasyAspectRatioNode",
            "ImageOverlayNode",
            "LLMAIONode",
            "LoRASwitcherNode",
@@ -4661,6 +4938,14 @@
            "title_aux": "ComyUI-Tupham"
        }
    ],
+    "https://github.com/pixuai/ComfyUI-PixuAI": [
+        [
+            "PromptSearch"
+        ],
+        {
+            "title_aux": "ComfyUI-PixuAI"
+        }
+    ],
    "https://github.com/poisenbery/NudeNet-Detector-Provider": [
        [
            "NudeNetDetectorProvider"
@@ -4775,6 +5060,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",
@@ -4801,14 +5094,6 @@
            "title_aux": "ComfyUI_YoloNasObjectDetection_Tensorrt [WIP]"
        }
    ],
-    "https://github.com/scottmudge/ComfyUI_BiscuitNodes": [
-        [
-            "LoadImagePrompted"
-        ],
-        {
-            "title_aux": "ComfyUI_BiscuitNodes"
-        }
-    ],
    "https://github.com/sdfxai/SDFXBridgeForComfyUI": [
        [
            "SDFXClipTextEncode"
@@ -5066,6 +5351,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"
@@ -5331,6 +5625,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
@@ -11,6 +11,66 @@
        


+        {
+            "author": "Rvage0815",
+            "title": "ComfyUI-RvTools [REMOVED]",
+            "reference": "https://github.com/Rvage0815/ComfyUI-RvTools",
+            "files": [
+                "https://github.com/Rvage0815/ComfyUI-RvTools"
+            ],
+            "install_type": "git-clone",
+            "description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
+        },
+        {
+            "author": "Rvage0815",
+            "title": "RvTComfyUI-RvTools_v2 [REMOVED]",
+            "reference": "https://github.com/Rvage0815/ComfyUI-RvTools_v2",
+            "files": [
+                "https://github.com/Rvage0815/ComfyUI-RvTools_v2"
+            ],
+            "install_type": "git-clone",
+            "description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
+        },
+        {
+            "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]",
@@ -85,7 +145,7 @@
        },
        {
            "author": "myAiLemon",
-            "title": "MagicGetPromptAutomatically",
+            "title": "MagicGetPromptAutomatically [REMOVED]",
            "reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
            "files": [
                "https://github.com/myAiLemon/MagicGetPromptAutomatically"
--- 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/prestartup_script.py
+++ b/prestartup_script.py
@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 import sys
 import atexit
@@ -34,6 +35,8 @@ else:

 security_check.security_check()

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

@@ -504,7 +507,7 @@ check_bypass_ssl()
 # 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())
+pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path)


 def is_installed(name):
@@ -693,13 +696,44 @@ def execute_migration(moves):
            shutil.move(x[0], x[1])
            print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")

+
 script_executed = False

-# Check if script_list_path exists
-if os.path.exists(script_list_path):
+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:
@@ -723,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]
@@ -731,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:
@@ -739,12 +776,12 @@ 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):
@@ -754,6 +791,12 @@ if os.path.exists(script_list_path):
    print("\n[ComfyUI-Manager] Startup script completed.")
    print("#######################################################################\n")

+
+# Check if script_list_path exists
+if os.path.exists(script_list_path):
+    execute_startup_script()
+
+
 pip_fixer.fix_broken()

 del processed_install
--- 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.25.1"
+version = "3.28"
 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"
Author	SHA1	Message	Date
Dr.Lt.Data	3de17b2fa6	improve: pip fixer - support missing comfyui_frontend_package fixing	2025-03-05 12:55:39 +09:00
Dr.Lt.Data	22ecb5de95	update db	2025-03-05 08:15:03 +09:00
Dr.Lt.Data	992b8b3cb5	update DB	2025-03-04 22:24:05 +09:00
Dr.Lt.Data	bebc16d5a6	fixed: invalid log message	2025-03-04 22:07:15 +09:00
Dr.Lt.Data	ddb719f866	update DB	2025-03-04 22:05:03 +09:00
Dr.Lt.Data	0bd1bf2605	fixed: cm-cli - crash when comfyui doesn't have `.git` dir. (support for desktop version)	2025-03-04 21:35:24 +09:00
Dr.Lt.Data	fd32ba4035	update DB	2025-03-04 12:50:27 +09:00
Dr.Lt.Data	22f723b920	modified: show more detailed info if updating failed	2025-03-04 12:37:39 +09:00
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