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

README.md

@@ -5,6 +5,7 @@
 ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
 ## NOTICE
+* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
 * V3.10: `double-click feature` is removed
   * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
 * V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
@@ -148,6 +149,7 @@ In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generat
 * Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
 * Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
 * Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
+* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
 * Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
 * Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
 * Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
@@ -246,6 +248,32 @@ The following settings are applied based on the section marked as `is_default`.
 ![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
 
 
+# Config
+* You can modify the `config.ini` file to apply the settings for ComfyUI-Manager.
+    * The path to the `config.ini` used by ComfyUI-Manager is displayed in the startup log messages.
+    * See also: [https://github.com/ltdrdata/ComfyUI-Manager#paths]
+* Configuration options:
+    ```
+    [default]
+    git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
+    use_uv = <Use uv instead of pip for dependency installation.>
+    default_cache_as_channel_url = <Determines whether to retrieve the DB designated as channel_url at startup>
+    bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
+    file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
+    windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
+    model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
+    downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
+    security_level = <Set the security level => strong|normal|normal-|weak>
+    always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
+    network_mode = <Set the network mode => public|private|offline>
+    ```
+
+    * network_mode:
+      - public: An environment that uses a typical public network.
+      - private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
+      - offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)
+
+
 ## Additional Feature
 * Logging to file feature
   * This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.
@@ -274,7 +302,10 @@ The following settings are applied based on the section marked as `is_default`.
 * Custom pip mapping
   * When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
     * Please refer to the `pip_overrides.json.template` file.
-    
+
+* Prevent the installation of specific pip packages
+  * List the package names one per line in the `pip_blacklist.list` file.
+
 * Use `aria2` as downloader
   * [howto](docs/en/use_aria2.md)
 
@@ -282,6 +313,29 @@ The following settings are applied based on the section marked as `is_default`.
   * This option can be used if performance issues occur in a Colab+GDrive environment.
 
 
+## Environment Variables
+
+The following features can be configured using environment variables:
+
+* **COMFYUI_PATH**: The installation path of ComfyUI
+* **GITHUB_ENDPOINT**: Reverse proxy configuration for environments with limited access to GitHub
+* **HF_ENDPOINT**: Reverse proxy configuration for environments with limited access to Hugging Face
+
+
+### Example 1:
+Redirecting `https://github.com/ltdrdata/ComfyUI-Impact-Pack` to `https://mirror.ghproxy.com/https://github.com/ltdrdata/ComfyUI-Impact-Pack`
+
+```
+GITHUB_ENDPOINT=https://mirror.ghproxy.com/https://github.com
+```
+
+#### Example 2:
+Changing `https://huggingface.co/path/to/somewhere` to `https://some-hf-mirror.com/path/to/somewhere`
+
+```
+HF_ENDPOINT=https://some-hf-mirror.com 
+```
+
 ## Scanner
 When you run the `scan.sh` script:
 

cm-cli.py

@@ -32,6 +32,7 @@ if comfy_path is None:
         print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
         comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
+# This should be placed here
 sys.path.append(comfy_path)
 
 import utils.extra_config
@@ -42,7 +43,7 @@ import cnr_utils
 
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 
-cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
+cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 cm_global.pip_overrides = {'numpy': 'numpy<2'}
 
@@ -51,6 +52,14 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides
         cm_global.pip_overrides = json.load(json_file)
 
 
+if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list")):
+    with open(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list"), 'r', encoding="UTF-8", errors="ignore") as f:
+        for x in f.readlines():
+            y = x.strip()
+            if y != '':
+                cm_global.pip_blacklist.add(y)
+
+
 def check_comfyui_hash():
     repo = git.Repo(comfy_path)
     core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
@@ -67,7 +76,7 @@ core.check_invalid_nodes()
 def read_downgrade_blacklist():
     try:
         import configparser
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
         config.read(core.manager_config.path)
         default_conf = config['default']
 
@@ -136,6 +145,13 @@ class Ctx:
                 cm_global.pip_overrides = json.load(json_file)
                 cm_global.pip_overrides = {'numpy': 'numpy<2'}
 
+        if os.path.exists(core.manager_pip_blacklist_path):
+            with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+                for x in f.readlines():
+                    y = x.strip()
+                    if y != '':
+                        cm_global.pip_blacklist.add(y)
+
     @staticmethod
     def get_startup_scripts_path():
         return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
@@ -1012,17 +1028,32 @@ def save_snapshot(
         user_directory: str = typer.Option(
             None,
             help="user directory"
-        )
+        ),
+        full_snapshot: Annotated[
+            bool,
+            typer.Option(
+                show_default=False, help="If the snapshot should include custom node, ComfyUI version and pip versions (default), or only custom node details"
+            ),
+        ] = True,
 ):
     cmd_ctx.set_user_directory(user_directory)
 
-    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output))
+    if(not output.endswith('.json') and not output.endswith('.yaml')):
+        print("ERROR: output path should be either '.json' or '.yaml' file.")
+        raise typer.Exit(code=1)
+    
+    dir_path = os.path.dirname(output)
+    if(dir_path != '' and not os.path.exists(dir_path)):
+        print(f"ERROR: {output} path not exists.")
+        raise typer.Exit(code=1)
+        
+    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
     print(f"Current snapshot is saved as `{path}`")
 
 
 @app.command("restore-snapshot", help="Restore snapshot from snapshot file")
 def restore_snapshot(
-        snapshot_name: str,
+        snapshot_name: str, 
         pip_non_url: Optional[bool] = typer.Option(
             default=None,
             show_default=False,

git_helper.py

@@ -154,14 +154,27 @@ def switch_to_default_branch(repo):
         repo.git.checkout(default_branch)
         return True
     except:
+        # try checkout master
+        # try checkout main if failed
         try:
             repo.git.checkout(repo.heads.master)
+            return True
         except:
             try:
                 if remote_name is not None:
                     repo.git.checkout('-b', 'master', f'{remote_name}/master')
+                    return True
             except:
-                pass
+                try:
+                    repo.git.checkout(repo.heads.main)
+                    return True
+                except:
+                    try:
+                        if remote_name is not None:
+                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
+                            return True
+                    except:
+                        pass
 
     print("[ComfyUI Manager] Failed to switch to the default branch")
     return False
@@ -389,12 +402,13 @@ def apply_snapshot(path):
                 git_custom_node_infos = info['git_custom_nodes']
                 file_custom_node_infos = info['file_custom_nodes']
 
-                checkout_comfyui_hash(comfyui_hash)
+                if comfyui_hash:
+                    checkout_comfyui_hash(comfyui_hash)
                 checkout_custom_node_hash(git_custom_node_infos)
                 invalidate_custom_node_file(file_custom_node_infos)
 
                 print("APPLY SNAPSHOT: True")
-                if 'pips' in info:
+                if 'pips' in info and info['pips']:
                     return info['pips']
                 else:
                     return None

glob/cnr_utils.py

@@ -173,7 +173,10 @@ def read_cnr_info(fullpath):
 
             project = data.get('project', {})
             name = project.get('name').strip().lower()
-            version = project.get('version')
+
+            # normalize version
+            # for example: 2.5 -> 2.5.0
+            version = str(manager_util.StrictVersion(project.get('version')))
 
             urls = project.get('urls', {})
             repository = urls.get('Repository')

glob/git_utils.py

@@ -2,6 +2,9 @@ import os
 import configparser
 
 
+GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
+
+
 def is_git_repo(path: str) -> bool:
     """ Check if the path is a git repository. """
     # NOTE: Checking it through `git.Repo` must be avoided.
@@ -37,7 +40,8 @@ def git_url(fullpath):
     if not os.path.exists(git_config_path):
         return None
 
-    config = configparser.ConfigParser()
+    # Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
+    config = configparser.ConfigParser(strict=False)
     config.read(git_config_path)
 
     for k, v in config.items():
@@ -46,16 +50,36 @@ def git_url(fullpath):
 
     return None
 
+
 def normalize_url(url) -> str:
-    url = url.replace("git@github.com:", "https://github.com/")
-    if url.endswith('.git'):
-        url = url[:-4]
+    github_id = normalize_to_github_id(url)
+    if github_id is not None:
+        url = f"https://github.com/{github_id}"
 
     return url
 
-def normalize_url_http(url) -> str:
-    url = url.replace("https://github.com/", "git@github.com:")
-    if url.endswith('.git'):
-        url = url[:-4]
 
-    return url
+def normalize_to_github_id(url) -> str:
+    if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
+        author = os.path.basename(os.path.dirname(url))
+
+        if author.startswith('git@github.com:'):
+            author = author.split(':')[1]
+
+        repo_name = os.path.basename(url)
+        if repo_name.endswith('.git'):
+            repo_name = repo_name[:-4]
+
+        return f"{author}/{repo_name}"
+
+    return None
+
+
+def get_url_for_clone(url):
+    url = normalize_url(url)
+
+    if GITHUB_ENDPOINT is not None and url.startswith('https://github.com/'):
+        url = GITHUB_ENDPOINT + url[18:] # url[18:] -> remove `https://github.com`
+
+    return url
+    

glob/manager_core.py

@@ -4,6 +4,7 @@ description:
 """
 
 import json
+import logging
 import os
 import sys
 import subprocess
@@ -41,7 +42,7 @@ import manager_downloader
 from node_package import InstalledNodePackage
 
 
-version_code = [3, 14]
+version_code = [3, 26]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 
@@ -173,9 +174,10 @@ git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py
 manager_files_path = None
 manager_config_path = None
 manager_channel_list_path = None
-manager_startup_script_path = None
+manager_startup_script_path:str = None
 manager_snapshot_path = None
 manager_pip_overrides_path = None
+manager_pip_blacklist_path = None
 manager_components_path = None
 
 def update_user_directory(user_dir):
@@ -185,6 +187,7 @@ def update_user_directory(user_dir):
     global manager_startup_script_path
     global manager_snapshot_path
     global manager_pip_overrides_path
+    global manager_pip_blacklist_path
     global manager_components_path
 
     manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
@@ -202,6 +205,7 @@ def update_user_directory(user_dir):
     manager_config_path = os.path.join(manager_files_path, 'config.ini')
     manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
     manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
     manager_components_path = os.path.join(manager_files_path, "components")
     manager_util.cache_dir = os.path.join(manager_files_path, "cache")
 
@@ -324,6 +328,8 @@ def normalize_channel(channel):
         return None
     elif channel.startswith('https://'):
         return channel
+    elif channel.startswith('http://') and get_config()['http_channel_enabled'] == True:
+        return channel
 
     tmp_dict = get_channel_dict()
     channel_url = tmp_dict.get(channel)
@@ -342,6 +348,7 @@ class ManagedResult:
         self.msg = None
         self.target = None
         self.postinstall = lambda: True
+        self.ver = None
 
     def append(self, item):
         self.items.append(item)
@@ -363,6 +370,10 @@ class ManagedResult:
         self.postinstall = postinstall
         return self
 
+    def with_ver(self, ver):
+        self.ver = ver
+        return self
+
 
 class UnifiedManager:
     def __init__(self):
@@ -494,6 +505,8 @@ class UnifiedManager:
     def resolve_from_path(self, fullpath):
         url = git_utils.git_url(fullpath)
         if url:
+            url = git_utils.normalize_url(url)
+
             cnr = self.get_cnr_by_repo(url)
             commit_hash = git_utils.get_commit_hash(fullpath)
             if cnr:
@@ -510,7 +523,10 @@ class UnifiedManager:
             if info:
                 cnr = self.cnr_map.get(info['id'])
                 if cnr:
-                    return {'id': cnr['id'], 'cnr': cnr, 'ver': info['version']}
+                    # normalize version
+                    # for example: 2.5 -> 2.5.0
+                    ver = str(manager_util.StrictVersion(info['version']))
+                    return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                 else:
                     return None
             else:
@@ -522,6 +538,8 @@ class UnifiedManager:
 
         if node_package.is_disabled and node_package.is_unknown:
             url = git_utils.git_url(node_package.fullpath)
+            if url is not None:
+                url = git_utils.normalize_url(url)
             self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)
 
         if node_package.is_disabled and node_package.is_nightly:
@@ -532,6 +550,8 @@ class UnifiedManager:
 
         if node_package.is_enabled and node_package.is_unknown:
             url = git_utils.git_url(node_package.fullpath)
+            if url is not None:
+                url = git_utils.normalize_url(url)
             self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)
 
         if node_package.is_from_cnr and node_package.is_disabled:
@@ -692,6 +712,9 @@ class UnifiedManager:
         self.unknown_active_nodes = {}    # node_id -> repo url * fullpath
         self.active_nodes = {}            # node_id -> node_version * fullpath
 
+        if get_config()['network_mode'] != 'public':
+            dont_wait = True
+
         # reload 'cnr_map' and 'repo_cnr_map'
         cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
 
@@ -730,14 +753,17 @@ class UnifiedManager:
 
         json_obj = await get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url)
         for x in json_obj['custom_nodes']:
-            for y in x['files']:
-                if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
-                    repo_name = y.split('/')[-1]
-                    res[repo_name] = (x, False)
+            try:
+                for y in x['files']:
+                    if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
+                        repo_name = y.split('/')[-1]
+                        res[repo_name] = (x, False)
 
-            if 'id' in x:
-                if x['id'] not in res:
-                    res[x['id']] = (x, True)
+                if 'id' in x:
+                    if x['id'] not in res:
+                        res[x['id']] = (x, True)
+            except:
+                logging.error(f"[ComfyUI-Manager] broken item:{x}")
 
         return res
 
@@ -777,6 +803,7 @@ class UnifiedManager:
                     node_id = v['id']
                 else:
                     node_id = v['files'][0].split('/')[-1]
+                    v['repository'] = v['files'][0]
                 res[node_id] = v
             elif len(v['files']) > 1:
                 res[v['files'][0]] = v  # A custom node composed of multiple url is treated as a single repository with one representative path
@@ -803,14 +830,14 @@ class UnifiedManager:
                 print("Install: pip packages")
                 pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
                 res = True
-                with open(requirements_path, "r") as requirements_file:
-                    for line in requirements_file:
-                        package_name = remap_pip_package(line.strip())
-                        if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
-                            self.processed_install.add(package_name)
-                            install_cmd = [sys.executable, "-m", "pip", "install", package_name]
-                            if package_name.strip() != "" and not package_name.startswith('#'):
-                                res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
+                lines = manager_util.robust_readlines(requirements_path)
+                for line in lines:
+                    package_name = remap_pip_package(line.strip())
+                    if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
+                        self.processed_install.add(package_name)
+                        install_cmd = manager_util.make_pip_cmd(["install", package_name])
+                        if package_name.strip() != "" and not package_name.startswith('#'):
+                            res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
                 pip_fixer.fix_broken()
                 return res
@@ -1036,8 +1063,8 @@ class UnifiedManager:
 
         # update cache
         if version_spec == 'unknown':
+            self.unknown_active_nodes[node_id] = self.unknown_inactive_nodes[node_id][0], to_path
             del self.unknown_inactive_nodes[node_id]
-            self.unknown_active_nodes[node_id] = to_path
             return result.with_target(to_path)
         elif version_spec == 'nightly':
             del self.nightly_inactive_nodes[node_id]
@@ -1218,15 +1245,16 @@ class UnifiedManager:
         if url.endswith("/"):
             url = url[:-1]
         try:
-            print(f"Download: git clone '{url}'")
-
             # Clone the repository from the remote URL
+            clone_url = git_utils.get_url_for_clone(url)
+            print(f"Download: git clone '{clone_url}'")
+
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                 if res != 0:
-                    return result.fail(f"Failed to clone repo: {url}")
+                    return result.fail(f"Failed to clone repo: {clone_url}")
             else:
-                repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
+                repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
                 repo.git.clear_cache()
                 repo.close()
 
@@ -1240,7 +1268,8 @@ class UnifiedManager:
                     return result.fail(f"Failed to execute install script: {url}")
 
         except Exception as e:
-            return result.fail(f"Install(git-clone) error: {url} / {e}")
+            traceback.print_exc()
+            return result.fail(f"Install(git-clone) error[2]: {url} / {e}")
 
         print("Installation was successful.")
         return result
@@ -1321,14 +1350,14 @@ class UnifiedManager:
             version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')
 
         if version_spec is None:
-            return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}')
+            return ManagedResult('update').fail(f'Update not available: {node_id}@{version_spec}').with_ver(version_spec)
 
         if version_spec == 'nightly':
-            return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly')
+            return self.repo_update(self.active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('nightly').with_ver('nightly')
         elif version_spec == 'unknown':
-            return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown')
+            return self.repo_update(self.unknown_active_nodes[node_id][1], instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_target('unknown').with_ver('unknown')
         else:
-            return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
+            return self.cnr_switch_version(node_id, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall).with_ver('cnr')
 
     async def install_by_id(self, node_id, version_spec=None, channel=None, mode=None, instant_execution=False, no_deps=False, return_postinstall=False):
         """
@@ -1376,7 +1405,7 @@ class UnifiedManager:
             res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
             if res.result:
                 if version_spec == 'unknown':
-                    self.unknown_active_nodes[node_id] = to_path
+                    self.unknown_active_nodes[node_id] = repo_url, to_path
                 elif version_spec == 'nightly':
                     cnr_utils.generate_cnr_id(to_path, node_id)
                     self.active_nodes[node_id] = 'nightly', to_path
@@ -1443,7 +1472,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:
@@ -1451,10 +1480,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():
@@ -1472,7 +1509,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):
@@ -1485,7 +1522,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
 
@@ -1541,21 +1578,25 @@ manager_funcs = ManagerFuncs()
 
 
 def write_config():
-    config = configparser.ConfigParser()
+    config = configparser.ConfigParser(strict=False)
+
     config['default'] = {
         'preview_method': manager_funcs.get_current_preview_method(),
-        'git_exe':  get_config()['git_exe'],
+        'git_exe': get_config()['git_exe'],
+        'use_uv': get_config()['use_uv'],
         'channel_url': get_config()['channel_url'],
         'share_option': get_config()['share_option'],
         'bypass_ssl': get_config()['bypass_ssl'],
         "file_logging": get_config()['file_logging'],
-        'default_ui': get_config()['default_ui'],
         'component_policy': get_config()['component_policy'],
+        'update_policy': get_config()['update_policy'],
         'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
         'model_download_by_agent': get_config()['model_download_by_agent'],
         'downgrade_blacklist': get_config()['downgrade_blacklist'],
         'security_level': get_config()['security_level'],
         'skip_migration_check': get_config()['skip_migration_check'],
+        'always_lazy_install': get_config()['always_lazy_install'],
+        'network_mode': get_config()['network_mode']
     }
 
     directory = os.path.dirname(manager_config_path)
@@ -1568,50 +1609,56 @@ def write_config():
 
 def read_config():
     try:
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
         config.read(manager_config_path)
         default_conf = config['default']
+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
 
-        # policy migration: disable_unsecure_features -> security_level
-        if 'disable_unsecure_features' in default_conf:
-            if default_conf['disable_unsecure_features'].lower() == 'true':
-                security_level = 'strong'
-            else:
-                security_level = 'normal'
-        else:
-            security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
+        def get_bool(key, default_value):
+            return default_conf[key].lower() == 'true' if key in default_conf else False
 
         return {
-                    'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
-                    'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
-                    'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
-                    'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
-                    'bypass_ssl': default_conf['bypass_ssl'].lower() == 'true' if 'bypass_ssl' in default_conf else False,
-                    'file_logging': default_conf['file_logging'].lower() == 'true' if 'file_logging' in default_conf else True,
-                    'default_ui': default_conf['default_ui'] if 'default_ui' in default_conf else 'none',
-                    'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow',
-                    'windows_selector_event_loop_policy': default_conf['windows_selector_event_loop_policy'].lower() == 'true' if 'windows_selector_event_loop_policy' in default_conf else False,
-                    'model_download_by_agent': default_conf['model_download_by_agent'].lower() == 'true' if 'model_download_by_agent' in default_conf else False,
-                    'downgrade_blacklist': default_conf['downgrade_blacklist'] if 'downgrade_blacklist' in default_conf else '',
-                    'skip_migration_check': default_conf['skip_migration_check'].lower() == 'true' if 'skip_migration_check' in default_conf else False,
-                    'security_level': security_level
+                    'http_channel_enabled': get_bool('http_channel_enabled', False),
+                    'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
+                    'git_exe': default_conf.get('git_exe', ''),
+                    'use_uv': get_bool('use_uv', False),
+                    'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
+                    'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
+                    'share_option': default_conf.get('share_option', 'all').lower(),
+                    'bypass_ssl': get_bool('bypass_ssl', False),
+                    'file_logging': get_bool('file_logging', True),
+                    'component_policy': default_conf.get('component_policy', 'workflow').lower(),
+                    'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
+                    'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
+                    'model_download_by_agent': get_bool('model_download_by_agent', False),
+                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
+                    'skip_migration_check': get_bool('skip_migration_check', False),
+                    'always_lazy_install': get_bool('always_lazy_install', False),
+                    'network_mode': default_conf.get('network_mode', 'public').lower(),
+                    'security_level': default_conf.get('security_level', 'normal').lower(),
                }
 
     except Exception:
+        manager_util.use_uv = False
         return {
+            'http_channel_enabled': False,
             'preview_method': manager_funcs.get_current_preview_method(),
             'git_exe': '',
+            'use_uv': False,
             'channel_url': DEFAULT_CHANNEL,
+            'default_cache_as_channel_url': False,
             'share_option': 'all',
             'bypass_ssl': False,
             'file_logging': True,
-            'default_ui': 'none',
             'component_policy': 'workflow',
+            'update_policy': 'stable-comfyui',
             'windows_selector_event_loop_policy': False,
             'model_download_by_agent': False,
             'downgrade_blacklist': '',
             'skip_migration_check': False,
-            'security_level': 'normal',
+            'always_lazy_install': False,
+            'network_mode': 'public',   # public | private | offline
+            'security_level': 'normal', # strong | normal | normal- | weak
         }
 
 
@@ -1620,6 +1667,8 @@ def get_config():
 
     if cached_config is None:
         cached_config = read_config()
+        if cached_config['http_channel_enabled']:
+            print("[ComfyUI-Manager] Warning: http channel enabled, make sure server in secure env")
 
     return cached_config
 
@@ -1654,21 +1703,36 @@ def switch_to_default_branch(repo):
         repo.git.checkout(default_branch)
         return True
     except:
+        # try checkout master
+        # try checkout main if failed
         try:
             repo.git.checkout(repo.heads.master)
+            return True
         except:
             try:
                 if remote_name is not None:
                     repo.git.checkout('-b', 'master', f'{remote_name}/master')
+                    return True
             except:
-                pass
+                try:
+                    repo.git.checkout(repo.heads.main)
+                    return True
+                except:
+                    try:
+                        if remote_name is not None:
+                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
+                            return True
+                    except:
+                        pass
 
     print("[ComfyUI Manager] Failed to switch to the default branch")
     return False
 
 
 def try_install_script(url, repo_path, install_cmd, instant_execution=False):
-    if not instant_execution and ((len(install_cmd) > 0 and install_cmd[0].startswith('#')) or (platform.system() == "Windows" and comfy_ui_commit_datetime.date() >= comfy_ui_required_commit_datetime.date())):
+    if not instant_execution and (
+            (len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
+    ):
         if not os.path.exists(manager_startup_script_path):
             os.makedirs(manager_startup_script_path)
 
@@ -1683,13 +1747,17 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
             if is_blacklisted(install_cmd[4]):
                 print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'")
                 return True
+        elif len(install_cmd) == 6 and install_cmd[3:5] == ['pip', 'install']:  # uv mode
+            if is_blacklisted(install_cmd[5]):
+                print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[5]}'")
+                return True
 
         print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
         code = manager_funcs.run_script(install_cmd, cwd=repo_path)
 
         if platform.system() != "Windows":
             try:
-                if comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
+                if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and comfy_ui_commit_datetime.date() < comfy_ui_required_commit_datetime.date():
                     print("\n\n###################################################################")
                     print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
                     print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
@@ -1799,9 +1867,9 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
                     if package_name and not package_name.startswith('#'):
                         if '--index-url' in package_name:
                             s = package_name.split('--index-url')
-                            install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
+                            install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
                         else:
-                            install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                            install_cmd = manager_util.make_pip_cmd(["install", package_name])
 
                         if package_name.strip() != "" and not package_name.startswith('#'):
                             try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
@@ -2006,12 +2074,14 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
             print(f"CLONE into '{repo_path}'")
 
             # Clone the repository from the remote URL
+            clone_url = git_utils.get_url_for_clone(url)
+
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                 if res != 0:
-                    return result.fail(f"Failed to clone '{url}' into  '{repo_path}'")
+                    return result.fail(f"Failed to clone '{clone_url}' into  '{repo_path}'")
             else:
-                repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
+                repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
                 repo.git.clear_cache()
                 repo.close()
 
@@ -2021,8 +2091,8 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
 
     except Exception as e:
         traceback.print_exc()
-        print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
-        return result.fail(f"Install(git-clone) error: {url} / {e}")
+        print(f"Install(git-clone) error[1]: {url} / {e}", file=sys.stderr)
+        return result.fail(f"Install(git-clone)[1] error: {url} / {e}")
 
 
 def git_pull(path):
@@ -2061,9 +2131,10 @@ async def get_data_by_mode(mode, filename, channel_url=None):
         channel_url = get_channel_dict()[channel_url]
 
     try:
+        local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
+
         if mode == "local":
-            uri = os.path.join(manager_util.comfyui_manager_path, filename)
-            json_obj = await manager_util.get_data(uri)
+            json_obj = await manager_util.get_data(local_uri)
         else:
             if channel_url is None:
                 uri = get_config()['channel_url'] + '/' + filename
@@ -2073,19 +2144,25 @@ async def get_data_by_mode(mode, filename, channel_url=None):
             cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
             cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
-            if mode == "cache":
-                if manager_util.is_file_created_within_one_day(cache_uri):
+            if get_config()['network_mode'] == 'offline':
+                # offline network mode
+                if os.path.exists(cache_uri):
+                    json_obj = await manager_util.get_data(cache_uri)
+                else:
+                    local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
+                    if os.path.exists(local_uri):
+                        json_obj = await manager_util.get_data(local_uri)
+                    else:
+                        json_obj = {}  # fallback
+            else:
+                # public network mode
+                if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
                     json_obj = await manager_util.get_data(cache_uri)
                 else:
                     json_obj = await manager_util.get_data(uri)
                     with manager_util.cache_lock:
                         with open(cache_uri, "w", encoding='utf-8') as file:
                             json.dump(json_obj, file, indent=4, sort_keys=True)
-            else:
-                json_obj = await manager_util.get_data(uri)
-                with manager_util.cache_lock:
-                    with open(cache_uri, "w", encoding='utf-8') as file:
-                        json.dump(json_obj, file, indent=4, sort_keys=True)
     except Exception as e:
         print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
         uri = os.path.join(manager_util.comfyui_manager_path, filename)
@@ -2114,7 +2191,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
                 return False
 
         except Exception as e:
-            print(f"Install(git-clone) error: {url} / {e}", file=sys.stderr)
+            print(f"Fix(git-clone) error: {url} / {e}", file=sys.stderr)
             return False
 
     print(f"Attempt to fixing '{files}' is done.")
@@ -2122,7 +2199,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):
 
 
 def pip_install(packages):
-    install_cmd = ['#FORCE', sys.executable, "-m", "pip", "install", '-U'] + packages
+    install_cmd = ['#FORCE'] + manager_util.make_pip_cmd(["install", '-U']) + packages
     try_install_script('pip install via manager', '..', install_cmd)
 
 
@@ -2298,6 +2375,32 @@ def gitclone_update(files, instant_execution=False, skip_script=False, msg_prefi
     return True
 
 
+def update_to_stable_comfyui(repo_path):
+    try:
+        repo = git.Repo(repo_path)
+        repo.git.checkout(repo.heads.master)
+        versions, current_tag, _ = get_comfyui_versions(repo)
+        
+        if len(versions) == 0 or (len(versions) == 1 and versions[0] == 'nightly'):
+            logging.info("[ComfyUI-Manager] Unable to update to the stable ComfyUI version.")
+            return "fail", None
+            
+        if versions[0] == 'nightly':
+            latest_tag = versions[1]
+        else:
+            latest_tag = versions[0]
+
+        if current_tag == latest_tag:
+            return "skip", None
+        else:
+            logging.info(f"[ComfyUI-Manager] Updating ComfyUI: {current_tag} -> {latest_tag}")
+            repo.git.checkout(latest_tag)
+            return 'updated', latest_tag
+    except:
+        traceback.print_exc()
+        return "fail", None
+            
+
 def update_path(repo_path, instant_execution=False, no_deps=False):
     if not os.path.exists(os.path.join(repo_path, '.git')):
         return "fail"
@@ -2305,9 +2408,12 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
     # version check
     repo = git.Repo(repo_path)
 
+    is_switched = False
     if repo.head.is_detached:
         if not switch_to_default_branch(repo):
             return "fail"
+        else:
+            is_switched = True
 
     current_branch = repo.active_branch
     branch_name = current_branch.name
@@ -2346,6 +2452,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
         git_pull(repo_path)
         execute_install_script("ComfyUI", repo_path, instant_execution=instant_execution, no_deps=no_deps)
         return "updated"
+    elif is_switched:
+        return "updated"
     else:
         return "skipped"
 
@@ -2419,7 +2527,8 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr
 
 def get_installed_pip_packages():
     # extract pip package infos
-    pips = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'], text=True).split('\n')
+    cmd = manager_util.make_pip_cmd(['freeze'])
+    pips = subprocess.check_output(cmd, text=True).split('\n')
 
     res = {}
     for x in pips:
@@ -2435,7 +2544,7 @@ def get_installed_pip_packages():
     return res
 
 
-async def get_current_snapshot():
+async def get_current_snapshot(custom_nodes_only = False):
     await unified_manager.reload('cache')
     await unified_manager.get_custom_nodes('default', 'cache')
 
@@ -2446,8 +2555,10 @@ async def get_current_snapshot():
         print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
         return {}
 
-    repo = git.Repo(repo_path)
-    comfyui_commit_hash = repo.head.commit.hexsha
+    comfyui_commit_hash = None
+    if not custom_nodes_only:
+        repo = git.Repo(repo_path)
+        comfyui_commit_hash = repo.head.commit.hexsha
 
     git_custom_nodes = {}
     cnr_custom_nodes = {}
@@ -2513,7 +2624,7 @@ async def get_current_snapshot():
 
                 file_custom_nodes.append(item)
 
-    pip_packages = get_installed_pip_packages()
+    pip_packages = None if custom_nodes_only else get_installed_pip_packages()
 
     return {
         'comfyui': comfyui_commit_hash,
@@ -2524,7 +2635,7 @@ async def get_current_snapshot():
     }
 
 
-async def save_snapshot_with_postfix(postfix, path=None):
+async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = False):
     if path is None:
         now = datetime.now()
 
@@ -2536,7 +2647,7 @@ async def save_snapshot_with_postfix(postfix, path=None):
         file_name = path.replace('\\', '/').split('/')[-1]
         file_name = file_name.split('.')[-2]
 
-    snapshot = await get_current_snapshot()
+    snapshot = await get_current_snapshot(custom_nodes_only)
     if path.endswith('.json'):
         with open(path, "w") as json_file:
             json.dump(snapshot, json_file, indent=4)
@@ -2653,9 +2764,6 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
         if ext == 'https://github.com/comfyanonymous/ComfyUI':
             pass
         elif ext is not None:
-            if 'Fooocus' in ext:
-                print(f">> {node_name}")
-
             used_exts.add(ext)
         else:
             unknown_nodes.add(node_name)
@@ -2835,15 +2943,18 @@ async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
 
 def populate_github_stats(node_packs, json_obj_github):
     for k, v in node_packs.items():
-        url = v['reference']
-        if url in json_obj_github:
-            v['stars'] = json_obj_github[url]['stars']
-            v['last_update'] = json_obj_github[url]['last_update']
-            v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
-        else:
-            v['stars'] = -1
-            v['last_update'] = -1
-            v['trust'] = False
+        try:
+            url = v['reference']
+            if url in json_obj_github:
+                v['stars'] = json_obj_github[url]['stars']
+                v['last_update'] = json_obj_github[url]['last_update']
+                v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
+            else:
+                v['stars'] = -1
+                v['last_update'] = -1
+                v['trust'] = False
+        except:
+            logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
 
 
 def populate_favorites(node_packs, json_obj_extras):
@@ -2923,7 +3034,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
                         print("cm-cli: unexpected [0001]")
 
         # for nightly restore
-        git_info = info.get('git_custom_nodes')
+        _git_info = info.get('git_custom_nodes')
+        git_info = {}
+
+        # normalize github repo
+        for k, v in _git_info.items():
+            norm_k = git_utils.normalize_url(k)
+            git_info[norm_k] = v
+
         if git_info is not None:
             todo_disable = []
             todo_enable = []
@@ -2936,20 +3054,13 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
 
                 if v[0] == 'nightly' and cnr_repo_map.get(k):
                     repo_url = cnr_repo_map.get(k)
+                    normalized_url = git_utils.normalize_url(repo_url)
 
-                    normalized_url1 = git_utils.normalize_url(repo_url)
-                    normalized_url2 = git_utils.normalize_url_http(repo_url)
-
-                    if normalized_url1 not in git_info and normalized_url2 not in git_info:
+                    if normalized_url not in git_info:
                         todo_disable.append(k)
                     else:
-                        if normalized_url1 in git_info:
-                            commit_hash = git_info[normalized_url1]['hash']
-                            todo_checkout.append((v[1], commit_hash))
-
-                        if normalized_url2 in git_info:
-                            commit_hash = git_info[normalized_url2]['hash']
-                            todo_checkout.append((v[1], commit_hash))
+                        commit_hash = git_info[normalized_url]['hash']
+                        todo_checkout.append((v[1], commit_hash))
 
             for k, v in unified_manager.nightly_inactive_nodes.items():
                 if 'comfyui-manager' in k:
@@ -2957,18 +3068,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
 
                 if cnr_repo_map.get(k):
                     repo_url = cnr_repo_map.get(k)
-                    normalized_url1 = git_utils.normalize_url(repo_url)
-                    normalized_url2 = git_utils.normalize_url_http(repo_url)
+                    normalized_url = git_utils.normalize_url(repo_url)
 
-                    if normalized_url1 in git_info:
-                        commit_hash = git_info[normalized_url1]['hash']
+                    if normalized_url in git_info:
+                        commit_hash = git_info[normalized_url]['hash']
                         todo_enable.append((k, commit_hash))
-                        processed_urls.append(normalized_url1)
-
-                    if normalized_url2 in git_info:
-                        commit_hash = git_info[normalized_url2]['hash']
-                        todo_enable.append((k, commit_hash))
-                        processed_urls.append(normalized_url2)
+                        processed_urls.append(normalized_url)
 
             for x in todo_disable:
                 unified_manager.unified_disable(x, False)
@@ -3021,21 +3126,14 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
         if repo_url is None:
             continue
 
-        normalized_url1 = git_utils.normalize_url(repo_url)
-        normalized_url2 = git_utils.normalize_url_http(repo_url)
+        normalized_url = git_utils.normalize_url(repo_url)
 
-        if normalized_url1 not in git_info and normalized_url2 not in git_info:
+        if normalized_url not in git_info:
             todo_disable.append(k2)
         else:
-            if normalized_url1 in git_info:
-                commit_hash = git_info[normalized_url1]['hash']
-                todo_checkout.append((k2, commit_hash))
-                processed_urls.append(normalized_url1)
-
-            if normalized_url2 in git_info:
-                commit_hash = git_info[normalized_url2]['hash']
-                todo_checkout.append((k2, commit_hash))
-                processed_urls.append(normalized_url2)
+            commit_hash = git_info[normalized_url]['hash']
+            todo_checkout.append((k2, commit_hash))
+            processed_urls.append(normalized_url)
 
     for k2, v2 in unified_manager.unknown_inactive_nodes.items():
         repo_url = resolve_giturl_from_path(v2[1])
@@ -3043,18 +3141,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
         if repo_url is None:
             continue
 
-        normalized_url1 = git_utils.normalize_url(repo_url)
-        normalized_url2 = git_utils.normalize_url_http(repo_url)
+        normalized_url = git_utils.normalize_url(repo_url)
 
-        if normalized_url1 in git_info:
-            commit_hash = git_info[normalized_url1]['hash']
+        if normalized_url in git_info:
+            commit_hash = git_info[normalized_url]['hash']
             todo_enable.append((k2, commit_hash))
-            processed_urls.append(normalized_url1)
-
-        if normalized_url2 in git_info:
-            commit_hash = git_info[normalized_url2]['hash']
-            todo_enable.append((k2, commit_hash))
-            processed_urls.append(normalized_url2)
+            processed_urls.append(normalized_url)
 
     for x in todo_disable:
         unified_manager.unified_disable(x, True)
@@ -3140,17 +3232,26 @@ async def check_need_to_migrate():
         need_to_migrate = True
 
 
-def get_comfyui_versions():
-    repo = git.Repo(comfy_path)
-    versions = [x.name for x in repo.tags if x.name.startswith('v')]
-    versions.reverse()  # nearest tag
+def get_comfyui_versions(repo=None):
+    if repo is None:
+        repo = git.Repo(comfy_path)
 
+    try:
+        remote = get_remote_name(repo)   
+        repo.remotes[remote].fetch()    
+    except:
+        logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
+
+    versions = [x.name for x in repo.tags if x.name.startswith('v')]
+
+    # nearest tag
+    versions = sorted(versions, key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
     versions = versions[:4]
 
     current_tag = repo.git.describe('--tags')
 
     if current_tag not in versions:
-        versions = sorted(versions + [current_tag], reverse=True)
+        versions = sorted(versions + [current_tag], key=lambda v: repo.git.log('-1', '--format=%ct', v), reverse=True)
         versions = versions[:4]
 
     main_branch = repo.heads.master
@@ -3163,16 +3264,18 @@ def get_comfyui_versions():
         versions[0] = 'nightly'
         current_tag = 'nightly'
 
-    return versions, current_tag
+    return versions, current_tag, latest_tag
 
 
 def switch_comfyui(tag):
     repo = git.Repo(comfy_path)
 
     if tag == 'nightly':
-        repo.git.checkout('main')
-        repo.remotes.origin.pull()
-        print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'main' version")
+        repo.git.checkout('master')
+        tracking_branch = repo.active_branch.tracking_branch()
+        remote_name = tracking_branch.remote_name
+        repo.remotes[remote_name].pull()
+        print("[ComfyUI-Manager] ComfyUI version is switched to the latest 'master' version")
     else:
         repo.git.checkout(tag)
         print(f"[ComfyUI-Manager] ComfyUI version is switched to '{tag}'")
@@ -3187,7 +3290,7 @@ def resolve_giturl_from_path(fullpath):
     if not os.path.exists(git_config_path):
         return "unknown"
 
-    config = configparser.ConfigParser()
+    config = configparser.ConfigParser(strict=False)
     config.read(git_config_path)
 
     for k, v in config.items():

glob/manager_downloader.py

@@ -3,9 +3,15 @@ from urllib.parse import urlparse
 import urllib
 import sys
 import logging
+import requests
+from huggingface_hub import HfApi
+from tqdm.auto import tqdm
+
+
 aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
 HF_ENDPOINT = os.getenv('HF_ENDPOINT')
 
+
 if aria2 is not None:
     secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
     url = urlparse(aria2)
@@ -117,3 +123,37 @@ def download_url_with_agent(url, save_path):
 
     print("Installation was successful.")
     return True
+
+# NOTE: snapshot_download doesn't provide file size tqdm.
+def download_repo_in_bytes(repo_id, local_dir):
+    api = HfApi()
+    repo_info = api.repo_info(repo_id=repo_id, files_metadata=True)
+
+    os.makedirs(local_dir, exist_ok=True)
+
+    total_size = 0
+    for file_info in repo_info.siblings:
+        if file_info.size is not None:
+            total_size += file_info.size
+
+    pbar = tqdm(total=total_size, unit="B", unit_scale=True, desc="Downloading")
+
+    for file_info in repo_info.siblings:
+        out_path = os.path.join(local_dir, file_info.rfilename)
+        os.makedirs(os.path.dirname(out_path), exist_ok=True)
+
+        if file_info.size is None:
+            continue
+
+        download_url = f"https://huggingface.co/{repo_id}/resolve/main/{file_info.rfilename}"
+
+        with requests.get(download_url, stream=True) as r, open(out_path, "wb") as f:
+            r.raise_for_status()
+            for chunk in r.iter_content(chunk_size=65536):
+                if chunk:
+                    f.write(chunk)
+                    pbar.update(len(chunk))
+
+    pbar.close()
+
+

glob/manager_server.py

@@ -21,8 +21,11 @@ import logging
 import asyncio
 import queue
 
+import manager_downloader
+
 
 logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
+logging.info("[ComfyUI-Manager] network_mode: " + core.get_config()['network_mode'])
 
 comfy_ui_hash = "-"
 comfyui_tag = None
@@ -30,6 +33,7 @@ comfyui_tag = None
 SECURITY_MESSAGE_MIDDLE_OR_BELOW = "ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
 SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
 SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
 
 routes = PromptServer.instance.routes
 
@@ -51,8 +55,14 @@ def handle_stream(stream, prefix):
 from comfy.cli_args import args
 import latent_preview
 
+def is_loopback(address):
+    import ipaddress
+    try:
+        return ipaddress.ip_address(address).is_loopback
+    except ValueError:
+        return False
 
-is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
+is_local_mode = is_loopback(args.listen)
 
 
 model_dir_name_map = {
@@ -81,11 +91,11 @@ def is_allowed_security_level(level):
         return False
     elif level == 'high':
         if is_local_mode:
-            return core.get_config()['security_level'].lower() in ['weak', 'normal-']
+            return core.get_config()['security_level'] in ['weak', 'normal-']
         else:
-            return core.get_config()['security_level'].lower() == 'weak'
+            return core.get_config()['security_level'] == 'weak'
     elif level == 'middle':
-        return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
+        return core.get_config()['security_level'] in ['weak', 'normal', 'normal-']
     else:
         return True
 
@@ -96,7 +106,7 @@ async def get_risky_level(files, pip_packages):
 
     all_urls = set()
     for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
-        all_urls.update(x['files'])
+        all_urls.update(x.get('files', []))
 
     for x in files:
         if x not in all_urls:
@@ -104,8 +114,7 @@ async def get_risky_level(files, pip_packages):
 
     all_pip_packages = set()
     for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
-        if "pip" in x:
-            all_pip_packages.update(x['pip'])
+        all_pip_packages.update(x.get('pip', []))
 
     for p in pip_packages:
         if p not in all_pip_packages:
@@ -169,19 +178,17 @@ def set_preview_method(method):
     else:
         args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
 
-    core.get_config()['preview_method'] = args.preview_method
+    core.get_config()['preview_method'] = method
 
 
 set_preview_method(core.get_config()['preview_method'])
 
 
-def set_default_ui_mode(mode):
-    core.get_config()['default_ui'] = mode
-
-
 def set_component_policy(mode):
     core.get_config()['component_policy'] = mode
 
+def set_update_policy(mode):
+    core.get_config()['update_policy'] = mode
 
 def print_comfyui_version():
     global comfy_ui_hash
@@ -204,7 +211,7 @@ def print_comfyui_version():
         comfyui_tag = core.get_comfyui_tag()
 
         try:
-            if core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
+            if not os.environ.get('__COMFYUI_DESKTOP_VERSION__') and core.comfy_ui_commit_datetime.date() < core.comfy_ui_required_commit_datetime.date():
                 logging.warning(f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n")
         except:
             pass
@@ -310,7 +317,10 @@ def get_model_path(data, show_log=False):
     if base_model is None:
         return None
     else:
-        return os.path.join(base_model, data['filename'])
+        if data['filename'] == '<huggingface>':
+            return os.path.join(base_model, os.path.basename(data['url']))
+        else:
+            return os.path.join(base_model, data['filename'])
 
 
 def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False):
@@ -408,22 +418,69 @@ async def task_worker():
             traceback.print_exc()
             return f"Installation failed:\n{node_spec_str}"
 
-    async def do_update(item) -> str:
+    async def do_update(item):
         ui_id, node_name, node_ver = item
 
         try:
             res = core.unified_manager.unified_update(node_name, node_ver)
 
+            if res.ver == 'unknown':
+                url = core.unified_manager.unknown_active_nodes[node_name][0]
+                title = os.path.basename(url)
+            else:
+                url = core.unified_manager.cnr_map[node_name].get('repository')
+                title = core.unified_manager.cnr_map[node_name]['name']
+
             manager_util.clear_pip_cache()
 
-            if res.result:
-                return 'success'
+            if url is not None:
+                base_res = {'url': url, 'title': title}
+            else:
+                base_res = {'title': title}
 
+            if res.result:
+                if res.action == 'skip':
+                    base_res['msg'] = 'skip'
+                    return base_res
+                else:
+                    base_res['msg'] = 'success'
+                    return base_res
+
+            base_res['msg'] = f"An error occurred while updating '{node_name}'."
             logging.error(f"\nERROR: An error occurred while updating '{node_name}'.")
+            return base_res
         except Exception:
             traceback.print_exc()
 
-        return f"An error occurred while updating '{node_name}'."
+        return {'msg':f"An error occurred while updating '{node_name}'."}
+
+    async def do_update_comfyui(is_stable) -> str:
+        try:
+            repo_path = os.path.dirname(folder_paths.__file__)
+            latest_tag = None
+            if is_stable:
+                res, latest_tag = core.update_to_stable_comfyui(repo_path)
+            else:
+                res = core.update_path(repo_path)
+                
+            if res == "fail":
+                logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
+                return "The installed ComfyUI does not have a Git repository."
+            elif res == "updated":
+                if is_stable:
+                    logging.info("ComfyUI is updated to latest stable version.")
+                    return "success-stable-"+latest_tag
+                else:
+                    logging.info("ComfyUI is updated to latest nightly version.")
+                    return "success-nightly"
+            else:  # skipped
+                logging.info("ComfyUI is up-to-date.")
+                return "skip"
+
+        except Exception:
+            traceback.print_exc()
+
+        return "An error occurred while updating 'comfyui'."
 
     async def do_fix(item) -> str:
         ui_id, node_name, node_ver = item
@@ -482,7 +539,18 @@ async def task_worker():
         try:
             if model_path is not None:
                 logging.info(f"Install model '{json_data['name']}' from '{model_url}' into '{model_path}'")
-                if not core.get_config()['model_download_by_agent'] and (
+
+                if json_data['filename'] == '<huggingface>':
+                    if os.path.exists(os.path.join(model_path, os.path.dirname(json_data['url']))):
+                        logging.error(f"[ComfyUI-Manager] the model path already exists: {model_path}")
+                        return f"The model path already exists: {model_path}"
+
+                    logging.info(f"[ComfyUI-Manager] Downloading '{model_url}' into '{model_path}'")
+                    manager_downloader.download_repo_in_bytes(repo_id=model_url, local_dir=model_path)
+
+                    return 'success'
+
+                elif not core.get_config()['model_download_by_agent'] and (
                         model_url.startswith('https://github.com') or model_url.startswith('https://huggingface.co') or model_url.startswith('https://heibox.uni-heidelberg.de')):
                     model_dir = get_model_dir(json_data, True)
                     download_url(model_url, model_dir, filename=json_data['filename'])
@@ -498,13 +566,13 @@ async def task_worker():
                     if res and model_path.endswith('.zip'):
                         res = core.unzip(model_path)
             else:
-                logging.error(f"Model installation error: invalid model type - {json_data['type']}")
+                logging.error(f"[ComfyUI-Manager] Model installation error: invalid model type - {json_data['type']}")
 
             if res:
                 return 'success'
 
         except Exception as e:
-            logging.error(f"[ERROR] {e}", file=sys.stderr)
+            logging.error(f"[ComfyUI-Manager] ERROR: {e}", file=sys.stderr)
 
         return f"Model installation error: {model_url}"
 
@@ -537,6 +605,10 @@ async def task_worker():
                 msg = await do_install_model(item)
             elif kind == 'update':
                 msg = await do_update(item)
+            elif kind == 'update-main':
+                msg = await do_update(item)
+            elif kind == 'update-comfyui':
+                msg = await do_update_comfyui(item[1])
             elif kind == 'fix':
                 msg = await do_fix(item)
             elif kind == 'uninstall':
@@ -556,6 +628,15 @@ async def task_worker():
             if kind == 'install-model':
                 model_result[ui_id] = msg
                 ui_target = "model_manager"
+            elif kind == 'update-main':
+                nodepack_result[ui_id] = msg
+                ui_target = "main"
+            elif kind == 'update-comfyui':
+                nodepack_result['comfyui'] = msg
+                ui_target = "main"
+            elif kind == 'update':
+                nodepack_result[ui_id] = msg['msg']
+                ui_target = "nodepack_manager"
             else:
                 nodepack_result[ui_id] = msg
                 ui_target = "nodepack_manager"
@@ -630,49 +711,46 @@ async def fetch_updates(request):
         return web.Response(status=400)
 
 
-@routes.get("/customnode/update_all")
+@routes.get("/manager/queue/update_all")
 async def update_all(request):
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
         return web.Response(status=403)
 
-    try:
-        await core.save_snapshot_with_postfix('autosave')
+    with task_worker_lock:
+        is_processing = task_worker_thread is not None and task_worker_thread.is_alive()
+        if is_processing:
+            return web.Response(status=401)
+        
+    await core.save_snapshot_with_postfix('autosave')
 
-        if request.rel_url.query["mode"] == "local":
-            channel = 'local'
-        else:
-            channel = core.get_config()['channel_url']
+    if request.rel_url.query["mode"] == "local":
+        channel = 'local'
+    else:
+        channel = core.get_config()['channel_url']
 
-        await core.unified_manager.reload(request.rel_url.query["mode"])
-        await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
+    await core.unified_manager.reload(request.rel_url.query["mode"])
+    await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
 
-        updated_cnr = []
-        for k, v in core.unified_manager.active_nodes.items():
-            if v[0] != 'nightly':
-                res = core.unified_manager.unified_update(k, v[0])
-                if res.action == 'switch-cnr' and res:
-                    updated_cnr.append(k)
+    for k, v in core.unified_manager.active_nodes.items():
+        if k == 'comfyui-manager':
+            # skip updating comfyui-manager if desktop version
+            if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
+                continue
 
-        res = core.unified_manager.fetch_or_pull_git_repo(is_pull=True)
+        update_item = k, k, v[0]
+        task_queue.put(("update-main", update_item))
 
-        res['updated'] += updated_cnr
+    for k, v in core.unified_manager.unknown_active_nodes.items():
+        if k == 'comfyui-manager':
+            # skip updating comfyui-manager if desktop version
+            if os.environ.get('__COMFYUI_DESKTOP_VERSION__'):
+                continue
 
-        for x in res['failed']:
-            logging.error(f"PULL FAILED: {x}")
+        update_item = k, k, 'unknown'
+        task_queue.put(("update-main", update_item))
 
-        if len(res['updated']) == 0 and len(res['failed']) == 0:
-            status = 200
-        else:
-            status = 201
-
-        logging.info("\nDone.")
-        return web.json_response(res, status=status, content_type='application/json')
-    except:
-        traceback.print_exc()
-        return web.Response(status=400)
-    finally:
-        manager_util.clear_pip_cache()
+    return web.Response(status=200)
 
 
 def convert_markdown_to_html(input_text):
@@ -791,15 +869,18 @@ async def fetch_customnode_alternatives(request):
 
 
 def check_model_installed(json_obj):
-    def is_exists(model_dir_name, file_name):
+    def is_exists(model_dir_name, filename, url):
+        if filename == '<huggingface>':
+            filename = os.path.basename(url)
+
         dirs = folder_paths.get_folder_paths(model_dir_name)
+
         for x in dirs:
-            if os.path.exists(os.path.join(x, file_name)):
+            if os.path.exists(os.path.join(x, filename)):
                 return True
 
         return False
 
-
     model_dir_names = ['checkpoints', 'loras', 'vae', 'text_encoders', 'diffusion_models', 'clip_vision', 'embeddings',
                        'diffusers', 'vae_approx', 'controlnet', 'gligen', 'upscale_models', 'hypernetworks',
                        'photomaker', 'classifiers']
@@ -819,23 +900,30 @@ def check_model_installed(json_obj):
         if item['save_path'] == 'default':
             model_dir_name = model_dir_name_map.get(item['type'].lower())
             if model_dir_name is not None:
-                item['installed'] = str(is_exists(model_dir_name, item['filename']))
+                item['installed'] = str(is_exists(model_dir_name, item['filename'], item['url']))
             else:
                 item['installed'] = 'False'
         else:
             model_dir_name = item['save_path'].split('/')[0]
             if model_dir_name in folder_paths.folder_names_and_paths:
-                if is_exists(model_dir_name, item['filename']):
+                if is_exists(model_dir_name, item['filename'], item['url']):
                     item['installed'] = 'True'
 
             if 'installed' not in item:
-                fullpath = os.path.join(folder_paths.models_dir, item['save_path'], item['filename'])
+                if item['filename'] == '<huggingface>':
+                    filename = os.path.basename(item['url'])
+                else:
+                    filename = item['filename']
+
+                fullpath = os.path.join(folder_paths.models_dir, item['save_path'], filename)
+
                 item['installed'] = 'True' if os.path.exists(fullpath) else 'False'
 
     with concurrent.futures.ThreadPoolExecutor(8) as executor:
         for item in json_obj['models']:
             executor.submit(process_model_phase, item)
 
+
 @routes.get("/externalmodel/getlist")
 async def fetch_externalmodel_list(request):
     json_obj = await core.get_data_by_mode(request.rel_url.query["mode"], 'model-list.json')
@@ -1258,32 +1346,17 @@ async def update_custom_node(request):
     return web.Response(status=200)
 
 
-@routes.get("/comfyui_manager/update_comfyui")
+@routes.get("/manager/queue/update_comfyui")
 async def update_comfyui(request):
-    logging.info("Update ComfyUI")
-
-    try:
-        repo_path = os.path.dirname(folder_paths.__file__)
-        res = core.update_path(repo_path)
-        if res == "fail":
-            logging.error("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
-            return web.Response(status=400)
-        elif res == "updated":
-            logging.info("ComfyUI is updated.")
-            return web.Response(status=201)
-        else:  # skipped
-            logging.info("ComfyUI is up-to-date.")
-            return web.Response(status=200)
-    except Exception as e:
-        logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
-
-    return web.Response(status=400)
+    is_stable = core.get_config()['update_policy'] != 'nightly-comfyui'
+    task_queue.put(("update-comfyui", ('comfyui', is_stable)))
+    return web.Response(status=200)
 
 
 @routes.get("/comfyui_manager/comfyui_versions")
 async def comfyui_versions(request):
     try:
-        res, current = core.get_comfyui_versions()
+        res, current, latest = core.get_comfyui_versions()
         return web.json_response({'versions': res, 'current': current}, status=200, content_type='application/json')
     except Exception as e:
         logging.error(f"ComfyUI update fail: {e}", file=sys.stderr)
@@ -1342,10 +1415,10 @@ async def install_model(request):
 
     if not is_allowed_security_level('middle'):
         logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
-        return web.Response(status=403)
+        return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
 
     if not json_data['filename'].endswith('.safetensors') and not is_allowed_security_level('high'):
-        models_json = await core.get_data_by_mode('cache', 'model-list.json')
+        models_json = await core.get_data_by_mode('cache', 'model-list.json', 'default')
 
         is_belongs_to_whitelist = False
         for x in models_json['models']:
@@ -1354,8 +1427,8 @@ async def install_model(request):
                 break
 
         if not is_belongs_to_whitelist:
-            logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
-            return web.Response(status=403)
+            logging.error(SECURITY_MESSAGE_NORMAL_MINUS_MODEL)
+            return web.Response(status=403, text="A security error has occurred. Please check the terminal logs")
 
     install_item = json_data.get('ui_id'), json_data
     task_queue.put(("install-model", install_item))
@@ -1374,18 +1447,7 @@ async def preview_method(request):
     return web.Response(status=200)
 
 
-@routes.get("/manager/default_ui")
-async def default_ui_mode(request):
-    if "value" in request.rel_url.query:
-        set_default_ui_mode(request.rel_url.query['value'])
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['default_ui'], status=200)
-
-    return web.Response(status=200)
-
-
-@routes.get("/manager/component/policy")
+@routes.get("/manager/policy/component")
 async def component_policy(request):
     if "value" in request.rel_url.query:
         set_component_policy(request.rel_url.query['value'])
@@ -1396,6 +1458,17 @@ async def component_policy(request):
     return web.Response(status=200)
 
 
+@routes.get("/manager/policy/update")
+async def update_policy(request):
+    if "value" in request.rel_url.query:
+        set_update_policy(request.rel_url.query['value'])
+        core.write_config()
+    else:
+        return web.Response(text=core.get_config()['update_policy'], status=200)
+
+    return web.Response(status=200)
+
+
 @routes.get("/manager/channel_url_list")
 async def channel_url_list(request):
     channels = core.get_channel_dict()
@@ -1451,7 +1524,11 @@ async def get_notice(request):
                     markdown_content = match.group(1)
                     version_tag = core.get_comfyui_tag()
                     if version_tag is None:
-                        markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
+                        version_tag = os.environ.get('__COMFYUI_DESKTOP_VERSION__')
+                        if version_tag is not None:
+                            markdown_content += f"<HR>ComfyUI: {version_tag} [Desktop]"
+                        else:
+                            markdown_content += f"<HR>ComfyUI: {core.comfy_ui_revision}[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
                     else:
                         markdown_content += (f"<HR>ComfyUI: {version_tag}<BR>"
                                              f"&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;({core.comfy_ui_commit_datetime.date()})")
@@ -1591,8 +1668,13 @@ 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):
-        uri = f"{core.DEFAULT_CHANNEL}/{filename}"
+        if core.get_config()['default_cache_as_channel_url']:
+            uri = f"{channel_url}/{filename}"
+        else:
+            uri = f"{core.DEFAULT_CHANNEL}/{filename}"
+
         cache_uri = str(manager_util.simple_hash(uri)) + '_' + filename
         cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
@@ -1603,17 +1685,21 @@ async def default_cache_update():
                 json.dump(json_obj, file, indent=4, sort_keys=True)
                 logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
 
-    a = get_cache("custom-node-list.json")
-    b = get_cache("extension-node-map.json")
-    c = get_cache("model-list.json")
-    d = get_cache("alter-list.json")
-    e = get_cache("github-stats.json")
+    if core.get_config()['network_mode'] != 'offline':
+        a = get_cache("custom-node-list.json")
+        b = get_cache("extension-node-map.json")
+        c = get_cache("model-list.json")
+        d = get_cache("alter-list.json")
+        e = get_cache("github-stats.json")
 
-    await asyncio.gather(a, b, c, d, e)
+        await asyncio.gather(a, b, c, d, e)
 
-    # load at least once
-    await core.unified_manager.reload('remote', dont_wait=False)
-    await core.unified_manager.get_custom_nodes('default', 'remote')
+        if core.get_config()['network_mode'] == 'private':
+            logging.info("[ComfyUI-Manager] The private comfyregistry is not yet supported in `network_mode=private`.")
+        else:
+            # load at least once
+            await core.unified_manager.reload('remote', dont_wait=False)
+            await core.unified_manager.get_custom_nodes(channel_url, 'remote')
 
     logging.info("[ComfyUI-Manager] All startup tasks have been completed.")
 

glob/manager_util.py

@@ -19,6 +19,14 @@ cache_lock = threading.Lock()
 comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
 
+use_uv = False
+
+def make_pip_cmd(cmd):
+    if use_uv:
+        return [sys.executable, '-m', 'uv', 'pip'] + cmd
+    else:
+        return [sys.executable, '-m', 'pip'] + cmd
+
 
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
@@ -122,7 +130,12 @@ async def get_data(uri, silent=False):
             with open(uri, "r", encoding="utf-8") as f:
                 json_text = f.read()
 
-    json_obj = json.loads(json_text)
+    try:
+        json_obj = json.loads(json_text)
+    except Exception as e:
+        logging.error(f"[ComfyUI-Manager] An error occurred while fetching '{uri}': {e}")
+
+        return {}
 
     if not silent:
         print(" [DONE]")
@@ -209,7 +222,7 @@ def get_installed_packages(renew=False):
 
     if renew or pip_map is None:
         try:
-            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
+            result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)
 
             pip_map = {}
             for line in result.split('\n'):
@@ -260,7 +273,7 @@ class PIPFixer:
         if len(spec) > 0:
             platform = spec[1]
         else:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
+            cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
             subprocess.check_output(cmd, universal_newlines=True)
             logging.error(cmd)
             return
@@ -270,15 +283,13 @@ class PIPFixer:
         torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
 
         if torch_torchvision_torchaudio_ver is None:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
-                   'torch', 'torchvision', 'torchaudio',
-                   '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
+            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
+                                '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
             logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
         else:
             torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
-            cmd = [sys.executable, '-m', 'pip', 'install',
-                   f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
-                   '--index-url', f"https://download.pytorch.org/whl/{platform}"]
+            cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
+                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
             logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
 
         subprocess.check_output(cmd, universal_newlines=True)
@@ -289,7 +300,7 @@ class PIPFixer:
         # remove `comfy` python package
         try:
             if 'comfy' in new_pip_versions:
-                cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
+                cmd = make_pip_cmd(['uninstall', 'comfy'])
                 subprocess.check_output(cmd, universal_newlines=True)
 
                 logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
@@ -335,7 +346,7 @@ class PIPFixer:
 
                 if len(targets) > 0:
                     for x in targets:
-                        cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
+                        cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
                         subprocess.check_output(cmd, universal_newlines=True)
 
                     logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
@@ -348,7 +359,8 @@ class PIPFixer:
             np = new_pip_versions.get('numpy')
             if np is not None:
                 if StrictVersion(np) >= StrictVersion('2'):
-                    subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
+                    cmd = make_pip_cmd(['install', "numpy<2"])
+                    subprocess.check_output(cmd , universal_newlines=True)
         except Exception as e:
             logging.error("[ComfyUI-Manager] Failed to restore numpy")
             logging.error(e)
@@ -361,3 +373,23 @@ def sanitize(data):
 def sanitize_filename(input_string):
     result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
     return result_string
+
+
+def robust_readlines(fullpath):
+    import chardet
+    try:
+        with open(fullpath, "r") as f:
+            return f.readlines()
+    except:
+        encoding = None
+        with open(fullpath, "rb") as f:
+            raw_data = f.read()
+            result = chardet.detect(raw_data)
+            encoding = result['encoding']
+
+        if encoding is not None:
+            with open(fullpath, "r", encoding=encoding) as f:
+                return f.readlines()
+
+        print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
+        return []

js/comfyui-manager.js

@@ -13,12 +13,16 @@ import {
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import {
 	free_models, install_pip, install_via_git_url, manager_instance,
-	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js";
+	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
+	infoToast, showTerminal, setNeedRestart
+} from "./common.js";
 import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
 import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
 import { SnapshotManager } from "./snapshot.js";
 
+let manager_version = await getVersion();
+
 var docStyle = document.createElement('style');
 docStyle.innerHTML = `
 .comfy-toast {
@@ -40,7 +44,7 @@ docStyle.innerHTML = `
 
 #cm-manager-dialog {
 	width: 1000px;
-	height: 520px;
+	height: 455px;
 	box-sizing: content-box;
 	z-index: 1000;
 	overflow-y: auto;
@@ -137,7 +141,7 @@ docStyle.innerHTML = `
 
 .cm-notice-board {
 	width: 290px;
-	height: 270px;
+	height: 230px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -225,7 +229,12 @@ 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;
+
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
 const style = `
@@ -424,102 +433,56 @@ async function init_notice(notice) {
 
 await init_share_option();
 
-async function fetchNicknames() {
-	const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
-	const mappings = await response1.json();
 
-	let result = {};
-	let nickname_patterns = [];
+async function set_inprogress_mode() {
+	update_comfyui_button.disabled = true;
+	update_comfyui_button.style.backgroundColor = "gray";
 
-	for (let i in mappings) {
-		let item = mappings[i];
-		var nickname;
-		if (item[1].nickname) {
-			nickname = item[1].nickname;
-		}
-		else if (item[1].title) {
-			nickname = item[1].title;
-		}
-		else {
-			nickname = item[1].title_aux;
-		}
+	update_all_button.disabled = true;
+	update_all_button.style.backgroundColor = "gray";
 
-		for (let j in item[0]) {
-			result[item[0][j]] = nickname;
-		}
+	switch_comfyui_button.disabled = true;
+	switch_comfyui_button.style.backgroundColor = "gray";
 
-		if(item[1].nodename_pattern) {
-			nickname_patterns.push([item[1].nodename_pattern, nickname]);
-		}
-	}
-
-	return [result, nickname_patterns];
+	restart_stop_button.innerText = 'Stop';
 }
 
-const [nicknames, nickname_patterns] = await fetchNicknames();
 
-function getNickname(node, nodename) {
-	if(node.nickname) {
-		return node.nickname;
+async function reset_action_buttons() {
+	const isElectron = 'electronAPI' in window;
+
+	if(isElectron) {
+		update_all_button.innerText = "Update All Custom Nodes";
 	}
 	else {
-		if (nicknames[nodename]) {
-			node.nickname = nicknames[nodename];
-		}
-		else if(node.getInnerNodes) {
-			let pure_name = getPureName(node);
-			let groupNode = app.graph.extra?.groupNodes?.[pure_name];
-			if(groupNode) {
-				let packname = groupNode.packname;
-				node.nickname = packname;
-			}
-			return node.nickname;
-		}
-		else {
-			for(let i in nickname_patterns) {
-				let item = nickname_patterns[i];
-				if(nodename.match(item[0])) {
-					node.nickname = item[1];
-				}
-			}
-		}
-
-		return node.nickname;
+		update_all_button.innerText = "Update All";
 	}
+
+	update_comfyui_button.innerText = "Update ComfyUI";
+	switch_comfyui_button.innerText = "Switch ComfyUI";
+	restart_stop_button.innerText = 'Restart';
+
+	update_comfyui_button.disabled = false;
+	update_all_button.disabled = false;
+	switch_comfyui_button.disabled = false;
+
+	update_comfyui_button.style.backgroundColor = "";
+	update_all_button.style.backgroundColor = "";
+	switch_comfyui_button.style.backgroundColor = "";
 }
 
 async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
-	update_comfyui_button.disabled = true;
-	update_comfyui_button.style.backgroundColor = "gray";
 
-	try {
-		const response = await api.fetchApi('/comfyui_manager/update_comfyui');
+	set_inprogress_mode();
 
-		if (response.status == 400) {
-			show_message('Failed to update ComfyUI.');
-			return false;
-		}
+	const response = await api.fetchApi('/manager/queue/update_comfyui');
 
-		if (response.status == 201) {
-			show_message('ComfyUI has been successfully updated.');
-		}
-		else {
-			show_message('ComfyUI is already up to date with the latest version.');
-		}
+	showTerminal();
 
-		return true;
-	}
-	catch (exception) {
-		show_message(`Failed to update ComfyUI / ${exception}`);
-		return false;
-	}
-	finally {
-		update_comfyui_button.disabled = false;
-		update_comfyui_button.innerText = prev_text;
-		update_comfyui_button.style.backgroundColor = "";
-	}
+	is_updating = true;
+	await api.fetchApi('/manager/queue/start');
 }
 
 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -647,26 +610,47 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 }
 
 async function switchComfyUI() {
-    let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
+	switch_comfyui_button.disabled = true;
+	switch_comfyui_button.style.backgroundColor = "gray";
+	
+	let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
 
-    if(res.status == 200) {
-        let obj = await res.json();
+	switch_comfyui_button.disabled = false;
+	switch_comfyui_button.style.backgroundColor = "";
 
-        let versions = [];
-        let default_version;
+	if(res.status == 200) {
+		let obj = await res.json();
 
-        for(let v of obj.versions) {
-            default_version = v;
-            versions.push(v);
-        }
+		let versions = [];
+		let default_version;
 
-        showVersionSelectorDialog(versions, obj.current, (selected_version) => {
-            api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
-        });
-    }
-    else {
-        show_message('Failed to fetch ComfyUI versions.');
-    }
+		for(let v of obj.versions) {
+			default_version = v;
+			versions.push(v);
+		}
+
+		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}`);
+			}
+			else {
+				customAlert('Failed to switch ComfyUI version.');
+			}
+		});
+	}
+	else {
+		customAlert('Failed to fetch ComfyUI versions.');
+	}
 }
 
 
@@ -720,70 +704,141 @@ async function fetchUpdates(update_check_checkbox) {
 	}
 }
 
-async function updateAll(update_check_checkbox, manager_dialog) {
-	let prev_text = update_all_button.innerText;
-	update_all_button.innerText = "Updating all...(ComfyUI)";
-	update_all_button.disabled = true;
-	update_all_button.style.backgroundColor = "gray";
+async function onQueueStatus(event) {
+	const isElectron = 'electronAPI' in window;
 
-	try {
-		var mode = manager_instance.datasrc_combo.value;
+	if(event.detail.status == 'in_progress') {
+		set_inprogress_mode();
+		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
+	}
+	else if(event.detail.status == 'done') {
+		reset_action_buttons();
 
-		update_all_button.innerText = "Updating all...";
-		const response1 = await api.fetchApi('/comfyui_manager/update_comfyui');
-		const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
-
-		if (response2.status == 403) {
-			show_message('This action is not allowed with this security level configuration.');
-			return false;
+		if(!is_updating)  {
+			return;
 		}
 
-		if (response1.status == 400 || response2.status == 400) {
-			show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
-			return false;
+		is_updating = false;
+
+		let success_list = [];
+		let failed_list = [];
+		let comfyui_state = null;
+
+		for(let k in event.detail.nodepack_result){
+			let v = event.detail.nodepack_result[k];
+
+			if(k == 'comfyui') {
+				comfyui_state = v;
+				continue;
+			}
+
+			if(v.msg == 'success') {
+				success_list.push(k);
+			}
+			else if(v.msg != 'skip')
+				failed_list.push(k);
 		}
 
-		if(response1.status == 201 || response2.status == 201) {
-			const update_info = await response2.json();
-
-			let failed_list = "";
-			if(update_info.failed.length > 0) {
-				failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
+		let msg = "";
+		
+		if(success_list.length == 0 && !comfyui_state.startsWith('success')) {
+			if(failed_list.length == 0) {
+				msg += "You are already up to date.";
 			}
-
-			let updated_list = "";
-			if(update_info.updated.length > 0) {
-				updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
-			}
-
-			show_message(
-				"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
-				+failed_list
-				+updated_list
-				);
-
-			const rebootButton = document.getElementById('cm-reboot-button5');
-			rebootButton.addEventListener("click",
-				function() {
-					if(rebootAPI()) {
-						manager_dialog.close();
-					}
-				});
 		}
 		else {
-			show_message('ComfyUI and all extensions are already up-to-date with the latest versions.');
+			msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
+
+			if(comfyui_state == 'success-nightly') {
+				msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
+				infoToast("ComfyUI has been updated to the latest nightly version.");
+			}
+			else if(comfyui_state.startsWith('success-stable')) {
+				const ver = comfyui_state.split("-").pop();
+				msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
+				infoToast(`ComfyUI has been updated to ${ver}`);
+			}
+			else if(comfyui_state == 'skip') {
+				msg += "ComfyUI is already up to date.<BR><BR>"
+			}
+			else if(comfyui_state != null) {
+				msg += "Failed to update ComfyUI.<BR><BR>"
+			}
+
+			if(success_list.length > 0) {
+				msg += "The following custom nodes have been updated:<ul>";
+				for(let x in success_list) {
+					let k = success_list[x];
+					let url = event.detail.nodepack_result[k].url;
+					let title = event.detail.nodepack_result[k].title;
+					if(url) {
+						msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
+					}
+					else {
+						msg += `<li>${k}</li>`;
+					}
+				}
+				msg += "</ul>";
+			}
+
+			setNeedRestart(true);
+		}
+		
+		if(failed_list.length > 0) {
+			msg += '<br>The update for the following custom nodes has failed:<ul>';
+			for(let x in failed_list) {
+				let k = failed_list[x];
+				let url = event.detail.nodepack_result[k].url;
+				let title = event.detail.nodepack_result[k].title;
+				if(url) {
+					msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
+				}
+				else {
+					msg += `<li>${k}</li>`;
+				}
+			}
+
+			msg += '</ul>'
 		}
 
-		return true;
+		show_message(msg);
+
+		const rebootButton = document.getElementById('cm-reboot-button5');
+		rebootButton?.addEventListener("click",
+			function() {
+				if(rebootAPI()) {
+					manager_dialog.close();
+				}
+			});
 	}
-	catch (exception) {
-		show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
-		return false;
+}
+
+api.addEventListener("cm-queue-status", onQueueStatus);
+
+
+async function updateAll(update_comfyui, manager_dialog) {
+	let prev_text = update_all_button.innerText;
+	update_all_button.innerText = "Updating...";
+
+	set_inprogress_mode();
+
+	var mode = manager_instance.datasrc_combo.value;
+
+	showTerminal();
+
+	if(update_comfyui) {
+		update_all_button.innerText = "Updating ComfyUI...";
+		await api.fetchApi('/manager/queue/update_comfyui');
 	}
-	finally {
-		update_all_button.disabled = false;
-		update_all_button.innerText = prev_text;
-		update_all_button.style.backgroundColor = "";
+
+	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
+
+	if (response.status == 401) {
+		customAlert('Another task is already in progress. Please stop the ongoing task first.');
+	}
+	else if(response.status == 200) {
+		is_updating = true;
+		await api.fetchApi('/manager/queue/start');
 	}
 }
 
@@ -807,12 +862,22 @@ const isOutputNode = (node) => {
 	return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
 }
 
+function restartOrStop() {
+	if(restart_stop_button.innerText == 'Restart'){
+		rebootAPI();
+	}
+	else {
+		api.fetchApi('/manager/queue/reset');
+		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
+	}
+}
+
 // -----------
 class ManagerMenuDialog extends ComfyDialog {
 	createControlsMid() {
 		let self = this;
-    const isElectron = 'electronAPI' in window;
-
+		const isElectron = 'electronAPI' in window;
+		
 		update_comfyui_button =
 			$el("button.cm-button", {
 				type: "button",
@@ -843,14 +908,32 @@ class ManagerMenuDialog extends ComfyDialog {
 					() => fetchUpdates(this.update_check_checkbox)
 			});
 
-		update_all_button =
-			$el("button.cm-button", {
+		restart_stop_button =
+			$el("button.cm-button-red", {
 				type: "button",
-				textContent: "Update All",
-				onclick:
-					() => updateAll(this.update_check_checkbox, self)
+				textContent: "Restart",
+				onclick: () => restartOrStop()
 			});
 
+		if(isElectron) {
+			update_all_button =
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Update All Custom Nodes",
+					onclick:
+						() => updateAll(false, self)
+				});
+		}
+		else {
+			update_all_button =
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Update All",
+					onclick:
+						() => updateAll(true, self)
+				});
+		}
+
 		const res =
 			[
 				$el("button.cm-button", {
@@ -877,7 +960,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",
@@ -906,27 +1001,10 @@ class ManagerMenuDialog extends ComfyDialog {
 				update_all_button,
 				update_comfyui_button,
 				switch_comfyui_button,
-				fetch_updates_button,
+				// fetch_updates_button,
 
 				$el("br", {}, []),
-				$el("button.cm-button", {
-					type: "button",
-					textContent: "Alternatives of A1111",
-					onclick:
-						() => {
-							if(!CustomNodesManager.instance) {
-								CustomNodesManager.instance = new CustomNodesManager(app, self);
-							}
-							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
-						}
-				}),
-
-				$el("br", {}, []),
-				$el("button.cm-button-red", {
-					type: "button",
-					textContent: "Restart",
-					onclick: () => rebootAPI()
-				}),
+				restart_stop_button,
 			];
 
 		let migration_btn =
@@ -955,6 +1033,8 @@ class ManagerMenuDialog extends ComfyDialog {
 	}
 
 	createControlsLeft() {
+		const isElectron = 'electronAPI' in window;
+
 		let self = this;
 
 		this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
@@ -1015,21 +1095,6 @@ class ManagerMenuDialog extends ComfyDialog {
 				}
 			});
 
-		// default ui state
-		let default_ui_combo = document.createElement("select");
-		default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
-		default_ui_combo.className = "cm-menu-combo";
-		default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
-		api.fetchApi('/manager/default_ui')
-			.then(response => response.text())
-			.then(data => { default_ui_combo.value = data; });
-
-		default_ui_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
-		});
-
 
 		// share
 		let share_combo = document.createElement("select");
@@ -1048,25 +1113,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
 		}
 
-		// default ui state
-		let component_policy_combo = document.createElement("select");
-		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
-		component_policy_combo.className = "cm-menu-combo";
-		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
-		api.fetchApi('/manager/component/policy')
-			.then(response => response.text())
-			.then(data => {
-				component_policy_combo.value = data;
-				set_component_policy(data);
-			});
-
-		component_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
-			set_component_policy(event.target.value);
-		});
-
 		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
@@ -1086,15 +1132,52 @@ class ManagerMenuDialog extends ComfyDialog {
 			}
 		});
 
+		let component_policy_combo = document.createElement("select");
+		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
+		component_policy_combo.className = "cm-menu-combo";
+		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
+		api.fetchApi('/manager/policy/component')
+			.then(response => response.text())
+			.then(data => {
+				component_policy_combo.value = data;
+				set_component_policy(data);
+			});
+
+		component_policy_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
+			set_component_policy(event.target.value);
+		});
+
+		update_policy_combo = document.createElement("select");
+
+		if(isElectron)
+			update_policy_combo.style.display = 'none';
+		
+		update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
+		update_policy_combo.className = "cm-menu-combo";
+		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
+		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
+		api.fetchApi('/manager/policy/update')
+			.then(response => response.text())
+			.then(data => {
+				update_policy_combo.value = data;
+			});
+
+		update_policy_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
+		});
+
 		return [
 			$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
 			$el("br", {}, []),
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
-			default_ui_combo,
 			share_combo,
 			component_policy_combo,
+			update_policy_combo,
 			$el("br", {}, []),
 
 			$el("br", {}, []),
@@ -1121,11 +1204,6 @@ class ManagerMenuDialog extends ComfyDialog {
 									install_pip(url, self);
 								}
 							}
-					}),
-					$el("button.cm-experimental-button", {
-						type: "button",
-						textContent: "Unload models",
-						onclick: () => { free_models(); }
 					})
 				]),
 		];
@@ -1254,7 +1332,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",
@@ -1396,13 +1474,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'
 		}
@@ -1637,27 +1714,3 @@ app.registerExtension({
 		}
 	},
 });
-
-
-async function set_default_ui()
-{
-	let res = await api.fetchApi('/manager/default_ui');
-	if(res.status == 200) {
-		let mode = await res.text();
-		switch(mode) {
-		case 'history':
-			app.ui.queue.hide();
-			app.ui.history.show();
-			break;
-		case 'queue':
-			app.ui.queue.show();
-			app.ui.history.hide();
-			break;
-		default:
-			// do nothing
-			break;
-		}
-	}
-}
-
-set_default_ui();

js/common.js

@@ -413,10 +413,93 @@ export const icons = {
 }
 
 export function sanitizeHTML(str) {
-    return str
-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&#039;");
-}
+	return str
+		.replace(/&/g, "&amp;")
+		.replace(/</g, "&lt;")
+		.replace(/>/g, "&gt;")
+		.replace(/"/g, "&quot;")
+		.replace(/'/g, "&#039;");
+}
+
+export function showTerminal() {
+	try {
+		const panel = app.extensionManager.bottomPanel;
+		const isTerminalVisible = panel.bottomPanelVisible && panel.activeBottomPanelTab.id === 'logs-terminal';
+		if (!isTerminalVisible)
+			panel.toggleBottomPanelTab('logs-terminal');
+	}
+	catch(exception) {
+		// do nothing
+	}
+}
+
+let need_restart = false;
+
+export function setNeedRestart(value) {
+	need_restart = value;
+}
+
+async function onReconnected(event) {
+	if(need_restart) {
+		setNeedRestart(false);
+
+		const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
+		if (!confirmed) {
+			return;
+		}
+
+		window.location.reload(true);
+	}
+}
+
+api.addEventListener('reconnected', onReconnected);
+
+const storeId = "comfyui-manager-grid";
+let timeId;
+export function storeColumnWidth(gridId, columnItem) {
+	clearTimeout(timeId);
+	timeId = setTimeout(() => {
+		let data = {};
+		const dataStr = localStorage.getItem(storeId);
+		if (dataStr) {
+			try {
+				data = JSON.parse(dataStr);
+			} catch (e) {}
+		}
+
+		if (!data[gridId]) {
+			data[gridId] =  {};
+		}
+
+		data[gridId][columnItem.id] = columnItem.width;
+
+		localStorage.setItem(storeId, JSON.stringify(data));
+
+	}, 200)
+}
+
+export function restoreColumnWidth(gridId, columns) {
+	const dataStr = localStorage.getItem(storeId);
+	if (!dataStr) {
+		return;
+	}
+	let data;
+	try {
+		data = JSON.parse(dataStr);
+	} catch (e) {}
+	if(!data) {
+		return;
+	}
+	const widthMap = data[gridId];
+	if (!widthMap) {
+		return;
+	}
+
+	columns.forEach(columnItem => {
+		const w = widthMap[columnItem.id];
+		if (w) {
+			columnItem.width = w;
+		}
+	});
+
+}

js/components-manager.js

@@ -709,7 +709,7 @@ app.handleFile = handleFile;
 
 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/manager/component/policy')
+	api.fetchApi('/manager/policy/component')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }

js/custom-nodes-manager.js

@@ -4,12 +4,16 @@ import { api } from "../../scripts/api.js";
 
 import {
 	manager_instance, rebootAPI, install_via_git_url,
-	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt, sanitizeHTML, infoToast
+	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
+	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
 
+const gridId = "node";
+
 const pageCss = `
 .cn-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -359,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>
@@ -370,7 +375,8 @@ const ShowMode = {
 	UPDATE: "Update",
 	MISSING: "Missing",
 	FAVORITES: "Favorites",
-	ALTERNATIVES: "Alternatives"
+	ALTERNATIVES: "Alternatives",
+	IN_WORKFLOW: "In Workflow",
 };
 
 export class CustomNodesManager {
@@ -582,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,
@@ -722,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;
 					}
@@ -762,10 +772,9 @@ export class CustomNodesManager {
 
 			".cn-manager-restart": {
 				click: () => {
-					if(rebootAPI()) {
-						this.close();
-						this.manager_dialog.close();
-					}
+					this.close();
+					this.manager_dialog.close();
+					rebootAPI();
 				}
 			},
 
@@ -776,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");
@@ -832,6 +849,10 @@ export class CustomNodesManager {
 			this.renderSelected();
 		});
 
+		grid.bind("onColumnWidthChanged", (e, columnItem) => {
+			storeColumnWidth(gridId, columnItem)
+		});
+
 		grid.bind('onClick', (e, d) => {
 			const btn = this.getButton(d.e.target);
 			if (btn) {
@@ -1159,6 +1180,8 @@ export class CustomNodesManager {
 				return 0;
 			});
 
+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options: options,
 			rows: rows_values,
@@ -1369,14 +1392,14 @@ export class CustomNodesManager {
 			});
 
 			if (res.status != 200) {
-				errorMsg = `${item.title} ${mode} failed: `;
+				errorMsg = `'${item.title}': `;
 
 				if(res.status == 403) {
-					errorMsg += `This action is not allowed with this security level configuration.`;
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
 				} else if(res.status == 404) {
-					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.`;
+					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.\n`;
 				} else {
-					errorMsg += await res.text();
+					errorMsg += await res.text() + '\n';
 				}
 
 				break;
@@ -1385,24 +1408,20 @@ export class CustomNodesManager {
 
 		this.install_context = {btn: btn, targets: target_items};
 
-		for(let k in target_items) {
-			let item = this.install_context.targets[k];
-			this.grid.updateCell(item, "action");
-		}
-
 		if(errorMsg) {
 			this.showError(errorMsg);
-			show_message("Installation Error:\n"+errorMsg);
+			show_message("[Installation Errors]\n"+errorMsg);
 
 			// reset
-			for (const hash of list) {
-				const item = this.grid.getRowItemBy("hash", hash);
-				self.grid.updateCell(item, "action");
+			for(let k in target_items) {
+				const item = target_items[k];
+				this.grid.updateCell(item, "action");
 			}
 		}
 		else {
 			await api.fetchApi('/manager/queue/start');
 			this.showStop();
+			showTerminal();
 		}
 	}
 
@@ -1445,8 +1464,8 @@ export class CustomNodesManager {
 		for(let hash in result){
 			let v = result[hash];
 
-			if(v != 'success')
-				errorMsg += v;
+			if(v != 'success' && v != 'skip')
+				errorMsg += v+'\n';
 		}
 
 		for(let k in self.install_context.targets) {
@@ -1524,7 +1543,110 @@ 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;
+
+		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];
+					hashMap[item.hash] = true;
+				}
+				else if(node.properties.aux_id) {
+					unresolved_aux_ids[node.properties.aux_id] = node.type;
+				}
+				else {
+					unresolved_missing_nodes.add(node.type);
+				}
+			}
+		}
+
+		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, registered_nodes);
+		}
+
+		return hashMap;
+	}
+
+	async getMissingNodesLegacy(hashMap, missing_nodes, registered_nodes) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading missing nodes (${mode}) ...`);
 		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
@@ -1563,23 +1685,8 @@ 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;
+		let unresolved_missing_nodes = new Set();
+		for (let node_type of missing_nodes) {
 			if(node_type.startsWith('workflow/') || node_type.startsWith('workflow>'))
 				continue;
 
@@ -1587,26 +1694,25 @@ export class CustomNodesManager {
 				const packs = name_to_packs[node_type.trim()];
 				if(packs)
 					packs.forEach(url => {
-						missing_nodes.add(url);
+						unresolved_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);
+							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;
 			}
 		}
@@ -1625,6 +1731,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}) ...`);
@@ -1660,6 +1801,8 @@ export class CustomNodesManager {
 	}
 
 	async loadData(show_mode = ShowMode.NORMAL) {
+		const isElectron = 'electronAPI' in window;
+
 		this.show_mode = show_mode;
 		console.log("Show mode:", show_mode);
 
@@ -1679,6 +1822,11 @@ export class CustomNodesManager {
 		}
 		
 		const { channel, node_packs } = res.data;
+
+		if(isElectron) {
+			delete node_packs['comfyui-manager'];
+		}
+
 		this.channel = channel;
 		this.mode = mode;
 		this.custom_nodes = node_packs;
@@ -1713,9 +1861,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) {
@@ -1767,7 +1920,6 @@ export class CustomNodesManager {
 						case "disabled":
 							filterTypes.add("installed");
 							break;
-
 						case "not-installed":
 							filterTypes.add("not-installed");
 							break;
@@ -1879,6 +2031,7 @@ export class CustomNodesManager {
 
 	showRestart() {
 		this.element.querySelector(".cn-manager-restart").style.display = "block";
+		setNeedRestart(true);
 	}
 
 	showStop() {

js/model-manager.js

@@ -2,13 +2,16 @@ import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
-	fetchData, md5, icons, show_message, customAlert, infoToast
+	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
 import { api } from "../../scripts/api.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
 
+const gridId = "model";
+
 const pageCss = `
 .cmm-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -438,6 +441,10 @@ export class ModelManager {
             this.renderSelected();
         });
 
+		grid.bind("onColumnWidthChanged", (e, columnItem) => {
+			storeColumnWidth(gridId, columnItem)
+		});
+
 		grid.bind('onClick', (e, d) => {
 			const { rowItem } = d;
 			const target = d.e.target;
@@ -589,6 +596,8 @@ export class ModelManager {
 			width: 200
 		}];
 
+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options,
 			rows,
@@ -640,7 +649,6 @@ export class ModelManager {
 		}
 
 		btn.classList.add("cmm-btn-loading");
-		this.showLoading();
 		this.showError("");
 
 		let needRefresh = false;
@@ -671,7 +679,14 @@ export class ModelManager {
 			});
 
 			if (res.status != 200) {
-				errorMsg = `Install failed: ${item.name} ${res.error.message}`;
+				errorMsg = `'${item.name}': `;
+
+				if(res.status == 403) {
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
 				break;
 			}
 		}
@@ -680,17 +695,18 @@ export class ModelManager {
 
 		if(errorMsg) {
 			this.showError(errorMsg);
-			show_message("Installation Error:\n"+errorMsg);
+			show_message("[Installation Errors]\n"+errorMsg);
 
 			// reset
-			for (const hash of list) {
-				const item = this.grid.getRowItemBy("hash", hash);
+			for(let k in target_items) {
+				const item = target_items[k];
 				this.grid.updateCell(item, "installed");
 			}
 		}
 		else {
 			await api.fetchApi('/manager/queue/start');
 			this.showStop();
+			showTerminal();
 		}
 	}
 
@@ -738,7 +754,7 @@ export class ModelManager {
 			let v = result[hash];
 
 			if(v != 'success')
-				errorMsg += v;
+				errorMsg += v + '\n';
 		}
 
 		for(let k in self.install_context.targets) {

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);
+    }
   }
 }
 

model-list.json

@@ -209,28 +209,6 @@
       "url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors",
       "size": "3.53GB"
     },
-    {
-      "name": "Inswapper-fp16 (face swap)",
-      "type": "insightface",
-      "base": "inswapper",
-      "save_path": "insightface",
-      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
-      "reference": "https://github.com/facefusion/facefusion-assets",
-      "filename": "inswapper_128_fp16.onnx",
-      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
-      "size": "277.7MB"
-    },
-    {
-      "name": "Inswapper (face swap)",
-      "type": "insightface",
-      "base": "inswapper",
-      "save_path": "insightface",
-      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
-      "reference": "https://github.com/facefusion/facefusion-assets",
-      "filename": "inswapper_128.onnx",
-      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
-      "size": "555.3MB"
-    },
     {
       "name": "Deepbump",
       "type": "deepbump",
@@ -4684,6 +4662,51 @@
       "filename": "customnet_inpaint_v1.pt",
       "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
       "size": "5.71GB"
+    },
+
+    {
+      "name": "deepseek-ai/Janus-Pro-1B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-1B",
+      "size": "7.8GB"
+    },
+    {
+      "name": "deepseek-ai/Janus-Pro-7B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-7B",
+      "size": "14.85GB"
+    },
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.fp16.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
+      "size": "167MB"
+    },
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
+      "size": "335MB"
     }
   ]
 }

node_db/dev/custom-node-list.json

@@ -11,6 +11,441 @@
 
         
         
+        
+
+        {
+            "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": "RiceRound",
+            "title": "RiceRound Cloud Node [UNSAFE]",
+            "id": "riceround",
+            "reference": "https://github.com/RiceRound/ComfyUI_RiceRound",
+            "files": [
+                "https://github.com/RiceRound/ComfyUI_RiceRound"
+            ],
+            "install_type": "git-clone",
+            "description": "This is an imaginative project that allows for one-click deployment, providing both an online page and a ComfyUI cloud node.[w/This custom node is vulnerable because it can dynamically download and execute nodes.]"
+        },
+        {
+            "author": "Yeonri",
+            "title": "ComfyUI_LLM_Are_You_Listening [WIP]",
+            "reference": "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening",
+            "files": [
+               "https://github.com/Yeonri/ComfyUI_LLM_Are_You_Listening"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: AYL_Node, AYL_GGUF_Node, AYL_API_Node\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "altkeyproject",
+            "title": "Dream Painter [WIP]",
+            "reference": "https://github.com/alt-key-project/comfyui-dream-painter",
+            "files": [
+               "https://github.com/alt-key-project/comfyui-dream-painter"
+            ],
+            "install_type": "git-clone",
+            "description": "Provide utilities for 2D image generation and processing."
+        },
+        {
+            "author": "kimara-ai",
+            "title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
+            "reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
+            "files": [
+               "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
+        },
+        {
+            "author": "krisshen2021",
+            "title": "comfyui_OpenRouterNodes [WIP]",
+            "reference": "https://github.com/krisshen2021/comfyui_OpenRouterNodes",
+            "files": [
+                "https://github.com/krisshen2021/comfyui_OpenRouterNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "LLM custom nodes for comfyui\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "Velour-Fog",
+            "title": "comfy-latent-nodes [UNSAFE]",
+            "reference": "https://github.com/Velour-Fog/comfy-latent-nodes",
+            "files": [
+                "https://github.com/Velour-Fog/comfy-latent-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI nodes to save and load a latent to a specified directory. Saves time for doing operations on a latent such as upscaling without having to re-trigger the creation of the original latent.[w/This node can write files to an arbitrary path.]"
+        },
+        {
+            "author": "jgbyte",
+            "title": "ComfyUI-RandomCube [WIP]",
+            "reference": "https://github.com/jgbyte/ComfyUI-RandomCube",
+            "files": [
+                "https://github.com/jgbyte/ComfyUI-RandomCube"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: RandomCubeGrid"
+        },
+        {
+            "author": "thot-experiment",
+            "title": "comfy-live-preview [WIP]",
+            "reference": "https://github.com/thot-experiment/comfy-live-preview",
+            "files": [
+                "https://github.com/thot-experiment/comfy-live-preview"
+            ],
+            "install_type": "git-clone",
+            "description": "external live preview plugin for ComfyUI"
+        },
+        {
+            "author": "AhBumm",
+            "title": "ComfyUI-Upscayl",
+            "reference": "https://github.com/AhBumm/ComfyUI-Upscayl",
+            "files": [
+                "https://github.com/AhBumm/ComfyUI-Upscayl"
+            ],
+            "nodename_pattern": "\\(BillBum\\)$",
+            "install_type": "git-clone",
+            "description": "NODES: Upscayl Upscaler"
+        },
+        {
+            "author": "NEZHA625",
+            "title": "ComfyUI-tools-by-dong [UNSAFE]",
+            "reference": "https://github.com/NEZHA625/ComfyUI-tools-by-dong",
+            "files": [
+                "https://github.com/NEZHA625/ComfyUI-tools-by-dong"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: HuggingFaceUploadNode, ImageDownloader, LoraIterator, FileMoveNode, InputDetectionNode, ...\nNOTE: The files in the repo are not organized.[w/This node pack includes nodes that can modify arbitrary files.]"
+        },
+        {
+            "author": "if-ai",
+            "title": "ComfyUI-IF_Zonos [WIP]",
+            "reference": "https://github.com/if-ai/ComfyUI-IF_Zonos",
+            "files": [
+                "https://github.com/if-ai/ComfyUI-IF_Zonos"
+            ],
+            "install_type": "git-clone",
+            "description": "Zonos for ComfyUI"
+        },
+        {
+            "author": "grinlau18",
+            "title": "Xiser_Nodes [WIP]",
+            "reference": "https://github.com/grinlau18/ComfyUI_XISER_Nodes",
+            "files": [
+                "https://github.com/grinlau18/ComfyUI_XISER_Nodes"
+             ],
+             "install_type": "git-clone",
+             "description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "LAOGOU-666",
+            "title": "Comfyui_StartPatch [UNSAFE]",
+            "reference": "https://github.com/LAOGOU-666/Comfyui_StartPatch",
+            "files": [
+                "https://github.com/LAOGOU-666/Comfyui_StartPatch"
+             ],
+             "install_type": "git-clone",
+             "description": "This patch plugin optimizes the node information processing mechanism of the ComfyUI server, significantly improving server performance and response speed. It greatly reduces the browser page initialization waiting time. [w/Since this patch modifies key functions of ComfyUI, it is highly likely to cause compatibility issues.]"
+        },
+        {
+            "author": "badmike",
+            "title": "Prompt Factory [CONFLICT]",
+            "reference": "https://github.com/badmike/comfyui-prompt-factory",
+            "files": [
+                "https://github.com/badmike/comfyui-prompt-factory"
+            ],
+            "install_type": "git-clone",
+            "description": "A modular system that adds randomness to prompt generation [w/This node pack is causing a name conflict with https://github.com/satche/comfyui-prompt-factory]"
+        },
+        {
+            "author": "owengillett",
+            "title": "ComfyUI-tilefusion",
+            "reference": "https://github.com/owengillett/ComfyUI-tilefusion",
+            "files": [
+                "https://github.com/owengillett/ComfyUI-tilefusion"
+             ],
+             "install_type": "git-clone",
+             "description": "Helper nodes for generating seamless tiles."
+        },
+        {
+            "author": "Scaryplasmon",
+            "title": "ComfTrellis [WIP]",
+            "reference": "https://github.com/Scaryplasmon/ComfTrellis",
+            "files": [
+                "https://github.com/Scaryplasmon/ComfTrellis"
+             ],
+             "install_type": "git-clone",
+             "description": "1 click install to run Trellis in ComfyUI\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "fangziheng2321",
+            "title": "comfyuinode_chopmask [WIP]",
+            "reference": "https://github.com/fangziheng2321/comfyuinode_chopmask",
+            "files": [
+                "https://github.com/fangziheng2321/comfyuinode_chopmask"
+             ],
+             "install_type": "git-clone",
+             "description": "a custom comfyui node for '/fooocusinpaint_upload'\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "D1-3105",
+            "title": "ComfyUI-VideoStream",
+            "reference": "https://github.com/D1-3105/ComfyUI-VideoStream",
+            "files": [
+                "https://github.com/D1-3105/ComfyUI-VideoStream"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: FloWWeaverExportSingleFrameGRPC"
+        },
+        {
+            "author": "gmorks",
+            "title": "ComfyUI Animagine prompt [WIP]",
+            "reference": "https://github.com/gmorks/ComfyUI-Animagine-Prompt",
+            "files": [
+                "https://github.com/gmorks/ComfyUI-Animagine-Prompt"
+             ],
+             "install_type": "git-clone",
+             "description": "Comfy UI node to prompt build for [a/https://huggingface.co/cagliostrolab/animagine-xl-4.0](https://huggingface.co/cagliostrolab/animagine-xl-4.0) model\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "wirytiox",
+            "title": "ComfyUI-Qwen [CONFLICT]",
+            "reference": "https://github.com/mr-krak3n/ComfyUI-Qwen",
+            "files": [
+                "https://github.com/mr-krak3n/ComfyUI-Qwen"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository contains custom nodes for ComfyUI, designed to facilitate working with language models such as Qwen2.5 and DeepSeek. [w/This node pack is causing a name conflict with https://github.com/ZHO-ZHO-ZHO/ComfyUI-Qwen]"
+        },
+        {
+            "author": "hiusdev",
+            "title": "ComfyUI_Lah_Toffee",
+            "reference": "https://github.com/hiusdev/ComfyUI_Lah_Toffee",
+            "files": [
+                "https://github.com/hiusdev/ComfyUI_Lah_Toffee"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Lah LoadVideoRandom"
+        },
+        {
+            "author": "hdfhssg",
+            "title": "ComfyUI_pxtool [WIP]",
+            "reference": "https://github.com/hdfhssg/ComfyUI_pxtool",
+            "files": [
+                "https://github.com/hdfhssg/ComfyUI_pxtool"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a custom plugin node for ComfyUI that modifies and extends some features from existing projects. The main implementations include:\n* Reproducing some features of the [a/Stable-Diffusion-Webui-Civitai-Helper](https://github.com/zixaphir/Stable-Diffusion-Webui-Civitai-Helper) project within ComfyUI\n* Implementing a feature to randomly generate related prompt words by referencing the [a/noob-wiki dataset](https://huggingface.co/datasets/Laxhar/noob-wiki/tree/main)\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "franky519",
+            "title": "comfyui-redux-style",
+            "reference": "https://github.com/franky519/comfyui-redux-style",
+            "files": [
+                "https://github.com/franky519/comfyui-redux-style"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Style Model Grid, Style Model Apply, Style Model Advanced"
+        },
+        {
+            "author": "rishipandey125",
+            "title": "ComfyUI-FramePacking [WIP]",
+            "reference": "https://github.com/rishipandey125/ComfyUI-FramePacking",
+            "files": [
+                "https://github.com/rishipandey125/ComfyUI-FramePacking"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Add Grid Boundaries, Pack Frames, Unpack Frames, Resize Frame"
+        },
+        {
+            "author": "Northerner1",
+            "title": "ComfyUI_North_Noise [WIP]",
+            "reference": "https://github.com/Northerner1/ComfyUI_North_Noise",
+            "files": [
+                "https://github.com/Northerner1/ComfyUI_North_Noise"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Unsampler"
+        },
+        {
+            "author": "kimara-ai",
+            "title": "ComfyUI-Kimara-AI-Image-From-URL [WIP]",
+            "reference": "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL",
+            "files": [
+                "https://github.com/kimara-ai/ComfyUI-Kimara-AI-Image-From-URL"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image from URL and downscale to desired megapixels. Set megapixels to 0 for no downscaling."
+        },
+        {
+            "author": "tc8M4lF3s88",
+            "title": "comfy-tif-support",
+            "reference": "https://github.com/M4lF3s/comfy-tif-support",
+            "files": [
+                "https://github.com/M4lF3s/comfy-tif-support"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Load TIFF"
+        },
+        {
+            "author": "tc888",
+            "title": "ComfyUI_Save_Flux_Image",
+            "reference": "https://github.com/tc888/ComfyUI_Save_Flux_Image",
+            "files": [
+                "https://github.com/tc888/ComfyUI_Save_Flux_Image"
+            ],
+            "install_type": "git-clone",
+            "description": "Customized version of comfyui-image-save tailored for saving Flux images"
+        },
+        {
+            "author": "var1ableX",
+            "title": "ComfyUI_Accessories",
+            "reference": "https://github.com/var1ableX/ComfyUI_Accessories",
+            "files": [
+                "https://github.com/var1ableX/ComfyUI_Accessories"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Get Mask Dimensions, Get Random Dimensions, Is Mask Empty/Image, Any Cast, Make List From Text"
+        },
+        {
+            "author": "xinyiSS",
+            "title": "CombineMasksNode",
+            "reference": "https://github.com/xinyiSS/CombineMasksNode",
+            "files": [
+                "https://github.com/xinyiSS/CombineMasksNode"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Combine Masks Node"
+        },
+        {
+            "author": "osuiso-depot",
+            "title": "comfyui-keshigom_custom",
+            "reference": "https://github.com/osuiso-depot/comfyui-keshigom_custom",
+            "files": [
+                "https://github.com/osuiso-depot/comfyui-keshigom_custom"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: RegexpChopper, FLIP-W/H Selector, FLIP-W/H SelectorConst, TextFind, ckpt_Loader_Simple, True-or-False, myStringNode"
+        },
+        {
+            "author": "LucipherDev",
+            "title": "ComfyUI-Sentinel [WIP]",
+            "reference": "https://github.com/LucipherDev/ComfyUI-Sentinel",
+            "files": [
+                "https://github.com/LucipherDev/ComfyUI-Sentinel"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Extension for Advanced Security. Implements login, multi-user registration, IP filtering, and user-specific input/output directories.[w/WARN:While ComfyUI Sentinel enhances security for ComfyUI, it does not guarantee absolute protection. Security is about risk mitigation, not elimination. Users are responsible for implementing their own security measures.]"
+        },
+        {
+            "author": "threadedblue",
+            "title": "MLXnodes [WIP]",
+            "reference": "https://github.com/threadedblue/MLXnodes",
+            "files": [
+                "https://github.com/threadedblue/MLXnodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A port of MLX Examples to ComfyUI custom_nodes. These are intended to run on a macOS M1.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "jschoormans",
+            "title": "Comfy-InterestingPixels [WIP]",
+            "reference": "https://github.com/jschoormans/Comfy-InterestingPixels",
+            "files": [
+                "https://github.com/jschoormans/Comfy-InterestingPixels"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Shareable Image Slider, Random Palette\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "jschoormans",
+            "title": "ComfyUI-TexturePacker [WIP]",
+            "reference": "https://github.com/kijai/ComfyUI-TexturePacker",
+            "files": [
+                "https://github.com/jschoormans/Comfy-InterestingPixels"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI node to use PyTexturePacker\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "lum3on",
+            "title": "comfyui_LLM_Polymath [WIP]",
+            "reference": "https://github.com/lum3on/comfyui_LLM_Polymath",
+            "files": [
+                "https://github.com/lum3on/comfyui_LLM_Polymath"
+            ],
+            "install_type": "git-clone",
+            "description": "An advanced chat node, that integrates large language models to automate data processes and enhance prompt responses through real-time web search and image handling. It supports both OpenAI's GPT-like models and a local Ollama API. Custom node finder and smart assistant tools provide tailored workflow recommendations for efficient integration. Additionally, the node dynamically augments prompts and offers flexible output compression options.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "MickeyJ",
+            "title": "ComfyUI_mickster_nodes [WIP]",
+            "reference": "https://github.com/MickeyJ/ComfyUI_mickster_nodes",
+            "files": [
+                "https://github.com/MickeyJ/ComfyUI_mickster_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of custom nodes for ComfyUI, focusing on image handling and LoRA training."
+        },
+        {
+            "author": "thedivergentai",
+            "title": "Divergent Nodes [WIP]",
+            "reference": "https://github.com/thedivergentai/divergent_nodes",
+            "files": [
+                "https://github.com/thedivergentai/divergent_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node for counting CLIP tokens in text input."
+        },
+        {
+            "author": "gold24park",
+            "title": "loki-comfyui-node",
+            "reference": "https://github.com/gold24park/loki-comfyui-node",
+            "files": [
+                "https://github.com/gold24park/loki-comfyui-node"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Get Image Luminance, Get Dominant Color, Overlay Text"
+        },
+        {
+            "author": "hayden-fr",
+            "title": "ComfyUI-Image-Browsing [USAFE]",
+            "id": "image-browsing",
+            "reference": "https://github.com/hayden-fr/ComfyUI-Image-Browsing",
+            "files": [
+                "https://github.com/hayden-fr/ComfyUI-Image-Browsing"
+            ],
+            "install_type": "git-clone",
+            "description": "Image Browsing: browsing, download and delete."
+        },
         {
             "author": "molbal",
             "title": "comfy-url-fetcher [WIP]",
@@ -169,7 +604,7 @@
                 "https://github.com/7BEII/Comfyui_PDuse"
             ],
             "install_type": "git-clone",
-            "description": "NODES:PD_groupfontsize unnify, PD_grownumber-JSON, PD_add or delete words, PD_Image Crop Location, PD_Image centerCrop, PD_GetImageSize\nNOTE: The files in the repo are not organized."
+            "description": "NODES: PD_json_group_fontsize, PD_Incremental_JSON, PD_removeword, PD_Image Crop Location, PD_ImageConcanate, PD_FileName_refixer\nNOTE: The files in the repo are not organized."
         },
         {
             "author": "RLW-Chars",
@@ -229,7 +664,7 @@
                 "https://github.com/yanhuifair/comfyui-deepseek"
             ],
             "install_type": "git-clone",
-            "description": "Implement deepseek API call [a/https://api-docs.deepseek.com/](Implement deepseek API call https://api-docs.deepseek.com/)\nNOTE: The files in the repo are not organized."
+            "description": "nodes for deepseek api\nNOTE: The files in the repo are not organized."
         },
         {
             "author": "807502278",
@@ -251,16 +686,6 @@
             "install_type": "git-clone",
             "description": "NODES: Face Crop, [w/A pack of custom nodes used in my projects. Not intended to be used by other persons as the usage is not documented. But if something interests you in this repository, go for it !]"
         },
-        {
-            "author": "zmwv823",
-            "title": "ComfyUI-VideoDiffusion",
-            "reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
-            "files": [
-                "https://github.com/zmwv823/ComfyUI-VideoDiffusion"
-            ],
-            "install_type": "git-clone",
-            "description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
-        },
         {
             "author": "KihongK",
             "title": "ComfyUI-RoysNodes [WIP]",
@@ -371,16 +796,6 @@
             "install_type": "git-clone",
             "description": "Tools for creating voxel based videos"
         },
-        {
-            "author": "Njbx",
-            "title": "ComfyUI-blockswap",
-            "reference": "https://github.com/Njbx/ComfyUI-blockswap",
-            "files": [
-                "https://github.com/Njbx/ComfyUI-blockswap"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Block Swap"
-        },
         {
             "author": "PATATAJEC",
             "title": "Patatajec-Nodes [WIP]",
@@ -529,7 +944,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",
@@ -609,7 +1024,7 @@
                 "https://github.com/DraconicDragon/ComfyUI_e621_booru_toolkit"
             ],
             "install_type": "git-clone",
-            "description": "for now: just custom node(s) to fetch tags from a given danbooru (soon e621 too) post link\ncurrently only supports danbooru-style urls + api response formats\nthis repo is a rewrite of: [a/https://github.com/yffyhk/comfyui_auto_danbooru](https://github.com/yffyhk/comfyui_auto_danbooru)"
+            "description": "WIP. Nodes: Fetch e621/danbooru image and/or tags etc from a given URL; Get the Wiki entry for a tag through a button press."
         },
         {
             "author": "Grey3016",
@@ -1408,16 +1823,6 @@
             "install_type": "git-clone",
             "description": "NODES:Mask Size Calculator (MagicAI), Universal Mask Converter (MagicAI), Python Execution (MagicAI), Extract JSON From Text Node(MagicAI)\n[w/This extension allows the execution of arbitrary Python code from a workflow.]"
         },
-        {
-            "author": "T8star1984",
-            "title": "comfyui-purgevram",
-            "reference": "https://github.com/T8star1984/comfyui-purgevram",
-            "files": [
-                "https://github.com/T8star1984/comfyui-purgevram"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
-        },
         {
             "author": "Laser-one",
             "title": "ComfyUI-align-pose",
@@ -1438,16 +1843,6 @@
             "install_type": "git-clone",
             "description": "To use stepfun's library, you need an official api that supports multimodal inputs such as video and pictures [a/https://platform.stepfun.com/request-restriction](https://platform.stepfun.com/request-restriction)"
         },
-        {
-            "author": "attashe",
-            "title": "ComfyUI-FluxRegionAttention [WIP]",
-            "reference": "https://github.com/attashe/ComfyUI-FluxRegionAttention",
-            "files": [
-                "https://github.com/attashe/ComfyUI-FluxRegionAttention"
-            ],
-            "install_type": "git-clone",
-            "description": "Implement Region Attention for Flux model"
-        },
         {
             "author": "aria1th",
             "title": "ComfyUI-SkipCFGSigmas",
@@ -1626,7 +2021,7 @@
                 "https://github.com/rouxianmantou/comfyui-rxmt-nodes"
             ],
             "install_type": "git-clone",
-            "description": "NODES:Check Value Type"
+            "description": "NODES:Check Value Type, Why Prompt Text"
         },
         {
             "author": "SirVeggie",
@@ -2010,16 +2405,6 @@
             "install_type": "git-clone",
             "description": "ComfyUI-OpenAINode is a user-friendly node that serves as an interface to the OpenAI Models.[w/Repo name conflict with Electrofried/ComfyUI-OpenAINode]"
         },
-        {
-            "author": "hgabha",
-            "title": "WWAA-CustomNodes",
-            "reference": "https://github.com/hgabha/WWAA-CustomNodes",
-            "files": [
-                "https://github.com/hgabha/WWAA-CustomNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom Nodes for ComfyUI made by the team at [a/WeirdWonderfulAI.Art](https://weirdwonderfulai.art/). Line Count, Join String, Dither Image, Image Batch Loader"
-        },
         {
             "author": "IgPoly",
             "title": "ComfyUI-igTools",

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"
         }
     ]
 }

node_db/legacy/custom-node-list.json

@@ -10,7 +10,109 @@
         },
         
 
-        
+
+        {
+            "author": "thanhduong0213929",
+            "title": "ComfyUI-DeepUnlock [REMOVED]",
+            "reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
+            "files": [
+                "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
+            ],
+            "install_type": "git-clone",
+            "description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
+        },
+        {
+            "author": "pathway8-sudo",
+            "title": "RMBG [REMOVED]",
+            "reference": "https://github.com/pathway8-sudo/RMBG",
+            "files": [
+                "https://github.com/pathway8-sudo/RMBG"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
+        },
+        {
+            "author": "iris-Neko",
+            "title": "ComfyUI_ascii_art [REMOVED]",
+            "reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
+            "files": [
+                "https://github.com/iris-Neko/ComfyUI_ascii_art"
+             ],
+             "install_type": "git-clone",
+             "description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
+        },
+        {
+            "author": "apesplat",
+            "title": "ezXY scripts and nodes [NOT MAINTAINED]",
+            "id": "ezxy",
+            "reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
+            "files": [
+                "https://github.com/GMapeSplat/ComfyUI_ezXY"
+            ],
+            "install_type": "git-clone",
+            "description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
+        },
+        {
+            "author": "mie",
+            "title": "ComfyUI_JanusProCaption [REMOVED]",
+            "reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
+            "files": [
+                "https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
+            ],
+            "install_type": "git-clone",
+            "description": "Describe image or create caption files using Janus Pro Model"
+        },
+        {
+            "author": "Njbx",
+            "title": "ComfyUI-blockswap [REMOVED]",
+            "reference": "https://github.com/Njbx/ComfyUI-blockswap",
+            "files": [
+                "https://github.com/Njbx/ComfyUI-blockswap"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Block Swap"
+        },
+        {
+            "author": "T8star1984",
+            "title": "comfyui-purgevram [REMOVED]",
+            "reference": "https://github.com/T8star1984/comfyui-purgevram",
+            "files": [
+                "https://github.com/T8star1984/comfyui-purgevram"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-VideoDiffusion [REMOVED]",
+            "reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI-VideoDiffusion"
+            ],
+            "install_type": "git-clone",
+            "description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
+        },
+        {
+            "author": "NyaamZ",
+            "title": "Get Booru Tag ExtendeD [REMOVED]",
+            "reference": "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED",
+            "files": [
+               "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED"
+            ],
+            "description": "Get tag from Booru site.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "lingha",
+            "title": "comfyui_kj [REMOVED]",
+            "id": "comfyui_kj",
+            "reference": "https://github.com/XieChengYuan/comfyui_kj",
+            "files": [
+                "https://github.com/XieChengYuan/comfyui_kj"
+            ],
+            "install_type": "git-clone",
+            "description": "comfyui_kj, A tool that can package workflows into projects and publish them to a WeChat Mini Program named Kaji, allowing charges to be collected from users."
+        },
         {
             "author": "myAiLemon",
             "title": "MagicGetPromptAutomatically",

node_db/legacy/model-list.json

@@ -1,5 +1,27 @@
 {
   "models": [
+    {
+      "name": "Inswapper-fp16 (face swap) [REMOVED]",
+      "type": "insightface",
+      "base": "inswapper",
+      "save_path": "insightface",
+      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
+      "reference": "https://github.com/facefusion/facefusion-assets",
+      "filename": "inswapper_128_fp16.onnx",
+      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
+      "size": "277.7MB"
+    },
+    {
+      "name": "Inswapper (face swap) [REMOVED]",
+      "type": "insightface",
+      "base": "inswapper",
+      "save_path": "insightface",
+      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
+      "reference": "https://github.com/facefusion/facefusion-assets",
+      "filename": "inswapper_128.onnx",
+      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
+      "size": "555.3MB"
+    },
     {
       "name": "pfg-novel-n10.pt",
       "type": "PFG",

node_db/new/model-list.json

@@ -1,5 +1,51 @@
 {
   "models": [
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.fp16.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.fp16.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.fp16.safetensors",
+      "size": "167MB"
+    },
+    {
+      "name": "kolors/vae/diffusion_pytorch_model.safetensors",
+      "type": "VAE",
+      "base": "Kolors",
+      "save_path": "vae/kolors",
+      "description": "Kolors VAE",
+      "reference": "https://huggingface.co/Kwai-Kolors/Kolors",
+      "filename": "diffusion_pytorch_model.safetensors",
+      "url": "https://huggingface.co/Kwai-Kolors/Kolors/resolve/main/vae/diffusion_pytorch_model.safetensors",
+      "size": "335MB"
+    },
+    
+    {
+      "name": "deepseek-ai/Janus-Pro-1B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-1B",
+      "size": "7.8GB"
+    },
+    {
+      "name": "deepseek-ai/Janus-Pro-7B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-7B",
+      "size": "14.85GB"
+    },
+
     {
       "name": "Leoxing/pia.ckpt",
       "type": "animatediff-pia",

node_db/tutorial/custom-node-list.json

@@ -291,6 +291,26 @@
             ],
             "install_type": "git-clone",
             "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
+        },
+        {
+            "author": "xhiroga",
+            "title": "ComfyUI-TypeScript-CustomNode",
+            "reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
+            "files": [
+                "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
+            ],
+            "install_type": "git-clone",
+            "description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
+        },
+        {
+            "author": "zentrocdot",
+            "title": "ComfyUI-Turtle_Graphics_Demos",
+            "reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
+            "files": [
+                "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
+            ],
+            "description": "ComfyUI node for creating some Turtle Graphic demos.", 
+            "install_type": "git-clone"
         }
     ]
 }

prestartup_script.py

@@ -22,8 +22,9 @@ import folder_paths
 
 import datetime
 if hasattr(datetime, 'datetime'):
+    from datetime import datetime
     def current_timestamp():
-        return datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+        return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
 else:
     # NOTE: Occurs in some Mac environments.
     import time
@@ -33,7 +34,7 @@ else:
 
 security_check.security_check()
 
-cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
+cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 
 
@@ -57,22 +58,6 @@ def is_import_failed_extension(name):
     return name in import_failed_extensions
 
 
-def check_file_logging():
-    global enable_file_logging
-    try:
-        import configparser
-        config = configparser.ConfigParser()
-        config.read(manager_config_path)
-        default_conf = config['default']
-
-        if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
-            enable_file_logging = False
-    except Exception:
-        pass
-
-
-check_file_logging()
-
 comfy_path = os.environ.get('COMFYUI_PATH')
 comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
 
@@ -97,12 +82,39 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
 manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
 manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
 restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
 manager_config_path = os.path.join(manager_files_path, 'config.ini')
 
 cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
 
 
+default_conf = {}
+
+def read_config():
+    global default_conf
+    try:
+        import configparser
+        config = configparser.ConfigParser(strict=False)
+        config.read(manager_config_path)
+        default_conf = config['default']
+    except Exception:
+        pass
+
+def read_uv_mode():
+    if 'use_uv' in default_conf:
+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
+
+def check_file_logging():
+    global enable_file_logging
+    if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
+        enable_file_logging = False
+
+
+read_config()
+read_uv_mode()
+check_file_logging()
+
 cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
 if os.path.exists(manager_pip_overrides_path):
     with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
@@ -111,6 +123,14 @@ if os.path.exists(manager_pip_overrides_path):
         cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40'  # for security
 
 
+if os.path.exists(manager_pip_blacklist_path):
+    with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+        for x in f.readlines():
+            y = x.strip()
+            if y != '':
+                cm_global.pip_blacklist.add(y)
+
+
 def remap_pip_package(pkg):
     if pkg in cm_global.pip_overrides:
         res = cm_global.pip_overrides[pkg]
@@ -410,28 +430,33 @@ except Exception as e:
     print(f"[ComfyUI-Manager] Logging failed: {e}")
 
 
-try:
-    import git  # noqa: F401
-    import toml  # noqa: F401
-except ModuleNotFoundError:
-    my_path = os.path.dirname(__file__)
-    requirements_path = os.path.join(my_path, "requirements.txt")
-
-    print("## ComfyUI-Manager: installing dependencies. (GitPython)")
+def ensure_dependencies():
     try:
-        result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
-    except subprocess.CalledProcessError:
-        print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
-        try:
-            result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
-        except subprocess.CalledProcessError:
-            print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
+        import git     # noqa: F401
+        import toml    # noqa: F401
+        import rich    # noqa: F401
+        import chardet # noqa: F401
+    except ModuleNotFoundError:
+        my_path = os.path.dirname(__file__)
+        requirements_path = os.path.join(my_path, "requirements.txt")
 
-try:
-    print("## ComfyUI-Manager: installing dependencies done.")
-except:
-    # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
-    print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+        print("## ComfyUI-Manager: installing dependencies. (GitPython)")
+        try:
+            subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
+        except subprocess.CalledProcessError:
+            print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+            try:
+                subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
+            except subprocess.CalledProcessError:
+                print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
+
+    try:
+        print("## ComfyUI-Manager: installing dependencies done.")
+    except:
+        # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
+        print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+
+ensure_dependencies()
 
 
 print("** ComfyUI startup time:", current_timestamp())
@@ -452,11 +477,6 @@ else:
 
 def read_downgrade_blacklist():
     try:
-        import configparser
-        config = configparser.ConfigParser()
-        config.read(manager_config_path)
-        default_conf = config['default']
-
         if 'downgrade_blacklist' in default_conf:
             items = default_conf['downgrade_blacklist'].split(',')
             items = [x.strip() for x in items if x != '']
@@ -471,19 +491,13 @@ read_downgrade_blacklist()
 
 def check_bypass_ssl():
     try:
-        import configparser
         import ssl
-        config = configparser.ConfigParser()
-        config.read(manager_config_path)
-        default_conf = config['default']
-
         if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
             print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
             ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
     except Exception:
         pass
 
-
 check_bypass_ssl()
 
 
@@ -597,17 +611,18 @@ def execute_lazy_install_script(repo_path, executable):
 
     if os.path.exists(requirements_path):
         print(f"Install: pip packages for '{repo_path}'")
-        with open(requirements_path, "r") as requirements_file:
-            for line in requirements_file:
-                package_name = remap_pip_package(line.strip())
-                if package_name and not is_installed(package_name):
-                    if '--index-url' in package_name:
-                        s = package_name.split('--index-url')
-                        install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
-                    else:
-                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
 
-                    process_wrap(install_cmd, repo_path)
+        lines = manager_util.robust_readlines(requirements_path)
+        for line in lines:
+            package_name = remap_pip_package(line.strip())
+            if package_name and not is_installed(package_name):
+                if '--index-url' in package_name:
+                    s = package_name.split('--index-url')
+                    install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
+                else:
+                    install_cmd = manager_util.make_pip_cmd(["install", package_name])
+
+                process_wrap(install_cmd, repo_path)
 
     if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
         processed_install.add(f'{repo_path}/install.py')
@@ -678,6 +693,7 @@ def execute_migration(moves):
             shutil.move(x[0], x[1])
             print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
 
+script_executed = False
 
 # Check if script_list_path exists
 if os.path.exists(script_list_path):
@@ -732,6 +748,7 @@ if os.path.exists(script_list_path):
 
     # Remove the script_list_path file
     if os.path.exists(script_list_path):
+        script_executed = True
         os.remove(script_list_path)
         
     print("\n[ComfyUI-Manager] Startup script completed.")
@@ -743,11 +760,34 @@ del processed_install
 del pip_fixer
 manager_util.clear_pip_cache()
 
+if script_executed:
+    # Restart
+    print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
+
+    if '__COMFY_CLI_SESSION__' in os.environ:
+        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
+            pass
+
+        print("--------------------------------------------------------------------------\n")
+        exit(0)
+    else:
+        sys_argv = sys.argv.copy()
+
+        if sys.platform.startswith('win32'):
+            cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
+        else:
+            cmds = [sys.executable] + sys_argv
+
+        print(f"Command: {cmds}", flush=True)
+        print("--------------------------------------------------------------------------\n")
+
+        os.execv(sys.executable, cmds)
+
 
 def check_windows_event_loop_policy():
     try:
         import configparser
-        config = configparser.ConfigParser()
+        config = configparser.ConfigParser(strict=False)
         config.read(manager_config_path)
         default_conf = config['default']
 

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.14"
+version = "3.26"
 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"

requirements.txt

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

scripts/install-comfyui-venv-win.bat

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

scripts/install-manager-for-portable-version.bat

@@ -1,2 +1,3 @@
 .\python_embeded\python.exe -s -m pip install gitpython
 .\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
+.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt