modified: release pinning ultralytics version

add custom nodes from https://github.com/numz/Comfyui-Orpheus

.github/workflows/publish.yml

@@ -7,15 +7,19 @@ on:
     paths:
       - "pyproject.toml"
 
+permissions:
+  issues: write
+
 jobs:
   publish-node:
     name: Publish Custom Node to registry
     runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'ltdrdata' }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Publish Custom Node
-        uses: Comfy-Org/publish-node-action@main
+        uses: Comfy-Org/publish-node-action@v1
         with:
           ## Add your own personal access token to your Github Repository secrets and reference it here.
-          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.gitignore

@@ -17,3 +17,4 @@ github-stats-cache.json
 pip_overrides.json
 *.json
 check2.sh
+/venv/

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.
+* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
-* 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.
+* V3.10: `double-click feature` is removed
-* V2.37 Show a ✅ mark to accounts that have been active on GitHub for more than six months.
+  * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
-* V2.33 Security policy is applied.
+* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
-* 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.
 * 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.
+  * 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 have to rename `ComfyUI/custom_nodes/ComfyUI-Manager-main` to `ComfyUI/custom_nodes/ComfyUI-Manager`
 
 
 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,56 @@ 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.
+4. Share
-    * When selecting (hide built-in), it hides the 🦊 icon, which signifies built-in nodes.
+  ![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) 
-      * 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) 
 
   * 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 Ouput button on Context Menu.
+  * 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`
+* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
+* Configurable pip auto fix: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_auto_fix.list`
+* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
+* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
+* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`
+
+
+## `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 +190,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.
+**Special purpose files** (optional)
-
+  * `pyproject.toml` - Spec file for comfyregistry.
-```
-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)
   * `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 +220,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 +242,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
@@ -316,12 +303,40 @@ NODE_CLASS_MAPPINGS.update({
 * Custom pip mapping
   * When you create the `pip_overrides.json` file, it changes the installation of specific pip packages to installations defined by the user.
     * Please refer to the `pip_overrides.json.template` file.
-    
+
+* Prevent the installation of specific pip packages
+  * List the package names one per line in the `pip_blacklist.list` file.
+
+* Automatically Restoring pip Installation
+ * If you list pip spec requirements in `pip_auto_fix.list`, similar to `requirements.txt`, it will automatically restore the specified versions when starting ComfyUI or when versions get mismatched during various custom node installations.
+ * `--index-url` can be used.
+
 * Use `aria2` as downloader
   * [howto](docs/en/use_aria2.md)
 
-* 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.
+## Environment Variables
+
+The following features can be configured using environment variables:
+
+* **COMFYUI_PATH**: The installation path of ComfyUI
+* **GITHUB_ENDPOINT**: Reverse proxy configuration for environments with limited access to GitHub
+* **HF_ENDPOINT**: Reverse proxy configuration for environments with limited access to Hugging Face
+
+
+### Example 1:
+Redirecting `https://github.com/ltdrdata/ComfyUI-Impact-Pack` to `https://mirror.ghproxy.com/https://github.com/ltdrdata/ComfyUI-Impact-Pack`
+
+```
+GITHUB_ENDPOINT=https://mirror.ghproxy.com/https://github.com
+```
+
+#### Example 2:
+Changing `https://huggingface.co/path/to/somewhere` to `https://some-hf-mirror.com/path/to/somewhere`
+
+```
+HF_ENDPOINT=https://some-hf-mirror.com 
+```
 
 ## Scanner
 When you run the `scan.sh` script:
@@ -339,17 +354,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 +390,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.

__init__.py

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

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,14 +20,19 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
 
 import manager_util
 
+# read env vars
+# COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
+# `comfy_path` should be resolved before importing manager_core
 comfy_path = os.environ.get('COMFYUI_PATH')
 if comfy_path is None:
     try:
         import folder_paths
         comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
     except:
+        print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
         comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
+# This should be placed here
 sys.path.append(comfy_path)
 
 import utils.extra_config
@@ -35,17 +41,9 @@ 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:
+cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
-    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']
 cm_global.pip_overrides = {'numpy': 'numpy<2'}
 
@@ -54,14 +52,26 @@ if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_overrides
         cm_global.pip_overrides = json.load(json_file)
 
 
+if os.path.exists(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list")):
+    with open(os.path.join(manager_util.comfyui_manager_path, "pip_blacklist.list"), 'r', encoding="UTF-8", errors="ignore") as f:
+        for x in f.readlines():
+            y = x.strip()
+            if y != '':
+                cm_global.pip_blacklist.add(y)
+
+
 def check_comfyui_hash():
-    repo = git.Repo(comfy_path)
+    try:
-    core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
+        repo = git.Repo(comfy_path)
+        core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
+        core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
+    except:
+        print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
+        core.comfy_ui_revision = 0
+        core.comfy_ui_commit_datetime = 0
 
     cm_global.variables['comfyui.revision'] = core.comfy_ui_revision
 
-    core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
-
 
 check_comfyui_hash()  # This is a preparation step for manager_core
 core.check_invalid_nodes()
@@ -70,9 +80,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(strict=False)
-        config = configparser.ConfigParser()
+        config.read(core.manager_config.path)
-        config.read(config_path)
         default_conf = config['default']
 
         if 'downgrade_blacklist' in default_conf:
@@ -88,12 +97,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 +128,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 +145,21 @@ 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'}
+
+        if os.path.exists(core.manager_pip_blacklist_path):
+            with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+                for x in f.readlines():
+                    y = x.strip()
+                    if y != '':
+                        cm_global.pip_blacklist.add(y)
+
+    def update_custom_nodes_dir(self, target_dir):
+        import folder_paths
+        a, b = folder_paths.folder_names_and_paths['custom_nodes']
+        folder_paths.folder_names_and_paths['custom_nodes'] = [os.path.abspath(target_dir)], set()
 
     @staticmethod
     def get_startup_scripts_path():
@@ -145,7 +175,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()
@@ -221,10 +254,10 @@ def fix_node(node_spec_str, is_all=False, cnt_msg=''):
     res = unified_manager.unified_fix(node_name, version_spec, no_deps=cmd_ctx.no_deps)
 
     if not res.result:
-        print(f"ERROR: f{res.msg}")
+        print(f"[bold red]ERROR: f{res.msg}[/bold red]")
 
 
-def uninstall_node(node_spec_str, is_all=False, cnt_msg=''):
+def uninstall_node(node_spec_str: str, is_all: bool = False, cnt_msg: str = ''):
     spec = node_spec_str.split('@')
     if len(spec) == 2 and spec[1] == 'unknown':
         node_name = spec[0]
@@ -481,8 +514,8 @@ def show_list(kind, simple=False):
             print(f"{prefix} {title:50} {short_id:30} (author: {author:20}) [UNKNOWN]")
 
 
-def show_snapshot(simple_mode=False):
+async def show_snapshot(simple_mode=False):
-    json_obj = core.get_current_snapshot()
+    json_obj = await core.get_current_snapshot()
 
     if simple_mode:
         print(f"[{json_obj['comfyui']}] comfyui")
@@ -513,8 +546,8 @@ def cancel():
         os.remove(cmd_ctx.get_restore_snapshot_path())
 
 
-def auto_save_snapshot():
+async def auto_save_snapshot():
-    path = core.save_snapshot_with_postfix('cli-autosave')
+    path = await core.save_snapshot_with_postfix('cli-autosave')
     print(f"Current snapshot is saved as `{path}`")
 
 
@@ -526,7 +559,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 +568,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 +646,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(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, act=install_node)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Reinstall custom nodes")
@@ -648,7 +684,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(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, act=reinstall_node)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Uninstall custom nodes")
@@ -672,7 +711,7 @@ def uninstall(
     for_each_nodes(nodes, act=uninstall_node)
 
 
-@app.command(help="Disable custom nodes")
+@app.command(help="Update custom nodes")
 def update(
         nodes: List[str] = typer.Argument(
             ...,
@@ -698,7 +737,9 @@ def update(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
 
     for x in nodes:
         if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -706,6 +747,7 @@ def update(
             break
 
     update_parallel(nodes)
+    pip_fixer.fix_broken()
 
 
 @app.command(help="Disable custom nodes")
@@ -734,7 +776,7 @@ def disable(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
 
     for_each_nodes(nodes, disable_node, allow_all=True)
 
@@ -765,7 +807,7 @@ def enable(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
 
     for_each_nodes(nodes, enable_node, allow_all=True)
 
@@ -796,9 +838,11 @@ def fix(
     cmd_ctx.set_channel_mode(channel, mode)
 
     if 'all' in nodes:
-        auto_save_snapshot()
+        asyncio.run(auto_save_snapshot())
 
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     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 +1037,34 @@ 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 = core.save_snapshot_with_postfix('snapshot', output)
+    if output is not None:
+        if(not output.endswith('.json') and not output.endswith('.yaml')):
+            print("[bold red]ERROR: output path should be either '.json' or '.yaml' file.[/bold red]")
+            raise typer.Exit(code=1)
+    
+        dir_path = os.path.dirname(output)
+        
+        if(dir_path != '' and not os.path.exists(dir_path)):
+            print(f"[bold red]ERROR: {output} path not exists.[/bold red]")
+            raise typer.Exit(code=1)
+        
+    path = asyncio.run(core.save_snapshot_with_postfix('snapshot', output, not full_snapshot))
     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,
@@ -1025,10 +1086,17 @@ def restore_snapshot(
         user_directory: str = typer.Option(
             None,
             help="user directory"
+        ),
+        restore_to: Optional[str] = typer.Option(
+            None,
+            help="Manually specify the installation path for the custom node. Ignore user directory."
         )
 ):
     cmd_ctx.set_user_directory(user_directory)
 
+    if restore_to:
+        cmd_ctx.update_custom_nodes_dir(restore_to)
+
     extras = []
     if pip_non_url:
         extras.append('--pip-non-url')
@@ -1049,12 +1117,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(), comfy_path, core.manager_files_path)
     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 +1148,14 @@ def restore_dependencies(
 
     total = len(node_paths)
     i = 1
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     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 +1167,10 @@ def post_install(
         )
 ):
     path = os.path.expanduser(path)
+
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     unified_manager.execute_install_script('', path, instant_execution=True)
+    pip_fixer.fix_broken()
 
 
 @app.command(
@@ -1123,7 +1199,7 @@ def install_deps(
 ):
     cmd_ctx.set_user_directory(user_directory)
     cmd_ctx.set_channel_mode(channel, mode)
-    auto_save_snapshot()
+    asyncio.run(auto_save_snapshot())
 
     if not os.path.exists(deps):
         print(f"[bold red]File not found: {deps}[/bold red]")
@@ -1136,6 +1212,7 @@ 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(), comfy_path, core.manager_files_path)
             for k in json_obj['custom_nodes'].keys():
                 state = core.simple_check_custom_node(k)
                 if state == 'installed':
@@ -1144,6 +1221,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.")
 
@@ -1191,20 +1269,6 @@ def export_custom_node_ids(
                     print(f"{x['id']}@unknown", file=output_file)
 
 
-@app.command(
-    "migrate",
-    help="Migrate legacy node system to new node system",
-)
-def migrate(
-        user_directory: str = typer.Option(
-            None,
-            help="user directory"
-        )
-):
-    cmd_ctx.set_user_directory(user_directory)
-    asyncio.run(unified_manager.migrate_unmanaged_nodes())
-
-
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
     sys.exit(app())

docs/en/cm-cli.md

@@ -121,8 +121,9 @@ ComfyUI-Loopchain
   * If no file exists at the snapshot path, it is implicitly assumed to be in ComfyUI-Manager/snapshots.
   * `--pip-non-url`: Restore for pip packages registered on PyPI.
   * `--pip-non-local-url`: Restore for pip packages registered at web URLs.
-  * `--pip-local-url`: Restore for pip packages specified by local paths. 
+  * `--pip-local-url`: Restore for pip packages specified by local paths.
-
+  * `--user-directory`: Set the user directory.
+  * `--restore-to`: The path where the restored custom nodes will be installed. (When this option is applied, only the custom nodes installed in the target path are recognized as installed.)
 
 ### 5. CLI Only Mode
 

docs/ko/cm-cli.md

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

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",

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,60 @@ 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/', '')
+    remote_name = get_remote_name(repo)
-    repo.git.checkout(default_branch)
+
+    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 checkout master
+        # try checkout main if failed
+        try:
+            repo.git.checkout(repo.heads.master)
+            return True
+        except:
+            try:
+                if remote_name is not None:
+                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
+                    return True
+            except:
+                try:
+                    repo.git.checkout(repo.heads.main)
+                    return True
+                except:
+                    try:
+                        if remote_name is not None:
+                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
+                            return True
+                    except:
+                        pass
+
+    print("[ComfyUI Manager] Failed to switch to the default branch")
+    return False
 
 
 def gitpull(path):
@@ -159,7 +208,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
@@ -206,7 +259,7 @@ def checkout_custom_node_hash(git_custom_node_infos):
         repo_name_to_url[repo_name] = url
 
     for path in os.listdir(working_directory):
-        if '@' in path or path.endswith("ComfyUI-Manager"):
+        if path.endswith("ComfyUI-Manager"):
             continue
 
         fullpath = os.path.join(working_directory, path)
@@ -349,12 +402,13 @@ def apply_snapshot(path):
                 git_custom_node_infos = info['git_custom_nodes']
                 file_custom_node_infos = info['file_custom_nodes']
 
-                checkout_comfyui_hash(comfyui_hash)
+                if comfyui_hash:
+                    checkout_comfyui_hash(comfyui_hash)
                 checkout_custom_node_hash(git_custom_node_infos)
                 invalidate_custom_node_file(file_custom_node_infos)
 
                 print("APPLY SNAPSHOT: True")
-                if 'pips' in info:
+                if 'pips' in info and info['pips']:
                     return info['pips']
                 else:
                     return None
@@ -431,10 +485,8 @@ def restore_pip_snapshot(pips, options):
 
 
 def setup_environment():
-    config = configparser.ConfigParser()
+    if git_exe_path is not None:
-    config.read(config_path)
+        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe_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'])
 
 
 setup_environment()
@@ -467,5 +519,5 @@ try:
 except Exception as e:
     print(e)
     sys.exit(-1)
-    
+
-    
+

glob/cm_global.py

@@ -110,3 +110,8 @@ def add_on_revision_detected(k, f):
             traceback.print_exc()
     else:
         variables['cm.on_revision_detected_handler'].append((k, f))
+
+
+error_dict = {}
+
+disable_front = False

glob/cnr_utils.py

@@ -1,24 +1,122 @@
-import requests
+import asyncio
+import json
+import os
+import platform
+import time
 from dataclasses import dataclass
 from typing import List
+
+import manager_core
 import manager_util
+import requests
+import toml
 
 base_url = "https://api.comfy.org"
 
 
-async def get_cnr_data(page=1, limit=1000, cache_mode=True):
+lock = asyncio.Lock()
-    try:
-        uri = f'{base_url}/nodes?page={page}&limit={limit}'
-        json_obj = await manager_util.get_data_with_cache(uri, cache_mode=cache_mode)
 
-        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 = {}
+
+        
+        # Determine form factor based on environment and platform
+        is_desktop = bool(os.environ.get('__COMFYUI_DESKTOP_VERSION__'))
+        system = platform.system().lower()
+        is_windows = system == 'windows'
+        is_mac = system == 'darwin'
+        is_linux = system == 'linux'
+
+        # Get ComfyUI version tag
+        if is_desktop:
+            # extract version from pyproject.toml instead of git tag
+            comfyui_ver = manager_core.get_current_comfyui_ver() or 'unknown'
+        else:
+            comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
+
+        if is_desktop:
+            if is_windows:
+                form_factor = 'desktop-win'
+            elif is_mac:
+                form_factor = 'desktop-mac'
+            else:
+                form_factor = 'other'
+        else:
+            if is_windows:
+                form_factor = 'git-windows'
+            elif is_mac:
+                form_factor = 'git-mac'
+            elif is_linux:
+                form_factor = 'git-linux'
+            else:
+                form_factor = 'other'
+        
+        while remained:
+            # Add comfyui_version and form_factor to the API request
+            sub_uri = f'{base_url}/nodes?page={page}&limit=30&comfyui_version={comfyui_ver}&form_factor={form_factor}'
+            sub_json_obj = await asyncio.wait_for(manager_util.get_data_with_cache(sub_uri, cache_mode=False, silent=True, dont_cache=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
 
@@ -90,7 +188,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:
@@ -98,3 +196,58 @@ def all_versions_of_node(node_id):
     else:
         return None
 
+
+def read_cnr_info(fullpath):
+    try:
+        toml_path = os.path.join(fullpath, 'pyproject.toml')
+        tracking_path = os.path.join(fullpath, '.tracking')
+
+        if not os.path.exists(toml_path) or not os.path.exists(tracking_path):
+            return None  # not valid CNR node pack
+
+        with open(toml_path, "r", encoding="utf-8") as f:
+            data = toml.load(f)
+
+            project = data.get('project', {})
+            name = project.get('name').strip().lower()
+
+            # normalize version
+            # for example: 2.5 -> 2.5.0
+            version = str(manager_util.StrictVersion(project.get('version')))
+
+            urls = project.get('urls', {})
+            repository = urls.get('Repository')
+
+            if name and version:  # repository is optional
+                return {
+                    "id": name,
+                    "version": version,
+                    "url": repository
+                }
+
+        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
+

glob/git_utils.py

@@ -0,0 +1,85 @@
+import os
+import configparser
+
+
+GITHUB_ENDPOINT = os.getenv('GITHUB_ENDPOINT')
+
+
+def is_git_repo(path: str) -> bool:
+    """ Check if the path is a git repository. """
+    # NOTE: Checking it through `git.Repo` must be avoided.
+    #       It locks the file, causing issues on Windows.
+    return os.path.exists(os.path.join(path, '.git'))
+
+
+def get_commit_hash(fullpath):
+    git_head = os.path.join(fullpath, '.git', 'HEAD')
+    if os.path.exists(git_head):
+        with open(git_head) as f:
+            line = f.readline()
+
+            if line.startswith("ref: "):
+                ref = os.path.join(fullpath, '.git', line[5:].strip())
+                if os.path.exists(ref):
+                    with open(ref) as f2:
+                        return f2.readline().strip()
+                else:
+                    return "unknown"
+            else:
+                return line
+
+    return "unknown"
+
+
+def git_url(fullpath):
+    """
+    resolve version of unclassified custom node based on remote url in .git/config
+    """
+    git_config_path = os.path.join(fullpath, '.git', 'config')
+
+    if not os.path.exists(git_config_path):
+        return None
+
+    # Set `strict=False` to allow duplicate `vscode-merge-base` sections, addressing <https://github.com/ltdrdata/ComfyUI-Manager/issues/1529>
+    config = configparser.ConfigParser(strict=False)
+    config.read(git_config_path)
+
+    for k, v in config.items():
+        if k.startswith('remote ') and 'url' in v:
+            return v['url']
+
+    return None
+
+
+def normalize_url(url) -> str:
+    github_id = normalize_to_github_id(url)
+    if github_id is not None:
+        url = f"https://github.com/{github_id}"
+
+    return url
+
+
+def normalize_to_github_id(url) -> str:
+    if 'github' in url or (GITHUB_ENDPOINT is not None and GITHUB_ENDPOINT in url):
+        author = os.path.basename(os.path.dirname(url))
+
+        if author.startswith('git@github.com:'):
+            author = author.split(':')[1]
+
+        repo_name = os.path.basename(url)
+        if repo_name.endswith('.git'):
+            repo_name = repo_name[:-4]
+
+        return f"{author}/{repo_name}"
+
+    return None
+
+
+def get_url_for_clone(url):
+    url = normalize_url(url)
+
+    if GITHUB_ENDPOINT is not None and url.startswith('https://github.com/'):
+        url = GITHUB_ENDPOINT + url[18:] # url[18:] -> remove `https://github.com`
+
+    return url
+    

glob/manager_downloader.py

@@ -2,10 +2,16 @@ 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')
 
+
 if aria2 is not None:
     secret = os.getenv('COMFYUI_MANAGER_ARIA2_SECRET')
     url = urlparse(aria2)
@@ -16,7 +22,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
@@ -38,6 +48,9 @@ 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:
@@ -66,9 +79,6 @@ def aria2_download_url(model_url: str, model_dir: str, filename: str):
     if model_dir.startswith(core.comfy_path):
         model_dir = model_dir[len(core.comfy_path) :]
 
-    if HF_ENDPOINT:
-        model_url = model_url.replace('https://huggingface.co', HF_ENDPOINT)
-
     download_dir = model_dir if model_dir.startswith('/') else os.path.join('/models', model_dir)
 
     download = aria2_find_task(download_dir, filename)
@@ -112,4 +122,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()
+
+

glob/manager_util.py

@@ -1,3 +1,9 @@
+"""
+description:
+    `manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
+"""
+import traceback
+
 import aiohttp
 import json
 import threading
@@ -6,12 +12,40 @@ from datetime import datetime
 import subprocess
 import sys
 import re
+import logging
+import platform
+import shlex
+
 
 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 add_python_path_to_env():
+    if platform.system() != "Windows":
+        sep = ':'
+    else:
+        sep = ';'
+
+    os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']
+
+
+def make_pip_cmd(cmd):
+    if 'python_embeded' in sys.executable:
+        if use_uv:
+            return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
+        else:
+            return [sys.executable, '-s', '-m', 'pip'] + cmd
+    else:
+        # FIXED: https://github.com/ltdrdata/ComfyUI-Manager/issues/1667
+        if use_uv:
+            return [sys.executable, '-m', 'uv', 'pip'] + cmd
+        else:
+            return [sys.executable, '-m', 'pip'] + cmd
 
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
@@ -103,14 +137,24 @@ async def get_data(uri, silent=False):
 
     if uri.startswith("http"):
         async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.get(uri) as resp:
+            headers = {
+                'Cache-Control': 'no-cache',
+                'Pragma': 'no-cache',
+                'Expires': '0'
+            }
+            async with session.get(uri, headers=headers) as resp:
                 json_text = await resp.text()
     else:
         with cache_lock:
             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]")
@@ -118,20 +162,57 @@ 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, dont_cache=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)
-
+        if not dont_cache:
-        with cache_lock:
+            with cache_lock:
-            with open(cache_uri, "w", encoding='utf-8') as file:
+                with open(cache_uri, "w", encoding='utf-8') as file:
-                json.dump(json_obj, file, indent=4, sort_keys=True)
+                    json.dump(json_obj, file, indent=4, sort_keys=True)
-                if not silent:
+                    if not silent:
-                    print(f"[ComfyUI-Manager] default cache updated: {uri}")
+                        logging.info(f"[ComfyUI-Manager] default cache updated: {uri}")
 
     return json_obj
 
@@ -146,10 +227,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
 
 
@@ -161,7 +242,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'):
@@ -171,9 +252,10 @@ def get_installed_packages(renew=False):
                     if y[0] == 'Package' or y[0].startswith('-'):
                         continue
 
-                    pip_map[y[0]] = y[1]
+                    normalized_name = y[0].lower().replace('-', '_')
+                    pip_map[normalized_name] = 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
@@ -184,52 +266,95 @@ def clear_pip_cache():
     pip_map = None
 
 
-torch_torchvision_version_map = {
+def parse_requirement_line(line):
-    '2.5.1': '0.20.1',
+    tokens = shlex.split(line)
-    '2.5.0': '0.20.0',
+    if not tokens:
-    '2.4.1': '0.19.1',
+        return None
-    '2.4.0': '0.19.0',
+
-    '2.3.1': '0.18.1',
+    package_spec = tokens[0]
-    '2.3.0': '0.18.0',
+
-    '2.2.2': '0.17.2',
+    pattern = re.compile(
-    '2.2.1': '0.17.1',
+        r'^(?P<package>[A-Za-z0-9_.+-]+)'
-    '2.2.0': '0.17.0',
+        r'(?P<operator>==|>=|<=|!=|~=|>|<)?'
-    '2.1.2': '0.16.2',
+        r'(?P<version>[A-Za-z0-9_.+-]*)$'
-    '2.1.1': '0.16.1',
+    )
-    '2.1.0': '0.16.0',
+    m = pattern.match(package_spec)
-    '2.0.1': '0.15.2',
+    if not m:
-    '2.0.0': '0.15.1',
+        return None
+
+    package = m.group('package')
+    operator = m.group('operator') or None
+    version = m.group('version') or None
+
+    index_url = None
+    if '--index-url' in tokens:
+        idx = tokens.index('--index-url')
+        if idx + 1 < len(tokens):
+            index_url = tokens[idx + 1]
+
+    res = {'package': package}
+
+    if operator is not None:
+        res['operator'] = operator
+
+    if version is not None:
+        res['version'] = StrictVersion(version)
+
+    if index_url is not None:
+        res['index_url'] = index_url
+
+    return res
+
+
+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'),
 }
 
 
+
 class PIPFixer:
-    def __init__(self, prev_pip_versions):
+    def __init__(self, prev_pip_versions, comfyui_path, manager_files_path):
         self.prev_pip_versions = { **prev_pip_versions }
+        self.comfyui_path = comfyui_path
+        self.manager_files_path = manager_files_path
 
     def torch_rollback(self):
         spec = self.prev_pip_versions['torch'].split('+')
         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:
+        if torch_torchvision_torchaudio_ver is None:
-            cmd = [sys.executable, '-m', 'pip', 'install', '--pre',
+            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
-                   'torch', 'torchvision', 'torchaudio',
+                                '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
-                   '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"]
+            logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
-            print("[manager-core] restore PyTorch to nightly version")
         else:
-            cmd = [sys.executable, '-m', 'pip', 'install',
+            torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
-                   f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torch_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}"]
+                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
-            print(f"[manager-core] restore PyTorch to {torch_ver}+{platform}")
+            logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
 
         subprocess.check_output(cmd, universal_newlines=True)
 
@@ -239,23 +364,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")
+            logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
-            print(e)
+            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")
+            logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
-            print(e)
+            logging.error(e)
 
         # fix opencv
         try:
@@ -283,24 +410,98 @@ 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}", "numpy<2"])
                         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")
+            logging.error("[ComfyUI-Manager] Failed to restore opencv")
-            print(e)
+            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"])
-        except Exception as e:
+                    subprocess.check_output(cmd , universal_newlines=True)
-            print("[manager-core] Failed to restore numpy")
-            print(e)
 
+                    logging.info("[ComfyUI-Manager] 'numpy' dependency were fixed")
+        except Exception as e:
+            logging.error("[ComfyUI-Manager] Failed to restore numpy")
+            logging.error(e)
+
+        # fix missing frontend
+        try:
+            # NOTE: package name in requirements is 'comfyui-frontend-package'
+            #       but, package name from `pip freeze` is 'comfyui_frontend_package'
+            #       but, package name from `uv pip freeze` is 'comfyui-frontend-package'
+            #
+            #       get_installed_packages returns normalized name (i.e. comfyui_frontend_package)
+            if 'comfyui_frontend_package' not in new_pip_versions:
+                requirements_path = os.path.join(self.comfyui_path, 'requirements.txt')
+
+                with open(requirements_path, 'r') as file:
+                    lines = file.readlines()
+                
+                front_line = next((line.strip() for line in lines if line.startswith('comfyui-frontend-package')), None)
+                if front_line is None:
+                    logging.info("[ComfyUI-Manager] Skipped fixing the 'comfyui-frontend-package' dependency because the ComfyUI is outdated.")
+                else:
+                    cmd = make_pip_cmd(['install', front_line])
+                    subprocess.check_output(cmd , universal_newlines=True)
+                    logging.info("[ComfyUI-Manager] 'comfyui-frontend-package' dependency were fixed")
+        except Exception as e:
+            logging.error("[ComfyUI-Manager] Failed to restore comfyui-frontend-package")
+            logging.error(e)
+
+        # restore based on custom list
+        pip_auto_fix_path = os.path.join(self.manager_files_path, "pip_auto_fix.list")
+        if os.path.exists(pip_auto_fix_path):
+            with open(pip_auto_fix_path, 'r', encoding="UTF-8", errors="ignore") as f:
+                fixed_list = []
+
+                for x in f.readlines():
+                    try:
+                        parsed = parse_requirement_line(x)
+                        need_to_reinstall = True
+
+                        normalized_name = parsed['package'].lower().replace('-', '_')
+                        if normalized_name in new_pip_versions:
+                            if 'version' in parsed and 'operator' in parsed:
+                                cur = StrictVersion(new_pip_versions[parsed['package']])
+                                dest = parsed['version']
+                                op = parsed['operator']
+                                if cur == dest:
+                                    if op in ['==', '>=', '<=']:
+                                        need_to_reinstall = False
+                                elif cur < dest:
+                                    if op in ['<=', '<', '~=', '!=']:
+                                        need_to_reinstall = False
+                                elif cur > dest:
+                                    if op in ['>=', '>', '~=', '!=']:
+                                        need_to_reinstall = False
+
+                        if need_to_reinstall:
+                            cmd_args = ['install']
+                            if 'version' in parsed and 'operator' in parsed:
+                                cmd_args.append(parsed['package']+parsed['operator']+parsed['version'].version_string)
+
+                            if 'index_url' in parsed:
+                                cmd_args.append('--index-url')
+                                cmd_args.append(parsed['index_url'])
+
+                            cmd = make_pip_cmd(cmd_args)
+                            subprocess.check_output(cmd, universal_newlines=True)
+
+                            fixed_list.append(parsed['package'])
+                    except Exception as e:
+                        traceback.print_exc()
+                        logging.error(f"[ComfyUI-Manager] Failed to restore '{x}'")
+                        logging.error(e)
+
+                if len(fixed_list) > 0:
+                    logging.info(f"[ComfyUI-Manager] dependencies in pip_auto_fix.json were fixed: {fixed_list}")
 
 def sanitize(data):
     return data.replace("<", "&lt;").replace(">", "&gt;")
@@ -309,3 +510,23 @@ def sanitize(data):
 def sanitize_filename(input_string):
     result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
     return result_string
+
+
+def robust_readlines(fullpath):
+    import chardet
+    try:
+        with open(fullpath, "r") as f:
+            return f.readlines()
+    except:
+        encoding = None
+        with open(fullpath, "rb") as f:
+            raw_data = f.read()
+            result = chardet.detect(raw_data)
+            encoding = result['encoding']
+
+        if encoding is not None:
+            with open(fullpath, "r", encoding=encoding) as f:
+                return f.readlines()
+
+        print(f"[ComfyUI-Manager] Failed to recognize encoding for: {fullpath}")
+        return []

glob/node_package.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+import os
+
+from git_utils import get_commit_hash
+
+
+@dataclass
+class InstalledNodePackage:
+    """Information about an installed node package."""
+
+    id: str
+    fullpath: str
+    disabled: bool
+    version: str
+
+    @property
+    def is_unknown(self) -> bool:
+        return self.version == "unknown"
+
+    @property
+    def is_nightly(self) -> bool:
+        return self.version == "nightly"
+
+    @property
+    def is_from_cnr(self) -> bool:
+        return not self.is_unknown and not self.is_nightly
+
+    @property
+    def is_enabled(self) -> bool:
+        return not self.disabled
+
+    @property
+    def is_disabled(self) -> bool:
+        return self.disabled
+
+    def get_commit_hash(self) -> str:
+        return get_commit_hash(self.fullpath)
+
+    def isValid(self) -> bool:
+        if self.is_from_cnr:
+            return os.path.exists(os.path.join(self.fullpath, '.tracking'))
+
+        return True
+
+    @staticmethod
+    def from_fullpath(fullpath: str, resolve_from_path) -> InstalledNodePackage:
+        parent_folder_name = os.path.basename(os.path.dirname(fullpath))
+        module_name = os.path.basename(fullpath)
+
+        if module_name.endswith(".disabled"):
+            node_id = module_name[:-9]
+            disabled = True
+        elif parent_folder_name == ".disabled":
+            # Nodes under custom_nodes/.disabled/* are disabled
+            node_id = module_name
+            disabled = True
+        else:
+            node_id = module_name
+            disabled = False
+
+        info = resolve_from_path(fullpath)
+        if info is None:
+            version = 'unknown'
+        else:
+            node_id = info['id']    # robust module guessing
+            version = info['ver']
+
+        return InstalledNodePackage(
+            id=node_id, fullpath=fullpath, disabled=disabled, version=version
+        )

glob/share_3rdparty.py

@@ -317,7 +317,7 @@ async def share_art(request):
             form.add_field("shareWorkflowTitle", title)
             form.add_field("shareWorkflowDescription", description)
             form.add_field("shareWorkflowIsNSFW", str(is_nsfw).lower())
-            form.add_field("currentSnapshot", json.dumps(core.get_current_snapshot()))
+            form.add_field("currentSnapshot", json.dumps(await core.get_current_snapshot()))
             form.add_field("modelsInfo", json.dumps(models_info))
 
             async with session.post(

js/cm-api.js

@@ -1,6 +1,6 @@
 import { api } from "../../scripts/api.js";
 import { app } from "../../scripts/app.js";
-import { sleep } from "./common.js";
+import { sleep, customConfirm, customAlert } from "./common.js";
 
 async function tryInstallCustomNode(event) {
 	let msg = '-= [ComfyUI Manager] extension installation request =-\n\n';
@@ -19,11 +19,10 @@ async function tryInstallCustomNode(event) {
 	msg += `\n\nRequest message:\n${event.detail.msg}`;
 
 	if(event.detail.target.installed == 'True') {
-		alert(msg);
+		customAlert(msg);
 		return;
 	}
-
+	const res = await customConfirm(msg);
-	let res = confirm(msg);
 	if(res) {
 		if(event.detail.target.installed == 'Disabled') {
 			const response = await api.fetchApi(`/customnode/toggle_active`, {
@@ -46,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");

js/comfyui-share-common.js

@@ -4,6 +4,7 @@ import { $el, ComfyDialog } from "../../scripts/ui.js";
 import { CopusShareDialog } from "./comfyui-share-copus.js";
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import { YouMLShareDialog } from "./comfyui-share-youml.js";
+import { customAlert } from "./common.js";
 
 export const SUPPORTED_OUTPUT_NODE_TYPES = [
 	"PreviewImage",
@@ -252,9 +253,9 @@ export const showShareDialog = async (share_option) => {
         if (potential_output_nodes.length === 0) {
           // todo: add support for other output node types (animatediff combine, etc.)
           const supported_nodes_string = SUPPORTED_OUTPUT_NODE_TYPES.join(", ");
-          alert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
+          customAlert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
         } else {
-          alert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
+          customAlert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
         }
         return false;
       }
@@ -512,7 +513,7 @@ export class ShareDialogChooser extends ComfyDialog {
 	}
 	show() {
 		this.element.style.display = "block";
-		this.element.style.zIndex = 10001;
+		this.element.style.zIndex = 1099;
 	}
 }
 export class ShareDialog extends ComfyDialog {
@@ -861,7 +862,7 @@ export class ShareDialog extends ComfyDialog {
 			if (destinations.includes("matrix")) {
 				let definedMatrixAuth = !!this.matrix_homeserver_input.value && !!this.matrix_username_input.value && !!this.matrix_password_input.value;
 				if (!definedMatrixAuth) {
-					alert("Please set your Matrix account details.");
+					customAlert("Please set your Matrix account details.");
 					return;
 				}
 			}
@@ -878,9 +879,9 @@ export class ShareDialog extends ComfyDialog {
 				if (potential_output_nodes.length === 0) {
 					// todo: add support for other output node types (animatediff combine, etc.)
 					const supported_nodes_string = SUPPORTED_OUTPUT_NODE_TYPES.join(", ");
-					alert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
+					customAlert(`No supported output node found (${supported_nodes_string}). To share this workflow, please add an output node to your graph and re-run your prompt.`);
 				} else {
-					alert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
+					customAlert("To share this, first run a prompt. Once it's done, click 'Share'.\n\nNOTE: Images of the Share target can only be selected in the PreviewImage, SaveImage, and VHS_VideoCombine nodes. In the case of VHS_VideoCombine, only the image/gif and image/webp formats are supported.");
 				}
 				this.selectedOutputIndex = 0;
 				this.close();
@@ -918,16 +919,16 @@ export class ShareDialog extends ComfyDialog {
 				try {
 					const response_json = await response.json();
 					if (response_json.error) {
-						alert(response_json.error);
+						customAlert(response_json.error);
 						this.close();
 						return;
 					} else {
-						alert("Failed to share your art. Please try again.");
+						customAlert("Failed to share your art. Please try again.");
 						this.close();
 						return;
 					}
 				} catch (e) {
-					alert("Failed to share your art. Please try again.");
+					customAlert("Failed to share your art. Please try again.");
 					this.close();
 					return;
 				}

js/comfyui-share-copus.js

@@ -1,5 +1,7 @@
 import { app } from "../../scripts/app.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
+import { customAlert } from "./common.js";
+
 const env = "prod";
 
 let DEFAULT_HOMEPAGE_URL = "https://copus.io";
@@ -603,7 +605,7 @@ export class CopusShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      alert(e.message);
+      customAlert(e.message);
     }
     this.shareButton.disabled = false;
     this.shareButton.textContent = "Share";

js/comfyui-share-openart.js

@@ -1,6 +1,7 @@
 import {app} from "../../scripts/app.js";
 import {api} from "../../scripts/api.js";
 import {ComfyDialog, $el} from "../../scripts/ui.js";
+import { customAlert } from "./common.js";
 
 const LOCAL_STORAGE_KEY = "openart_comfy_workflow_key";
 const DEFAULT_HOMEPAGE_URL = "https://openart.ai/workflows/dev?developer=true";
@@ -431,7 +432,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      alert(e.message);
+      customAlert(e.message);
     }
     this.shareButton.disabled = false;
     this.shareButton.textContent = "Share";

js/comfyui-share-youml.js

@@ -1,6 +1,7 @@
 import {app} from "../../scripts/app.js";
 import {api} from "../../scripts/api.js";
 import {ComfyDialog, $el} from "../../scripts/ui.js";
+import { customAlert } from "./common.js";
 
 const BASE_URL = "https://youml.com";
 //const BASE_URL = "http://localhost:3000";
@@ -347,7 +348,7 @@ export class YouMLShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      alert(e.message);
+      customAlert(e.message);
     } finally {
       this.shareButton.disabled = false;
       this.shareButton.textContent = "Share";

js/common.js

@@ -1,46 +1,182 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
+import { getBestPosition, getPositionStyle, getRect } from './popover-helper.js';
+
+
+function internalCustomConfirm(message, confirmMessage, cancelMessage) {
+	return new Promise((resolve) => {
+		// transparent bg
+		const modalOverlay = document.createElement('div');
+		modalOverlay.style.position = 'fixed';
+		modalOverlay.style.top = 0;
+		modalOverlay.style.left = 0;
+		modalOverlay.style.width = '100%';
+		modalOverlay.style.height = '100%';
+		modalOverlay.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
+		modalOverlay.style.display = 'flex';
+		modalOverlay.style.alignItems = 'center';
+		modalOverlay.style.justifyContent = 'center';
+		modalOverlay.style.zIndex = '1101';
+
+		// Modal window container (dark bg)
+		const modalDialog = document.createElement('div');
+		modalDialog.style.backgroundColor = '#333';
+		modalDialog.style.padding = '20px';
+		modalDialog.style.borderRadius = '4px';
+		modalDialog.style.maxWidth = '400px';
+		modalDialog.style.width = '80%';
+		modalDialog.style.boxShadow = '0 2px 8px rgba(0, 0, 0, 0.5)';
+		modalDialog.style.color = '#fff';
+
+		// Display message
+		const modalMessage = document.createElement('p');
+		modalMessage.textContent = message;
+		modalMessage.style.margin = '0';
+		modalMessage.style.padding = '0 0 20px';
+		modalMessage.style.wordBreak = 'keep-all';
+
+		// Button container
+		const modalButtons = document.createElement('div');
+		modalButtons.style.display = 'flex';
+		modalButtons.style.justifyContent = 'flex-end';
+
+		// Confirm button (green)
+		const confirmButton = document.createElement('button');
+		if(confirmMessage)
+			confirmButton.textContent = confirmMessage;
+		else
+			confirmButton.textContent = 'Confirm';
+		confirmButton.style.marginLeft = '10px';
+		confirmButton.style.backgroundColor = '#28a745'; // green
+		confirmButton.style.color = '#fff';
+		confirmButton.style.border = 'none';
+		confirmButton.style.padding = '6px 12px';
+		confirmButton.style.borderRadius = '4px';
+		confirmButton.style.cursor = 'pointer';
+		confirmButton.style.fontWeight = 'bold';
+
+		// Cancel button (red)
+		const cancelButton = document.createElement('button');
+		if(cancelMessage)
+			cancelButton.textContent = cancelMessage;
+		else
+			cancelButton.textContent = 'Cancel';
+
+		cancelButton.style.marginLeft = '10px';
+		cancelButton.style.backgroundColor = '#dc3545'; // red
+		cancelButton.style.color = '#fff';
+		cancelButton.style.border = 'none';
+		cancelButton.style.padding = '6px 12px';
+		cancelButton.style.borderRadius = '4px';
+		cancelButton.style.cursor = 'pointer';
+		cancelButton.style.fontWeight = 'bold';
+
+		const closeModal = () => {
+			document.body.removeChild(modalOverlay);
+		};
+
+		confirmButton.addEventListener('click', () => {
+			closeModal();
+			resolve(true);
+		});
+
+		cancelButton.addEventListener('click', () => {
+			closeModal();
+			resolve(false);
+		});
+
+		modalButtons.appendChild(confirmButton);
+		modalButtons.appendChild(cancelButton);
+		modalDialog.appendChild(modalMessage);
+		modalDialog.appendChild(modalButtons);
+		modalOverlay.appendChild(modalDialog);
+		document.body.appendChild(modalOverlay);
+	});
+}
 
 export function show_message(msg) {
 	app.ui.dialog.show(msg);
-	app.ui.dialog.element.style.zIndex = 10010;
+	app.ui.dialog.element.style.zIndex = 1100;
 }
 
 export async function sleep(ms) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export function rebootAPI() {
+export async function customConfirm(message) {
-	if ('electronAPI' in window) {
+	try {
-      		window.electronAPI.restartApp();
+		let res = await
-      		return true;
+			window['app'].extensionManager.dialog
-    	}
+			.confirm({
-	if (confirm("Are you sure you'd like to reboot the server?")) {
+				title: 'Confirm',
-		try {
+				message: message
-			api.fetchApi("/manager/reboot");
+			});
-		}
-		catch(exception) {
 
-		}
+		return res;
-		return true;
+	}
+	catch {
+		let res = await internalCustomConfirm(message);
+		return res;
 	}
-
-	return false;
 }
 
 
-export async function migrateAPI() {
+export function customAlert(message) {
-	if (confirm("When performing a migration, existing installed custom nodes will be renamed and the server will be restarted. Are you sure you want to apply this?\n\n(If you don't perform the migration, ComfyUI-Manager's start-up time will be longer each time due to re-checking during startup.)")) {
+	try {
-		try {
+		window['app'].extensionManager.toast.addAlert(message);
-			await api.fetchApi("/manager/migrate_unmanaged_nodes");
-			api.fetchApi("/manager/reboot");
-		}
-		catch(exception) {
-
-		}
-		return true;
 	}
+	catch {
+		alert(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 {
+		let res = await
+				window['app'].extensionManager.dialog
+				.prompt({
+					title: title,
+					message: message
+				});
+
+		return res;
+	}
+	catch {
+		return prompt(title, message)
+	}
+}
+
+
+export function rebootAPI() {
+	if ('electronAPI' in window) {
+			window.electronAPI.restartApp();
+			return true;
+	}
+
+	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
+		if (isConfirmed) {
+			try {
+				api.fetchApi("/manager/reboot");
+			}
+			catch(exception) {}
+		}
+	});
 
 	return false;
 }
@@ -252,10 +388,267 @@ export async function fetchData(route, options) {
 	}
 }
 
+// https://cenfun.github.io/open-icons/
 export const icons = {
 	search: '<svg viewBox="0 0 24 24" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m21 21-4.486-4.494M19 10.5a8.5 8.5 0 1 1-17 0 8.5 8.5 0 0 1 17 0"/></svg>',
-	extensions: '<svg viewBox="64 64 896 896" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M843.5 737.4c-12.4-75.2-79.2-129.1-155.3-125.4S550.9 676 546 752c-153.5-4.8-208-40.7-199.1-113.7 3.3-27.3 19.8-41.9 50.1-49 18.4-4.3 38.8-4.9 57.3-3.2 1.7.2 3.5.3 5.2.5 11.3 2.7 22.8 5 34.3 6.8 34.1 5.6 68.8 8.4 101.8 6.6 92.8-5 156-45.9 159.2-132.7 3.1-84.1-54.7-143.7-147.9-183.6-29.9-12.8-61.6-22.7-93.3-30.2-14.3-3.4-26.3-5.7-35.2-7.2-7.9-75.9-71.5-133.8-147.8-134.4S189.7 168 180.5 243.8s40 146.3 114.2 163.9 149.9-23.3 175.7-95.1c9.4 1.7 18.7 3.6 28 5.8 28.2 6.6 56.4 15.4 82.4 26.6 70.7 30.2 109.3 70.1 107.5 119.9-1.6 44.6-33.6 65.2-96.2 68.6-27.5 1.5-57.6-.9-87.3-5.8-8.3-1.4-15.9-2.8-22.6-4.3-3.9-.8-6.6-1.5-7.8-1.8l-3.1-.6c-2.2-.3-5.9-.8-10.7-1.3-25-2.3-52.1-1.5-78.5 4.6-55.2 12.9-93.9 47.2-101.1 105.8-15.7 126.2 78.6 184.7 276 188.9 29.1 70.4 106.4 107.9 179.6 87 73.3-20.9 119.3-93.4 106.9-168.6M329.1 345.2a83.3 83.3 0 1 1 .01-166.61 83.3 83.3 0 0 1-.01 166.61M695.6 845a83.3 83.3 0 1 1 .01-166.61A83.3 83.3 0 0 1 695.6 845"/></svg>',
 	conflicts: '<svg viewBox="0 0 400 400" width="100%" height="100%" pointer-events="none" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="m397.2 350.4.2-.2-180-320-.2.2C213.8 24.2 207.4 20 200 20s-13.8 4.2-17.2 10.4l-.2-.2-180 320 .2.2c-1.6 2.8-2.8 6-2.8 9.6 0 11 9 20 20 20h360c11 0 20-9 20-20 0-3.6-1.2-6.8-2.8-9.6M220 340h-40v-40h40zm0-60h-40V120h40z"/></svg>',
 	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>'
+	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>',
+	close: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 16 16"><g fill="currentColor"><path fill-rule="evenodd" clip-rule="evenodd" d="m7.116 8-4.558 4.558.884.884L8 8.884l4.558 4.558.884-.884L8.884 8l4.558-4.558-.884-.884L8 7.116 3.442 2.558l-.884.884L7.116 8z"/></g></svg>',
+	arrowRight: '<svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" width="100%" height="100%" viewBox="0 0 20 20"><path fill="currentColor" fill-rule="evenodd" d="m2.542 2.154 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Zm9 0 7.254 7.26c.136.14.204.302.204.483a.73.73 0 0 1-.204.5l-7.575 7.398c-.383.317-.724.317-1.022 0-.299-.317-.299-.643 0-.98l7.08-6.918-6.754-6.763c-.237-.343-.215-.654.066-.935.281-.28.598-.295.951-.045Z"/></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;
+		}
+	});
+
+}
+
+export function getTimeAgo(dateStr) {
+	const date = new Date(dateStr);
+
+	if (!date || !(date instanceof Date) || isNaN(date.getTime())) {
+		return "";
+	}
+
+	const units = [
+		{ max: 2760000, value: 60000, name: 'minute', past: 'a minute ago', future: 'in a minute' },
+		{ max: 72000000, value: 3600000, name: 'hour', past: 'an hour ago', future: 'in an hour' },
+		{ max: 518400000, value: 86400000, name: 'day', past: 'yesterday', future: 'tomorrow' },
+		{ max: 2419200000, value: 604800000, name: 'week', past: 'last week', future: 'in a week' },
+		{ max: 28512000000, value: 2592000000, name: 'month', past: 'last month', future: 'in a month' }
+	];
+    const diff = Date.now() - date.getTime();
+    // less than a minute
+    if (Math.abs(diff) < 60000)
+        return 'just now';
+    for (let i = 0; i < units.length; i++) {
+        if (Math.abs(diff) < units[i].max) {
+            return format(diff, units[i].value, units[i].name, units[i].past, units[i].future, diff < 0);
+        }
+    }
+    function format(diff, divisor, unit, past, future, isInTheFuture) {
+		const val = Math.round(Math.abs(diff) / divisor);
+		if (isInTheFuture)
+			return val <= 1 ? future : 'in ' + val + ' ' + unit + 's';
+		return val <= 1 ? past : val + ' ' + unit + 's ago';
+	}
+    return format(diff, 31536000000, 'year', 'last year', 'in a year', diff < 0);
+};
+
+export const loadCss = (cssFile) => {
+	const cssPath = import.meta.resolve(cssFile);
+	//console.log(cssPath);
+	const $link = document.createElement("link");
+	$link.setAttribute("rel", 'stylesheet');
+	$link.setAttribute("href", cssPath);
+	document.head.appendChild($link);
+};
+
+export const copyText = (text) => {
+	return new Promise((resolve) => {
+		let err;
+		try {
+			navigator.clipboard.writeText(text);
+		} catch (e) {
+			err = e;
+		}
+		if (err) {
+			resolve(false);
+		} else {
+			resolve(true);
+		}
+	});
+};
+
+function renderPopover($elem, target, options = {}) {
+	// async microtask
+	queueMicrotask(() => {
+		
+		const containerRect = getRect(window);
+		const targetRect = getRect(target);
+		const elemRect = getRect($elem);
+
+		const positionInfo = getBestPosition(
+			containerRect,
+			targetRect,
+			elemRect,
+			options.positions
+		);
+		const style = getPositionStyle(positionInfo, {
+			bgColor: options.bgColor,
+			borderColor: options.borderColor,
+			borderRadius: options.borderRadius
+		});
+
+		$elem.style.top = positionInfo.top + "px";
+		$elem.style.left = positionInfo.left + "px";
+		$elem.style.background = style.background;
+	
+	});
+}
+
+let $popover;
+export function hidePopover() {
+	if ($popover) {
+		$popover.remove();
+		$popover = null;
+	}
+}
+export function showPopover(target, text, className, options) {
+	hidePopover();
+	$popover = document.createElement("div");
+	$popover.className = ['cn-popover', className].filter(it => it).join(" ");
+	document.body.appendChild($popover);
+	$popover.innerHTML = text;
+	$popover.style.display = "block";
+	renderPopover($popover, target, {
+		borderRadius: 10,
+		... options
+	});
+}
+
+let $tooltip;
+export function hideTooltip(target) {
+	if ($tooltip) {
+		$tooltip.style.display = "none";
+		$tooltip.innerHTML = "";
+		$tooltip.style.top = "0px";
+		$tooltip.style.left = "0px";
+	}
+}
+export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {}) {
+	if (!$tooltip) {
+		$tooltip = document.createElement("div");
+		$tooltip.className = className;
+		$tooltip.style.cssText = `
+			pointer-events: none;
+			position: fixed;
+			z-index: 10001;
+			padding: 20px;
+			color: #1e1e1e;
+			max-width: 350px;
+			filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
+			${Object.keys(styleMap).map(k=>k+":"+styleMap[k]+";").join("")}
+		`;
+		document.body.appendChild($tooltip);
+	}
+
+	$tooltip.innerHTML = text;
+	$tooltip.style.display = "block";
+	renderPopover($tooltip, target, {
+		positions: ['top', 'bottom', 'right', 'center'],
+		bgColor: "#ffffff",
+		borderColor: "#cccccc",
+		borderRadius: 5
+	});
+}
+
+function initTooltip () {
+	const mouseenterHandler = (e) => {
+        const target = e.target;
+        const text = target.getAttribute('tooltip');
+        if (text) {
+            showTooltip(target, text);
+        }
+    };
+	const mouseleaveHandler = (e) => {
+        const target = e.target;
+        const text = target.getAttribute('tooltip');
+        if (text) {
+            hideTooltip(target);
+        }
+    };
+	document.body.removeEventListener('mouseenter', mouseenterHandler, true);
+	document.body.removeEventListener('mouseleave', mouseleaveHandler, true);
+	document.body.addEventListener('mouseenter', mouseenterHandler, true);
+    document.body.addEventListener('mouseleave', mouseleaveHandler, true);
+}
+
+initTooltip();

js/components-manager.js

@@ -1,6 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js"
-import { sleep, show_message } from "./common.js";
+import { sleep, show_message, customConfirm, customAlert } from "./common.js";
 import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
 import { ComfyDialog, $el } from "../../scripts/ui.js";
 
@@ -365,7 +365,7 @@ function checkVersion(name, component) {
 	return msg;
 }
 
-function handle_import_components(components) {
+async function handle_import_components(components) {
 	let msg = 'Components:\n';
 	let cnt = 0;
 	for(let name in components) {
@@ -387,8 +387,9 @@ function handle_import_components(components) {
 
 	let last_name = null;
 	msg += '\nWill you load components?\n';
-	if(confirm(msg)) {
+	const confirmed = await customConfirm(msg);
-		let mode = confirm('\nWill you save components?\n(cancel=load without save)');
+	if(confirmed) {
+		const mode = await customConfirm('\nWill you save components?\n(cancel=load without save)');
 
 		for(let name in components) {
 			let component = components[name];
@@ -411,7 +412,7 @@ function handle_import_components(components) {
 	}
 }
 
-function handlePaste(e) {
+async function handlePaste(e) {
 	let data = (e.clipboardData || window.clipboardData);
 	const items = data.items;
 	for(const item of items) {
@@ -421,7 +422,7 @@ function handlePaste(e) {
 				let json_data = JSON.parse(data);
 				if(json_data.kind == 'ComfyUI Components' && last_paste_timestamp != json_data.timestamp) {
 					last_paste_timestamp = json_data.timestamp;
-					handle_import_components(json_data.components);
+					await handle_import_components(json_data.components);
 
 					// disable paste node
 					localStorage.removeItem("litegrapheditor_clipboard", null);
@@ -455,7 +456,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 		this.invalidateControl();
 
 		this.element.style.display = "block";
-		this.element.style.zIndex = 10001;
+		this.element.style.zIndex = 1099;
 		this.element.style.width = "500px";
 		this.element.style.height = "480px";
 	}
@@ -621,7 +622,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 				self.version_string.value = self.default_ver;
 			}
 			else {
-				alert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
+				customAlert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
 			}
 		};
 
@@ -677,7 +678,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 
 let orig_handleFile = app.handleFile;
 
-function handleFile(file) {
+async function handleFile(file) {
 	if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
 		const reader = new FileReader();
 		reader.onload = async () => {
@@ -690,7 +691,7 @@ function handleFile(file) {
 			}
 
 			if(is_component) {
-				handle_import_components(jsonContent);
+				await handle_import_components(jsonContent);
 			}
 			else {
 				orig_handleFile.call(app, file);
@@ -708,7 +709,7 @@ app.handleFile = handleFile;
 
 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/manager/component/policy')
+	api.fetchApi('/manager/policy/component')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }

js/custom-nodes-manager.css

@@ -0,0 +1,699 @@
+.cn-manager {
+	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	z-index: 1099;
+	width: 80%;
+	height: 80%;
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+	color: var(--fg-color);
+	font-family: arial, sans-serif;
+	text-underline-offset: 3px;
+	outline: none;
+}
+
+.cn-manager .cn-flex-auto {
+	flex: auto;
+}
+
+.cn-manager button {
+	font-size: 16px;
+	color: var(--input-text);
+	background-color: var(--comfy-input-bg);
+	border-radius: 8px;
+	border-color: var(--border-color);
+	border-style: solid;
+	margin: 0;
+	padding: 4px 8px;
+	min-width: 100px;
+}
+
+.cn-manager button:disabled,
+.cn-manager input:disabled,
+.cn-manager select:disabled {
+	color: gray;
+}
+
+.cn-manager button:disabled {
+	background-color: var(--comfy-input-bg);
+}
+
+.cn-manager .cn-manager-restart {
+	display: none;
+	background-color: #500000;
+	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;
+}
+
+.arrow-icon {
+	height: 1em;
+	width: 1em;
+	margin-right: 5px;
+	transform: translateY(2px);
+}
+
+.cn-icon {
+	display: block;
+	width: 16px;
+	height: 16px;
+}
+
+.cn-icon svg {
+	display: block;
+	margin: 0;
+	pointer-events: none;
+}
+
+.cn-manager-header {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 5px;
+	align-items: center;
+	padding: 0 5px;
+}
+
+.cn-manager-header label {
+	display: flex;
+	gap: 5px;
+	align-items: center;
+}
+
+.cn-manager-filter {
+	height: 28px;
+	line-height: 28px;
+}
+
+.cn-manager-keywords {
+	height: 28px;
+	line-height: 28px;
+	padding: 0 5px 0 26px;
+	background-size: 16px;
+	background-position: 5px center;
+	background-repeat: no-repeat;
+	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
+}
+
+.cn-manager-status {
+	padding-left: 10px;
+}
+
+.cn-manager-grid {
+	flex: auto;
+	border: 1px solid var(--border-color);
+	overflow: hidden;
+	position: relative;
+}
+
+.cn-manager-selection {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cn-manager-message {
+	position: relative;
+}
+
+.cn-manager-footer {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cn-manager-grid .tg-turbogrid {
+	font-family: var(--grid-font);
+	font-size: 15px;
+	background: var(--bg-color);
+}
+
+.cn-manager-grid .tg-turbogrid .tg-highlight::after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	content: "";
+	display: block;
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	background-color: #80bdff11;
+	pointer-events: none;
+}
+
+.cn-manager-grid .cn-pack-name a {
+	color: skyblue;
+	text-decoration: none;
+	word-break: break-word;
+}
+
+.cn-manager-grid .cn-pack-desc a {
+	color: #5555FF;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.cn-manager-grid .tg-cell a:hover {
+	text-decoration: underline;
+}
+
+.cn-manager-grid .cn-pack-version {
+	line-height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	height: 100%;
+	gap: 5px;
+}
+
+.cn-manager-grid .cn-pack-nodes {
+	line-height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	gap: 5px;
+	cursor: pointer;
+	height: 100%;
+}
+
+.cn-manager-grid .cn-pack-nodes:hover {
+	text-decoration: underline;
+}
+
+.cn-manager-grid .cn-pack-conflicts {
+	color: orange;
+}
+
+.cn-popover {
+	position: fixed;
+	z-index: 10000;
+	padding: 20px;
+	color: #1e1e1e;
+	filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
+	overflow: hidden;
+}
+
+.cn-flyover {
+	position: absolute;
+    top: 0;
+	right: 0;
+    z-index: 1000;
+    display: none;
+    width: 50%;
+    height: 100%;
+    background-color: var(--comfy-menu-bg);
+    animation-duration: 0.2s;
+    animation-fill-mode: both;
+	flex-direction: column;
+}
+
+.cn-flyover::before {
+    position: absolute;
+    top: 0;
+    content: "";
+    z-index: 10;
+    display: block;
+    width: 10px;
+    height: 100%;
+    pointer-events: none;
+	left: -10px;
+    background-image: linear-gradient(to left, rgb(0 0 0 / 20%), rgb(0 0 0 / 0%));
+}
+
+.cn-flyover-header {
+	height: 45px;
+	display: flex;
+	align-items: center;
+	gap: 5px;
+	border-bottom: 1px solid var(--border-color);
+}
+
+.cn-flyover-close {
+	display: flex;
+	align-items: center;
+	padding: 0 10px;
+	justify-content: center;
+	cursor: pointer;
+	opacity: 0.8;
+	height: 100%;
+}
+
+.cn-flyover-close:hover {
+	opacity: 1;
+}
+
+.cn-flyover-close svg {
+	display: block;
+	margin: 0;
+	pointer-events: none;
+	width: 20px;
+	height: 20px;
+}
+
+.cn-flyover-title {
+	display: flex;
+	align-items: center;
+	font-weight: bold;
+	gap: 10px;
+	flex: auto;
+}
+
+.cn-flyover-body {
+	height: calc(100% - 45px);
+	overflow-y: auto;
+	position: relative;
+	background-color: var(--comfy-menu-secondary-bg);
+}
+
+@keyframes cn-slide-in-right {
+    from {
+        visibility: visible;
+        transform: translate3d(100%, 0, 0);
+    }
+
+    to {
+        transform: translate3d(0, 0, 0);
+    }
+}
+
+.cn-slide-in-right {
+    animation-name: cn-slide-in-right;
+}
+
+@keyframes cn-slide-out-right {
+    from {
+        transform: translate3d(0, 0, 0);
+    }
+
+    to {
+        visibility: hidden;
+        transform: translate3d(100%, 0, 0);
+    }
+}
+
+.cn-slide-out-right {
+    animation-name: cn-slide-out-right;
+}
+
+.cn-nodes-list {
+	width: 100%;
+}
+
+.cn-nodes-row {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+}
+
+.cn-nodes-row:nth-child(odd) {
+	background-color: rgb(0 0 0 / 5%);
+}
+
+.cn-nodes-row:hover {
+    background-color: rgb(0 0 0 / 10%);
+}
+
+.cn-nodes-sn {
+	text-align: right;
+	min-width: 35px;
+	color: var(--drag-text);
+	flex-shrink: 0;
+	font-size: 12px;
+	padding: 8px 5px;
+}
+
+.cn-nodes-name {
+	cursor: pointer;
+	white-space: nowrap;
+	flex-shrink: 0;
+	position: relative;
+	padding: 8px 5px;
+}
+
+.cn-nodes-name::after {
+	content: attr(action);
+	position: absolute;
+	pointer-events: none;
+	top: 50%;
+	left: 100%;
+	transform: translate(5px, -50%);
+	font-size: 12px;
+	color: var(--drag-text);
+	background-color: var(--comfy-input-bg);
+	border-radius: 10px;
+	border: 1px solid var(--border-color);
+	padding: 3px 8px;
+	display: none;
+}
+
+.cn-nodes-name.action::after {
+	display: block;
+}
+
+.cn-nodes-name:hover {
+	text-decoration: underline;
+}
+
+.cn-nodes-conflict .cn-nodes-name,
+.cn-nodes-conflict .cn-icon {
+	color: orange;
+}
+
+.cn-conflicts-list {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 5px;
+	align-items: center;
+	padding: 5px 0;
+}
+
+.cn-conflicts-list b {
+	font-weight: normal;
+	color: var(--descrip-text);
+}
+
+.cn-nodes-pack {
+	cursor: pointer;
+	color: skyblue;
+}
+
+.cn-nodes-pack:hover {
+	text-decoration: underline;
+}
+
+.cn-pack-badge {
+	font-size: 12px;
+	font-weight: normal;
+	background-color: var(--comfy-input-bg);
+	border-radius: 10px;
+	border: 1px solid var(--border-color);
+	padding: 3px 8px;
+	color: var(--error-text);
+}
+
+.cn-preview {
+	min-width: 300px;
+	max-width: 500px;
+	min-height: 120px;
+	overflow: hidden;
+  	font-size: 12px;
+	pointer-events: none;
+	padding: 12px;
+	color: var(--fg-color);
+}
+
+.cn-preview-header {
+	display: flex;
+	gap: 8px;
+	align-items: center;
+	border-bottom: 1px solid var(--comfy-input-bg);
+	padding: 5px 10px;
+}
+
+.cn-preview-dot {
+	width: 8px;
+	height: 8px;
+	border-radius: 50%;
+	background-color: grey;
+	position: relative;
+	filter: drop-shadow(1px 2px 3px rgb(0 0 0 / 30%));
+}
+
+.cn-preview-dot.cn-preview-optional::after {
+	content: "";
+	position: absolute;
+	pointer-events: none;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	background-color: var(--comfy-input-bg);
+	border-radius: 50%;
+	width: 3px;
+  	height: 3px;
+}
+
+.cn-preview-dot.cn-preview-grid {
+	border-radius: 0;
+}
+
+.cn-preview-dot.cn-preview-grid::before {
+	content: '';
+	position: absolute;
+	border-left: 1px solid var(--comfy-input-bg);
+	border-right: 1px solid var(--comfy-input-bg);
+	width: 4px;
+	height: 100%;
+	left: 2px;
+	top: 0;
+	z-index: 1;
+}
+
+.cn-preview-dot.cn-preview-grid::after {
+	content: '';
+	position: absolute;
+	border-top: 1px solid var(--comfy-input-bg);
+	border-bottom: 1px solid var(--comfy-input-bg);
+	width: 100%;
+	height: 4px;
+	left: 0;
+	top: 2px;
+	z-index: 1;
+}
+
+.cn-preview-name {
+	flex: auto;
+	font-size: 14px;
+}
+
+.cn-preview-io {
+	display: flex;
+	justify-content: space-between;
+	padding: 10px 10px;
+}
+
+.cn-preview-column > div {
+	display: flex;
+	gap: 10px;
+	align-items: center;
+	height: 18px;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.cn-preview-input {
+	justify-content: flex-start;
+}
+
+.cn-preview-output {
+	justify-content: flex-end;
+}
+
+.cn-preview-list {
+	display: flex;
+	flex-direction: column;
+	gap: 3px;
+	padding: 0 10px 10px 10px;
+}
+
+.cn-preview-switch {
+	position: relative;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	background: var(--bg-color);
+	border: 2px solid var(--border-color);
+	border-radius: 10px;
+	text-wrap: nowrap;
+	padding: 2px 20px;
+	gap: 10px;
+}
+
+.cn-preview-switch::before,
+.cn-preview-switch::after {
+	position: absolute;
+	pointer-events: none;
+	top: 50%;
+	transform: translate(0, -50%);
+	color: var(--fg-color);
+	opacity: 0.8;
+}
+
+.cn-preview-switch::before {
+	content: "◀";
+	left: 5px;
+}
+
+.cn-preview-switch::after {
+	content: "▶";
+	right: 5px;
+}
+
+.cn-preview-value {
+	color: var(--descrip-text);
+}
+
+.cn-preview-string {
+	min-height: 30px;
+	max-height: 300px;
+	background: var(--bg-color);
+	color: var(--descrip-text);
+	border-radius: 3px;
+	padding: 3px 5px;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
+
+.cn-preview-description {
+	margin: 0px 10px 10px 10px;
+	padding: 6px;
+	background: var(--border-color);
+	color: var(--descrip-text);
+	border-radius: 5px;
+	font-style: italic;
+	word-break: break-word;
+}
+
+.cn-tag-list {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 5px;
+	align-items: center;
+	margin-bottom: 5px;
+}
+
+.cn-tag-list > div {
+	background-color: var(--border-color);
+	border-radius: 5px;
+	padding: 0 5px;
+}
+
+.cn-install-buttons {
+	display: flex;
+	flex-direction: column;
+	gap: 3px;
+	padding: 3px;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+}
+
+.cn-selected-buttons {
+	display: flex;
+	gap: 5px;
+	align-items: center;
+	padding-right: 20px;
+}
+
+.cn-manager .cn-btn-enable {
+	background-color: #333399;
+	color: white;
+}
+
+.cn-manager .cn-btn-disable {
+	background-color: #442277;
+	color: white;
+}
+
+.cn-manager .cn-btn-update {
+	background-color: #1155AA;
+	color: white;
+}
+
+.cn-manager .cn-btn-try-update {
+	background-color: Gray;
+	color: white;
+}
+
+.cn-manager .cn-btn-try-fix {
+	background-color: #6495ED;
+	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;
+}
+
+.cn-manager .cn-btn-try-install {
+	background-color: Gray;
+	color: white;
+}
+
+.cn-manager .cn-btn-uninstall {
+	background-color: #993333;
+	color: white;
+}
+
+.cn-manager .cn-btn-reinstall {
+	background-color: #993333;
+	color: white;
+}
+
+.cn-manager .cn-btn-switch {
+	background-color: #448833;
+	color: white;
+
+}
+
+@keyframes cn-btn-loading-bg {
+	0% {
+		left: 0;
+	}
+	100% {
+		left: -105px;
+	}
+}
+
+.cn-manager button.cn-btn-loading {
+	position: relative;
+	overflow: hidden;
+	border-color: rgb(0 119 207 / 80%);
+	background-color: var(--comfy-input-bg);
+}
+
+.cn-manager button.cn-btn-loading::after {
+	position: absolute;
+	top: 0;
+	left: 0;
+	content: "";
+	width: 500px;
+	height: 100%;
+	background-image: repeating-linear-gradient(
+		-45deg,
+		rgb(0 119 207 / 30%),
+		rgb(0 119 207 / 30%) 10px,
+		transparent 10px,
+		transparent 15px
+	);
+	animation: cn-btn-loading-bg 2s linear infinite;
+}
+
+.cn-manager-light .cn-pack-name a {
+	color: blue;
+}
+
+.cn-manager-light .cm-warn-note {
+	background-color: #ccc !important;
+}
+
+.cn-manager-light .cn-btn-install {
+	background-color: #333;
+}

js/model-manager.css

@@ -0,0 +1,213 @@
+.cmm-manager {
+	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	z-index: 1099;
+	width: 80%;
+	height: 80%;
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+	color: var(--fg-color);
+	font-family: arial, sans-serif;
+}
+
+.cmm-manager .cmm-flex-auto {
+	flex: auto;
+}
+
+.cmm-manager button {
+	font-size: 16px;
+	color: var(--input-text);
+    background-color: var(--comfy-input-bg);
+    border-radius: 8px;
+    border-color: var(--border-color);
+    border-style: solid;
+    margin: 0;
+	padding: 4px 8px;
+	min-width: 100px;
+}
+
+.cmm-manager button:disabled,
+.cmm-manager input:disabled,
+.cmm-manager select:disabled {
+	color: gray;
+}
+
+.cmm-manager button:disabled {
+	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;
+	gap: 5px;
+	align-items: center;
+	padding: 0 5px;
+}
+
+.cmm-manager-header label {
+	display: flex;
+	gap: 5px;
+	align-items: center;
+}
+
+.cmm-manager-type,
+.cmm-manager-base,
+.cmm-manager-filter {
+	height: 28px;
+	line-height: 28px;
+}
+
+.cmm-manager-keywords {
+	height: 28px;
+	line-height: 28px;
+	padding: 0 5px 0 26px;
+	background-size: 16px;
+	background-position: 5px center;
+	background-repeat: no-repeat;
+	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
+}
+
+.cmm-manager-status {
+	padding-left: 10px;
+}
+
+.cmm-manager-grid {
+	flex: auto;
+	border: 1px solid var(--border-color);
+	overflow: hidden;
+}
+
+.cmm-manager-selection {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cmm-manager-footer {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+	align-items: center;
+}
+
+.cmm-manager-grid .tg-turbogrid {
+	font-family: var(--grid-font);
+	font-size: 15px;
+	background: var(--bg-color);
+}
+
+.cmm-manager-grid .cmm-node-name a {
+	color: skyblue;
+	text-decoration: none;
+	word-break: break-word;
+}
+
+.cmm-manager-grid .cmm-node-desc a {
+	color: #5555FF;
+    font-weight: bold;
+	text-decoration: none;
+}
+
+.cmm-manager-grid .tg-cell a:hover {
+	text-decoration: underline;
+}
+
+.cmm-icon-passed {
+	width: 20px;
+	height: 20px;
+	position: absolute;
+	left: calc(50% - 10px);
+	top: calc(50% - 10px);
+}
+
+.cmm-manager .cmm-btn-enable {
+	background-color: blue;
+	color: white;
+}
+
+.cmm-manager .cmm-btn-disable {
+	background-color: MediumSlateBlue;
+	color: white;
+}
+
+.cmm-manager .cmm-btn-install {
+	background-color: black;
+	color: white;
+}
+
+.cmm-btn-download {
+	width: 18px;
+	height: 18px;
+	position: absolute;
+	left: calc(50% - 10px);
+	top: calc(50% - 10px);
+	cursor: pointer;
+	opacity: 0.8;
+	color: #fff;
+}
+
+.cmm-btn-download:hover {
+	opacity: 1;
+}
+
+.cmm-manager-light .cmm-btn-download {
+	color: #000;
+}
+
+@keyframes cmm-btn-loading-bg {
+    0% {
+        left: 0;
+    }
+    100% {
+        left: -105px;
+    }
+}
+
+.cmm-manager button.cmm-btn-loading {
+    position: relative;
+    overflow: hidden;
+    border-color: rgb(0 119 207 / 80%);
+	background-color: var(--comfy-input-bg);
+}
+
+.cmm-manager button.cmm-btn-loading::after {
+    position: absolute;
+    top: 0;
+    left: 0;
+    content: "";
+    width: 500px;
+    height: 100%;
+    background-image: repeating-linear-gradient(
+        -45deg,
+        rgb(0 119 207 / 30%),
+        rgb(0 119 207 / 30%) 10px,
+        transparent 10px,
+        transparent 15px
+    );
+    animation: cmm-btn-loading-bg 2s linear infinite;
+}
+
+.cmm-manager-light .cmm-node-name a {
+	color: blue;
+}
+
+.cmm-manager-light .cm-warn-note {
+	background-color: #ccc !important;
+}
+
+.cmm-manager-light .cmm-btn-install {
+	background-color: #333;
+}

js/model-manager.js

@@ -1,220 +1,18 @@
+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, loadCss
 } from  "./common.js";
+import { api } from "../../scripts/api.js";
 
 // https://cenfun.github.io/turbogrid/api.html
 import TG from "./turbogrid.esm.js";
 
-const pageCss = `
+loadCss("./model-manager.css");
-.cmm-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 10001;
-	width: 80%;
-	height: 80%;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-}
 
-.cmm-manager .cmm-flex-auto {
+const gridId = "model";
-	flex: auto;
-}
-
-.cmm-manager button {
-	font-size: 16px;
-	color: var(--input-text);
-    background-color: var(--comfy-input-bg);
-    border-radius: 8px;
-    border-color: var(--border-color);
-    border-style: solid;
-    margin: 0;
-	padding: 4px 8px;
-	min-width: 100px;
-}
-
-.cmm-manager button:disabled,
-.cmm-manager input:disabled,
-.cmm-manager select:disabled {
-	color: gray;
-}
-
-.cmm-manager button:disabled {
-	background-color: var(--comfy-input-bg);
-}
-
-.cmm-manager-header {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 0 5px;
-}
-
-.cmm-manager-header label {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-}
-
-.cmm-manager-type,
-.cmm-manager-base,
-.cmm-manager-filter {
-	height: 28px;
-	line-height: 28px;
-}
-
-.cmm-manager-keywords {
-	height: 28px;
-	line-height: 28px;
-	padding: 0 5px 0 26px;
-	background-size: 16px;
-	background-position: 5px center;
-	background-repeat: no-repeat;
-	background-image: url("data:image/svg+xml;charset=utf8,${encodeURIComponent(icons.search.replace("currentColor", "#888"))}");
-}
-
-.cmm-manager-status {
-	padding-left: 10px;
-}
-
-.cmm-manager-grid {
-	flex: auto;
-	border: 1px solid var(--border-color);
-	overflow: hidden;
-}
-
-.cmm-manager-selection {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cmm-manager-message {
-	
-}
-
-.cmm-manager-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.cmm-manager-grid .tg-turbogrid {
-	font-family: var(--grid-font);
-	font-size: 15px;
-	background: var(--bg-color);
-}
-
-.cmm-manager-grid .cmm-node-name a {
-	color: skyblue;
-	text-decoration: none;
-	word-break: break-word;
-}
-
-.cmm-manager-grid .cmm-node-desc a {
-	color: #5555FF;
-    font-weight: bold;
-	text-decoration: none;
-}
-
-.cmm-manager-grid .tg-cell a:hover {
-	text-decoration: underline;
-}
-
-.cmm-icon-passed {
-	width: 20px;
-	height: 20px;
-	position: absolute;
-	left: calc(50% - 10px);
-	top: calc(50% - 10px);
-}
-
-.cmm-manager .cmm-btn-enable {
-	background-color: blue;
-	color: white;
-}
-
-.cmm-manager .cmm-btn-disable {
-	background-color: MediumSlateBlue;
-	color: white;
-}
-
-.cmm-manager .cmm-btn-install {
-	background-color: black;
-	color: white;
-}
-
-.cmm-btn-download {
-	width: 18px;
-	height: 18px;
-	position: absolute;
-	left: calc(50% - 10px);
-	top: calc(50% - 10px);
-	cursor: pointer;
-	opacity: 0.8;
-	color: #fff;
-}
-
-.cmm-btn-download:hover {
-	opacity: 1;
-}
-
-.cmm-manager-light .cmm-btn-download {
-	color: #000;
-}
-
-@keyframes cmm-btn-loading-bg {
-    0% {
-        left: 0;
-    }
-    100% {
-        left: -105px;
-    }
-}
-
-.cmm-manager button.cmm-btn-loading {
-    position: relative;
-    overflow: hidden;
-    border-color: rgb(0 119 207 / 80%);
-	background-color: var(--comfy-input-bg);
-}
-
-.cmm-manager button.cmm-btn-loading::after {
-    position: absolute;
-    top: 0;
-    left: 0;
-    content: "";
-    width: 500px;
-    height: 100%;
-    background-image: repeating-linear-gradient(
-        -45deg,
-        rgb(0 119 207 / 30%),
-        rgb(0 119 207 / 30%) 10px,
-        transparent 10px,
-        transparent 15px
-    );
-    animation: cmm-btn-loading-bg 2s linear infinite;
-}
-
-.cmm-manager-light .cmm-node-name a {
-	color: blue;
-}
-
-.cmm-manager-light .cm-warn-note {
-	background-color: #ccc !important;
-}
-
-.cmm-manager-light .cmm-btn-install {
-	background-color: #333;
-}
-
-`;
 
 const pageHtml = `
 <div class="cmm-manager-header">
@@ -235,7 +33,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,17 +59,11 @@ export class ModelManager {
 		this.keywords = '';
 
 		this.init();
+
+		api.addEventListener("cm-queue-status", this.onQueueStatus);
 	}
 
 	init() {
-
-		if (!document.querySelector(`style[context="${this.id}"]`)) {
-			const $style = document.createElement("style");
-			$style.setAttribute("context", this.id);
-			$style.innerHTML = pageCss;
-			document.head.appendChild($style);
-		}
-
 		this.element = $el("div", {
 			parent: document.body,
 			className: "comfy-modal cmm-manager"
@@ -365,12 +164,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 +214,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;
@@ -518,7 +334,7 @@ export class ModelManager {
 			sortable: false,
 			align: 'center',
 			formatter: (url, rowItem, columnItem) => {
-				return `<a class="cmm-btn-download" title="Download file" href="${url}" target="_blank">${icons.download}</a>`;
+				return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
 			}
 		}, {
 			id: 'size',
@@ -553,6 +369,8 @@ export class ModelManager {
 			width: 200
 		}];
 
+		restoreColumnWidth(gridId, columns);
+
 		this.grid.setData({
 			options,
 			rows,
@@ -595,17 +413,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 +444,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) {
+				if(res.status == 403) {
-				errorMsg = `Install failed: ${item.name} ${res.error.message}`;
+					errorMsg += `This action is not allowed with this security level configuration.\n`;
-				break;;
+				} 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");
+//			self.grid.updateCell(item, "tg-column-select");
-			this.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) {
+		self.showRefresh();
-			this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "red")
+		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 +718,7 @@ export class ModelManager {
 	}
 
 	showLoading() {
-		this.setDisabled(true);
+//		this.setDisabled(true);
 		if (this.grid) {
 			this.grid.showLoading();
 			this.grid.showMask({
@@ -836,7 +728,7 @@ export class ModelManager {
 	}
 
 	hideLoading() {
-		this.setDisabled(false);
+//		this.setDisabled(false);
 		if (this.grid) {
 			this.grid.hideLoading();
 			this.grid.hideMask();
@@ -844,8 +736,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 +750,7 @@ export class ModelManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close;
+			return it !== $close && it !== $refresh && it !== $stop;
 		});
 		
 		list.forEach($elem => {
@@ -874,6 +767,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;

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({

js/popover-helper.js

@@ -0,0 +1,619 @@
+const hasOwn = function(obj, key) {
+    return Object.prototype.hasOwnProperty.call(obj, key);
+};
+
+const isNum = function(num) {
+    if (typeof num !== 'number' || isNaN(num)) {
+        return false;
+    }
+    const isInvalid = function(n) {
+        if (n === Number.MAX_VALUE || n === Number.MIN_VALUE || n === Number.NEGATIVE_INFINITY || n === Number.POSITIVE_INFINITY) {
+            return true;
+        }
+        return false;
+    };
+    if (isInvalid(num)) {
+        return false;
+    }
+    return true;
+};
+
+const toNum = (num) => {
+    if (typeof (num) !== 'number') {
+        num = parseFloat(num);
+    }
+    if (isNaN(num)) {
+        num = 0;
+    }
+    num = Math.round(num);
+    return num;
+};
+
+const clamp = function(value, min, max) {
+    return Math.max(min, Math.min(max, value));
+};
+
+const isWindow = (obj) => {
+    return Boolean(obj && obj === obj.window);
+};
+
+const isDocument = (obj) => {
+    return Boolean(obj && obj.nodeType === 9);
+};
+
+const isElement = (obj) => {
+    return Boolean(obj && obj.nodeType === 1);
+};
+
+// ===========================================================================================
+
+export const toRect = (obj) => {
+    if (obj) {
+        return {
+            left: toNum(obj.left || obj.x),
+            top: toNum(obj.top || obj.y),
+            width: toNum(obj.width),
+            height: toNum(obj.height)
+        };
+    }
+    return {
+        left: 0,
+        top: 0,
+        width: 0,
+        height: 0
+    };
+};
+
+export const getElement = (selector) => {
+    if (typeof selector === 'string' && selector) {
+        if (selector.startsWith('#')) {
+            return document.getElementById(selector.slice(1));
+        }
+        return document.querySelector(selector);
+    }
+
+    if (isDocument(selector)) {
+        return selector.body;
+    }
+    if (isElement(selector)) {
+        return selector;
+    }
+};
+
+export const getRect = (target, fixed) => {
+    if (!target) {
+        return toRect();
+    }
+
+    if (isWindow(target)) {
+        return {
+            left: 0,
+            top: 0,
+            width: window.innerWidth,
+            height: window.innerHeight
+        };
+    }
+
+    const elem = getElement(target);
+    if (!elem) {
+        return toRect(target);
+    }
+
+    const br = elem.getBoundingClientRect();
+    const rect = toRect(br);
+
+    // fix offset
+    if (!fixed) {
+        rect.left += window.scrollX;
+        rect.top += window.scrollY;
+    }
+
+    rect.width = elem.offsetWidth;
+    rect.height = elem.offsetHeight;
+
+    return rect;
+};
+
+// ===========================================================================================
+
+const calculators = {
+
+    bottom: (info, containerRect, targetRect) => {
+        info.space = containerRect.top + containerRect.height - targetRect.top - targetRect.height - info.height;
+        info.top = targetRect.top + targetRect.height;
+        info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
+    },
+
+    top: (info, containerRect, targetRect) => {
+        info.space = targetRect.top - info.height - containerRect.top;
+        info.top = targetRect.top - info.height;
+        info.left = Math.round(targetRect.left + targetRect.width * 0.5 - info.width * 0.5);
+    },
+
+    right: (info, containerRect, targetRect) => {
+        info.space = containerRect.left + containerRect.width - targetRect.left - targetRect.width - info.width;
+        info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
+        info.left = targetRect.left + targetRect.width;
+    },
+
+    left: (info, containerRect, targetRect) => {
+        info.space = targetRect.left - info.width - containerRect.left;
+        info.top = Math.round(targetRect.top + targetRect.height * 0.5 - info.height * 0.5);
+        info.left = targetRect.left - info.width;
+    }
+};
+
+// with order
+export const getDefaultPositions = () => {
+    return Object.keys(calculators);
+};
+
+const calculateSpace = (info, containerRect, targetRect) => {
+    const calculator = calculators[info.position];
+    calculator(info, containerRect, targetRect);
+    if (info.space >= 0) {
+        info.passed += 1;
+    }
+};
+
+// ===========================================================================================
+
+const calculateAlignOffset = (info, containerRect, targetRect, alignType, sizeType) => {
+
+    const popoverStart = info[alignType];
+    const popoverSize = info[sizeType];
+
+    const containerStart = containerRect[alignType];
+    const containerSize = containerRect[sizeType];
+
+    const targetStart = targetRect[alignType];
+    const targetSize = targetRect[sizeType];
+
+    const targetCenter = targetStart + targetSize * 0.5;
+
+    // size overflow
+    if (popoverSize > containerSize) {
+        const overflow = (popoverSize - containerSize) * 0.5;
+        info[alignType] = containerStart - overflow;
+        info.offset = targetCenter - containerStart + overflow;
+        return;
+    }
+
+    const space1 = popoverStart - containerStart;
+    const space2 = (containerStart + containerSize) - (popoverStart + popoverSize);
+
+    // both side passed, default to center
+    if (space1 >= 0 && space2 >= 0) {
+        if (info.passed) {
+            info.passed += 2;
+        }
+        info.offset = popoverSize * 0.5;
+        return;
+    }
+
+    // one side passed
+    if (info.passed) {
+        info.passed += 1;
+    }
+
+    if (space1 < 0) {
+        const min = containerStart;
+        info[alignType] = min;
+        info.offset = targetCenter - min;
+        return;
+    }
+
+    // space2 < 0
+    const max = containerStart + containerSize - popoverSize;
+    info[alignType] = max;
+    info.offset = targetCenter - max;
+
+};
+
+const calculateHV = (info, containerRect) => {
+    if (['top', 'bottom'].includes(info.position)) {
+        info.top = clamp(info.top, containerRect.top, containerRect.top + containerRect.height - info.height);
+        return ['left', 'width'];
+    }
+    info.left = clamp(info.left, containerRect.left, containerRect.left + containerRect.width - info.width);
+    return ['top', 'height'];
+};
+
+const calculateOffset = (info, containerRect, targetRect) => {
+
+    const [alignType, sizeType] = calculateHV(info, containerRect);
+
+    calculateAlignOffset(info, containerRect, targetRect, alignType, sizeType);
+
+    info.offset = clamp(info.offset, 0, info[sizeType]);
+
+};
+
+// ===========================================================================================
+
+const calculateDistance = (info, previousPositionInfo) => {
+    if (!previousPositionInfo) {
+        return;
+    }
+    // no change if position no change with previous
+    if (info.position === previousPositionInfo.position) {
+        return;
+    }
+    const ax = info.left + info.width * 0.5;
+    const ay = info.top + info.height * 0.5;
+    const bx = previousPositionInfo.left + previousPositionInfo.width * 0.5;
+    const by = previousPositionInfo.top + previousPositionInfo.height * 0.5;
+    const dx = Math.abs(ax - bx);
+    const dy = Math.abs(ay - by);
+    info.distance = Math.round(Math.sqrt(dx * dx + dy * dy));
+};
+
+// ===========================================================================================
+
+const calculatePositionInfo = (info, containerRect, targetRect, previousPositionInfo) => {
+    calculateSpace(info, containerRect, targetRect);
+    calculateOffset(info, containerRect, targetRect);
+    calculateDistance(info, previousPositionInfo);
+};
+
+// ===========================================================================================
+
+const calculateBestPosition = (containerRect, targetRect, infoMap, withOrder, previousPositionInfo) => {
+
+    // position space: +1
+    // align space:
+    //    two side passed: +2
+    //    one side passed: +1
+
+    const safePassed = 3;
+
+    if (previousPositionInfo) {
+        const prevInfo = infoMap[previousPositionInfo.position];
+        if (prevInfo) {
+            calculatePositionInfo(prevInfo, containerRect, targetRect);
+            if (prevInfo.passed >= safePassed) {
+                return prevInfo;
+            }
+            prevInfo.calculated = true;
+        }
+    }
+
+    const positionList = [];
+    Object.values(infoMap).forEach((info) => {
+        if (!info.calculated) {
+            calculatePositionInfo(info, containerRect, targetRect, previousPositionInfo);
+        }
+        positionList.push(info);
+    });
+
+    positionList.sort((a, b) => {
+        if (a.passed !== b.passed) {
+            return b.passed - a.passed;
+        }
+
+        if (withOrder && a.passed >= safePassed && b.passed >= safePassed) {
+            return a.index - b.index;
+        }
+
+        if (a.space !== b.space) {
+            return b.space - a.space;
+        }
+
+        return a.index - b.index;
+    });
+
+    // logTable(positionList);
+
+    return positionList[0];
+};
+
+// const logTable = (() => {
+//     let time_id;
+//     return (info) => {
+//         clearTimeout(time_id);
+//         time_id = setTimeout(() => {
+//             console.table(info);
+//         }, 10);
+//     };
+// })();
+
+// ===========================================================================================
+
+const getAllowPositions = (positions, defaultAllowPositions) => {
+    if (!positions) {
+        return;
+    }
+    if (Array.isArray(positions)) {
+        positions = positions.join(',');
+    }
+    positions = String(positions).split(',').map((it) => it.trim().toLowerCase()).filter((it) => it);
+    positions = positions.filter((it) => defaultAllowPositions.includes(it));
+    if (!positions.length) {
+        return;
+    }
+    return positions;
+};
+
+const isPositionChanged = (info, previousPositionInfo) => {
+    if (!previousPositionInfo) {
+        return true;
+    }
+
+    if (info.left !== previousPositionInfo.left) {
+        return true;
+    }
+
+    if (info.top !== previousPositionInfo.top) {
+        return true;
+    }
+
+    return false;
+};
+
+// ===========================================================================================
+
+// const log = (name, time) => {
+//     if (time > 0.1) {
+//         console.log(name, time);
+//     }
+// };
+
+export const getBestPosition = (containerRect, targetRect, popoverRect, positions, previousPositionInfo) => {
+
+    const defaultAllowPositions = getDefaultPositions();
+    let withOrder = true;
+    let allowPositions = getAllowPositions(positions, defaultAllowPositions);
+    if (!allowPositions) {
+        allowPositions = defaultAllowPositions;
+        withOrder = false;
+    }
+
+    // console.log('withOrder', withOrder);
+
+    // const start_time = performance.now();
+
+    const infoMap = {};
+    allowPositions.forEach((k, i) => {
+        infoMap[k] = {
+            position: k,
+            index: i,
+
+            top: 0,
+            left: 0,
+            width: popoverRect.width,
+            height: popoverRect.height,
+
+            space: 0,
+
+            offset: 0,
+            passed: 0,
+
+            distance: 0
+        };
+    });
+
+    // log('infoMap', performance.now() - start_time);
+
+
+    const bestPosition = calculateBestPosition(containerRect, targetRect, infoMap, withOrder, previousPositionInfo);
+
+    // check left/top
+    bestPosition.changed = isPositionChanged(bestPosition, previousPositionInfo);
+
+    return bestPosition;
+};
+
+// ===========================================================================================
+
+const getTemplatePath = (width, height, arrowOffset, arrowSize, borderRadius) => {
+    const p = (px, py) => {
+        return [px, py].join(',');
+    };
+
+    const px = function(num, alignEnd) {
+        const floor = Math.floor(num);
+        let n = num < floor + 0.5 ? floor + 0.5 : floor + 1.5;
+        if (alignEnd) {
+            n -= 1;
+        }
+        return n;
+    };
+
+    const pxe = function(num) {
+        return px(num, true);
+    };
+
+    const ls = [];
+
+    const innerLeft = px(arrowSize);
+    const innerRight = pxe(width - arrowSize);
+    arrowOffset = clamp(arrowOffset, innerLeft, innerRight);
+
+    const innerTop = px(arrowSize);
+    const innerBottom = pxe(height - arrowSize);
+
+    const startPoint = p(innerLeft, innerTop + borderRadius);
+    const arrowPoint = p(arrowOffset, 1);
+
+    const LT = p(innerLeft, innerTop);
+    const RT = p(innerRight, innerTop);
+
+    const AOT = p(arrowOffset - arrowSize, innerTop);
+    const RRT = p(innerRight - borderRadius, innerTop);
+
+    ls.push(`M${startPoint}`);
+    ls.push(`V${innerBottom - borderRadius}`);
+    ls.push(`Q${p(innerLeft, innerBottom)} ${p(innerLeft + borderRadius, innerBottom)}`);
+    ls.push(`H${innerRight - borderRadius}`);
+    ls.push(`Q${p(innerRight, innerBottom)} ${p(innerRight, innerBottom - borderRadius)}`);
+    ls.push(`V${innerTop + borderRadius}`);
+
+    if (arrowOffset < innerLeft + arrowSize + borderRadius) {
+        ls.push(`Q${RT} ${RRT}`);
+        ls.push(`H${arrowOffset + arrowSize}`);
+        ls.push(`L${arrowPoint}`);
+        if (arrowOffset < innerLeft + arrowSize) {
+            ls.push(`L${LT}`);
+            ls.push(`L${startPoint}`);
+        } else {
+            ls.push(`L${AOT}`);
+            ls.push(`Q${LT} ${startPoint}`);
+        }
+    } else if (arrowOffset > innerRight - arrowSize - borderRadius) {
+        if (arrowOffset > innerRight - arrowSize) {
+            ls.push(`L${RT}`);
+        } else {
+            ls.push(`Q${RT} ${p(arrowOffset + arrowSize, innerTop)}`);
+        }
+        ls.push(`L${arrowPoint}`);
+        ls.push(`L${AOT}`);
+        ls.push(`H${innerLeft + borderRadius}`);
+        ls.push(`Q${LT} ${startPoint}`);
+    } else {
+        ls.push(`Q${RT} ${RRT}`);
+        ls.push(`H${arrowOffset + arrowSize}`);
+        ls.push(`L${arrowPoint}`);
+        ls.push(`L${AOT}`);
+        ls.push(`H${innerLeft + borderRadius}`);
+        ls.push(`Q${LT} ${startPoint}`);
+    }
+    return ls.join('');
+};
+
+const getPathData = function(position, width, height, arrowOffset, arrowSize, borderRadius) {
+
+    const handlers = {
+
+        bottom: () => {
+            const d = getTemplatePath(width, height, arrowOffset, arrowSize, borderRadius);
+            return {
+                d,
+                transform: ''
+            };
+        },
+
+        top: () => {
+            const d = getTemplatePath(width, height, width - arrowOffset, arrowSize, borderRadius);
+            return {
+                d,
+                transform: `rotate(180,${width * 0.5},${height * 0.5})`
+            };
+        },
+
+        left: () => {
+            const d = getTemplatePath(height, width, arrowOffset, arrowSize, borderRadius);
+            const x = (width - height) * 0.5;
+            const y = (height - width) * 0.5;
+            return {
+                d,
+                transform: `translate(${x} ${y}) rotate(90,${height * 0.5},${width * 0.5})`
+            };
+        },
+
+        right: () => {
+            const d = getTemplatePath(height, width, height - arrowOffset, arrowSize, borderRadius);
+            const x = (width - height) * 0.5;
+            const y = (height - width) * 0.5;
+            return {
+                d,
+                transform: `translate(${x} ${y}) rotate(-90,${height * 0.5},${width * 0.5})`
+            };
+        }
+    };
+
+    return handlers[position]();
+};
+
+// ===========================================================================================
+
+// position style cache
+const styleCache = {
+    // position: '',
+    // top: {},
+    // bottom: {},
+    // left: {},
+    // right: {}
+};
+
+export const getPositionStyle = (info, options = {}) => {
+
+    const o = {
+        bgColor: '#fff',
+        borderColor: '#ccc',
+        borderRadius: 5,
+        arrowSize: 10
+    };
+    Object.keys(o).forEach((k) => {
+
+        if (hasOwn(options, k)) {
+            const d = o[k];
+            const v = options[k];
+
+            if (typeof d === 'string') {
+                // string
+                if (typeof v === 'string' && v) {
+                    o[k] = v;
+                }
+            } else {
+                // number
+                if (isNum(v) && v >= 0) {
+                    o[k] = v;
+                }
+
+            }
+
+        }
+    });
+
+    const key = [
+        info.width,
+        info.height,
+        info.offset,
+        o.arrowSize,
+        o.borderRadius,
+        o.bgColor,
+        o.borderColor
+    ].join('-');
+
+    const positionCache = styleCache[info.position];
+    if (positionCache && key === positionCache.key) {
+        const st = positionCache.style;
+        st.changed = styleCache.position !== info.position;
+        styleCache.position = info.position;
+        return st;
+    }
+
+    // console.log(options);
+
+    const data = getPathData(info.position, info.width, info.height, info.offset, o.arrowSize, o.borderRadius);
+    // console.log(data);
+
+    const viewBox = [0, 0, info.width, info.height].join(' ');
+    const svg = [
+        `<svg viewBox="${viewBox}" xmlns="http://www.w3.org/2000/svg">`,
+        `<path d="${data.d}" fill="${o.bgColor}" stroke="${o.borderColor}" transform="${data.transform}" />`,
+        '</svg>'
+    ].join('');
+
+    // console.log(svg);
+    const backgroundImage = `url("data:image/svg+xml;charset=utf8,${encodeURIComponent(svg)}")`;
+
+    const background = `${backgroundImage} center no-repeat`;
+
+    const padding = `${o.arrowSize + o.borderRadius}px`;
+
+    const style = {
+        background,
+        backgroundImage,
+        padding,
+        changed: true
+    };
+
+    styleCache.position = info.position;
+    styleCache[info.position] = {
+        key,
+        style
+    };
+
+    return style;
+};

js/snapshot.js

@@ -291,7 +291,7 @@ export class SnapshotManager extends ComfyDialog {
 		try {
 			this.invalidateControl();
 			this.element.style.display = "block";
-			this.element.style.zIndex = 10001;
+			this.element.style.zIndex = 1099;
 		}
 		catch(exception) {
 			app.ui.dialog.show(`Failed to get external model list. / ${exception}`);

js/workflow-metadata.js

@@ -3,12 +3,21 @@
  * - custom node pack version to all custom nodes used in the workflow
  *
  * Example metadata:
- "extra": {
+ * "nodes": {
-    "node_versions": {
+ *   "1": {
-      "comfy-core": "v0.3.8-4-g0b2eb7f",
+ *     type: "CheckpointLoaderSimple",
-      "comfyui-easy-use": "1.2.5"
+ *     ...
-    }
+ *     properties: {
-  },
+ *       cnr_id: "comfy-core",
+ *       version: "0.3.8",
+ *     },
+ *   },
+ * }
+ *
+ * @typedef {Object} NodeInfo
+ * @property {string} ver - Version (git hash or semantic version)
+ * @property {string} cnr_id - ComfyRegistry node ID
+ * @property {boolean} enabled - Whether the node is enabled
  */
 
 import { app } from "../../scripts/app.js";
@@ -17,67 +26,58 @@ 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
+   * Get the installed nodes info
-   * @returns {Promise<Record<string, string>>} The mapping from node name to version
+   * @returns {Promise<Record<string, NodeInfo>>} The mapping from node name to its info.
-   * version can either be a git commit hash or a semantic version such as "1.0.0"
+   * 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();
   }
 
-  /**
+  async init() {
-   * Get the node versions for the given graph
+    this.installedNodes = await this.getInstalledNodes();
-   * @param {LGraph} graph The graph to get the node versions for
+    this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
-   * @returns {Promise<Record<string, string>>} The mapping from node name to version
-   */
-  getGraphNodeVersions(graph) {
-    const nodeVersions = {};
-    for (const node of graph.nodes) {
-      const nodeData = node.constructor.nodeData;
-      // Frontend only nodes don't have nodeData
-      if (!nodeData) {
-        continue;
-      }
-      const modules = nodeData.python_module.split(".");
-
-      if (modules[0] === "custom_nodes") {
-        const nodePackageName = modules[1].split("@")[0];
-        const nodeVersion = this.installedNodeVersions[nodePackageName];
-        nodeVersions[nodePackageName] = nodeVersion;
-      } else if (["nodes", "comfy_extras"].includes(modules[0])) {
-        nodeVersions["comfy-core"] = this.comfyCoreVersion;
-      } else {
-        console.warn(`Unknown node source: ${nodeData.python_module}`);
-      }
-    }
-    return nodeVersions;
   }
 
-  async init() {
+  /**
-    const extension = this;
+   * Called when any node is created
-    this.installedNodeVersions = await this.getInstalledNodeVersions();
+   * @param {LGraphNode} node The newly created node
-    this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
+   */
+  nodeCreated(node) {
+    try {
+      // nodeData doesn't exist if node is missing or node is frontend only node
+      if (!node?.constructor?.nodeData?.python_module) return;
 
-    // Attach metadata when app.graphToPrompt is called.
+      const nodeProperties = (node.properties ??= {});
-    const originalSerialize = LGraph.prototype.serialize;
+      const modules = node.constructor.nodeData.python_module.split(".");
-    LGraph.prototype.serialize = function () {
+      const moduleType = modules[0];
-      const workflow = originalSerialize.apply(this, arguments);
 
-      // Add metadata to the workflow
+      if (moduleType === "custom_nodes") {
-      if (!workflow.extra) {
+        const nodePackageName = modules[1];
-        workflow.extra = {};
+        const { cnr_id, aux_id, ver } =
+          this.installedNodes[nodePackageName] ??
+          this.installedNodes[nodePackageName.toLowerCase()] ??
+          {};
+
+        if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
+        if (cnr_id) nodeProperties.cnr_id = cnr_id;
+        else nodeProperties.aux_id = aux_id;
+        if (ver) nodeProperties.ver = ver.trim();
+      } else if (["nodes", "comfy_extras"].includes(moduleType)) {
+        nodeProperties.cnr_id = "comfy-core";
+        nodeProperties.ver = this.comfyCoreVersion;
       }
-      const graph = this;
+    } catch (e) {
-      workflow.extra["node_versions"] = extension.getGraphNodeVersions(graph);
+      console.error(e);
-
+    }
-      return workflow;
-    };
   }
 }
 

node_db/forked/custom-node-list.json

@@ -1,5 +1,25 @@
 {
     "custom_nodes": [
+        {
+            "author": "SanDiegoDude",
+            "title": "ComfyUI-HiDream-Sampler [WIP]",
+            "reference": "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler",
+            "files": [
+                "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler"
+            ],
+            "install_type": "git-clone",
+            "description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "PramaLLC",
+            "title": "ComfyUI BEN - Background Erase Network",
+            "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",
@@ -119,6 +139,16 @@
             ],
             "install_type": "git-clone",
             "description": "A forked version of ComfyUI_ExtraModels. (modified by Efficient-Large-Model)"
+        },
+        {
+            "author": "Pablerdo",
+            "title": "ComfyUI-PSNodes",
+            "reference": "https://github.com/Pablerdo/ComfyUI-PSNodes",
+            "files": [
+                "https://github.com/Pablerdo/ComfyUI-PSNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
         }
     ]
 }

node_db/legacy/custom-node-list.json

@@ -8,9 +8,733 @@
             "install_type": "git-clone",
             "description": "If you see this message, your ComfyUI-Manager is outdated.\nLegacy channel provides only the list of the deprecated nodes. If you want to find the complete node list, please go to the Default channel."
         },
-        
 
         
+        {
+            "author": "myAiLemon",
+            "title": "MagicAutomaticPicture [REMOVED]",
+            "reference": "https://github.com/myAiLemon/MagicAutomaticPicture",
+            "files": [
+                "https://github.com/myAiLemon/MagicAutomaticPicture"
+            ],
+            "install_type": "git-clone",
+            "description": "A comfyui node package that can generate pictures and automatically save positive prompts and eliminate unwanted prompts"
+        },
+        {
+            "author": "thisiseddy-ab",
+            "title": "ComfyUI-Edins-Ultimate-Pack [REMOVED]",
+            "reference": "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack",
+            "files": [
+                "https://github.com/thisiseddy-ab/ComfyUI-Edins-Ultimate-Pack"
+            ],
+            "install_type": "git-clone",
+            "description": "Well i needet a Tiled Ksampler that still works for Comfy UI there were none so i made one, in this Package i will put all Nodes i will develop for Comfy Ui still in beta alot will change.."
+        },
+        {
+            "author": "Davros666",
+            "title": "safetriggers [REMOVED]",
+            "reference": "https://github.com/Davros666/safetriggers",
+            "files": [
+                "https://github.com/Davros666/safetriggers"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI Nodes for READING TRIGGERS, TRIGGER-WORDS, TRIGGER-PHRASES FROM LoRAs"
+        },
+        {
+            "author": "cubiq",
+            "title": "Simple Math [REMOVED]",
+            "id": "simplemath",
+            "reference": "https://github.com/cubiq/ComfyUI_SimpleMath",
+            "files": [
+                "https://github.com/cubiq/ComfyUI_SimpleMath"
+            ],
+            "install_type": "git-clone",
+            "description": "custom node for ComfyUI to perform simple math operations"
+        },
+        {
+            "author": "lucafoscili",
+            "title": "LF Nodes [DEPRECATED]",
+            "reference": "https://github.com/lucafoscili/comfyui-lf",
+            "files": [
+                "https://github.com/lucafoscili/comfyui-lf"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes with a touch of extra UX, including: history for primitives, JSON manipulation, logic switches with visual feedback, LLM chat... and more!"
+        },
+        {
+            "author": "AI2lab",
+            "title": "comfyUI-tool-2lab [REMOVED]",
+            "id": "tool-2lab",
+            "reference": "https://github.com/AI2lab/comfyUI-tool-2lab",
+            "files": [
+                "https://github.com/AI2lab/comfyUI-tool-2lab"
+            ],
+            "install_type": "git-clone",
+            "description": "tool set for developing workflow and publish to web api server"
+        },
+        {
+            "author": "AI2lab",
+            "title": "comfyUI-DeepSeek-2lab [REMOVED]",
+            "id": "deepseek",
+            "reference": "https://github.com/AI2lab/comfyUI-DeepSeek-2lab",
+            "files": [
+                "https://github.com/AI2lab/comfyUI-DeepSeek-2lab"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial implementation of DeepSeek for ComfyUI"
+        },
+        {
+            "author": "AI2lab",
+            "title": "comfyUI-kling-api-2lab [REMOVED]",
+            "reference": "https://github.com/AI2lab/comfyUI-kling-api-2lab",
+            "files": [
+                "https://github.com/AI2lab/comfyUI-kling-api-2lab"
+            ],
+            "install_type": "git-clone",
+            "description": "Unofficial implementation of KLing for ComfyUI"
+        },
+        {
+            "author": "ZhiHui6",
+            "title": "comfyui_zhihui_nodes [REMOVED]",
+            "reference": "https://github.com/ZhiHui6/comfyui_zhihui_nodes",
+            "files": [
+                "https://github.com/ZhiHui6/comfyui_zhihui_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Prompt Preset, Video Batch Loader, Video Combiner"
+        },
+        {
+            "author": "ImagineerNL",
+            "title": "comfyui_potrace_svg [REMOVED]",
+            "reference": "https://github.com/ImagineerNL/comfyui_potrace_svg",
+            "files": [
+                "https://github.com/ImagineerNL/comfyui_potrace_svg"
+            ],
+            "install_type": "git-clone",
+            "description": "This project converts raster images into SVG format using the Potrace library."
+        },
+        {
+            "author": "kayselmecnun",
+            "title": "ComfyUI-Qwen-25-VL [REMOVED]",
+            "reference": "https://github.com/kayselmecnun/ComfyUI-Qwen-25-VL",
+            "files": [
+                "https://github.com/kayselmecnun/ComfyUI-Qwen-25-VL"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom Comfy UI node for using Qwen2.5-VL-3B/7B-Instruct models"
+        },
+        {
+            "author": "IfnotFr",
+            "title": "⚡ ComfyUI Connect [REMOVED]",
+            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
+            "files": [
+                "https://github.com/IfnotFr/ComfyUI-Connect"
+            ],
+            "install_type": "git-clone",
+            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
+        },
+        {
+            "author": "ginlov",
+            "title": "segment_to_mask_comfyui [REMOVED]",
+            "reference": "https://github.com/ginlov/segment_to_mask_comfyui",
+            "files": [
+                "https://github.com/ginlov/segment_to_mask_comfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes:SegToMask"
+        },
+        {
+            "author": "TGu-97",
+            "title": "TGu Utilities [REMOVED]",
+            "id": "tgu",
+            "reference": "https://github.com/TGu-97/ComfyUI-TGu-utils",
+            "files": [
+                "https://github.com/TGu-97/ComfyUI-TGu-utils"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: MPN Switch, MPN Reroute, PN Switch. This is a set of custom nodes for ComfyUI. Mainly focus on control switches."
+        },
+        {
+            "author": "IfnotFr",
+            "title": "ComfyUI-Connect [REMOVED]",
+            "reference": "https://github.com/IfnotFr/ComfyUI-Connect",
+            "files": [
+                "https://github.com/IfnotFr/ComfyUI-Connect"
+            ],
+            "install_type": "git-clone",
+            "description": "Transform your ComfyUI into a powerful API, exposing all your saved workflows as ready-to-use HTTP endpoints."
+        },
+        {
+            "author": "KurtHokke",
+            "title": "ComfyUI_KurtHokke-Nodes [REMOVED]",
+            "reference": "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes",
+            "files": [
+                "https://github.com/KurtHokke/ComfyUI_KurtHokke-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI_KurtHokke-Nodes"
+        },
+        {
+            "author": "SpatialDeploy",
+            "title": "ComfyUI-Voxels [REMOVED]",
+            "reference": "https://github.com/SpatialDeploy/ComfyUI-Voxels",
+            "files": [
+                "https://github.com/SpatialDeploy/ComfyUI-Voxels"
+            ],
+            "install_type": "git-clone",
+            "description": "Tools for creating voxel based videos"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-group-selection [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-group-selection",
+            "files": [
+                "https://github.com/shinich39/comfyui-group-selection"
+            ],
+            "install_type": "git-clone",
+            "description": "Create a new group of nodes."
+        },
+        {
+            "author": "shinich39",
+            "title": "connect-from-afar [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-connect-from-afar",
+            "files": [
+                "https://github.com/shinich39/comfyui-connect-from-afar"
+            ],
+            "install_type": "git-clone",
+            "description": "Connect a new link from out of screen."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-local-db [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-local-db",
+            "files": [
+                "https://github.com/shinich39/comfyui-local-db"
+            ],
+            "install_type": "git-clone",
+            "description": "Store text to Key-Values pair json."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-model-db [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-model-db",
+            "files": [
+                "https://github.com/shinich39/comfyui-model-db"
+            ],
+            "install_type": "git-clone",
+            "description": "Store settings by model."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-target-search [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-target-search",
+            "files": [
+                "https://github.com/shinich39/comfyui-target-search"
+            ],
+            "install_type": "git-clone",
+            "description": "Move canvas to target on dragging connection."
+        },
+        {
+            "author": "chrisgoringe",
+            "title": "Image chooser [DEPRECATED]",
+            "id": "image-chooser",
+            "reference": "https://github.com/chrisgoringe/cg-image-picker",
+            "files": [
+                "https://github.com/chrisgoringe/cg-image-picker"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom node that pauses the flow while you choose which image (or latent) to pass on to the rest of the workflow."
+        },
+        {
+            "author": "weilin9999",
+            "title": "WeiLin-ComfyUI-prompt-all-in-one [DEPRECATED]",
+            "id": "prompt-all-in-one",
+            "reference": "https://github.com/weilin9999/WeiLin-ComfyUI-prompt-all-in-one",
+            "files": [
+                "https://github.com/weilin9999/WeiLin-ComfyUI-prompt-all-in-one"
+            ],
+            "install_type": "git-clone",
+            "description": "Write prompt words like WebUI"
+        },
+        {
+            "author": "svetozarov",
+            "title": "AS_GeminiCaptioning Node [REMOVED]",
+            "reference": "https://github.com/svetozarov/AS_GeminiCaptioning",
+            "files": [
+                "https://github.com/svetozarov/AS_GeminiCaptioning"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI node that combines an image with simple text parameters to create a prompt, sends it to the Google Gemini API via the google-generativeai SDK, and returns the generated text response along with the original prompt and an execution log"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-load-image-in-seq [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-load-image-in-seq",
+            "files": [
+                "https://github.com/shinich39/comfyui-load-image-in-seq"
+            ],
+            "install_type": "git-clone",
+            "description": "This node is load png image sequentially with metadata. Only supported for PNG format that has been created by ComfyUI.[w/renamed from comfyui-load-image-39. You need to remove previous one and reinstall to this.]"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-model-metadata [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-model-metadata",
+            "files": [
+                "https://github.com/shinich39/comfyui-model-metadata"
+            ],
+            "install_type": "git-clone",
+            "description": "Print model metadata on note node"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-view-recommendations [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-view-recommendations",
+            "files": [
+                "https://github.com/shinich39/comfyui-view-recommendations"
+            ],
+            "install_type": "git-clone",
+            "description": "Load model generation data from civitai."
+        },
+        {
+            "author": "jonstreeter",
+            "title": "Comfyui-PySceneDetect [REMOVED]",
+            "reference": "https://github.com/jonstreeter/Comfyui-PySceneDetect",
+            "files": [
+                "https://github.com/jonstreeter/Comfyui-PySceneDetect"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: PySceneDetect Video Processor"
+        },
+        {
+            "author": "muxueChen",
+            "title": "ComfyUI-NTQwen25-VL [REMOVED]",
+            "reference": "https://github.com/muxueChen/ComfyUI-NTQwen25-VL",
+            "files": [
+                "https://github.com/muxueChen/ComfyUI-NTQwen25-VL"
+            ],
+            "install_type": "git-clone",
+            "description": "Qwen25-VL is a plugin for ComfyU"
+        },
+        {
+            "author": "Makki_Shizu",
+            "title": "ComfyUI-SaveAnimatedGIF [DEPRECATED]",
+            "id": "SaveAnimatedGIF",
+            "reference": "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF",
+            "files": [
+                "https://github.com/MakkiShizu/ComfyUI-SaveAnimatedGIF"
+            ],
+            "install_type": "git-clone",
+            "description": "Save animated GIF format nodes in ComfyUI"
+        },
+        {
+            "author": "l1yongch1",
+            "title": "ComfyUI_PhiCaption [REMOVED]",
+            "reference": "https://github.com/l1yongch1/ComfyUI_PhiCaption",
+            "files": [
+                "https://github.com/l1yongch1/ComfyUI_PhiCaption"
+            ],
+            "install_type": "git-clone",
+            "description": "In addition to achieving conventional single-image, single-round reverse engineering, it can also achieve single-image multi-round and multi-image single-round reverse engineering. Moreover, the Phi model has a better understanding of prompts."
+        },
+        {
+            "author": "nova-florealis",
+            "title": "comfyui-alien [REMOVED]",
+            "reference": "https://github.com/nova-florealis/comfyui-alien",
+            "files": [
+                "https://github.com/nova-florealis/comfyui-alien"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Text to Text (LLM), Text Output, Convert to Markdown, List Display (Debug)"
+        },
+        {
+            "author": "PluMaZero",
+            "title": "ComfyUI-SpaceFlower [REMOVED]",
+            "reference": "https://github.com/PluMaZero/ComfyUI-SpaceFlower",
+            "files": [
+                "https://github.com/PluMaZero/ComfyUI-SpaceFlower"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes: SpaceFlower_Prompt, SpaceFlower_HangulPrompt, ..."
+        },
+        {
+            "author": "vahidzxc",
+            "title": "ComfyUI-My-Handy-Nodes [REMOVED]",
+            "reference": "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes",
+            "files": [
+                "https://github.com/vahidzxc/ComfyUI-My-Handy-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:VahCropImage"
+        },
+        {
+            "author": "Samulebotin",
+            "title": "ComfyUI-FreeVC_wrapper [REMOVED]",
+            "reference": "https://github.com/Samulebotin/ComfyUI-FreeVC_wrapper",
+            "files": [
+                "https://github.com/Samulebotin/ComfyUI-FreeVC_wrapper"
+            ],
+            "install_type": "git-clone",
+            "description": "A voice conversion extension node for ComfyUI based on FreeVC, enabling high-quality voice conversion capabilities within the ComfyUI framework."
+        },
+        {
+            "author": "GoingAI1998",
+            "title": "ComfyUI Web Canvas Node [REMOVED]",
+            "reference": "https://github.com/GoingAI1998/Comfyui_imgcanvas",
+            "files": [
+                "https://github.com/GoingAI1998/Comfyui_imgcanvas"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI_imgcanvas At present, I have not used the useful comfyui custom node about layer mixing, and I have written a comfyui runtime automatic pop-up window for layer editing node"
+        },
+        {
+            "author": "807502278",
+            "title": "ComfyUI_TensorRT_Merge [REMOVED]",
+            "reference": "https://github.com/807502278/ComfyUI_TensorRT_Merge",
+            "files": [
+                "https://github.com/807502278/ComfyUI_TensorRT_Merge"
+            ],
+            "install_type": "git-clone",
+            "description": "Non diffusion models supported by TensorRT, merged Comfyui plugin, added onnx automatic download and trt model conversion nodes."
+        },
+        {
+            "author": "logtd",
+            "title": "ComfyUI-LTXTricks [DEPRECATED]",
+            "reference": "https://github.com/logtd/ComfyUI-LTXTricks",
+            "files": [
+                "https://github.com/logtd/ComfyUI-LTXTricks"
+            ],
+            "install_type": "git-clone",
+            "description": "A set of nodes that provide additional controls for the LTX Video model"
+        },
+        {
+            "author": "JichaoLiang",
+            "title": "Immortal_comfyUI [REMOVED]",
+            "reference": "https://github.com/JichaoLiang/Immortal_comfyUI",
+            "files": [
+                "https://github.com/JichaoLiang/Immortal_comfyUI"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:ImNewNode, ImAppendNode, MergeNode, SetProperties, SaveToDirectory, batchNodes, redirectToNode, SetEvent, ..."
+        },
+        {
+            "author": "Rvage0815",
+            "title": "ComfyUI-RvTools [REMOVED]",
+            "reference": "https://github.com/Rvage0815/ComfyUI-RvTools",
+            "files": [
+                "https://github.com/Rvage0815/ComfyUI-RvTools"
+            ],
+            "install_type": "git-clone",
+            "description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
+        },
+        {
+            "author": "Rvage0815",
+            "title": "RvTComfyUI-RvTools_v2 [REMOVED]",
+            "reference": "https://github.com/Rvage0815/ComfyUI-RvTools_v2",
+            "files": [
+                "https://github.com/Rvage0815/ComfyUI-RvTools_v2"
+            ],
+            "install_type": "git-clone",
+            "description": "this node contains a lot of small little helpers like switches, passers and selectors that i use a lot to build my workflows."
+        },
+        {
+            "author": "scottmudge",
+            "title": "ComfyUI_BiscuitNodes [REMOVED]",
+            "reference": "https://github.com/scottmudge/ComfyUI_BiscuitNodes",
+            "files": [
+                "https://github.com/scottmudge/ComfyUI_BiscuitNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Load Image From Path Using File Selector"
+        },
+        {
+            "author": "thanhduong0213929",
+            "title": "ComfyUI-DeepUnlock [REMOVED]",
+            "reference": "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock",
+            "files": [
+                "https://github.com/thanhduong0213929/ComfyUI-DeepUnlock"
+            ],
+            "install_type": "git-clone",
+            "description": "DeepFuze is a state-of-the-art deep learning tool that seamlessly integrates with ComfyUI to revolutionize facial transformations, lipsyncing, video generation, voice cloning, face swapping, and lipsync translation. Leveraging advanced algorithms, DeepFuze enables users to combine audio and video with unparalleled realism, ensuring perfectly synchronized facial movements. This innovative solution is ideal for content creators, animators, developers, and anyone seeking to elevate their video editing projects with sophisticated AI-driven features."
+        },
+        {
+            "author": "pathway8-sudo",
+            "title": "RMBG [REMOVED]",
+            "reference": "https://github.com/pathway8-sudo/RMBG",
+            "files": [
+                "https://github.com/pathway8-sudo/RMBG"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository provides a custom node for ComfyUI, leveraging the BriaRMBG model to remove backgrounds from images and output a transparent PNG."
+        },
+        {
+            "author": "iris-Neko",
+            "title": "ComfyUI_ascii_art [REMOVED]",
+            "reference": "https://github.com/iris-Neko/ComfyUI_ascii_art",
+            "files": [
+                "https://github.com/iris-Neko/ComfyUI_ascii_art"
+             ],
+             "install_type": "git-clone",
+             "description": "ComfyUI node for [a/ASCII art controlnet](https://civitai.com/models/986392)"
+        },
+        {
+            "author": "apesplat",
+            "title": "ezXY scripts and nodes [NOT MAINTAINED]",
+            "id": "ezxy",
+            "reference": "https://github.com/GMapeSplat/ComfyUI_ezXY",
+            "files": [
+                "https://github.com/GMapeSplat/ComfyUI_ezXY"
+            ],
+            "install_type": "git-clone",
+            "description": "Extensions/Patches: Enables linking float and integer inputs and ouputs. Values are automatically cast to the correct type and clamped to the correct range. Works with both builtin and custom nodes.[w/NOTE: This repo patches ComfyUI's validate_inputs and map_node_over_list functions while running. May break depending on your version of ComfyUI. Can be deactivated in config.yaml.]Nodes: A collection of nodes for facilitating the generation of XY plots. Capable of plotting changes over most primitive values.[w/Does not work with current version of Comfyui]"
+        },
+        {
+            "author": "mie",
+            "title": "ComfyUI_JanusProCaption [REMOVED]",
+            "reference": "https://github.com/MieMieeeee/ComfyUI-JanusProCaption",
+            "files": [
+                "https://github.com/MieMieeeee/ComfyUI-JanusProCaption"
+            ],
+            "install_type": "git-clone",
+            "description": "Describe image or create caption files using Janus Pro Model"
+        },
+        {
+            "author": "Njbx",
+            "title": "ComfyUI-blockswap [REMOVED]",
+            "reference": "https://github.com/Njbx/ComfyUI-blockswap",
+            "files": [
+                "https://github.com/Njbx/ComfyUI-blockswap"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Block Swap"
+        },
+        {
+            "author": "T8star1984",
+            "title": "comfyui-purgevram [REMOVED]",
+            "reference": "https://github.com/T8star1984/comfyui-purgevram",
+            "files": [
+                "https://github.com/T8star1984/comfyui-purgevram"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES:PurgeVRAM.\nCan be added after any node to clean up vram and memory"
+        },
+        {
+            "author": "zmwv823",
+            "title": "ComfyUI-VideoDiffusion [REMOVED]",
+            "reference": "https://github.com/zmwv823/ComfyUI-VideoDiffusion",
+            "files": [
+                "https://github.com/zmwv823/ComfyUI-VideoDiffusion"
+            ],
+            "install_type": "git-clone",
+            "description": "[a/LatentSync](https://github.com/bytedance/LatentSync) and [a/Sonic](https://github.com/jixiaozhong/Sonic). [w/Just for study purpose. It's not for directly use, u should know how to fix issues.]"
+        },
+        {
+            "author": "NyaamZ",
+            "title": "Get Booru Tag ExtendeD [REMOVED]",
+            "reference": "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED",
+            "files": [
+               "https://github.com/NyaamZ/ComfyUI-GetBooruTag-ED"
+            ],
+            "description": "Get tag from Booru site.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "lingha",
+            "title": "comfyui_kj [REMOVED]",
+            "id": "comfyui_kj",
+            "reference": "https://github.com/XieChengYuan/comfyui_kj",
+            "files": [
+                "https://github.com/XieChengYuan/comfyui_kj"
+            ],
+            "install_type": "git-clone",
+            "description": "comfyui_kj, A tool that can package workflows into projects and publish them to a WeChat Mini Program named Kaji, allowing charges to be collected from users."
+        },
+        {
+            "author": "myAiLemon",
+            "title": "MagicGetPromptAutomatically [REMOVED]",
+            "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]",
+            "reference": "https://github.com/daqingliu/ComfyUI-SaveImageOSS",
+            "files": [
+                "https://github.com/daqingliu/ComfyUI-SaveImageOSS"
+            ],
+            "install_type": "git-clone",
+            "description": "Save images directly to URL, e.g., OSS. Just input the url in the text box!"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-textarea-keybindings [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-textarea-keybindings",
+            "files": [
+                "https://github.com/shinich39/comfyui-textarea-keybindings"
+            ],
+            "install_type": "git-clone",
+            "description": "Add keybindings to textarea."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-load-image-with-cmd [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-load-image-with-cmd",
+            "files": [
+                "https://github.com/shinich39/comfyui-load-image-with-cmd"
+            ],
+            "install_type": "git-clone",
+            "description": "Load image and partially workflow with javascript."
+        },
+        {
+            "author": "neuratech-ai",
+            "title": "ComfyUI-MultiGPU [NOT MAINTAINED]",
+            "reference": "https://github.com/neuratech-ai/ComfyUI-MultiGPU",
+            "files": [
+                "https://github.com/neuratech-ai/ComfyUI-MultiGPU"
+            ],
+            "install_type": "git-clone",
+            "description": "Experimental nodes for using multiple GPUs in a single ComfyUI workflow.\nThis extension adds new nodes for model loading that allow you to specify the GPU to use for each model. It monkey patches the memory management of ComfyUI in a hacky way and is neither a comprehensive solution nor a well-tested one. Use at your own risk.\nNote that this does not add parallelism. The workflow steps are still executed sequentially just on different GPUs. Any potential speedup comes from not having to constantly load and unload models from VRAM."
+        },
         {
             "author": "jefferyharrell",
             "title": "ComfyUI-JHXMP [REMOVED]",
@@ -563,17 +1287,6 @@
             "install_type": "git-clone",
             "description": "Some simple string tools to modify text and strings in ComfyUI."
         },
-        {
-            "author": "zmwv823",
-            "title": "ComfyUI-AnyText [DEPRECATED]",
-            "id": "anytext",
-            "reference": "https://github.com/zmwv823/ComfyUI-AnyText",
-            "files": [
-                "https://github.com/zmwv823/ComfyUI-AnyText"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial Simple And Rough Implementation Of [a/AnyText](https://github.com/tyxsspa/AnyText)"
-        },
         {
             "author": "Millyarde",
             "title": "Pomfy - Photoshop and ComfyUI 2-way sync [REMOVED]",

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

node_db/tutorial/custom-node-list.json

@@ -240,6 +240,87 @@
             ],
             "install_type": "git-clone",
             "description": "RAG Demo for LLM"
+        },
+        {
+            "author": "FelixTeutsch",
+            "title": "BachelorThesis",
+            "reference": "https://github.com/FelixTeutsch/BachelorThesis",
+            "files": [
+                "https://github.com/FelixTeutsch/BachelorThesis"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a ComfyUi custom node, that build a new UI on top of the already existing AI, to enable the use of custom controllers"
+        },
+        {
+            "author": "jhj0517",
+            "title": "ComfyUI-CustomNodes-Template",
+            "reference": "https://github.com/jhj0517/ComfyUI-CustomNodes-Template",
+            "files": [
+                "https://github.com/jhj0517/ComfyUI-CustomNodes-Template"
+            ],
+            "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"
+        },
+        {
+            "author": "xhiroga",
+            "title": "ComfyUI-TypeScript-CustomNode",
+            "reference": "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode",
+            "files": [
+                "https://github.com/xhiroga/ComfyUI-TypeScript-CustomNode"
+            ],
+            "install_type": "git-clone",
+            "description": "This project is generated from xhiroga/ComfyUI-TypeScript-CustomNode"
+        },
+        {
+            "author": "zentrocdot",
+            "title": "ComfyUI-Turtle_Graphics_Demos",
+            "reference": "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo",
+            "files": [
+                "https://github.com/zentrocdot/ComfyUI-Turtle_Graphics_Demo"
+            ],
+            "description": "ComfyUI node for creating some Turtle Graphic demos.", 
+            "install_type": "git-clone"
+        },
+        {
+            "author": "cozy-comfyui",
+            "title": "cozy_ex_dynamic",
+            "reference": "https://github.com/cozy-comfyui/cozy_ex_dynamic",
+            "files": [
+                "https://github.com/cozy-comfyui/cozy_ex_dynamic"
+            ],
+            "description": "Dynamic Node examples for ComfyUI",
+            "install_type": "git-clone"
         }
     ]
 }

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",

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.24>=1.18": "numpy==1.26.4",
-    "numpy>=1.18.5, <1.25.0": "numpy",
+    "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",

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.24>=1.18": "numpy==1.26.4",
-    "numpy>=1.18.5, <1.25.0": "numpy",
+    "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",

prestartup_script.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 import sys
 import atexit
@@ -9,6 +10,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,12 +19,28 @@ import security_check
 import manager_util
 import cm_global
 import manager_downloader
-from datetime import datetime
 import folder_paths
 
+manager_util.add_python_path_to_env()
+
+import datetime as dt
+
+if hasattr(dt, 'datetime'):
+    from datetime import datetime as dt_datetime
+    
+    def current_timestamp():
+        return dt_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: '{dt.__file__}'")
+    
+    def current_timestamp():
+        return str(time.time()).split('.')[0]
+
 security_check.security_check()
 
-cm_global.pip_blacklist = ['torch', 'torchsde', 'torchvision']
+cm_global.pip_blacklist = {'torch', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
 
 
@@ -46,27 +64,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)
@@ -78,18 +88,52 @@ comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
 manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
 manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
 restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
+manager_config_path = os.path.join(manager_files_path, 'config.ini')
 
-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(strict=False)
+        config.read(manager_config_path)
+        default_conf = config['default']
+    except Exception:
+        pass
+
+def read_uv_mode():
+    if 'use_uv' in default_conf:
+        manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
+
+def check_file_logging():
+    global enable_file_logging
+    if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
+        enable_file_logging = False
+
+
+read_config()
+read_uv_mode()
+check_file_logging()
+
+cm_global.pip_overrides = {'numpy': 'numpy<2'}
 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)
         cm_global.pip_overrides['numpy'] = 'numpy<2'
-        cm_global.pip_overrides['ultralytics'] = 'ultralytics==8.3.40'  # for security
+
+
+if os.path.exists(manager_pip_blacklist_path):
+    with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+        for x in f.readlines():
+            y = x.strip()
+            if y != '':
+                cm_global.pip_blacklist.add(y)
 
 
 def remap_pip_package(pkg):
@@ -137,6 +181,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 +239,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 +305,16 @@ try:
                 if match:
                     import_failed_extensions.add(match.group(1).strip())
 
-                if 'Starting server' in message:
+                if not self.is_stdout:
-                    is_start_mode = False
+                    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 +333,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 +399,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())
 
@@ -316,34 +435,44 @@ except Exception as e:
     print(f"[ComfyUI-Manager] Logging failed: {e}")
 
 
-try:
+def ensure_dependencies():
-    import git  # 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])
+        import git     # noqa: F401
-    except subprocess.CalledProcessError:
+        import toml    # noqa: F401
-        print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+        import rich    # noqa: F401
+        import chardet # noqa: F401
+    except ModuleNotFoundError:
+        my_path = os.path.dirname(__file__)
+        requirements_path = os.path.join(my_path, "requirements.txt")
+
+        print("## ComfyUI-Manager: installing dependencies. (GitPython)")
         try:
-            result = subprocess.check_output([sys.executable, '-s', '-m', 'pip', 'install', '--user', '-r', requirements_path])
+            subprocess.check_output(manager_util.make_pip_cmd(['install', '-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)")
+            print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
+            try:
+                subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
+            except subprocess.CalledProcessError:
+                print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
 
-try:
+    try:
-    print("## ComfyUI-Manager: installing dependencies done.")
+        print("## ComfyUI-Manager: installing dependencies done.")
-except:
+    except:
-    # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
+        # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
-    print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+        print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
+
+ensure_dependencies()
 
 
-print("** ComfyUI startup time:", 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 +482,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,27 +496,20 @@ 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()
 
 
 # Perform install
 processed_install = set()
 script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
-pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages())
+pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
 
 
 def is_installed(name):
@@ -402,7 +518,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 +533,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 +552,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 +590,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)
@@ -491,17 +616,18 @@ def execute_lazy_install_script(repo_path, executable):
 
     if os.path.exists(requirements_path):
         print(f"Install: pip packages for '{repo_path}'")
-        with open(requirements_path, "r") as requirements_file:
-            for line in requirements_file:
-                package_name = remap_pip_package(line.strip())
-                if package_name and not is_installed(package_name):
-                    if '--index-url' in package_name:
-                        s = package_name.split('--index-url')
-                        install_cmd = [sys.executable, "-m", "pip", "install", s[0].strip(), '--index-url', s[1].strip()]
-                    else:
-                        install_cmd = [sys.executable, "-m", "pip", "install", package_name]
 
-                    process_wrap(install_cmd, repo_path)
+        lines = manager_util.robust_readlines(requirements_path)
+        for line in lines:
+            package_name = remap_pip_package(line.strip())
+            if package_name and not is_installed(package_name):
+                if '--index-url' in package_name:
+                    s = package_name.split('--index-url')
+                    install_cmd = manager_util.make_pip_cmd(["install", s[0].strip(), '--index-url', s[1].strip()])
+                else:
+                    install_cmd = manager_util.make_pip_cmd(["install", package_name])
+
+                process_wrap(install_cmd, repo_path)
 
     if os.path.exists(install_script_path) and f'{repo_path}/install.py' not in processed_install:
         processed_install.add(f'{repo_path}/install.py')
@@ -509,7 +635,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)
 
 
@@ -564,19 +691,43 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
         file.write('\n'.join(list(extracted)))
 
 
-def execute_migration(moves):
+script_executed = False
-    import shutil
-    for x in moves:
-        if os.path.exists(x[0]) and not os.path.exists(x[1]):
-            shutil.move(x[0], x[1])
-            print(f"[ComfyUI-Manager] MIGRATION: '{x[0]}' -> '{x[1]}'")
 
-
+def execute_startup_script():
-# Check if script_list_path exists
+    global script_executed
-if os.path.exists(script_list_path):
     print("\n#######################################################################")
     print("[ComfyUI-Manager] Starting dependency installation/(de)activation for the extension\n")
 
+    custom_nodelist_cache = None
+
+    def get_custom_node_paths():
+        nonlocal custom_nodelist_cache
+        if custom_nodelist_cache is None:
+            custom_nodelist_cache = set()
+            for base in folder_paths.get_folder_paths('custom_nodes'):
+                for x in os.listdir(base):
+                    fullpath = os.path.join(base, x)
+                    if os.path.isdir(fullpath):
+                        custom_nodelist_cache.add(fullpath)
+
+        return custom_nodelist_cache
+
+    def execute_lazy_delete(path):
+        # Validate to prevent arbitrary paths from being deleted
+        if path not in get_custom_node_paths():
+            logging.error(f"## ComfyUI-Manager: The scheduled '{path}' is not a custom node path, so the deletion has been canceled.")
+            return
+
+        if not os.path.exists(path):
+            logging.info(f"## ComfyUI-Manager: SKIP-DELETE => '{path}' (already deleted)")
+            return
+
+        try:
+            shutil.rmtree(path)
+            logging.info(f"## ComfyUI-Manager: DELETE => '{path}'")
+        except Exception as e:
+            logging.error(f"## ComfyUI-Manager: Failed to delete '{path}' ({e})")
+
     executed = set()
     # Read each line from the file and convert it to a list using eval
     with open(script_list_path, 'r', encoding="UTF-8", errors="ignore") as file:
@@ -597,8 +748,8 @@ if os.path.exists(script_list_path):
                         execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
                         execute_lazy_install_script(script[3], script[7])
 
-                    elif script[1] == "#LAZY-MIGRATION":
+                    elif script[1] == "#LAZY-DELETE-NODEPACK":
-                        execute_migration(script[2])
+                        execute_lazy_delete(script[2])
 
                 elif os.path.exists(script[0]):
                     if script[1] == "#FORCE":
@@ -608,40 +759,73 @@ if os.path.exists(script_list_path):
                             continue
 
                     print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}")
-                    print(f"\n## Execute install/(de)activation script for '{script[0]}'")
+                    print(f"\n## Execute management script for '{script[0]}'")
 
                     new_env = os.environ.copy()
-                    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:
-                        print(f"install/(de)activation script failed: {script[0]}")
+                        print(f"management script failed: {script[0]}")
                 else:
                     print(f"\n## ComfyUI-Manager: CANCELED => {script[1:]}")
 
             except Exception as e:
-                print(f"[ERROR] Failed to execute install/(de)activation script: {line} / {e}")
+                print(f"[ERROR] Failed to execute management script: {line} / {e}")
 
     # Remove the script_list_path file
     if os.path.exists(script_list_path):
+        script_executed = True
         os.remove(script_list_path)
         
     print("\n[ComfyUI-Manager] Startup script completed.")
     print("#######################################################################\n")
 
+
+# Check if script_list_path exists
+if os.path.exists(script_list_path):
+    execute_startup_script()
+
+
 pip_fixer.fix_broken()
 
 del processed_install
 del pip_fixer
 manager_util.clear_pip_cache()
 
+if script_executed:
+    # Restart
+    print("[ComfyUI-Manager] Restarting to reapply dependency installation.")
+
+    if '__COMFY_CLI_SESSION__' in os.environ:
+        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w'):
+            pass
+
+        print("--------------------------------------------------------------------------\n")
+        exit(0)
+    else:
+        sys_argv = sys.argv.copy()
+
+        if sys_argv[0].endswith("__main__.py"):  # this is a python module
+            module_name = os.path.basename(os.path.dirname(sys_argv[0]))
+            cmds = [sys.executable, '-m', module_name] + sys_argv[1:]
+        elif sys.platform.startswith('win32'):
+            cmds = ['"' + sys.executable + '"', '"' + sys_argv[0] + '"'] + sys_argv[1:]
+        else:
+            cmds = [sys.executable] + sys_argv
+
+        print(f"Command: {cmds}", flush=True)
+        print("--------------------------------------------------------------------------\n")
+
+        os.execv(sys.executable, cmds)
+
 
 def check_windows_event_loop_policy():
     try:
         import configparser
-        config_path = os.path.join(os.path.dirname(__file__), "config.ini")
+        config = configparser.ConfigParser(strict=False)
-        config = configparser.ConfigParser()
+        config.read(manager_config_path)
-        config.read(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':

pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "comfyui-manager"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.1"
+version = "3.31.11"
 license = { file = "LICENSE.txt" }
-dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
+dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
 
 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"

requirements.txt

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

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

scripts/install-comfyui-venv-win.bat

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

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

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

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")