improved: cm-cli.py save-snapshot - validate output path

fixed: Update all - Properly display the results of the ComfyUI update. fixed: Update all - An issue where the action results of the custom nodes manager were reflected in the main dialog. https://github.com/ltdrdata/ComfyUI-Manager/issues/1548
update DB
2025-02-15 09:23:04 +09:00 · 2025-02-14 07:43:16 +09:00 · 2025-02-14 07:29:48 +09:00 · 2025-02-14 07:29:11 +09:00 · 2025-02-14 07:26:35 +09:00 · 2025-02-13 22:34:36 +09:00
52 changed files with 19485 additions and 7182 deletions
--- a/README.md
+++ b/README.md
@@ -2,15 +2,13 @@

 **ComfyUI-Manager** is an extension designed to enhance the usability of [ComfyUI](https://github.com/comfyanonymous/ComfyUI). It offers management functions to **install, remove, disable, and enable** various custom nodes of ComfyUI. Furthermore, this extension provides a hub feature and convenience functions to access a wide range of information within ComfyUI.

-![menu](misc/menu.jpg)
+![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)

 ## NOTICE
-* V2.48.1: Security policy has been changed. Downloads of models in the list are allowed under the 'normal' security level.
-* V2.47: Security policy has been changed. The former 'normal' is now 'normal-', and 'normal' no longer allows high-risk features, even if your ComfyUI is local.
-* V2.37 Show a ✅ mark to accounts that have been active on GitHub for more than six months.
-* V2.33 Security policy is applied.
-* V2.21 [cm-cli](docs/en/cm-cli.md) tool is added.
-* V2.18 to V2.18.3 is not functioning due to a severe bug. Users on these versions are advised to promptly update to V2.18.4. Please navigate to the `ComfyUI/custom_nodes/ComfyUI-Manager` directory and execute `git pull` to update.
+* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
+* V3.10: `double-click feature` is removed
+  * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
+* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
 * You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.

 ## Installation
@@ -20,7 +18,7 @@
 To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:

 1. goto `ComfyUI/custom_nodes` dir in terminal(cmd)
-2. `git clone https://github.com/ltdrdata/ComfyUI-Manager.git`
+2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
 3. Restart ComfyUI


@@ -30,9 +28,10 @@ To install ComfyUI-Manager in addition to an existing installation of ComfyUI, y
 - 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](misc/portable-install.png)
+![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.)  
@@ -55,6 +54,7 @@ python -m venv venv
 pip install comfy-cli
 comfy install
 ```
+* See also: https://github.com/Comfy-Org/comfy-cli


 ### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
@@ -63,20 +63,19 @@ To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you c
 * **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`
+* **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`.
-  * You have to move `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager` to `ComfyUI/custom_nodes/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.
-  * You have to rename `ComfyUI/custom_nodes/ComfyUI-Manager-main` to `ComfyUI/custom_nodes/ComfyUI-Manager`
+  * 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.
@@ -87,42 +86,17 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 * Support for basic installation of ComfyUI-Manager
 * Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.

-## Changes
-* **2.38** `Install Custom Nodes` menu is changed to `Custom Nodes Manager`.
-* **2.21** [cm-cli](docs/en/cm-cli.md) tool is added.
-* **2.4** Copy the connections of the nearest node by double-clicking.
-* **2.2.3** Support Components System
-* **0.29** Add `Update all` feature
-* **0.25** support db channel
-  * You can directly modify the db channel settings in the `config.ini` file.
-  * If you want to maintain a new DB channel, please modify the `channels.list` and submit a PR.
-* **0.23** support multiple selection
-* **0.18.1** `skip update check` feature added.
-  * A feature that allows quickly opening windows in environments where update checks take a long time.
-* **0.17.1** Bug fix for the issue where enable/disable of the web extension was not working. Compatibility patch for StableSwarmUI.
-  * Requires latest version of ComfyUI (Revision: 1240)
-* **0.17** Support preview method setting feature.
-* **0.14** Support robust update.
-* **0.13** Support additional 'pip' section for install spec.
-* **0.12** Better installation support for Windows.
-* **0.9** Support keyword search in installer menu.
-* **V0.7.1** Bug fix for the issue where updates were not being applied on Windows.
-  * **For those who have been using versions 0.6, please perform a manual git pull in the custom_nodes/ComfyUI-Manager directory.**
-* **V0.7** To address the issue of a slow list refresh, separate the fetch update and update check processes.
-* **V0.6** Support extension installation for missing nodes.
-* **V0.5** Removed external git program dependencies.
-

 ## How To Use

 1. Click "Manager" button on main menu

-    ![mainmenu](misc/main.jpg)
+    ![mainmenu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg)


 2. If you click on 'Install Custom Nodes' or 'Install Models', an installer dialog will open.

-    ![menu](misc/menu.jpg)
+    ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)

    * There are three DB modes: `DB: Channel (1day cache)`, `DB: Local`, and `DB: Channel (remote)`. 
      * `Channel (1day cache)` utilizes Channel cache information with a validity period of one day to quickly display the list.
@@ -138,9 +112,9 @@ This repository provides Colab notebooks that allow you to install and use Comfy

 3. Click 'Install' or 'Try Install' button.

-    ![node-install-dialog](misc/custom-nodes.jpg)
+    ![node-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/custom-nodes.jpg)

-    ![model-install-dialog](misc/models.png)
+    ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/models.jpg)

    * Installed: This item is already installed.
    * Install: Clicking this button will install the item.
@@ -150,39 +124,54 @@ This repository provides Colab notebooks that allow you to install and use Comfy
      * Channel settings have a broad impact, affecting not only the node list but also all functions like "Update all."
    * Conflicted Nodes with a yellow background show a list of nodes conflicting with other extensions in the respective extension. This issue needs to be addressed by the developer, and users should be aware that due to these conflicts, some nodes may not function correctly and may need to be installed accordingly.

-4. If you set the `Badge:` item in the menu as `Badge: Nickname`, `Badge: Nickname (hide built-in)`, `Badge: #ID Nickname`, `Badge: #ID Nickname (hide built-in)` the information badge will be displayed on the node.
-    * When selecting (hide built-in), it hides the 🦊 icon, which signifies built-in nodes.
-      * Nodes without any indication on the badge are custom nodes that Manager cannot recognize.
-    * `Badge: Nickname` displays the nickname of custom nodes, while `Badge: #ID Nickname` also includes the internal ID of the node.
-
-    ![model-install-dialog](misc/nickname.jpg)
-
-
-5. Share
-  ![menu](misc/main.jpg) ![share](misc/share.jpg) 
+4. Share
+  ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg) ![share](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share.jpg) 

  * You can share the workflow by clicking the Share button at the bottom of the main menu or selecting Share Output from the Context Menu of the Image node.
  * Currently, it supports sharing via [https://comfyworkflows.com/](https://comfyworkflows.com/),
    [https://openart.ai](https://openart.ai/workflows/dev), [https://youml.com](https://youml.com) 
    as well as through the Matrix channel.

-  ![menu](misc/share-setting.jpg)
+  ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share-setting.jpg)
  
  * Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Output button on Context Menu.
    * `None`: hide from Main menu
    * `All`: Show a dialog where the user can select a title for sharing.


+## Paths
+In `ComfyUI-Manager` V3.0 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/default/ComfyUI-Manager/`.
+
+* <USER_DIRECTORY>  
+  * If executed without any options, the path defaults to ComfyUI/user.  
+  * It can be set using --user-directory <USER_DIRECTORY>.  
+
+* Basic config files: `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini`
+* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
+* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
+* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
+* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
+* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
+
+
+## `extra_model_paths.yaml` Configuration
+The following settings are applied based on the section marked as `is_default`.
+
+* `custom_nodes`: Path for installing custom nodes
+    * Importing does not need to adhere to the path set as `is_default`, but this is the path where custom nodes are installed by the `ComfyUI Nodes Manager`.
+* `download_model_base`: Path for downloading models
+
+
 ## Snapshot-Manager
 * When you press `Save snapshot` or use `Update All` on `Manager Menu`, the current installation status snapshot is saved.
-  * Snapshot file dir: `ComfyUI-Manager/snapshots`
+  * Snapshot file dir: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
  * You can rename snapshot file.
 * Press the "Restore" button to revert to the installation status of the respective snapshot.
  * However, for custom nodes not managed by Git, snapshot support is incomplete.
 * When you press `Restore`, it will take effect on the next ComfyUI startup.
-  * The selected snapshot file is saved in `ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
+  * The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.

-![model-install-dialog](misc/snapshot.jpg)
+![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)


 ## cm-cli: command line tools for power user
@@ -199,48 +188,18 @@ This repository provides Colab notebooks that allow you to install and use Comfy

 ## Custom node support guide

-* Currently, the system operates by cloning the git repository and sequentially installing the dependencies listed in requirements.txt using pip, followed by invoking the install.py script. In the future, we plan to discuss and determine the specifications for supporting custom nodes.
+* **NOTICE:**
+    - You should no longer assume that the GitHub repository name will match the subdirectory name under `custom_nodes`. The name of the subdirectory under `custom_nodes` will now use the normalized name from the `name` field in `pyproject.toml`.
+    - Avoid relying on directory names for imports whenever possible.

-* Please submit a pull request to update either the custom-node-list.json or model-list.json file.
+* https://docs.comfy.org/registry/overview
+* https://github.com/Comfy-Org/rfcs

-* The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
-
-```
-NODE_CLASS_MAPPINGS = {
-    "ExecutionSwitch": ExecutionSwitch,
-    "ExecutionBlocker": ExecutionBlocker,
-    ...
-}
-
-NODE_CLASS_MAPPINGS.update({
-    "UniFormer-SemSegPreprocessor": Uniformer_SemSegPreprocessor,
-    "SemSegPreprocessor": Uniformer_SemSegPreprocessor,
-})
-```
-  * Or you can provide manually `node_list.json` file.
-
-* When you write a docstring in the header of the .py file for the Node as follows, it will be used for managing the database in the Manager.
-  * Currently, only the `nickname` is being used, but other parts will also be utilized in the future.
-  * The `nickname` will be the name displayed on the badge of the node.
-  * If there is no `nickname`, it will be truncated to 20 characters from the arbitrarily written title and used.
-```
-"""
-@author: Dr.Lt.Data
-@title: Impact Pack
-@nickname: Impact Pack
-@description: This extension offers various detector nodes and detailer nodes that allow you to configure a workflow that automatically enhances facial details. And provide iterative upscaler.
-"""
-```
-
-
-* **Special purpose files** (optional)
+**Special purpose files** (optional)
+  * `pyproject.toml` - Spec file for comfyregistry.
  * `node_list.json` - When your custom nodes pattern of NODE_CLASS_MAPPINGS is not conventional, it is used to manually provide a list of nodes for reference. ([example](https://github.com/melMass/comfy_mtb/raw/main/node_list.json))
  * `requirements.txt` - When installing, this pip requirements will be installed automatically 
  * `install.py` - When installing, it is automatically called
-  * `uninstall.py` - When uninstalling, it is automatically called
-  * `disable.py` - When disabled, it is automatically called
-    * When installing a custom node setup `.js` file, it is recommended to write this script for disabling.
-  * `enable.py` - When enabled, it is automatically called
  * **All scripts are executed from the root path of the corresponding custom node.**


@@ -259,12 +218,12 @@ NODE_CLASS_MAPPINGS.update({
    }
    ```
  * `<current timestamp>` Ensure that the timestamp is always unique.
-    * "components" should have the same structure as the content of the file stored in ComfyUI-Manager/components.
+    * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
      * `<component name>`: The name should be in the format `<prefix>::<node name>`.
        * `<compnent nodeata>`: In the nodedata of the group node.
          * `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
          * `<datetime>`: Saved time
-          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in ComfyUI-Manager/components.
+          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
          * `<category>`: If there is neither a category nor a packname, it is saved in the components category.
          ```
              "version":"1.0",
@@ -281,11 +240,37 @@ NODE_CLASS_MAPPINGS.update({

 ## Support of missing nodes installation

-![missing-menu](misc/missing-menu.jpg)
+![missing-menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-menu.jpg)

 * When you click on the ```Install Missing Custom Nodes``` button in the menu, it displays a list of extension nodes that contain nodes not currently present in the workflow.

-![missing-list](misc/missing-list.jpg)
+![missing-list](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
+
+
+# Config
+* You can modify the `config.ini` file to apply the settings for ComfyUI-Manager.
+    * The path to the `config.ini` used by ComfyUI-Manager is displayed in the startup log messages.
+    * See also: [https://github.com/ltdrdata/ComfyUI-Manager#paths]
+* Configuration options:
+    ```
+    [default]
+    git_exe = <Manually specify the path to the git executable. If left empty, the default git executable path will be used.>
+    use_uv = <Use uv instead of pip for dependency installation.>
+    default_cache_as_channel_url = <Determines whether to retrieve the DB designated as channel_url at startup>
+    bypass_ssl = <Set to True if SSL errors occur to disable SSL.>
+    file_logging = <Configure whether to create a log file used by ComfyUI-Manager.>
+    windows_selector_event_loop_policy = <If an event loop error occurs on Windows, set this to True.>
+    model_download_by_agent = <When downloading models, use an agent instead of torchvision_download_url.>
+    downgrade_blacklist = <Set a list of packages to prevent downgrades. List them separated by commas.>
+    security_level = <Set the security level => strong|normal|normal-|weak>
+    always_lazy_install = <Whether to perform dependency installation on restart even in environments other than Windows.>
+    network_mode = <Set the network mode => public|private|offline>
+    ```
+
+    * network_mode:
+      - public: An environment that uses a typical public network.
+      - private: An environment that uses a closed network, where a private node DB is configured via `channel_url`. (Uses cache if available)
+      - offline: An environment that does not use any external connections when using an offline network. (Uses cache if available)


 ## Additional Feature
@@ -323,6 +308,7 @@ NODE_CLASS_MAPPINGS.update({
 * If you add the item `skip_migration_check = True` to `config.ini`, it will not check whether there are nodes that can be migrated at startup.
  * This option can be used if performance issues occur in a Colab+GDrive environment.

+
 ## Scanner
 When you run the `scan.sh` script:

@@ -339,17 +325,14 @@ When you run the `scan.sh` script:


 ## Troubleshooting
-* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the ComfyUI-Manager/config.ini file that is generated.
+* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` file that is generated.
 * If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
- * Alternatively, download the update-fix.py script from [update-fix.py](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/update-fix.py) and place it in the ComfyUI-Manager directory. Then, run it using your Python command.
-   For the portable version, use `..\..\..\python_embeded\python.exe update-fix.py`.
-* For cases where nodes like `PreviewTextNode` from `ComfyUI_Custom_Nodes_AlekPet` are only supported as front-end nodes, we currently do not provide missing nodes for them.
-* Currently, `vid2vid` is not being updated, causing compatibility issues.
 * If you encounter the error message `Overlapped Object has pending operation at deallocation on Comfyui Manager load` under Windows
  * Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
 * if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.
  * Edit `config.ini` file: add `bypass_ssl = True`

+
 ## Security policy
  * Edit `config.ini` file: add `security_level = <LEVEL>`
    * `strong`
@@ -378,41 +361,6 @@ When you run the `scan.sh` script:
    * Update ComfyUI


-## TODO: Unconventional form of custom node list
-
-* https://github.com/diontimmer/Sample-Diffusion-ComfyUI-Extension
-* https://github.com/senshilabs/NINJA-plugin
-* https://github.com/MockbaTheBorg/Nodes
-* https://github.com/StartHua/Comfyui_GPT_Story
-* https://github.com/NielsGercama/comfyui_customsampling
-* https://github.com/wrightdaniel2017/ComfyUI-VideoLipSync
-* https://github.com/bxdsjs/ComfyUI-Image-preprocessing
-* https://github.com/SMUELDigital/ComfyUI-ONSET
-* https://github.com/SimithWang/comfyui-renameImages
-* https://github.com/icefairy64/comfyui-model-tilt
-* https://github.com/andrewharp/ComfyUI-EasyNodes
-* https://github.com/SimithWang/comfyui-renameImages
-* https://github.com/Tcheko243/ComfyUI-Photographer-Alpha7-Nodes
-* https://github.com/Limbicnation/ComfyUINodeToolbox
-* https://github.com/APZmedia/ComfyUI-APZmedia-srtTools
-
-## Roadmap
-
- [x] System displaying information about failed custom nodes import.
- [x] Guide for missing nodes in ComfyUI vanilla nodes.
- [x] Collision checking system for nodes with the same ID across extensions.
- [x] Template sharing system. (-> Component system based on Group Nodes)
- [x] 3rd party API system.
- [ ] Auto migration for custom nodes with changed structures.
- [ ] Version control feature for nodes.
- [ ] List of currently used custom nodes.
- [x] Download support multiple model download.
- [x] Model download via url.
- [x] List sorting (custom nodes).
- [x] List sorting (model).
- [ ] Provides description of node.
-
-
 # Disclaimer

 * This extension simply provides the convenience of installing custom nodes and does not guarantee their proper functioning.
--- a/cm-cli.py
+++ b/cm-cli.py
@@ -12,6 +12,7 @@ from rich import print
 from typing_extensions import List, Annotated
 import re
 import git
+import importlib


 sys.path.append(os.path.dirname(__file__))
@@ -19,12 +20,16 @@ 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, '..', '..'))

 sys.path.append(comfy_path)
@@ -35,15 +40,7 @@ import manager_core as core
 from manager_core import unified_manager
 import cnr_utils

-
-
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
-comfy_path = os.environ.get('COMFYUI_PATH')
-
-if comfy_path is None:
-    print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
-    comfy_path = os.path.abspath(os.path.join(comfyui_manager_path, '..', '..'))
-

 cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
@@ -70,9 +67,8 @@ core.check_invalid_nodes()
 def read_downgrade_blacklist():
    try:
        import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
        config = configparser.ConfigParser()
-        config.read(config_path)
+        config.read(core.manager_config.path)
        default_conf = config['default']

        if 'downgrade_blacklist' in default_conf:
@@ -88,12 +84,21 @@ read_downgrade_blacklist()  # This is a preparation step for manager_core


 class Ctx:
+    folder_paths = None
+    
    def __init__(self):
        self.channel = 'default'
        self.no_deps = False
        self.mode = 'cache'
        self.user_directory = None
-        self.custom_nodes_paths = [os.path.join(core.comfy_path, 'custom_nodes')]
+        self.custom_nodes_paths = [os.path.join(core.comfy_base_path, 'custom_nodes')]
+        self.manager_files_directory = os.path.dirname(__file__)
+        
+        if Ctx.folder_paths is None:
+            try:
+                Ctx.folder_paths = importlib.import_module('folder_paths')
+            except ImportError:
+                print("Warning: Unable to import folder_paths module")

    def set_channel_mode(self, channel, mode):
        if mode is not None:
@@ -110,7 +115,7 @@ class Ctx:
        if channel is not None:
            self.channel = channel

-        asyncio.run(unified_manager.reload(cache_mode=self.mode == 'cache'))
+        asyncio.run(unified_manager.reload(cache_mode=self.mode, dont_wait=False))
        asyncio.run(unified_manager.load_nightly(self.channel, self.mode))

    def set_no_deps(self, no_deps):
@@ -127,9 +132,9 @@ class Ctx:
        core.update_user_directory(user_directory)

        if os.path.exists(core.manager_pip_overrides_path):
-            cm_global.pip_overrides = {'numpy': 'numpy<2'}
            with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
                cm_global.pip_overrides = json.load(json_file)
+                cm_global.pip_overrides = {'numpy': 'numpy<2'}

    @staticmethod
    def get_startup_scripts_path():
@@ -145,7 +150,10 @@ class Ctx:

    @staticmethod
    def get_custom_nodes_paths():
-        return folder_paths.get_folder_paths('custom_nodes')
+        if Ctx.folder_paths is None:
+            print("Error: folder_paths module is not available")
+            return []
+        return Ctx.folder_paths.get_folder_paths('custom_nodes')


 cmd_ctx = Ctx()
@@ -526,7 +534,7 @@ def get_all_installed_node_specs():
        res.append(node_spec_str)
        processed.add(k)

-    for k, _ in unified_manager.cnr_inactive_nodes.keys():
+    for k in unified_manager.cnr_inactive_nodes.keys():
        if k in processed:
            continue

@@ -535,7 +543,7 @@ def get_all_installed_node_specs():
            node_spec_str = f"{k}@{str(latest[0])}"
            res.append(node_spec_str)

-    for k, _ in unified_manager.nightly_inactive_nodes.keys():
+    for k in unified_manager.nightly_inactive_nodes.keys():
        if k in processed:
            continue

@@ -613,7 +621,10 @@ def install(
    cmd_ctx.set_user_directory(user_directory)
    cmd_ctx.set_channel_mode(channel, mode)
    cmd_ctx.set_no_deps(no_deps)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
    for_each_nodes(nodes, act=install_node)
+    pip_fixer.fix_broken()


@app.command(help="Reinstall custom nodes")
@@ -648,7 +659,10 @@ def reinstall(
    cmd_ctx.set_user_directory(user_directory)
    cmd_ctx.set_channel_mode(channel, mode)
    cmd_ctx.set_no_deps(no_deps)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
    for_each_nodes(nodes, act=reinstall_node)
+    pip_fixer.fix_broken()


@app.command(help="Uninstall custom nodes")
@@ -700,12 +714,15 @@ def update(
    if 'all' in nodes:
        asyncio.run(auto_save_snapshot())

+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+
    for x in nodes:
        if x.lower() in ['comfyui', 'comfy', 'all']:
            update_comfyui()
            break

    update_parallel(nodes)
+    pip_fixer.fix_broken()


@app.command(help="Disable custom nodes")
@@ -798,7 +815,9 @@ def fix(
    if 'all' in nodes:
        asyncio.run(auto_save_snapshot())

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


@app.command("show-versions", help="Show all available versions of the node")
@@ -993,17 +1012,32 @@ def save_snapshot(
        user_directory: str = typer.Option(
            None,
            help="user directory"
-        )
+        ),
+        full_snapshot: Annotated[
+            bool,
+            typer.Option(
+                show_default=False, help="If the snapshot should include custom node, ComfyUI version and pip versions (default), or only custom node details"
+            ),
+        ] = True,
 ):
    cmd_ctx.set_user_directory(user_directory)

-    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output))
+    if(not output.endswith('.json') and not output.endswith('.yaml')):
+        print("ERROR: output path should be either '.json' or '.yaml' file.")
+        raise typer.Exit(code=1)
+    
+    dir_path = os.path.dirname(output)
+    if(dir_path != '' and not os.path.exists(dir_path)):
+        print(f"ERROR: {output} path not exists.")
+        raise typer.Exit(code=1)
+        
+    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
    print(f"Current snapshot is saved as `{path}`")


@app.command("restore-snapshot", help="Restore snapshot from snapshot file")
 def restore_snapshot(
-        snapshot_name: str,
+        snapshot_name: str, 
        pip_non_url: Optional[bool] = typer.Option(
            default=None,
            show_default=False,
@@ -1049,12 +1083,14 @@ def restore_snapshot(
            print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
            exit(1)

+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
    try:
        asyncio.run(core.restore_snapshot(snapshot_path, extras))
    except Exception:
        print("[bold red]ERROR: Failed to restore snapshot.[/bold red]")
        traceback.print_exc()
        raise typer.Exit(code=1)
+    pip_fixer.fix_broken()


@app.command(
@@ -1078,11 +1114,14 @@ def restore_dependencies(

    total = len(node_paths)
    i = 1
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
    for x in node_paths:
        print("----------------------------------------------------------------------------------------------------")
        print(f"Restoring [{i}/{total}]: {x}")
        unified_manager.execute_install_script('', x, instant_execution=True)
        i += 1
+    pip_fixer.fix_broken()


@app.command(
@@ -1094,7 +1133,10 @@ def post_install(
        )
 ):
    path = os.path.expanduser(path)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
    unified_manager.execute_install_script('', path, instant_execution=True)
+    pip_fixer.fix_broken()


@app.command(
@@ -1136,6 +1178,8 @@ def install_deps(
                print(f"[bold red]Invalid json file: {deps}[/bold red]")
                exit(1)

+
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
            for k in json_obj['custom_nodes'].keys():
                state = core.simple_check_custom_node(k)
                if state == 'installed':
@@ -1144,6 +1188,7 @@ def install_deps(
                    asyncio.run(core.gitclone_install(k, instant_execution=True))
                else:  # disabled
                    core.gitclone_set_active([k], False)
+            pip_fixer.fix_broken()

        print("Dependency installation and activation complete.")

--- a/custom-node-list.json
+++ b/custom-node-list.json
--- a/extension-node-map.json
+++ b/extension-node-map.json
--- a/extras.json
+++ b/extras.json
@@ -4,11 +4,12 @@
        "comfyui-animatediff-evolved",
        "comfyui_controlnet_aux",
        "comfyui-impact-pack",
+        "comfyui-impact-subpack",
        "comfyui-custom-scripts",
        "comfyui-layerdiffuse",
        "comfyui-liveportraitkj",
        "aigodlike-comfyui-translation",
-        "comfyui-reactor-node",
+        "comfyui-reactor",
        "comfyui_instantid",
        "sd-dynamic-thresholding",
        "pr-was-node-suite-comfyui-47064894",
--- a/git_helper.py
+++ b/git_helper.py
@@ -4,7 +4,6 @@ import os
 import traceback

 import git
-import configparser
 import json
 import yaml
 import requests
@@ -13,13 +12,13 @@ from git.remote import RemoteProgress


 comfy_path = os.environ.get('COMFYUI_PATH')
+git_exe_path = os.environ.get('GIT_EXE_PATH')

 if comfy_path is None:
-    print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
+    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__), '..', '..'))


-
 def download_url(url, dest_folder, filename=None):
    # Ensure the destination folder exists
    if not os.path.exists(dest_folder):
@@ -43,7 +42,6 @@ def download_url(url, dest_folder, filename=None):
        print(f"Failed to download file from {url}")


-config_path = os.path.join(os.path.dirname(__file__), "config.ini")
 nodelist_path = os.path.join(os.path.dirname(__file__), "custom-node-list.json")
 working_directory = os.getcwd()

@@ -126,9 +124,47 @@ def gitcheck(path, do_fetch=False):
        print("CUSTOM NODE CHECK: Error")


+def get_remote_name(repo):
+    available_remotes = [remote.name for remote in repo.remotes]
+    if 'origin' in available_remotes:
+        return 'origin'
+    elif 'upstream' in available_remotes:
+        return 'upstream'
+    elif len(available_remotes) > 0:
+        return available_remotes[0]
+
+    if not available_remotes:
+        print(f"[ComfyUI-Manager] No remotes are configured for this repository: {repo.working_dir}")
+    else:
+        print(f"[ComfyUI-Manager] Available remotes in '{repo.working_dir}': ")
+        for remote in available_remotes:
+            print(f"- {remote}")
+
+    return None
+
+
 def switch_to_default_branch(repo):
-    default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
-    repo.git.checkout(default_branch)
+    remote_name = get_remote_name(repo)
+
+    try:
+        if remote_name is None:
+            return False
+
+        default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
+        repo.git.checkout(default_branch)
+        return True
+    except:
+        try:
+            repo.git.checkout(repo.heads.master)
+        except:
+            try:
+                if remote_name is not None:
+                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
+            except:
+                pass
+
+    print("[ComfyUI Manager] Failed to switch to the default branch")
+    return False


 def gitpull(path):
@@ -159,7 +195,11 @@ def gitpull(path):
            branch_name = current_branch.name

        remote.fetch()
-        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        if f'{remote_name}/{branch_name}' in repo.refs:
+            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+        else:
+            print("CUSTOM NODE PULL: Fail")  # update fail
+            return

        if commit_hash == remote_commit_hash:
            print("CUSTOM NODE PULL: None")  # there is no update
@@ -349,12 +389,13 @@ def apply_snapshot(path):
                git_custom_node_infos = info['git_custom_nodes']
                file_custom_node_infos = info['file_custom_nodes']

-                checkout_comfyui_hash(comfyui_hash)
+                if comfyui_hash:
+                    checkout_comfyui_hash(comfyui_hash)
                checkout_custom_node_hash(git_custom_node_infos)
                invalidate_custom_node_file(file_custom_node_infos)

                print("APPLY SNAPSHOT: True")
-                if 'pips' in info:
+                if 'pips' in info and info['pips']:
                    return info['pips']
                else:
                    return None
@@ -431,10 +472,8 @@ def restore_pip_snapshot(pips, options):


 def setup_environment():
-    config = configparser.ConfigParser()
-    config.read(config_path)
-    if 'default' in config and 'git_exe' in config['default'] and config['default']['git_exe'] != '':
-        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=config['default']['git_exe'])
+    if git_exe_path is not None:
+        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe_path)


 setup_environment()
--- a/github-stats.json
+++ b/github-stats.json
--- a/glob/cm_global.py
+++ b/glob/cm_global.py
@@ -110,3 +110,6 @@ def add_on_revision_detected(k, f):
            traceback.print_exc()
    else:
        variables['cm.on_revision_detected_handler'].append((k, f))
+
+
+error_dict = {}
--- a/glob/cnr_utils.py
+++ b/glob/cnr_utils.py
@@ -4,23 +4,82 @@ from typing import List
 import manager_util
 import toml
 import os
+import asyncio
+import json
+import time

 base_url = "https://api.comfy.org"


-async def get_cnr_data(page=1, limit=1000, cache_mode=True):
-    try:
-        uri = f'{base_url}/nodes?page={page}&limit={limit}'
-        json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
+lock = asyncio.Lock()

-        for v in json_obj['nodes']:
+is_cache_loading = False
+
+async def get_cnr_data(cache_mode=True, dont_wait=True):
+    try:
+        return await _get_cnr_data(cache_mode, dont_wait)
+    except asyncio.TimeoutError:
+        print("A timeout occurred during the fetch process from ComfyRegistry.")
+        return await _get_cnr_data(cache_mode=True, dont_wait=True)  # timeout fallback
+
+async def _get_cnr_data(cache_mode=True, dont_wait=True):
+    global is_cache_loading
+
+    uri = f'{base_url}/nodes'
+
+    async def fetch_all():
+        remained = True
+        page = 1
+
+        full_nodes = {}
+        while remained:
+            sub_uri = f'{base_url}/nodes?page={page}&limit=30'
+            sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True), timeout=30)
+            remained = page < sub_json_obj['totalPages']
+
+            for x in sub_json_obj['nodes']:
+                full_nodes[x['id']] = x
+
+            if page % 5 == 0:
+                print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
+
+            page += 1
+            time.sleep(0.5)
+
+        print("FETCH ComfyRegistry Data [DONE]")
+
+        for v in full_nodes.values():
            if 'latest_version' not in v:
                v['latest_version'] = dict(version='nightly')

+        return {'nodes': list(full_nodes.values())}
+
+    if cache_mode:
+        is_cache_loading = True
+        cache_state = manager_util.get_cache_state(uri)
+
+        if dont_wait:
+            if cache_state == 'not-cached':
+                return {}
+            else:
+                print("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
+                with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
+                    return json.load(json_file)['nodes']
+
+        if cache_state == 'cached':
+            with open(manager_util.get_cache_path(uri), 'r', encoding="UTF-8", errors="ignore") as json_file:
+                return json.load(json_file)['nodes']
+
+    try:
+        json_obj = await fetch_all()
+        manager_util.save_to_cache(uri, json_obj)
        return json_obj['nodes']
    except:
        res = {}
        print("Cannot connect to comfyregistry.")
+    finally:
+        if cache_mode:
+            is_cache_loading = False

    return res

@@ -92,7 +151,7 @@ def install_node(node_id, version=None):


 def all_versions_of_node(node_id):
-    url = f"https://api.comfy.org/nodes/{node_id}/versions"
+    url = f"{base_url}/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"

    response = requests.get(url)
    if response.status_code == 200:
@@ -113,7 +172,7 @@ def read_cnr_info(fullpath):
            data = toml.load(f)

            project = data.get('project', {})
-            name = project.get('name')
+            name = project.get('name').strip().lower()
            version = project.get('version')

            urls = project.get('urls', {})
@@ -129,3 +188,26 @@ def read_cnr_info(fullpath):
        return None
    except Exception:
        return None  # not valid CNR node pack
+
+
+def generate_cnr_id(fullpath, cnr_id):
+    cnr_id_path = os.path.join(fullpath, '.git', '.cnr-id')
+    try:
+        if not os.path.exists(cnr_id_path):
+            with open(cnr_id_path, "w") as f:
+                return f.write(cnr_id)
+    except:
+        print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
+
+
+def read_cnr_id(fullpath):
+    cnr_id_path = os.path.join(fullpath, '.git', '.cnr-id')
+    try:
+        if os.path.exists(cnr_id_path):
+            with open(cnr_id_path) as f:
+                return f.read().strip()
+    except:
+        pass
+
+    return None
+
--- a/glob/manager_core.py
+++ b/glob/manager_core.py
@@ -1,4 +1,10 @@
+"""
+description:
+    `manager_core` contains the core implementation of the management functions in ComfyUI-Manager.
+"""
+
 import json
+import logging
 import os
 import sys
 import subprocess
@@ -36,7 +42,7 @@ import manager_downloader
 from node_package import InstalledNodePackage


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


@@ -45,6 +51,7 @@ DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/ma

 default_custom_nodes_path = None

+
 def get_default_custom_nodes_path():
    global default_custom_nodes_path
    if default_custom_nodes_path is None:
@@ -74,6 +81,21 @@ def get_comfyui_tag():
        return None


+def get_script_env():
+    new_env = os.environ.copy()
+    git_exe = get_config().get('git_exe')
+    if git_exe is not None:
+        new_env['GIT_EXE_PATH'] = git_exe
+
+    if 'COMFYUI_PATH' not in new_env:
+        new_env['COMFYUI_PATH'] = comfy_path
+
+    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+        new_env['COMFYUI_FOLDERS_BASE_PATH'] = comfy_path
+
+    return new_env
+
+
 invalid_nodes = {}


@@ -96,7 +118,7 @@ def check_invalid_nodes():
            sys.path.append(comfy_path)
            import folder_paths
        except:
-            raise Exception(f"Invalid COMFYUI_PATH: {comfy_path}")
+            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {comfy_path}")

    def check(root):
        global invalid_nodes
@@ -106,7 +128,6 @@ def check_invalid_nodes():
            if subdir in ['.disabled', '__pycache__']:
                continue

-
            package = unified_manager.installed_node_packages.get(subdir)
            if not package:
                continue
@@ -132,7 +153,10 @@ def check_invalid_nodes():
        print("\n---------------------------------------------------------------------------\n")


+# read env vars
 comfy_path = os.environ.get('COMFYUI_PATH')
+comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
+
 if comfy_path is None:
    try:
        import folder_paths
@@ -140,6 +164,9 @@ if comfy_path is None:
    except:
        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))

+if comfy_base_path is None:
+    comfy_base_path = comfy_path
+

 channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
 git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py")
@@ -147,9 +174,10 @@ git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py
 manager_files_path = None
 manager_config_path = None
 manager_channel_list_path = None
-manager_startup_script_path = None
+manager_startup_script_path:str = None
 manager_snapshot_path = None
 manager_pip_overrides_path = None
+manager_components_path = None

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

    manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
    if not os.path.exists(manager_files_path):
@@ -174,6 +203,11 @@ def update_user_directory(user_dir):
    manager_config_path = os.path.join(manager_files_path, 'config.ini')
    manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
    manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    manager_components_path = os.path.join(manager_files_path, "components")
+    manager_util.cache_dir = os.path.join(manager_files_path, "cache")
+
+    if not os.path.exists(manager_util.cache_dir):
+        os.makedirs(manager_util.cache_dir)

 try:
    import folder_paths
@@ -210,7 +244,7 @@ def remap_pip_package(pkg):
 def is_blacklisted(name):
    name = name.strip()

-    pattern = r'([^<>!=]+)([<>!=]=?)([^ ]*)'
+    pattern = r'([^<>!~=]+)([<>!~=]=?)([^ ]*)'
    match = re.search(pattern, name)

    if match:
@@ -225,7 +259,7 @@ def is_blacklisted(name):
        if match is None:
            if name in pips:
                return True
-        elif match.group(2) in ['<=', '==', '<']:
+        elif match.group(2) in ['<=', '==', '<', '~=']:
            if name in pips:
                if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
                    return True
@@ -239,7 +273,7 @@ def is_installed(name):
    if name.startswith('#'):
        return True

-    pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
+    pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
    match = re.search(pattern, name)

    if match:
@@ -254,12 +288,33 @@ def is_installed(name):
        if match is None:
            if name in pips:
                return True
-        elif match.group(2) in ['<=', '==', '<']:
+        elif match.group(2) in ['<=', '==', '<', '~=']:
            if name in pips:
                if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
                    print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
                    return True

+    pkg = manager_util.get_installed_packages().get(name.lower())
+    if pkg is None:
+        return False  # update if not installed
+
+    if match is None:
+        return True   # don't update if version is not specified
+
+    if match.group(2) in ['>', '>=']:
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+        elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
+            print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
+
+    if match.group(2) == '==':
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+
+    if match.group(2) == '~=':
+        if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
+            return False
+
    return name.lower() in manager_util.get_installed_packages()


@@ -270,6 +325,8 @@ def normalize_channel(channel):
        return None
    elif channel.startswith('https://'):
        return channel
+    elif channel.startswith('http://') and get_config()['http_channel_enabled'] == True:
+        return channel

    tmp_dict = get_channel_dict()
    channel_url = tmp_dict.get(channel)
@@ -324,6 +381,16 @@ class UnifiedManager:
        self.custom_node_map_cache = {}    # (channel, mode) -> augmented custom node list json
        self.processed_install = set()

+    def get_module_name(self, x):
+        info = self.active_nodes.get(x)
+        if info is None:
+            for url, fullpath in self.unknown_active_nodes.values():
+                if url == x:
+                    return os.path.basename(fullpath)
+        else:
+            return os.path.basename(info[1])
+
+        return None

    def get_cnr_by_repo(self, url):
        return self.repo_cnr_map.get(git_utils.normalize_url(url))
@@ -433,6 +500,7 @@ class UnifiedManager:
            cnr = self.get_cnr_by_repo(url)
            commit_hash = git_utils.get_commit_hash(fullpath)
            if cnr:
+                cnr_utils.generate_cnr_id(fullpath, cnr['id'])
                return {'id': cnr['id'], 'cnr': cnr, 'ver': 'nightly', 'hash': commit_hash}
            else:
                url = os.path.basename(url)
@@ -456,18 +524,18 @@ class UnifiedManager:
        self.installed_node_packages[node_package.id] = node_package

        if node_package.is_disabled and node_package.is_unknown:
-            # NOTE: unknown package does not have an url.
-            self.unknown_inactive_nodes[node_package.id] = ('', node_package.fullpath)
+            url = git_utils.git_url(node_package.fullpath)
+            self.unknown_inactive_nodes[node_package.id] = (url, node_package.fullpath)

        if node_package.is_disabled and node_package.is_nightly:
            self.nightly_inactive_nodes[node_package.id] = node_package.fullpath

-        if node_package.is_enabled:
+        if node_package.is_enabled and not node_package.is_unknown:
            self.active_nodes[node_package.id] = node_package.version, node_package.fullpath

        if node_package.is_enabled and node_package.is_unknown:
-            # NOTE: unknown package does not have an url.
-            self.unknown_active_nodes[node_package.id] = ('', node_package.fullpath)
+            url = git_utils.git_url(node_package.fullpath)
+            self.unknown_active_nodes[node_package.id] = (url, node_package.fullpath)

        if node_package.is_from_cnr and node_package.is_disabled:
            self.add_to_cnr_inactive_nodes(node_package.id, node_package.version, node_package.fullpath)
@@ -619,7 +687,7 @@ class UnifiedManager:

        return latest

-    async def reload(self, cache_mode):
+    async def reload(self, cache_mode, dont_wait=True):
        self.custom_node_map_cache = {}
        self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
        self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -627,12 +695,14 @@ class UnifiedManager:
        self.unknown_active_nodes = {}    # node_id -> repo url * fullpath
        self.active_nodes = {}            # node_id -> node_version * fullpath

+        if get_config()['network_mode'] != 'public':
+            dont_wait = True
+
        # reload 'cnr_map' and 'repo_cnr_map'
-        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode)
+        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
@@ -659,27 +729,33 @@ class UnifiedManager:
        res = {}

        channel_url = normalize_channel(channel)
-        if channel:
+        if channel_url:
            if mode not in ['remote', 'local', 'cache']:
                print(f"[bold red]ERROR: Invalid mode is specified `--mode {mode}`[/bold red]", file=sys.stderr)
                return {}

        json_obj = await get_data_by_mode(mode, 'custom-node-list.json', channel_url=channel_url)
        for x in json_obj['custom_nodes']:
-            for y in x['files']:
-                if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
-                    repo_name = y.split('/')[-1]
-                    res[repo_name] = (x, False)
+            try:
+                for y in x['files']:
+                    if 'github.com' in y and not (y.endswith('.py') or y.endswith('.js')):
+                        repo_name = y.split('/')[-1]
+                        res[repo_name] = (x, False)

-            if 'id' in x:
-                if x['id'] not in res:
-                    res[x['id']] = (x, True)
+                if 'id' in x:
+                    if x['id'] not in res:
+                        res[x['id']] = (x, True)
+            except:
+                logging.error(f"[ComfyUI-Manager] broken item:{x}")

        return res

    async def get_custom_nodes(self, channel, mode):
-        default_channel = normalize_channel('default')
-        cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
+        # default_channel = normalize_channel('default')
+        # cache = self.custom_node_map_cache.get((default_channel, mode)) # CNR/nightly should always be based on the default channel.
+
+        channel = normalize_channel(channel)
+        cache = self.custom_node_map_cache.get((channel, mode)) # CNR/nightly should always be based on the default channel.

        if cache is not None:
            return cache
@@ -704,6 +780,8 @@ class UnifiedManager:
                    v['title'] = cnr['name']
                    v['description'] = cnr['description']
                    v['health'] = '-'
+                    if 'repository' in cnr:
+                        v['repository'] = cnr['repository']
                    added_cnr.add(cnr['id'])
                    node_id = v['id']
                else:
@@ -739,7 +817,7 @@ class UnifiedManager:
                        package_name = remap_pip_package(line.strip())
                        if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
                            self.processed_install.add(package_name)
-                            install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                            install_cmd = manager_util.make_pip_cmd(["install", package_name])
                            if package_name.strip() != "" and not package_name.startswith('#'):
                                res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)

@@ -779,7 +857,11 @@ class UnifiedManager:

        result = ManagedResult('fix')

-        info = self.active_nodes.get(node_id)
+        if version_spec == 'unknown':
+            info = self.unknown_active_nodes.get(node_id)
+        else:
+            info = self.active_nodes.get(node_id)
+
        if info is None or not os.path.exists(info[1]):
            return result.fail(f'not found: {node_id}@{version_spec}')

@@ -844,7 +926,7 @@ class UnifiedManager:

        archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip"  # should be unpredictable name - security precaution
        download_path = os.path.join(get_default_custom_nodes_path(), archive_name)
-        manager_downloader.download_url(node_info.download_url, get_default_custom_nodes_path(), archive_name)
+        manager_downloader.basic_download_url(node_info.download_url, get_default_custom_nodes_path(), archive_name)

        # 2. extract files into <node_id>
        install_path = self.active_nodes[node_id][1]
@@ -1182,24 +1264,29 @@ class UnifiedManager:
        repo = git.Repo(repo_path)

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

        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 = 'origin'
+            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("[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository")
-                safedir_path = comfy_path.replace('\\', '/')
+                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()
@@ -1210,7 +1297,10 @@ class UnifiedManager:
                          "-----------------------------------------------------------------------------------------\n")

        commit_hash = repo.head.commit.hexsha
-        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.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)
@@ -1234,6 +1324,8 @@ class UnifiedManager:
            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='')
+
        if version_spec is None:
            version_spec = self.resolve_unspecified_version(node_id, guess_mode='active')

@@ -1269,7 +1361,10 @@ class UnifiedManager:
            custom_nodes = await self.get_custom_nodes(channel, mode)
            the_node = custom_nodes.get(node_id)
            if the_node is not None:
-                repo_url = the_node['files'][0]
+                if version_spec == 'unknown':
+                    repo_url = the_node['files'][0]
+                else:  # nightly
+                    repo_url = the_node['repository']
            else:
                result = ManagedResult('install')
                return result.fail(f"Node '{node_id}@{version_spec}' not found in [{channel}, {mode}]")
@@ -1292,7 +1387,10 @@ class UnifiedManager:
                if version_spec == 'unknown':
                    self.unknown_active_nodes[node_id] = to_path
                elif version_spec == 'nightly':
+                    cnr_utils.generate_cnr_id(to_path, node_id)
                    self.active_nodes[node_id] = 'nightly', to_path
+            else:
+                return res

            return res.with_target(version_spec)

@@ -1344,6 +1442,63 @@ class UnifiedManager:
 unified_manager = UnifiedManager()


+def identify_node_pack_from_path(fullpath):
+    module_name = os.path.basename(fullpath)
+    if module_name.endswith('.git'):
+        module_name = module_name[:-4]
+
+    repo_url = git_utils.git_url(fullpath)
+    if repo_url is None:
+        # cnr
+        cnr = cnr_utils.read_cnr_info(fullpath)
+        if cnr is not None:
+            return module_name, cnr['version'], cnr['id']
+
+        return None
+    else:
+        # nightly or unknown
+        cnr_id = cnr_utils.read_cnr_id(fullpath)
+        commit_hash = git_utils.get_commit_hash(fullpath)
+
+        if cnr_id is not None:
+            return module_name, commit_hash, cnr_id
+        else:
+            return module_name, commit_hash, ''
+
+
+def get_installed_node_packs():
+    res = {}
+
+    for x in get_custom_nodes_paths():
+        for y in os.listdir(x):
+            if y == '__pycache__' or y == '.disabled':
+                continue
+
+            fullpath = os.path.join(x, y)
+            info = identify_node_pack_from_path(fullpath)
+            if info is None:
+                continue
+
+            is_disabled = not y.endswith('.disabled')
+
+            res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': is_disabled }
+
+        disabled_dirs = os.path.join(x, '.disabled')
+        if os.path.exists(disabled_dirs):
+            for y in os.listdir(disabled_dirs):
+                if y == '__pycache__':
+                    continue
+
+                fullpath = os.path.join(disabled_dirs, y)
+                info = identify_node_pack_from_path(fullpath)
+                if info is None:
+                    continue
+
+                res[info[0]] = { 'ver': info[1], 'cnr_id': info[2], 'enabled': False }
+
+    return res
+
+
 def get_channel_dict():
    global channel_dict

@@ -1386,9 +1541,7 @@ class ManagerFuncs:
            print(f"[ComfyUI-Manager] Unexpected behavior: `{cmd}`")
            return 0

-        new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
-        subprocess.check_call(cmd, cwd=cwd, env=new_env)
+        subprocess.check_call(cmd, cwd=cwd, env=get_script_env())

        return 0

@@ -1398,22 +1551,23 @@ manager_funcs = ManagerFuncs()

 def write_config():
    config = configparser.ConfigParser()
+
    config['default'] = {
        'preview_method': manager_funcs.get_current_preview_method(),
-        'badge_mode': get_config()['badge_mode'],
-        'git_exe':  get_config()['git_exe'],
+        'git_exe': get_config()['git_exe'],
+        'use_uv': get_config()['use_uv'],
        'channel_url': get_config()['channel_url'],
        'share_option': get_config()['share_option'],
        'bypass_ssl': get_config()['bypass_ssl'],
        "file_logging": get_config()['file_logging'],
-        'default_ui': get_config()['default_ui'],
        'component_policy': get_config()['component_policy'],
-        'double_click_policy': get_config()['double_click_policy'],
        'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
        'model_download_by_agent': get_config()['model_download_by_agent'],
        'downgrade_blacklist': get_config()['downgrade_blacklist'],
        'security_level': get_config()['security_level'],
        'skip_migration_check': get_config()['skip_migration_check'],
+        'always_lazy_install': get_config()['always_lazy_install'],
+        'network_mode': get_config()['network_mode']
    }

    directory = os.path.dirname(manager_config_path)
@@ -1439,41 +1593,51 @@ def read_config():
        else:
            security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'

+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
+
+        def get_bool(key, default_value):
+            return default_conf[key].lower() == 'true' if key in default_conf else False
+
        return {
-                    'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else manager_funcs.get_current_preview_method(),
-                    'badge_mode': default_conf['badge_mode'] if 'badge_mode' in default_conf else 'none',
-                    'git_exe': default_conf['git_exe'] if 'git_exe' in default_conf else '',
-                    'channel_url': default_conf['channel_url'] if 'channel_url' in default_conf else DEFAULT_CHANNEL,
-                    'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
-                    'bypass_ssl': default_conf['bypass_ssl'].lower() == 'true' if 'bypass_ssl' in default_conf else False,
-                    'file_logging': default_conf['file_logging'].lower() == 'true' if 'file_logging' in default_conf else True,
-                    'default_ui': default_conf['default_ui'] if 'default_ui' in default_conf else 'none',
-                    'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow',
-                    'double_click_policy': default_conf['double_click_policy'] if 'double_click_policy' in default_conf else 'copy-all',
-                    'windows_selector_event_loop_policy': default_conf['windows_selector_event_loop_policy'].lower() == 'true' if 'windows_selector_event_loop_policy' in default_conf else False,
-                    'model_download_by_agent': default_conf['model_download_by_agent'].lower() == 'true' if 'model_download_by_agent' in default_conf else False,
-                    'downgrade_blacklist': default_conf['downgrade_blacklist'] if 'downgrade_blacklist' in default_conf else '',
-                    'skip_migration_check': default_conf['skip_migration_check'].lower() == 'true' if 'skip_migration_check' in default_conf else False,
-                    'security_level': security_level
+                    'http_channel_enabled': get_bool('http_channel_enabled', False),
+                    'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()),
+                    'git_exe': default_conf.get('git_exe', ''),
+                    'use_uv': get_bool('use_uv', False),
+                    'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
+                    'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
+                    'share_option': default_conf.get('share_option', 'all'),
+                    'bypass_ssl': get_bool('bypass_ssl', False),
+                    'file_logging': get_bool('file_logging', True),
+                    'component_policy': default_conf.get('component_policy', 'workflow'),
+                    'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
+                    'model_download_by_agent': get_bool('model_download_by_agent', False),
+                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', ''),
+                    'skip_migration_check': get_bool('skip_migration_check', False),
+                    'always_lazy_install': get_bool('always_lazy_install', False),
+                    'network_mode': default_conf.get('network_mode', 'public'),
+                    'security_level': security_level,
               }

    except Exception:
+        manager_util.use_uv = False
        return {
+            'http_channel_enabled': False,
            'preview_method': manager_funcs.get_current_preview_method(),
-            'badge_mode': 'none',
            'git_exe': '',
+            'use_uv': False,
            'channel_url': DEFAULT_CHANNEL,
+            'default_cache_as_channel_url': False,
            'share_option': 'all',
            'bypass_ssl': False,
            'file_logging': True,
-            'default_ui': 'none',
            'component_policy': 'workflow',
-            'double_click_policy': 'copy-all',
            'windows_selector_event_loop_policy': False,
            'model_download_by_agent': False,
            'downgrade_blacklist': '',
            'skip_migration_check': False,
-            'security_level': 'normal',
+            'always_lazy_install': False,
+            'network_mode': 'public',   # public | private | offline
+            'security_level': 'normal', # strong | normal | normal- | weak
        }


@@ -1482,17 +1646,59 @@ def get_config():

    if cached_config is None:
        cached_config = read_config()
+        if cached_config['http_channel_enabled']:
+            print("[ComfyUI-Manager] Warning: http channel enabled, make sure server in secure env")

    return cached_config


+def get_remote_name(repo):
+    available_remotes = [remote.name for remote in repo.remotes]
+    if 'origin' in available_remotes:
+        return 'origin'
+    elif 'upstream' in available_remotes:
+        return 'upstream'
+    elif len(available_remotes) > 0:
+        return available_remotes[0]
+
+    if not available_remotes:
+        print(f"[ComfyUI-Manager] No remotes are configured for this repository: {repo.working_dir}")
+    else:
+        print(f"[ComfyUI-Manager] Available remotes in '{repo.working_dir}': ")
+        for remote in available_remotes:
+            print(f"- {remote}")
+
+    return None
+
+
 def switch_to_default_branch(repo):
-    default_branch = repo.git.symbolic_ref('refs/remotes/origin/HEAD').replace('refs/remotes/origin/', '')
-    repo.git.checkout(default_branch)
+    remote_name = get_remote_name(repo)
+
+    try:
+        if remote_name is None:
+            return False
+
+        default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
+        repo.git.checkout(default_branch)
+        return True
+    except:
+        try:
+            repo.git.checkout(repo.heads.master)
+        except:
+            try:
+                if remote_name is not None:
+                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
+            except:
+                pass
+
+    print("[ComfyUI Manager] Failed to switch to the default branch")
+    return False


 def try_install_script(url, repo_path, install_cmd, instant_execution=False):
-    if not instant_execution and ((len(install_cmd) > 0 and install_cmd[0].startswith('#')) or (platform.system() == "Windows" and comfy_ui_commit_datetime.date() >= comfy_ui_required_commit_datetime.date())):
+    if not instant_execution and (
+            (len(install_cmd) > 0 and install_cmd[0].startswith('#')) or platform.system() == "Windows" or get_config()['always_lazy_install']
+    ):
        if not os.path.exists(manager_startup_script_path):
            os.makedirs(manager_startup_script_path)

@@ -1507,6 +1713,10 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
            if is_blacklisted(install_cmd[4]):
                print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[4]}'")
                return True
+        elif len(install_cmd) == 6 and install_cmd[3:5] == ['pip', 'install']:  # uv mode
+            if is_blacklisted(install_cmd[5]):
+                print(f"[ComfyUI-Manager] skip black listed pip installation: '{install_cmd[5]}'")
+                return True

        print(f"\n## ComfyUI-Manager: EXECUTE => {install_cmd}")
        code = manager_funcs.run_script(install_cmd, cwd=repo_path)
@@ -1539,9 +1749,8 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
    else:
        command = [sys.executable, git_script_path, "--check", path]

-    new_env = os.environ.copy()
-    new_env["COMFYUI_PATH"] = comfy_path
-    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path())
+    new_env = get_script_env()
+    process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path(), env=new_env)
    output, _ = process.communicate()
    output = output.decode('utf-8').strip()

@@ -1592,10 +1801,8 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):


 def __win_check_git_pull(path):
-    new_env = os.environ.copy()
-    new_env["COMFYUI_PATH"] = comfy_path
    command = [sys.executable, git_script_path, "--pull", path]
-    process = subprocess.Popen(command, env=new_env, cwd=get_default_custom_nodes_path())
+    process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
    process.wait()


@@ -1626,9 +1833,9 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
                    if package_name and not package_name.startswith('#'):
                        if '--index-url' in package_name:
                            s = package_name.split('--index-url')
-                            install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
+                            install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
                        else:
-                            install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                            install_cmd = manager_util.make_pip_cmd(["install", package_name])

                        if package_name.strip() != "" and not package_name.startswith('#'):
                            try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
@@ -1661,7 +1868,7 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa

    # Check if the path is a git repository
    if not os.path.exists(os.path.join(path, '.git')):
-        raise ValueError(f'Not a git repository: {path}')
+        raise ValueError(f'[ComfyUI-Manager] Not a valid git repository: {path}')

    if platform.system() == "Windows":
        updated, success = __win_check_git_update(path, do_fetch, do_update)
@@ -1672,7 +1879,11 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
        # Fetch the latest commits from the remote repository
        repo = git.Repo(path)

-        remote_name = 'origin'
+        remote_name = get_remote_name(repo)
+
+        if remote_name is None:
+            raise ValueError(f"No remotes are configured for this repository: {path}")
+
        remote = repo.remote(name=remote_name)

        if not do_update and repo.head.is_detached:
@@ -1682,7 +1893,8 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
            return True, True  # detached branch is treated as updatable

        if repo.head.is_detached:
-            switch_to_default_branch(repo)
+            if not switch_to_default_branch(repo):
+                raise ValueError(f"Failed to switch detached branch to default branch: {path}")

        current_branch = repo.active_branch
        branch_name = current_branch.name
@@ -1695,15 +1907,20 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa

        if do_update:
            if repo.is_dirty():
-                print(f"STASH: '{path}' is dirty.")
+                print(f"\nSTASH: '{path}' is dirty.")
                repo.git.stash()

            if f'{remote_name}/{branch_name}' not in repo.refs:
-                switch_to_default_branch(repo)
+                if not switch_to_default_branch(repo):
+                    raise ValueError(f"Failed to switch to default branch while updating: {path}")
+
                current_branch = repo.active_branch
                branch_name = current_branch.name

-            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+            if f'{remote_name}/{branch_name}' in repo.refs:
+                remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+            else:
+                return False, False

            if commit_hash == remote_commit_hash:
                repo.close()
@@ -1858,7 +2075,8 @@ def git_pull(path):
            repo.git.stash()

        if repo.head.is_detached:
-            switch_to_default_branch(repo)
+            if not switch_to_default_branch(repo):
+                raise ValueError(f"Failed to switch to default branch while pulling: {path}")

        current_branch = repo.active_branch
        remote_name = current_branch.tracking_branch().remote_name
@@ -1877,9 +2095,10 @@ async def get_data_by_mode(mode, filename, channel_url=None):
        channel_url = get_channel_dict()[channel_url]

    try:
+        local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
+
        if mode == "local":
-            uri = os.path.join(manager_util.comfyui_manager_path, filename)
-            json_obj = await manager_util.get_data(uri)
+            json_obj = await manager_util.get_data(local_uri)
        else:
            if channel_url is None:
                uri = get_config()['channel_url'] + '/' + filename
@@ -1889,19 +2108,25 @@ async def get_data_by_mode(mode, filename, channel_url=None):
            cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
            cache_uri = os.path.join(manager_util.cache_dir, cache_uri)

-            if mode == "cache":
-                if manager_util.is_file_created_within_one_day(cache_uri):
+            if get_config()['network_mode'] == 'offline':
+                # offline network mode
+                if os.path.exists(cache_uri):
+                    json_obj = await manager_util.get_data(cache_uri)
+                else:
+                    local_uri = os.path.join(manager_util.comfyui_manager_path, filename)
+                    if os.path.exists(local_uri):
+                        json_obj = await manager_util.get_data(local_uri)
+                    else:
+                        json_obj = {}  # fallback
+            else:
+                # public network mode
+                if mode == "cache" and manager_util.is_file_created_within_one_day(cache_uri):
                    json_obj = await manager_util.get_data(cache_uri)
                else:
                    json_obj = await manager_util.get_data(uri)
                    with manager_util.cache_lock:
                        with open(cache_uri, "w", encoding='utf-8') as file:
                            json.dump(json_obj, file, indent=4, sort_keys=True)
-            else:
-                json_obj = await manager_util.get_data(uri)
-                with manager_util.cache_lock:
-                    with open(cache_uri, "w", encoding='utf-8') as file:
-                        json.dump(json_obj, file, indent=4, sort_keys=True)
    except Exception as e:
        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
        uri = os.path.join(manager_util.comfyui_manager_path, filename)
@@ -1938,7 +2163,7 @@ def gitclone_fix(files, instant_execution=False, no_deps=False):


 def pip_install(packages):
-    install_cmd = ['#FORCE', sys.executable, "-m", "pip", "install", '-U'] + packages
+    install_cmd = ['#FORCE'] + manager_util.make_pip_cmd(["install", '-U']) + packages
    try_install_script('pip install via manager', '..', install_cmd)


@@ -2122,14 +2347,15 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
    repo = git.Repo(repo_path)

    if repo.head.is_detached:
-        switch_to_default_branch(repo)
+        if not switch_to_default_branch(repo):
+            return "fail"

    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 = 'origin'
+        remote_name = get_remote_name(repo)
    else:
        remote_name = current_branch.tracking_branch().remote_name
    remote = repo.remote(name=remote_name)
@@ -2138,8 +2364,8 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
        remote.fetch()
    except Exception as e:
        if 'detected dubious' in str(e):
-            print("[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository")
-            safedir_path = comfy_path.replace('\\', '/')
+            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()
@@ -2148,9 +2374,14 @@ def update_path(repo_path, instant_execution=False, no_deps=False):
                      f"-----------------------------------------------------------------------------------------\n"
                      f'git config --global --add safe.directory "{safedir_path}"\n'
                      f"-----------------------------------------------------------------------------------------\n")
+                return "fail"

    commit_hash = repo.head.commit.hexsha
-    remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+
+    if f'{remote_name}/{branch_name}' in repo.refs:
+        remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
+    else:
+        return "fail"

    if commit_hash != remote_commit_hash:
        git_pull(repo_path)
@@ -2217,16 +2448,20 @@ def check_state_of_git_node_pack_single(item, do_fetch=False, do_update_check=Tr

    if dir_path and os.path.exists(dir_path):
        if do_update_check:
-            update_state, success = git_repo_update_check_with(dir_path, do_fetch, do_update)
-            if (do_update_check or do_update) and update_state:
-                item['update-state'] = 'true'
-            elif do_update and not success:
-                item['update-state'] = 'fail'
+            try:
+                update_state, success = git_repo_update_check_with(dir_path, do_fetch, do_update)
+                if (do_update_check or do_update) and update_state:
+                    item['update-state'] = 'true'
+                elif do_update and not success:
+                    item['update-state'] = 'fail'
+            except Exception:
+                print(f"[ComfyUI-Manager] Failed to check state of the git node pack: {dir_path}")


 def get_installed_pip_packages():
    # extract pip package infos
-    pips = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'], text=True).split('\n')
+    cmd = manager_util.make_pip_cmd(['freeze'])
+    pips = subprocess.check_output(cmd, text=True).split('\n')

    res = {}
    for x in pips:
@@ -2242,7 +2477,7 @@ def get_installed_pip_packages():
    return res


-async def get_current_snapshot():
+async def get_current_snapshot(custom_nodes_only = False):
    await unified_manager.reload('cache')
    await unified_manager.get_custom_nodes('default', 'cache')

@@ -2253,8 +2488,10 @@ async def get_current_snapshot():
        print("ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
        return {}

-    repo = git.Repo(repo_path)
-    comfyui_commit_hash = repo.head.commit.hexsha
+    comfyui_commit_hash = None
+    if not custom_nodes_only:
+        repo = git.Repo(repo_path)
+        comfyui_commit_hash = repo.head.commit.hexsha

    git_custom_nodes = {}
    cnr_custom_nodes = {}
@@ -2291,8 +2528,21 @@ async def get_current_snapshot():
                        cnr_custom_nodes[info['id']] = info['ver']
                    else:
                        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.origin.url
+
+                        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}'.")
@@ -2307,7 +2557,7 @@ async def get_current_snapshot():

                file_custom_nodes.append(item)

-    pip_packages = get_installed_pip_packages()
+    pip_packages = None if custom_nodes_only else get_installed_pip_packages()

    return {
        'comfyui': comfyui_commit_hash,
@@ -2318,7 +2568,7 @@ async def get_current_snapshot():
    }


-async def save_snapshot_with_postfix(postfix, path=None):
+async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = False):
    if path is None:
        now = datetime.now()

@@ -2330,7 +2580,7 @@ async def save_snapshot_with_postfix(postfix, path=None):
        file_name = path.replace('\\', '/').split('/')[-1]
        file_name = file_name.split('.')[-2]

-    snapshot = await get_current_snapshot()
+    snapshot = await get_current_snapshot(custom_nodes_only)
    if path.endswith('.json'):
        with open(path, "w") as json_file:
            json.dump(snapshot, json_file, indent=4)
@@ -2497,8 +2747,8 @@ def map_to_unified_keys(json_obj):
    return res


-async def get_unified_total_nodes(channel, mode):
-    await unified_manager.reload(mode)
+async def get_unified_total_nodes(channel, mode, regsitry_cache_mode='cache'):
+    await unified_manager.reload(regsitry_cache_mode)

    res = await unified_manager.get_custom_nodes(channel, mode)

@@ -2581,6 +2831,7 @@ async def get_unified_total_nodes(channel, mode):
            author = cnr['publisher']['name']
            title = cnr['name']
            reference = f"https://registry.comfy.org/nodes/{cnr['id']}"
+            repository = cnr.get('repository', '')
            install_type = "cnr"
            description = cnr.get('description', '')

@@ -2612,7 +2863,7 @@ async def get_unified_total_nodes(channel, mode):
            if ver is None:
                ver = cnr['latest_version']['version']

-            item = dict(author=author, title=title, reference=reference, install_type=install_type,
+            item = dict(author=author, title=title, reference=reference, repository=repository, install_type=install_type,
                        description=description, state=state, updatable=updatable, version=ver)

            if active_version:
@@ -2628,15 +2879,18 @@ async def get_unified_total_nodes(channel, mode):

 def populate_github_stats(node_packs, json_obj_github):
    for k, v in node_packs.items():
-        url = v['reference']
-        if url in json_obj_github:
-            v['stars'] = json_obj_github[url]['stars']
-            v['last_update'] = json_obj_github[url]['last_update']
-            v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
-        else:
-            v['stars'] = -1
-            v['last_update'] = -1
-            v['trust'] = False
+        try:
+            url = v['reference']
+            if url in json_obj_github:
+                v['stars'] = json_obj_github[url]['stars']
+                v['last_update'] = json_obj_github[url]['last_update']
+                v['trust'] = json_obj_github[url]['author_account_age_days'] > 600
+            else:
+                v['stars'] = -1
+                v['last_update'] = -1
+                v['trust'] = False
+        except:
+            logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")


 def populate_favorites(node_packs, json_obj_extras):
@@ -2946,7 +3200,7 @@ def get_comfyui_versions():
        versions = sorted(versions + [current_tag], reverse=True)
        versions = versions[:4]

-    main_branch = repo.heads.main
+    main_branch = repo.heads.master
    latest_commit = main_branch.commit
    latest_tag = repo.git.describe('--tags', latest_commit.hexsha)

--- a/glob/manager_downloader.py
+++ b/glob/manager_downloader.py
@@ -2,6 +2,11 @@ import os
 from urllib.parse import urlparse
 import urllib
 import sys
+import logging
+import requests
+from huggingface_hub import HfApi
+from tqdm.auto import tqdm
+

 aria2 = os.getenv('COMFYUI_MANAGER_ARIA2_SERVER')
 HF_ENDPOINT = os.getenv('HF_ENDPOINT')
@@ -16,7 +21,11 @@ if aria2 is not None:
    aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))


-def basic_download_url(url, dest_folder, filename):
+def basic_download_url(url, dest_folder: str, filename: str):
+    '''
+    Download file from url to dest_folder with filename
+    using requests library.
+    '''
    import requests

    # Ensure the destination folder exists
@@ -40,6 +49,7 @@ def basic_download_url(url, dest_folder, filename):
 def download_url(model_url: str, model_dir: str, filename: str):
    if HF_ENDPOINT:
        model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
+        logging.info(f"model_url replaced by HF_ENDPOINT, new = {model_url}")
    if aria2:
        return aria2_download_url(model_url, model_dir, filename)
    else:
@@ -111,4 +121,38 @@ def download_url_with_agent(url, save_path):
        return False

    print("Installation was successful.")
-    return True
+    return True
+
+# NOTE: snapshot_download doesn't provide file size tqdm.
+def download_repo_in_bytes(repo_id, local_dir):
+    api = HfApi()
+    repo_info = api.repo_info(repo_id=repo_id, files_metadata=True)
+
+    os.makedirs(local_dir, exist_ok=True)
+
+    total_size = 0
+    for file_info in repo_info.siblings:
+        if file_info.size is not None:
+            total_size += file_info.size
+
+    pbar = tqdm(total=total_size, unit="B", unit_scale=True, desc="Downloading")
+
+    for file_info in repo_info.siblings:
+        out_path = os.path.join(local_dir, file_info.rfilename)
+        os.makedirs(os.path.dirname(out_path), exist_ok=True)
+
+        if file_info.size is None:
+            continue
+
+        download_url = f"https://huggingface.co/{repo_id}/resolve/main/{file_info.rfilename}"
+
+        with requests.get(download_url, stream=True) as r, open(out_path, "wb") as f:
+            r.raise_for_status()
+            for chunk in r.iter_content(chunk_size=65536):
+                if chunk:
+                    f.write(chunk)
+                    pbar.update(len(chunk))
+
+    pbar.close()
+
+
--- a/glob/manager_server.py
+++ b/glob/manager_server.py
--- a/glob/manager_util.py
+++ b/glob/manager_util.py
@@ -1,3 +1,8 @@
+"""
+description:
+    `manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
+"""
+
 import aiohttp
 import json
 import threading
@@ -6,11 +11,21 @@ from datetime import datetime
 import subprocess
 import sys
 import re
+import logging
+

 cache_lock = threading.Lock()

 comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-cache_dir = os.path.join(comfyui_manager_path, '.cache')
+cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
+
+use_uv = False
+
+def make_pip_cmd(cmd):
+    if use_uv:
+        return [sys.executable, '-m', 'uv', 'pip'] + cmd
+    else:
+        return [sys.executable, '-m', 'pip'] + cmd


 # DON'T USE StrictVersion - cannot handle pre_release version
@@ -115,7 +130,12 @@ async def get_data(uri, silent=False):
            with open(uri, "r", encoding="utf-8") as f:
                json_text = f.read()

-    json_obj = json.loads(json_text)
+    try:
+        json_obj = json.loads(json_text)
+    except Exception as e:
+        logging.error(f"[ComfyUI-Manager] An error occurred while fetching '{uri}': {e}")
+
+        return {}

    if not silent:
        print(" [DONE]")
@@ -123,20 +143,56 @@ async def get_data(uri, silent=False):
    return json_obj


-async def get_data_with_cache(uri, silent=False, cache_mode=True):
+def get_cache_path(uri):
    cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
-    cache_uri = os.path.join(cache_dir, cache_uri+'.json')
+    return os.path.join(cache_dir, cache_uri+'.json')
+
+
+def get_cache_state(uri):
+    cache_uri = get_cache_path(uri)
+
+    if not os.path.exists(cache_uri):
+        return "not-cached"
+    elif is_file_created_within_one_day(cache_uri):
+        return "cached"
+
+    return "expired"
+
+
+def save_to_cache(uri, json_obj, silent=False):
+    cache_uri = get_cache_path(uri)
+
+    with cache_lock:
+        with open(cache_uri, "w", encoding='utf-8') as file:
+            json.dump(json_obj, file, indent=4, sort_keys=True)
+            if not silent:
+                logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
+
+
+async def get_data_with_cache(uri, silent=False, cache_mode=True, dont_wait=False):
+    cache_uri = get_cache_path(uri)
+
+    if cache_mode and dont_wait:
+        # NOTE: return the cache if possible, even if it is expired, so do not cache
+        if not os.path.exists(cache_uri):
+            logging.error(f"[ComfyUI-Manager] The network connection is unstable, so it is operating in fallback mode: {uri}")
+
+            return {}
+        else:
+            if not is_file_created_within_one_day(cache_uri):
+                logging.error(f"[ComfyUI-Manager] The network connection is unstable, so it is operating in outdated cache mode: {uri}")
+
+            return await get_data(cache_uri, silent=silent)

    if cache_mode and is_file_created_within_one_day(cache_uri):
        json_obj = await get_data(cache_uri, silent=silent)
    else:
        json_obj = await get_data(uri, silent=silent)
-
        with cache_lock:
            with open(cache_uri, "w", encoding='utf-8') as file:
                json.dump(json_obj, file, indent=4, sort_keys=True)
                if not silent:
-                    print(f"[ComfyUI-Manager] default cache updated: {uri}")
+                    logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")

    return json_obj

@@ -151,10 +207,10 @@ def extract_package_as_zip(file_path, extract_path):
        with zipfile.ZipFile(file_path, "r") as zip_ref:
            zip_ref.extractall(extract_path)
            extracted_files = zip_ref.namelist()
-        print(f"Extracted zip file to {extract_path}")
+        logging.info(f"Extracted zip file to {extract_path}")
        return extracted_files
    except zipfile.BadZipFile:
-        print(f"File '{file_path}' is not a zip or is corrupted.")
+        logging.error(f"File '{file_path}' is not a zip or is corrupted.")
        return None


@@ -166,7 +222,7 @@ def get_installed_packages(renew=False):

    if renew or pip_map is None:
        try:
-            result = subprocess.check_output([sys.executable, '-m', 'pip', 'list'], universal_newlines=True)
+            result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)

            pip_map = {}
            for line in result.split('\n'):
@@ -178,7 +234,7 @@ def get_installed_packages(renew=False):

                    pip_map[y[0]] = y[1]
        except subprocess.CalledProcessError:
-            print("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
+            logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
            return set()

    return pip_map
@@ -189,21 +245,22 @@ def clear_pip_cache():
    pip_map = None


-torch_torchvision_version_map = {
-    '2.5.1': '0.20.1',
-    '2.5.0': '0.20.0',
-    '2.4.1': '0.19.1',
-    '2.4.0': '0.19.0',
-    '2.3.1': '0.18.1',
-    '2.3.0': '0.18.0',
-    '2.2.2': '0.17.2',
-    '2.2.1': '0.17.1',
-    '2.2.0': '0.17.0',
-    '2.1.2': '0.16.2',
-    '2.1.1': '0.16.1',
-    '2.1.0': '0.16.0',
-    '2.0.1': '0.15.2',
-    '2.0.0': '0.15.1',
+torch_torchvision_torchaudio_version_map = {
+    '2.6.0': ('0.21.0', '2.6.0'),
+    '2.5.1': ('0.20.0', '2.5.0'),
+    '2.5.0': ('0.20.0', '2.5.0'),
+    '2.4.1': ('0.19.1', '2.4.1'),
+    '2.4.0': ('0.19.0', '2.4.0'),
+    '2.3.1': ('0.18.1', '2.3.1'),
+    '2.3.0': ('0.18.0', '2.3.0'),
+    '2.2.2': ('0.17.2', '2.2.2'),
+    '2.2.1': ('0.17.1', '2.2.1'),
+    '2.2.0': ('0.17.0', '2.2.0'),
+    '2.1.2': ('0.16.2', '2.1.2'),
+    '2.1.1': ('0.16.1', '2.1.1'),
+    '2.1.0': ('0.16.0', '2.1.0'),
+    '2.0.1': ('0.15.2', '2.0.1'),
+    '2.0.0': ('0.15.1', '2.0.0'),
 }


@@ -216,25 +273,24 @@ class PIPFixer:
        if len(spec) > 0:
            platform = spec[1]
        else:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--force', 'torch', 'torchvision', 'torchaudio']
+            cmd = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
            subprocess.check_output(cmd, universal_newlines=True)
-            print(cmd)
+            logging.error(cmd)
            return

        torch_ver = StrictVersion(spec[0])
        torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
-        torchvision_ver = torch_torchvision_version_map.get(torch_ver)
+        torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)

-        if torchvision_ver is None:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
-                   'torch', 'torchvision', 'torchaudio',
-                   '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
-            print("[manager-core] restore PyTorch to nightly version")
+        if torch_torchvision_torchaudio_ver is None:
+            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
+                                '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
+            logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
        else:
-            cmd = [sys.executable, '-m', 'pip', 'install',
-                   f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_ver}",
-                   '--index-url', f"https://download.pytorch.org/whl/{platform}"]
-            print(f"[manager-core] restore PyTorch to {torch_ver}+{platform}")
+            torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
+            cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
+                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
+            logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")

        subprocess.check_output(cmd, universal_newlines=True)

@@ -244,23 +300,25 @@ class PIPFixer:
        # remove `comfy` python package
        try:
            if 'comfy' in new_pip_versions:
-                cmd = [sys.executable, '-m', 'pip', 'uninstall', 'comfy']
+                cmd = make_pip_cmd(['uninstall', 'comfy'])
                subprocess.check_output(cmd, universal_newlines=True)

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

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

        # fix opencv
        try:
@@ -288,23 +346,24 @@ class PIPFixer:

                if len(targets) > 0:
                    for x in targets:
-                        cmd = [sys.executable, '-m', 'pip', 'install', f"{x}=={versions[0].version_string}"]
+                        cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}"])
                        subprocess.check_output(cmd, universal_newlines=True)

-                    print(f"[manager-core] 'opencv' dependencies were fixed: {targets}")
+                    logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
        except Exception as e:
-            print("[manager-core] Failed to restore opencv")
-            print(e)
+            logging.error("[ComfyUI-Manager] Failed to restore opencv")
+            logging.error(e)

        # fix numpy
        try:
            np = new_pip_versions.get('numpy')
            if np is not None:
                if StrictVersion(np) >= StrictVersion('2'):
-                    subprocess.check_output([sys.executable, '-m', 'pip', 'install', "numpy<2"], universal_newlines=True)
+                    cmd = make_pip_cmd(['install', "numpy<2"])
+                    subprocess.check_output(cmd , universal_newlines=True)
        except Exception as e:
-            print("[manager-core] Failed to restore numpy")
-            print(e)
+            logging.error("[ComfyUI-Manager] Failed to restore numpy")
+            logging.error(e)


 def sanitize(data):
--- a/js/cm-api.js
+++ b/js/cm-api.js
@@ -45,6 +45,11 @@ async function tryInstallCustomNode(event) {
 				show_message('This action is not allowed with this security level configuration.');
 				return false;
 			}
+			else if(response.status == 400) {
+				let msg = await res.text();
+				show_message(msg);
+				return false;
+			}
 		}

 		let response = await api.fetchApi("/manager/reboot");
--- a/js/comfyui-manager.js
+++ b/js/comfyui-manager.js
@@ -13,11 +13,12 @@ import {
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import {
 	free_models, install_pip, install_via_git_url, manager_instance,
-	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt } from "./common.js";
+	rebootAPI, migrateAPI, setManagerInstance, show_message, customAlert, customPrompt,
+	infoToast, showTerminal, setNeedRestart
+} from "./common.js";
 import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
 import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
-import { set_double_click_policy } from "./node_fixer.js";
 import { SnapshotManager } from "./snapshot.js";

 var docStyle = document.createElement('style');
@@ -41,7 +42,7 @@ docStyle.innerHTML = `

 #cm-manager-dialog {
 	width: 1000px;
-	height: 520px;
+	height: 450px;
 	box-sizing: content-box;
 	z-index: 1000;
 	overflow-y: auto;
@@ -103,24 +104,6 @@ docStyle.innerHTML = `
 	vertical-align: middle;
 }

-#cm-channel-badge {
-	color: white;
-	background-color: #AA0000;
-	width: 220px;
-	height: 23px;
-	font-size: 13px;
-	border-radius: 5px;
-	left: 5px;
-	top: 5px;
-	align-content: center;
-	justify-content: center;
-	text-align: center;
-	font-weight: bold;
-	float: left;
-	vertical-align: middle;
-	position: relative;
-}
-
 #custom-nodes-grid a {
 	color: #5555FF;
 	font-weight: bold;
@@ -156,7 +139,7 @@ docStyle.innerHTML = `

 .cm-notice-board {
 	width: 290px;
-	height: 270px;
+	height: 210px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -244,8 +227,11 @@ var update_comfyui_button = null;
 var switch_comfyui_button = null;
 var fetch_updates_button = null;
 var update_all_button = null;
-var badge_mode = "none";
+var restart_stop_button = null;
+
 let share_option = 'all';
+var is_updating_all = false;
+

 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
 const style = `
@@ -426,14 +412,6 @@ const style = `
 }
 `;

-
-
-async function init_badge_mode() {
-	api.fetchApi('/manager/badge_mode')
-		.then(response => response.text())
-		.then(data => { badge_mode = data; })
-}
-
 async function init_share_option() {
 	api.fetchApi('/manager/share_option')
 		.then(response => response.text())
@@ -450,164 +428,56 @@ async function init_notice(notice) {
 		})
 }

-await init_badge_mode();
 await init_share_option();

-async function fetchNicknames() {
-	const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
-	const mappings = await response1.json();

-	let result = {};
-	let nickname_patterns = [];
+async function set_inprogress_mode() {
+	update_comfyui_button.disabled = true;
+	update_comfyui_button.style.backgroundColor = "gray";

-	for (let i in mappings) {
-		let item = mappings[i];
-		var nickname;
-		if (item[1].nickname) {
-			nickname = item[1].nickname;
-		}
-		else if (item[1].title) {
-			nickname = item[1].title;
-		}
-		else {
-			nickname = item[1].title_aux;
-		}
+	update_all_button.disabled = true;
+	update_all_button.style.backgroundColor = "gray";

-		for (let j in item[0]) {
-			result[item[0][j]] = nickname;
-		}
+	switch_comfyui_button.disabled = true;
+	switch_comfyui_button.style.backgroundColor = "gray";

-		if(item[1].nodename_pattern) {
-			nickname_patterns.push([item[1].nodename_pattern, nickname]);
-		}
-	}
-
-	return [result, nickname_patterns];
+	restart_stop_button.innerText = 'Stop';
 }

-const [nicknames, nickname_patterns] = await fetchNicknames();

-function getNickname(node, nodename) {
-	if(node.nickname) {
-		return node.nickname;
+async function reset_action_buttons() {
+	const isElectron = 'electronAPI' in window;
+
+	if(isElectron) {
+		update_all_button.innerText = "Update All Custom Nodes";
 	}
 	else {
-		if (nicknames[nodename]) {
-			node.nickname = nicknames[nodename];
-		}
-		else if(node.getInnerNodes) {
-			let pure_name = getPureName(node);
-			let groupNode = app.graph.extra?.groupNodes?.[pure_name];
-			if(groupNode) {
-				let packname = groupNode.packname;
-				node.nickname = packname;
-			}
-			return node.nickname;
-		}
-		else {
-			for(let i in nickname_patterns) {
-				let item = nickname_patterns[i];
-				if(nodename.match(item[0])) {
-					node.nickname = item[1];
-				}
-			}
-		}
-
-		return node.nickname;
+		update_all_button.innerText = "Update All";
 	}
+
+	update_comfyui_button.innerText = "Update ComfyUI";
+	switch_comfyui_button.innerText = "Switch ComfyUI";
+	restart_stop_button.innerText = 'Restart';
+
+	update_comfyui_button.disabled = false;
+	update_all_button.disabled = false;
+	switch_comfyui_button.disabled = false;
+
+	update_comfyui_button.style.backgroundColor = "";
+	update_all_button.style.backgroundColor = "";
+	switch_comfyui_button.style.backgroundColor = "";
 }

-function drawBadge(node, orig, restArgs) {
-	let ctx = restArgs[0];
-	const r = orig?.apply?.(node, restArgs);
-
-	if (!node.flags.collapsed && badge_mode != 'none' && node.constructor.title_mode != LiteGraph.NO_TITLE) {
-		let text = "";
-		if (badge_mode.startsWith('id_nick'))
-			text = `#${node.id} `;
-
-		let nick = node.getNickname();
-		if (nick) {
-			if (nick == 'ComfyUI') {
-				if(badge_mode.endsWith('hide')) {
-					nick = "";
-				}
-				else {
-					nick = "🦊"
-				}
-			}
-
-			if (nick.length > 25) {
-				text += nick.substring(0, 23) + "..";
-			}
-			else {
-				text += nick;
-			}
-		}
-
-		if (text != "") {
-			let fgColor = "white";
-			let bgColor = "#0F1F0F";
-			let visible = true;
-
-			ctx.save();
-			ctx.font = "12px sans-serif";
-			const sz = ctx.measureText(text);
-			ctx.fillStyle = bgColor;
-			ctx.beginPath();
-			ctx.roundRect(node.size[0] - sz.width - 12, -LiteGraph.NODE_TITLE_HEIGHT - 20, sz.width + 12, 20, 5);
-			ctx.fill();
-
-			ctx.fillStyle = fgColor;
-			ctx.fillText(text, node.size[0] - sz.width - 6, -LiteGraph.NODE_TITLE_HEIGHT - 6);
-			ctx.restore();
-
-			if (node.has_errors) {
-				ctx.save();
-				ctx.font = "bold 14px sans-serif";
-				const sz2 = ctx.measureText(node.type);
-				ctx.fillStyle = 'white';
-				ctx.fillText(node.type, node.size[0] / 2 - sz2.width / 2, node.size[1] / 2);
-				ctx.restore();
-			}
-		}
-	}
-	return r;
-}
-
-
 async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
-	update_comfyui_button.disabled = true;
-	update_comfyui_button.style.backgroundColor = "gray";

-	try {
-		const response = await api.fetchApi('/comfyui_manager/update_comfyui');
+	set_inprogress_mode();

-		if (response.status == 400) {
-			show_message('Failed to update ComfyUI.');
-			return false;
-		}
+	const response = await api.fetchApi('/manager/queue/update_comfyui');

-		if (response.status == 201) {
-			show_message('ComfyUI has been successfully updated.');
-		}
-		else {
-			show_message('ComfyUI is already up to date with the latest version.');
-		}
-
-		return true;
-	}
-	catch (exception) {
-		show_message(`Failed to update ComfyUI / ${exception}`);
-		return false;
-	}
-	finally {
-		update_comfyui_button.disabled = false;
-		update_comfyui_button.innerText = prev_text;
-		update_comfyui_button.style.backgroundColor = "";
-	}
+	showTerminal();
+	await api.fetchApi('/manager/queue/start');
 }

 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -735,26 +605,32 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 }

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

-    if(res.status == 200) {
-        let obj = await res.json();
+	if(res.status == 200) {
+		let obj = await res.json();

-        let versions = [];
-        let default_version;
+		let versions = [];
+		let default_version;

-        for(let v of obj.versions) {
-            default_version = v;
-            versions.push(v);
-        }
+		for(let v of obj.versions) {
+			default_version = v;
+			versions.push(v);
+		}

-        showVersionSelectorDialog(versions, obj.current, (selected_version) => {
-            api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
-        });
-    }
-    else {
-        show_message('Failed to fetch ComfyUI versions.');
-    }
+		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
+			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
+			if (response.status == 200) {
+				infoToast(`ComfyUI version is switched to ${selected_version}`);
+			}
+			else {
+				customAlert('Failed to switch ComfyUI version.');
+			}
+		});
+	}
+	else {
+		customAlert('Failed to fetch ComfyUI versions.');
+	}
 }


@@ -808,70 +684,121 @@ async function fetchUpdates(update_check_checkbox) {
 	}
 }

-async function updateAll(update_check_checkbox, manager_dialog) {
-	let prev_text = update_all_button.innerText;
-	update_all_button.innerText = "Updating all...(ComfyUI)";
-	update_all_button.disabled = true;
-	update_all_button.style.backgroundColor = "gray";
+async function onQueueStatus(event) {
+	const isElectron = 'electronAPI' in window;

-	try {
-		var mode = manager_instance.datasrc_combo.value;
+	if(event.detail.status == 'in_progress') {
+		set_inprogress_mode();
+		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
+	}
+	else if(event.detail.status == 'done') {
+		reset_action_buttons();

-		update_all_button.innerText = "Updating all...";
-		const response1 = await api.fetchApi('/comfyui_manager/update_comfyui');
-		const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
-
-		if (response2.status == 403) {
-			show_message('This action is not allowed with this security level configuration.');
-			return false;
+		if(!is_updating_all)  {
+			return;
 		}

-		if (response1.status == 400 || response2.status == 400) {
-			show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
-			return false;
+		is_updating_all = false;
+
+		let success_list = [];
+		let failed_list = [];
+		let comfyui_state = null;
+
+		for(let k in event.detail.nodepack_result){
+			let v = event.detail.nodepack_result[k];
+
+			if(v == 'success') {
+				if(k == 'comfyui')
+					comfyui_state = 'success';
+				else
+					success_list.push(k);
+			}
+			else if(v == 'skip') {
+				if(k == 'comfyui')
+					comfyui_state = 'skip';
+			}
+			else
+				failed_list.push(k);
 		}

-		if(response1.status == 201 || response2.status == 201) {
-			const update_info = await response2.json();
-
-			let failed_list = "";
-			if(update_info.failed.length > 0) {
-				failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
+		let msg = "";
+		
+		if(success_list.length == 0 && comfyui_state != 'success') {
+			if(failed_list.length == 0) {
+				msg += "All custom nodes are already up to date.";
 			}
-
-			let updated_list = "";
-			if(update_info.updated.length > 0) {
-				updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
-			}
-
-			show_message(
-				"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
-				+failed_list
-				+updated_list
-				);
-
-			const rebootButton = document.getElementById('cm-reboot-button5');
-			rebootButton.addEventListener("click",
-				function() {
-					if(rebootAPI()) {
-						manager_dialog.close();
-					}
-				});
 		}
 		else {
-			show_message('ComfyUI and all extensions are already up-to-date with the latest versions.');
+			msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
+
+			if(comfyui_state == 'success') {
+				msg += "ComfyUI is updated.<BR><BR>";
+			}
+			else if(comfyui_state == 'skip') {
+				msg += "ComfyUI is already up-to-date.<BR><BR>"
+			}
+
+			if(success_list.length > 0) {
+				msg += "The following custom nodes have been updated:<ul>";
+				for(let x in success_list) {
+					if(success_list[x] == 'comfyui')
+						continue;
+
+					msg += '<li>'+success_list[x]+'</li>';
+				}
+				msg += "</ul>";
+			}
+
+			setNeedRestart(true);
+		}
+		
+		if(failed_list.length > 0) {
+			msg += '<br>The update for the following custom nodes has failed:<ul>';
+			for(let x in failed_list) {
+				msg += '<li>'+failed_list[x]+'</li>';
+			}
+
+			msg += '</ul>'
 		}

-		return true;
+		show_message(msg);
+
+		const rebootButton = document.getElementById('cm-reboot-button5');
+		rebootButton?.addEventListener("click",
+			function() {
+				if(rebootAPI()) {
+					manager_dialog.close();
+				}
+			});
 	}
-	catch (exception) {
-		show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
-		return false;
+}
+
+api.addEventListener("cm-queue-status", onQueueStatus);
+
+
+async function updateAll(update_comfyui, manager_dialog) {
+	let prev_text = update_all_button.innerText;
+	update_all_button.innerText = "Updating...";
+
+	set_inprogress_mode();
+
+	var mode = manager_instance.datasrc_combo.value;
+
+	showTerminal();
+
+	if(update_comfyui) {
+		update_all_button.innerText = "Updating ComfyUI...";
+		await api.fetchApi('/manager/queue/update_comfyui');
 	}
-	finally {
-		update_all_button.disabled = false;
-		update_all_button.innerText = prev_text;
-		update_all_button.style.backgroundColor = "";
+
+	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
+
+	if (response.status == 401) {
+		customAlert('Another task is already in progress. Please stop the ongoing task first.');
+	}
+	else if(response.status == 200) {
+		is_updating_all = true;
+		await api.fetchApi('/manager/queue/start');
 	}
 }

@@ -895,15 +822,29 @@ const isOutputNode = (node) => {
 	return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
 }

+function restartOrStop() {
+	if(restart_stop_button.innerText == 'Restart'){
+		rebootAPI();
+	}
+	else {
+		api.fetchApi('/manager/queue/reset');
+		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
+	}
+}
+
 // -----------
 class ManagerMenuDialog extends ComfyDialog {
 	createControlsMid() {
 		let self = this;
-
+		const isElectron = 'electronAPI' in window;
+		
 		update_comfyui_button =
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Update ComfyUI",
+				style: {
+					display: isElectron ? 'none' : 'block'
+				},
 				onclick:
 					() => updateComfyUI()
 			});
@@ -912,6 +853,9 @@ class ManagerMenuDialog extends ComfyDialog {
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Switch ComfyUI",
+				style: {
+					display: isElectron ? 'none' : 'block'
+				},
 				onclick:
 					() => switchComfyUI()
 			});
@@ -924,14 +868,32 @@ class ManagerMenuDialog extends ComfyDialog {
 					() => fetchUpdates(this.update_check_checkbox)
 			});

-		update_all_button =
-			$el("button.cm-button", {
+		restart_stop_button =
+			$el("button.cm-button-red", {
 				type: "button",
-				textContent: "Update All",
-				onclick:
-					() => updateAll(this.update_check_checkbox, self)
+				textContent: "Restart",
+				onclick: () => restartOrStop()
 			});

+		if(isElectron) {
+			update_all_button =
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Update All Custom Nodes",
+					onclick:
+						() => updateAll(false, self)
+				});
+		}
+		else {
+			update_all_button =
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Update All",
+					onclick:
+						() => updateAll(true, self)
+				});
+		}
+
 		const res =
 			[
 				$el("button.cm-button", {
@@ -990,24 +952,7 @@ class ManagerMenuDialog extends ComfyDialog {
 				fetch_updates_button,

 				$el("br", {}, []),
-				$el("button.cm-button", {
-					type: "button",
-					textContent: "Alternatives of A1111",
-					onclick:
-						() => {
-							if(!CustomNodesManager.instance) {
-								CustomNodesManager.instance = new CustomNodesManager(app, self);
-							}
-							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
-						}
-				}),
-
-				$el("br", {}, []),
-				$el("button.cm-button-red", {
-					type: "button",
-					textContent: "Restart",
-					onclick: () => rebootAPI()
-				}),
+				restart_stop_button,
 			];

 		let migration_btn =
@@ -1050,7 +995,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.className = "cm-menu-combo";
 		this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'DB: Channel (1day cache)' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
-		this.datasrc_combo.appendChild($el('option', { value: 'url', text: 'DB: Channel (remote)' }, []));
+		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));

 		// preview method
 		let preview_combo = document.createElement("select");
@@ -1069,32 +1014,9 @@ class ManagerMenuDialog extends ComfyDialog {
 			api.fetchApi(`/manager/preview_method?value=${event.target.value}`);
 		});

-		// nickname
-		let badge_combo = "";
-		if(is_legacy_front()) {
-            badge_combo = document.createElement("select");
-            badge_combo.setAttribute("title", "Configure the content to be displayed on the badge at the top right corner of the node. The ID is the identifier of the node. If 'hide built-in' is selected, both unknown nodes and built-in nodes will be omitted, making them indistinguishable");
-            badge_combo.className = "cm-menu-combo";
-            badge_combo.appendChild($el('option', { value: 'none', text: 'Badge: None' }, []));
-            badge_combo.appendChild($el('option', { value: 'nick', text: 'Badge: Nickname' }, []));
-            badge_combo.appendChild($el('option', { value: 'nick_hide', text: 'Badge: Nickname (hide built-in)' }, []));
-            badge_combo.appendChild($el('option', { value: 'id_nick', text: 'Badge: #ID Nickname' }, []));
-            badge_combo.appendChild($el('option', { value: 'id_nick_hide', text: 'Badge: #ID Nickname (hide built-in)' }, []));
-
-            api.fetchApi('/manager/badge_mode')
-                .then(response => response.text())
-                .then(data => { badge_combo.value = data; badge_mode = data; });
-
-            badge_combo.addEventListener('change', function (event) {
-                api.fetchApi(`/manager/badge_mode?value=${event.target.value}`);
-                badge_mode = event.target.value;
-                app.graph.setDirtyCanvas(true);
-            });
-		}
-
 		// 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. Note that the badge utilizes local information.");
+		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')
 			.then(response => response.json())
@@ -1119,21 +1041,6 @@ class ManagerMenuDialog extends ComfyDialog {
 				}
 			});

-		// default ui state
-		let default_ui_combo = document.createElement("select");
-		default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
-		default_ui_combo.className = "cm-menu-combo";
-		default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
-		default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
-		api.fetchApi('/manager/default_ui')
-			.then(response => response.text())
-			.then(data => { default_ui_combo.value = data; });
-
-		default_ui_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
-		});
-

 		// share
 		let share_combo = document.createElement("select");
@@ -1171,28 +1078,6 @@ class ManagerMenuDialog extends ComfyDialog {
 			set_component_policy(event.target.value);
 		});

-		let dbl_click_policy_combo = document.createElement("select");
-		dbl_click_policy_combo.setAttribute("title", "Sets the behavior when you double-click the title area of a node.");
-		dbl_click_policy_combo.className = "cm-menu-combo";
-		dbl_click_policy_combo.appendChild($el('option', { value: 'none', text: 'Double-Click: None' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-all', text: 'Double-Click: Copy All Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-full', text: 'Double-Click: Copy All Connections and shape' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-input', text: 'Double-Click: Copy Input Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'possible-input', text: 'Double-Click: Possible Input Connections' }, []));
-		dbl_click_policy_combo.appendChild($el('option', { value: 'dual', text: 'Double-Click: Possible(left) + Copy(right)' }, []));
-
-		api.fetchApi('/manager/dbl_click/policy')
-			.then(response => response.text())
-			.then(data => {
-				dbl_click_policy_combo.value = data;
-				set_double_click_policy(data);
-			});
-
-		dbl_click_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/dbl_click/policy?value=${event.target.value}`);
-			set_double_click_policy(event.target.value);
-		});
-
 		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
@@ -1218,11 +1103,8 @@ class ManagerMenuDialog extends ComfyDialog {
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
-			badge_combo,
-			default_ui_combo,
 			share_combo,
 			component_policy_combo,
-			dbl_click_policy_combo,
 			$el("br", {}, []),

 			$el("br", {}, []),
@@ -1403,10 +1285,22 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
 	}

+	get isVisible() {
+		return this.element?.style?.display !== "none";
+	}
+
 	show() {
 		this.element.style.display = "block";
 	}

+	toggleVisibility() {
+		if (this.isVisible) {
+			this.close();
+		} else {
+			this.show();
+		}
+	}
+
 	handleWorkflowGalleryButtonClick(e) {
 		e.preventDefault();
 		e.stopPropagation();
@@ -1524,6 +1418,41 @@ app.registerExtension({
 		}
 	],

+	commands: [
+	{
+		id: "Comfy.Manager.Menu.ToggleVisibility",
+		label: "Toggle Manager Menu Visibility",
+		icon: "mdi mdi-puzzle",
+		function: () => {
+			if (!manager_instance) {
+				setManagerInstance(new ManagerMenuDialog());
+				manager_instance.show();
+			} else {
+				manager_instance.toggleVisibility();
+			}
+		},
+	},
+	{
+		id: "Comfy.Manager.CustomNodesManager.ToggleVisibility",
+		label: "Toggle Custom Nodes Manager Visibility",
+		icon: "pi pi-server",
+		function: () => {
+			if (CustomNodesManager.instance?.isVisible) {
+				CustomNodesManager.instance.close();
+				return;
+			}
+
+			if (!manager_instance) {
+				setManagerInstance(new ManagerMenuDialog());
+			}
+			if (!CustomNodesManager.instance) {
+				CustomNodesManager.instance = new CustomNodesManager(app, self);
+			}
+			CustomNodesManager.instance.show(CustomNodesManager.ShowMode.NORMAL);
+		},
+	}
+	],
+
 	init() {
 		$el("style", {
 			textContent: style,
@@ -1663,32 +1592,6 @@ app.registerExtension({
 		this._addExtraNodeContextMenu(nodeType, app);
 	},

-	async nodeCreated(node, app) {
-	    if(is_legacy_front()) {
-            if(!node.badge_enabled) {
-                node.getNickname = function () { return getNickname(node, node.comfyClass.trim()) };
-                let orig = node.onDrawForeground;
-                if(!orig)
-                    orig = node.__proto__.onDrawForeground;
-
-                node.onDrawForeground = function (ctx) {
-                    drawBadge(node, orig, arguments)
-                };
-                node.badge_enabled = true;
-            }
-		}
-	},
-
-	async loadedGraphNode(node, app) {
-	    if(is_legacy_front()) {
-            if(!node.badge_enabled) {
-                const orig = node.onDrawForeground;
-                node.getNickname = function () { return getNickname(node, node.type.trim()) };
-                node.onDrawForeground = function (ctx) { drawBadge(node, orig, arguments) };
-            }
-		}
-	},
-
 	_addExtraNodeContextMenu(node, app) {
 		const origGetExtraMenuOptions = node.prototype.getExtraMenuOptions;
 		node.prototype.cm_menu_added = true;
@@ -1744,27 +1647,3 @@ app.registerExtension({
 		}
 	},
 });
-
-
-async function set_default_ui()
-{
-	let res = await api.fetchApi('/manager/default_ui');
-	if(res.status == 200) {
-		let mode = await res.text();
-		switch(mode) {
-		case 'history':
-			app.ui.queue.hide();
-			app.ui.history.show();
-			break;
-		case 'queue':
-			app.ui.queue.show();
-			app.ui.history.hide();
-			break;
-		default:
-			// do nothing
-			break;
-		}
-	}
-}
-
-set_default_ui();
--- a/js/common.js
+++ b/js/common.js
@@ -16,7 +16,7 @@ function internalCustomConfirm(message, confirmMessage, cancelMessage) {
 		modalOverlay.style.display = 'flex';
 		modalOverlay.style.alignItems = 'center';
 		modalOverlay.style.justifyContent = 'center';
-		modalOverlay.style.zIndex = '1100';
+		modalOverlay.style.zIndex = '1101';

 		// Modal window container (dark bg)
 		const modalDialog = document.createElement('div');
@@ -96,7 +96,7 @@ function internalCustomConfirm(message, confirmMessage, cancelMessage) {

 export function show_message(msg) {
 	app.ui.dialog.show(msg);
-	app.ui.dialog.element.style.zIndex = 1099;
+	app.ui.dialog.element.style.zIndex = 1100;
 }

 export async function sleep(ms) {
@@ -130,6 +130,20 @@ export function customAlert(message) {
 	}
 }

+export function infoToast(summary, message) {
+	try {
+		app.extensionManager.toast.add({
+			severity: 'info',
+			summary: summary,
+			detail: message,
+			life: 3000
+		})
+	}
+	catch {
+		// do nothing
+	}
+}
+

 export async function customPrompt(title, message) {
 	try {
@@ -397,3 +411,95 @@ export const icons = {
 	passed: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 426.667 426.667"><path fill="#6AC259" d="M213.333,0C95.518,0,0,95.514,0,213.333s95.518,213.333,213.333,213.333c117.828,0,213.333-95.514,213.333-213.333S331.157,0,213.333,0z M174.199,322.918l-93.935-93.931l31.309-31.309l62.626,62.622l140.894-140.898l31.309,31.309L174.199,322.918z"/></svg>',
 	download: '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" width="100%" height="100%" viewBox="0 0 32 32"><path fill="currentColor" d="M26 24v4H6v-4H4v4a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2v-4zm0-10l-1.41-1.41L17 20.17V2h-2v18.17l-7.59-7.58L6 14l10 10l10-10z"></path></svg>'
 }
+
+export function sanitizeHTML(str) {
+	return str
+		.replace(/&/g, "&amp;")
+		.replace(/</g, "&lt;")
+		.replace(/>/g, "&gt;")
+		.replace(/"/g, "&quot;")
+		.replace(/'/g, "&#039;");
+}
+
+export function showTerminal() {
+	try {
+		const panel = app.extensionManager.bottomPanel;
+		const isTerminalVisible = panel.bottomPanelVisible && panel.activeBottomPanelTab.id === 'logs-terminal';
+		if (!isTerminalVisible)
+			panel.toggleBottomPanelTab('logs-terminal');
+	}
+	catch(exception) {
+		// do nothing
+	}
+}
+
+let need_restart = false;
+
+export function setNeedRestart(value) {
+	need_restart = value;
+}
+
+async function onReconnected(event) {
+	if(need_restart) {
+		setNeedRestart(false);
+
+		const confirmed = await customConfirm("To apply the changes to the node pack's installation status, you need to refresh the browser. Would you like to refresh?");
+		if (!confirmed) {
+			return;
+		}
+
+		window.location.reload(true);
+	}
+}
+
+api.addEventListener('reconnected', onReconnected);
+
+const storeId = "comfyui-manager-grid";
+let timeId;
+export function storeColumnWidth(gridId, columnItem) {
+	clearTimeout(timeId);
+	timeId = setTimeout(() => {
+		let data = {};
+		const dataStr = localStorage.getItem(storeId);
+		if (dataStr) {
+			try {
+				data = JSON.parse(dataStr);
+			} catch (e) {}
+		}
+
+		if (!data[gridId]) {
+			data[gridId] =  {};
+		}
+
+		data[gridId][columnItem.id] = columnItem.width;
+
+		localStorage.setItem(storeId, JSON.stringify(data));
+
+	}, 200)
+}
+
+export function restoreColumnWidth(gridId, columns) {
+	const dataStr = localStorage.getItem(storeId);
+	if (!dataStr) {
+		return;
+	}
+	let data;
+	try {
+		data = JSON.parse(dataStr);
+	} catch (e) {}
+	if(!data) {
+		return;
+	}
+	const widthMap = data[gridId];
+	if (!widthMap) {
+		return;
+	}
+
+	columns.forEach(columnItem => {
+		const w = widthMap[columnItem.id];
+		if (w) {
+			columnItem.width = w;
+		}
+	});
+
+}
--- a/js/custom-nodes-manager.js
+++ b/js/custom-nodes-manager.js
@@ -4,12 +4,16 @@ import { api } from "../../scripts/api.js";

 import {
 	manager_instance, rebootAPI, install_via_git_url,
-	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt
+	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
+	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";

 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";

+const gridId = "node";
+
 const pageCss = `
 .cn-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -55,6 +59,12 @@ const pageCss = `
 	color: white;
 }

+.cn-manager .cn-manager-stop {
+	display: none;
+	background-color: #500000;
+	color: white;
+}
+
 .cn-manager .cn-manager-back {
 	align-items: center;
 	justify-content: center;
@@ -250,6 +260,13 @@ const pageCss = `
 	color: white;
 }

+.cn-manager .cn-btn-import-failed {
+	background-color: #AA1111;
+    font-size: 10px;
+	font-weight: bold;
+	color: white;
+}
+
 .cn-manager .cn-btn-install {
 	background-color: black;
 	color: white;
@@ -337,13 +354,14 @@ const pageHtml = `
 <div class="cn-manager-selection"></div>
 <div class="cn-manager-message"></div>
 <div class="cn-manager-footer">
-<button class="cn-manager-back">
-    <svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-    </svg>
-    Back
-</button>
+	<button class="cn-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
 	<button class="cn-manager-restart">Restart</button>
+	<button class="cn-manager-stop">Stop</button>
 	<div class="cn-flex-auto"></div>
 	<button class="cn-manager-check-update">Check Update</button>
 	<button class="cn-manager-check-missing">Check Missing</button>
@@ -384,6 +402,8 @@ export class CustomNodesManager {
 		this.restartMap = {};

 		this.init();
+
+        api.addEventListener("cm-queue-status", this.onQueueStatus);
 	}

 	init() {
@@ -746,10 +766,16 @@ export class CustomNodesManager {

 			".cn-manager-restart": {
 				click: () => {
-					if(rebootAPI()) {
-						this.close();
-						this.manager_dialog.close();
-					}
+					this.close();
+					this.manager_dialog.close();
+					rebootAPI();
+				}
+			},
+
+			".cn-manager-stop": {
+				click: () => {
+					api.fetchApi('/manager/queue/reset');
+					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},

@@ -809,6 +835,10 @@ export class CustomNodesManager {
 			this.renderSelected();
 		});

+		grid.bind("onColumnWidthChanged", (e, columnItem) => {
+			storeColumnWidth(gridId, columnItem)
+		});
+
 		grid.bind('onClick', (e, d) => {
 			const btn = this.getButton(d.e.target);
 			if (btn) {
@@ -872,6 +902,38 @@ export class CustomNodesManager {
 		return this.filter === ShowMode.ALTERNATIVES
 	}

+	async handleImportFail(rowItem) {
+		var info;
+		if(rowItem.version == 'unknown'){
+			info = {
+				'url': rowItem.originalData.files[0]
+			};
+		}
+		else{
+			info = {
+				'cnr_id': rowItem.originalData.id
+			};
+		}
+
+		const response = await api.fetchApi(`/customnode/import_fail_info`, {
+									method: 'POST',
+									headers: { 'Content-Type': 'application/json' },
+									body: JSON.stringify(info)
+								});
+
+		let res = await response.json();
+
+		let title = `<FONT COLOR=GREEN><B>Error message occurred while importing the '${rowItem.title}' module.</B></FONT><BR><HR><BR>`
+
+		if(res.code == 400)
+		{
+			show_message(title+'The information is not available.')
+		}
+		else {
+			show_message(title+sanitizeHTML(res['msg']).replace(/ /g, '&nbsp;').replace(/\n/g, '<BR>'));
+		}
+	}
+
 	renderGrid() {

 		// update theme
@@ -905,6 +967,7 @@ export class CustomNodesManager {
 			}
 		}

+		let self = this;
 		const columns = [{
 			id: 'id',
 			name: 'ID',
@@ -918,16 +981,32 @@ export class CustomNodesManager {
 			maxWidth: 500,
 			classMap: 'cn-node-name',
 			formatter: (title, rowItem, columnItem) => {
-			    var prefix = '';
-			    if(rowItem.action === 'invalid-installation') {
-			        prefix = '<font color="red"><B>(INVALID)</B></font>';
-			    }
+				const container = document.createElement('div');

-			    else if(rowItem.action === 'import-fail') {
-			        prefix = '<font color="red"><B>(IMPORT FAILED)</B></font>';
-			    }
+				if (rowItem.action === 'invalid-installation') {
+					const invalidTag = document.createElement('span');
+					invalidTag.style.color = 'red';
+					invalidTag.innerHTML = '<b>(INVALID)</b>';
+					container.appendChild(invalidTag);
+				} else if (rowItem.action === 'import-fail') {
+					const button = document.createElement('button');
+					button.className = 'cn-btn-import-failed';
+					button.innerText = 'IMPORT FAILED ↗';
+					button.onclick = () => self.handleImportFail(rowItem);
+					container.appendChild(button);
+					container.appendChild(document.createElement('br'));
+				}

-				return `${prefix}<a href=${rowItem.reference} target="_blank"><b>${title}</b></a>`;
+				const link = document.createElement('a');
+				if(rowItem.originalData.repository)
+					link.href = rowItem.originalData.repository;
+				else
+					link.href = rowItem.reference;
+				link.target = '_blank';
+				link.innerHTML = `<b>${title}</b>`;
+				container.appendChild(link);
+
+				return container;
 			}
 		}, {
 			id: 'version',
@@ -1087,6 +1166,8 @@ export class CustomNodesManager {
 				return 0;
 			});

+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options: options,
 			rows: rows_values,
@@ -1148,7 +1229,7 @@ export class CustomNodesManager {
 	}

 	focusInstall(item, mode) {
-		const cellNode = this.grid.getCellNode(item, "installed");
+		const cellNode = this.grid.getCellNode(item, "action");
 		if (cellNode) {
 			const cellBtn = cellNode.querySelector(`button[mode="${mode}"]`);
 			if (cellBtn) {
@@ -1190,7 +1271,7 @@ export class CustomNodesManager {
 					version_cnt++;
 				}

-				if(rowItem.cnr_latest != rowItem.originalData.active_version) {
+				if(rowItem.cnr_latest != rowItem.originalData.active_version && obj.length > 0) {
 					versions.push('latest');
 				}
 			}
@@ -1213,6 +1294,13 @@ export class CustomNodesManager {
 	}

 	async installNodes(list, btn, title, selected_version) {
+		let stats = await api.fetchApi('/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})`);
+			return;
+		}
+
 		const { target, label, mode} = btn;

 		if(mode === "uninstall") {
@@ -1238,8 +1326,15 @@ export class CustomNodesManager {

 		let needRestart = false;
 		let errorMsg = "";
+
+		await api.fetchApi('/manager/queue/reset');
+
+		let target_items = [];
+
 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
+			target_items.push(item);
+
 			if (!item) {
 				errorMsg = `Not found custom node: ${hash}`;
 				break;
@@ -1259,6 +1354,7 @@ export class CustomNodesManager {
 			data.selected_version = selected_version;
 			data.channel = this.channel;
 			data.mode = this.mode;
+			data.ui_id = hash;

 			let install_mode = mode;
 			if(mode == 'switch') {
@@ -1276,49 +1372,105 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}

-			const res = await api.fetchApi(`/customnode/${api_mode}`, {
+			const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
 				method: 'POST',
 				body: JSON.stringify(data)
 			});

-			if (res.error) {
+			if (res.status != 200) {
+				errorMsg = `'${item.title}': `;

-				errorMsg = `${item.title} ${mode} failed: `;
 				if(res.status == 403) {
-					errorMsg += `This action is not allowed with this security level configuration.`;
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
 				} else if(res.status == 404) {
-					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.`;
+					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.\n`;
 				} else {
-					errorMsg += res.error.message;
+					errorMsg += await res.text() + '\n';
 				}

 				break;
 			}
-
-			needRestart = true;
-
-			this.grid.setRowSelected(item, false);
-			item.restart = true;
-			this.restartMap[item.hash] = true;
-			this.grid.updateCell(item, "action");
-
-			//console.log(res.data);
-
 		}

+		this.install_context = {btn: btn, targets: target_items};
+
+		if(errorMsg) {
+			this.showError(errorMsg);
+			show_message("[Installation Errors]\n"+errorMsg);
+
+			// reset
+			for(let k in target_items) {
+				const item = target_items[k];
+				this.grid.updateCell(item, "action");
+			}
+		}
+		else {
+			await api.fetchApi('/manager/queue/start');
+			this.showStop();
+			showTerminal();
+		}
+	}
+
+	async onQueueStatus(event) {
+		let self = CustomNodesManager.instance;
+		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
+			const hash = event.detail.target;
+
+			const item = self.grid.getRowItemBy("hash", hash);
+
+			item.restart = true;
+			self.restartMap[item.hash] = true;
+			self.grid.updateCell(item, "action");
+			self.grid.setRowSelected(item, false);
+		}
+		else if(event.detail.status == 'done') {
+			self.hideStop();
+			self.onQueueCompleted(event.detail);
+		}
+	}
+
+	async onQueueCompleted(info) {
+		let result = info.nodepack_result;
+
+		if(result.length == 0) {
+			return;
+		}
+
+		let self = CustomNodesManager.instance;
+
+		if(!self.install_context) {
+			return;
+		}
+
+		const { target, label, mode } = self.install_context.btn;
 		target.classList.remove("cn-btn-loading");

+		let errorMsg = "";
+
+		for(let hash in result){
+			let v = result[hash];
+
+			if(v != 'success' && v != 'skip')
+				errorMsg += v+'\n';
+		}
+
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "action");
+		}
+
 		if (errorMsg) {
-			this.showError(errorMsg);
+			self.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			this.showStatus(`${label} ${list.length} custom node(s) successfully`);
+			self.showStatus(`${label} ${result.length} custom node(s) successfully`);
 		}

-		if (needRestart) {
-			this.showRestart();
-			this.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red")
-		}
+		self.showRestart();
+		self.showMessage(`To apply the installed/updated/disabled/enabled custom node, please restart ComfyUI. And refresh browser.`, "red");

+		infoToast(`[ComfyUI-Manager] All node pack tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
+		self.install_context = undefined;
 	}

 	// ===========================================================================================
@@ -1513,6 +1665,8 @@ export class CustomNodesManager {
 	}

 	async loadData(show_mode = ShowMode.NORMAL) {
+		const isElectron = 'electronAPI' in window;
+
 		this.show_mode = show_mode;
 		console.log("Show mode:", show_mode);

@@ -1532,6 +1686,11 @@ export class CustomNodesManager {
 		}
 		
 		const { channel, node_packs } = res.data;
+
+		if(isElectron) {
+			delete node_packs['comfyui-manager'];
+		}
+
 		this.channel = channel;
 		this.mode = mode;
 		this.custom_nodes = node_packs;
@@ -1699,9 +1858,9 @@ export class CustomNodesManager {
 	}

 	setDisabled(disabled) {
-
 		const $close = this.element.querySelector(".cn-manager-close");
 		const $restart = this.element.querySelector(".cn-manager-restart");
+		const $stop = this.element.querySelector(".cn-manager-stop");

 		const list = [
 			".cn-manager-header input",
@@ -1713,7 +1872,7 @@ export class CustomNodesManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close && it !== $restart;
+			return it !== $close && it !== $restart && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -1732,6 +1891,15 @@ export class CustomNodesManager {

 	showRestart() {
 		this.element.querySelector(".cn-manager-restart").style.display = "block";
+		setNeedRestart(true);
+	}
+
+	showStop() {
+		this.element.querySelector(".cn-manager-stop").style.display = "block";
+	}
+
+	hideStop() {
+		this.element.querySelector(".cn-manager-stop").style.display = "none";
 	}

 	setFilter(filterValue) {
@@ -1761,4 +1929,8 @@ export class CustomNodesManager {
 	close() {
 		this.element.style.display = "none";
 	}
+
+	get isVisible() {
+		return this.element?.style?.display !== "none";
+	}
 }
--- a/js/model-manager.js
+++ b/js/model-manager.js
@@ -1,12 +1,17 @@
+import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
-	fetchData, md5, icons 
+	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
+	storeColumnWidth, restoreColumnWidth
 } from  "./common.js";
+import { api } from "../../scripts/api.js";

 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";

+const gridId = "model";
+
 const pageCss = `
 .cmm-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
@@ -46,6 +51,18 @@ const pageCss = `
 	background-color: var(--comfy-input-bg);
 }

+.cmm-manager .cmm-manager-refresh {
+	display: none;
+	background-color: #000080;
+	color: white;
+}
+
+.cmm-manager .cmm-manager-stop {
+	display: none;
+	background-color: #500000;
+	color: white;
+}
+
 .cmm-manager-header {
 	display: flex;
 	flex-wrap: wrap;
@@ -235,7 +252,14 @@ const pageHtml = `
 <div class="cmm-manager-selection"></div>
 <div class="cmm-manager-message"></div>
 <div class="cmm-manager-footer">
-	<button class="cmm-manager-back">Back</button>
+	<button class="cmm-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
+	<button class="cmm-manager-refresh">Refresh</button>
+	<button class="cmm-manager-stop">Stop</button>
 	<div class="cmm-flex-auto"></div>
 </div>
 `;
@@ -254,6 +278,8 @@ export class ModelManager {
 		this.keywords = '';

 		this.init();
+
+		api.addEventListener("cm-queue-status", this.onQueueStatus);
 	}

 	init() {
@@ -365,12 +391,25 @@ export class ModelManager {
 				}
 			},

+			".cmm-manager-refresh": {
+				click: () => {
+					app.refreshComboInNodes();
+				}
+			},
+
+			".cmm-manager-stop": {
+				click: () => {
+					api.fetchApi('/manager/queue/reset');
+					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
+				}
+			},
+
 			".cmm-manager-back": {
 				click: (e) => {
 				    this.close()
 				    manager_instance.show();
 				}
-			},
+			}
 		};
 		Object.keys(eventsMap).forEach(selector => {
 			const target = this.element.querySelector(selector);
@@ -402,6 +441,10 @@ export class ModelManager {
            this.renderSelected();
        });

+		grid.bind("onColumnWidthChanged", (e, columnItem) => {
+			storeColumnWidth(gridId, columnItem)
+		});
+
 		grid.bind('onClick', (e, d) => {
 			const { rowItem } = d;
 			const target = d.e.target;
@@ -553,6 +596,8 @@ export class ModelManager {
 			width: 200
 		}];

+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options,
 			rows,
@@ -595,17 +640,27 @@ export class ModelManager {
 	}

 	async installModels(list, btn) {
-		
+		let stats = await api.fetchApi('/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})`);
+			return;
+		}
+
 		btn.classList.add("cmm-btn-loading");
-		this.showLoading();
 		this.showError("");

-		let needRestart = false;
+		let needRefresh = false;
 		let errorMsg = "";

+		await api.fetchApi('/manager/queue/reset');
+
+		let target_items = [];
+
 		for (const item of list) {
-			
 			this.grid.scrollRowIntoView(item);
+			target_items.push(item);

 			if (!this.focusInstall(item)) {
 				this.grid.onNextUpdated(() => {
@@ -616,48 +671,112 @@ export class ModelManager {
 			this.showStatus(`Install ${item.name} ...`);

 			const data = item.originalData;
-			const res = await fetchData('/model/install', {
+			data.ui_id = item.hash;
+
+			const res = await api.fetchApi(`/manager/queue/install_model`, {
 				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify(data)
 			});

+			if (res.status != 200) {
+				errorMsg = `'${item.name}': `;

-			if (res.error) {
-				errorMsg = `Install failed: ${item.name} ${res.error.message}`;
-				break;;
+				if(res.status == 403) {
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
+		}

-			needRestart = true;
+		this.install_context = {btn: btn, targets: target_items};

-			this.grid.setRowSelected(item, false);
+		if(errorMsg) {
+			this.showError(errorMsg);
+			show_message("[Installation Errors]\n"+errorMsg);
+
+			// reset
+			for(let k in target_items) {
+				const item = target_items[k];
+				this.grid.updateCell(item, "installed");
+			}
+		}
+		else {
+			await api.fetchApi('/manager/queue/start');
+			this.showStop();
+			showTerminal();
+		}
+	}
+
+	async onQueueStatus(event) {
+		let self = ModelManager.instance;
+
+		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'model_manager') {
+			const hash = event.detail.target;
+
+			const item = self.grid.getRowItemBy("hash", hash);

 			item.refresh = true;
+			self.grid.setRowSelected(item, false);
 			item.selectable = false;
-			this.grid.updateCell(item, "installed");
-			this.grid.updateCell(item, "tg-column-select");
+//			self.grid.updateCell(item, "tg-column-select");
+			self.grid.updateRow(item);
+		}
+		else if(event.detail.status == 'done') {
+			self.hideStop();
+			self.onQueueCompleted(event.detail);
+		}
+	}

-			this.showStatus(`Install ${item.name} successfully`);
+	async onQueueCompleted(info) {
+		let result = info.model_result;

+		if(result.length == 0) {
+			return;
 		}

-		this.hideLoading();
+		let self = ModelManager.instance;
+
+		if(!self.install_context) {
+			return;
+		}
+
+		let btn = self.install_context.btn;
+
+		self.hideLoading();
 		btn.classList.remove("cmm-btn-loading");

+		let errorMsg = "";
+
+		for(let hash in result){
+			let v = result[hash];
+
+			if(v != 'success')
+				errorMsg += v + '\n';
+		}
+
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "installed");
+		}
+
 		if (errorMsg) {
-			this.showError(errorMsg);
+			self.showError(errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			this.showStatus(`Install ${list.length} models successfully`);
+			self.showStatus(`Install ${result.length} models successfully`);
 		}

-		if (needRestart) {
-			this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red")
-		}
+		self.showRefresh();
+		self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red")

+		infoToast('Tasks done', `[ComfyUI-Manager] All model downloading tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
+		self.install_context = undefined;
 	}

 	getModelList(models) {
-
 		const typeMap = new Map();
 		const baseMap = new Map();

@@ -826,7 +945,7 @@ export class ModelManager {
 	}

 	showLoading() {
-		this.setDisabled(true);
+//		this.setDisabled(true);
 		if (this.grid) {
 			this.grid.showLoading();
 			this.grid.showMask({
@@ -836,7 +955,7 @@ export class ModelManager {
 	}

 	hideLoading() {
-		this.setDisabled(false);
+//		this.setDisabled(false);
 		if (this.grid) {
 			this.grid.hideLoading();
 			this.grid.hideMask();
@@ -844,8 +963,9 @@ export class ModelManager {
 	}

 	setDisabled(disabled) {
-
 		const $close = this.element.querySelector(".cmm-manager-close");
+		const $refresh = this.element.querySelector(".cmm-manager-refresh");
+		const $stop = this.element.querySelector(".cmm-manager-stop");

 		const list = [
 			".cmm-manager-header input",
@@ -857,7 +977,7 @@ export class ModelManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close;
+			return it !== $close && it !== $refresh && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -874,6 +994,18 @@ export class ModelManager {

 	}

+	showRefresh() {
+		this.element.querySelector(".cmm-manager-refresh").style.display = "block";
+	}
+
+	showStop() {
+		this.element.querySelector(".cmm-manager-stop").style.display = "block";
+	}
+
+	hideStop() {
+		this.element.querySelector(".cmm-manager-stop").style.display = "none";
+	}
+
 	setKeywords(keywords = "") {
 		this.keywords = keywords;
 		this.element.querySelector(".cmm-manager-keywords").value = keywords;
--- a/js/node_fixer.js
+++ b/js/node_fixer.js
@@ -1,16 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";

-let double_click_policy = "copy-all";
-
-api.fetchApi('/manager/dbl_click/policy')
-	.then(response => response.text())
-	.then(data => set_double_click_policy(data));
-
-export function set_double_click_policy(mode) {
-	double_click_policy = mode;
-}
-
 function addMenuHandler(nodeType, cb) {
 	const getOpts = nodeType.prototype.getExtraMenuOptions;
 	nodeType.prototype.getExtraMenuOptions = function () {
@@ -153,62 +143,6 @@ function node_info_copy(src, dest, connect_both, copy_shape) {

 app.registerExtension({
 	name: "Comfy.Manager.NodeFixer",
-
-	async nodeCreated(node, app) {
-		let orig_dblClick = node.onDblClick;
-		node.onDblClick = function (e, pos, self) {
-			orig_dblClick?.apply?.(this, arguments);
-
-			if((!node.inputs && !node.outputs) || pos[1] > 0)
-				return;
-
-			switch(double_click_policy) {
-				case "copy-all":
-				case "copy-full":
-				case "copy-input":
-					{
-						if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
-							return;
-
-						let src_node = lookup_nearest_nodes(node);
-						if(src_node)
-						{
-							let both_connection = double_click_policy != "copy-input";
-							let copy_shape = double_click_policy == "copy-full";
-							node_info_copy(src_node, node, both_connection, copy_shape);
-						}
-					}
-					break;
-				case "possible-input":
-					{
-						let nearest_inputs = lookup_nearest_inputs(node);
-						if(nearest_inputs)
-							connect_inputs(nearest_inputs, node);
-					}
-					break;
-				case "dual":
-					{
-						if(pos[0] < node.size[0]/2) {
-							// left: possible-input
-							let nearest_inputs = lookup_nearest_inputs(node);
-							if(nearest_inputs)
-								connect_inputs(nearest_inputs, node);
-						}
-						else {
-							// right: copy-all
-							if(node.inputs?.some(x => x.link != null) || node.outputs?.some(x => x.links != null && x.links.length > 0) )
-								return;
-
-							let src_node = lookup_nearest_nodes(node);
-							if(src_node)
-								node_info_copy(src_node, node, true);
-						}
-					}
-					break;
-			}
-		}
-	},
-
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({
--- a/js/workflow-metadata.js
+++ b/js/workflow-metadata.js
@@ -17,16 +17,18 @@ import { api } from "../../scripts/api.js";
 class WorkflowMetadataExtension {
  constructor() {
    this.name = "Comfy.CustomNodesManager.WorkflowMetadata";
-    this.installedNodeVersions = {};
+    this.installedNodes = {};
    this.comfyCoreVersion = null;
  }

  /**
-   * Get the installed node versions
-   * @returns {Promise<Record<string, string>>} The mapping from node name to version
-   * version can either be a git commit hash or a semantic version such as "1.0.0"
+   * Get the installed nodes info
+   * @returns {Promise<Record<string, {ver: string, cnr_id: string, enabled: boolean}>>} The mapping from node name to its info.
+   * ver can either be a git commit hash or a semantic version such as "1.0.0"
+   * cnr_id is the id of the node in the ComfyRegistry
+   * enabled is true if the node is enabled, false if it is disabled
   */
-  async getInstalledNodeVersions() {
+  async getInstalledNodes() {
    const res = await api.fetchApi("/customnode/installed");
    return await res.json();
  }
@@ -48,8 +50,12 @@ class WorkflowMetadataExtension {

      if (modules[0] === "custom_nodes") {
        const nodePackageName = modules[1];
-        const nodeVersion = this.installedNodeVersions[nodePackageName];
-        nodeVersions[nodePackageName] = nodeVersion;
+        const nodeInfo =
+          this.installedNodes[nodePackageName] ??
+          this.installedNodes[nodePackageName.toLowerCase()];
+        if (nodeInfo) {
+          nodeVersions[nodePackageName] = nodeInfo.ver;
+        }
      } else if (["nodes", "comfy_extras"].includes(modules[0])) {
        nodeVersions["comfy-core"] = this.comfyCoreVersion;
      } else {
@@ -61,7 +67,7 @@ class WorkflowMetadataExtension {

  async init() {
    const extension = this;
-    this.installedNodeVersions = await this.getInstalledNodeVersions();
+    this.installedNodes = await this.getInstalledNodes();
    this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;

    // Attach metadata when app.graphToPrompt is called.
@@ -74,7 +80,11 @@ class WorkflowMetadataExtension {
        workflow.extra = {};
      }
      const graph = this;
-      workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
+      try {
+        workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
+      } catch (e) {
+        console.error(e);
+      }

      return workflow;
    };
--- a/misc/custom-nodes.jpg
+++ b/misc/custom-nodes.jpg
--- a/misc/main.jpg
+++ b/misc/main.jpg
--- a/misc/menu.jpg
+++ b/misc/menu.jpg
--- a/misc/missing-list.jpg
+++ b/misc/missing-list.jpg
--- a/misc/missing-menu.jpg
+++ b/misc/missing-menu.jpg
--- a/misc/models.png
+++ b/misc/models.png
--- a/misc/nickname.jpg
+++ b/misc/nickname.jpg
--- a/misc/portable-install.png
+++ b/misc/portable-install.png
--- a/misc/share-setting.jpg
+++ b/misc/share-setting.jpg
--- a/misc/share.jpg
+++ b/misc/share.jpg
--- a/misc/snapshot.jpg
+++ b/misc/snapshot.jpg
--- a/model-list.json
+++ b/model-list.json
@@ -209,28 +209,6 @@
      "url": "https://huggingface.co/stabilityai/stable-diffusion-x4-upscaler/resolve/main/x4-upscaler-ema.safetensors",
      "size": "3.53GB"
    },
-    {
-      "name": "Inswapper-fp16 (face swap)",
-      "type": "insightface",
-      "base": "inswapper",
-      "save_path": "insightface",
-      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
-      "reference": "https://github.com/facefusion/facefusion-assets",
-      "filename": "inswapper_128_fp16.onnx",
-      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
-      "size": "277.7MB"
-    },
-    {
-      "name": "Inswapper (face swap)",
-      "type": "insightface",
-      "base": "inswapper",
-      "save_path": "insightface",
-      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
-      "reference": "https://github.com/facefusion/facefusion-assets",
-      "filename": "inswapper_128.onnx",
-      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
-      "size": "555.3MB"
-    },
    {
      "name": "Deepbump",
      "type": "deepbump",
@@ -310,7 +288,7 @@
    },
    {
      "name": "negative_hand Negative Embedding",
-      "type": "embeddings",
+      "type": "embedding",
      "base": "SD1.5",
      "save_path": "embeddings/SD1.5",
      "description": "If you use this embedding with negatives, you can solve the issue of damaging your hands.",
@@ -321,7 +299,7 @@
    },
    {
      "name": "bad_prompt Negative Embedding",
-      "type": "embeddings",
+      "type": "embedding",
      "base": "SD1.5",
      "save_path": "embeddings/SD1.5",
      "description": "The idea behind this embedding was to somehow train the negative prompt as an embedding, thus unifying the basis of the negative prompt into one word or embedding.",
@@ -332,7 +310,7 @@
    },
    {
      "name": "Deep Negative V1.75",
-      "type": "embeddings",
+      "type": "embedding",
      "base": "SD1.5",
      "save_path": "embeddings/SD1.5",
      "description": "These embedding learn what disgusting compositions and color patterns are, including faulty human anatomy, offensive color schemes, upside-down spatial structures, and more. Placing it in the negative can go a long way to avoiding these things.",
@@ -343,7 +321,7 @@
    },
    {
      "name": "EasyNegative",
-      "type": "embeddings",
+      "type": "embedding",
      "base": "SD1.5",
      "save_path": "embeddings/SD1.5",
      "description": "This embedding should be used in your NEGATIVE prompt. Adjust the strength as desired (seems to scale well without any distortions), the strength required may vary based on positive and negative prompts.",
@@ -488,7 +466,7 @@
      "name": "stabilityai/Stable Cascade: text_encoder (CLIP)",
      "type": "clip",
      "base": "Stable Cascade",
-      "save_path": "clip/Stable-Cascade",
+      "save_path": "text_encoders/Stable-Cascade",
      "description": "Stable Cascade: text_encoder",
      "reference": "https://huggingface.co/stabilityai/stable-cascade",
      "filename": "model.safetensors",
@@ -877,11 +855,67 @@
      "size": "5.16GB"
    },

+    {
+      "name": "comfyanonymous/cosmos_cv8x8x8_1.0.safetensors",
+      "type": "VAE",
+      "base": "Cosmos-1.0",
+      "save_path": "default",
+      "description": "VAE model for Cosmos 1.0",
+      "reference": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/tree/main",
+      "filename": "cosmos_cv8x8x8_1.0.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/resolve/main/vae/cosmos_cv8x8x8_1.0.safetensors",
+      "size": "211MB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "size": "28.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "size": "28.5GB"
+    },
+
    {
      "name": "google-t5/t5-base",
      "type": "clip",
      "base": "t5-base",
-      "save_path": "clip/t5-base",
+      "save_path": "text_encoders/t5-base",
      "description": "T5 Base: Text-To-Text Transfer Transformer. This model can be loaded via CLIPLoader for Stable Audio workflow.",
      "reference": "https://huggingface.co/google-t5/t5-base",
      "filename": "model.safetensors",
@@ -892,7 +926,7 @@
      "name": "google-t5/t5-v1_1-xxl_encoderonly-fp16",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
      "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
      "filename": "google_t5-v1_1-xxl_encoderonly-fp16.safetensors",
@@ -903,7 +937,7 @@
      "name": "google-t5/t5-v1_1-xxl_encoderonly-fp8_e4m3fn",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "The encoder part of https://huggingface.co/google/t5-v1_1-xxl, used with SD3 and Flux1",
      "reference": "https://huggingface.co/mcmonkey/google_t5-v1_1-xxl_encoderonly",
      "filename": "google_t5-v1_1-xxl_encoderonly-fp8_e4m3fn.safetensors",
@@ -916,7 +950,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q3_K_L.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q3_K_L quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q3_K_L.gguf",
@@ -927,7 +961,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q3_K_M.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q3_K_M quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q3_K_M.gguf",
@@ -938,7 +972,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q3_K_S.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q3_K_S quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q3_K_S.gguf",
@@ -949,7 +983,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q4_K_M.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q4_K_M quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q4_K_M.gguf",
@@ -960,7 +994,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q4_K_S.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q4_K_S quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q4_K_S.gguf",
@@ -971,7 +1005,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q5_K_M.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q5_K_M quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q5_K_M.gguf",
@@ -982,7 +1016,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q5_K_S.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q5_K_S quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q5_K_S.gguf",
@@ -993,7 +1027,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q6_K.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q6_K quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q6_K.gguf",
@@ -1004,7 +1038,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-Q8_0.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (Q8_0 quantized)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-Q8_0.gguf",
@@ -1015,7 +1049,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-f16.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (float 16)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-f16.gguf",
@@ -1026,7 +1060,7 @@
      "name": "city96/t5-v1_1-xxl-encoder-f32.gguf",
      "type": "clip",
      "base": "t5",
-      "save_path": "clip/t5",
+      "save_path": "text_encoders/t5",
      "description": "t5xxl Text Encoder GGUF model. (float 32)",
      "reference": "https://huggingface.co/city96/t5-v1_1-xxl-encoder-gguf",
      "filename": "t5-v1_1-xxl-encoder-f32.gguf",
@@ -1665,17 +1699,6 @@
      "url": "https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors",
      "size": "774.5MB"
    },
-    {
-      "name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
-      "type": "controlnet",
-      "base": "SDXL",
-      "save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
-      "description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
-      "reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
-      "filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
-      "url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
-      "size": "46.2MB"
-    },
    {
      "name": "SDXL-controlnet: OpenPose (v2)",
      "type": "controlnet",
@@ -2259,6 +2282,18 @@
      "url": "https://huggingface.co/CiaraRowles/TemporalDiff/resolve/main/temporaldiff-v1-animatediff.ckpt",
      "size": "1.67GB"
    },
+    {
+      "name": "Leoxing/pia.ckpt",
+      "type": "animatediff-pia",
+      "base": "SD1.x",
+      "save_path": "animatediff_models",
+      "description": "AnimateDiff-PIA Model",
+      "reference": "https://huggingface.co/Leoxing/PIA/tree/main",
+      "filename": "pia.ckpt",
+      "url": "https://huggingface.co/Leoxing/PIA/resolve/main/pia.ckpt",
+      "size": "1.67GB"
+    },
+
    {
      "name": "animatediff/v2_lora_PanLeft.ckpt (ComfyUI-AnimateDiff-Evolved) (Updated path)",
      "type": "motion lora",
@@ -2746,39 +2781,6 @@



-    {
-      "name": "pfg-novel-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-novel-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
-      "size": "23.6MB"
-    },
-    {
-      "name": "pfg-wd14-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-wd14-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
-      "size": "31.5MB"
-    },
-    {
-      "name": "pfg-wd15beta2-n10.pt",
-      "type": "PFG",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/pfg-ComfyUI/models",
-      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
-      "reference": "https://huggingface.co/furusu/PFG",
-      "filename": "pfg-wd15beta2-n10.pt",
-      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
-      "size": "31.5MB"
-    },
    {
      "name": "GFPGANv1.4.pth",
      "type": "GFPGAN",
@@ -2944,50 +2946,6 @@
      "url": "https://huggingface.co/InstantX/InstantID/resolve/main/ControlNetModel/diffusion_pytorch_model.safetensors",
      "size": "2.50GB"
    },
-    {
-      "name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
-      "type": "efficient_sam",
-      "base": "efficient_sam",
-      "save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
-      "description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
-      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
-      "filename": "efficient_sam_s_cpu.jit",
-      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
-      "size": "106.0MB"
-    },
-    {
-      "name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
-      "type": "efficient_sam",
-      "base": "efficient_sam",
-      "save_path": "custom_nodes/ComfyUI-YoloWorld-EfficientSAM",
-      "description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
-      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
-      "filename": "efficient_sam_s_gpu.jit",
-      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
-      "size": "106.0MB"
-    },
-    {
-      "name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
-      "type": "Shape Predictor",
-      "base": "DLIB",
-      "save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
-      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
-      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
-      "filename": "shape_predictor_68_face_landmarks.dat",
-      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
-      "size": "99.7MB"
-    },
-    {
-      "name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
-      "type": "Face Recognition",
-      "base": "DLIB",
-      "save_path": "custom_nodes/ComfyUI_FaceAnalysis/dlib",
-      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
-      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
-      "filename": "dlib_face_recognition_resnet_model_v1.dat",
-      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
-      "size": "22.5MB"
-    },
    {
      "name": "InstanceDiffusion/fusers",
      "type": "InstanceDiffusion",
@@ -3362,50 +3320,6 @@
      "url": "https://huggingface.co/lllyasviel/ic-light/resolve/main/iclight_sd15_fcon.safetensors",
      "size": "1.72GB"
    },
-    {
-      "name": "ID-Animator/animator.ckpt",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models",
-      "description": "ID-Animator checkpoint",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "animator.ckpt",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
-      "size": "247.3MB"
-    },
-    {
-      "name": "ID-Animator/mm_sd_v15_v2.ckpt",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models/animatediff_models",
-      "description": "AnimateDiff checkpoint for ID-Animator",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "mm_sd_v15_v2.ckpt",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
-      "size": "1.82GB"
-    },
-    {
-      "name": "ID-Animator/image_encoder",
-      "type": "ID-Animator",
-      "base": "SD1.5",
-      "save_path": "custom_nodes/ComfyUI_ID_Animator/models/image_encoder",
-      "description": "CLIP Image encoder for ID-Animator",
-      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
-      "filename": "model.safetensors",
-      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
-      "size": "2.53GB"
-    },
-    {
-      "name": "TencentARC/CustomNet",
-      "type": "CustomNet",
-      "base": "CustomNet",
-      "save_path": "custom_nodes/ComfyUI_CustomNet/pretrain",
-      "description": "CustomNet pretrained model for ComfyUI_CustomNet",
-      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
-      "filename": "customnet_v1.pt",
-      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
-      "size": "5.71GB"
-    },
    {
      "name": "TTPlanet/TTPLanet_SDXL_Controlnet_Tile_Realistic v2 (fp16)",
      "type": "controlnet",
@@ -3494,17 +3408,6 @@
      "url": "https://huggingface.co/ViperYX/RGT/resolve/main/RGT_S/RGT_S_x4.pth",
      "size": "136.0MB"
    },
-    {
-      "name": "Doubiiu/ToonCrafter model checkpoint",
-      "type": "checkpoint",
-      "base": "ToonCrafter",
-      "save_path": "custom_nodes/ComfyUI-ToonCrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
-      "description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
-      "reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
-      "filename": "model.ckpt",
-      "url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
-      "size": "10.5GB"
-    },

    {
      "name": "InstantX/FLUX.1-dev Controlnet (Union)",
@@ -4040,7 +3943,7 @@
      "name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
      "type": "VAE",
      "base": "Hunyuan Video",
-      "save_path": "VAE",
+      "save_path": "default",
      "description": "Huyuan Video VAE model. repackaged version.",
      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
      "filename": "hunyuan_video_vae_bf16.safetensors",
@@ -4397,23 +4300,11 @@
      "size": "12.7GB"
    },

-    {
-      "name": "BAAI/SegGPT",
-      "type": "SegGPT",
-      "base": "SegGPT",
-      "save_path": "custom_nodes/comfyui-SegGPT",
-      "description": "SegGPT",
-      "reference": "https://huggingface.co/BAAI/SegGPT",
-      "filename": "seggpt_vit_large.pth",
-      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
-      "size": "1.48GB"
-    },
-
    {
      "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
      "type": "clip",
      "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
      "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
      "reference": "https://huggingface.co/zer0int",
      "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -4424,7 +4315,7 @@
      "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
      "type": "clip",
      "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
      "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
      "reference": "https://huggingface.co/zer0int",
      "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -4725,6 +4616,75 @@
      "filename": "ip_adapter.safetensors",
      "url": "https://huggingface.co/XLabs-AI/flux-ip-adapter/resolve/main/ip_adapter.safetensors",
      "size": "982MB"
+    },
+
+    {
+      "name": "efficient_sam_s_cpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
+      "type": "efficient_sam",
+      "base": "efficient_sam",
+      "save_path": "yolo_world",
+      "description": "Install efficient_sam_s_cpu.jit into ComfyUI-YoloWorld-EfficientSAM",
+      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
+      "filename": "efficient_sam_s_cpu.jit",
+      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_cpu.jit",
+      "size": "106.0MB"
+    },
+    {
+      "name": "efficient_sam_s_gpu.jit [ComfyUI-YoloWorld-EfficientSAM]",
+      "type": "efficient_sam",
+      "base": "efficient_sam",
+      "save_path": "yolo_world",
+      "description": "Install efficient_sam_s_gpu.jit into ComfyUI-YoloWorld-EfficientSAM",
+      "reference": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/tree/main",
+      "filename": "efficient_sam_s_gpu.jit",
+      "url": "https://huggingface.co/camenduru/YoloWorld-EfficientSAM/resolve/main/efficient_sam_s_gpu.jit",
+      "size": "106.0MB"
+    },
+
+    {
+      "name": "TencentARC/CustomNet V1",
+      "type": "CustomNet",
+      "base": "CustomNet",
+      "save_path": "checkpoints/customnet",
+      "description": "CustomNet pretrained model for ComfyUI_CustomNet",
+      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
+      "filename": "customnet_v1.pt",
+      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_v1.pt",
+      "size": "5.71GB"
+    },
+    {
+      "name": "TencentARC/CustomNet Inpaint V1",
+      "type": "CustomNet",
+      "base": "CustomNet",
+      "save_path": "checkpoints/customnet",
+      "description": "CustomNet Inpaint pretrained model for ComfyUI_CustomNet",
+      "reference": "https://huggingface.co/TencentARC/CustomNet/tree/main",
+      "filename": "customnet_inpaint_v1.pt",
+      "url": "https://huggingface.co/TencentARC/CustomNet/resolve/main/customnet_inpaint_v1.pt",
+      "size": "5.71GB"
+    },
+
+    {
+      "name": "deepseek-ai/Janus-Pro-1B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-1B",
+      "size": "7.8GB"
+    },
+    {
+      "name": "deepseek-ai/Janus-Pro-7B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-7B",
+      "size": "14.85GB"
    }
  ]
 }
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
--- 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,5 +1,15 @@
 {
    "custom_nodes": [
+        {
+            "author": "PramaLLC",
+            "title": "ComfyUI BEN - Background Erase Network",
+            "reference": "https://github.com/PramaLLC/BEN2_ComfyUI",
+            "files": [
+                "https://github.com/PramaLLC/BEN2_ComfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "Remove backgrounds from images with [a/BEN2](https://huggingface.co/PramaLLC/BEN2) in ComfyUI\nOriginal repo: [a/https://github.com/DoctorDiffusion/ComfyUI-BEN](https://github.com/DoctorDiffusion/ComfyUI-BEN)"
+        },
        {
            "author": "BlenderNeko",
            "title": "ltdrdata/ComfyUI_TiledKSampler",
--- a/node_db/legacy/custom-node-list.json
+++ b/node_db/legacy/custom-node-list.json
@@ -10,7 +10,203 @@
        },
        

-        
+        {
+            "author": "Njbx",
+            "title": "ComfyUI-blockswap [REMOVED]",
+            "reference": "https://github.com/Njbx/ComfyUI-blockswap",
+            "files": [
+                "https://github.com/Njbx/ComfyUI-blockswap"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Block Swap"
+        },
+        {
+            "author": "T8star1984",
+            "title": "comfyui-purgevram [REMOVED]",
+            "reference": "https://github.com/T8star1984/comfyui-purgevram",
+            "files": [
+                "https://github.com/T8star1984/comfyui-purgevram"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-VideoDiffusion [REMOVED]",
+            "reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI-VideoDiffusion"
+            ],
+            "install_type": "git-clone",
+            "description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
+        },
+        {
+            "author": "NyaamZ",
+            "title": "Get Booru Tag ExtendeD [REMOVED]",
+            "reference": "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED",
+            "files": [
+               "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED"
+            ],
+            "description": "Get tag from Booru site.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "lingha",
+            "title": "comfyui_kj [REMOVED]",
+            "id": "comfyui_kj",
+            "reference": "https://github.com/XieChengYuan/comfyui_kj",
+            "files": [
+                "https://github.com/XieChengYuan/comfyui_kj"
+            ],
+            "install_type": "git-clone",
+            "description": "comfyui_kj, A tool that can package workflows into projects and publish them to a WeChat Mini Program named Kaji, allowing charges to be collected from users."
+        },
+        {
+            "author": "myAiLemon",
+            "title": "MagicGetPromptAutomatically",
+            "reference": "https://github.com/myAiLemon/MagicGetPromptAutomatically",
+            "files": [
+                "https://github.com/myAiLemon/MagicGetPromptAutomatically"
+            ],
+            "install_type": "git-clone",
+            "description": "A plug-in that can automatically generate pictures and save txt files in comfyui"
+        },
+        {
+            "author": "ryanontheinside",
+            "title": "ComfyUI_ScavengerHunt [REMOVED]",
+            "reference": "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt",
+            "files": [
+                "https://github.com/ryanontheinside/ComfyUI_ScavengerHunt"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Compare Image Similarity (ResNet), Compare Image Similarity (CLIP), Compare Image Types\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "vpakarinen",
+            "title": "ComfyUI-GenerationTimer [REMOVED]",
+            "reference": "https://github.com/vpakarinen/ComfyUI-GenerationTimer",
+            "files": [
+                "https://github.com/vpakarinen/ComfyUI-GenerationTimer"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Generation Timer, Image Timer, Timer Display"
+        },
+        {
+            "author": "RedRayz",
+            "title": "ComfyUI-Danbooru-To-WD [REMOVED]",
+            "id": "danbooru2wd",
+            "reference": "https://github.com/RedRayz/ComfyUI-Danbooru-To-WD",
+            "files": [
+                "https://github.com/RedRayz/ComfyUI-Danbooru-To-WD"
+            ],
+            "install_type": "git-clone",
+            "description": "Converts booru tags to a format suitable for Waifu Diffusion(or Danbooru based models)."
+        },
+        {
+            "author": "alexgenovese",
+            "title": "comfyui_CfgPlusPlus [REMOVED]",
+            "id": "cfgpp",
+            "reference": "https://gitea.com/NotEvilGirl/cfgpp",
+            "files": [
+                "https://gitea.com/NotEvilGirl/cfgpp"
+            ],
+            "install_type": "git-clone",
+            "description": "CFG++ implemented according to [a/https://cfgpp-diffusion.github.io](https://cfgpp-diffusion.github.io). Basically modified DDIM sampler that makes sampling work at low CFG values (0 ~ 2). Read the CFG++ paper for more details"
+        },
+        {
+            "author": "hosterosi",
+            "title": "ComfyUI OpenAI Node",
+            "reference": "https://github.com/hosterosi/ComfyUI_OpenAI [REMOVED]",
+            "files": [
+                "https://github.com/hosterosi/ComfyUI_OpenAI"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node for ComfyUI allows users to input multiline text and select a specific line by its number. The node processes the input and returns the selected line along with its index."
+        },
+        {
+            "author": "Gourieff",
+            "title": "ReActor Node for ComfyUI [DISABLED]",
+            "id": "reactor",
+            "reference": "https://github.com/Gourieff/comfyui-reactor-node",
+            "files": [
+                "https://github.com/Gourieff/comfyui-reactor-node"
+            ],
+            "install_type": "git-clone",
+            "description": "The Fast and Simple 'roop-like' Face Swap Extension Node for ComfyUI, based on ReActor (ex Roop-GE) SD-WebUI Face Swap Extension"
+        },
+        {
+            "author": "prismwastaken",
+            "title": "prism-tools [REMOVED]",
+            "reference": "https://github.com/prismwastaken/prism-comfyui-tools",
+            "files": [
+                "https://github.com/prismwastaken/prism-comfyui-tools"
+            ],
+            "install_type": "git-clone",
+            "description": "prism-tools"
+        },
+        {
+            "author": "42lux",
+            "title": "ComfyUI-safety-checker [DEPRECATED]",
+            "reference": "https://github.com/42lux/ComfyUI-safety-checker",
+            "files": [
+                "https://github.com/42lux/ComfyUI-safety-checker"
+            ],
+            "install_type": "git-clone",
+            "description": "A NSFW/Safety Checker Node for ComfyUI."
+        },
+        {
+            "author": "riverolls",
+            "title": "ComfyUI-FJDH",
+            "reference": "https://github.com/riverolls/ComfyUI-FJDH [REMOVED]",
+            "files": [
+                "https://github.com/riverolls/ComfyUI-FJDH"
+            ],
+            "install_type": "git-clone",
+            "description": "bbox tools, image tools, mask generators, point tools"
+        },
+        {
+            "author": "jetchopper",
+            "title": "ComfyUI-GeneraNodes",
+            "id": "genera",
+            "reference": "https://github.com/evolox/ComfyUI-GeneraNodes [REMOVED]",
+            "files": [
+                "https://github.com/evolox/ComfyUI-GeneraNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Genera custom nodes and extensions"
+        },
+        {
+            "author": "Pos13",
+            "title": "Cyclist [DEPRECATED]",
+            "id": "cyclist",
+            "reference": "https://github.com/Pos13/comfyui-cyclist",
+            "files": [
+                "https://github.com/Pos13/comfyui-cyclist"
+            ],
+            "install_type": "git-clone",
+            "description": "This extension provides tools to iterate generation results between runs. In general, it's for cycles."
+        },
+        {
+            "author": "leiweiqiang",
+            "title": "ComfyUI-TRA",
+            "id": "tra",
+            "reference": "https://github.com/leiweiqiang/ComfyUI-TRA",
+            "files": [
+                "https://github.com/leiweiqiang/ComfyUI-TRA"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:TCL EbSynth, TCL Extract Frames (From File), TCL Extract Frames (From Video), TCL Combine Frames, TCL Save Video (From Frames)"
+        },
+        {
+            "author": "ai-business-hql",
+            "title": "comfyUIAgent [REMOVED]",
+            "reference": "https://github.com/ai-business-hql/comfyUIAgent",
+            "files": [
+                "https://github.com/ai-business-hql/comfyUIAgent"
+            ],
+            "install_type": "git-clone",
+            "description": "test"
+        },
        {
            "author": "daqingliu",
            "title": "ComfyUI-SaveImageOSS [REMOVED]",
--- a/node_db/legacy/model-list.json
+++ b/node_db/legacy/model-list.json
@@ -1,3 +1,148 @@
 {
-  "models": []
+  "models": [
+    {
+      "name": "Inswapper-fp16 (face swap) [REMOVED]",
+      "type": "insightface",
+      "base": "inswapper",
+      "save_path": "insightface",
+      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
+      "reference": "https://github.com/facefusion/facefusion-assets",
+      "filename": "inswapper_128_fp16.onnx",
+      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128_fp16.onnx",
+      "size": "277.7MB"
+    },
+    {
+      "name": "Inswapper (face swap) [REMOVED]",
+      "type": "insightface",
+      "base": "inswapper",
+      "save_path": "insightface",
+      "description": "Checkpoint of the insightface swapper model\n(used by ComfyUI-FaceSwap, comfyui-reactor-node, CharacterFaceSwap,\nComfyUI roop and comfy_mtb)",
+      "reference": "https://github.com/facefusion/facefusion-assets",
+      "filename": "inswapper_128.onnx",
+      "url": "https://github.com/facefusion/facefusion-assets/releases/download/models/inswapper_128.onnx",
+      "size": "555.3MB"
+    },
+    {
+      "name": "pfg-novel-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-novel-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-novel-n10.pt",
+      "size": "23.6MB"
+    },
+    {
+      "name": "pfg-wd14-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-wd14-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd14-n10.pt",
+      "size": "31.5MB"
+    },
+    {
+      "name": "pfg-wd15beta2-n10.pt",
+      "type": "PFG",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/pfg-ComfyUI/models",
+      "description": "Pressing 'install' directly downloads the model from the pfg-ComfyUI/models extension node. (Note: Requires ComfyUI-Manager V0.24 or above)",
+      "reference": "https://huggingface.co/furusu/PFG",
+      "filename": "pfg-wd15beta2-n10.pt",
+      "url": "https://huggingface.co/furusu/PFG/resolve/main/pfg-wd15beta2-n10.pt",
+      "size": "31.5MB"
+    },
+    {
+      "name": "shape_predictor_68_face_landmarks.dat [Face Analysis]",
+      "type": "Shape Predictor",
+      "base": "DLIB",
+      "save_path": "custom_nodes/comfyui_faceanalysis/dlib",
+      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
+      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
+      "filename": "shape_predictor_68_face_landmarks.dat",
+      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/shape_predictor_68_face_landmarks.dat",
+      "size": "99.7MB"
+    },
+    {
+      "name": "dlib_face_recognition_resnet_model_v1.dat [Face Analysis]",
+      "type": "Face Recognition",
+      "base": "DLIB",
+      "save_path": "custom_nodes/comfyui_faceanalysis/dlib",
+      "description": "To use the Face Analysis for ComfyUI custom node, installation of this model is needed.",
+      "reference": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/tree/main",
+      "filename": "dlib_face_recognition_resnet_model_v1.dat",
+      "url": "https://huggingface.co/matt3ounstable/dlib_predictor_recognition/resolve/main/dlib_face_recognition_resnet_model_v1.dat",
+      "size": "22.5MB"
+    },
+    {
+      "name": "ID-Animator/animator.ckpt",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models",
+      "description": "ID-Animator checkpoint",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "animator.ckpt",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/animator.ckpt",
+      "size": "247.3MB"
+    },
+    {
+      "name": "ID-Animator/mm_sd_v15_v2.ckpt",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models/animatediff_models",
+      "description": "AnimateDiff checkpoint for ID-Animator",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "mm_sd_v15_v2.ckpt",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/mm_sd_v15_v2.ckpt",
+      "size": "1.82GB"
+    },
+    {
+      "name": "ID-Animator/image_encoder",
+      "type": "ID-Animator",
+      "base": "SD1.5",
+      "save_path": "custom_nodes/comfyui_id_animator/models/image_encoder",
+      "description": "CLIP Image encoder for ID-Animator",
+      "reference": "https://huggingface.co/spaces/ID-Animator/ID-Animator",
+      "filename": "model.safetensors",
+      "url": "https://huggingface.co/spaces/ID-Animator/ID-Animator/resolve/main/image_encoder/model.safetensors",
+      "size": "2.53GB"
+    },
+    {
+      "name": "Doubiiu/ToonCrafter model checkpoint",
+      "type": "checkpoint",
+      "base": "ToonCrafter",
+      "save_path": "custom_nodes/comfyui-tooncrafter/ToonCrafter/checkpoints/tooncrafter_512_interp_v1",
+      "description": "ToonCrafter checkpoint model for ComfyUI-ToonCrafter",
+      "reference": "https://huggingface.co/Doubiiu/ToonCrafter/tree/main",
+      "filename": "model.ckpt",
+      "url": "https://huggingface.co/Doubiiu/ToonCrafter/resolve/main/model.ckpt",
+      "size": "10.5GB"
+    },
+
+    {
+      "name": "BAAI/SegGPT",
+      "type": "SegGPT",
+      "base": "SegGPT",
+      "save_path": "custom_nodes/comfyui-seggpt",
+      "description": "SegGPT",
+      "reference": "https://huggingface.co/BAAI/SegGPT",
+      "filename": "seggpt_vit_large.pth",
+      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
+      "size": "1.48GB"
+    },
+    {
+      "name": "kohya-ss/ControlNet-LLLite: SDXL Canny Anime",
+      "type": "controlnet",
+      "base": "SDXL",
+      "save_path": "custom_nodes/ControlNet-LLLite-ComfyUI/models",
+      "description": "An extremely compactly designed controlnet model (a.k.a. ControlNet-LLLite). Note: The model structure is highly experimental and may be subject to change in the future.",
+      "reference": "https://huggingface.co/kohya-ss/controlnet-lllite",
+      "filename": "controllllite_v01032064e_sdxl_canny_anime.safetensors",
+      "url": "https://huggingface.co/kohya-ss/controlnet-lllite/resolve/main/controllllite_v01032064e_sdxl_canny_anime.safetensors",
+      "size": "46.2MB"
+    }
+  ]
 }
--- a/node_db/new/custom-node-list.json
+++ b/node_db/new/custom-node-list.json
--- a/node_db/new/extension-node-map.json
+++ b/node_db/new/extension-node-map.json
--- a/node_db/new/model-list.json
+++ b/node_db/new/model-list.json
@@ -1,5 +1,96 @@
 {
  "models": [
+    {
+      "name": "deepseek-ai/Janus-Pro-1B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-1B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-1B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-1B",
+      "size": "7.8GB"
+    },
+    {
+      "name": "deepseek-ai/Janus-Pro-7B",
+      "type": "Janus-Pro",
+      "base": "Janus-Pro",
+      "save_path": "Janus-Pro",
+      "description": "[SNAPSHOT] Janus-Pro-7B model.[w/You cannot download this item on ComfyUI-Manager versions below V3.18]",
+      "reference": "https://huggingface.co/deepseek-ai/Janus-Pro-7B",
+      "filename": "<huggingface>",
+      "url": "deepseek-ai/Janus-Pro-7B",
+      "size": "14.85GB"
+    },
+
+    {
+      "name": "Leoxing/pia.ckpt",
+      "type": "animatediff-pia",
+      "base": "SD1.x",
+      "save_path": "animatediff_models",
+      "description": "AnimateDiff-PIA Model",
+      "reference": "https://huggingface.co/Leoxing/PIA/tree/main",
+      "filename": "pia.ckpt",
+      "url": "https://huggingface.co/Leoxing/PIA/resolve/main/pia.ckpt",
+      "size": "1.67GB"
+    },
+
+    {
+      "name": "comfyanonymous/cosmos_cv8x8x8_1.0.safetensors",
+      "type": "VAE",
+      "base": "Cosmos-1.0",
+      "save_path": "default",
+      "description": "VAE model for Cosmos 1.0",
+      "reference": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/tree/main",
+      "filename": "cosmos_cv8x8x8_1.0.safetensors",
+      "url": "https://huggingface.co/comfyanonymous/cosmos_1.0_text_encoder_and_VAE_ComfyUI/resolve/main/vae/cosmos_cv8x8x8_1.0.safetensors",
+      "size": "211MB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Text2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (7B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-7B-Video2World.safetensors",
+      "size": "14.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Text2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Text2World.safetensors",
+      "size": "28.5GB"
+    },
+    {
+      "name": "mcmonkey/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "type": "diffusion_model",
+      "base": "Cosmos-1.0",
+      "save_path": "diffusion_models/cosmos-1.0",
+      "description": "Cosmos 1.0 Video2World Diffusion Model (14B)",
+      "reference": "https://huggingface.co/mcmonkey/cosmos-1.0",
+      "filename": "Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "url": "https://huggingface.co/mcmonkey/cosmos-1.0/resolve/main/Cosmos-1_0-Diffusion-14B-Video2World.safetensors",
+      "size": "28.5GB"
+    },
+
    {
      "name": "Comfy-Org/llava_llama3_fp8_scaled.safetensors",
      "type": "clip",
@@ -507,7 +598,7 @@
      "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
      "type": "clip",
      "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
      "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
      "reference": "https://huggingface.co/zer0int",
      "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors",
@@ -518,7 +609,7 @@
      "name": "ViT-L-14-TEXT-detail-improved-hiT-GmP-HF.safetensors [Long CLIP L]",
      "type": "clip",
      "base": "clip",
-      "save_path": "clip/long_clip",
+      "save_path": "text_encoders/long_clip",
      "description": "Greatly improved TEXT + Detail (as CLIP-L for Flux.1)",
      "reference": "https://huggingface.co/zer0int",
      "filename": "ViT-L-14-TEXT-detail-improved-hiT-GmP-TE-only-HF.safetensors",
@@ -561,18 +652,6 @@
      "size": "1.39GB"
    },

-    {
-      "name": "BAAI/SegGPT",
-      "type": "SegGPT",
-      "base": "SegGPT",
-      "save_path": "custom_nodes/comfyui-SegGPT",
-      "description": "SegGPT",
-      "reference": "https://huggingface.co/BAAI/SegGPT",
-      "filename": "seggpt_vit_large.pth",
-      "url": "https://huggingface.co/BAAI/SegGPT/resolve/main/seggpt_vit_large.pth",
-      "size": "1.48GB"
-    },
-
    {
      "name": "DMD2 LoRA (4steps)",
      "type": "lora",
@@ -594,140 +673,6 @@
      "filename": "dmd2_sdxl_4step_lora_fp16.safetensors",
      "url": "https://huggingface.co/tianweiy/DMD2/resolve/main/dmd2_sdxl_4step_lora_fp16.safetensors",
      "size": "394MB"
-    },
-
-    {
-      "name": "Hyper-SD LoRA (1step) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (1step) - SD1.5",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-1step-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-1step-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (2steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (2steps) - SD1.5",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-2steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-2steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (4steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (4steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-4steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (8steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD LoRA (8steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-8steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD CFG LoRA (8steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-8steps-CFG-lora.safetensors",
-      "size": "269MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (12steps) - SD1.5",
-      "type": "lora",
-      "base": "SD1.5",
-      "save_path": "loras/HyperSD/SD15",
-      "description": "Hyper-SD CFG LoRA (12steps)",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-12steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-12steps-CFG-lora.safetensors",
-      "size": "269MB"
-    },
-
-    {
-      "name": "Hyper-SD LoRA (1step) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (1step) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-1step-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-1step-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (2steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (2steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-2steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-2steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (4steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (4steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SD15-4steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SD15-4steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD LoRA (8steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD LoRA (8steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-8steps-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (8steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD CFG LoRA (8steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-8steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-8steps-CFG-lora.safetensors",
-      "size": "787MB"
-    },
-    {
-      "name": "Hyper-SD CFG LoRA (12steps) - SDXL",
-      "type": "lora",
-      "base": "SDXL",
-      "save_path": "loras/HyperSD/SDXL",
-      "description": "Hyper-SD CFG LoRA (12steps) - SDXL",
-      "reference": "https://huggingface.co/ByteDance/Hyper-SD",
-      "filename": "Hyper-SDXL-12steps-CFG-lora.safetensors",
-      "url": "https://huggingface.co/ByteDance/Hyper-SD/resolve/main/Hyper-SDXL-12steps-CFG-lora.safetensors",
-      "size": "787MB"
    }
  ]
 }
--- a/node_db/tutorial/custom-node-list.json
+++ b/node_db/tutorial/custom-node-list.json
@@ -260,6 +260,37 @@
            ],
            "install_type": "git-clone",
            "description": "This is the ComfyUI custom node template repository that anyone can use to create their own custom nodes."
+        },
+        {
+            "author": "laogou666",
+            "title": "Comfyui_LG_Advertisement",
+            "reference": "https://github.com/LAOGOU-666/Comfyui_LG_Advertisement",
+            "files": [
+                "https://github.com/LAOGOU-666/Comfyui_LG_Advertisement"
+            ],
+            "install_type": "git-clone",
+            "description": "A node for demonstration."
+        },
+        {
+            "author": "amorano",
+            "title": "cozy_spoke",
+            "reference": "https://github.com/cozy-comfyui/cozy_spoke",
+            "files": [
+                "https://github.com/cozy-comfyui/cozy_spoke"
+            ],
+            "install_type": "git-clone",
+            "description": "Example node communicating between ComfyUI Javascript and Python."
+        },
+        {
+            "author": "amorano",
+            "title": "Cozy Link Toggle",
+            "id": "cozyLinkToggle",
+            "reference": "https://github.com/cozy-comfyui/cozy_link_toggle",
+            "files": [
+                "https://github.com/cozy-comfyui/cozy_link_toggle"
+            ],
+            "install_type": "git-clone",
+            "description": "Example of using ComfyUI Toolbar to Toggle ComfyUI links on/off"
        }
    ]
 }
--- a/node_db/tutorial/extension-node-map.json
+++ b/node_db/tutorial/extension-node-map.json
@@ -172,6 +172,7 @@
            "CLIPTextEncodeControlnet",
            "CLIPTextEncodeFlux",
            "CLIPTextEncodeHunyuanDiT",
+            "CLIPTextEncodePixArtAlpha",
            "CLIPTextEncodeSD3",
            "CLIPTextEncodeSDXL",
            "CLIPTextEncodeSDXLRefiner",
@@ -189,6 +190,7 @@
            "ConditioningSetAreaStrength",
            "ConditioningSetMask",
            "ConditioningSetTimestepRange",
+            "ConditioningStableAudio",
            "ConditioningZeroOut",
            "ControlNetApply",
            "ControlNetApplyAdvanced",
@@ -202,7 +204,9 @@
            "DisableNoise",
            "DualCFGGuider",
            "DualCLIPLoader",
+            "EmptyHunyuanLatentVideo",
            "EmptyImage",
+            "EmptyLTXVLatentVideo",
            "EmptyLatentAudio",
            "EmptyLatentImage",
            "EmptyMochiLatentVideo",
@@ -245,6 +249,9 @@
            "KSamplerAdvanced",
            "KSamplerSelect",
            "KarrasScheduler",
+            "LTXVConditioning",
+            "LTXVImgToVideo",
+            "LTXVScheduler",
            "LaplaceScheduler",
            "LatentAdd",
            "LatentApplyOperation",
@@ -265,6 +272,8 @@
            "LatentSubtract",
            "LatentUpscale",
            "LatentUpscaleBy",
+            "Load3D",
+            "Load3DAnimation",
            "LoadAudio",
            "LoadImage",
            "LoadImageMask",
@@ -272,11 +281,15 @@
            "LoraLoader",
            "LoraLoaderModelOnly",
            "LoraSave",
+            "Mahiro",
            "MaskComposite",
            "MaskToImage",
            "ModelMergeAdd",
+            "ModelMergeAuraflow",
            "ModelMergeBlocks",
            "ModelMergeFlux1",
+            "ModelMergeLTXV",
+            "ModelMergeMochiPreview",
            "ModelMergeSD1",
            "ModelMergeSD2",
            "ModelMergeSD35_Large",
@@ -289,6 +302,7 @@
            "ModelSamplingContinuousV",
            "ModelSamplingDiscrete",
            "ModelSamplingFlux",
+            "ModelSamplingLTXV",
            "ModelSamplingSD3",
            "ModelSamplingStableCascade",
            "ModelSave",
@@ -301,6 +315,7 @@
            "PhotoMakerLoader",
            "PolyexponentialScheduler",
            "PorterDuffImageComposite",
+            "Preview3D",
            "PreviewAudio",
            "PreviewImage",
            "RandomNoise",
@@ -334,6 +349,7 @@
            "SelfAttentionGuidance",
            "SetLatentNoiseMask",
            "SetUnionControlNetType",
+            "SkipLayerGuidanceDiT",
            "SkipLayerGuidanceSD3",
            "SolidMask",
            "SplitImageWithAlpha",
@@ -462,6 +478,17 @@
            "title_aux": "comfyui-custom-nodes"
        }
    ],
+    "https://github.com/jhj0517/ComfyUI-CustomNodes-Template": [
+        [
+            "(Down)Load My Model",
+            "Calculate Minus",
+            "Calculate Plus",
+            "Example Output Node"
+        ],
+        {
+            "title_aux": "ComfyUI-CustomNodes-Template"
+        }
+    ],
    "https://github.com/jtong/comfyui-jtong-workflow": [
        [
            "Example",
--- a/pip_overrides.json.template
+++ b/pip_overrides.json.template
@@ -4,8 +4,8 @@
    "imageio_ffmpeg": "imageio",
    "diffusers~=0.21.4": "diffusers",
    "huggingface_hub": "huggingface-hub",
-    "numpy<1.24>=1.18": "numpy",
-    "numpy>=1.18.5, <1.25.0": "numpy",
+    "numpy<1.24>=1.18": "numpy==1.26.4",
+    "numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
    "opencv-contrib-python": "opencv-contrib-python-headless",
    "opencv-python": "opencv-contrib-python-headless",
    "opencv-python-headless": "opencv-contrib-python-headless",
--- a/pip_overrides.osx.template
+++ b/pip_overrides.osx.template
@@ -4,8 +4,8 @@
    "imageio_ffmpeg": "imageio",
    "diffusers~=0.21.4": "diffusers",
    "huggingface_hub": "huggingface-hub",
-    "numpy<1.24>=1.18": "numpy",
-    "numpy>=1.18.5, <1.25.0": "numpy",
+    "numpy<1.24>=1.18": "numpy==1.26.4",
+    "numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
    "opencv-contrib-python": "opencv-contrib-python-headless",
    "opencv-python": "opencv-contrib-python-headless",
    "opencv-python-headless": "opencv-contrib-python-headless",
--- a/prestartup_script.py
+++ b/prestartup_script.py
@@ -9,6 +9,7 @@ import platform
 import json
 import ast
 import logging
+import traceback

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

+import datetime
+if hasattr(datetime, 'datetime'):
+    from datetime import datetime
+    def current_timestamp():
+        return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+else:
+    # NOTE: Occurs in some Mac environments.
+    import time
+    logging.error(f"[ComfyUI-Manager] fallback timestamp mode\n                  datetime module is invalid: '{datetime.__file__}'")
+    def current_timestamp():
+        return str(time.time()).split('.')[0]
+
 security_check.security_check()

 cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
@@ -46,27 +58,19 @@ def is_import_failed_extension(name):
    return name in import_failed_extensions


-def check_file_logging():
-    global enable_file_logging
-    try:
-        import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
-        config = configparser.ConfigParser()
-        config.read(config_path)
-        default_conf = config['default']
-
-        if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
-            enable_file_logging = False
-    except Exception:
-        pass
-
-
-check_file_logging()
-
 comfy_path = os.environ.get('COMFYUI_PATH')
+comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
+
+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__))

+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)
@@ -79,12 +83,38 @@ custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
 manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
 manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
 restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
+manager_config_path = os.path.join(manager_files_path, 'config.ini')

-git_script_path = os.path.join(comfyui_manager_path, "git_helper.py")
 cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")


-cm_global.pip_overrides = {}
+default_conf = {}
+
+def read_config():
+    global default_conf
+    try:
+        import configparser
+        config = configparser.ConfigParser()
+        config.read(manager_config_path)
+        default_conf = config['default']
+    except Exception:
+        pass
+
+def read_uv_mode():
+    if 'use_uv' in default_conf:
+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
+
+def check_file_logging():
+    global enable_file_logging
+    if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
+        enable_file_logging = False
+
+
+read_config()
+read_uv_mode()
+check_file_logging()
+
+cm_global.pip_overrides = {'numpy': 'numpy<2', 'ultralytics': 'ultralytics==8.3.40'}
 if os.path.exists(manager_pip_overrides_path):
    with open(manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
        cm_global.pip_overrides = json.load(json_file)
@@ -137,6 +167,48 @@ def process_wrap(cmd_str, cwd_path, handler=None, env=None):
    return process.wait()


+original_stdout = sys.stdout
+
+
+def try_get_custom_nodes(x):
+    for custom_nodes_dir in folder_paths.get_folder_paths('custom_nodes'):
+        if x.startswith(custom_nodes_dir):
+            relative_path = os.path.relpath(x, custom_nodes_dir)
+            next_segment = relative_path.split(os.sep)[0]
+            if next_segment.lower() != 'comfyui-manager':
+                return next_segment, os.path.join(custom_nodes_dir, next_segment)
+    return None
+
+
+def extract_origin_module():
+    stack = traceback.extract_stack()[:-2]
+    for frame in reversed(stack):
+        info = try_get_custom_nodes(frame.filename)
+        if info is None:
+            continue
+        else:
+            return info
+    return None
+
+def extract_origin_module_from_strings(file_paths):
+    for filepath in file_paths:
+        info = try_get_custom_nodes(filepath)
+        if info is None:
+            continue
+        else:
+            return info
+    return None
+
+
+def finalize_startup():
+    res = {}
+    for k, v in cm_global.error_dict.items():
+        if v['path'] in import_failed_extensions:
+            res[k] = v
+
+    cm_global.error_dict = res
+
+
 try:
    if '--port' in sys.argv:
        port_index = sys.argv.index('--port')
@@ -153,6 +225,9 @@ try:
    if enable_file_logging:
        log_path_base = os.path.join(folder_paths.user_directory, 'comfyui')

+        if not os.path.exists(folder_paths.user_directory):
+            os.makedirs(folder_paths.user_directory)
+
        if os.path.exists(f"{log_path_base}{postfix}.log"):
            if os.path.exists(f"{log_path_base}{postfix}.prev.log"):
                if os.path.exists(f"{log_path_base}{postfix}.prev2.log"):
@@ -216,8 +291,16 @@ try:
                if match:
                    import_failed_extensions.add(match.group(1).strip())

-                if 'Starting server' in message:
-                    is_start_mode = False
+                if not self.is_stdout:
+                    origin_info = extract_origin_module()
+                    if origin_info is not None:
+                        name, origin_path = origin_info
+                        
+                        if name != 'comfyui-manager':
+                            if name not in cm_global.error_dict:
+                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
+
+                            cm_global.error_dict[name]['msg'] += message

            if not self.is_stdout:
                match = re.search(pat_tqdm, message)
@@ -236,7 +319,7 @@ try:

        def sync_write(self, message, file_only=False):
            with log_lock:
-                timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
+                timestamp = current_timestamp()
                if self.last_char != '\n':
                    log_file.write(message)
                else:
@@ -302,12 +385,34 @@ try:
                if match:
                    import_failed_extensions.add(match.group(1).strip())

+                if 'Traceback' in message:
+                    file_lists = self._extract_file_paths(message)
+                    origin_info = extract_origin_module_from_strings(file_lists)
+                    if origin_info is not None:
+                        name, origin_path = origin_info
+                        
+                        if name != 'comfyui-manager':
+                            if name not in cm_global.error_dict:
+                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
+
+                            cm_global.error_dict[name]['msg'] += message
+
                if 'Starting server' in message:
                    is_start_mode = False
+                    finalize_startup()

            if stderr_wrapper:
                stderr_wrapper.sync_write(message+'\n', file_only=True)

+        def _extract_file_paths(self, msg):
+            file_paths = []
+            for line in msg.split('\n'):
+                match = re.findall(r'File \"(.*?)\", line \d+', line)
+                for x in match:
+                    if not x.startswith('<'):
+                        file_paths.extend(match)
+            return file_paths
+

    logging.getLogger().addHandler(LoggingHandler())

@@ -317,18 +422,20 @@ except Exception as e:


 try:
-    import git  # noqa: F401
+    import git   # noqa: F401
+    import toml  # noqa: F401
+    import rich  # noqa: F401
 except ModuleNotFoundError:
    my_path = os.path.dirname(__file__)
    requirements_path = os.path.join(my_path, "requirements.txt")

    print("## ComfyUI-Manager: installing dependencies. (GitPython)")
    try:
-        result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '-r', requirements_path])
+        result = subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
    except subprocess.CalledProcessError:
        print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
        try:
-            result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
+            result = subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
        except subprocess.CalledProcessError:
            print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")

@@ -339,11 +446,15 @@ except:
    print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")


-print("** ComfyUI startup time:", datetime.now())
+print("** ComfyUI startup time:", current_timestamp())
 print("** Platform:", platform.system())
 print("** Python version:", sys.version)
 print("** Python executable:", sys.executable)
 print("** ComfyUI Path:", comfy_path)
+print("** ComfyUI Base Folder Path:", comfy_base_path)
+print("** User directory:", folder_paths.user_directory)
+print("** ComfyUI-Manager config path:", manager_config_path)
+

 if log_path_base is not None:
    print("** Log path:", os.path.abspath(f'{log_path_base}.log'))
@@ -353,12 +464,6 @@ else:

 def read_downgrade_blacklist():
    try:
-        import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
-        config = configparser.ConfigParser()
-        config.read(config_path)
-        default_conf = config['default']
-
        if 'downgrade_blacklist' in default_conf:
            items = default_conf['downgrade_blacklist'].split(',')
            items = [x.strip() for x in items if x != '']
@@ -373,20 +478,13 @@ read_downgrade_blacklist()

 def check_bypass_ssl():
    try:
-        import configparser
        import ssl
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
-        config = configparser.ConfigParser()
-        config.read(config_path)
-        default_conf = config['default']
-
        if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
-            print("[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see ComfyUI-Manager/config.ini)")
+            print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
            ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
    except Exception:
        pass

-
 check_bypass_ssl()


@@ -402,7 +500,7 @@ def is_installed(name):
    if name.startswith('#'):
        return True

-    pattern = r'([^<>!=]+)([<>!=]=?)([0-9.a-zA-Z]*)'
+    pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
    match = re.search(pattern, name)

    if match:
@@ -417,7 +515,7 @@ def is_installed(name):
        if match is None:
            if name in pips:
                return True
-        elif match.group(2) in ['<=', '==', '<']:
+        elif match.group(2) in ['<=', '==', '<', '~=']:
            if name in pips:
                if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
                    print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
@@ -436,6 +534,14 @@ def is_installed(name):
        elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
            print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")

+    if match.group(2) == '==':
+        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
+            return False
+
+    if match.group(2) == '~=':
+        if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
+            return False
+
    return True       # prevent downgrade


@@ -466,7 +572,8 @@ if os.path.exists(restore_snapshot_path):

        print("[ComfyUI-Manager] Restore snapshot.")
        new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
+        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path

        cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
        exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)
@@ -497,9 +604,9 @@ def execute_lazy_install_script(repo_path, executable):
                if package_name and not is_installed(package_name):
                    if '--index-url' in package_name:
                        s = package_name.split('--index-url')
-                        install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
+                        install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
                    else:
-                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
+                        install_cmd = manager_util.make_pip_cmd(["install", package_name])

                    process_wrap(install_cmd, repo_path)

@@ -509,7 +616,8 @@ def execute_lazy_install_script(repo_path, executable):
        install_cmd = [executable, "install.py"]

        new_env = os.environ.copy()
-        new_env["COMFYUI_PATH"] = comfy_path
+        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
        process_wrap(install_cmd, repo_path, env=new_env)


@@ -611,7 +719,8 @@ if os.path.exists(script_list_path):
                    print(f"\n## Execute install/(de)activation script for '{script[0]}'")

                    new_env = os.environ.copy()
-                    new_env["COMFYUI_PATH"] = comfy_path
+                    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
+                        new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
                    exit_code = process_wrap(script[1:], script[0], env=new_env)

                    if exit_code != 0:
@@ -639,9 +748,8 @@ manager_util.clear_pip_cache()
 def check_windows_event_loop_policy():
    try:
        import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
        config = configparser.ConfigParser()
-        config.read(config_path)
+        config.read(manager_config_path)
        default_conf = config['default']

        if 'windows_selector_event_loop_policy' in default_conf and default_conf['windows_selector_event_loop_policy'].lower() == 'true':
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-manager"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.3"
+version = "3.21.1"
 license = { file = "LICENSE.txt" }
 dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]

--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ huggingface-hub>0.20
 typer
 rich
 typing-extensions
-toml
+toml
+uv
--- a/scripts/install-comfyui-venv-linux.sh
+++ b/scripts/install-comfyui-venv-linux.sh
@@ -1,12 +1,12 @@
 git clone https://github.com/comfyanonymous/ComfyUI
 cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager
+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
+python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
 cd ..
 echo "#!/bin/bash" > run_gpu.sh
 echo "cd ComfyUI" >> run_gpu.sh
--- a/scripts/install-comfyui-venv-win.bat
+++ b/scripts/install-comfyui-venv-win.bat
@@ -1,6 +1,6 @@
 git clone https://github.com/comfyanonymous/ComfyUI
 cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager
+git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
 cd ..
 python -m venv venv
 call venv/Scripts/activate
--- a/scripts/install-manager-for-portable-version.bat
+++ b/scripts/install-manager-for-portable-version.bat
@@ -1,2 +1,2 @@
 .\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 -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
--- a/scripts/update-fix.py
+++ b/scripts/update-fix.py
@@ -1,12 +0,0 @@
-import git
-
-commit_hash = "a361cc1"
-
-repo = git.Repo('.')
-
-if repo.is_dirty():
-    repo.git.stash()
-
-repo.git.update_ref("refs/remotes/origin/main", commit_hash)
-repo.remotes.origin.fetch()
-repo.git.pull("origin", "main")