use parsed version and id even when no cnr map exists

fix: installed nodes should still be initialized in offline mode
fix is_legacy_front should be a function still
2025-04-11 16:33:12 -07:00 · 2025-04-11 15:56:03 -07:00 · 2025-04-10 18:24:34 -07:00 · 2025-04-10 13:09:56 -07:00 · 2025-04-09 22:19:56 -07:00 · 2025-04-09 14:59:32 -07:00
56 changed files with 5905 additions and 9471 deletions
--- a/.github/workflows/publish-to-pypi.yml
+++ b/.github/workflows/publish-to-pypi.yml
@@ -0,0 +1,58 @@
+name: Publish to PyPI
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - "pyproject.toml"
+
+jobs:
+  build-and-publish:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install build twine
+
+      - name: Get current version
+        id: current_version
+        run: |
+          CURRENT_VERSION=$(grep -oP 'version = "\K[^"]+' pyproject.toml)
+          echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "Current version: $CURRENT_VERSION"
+
+      - name: Build package
+        run: python -m build
+
+      - name: Create GitHub Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: dist/*
+          tag_name: v${{ steps.current_version.outputs.version }}
+          draft: false
+          prerelease: false
+          generate_release_notes: true
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_TOKEN }}
+          skip-existing: true
+          verbose: true 
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
  publish-node:
    name: Publish Custom Node to registry
    runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ltdrdata' }}
+    if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
    steps:
      - name: Check out code
        uses: actions/checkout@v4
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ github-stats-cache.json
 pip_overrides.json
 *.json
 check2.sh
-/venv/
+/venv/
+build
+*.egg-info
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,7 @@
+include comfyui_manager/js/*
+include comfyui_manager/*.json
+include comfyui_manager/glob/*
+include LICENSE.txt
+include README.md
+include requirements.txt
+include pyproject.toml
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
 ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)

 ## NOTICE
+* V4.0: Modify the structure to be installable via pip instead of using git clone.
 * 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
@@ -13,78 +14,26 @@

 ## Installation

-### Installation[method1] (General installation method: ComfyUI-Manager only)
+* When installing the latest ComfyUI, it will be automatically installed as a dependency, so manual installation is no longer necessary.

-To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
+* Manual installation of the nightly version:
+    * Clone to a temporary directory (**Note:** Do **not** clone into `ComfyUI/custom_nodes`.)
+      ```  
+      git clone https://github.com/Comfy-Org/ComfyUI-Manager  
+      ```  
+    * Install via pip
+      ```  
+      cd ComfyUI-Manager  
+      pip install .  
+      ```

-1. goto `ComfyUI/custom_nodes` dir in terminal(cmd)
-2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
-3. Restart ComfyUI
-
-
-### Installation[method2] (Installation for portable ComfyUI version: ComfyUI-Manager only)
-1. install git 
- https://git-scm.com/download/win
- standalone version  
- select option: use windows default console window
-2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
- Don't click. Right click the link and use save as...
-3. double click `install-manager-for-portable-version.bat` batch file
-
-![portable-install](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/portable-install.jpg)
-
-
-### Installation[method3] (Installation through comfy-cli: install ComfyUI and ComfyUI-Manager at once.)  
-> RECOMMENDED: comfy-cli provides various features to manage ComfyUI from the CLI.
-
-* **prerequisite: python 3, git**
-
-Windows:
-```commandline
-python -m venv venv
-venv\Scripts\activate
-pip install comfy-cli
-comfy install
-```
-
-Linux/OSX:
-```commandline
-python -m venv venv
-. venv/bin/activate
-pip install comfy-cli
-comfy install
-```
 * See also: https://github.com/Comfy-Org/comfy-cli


-### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
+## Front-end

-To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you can follow these steps:
-* **prerequisite: python-is-python3, python3-venv, git**
-
-1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
- Don't click. Right click the link and use save as...
- ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
-2. `chmod +x install-comfyui-venv-linux.sh`
-3. `./install-comfyui-venv-linux.sh`
-
-### Installation Precautions
-* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/comfyui-manager`
-  * Installing in a compressed file format is not recommended.
-* **DON'T**: Decompress directly into the `ComfyUI/custom_nodes` location, resulting in the Manager contents like `__init__.py` being placed directly in that directory.
-  * You have to remove all ComfyUI-Manager files from `ComfyUI/custom_nodes`
-* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager`.
-* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager-main`.
-  * In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations. Remove it and install properly via `git clone` method.
-
-
-You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
-
-## Colab Notebook
-This repository provides Colab notebooks that allow you to install and use ComfyUI, including ComfyUI-Manager. To use ComfyUI, [click on this link](https://colab.research.google.com/github/ltdrdata/ComfyUI-Manager/blob/main/notebooks/comfyui_colab_with_manager.ipynb).
-* Support for installing ComfyUI
-* Support for basic installation of ComfyUI-Manager
-* Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.
+* The built-in front-end of ComfyUI-Manager is the legacy front-end. The front-end for ComfyUI-Manager is now provided via [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
+* To enable the legacy front-end, set the environment variable `ENABLE_LEGACY_COMFYUI_MANAGER_FRONT` to `true` before running.


 ## How To Use
--- a/init.py
+++ b/init.py
@@ -1,21 +0,0 @@
-import os
-import sys
-
-cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
-
-if not os.path.exists(cli_mode_flag):
-    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
-    import manager_server  # noqa: F401
-    import share_3rdparty  # noqa: F401
-    import cm_global
-
-    if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
-        WEB_DIRECTORY = "js"
-else:
-    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
-
-NODE_CLASS_MAPPINGS = {}
-__all__ = ['NODE_CLASS_MAPPINGS']
-
-
-
--- a/cm-cli.sh
+++ b/cm-cli.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-python cm-cli.py $*
+python ./comfyui_manager/cm-cli.py $*
--- a/comfyui_manager/init.py
+++ b/comfyui_manager/init.py
@@ -0,0 +1,24 @@
+import os
+import logging
+from comfy.cli_args import args
+
+ENABLE_LEGACY_COMFYUI_MANAGER_FRONT_DEFAULT = True # Enable legacy ComfyUI Manager frontend while new UI is in beta phase
+
+def prestartup():
+    from . import prestartup_script  # noqa: F401
+    logging.info('[PRE] ComfyUI-Manager')
+
+
+def start():
+    logging.info('[START] ComfyUI-Manager')
+    from .glob import manager_server  # noqa: F401
+    from .glob import share_3rdparty  # noqa: F401
+    from .glob import cm_global       # noqa: F401
+
+    should_show_legacy_manager_front = os.environ.get('ENABLE_LEGACY_COMFYUI_MANAGER_FRONT', 'false') == 'true' or ENABLE_LEGACY_COMFYUI_MANAGER_FRONT_DEFAULT
+    if not args.disable_manager and should_show_legacy_manager_front:
+        try:
+            import nodes
+            nodes.EXTENSION_WEB_DIRS['comfyui-manager-legacy'] = os.path.join(os.path.dirname(__file__), 'js')
+        except Exception as e:
+            print("Error enabling legacy ComfyUI Manager frontend:", e)
--- a/comfyui_manager/cm-cli.py
+++ b/comfyui_manager/cm-cli.py
@@ -15,36 +15,35 @@ import git
 import importlib


-sys.path.append(os.path.dirname(__file__))
-sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
-
 import manager_util

 # read env vars
 # COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
 # `comfy_path` should be resolved before importing manager_core
-comfy_path = os.environ.get('COMFYUI_PATH')
-if comfy_path is None:
-    try:
-        import folder_paths
-        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
-    except:
-        print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
-        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))

-# This should be placed here
+comfy_path = os.environ.get('COMFYUI_PATH')
+
+if comfy_path is None:
+    print("[bold red]cm-cli: environment variable 'COMFYUI_PATH' is not specified.[/bold red]")
+    exit(-1)
+
 sys.path.append(comfy_path)

+if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
+    print("[bold red]cm-cli: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.[/bold red]")
+    exit(-1)
+
+
 import utils.extra_config
-import cm_global
-import manager_core as core
-from manager_core import unified_manager
-import cnr_utils
+from .glob import cm_global
+from .glob import manager_core as core
+from .glob.manager_core import unified_manager
+from .glob import cnr_utils

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

-cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
-cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
+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'}

 if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides.json")):
--- a/comfyui_manager/glob/cm_global.py
+++ b/comfyui_manager/glob/cm_global.py
--- a/comfyui_manager/glob/cnr_utils.py
+++ b/comfyui_manager/glob/cnr_utils.py
@@ -6,8 +6,9 @@ import time
 from dataclasses import dataclass
 from typing import List

-import manager_core
-import manager_util
+from . import manager_core
+from . import manager_util
+
 import requests
 import toml

--- a/comfyui_manager/glob/enums.py
+++ b/comfyui_manager/glob/enums.py
@@ -0,0 +1,17 @@
+import enum
+
+class NetworkMode(enum.Enum):
+    PUBLIC = "public"
+    PRIVATE = "private"
+    OFFLINE = "offline"
+
+class SecurityLevel(enum.Enum):
+    STRONG = "strong"
+    NORMAL = "normal"
+    NORMAL_MINUS = "normal-minus"
+    WEAK = "weak"
+
+class DBMode(enum.Enum):
+    LOCAL = "local"
+    CACHE = "cache"
+    REMOTE = "remote"
--- a/comfyui_manager/glob/git_helper.py
+++ b/comfyui_manager/glob/git_helper.py
@@ -15,9 +15,12 @@ comfy_path = os.environ.get('COMFYUI_PATH')
 git_exe_path = os.environ.get('GIT_EXE_PATH')

 if comfy_path is None:
-    print("\nWARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.", file=sys.stderr)
-    comfy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+    print("git_helper: environment variable 'COMFYUI_PATH' is not specified.")
+    exit(-1)

+if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
+    print("git_helper: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.")
+    exit(-1)

 def download_url(url, dest_folder, filename=None):
    # Ensure the destination folder exists
--- a/comfyui_manager/glob/git_utils.py
+++ b/comfyui_manager/glob/git_utils.py
--- a/comfyui_manager/glob/manager_core.py
+++ b/comfyui_manager/glob/manager_core.py
@@ -32,18 +32,15 @@ from packaging import version

 import uuid

-glob_path = os.path.join(os.path.dirname(__file__))  # ComfyUI-Manager/glob
-sys.path.append(glob_path)
+from . import cm_global
+from . import cnr_utils
+from . import manager_util
+from . import git_utils
+from . import manager_downloader
+from .node_package import InstalledNodePackage
+from .enums import NetworkMode, SecurityLevel, DBMode

-import cm_global
-import cnr_utils
-import manager_util
-import git_utils
-import manager_downloader
-from node_package import InstalledNodePackage
-
-
-version_code = [3, 31, 12]
+version_code = [4, 0]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')


@@ -58,6 +55,7 @@ class InvalidChannel(Exception):
        self.channel = channel
        super().__init__(channel)

+
 def get_default_custom_nodes_path():
    global default_custom_nodes_path
    if default_custom_nodes_path is None:
@@ -183,10 +181,11 @@ comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')

 if comfy_path is None:
    try:
-        import folder_paths
-        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
+        comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
+        os.environ['COMFYUI_PATH'] = comfy_path
    except:
-        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
+        logging.error("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
+        exit(-1)

 if comfy_base_path is None:
    comfy_base_path = comfy_path
@@ -553,7 +552,7 @@ class UnifiedManager:
                    ver = str(manager_util.StrictVersion(info['version']))
                    return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                else:
-                    return None
+                    return {'id': info['id'], 'ver': info['version']}
            else:
                return None

@@ -729,7 +728,7 @@ class UnifiedManager:

        return latest

-    async def reload(self, cache_mode, dont_wait=True):
+    async def reload(self, cache_mode, dont_wait=True, update_cnr_map=True):
        self.custom_node_map_cache = {}
        self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
        self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -737,17 +736,18 @@ 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':
+        if get_config()['network_mode'] != 'public' or manager_util.is_manager_pip_package():
            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)
+        if update_cnr_map:
+            # reload 'cnr_map' and 'repo_cnr_map'
+            cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)

-        for x in cnrs:
-            self.cnr_map[x['id']] = x
-            if 'repository' in x:
-                normalized_url = git_utils.normalize_url(x['repository'])
-                self.repo_cnr_map[normalized_url] = x
+            for x in cnrs:
+                self.cnr_map[x['id']] = x
+                if 'repository' in x:
+                    normalized_url = git_utils.normalize_url(x['repository'])
+                    self.repo_cnr_map[normalized_url] = x

        # reload node status info from custom_nodes/*
        for custom_nodes_path in folder_paths.get_folder_paths('custom_nodes'):
@@ -1320,66 +1320,67 @@ class UnifiedManager:
            return result.fail(f'Path not found: {repo_path}')

        # version check
-        with git.Repo(repo_path) as repo:
-            if repo.head.is_detached:
-                if not switch_to_default_branch(repo):
-                    return result.fail(f"Failed to switch to default branch: {repo_path}")
+        repo = git.Repo(repo_path)

-            current_branch = repo.active_branch
-            branch_name = current_branch.name
+        if repo.head.is_detached:
+            if not switch_to_default_branch(repo):
+                return result.fail(f"Failed to switch to default branch: {repo_path}")

-            if current_branch.tracking_branch() is None:
-                print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
-                remote_name = get_remote_name(repo)
+        current_branch = repo.active_branch
+        branch_name = current_branch.name
+
+        if current_branch.tracking_branch() is None:
+            print(f"[ComfyUI-Manager] There is no tracking branch ({current_branch})")
+            remote_name = get_remote_name(repo)
+        else:
+            remote_name = current_branch.tracking_branch().remote_name
+
+        if remote_name is None:
+            return result.fail(f"Failed to get remote when installing: {repo_path}")
+
+        remote = repo.remote(name=remote_name)
+
+        try:
+            remote.fetch()
+        except Exception as e:
+            if 'detected dubious' in str(e):
+                print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{repo_path}' repository")
+                safedir_path = repo_path.replace('\\', '/')
+                subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
+                try:
+                    remote.fetch()
+                except Exception:
+                    print("\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n"
+                          "-----------------------------------------------------------------------------------------\n"
+                          f'git config --global --add safe.directory "{safedir_path}"\n'
+                          "-----------------------------------------------------------------------------------------\n")
+
+        commit_hash = repo.head.commit.hexsha
+        if f'{remote_name}/{branch_name}' in repo.refs:
+            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        else:
+            return result.fail(f"Not updatable branch: {branch_name}")
+
+        if commit_hash != remote_commit_hash:
+            git_pull(repo_path)
+
+            if len(repo.remotes) > 0:
+                url = repo.remotes[0].url
            else:
-                remote_name = current_branch.tracking_branch().remote_name
+                url = "unknown repo"

-            if remote_name is None:
-                return result.fail(f"Failed to get remote when installing: {repo_path}")
+            def postinstall():
+                return self.execute_install_script(url, repo_path, instant_execution=instant_execution, no_deps=no_deps)

-            remote = repo.remote(name=remote_name)
-
-            try:
-                remote.fetch()
-            except Exception as e:
-                if 'detected dubious' in str(e):
-                    print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{repo_path}' repository")
-                    safedir_path = repo_path.replace('\\', '/')
-                    subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])
-                    try:
-                        remote.fetch()
-                    except Exception:
-                        print("\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n"
-                              "-----------------------------------------------------------------------------------------\n"
-                              f'git config --global --add safe.directory "{safedir_path}"\n'
-                              "-----------------------------------------------------------------------------------------\n")
-
-            commit_hash = repo.head.commit.hexsha
-            if f'{remote_name}/{branch_name}' in repo.refs:
-                remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+            if return_postinstall:
+                return result.with_postinstall(postinstall)
            else:
-                return result.fail(f"Not updatable branch: {branch_name}")
+                if not postinstall():
+                    return result.fail(f"Failed to execute install script: {url}")

-            if commit_hash != remote_commit_hash:
-                git_pull(repo_path)
-
-                if len(repo.remotes) > 0:
-                    url = repo.remotes[0].url
-                else:
-                    url = "unknown repo"
-
-                def postinstall():
-                    return self.execute_install_script(url, repo_path, instant_execution=instant_execution, no_deps=no_deps)
-
-                if return_postinstall:
-                    return result.with_postinstall(postinstall)
-                else:
-                    if not postinstall():
-                        return result.fail(f"Failed to execute install script: {url}")
-
-                return result
-            else:
-                return ManagedResult('skip').with_msg('Up to date')
+            return result
+        else:
+            return ManagedResult('skip').with_msg('Up to date')

    def unified_update(self, node_id, version_spec=None, instant_execution=False, no_deps=False, return_postinstall=False):
        orig_print(f"\x1b[2K\rUpdating: {node_id}", end='')
@@ -1441,12 +1442,20 @@ class UnifiedManager:
            return self.unified_enable(node_id, version_spec)

        elif version_spec == 'unknown' or version_spec == 'nightly':
+            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
+
            if version_spec == 'nightly':
                # disable cnr nodes
                if self.is_enabled(node_id, 'cnr'):
                    self.unified_disable(node_id, False)

-            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
+                # use `repo name` as a dir name instead of `cnr id` if system added nodepack (i.e. publisher is null)
+                cnr = self.cnr_map.get(node_id)
+
+                if cnr is not None and cnr.get('publisher') is None:
+                    repo_name = os.path.basename(git_utils.normalize_url(repo_url))
+                    to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), repo_name))
+
            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':
@@ -1663,9 +1672,9 @@ def read_config():
                    'model_download_by_agent': get_bool('model_download_by_agent', False),
                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
                    'always_lazy_install': get_bool('always_lazy_install', False),
-                    'network_mode': default_conf.get('network_mode', 'public').lower(),
-                    'security_level': default_conf.get('security_level', 'normal').lower(),
-                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
+                    'network_mode': default_conf.get('network_mode', NetworkMode.PUBLIC.value).lower(),
+                    'security_level': default_conf.get('security_level', SecurityLevel.NORMAL.value).lower(),
+                    'db_mode': default_conf.get('db_mode', DBMode.CACHE.value).lower(),
               }

    except Exception:
@@ -1686,9 +1695,9 @@ def read_config():
            'model_download_by_agent': False,
            'downgrade_blacklist': '',
            'always_lazy_install': False,
-            'network_mode': 'public',   # public | private | offline
-            'security_level': 'normal', # strong | normal | normal- | weak
-            'db_mode': 'cache',         # local | cache | remote
+            'network_mode': NetworkMode.OFFLINE.value,
+            'security_level': SecurityLevel.NORMAL.value,
+            'db_mode': DBMode.CACHE.value,
        }


@@ -2185,7 +2194,7 @@ 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 get_config()['network_mode'] == 'offline':
+            if get_config()['network_mode'] == 'offline' or manager_util.is_manager_pip_package():
                # offline network mode
                if os.path.exists(cache_uri):
                    json_obj = await manager_util.get_data(cache_uri)
@@ -2205,7 +2214,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
                        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}")
+        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename} @ {channel_url}/{mode}\n=> {e}")
        uri = os.path.join(manager_util.comfyui_manager_path, filename)
        json_obj = await manager_util.get_data(uri)

@@ -2639,8 +2648,22 @@ async def get_current_snapshot(custom_nodes_only = False):

                        cnr_custom_nodes[info['id']] = info['ver']
                    else:
-                        commit_hash = git_utils.get_commit_hash(fullpath)
-                        url = git_utils.git_url(fullpath)
+                        repo = git.Repo(fullpath)
+
+                        if repo.head.is_detached:
+                            remote_name = get_remote_name(repo)
+                        else:
+                            current_branch = repo.active_branch
+
+                            if current_branch.tracking_branch() is None:
+                                remote_name = get_remote_name(repo)
+                            else:
+                                remote_name = current_branch.tracking_branch().remote_name
+
+                        commit_hash = repo.head.commit.hexsha
+
+                        url = repo.remotes[remote_name].url
+
                        git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
                except:
                    print(f"Failed to extract snapshots for the custom node '{path}'.")
--- a/comfyui_manager/glob/manager_downloader.py
+++ b/comfyui_manager/glob/manager_downloader.py
--- a/comfyui_manager/glob/manager_server.py
+++ b/comfyui_manager/glob/manager_server.py
@@ -14,18 +14,23 @@ import git
 from datetime import datetime

 from server import PromptServer
-import manager_core as core
-import manager_util
-import cm_global
 import logging
 import asyncio
 import queue

-import manager_downloader
+from . import manager_core as core
+from . import manager_util
+from . import cm_global
+from . import manager_downloader


 logging.info(f"### Loading: ComfyUI-Manager ({core.version_str})")
-logging.info("[ComfyUI-Manager] network_mode: " + core.get_config()['network_mode'])
+
+if not manager_util.is_manager_pip_package():
+    network_mode_description = "offline"
+else:
+    network_mode_description = core.get_config()['network_mode']
+logging.info("[ComfyUI-Manager] network_mode: " + network_mode_description)

 comfy_ui_hash = "-"
 comfyui_tag = None
@@ -155,9 +160,7 @@ class ManagerFuncsInComfyUI(core.ManagerFuncs):

 core.manager_funcs = ManagerFuncsInComfyUI()

-sys.path.append('../..')
-
-from manager_downloader import download_url, download_url_with_agent
+from .manager_downloader import download_url, download_url_with_agent

 core.comfy_path = os.path.dirname(folder_paths.__file__)
 core.js_path = os.path.join(core.comfy_path, "web", "extensions")
@@ -659,7 +662,7 @@ async def task_worker():
                                         'total_count': total_count, 'done_count': done_count})


-@routes.get("/customnode/getmappings")
+@routes.get("/v2/customnode/getmappings")
 async def fetch_customnode_mappings(request):
    """
    provide unified (node -> node pack) mapping list
@@ -695,7 +698,7 @@ async def fetch_customnode_mappings(request):
    return web.json_response(json_obj, content_type='application/json')


-@routes.get("/customnode/fetch_updates")
+@routes.get("/v2/customnode/fetch_updates")
 async def fetch_updates(request):
    try:
        if request.rel_url.query["mode"] == "local":
@@ -722,7 +725,7 @@ async def fetch_updates(request):
        return web.Response(status=400)


-@routes.get("/manager/queue/update_all")
+@routes.get("/v2/manager/queue/update_all")
 async def update_all(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -810,7 +813,7 @@ def populate_markdown(x):

 # freeze imported version
 startup_time_installed_node_packs = core.get_installed_node_packs()
-@routes.get("/customnode/installed")
+@routes.get("/v2/customnode/installed")
 async def installed_list(request):
    mode = request.query.get('mode', 'default')

@@ -822,7 +825,7 @@ async def installed_list(request):
    return web.json_response(res, content_type='application/json')


-@routes.get("/customnode/getlist")
+@routes.get("/v2/customnode/getlist")
 async def fetch_customnode_list(request):
    """
    provide unified custom node list
@@ -935,7 +938,7 @@ def check_model_installed(json_obj):
            executor.submit(process_model_phase, item)


-@routes.get("/externalmodel/getlist")
+@routes.get("/v2/externalmodel/getlist")
 async def fetch_externalmodel_list(request):
    # The model list is only allowed in the default channel, yet.
    json_obj = await core.get_data_by_mode(request.rel_url.query["mode"], 'model-list.json')
@@ -948,14 +951,14 @@ async def fetch_externalmodel_list(request):
    return web.json_response(json_obj, content_type='application/json')


-@PromptServer.instance.routes.get("/snapshot/getlist")
+@PromptServer.instance.routes.get("/v2/snapshot/getlist")
 async def get_snapshot_list(request):
    items = [f[:-5] for f in os.listdir(core.manager_snapshot_path) if f.endswith('.json')]
    items.sort(reverse=True)
    return web.json_response({'items': items}, content_type='application/json')


-@routes.get("/snapshot/remove")
+@routes.get("/v2/snapshot/remove")
 async def remove_snapshot(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -973,7 +976,7 @@ async def remove_snapshot(request):
        return web.Response(status=400)


-@routes.get("/snapshot/restore")
+@routes.get("/v2/snapshot/restore")
 async def restore_snapshot(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -999,7 +1002,7 @@ async def restore_snapshot(request):
        return web.Response(status=400)


-@routes.get("/snapshot/get_current")
+@routes.get("/v2/snapshot/get_current")
 async def get_current_snapshot_api(request):
    try:
        return web.json_response(await core.get_current_snapshot(), content_type='application/json')
@@ -1007,7 +1010,7 @@ async def get_current_snapshot_api(request):
        return web.Response(status=400)


-@routes.get("/snapshot/save")
+@routes.get("/v2/snapshot/save")
 async def save_snapshot(request):
    try:
        await core.save_snapshot_with_postfix('snapshot')
@@ -1044,82 +1047,7 @@ def unzip_install(files):
    return True


-def copy_install(files, js_path_name=None):
-    for url in files:
-        if url.endswith("/"):
-            url = url[:-1]
-        try:
-            filename = os.path.basename(url)
-            if url.endswith(".py"):
-                download_url(url, core.get_default_custom_nodes_path(), filename)
-            else:
-                path = os.path.join(core.js_path, js_path_name) if js_path_name is not None else core.js_path
-                if not os.path.exists(path):
-                    os.makedirs(path)
-                download_url(url, path, filename)
-
-        except Exception as e:
-            logging.error(f"Install(copy) error: {url} / {e}", file=sys.stderr)
-            return False
-
-    logging.info("Installation was successful.")
-    return True
-
-
-def copy_uninstall(files, js_path_name='.'):
-    for url in files:
-        if url.endswith("/"):
-            url = url[:-1]
-        dir_name = os.path.basename(url)
-        base_path = core.get_default_custom_nodes_path() if url.endswith('.py') else os.path.join(core.js_path, js_path_name)
-        file_path = os.path.join(base_path, dir_name)
-
-        try:
-            if os.path.exists(file_path):
-                os.remove(file_path)
-            elif os.path.exists(file_path + ".disabled"):
-                os.remove(file_path + ".disabled")
-        except Exception as e:
-            logging.error(f"Uninstall(copy) error: {url} / {e}", file=sys.stderr)
-            return False
-
-    logging.info("Uninstallation was successful.")
-    return True
-
-
-def copy_set_active(files, is_disable, js_path_name='.'):
-    if is_disable:
-        action_name = "Disable"
-    else:
-        action_name = "Enable"
-
-    for url in files:
-        if url.endswith("/"):
-            url = url[:-1]
-        dir_name = os.path.basename(url)
-        base_path = core.get_default_custom_nodes_path() if url.endswith('.py') else os.path.join(core.js_path, js_path_name)
-        file_path = os.path.join(base_path, dir_name)
-
-        try:
-            if is_disable:
-                current_name = file_path
-                new_name = file_path + ".disabled"
-            else:
-                current_name = file_path + ".disabled"
-                new_name = file_path
-
-            os.rename(current_name, new_name)
-
-        except Exception as e:
-            logging.error(f"{action_name}(copy) error: {url} / {e}", file=sys.stderr)
-
-            return False
-
-    logging.info(f"{action_name} was successful.")
-    return True
-
-
-@routes.get("/customnode/versions/{node_name}")
+@routes.get("/v2/customnode/versions/{node_name}")
 async def get_cnr_versions(request):
    node_name = request.match_info.get("node_name", None)
    versions = core.cnr_utils.all_versions_of_node(node_name)
@@ -1130,7 +1058,7 @@ async def get_cnr_versions(request):
    return web.Response(status=400)


-@routes.get("/customnode/disabled_versions/{node_name}")
+@routes.get("/v2/customnode/disabled_versions/{node_name}")
 async def get_disabled_versions(request):
    node_name = request.match_info.get("node_name", None)
    versions = []
@@ -1146,7 +1074,7 @@ async def get_disabled_versions(request):
    return web.Response(status=400)


-@routes.post("/customnode/import_fail_info")
+@routes.post("/v2/customnode/import_fail_info")
 async def import_fail_info(request):
    json_data = await request.json()

@@ -1163,20 +1091,20 @@ async def import_fail_info(request):
    return web.Response(status=400)


-@routes.post("/manager/queue/reinstall")
+@routes.post("/v2/manager/queue/reinstall")
 async def reinstall_custom_node(request):
    await uninstall_custom_node(request)
    await install_custom_node(request)


-@routes.get("/manager/queue/reset")
+@routes.get("/v2/manager/queue/reset")
 async def reset_queue(request):
    global task_queue
    task_queue = queue.Queue()
    return web.Response(status=200)


-@routes.get("/manager/queue/status")
+@routes.get("/v2/manager/queue/status")
 async def queue_count(request):
    global task_queue

@@ -1191,7 +1119,7 @@ async def queue_count(request):
        'is_processing': is_processing})


-@routes.post("/manager/queue/install")
+@routes.post("/v2/manager/queue/install")
 async def install_custom_node(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1252,7 +1180,7 @@ async def install_custom_node(request):

 task_worker_thread:threading.Thread = None

-@routes.get("/manager/queue/start")
+@routes.get("/v2/manager/queue/start")
 async def queue_start(request):
    global nodepack_result
    global model_result
@@ -1270,7 +1198,7 @@ async def queue_start(request):
    return web.Response(status=200)


-@routes.post("/manager/queue/fix")
+@routes.post("/v2/manager/queue/fix")
 async def fix_custom_node(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_GENERAL)
@@ -1292,7 +1220,7 @@ async def fix_custom_node(request):
    return web.Response(status=200)


-@routes.post("/customnode/install/git_url")
+@routes.post("/v2/customnode/install/git_url")
 async def install_custom_node_git_url(request):
    if not is_allowed_security_level('high'):
        logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
@@ -1312,7 +1240,7 @@ async def install_custom_node_git_url(request):
    return web.Response(status=400)


-@routes.post("/customnode/install/pip")
+@routes.post("/v2/customnode/install/pip")
 async def install_custom_node_pip(request):
    if not is_allowed_security_level('high'):
        logging.error(SECURITY_MESSAGE_NORMAL_MINUS)
@@ -1324,7 +1252,7 @@ async def install_custom_node_pip(request):
    return web.Response(status=200)


-@routes.post("/manager/queue/uninstall")
+@routes.post("/v2/manager/queue/uninstall")
 async def uninstall_custom_node(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1347,7 +1275,7 @@ async def uninstall_custom_node(request):
    return web.Response(status=200)


-@routes.post("/manager/queue/update")
+@routes.post("/v2/manager/queue/update")
 async def update_custom_node(request):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1368,14 +1296,14 @@ async def update_custom_node(request):
    return web.Response(status=200)


-@routes.get("/manager/queue/update_comfyui")
+@routes.get("/v2/manager/queue/update_comfyui")
 async def update_comfyui(request):
    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")
+@routes.get("/v2/comfyui_manager/comfyui_versions")
 async def comfyui_versions(request):
    try:
        res, current, latest = core.get_comfyui_versions()
@@ -1386,7 +1314,7 @@ async def comfyui_versions(request):
    return web.Response(status=400)


-@routes.get("/comfyui_manager/comfyui_switch_version")
+@routes.get("/v2/comfyui_manager/comfyui_switch_version")
 async def comfyui_switch_version(request):
    try:
        if "ver" in request.rel_url.query:
@@ -1399,7 +1327,7 @@ async def comfyui_switch_version(request):
    return web.Response(status=400)


-@routes.post("/manager/queue/disable")
+@routes.post("/v2/manager/queue/disable")
 async def disable_node(request):
    json_data = await request.json()

@@ -1434,7 +1362,7 @@ async def check_whitelist_for_model(item):
    return False


-@routes.post("/manager/queue/install_model")
+@routes.post("/v2/manager/queue/install_model")
 async def install_model(request):
    json_data = await request.json()

@@ -1466,7 +1394,7 @@ async def install_model(request):
    return web.Response(status=200)


-@routes.get("/manager/preview_method")
+@routes.get("/v2/manager/preview_method")
 async def preview_method(request):
    if "value" in request.rel_url.query:
        set_preview_method(request.rel_url.query['value'])
@@ -1477,7 +1405,7 @@ async def preview_method(request):
    return web.Response(status=200)


-@routes.get("/manager/db_mode")
+@routes.get("/v2/manager/db_mode")
 async def db_mode(request):
    if "value" in request.rel_url.query:
        set_db_mode(request.rel_url.query['value'])
@@ -1489,7 +1417,7 @@ async def db_mode(request):



-@routes.get("/manager/policy/component")
+@routes.get("/v2/manager/policy/component")
 async def component_policy(request):
    if "value" in request.rel_url.query:
        set_component_policy(request.rel_url.query['value'])
@@ -1500,7 +1428,7 @@ async def component_policy(request):
    return web.Response(status=200)


-@routes.get("/manager/policy/update")
+@routes.get("/v2/manager/policy/update")
 async def update_policy(request):
    if "value" in request.rel_url.query:
        set_update_policy(request.rel_url.query['value'])
@@ -1511,7 +1439,7 @@ async def update_policy(request):
    return web.Response(status=200)


-@routes.get("/manager/channel_url_list")
+@routes.get("/v2/manager/channel_url_list")
 async def channel_url_list(request):
    channels = core.get_channel_dict()
    if "value" in request.rel_url.query:
@@ -1548,7 +1476,7 @@ def add_target_blank(html_text):
    return modified_html


-@routes.get("/manager/notice")
+@routes.get("/v2/manager/notice")
 async def get_notice(request):
    url = "github.com"
    path = "/ltdrdata/ltdrdata.github.io/wiki/News"
@@ -1595,7 +1523,13 @@ async def get_notice(request):
                return web.Response(text="Unable to retrieve Notice", status=200)


-@routes.get("/manager/reboot")
+# legacy /manager/notice
+@routes.get("/manager/notice")
+async def get_notice_legacy(request):
+    return web.Response(text="""<font color="red">Starting from ComfyUI-Manager V4.0+, it should be installed via pip.<BR><BR>Please remove the ComfyUI-Manager installed in the <font color="white">'custom_nodes'</font> directory.</font>""", status=200)
+
+
+@routes.get("/v2/manager/reboot")
 def restart(self):
    if not is_allowed_security_level('middle'):
        logging.error(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
@@ -1632,7 +1566,7 @@ def restart(self):
    return os.execv(sys.executable, cmds)


-@routes.post("/manager/component/save")
+@routes.post("/v2/manager/component/save")
 async def save_component(request):
    try:
        data = await request.json()
@@ -1662,7 +1596,7 @@ async def save_component(request):
        return web.Response(status=400)


-@routes.post("/manager/component/loads")
+@routes.post("/v2/manager/component/loads")
 async def load_components(request):
    if os.path.exists(core.manager_components_path):
        try:
@@ -1687,7 +1621,7 @@ async def load_components(request):
        return web.json_response({})


-@routes.get("/manager/version")
+@routes.get("/v2/manager/version")
 async def get_version(request):
    return web.Response(text=core.version_str, status=200)

@@ -1736,7 +1670,7 @@ async def default_cache_update():
            logging.error(f"[ComfyUI-Manager] Failed to perform initial fetching '{filename}': {e}")
            traceback.print_exc()

-    if core.get_config()['network_mode'] != 'offline':
+    if core.get_config()['network_mode'] != 'offline' and not manager_util.is_manager_pip_package():
        a = get_cache("custom-node-list.json")
        b = get_cache("extension-node-map.json")
        c = get_cache("model-list.json")
@@ -1751,6 +1685,8 @@ async def default_cache_update():
            # load at least once
            await core.unified_manager.reload('remote', dont_wait=False)
            await core.unified_manager.get_custom_nodes(channel_url, 'remote')
+    else:
+        await core.unified_manager.reload('remote', dont_wait=False, update_cnr_map=False)

    logging.info("[ComfyUI-Manager] All startup tasks have been completed.")

@@ -1768,4 +1704,3 @@ cm_global.register_extension('ComfyUI-Manager',
                                 'nodes': {},
                                 'description': 'This extension provides the ability to manage custom nodes in ComfyUI.', })

-
--- a/comfyui_manager/glob/manager_util.py
+++ b/comfyui_manager/glob/manager_util.py
@@ -18,12 +18,15 @@ import shlex


 cache_lock = threading.Lock()
+session_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 is_manager_pip_package():
+    return not os.path.exists(os.path.join(comfyui_manager_path, '..', 'custom_nodes'))

 def add_python_path_to_env():
    if platform.system() != "Windows":
--- a/comfyui_manager/glob/node_package.py
+++ b/comfyui_manager/glob/node_package.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 import os

-from git_utils import get_commit_hash
+from .git_utils import get_commit_hash


@dataclass
--- a/comfyui_manager/glob/security_check.py
+++ b/comfyui_manager/glob/security_check.py
--- a/comfyui_manager/glob/share_3rdparty.py
+++ b/comfyui_manager/glob/share_3rdparty.py
@@ -1,5 +1,6 @@
 import mimetypes
-import manager_core as core
+from . import manager_core as core
+
 import os
 from aiohttp import web
 import aiohttp
@@ -53,7 +54,7 @@ def compute_sha256_checksum(filepath):
    return sha256.hexdigest()


-@PromptServer.instance.routes.get("/manager/share_option")
+@PromptServer.instance.routes.get("/v2/manager/share_option")
 async def share_option(request):
    if "value" in request.rel_url.query:
        core.get_config()['share_option'] = request.rel_url.query['value']
@@ -122,7 +123,7 @@ def set_youml_settings(settings):
        f.write(settings)


-@PromptServer.instance.routes.get("/manager/get_openart_auth")
+@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
 async def api_get_openart_auth(request):
    # print("Getting stored Matrix credentials...")
    openart_key = get_openart_auth()
@@ -131,7 +132,7 @@ async def api_get_openart_auth(request):
    return web.json_response({"openart_key": openart_key})


-@PromptServer.instance.routes.post("/manager/set_openart_auth")
+@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
 async def api_set_openart_auth(request):
    json_data = await request.json()
    openart_key = json_data['openart_key']
@@ -140,7 +141,7 @@ async def api_set_openart_auth(request):
    return web.Response(status=200)


-@PromptServer.instance.routes.get("/manager/get_matrix_auth")
+@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
 async def api_get_matrix_auth(request):
    # print("Getting stored Matrix credentials...")
    matrix_auth = get_matrix_auth()
@@ -149,7 +150,7 @@ async def api_get_matrix_auth(request):
    return web.json_response(matrix_auth)


-@PromptServer.instance.routes.get("/manager/youml/settings")
+@PromptServer.instance.routes.get("/v2/manager/youml/settings")
 async def api_get_youml_settings(request):
    youml_settings = get_youml_settings()
    if not youml_settings:
@@ -157,14 +158,14 @@ async def api_get_youml_settings(request):
    return web.json_response(json.loads(youml_settings))


-@PromptServer.instance.routes.post("/manager/youml/settings")
+@PromptServer.instance.routes.post("/v2/manager/youml/settings")
 async def api_set_youml_settings(request):
    json_data = await request.json()
    set_youml_settings(json.dumps(json_data))
    return web.Response(status=200)


-@PromptServer.instance.routes.get("/manager/get_comfyworkflows_auth")
+@PromptServer.instance.routes.get("/v2/manager/get_comfyworkflows_auth")
 async def api_get_comfyworkflows_auth(request):
    # Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
    # in the same directory as the ComfyUI base folder
@@ -175,7 +176,7 @@ async def api_get_comfyworkflows_auth(request):
    return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})


-@PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
+@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
 async def set_esheep_workflow_and_images(request):
    json_data = await request.json()
    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
@@ -183,7 +184,7 @@ async def set_esheep_workflow_and_images(request):
        return web.Response(status=200)


-@PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
+@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
 async def get_esheep_workflow_and_images(request):
    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
        data = json.load(file)
@@ -211,7 +212,7 @@ def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
    return comfyworkflows_sharekey.strip()


-@PromptServer.instance.routes.post("/manager/share")
+@PromptServer.instance.routes.post("/v2/manager/share")
 async def share_art(request):
    # get json data
    json_data = await request.json()
--- a/comfyui_manager/js/cm-api.js
+++ b/comfyui_manager/js/cm-api.js
@@ -25,7 +25,7 @@ async function tryInstallCustomNode(event) {
 	const res = await customConfirm(msg);
 	if(res) {
 		if(event.detail.target.installed == 'Disabled') {
-			const response = await api.fetchApi(`/customnode/toggle_active`, {
+			const response = await api.fetchApi(`/v2/customnode/toggle_active`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
@@ -35,7 +35,7 @@ async function tryInstallCustomNode(event) {
 			await sleep(300);
 			app.ui.dialog.show(`Installing... '${event.detail.target.title}'`);

-			const response = await api.fetchApi(`/customnode/install`, {
+			const response = await api.fetchApi(`/v2/customnode/install`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
@@ -52,7 +52,7 @@ async function tryInstallCustomNode(event) {
 			}
 		}

-		let response = await api.fetchApi("/manager/reboot");
+		let response = await api.fetchApi("/v2/manager/reboot");
 		if(response.status == 403) {
 			show_message('This action is not allowed with this security level configuration.');
 			return false;
--- a/comfyui_manager/js/comfyui-manager.js
+++ b/comfyui_manager/js/comfyui-manager.js
@@ -189,8 +189,7 @@ docStyle.innerHTML = `
 }
 `;

-function is_legacy_front() {
-    let compareVersion = '1.2.49';
+function isBeforeFrontendVersion(compareVersion) {
    try {
        const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
        if (typeof frontendVersion !== 'string') {
@@ -223,6 +222,9 @@ function is_legacy_front() {
    }
 }

+const is_legacy_front = () => isBeforeFrontendVersion('1.2.49');
+const isNewManagerUI = () => isBeforeFrontendVersion('1.16.4');
+
 document.head.appendChild(docStyle);

 var update_comfyui_button = null;
@@ -415,7 +417,7 @@ const style = `
 `;

 async function init_share_option() {
-	api.fetchApi('/manager/share_option')
+	api.fetchApi('/v2/manager/share_option')
 		.then(response => response.text())
 		.then(data => {
 			share_option = data || 'all';
@@ -423,7 +425,7 @@ async function init_share_option() {
 }

 async function init_notice(notice) {
-	api.fetchApi('/manager/notice')
+	api.fetchApi('/v2/manager/notice')
 		.then(response => response.text())
 		.then(data => {
 			notice.innerHTML = data;
@@ -476,12 +478,12 @@ async function updateComfyUI() {

 	set_inprogress_mode();

-	const response = await api.fetchApi('/manager/queue/update_comfyui');
+	const response = await api.fetchApi('/v2/manager/queue/update_comfyui');

 	showTerminal();

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

 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -612,7 +614,7 @@ async function switchComfyUI() {
 	switch_comfyui_button.disabled = true;
 	switch_comfyui_button.style.backgroundColor = "gray";
 	
-	let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
+	let res = await api.fetchApi(`/v2/comfyui_manager/comfyui_versions`, { cache: "no-store" });

 	switch_comfyui_button.disabled = false;
 	switch_comfyui_button.style.backgroundColor = "";
@@ -631,14 +633,14 @@ async function switchComfyUI() {
 		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
 			if(selected_version == 'nightly') {
 				update_policy_combo.value = 'nightly-comfyui';
-				api.fetchApi('/manager/policy/update?value=nightly-comfyui');
+				api.fetchApi('/v2/manager/policy/update?value=nightly-comfyui');
 			}
 			else {
 				update_policy_combo.value = 'stable-comfyui';
-				api.fetchApi('/manager/policy/update?value=stable-comfyui');
+				api.fetchApi('/v2/manager/policy/update?value=stable-comfyui');
 			}

-			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
+			let response = await api.fetchApi(`/v2/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
 			if (response.status == 200) {
 				infoToast(`ComfyUI version is switched to ${selected_version}`);
 			}
@@ -775,17 +777,17 @@ async function updateAll(update_comfyui) {

 	if(update_comfyui) {
 		update_all_button.innerText = "Updating ComfyUI...";
-		await api.fetchApi('/manager/queue/update_comfyui');
+		await api.fetchApi('/v2/manager/queue/update_comfyui');
 	}

-	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
+	const response = await api.fetchApi(`/v2/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');
+		await api.fetchApi('/v2/manager/queue/start');
 	}
 }

@@ -814,7 +816,7 @@ function restartOrStop() {
 		rebootAPI();
 	}
 	else {
-		api.fetchApi('/manager/queue/reset');
+		api.fetchApi('/v2/manager/queue/reset');
 		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 	}
 }
@@ -962,12 +964,12 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));

-		api.fetchApi('/manager/db_mode')
+		api.fetchApi('/v2/manager/db_mode')
 			.then(response => response.text())
 			.then(data => { this.datasrc_combo.value = data; });

 		this.datasrc_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
+			api.fetchApi(`/v2/manager/db_mode?value=${event.target.value}`);
 		});

 		// preview method
@@ -979,19 +981,19 @@ class ManagerMenuDialog extends ComfyDialog {
 		preview_combo.appendChild($el('option', { value: 'latent2rgb', text: 'Preview method: Latent2RGB (fast)' }, []));
 		preview_combo.appendChild($el('option', { value: 'none', text: 'Preview method: None (very fast)' }, []));

-		api.fetchApi('/manager/preview_method')
+		api.fetchApi('/v2/manager/preview_method')
 			.then(response => response.text())
 			.then(data => { preview_combo.value = data; });

 		preview_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
+			api.fetchApi(`/v2/manager/preview_method?value=${event.target.value}`);
 		});

 		// channel
 		let channel_combo = document.createElement("select");
 		channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
 		channel_combo.className = "cm-menu-combo";
-		api.fetchApi('/manager/channel_url_list')
+		api.fetchApi('/v2/manager/channel_url_list')
 			.then(response => response.json())
 			.then(async data => {
 				try {
@@ -1004,7 +1006,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					}

 					channel_combo.addEventListener('change', function (event) {
-						api.fetchApi(`/manager/channel_url_list?value=${event.target.value}`);
+						api.fetchApi(`/v2/manager/channel_url_list?value=${event.target.value}`);
 					});

 					channel_combo.value = data.selected;
@@ -1032,7 +1034,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
 		}

-		api.fetchApi('/manager/share_option')
+		api.fetchApi('/v2/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
 				share_combo.value = data || 'all';
@@ -1042,7 +1044,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		share_combo.addEventListener('change', function (event) {
 			const value = event.target.value;
 			share_option = value;
-			api.fetchApi(`/manager/share_option?value=${value}`);
+			api.fetchApi(`/v2/manager/share_option?value=${value}`);
 			const shareButton = document.getElementById("shareButton");
 			if (value === 'none') {
 				shareButton.style.display = "none";
@@ -1057,7 +1059,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		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')
+		api.fetchApi('/v2/manager/policy/component')
 			.then(response => response.text())
 			.then(data => {
 				component_policy_combo.value = data;
@@ -1065,7 +1067,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			});

 		component_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
+			api.fetchApi(`/v2/manager/policy/component?value=${event.target.value}`);
 			set_component_policy(event.target.value);
 		});

@@ -1078,14 +1080,14 @@ class ManagerMenuDialog extends ComfyDialog {
 		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')
+		api.fetchApi('/v2/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}`);
+			api.fetchApi(`/v2/manager/policy/update?value=${event.target.value}`);
 		});

 		return [
@@ -1388,12 +1390,12 @@ class ManagerMenuDialog extends ComfyDialog {
 }

 async function getVersion() {
-	let version = await api.fetchApi(`/manager/version`);
+	let version = await api.fetchApi(`/v2/manager/version`);
 	return await version.text();
 }

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

 	aboutPageBadges: [
 		{
@@ -1525,7 +1527,10 @@ app.registerExtension({
 				}).element
 			);

-			app.menu?.settingsGroup.element.before(cmGroup.element);
+			const shouldShowLegacyMenuItems = !isNewManagerUI();
+			if (shouldShowLegacyMenuItems) {
+				app.menu?.settingsGroup.element.before(cmGroup.element);
+			}
 		}
 		catch(exception) {
 			console.log('ComfyUI is outdated. New style menu based features are disabled.');
--- a/comfyui_manager/js/comfyui-share-common.js
+++ b/comfyui_manager/js/comfyui-share-common.js
@@ -172,7 +172,7 @@ export const shareToEsheep= () => {
 		const nodes = app.graph._nodes
 		const { potential_outputs, potential_output_nodes } = getPotentialOutputsAndOutputNodes(nodes);
 		const workflow = prompt['workflow']
-		api.fetchApi(`/manager/set_esheep_workflow_and_images`, {
+		api.fetchApi(`/v2/manager/set_esheep_workflow_and_images`, {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({
@@ -812,7 +812,7 @@ export class ShareDialog extends ComfyDialog {
 		// get the user's existing matrix auth and share key
 		ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
 		try {
-			api.fetchApi(`/manager/get_matrix_auth`)
+			api.fetchApi(`/v2/manager/get_matrix_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.matrix_auth = data;
@@ -831,7 +831,7 @@ export class ShareDialog extends ComfyDialog {
 		ShareDialog.cw_sharekey = "";
 		try {
 			// console.log("Fetching comfyworkflows share key")
-			api.fetchApi(`/manager/get_comfyworkflows_auth`)
+			api.fetchApi(`/v2/manager/get_comfyworkflows_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.cw_sharekey = data.comfyworkflows_sharekey;
@@ -891,7 +891,7 @@ export class ShareDialog extends ComfyDialog {
 			// Change the text of the share button to "Sharing..." to indicate that the share process has started
 			this.share_button.textContent = "Sharing...";

-			const response = await api.fetchApi(`/manager/share`, {
+			const response = await api.fetchApi(`/v2/manager/share`, {
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify({
--- a/comfyui_manager/js/comfyui-share-copus.js
+++ b/comfyui_manager/js/comfyui-share-copus.js
--- a/comfyui_manager/js/comfyui-share-openart.js
+++ b/comfyui_manager/js/comfyui-share-openart.js
@@ -67,7 +67,7 @@ export class OpenArtShareDialog extends ComfyDialog {
  async readKey() {
    let key = ""
    try {
-      key = await api.fetchApi(`/manager/get_openart_auth`)
+      key = await api.fetchApi(`/v2/manager/get_openart_auth`)
        .then(response => response.json())
        .then(data => {
          return data.openart_key;
@@ -82,7 +82,7 @@ export class OpenArtShareDialog extends ComfyDialog {
  }

  async saveKey(value) {
-    await api.fetchApi(`/manager/set_openart_auth`, {
+    await api.fetchApi(`/v2/manager/set_openart_auth`, {
      method: 'POST',
      headers: {'Content-Type': 'application/json'},
      body: JSON.stringify({
@@ -399,7 +399,7 @@ export class OpenArtShareDialog extends ComfyDialog {
    form.append("file", uploadFile);
    try {
      const res = await this.fetchApi(
-        `/workflows/upload_thumbnail`,
+        `/v2/workflows/upload_thumbnail`,
        {
          method: "POST",
          body: form,
@@ -459,7 +459,7 @@ export class OpenArtShareDialog extends ComfyDialog {
      throw new Error("Title is required");
    }

-    const current_snapshot = await api.fetchApi(`/snapshot/get_current`)
+    const current_snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
      .then(response => response.json())
      .catch(error => {
        // console.log(error);
@@ -489,7 +489,7 @@ export class OpenArtShareDialog extends ComfyDialog {

    try {
      const response = await this.fetchApi(
-        "/workflows/publish",
+        "/v2/workflows/publish",
        {
          method: "POST",
          headers: {"Content-Type": "application/json"},
--- a/comfyui_manager/js/comfyui-share-youml.js
+++ b/comfyui_manager/js/comfyui-share-youml.js
@@ -179,7 +179,7 @@ export class YouMLShareDialog extends ComfyDialog {
  async loadToken() {
    let key = ""
    try {
-      const response = await api.fetchApi(`/manager/youml/settings`)
+      const response = await api.fetchApi(`/v2/manager/youml/settings`)
      const settings = await response.json()
      return settings.token
    } catch (error) {
@@ -188,7 +188,7 @@ export class YouMLShareDialog extends ComfyDialog {
  }

  async saveToken(value) {
-    await api.fetchApi(`/manager/youml/settings`, {
+    await api.fetchApi(`/v2/manager/youml/settings`, {
      method: 'POST',
      headers: {'Content-Type': 'application/json'},
      body: JSON.stringify({
@@ -380,7 +380,7 @@ export class YouMLShareDialog extends ComfyDialog {
    try {
      let snapshotData = null;
      try {
-        const snapshot = await api.fetchApi(`/snapshot/get_current`)
+        const snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
        snapshotData = await snapshot.json()
      } catch (e) {
        console.error("Failed to get snapshot", e)
--- a/comfyui_manager/js/common.js
+++ b/comfyui_manager/js/common.js
@@ -172,7 +172,7 @@ export function rebootAPI() {
 	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
 		if (isConfirmed) {
 			try {
-				api.fetchApi("/manager/reboot");
+				api.fetchApi("/v2/manager/reboot");
 			}
 			catch(exception) {}
 		}
@@ -210,7 +210,7 @@ export async function install_pip(packages) {
 	if(packages.includes('&'))
 		app.ui.dialog.show(`Invalid PIP package enumeration: '${packages}'`);

-	const res = await api.fetchApi("/customnode/install/pip", {
+	const res = await api.fetchApi("/v2/customnode/install/pip", {
 		method: "POST",
 		body: packages,
 	});
@@ -245,7 +245,7 @@ export async function install_via_git_url(url, manager_dialog) {

 	show_message(`Wait...<BR><BR>Installing '${url}'`);

-	const res = await api.fetchApi("/customnode/install/git_url", {
+	const res = await api.fetchApi("/v2/customnode/install/git_url", {
 		method: "POST",
 		body: url,
 	});
--- a/comfyui_manager/js/components-manager.js
+++ b/comfyui_manager/js/components-manager.js
@@ -64,7 +64,7 @@ function storeGroupNode(name, data, register=true) {
 }

 export async function load_components() {
-	let data = await api.fetchApi('/manager/component/loads', {method: "POST"});
+	let data = await api.fetchApi('/v2/manager/component/loads', {method: "POST"});
 	let components = await data.json();

 	let start_time = Date.now();
@@ -222,7 +222,7 @@ async function save_as_component(node, version, author, prefix, nodename, packna
 	pack_map[packname] = component_name;
 	rpack_map[component_name] = subgraph;

-	const res = await api.fetchApi('/manager/component/save', {
+	const res = await api.fetchApi('/v2/manager/component/save', {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/json",
@@ -259,7 +259,7 @@ async function import_component(component_name, component, mode) {
 				workflow: component
 			};

-		const res = await api.fetchApi('/manager/component/save', {
+		const res = await api.fetchApi('/v2/manager/component/save', {
 						method: "POST",
 						headers: { "Content-Type": "application/json", },
 						body: JSON.stringify(body)
@@ -709,7 +709,7 @@ app.handleFile = handleFile;

 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/manager/policy/component')
+	api.fetchApi('/v2/manager/policy/component')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }
--- a/comfyui_manager/js/custom-nodes-manager.css
+++ b/comfyui_manager/js/custom-nodes-manager.css
--- a/comfyui_manager/js/custom-nodes-manager.js
+++ b/comfyui_manager/js/custom-nodes-manager.js
@@ -66,7 +66,7 @@ export class CustomNodesManager {
 		this.id = "cn-manager";

 		app.registerExtension({
-			name: "Comfy.CustomNodesManager",
+			name: "Comfy.Legacy.CustomNodesManager",
 			afterConfigureGraph: (missingNodeTypes) => {
 				const item = this.getFilterItem(ShowMode.MISSING);
 				if (item) {
@@ -459,7 +459,7 @@ export class CustomNodesManager {

 			".cn-manager-stop": {
 				click: () => {
-					api.fetchApi('/manager/queue/reset');
+					api.fetchApi('/v2/manager/queue/reset');
 					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
@@ -635,7 +635,7 @@ export class CustomNodesManager {
 			};
 		}

-		const response = await api.fetchApi(`/customnode/import_fail_info`, {
+		const response = await api.fetchApi(`/v2/customnode/import_fail_info`, {
 									method: 'POST',
 									headers: { 'Content-Type': 'application/json' },
 									body: JSON.stringify(info)
@@ -1243,7 +1243,7 @@ export class CustomNodesManager {
 	async loadNodes(node_packs) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading node mappings (${mode}) ...`);
-		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			console.log(res.error);
 			return;
@@ -1395,10 +1395,10 @@ export class CustomNodesManager {
 		this.showLoading();
 		let res;
 		if(is_enable) {
-			res = await api.fetchApi(`/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
+			res = await api.fetchApi(`/v2/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
 		}
 		else {
-			res = await api.fetchApi(`/customnode/versions/${node_id}`, { cache: "no-store" });
+			res = await api.fetchApi(`/v2/customnode/versions/${node_id}`, { cache: "no-store" });
 		}
 		this.hideLoading();

@@ -1410,16 +1410,15 @@ export class CustomNodesManager {
 			let version_cnt = 0;

 			if(!is_enable) {
-
-				if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
-					versions.push('latest');
-				}
-
 				if(rowItem.originalData.active_version != 'nightly') {
 					versions.push('nightly');
 					default_version = 'nightly';
 					version_cnt++;
 				}
+
+				if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
+					versions.push('latest');
+				}
 			}

 			for(let v of obj) {
@@ -1440,7 +1439,7 @@ export class CustomNodesManager {
 	}

 	async installNodes(list, btn, title, selected_version) {
-		let stats = await api.fetchApi('/manager/queue/status');
+		let stats = await api.fetchApi('/v2/manager/queue/status');
 		stats = await stats.json();
 		if(stats.is_processing) {
 			customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
@@ -1473,7 +1472,7 @@ export class CustomNodesManager {
 		let needRestart = false;
 		let errorMsg = "";

-		await api.fetchApi('/manager/queue/reset');
+		await api.fetchApi('/v2/manager/queue/reset');

 		let target_items = [];

@@ -1518,7 +1517,7 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}

-			const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
+			const res = await api.fetchApi(`/v2/manager/queue/${api_mode}`, {
 				method: 'POST',
 				body: JSON.stringify(data)
 			});
@@ -1551,7 +1550,7 @@ export class CustomNodesManager {
 			}
 		}
 		else {
-			await api.fetchApi('/manager/queue/start');
+			await api.fetchApi('/v2/manager/queue/start');
 			this.showStop();
 			showTerminal();
 		}
@@ -1559,6 +1558,9 @@ export class CustomNodesManager {

 	async onQueueStatus(event) {
 		let self = CustomNodesManager.instance;
+		// If legacy manager front is not open, return early (using new manager front)
+		if (self.element?.style.display === 'none') return
+
 		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
 			const hash = event.detail.target;

@@ -1745,7 +1747,7 @@ export class CustomNodesManager {
 	async getMissingNodesLegacy(hashMap, missing_nodes) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading missing nodes (${mode}) ...`);
-		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get custom node mappings: ${res.error}`);
 			return;
@@ -1860,7 +1862,7 @@ export class CustomNodesManager {
 	async getAlternatives() {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading alternatives (${mode}) ...`);
-		const res = await fetchData(`/customnode/alternatives?mode=${mode}`);
+		const res = await fetchData(`/v2/customnode/alternatives?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get alternatives: ${res.error}`);
 			return [];
@@ -1908,7 +1910,7 @@ export class CustomNodesManager {
 			infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
 		}

-		const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
+		const res = await fetchData(`/v2/customnode/getlist?mode=${mode}${skip_update}`);
 		if (res.error) {
 			this.showError("Failed to get custom node list.");
 			this.hideLoading();
--- a/comfyui_manager/js/model-manager.css
+++ b/comfyui_manager/js/model-manager.css
--- a/comfyui_manager/js/model-manager.js
+++ b/comfyui_manager/js/model-manager.js
@@ -172,7 +172,7 @@ export class ModelManager {

 			".cmm-manager-stop": {
 				click: () => {
-					api.fetchApi('/manager/queue/reset');
+					api.fetchApi('/v2/manager/queue/reset');
 					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
@@ -413,7 +413,7 @@ export class ModelManager {
 	}

 	async installModels(list, btn) {
-		let stats = await api.fetchApi('/manager/queue/status');
+		let stats = await api.fetchApi('/v2/manager/queue/status');

 		stats = await stats.json();
 		if(stats.is_processing) {
@@ -427,7 +427,7 @@ export class ModelManager {
 		let needRefresh = false;
 		let errorMsg = "";

-		await api.fetchApi('/manager/queue/reset');
+		await api.fetchApi('/v2/manager/queue/reset');

 		let target_items = [];

@@ -446,7 +446,7 @@ export class ModelManager {
 			const data = item.originalData;
 			data.ui_id = item.hash;

-			const res = await api.fetchApi(`/manager/queue/install_model`, {
+			const res = await api.fetchApi(`/v2/manager/queue/install_model`, {
 				method: 'POST',
 				body: JSON.stringify(data)
 			});
@@ -477,7 +477,7 @@ export class ModelManager {
 			}
 		}
 		else {
-			await api.fetchApi('/manager/queue/start');
+			await api.fetchApi('/v2/manager/queue/start');
 			this.showStop();
 			showTerminal();
 		}
@@ -623,7 +623,7 @@ export class ModelManager {

 		const mode = manager_instance.datasrc_combo.value;

-		const res = await fetchData(`/externalmodel/getlist?mode=${mode}`);
+		const res = await fetchData(`/v2/externalmodel/getlist?mode=${mode}`);
 		if (res.error) {
 			this.showError("Failed to get external model list.");
 			this.hideLoading();
--- a/comfyui_manager/js/node_fixer.js
+++ b/comfyui_manager/js/node_fixer.js
@@ -142,7 +142,7 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
 }

 app.registerExtension({
-	name: "Comfy.Manager.NodeFixer",
+	name: "Comfy.Legacy.Manager.NodeFixer",
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({
--- a/comfyui_manager/js/popover-helper.js
+++ b/comfyui_manager/js/popover-helper.js
--- a/comfyui_manager/js/snapshot.js
+++ b/comfyui_manager/js/snapshot.js
@@ -7,7 +7,7 @@ import { manager_instance, rebootAPI, show_message } from  "./common.js";
 async function restore_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/snapshot/restore?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/v2/snapshot/restore?target=${target}`, { cache: "no-store" });

 			if(response.status == 403) {
 				show_message('This action is not allowed with this security level configuration.');
@@ -35,7 +35,7 @@ async function restore_snapshot(target) {
 async function remove_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/snapshot/remove?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/v2/snapshot/remove?target=${target}`, { cache: "no-store" });

 			if(response.status == 403) {
 				show_message('This action is not allowed with this security level configuration.');
@@ -61,7 +61,7 @@ async function remove_snapshot(target) {

 async function save_current_snapshot() {
 	try {
-		const response = await api.fetchApi('/snapshot/save', { cache: "no-store" });
+		const response = await api.fetchApi('/v2/snapshot/save', { cache: "no-store" });
 		app.ui.dialog.close();
 		return true;
 	}
@@ -76,7 +76,7 @@ async function save_current_snapshot() {
 }

 async function getSnapshotList() {
-	const response = await api.fetchApi(`/snapshot/getlist`);
+	const response = await api.fetchApi(`/v2/snapshot/getlist`);
 	const data = await response.json();
 	return data;
 }
--- a/comfyui_manager/js/turbogrid.esm.js
+++ b/comfyui_manager/js/turbogrid.esm.js
--- a/comfyui_manager/js/workflow-metadata.js
+++ b/comfyui_manager/js/workflow-metadata.js
@@ -38,7 +38,7 @@ class WorkflowMetadataExtension {
   * enabled is true if the node is enabled, false if it is disabled
   */
  async getInstalledNodes() {
-    const res = await api.fetchApi("/customnode/installed");
+    const res = await api.fetchApi("/v2/customnode/installed");
    return await res.json();
  }

@@ -70,7 +70,7 @@ class WorkflowMetadataExtension {
        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.trim();
+        if (ver) nodeProperties.ver = ver;
      } else if (["nodes", "comfy_extras"].includes(moduleType)) {
        nodeProperties.cnr_id = "comfy-core";
        nodeProperties.ver = this.comfyCoreVersion;
--- a/comfyui_manager/prestartup_script.py
+++ b/comfyui_manager/prestartup_script.py
@@ -12,13 +12,10 @@ import ast
 import logging
 import traceback

-glob_path = os.path.join(os.path.dirname(__file__), "glob")
-sys.path.append(glob_path)
-
-import security_check
-import manager_util
-import cm_global
-import manager_downloader
+from .glob import security_check
+from .glob import manager_util
+from .glob import cm_global
+from .glob import manager_downloader
 import folder_paths

 manager_util.add_python_path_to_env()
@@ -40,8 +37,8 @@ else:

 security_check.security_check()

-cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
-cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
+cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
+cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']


 def skip_pip_spam(x):
@@ -68,15 +65,17 @@ comfy_path = os.environ.get('COMFYUI_PATH')
 comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')

 if comfy_path is None:
-    # legacy env var
-    comfy_path = os.environ.get('COMFYUI_PATH')
-
-if comfy_path is None:
-    comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
+    try:
+        comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
+        os.environ['COMFYUI_PATH'] = comfy_path
+    except:
+        print("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
+        exit(-1)

 if comfy_base_path is None:
    comfy_base_path = comfy_path

+
 sys.__comfyui_manager_register_message_collapse = register_message_collapse
 sys.__comfyui_manager_is_import_failed_extension = is_import_failed_extension
 cm_global.register_api('cm.register_message_collapse', register_message_collapse)
@@ -392,7 +391,11 @@ try:
        def emit(self, record):
            global is_start_mode

-            message = record.getMessage()
+            try:
+                message = record.getMessage()
+            except Exception as e:
+                message = f"<<logging error>>: {record} - {e}"
+                original_stderr.write(message)

            if is_start_mode:
                match = re.search(pat_import_fail, message)
--- a/custom-node-list.json
+++ b/custom-node-list.json
--- a/extension-node-map.json
+++ b/extension-node-map.json
--- a/github-stats.json
+++ b/github-stats.json
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
@@ -12,376 +12,7 @@
        
        
        
-        {
-            "author": "leon-etienne",
-            "title": "ComfyUI_Scoring-Nodes",
-            "reference": "https://github.com/leon-etienne/ComfyUI_Scoring-Nodes",
-            "files": [
-                "https://github.com/leon-etienne/ComfyUI_Scoring-Nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Text Similarity (CLIP), Image Similarity (CLIP), Multi Text→Image Similarity, Multi Image→Text Similarity, Aesthetic Score, Multi Aesthetic Comparison"
-        },
-        {
-            "author": "tanmoy-it",
-            "title": "comfyuiCustomNode",
-            "reference": "https://github.com/tanmoy-it/comfyuiCustomNode",
-            "files": [
-                "https://github.com/tanmoy-it/comfyuiCustomNode"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Download Image (Direct/No Save)"
-        },
-        {
-            "author": "Jingwen-genies",
-            "title": "comfyui-genies-nodes",
-            "reference": "https://github.com/Jingwen-genies/comfyui-genies-nodes",
-            "files": [
-                "https://github.com/Jingwen-genies/comfyui-genies-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Genies Pose Estimation, Genies Scale Face by Keypoints, Get V Channel from HSV, Select RGB by Mask"
-        },
-        {
-            "author": "Tawbaware",
-            "title": "ComfyUI-Tawbaware [WIP]",
-            "reference": "https://github.com/Tawbaware/ComfyUI-Tawbaware",
-            "files": [
-                "https://github.com/Tawbaware/ComfyUI-Tawbaware"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "lucafoscili",
-            "title": "LF Nodes [UNSAFE]",
-            "reference": "https://github.com/lucafoscili/lf-nodes",
-            "files": [
-                "https://github.com/lucafoscili/lf-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom nodes with a touch of extra UX, including: history for primitives, JSON manipulation, logic switches with visual feedback, LLM chat... and more!\n[w/This node pack contains a node with a vulnerability that allows arbitrary code execution.]"
-        },
-        {
-            "author": "jerryname2022",
-            "title": "ComfyUI-Real-ESRGAN [WIP]",
-            "reference": "https://github.com/jerryname2022/ComfyUI-Real-ESRGAN",
-            "files": [
-                "https://github.com/jerryname2022/ComfyUI-Real-ESRGAN"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Real-ESRGAN Model Loader, GFPGAN Model Loader, Real-ESRGAN Image Generator, GFPGAN Image Generator"
-        },
-        {
-            "author": "mm-akhtar",
-            "title": "comfyui-mask-selector-node",
-            "reference": "https://github.com/mm-akhtar/comfyui-mask-selector-node",
-            "files": [
-                "https://github.com/mm-akhtar/comfyui-mask-selector-node"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Mask Selector"
-        },
-        {
-            "author": "ryanontheinside",
-            "title": "ComfyUI-Livepeer [WIP]",
-            "reference": "https://github.com/ryanontheinside/ComfyUI-Livepeer",
-            "files": [
-                "https://github.com/ryanontheinside/ComfyUI-Livepeer"
-            ],
-            "install_type": "git-clone",
-            "description": "A ComfyUI extension that provides integration with [a/Livepeer](https://livepeer.org/)'s AI services allowing for both sync and async generation."
-        },
-        {
-            "author": "newraina",
-            "title": "ComfyUI-Remote-Save-Image [UNSAFE]",
-            "reference": "https://github.com/newraina/ComfyUI-Remote-Save-Image",
-            "files": [
-               "https://github.com/newraina/ComfyUI-Remote-Save-Image"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom node for ComfyUI that allows uploading generated images to any HTTP endpoint.[w/This node allows any users to send any locally stored image to a specified URL.]"
-        },
-        {
-            "author": "SXQBW",
-            "title": "ComfyUI-Qwen-VLM [WIP]",
-            "reference": "https://github.com/SXQBW/ComfyUI-Qwen-VLM",
-            "files": [
-               "https://github.com/SXQBW/ComfyUI-Qwen-VLM"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: QwenVLM"
-        },
-        {
-            "author": "kijai",
-            "title": "ComfyUI-FramePackWrapper [WIP]",
-            "reference": "https://github.com/kijai/ComfyUI-FramePackWrapper",
-            "files": [
-               "https://github.com/kijai/ComfyUI-FramePackWrapper"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI Wrapper for FramePack by lllyasviel"
-        },
-        {
-            "author": "WaiyanLing",
-            "title": "ComfyUI-Tracking [WIP]",
-            "reference": "https://github.com/WaiyanLing/ComfyUI-Tracking",
-            "files": [
-                "https://github.com/WaiyanLing/ComfyUI-Tracking"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI-Tracking This node pack helps to conveniently collect invocation data from workflows for further study.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "vladp0727",
-            "title": "ComfyUI Simple Image Tools [WIP]",
-            "reference": "https://github.com/vladp0727/Comfyui-with-Furniture",
-            "files": [
-                "https://github.com/vladp0727/Comfyui-with-Furniture"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Get Mask From Alpha, Get Quadrilateral Outfit\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "Simlym",
-            "title": "Simlym/comfyui-prompt-helper [WIP]",
-            "reference": "https://github.com/Simlym/comfyui-prompt-helper",
-            "files": [
-                "https://github.com/Simlym/comfyui-prompt-helper"
-            ],
-            "install_type": "git-clone",
-            "description": "A ComfyUI custom node for processing Chinese prompts and generating English prompts with LLM\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "ryanontheinside",
-            "title": "ComfyUI MineWorld Nodes [WIP]",
-            "reference": "https://github.com/ryanontheinside/ComfyUI-MineWorld",
-            "files": [
-                "https://github.com/ryanontheinside/ComfyUI-MineWorld"
-            ],
-            "install_type": "git-clone",
-            "description": "This extension integrates Microsoft's MineWorld - an interactive world model for Minecraft - into ComfyUI.\nMineWorld allows you to generate interactive Minecraft gameplay based on actions you provide, creating realistic Minecraft gameplay videos."
-        },
-        {
-            "author": "SanDiegoDude",
-            "title": "HiDreamSampler for ComfyUI [WIP]",
-            "reference": "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler",
-            "files": [
-                "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom ComfyUI node for generating images using the HiDream AI model.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "AJO-reading",
-            "title": "ComfyUI-AjoNodes [WIP]",
-            "reference": "https://github.com/AJO-reading/ComfyUI-AjoNodes",
-            "files": [
-                "https://github.com/AJO-reading/ComfyUI-AjoNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of custom nodes designed for ComfyUI from the AJO-reading organization. This repository currently includes the Audio Collect & Concat node, which collects multiple audio segments and concatenates them into a single audio stream.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "ZenAI-Vietnam",
-            "title": "ComfyUI_InfiniteYou [NAME CONFLICT]",
-            "reference": "https://github.com/ZenAI-Vietnam/ComfyUI_InfiniteYou",
-            "files": [
-                "https://github.com/ZenAI-Vietnam/ComfyUI_InfiniteYou"
-            ],
-            "install_type": "git-clone",
-            "description": "An implementation of InfiniteYou for ComfyUI. Native support for [a/InfiniteYou](https://github.com/bytedance/InfiniteYou) in ComfyUI, designed by the ZenAI team."
-        },
-        {
-            "author": "filipemeneses",
-            "title": "ComfyUI_html [UNSAFE]",
-            "reference": "https://github.com/filipemeneses/ComfyUI_html",
-            "files": [
-                "https://github.com/filipemeneses/ComfyUI_html"
-            ],
-            "install_type": "git-clone",
-            "description": "Nodes to manipulate HTML.[w/This extension poses a risk of XSS vulnerability.]"
-        },
-        {
-            "author": "LLMCoder2023",
-            "title": "ComfyUI-LLMCoderNodes",
-            "reference": "https://github.com/LLMCoder2023/ComfyUI-LLMCoderNodes",
-            "files": [
-                "https://github.com/LLMCoder2023/ComfyUI-LLMCoderNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: String Template Interpolation, Variable Definition, Weighted Attributes Formatter"
-        },
-        {
-            "author": "FaberVS",
-            "title": "MultiModel",
-            "reference": "https://github.com/FaberVS/MultiModel",
-            "files": [
-                "https://github.com/FaberVS/MultiModel"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of ComfyUI nodes enabling seamless integration of multiple models into workflows without requiring constant configuration."
-        },
-        {
-            "author": "m-ai-studio",
-            "title": "mai-prompt-progress",
-            "reference": "https://github.com/m-ai-studio/mai-prompt-progress",
-            "files": [
-                "https://github.com/m-ai-studio/mai-prompt-progress"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI extensions for sending prompt progress to webhook"
-        },
-        {
-            "author": "ashllay",
-            "title": "ComfyUI_MoreComfy",
-            "reference": "https://github.com/ashllay/ComfyUI_MoreComfy",
-            "files": [
-                "https://github.com/ashllay/ComfyUI_MoreComfy"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: MC Switch Seed/Image/Latent/Model/String, MC Alter Seed, MC Set Tile Size, MC Get Image Size, MC Multi Concat"
-        },
-        {
-            "author": "gordon1chuge2623",
-            "title": "ComfyUI_seal_migration [WIP]",
-            "reference": "https://github.com/chuge26/ComfyUI_seal_migration",
-            "files": [
-                "https://github.com/chuge26/ComfyUI_seal_migration"
-            ],
-            "install_type": "git-clone",
-            "description": "This project implements stamp migration in PDF files based on ComfyUI, allowing stamps from specified pages of a source PDF to be transferred to specified pages of a target PDF.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "gordon123",
-            "title": "ComfyUI_srt2speech [WIP]",
-            "reference": "https://github.com/gordon123/ComfyUI_srt2speech",
-            "files": [
-                "https://github.com/gordon123/ComfyUI_srt2speech"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI_srt2speech"
-        },
-        {
-            "author": "hnmr293",
-            "title": "ComfyUI-SamOne - one-step sampling",
-            "reference": "https://github.com/hnmr293/ComfyUI-SamOne",
-            "files": [
-                "https://github.com/hnmr293/ComfyUI-SamOne"
-            ],
-            "install_type": "git-clone",
-            "description": "This is a node that advances sampling by just one step in ComfyUI."
-        },
-        {
-            "author": "rphmeier",
-            "title": "comfyui-videodepthanything",
-            "reference": "https://github.com/rphmeier/comfyui-videodepthanything",
-            "files": [
-                "https://github.com/rphmeier/comfyui-videodepthanything"
-            ],
-            "install_type": "git-clone",
-            "description": "VideoDepthAnything nodes for ComfyUI"
-        },
-        {
-            "author": "MITCAP",
-            "title": "ComfyUI OpenAI DALL-E 3 Node [WIP]",
-            "reference": "https://github.com/MITCAP/OpenAI-ComfyUI",
-            "files": [
-                "https://github.com/MITCAP/OpenAI-ComfyUI"
-            ],
-            "install_type": "git-clone",
-            "description": "This project provides custom nodes for ComfyUI that integrate with OpenAI's DALL-E 3 and GPT-4o models. The nodes allow users to generate images and describe images using OpenAI's API.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "benmizrahi",
-            "title": "ComfyGCS [WIP]",
-            "reference": "https://github.com/benmizrahi/ComfyGCS",
-            "files": [
-                "https://github.com/benmizrahi/ComfyGCS"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyGCS is a robust read/write plugin for Google Cloud Storage, designed to simplify interaction with GCS buckets in your projects.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "dogcomplex",
-            "title": "ComfyUI-LOKI [WIP]",
-            "reference": "https://github.com/dogcomplex/ComfyUI-LOKI",
-            "files": [
-                "https://github.com/dogcomplex/ComfyUI-LOKI"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Glamour\nNOTE: This node pack installs pip dependencies outside the control of ComfyUI-Manager."
-        },
-        {
-            "author": "hunzmusic",
-            "title": "Comfyui-CraftsMan3DWrapper [WIP]",
-            "reference": "https://github.com/hunzmusic/Comfyui-CraftsMan3DWrapper",
-            "files": [
-                "https://github.com/hunzmusic/Comfyui-CraftsMan3DWrapper"
-            ],
-            "install_type": "git-clone",
-            "description": "A wrapper for CraftsMan\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "jax-explorer",
-            "title": "ComfyUI-H-flow",
-            "reference": "https://github.com/jax-explorer/ComfyUI-H-flow",
-            "files": [
-                "https://github.com/jax-explorer/ComfyUI-H-flow"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Wan2-1 Image To Video, LLM Task, Save Image, Save Video, Show Text, FluxPro Ultra, IdeogramV2 Turbo, Runway Image To Video, Kling Image To Video, Replace Text, Join Text, Test Image, Test Text"
-        },
-        {
-            "author": "Slix-M-Lestragg",
-            "title": "comfyui-enhanced [WIP]",
-            "reference": "https://github.com/Slix-M-Lestragg/comfyui-enhanced",
-            "files": [
-                "https://github.com/Slix-M-Lestragg/comfyui-enhanced"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "tzsoulcap",
-            "title": "ComfyUI-SaveImg-W-MetaData",
-            "reference": "https://github.com/tzsoulcap/ComfyUI-SaveImg-W-MetaData",
-            "files": [
-                "https://github.com/tzsoulcap/ComfyUI-SaveImg-W-MetaData"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: CAP Checkpoint Selector, CAP Save Image w/Metadata, CAP Load Image with Metadata, CAP Tag Image, CAP Sampler Selector, CAP Scheduler Selector, CAP Seed Generator, CAP String Literal, CAP Width/Height Literal, CAP Cfg Literal, CAP Int Literal"
-        },
-        {
-            "author": "hylarucoder",
-            "title": "comfyui-copilot",
-            "reference": "https://github.com/hylarucoder/comfyui-copilot",
-            "files": [
-                "https://github.com/hylarucoder/comfyui-copilot"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Eagle Image Node for PNGInfo, SDXL Resolution Presets (ws), SDXL Prompt Styler, SDXL Prompt Styler Advanced"
-        },
-        {
-            "author": "SS-snap",
-            "title": "Comfyui_SSsnap_pose-Remapping",
-            "reference": "https://github.com/SS-snap/Comfyui_SSsnap_pose-Remapping",
-            "files": [
-                "https://github.com/SS-snap/Comfyui_SSsnap_pose-Remapping"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: SSsnap Apply Pose Diff ✂️, SSsnap Pose Diff Calculator 🛠️"
-        },
-        {
-            "author": "AlejandroTuzzi",
-            "title": "TUZZI-ByPass [WIP]",
-            "reference": "https://github.com/AlejandroTuzzi/TUZZI-ByPass",
-            "files": [
-                "https://github.com/AlejandroTuzzi/TUZZI-ByPass"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom nodes for automated AI pipelines\nNOTE: The files in the repo are not organized."
-        },
+        
        {
            "author": "oxysoft",
            "title": "Comfy-Compel",
@@ -560,7 +191,7 @@
                "https://github.com/grokuku/ComfyUI-Holaf"
            ],
            "install_type": "git-clone",
-            "description": "NODES: Neurogrid Overload, Tile Calculator, Slice Calculator, Save Image, Tiled KSampler, KSampler, Image Comparer, Upscale, Overlay, Resolution Preset, Benchmark Runner, Benchmark Plotter, Benchmark Loader"
+            "description": "NODES: Neurogrid Overload, Tile Calculator, Slice Calculator, Save Image, Tiled KSampler, KSampler, Image Comparer, Upscale"
        },
        {
            "author": "Burgstall-labs",
@@ -683,6 +314,16 @@
            "install_type": "git-clone",
            "description": "Nova utils for ComfyUI"
        },
+        {
+            "author": "niknah",
+            "title": "niknah/ComfyUI-InfiniteYou",
+            "reference": "https://github.com/niknah/ComfyUI-InfiniteYou",
+            "files": [
+                "https://github.com/niknah/ComfyUI-InfiniteYou"
+            ],
+            "install_type": "git-clone",
+            "description": "Put anyone's face on anything with Byte Dance's [a/InfiniteYou](https://github.com/bytedance/InfiniteYou)."
+        },
        {
            "author": "sugarkwork",
            "title": "comfyui_my_img_util",
@@ -863,6 +504,26 @@
            "install_type": "git-clone",
            "description": "Custom nodes for basic actions."
        },
+        {
+            "author": "silveroxides",
+            "title": "ComfyUI-ModelUtils [WIP]",
+            "reference": "https://github.com/silveroxides/ComfyUI-ModelUtils",
+            "files": [
+                "https://github.com/silveroxides/ComfyUI-ModelUtils"
+            ],
+            "install_type": "git-clone",
+            "description": "[WIP]Custom nodes for handling, inspecting, modifying and creating various model files."
+        },
+        {
+            "author": "thisiseddy-ab",
+            "title": "ComfyUI-Edins-Ultimate-Pack",
+            "reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
+            "files": [
+                "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
+            ],
+            "install_type": "git-clone",
+            "description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
+        },
        {
            "author": "longzoho",
            "title": "ComfyUI-Qdrant-Saver",
@@ -1212,7 +873,7 @@
                "https://github.com/grinlau18/ComfyUI_XISER_Nodes"
             ],
             "install_type": "git-clone",
-             "description": "Custom nodes for customizing workflows\nNOTE: The files in the repo are not organized."
+             "description": "A collection of custom nodes for ComfyUI\nNOTE: The files in the repo are not organized."
        },
        {
            "author": "LAOGOU-666",
@@ -1505,6 +1166,16 @@
            "install_type": "git-clone",
            "description": "Fetches URLs"
        },
+        {
+            "author": "myAiLemon",
+            "title": "MagicAutomaticPicture [WIP]",
+            "reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
+            "files": [
+                "https://github.com/myAiLemon/MagicAutomaticPicture"
+            ],
+            "install_type": "git-clone",
+            "description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
+        },
        {
            "author": "neverbiasu",
            "title": "ComfyUI_Output_as_Input",
@@ -1953,7 +1624,7 @@
                "https://github.com/zyd232/ComfyUI-zyd232-Nodes"
            ],
            "install_type": "git-clone",
-            "description": "NODES: Image Pixels Compare, Save Preview Images"
+            "description": "NODES: Image Pixels Compare"
        },
        {
            "author": "yanhuifair",
@@ -2892,6 +2563,16 @@
            "install_type": "git-clone",
            "description": "NODES:LETM Save Image, ETM Load Image From Local"
        },
+        {
+            "author": "oshtz",
+            "title": "ComfyUI-oshtz-nodes [WIP]",
+            "reference": "https://github.com/oshtz/ComfyUI-oshtz-nodes",
+            "files": [
+                "https://github.com/oshtz/ComfyUI-oshtz-nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI created for some of my workflows.\nLLM All-in-One Node, String Splitter Node, LoRA Switcher Node, Image Overlay Node\nNOTE: The files in the repo are not organized."
+        },
        {
            "author": "m-ai-studio",
            "title": "mai-prompt-progress",
@@ -3173,6 +2854,16 @@
            "install_type": "copy",
            "description": "This platform extension provides ZhipuAI nodes, enabling you to configure a workflow for online video generation."
        },
+        {
+            "author": "HavocsCall",
+            "title": "comfyui_HavocsCall_Custom_Nodes",
+            "reference": "https://github.com/HavocsCall/comfyui_HavocsCall_Custom_Nodes",
+            "files": [
+                "https://github.com/HavocsCall/comfyui_HavocsCall_Custom_Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:Prompt Combiner, Sampler Config, Text Box, Int to Float, Clip Switch, Conditioning Switch, Image Switch, Latent Switch, Model Switch, String Switch, VAE Switch"
+        },
        {
            "author": "mfg637",
            "title": "ComfyUI-ScheduledGuider-Ext",
--- a/node_db/dev/extension-node-map.json
+++ b/node_db/dev/extension-node-map.json
--- a/node_db/dev/github-stats.json
+++ b/node_db/dev/github-stats.json
--- a/node_db/forked/custom-node-list.json
+++ b/node_db/forked/custom-node-list.json
@@ -1,15 +1,5 @@
 {
    "custom_nodes": [
-        {
-            "author": "SanDiegoDude",
-            "title": "ComfyUI-HiDream-Sampler [WIP]",
-            "reference": "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler",
-            "files": [
-                "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
-        },
        {
            "author": "PramaLLC",
            "title": "ComfyUI BEN - Background Erase Network",
--- a/node_db/legacy/custom-node-list.json
+++ b/node_db/legacy/custom-node-list.json
@@ -10,67 +10,6 @@
        },

        
-        {
-            "author": "zhuanqianfish",
-            "title": "TaesdDecoder [REMOVED]",
-            "reference": "https://github.com/zhuanqianfish/TaesdDecoder",
-            "files": [
-                "https://github.com/zhuanqianfish/TaesdDecoder"
-            ],
-            "install_type": "git-clone",
-            "description": "use TAESD decoded image.you need donwload taesd_decoder.pth and taesdxl_decoder.pth to vae_approx folder first.\n It will result in a slight loss of image quality and a significant decrease in peak video memory during decoding."
-        },
-        {
-            "author": "myAiLemon",
-            "title": "MagicAutomaticPicture [REMOVED]",
-            "reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
-            "files": [
-                "https://github.com/myAiLemon/MagicAutomaticPicture"
-            ],
-            "install_type": "git-clone",
-            "description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
-        },
-        {
-            "author": "thisiseddy-ab",
-            "title": "ComfyUI-Edins-Ultimate-Pack [REMOVED]",
-            "reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
-            "files": [
-                "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
-            ],
-            "install_type": "git-clone",
-            "description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
-        },
-        {
-            "author": "Davros666",
-            "title": "safetriggers [REMOVED]",
-            "reference": "https://github.com/Davros666/safetriggers",
-            "files": [
-                "https://github.com/Davros666/safetriggers"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI Nodes for READING TRIGGERS, TRIGGER-WORDS, TRIGGER-PHRASES FROM LoRAs"
-        },
-        {
-            "author": "cubiq",
-            "title": "Simple Math [REMOVED]",
-            "id": "simplemath",
-            "reference": "https://github.com/cubiq/ComfyUI_SimpleMath",
-            "files": [
-                "https://github.com/cubiq/ComfyUI_SimpleMath"
-            ],
-            "install_type": "git-clone",
-            "description": "custom node for ComfyUI to perform simple math operations"
-        },
-        {
-            "author": "lucafoscili",
-            "title": "LF Nodes [DEPRECATED]",
-            "reference": "https://github.com/lucafoscili/comfyui-lf",
-            "files": [
-                "https://github.com/lucafoscili/comfyui-lf"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom nodes with a touch of extra UX, including: history for primitives, JSON manipulation, logic switches with visual feedback, LLM chat... and more!"
-        },
        {
            "author": "AI2lab",
            "title": "comfyUI-tool-2lab [REMOVED]",
--- a/node_db/new/custom-node-list.json
+++ b/node_db/new/custom-node-list.json
--- a/node_db/new/extension-node-map.json
+++ b/node_db/new/extension-node-map.json
--- a/notebooks/comfyui_colab_with_manager.ipynb
+++ b/notebooks/comfyui_colab_with_manager.ipynb
@@ -1,373 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "aaaaaaaaaa"
-   },
-   "source": [
-    "Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "bbbbbbbbbb"
-   },
-   "outputs": [],
-   "source": [
-    "# #@title Environment Setup\n",
-    "\n",
-    "from pathlib import Path\n",
-    "\n",
-    "OPTIONS = {}\n",
-    "\n",
-    "USE_GOOGLE_DRIVE = True  #@param {type:\"boolean\"}\n",
-    "UPDATE_COMFY_UI = True  #@param {type:\"boolean\"}\n",
-    "USE_COMFYUI_MANAGER = True  #@param {type:\"boolean\"}\n",
-    "INSTALL_CUSTOM_NODES_DEPENDENCIES = True  #@param {type:\"boolean\"}\n",
-    "OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
-    "OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
-    "OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
-    "OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
-    "\n",
-    "current_dir = !pwd\n",
-    "WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
-    "\n",
-    "if OPTIONS['USE_GOOGLE_DRIVE']:\n",
-    "    !echo \"Mounting Google Drive...\"\n",
-    "    %cd /\n",
-    "\n",
-    "    from google.colab import drive\n",
-    "    drive.mount('/content/drive')\n",
-    "\n",
-    "    WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
-    "    %cd /content/drive/MyDrive\n",
-    "\n",
-    "![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
-    "%cd $WORKSPACE\n",
-    "\n",
-    "if OPTIONS['UPDATE_COMFY_UI']:\n",
-    "  !echo -= Updating ComfyUI =-\n",
-    "\n",
-    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
-    "  ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
-    "  ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
-    "  ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
-    "  ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
-    "  ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
-    "  ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
-    "  ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
-    "  ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
-    "  ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
-    "\n",
-    "  !git pull\n",
-    "\n",
-    "!echo -= Install dependencies =-\n",
-    "!pip3 install accelerate\n",
-    "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
-    "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
-    "!pip3 install torchsde\n",
-    "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
-    "\n",
-    "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
-    "  %cd custom_nodes\n",
-    "\n",
-    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
-    "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
-    "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
-    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
-    "\n",
-    "  ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
-    "  %cd ComfyUI-Manager\n",
-    "  !git pull\n",
-    "\n",
-    "%cd $WORKSPACE\n",
-    "\n",
-    "if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
-    "  !echo -= Install custom nodes dependencies =-\n",
-    "  !pip install GitPython\n",
-    "  !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "cccccccccc"
-   },
-   "source": [
-    "Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "dddddddddd"
-   },
-   "outputs": [],
-   "source": [
-    "# Checkpoints\n",
-    "\n",
-    "### SDXL\n",
-    "### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
-    "\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "# SDXL ReVision\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
-    "\n",
-    "# SD1.5\n",
-    "!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
-    "\n",
-    "# SD2\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "# Some SD1.5 anime style\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
-    "#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "\n",
-    "# unCLIP models\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "\n",
-    "# VAE\n",
-    "!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
-    "#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
-    "\n",
-    "\n",
-    "# Loras\n",
-    "#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
-    "#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
-    "\n",
-    "\n",
-    "# T2I-Adapter\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
-    "\n",
-    "# T2I Styles Model\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
-    "\n",
-    "# CLIPVision model (needed for styles model)\n",
-    "#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
-    "\n",
-    "\n",
-    "# ControlNet\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
-    "\n",
-    "# ControlNet SDXL\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
-    "\n",
-    "# Controlnet Preprocessor nodes by Fannovel16\n",
-    "#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
-    "\n",
-    "\n",
-    "# GLIGEN\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
-    "\n",
-    "\n",
-    "# ESRGAN upscale model\n",
-    "#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
-    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
-    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "kkkkkkkkkkkkkkk"
-   },
-   "source": [
-    "### Run ComfyUI with cloudflared (Recommended Way)\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "jjjjjjjjjjjjjj"
-   },
-   "outputs": [],
-   "source": [
-    "!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
-    "!dpkg -i ~/cloudflared-linux-amd64.deb\n",
-    "\n",
-    "import subprocess\n",
-    "import threading\n",
-    "import time\n",
-    "import socket\n",
-    "import urllib.request\n",
-    "\n",
-    "def iframe_thread(port):\n",
-    "  while True:\n",
-    "      time.sleep(0.5)\n",
-    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-    "      result = sock.connect_ex(('127.0.0.1', port))\n",
-    "      if result == 0:\n",
-    "        break\n",
-    "      sock.close()\n",
-    "  print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
-    "\n",
-    "  p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
-    "  for line in p.stderr:\n",
-    "    l = line.decode()\n",
-    "    if \"trycloudflare.com \" in l:\n",
-    "      print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
-    "    #print(l, end='')\n",
-    "\n",
-    "\n",
-    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-    "\n",
-    "!python main.py --dont-print-server"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "kkkkkkkkkkkkkk"
-   },
-   "source": [
-    "### Run ComfyUI with localtunnel\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "jjjjjjjjjjjjj"
-   },
-   "outputs": [],
-   "source": [
-    "!npm install -g localtunnel\n",
-    "\n",
-    "import subprocess\n",
-    "import threading\n",
-    "import time\n",
-    "import socket\n",
-    "import urllib.request\n",
-    "\n",
-    "def iframe_thread(port):\n",
-    "  while True:\n",
-    "      time.sleep(0.5)\n",
-    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-    "      result = sock.connect_ex(('127.0.0.1', port))\n",
-    "      if result == 0:\n",
-    "        break\n",
-    "      sock.close()\n",
-    "  print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
-    "\n",
-    "  print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
-    "  p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
-    "  for line in p.stdout:\n",
-    "    print(line.decode(), end='')\n",
-    "\n",
-    "\n",
-    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-    "\n",
-    "!python main.py --dont-print-server"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "gggggggggg"
-   },
-   "source": [
-    "### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
-    "\n",
-    "You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
-    "\n",
-    "If you want to open it in another window use the link.\n",
-    "\n",
-    "Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "hhhhhhhhhh"
-   },
-   "outputs": [],
-   "source": [
-    "import threading\n",
-    "import time\n",
-    "import socket\n",
-    "def iframe_thread(port):\n",
-    "  while True:\n",
-    "      time.sleep(0.5)\n",
-    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-    "      result = sock.connect_ex(('127.0.0.1', port))\n",
-    "      if result == 0:\n",
-    "        break\n",
-    "      sock.close()\n",
-    "  from google.colab import output\n",
-    "  output.serve_kernel_port_as_iframe(port, height=1024)\n",
-    "  print(\"to open it in a window you can open this link here:\")\n",
-    "  output.serve_kernel_port_as_window(port)\n",
-    "\n",
-    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-    "\n",
-    "!python main.py --dont-print-server"
-   ]
-  }
- ],
- "metadata": {
-  "accelerator": "GPU",
-  "colab": {
-   "provenance": []
-  },
-  "gpuClass": "standard",
-  "kernelspec": {
-   "display_name": "Python 3",
-   "name": "python3"
-  },
-  "language_info": {
-   "name": "python"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 0
-}
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,15 +1,62 @@
+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "comfyui-manager"
+license = { text = "GPL-3.0-only" }
+version = "4.0"
+requires-python = ">= 3.9"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.31.12"
-license = { file = "LICENSE.txt" }
-dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
+readme = "README.md"
+keywords = ["comfyui", "comfyui-manager"]
+
+maintainers = [
+  { name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
+  { name = "Yoland Yan", email = "yoland@drip.art" },
+  { name = "James Kwon", email = "hongilkwon316@gmail.com" },
+  { name = "Robin Huang", email = "robin@drip.art" },
+]
+
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+]
+
+dependencies = [
+    "GitPython", 
+    "PyGithub", 
+    "matrix-client==0.4.0", 
+    "transformers", 
+    "huggingface-hub>0.20", 
+    "typer", 
+    "rich", 
+    "typing-extensions", 
+    "toml", 
+    "uv", 
+    "chardet"
+]
+
+[project.optional-dependencies]
+dev = ["pre-commit", "pytest", "ruff", "pytest-cov"]

 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
-#  Used by Comfy Registry https://comfyregistry.org

-[tool.comfy]
-PublisherId = "drltdata"
-DisplayName = "ComfyUI-Manager"
-Icon = ""
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["comfyui_manager*"]
+
+[tool.ruff]
+line-length = 120
+target-version = "py39"
+
+[tool.ruff.lint]
+select = [
+  "E4", # default
+  "E7", # default
+  "E9", # default
+  "F",  # default
+  "I",  # isort-like behavior (import statement sorting)
+]
--- a/scripts/colab-dependencies.py
+++ b/scripts/colab-dependencies.py
@@ -1,39 +0,0 @@
-import os
-import subprocess
-
-
-def get_enabled_subdirectories_with_files(base_directory):
-    subdirs_with_files = []
-    for subdir in os.listdir(base_directory):
-        try:
-            full_path = os.path.join(base_directory, subdir)
-            if os.path.isdir(full_path) and not subdir.endswith(".disabled") and not subdir.startswith('.') and subdir != '__pycache__':
-                print(f"## Install dependencies for '{subdir}'")
-                requirements_file = os.path.join(full_path, "requirements.txt")
-                install_script = os.path.join(full_path, "install.py")
-
-                if os.path.exists(requirements_file) or os.path.exists(install_script):
-                    subdirs_with_files.append((full_path, requirements_file, install_script))
-        except Exception as e:
-            print(f"EXCEPTION During Dependencies INSTALL on '{subdir}':\n{e}")
-
-    return subdirs_with_files
-
-
-def install_requirements(requirements_file_path):
-    if os.path.exists(requirements_file_path):
-        subprocess.run(["pip", "install", "-r", requirements_file_path])
-
-
-def run_install_script(install_script_path):
-    if os.path.exists(install_script_path):
-        subprocess.run(["python", install_script_path])
-
-
-custom_nodes_directory = "custom_nodes"
-subdirs_with_files = get_enabled_subdirectories_with_files(custom_nodes_directory)
-
-
-for subdir, requirements_file, install_script in subdirs_with_files:
-    install_requirements(requirements_file)
-    run_install_script(install_script)
--- a/scripts/install-comfyui-venv-linux.sh
+++ b/scripts/install-comfyui-venv-linux.sh
@@ -1,21 +0,0 @@
-git clone https://github.com/comfyanonymous/ComfyUI
-cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
-cd ..
-python -m venv venv
-source venv/bin/activate
-python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
-python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
-cd ..
-echo "#!/bin/bash" > run_gpu.sh
-echo "cd ComfyUI" >> run_gpu.sh
-echo "source venv/bin/activate" >> run_gpu.sh
-echo "python main.py --preview-method auto" >> run_gpu.sh
-chmod +x run_gpu.sh
-
-echo "#!/bin/bash" > run_cpu.sh
-echo "cd ComfyUI" >> run_cpu.sh
-echo "source venv/bin/activate" >> run_cpu.sh
-echo "python main.py --preview-method auto --cpu" >> run_cpu.sh
-chmod +x run_cpu.sh
--- a/scripts/install-comfyui-venv-win.bat
+++ b/scripts/install-comfyui-venv-win.bat
@@ -1,17 +0,0 @@
-git clone https://github.com/comfyanonymous/ComfyUI
-cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
-cd ..
-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
-cd ..
-echo "cd ComfyUI" >> run_gpu.bat
-echo "call venv/Scripts/activate" >> run_gpu.bat
-echo "python main.py" >> run_gpu.bat
-
-echo "cd ComfyUI" >> run_cpu.bat
-echo "call venv/Scripts/activate" >> run_cpu.bat
-echo "python main.py --cpu" >> run_cpu.bat
--- a/scripts/install-manager-for-portable-version.bat
+++ b/scripts/install-manager-for-portable-version.bat
@@ -1,3 +0,0 @@
-.\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
--- a/snapshots/the_snapshot_files_are_located_here
+++ b/snapshots/the_snapshot_files_are_located_here
Author	SHA1	Message	Date
bymyself	3c413840d7	use parsed version and id even when no cnr map exists	2025-04-11 16:33:12 -07:00
bymyself	29ca93fcb4	fix: installed nodes should still be initialized in offline mode	2025-04-11 15:56:03 -07:00
bymyself	9dc8e630a0	fix is_legacy_front should be a function still	2025-04-10 18:24:34 -07:00
bymyself	10105ad737	if pip package, force offline mode	2025-04-10 13:09:56 -07:00
bymyself	5738ea861a	don't load legacy web dir when --disable-manager arg set	2025-04-09 22:19:56 -07:00
bymyself	0de9d36c28	enable legacy manager frontend during beta phase	2025-04-09 14:59:32 -07:00
bymyself	05f1a8ab0d	add missing v2 prefix to customnode/installed route	2025-04-09 14:59:06 -07:00
bymyself	5ce170b7ce	don't handle queue in legacy front if element is not visible	2025-04-09 14:58:39 -07:00
bymyself	2b47aad076	don't show menu buttons if past comfyui front 1.16	2025-04-09 14:58:21 -07:00
bymyself	b4dc59331d	fix merge conflict	2025-04-09 14:57:53 -07:00
bymyself	81e84fad78	add workflow to publish to pypi	2025-04-09 08:59:39 -07:00
Dr.Lt.Data	42e8a959dd	Modify the structure to be installable via pip.	2025-04-09 08:59:37 -07:00
Dr.Lt.Data	208ca31836	support installation of system added nodepack modified: install_by_id - Change the install path of the CNR node added by the system to be based on the repo URL instead of the CNR ID.	2025-04-09 08:57:56 -07:00