fix: message fix

FIXED: confusing of config handler with manager-core

.github/workflows/publish.yml

@@ -3,23 +3,19 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - main-blocked
+      - main
     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@v1
+        uses: Comfy-Org/publish-node-action@main
         with:
           ## Add your own personal access token to your Github Repository secrets and reference it here.
           personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.github/workflows/ruff.yml

@@ -1,23 +0,0 @@
-name: Python Linting
-
-on: [push, pull_request]
-
-jobs:
-  ruff:
-    name: Run Ruff
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.x
-
-    - name: Install Ruff
-      run: pip install ruff
-
-    - name: Run Ruff
-      run: ruff check .

.gitignore

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

README.md

@@ -1,84 +1,42 @@
-# ComfyUI Manager
+# ComfyUI Manager (Extension)
 
-**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.
+**ComfyUI-Manager (Extension)** expands the functionality of [manager-core](https://github.com/Comfy-Org/manager-core), allowing users to access the existing ComfyUI-Manager features.
+
+![menu](misc/menu.jpg)
 
-![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
 ## NOTICE
-* V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
+* V3.0: ComfyUI-Manager (Extension)
-* V3.10: `double-click feature` is removed
+
-  * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
-* V3.3.2: Overhauled. Officially supports [https://comfyregistry.org/](https://comfyregistry.org/).
-* You can see whole nodes info on [ComfyUI Nodes Info](https://ltdrdata.github.io/) page.
 
 ## Installation
 
-### Installation[method1] (General installation method: ComfyUI-Manager only)
+### Installation[method1] installation via manager-core (Recommended)
+
+Search for ComfyUI-Manager in the custom node installation feature of manager-core and install it.
+
+
+### Installation[method1] manual (Not Recommended)
 
 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 comfyui-manager`
+2. `git clone https://github.com/ltdrdata/ComfyUI-Manager.git`
 3. Restart ComfyUI
 
 
-### Installation[method2] (Installation for portable ComfyUI version: ComfyUI-Manager only)
-1. install git 
-- https://git-scm.com/download/win
-- standalone version  
-- select option: use windows default console window
-2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
-- Don't click. Right click the link and use save as...
-3. double click `install-manager-for-portable-version.bat` batch file
-
-![portable-install](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/portable-install.jpg)
-
-
-### Installation[method3] (Installation through comfy-cli: install ComfyUI and ComfyUI-Manager at once.)  
-> RECOMMENDED: comfy-cli provides various features to manage ComfyUI from the CLI.
-
-* **prerequisite: python 3, git**
-
-Windows:
-```commandline
-python -m venv venv
-venv\Scripts\activate
-pip install comfy-cli
-comfy install
-```
-
-Linux/OSX:
-```commandline
-python -m venv venv
-. venv/bin/activate
-pip install comfy-cli
-comfy install
-```
-* See also: https://github.com/Comfy-Org/comfy-cli
-
-
-### Installation[method4] (Installation for linux+venv: ComfyUI + ComfyUI-Manager)
-
-To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you can follow these steps:
-* **prerequisite: python-is-python3, python3-venv, git**
-
-1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
-- Don't click. Right click the link and use save as...
-- ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
-2. `chmod +x install-comfyui-venv-linux.sh`
-3. `./install-comfyui-venv-linux.sh`
-
 ### Installation Precautions
-* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/comfyui-manager`
+* **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. Remove it and install properly via `git clone` method.
+  * In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations.
+  * You have to rename `ComfyUI/custom_nodes/ComfyUI-Manager-main` to `ComfyUI/custom_nodes/ComfyUI-Manager`
 
 
-You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
 
 ## Colab Notebook
 This repository provides Colab notebooks that allow you to install and use ComfyUI, including ComfyUI-Manager. To use ComfyUI, [click on this link](https://colab.research.google.com/github/ltdrdata/ComfyUI-Manager/blob/main/notebooks/comfyui_colab_with_manager.ipynb).
@@ -91,12 +49,12 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
 1. Click "Manager" button on main menu
 
-    ![mainmenu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/topbar.jpg)
+    ![mainmenu](misc/main.jpg)
 
 
 2. If you click on 'Install Custom Nodes' or 'Install Models', an installer dialog will open.
 
-    ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
+    ![menu](misc/menu.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.
@@ -112,9 +70,9 @@ This repository provides Colab notebooks that allow you to install and use Comfy
 
 3. Click 'Install' or 'Try Install' button.
 
-    ![node-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/custom-nodes.jpg)
+    ![node-install-dialog](misc/custom-nodes.jpg)
 
-    ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/models.jpg)
+    ![model-install-dialog](misc/models.png)
 
     * Installed: This item is already installed.
     * Install: Clicking this button will install the item.
@@ -124,56 +82,39 @@ 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. Share
+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.
-  ![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) 
+    * When selecting (hide built-in), it hides the 🦊 icon, which signifies built-in nodes.
+      * Nodes without any indication on the badge are custom nodes that Manager cannot recognize.
+    * `Badge: Nickname` displays the nickname of custom nodes, while `Badge: #ID Nickname` also includes the internal ID of the node.
+
+    ![model-install-dialog](misc/nickname.jpg)
+
+
+5. Share
+  ![menu](misc/main.jpg) ![share](misc/share.jpg) 
 
   * 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](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/share-setting.jpg)
+  ![menu](misc/share-setting.jpg)
   
-  * Through the Share settings in the Manager menu, you can configure the behavior of the Share button in the Main menu or Share Output button on Context Menu.
+  * 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.
     * `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: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
+  * Snapshot file dir: `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 `<USER_DIRECTORY>/default/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 `ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
 
-![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)
+![model-install-dialog](misc/snapshot.jpg)
 
 
 ## cm-cli: command line tools for power user
@@ -190,18 +131,48 @@ The following settings are applied based on the section marked as `is_default`.
 
 ## Custom node support guide
 
-* **NOTICE:**
+* 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.
-    - 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.
 
-* https://docs.comfy.org/registry/overview
+* Please submit a pull request to update either the custom-node-list.json or model-list.json file.
-* https://github.com/Comfy-Org/rfcs
 
-**Special purpose files** (optional)
+* The scanner currently provides a detection function for missing nodes, which is capable of detecting nodes described by the following two patterns.
-  * `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.**
 
 
@@ -220,12 +191,12 @@ The following settings are applied based on the section marked as `is_default`.
     }
     ```
   * `<current timestamp>` Ensure that the timestamp is always unique.
-    * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
+    * "components" should have the same structure as the content of the file stored in 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 `<USER_DIRECTORY>/default/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 ComfyUI-Manager/components.
           * `<category>`: If there is neither a category nor a packname, it is saved in the components category.
           ```
               "version":"1.0",
@@ -242,37 +213,11 @@ The following settings are applied based on the section marked as `is_default`.
 
 ## Support of missing nodes installation
 
-![missing-menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-menu.jpg)
+![missing-menu](misc/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](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/missing-list.jpg)
+![missing-list](misc/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
@@ -304,39 +249,12 @@ The following settings are applied based on the section marked as `is_default`.
   * 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:
@@ -354,14 +272,17 @@ 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 `<USER_DIRECTORY>/default/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 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`

__init__.py

@@ -1,25 +1,37 @@
-"""
+legacy_manager_core_path = None
-This file is the entry point for the ComfyUI-Manager package, handling CLI-only mode and initial setup.
+manager_core_path = None
-"""
 
-import os
-import sys
 
-cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
+def is_manager_core_exists():
+    global legacy_manager_core_path
+    global manager_core_path
+    import os
+    import folder_paths
 
-if not os.path.exists(cli_mode_flag):
+    comfy_path = os.path.dirname(folder_paths.__file__)
-    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+    legacy_manager_core_path = os.path.join(comfy_path, 'custom_nodes', 'manager-core')
-    import manager_server  # noqa: F401
+    manager_core_path = legacy_manager_core_path
-    import share_3rdparty  # noqa: F401
-    import cm_global
 
-    if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
+    manager_core_path_file = os.path.join(comfy_path, 'manager_core_path.txt')
-        WEB_DIRECTORY = "js"
+    if os.path.exists(manager_core_path_file):
+        with open(manager_core_path_file, 'r') as f:
+            manager_core_path = os.path.join(f.read().strip(), 'manager-core')
+
+    return os.path.exists(manager_core_path) or os.path.exists(legacy_manager_core_path)
+
+
+if not is_manager_core_exists():
+    from .modules import migration_server
+    migration_server.manager_core_path = manager_core_path
+
+    WEB_DIRECTORY = "migration_js"
+    NODE_CLASS_MAPPINGS = {}
 else:
-    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
+    # Main code
-
+    from .modules import manager_ext_server
-NODE_CLASS_MAPPINGS = {}
+    from .modules import share_3rdparty
-__all__ = ['NODE_CLASS_MAPPINGS']
-
 
+    WEB_DIRECTORY = "js"
 
+    NODE_CLASS_MAPPINGS = {}
+    __all__ = ['NODE_CLASS_MAPPINGS']

channels.list.template

@@ -1,5 +1,3 @@
-default::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
-recent::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/new
 legacy::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/legacy
 forked::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/forked
 dev::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/dev

cm-cli.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-python cm-cli.py $*

docs/en/cm-cli.md

@@ -122,8 +122,7 @@ ComfyUI-Loopchain
   * `--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. 
-  * `--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,8 +123,7 @@ 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

@@ -1,15 +1,15 @@
 {
     "favorites": [
+        "comfyui-manager",
         "comfyui_ipadapter_plus",
         "comfyui-animatediff-evolved",
         "comfyui_controlnet_aux",
         "comfyui-impact-pack",
-        "comfyui-impact-subpack",
         "comfyui-custom-scripts",
         "comfyui-layerdiffuse",
         "comfyui-liveportraitkj",
         "aigodlike-comfyui-translation",
-        "comfyui-reactor",
+        "comfyui-reactor-node",
         "comfyui_instantid",
         "sd-dynamic-thresholding",
         "pr-was-node-suite-comfyui-47064894",

git_helper.py

@@ -1,523 +0,0 @@
-import subprocess
-import sys
-import os
-import traceback
-
-import git
-import json
-import yaml
-import requests
-from tqdm.auto import tqdm
-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("\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):
-        os.makedirs(dest_folder)
-
-    # Extract filename from URL if not provided
-    if filename is None:
-        filename = os.path.basename(url)
-
-    # Full path to save the file
-    dest_path = os.path.join(dest_folder, filename)
-
-    # Download the file
-    response = requests.get(url, stream=True)
-    if response.status_code == 200:
-        with open(dest_path, 'wb') as file:
-            for chunk in response.iter_content(chunk_size=1024):
-                if chunk:
-                    file.write(chunk)
-    else:
-        print(f"Failed to download file from {url}")
-
-
-nodelist_path = os.path.join(os.path.dirname(__file__), "custom-node-list.json")
-working_directory = os.getcwd()
-
-if os.path.basename(working_directory) != 'custom_nodes':
-    print("WARN: This script should be executed in custom_nodes dir")
-    print(f"DBG: INFO {working_directory}")
-    print(f"DBG: INFO {sys.argv}")
-    # exit(-1)
-
-
-class GitProgress(RemoteProgress):
-    def __init__(self):
-        super().__init__()
-        self.pbar = tqdm(ascii=True)
-
-    def update(self, op_code, cur_count, max_count=None, message=''):
-        self.pbar.total = max_count
-        self.pbar.n = cur_count
-        self.pbar.pos = 0
-        self.pbar.refresh()
-
-
-def gitclone(custom_nodes_path, url, target_hash=None, repo_path=None):
-    repo_name = os.path.splitext(os.path.basename(url))[0]
-
-    if repo_path is None:
-        repo_path = os.path.join(custom_nodes_path, repo_name)
-
-    # Clone the repository from the remote URL
-    repo = git.Repo.clone_from(url, repo_path, recursive=True, progress=GitProgress())
-
-    if target_hash is not None:
-        print(f"CHECKOUT: {repo_name} [{target_hash}]")
-        repo.git.checkout(target_hash)
-            
-    repo.git.clear_cache()
-    repo.close()
-
-
-def gitcheck(path, do_fetch=False):
-    try:
-        # Fetch the latest commits from the remote repository
-        repo = git.Repo(path)
-
-        if repo.head.is_detached:
-            print("CUSTOM NODE CHECK: True")
-            return
-
-        current_branch = repo.active_branch
-        branch_name = current_branch.name
-
-        remote_name = current_branch.tracking_branch().remote_name
-        remote = repo.remote(name=remote_name)
-
-        if do_fetch:
-            remote.fetch()
-
-        # Get the current commit hash and the commit hash of the remote branch
-        commit_hash = repo.head.commit.hexsha
-
-        if f'{remote_name}/{branch_name}' in repo.refs:
-            remote_commit_hash = repo.refs[f'{remote_name}/{branch_name}'].object.hexsha
-        else:
-            print("CUSTOM NODE CHECK: True")  # non default branch is treated as updatable
-            return
-
-        # Compare the commit hashes to determine if the local repository is behind the remote repository
-        if commit_hash != remote_commit_hash:
-            # Get the commit dates
-            commit_date = repo.head.commit.committed_datetime
-            remote_commit_date = repo.refs[f'{remote_name}/{branch_name}'].object.committed_datetime
-
-            # Compare the commit dates to determine if the local repository is behind the remote repository
-            if commit_date < remote_commit_date:
-                print("CUSTOM NODE CHECK: True")
-        else:
-            print("CUSTOM NODE CHECK: False")
-    except Exception as e:
-        print(e)
-        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):
-    remote_name = get_remote_name(repo)
-
-    try:
-        if remote_name is None:
-            return False
-
-        default_branch = repo.git.symbolic_ref(f'refs/remotes/{remote_name}/HEAD').replace(f'refs/remotes/{remote_name}/', '')
-        repo.git.checkout(default_branch)
-        return True
-    except:
-        # try 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):
-    # Check if the path is a git repository
-    if not os.path.exists(os.path.join(path, '.git')):
-        raise ValueError('Not a git repository')
-
-    # Pull the latest changes from the remote repository
-    repo = git.Repo(path)
-    if repo.is_dirty():
-        print(f"STASH: '{path}' is dirty.")
-        repo.git.stash()
-
-    commit_hash = repo.head.commit.hexsha
-    try:
-        if repo.head.is_detached:
-            switch_to_default_branch(repo)
-
-        current_branch = repo.active_branch
-        branch_name = current_branch.name
-
-        remote_name = current_branch.tracking_branch().remote_name
-        remote = repo.remote(name=remote_name)
-
-        if f'{remote_name}/{branch_name}' not in repo.refs:
-            switch_to_default_branch(repo)
-            current_branch = repo.active_branch
-            branch_name = current_branch.name
-
-        remote.fetch()
-        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
-            repo.close()
-            return
-
-        remote.pull()
-
-        repo.git.submodule('update', '--init', '--recursive')
-        new_commit_hash = repo.head.commit.hexsha
-
-        if commit_hash != new_commit_hash:
-            print("CUSTOM NODE PULL: Success")  # update success
-        else:
-            print("CUSTOM NODE PULL: Fail")  # update fail
-    except Exception as e:
-        print(e)
-        print("CUSTOM NODE PULL: Fail")  # unknown git error
-
-    repo.close()
-
-
-def checkout_comfyui_hash(target_hash):
-    repo = git.Repo(comfy_path)
-    commit_hash = repo.head.commit.hexsha
-
-    if commit_hash != target_hash:
-        try:
-            print(f"CHECKOUT: ComfyUI [{target_hash}]")
-            repo.git.checkout(target_hash)
-        except git.GitCommandError as e:
-            print(f"Error checking out the ComfyUI: {str(e)}")
-
-
-def checkout_custom_node_hash(git_custom_node_infos):
-    repo_name_to_url = {}
-
-    for url in git_custom_node_infos.keys():
-        repo_name = url.split('/')[-1]
-
-        if repo_name.endswith('.git'):
-            repo_name = repo_name[:-4]
-
-        repo_name_to_url[repo_name] = url
-
-    for path in os.listdir(working_directory):
-        if path.endswith("ComfyUI-Manager"):
-            continue
-
-        fullpath = os.path.join(working_directory, path)
-
-        if os.path.isdir(fullpath):
-            is_disabled = path.endswith(".disabled")
-
-            try:
-                git_dir = os.path.join(fullpath, '.git')
-                if not os.path.exists(git_dir):
-                    continue
-
-                need_checkout = False
-                repo_name = os.path.basename(fullpath)
-
-                if repo_name.endswith('.disabled'):
-                    repo_name = repo_name[:-9]
-
-                if repo_name not in repo_name_to_url:
-                    if not is_disabled:
-                        # should be disabled
-                        print(f"DISABLE: {repo_name}")
-                        new_path = fullpath + ".disabled"
-                        os.rename(fullpath, new_path)
-                        need_checkout = False
-                else:
-                    item = git_custom_node_infos[repo_name_to_url[repo_name]]
-                    if item['disabled'] and is_disabled:
-                        pass
-                    elif item['disabled'] and not is_disabled:
-                        # disable
-                        print(f"DISABLE: {repo_name}")
-                        new_path = fullpath + ".disabled"
-                        os.rename(fullpath, new_path)
-
-                    elif not item['disabled'] and is_disabled:
-                        # enable
-                        print(f"ENABLE: {repo_name}")
-                        new_path = fullpath[:-9]
-                        os.rename(fullpath, new_path)
-                        fullpath = new_path
-                        need_checkout = True
-                    else:
-                        need_checkout = True
-
-                if need_checkout:
-                    repo = git.Repo(fullpath)
-                    commit_hash = repo.head.commit.hexsha
-
-                    if commit_hash != item['hash']:
-                        print(f"CHECKOUT: {repo_name} [{item['hash']}]")
-                        repo.git.checkout(item['hash'])
-
-            except Exception:
-                print(f"Failed to restore snapshots for the custom node '{path}'")
-
-    # clone missing
-    for k, v in git_custom_node_infos.items():
-        if 'ComfyUI-Manager' in k:
-            continue
-
-        if not v['disabled']:
-            repo_name = k.split('/')[-1]
-            if repo_name.endswith('.git'):
-                repo_name = repo_name[:-4]
-
-            path = os.path.join(working_directory, repo_name)
-            if not os.path.exists(path):
-                print(f"CLONE: {path}")
-                gitclone(working_directory, k, target_hash=v['hash'])
-
-
-def invalidate_custom_node_file(file_custom_node_infos):
-    global nodelist_path
-
-    enabled_set = set()
-    for item in file_custom_node_infos:
-        if not item['disabled']:
-            enabled_set.add(item['filename'])
-
-    for path in os.listdir(working_directory):
-        fullpath = os.path.join(working_directory, path)
-
-        if not os.path.isdir(fullpath) and fullpath.endswith('.py'):
-            if path not in enabled_set:
-                print(f"DISABLE: {path}")
-                new_path = fullpath+'.disabled'
-                os.rename(fullpath, new_path)
-
-        elif not os.path.isdir(fullpath) and fullpath.endswith('.py.disabled'):
-            path = path[:-9]
-            if path in enabled_set:
-                print(f"ENABLE: {path}")
-                new_path = fullpath[:-9]
-                os.rename(fullpath, new_path)
-
-    # download missing: just support for 'copy' style
-    py_to_url = {}
-
-    with open(nodelist_path, 'r', encoding="UTF-8") as json_file:
-        info = json.load(json_file)
-        for item in info['custom_nodes']:
-            if item['install_type'] == 'copy':
-                for url in item['files']:
-                    if url.endswith('.py'):
-                        py = url.split('/')[-1]
-                        py_to_url[py] = url
-
-        for item in file_custom_node_infos:
-            filename = item['filename']
-            if not item['disabled']:
-                target_path = os.path.join(working_directory, filename)
-
-                if not os.path.exists(target_path) and filename in py_to_url:
-                    url = py_to_url[filename]
-                    print(f"DOWNLOAD: {filename}")
-                    download_url(url, working_directory)
-
-
-def apply_snapshot(path):
-    try:
-        if os.path.exists(path):
-            if not path.endswith('.json') and not path.endswith('.yaml'):
-                print(f"Snapshot file not found: `{path}`")
-                print("APPLY SNAPSHOT: False")
-                return None
-
-            with open(path, 'r', encoding="UTF-8") as snapshot_file:
-                if path.endswith('.json'):
-                    info = json.load(snapshot_file)
-                elif path.endswith('.yaml'):
-                    info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
-                    info = info['custom_nodes']
-                else:
-                    # impossible case
-                    print("APPLY SNAPSHOT: False")
-                    return None
-
-                comfyui_hash = info['comfyui']
-                git_custom_node_infos = info['git_custom_nodes']
-                file_custom_node_infos = info['file_custom_nodes']
-
-                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 and info['pips']:
-                    return info['pips']
-                else:
-                    return None
-
-        print(f"Snapshot file not found: `{path}`")
-        print("APPLY SNAPSHOT: False")
-
-        return None
-    except Exception as e:
-        print(e)
-        traceback.print_exc()
-        print("APPLY SNAPSHOT: False")
-
-        return None
-
-
-def restore_pip_snapshot(pips, options):
-    non_url = []
-    local_url = []
-    non_local_url = []
-    for k, v in pips.items():
-        if v == "":
-            non_url.append(k)
-        else:
-            if v.startswith('file:'):
-                local_url.append(v)
-            else:
-                non_local_url.append(v)
-
-    failed = []
-    if '--pip-non-url' in options:
-        # try all at once
-        res = 1
-        try:
-            res = subprocess.check_call([sys.executable, '-m', 'pip', 'install'] + non_url)
-        except:
-            pass
-
-        # fallback
-        if res != 0:
-            for x in non_url:
-                res = 1
-                try:
-                    res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-                except:
-                    pass
-
-                if res != 0:
-                    failed.append(x)
-
-    if '--pip-non-local-url' in options:
-        for x in non_local_url:
-            res = 1
-            try:
-                res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except:
-                pass
-
-            if res != 0:
-                failed.append(x)
-
-    if '--pip-local-url' in options:
-        for x in local_url:
-            res = 1
-            try:
-                res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except:
-                pass
-
-            if res != 0:
-                failed.append(x)
-
-    print(f"Installation failed for pip packages: {failed}")
-
-
-def setup_environment():
-    if git_exe_path is not None:
-        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe_path)
-
-
-setup_environment()
-
-
-try:
-    if sys.argv[1] == "--clone":
-        repo_path = None
-        if len(sys.argv) > 4:
-            repo_path = sys.argv[4]
-
-        gitclone(sys.argv[2], sys.argv[3], repo_path=repo_path)
-    elif sys.argv[1] == "--check":
-        gitcheck(sys.argv[2], False)
-    elif sys.argv[1] == "--fetch":
-        gitcheck(sys.argv[2], True)
-    elif sys.argv[1] == "--pull":
-        gitpull(sys.argv[2])
-    elif sys.argv[1] == "--apply-snapshot":
-        options = set()
-        for x in sys.argv:
-            if x in ['--pip-non-url', '--pip-local-url', '--pip-non-local-url']:
-                options.add(x)
-
-        pips = apply_snapshot(sys.argv[2])
-
-        if pips and len(options) > 0:
-            restore_pip_snapshot(pips, options)
-    sys.exit(0)
-except Exception as e:
-    print(e)
-    sys.exit(-1)
-
-

glob/cm_global.py

@@ -1,117 +0,0 @@
-import traceback
-
-#
-# Global Var
-#
-# Usage:
-#   import cm_global
-#   cm_global.variables['comfyui.revision'] = 1832
-#   print(f"log mode: {cm_global.variables['logger.enabled']}")
-#
-variables = {}
-
-
-#
-# Global API
-#
-# Usage:
-# [register API]
-#   import cm_global
-#
-#   def api_hello(msg):
-#       print(f"hello: {msg}")
-#       return msg
-#
-#   cm_global.register_api('hello', api_hello)
-#
-# [use API]
-#   import cm_global
-#
-#   test = cm_global.try_call(api='hello', msg='an example')
-#   print(f"'{test}' is returned")
-#
-
-APIs = {}
-
-
-def register_api(k, f):
-    global APIs
-    APIs[k] = f
-
-
-def try_call(**kwargs):
-    if 'api' in kwargs:
-        api_name = kwargs['api']
-        try:
-            api = APIs.get(api_name)
-            if api is not None:
-                del kwargs['api']
-                return api(**kwargs)
-            else:
-                print(f"WARN: The '{kwargs['api']}' API has not been registered.")
-        except Exception as e:
-            print(f"ERROR: An exception occurred while calling the '{api_name}' API.")
-            raise e
-    else:
-        return None
-
-
-#
-# Extension Info
-#
-# Usage:
-#   import cm_global
-#
-#   cm_global.extension_infos['my_extension'] = {'version': [0, 1], 'name': 'me', 'description': 'example extension', }
-#
-extension_infos = {}
-
-on_extension_registered_handlers = {}
-
-
-def register_extension(extension_name, v):
-    global extension_infos
-    global on_extension_registered_handlers
-    extension_infos[extension_name] = v
-
-    if extension_name in on_extension_registered_handlers:
-        for k, f in on_extension_registered_handlers[extension_name]:
-            try:
-                f(extension_name, v)
-            except Exception:
-                print(f"[ERROR] '{k}' on_extension_registered_handlers")
-                traceback.print_exc()
-
-        del on_extension_registered_handlers[extension_name]
-
-
-def add_on_extension_registered(k, extension_name, f):
-    global on_extension_registered_handlers
-    if extension_name in extension_infos:
-        try:
-            v = extension_infos[extension_name]
-            f(extension_name, v)
-        except Exception:
-            print(f"[ERROR] '{k}' on_extension_registered_handler")
-            traceback.print_exc()
-    else:
-        if extension_name not in on_extension_registered_handlers:
-            on_extension_registered_handlers[extension_name] = []
-
-        on_extension_registered_handlers[extension_name].append((k, f))
-
-
-def add_on_revision_detected(k, f):
-    if 'comfyui.revision' in variables:
-        try:
-            f(variables['comfyui.revision'])
-        except Exception:
-            print(f"[ERROR] '{k}' on_revision_detected_handler")
-            traceback.print_exc()
-    else:
-        variables['cm.on_revision_detected_handler'].append((k, f))
-
-
-error_dict = {}
-
-disable_front = False

glob/cnr_utils.py

@@ -1,253 +0,0 @@
-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"
-
-
-lock = asyncio.Lock()
-
-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
-
-
-@dataclass
-class NodeVersion:
-    changelog: str
-    dependencies: List[str]
-    deprecated: bool
-    id: str
-    version: str
-    download_url: str
-
-
-def map_node_version(api_node_version):
-    """
-    Maps node version data from API response to NodeVersion dataclass.
-
-    Args:
-        api_data (dict): The 'node_version' part of the API response.
-
-    Returns:
-        NodeVersion: An instance of NodeVersion dataclass populated with data from the API.
-    """
-    return NodeVersion(
-        changelog=api_node_version.get(
-            "changelog", ""
-        ),  # Provide a default value if 'changelog' is missing
-        dependencies=api_node_version.get(
-            "dependencies", []
-        ),  # Provide a default empty list if 'dependencies' is missing
-        deprecated=api_node_version.get(
-            "deprecated", False
-        ),  # Assume False if 'deprecated' is not specified
-        id=api_node_version[
-            "id"
-        ],  # 'id' should be mandatory; raise KeyError if missing
-        version=api_node_version[
-            "version"
-        ],  # 'version' should be mandatory; raise KeyError if missing
-        download_url=api_node_version.get(
-            "downloadUrl", ""
-        ),  # Provide a default value if 'downloadUrl' is missing
-    )
-
-
-def install_node(node_id, version=None):
-    """
-    Retrieves the node version for installation.
-
-    Args:
-      node_id (str): The unique identifier of the node.
-      version (str, optional): Specific version of the node to retrieve. If omitted, the latest version is returned.
-
-    Returns:
-      NodeVersion: Node version data or error message.
-    """
-    if version is None:
-        url = f"{base_url}/nodes/{node_id}/install"
-    else:
-        url = f"{base_url}/nodes/{node_id}/install?version={version}"
-
-    response = requests.get(url)
-    if response.status_code == 200:
-        # Convert the API response to a NodeVersion object
-        return map_node_version(response.json())
-    else:
-        return None
-
-
-def all_versions_of_node(node_id):
-    url = f"{base_url}/nodes/{node_id}/versions?statuses=NodeVersionStatusActive&statuses=NodeVersionStatusPending"
-
-    response = requests.get(url)
-    if response.status_code == 200:
-        return response.json()
-    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

@@ -1,85 +0,0 @@
-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

@@ -1,159 +0,0 @@
-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)
-    port = url.port
-    host = url.scheme + '://' + url.hostname
-    import aria2p
-
-    aria2 = aria2p.API(aria2p.Client(host=host, port=port, secret=secret))
-
-
-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
-    if not os.path.exists(dest_folder):
-        os.makedirs(dest_folder)
-
-    # Full path to save the file
-    dest_path = os.path.join(dest_folder, filename)
-
-    # Download the file
-    response = requests.get(url, stream=True)
-    if response.status_code == 200:
-        with open(dest_path, 'wb') as file:
-            for chunk in response.iter_content(chunk_size=1024):
-                if chunk:
-                    file.write(chunk)
-    else:
-        raise Exception(f"Failed to download file from {url}")
-
-
-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:
-        from torchvision.datasets.utils import download_url as torchvision_download_url
-        return torchvision_download_url(model_url, model_dir, filename)
-
-
-def aria2_find_task(dir: str, filename: str):
-    target = os.path.join(dir, filename)
-
-    downloads = aria2.get_downloads()
-
-    for download in downloads:
-        for file in download.files:
-            if file.is_metadata:
-                continue
-            if str(file.path) == target:
-                return download
-
-
-def aria2_download_url(model_url: str, model_dir: str, filename: str):
-    import manager_core as core
-    import tqdm
-    import time
-
-    if model_dir.startswith(core.comfy_path):
-        model_dir = model_dir[len(core.comfy_path) :]
-
-    download_dir = model_dir if model_dir.startswith('/') else os.path.join('/models', model_dir)
-
-    download = aria2_find_task(download_dir, filename)
-    if download is None:
-        options = {'dir': download_dir, 'out': filename}
-        download = aria2.add(model_url, options)[0]
-
-    if download.is_active:
-        with tqdm.tqdm(
-            total=download.total_length,
-            bar_format='{l_bar}{bar}{r_bar}',
-            desc=filename,
-            unit='B',
-            unit_scale=True,
-        ) as progress_bar:
-            while download.is_active:
-                if progress_bar.total == 0 and download.total_length != 0:
-                    progress_bar.reset(download.total_length)
-                progress_bar.update(download.completed_length - progress_bar.n)
-                time.sleep(1)
-                download.update()
-
-
-def download_url_with_agent(url, save_path):
-    try:
-        headers = {
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'}
-
-        req = urllib.request.Request(url, headers=headers)
-        response = urllib.request.urlopen(req)
-        data = response.read()
-
-        if not os.path.exists(os.path.dirname(save_path)):
-            os.makedirs(os.path.dirname(save_path))
-
-        with open(save_path, 'wb') as f:
-            f.write(data)
-
-    except Exception as e:
-        print(f"Download error: {url} / {e}", file=sys.stderr)
-        return False
-
-    print("Installation was successful.")
-    return True
-
-# NOTE: snapshot_download doesn't provide file size tqdm.
-def download_repo_in_bytes(repo_id, local_dir):
-    api = HfApi()
-    repo_info = api.repo_info(repo_id=repo_id, files_metadata=True)
-
-    os.makedirs(local_dir, exist_ok=True)
-
-    total_size = 0
-    for file_info in repo_info.siblings:
-        if file_info.size is not None:
-            total_size += file_info.size
-
-    pbar = tqdm(total=total_size, unit="B", unit_scale=True, desc="Downloading")
-
-    for file_info in repo_info.siblings:
-        out_path = os.path.join(local_dir, file_info.rfilename)
-        os.makedirs(os.path.dirname(out_path), exist_ok=True)
-
-        if file_info.size is None:
-            continue
-
-        download_url = f"https://huggingface.co/{repo_id}/resolve/main/{file_info.rfilename}"
-
-        with requests.get(download_url, stream=True) as r, open(out_path, "wb") as f:
-            r.raise_for_status()
-            for chunk in r.iter_content(chunk_size=65536):
-                if chunk:
-                    f.write(chunk)
-                    pbar.update(len(chunk))
-
-    pbar.close()
-
-

glob/manager_util.py

@@ -1,539 +0,0 @@
-"""
-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
-import os
-from datetime import datetime
-import subprocess
-import sys
-import re
-import logging
-import platform
-import shlex
-import cm_global
-
-
-cache_lock = threading.Lock()
-
-comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
-
-use_uv = False
-
-
-def 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:
-#     from distutils.version import StrictVersion
-# except:
-#     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
-class StrictVersion:
-    def __init__(self, version_string):
-        self.version_string = version_string
-        self.major = 0
-        self.minor = 0
-        self.patch = 0
-        self.pre_release = None
-        self.parse_version_string()
-
-    def parse_version_string(self):
-        parts = self.version_string.split('.')
-        if not parts:
-            raise ValueError("Version string must not be empty")
-
-        self.major = int(parts[0])
-        self.minor = int(parts[1]) if len(parts) > 1 else 0
-        self.patch = int(parts[2]) if len(parts) > 2 else 0
-
-        # Handling pre-release versions if present
-        if len(parts) > 3:
-            self.pre_release = parts[3]
-
-    def __str__(self):
-        version = f"{self.major}.{self.minor}.{self.patch}"
-        if self.pre_release:
-            version += f"-{self.pre_release}"
-        return version
-
-    def __eq__(self, other):
-        return (self.major, self.minor, self.patch, self.pre_release) == \
-            (other.major, other.minor, other.patch, other.pre_release)
-
-    def __lt__(self, other):
-        if (self.major, self.minor, self.patch) == (other.major, other.minor, other.patch):
-            return self.pre_release_compare(self.pre_release, other.pre_release) < 0
-        return (self.major, self.minor, self.patch) < (other.major, other.minor, other.patch)
-
-    @staticmethod
-    def pre_release_compare(pre1, pre2):
-        if pre1 == pre2:
-            return 0
-        if pre1 is None:
-            return 1
-        if pre2 is None:
-            return -1
-        return -1 if pre1 < pre2 else 1
-
-    def __le__(self, other):
-        return self == other or self < other
-
-    def __gt__(self, other):
-        return not self <= other
-
-    def __ge__(self, other):
-        return not self < other
-
-    def __ne__(self, other):
-        return not self == other
-
-
-def simple_hash(input_string):
-    hash_value = 0
-    for char in input_string:
-        hash_value = (hash_value * 31 + ord(char)) % (2**32)
-
-    return hash_value
-
-
-def is_file_created_within_one_day(file_path):
-    if not os.path.exists(file_path):
-        return False
-
-    file_creation_time = os.path.getctime(file_path)
-    current_time = datetime.now().timestamp()
-    time_difference = current_time - file_creation_time
-
-    return time_difference <= 86400
-
-
-async def get_data(uri, silent=False):
-    if not silent:
-        print(f"FETCH DATA from: {uri}", end="")
-
-    if uri.startswith("http"):
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            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()
-
-    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]")
-
-    return json_obj
-
-
-def get_cache_path(uri):
-    cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
-    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 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}")
-
-    return json_obj
-
-
-def sanitize_tag(x):
-    return x.replace('<', '&lt;').replace('>', '&gt;')
-
-
-def extract_package_as_zip(file_path, extract_path):
-    import zipfile
-    try:
-        with zipfile.ZipFile(file_path, "r") as zip_ref:
-            zip_ref.extractall(extract_path)
-            extracted_files = zip_ref.namelist()
-        logging.info(f"Extracted zip file to {extract_path}")
-        return extracted_files
-    except zipfile.BadZipFile:
-        logging.error(f"File '{file_path}' is not a zip or is corrupted.")
-        return None
-
-
-pip_map = None
-
-
-def get_installed_packages(renew=False):
-    global pip_map
-
-    if renew or pip_map is None:
-        try:
-            result = subprocess.check_output(make_pip_cmd(['list']), universal_newlines=True)
-
-            pip_map = {}
-            for line in result.split('\n'):
-                x = line.strip()
-                if x:
-                    y = line.split()
-                    if y[0] == 'Package' or y[0].startswith('-'):
-                        continue
-
-                    normalized_name = y[0].lower().replace('-', '_')
-                    pip_map[normalized_name] = y[1]
-        except subprocess.CalledProcessError:
-            logging.error("[ComfyUI-Manager] Failed to retrieve the information of installed pip packages.")
-            return {}
-
-    return pip_map
-
-
-def clear_pip_cache():
-    global pip_map
-    pip_map = None
-
-
-def parse_requirement_line(line):
-    tokens = shlex.split(line)
-    if not tokens:
-        return None
-
-    package_spec = tokens[0]
-
-    pattern = re.compile(
-        r'^(?P<package>[A-Za-z0-9_.+-]+)'
-        r'(?P<operator>==|>=|<=|!=|~=|>|<)?'
-        r'(?P<version>[A-Za-z0-9_.+-]*)$'
-    )
-    m = pattern.match(package_spec)
-    if not m:
-        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.7.0': ('0.22.0', '2.7.0'),
-    '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, 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 = make_pip_cmd(['install', '--force', 'torch', 'torchvision', 'torchaudio'])
-            subprocess.check_output(cmd, universal_newlines=True)
-            logging.error(cmd)
-            return
-
-        torch_ver = StrictVersion(spec[0])
-        torch_ver = f"{torch_ver.major}.{torch_ver.minor}.{torch_ver.patch}"
-        torch_torchvision_torchaudio_ver = torch_torchvision_torchaudio_version_map.get(torch_ver)
-
-        if torch_torchvision_torchaudio_ver is None:
-            cmd = make_pip_cmd(['install', '--pre', 'torch', 'torchvision', 'torchaudio',
-                                '--index-url', f"https://download.pytorch.org/whl/nightly/{platform}"])
-            logging.info("[ComfyUI-Manager] restore PyTorch to nightly version")
-        else:
-            torchvision_ver, torchaudio_ver = torch_torchvision_torchaudio_ver
-            cmd = make_pip_cmd(['install', f'torch=={torch_ver}', f'torchvision=={torchvision_ver}', f"torchaudio=={torchaudio_ver}",
-                                '--index-url', f"https://download.pytorch.org/whl/{platform}"])
-            logging.info(f"[ComfyUI-Manager] restore PyTorch to {torch_ver}+{platform}")
-
-        subprocess.check_output(cmd, universal_newlines=True)
-
-    def fix_broken(self):
-        new_pip_versions = get_installed_packages(True)
-
-        # remove `comfy` python package
-        try:
-            if 'comfy' in new_pip_versions:
-                cmd = make_pip_cmd(['uninstall', 'comfy'])
-                subprocess.check_output(cmd, universal_newlines=True)
-
-                logging.warning("[ComfyUI-Manager] 'comfy' python package is uninstalled.\nWARN: The 'comfy' package is completely unrelated to ComfyUI and should never be installed as it causes conflicts with ComfyUI.")
-        except Exception as e:
-            logging.error("[ComfyUI-Manager] Failed to uninstall `comfy` python package")
-            logging.error(e)
-
-        # fix torch - reinstall torch packages if version is changed
-        try:
-            if '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:
-            logging.error("[ComfyUI-Manager] Failed to restore PyTorch")
-            logging.error(e)
-
-        # fix opencv
-        try:
-            ocp = new_pip_versions.get('opencv-contrib-python')
-            ocph = new_pip_versions.get('opencv-contrib-python-headless')
-            op = new_pip_versions.get('opencv-python')
-            oph = new_pip_versions.get('opencv-python-headless')
-
-            versions = [ocp, ocph, op, oph]
-            versions = [StrictVersion(x) for x in versions if x is not None]
-            versions.sort(reverse=True)
-
-            if len(versions) > 0:
-                # upgrade to maximum version
-                targets = []
-                cur = versions[0]
-                if ocp is not None and StrictVersion(ocp) != cur:
-                    targets.append('opencv-contrib-python')
-                if ocph is not None and StrictVersion(ocph) != cur:
-                    targets.append('opencv-contrib-python-headless')
-                if op is not None and StrictVersion(op) != cur:
-                    targets.append('opencv-python')
-                if oph is not None and StrictVersion(oph) != cur:
-                    targets.append('opencv-python-headless')
-
-                if len(targets) > 0:
-                    for x in targets:
-                        if sys.version_info < (3, 13):
-                            cmd = make_pip_cmd(['install', f"{x}=={versions[0].version_string}", "numpy<2"])
-                            subprocess.check_output(cmd, universal_newlines=True)
-
-                    logging.info(f"[ComfyUI-Manager] 'opencv' dependencies were fixed: {targets}")
-        except Exception as e:
-            logging.error("[ComfyUI-Manager] Failed to restore opencv")
-            logging.error(e)
-
-        # fix numpy
-        if sys.version_info >= (3, 13):
-            logging.info("[ComfyUI-Manager] In Python 3.13 and above, PIP Fixer does not downgrade `numpy` below version 2.0. If you need to force a downgrade of `numpy`, please use `pip_auto_fix.list`.")
-        else:
-            try:
-                np = new_pip_versions.get('numpy')
-                if cm_global.pip_overrides.get('numpy') == 'numpy<2':
-                    if np is not None:
-                        if StrictVersion(np) >= StrictVersion('2'):
-                            cmd = make_pip_cmd(['install', "numpy<2"])
-                            subprocess.check_output(cmd , universal_newlines=True)
-
-                            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;")
-
-
-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

@@ -1,72 +0,0 @@
-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/security_check.py

@@ -1,117 +0,0 @@
-import sys
-import subprocess
-import os
-
-
-def security_check():
-    print("[START] Security scan")
-
-    custom_nodes_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
-    comfyui_path = os.path.abspath(os.path.join(custom_nodes_path, '..'))
-
-    guide = {
-        "ComfyUI_LLMVISION": """
-0.Remove ComfyUI\\custom_nodes\\ComfyUI_LLMVISION.
-1.Remove pip packages: openai-1.16.3.dist-info, anthropic-0.21.4.dist-info, openai-1.30.2.dist-info, anthropic-0.21.5.dist-info, anthropic-0.26.1.dist-info, %LocalAppData%\\rundll64.exe
-  (For portable versions, it is recommended to reinstall. If you are using a venv, it is advised to recreate the venv.)
-2.Remove these files in your system: lib/browser/admin.py, Cadmino.py, Fadmino.py, VISION-D.exe, BeamNG.UI.exe
-3.Check your Windows registry for the key listed above and remove it.
-  (HKEY_CURRENT_USER\\Software\\OpenAICLI)
-4.Run a malware scanner.
-5.Change all of your passwords, everywhere.
-
-(Reinstall OS is recommended.)
-\n
-Detailed information: https://old.reddit.com/r/comfyui/comments/1dbls5n/psa_if_youve_used_the_comfyui_llmvision_node_from/
-    """,
-        "lolMiner": """
-1. Remove pip packages: lolMiner*
-2. Remove files: lolMiner*, 4G_Ethash_Linux_Readme.txt, mine* in ComfyUI dir.
-
-(Reinstall ComfyUI is recommended.)
-    """,
-    "ultralytics==8.3.41": f"""
-Execute following commands:
-    {sys.executable} -m pip uninstall ultralytics
-    {sys.executable} -m pip install ultralytics==8.3.40
-    
-And kill and remove /tmp/ultralytics_runner
-
-
-The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
-https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
-    """,
-    "ultralytics==8.3.42": f"""
-Execute following commands:
-    {sys.executable} -m pip uninstall ultralytics
-    {sys.executable} -m pip install ultralytics==8.3.40
-
-And kill and remove /tmp/ultralytics_runner
-
-
-The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
-https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
-    """
-             }
-
-    node_blacklist = {"ComfyUI_LLMVISION": "ComfyUI_LLMVISION"}
-
-    pip_blacklist = {
-        "AppleBotzz": "ComfyUI_LLMVISION",
-        "ultralytics==8.3.41": "ultralytics==8.3.41"
-    }
-
-    file_blacklist = {
-        "ComfyUI_LLMVISION": ["%LocalAppData%\\rundll64.exe"],
-        "lolMiner": [os.path.join(comfyui_path, 'lolMiner')]
-    }
-
-    installed_pips = subprocess.check_output([sys.executable, '-m', "pip", "freeze"], text=True)
-
-    detected = set()
-    try:
-        anthropic_info = subprocess.check_output([sys.executable, '-m', "pip", "show", "anthropic"], text=True, stderr=subprocess.DEVNULL)
-        anthropic_reqs = [x for x in anthropic_info.split('\n') if x.startswith("Requires")][0].split(': ')[1]
-        if "pycrypto" in anthropic_reqs:
-            location = [x for x in anthropic_info.split('\n') if x.startswith("Location")][0].split(': ')[1]
-            for fi in os.listdir(location):
-                if fi.startswith("anthropic"):
-                    guide["ComfyUI_LLMVISION"] = f"\n0.Remove {os.path.join(location, fi)}" + guide["ComfyUI_LLMVISION"]
-                    detected.add("ComfyUI_LLMVISION")
-    except subprocess.CalledProcessError:
-        pass
-
-    for k, v in node_blacklist.items():
-        if os.path.exists(os.path.join(custom_nodes_path, k)):
-            print(f"[SECURITY ALERT] custom node '{k}' is dangerous.")
-            detected.add(v)
-
-    for k, v in pip_blacklist.items():
-        if k in installed_pips:
-            detected.add(v)
-            break
-
-    for k, v in file_blacklist.items():
-        for x in v:
-            if os.path.exists(os.path.expandvars(x)):
-                detected.add(k)
-                break
-
-    if len(detected) > 0:
-        for line in installed_pips.split('\n'):
-            for k, v in pip_blacklist.items():
-                if k in line:
-                    print(f"[SECURITY ALERT] '{line}' is dangerous.")
-
-        print("\n########################################################################")
-        print("   Malware has been detected, forcibly terminating ComfyUI execution.")
-        print("########################################################################\n")
-
-        for x in detected:
-            print(f"\n======== TARGET: {x} =========")
-            print("\nTODO:")
-            print(guide.get(x))
-
-        exit(-1)
-
-    print("[DONE] Security scan")

js/cm-api.js

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

@@ -11,18 +11,13 @@ import {
 	showYouMLShareDialog
 } from "./comfyui-share-common.js";
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
-import {
+import { free_models, install_pip, install_via_git_url, manager_instance, rebootAPI, migrateAPI, setManagerInstance, show_message } from "./common.js";
-	free_models, install_pip, install_via_git_url, manager_instance,
-	rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
-	infoToast, showTerminal, setNeedRestart
-} from "./common.js";
 import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
 import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
+import { set_double_click_policy } from "./node_fixer.js";
 import { SnapshotManager } from "./snapshot.js";
 
-let manager_version = await getVersion();
-
 var docStyle = document.createElement('style');
 docStyle.innerHTML = `
 .comfy-toast {
@@ -44,9 +39,9 @@ docStyle.innerHTML = `
 
 #cm-manager-dialog {
 	width: 1000px;
-	height: 455px;
+	height: 520px;
 	box-sizing: content-box;
-	z-index: 1000;
+	z-index: 10000;
 	overflow-y: auto;
 }
 
@@ -54,7 +49,7 @@ docStyle.innerHTML = `
 	width: 400px;
 	height: 25px;
 	box-sizing: border-box;
-	z-index: 1000;
+	z-index: 10000;
 	margin-top: 10px;
 	margin-bottom: 5px;
 }
@@ -141,7 +136,7 @@ docStyle.innerHTML = `
 
 .cm-notice-board {
 	width: 290px;
-	height: 230px;
+	height: 270px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -227,13 +222,9 @@ document.head.appendChild(docStyle);
 
 var update_comfyui_button = null;
 var switch_comfyui_button = null;
+var fetch_updates_button = null;
 var update_all_button = null;
-var restart_stop_button = null;
-var update_policy_combo = null;
-
 let share_option = 'all';
-var is_updating = false;
-
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
 const style = `
@@ -399,10 +390,10 @@ const style = `
 .pysssss-workflow-arrow-2:after {
 	content: "▼";
  }
- .pysssss-workflow-arrow-2:hover {
+.pysssss-workflow-arrow-2:hover {
 	filter: brightness(1.6);
 	background-color: var(--comfy-menu-bg);
- }
+}
 .pysssss-workflow-popup-2 ~ .litecontextmenu {
 	transform: scale(1.3);
 }
@@ -414,6 +405,7 @@ const style = `
 }
 `;
 
+
 async function init_share_option() {
 	api.fetchApi('/manager/share_option')
 		.then(response => response.text())
@@ -432,61 +424,107 @@ async function init_notice(notice) {
 
 await init_share_option();
 
+async function fetchNicknames() {
+	const response1 = await api.fetchApi(`/customnode/getmappings?mode=nickname`);
+	const mappings = await response1.json();
 
-async function set_inprogress_mode() {
+	let result = {};
-	update_comfyui_button.disabled = true;
+	let nickname_patterns = [];
-	update_comfyui_button.style.backgroundColor = "gray";
 
-	update_all_button.disabled = true;
+	for (let i in mappings) {
-	update_all_button.style.backgroundColor = "gray";
+		let item = mappings[i];
-
+		var nickname;
-	switch_comfyui_button.disabled = true;
+		if (item[1].nickname) {
-	switch_comfyui_button.style.backgroundColor = "gray";
+			nickname = item[1].nickname;
-
+		}
-	restart_stop_button.innerText = 'Stop';
+		else if (item[1].title) {
-}
+			nickname = item[1].title;
-
-
-async function reset_action_buttons() {
-	const isElectron = 'electronAPI' in window;
-
-	if(isElectron) {
-		update_all_button.innerText = "Update All Custom Nodes";
 		}
 		else {
-		update_all_button.innerText = "Update All";
+			nickname = item[1].title_aux;
 		}
 
-	update_comfyui_button.innerText = "Update ComfyUI";
+		for (let j in item[0]) {
-	switch_comfyui_button.innerText = "Switch ComfyUI";
+			result[item[0][j]] = nickname;
-	restart_stop_button.innerText = 'Restart';
+		}
 
-	update_comfyui_button.disabled = false;
+		if(item[1].nodename_pattern) {
-	update_all_button.disabled = false;
+			nickname_patterns.push([item[1].nodename_pattern, nickname]);
-	switch_comfyui_button.disabled = false;
+		}
+	}
 
-	update_comfyui_button.style.backgroundColor = "";
+	return [result, nickname_patterns];
-	update_all_button.style.backgroundColor = "";
+}
-	switch_comfyui_button.style.backgroundColor = "";
+
+const [nicknames, nickname_patterns] = await fetchNicknames();
+
+function getNickname(node, nodename) {
+	if(node.nickname) {
+		return node.nickname;
+	}
+	else {
+		if (nicknames[nodename]) {
+			node.nickname = nicknames[nodename];
+		}
+		else if(node.getInnerNodes) {
+			let pure_name = getPureName(node);
+			let groupNode = app.graph.extra?.groupNodes?.[pure_name];
+			if(groupNode) {
+				let packname = groupNode.packname;
+				node.nickname = packname;
+			}
+			return node.nickname;
+		}
+		else {
+			for(let i in nickname_patterns) {
+				let item = nickname_patterns[i];
+				if(nodename.match(item[0])) {
+					node.nickname = item[1];
+				}
+			}
+		}
+
+		return node.nickname;
+	}
 }
 
 async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
+	update_comfyui_button.disabled = true;
+	update_comfyui_button.style.backgroundColor = "gray";
 
-	set_inprogress_mode();
+	try {
+		const response = await api.fetchApi('/comfyui_manager/update_comfyui');
 
-	const response = await api.fetchApi('/manager/queue/update_comfyui');
+		if (response.status == 400) {
+			show_message('Failed to update ComfyUI.');
+			return false;
+		}
 
-	showTerminal();
+		if (response.status == 201) {
+			show_message('ComfyUI has been successfully updated.');
+		}
+		else {
+			show_message('ComfyUI is already up to date with the latest version.');
+		}
 
-	is_updating = true;
+		return true;
-	await api.fetchApi('/manager/queue/start');
+	}
+	catch (exception) {
+		show_message(`Failed to update ComfyUI / ${exception}`);
+		return false;
+	}
+	finally {
+		update_comfyui_button.disabled = false;
+		update_comfyui_button.innerText = prev_text;
+		update_comfyui_button.style.backgroundColor = "";
+	}
 }
 
 function showVersionSelectorDialog(versions, current, onSelect) {
 		const dialog = new ComfyDialog();
-		dialog.element.style.zIndex = 1100;
+		dialog.element.style.zIndex = 100003;
 		dialog.element.style.width = "300px";
 		dialog.element.style.padding = "0";
 		dialog.element.style.backgroundColor = "#2a2a2a";
@@ -586,7 +624,7 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 							onSelect(selectedVersion);
 							dialog.close();
 						} else {
-							customAlert("Please select a version.");
+							alert("Please select a version.");
 						}
 					},
 					style: {
@@ -609,14 +647,8 @@ function showVersionSelectorDialog(versions, current, onSelect) {
 }
 
 async function switchComfyUI() {
-	switch_comfyui_button.disabled = true;
-	switch_comfyui_button.style.backgroundColor = "gray";
-	
     let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
 
-	switch_comfyui_button.disabled = false;
-	switch_comfyui_button.style.backgroundColor = "";
-
     if(res.status == 200) {
         let obj = await res.json();
 
@@ -628,164 +660,130 @@ async function switchComfyUI() {
             versions.push(v);
         }
 
-		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
+        showVersionSelectorDialog(versions, obj.current, (selected_version) => {
-			if(selected_version == 'nightly') {
+            api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
-				update_policy_combo.value = 'nightly-comfyui';
-				api.fetchApi('/manager/policy/update?value=nightly-comfyui');
-			}
-			else {
-				update_policy_combo.value = 'stable-comfyui';
-				api.fetchApi('/manager/policy/update?value=stable-comfyui');
-			}
-
-			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
-			if (response.status == 200) {
-				infoToast(`ComfyUI version is switched to ${selected_version}`);
-			}
-			else {
-				customAlert('Failed to switch ComfyUI version.');
-			}
         });
     }
     else {
-		customAlert('Failed to fetch ComfyUI versions.');
+        show_message('Failed to fetch ComfyUI versions.');
     }
 }
 
-async function onQueueStatus(event) {
-	const isElectron = 'electronAPI' in window;
 
-	if(event.detail.status == 'in_progress') {
+async function fetchUpdates(update_check_checkbox) {
-		set_inprogress_mode();
+	let prev_text = fetch_updates_button.innerText;
-		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
+	fetch_updates_button.innerText = "Fetching updates...";
-	}
+	fetch_updates_button.disabled = true;
-	else if(event.detail.status == 'done') {
+	fetch_updates_button.style.backgroundColor = "gray";
-		reset_action_buttons();
 
-		if(!is_updating)  {
+	try {
-			return;
+		var mode = manager_instance.datasrc_combo.value;
+
+		const response = await api.fetchApi(`/customnode/fetch_updates?mode=${mode}`);
+
+		if (response.status != 200 && response.status != 201) {
+			show_message('Failed to fetch updates.');
+			return false;
 		}
 
-		is_updating = false;
+		if (response.status == 201) {
+			show_message("There is an updated extension available.<BR><BR><P><B>NOTE:<BR>Fetch Updates is not an update.<BR>Please update from <button id='cm-install-customnodes-button'>Install Custom Nodes</button> </B></P>");
 
-		let success_list = [];
+			const button = document.getElementById('cm-install-customnodes-button');
-		let failed_list = [];
+			button.addEventListener("click",
-		let comfyui_state = null;
+				async function() {
+					app.ui.dialog.close();
 
-		for(let k in event.detail.nodepack_result){
+					if(!CustomNodesManager.instance) {
-			let v = event.detail.nodepack_result[k];
+						CustomNodesManager.instance = new CustomNodesManager(app, self);
-
-			if(k == 'comfyui') {
-				comfyui_state = v;
-				continue;
 					}
-
+					await CustomNodesManager.instance.show(CustomNodesManager.ShowMode.UPDATE);
-			if(v.msg == 'success') {
-				success_list.push(k);
-			}
-			else if(v.msg != 'skip')
-				failed_list.push(k);
 				}
+			);
 
-		let msg = "";
+			update_check_checkbox.checked = false;
-		
-		if(success_list.length == 0 && comfyui_state.startsWith('skip')) {
-			if(failed_list.length == 0) {
-				msg += "You are already up to date.";
-			}
 		}
 		else {
-			msg = "To apply the updates, you need to <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI.<hr>";
+			show_message('All extensions are already up-to-date with the latest versions.');
-
-			if(comfyui_state == 'success-nightly') {
-				msg += "ComfyUI has been updated to latest nightly version.<BR><BR>";
-				infoToast("ComfyUI has been updated to the latest nightly version.");
-			}
-			else if(comfyui_state.startsWith('success-stable')) {
-				const ver = comfyui_state.split("-").pop();
-				msg += `ComfyUI has been updated to ${ver}.<BR><BR>`;
-				infoToast(`ComfyUI has been updated to ${ver}`);
-			}
-			else if(comfyui_state == 'skip') {
-				msg += "ComfyUI is already up to date.<BR><BR>"
-			}
-			else if(comfyui_state != null) {
-				msg += "Failed to update ComfyUI.<BR><BR>"
 		}
 
-			if(success_list.length > 0) {
+		return true;
-				msg += "The following custom nodes have been updated:<ul>";
-				for(let x in success_list) {
-					let k = success_list[x];
-					let url = event.detail.nodepack_result[k].url;
-					let title = event.detail.nodepack_result[k].title;
-					if(url) {
-						msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
 	}
-					else {
+	catch (exception) {
-						msg += `<li>${k}</li>`;
+		show_message(`Failed to update custom nodes / ${exception}`);
+		return false;
 	}
+	finally {
+		fetch_updates_button.disabled = false;
+		fetch_updates_button.innerText = prev_text;
+		fetch_updates_button.style.backgroundColor = "";
 	}
-				msg += "</ul>";
+}
+
+async function updateAll(update_check_checkbox, manager_dialog) {
+	let prev_text = update_all_button.innerText;
+	update_all_button.innerText = "Updating all...(ComfyUI)";
+	update_all_button.disabled = true;
+	update_all_button.style.backgroundColor = "gray";
+
+	try {
+		var mode = manager_instance.datasrc_combo.value;
+
+		update_all_button.innerText = "Updating all...";
+		const response1 = await api.fetchApi('/comfyui_manager/update_comfyui');
+		const response2 = await api.fetchApi(`/customnode/update_all?mode=${mode}`);
+
+		if (response2.status == 403) {
+			show_message('This action is not allowed with this security level configuration.');
+			return false;
 		}
 
-			setNeedRestart(true);
+		if (response1.status == 400 || response2.status == 400) {
+			show_message('Failed to update ComfyUI or several extensions.<BR><BR>See terminal log.<BR>');
+			return false;
 		}
 
-		if(failed_list.length > 0) {
+		if(response1.status == 201 || response2.status == 201) {
-			msg += '<br>The update for the following custom nodes has failed:<ul>';
+			const update_info = await response2.json();
-			for(let x in failed_list) {
+
-				let k = failed_list[x];
+			let failed_list = "";
-				let url = event.detail.nodepack_result[k].url;
+			if(update_info.failed.length > 0) {
-				let title = event.detail.nodepack_result[k].title;
+				failed_list = "<BR>FAILED: "+update_info.failed.join(", ");
-				if(url) {
-					msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
-				}
-				else {
-					msg += `<li>${k}</li>`;
-				}
 			}
 
-			msg += '</ul>'
+			let updated_list = "";
+			if(update_info.updated.length > 0) {
+				updated_list = "<BR>UPDATED: "+update_info.updated.join(", ");
 			}
 
-		show_message(msg);
+			show_message(
+				"ComfyUI and all extensions have been updated to the latest version.<BR>To apply the updated custom node, please <button class='cm-small-button' id='cm-reboot-button5'>RESTART</button> ComfyUI. And refresh browser.<BR>"
+				+failed_list
+				+updated_list
+				);
 
 			const rebootButton = document.getElementById('cm-reboot-button5');
-		rebootButton?.addEventListener("click",
+			rebootButton.addEventListener("click",
 				function() {
 					if(rebootAPI()) {
 						manager_dialog.close();
 					}
 				});
 		}
-}
+		else {
-
+			show_message('ComfyUI and all extensions are already up-to-date with the latest versions.');
-api.addEventListener("cm-queue-status", onQueueStatus);
-
-
-async function updateAll(update_comfyui) {
-	update_all_button.innerText = "Updating...";
-
-	set_inprogress_mode();
-
-	var mode = manager_instance.datasrc_combo.value;
-
-	showTerminal();
-
-	if(update_comfyui) {
-		update_all_button.innerText = "Updating ComfyUI...";
-		await api.fetchApi('/manager/queue/update_comfyui');
 		}
 
-	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
+		return true;
-
-	if (response.status == 401) {
-		customAlert('Another task is already in progress. Please stop the ongoing task first.');
 	}
-	else if(response.status == 200) {
+	catch (exception) {
-		is_updating = true;
+		show_message(`Failed to update ComfyUI or several extensions / ${exception}`);
-		await api.fetchApi('/manager/queue/start');
+		return false;
+	}
+	finally {
+		update_all_button.disabled = false;
+		update_all_button.innerText = prev_text;
+		update_all_button.style.backgroundColor = "";
 	}
 }
 
@@ -809,29 +807,15 @@ const isOutputNode = (node) => {
 	return SUPPORTED_OUTPUT_NODE_TYPES.includes(node.type);
 }
 
-function restartOrStop() {
-	if(restart_stop_button.innerText == 'Restart'){
-		rebootAPI();
-	}
-	else {
-		api.fetchApi('/manager/queue/reset');
-		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
-	}
-}
-
 // -----------
 class ManagerMenuDialog extends ComfyDialog {
 	createControlsMid() {
 		let self = this;
-		const isElectron = 'electronAPI' in window;
 
 		update_comfyui_button =
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Update ComfyUI",
-				style: {
-					display: isElectron ? 'none' : 'block'
-				},
 				onclick:
 					() => updateComfyUI()
 			});
@@ -840,38 +824,25 @@ class ManagerMenuDialog extends ComfyDialog {
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Switch ComfyUI",
-				style: {
-					display: isElectron ? 'none' : 'block'
-				},
 				onclick:
 					() => switchComfyUI()
 			});
 
-		restart_stop_button =
+		fetch_updates_button =
-			$el("button.cm-button-red", {
-				type: "button",
-				textContent: "Restart",
-				onclick: () => restartOrStop()
-			});
-
-		if(isElectron) {
-			update_all_button =
 			$el("button.cm-button", {
 				type: "button",
-					textContent: "Update All Custom Nodes",
+				textContent: "Fetch Updates",
 				onclick:
-						() => updateAll(false)
+					() => fetchUpdates(this.update_check_checkbox)
 			});
-		}
+
-		else {
 		update_all_button =
 			$el("button.cm-button", {
 				type: "button",
 				textContent: "Update All",
 				onclick:
-						() => updateAll(true)
+					() => updateAll(this.update_check_checkbox, self)
 			});
-		}
 
 		const res =
 			[
@@ -899,19 +870,7 @@ class ManagerMenuDialog extends ComfyDialog {
 						}
 				}),
 
-				$el("button.cm-button", {
-					type: "button",
-					textContent: "Custom Nodes In Workflow",
-					onclick:
-						() => {
-							if(!CustomNodesManager.instance) {
-								CustomNodesManager.instance = new CustomNodesManager(app, self);
-							}
-							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
-						}
-				}),
 				
-				$el("br", {}, []),
 				$el("button.cm-button", {
 					type: "button",
 					textContent: "Model Manager",
@@ -927,8 +886,8 @@ class ManagerMenuDialog extends ComfyDialog {
 				$el("button.cm-button", {
 					type: "button",
 					textContent: "Install via Git URL",
-					onclick: async () => {
+					onclick: () => {
-						var url = await customPrompt("Please enter the URL of the Git repository to install", "");
+						var url = prompt("Please enter the URL of the Git repository to install", "");
 
 						if (url !== null) {
 							install_via_git_url(url, self);
@@ -940,35 +899,70 @@ class ManagerMenuDialog extends ComfyDialog {
 				update_all_button,
 				update_comfyui_button,
 				switch_comfyui_button,
-				// fetch_updates_button,
+				fetch_updates_button,
 
 				$el("br", {}, []),
-				restart_stop_button,
+				$el("button.cm-button", {
+					type: "button",
+					textContent: "Alternatives of A1111",
+					onclick:
+						() => {
+							if(!CustomNodesManager.instance) {
+								CustomNodesManager.instance = new CustomNodesManager(app, self);
+							}
+							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.ALTERNATIVES);
+						}
+				}),
+
+				$el("br", {}, []),
+				$el("button.cm-button-red", {
+					type: "button",
+					textContent: "Restart",
+					onclick: () => rebootAPI()
+				}),
 			];
 
+		let migration_btn =
+			$el("button.cm-button-orange", {
+				type: "button",
+				textContent: "Migrate to New Node System",
+				onclick: () => migrateAPI()
+			});
+
+		migration_btn.style.display = 'none';
+
+		res.push(migration_btn);
+
+		api.fetchApi('/manager/need_to_migrate')
+			.then(response => response.text())
+			.then(text => {
+				if (text === 'True') {
+					migration_btn.style.display = 'block';
+				}
+			})
+			.catch(error => {
+				console.error('Error checking migration status:', error);
+			});
+
 		return res;
 	}
 
 	createControlsLeft() {
-		const isElectron = 'electronAPI' in window;
-
 		let self = this;
 
+		this.update_check_checkbox = $el("input",{type:'checkbox', id:"skip_update_check"},[])
+		const uc_checkbox_text = $el("label",{for:"skip_update_check"},[" Skip update check"])
+		uc_checkbox_text.style.color = "var(--fg-color)";
+		uc_checkbox_text.style.cursor = "pointer";
+		this.update_check_checkbox.checked = true;
+
 		// db mode
 		this.datasrc_combo = document.createElement("select");
 		this.datasrc_combo.setAttribute("title", "Configure where to retrieve node/model information. If set to 'local,' the channel is ignored, and if set to 'channel (remote),' it fetches the latest information each time the list is opened.");
 		this.datasrc_combo.className = "cm-menu-combo";
 		this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'DB: Channel (1day cache)' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
-		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));
+		this.datasrc_combo.appendChild($el('option', { value: 'url', text: 'DB: Channel (remote)' }, []));
-
-		api.fetchApi('/manager/db_mode')
-			.then(response => response.text())
-			.then(data => { this.datasrc_combo.value = data; });
-
-		this.datasrc_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
-		});
 
 		// preview method
 		let preview_combo = document.createElement("select");
@@ -1014,6 +1008,21 @@ class ManagerMenuDialog extends ComfyDialog {
 				}
 			});
 
+		// default ui state
+		let default_ui_combo = document.createElement("select");
+		default_ui_combo.setAttribute("title", "Set the default state to be displayed in the main menu when the browser starts.");
+		default_ui_combo.className = "cm-menu-combo";
+		default_ui_combo.appendChild($el('option', { value: 'none', text: 'Default UI: None' }, []));
+		default_ui_combo.appendChild($el('option', { value: 'history', text: 'Default UI: History' }, []));
+		default_ui_combo.appendChild($el('option', { value: 'queue', text: 'Default UI: Queue' }, []));
+		api.fetchApi('/manager/default_ui')
+			.then(response => response.text())
+			.then(data => { default_ui_combo.value = data; });
+
+		default_ui_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/default_ui?value=${event.target.value}`);
+		});
+
 
 		// share
 		let share_combo = document.createElement("select");
@@ -1032,6 +1041,47 @@ class ManagerMenuDialog extends ComfyDialog {
 			share_combo.appendChild($el('option', { value: option[0], text: `Share: ${option[1]}` }, []));
 		}
 
+		// default ui state
+		let component_policy_combo = document.createElement("select");
+		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
+		component_policy_combo.className = "cm-menu-combo";
+		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
+		api.fetchApi('/manager/component/policy')
+			.then(response => response.text())
+			.then(data => {
+				component_policy_combo.value = data;
+				set_component_policy(data);
+			});
+
+		component_policy_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/component/policy?value=${event.target.value}`);
+			set_component_policy(event.target.value);
+		});
+
+		let dbl_click_policy_combo = document.createElement("select");
+		dbl_click_policy_combo.setAttribute("title", "Sets the behavior when you double-click the title area of a node.");
+		dbl_click_policy_combo.className = "cm-menu-combo";
+		dbl_click_policy_combo.appendChild($el('option', { value: 'none', text: 'Double-Click: None' }, []));
+		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-all', text: 'Double-Click: Copy All Connections' }, []));
+		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-full', text: 'Double-Click: Copy All Connections and shape' }, []));
+		dbl_click_policy_combo.appendChild($el('option', { value: 'copy-input', text: 'Double-Click: Copy Input Connections' }, []));
+		dbl_click_policy_combo.appendChild($el('option', { value: 'possible-input', text: 'Double-Click: Possible Input Connections' }, []));
+		dbl_click_policy_combo.appendChild($el('option', { value: 'dual', text: 'Double-Click: Possible(left) + Copy(right)' }, []));
+
+		api.fetchApi('/manager/dbl_click/policy')
+			.then(response => response.text())
+			.then(data => {
+				dbl_click_policy_combo.value = data;
+				set_double_click_policy(data);
+			});
+
+		dbl_click_policy_combo.addEventListener('change', function (event) {
+			api.fetchApi(`/manager/dbl_click/policy?value=${event.target.value}`);
+			set_double_click_policy(event.target.value);
+		});
+
 		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
@@ -1051,51 +1101,16 @@ class ManagerMenuDialog extends ComfyDialog {
 			}
 		});
 
-		let component_policy_combo = document.createElement("select");
-		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
-		component_policy_combo.className = "cm-menu-combo";
-		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
-		api.fetchApi('/manager/policy/component')
-			.then(response => response.text())
-			.then(data => {
-				component_policy_combo.value = data;
-				set_component_policy(data);
-			});
-
-		component_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/policy/component?value=${event.target.value}`);
-			set_component_policy(event.target.value);
-		});
-
-		update_policy_combo = document.createElement("select");
-
-		if(isElectron)
-			update_policy_combo.style.display = 'none';
-		
-		update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
-		update_policy_combo.className = "cm-menu-combo";
-		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
-		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
-		api.fetchApi('/manager/policy/update')
-			.then(response => response.text())
-			.then(data => {
-				update_policy_combo.value = data;
-			});
-
-		update_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
-		});
-
 		return [
+			$el("div", {}, [this.update_check_checkbox, uc_checkbox_text]),
 			$el("br", {}, []),
 			this.datasrc_combo,
 			channel_combo,
 			preview_combo,
+			default_ui_combo,
 			share_combo,
 			component_policy_combo,
-			update_policy_combo,
+			dbl_click_policy_combo,
 			$el("br", {}, []),
 
 			$el("br", {}, []),
@@ -1115,13 +1130,18 @@ class ManagerMenuDialog extends ComfyDialog {
 						type: "button",
 						textContent: "Install PIP packages",
 						onclick:
-							async () => {
+							() => {
-								var url = await customPrompt("Please enumerate the pip packages to be installed.\n\nExample: insightface opencv-python-headless>=4.1.1\n", "");
+								var url = prompt("Please enumerate the pip packages to be installed.\n\nExample: insightface opencv-python-headless>=4.1.1\n", "");
 
 								if (url !== null) {
 									install_pip(url, self);
 								}
 							}
+					}),
+					$el("button.cm-experimental-button", {
+						type: "button",
+						textContent: "Unload models",
+						onclick: () => { free_models(); }
 					})
 				]),
 		];
@@ -1250,7 +1270,7 @@ class ManagerMenuDialog extends ComfyDialog {
 				$el("div.comfy-modal-content",
 					[
 						$el("tr.cm-title", {}, [
-								$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
+								$el("font", {size:6, color:"white"}, [`ComfyUI Manager Menu`])]
 							),
 						$el("br", {}, []),
 						$el("div.cm-menu-container",
@@ -1271,22 +1291,10 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
 	}
 
-	get isVisible() {
-		return this.element?.style?.display !== "none";
-	}
-
 	show() {
 		this.element.style.display = "block";
 	}
 
-	toggleVisibility() {
-		if (this.isVisible) {
-			this.close();
-		} else {
-			this.show();
-		}
-	}
-
 	handleWorkflowGalleryButtonClick(e) {
 		e.preventDefault();
 		e.stopPropagation();
@@ -1350,6 +1358,15 @@ class ManagerMenuDialog extends ComfyDialog {
 						modifyButtonStyle(url);
 					},
 				},
+				{
+					title: "Open 'flowt.ai'",
+					callback: () => {
+						const url = "https://flowt.ai/";
+						localStorage.setItem("wg_last_visited", url);
+						window.open(url, url);
+						modifyButtonStyle(url);
+					},
+				},
 				{
 					title: "Open 'esheep'",
 					callback: () => {
@@ -1387,57 +1404,9 @@ class ManagerMenuDialog extends ComfyDialog {
 	}
 }
 
-async function getVersion() {
-	let version = await api.fetchApi(`/manager/version`);
-	return await version.text();
-}
 
 app.registerExtension({
-	name: "Comfy.ManagerMenu",
+	name: "Comfy.ManagerExtMenu",
-
-	aboutPageBadges: [
-		{
-			label: `ComfyUI-Manager ${manager_version}`,
-			url: 'https://github.com/ltdrdata/ComfyUI-Manager',
-			icon: 'pi pi-th-large'
-		}
-	],
-
-	commands: [
-	{
-		id: "Comfy.Manager.Menu.ToggleVisibility",
-		label: "Toggle Manager Menu Visibility",
-		icon: "mdi mdi-puzzle",
-		function: () => {
-			if (!manager_instance) {
-				setManagerInstance(new ManagerMenuDialog());
-				manager_instance.show();
-			} else {
-				manager_instance.toggleVisibility();
-			}
-		},
-	},
-	{
-		id: "Comfy.Manager.CustomNodesManager.ToggleVisibility",
-		label: "Toggle Custom Nodes Manager Visibility",
-		icon: "pi pi-server",
-		function: () => {
-			if (CustomNodesManager.instance?.isVisible) {
-				CustomNodesManager.instance.close();
-				return;
-			}
-
-			if (!manager_instance) {
-				setManagerInstance(new ManagerMenuDialog());
-			}
-			if (!CustomNodesManager.instance) {
-				CustomNodesManager.instance = new CustomNodesManager(app, self);
-			}
-			CustomNodesManager.instance.show(CustomNodesManager.ShowMode.NORMAL);
-		},
-	}
-	],
-
 	init() {
 		$el("style", {
 			textContent: style,
@@ -1464,17 +1433,6 @@ app.registerExtension({
 			// new style Manager buttons
 			// unload models button into new style Manager button
 			let cmGroup = new (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup(
-				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
-					icon: "puzzle",
-					action: () => {
-						if(!manager_instance)
-							setManagerInstance(new ManagerMenuDialog());
-						manager_instance.show();
-					},
-					tooltip: "ComfyUI Manager",
-					content: "Manager",
-					classList: "comfyui-button comfyui-menu-mobile-collapse primary"
-				}).element,
                 new(await import("../../scripts/ui/components/button.js")).ComfyButton({
                     icon: "star",
                     action: () => {
@@ -1486,7 +1444,18 @@ app.registerExtension({
                         }
                         CustomNodesManager.instance.show(CustomNodesManager.ShowMode.FAVORITES);
                     },
-					tooltip: "Show favorite custom node list"
+                    tooltip: "Show favorite custom node list",
+                    content: "Manager",
+                    classList: "comfyui-button comfyui-menu-mobile-collapse primary"
+                }).element,
+                new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+                    icon: "puzzle",
+                    action: () => {
+                        if(!manager_instance)
+                            setManagerInstance(new ManagerMenuDialog());
+                        manager_instance.show();
+                    },
+                    tooltip: "ComfyUI Manager",
                 }).element,
 				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
 					icon: "vacuum-outline",
@@ -1632,3 +1601,27 @@ app.registerExtension({
 		}
 	},
 });
+
+
+async function set_default_ui()
+{
+	let res = await api.fetchApi('/manager/default_ui');
+	if(res.status == 200) {
+		let mode = await res.text();
+		switch(mode) {
+		case 'history':
+			app.ui.queue.hide();
+			app.ui.history.show();
+			break;
+		case 'queue':
+			app.ui.queue.show();
+			app.ui.history.hide();
+			break;
+		default:
+			// do nothing
+			break;
+		}
+	}
+}
+
+set_default_ui();

js/comfyui-share-common.js

@@ -4,7 +4,6 @@ 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",
@@ -253,9 +252,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(", ");
-          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.`);
+          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.`);
         } else {
-          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.");
+          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.");
         }
         return false;
       }
@@ -337,7 +336,7 @@ export class ShareDialogChooser extends ComfyDialog {
 				key: "Copus",
 				textContent: "Copus",
 				website: "https://www.copus.io",
-				description: "🔴 Earn simple. Get paid from your ComfyUI workflows—no revenue sharing. Ever.",
+				description: "🔴 Permanently store and secure ownership of your workflow on the open-source platform: <a style='color:var(--input-text);' href='https://copus.io' target='_blank'>Copus.io</a>",
 				onclick: () => {
 					showCopusShareDialog();
 				  this.close();
@@ -357,8 +356,7 @@ export class ShareDialogChooser extends ComfyDialog {
 			});
 
 			buttons.forEach(b => {
-				const button = $el("button", 
+				const button = $el("button", {
-					{
 					type: "button",
 					textContent: b.textContent,
 					onclick: b.onclick,
@@ -371,14 +369,8 @@ export class ShareDialogChooser extends ComfyDialog {
 						'padding': '5px 5px',
 						'margin-bottom': '5px',
 						'transition': 'background-color 0.3s',
-						'position':'relative'
 					}
-				},
+				});
-				[
-					$el("span", { style: { 
-					 } }),
-				]
-			);
 				button.addEventListener('mouseover', () => {
 					button.style.backgroundColor = '#007BFF'; // Change color on hover
 				});
@@ -396,28 +388,6 @@ export class ShareDialogChooser extends ComfyDialog {
 					},
 				});
 
-				const copus_ui =$el("div", { style: { 
-					'position': 'absolute',
-					'height': '100%',
-					'left': '-25px',
-					'top': '-26px',
-					'width': '100%',
-					'z-index':'-1',
-					'background':'url("https://static.copus.io/images/client/202412/test/f28ac6ef8f4c6f3d5d50856a272ed02c.png")',
-					'background-repeat': 'no-repeat',
-				} });
-				const copus_ui_bottom =$el("div", { style: { 
-					'position': 'absolute',
-					'height': '100%',
-					'left': '25px',
-					'bottom': '-26px',
-					'width': '100%',
-					'transform':'scale(-1, -1)',
-					'z-index':'-1',
-					'background':'url("https://static.copus.io/images/client/202412/test/f28ac6ef8f4c6f3d5d50856a272ed02c.png")',
-					'background-repeat': 'no-repeat',
-				} });
-
 				const websiteLink = $el("a", {
 					textContent: "🌐 Website",
 					href: b.website,
@@ -447,6 +417,7 @@ export class ShareDialogChooser extends ComfyDialog {
 						'margin-bottom': '10px',
 					}
 				}, [button, websiteLink]);
+
 				const column = $el("div", {
 					style: {
 						'flex-basis': '100%',
@@ -455,17 +426,8 @@ export class ShareDialogChooser extends ComfyDialog {
 						'border': '1px solid #ddd',
 						'border-radius': '5px',
 						'box-shadow': '0 2px 4px rgba(0, 0, 0, 0.1)',
-						'position':'relative'
 					}
-				}, [buttonLinkContainer, description
+				}, [buttonLinkContainer, description]);
-					, 
-					b.key ==='Copus' ?
-					copus_ui
-					:'',
-					b.key ==='Copus' ?
-					copus_ui_bottom
-					:'',
-				]);
 
 				container.appendChild(column);
 			});
@@ -513,7 +475,7 @@ export class ShareDialogChooser extends ComfyDialog {
 	}
 	show() {
 		this.element.style.display = "block";
-		this.element.style.zIndex = 1099;
+		this.element.style.zIndex = 10001;
 	}
 }
 export class ShareDialog extends ComfyDialog {
@@ -862,7 +824,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) {
-					customAlert("Please set your Matrix account details.");
+					alert("Please set your Matrix account details.");
 					return;
 				}
 			}
@@ -879,9 +841,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(", ");
-					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.`);
+					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.`);
 				} else {
-					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.");
+					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.");
 				}
 				this.selectedOutputIndex = 0;
 				this.close();
@@ -919,16 +881,16 @@ export class ShareDialog extends ComfyDialog {
 				try {
 					const response_json = await response.json();
 					if (response_json.error) {
-						customAlert(response_json.error);
+						alert(response_json.error);
 						this.close();
 						return;
 					} else {
-						customAlert("Failed to share your art. Please try again.");
+						alert("Failed to share your art. Please try again.");
 						this.close();
 						return;
 					}
 				} catch (e) {
-					customAlert("Failed to share your art. Please try again.");
+					alert("Failed to share your art. Please try again.");
 					this.close();
 					return;
 				}

js/comfyui-share-copus.js

@@ -1,15 +1,13 @@
 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";
 
-let API_ENDPOINT = "https://api.client.prod.copus.io";
+let API_ENDPOINT = "https://api.client.prod.copus.io/copus-client";
 
 if (env !== "prod") {
-  API_ENDPOINT = "https://api.test.copus.io";
+  API_ENDPOINT = "https://api.dev.copus.io/copus-client";
   DEFAULT_HOMEPAGE_URL = "https://test.copus.io";
 }
 
@@ -63,7 +61,6 @@ export class CopusShareDialog extends ComfyDialog {
       [$el("div.comfy-modal-content", {}, [...this.createButtons()])]
     );
     this.selectedOutputIndex = 0;
-    this.selectedOutput_lock = 0;
     this.selectedNodeId = null;
     this.uploadedImages = [];
     this.allFilesImages = [];
@@ -193,36 +190,10 @@ export class CopusShareDialog extends ComfyDialog {
       type: "text",
       placeholder: "Subtitle (Optional)",
       style: inputStyle,
-      maxLength: "350",
+      maxLength: "70",
       oninput: () => {
         const titleNum = this.SubTitleInput.value.length;
-        subTitleNumDom.textContent = `${titleNum}/350`;
+        subTitleNumDom.textContent = `${titleNum}/70`;
-      },
-    });
-    this.LockInput = $el("input", {
-      type: "text",
-      placeholder: "",
-      style:  {
-        width: "100px",
-        padding: "7px",
-        borderRadius: "4px",
-        border: "1px solid #ddd",
-        boxSizing: "border-box",
-      },
-      oninput: (event) => {
-        let input = event.target.value;
-        // Use a regular expression to match a number with up to two decimal places
-        const regex = /^\d*\.?\d{0,2}$/;
-        if (!regex.test(input)) {
-          // If the input doesn't match, remove the last entered character
-          event.target.value = input.slice(0, -1);
-        }
-        const numericValue = parseFloat(input);
-        if (numericValue > 9999) {
-          input = "9999";
-        }
-        // Update the input field with the valid value
-        event.target.value = input;
       },
     });
     this.descriptionInput = $el("textarea", {
@@ -326,7 +297,7 @@ export class CopusShareDialog extends ComfyDialog {
           color: "#999",
         },
       },
-      ["0/350"]
+      ["0/70"]
     );
     const descriptionNumDom = $el(
       "label",
@@ -362,59 +333,6 @@ export class CopusShareDialog extends ComfyDialog {
       // descriptionNumDom,
     ]);
     // switch  between outputs section and additional inputs section
-    this.radioButtons_lock = [];
-
-    this.radioButtonsCheck_lock = $el("input", {
-      type: "radio",
-      name: "output_type_lock",
-      value: "0",
-      id: "blockchain1_lock",
-      checked: true,
-    });
-    this.radioButtonsCheckOff_lock = $el("input", {
-      type: "radio",
-      name: "output_type_lock",
-      value: "1",
-      id: "blockchain_lock",
-    });
-
-    const blockChainSection_lock = $el("div", { style: sectionStyle }, [
-      $el("label", { style: labelStyle }, ["6️⃣ Pay to download"]),
-      $el(
-        "label",
-        {
-          style: {
-            marginTop: "10px",
-            display: "flex",
-            alignItems: "center",
-            cursor: "pointer",
-          },
-        },
-        [
-          this.radioButtonsCheck_lock,
-          $el("div", { style: { marginLeft: "5px" ,display:'flex',alignItems:'center'} }, [
-            $el("span", { style: { marginLeft: "5px" } }, ["ON"]),
-            $el("span", { style: { marginLeft: "20px",marginRight:'10px' ,color:'#fff'} }, ["Price US$"]),
-            this.LockInput
-          ]),
-        ]
-      ),
-      $el(
-        "label",
-        { style: { display: "flex", alignItems: "center", cursor: "pointer" } },
-        [
-          this.radioButtonsCheckOff_lock,
-          $el("span", { style: { marginLeft: "5px" } }, ["OFF"]),
-        ]
-      ),
-      
-      $el(
-        "p",
-        { style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
-        ["Get paid from your workflow. You can change the price and withdraw your earnings on Copus."]
-      ),
-    ]);
-
     this.radioButtons = [];
 
     this.radioButtonsCheck = $el("input", {
@@ -432,7 +350,7 @@ export class CopusShareDialog extends ComfyDialog {
     });
 
     const blockChainSection = $el("div", { style: sectionStyle }, [
-      $el("label", { style: labelStyle }, ["7️⃣ Store on blockchain "]),
+      $el("label", { style: labelStyle }, ["6️⃣ Store on blockchain "]),
       $el(
         "label",
         {
@@ -462,8 +380,6 @@ export class CopusShareDialog extends ComfyDialog {
         ["Secure ownership with a permanent & decentralized storage"]
       ),
     ]);
-
-
     // Message Section
     this.message = $el(
       "div",
@@ -525,7 +441,6 @@ export class CopusShareDialog extends ComfyDialog {
       SubtitleSection,
       DescriptionSection,
       // contestSection,
-      blockChainSection_lock,
       blockChainSection,
       this.message,
       buttonsSection,
@@ -605,7 +520,7 @@ export class CopusShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      customAlert(e.message);
+      alert(e.message);
     }
     this.shareButton.disabled = false;
     this.shareButton.textContent = "Share";
@@ -628,8 +543,6 @@ export class CopusShareDialog extends ComfyDialog {
       subTitle: this.SubTitleInput.value,
       content: this.descriptionInput.value,
       storeOnChain: this.radioButtonsCheck.checked ? true : false,
-      lockState:this.radioButtonsCheck_lock.checked ? 2 : 0,
-      unlockPrice:this.LockInput.value,
     };
 
     if (!this.keyInput.value) {
@@ -644,12 +557,6 @@ export class CopusShareDialog extends ComfyDialog {
       throw new Error("Title is required");
     }
 
-    if(this.radioButtonsCheck_lock.checked){
-      if (!this.LockInput.value){
-        throw new Error("Price is required");
-      }
-    }
-
     if (!this.uploadedImages.length) {
       if (this.selectedFile) {
         await this.uploadThumbnail(this.selectedFile);

js/comfyui-share-openart.js

@@ -1,7 +1,6 @@
 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";
@@ -432,7 +431,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      customAlert(e.message);
+      alert(e.message);
     }
     this.shareButton.disabled = false;
     this.shareButton.textContent = "Share";

js/comfyui-share-youml.js

@@ -1,7 +1,6 @@
 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";
@@ -348,7 +347,7 @@ export class YouMLShareDialog extends ComfyDialog {
       this.shareButton.textContent = "Sharing...";
       await this.share();
     } catch (e) {
-      customAlert(e.message);
+      alert(e.message);
     } finally {
       this.shareButton.disabled = false;
       this.shareButton.textContent = "Share";

js/common.js

@@ -1,182 +1,42 @@
 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 = 1100;
+	app.ui.dialog.element.style.zIndex = 10010;
 }
 
 export async function sleep(ms) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-export async function customConfirm(message) {
-	try {
-		let res = await
-			window['app'].extensionManager.dialog
-			.confirm({
-				title: 'Confirm',
-				message: message
-			});
-
-		return res;
-	}
-	catch {
-		let res = await internalCustomConfirm(message);
-		return res;
-	}
-}
-
-
-export function customAlert(message) {
-	try {
-		window['app'].extensionManager.toast.addAlert(message);
-	}
-	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) {
+	if (confirm("Are you sure you'd like to reboot the server?")) {
-			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) {}
+		catch(exception) {
+
+		}
+		return true;
+	}
+
+	return false;
+}
+
+
+export async function migrateAPI() {
+	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 {
+			await api.fetchApi("/manager/migrate_unmanaged_nodes");
+			api.fetchApi("/manager/reboot");
+		}
+		catch(exception) {
+
+		}
+		return true;
 	}
-	});
 
 	return false;
 }
@@ -388,267 +248,10 @@ 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, customConfirm, customAlert } from "./common.js";
+import { sleep, show_message } 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;
 }
 
-async function handle_import_components(components) {
+function handle_import_components(components) {
 	let msg = 'Components:\n';
 	let cnt = 0;
 	for(let name in components) {
@@ -387,9 +387,8 @@ async function handle_import_components(components) {
 
 	let last_name = null;
 	msg += '\nWill you load components?\n';
-	const confirmed = await customConfirm(msg);
+	if(confirm(msg)) {
-	if(confirmed) {
+		let mode = confirm('\nWill you save components?\n(cancel=load without save)');
-		const mode = await customConfirm('\nWill you save components?\n(cancel=load without save)');
 
 		for(let name in components) {
 			let component = components[name];
@@ -412,7 +411,7 @@ async function handle_import_components(components) {
 	}
 }
 
-async function handlePaste(e) {
+function handlePaste(e) {
 	let data = (e.clipboardData || window.clipboardData);
 	const items = data.items;
 	for(const item of items) {
@@ -422,7 +421,7 @@ async 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;
-					await handle_import_components(json_data.components);
+					handle_import_components(json_data.components);
 
 					// disable paste node
 					localStorage.removeItem("litegrapheditor_clipboard", null);
@@ -456,7 +455,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 		this.invalidateControl();
 
 		this.element.style.display = "block";
-		this.element.style.zIndex = 1099;
+		this.element.style.zIndex = 10001;
 		this.element.style.width = "500px";
 		this.element.style.height = "480px";
 	}
@@ -622,7 +621,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 				self.version_string.value = self.default_ver;
 			}
 			else {
-				customAlert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
+				alert('If you are not the author, it is not recommended to change the version, as it may cause component update issues.');
 			}
 		};
 
@@ -678,7 +677,7 @@ export class ComponentBuilderDialog extends ComfyDialog {
 
 let orig_handleFile = app.handleFile;
 
-async function handleFile(file) {
+function handleFile(file) {
 	if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
 		const reader = new FileReader();
 		reader.onload = async () => {
@@ -691,7 +690,7 @@ async function handleFile(file) {
 			}
 
 			if(is_component) {
-				await handle_import_components(jsonContent);
+				handle_import_components(jsonContent);
 			}
 			else {
 				orig_handleFile.call(app, file);
@@ -709,7 +708,7 @@ app.handleFile = handleFile;
 
 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/manager/policy/component')
+	api.fetchApi('/manager/component/policy')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }

js/custom-nodes-manager.css

@@ -1,699 +0,0 @@
-.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

@@ -1,213 +0,0 @@
-.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,18 +1,220 @@
-import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
 import { 
 	manager_instance, rebootAPI, 
-	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
+	fetchData, md5, icons 
-	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";
 
-loadCss("./model-manager.css");
+const pageCss = `
+.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;
+}
 
-const gridId = "model";
+.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-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">
@@ -33,14 +235,7 @@ const pageHtml = `
 <div class="cmm-manager-selection"></div>
 <div class="cmm-manager-message"></div>
 <div class="cmm-manager-footer">
-	<button class="cmm-manager-back">
+	<button class="cmm-manager-back">Back</button>
-		<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>
 `;
@@ -59,11 +254,17 @@ 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"
@@ -81,13 +282,10 @@ export class ModelManager {
 			value: ""
 		}, {
 			label: "Installed",
-			value: "installed"
+			value: "True"
 		}, {
 			label: "Not Installed",
-			value: "not_installed"
+			value: "False"
-		}, {
-			label: "In Workflow",
-			value: "in_workflow"
 		}];
 
 		this.typeList = [{
@@ -167,25 +365,12 @@ 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);
@@ -217,10 +402,6 @@ 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;
@@ -257,31 +438,12 @@ export class ModelManager {
 			rowFilter: (rowItem) => {
 
 				const searchableColumns = ["name", "type", "base", "description", "filename", "save_path"];
-				const models_extensions = ['.ckpt', '.pt', '.pt2', '.bin', '.pth', '.safetensors', '.pkl', '.sft'];
 
 				let shouldShown = grid.highlightKeywordsFilter(rowItem, searchableColumns, this.keywords);
 
 				if (shouldShown) {
-					if(this.filter) {
+					if(this.filter && rowItem.installed !== this.filter) {
-						if (this.filter == "in_workflow") {
+						return false;
-							rowItem.in_workflow = null;
-							if (Array.isArray(app.graph._nodes)) {
-								app.graph._nodes.forEach((item, i) => {
-									if (Array.isArray(item.widgets_values)) {
-										item.widgets_values.forEach((_item, i) => {
-											if (rowItem.in_workflow === null && _item !== null && models_extensions.includes("." + _item.toString().split('.').pop())) {
-												let filename = _item.match(/([^\/]+)(?=\.\w+$)/)[0];
-												if (grid.highlightKeywordsFilter(rowItem, searchableColumns, filename)) {
-													rowItem.in_workflow = "True";
-													grid.highlightKeywordsFilter(rowItem, searchableColumns, "");
-												}
-											}
-										});
-									}
-								});
-							}
-						}
-						return ((this.filter == "installed" && rowItem.installed == "True") || (this.filter == "not_installed" && rowItem.installed == "False") || (this.filter == "in_workflow" && rowItem.in_workflow == "True"));
 					}
 
 					if(this.type && rowItem.type !== this.type) {
@@ -356,7 +518,7 @@ export class ModelManager {
 			sortable: false,
 			align: 'center',
 			formatter: (url, rowItem, columnItem) => {
-				return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
+				return `<a class="cmm-btn-download" title="Download file" href="${url}" target="_blank">${icons.download}</a>`;
 			}
 		}, {
 			id: 'size',
@@ -391,8 +553,6 @@ export class ModelManager {
 			width: 200
 		}];
 
-		restoreColumnWidth(gridId, columns);
-
 		this.grid.setData({
 			options,
 			rows,
@@ -435,27 +595,17 @@ 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 needRefresh = false;
+		let needRestart = 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(() => {
@@ -466,112 +616,48 @@ export class ModelManager {
 			this.showStatus(`Install ${item.name} ...`);
 
 			const data = item.originalData;
-			data.ui_id = item.hash;
+			const res = await fetchData('/model/install', {
-
-			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.status == 403) {
+			if (res.error) {
-					errorMsg += `This action is not allowed with this security level configuration.\n`;
+				errorMsg = `Install failed: ${item.name} ${res.error.message}`;
-				} else {
+				break;;
-					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;
-//			self.grid.updateCell(item, "tg-column-select");
+			this.grid.updateCell(item, "installed");
-			self.grid.updateRow(item);
+			this.grid.updateCell(item, "tg-column-select");
-		}
+
-		else if(event.detail.status == 'done') {
+			this.showStatus(`Install ${item.name} successfully`);
-			self.hideStop();
+
-			self.onQueueCompleted(event.detail);
-		}
 		}
 
-	async onQueueCompleted(info) {
+		this.hideLoading();
-		let result = info.model_result;
-
-		if(result.length == 0) {
-			return;
-		}
-
-		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) {
-			self.showError(errorMsg);
+			this.showError(errorMsg);
-			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			self.showStatus(`Install ${result.length} models successfully`);
+			this.showStatus(`Install ${list.length} models successfully`);
 		}
 
-		self.showRefresh();
+		if (needRestart) {
-		self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red")
+			this.showMessage(`To apply the installed model, please click the 'Refresh' button on the main menu.`, "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();
 
@@ -740,7 +826,7 @@ export class ModelManager {
 	}
 
 	showLoading() {
-//		this.setDisabled(true);
+		this.setDisabled(true);
 		if (this.grid) {
 			this.grid.showLoading();
 			this.grid.showMask({
@@ -750,7 +836,7 @@ export class ModelManager {
 	}
 
 	hideLoading() {
-//		this.setDisabled(false);
+		this.setDisabled(false);
 		if (this.grid) {
 			this.grid.hideLoading();
 			this.grid.hideMask();
@@ -758,9 +844,8 @@ 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",
@@ -772,7 +857,7 @@ export class ModelManager {
 		})
 		.flat()
 		.filter(it => {
-			return it !== $close && it !== $refresh && it !== $stop;
+			return it !== $close;
 		});
 		
 		list.forEach($elem => {
@@ -789,18 +874,6 @@ 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,6 +1,16 @@
 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 () {
@@ -143,6 +153,62 @@ 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

@@ -1,619 +0,0 @@
-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 = 1099;
+			this.element.style.zIndex = 10001;
 		}
 		catch(exception) {
 			app.ui.dialog.show(`Failed to get external model list. / ${exception}`);

js/workflow-metadata.js

@@ -1,84 +0,0 @@
-/**
- * Attaches metadata to the workflow on save
- * - custom node pack version to all custom nodes used in the workflow
- *
- * Example metadata:
- * "nodes": {
- *   "1": {
- *     type: "CheckpointLoaderSimple",
- *     ...
- *     properties: {
- *       cnr_id: "comfy-core",
- *       version: "0.3.8",
- *     },
- *   },
- * }
- *
- * @typedef {Object} NodeInfo
- * @property {string} ver - Version (git hash or semantic version)
- * @property {string} cnr_id - ComfyRegistry node ID
- * @property {boolean} enabled - Whether the node is enabled
- */
-
-import { app } from "../../scripts/app.js";
-import { api } from "../../scripts/api.js";
-
-class WorkflowMetadataExtension {
-  constructor() {
-    this.name = "Comfy.CustomNodesManager.WorkflowMetadata";
-    this.installedNodes = {};
-    this.comfyCoreVersion = null;
-  }
-
-  /**
-   * Get the installed nodes info
-   * @returns {Promise<Record<string, NodeInfo>>} The mapping from node name to its info.
-   * ver can either be a git commit hash or a semantic version such as "1.0.0"
-   * cnr_id is the id of the node in the ComfyRegistry
-   * enabled is true if the node is enabled, false if it is disabled
-   */
-  async getInstalledNodes() {
-    const res = await api.fetchApi("/customnode/installed");
-    return await res.json();
-  }
-
-  async init() {
-    this.installedNodes = await this.getInstalledNodes();
-    this.comfyCoreVersion = (await api.getSystemStats()).system.comfyui_version;
-  }
-
-  /**
-   * Called when any node is created
-   * @param {LGraphNode} node The newly created node
-   */
-  nodeCreated(node) {
-    try {
-      // nodeData doesn't exist if node is missing or node is frontend only node
-      if (!node?.constructor?.nodeData?.python_module) return;
-
-      const nodeProperties = (node.properties ??= {});
-      const modules = node.constructor.nodeData.python_module.split(".");
-      const moduleType = modules[0];
-
-      if (moduleType === "custom_nodes") {
-        const nodePackageName = modules[1];
-        const { cnr_id, aux_id, ver } =
-          this.installedNodes[nodePackageName] ??
-          this.installedNodes[nodePackageName.toLowerCase()] ??
-          {};
-
-        if (cnr_id === "comfy-core") return; // don't allow hijacking comfy-core name
-        if (cnr_id) nodeProperties.cnr_id = cnr_id;
-        else nodeProperties.aux_id = aux_id;
-        if (ver) nodeProperties.ver = ver.trim();
-      } else if (["nodes", "comfy_extras", "comfy_api_nodes"].includes(moduleType)) {
-        nodeProperties.cnr_id = "comfy-core";
-        nodeProperties.ver = this.comfyCoreVersion;
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }
-}
-
-app.registerExtension(new WorkflowMetadataExtension());

migration_js/migration.js

@@ -0,0 +1,34 @@
+import { app } from "../../scripts/app.js";
+import { api } from "../../scripts/api.js";
+
+app.registerExtension({
+	name: "Comfy.ManagerExtMenu",
+	init() {
+		$el("style", {
+			textContent: style,
+			parent: document.head,
+		});
+	},
+	async setup() {
+			let cmGroup = new (await import("../../scripts/ui/components/buttonGroup.js")).ComfyButtonGroup(
+				new(await import("../../scripts/ui/components/button.js")).ComfyButton({
+					icon: "puzzle",
+					action: async () => {
+						if(confirm('As some features of ComfyUI Manager have been integrated into ComfyUI, they have been separated into manager-core.\n\nComfyUI Manager only includes additional extension features that are not provided by manager-core.\n\nWill you install manager-core?')) {
+							app.ui.dialog.show('Installing manager-core...');
+							app.ui.dialog.element.style.zIndex = 10010;
+
+							await api.fetchApi("/manager/install_manager_core");
+
+							app.ui.dialog.show('The installation of manager-core will be completed after restarting.');
+						}
+					},
+					tooltip: "Need to install manager-core",
+					content: "Manager (Need To Install)",
+					classList: "comfyui-button comfyui-menu-mobile-collapse primary"
+				}).element
+			);
+
+			app.menu?.settingsGroup.element.before(cmGroup.element);
+	}
+});

modules/manager_ext_core.py

@@ -0,0 +1,113 @@
+import os
+import sys
+import configparser
+import manager_core as core
+import cm_global
+from manager_util import *
+import shutil
+
+import folder_paths
+from comfy.cli_args import args
+import latent_preview
+
+
+version_code = [3, 0, 1]
+version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
+
+DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
+
+manager_ext_config_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'manager-ext.ini'))
+cached_config = None
+
+manager_ext_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+channel_list_path = os.path.join(manager_ext_path, 'channels.list')
+
+
+def update_channel_dict():
+    if not os.path.exists(channel_list_path):
+        shutil.copy(channel_list_path+'.template', channel_list_path)
+
+    core.get_channel_dict() # for the loading
+
+    with open(os.path.join(manager_ext_path, 'channels.list'), 'r') as file:
+        channels = file.read()
+        for x in channels.split('\n'):
+            channel_info = x.split("::")
+            if len(channel_info) == 2:
+                core.channel_dict[channel_info[0]] = channel_info[1]
+
+
+update_channel_dict()
+
+
+def get_current_preview_method():
+    if args.preview_method == latent_preview.LatentPreviewMethod.Auto:
+        return "auto"
+    elif args.preview_method == latent_preview.LatentPreviewMethod.Latent2RGB:
+        return "latent2rgb"
+    elif args.preview_method == latent_preview.LatentPreviewMethod.TAESD:
+        return "taesd"
+    else:
+        return "none"
+
+
+def write_config():
+    config = configparser.ConfigParser()
+    config['default'] = {
+        'preview_method': get_current_preview_method(),
+        'share_option': get_config()['share_option'],
+        'default_ui': get_config()['default_ui'],
+        'component_policy': get_config()['component_policy'],
+        'double_click_policy': get_config()['double_click_policy'],
+        'security_level': get_config()['security_level'],
+    }
+
+    directory = os.path.dirname(manager_ext_config_path)
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+
+    with open(manager_ext_config_path, 'w') as configfile:
+        config.write(configfile)
+
+
+def read_config():
+    try:
+        config = configparser.ConfigParser()
+        config.read(manager_ext_config_path)
+        default_conf = config['default']
+
+        # policy migration: disable_unsecure_features -> security_level
+        security_level = default_conf['security_level'] if 'security_level' in default_conf else 'normal'
+
+        return {
+                    'preview_method': default_conf['preview_method'] if 'preview_method' in default_conf else get_current_preview_method(),
+                    'share_option': default_conf['share_option'] if 'share_option' in default_conf else 'all',
+                    'default_ui': default_conf['default_ui'] if 'default_ui' in default_conf else 'none',
+                    'component_policy': default_conf['component_policy'] if 'component_policy' in default_conf else 'workflow',
+                    'double_click_policy': default_conf['double_click_policy'] if 'double_click_policy' in default_conf else 'copy-all',
+                    'security_level': security_level
+               }
+
+    except Exception:
+        return {
+            'preview_method': get_current_preview_method(),
+            'share_option': 'all',
+            'default_ui': 'none',
+            'component_policy': 'workflow',
+            'double_click_policy': 'copy-all',
+            'security_level': 'normal',
+        }
+
+
+def get_config():
+    global cached_config
+
+    if cached_config is None:
+        cached_config = read_config()
+
+    return cached_config
+
+
+def pip_install(packages):
+    install_cmd = ['#FORCE', sys.executable, "-m", "pip", "install", '-U'] + packages
+    core.try_install_script('pip install via manager', '..', install_cmd)

modules/manager_ext_server.py

@@ -0,0 +1,745 @@
+import traceback
+
+import folder_paths
+import locale
+import concurrent
+import nodes
+import os
+import sys
+import re
+import git
+
+from server import PromptServer
+import manager_core as core
+import cm_global
+
+from . import manager_ext_core as ext_core
+from . import manager_ext_util
+
+print(f"### Loading: ComfyUI-Manager (ext) ({ext_core.version_str})")
+
+comfy_ui_hash = "-"
+
+SECURITY_MESSAGE_MIDDLE_OR_BELOW = f"ERROR: To use this action, a security_level of `middle or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+SECURITY_MESSAGE_NORMAL_MINUS = f"ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+SECURITY_MESSAGE_GENERAL = f"ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
+
+routes = PromptServer.instance.routes
+
+
+def handle_stream(stream, prefix):
+    stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
+    for msg in stream:
+        if prefix == '[!]' and ('it/s]' in msg or 's/it]' in msg) and ('%|' in msg or 'it [' in msg):
+            if msg.startswith('100%'):
+                print('\r' + msg, end="", file=sys.stderr),
+            else:
+                print('\r' + msg[:-1], end="", file=sys.stderr),
+        else:
+            if prefix == '[!]':
+                print(prefix, msg, end="", file=sys.stderr)
+            else:
+                print(prefix, msg, end="")
+
+
+from comfy.cli_args import args
+import latent_preview
+
+
+is_local_mode = args.listen.startswith('127.') or args.listen.startswith('local.')
+
+
+def is_allowed_security_level(level):
+    if level == 'block':
+        return False
+    elif level == 'high':
+        if is_local_mode:
+            return core.get_config()['security_level'].lower() in ['weak', 'normal-']
+        else:
+            return core.get_config()['security_level'].lower() == 'weak'
+    elif level == 'middle':
+        return core.get_config()['security_level'].lower() in ['weak', 'normal', 'normal-']
+    else:
+        return True
+
+
+async def get_risky_level(files, pip_packages):
+    json_data1 = await core.get_data_by_mode('local', 'custom-node-list.json')
+    json_data2 = await core.get_data_by_mode('cache', 'custom-node-list.json', channel_url='https://github.com/ltdrdata/ComfyUI-Manager/raw/main')
+
+    all_urls = set()
+    for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
+        all_urls.update(x['files'])
+
+    for x in files:
+        if x not in all_urls:
+            return "high"
+
+    all_pip_packages = set()
+    for x in json_data1['custom_nodes'] + json_data2['custom_nodes']:
+        if "pip" in x:
+            all_pip_packages.update(x['pip'])
+
+    for p in pip_packages:
+        if p not in all_pip_packages:
+            return "block"
+
+    return "middle"
+
+
+from manager_downloader import download_url
+
+components_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'components'))
+
+
+def set_preview_method(method):
+    if method == 'auto':
+        args.preview_method = latent_preview.LatentPreviewMethod.Auto
+    elif method == 'latent2rgb':
+        args.preview_method = latent_preview.LatentPreviewMethod.Latent2RGB
+    elif method == 'taesd':
+        args.preview_method = latent_preview.LatentPreviewMethod.TAESD
+    else:
+        args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
+
+    ext_core.get_config()['preview_method'] = args.preview_method
+
+
+set_preview_method(ext_core.get_config()['preview_method'])
+
+
+def set_default_ui_mode(mode):
+    ext_core.get_config()['default_ui'] = mode
+
+
+def set_component_policy(mode):
+    ext_core.get_config()['component_policy'] = mode
+
+
+def set_double_click_policy(mode):
+    ext_core.get_config()['double_click_policy'] = mode
+
+
+# Expand Server api
+import server
+from aiohttp import web
+import aiohttp
+import json
+import zipfile
+import urllib.request
+
+
+def check_state_of_git_node_pack(node_packs, do_fetch=False, do_update_check=True, do_update=False):
+    if do_fetch:
+        print("Start fetching...", end="")
+    elif do_update:
+        print("Start updating...", end="")
+    elif do_update_check:
+        print("Start update check...", end="")
+
+    def process_custom_node(item):
+        core.check_state_of_git_node_pack_single(item, do_fetch, do_update_check, do_update)
+
+    with concurrent.futures.ThreadPoolExecutor(4) as executor:
+        for k, v in node_packs.items():
+            if v.get('active_version') in ['unknown', 'nightly']:
+                executor.submit(process_custom_node, v)
+
+    if do_fetch:
+        print(f"\x1b[2K\rFetching done.")
+    elif do_update:
+        update_exists = any(item.get('updatable', False) for item in node_packs.values())
+        if update_exists:
+            print(f"\x1b[2K\rUpdate done.")
+        else:
+            print(f"\x1b[2K\rAll extensions are already up-to-date.")
+    elif do_update_check:
+        print(f"\x1b[2K\rUpdate check done.")
+
+
+def nickname_filter(json_obj):
+    preemptions_map = {}
+
+    for k, x in json_obj.items():
+        if 'preemptions' in x[1]:
+            for y in x[1]['preemptions']:
+                preemptions_map[y] = k
+        elif k.endswith("/ComfyUI"):
+            for y in x[0]:
+                preemptions_map[y] = k
+
+    updates = {}
+    for k, x in json_obj.items():
+        removes = set()
+        for y in x[0]:
+            k2 = preemptions_map.get(y)
+            if k2 is not None and k != k2:
+                removes.add(y)
+
+        if len(removes) > 0:
+            updates[k] = [y for y in x[0] if y not in removes]
+
+    for k, v in updates.items():
+        json_obj[k][0] = v
+
+    return json_obj
+
+
+@routes.get("/customnode/getmappings")
+async def fetch_customnode_mappings(request):
+    """
+    provide unified (node -> node pack) mapping list
+    """
+    mode = request.rel_url.query["mode"]
+
+    nickname_mode = False
+    if mode == "nickname":
+        mode = "local"
+        nickname_mode = True
+
+    json_obj = await core.get_data_by_mode(mode, 'extension-node-map.json')
+    json_obj = core.map_to_unified_keys(json_obj)
+
+    if nickname_mode:
+        json_obj = nickname_filter(json_obj)
+
+    all_nodes = set()
+    patterns = []
+    for k, x in json_obj.items():
+        all_nodes.update(set(x[0]))
+
+        if 'nodename_pattern' in x[1]:
+            patterns.append((x[1]['nodename_pattern'], x[0]))
+
+    missing_nodes = set(nodes.NODE_CLASS_MAPPINGS.keys()) - all_nodes
+
+    for x in missing_nodes:
+        for pat, item in patterns:
+            if re.match(pat, x):
+                item.append(x)
+
+    return web.json_response(json_obj, content_type='application/json')
+
+
+@routes.get("/customnode/fetch_updates")
+async def fetch_updates(request):
+    try:
+        if request.rel_url.query["mode"] == "local":
+            channel = 'local'
+        else:
+            channel = core.get_config()['channel_url']
+
+        await core.unified_manager.reload(request.rel_url.query["mode"])
+        await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
+
+        res = core.unified_manager.fetch_or_pull_git_repo(is_pull=False)
+
+        for x in res['failed']:
+            print(f"FETCH FAILED: {x}")
+
+        print("\nDone.")
+
+        if len(res['updated']) > 0:
+            return web.Response(status=201)
+
+        return web.Response(status=200)
+    except:
+        traceback.print_exc()
+        return web.Response(status=400)
+
+
+@routes.get("/customnode/update_all")
+async def update_all(request):
+    if not is_allowed_security_level('middle'):
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
+        return web.Response(status=403)
+
+    try:
+        core.save_snapshot_with_postfix('autosave')
+
+        if request.rel_url.query["mode"] == "local":
+            channel = 'local'
+        else:
+            channel = core.get_config()['channel_url']
+
+        await core.unified_manager.reload(request.rel_url.query["mode"])
+        await core.unified_manager.get_custom_nodes(channel, request.rel_url.query["mode"])
+
+        updated_cnr = []
+        for k, v in core.unified_manager.active_nodes.items():
+            if v[0] != 'nightly':
+                res = core.unified_manager.unified_update(k, v[0])
+                if res.action == 'switch-cnr' and res:
+                    updated_cnr.append(k)
+
+        res = core.unified_manager.fetch_or_pull_git_repo(is_pull=True)
+
+        res['updated'] += updated_cnr
+
+        for x in res['failed']:
+            print(f"PULL FAILED: {x}")
+
+        if len(res['updated']) == 0 and len(res['failed']) == 0:
+            status = 200
+        else:
+            status = 201
+
+        print(f"\nDone.")
+        return web.json_response(res, status=status, content_type='application/json')
+    except:
+        traceback.print_exc()
+        return web.Response(status=400)
+    finally:
+        core.clear_pip_cache()
+
+
+def convert_markdown_to_html(input_text):
+    pattern_a = re.compile(r'\[a/([^]]+)\]\(([^)]+)\)')
+    pattern_w = re.compile(r'\[w/([^]]+)\]')
+    pattern_i = re.compile(r'\[i/([^]]+)\]')
+    pattern_bold = re.compile(r'\*\*([^*]+)\*\*')
+    pattern_white = re.compile(r'%%([^*]+)%%')
+
+    def replace_a(match):
+        return f"<a href='{match.group(2)}' target='blank'>{match.group(1)}</a>"
+
+    def replace_w(match):
+        return f"<p class='cm-warn-note'>{match.group(1)}</p>"
+
+    def replace_i(match):
+        return f"<p class='cm-info-note'>{match.group(1)}</p>"
+
+    def replace_bold(match):
+        return f"<B>{match.group(1)}</B>"
+
+    def replace_white(match):
+        return f"<font color='white'>{match.group(1)}</font>"
+
+    input_text = input_text.replace('\\[', '&#91;').replace('\\]', '&#93;').replace('<', '&lt;').replace('>', '&gt;')
+
+    result_text = re.sub(pattern_a, replace_a, input_text)
+    result_text = re.sub(pattern_w, replace_w, result_text)
+    result_text = re.sub(pattern_i, replace_i, result_text)
+    result_text = re.sub(pattern_bold, replace_bold, result_text)
+    result_text = re.sub(pattern_white, replace_white, result_text)
+
+    return result_text.replace("\n", "<BR>")
+
+
+def populate_markdown(x):
+    if 'description' in x:
+        x['description'] = convert_markdown_to_html(manager_ext_util.sanitize_tag(x['description']))
+
+    if 'name' in x:
+        x['name'] = manager_ext_util.sanitize_tag(x['name'])
+
+    if 'title' in x:
+        x['title'] = manager_ext_util.sanitize_tag(x['title'])
+
+
+@routes.get("/customnode/getlist")
+async def fetch_customnode_list(request):
+    """
+    provide unified custom node list
+    """
+    if "skip_update" in request.rel_url.query and request.rel_url.query["skip_update"] == "true":
+        skip_update = True
+    else:
+        skip_update = False
+
+    if request.rel_url.query["mode"] == "local":
+        channel = 'local'
+    else:
+        channel = core.get_config()['channel_url']
+
+    node_packs = await core.get_unified_total_nodes(channel, request.rel_url.query["mode"])
+    json_obj_github = core.get_data_by_mode(request.rel_url.query["mode"], 'github-stats.json', 'default')
+    json_obj_extras = core.get_data_by_mode(request.rel_url.query["mode"], 'extras.json', 'default')
+
+    core.populate_github_stats(node_packs, await json_obj_github)
+    core.populate_favorites(node_packs, await json_obj_extras)
+
+    check_state_of_git_node_pack(node_packs, False, do_update_check=not skip_update)
+
+    for v in node_packs.values():
+        populate_markdown(v)
+
+    if channel != 'local':
+        found = 'custom'
+
+        for name, url in core.get_channel_dict().items():
+            if url == channel:
+                found = name
+                break
+
+        channel = found
+
+    result = dict(channel=channel, node_packs=node_packs)
+
+    return web.json_response(result, content_type='application/json')
+
+
+@routes.get("/customnode/alternatives")
+async def fetch_customnode_alternatives(request):
+    alter_json = await core.get_data_by_mode(request.rel_url.query["mode"], 'alter-list.json')
+
+    res = {}
+
+    for item in alter_json['items']:
+        populate_markdown(item)
+        res[item['id']] = item
+
+    res = core.map_to_unified_keys(res)
+
+    return web.json_response(res, content_type='application/json')
+
+
+@PromptServer.instance.routes.get("/snapshot/getlist")
+async def get_snapshot_list(request):
+    snapshots_directory = os.path.join(core.comfyui_manager_path, 'snapshots')
+    items = [f[:-5] for f in os.listdir(snapshots_directory) if f.endswith('.json')]
+    items.sort(reverse=True)
+    return web.json_response({'items': items}, content_type='application/json')
+
+
+@routes.get("/snapshot/remove")
+async def remove_snapshot(request):
+    if not is_allowed_security_level('middle'):
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
+        return web.Response(status=403)
+    
+    try:
+        target = request.rel_url.query["target"]
+
+        path = os.path.join(core.comfyui_manager_path, 'snapshots', f"{target}.json")
+        if os.path.exists(path):
+            os.remove(path)
+
+        return web.Response(status=200)
+    except:
+        return web.Response(status=400)
+
+
+@routes.get("/snapshot/get_current")
+async def get_current_snapshot_api(request):
+    try:
+        return web.json_response(core.get_current_snapshot(), content_type='application/json')
+    except:
+        return web.Response(status=400)
+
+
+def unzip_install(files):
+    temp_filename = 'manager-temp.zip'
+    for url in files:
+        if url.endswith("/"):
+            url = url[:-1]
+        try:
+            headers = {
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'}
+
+            req = urllib.request.Request(url, headers=headers)
+            response = urllib.request.urlopen(req)
+            data = response.read()
+
+            with open(temp_filename, 'wb') as f:
+                f.write(data)
+
+            with zipfile.ZipFile(temp_filename, 'r') as zip_ref:
+                zip_ref.extractall(core.custom_nodes_path)
+
+            os.remove(temp_filename)
+        except Exception as e:
+            print(f"Install(unzip) error: {url} / {e}", file=sys.stderr)
+            return False
+
+    print("Installation was successful.")
+    return True
+
+
+def download_url_with_agent(url, save_path):
+    try:
+        headers = {
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3'}
+
+        req = urllib.request.Request(url, headers=headers)
+        response = urllib.request.urlopen(req)
+        data = response.read()
+
+        if not os.path.exists(os.path.dirname(save_path)):
+            os.makedirs(os.path.dirname(save_path))
+
+        with open(save_path, 'wb') as f:
+            f.write(data)
+
+    except Exception as e:
+        print(f"Download error: {url} / {e}", file=sys.stderr)
+        return False
+
+    print("Installation was successful.")
+    return True
+
+
+@routes.post("/customnode/install/git_url")
+async def install_custom_node_git_url(request):
+    if not is_allowed_security_level('high'):
+        print(SECURITY_MESSAGE_NORMAL_MINUS)
+        return web.Response(status=403)
+
+    url = await request.text()
+    res = await core.gitclone_install(url)
+
+    if res.action == 'skip':
+        print(f"Already installed: '{res.target}'")
+        return web.Response(status=200)
+    elif res.result:
+        print(f"After restarting ComfyUI, please refresh the browser.")
+        return web.Response(status=200)
+
+    print(res.msg)
+    return web.Response(status=400)
+
+
+@routes.post("/customnode/install/pip")
+async def install_pip(request):
+    if not is_allowed_security_level('high'):
+        print(SECURITY_MESSAGE_NORMAL_MINUS)
+        return web.Response(status=403)
+
+    packages = await request.text()
+    core.pip_install(packages.split(' '))
+
+    return web.Response(status=200)
+
+
+@routes.get("/comfyui_manager/update_comfyui")
+async def update_comfyui(request):
+    print(f"Update ComfyUI")
+
+    try:
+        repo_path = os.path.dirname(folder_paths.__file__)
+        res = core.update_path(repo_path)
+        if res == "fail":
+            print(f"ComfyUI update fail: The installed ComfyUI does not have a Git repository.")
+            return web.Response(status=400)
+        elif res == "updated":
+            return web.Response(status=201)
+        else:  # skipped
+            return web.Response(status=200)
+    except Exception as e:
+        print(f"ComfyUI update fail: {e}", file=sys.stderr)
+
+    return web.Response(status=400)
+
+
+@routes.get("/comfyui_manager/comfyui_switch_version")
+async def comfyui_switch_version(request):
+    try:
+        if "ver" in request.rel_url.query:
+            core.switch_comfyui(request.rel_url.query['ver'])
+
+        return web.Response(status=200)
+    except Exception as e:
+        print(f"ComfyUI update fail: {e}", file=sys.stderr)
+
+    return web.Response(status=400)
+
+
+@PromptServer.instance.routes.get("/manager/preview_method")
+async def preview_method(request):
+    if "value" in request.rel_url.query:
+        set_preview_method(request.rel_url.query['value'])
+        ext_core.write_config()
+    else:
+        return web.Response(text=ext_core.get_current_preview_method(), status=200)
+
+    return web.Response(status=200)
+
+
+@routes.get("/manager/default_ui")
+async def default_ui_mode(request):
+    if "value" in request.rel_url.query:
+        set_default_ui_mode(request.rel_url.query['value'])
+        ext_core.write_config()
+    else:
+        return web.Response(text=ext_core.get_config()['default_ui'], status=200)
+
+    return web.Response(status=200)
+
+
+@routes.get("/manager/component/policy")
+async def component_policy(request):
+    if "value" in request.rel_url.query:
+        set_component_policy(request.rel_url.query['value'])
+        ext_core.write_config()
+    else:
+        return web.Response(text=ext_core.get_config()['component_policy'], status=200)
+
+    return web.Response(status=200)
+
+
+@routes.get("/manager/dbl_click/policy")
+async def dbl_click_policy(request):
+    if "value" in request.rel_url.query:
+        set_double_click_policy(request.rel_url.query['value'])
+        ext_core.write_config()
+    else:
+        return web.Response(text=ext_core.get_config()['double_click_policy'], status=200)
+
+    return web.Response(status=200)
+
+
+def add_target_blank(html_text):
+    pattern = r'(<a\s+href="[^"]*"\s*[^>]*)(>)'
+
+    def add_target(match):
+        if 'target=' not in match.group(1):
+            return match.group(1) + ' target="_blank"' + match.group(2)
+        return match.group(0)
+
+    modified_html = re.sub(pattern, add_target, html_text)
+
+    return modified_html
+
+
+@routes.get("/manager/notice")
+async def get_notice(request):
+    url = "github.com"
+    path = "/ltdrdata/ltdrdata.github.io/wiki/News"
+
+    async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
+        async with session.get(f"https://{url}{path}") as response:
+            if response.status == 200:
+                # html_content = response.read().decode('utf-8')
+                html_content = await response.text()
+
+                pattern = re.compile(r'<div class="markdown-body">([\s\S]*?)</div>')
+                match = pattern.search(html_content)
+
+                if match:
+                    markdown_content = match.group(1)
+                    if core.comfyui_tag:
+                        markdown_content += f"<HR>ComfyUI: <b>{core.comfyui_tag}</b><BR>Commit Date: {core.comfy_ui_commit_datetime.date()}"
+                    else:
+                        markdown_content += f"<HR>ComfyUI: <b>{core.comfy_ui_revision}</b>[{comfy_ui_hash[:6]}]({core.comfy_ui_commit_datetime.date()})"
+                    # markdown_content += f"<BR>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;()"
+                    markdown_content += f"<BR>manager-core: {core.version_str}"
+                    markdown_content += f"<BR>manager-ext: {ext_core.version_str}"
+
+                    markdown_content = add_target_blank(markdown_content)
+
+                    try:
+                        if core.comfy_ui_required_commit_datetime.date() > core.comfy_ui_commit_datetime.date():
+                            markdown_content = f'<P style="text-align: center; color:red; background-color:white; font-weight:bold">Your ComfyUI is too OUTDATED!!!</P>' + markdown_content
+                    except:
+                        pass
+
+                    return web.Response(text=markdown_content, status=200)
+                else:
+                    return web.Response(text="Unable to retrieve Notice", status=200)
+            else:
+                return web.Response(text="Unable to retrieve Notice", status=200)
+
+
+@routes.get("/manager/reboot")
+def restart(self):
+    if not is_allowed_security_level('middle'):
+        print(SECURITY_MESSAGE_MIDDLE_OR_BELOW)
+        return web.Response(status=403)
+
+    try:
+        sys.stdout.close_log()
+    except Exception as e:
+        pass
+
+    if '__COMFY_CLI_SESSION__' in os.environ:
+        with open(os.path.join(os.environ['__COMFY_CLI_SESSION__'] + '.reboot'), 'w') as file:
+            pass
+
+        print(f"\nRestarting...\n\n")
+        exit(0)
+
+    print(f"\nRestarting... [Legacy Mode]\n\n")
+    if sys.platform.startswith('win32'):
+        return os.execv(sys.executable, ['"' + sys.executable + '"', '"' + sys.argv[0] + '"'] + sys.argv[1:])
+    else:
+        return os.execv(sys.executable, [sys.executable] + sys.argv)
+
+
+def sanitize_filename(input_string):
+    result_string = re.sub(r'[^a-zA-Z0-9_]', '_', input_string)
+    return result_string
+
+
+@routes.post("/manager/component/save")
+async def save_component(request):
+    try:
+        data = await request.json()
+        name = data['name']
+        workflow = data['workflow']
+
+        if not os.path.exists(components_path):
+            os.mkdir(components_path)
+
+        if 'packname' in workflow and workflow['packname'] != '':
+            sanitized_name = sanitize_filename(workflow['packname']) + '.pack'
+        else:
+            sanitized_name = sanitize_filename(name) + '.json'
+
+        filepath = os.path.join(components_path, sanitized_name)
+        components = {}
+        if os.path.exists(filepath):
+            with open(filepath) as f:
+                components = json.load(f)
+
+        components[name] = workflow
+
+        with open(filepath, 'w') as f:
+            json.dump(components, f, indent=4, sort_keys=True)
+        return web.Response(text=filepath, status=200)
+    except:
+        return web.Response(status=400)
+
+
+@routes.post("/manager/component/loads")
+async def load_components(request):
+    try:
+        json_files = [f for f in os.listdir(components_path) if f.endswith('.json')]
+        pack_files = [f for f in os.listdir(components_path) if f.endswith('.pack')]
+
+        components = {}
+        for json_file in json_files + pack_files:
+            file_path = os.path.join(components_path, json_file)
+            with open(file_path, 'r') as file:
+                try:
+                    # When there is a conflict between the .pack and the .json, the pack takes precedence and overrides.
+                    components.update(json.load(file))
+                except json.JSONDecodeError as e:
+                    print(f"[ComfyUI-Manager] Error decoding component file in file {json_file}: {e}")
+
+        return web.json_response(components)
+    except Exception as e:
+        print(f"[ComfyUI-Manager] failed to load components\n{e}")
+        return web.Response(status=400)
+
+
+args.enable_cors_header = "*"
+if hasattr(PromptServer.instance, "app"):
+    app = PromptServer.instance.app
+    cors_middleware = server.create_cors_middleware(args.enable_cors_header)
+    app.middlewares.append(cors_middleware)
+
+
+def sanitize(data):
+    return data.replace("<", "&lt;").replace(">", "&gt;")
+
+if not os.path.exists(ext_core.manager_ext_config_path):
+    ext_core.get_config()
+    ext_core.write_config()
+
+cm_global.register_extension('ComfyUI-Manager',
+                             {'version': core.version,
+                              'name': 'ComfyUI Manager (Extension)',
+                              'nodes': {},
+                              'description': 'ComfyUI-Manager (Extension)', })
+
+cm_global.variables['manager-core.show_menu'] = False

modules/manager_ext_util.py

@@ -0,0 +1,174 @@
+import traceback
+
+import aiohttp
+import json
+import threading
+import os
+from datetime import datetime
+
+
+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')
+
+
+# DON'T USE StrictVersion - cannot handle pre_release version
+# try:
+#     from distutils.version import StrictVersion
+# except:
+#     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
+class StrictVersion:
+    def __init__(self, version_string):
+        self.version_string = version_string
+        self.major = 0
+        self.minor = 0
+        self.patch = 0
+        self.pre_release = None
+        self.parse_version_string()
+
+    def parse_version_string(self):
+        parts = self.version_string.split('.')
+        if not parts:
+            raise ValueError("Version string must not be empty")
+
+        self.major = int(parts[0])
+        self.minor = int(parts[1]) if len(parts) > 1 else 0
+        self.patch = int(parts[2]) if len(parts) > 2 else 0
+
+        # Handling pre-release versions if present
+        if len(parts) > 3:
+            self.pre_release = parts[3]
+
+    def __str__(self):
+        version = f"{self.major}.{self.minor}.{self.patch}"
+        if self.pre_release:
+            version += f"-{self.pre_release}"
+        return version
+
+    def __eq__(self, other):
+        return (self.major, self.minor, self.patch, self.pre_release) == \
+            (other.major, other.minor, other.patch, other.pre_release)
+
+    def __lt__(self, other):
+        if (self.major, self.minor, self.patch) == (other.major, other.minor, other.patch):
+            return self.pre_release_compare(self.pre_release, other.pre_release) < 0
+        return (self.major, self.minor, self.patch) < (other.major, other.minor, other.patch)
+
+    @staticmethod
+    def pre_release_compare(pre1, pre2):
+        if pre1 == pre2:
+            return 0
+        if pre1 is None:
+            return 1
+        if pre2 is None:
+            return -1
+        return -1 if pre1 < pre2 else 1
+
+    def __le__(self, other):
+        return self == other or self < other
+
+    def __gt__(self, other):
+        return not self <= other
+
+    def __ge__(self, other):
+        return not self < other
+
+    def __ne__(self, other):
+        return not self == other
+
+
+def simple_hash(input_string):
+    hash_value = 0
+    for char in input_string:
+        hash_value = (hash_value * 31 + ord(char)) % (2**32)
+
+    return hash_value
+
+
+def is_file_created_within_one_day(file_path):
+    if not os.path.exists(file_path):
+        return False
+
+    file_creation_time = os.path.getctime(file_path)
+    current_time = datetime.now().timestamp()
+    time_difference = current_time - file_creation_time
+
+    return time_difference <= 86400
+
+
+async def get_data(uri, silent=False):
+    if not silent:
+        print(f"FETCH DATA from: {uri}", end="")
+
+    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:
+                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)
+
+    if not silent:
+        print(f" [DONE]")
+
+    return json_obj
+
+
+async def get_data_with_cache(uri, silent=False, cache_mode=True):
+    cache_uri = str(simple_hash(uri)) + '_' + os.path.basename(uri).replace('&', "_").replace('?', "_").replace('=', "_")
+    cache_uri = os.path.join(cache_dir, cache_uri+'.json')
+
+    if cache_mode and is_file_created_within_one_day(cache_uri):
+        json_obj = await get_data(cache_uri, silent=silent)
+    else:
+        json_obj = await get_data(uri, silent=silent)
+
+        with cache_lock:
+            with open(cache_uri, "w", encoding='utf-8') as file:
+                json.dump(json_obj, file, indent=4, sort_keys=True)
+                if not silent:
+                    print(f"[ComfyUI-Manager] default cache updated: {uri}")
+
+    return json_obj
+
+
+def sanitize_tag(x):
+    return x.replace('<', '&lt;').replace('>', '&gt;')
+
+
+def download_url(url, dest_folder, filename):
+    import requests
+
+    # Ensure the destination folder exists
+    if not os.path.exists(dest_folder):
+        os.makedirs(dest_folder)
+
+    # Full path to save the file
+    dest_path = os.path.join(dest_folder, filename)
+
+    # Download the file
+    response = requests.get(url, stream=True)
+    if response.status_code == 200:
+        with open(dest_path, 'wb') as file:
+            for chunk in response.iter_content(chunk_size=1024):
+                if chunk:
+                    file.write(chunk)
+    else:
+        raise Exception(f"Failed to download file from {url}")
+
+
+def extract_package_as_zip(file_path, extract_path):
+    import zipfile
+    try:
+        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}")
+        return extracted_files
+    except zipfile.BadZipFile:
+        print(f"File '{file_path}' is not a zip or is corrupted.")
+        return None

modules/migration_server.py

@@ -0,0 +1,17 @@
+import git
+from aiohttp import web
+from server import PromptServer
+
+manager_core_path = None
+manager_core_url = "https://github.com/Comfy-Org/manager-core"
+
+@PromptServer.instance.routes.get("/manager/install_manager_core")
+def install_manager_core(request):
+    if manager_core_path is not None:
+        repo = git.Repo.clone_from(manager_core_url, manager_core_path)
+        repo.git.clear_cache()
+        repo.close()
+    else:
+        print(f"[ComfyUI Manager] Failed to install `manager-core`")
+
+    return web.Response(status=200)

modules/share_3rdparty.py

@@ -65,10 +65,10 @@ async def share_option(request):
 
 
 def get_openart_auth():
-    if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
+    if not os.path.exists(os.path.join(core.comfyui_manager_path, ".openart_key")):
         return None
     try:
-        with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
+        with open(os.path.join(core.comfyui_manager_path, ".openart_key"), "r") as f:
             openart_key = f.read().strip()
         return openart_key if openart_key else None
     except:
@@ -76,10 +76,10 @@ def get_openart_auth():
 
 
 def get_matrix_auth():
-    if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
+    if not os.path.exists(os.path.join(core.comfyui_manager_path, "matrix_auth")):
         return None
     try:
-        with open(os.path.join(core.manager_files_path, "matrix_auth"), "r") as f:
+        with open(os.path.join(core.comfyui_manager_path, "matrix_auth"), "r") as f:
             matrix_auth = f.read()
             homeserver, username, password = matrix_auth.strip().split("\n")
             if not homeserver or not username or not password:
@@ -94,10 +94,10 @@ def get_matrix_auth():
 
 
 def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
+    if not os.path.exists(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey")):
         return None
     try:
-        with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
+        with open(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey"), "r") as f:
             share_key = f.read()
             if not share_key.strip():
                 return None
@@ -107,10 +107,10 @@ def get_comfyworkflows_auth():
 
 
 def get_youml_settings():
-    if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
+    if not os.path.exists(os.path.join(core.comfyui_manager_path, ".youml")):
         return None
     try:
-        with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
+        with open(os.path.join(core.comfyui_manager_path, ".youml"), "r") as f:
             youml_settings = f.read().strip()
         return youml_settings if youml_settings else None
     except:
@@ -118,7 +118,7 @@ def get_youml_settings():
 
 
 def set_youml_settings(settings):
-    with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
+    with open(os.path.join(core.comfyui_manager_path, ".youml"), "w") as f:
         f.write(settings)
 
 
@@ -135,7 +135,7 @@ async def api_get_openart_auth(request):
 async def api_set_openart_auth(request):
     json_data = await request.json()
     openart_key = json_data['openart_key']
-    with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
+    with open(os.path.join(core.comfyui_manager_path, ".openart_key"), "w") as f:
         f.write(openart_key)
     return web.Response(status=200)
 
@@ -178,14 +178,16 @@ async def api_get_comfyworkflows_auth(request):
 @PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
 async def set_esheep_workflow_and_images(request):
     json_data = await request.json()
-    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
+    current_workflow = json_data['workflow']
+    images = json_data['images']
+    with open(os.path.join(core.comfyui_manager_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
         json.dump(json_data, file, indent=4)
         return web.Response(status=200)
 
 
 @PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
 async def get_esheep_workflow_and_images(request):
-    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
+    with open(os.path.join(core.comfyui_manager_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
         data = json.load(file)
         return web.Response(status=200, text=json.dumps(data))
 
@@ -194,12 +196,12 @@ def set_matrix_auth(json_data):
     homeserver = json_data['homeserver']
     username = json_data['username']
     password = json_data['password']
-    with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
+    with open(os.path.join(core.comfyui_manager_path, "matrix_auth"), "w") as f:
         f.write("\n".join([homeserver, username, password]))
 
 
 def set_comfyworkflows_auth(comfyworkflows_sharekey):
-    with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
+    with open(os.path.join(core.comfyui_manager_path, "comfyworkflows_sharekey"), "w") as f:
         f.write(comfyworkflows_sharekey)
 
 
@@ -317,7 +319,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(await core.get_current_snapshot()))
+            form.add_field("currentSnapshot", json.dumps(core.get_current_snapshot()))
             form.add_field("modelsInfo", json.dumps(models_info))
 
             async with session.post(
@@ -366,9 +368,9 @@ async def share_art(request):
                 text_content += f"{description}\n"
             if credits:
                 text_content += f"\ncredits: {credits}\n"
-            matrix.send_message(comfyui_share_room_id, text_content)
+            response = matrix.send_message(comfyui_share_room_id, text_content)
-            matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
+            response = matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
-            matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
+            response = matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
         except:
             import traceback
             traceback.print_exc()

node_db/forked/custom-node-list.json

@@ -1,25 +1,5 @@
 {
     "custom_nodes": [
-        {
-            "author": "SanDiegoDude",
-            "title": "ComfyUI-HiDream-Sampler [WIP]",
-            "reference": "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler",
-            "files": [
-                "https://github.com/SanDiegoDude/ComfyUI-HiDream-Sampler"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of enhanced nodes for ComfyUI that provide powerful additional functionality to your workflows.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "PramaLLC",
-            "title": "ComfyUI BEN - Background Erase Network",
-            "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",
@@ -129,26 +109,6 @@
             ],
             "install_type": "git-clone",
             "description": "This is a development respository for debugging migration of StableSR to ComfyUI\n\nNOTE:Forked from [https://github.com/gameltb/Comfyui-StableSR]\nPut the StableSR [a/webui_786v_139.ckpt](https://huggingface.co/Iceclear/StableSR/resolve/main/webui_768v_139.ckpt) model into Comyfui/models/stablesr/, Put the StableSR [a/stablesr_768v_000139.ckpt](https://huggingface.co/Iceclear/StableSR/resolve/main/stablesr_768v_000139.ckpt) model into Comyfui/models/checkpoints/"
-        },
-        {
-            "author": "city96",
-            "title": "Efficient-Large-Model/Extra Models for ComfyUI",
-            "reference": "https://github.com/Efficient-Large-Model/ComfyUI_ExtraModels",
-            "files": [
-                "https://github.com/Efficient-Large-Model/ComfyUI_ExtraModels"
-            ],
-            "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/model-list.json

@@ -1,148 +1,3 @@
 {
-  "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

@@ -1,15 +1,5 @@
 {
     "custom_nodes": [
-        {
-            "author": "Comfy-Org",
-            "title": "ComfyUI React Extension Template",
-            "reference": "https://github.com/Comfy-Org/ComfyUI-React-Extension-Template",
-            "files": [
-                "https://github.com/Comfy-Org/ComfyUI-React-Extension-Template"
-            ],
-            "install_type": "git-clone",
-            "description": "A minimal template for creating React/TypeScript frontend extensions for ComfyUI, with complete boilerplate setup including internationalization and unit testing."
-        },
         {
             "author": "Suzie1",
             "title": "Guide To Making Custom Nodes in ComfyUI",
@@ -250,87 +240,6 @@
             ],
             "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,7 +172,6 @@
             "CLIPTextEncodeControlnet",
             "CLIPTextEncodeFlux",
             "CLIPTextEncodeHunyuanDiT",
-            "CLIPTextEncodePixArtAlpha",
             "CLIPTextEncodeSD3",
             "CLIPTextEncodeSDXL",
             "CLIPTextEncodeSDXLRefiner",
@@ -190,7 +189,6 @@
             "ConditioningSetAreaStrength",
             "ConditioningSetMask",
             "ConditioningSetTimestepRange",
-            "ConditioningStableAudio",
             "ConditioningZeroOut",
             "ControlNetApply",
             "ControlNetApplyAdvanced",
@@ -204,9 +202,7 @@
             "DisableNoise",
             "DualCFGGuider",
             "DualCLIPLoader",
-            "EmptyHunyuanLatentVideo",
             "EmptyImage",
-            "EmptyLTXVLatentVideo",
             "EmptyLatentAudio",
             "EmptyLatentImage",
             "EmptyMochiLatentVideo",
@@ -249,9 +245,6 @@
             "KSamplerAdvanced",
             "KSamplerSelect",
             "KarrasScheduler",
-            "LTXVConditioning",
-            "LTXVImgToVideo",
-            "LTXVScheduler",
             "LaplaceScheduler",
             "LatentAdd",
             "LatentApplyOperation",
@@ -272,8 +265,6 @@
             "LatentSubtract",
             "LatentUpscale",
             "LatentUpscaleBy",
-            "Load3D",
-            "Load3DAnimation",
             "LoadAudio",
             "LoadImage",
             "LoadImageMask",
@@ -281,15 +272,11 @@
             "LoraLoader",
             "LoraLoaderModelOnly",
             "LoraSave",
-            "Mahiro",
             "MaskComposite",
             "MaskToImage",
             "ModelMergeAdd",
-            "ModelMergeAuraflow",
             "ModelMergeBlocks",
             "ModelMergeFlux1",
-            "ModelMergeLTXV",
-            "ModelMergeMochiPreview",
             "ModelMergeSD1",
             "ModelMergeSD2",
             "ModelMergeSD35_Large",
@@ -302,7 +289,6 @@
             "ModelSamplingContinuousV",
             "ModelSamplingDiscrete",
             "ModelSamplingFlux",
-            "ModelSamplingLTXV",
             "ModelSamplingSD3",
             "ModelSamplingStableCascade",
             "ModelSave",
@@ -315,7 +301,6 @@
             "PhotoMakerLoader",
             "PolyexponentialScheduler",
             "PorterDuffImageComposite",
-            "Preview3D",
             "PreviewAudio",
             "PreviewImage",
             "RandomNoise",
@@ -349,7 +334,6 @@
             "SelfAttentionGuidance",
             "SetLatentNoiseMask",
             "SetUnionControlNetType",
-            "SkipLayerGuidanceDiT",
             "SkipLayerGuidanceSD3",
             "SolidMask",
             "SplitImageWithAlpha",
@@ -478,17 +462,6 @@
             "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",

notebooks/comfyui_colab_with_manager.ipynb

@@ -78,7 +78,6 @@
         "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
         "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
         "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
         "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
         "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
         "\n",

openapi.yaml

@@ -1,846 +0,0 @@
-openapi: 3.1.0
-info:
-  title: ComfyUI-Manager API
-  description: |
-    API for ComfyUI-Manager, a comprehensive management tool for ComfyUI custom nodes, models, and components.
-    This API enables programmatic access to node management, model downloading, snapshot operations,
-    and overall system configuration.
-  version: "3.32.3"
-  contact:
-    name: ComfyUI-Manager Maintainers
-servers:
-  - url: '/'
-    description: Default ComfyUI server
-
-# Common API components
-components:
-  schemas:
-    Error:
-      type: object
-      properties:
-        error:
-          type: string
-          description: Error message
-          
-    NodePackageMetadata:
-      type: object
-      properties:
-        title:
-          type: string
-          description: Display name of the node package
-        name:
-          type: string
-          description: Repository/package name
-        files:
-          type: array
-          items:
-            type: string
-          description: Source URLs for the package
-        description:
-          type: string
-          description: Description of the node package functionality
-        install_type:
-          type: string
-          enum: [git, copy, pip]
-          description: Installation method
-        version:
-          type: string
-          description: Version identifier
-        id:
-          type: string
-          description: Unique identifier for the node package
-        ui_id:
-          type: string
-          description: ID for UI reference
-        channel:
-          type: string
-          description: Source channel
-        mode:
-          type: string
-          description: Source mode
-        
-    ModelMetadata:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Name of the model
-        type:
-          type: string
-          description: Type of model
-        base:
-          type: string
-          description: Base model type
-        save_path:
-          type: string
-          description: Path for saving the model
-        url:
-          type: string
-          description: Download URL
-        filename:
-          type: string
-          description: Target filename
-        ui_id:
-          type: string
-          description: ID for UI reference
-          
-    SnapshotItem:
-      type: string
-      description: Name of the snapshot
-
-    QueueStatus:
-      type: object
-      properties:
-        total_count:
-          type: integer
-          description: Total number of tasks
-        done_count:
-          type: integer
-          description: Number of completed tasks
-        in_progress_count:
-          type: integer
-          description: Number of tasks in progress
-        is_processing:
-          type: boolean
-          description: Whether the queue is currently processing
-
-  securitySchemes:
-    securityLevel:
-      type: apiKey
-      in: header
-      name: Security-Level
-      description: Security level for sensitive operations
-
-  parameters:
-    modeParam:
-      name: mode
-      in: query
-      description: Source mode (e.g., "local", "remote")
-      schema:
-        type: string
-        enum: [local, remote, default]
-        
-    targetParam:
-      name: target
-      in: query
-      description: Target identifier
-      required: true
-      schema:
-        type: string
-        
-    valueParam:
-      name: value
-      in: query
-      description: New value to set
-      required: true
-      schema:
-        type: string
-
-# API Paths
-paths:
-  # Custom Nodes Endpoints
-  /customnode/getmappings:
-    get:
-      summary: Get node-to-package mappings
-      description: Provides unified mapping between nodes and node packages
-      parameters:
-        - $ref: '#/components/parameters/modeParam'
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties:
-                  type: array
-                  items:
-                    type: array
-                description: Mapping of node packages to node classes
-
-  /customnode/fetch_updates:
-    get:
-      summary: Check for updates
-      description: Fetches updates for custom nodes
-      parameters:
-        - $ref: '#/components/parameters/modeParam'
-      responses:
-        '200':
-          description: No updates available
-        '201':
-          description: Updates found
-        '400':
-          description: Error occurred
-          
-  /customnode/installed:
-    get:
-      summary: Get installed custom nodes
-      description: Returns a list of installed node packages
-      parameters:
-        - name: mode
-          in: query
-          description: Lists mode, default or imported
-          schema:
-            type: string
-            enum: [default, imported]
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties:
-                  $ref: '#/components/schemas/NodePackageMetadata'
-                  
-  /customnode/getlist:
-    get:
-      summary: Get custom node list
-      description: Provides a list of available custom nodes
-      parameters:
-        - $ref: '#/components/parameters/modeParam'
-        - name: skip_update
-          in: query
-          description: Skip update check
-          schema:
-            type: boolean
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  channel:
-                    type: string
-                  node_packs:
-                    type: object
-                    additionalProperties:
-                      $ref: '#/components/schemas/NodePackageMetadata'
-                      
-  /customnode/alternatives:
-    get:
-      summary: Get alternative node options
-      description: Provides alternatives for nodes
-      parameters:
-        - $ref: '#/components/parameters/modeParam'
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                additionalProperties:
-                  type: object
-                  
-  /customnode/versions/{node_name}:
-    get:
-      summary: Get available versions for a node
-      description: Lists all available versions for a specific node
-      parameters:
-        - name: node_name
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    version:
-                      type: string
-        '400':
-          description: Node not found
-          
-  /customnode/disabled_versions/{node_name}:
-    get:
-      summary: Get disabled versions for a node
-      description: Lists all disabled versions for a specific node
-      parameters:
-        - name: node_name
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    version:
-                      type: string
-        '400':
-          description: Node not found
-          
-  /customnode/import_fail_info:
-    post:
-      summary: Get import failure information
-      description: Returns information about why a node failed to import
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                cnr_id:
-                  type: string
-                url:
-                  type: string
-      responses:
-        '200':
-          description: Successful operation
-        '400':
-          description: No information available
-          
-  /customnode/install/git_url:
-    post:
-      summary: Install custom node via Git URL
-      description: Installs a custom node from a Git repository URL
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          text/plain:
-            schema:
-              type: string
-      responses:
-        '200':
-          description: Installation successful or already installed
-        '400':
-          description: Installation failed
-        '403':
-          description: Security policy violation
-          
-  /customnode/install/pip:
-    post:
-      summary: Install custom node dependencies via pip
-      description: Installs Python package dependencies for custom nodes
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          text/plain:
-            schema:
-              type: string
-      responses:
-        '200':
-          description: Installation successful
-        '403':
-          description: Security policy violation
-          
-  # Model Management Endpoints
-  /externalmodel/getlist:
-    get:
-      summary: Get external model list
-      description: Provides a list of available external models
-      parameters:
-        - $ref: '#/components/parameters/modeParam'
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  models:
-                    type: array
-                    items:
-                      $ref: '#/components/schemas/ModelMetadata'
-                      
-  # Queue Management Endpoints
-  /manager/queue/update_all:
-    get:
-      summary: Update all custom nodes
-      description: Queues update operations for all installed custom nodes
-      security:
-        - securityLevel: []
-      parameters:
-        - $ref: '#/components/parameters/modeParam'
-      responses:
-        '200':
-          description: Update queued successfully
-        '401':
-          description: Processing already in progress
-        '403':
-          description: Security policy violation
-          
-  /manager/queue/reset:
-    get:
-      summary: Reset queue
-      description: Resets the operation queue
-      responses:
-        '200':
-          description: Queue reset successfully
-          
-  /manager/queue/status:
-    get:
-      summary: Get queue status
-      description: Returns the current status of the operation queue
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/QueueStatus'
-                
-  /manager/queue/install:
-    post:
-      summary: Install custom node
-      description: Queues installation of a custom node
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NodePackageMetadata'
-      responses:
-        '200':
-          description: Installation queued successfully
-        '403':
-          description: Security policy violation
-        '404':
-          description: Target node not found or security issue
-          
-  /manager/queue/start:
-    get:
-      summary: Start queue processing
-      description: Starts processing the operation queue
-      responses:
-        '200':
-          description: Processing started
-        '201':
-          description: Processing already in progress
-          
-  /manager/queue/fix:
-    post:
-      summary: Fix custom node
-      description: Attempts to fix a broken custom node installation
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NodePackageMetadata'
-      responses:
-        '200':
-          description: Fix operation queued successfully
-        '403':
-          description: Security policy violation
-          
-  /manager/queue/reinstall:
-    post:
-      summary: Reinstall custom node
-      description: Uninstalls and then reinstalls a custom node
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NodePackageMetadata'
-      responses:
-        '200':
-          description: Reinstall operation queued successfully
-        '403':
-          description: Security policy violation
-          
-  /manager/queue/uninstall:
-    post:
-      summary: Uninstall custom node
-      description: Queues uninstallation of a custom node
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NodePackageMetadata'
-      responses:
-        '200':
-          description: Uninstallation queued successfully
-        '403':
-          description: Security policy violation
-          
-  /manager/queue/update:
-    post:
-      summary: Update custom node
-      description: Queues update of a custom node
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NodePackageMetadata'
-      responses:
-        '200':
-          description: Update queued successfully
-        '403':
-          description: Security policy violation
-          
-  /manager/queue/disable:
-    post:
-      summary: Disable custom node
-      description: Disables a custom node without uninstalling it
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/NodePackageMetadata'
-      responses:
-        '200':
-          description: Disable operation queued successfully
-          
-  /manager/queue/update_comfyui:
-    get:
-      summary: Update ComfyUI
-      description: Queues an update operation for ComfyUI itself
-      responses:
-        '200':
-          description: Update queued successfully
-          
-  /manager/queue/install_model:
-    post:
-      summary: Install model
-      description: Queues installation of a model
-      security:
-        - securityLevel: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/ModelMetadata'
-      responses:
-        '200':
-          description: Installation queued successfully
-        '400':
-          description: Invalid model request
-        '403':
-          description: Security policy violation
-          
-  # Snapshot Management Endpoints
-  /snapshot/getlist:
-    get:
-      summary: Get snapshot list
-      description: Returns a list of available snapshots
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  items:
-                    type: array
-                    items:
-                      $ref: '#/components/schemas/SnapshotItem'
-                      
-  /snapshot/remove:
-    get:
-      summary: Remove snapshot
-      description: Removes a specified snapshot
-      security:
-        - securityLevel: []
-      parameters:
-        - $ref: '#/components/parameters/targetParam'
-      responses:
-        '200':
-          description: Snapshot removed successfully
-        '400':
-          description: Error removing snapshot
-        '403':
-          description: Security policy violation
-          
-  /snapshot/restore:
-    get:
-      summary: Restore snapshot
-      description: Restores a specified snapshot
-      security:
-        - securityLevel: []
-      parameters:
-        - $ref: '#/components/parameters/targetParam'
-      responses:
-        '200':
-          description: Snapshot restoration scheduled
-        '400':
-          description: Error restoring snapshot
-        '403':
-          description: Security policy violation
-          
-  /snapshot/get_current:
-    get:
-      summary: Get current snapshot
-      description: Returns the current system state as a snapshot
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-        '400':
-          description: Error creating snapshot
-          
-  /snapshot/save:
-    get:
-      summary: Save snapshot
-      description: Saves the current system state as a new snapshot
-      responses:
-        '200':
-          description: Snapshot saved successfully
-        '400':
-          description: Error saving snapshot
-          
-  # ComfyUI Management Endpoints
-  /comfyui_manager/comfyui_versions:
-    get:
-      summary: Get ComfyUI versions
-      description: Returns available and current ComfyUI versions
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  versions:
-                    type: array
-                    items:
-                      type: string
-                  current:
-                    type: string
-        '400':
-          description: Error retrieving versions
-          
-  /comfyui_manager/comfyui_switch_version:
-    get:
-      summary: Switch ComfyUI version
-      description: Switches to a specified ComfyUI version
-      parameters:
-        - name: ver
-          in: query
-          description: Target version
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Version switch successful
-        '400':
-          description: Error switching version
-          
-  /manager/reboot:
-    get:
-      summary: Reboot ComfyUI
-      description: Restarts the ComfyUI server
-      security:
-        - securityLevel: []
-      responses:
-        '200':
-          description: Reboot initiated
-        '403':
-          description: Security policy violation
-          
-  # Configuration Endpoints
-  /manager/preview_method:
-    get:
-      summary: Get or set preview method
-      description: Gets or sets the latent preview method
-      parameters:
-        - name: value
-          in: query
-          required: false
-          description: New preview method
-          schema:
-            type: string
-            enum: [auto, latent2rgb, taesd, none]
-      responses:
-        '200':
-          description: Setting updated or current value returned
-          content:
-            text/plain:
-              schema:
-                type: string
-                
-  /manager/db_mode:
-    get:
-      summary: Get or set database mode
-      description: Gets or sets the database mode
-      parameters:
-        - name: value
-          in: query
-          required: false
-          description: New database mode
-          schema:
-            type: string
-            enum: [channel, local, remote]
-      responses:
-        '200':
-          description: Setting updated or current value returned
-          content:
-            text/plain:
-              schema:
-                type: string
-                
-  /manager/policy/component:
-    get:
-      summary: Get or set component policy
-      description: Gets or sets the component policy
-      parameters:
-        - name: value
-          in: query
-          required: false
-          description: New component policy
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Setting updated or current value returned
-          content:
-            text/plain:
-              schema:
-                type: string
-                
-  /manager/policy/update:
-    get:
-      summary: Get or set update policy
-      description: Gets or sets the update policy
-      parameters:
-        - name: value
-          in: query
-          required: false
-          description: New update policy
-          schema:
-            type: string
-            enum: [stable, nightly, nightly-comfyui]
-      responses:
-        '200':
-          description: Setting updated or current value returned
-          content:
-            text/plain:
-              schema:
-                type: string
-                
-  /manager/channel_url_list:
-    get:
-      summary: Get or set channel URL
-      description: Gets or sets the channel URL for custom node sources
-      parameters:
-        - name: value
-          in: query
-          required: false
-          description: New channel name
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Setting updated or channel list returned
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  selected:
-                    type: string
-                  list:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        name:
-                          type: string
-                        url:
-                          type: string
-                          
-  # Component Management Endpoints
-  /manager/component/save:
-    post:
-      summary: Save component
-      description: Saves a reusable workflow component
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                name:
-                  type: string
-                workflow:
-                  type: object
-      responses:
-        '200':
-          description: Component saved successfully
-          content:
-            text/plain:
-              schema:
-                type: string
-        '400':
-          description: Error saving component
-          
-  /manager/component/loads:
-    post:
-      summary: Load components
-      description: Loads all available workflow components
-      responses:
-        '200':
-          description: Components loaded successfully
-          content:
-            application/json:
-              schema:
-                type: object
-        '400':
-          description: Error loading components
-          
-  # Miscellaneous Endpoints
-  /manager/version:
-    get:
-      summary: Get manager version
-      description: Returns the current version of ComfyUI-Manager
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            text/plain:
-              schema:
-                type: string
-                
-  /manager/notice:
-    get:
-      summary: Get manager notice
-      description: Returns HTML content with notices and version information
-      responses:
-        '200':
-          description: Successful operation
-          content:
-            text/html:
-              schema:
-                type: string

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==1.26.4",
+    "numpy<1.24>=1.18": "numpy",
-    "numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
+    "numpy>=1.18.5, <1.25.0": "numpy",
     "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==1.26.4",
+    "numpy<1.24>=1.18": "numpy",
-    "numpy>=1.18.5, <1.25.0": "numpy==1.26.4",
+    "numpy>=1.18.5, <1.25.0": "numpy",
     "opencv-contrib-python": "opencv-contrib-python-headless",
     "opencv-python": "opencv-contrib-python-headless",
     "opencv-python-headless": "opencv-contrib-python-headless",

prestartup_script.py

@@ -1,851 +0,0 @@
-import os
-import shutil
-import subprocess
-import sys
-import atexit
-import threading
-import re
-import locale
-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)
-
-import security_check
-import manager_util
-import cm_global
-import manager_downloader
-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', 'torchaudio', 'torchsde', 'torchvision'}
-cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
-
-
-def skip_pip_spam(x):
-    return ('Requirement already satisfied:' in x) or ("DEPRECATION: Loading egg at" in x)
-
-
-message_collapses = [skip_pip_spam]
-import_failed_extensions = set()
-cm_global.variables['cm.on_revision_detected_handler'] = []
-enable_file_logging = True
-
-
-def register_message_collapse(f):
-    global message_collapses
-    message_collapses.append(f)
-
-
-def is_import_failed_extension(name):
-    global import_failed_extensions
-    return name in import_failed_extensions
-
-
-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)
-cm_global.register_api('cm.is_import_failed_extension', is_import_failed_extension)
-
-
-comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
-
-custom_nodes_base_path = folder_paths.get_folder_paths('custom_nodes')[0]
-manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
-manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
-manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
-restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
-manager_config_path = os.path.join(manager_files_path, 'config.ini')
-
-cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
-
-
-default_conf = {}
-
-def read_config():
-    global default_conf
-    try:
-        import configparser
-        config = configparser.ConfigParser(strict=False)
-        config.read(manager_config_path)
-        default_conf = config['default']
-    except Exception:
-        pass
-
-def read_uv_mode():
-    if 'use_uv' in default_conf:
-        manager_util.use_uv = default_conf['use_uv'].lower() == 'true'
-
-def check_file_logging():
-    global enable_file_logging
-    if 'file_logging' in default_conf and default_conf['file_logging'].lower() == 'false':
-        enable_file_logging = False
-
-
-read_config()
-read_uv_mode()
-check_file_logging()
-
-if sys.version_info < (3, 13):
-    cm_global.pip_overrides = {'numpy': 'numpy<2'}
-else:
-    cm_global.pip_overrides = {}
-
-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)
-        
-        if sys.version_info < (3, 13):
-            cm_global.pip_overrides['numpy'] = 'numpy<2'
-
-
-if os.path.exists(manager_pip_blacklist_path):
-    with open(manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
-        for x in f.readlines():
-            y = x.strip()
-            if y != '':
-                cm_global.pip_blacklist.add(y)
-
-
-def remap_pip_package(pkg):
-    if pkg in cm_global.pip_overrides:
-        res = cm_global.pip_overrides[pkg]
-        print(f"[ComfyUI-Manager] '{pkg}' is remapped to '{res}'")
-        return res
-    else:
-        return pkg
-
-
-std_log_lock = threading.Lock()
-
-
-def handle_stream(stream, prefix):
-    stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
-    for msg in stream:
-        if prefix == '[!]' and ('it/s]' in msg or 's/it]' in msg) and ('%|' in msg or 'it [' in msg):
-            if msg.startswith('100%'):
-                print('\r' + msg, end="", file=sys.stderr),
-            else:
-                print('\r' + msg[:-1], end="", file=sys.stderr),
-        else:
-            if prefix == '[!]':
-                print(prefix, msg, end="", file=sys.stderr)
-            else:
-                print(prefix, msg, end="")
-
-
-def process_wrap(cmd_str, cwd_path, handler=None, env=None):
-    process = subprocess.Popen(cmd_str, cwd=cwd_path, env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, bufsize=1)
-
-    if handler is None:
-        handler = handle_stream
-
-    stdout_thread = threading.Thread(target=handler, args=(process.stdout, ""))
-    stderr_thread = threading.Thread(target=handler, args=(process.stderr, "[!]"))
-
-    stdout_thread.start()
-    stderr_thread.start()
-
-    stdout_thread.join()
-    stderr_thread.join()
-
-    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')
-        if port_index + 1 < len(sys.argv):
-            port = int(sys.argv[port_index + 1])
-            postfix = f"_{port}"
-        else:
-            postfix = ""
-    else:
-        postfix = ""
-
-    # Logger setup
-    log_path_base = None
-    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"):
-                    os.remove(f"{log_path_base}{postfix}.prev2.log")
-                os.rename(f"{log_path_base}{postfix}.prev.log", f"{log_path_base}{postfix}.prev2.log")
-            os.rename(f"{log_path_base}{postfix}.log", f"{log_path_base}{postfix}.prev.log")
-
-        log_file = open(f"{log_path_base}{postfix}.log", "w", encoding="utf-8", errors="ignore")
-
-    log_lock = threading.Lock()
-
-    original_stdout = sys.stdout
-    original_stderr = sys.stderr
-
-    if original_stdout.encoding.lower() == 'utf-8':
-        write_stdout = original_stdout.write
-        write_stderr = original_stderr.write
-    else:
-        def wrapper_stdout(msg):
-            original_stdout.write(msg.encode('utf-8').decode(original_stdout.encoding, errors="ignore"))
-            
-        def wrapper_stderr(msg):
-            original_stderr.write(msg.encode('utf-8').decode(original_stderr.encoding, errors="ignore"))
-
-        write_stdout = wrapper_stdout
-        write_stderr = wrapper_stderr
-
-    pat_tqdm = r'\d+%.*\[(.*?)\]'
-    pat_import_fail = r'seconds \(IMPORT FAILED\):(.*)$'
-
-    is_start_mode = True
-
-
-    class ComfyUIManagerLogger:
-        def __init__(self, is_stdout):
-            self.is_stdout = is_stdout
-            self.encoding = "utf-8"
-            self.last_char = ''
-
-        def fileno(self):
-            try:
-                if self.is_stdout:
-                    return original_stdout.fileno()
-                else:
-                    return original_stderr.fileno()
-            except AttributeError:
-                # Handle error
-                raise ValueError("The object does not have a fileno method")
-
-        def isatty(self):
-            return False
-
-        def write(self, message):
-            global is_start_mode
-
-            if any(f(message) for f in message_collapses):
-                return
-
-            if is_start_mode:
-                match = re.search(pat_import_fail, message)
-                if match:
-                    import_failed_extensions.add(match.group(1).strip())
-
-                if not self.is_stdout:
-                    origin_info = extract_origin_module()
-                    if origin_info is not None:
-                        name, origin_path = origin_info
-                        
-                        if name != 'comfyui-manager':
-                            if name not in cm_global.error_dict:
-                                cm_global.error_dict[name] = {'name': name, 'path': origin_path, 'msg': ''}
-
-                            cm_global.error_dict[name]['msg'] += message
-
-            if not self.is_stdout:
-                match = re.search(pat_tqdm, message)
-                if match:
-                    message = re.sub(r'([#|])\d', r'\1▌', message)
-                    message = re.sub('#', '█', message)
-                    if '100%' in message:
-                        self.sync_write(message)
-                    else:
-                        write_stderr(message)
-                        original_stderr.flush()
-                else:
-                    self.sync_write(message)
-            else:
-                self.sync_write(message)
-
-        def sync_write(self, message, file_only=False):
-            with log_lock:
-                timestamp = current_timestamp()
-                if self.last_char != '\n':
-                    log_file.write(message)
-                else:
-                    log_file.write(f"[{timestamp}] {message}")
-                log_file.flush()
-                self.last_char = message if message == '' else message[-1]
-
-            if not file_only:
-                with std_log_lock:
-                    if self.is_stdout:
-                        write_stdout(message)
-                        original_stdout.flush()
-                    else:
-                        write_stderr(message)
-                        original_stderr.flush()
-
-        def flush(self):
-            log_file.flush()
-
-            with std_log_lock:
-                if self.is_stdout:
-                    original_stdout.flush()
-                else:
-                    original_stderr.flush()
-
-        def close(self):
-            self.flush()
-
-        def reconfigure(self, *args, **kwargs):
-            pass
-
-        # You can close through sys.stderr.close_log()
-        def close_log(self):
-            sys.stderr = original_stderr
-            sys.stdout = original_stdout
-            log_file.close()
-            
-    def close_log():
-        sys.stderr = original_stderr
-        sys.stdout = original_stdout
-        log_file.close()
-
-
-    if enable_file_logging:
-        sys.stdout = ComfyUIManagerLogger(True)
-        stderr_wrapper = ComfyUIManagerLogger(False)
-        sys.stderr = stderr_wrapper
-
-        atexit.register(close_log)
-    else:
-        sys.stdout.close_log = lambda: None
-        stderr_wrapper = None
-
-
-    class LoggingHandler(logging.Handler):
-        def emit(self, record):
-            global is_start_mode
-
-            message = record.getMessage()
-
-            if is_start_mode:
-                match = re.search(pat_import_fail, message)
-                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())
-
-
-except Exception as e:
-    print(f"[ComfyUI-Manager] Logging failed: {e}")
-
-
-def ensure_dependencies():
-    try:
-        import git     # noqa: F401
-        import toml    # noqa: F401
-        import rich    # noqa: F401
-        import chardet # noqa: F401
-    except ModuleNotFoundError:
-        my_path = os.path.dirname(__file__)
-        requirements_path = os.path.join(my_path, "requirements.txt")
-
-        print("## ComfyUI-Manager: installing dependencies. (GitPython)")
-        try:
-            subprocess.check_output(manager_util.make_pip_cmd(['install', '-r', requirements_path]))
-        except subprocess.CalledProcessError:
-            print("## [ERROR] ComfyUI-Manager: Attempting to reinstall dependencies using an alternative method.")
-            try:
-                subprocess.check_output(manager_util.make_pip_cmd(['install', '--user', '-r', requirements_path]))
-            except subprocess.CalledProcessError:
-                print("## [ERROR] ComfyUI-Manager: Failed to install the GitPython package in the correct Python environment. Please install it manually in the appropriate environment. (You can seek help at https://app.element.io/#/room/%23comfyui_space%3Amatrix.org)")
-
-    try:
-        print("## ComfyUI-Manager: installing dependencies done.")
-    except:
-        # maybe we should sys.exit() here? there is at least two screens worth of error messages still being pumped after our error messages
-        print("## [ERROR] ComfyUI-Manager: GitPython package seems to be installed, but failed to load somehow. Make sure you have a working git client installed")
-
-ensure_dependencies()
-
-
-print("** ComfyUI startup time:", current_timestamp())
-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'))
-else:
-    print("** Log path: file logging is disabled")
-
-
-def read_downgrade_blacklist():
-    try:
-        if 'downgrade_blacklist' in default_conf:
-            items = default_conf['downgrade_blacklist'].split(',')
-            items = [x.strip() for x in items if x != '']
-            cm_global.pip_downgrade_blacklist += items
-            cm_global.pip_downgrade_blacklist = list(set(cm_global.pip_downgrade_blacklist))
-    except:
-        pass
-
-
-read_downgrade_blacklist()
-
-
-def check_bypass_ssl():
-    try:
-        import ssl
-        if 'bypass_ssl' in default_conf and default_conf['bypass_ssl'].lower() == 'true':
-            print(f"[ComfyUI-Manager] WARN: Unsafe - SSL verification bypass option is Enabled. (see {manager_config_path})")
-            ssl._create_default_https_context = ssl._create_unverified_context  # SSL certificate error fix.
-    except Exception:
-        pass
-
-check_bypass_ssl()
-
-
-# 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(), comfy_path, manager_files_path)
-
-
-def is_installed(name):
-    name = name.strip()
-
-    if name.startswith('#'):
-        return True
-
-    pattern = r'([^<>!~=]+)([<>!~=]=?)([0-9.a-zA-Z]*)'
-    match = re.search(pattern, name)
-
-    if match:
-        name = match.group(1)
-
-    if name in cm_global.pip_blacklist:
-        return True
-
-    if name in cm_global.pip_downgrade_blacklist:
-        pips = manager_util.get_installed_packages()
-
-        if match is None:
-            if name in pips:
-                return True
-        elif match.group(2) in ['<=', '==', '<', '~=']:
-            if name in pips:
-                if manager_util.StrictVersion(pips[name]) >= manager_util.StrictVersion(match.group(3)):
-                    print(f"[ComfyUI-Manager] skip black listed pip installation: '{name}'")
-                    return True
-
-    pkg = manager_util.get_installed_packages().get(name.lower())
-    if pkg is None:
-        return False  # update if not installed
-
-    if match is None:
-        return True   # don't update if version is not specified
-
-    if match.group(2) in ['>', '>=']:
-        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
-            return False
-        elif manager_util.StrictVersion(pkg) > manager_util.StrictVersion(match.group(3)):
-            print(f"[SKIP] Downgrading pip package isn't allowed: {name.lower()} (cur={pkg})")
-
-    if match.group(2) == '==':
-        if manager_util.StrictVersion(pkg) < manager_util.StrictVersion(match.group(3)):
-            return False
-
-    if match.group(2) == '~=':
-        if manager_util.StrictVersion(pkg) == manager_util.StrictVersion(match.group(3)):
-            return False
-
-    return True       # prevent downgrade
-
-
-if os.path.exists(restore_snapshot_path):
-    try:
-        cloned_repos = []
-
-        def msg_capture(stream, prefix):
-            stream.reconfigure(encoding=locale.getpreferredencoding(), errors='replace')
-            for msg in stream:
-                if msg.startswith("CLONE: "):
-                    cloned_repos.append(msg[7:])
-                    if prefix == '[!]':
-                        print(prefix, msg, end="", file=sys.stderr)
-                    else:
-                        print(prefix, msg, end="")
-
-                elif prefix == '[!]' and ('it/s]' in msg or 's/it]' in msg) and ('%|' in msg or 'it [' in msg):
-                    if msg.startswith('100%'):
-                        print('\r' + msg, end="", file=sys.stderr),
-                    else:
-                        print('\r'+msg[:-1], end="", file=sys.stderr),
-                else:
-                    if prefix == '[!]':
-                        print(prefix, msg, end="", file=sys.stderr)
-                    else:
-                        print(prefix, msg, end="")
-
-        print("[ComfyUI-Manager] Restore snapshot.")
-        new_env = os.environ.copy()
-        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)
-
-        if exit_code != 0:
-            print("[ComfyUI-Manager] Restore snapshot failed.")
-        else:
-            print("[ComfyUI-Manager] Restore snapshot done.")
-
-    except Exception as e:
-        print(e)
-        print("[ComfyUI-Manager] Restore snapshot failed.")
-
-    os.remove(restore_snapshot_path)
-
-
-def execute_lazy_install_script(repo_path, executable):
-    global processed_install
-
-    install_script_path = os.path.join(repo_path, "install.py")
-    requirements_path = os.path.join(repo_path, "requirements.txt")
-
-    if os.path.exists(requirements_path):
-        print(f"Install: pip packages for '{repo_path}'")
-
-        lines = manager_util.robust_readlines(requirements_path)
-        for line in lines:
-            package_name = remap_pip_package(line.strip())
-            package_name = package_name.split('#')[0].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')
-        print(f"Install: install script for '{repo_path}'")
-        install_cmd = [executable, "install.py"]
-
-        new_env = os.environ.copy()
-        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)
-
-
-def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom_nodes_path):
-    import uuid
-    import shutil
-
-    # 1. download
-    archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip"  # should be unpredictable name - security precaution
-    download_path = os.path.join(custom_nodes_path, archive_name)
-    manager_downloader.download_url(zip_url, custom_nodes_path, archive_name)
-
-    # 2. extract files into <node_id>@<cur_ver>
-    extracted = manager_util.extract_package_as_zip(download_path, from_path)
-    os.remove(download_path)
-
-    if extracted is None:
-        if len(os.listdir(from_path)) == 0:
-            shutil.rmtree(from_path)
-
-        print(f'Empty archive file: {target}')
-        return False
-
-
-    # 3. calculate garbage files (.tracking - extracted)
-    tracking_info_file = os.path.join(from_path, '.tracking')
-    prev_files = set()
-    with open(tracking_info_file, 'r') as f:
-        for line in f:
-            prev_files.add(line.strip())
-    garbage = prev_files.difference(extracted)
-    garbage = [os.path.join(custom_nodes_path, x) for x in garbage]
-
-    # 4-1. remove garbage files
-    for x in garbage:
-        if os.path.isfile(x):
-            os.remove(x)
-
-    # 4-2. remove garbage dir if empty
-    for x in garbage:
-        if os.path.isdir(x):
-            if not os.listdir(x):
-                os.rmdir(x)
-
-    # 5. rename dir name <node_id>@<prev_ver> ==> <node_id>@<cur_ver>
-    print(f"'{from_path}' is moved to '{to_path}'")
-    shutil.move(from_path, to_path)
-
-    # 6. create .tracking file
-    tracking_info_file = os.path.join(to_path, '.tracking')
-    with open(tracking_info_file, "w", encoding='utf-8') as file:
-        file.write('\n'.join(list(extracted)))
-
-
-script_executed = False
-
-def execute_startup_script():
-    global script_executed
-    print("\n#######################################################################")
-    print("[ComfyUI-Manager] Starting dependency installation/(de)activation for the extension\n")
-
-    custom_nodelist_cache = None
-
-    def get_custom_node_paths():
-        nonlocal custom_nodelist_cache
-        if custom_nodelist_cache is None:
-            custom_nodelist_cache = set()
-            for base in folder_paths.get_folder_paths('custom_nodes'):
-                for x in os.listdir(base):
-                    fullpath = os.path.join(base, x)
-                    if os.path.isdir(fullpath):
-                        custom_nodelist_cache.add(fullpath)
-
-        return custom_nodelist_cache
-
-    def execute_lazy_delete(path):
-        # Validate to prevent arbitrary paths from being deleted
-        if path not in get_custom_node_paths():
-            logging.error(f"## ComfyUI-Manager: The scheduled '{path}' is not a custom node path, so the deletion has been canceled.")
-            return
-
-        if not os.path.exists(path):
-            logging.info(f"## ComfyUI-Manager: SKIP-DELETE => '{path}' (already deleted)")
-            return
-
-        try:
-            shutil.rmtree(path)
-            logging.info(f"## ComfyUI-Manager: DELETE => '{path}'")
-        except Exception as e:
-            logging.error(f"## ComfyUI-Manager: Failed to delete '{path}' ({e})")
-
-    executed = set()
-    # Read each line from the file and convert it to a list using eval
-    with open(script_list_path, 'r', encoding="UTF-8", errors="ignore") as file:
-        for line in file:
-            if line in executed:
-                continue
-
-            executed.add(line)
-
-            try:
-                script = ast.literal_eval(line)
-
-                if script[1].startswith('#') and script[1] != '#FORCE':
-                    if script[1] == "#LAZY-INSTALL-SCRIPT":
-                        execute_lazy_install_script(script[0], script[2])
-
-                    elif script[1] == "#LAZY-CNR-SWITCH-SCRIPT":
-                        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-DELETE-NODEPACK":
-                        execute_lazy_delete(script[2])
-
-                elif os.path.exists(script[0]):
-                    if script[1] == "#FORCE":
-                        del script[1]
-                    else:
-                        if 'pip' in script[1:] and 'install' in script[1:] and is_installed(script[-1]):
-                            continue
-
-                    print(f"\n## ComfyUI-Manager: EXECUTE => {script[1:]}")
-                    print(f"\n## Execute management script for '{script[0]}'")
-
-                    new_env = os.environ.copy()
-                    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"management script failed: {script[0]}")
-                else:
-                    print(f"\n## ComfyUI-Manager: CANCELED => {script[1:]}")
-
-            except Exception as 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 = configparser.ConfigParser(strict=False)
-        config.read(manager_config_path)
-        default_conf = config['default']
-
-        if 'windows_selector_event_loop_policy' in default_conf and default_conf['windows_selector_event_loop_policy'].lower() == 'true':
-            try:
-                import asyncio
-                import asyncio.windows_events
-                asyncio.set_event_loop_policy(asyncio.windows_events.WindowsSelectorEventLoopPolicy())
-                print("[ComfyUI-Manager] Windows event loop policy mode enabled")
-            except Exception as e:
-                print(f"[ComfyUI-Manager] WARN: Windows initialization fail: {e}")
-    except Exception:
-        pass
-
-
-if platform.system() == 'Windows':
-    check_windows_event_loop_policy()

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.32.3"
+version = "3.0.1"
 license = { file = "LICENSE.txt" }
-dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
+dependencies = ["GitPython", "PyGithub", "matrix-client==0.4.0", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions"]
 
 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"

requirements.txt

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

ruff.toml

@@ -1,12 +0,0 @@
-# Disable all rules by default
-lint.ignore = ["ALL"]
-
-# Enable specific rules
-lint.select = [
-    "S307",  # suspicious-eval-usage
-    # The "F" series in Ruff stands for "Pyflakes" rules, which catch various Python syntax errors and undefined names.
-    # See all rules here: https://docs.astral.sh/ruff/rules/#pyflakes-f
-    "F",
-]
-
-exclude = ["*.ipynb"]

scanner.py

@@ -69,7 +69,7 @@ def extract_nodes(code_text):
 
     try:
         if parse_cnt % 100 == 0:
-            print(".", end="", flush=True)
+            print(f".", end="", flush=True)
         parse_cnt += 1
 
         code_text = re.sub(r'\\[^"\']', '', code_text)
@@ -245,10 +245,7 @@ def get_py_urls_from_json(json_file):
 
 
 def clone_or_pull_git_repository(git_url):
-    repo_name = git_url.split("/")[-1]
+    repo_name = git_url.split("/")[-1].split(".")[0]
-    if repo_name.endswith(".git"):
-        repo_name = repo_name[:-4]
-        
     repo_dir = os.path.join(temp_dir, repo_name)
 
     if os.path.exists(repo_dir):
@@ -515,7 +512,7 @@ def gen_json(node_info):
             nodes.sort()
             data[git_url] = (nodes, metadata_in_url)
 
-    json_path = "extension-node-map.json"
+    json_path = f"extension-node-map.json"
     with open(json_path, "w", encoding='utf-8') as file:
         json.dump(data, file, indent=4, sort_keys=True)
 

scripts/colab-dependencies.py

@@ -1,39 +0,0 @@
-import os
-import subprocess
-
-
-def get_enabled_subdirectories_with_files(base_directory):
-    subdirs_with_files = []
-    for subdir in os.listdir(base_directory):
-        try:
-            full_path = os.path.join(base_directory, subdir)
-            if os.path.isdir(full_path) and not subdir.endswith(".disabled") and not subdir.startswith('.') and subdir != '__pycache__':
-                print(f"## Install dependencies for '{subdir}'")
-                requirements_file = os.path.join(full_path, "requirements.txt")
-                install_script = os.path.join(full_path, "install.py")
-
-                if os.path.exists(requirements_file) or os.path.exists(install_script):
-                    subdirs_with_files.append((full_path, requirements_file, install_script))
-        except Exception as e:
-            print(f"EXCEPTION During Dependencies INSTALL on '{subdir}':\n{e}")
-
-    return subdirs_with_files
-
-
-def install_requirements(requirements_file_path):
-    if os.path.exists(requirements_file_path):
-        subprocess.run(["pip", "install", "-r", requirements_file_path])
-
-
-def run_install_script(install_script_path):
-    if os.path.exists(install_script_path):
-        subprocess.run(["python", install_script_path])
-
-
-custom_nodes_directory = "custom_nodes"
-subdirs_with_files = get_enabled_subdirectories_with_files(custom_nodes_directory)
-
-
-for subdir, requirements_file, install_script in subdirs_with_files:
-    install_requirements(requirements_file)
-    run_install_script(install_script)

scripts/install-comfyui-venv-linux.sh

@@ -1,21 +0,0 @@
-git clone https://github.com/comfyanonymous/ComfyUI
-cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
-cd ..
-python -m venv venv
-source venv/bin/activate
-python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
-python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
-cd ..
-echo "#!/bin/bash" > run_gpu.sh
-echo "cd ComfyUI" >> run_gpu.sh
-echo "source venv/bin/activate" >> run_gpu.sh
-echo "python main.py --preview-method auto" >> run_gpu.sh
-chmod +x run_gpu.sh
-
-echo "#!/bin/bash" > run_cpu.sh
-echo "cd ComfyUI" >> run_cpu.sh
-echo "source venv/bin/activate" >> run_cpu.sh
-echo "python main.py --preview-method auto --cpu" >> run_cpu.sh
-chmod +x run_cpu.sh

scripts/install-comfyui-venv-win.bat

@@ -1,17 +0,0 @@
-git clone https://github.com/comfyanonymous/ComfyUI
-cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
-cd ..
-python -m venv venv
-call venv/Scripts/activate
-python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
-python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
-cd ..
-echo "cd ComfyUI" >> run_gpu.bat
-echo "call venv/Scripts/activate" >> run_gpu.bat
-echo "python main.py" >> run_gpu.bat
-
-echo "cd ComfyUI" >> run_cpu.bat
-echo "call venv/Scripts/activate" >> run_cpu.bat
-echo "python main.py --cpu" >> run_cpu.bat

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

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