update DB

- Sanitize config string values to prevent CRLF injection attacks
- Add get_safe_snapshot_path() helper to validate snapshot targets
- Block path traversal attempts in remove_snapshot and restore_snapshot endpoints
- Reject targets containing /, \, .., or null characters

.env.example

@@ -1 +0,0 @@
-PYPI_TOKEN=your-pypi-token

.github/workflows/ci.yml

@@ -1,70 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ main, feat/*, fix/* ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  validate-openapi:
-    name: Validate OpenAPI Specification
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Check if OpenAPI changed
-      id: openapi-changed
-      uses: tj-actions/changed-files@v44
-      with:
-        files: openapi.yaml
-    
-    - name: Setup Node.js
-      if: steps.openapi-changed.outputs.any_changed == 'true'
-      uses: actions/setup-node@v4
-      with:
-        node-version: '18'
-    
-    - name: Install Redoc CLI
-      if: steps.openapi-changed.outputs.any_changed == 'true'
-      run: |
-        npm install -g @redocly/cli
-    
-    - name: Validate OpenAPI specification
-      if: steps.openapi-changed.outputs.any_changed == 'true'
-      run: |
-        redocly lint openapi.yaml
-
-  code-quality:
-    name: Code Quality Checks
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Fetch all history for proper diff
-    
-    - name: Get changed Python files
-      id: changed-py-files
-      uses: tj-actions/changed-files@v44
-      with:
-        files: |
-          **/*.py
-        files_ignore: |
-          comfyui_manager/legacy/**
-          
-    - name: Setup Python
-      if: steps.changed-py-files.outputs.any_changed == 'true'
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.9'
-    
-    - name: Install dependencies
-      if: steps.changed-py-files.outputs.any_changed == 'true'
-      run: |
-        pip install ruff
-    
-    - name: Run ruff linting on changed files
-      if: steps.changed-py-files.outputs.any_changed == 'true'
-      run: |
-        echo "Changed files: ${{ steps.changed-py-files.outputs.all_changed_files }}"
-        echo "${{ steps.changed-py-files.outputs.all_changed_files }}" | xargs -r ruff check

.github/workflows/publish-to-pypi.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - manager-v4
+      - draft-v4
     paths:
       - "pyproject.toml"
 
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: '3.9'
 
       - name: Install build dependencies
         run: |
@@ -31,28 +31,28 @@ jobs:
       - name: Get current version
         id: current_version
         run: |
-          CURRENT_VERSION=$(grep -oP '^version = "\K[^"]+' pyproject.toml)
+          CURRENT_VERSION=$(grep -oP 'version = "\K[^"]+' pyproject.toml)
           echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
           echo "Current version: $CURRENT_VERSION"
 
       - name: Build package
         run: python -m build
 
-      # - name: Create GitHub Release
-      #   id: create_release
-      #   uses: softprops/action-gh-release@v2
-      #   env:
-      #     GITHUB_TOKEN: ${{ github.token }}
-      #   with:
-      #     files: dist/*
-      #     tag_name: v${{ steps.current_version.outputs.version }}
-      #     draft: false
-      #     prerelease: false
-      #     generate_release_notes: true
+      - name: Create GitHub Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          files: dist/*
+          tag_name: v${{ steps.current_version.outputs.version }}
+          draft: false
+          prerelease: false
+          generate_release_notes: true
 
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_TOKEN }}
           skip-existing: true
-          verbose: true
+          verbose: true 

.github/workflows/publish.yml

@@ -0,0 +1,25 @@
+name: Publish to Comfy registry
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main-blocked
+    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
+        with:
+          ## Add your own personal access token to your Github Repository secrets and reference it here.
+          personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

.gitignore

@@ -17,8 +17,4 @@ github-stats-cache.json
 pip_overrides.json
 *.json
 check2.sh
-/venv/
-build
-dist
-*.egg-info
-.env
+/venv/

CONTRIBUTING.md

@@ -1,47 +0,0 @@
-## Testing Changes
-
-1. Activate the ComfyUI environment.
-
-2. Build package locally after making changes.
-
-```bash
-# from inside the ComfyUI-Manager directory, with the ComfyUI environment activated
-python -m build
-```
-
-3. Install the package locally in the ComfyUI environment.
-
-```bash
-# Uninstall existing package
-pip uninstall comfyui-manager
-
-# Install the locale package
-pip install dist/comfyui-manager-*.whl
-```
-
-4. Start ComfyUI.
-
-```bash
-# after navigating to the ComfyUI directory
-python main.py
-```
-
-## Manually Publish Test Version to PyPi
-
-1. Set the `PYPI_TOKEN` environment variable in env file.
-
-2. If manually publishing, you likely want to use a release candidate version, so set the version in [pyproject.toml](pyproject.toml) to something like `0.0.1rc1`.
-
-3. Build the package.
-
-```bash
-python -m build
-```
-
-4. Upload the package to PyPi.
-
-```bash
-python -m twine upload dist/* --username __token__ --password $PYPI_TOKEN
-```
-
-5. View at https://pypi.org/project/comfyui-manager/

MANIFEST.in

@@ -1,14 +0,0 @@
-include comfyui_manager/js/*
-include comfyui_manager/*.json
-include comfyui_manager/glob/*
-include LICENSE.txt
-include README.md
-include requirements.txt
-include pyproject.toml
-include custom-node-list.json
-include extension-node-list.json
-include extras.json
-include github-stats.json
-include model-list.json
-include alter-list.json
-include comfyui_manager/channels.list.template

README.md

@@ -5,7 +5,7 @@
 ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)
 
 ## NOTICE
-* V4.0: Modify the structure to be installable via pip instead of using git clone.
+* V3.38: **Security patch** - Manager data migrated to protected path. See [Migration Guide](docs/en/v3.38-userdata-security-migration.md).
 * V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
 * V3.10: `double-click feature` is removed
   * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
@@ -14,26 +14,78 @@
 
 ## Installation
 
-* When installing the latest ComfyUI, it will be automatically installed as a dependency, so manual installation is no longer necessary.
+### Installation[method1] (General installation method: ComfyUI-Manager only)
 
-* Manual installation of the nightly version:
-    * Clone to a temporary directory (**Note:** Do **not** clone into `ComfyUI/custom_nodes`.)
-      ```  
-      git clone https://github.com/Comfy-Org/ComfyUI-Manager  
-      ```  
-    * Install via pip
-      ```  
-      cd ComfyUI-Manager  
-      pip install .  
-      ```
+To install ComfyUI-Manager in addition to an existing installation of ComfyUI, you can follow the following steps:
 
+1. Go to `ComfyUI/custom_nodes` dir in terminal (cmd)
+2. `git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager`
+3. Restart ComfyUI
+
+
+### Installation[method2] (Installation for portable ComfyUI version: ComfyUI-Manager only)
+1. install git 
+- https://git-scm.com/download/win
+- standalone version  
+- select option: use windows default console window
+2. Download [scripts/install-manager-for-portable-version.bat](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-manager-for-portable-version.bat) into installed `"ComfyUI_windows_portable"` directory
+- Don't click. Right-click the link and choose '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/macOS:
+```commandline
+python -m venv venv
+. venv/bin/activate
+pip install comfy-cli
+comfy install
+```
 * See also: https://github.com/Comfy-Org/comfy-cli
 
 
-## Front-end
+### Installation[method4] (Installation for Linux+venv: ComfyUI + ComfyUI-Manager)
 
-* The built-in front-end of ComfyUI-Manager is the legacy front-end. The front-end for ComfyUI-Manager is now provided via [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
-* To enable the legacy front-end, set the environment variable `ENABLE_LEGACY_COMFYUI_MANAGER_FRONT` to `true` before running.
+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 choose 'Save As...'
+- ComfyUI will be installed in the subdirectory of the specified directory, and the directory will contain the generated executable script.
+2. `chmod +x install-comfyui-venv-linux.sh`
+3. `./install-comfyui-venv-linux.sh`
+
+### Installation Precautions
+* **DO**: `ComfyUI-Manager` files must be accurately located in the path `ComfyUI/custom_nodes/comfyui-manager`
+  * Installing in a compressed file format is not recommended.
+* **DON'T**: Decompress directly into the `ComfyUI/custom_nodes` location, resulting in the Manager contents like `__init__.py` being placed directly in that directory.
+  * You have to remove all ComfyUI-Manager files from `ComfyUI/custom_nodes`
+* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager/ComfyUI-Manager`.
+* **DON'T**: In a form where decompression occurs in a path such as `ComfyUI/custom_nodes/ComfyUI-Manager-main`.
+  * In such cases, `ComfyUI-Manager` may operate, but it won't be recognized within `ComfyUI-Manager`, and updates cannot be performed. It also poses the risk of duplicate installations. Remove it and install properly via `git clone` method.
+
+
+You can execute ComfyUI by running either `./run_gpu.sh` or `./run_cpu.sh` depending on your system configuration.
+
+## Colab Notebook
+This repository provides Colab notebooks that allow you to install and use ComfyUI, including ComfyUI-Manager. To use ComfyUI, [click on this link](https://colab.research.google.com/github/ltdrdata/ComfyUI-Manager/blob/main/notebooks/comfyui_colab_with_manager.ipynb).
+* Support for installing ComfyUI
+* Support for basic installation of ComfyUI-Manager
+* Support for automatically installing dependencies of custom nodes upon restarting Colab notebooks.
 
 
 ## How To Use
@@ -89,20 +141,27 @@
 
 
 ## Paths
-In `ComfyUI-Manager` V4.0.3b4 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/__manager/`.
+Starting from V3.38, Manager uses a protected system path for enhanced security.
 
 * <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>/__manager/config.ini`
-* Configurable channel lists: `<USER_DIRECTORY>/__manager/channels.ini`
-* Configurable pip overrides: `<USER_DIRECTORY>/__manager/pip_overrides.json`
-* Configurable pip blacklist: `<USER_DIRECTORY>/__manager/pip_blacklist.list`
-* Configurable pip auto fix: `<USER_DIRECTORY>/__manager/pip_auto_fix.list`
-* Saved snapshot files: `<USER_DIRECTORY>/__manager/snapshots`
-* Startup script files: `<USER_DIRECTORY>/__manager/startup-scripts`
-* Component files: `<USER_DIRECTORY>/__manager/components`
+| ComfyUI Version | Manager Path |
+|-----------------|--------------|
+| v0.3.76+ (with System User API) | `<USER_DIRECTORY>/__manager/` |
+| Older versions | `<USER_DIRECTORY>/default/ComfyUI-Manager/` |
+
+* Basic config files: `config.ini`
+* Configurable channel lists: `channels.list`
+* Configurable pip overrides: `pip_overrides.json`
+* Configurable pip blacklist: `pip_blacklist.list`
+* Configurable pip auto fix: `pip_auto_fix.list`
+* Saved snapshot files: `snapshots/`
+* Startup script files: `startup-scripts/`
+* Component files: `components/`
+
+> **Note**: See [Migration Guide](docs/en/v3.38-userdata-security-migration.md) for upgrade details.
 
 
 ## `extra_model_paths.yaml` Configuration
@@ -115,12 +174,12 @@ The following settings are applied based on the section marked as `is_default`.
 
 ## 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>/__manager/snapshots`
+  * Snapshot file dir: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
   * You can rename snapshot file.
 * Press the "Restore" button to revert to the installation status of the respective snapshot.
   * However, for custom nodes not managed by Git, snapshot support is incomplete.
 * When you press `Restore`, it will take effect on the next ComfyUI startup.
-  * The selected snapshot file is saved in `<USER_DIRECTORY>/__manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
+  * The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
 
 ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)
 
@@ -169,12 +228,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>/__manager/components`.
+    * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
       * `<component name>`: The name should be in the format `<prefix>::<node name>`.
         * `<component node data>`: In the node data 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>/__manager/components`.
+          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
           * `<category>`: If there is neither a category nor a packname, it is saved in the components category.
           ```
               "version":"1.0",
@@ -215,14 +274,13 @@ The following settings are applied based on the section marked as `is_default`.
     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|personal_cloud>
+    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)
-      - personal_cloud: Applies relaxed security features in cloud environments such as Google Colab or Runpod, where strong security is not required. 
 
 
 ## Additional Feature
@@ -304,7 +362,7 @@ 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>/__manager/config.ini` file that is generated.
+* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/default/ComfyUI-Manager/config.ini` file that is generated.
 * If updating ComfyUI-Manager itself fails, please go to the **ComfyUI-Manager** directory and execute the command `git update-ref refs/remotes/origin/main a361cc1 && git fetch --all && git pull`.
 * 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`
@@ -313,33 +371,31 @@ When you run the `scan.sh` script:
 
 
 ## Security policy
-
-The security settings are applied based on whether the ComfyUI server's listener is non-local and whether the network mode is set to `personal_cloud`.
-
-* **non-local**: When the server is launched with `--listen` and is bound to a network range other than the local `127.` range, allowing remote IP access.
-* **personal\_cloud**: When the `network_mode` is set to `personal_cloud`.
-
-
-### Risky Level Table
-
-| Risky Level | features                                                                                                                              |
-|-------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| high+       | * `Install via git url`, `pip install`<BR>* Installation of nodepack registered not in the `default channel`.                         |
-| high        | * Fix nodepack                                                                                                                        |
-| middle+     | * Uninstall/Update<BR>* Installation of nodepack registered in the `default channel`.<BR>* Restore/Remove Snapshot<BR>* Install model |
-| middle      | * Restart                                                                                                                             |
-| low         | * Update ComfyUI                                                                                                                      |
-
-
-### Security Level Table
-
-| Security Level | local                                                                                                                    | non-local (personal_cloud)                                                                                               | non-local (not personal_cloud) |
-|----------------|--------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|--------------------------------|
-| strong         | * Only `weak` level risky features are allowed                                                                           | * Only `weak` level risky features are allowed                                                                           | * Only `weak` level risky features are allowed                               |
-| normal         | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+`, `high` and `middle+` level risky features are not allowed<BR>* `middle` level risky features are available
-| normal-        | * All features are available                                                                                             | * `high+` and `high` level risky features are not allowed<BR>* `middle+` and `middle` level risky features are available | * `high+`, `high` and `middle+` level risky features are not allowed<BR>* `middle` level risky features are available 
-| weak           | * All features are available                                                                                             | * All features are available                                                                                             | * `high+` and `middle+` level risky features are not allowed<BR>* `high`, `middle` and `low` level risky features are available
-
+  * Edit `config.ini` file: add `security_level = <LEVEL>`
+    * `strong`
+      * doesn't allow `high` and `middle` level risky feature
+    * `normal`
+      * doesn't allow `high` level risky feature
+      * `middle` level risky feature is available
+    * `normal-`
+      * doesn't allow `high` level risky feature if `--listen` is specified and not starts with `127.`
+      * `middle` level risky feature is available
+    * `weak`
+      * all feature is available
+    
+  * `high` level risky features
+    * `Install via git url`, `pip install`
+    * Installation of custom nodes registered not in the `default channel`.
+    * Fix custom nodes
+  
+  * `middle` level risky features
+    * Uninstall/Update
+    * Installation of custom nodes registered in the `default channel`.
+    * Restore/Remove Snapshot
+    * Restart
+  
+  * `low` level risky features
+    * Update ComfyUI
 
 
 # Disclaimer

__init__.py

@@ -0,0 +1,25 @@
+"""
+This file is the entry point for the ComfyUI-Manager package, handling CLI-only mode and initial setup.
+"""
+
+import os
+import sys
+
+cli_mode_flag = os.path.join(os.path.dirname(__file__), '.enable-cli-only-mode')
+
+if not os.path.exists(cli_mode_flag):
+    sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+    import manager_server  # noqa: F401
+    import share_3rdparty  # noqa: F401
+    import cm_global
+
+    if not cm_global.disable_front and not 'DISABLE_COMFYUI_MANAGER_FRONT' in os.environ:
+        WEB_DIRECTORY = "js"
+else:
+    print("\n[ComfyUI-Manager] !! cli-only-mode is enabled !!\n")
+
+NODE_CLASS_MAPPINGS = {}
+__all__ = ['NODE_CLASS_MAPPINGS']
+
+
+

channels.list.template

@@ -0,0 +1,6 @@
+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
+tutorial::https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main/node_db/tutorial

cm-cli.py

@@ -15,31 +15,31 @@ import git
 import importlib
 
 
-from ..common import manager_util
+sys.path.append(os.path.dirname(__file__))
+sys.path.append(os.path.join(os.path.dirname(__file__), "glob"))
+
+import manager_util
 
 # read env vars
 # COMFYUI_FOLDERS_BASE_PATH is not required in cm-cli.py
 # `comfy_path` should be resolved before importing manager_core
-
 comfy_path = os.environ.get('COMFYUI_PATH')
-
 if comfy_path is None:
-    print("[bold red]cm-cli: environment variable 'COMFYUI_PATH' is not specified.[/bold red]")
-    exit(-1)
+    try:
+        import folder_paths
+        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
+    except:
+        print("\n[bold yellow]WARN: The `COMFYUI_PATH` environment variable is not set. Assuming `custom_nodes/ComfyUI-Manager/../../` as the ComfyUI path.[/bold yellow]", file=sys.stderr)
+        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
 
+# This should be placed here
 sys.path.append(comfy_path)
 
-if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
-    print("[bold red]cm-cli: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.[/bold red]")
-    exit(-1)
-
-
 import utils.extra_config
-from ..common import cm_global
-from ..legacy import manager_core as core
-from ..common import context
-from ..legacy.manager_core import unified_manager
-from ..common import cnr_utils
+import cm_global
+import manager_core as core
+from manager_core import unified_manager
+import cnr_utils
 
 comfyui_manager_path = os.path.abspath(os.path.dirname(__file__))
 
@@ -66,7 +66,7 @@ def check_comfyui_hash():
         repo = git.Repo(comfy_path)
         core.comfy_ui_revision = len(list(repo.iter_commits('HEAD')))
         core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
-    except Exception:
+    except:
         print('[bold yellow]INFO: Frozen ComfyUI mode.[/bold yellow]')
         core.comfy_ui_revision = 0
         core.comfy_ui_commit_datetime = 0
@@ -82,7 +82,7 @@ def read_downgrade_blacklist():
     try:
         import configparser
         config = configparser.ConfigParser(strict=False)
-        config.read(context.manager_config_path)
+        config.read(core.manager_config.path)
         default_conf = config['default']
 
         if 'downgrade_blacklist' in default_conf:
@@ -90,7 +90,7 @@ def read_downgrade_blacklist():
             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 Exception:
+    except:
         pass
 
 
@@ -105,7 +105,7 @@ class Ctx:
         self.no_deps = False
         self.mode = 'cache'
         self.user_directory = None
-        self.custom_nodes_paths = [os.path.join(context.comfy_base_path, 'custom_nodes')]
+        self.custom_nodes_paths = [os.path.join(core.comfy_base_path, 'custom_nodes')]
         self.manager_files_directory = os.path.dirname(__file__)
         
         if Ctx.folder_paths is None:
@@ -143,14 +143,14 @@ class Ctx:
         if os.path.exists(extra_model_paths_yaml):
             utils.extra_config.load_extra_path_config(extra_model_paths_yaml)
 
-        context.update_user_directory(user_directory)
+        core.update_user_directory(user_directory)
 
-        if os.path.exists(context.manager_pip_overrides_path):
-            with open(context.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
+        if os.path.exists(core.manager_pip_overrides_path):
+            with open(core.manager_pip_overrides_path, 'r', encoding="UTF-8", errors="ignore") as json_file:
                 cm_global.pip_overrides = json.load(json_file)
 
-        if os.path.exists(context.manager_pip_blacklist_path):
-            with open(context.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+        if os.path.exists(core.manager_pip_blacklist_path):
+            with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
                 for x in f.readlines():
                     y = x.strip()
                     if y != '':
@@ -163,15 +163,15 @@ class Ctx:
 
     @staticmethod
     def get_startup_scripts_path():
-        return os.path.join(context.manager_startup_script_path, "install-scripts.txt")
+        return os.path.join(core.manager_startup_script_path, "install-scripts.txt")
 
     @staticmethod
     def get_restore_snapshot_path():
-        return os.path.join(context.manager_startup_script_path, "restore-snapshot.json")
+        return os.path.join(core.manager_startup_script_path, "restore-snapshot.json")
 
     @staticmethod
     def get_snapshot_path():
-        return context.manager_snapshot_path
+        return core.manager_snapshot_path
 
     @staticmethod
     def get_custom_nodes_paths():
@@ -438,11 +438,8 @@ def show_list(kind, simple=False):
     flag = kind in ['all', 'cnr', 'installed', 'enabled']
     for k, v in unified_manager.active_nodes.items():
         if flag:
-            cnr = unified_manager.cnr_map.get(k)
-            if cnr:
-                processed[k] = "[    ENABLED    ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
-            else:
-                processed[k] = None
+            cnr = unified_manager.cnr_map[k]
+            processed[k] = "[    ENABLED    ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
         else:
             processed[k] = None
 
@@ -462,11 +459,8 @@ def show_list(kind, simple=False):
             continue
 
         if flag:
-            cnr = unified_manager.cnr_map.get(k)  # NOTE: can this be None if removed from CNR after installed
-            if cnr:
-                processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
-            else:
-                processed[k] = None
+            cnr = unified_manager.cnr_map[k]
+            processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
         else:
             processed[k] = None
 
@@ -475,11 +469,8 @@ def show_list(kind, simple=False):
             continue
 
         if flag:
-            cnr = unified_manager.cnr_map.get(k)
-            if cnr:
-                processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
-            else:
-                processed[k] = None
+            cnr = unified_manager.cnr_map[k]
+            processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
         else:
             processed[k] = None
 
@@ -499,12 +490,9 @@ def show_list(kind, simple=False):
             continue
 
         if flag:
-            cnr = unified_manager.cnr_map.get(k)
-            if cnr:
-                ver_spec = v['latest_version']['version'] if 'latest_version' in v else '0.0.0'
-                processed[k] = "[ NOT INSTALLED ] ", cnr['name'], k, cnr['publisher']['name'], ver_spec
-            else:
-                processed[k] = None
+            cnr = unified_manager.cnr_map[k]
+            ver_spec = v['latest_version']['version'] if 'latest_version' in v else '0.0.0'
+            processed[k] = "[ NOT INSTALLED ] ", cnr['name'], k, cnr['publisher']['name'], ver_spec
         else:
             processed[k] = None
 
@@ -670,7 +658,7 @@ def install(
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, act=install_node, exit_on_fail=exit_on_fail)
     pip_fixer.fix_broken()
 
@@ -708,7 +696,7 @@ def reinstall(
     cmd_ctx.set_channel_mode(channel, mode)
     cmd_ctx.set_no_deps(no_deps)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, act=reinstall_node)
     pip_fixer.fix_broken()
 
@@ -762,7 +750,7 @@ def update(
     if 'all' in nodes:
         asyncio.run(auto_save_snapshot())
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
 
     for x in nodes:
         if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -863,7 +851,7 @@ def fix(
     if 'all' in nodes:
         asyncio.run(auto_save_snapshot())
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for_each_nodes(nodes, fix_node, allow_all=True)
     pip_fixer.fix_broken()
 
@@ -1140,7 +1128,7 @@ def restore_snapshot(
             print(f"[bold red]ERROR: `{snapshot_path}` is not exists.[/bold red]")
             exit(1)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     try:
         asyncio.run(core.restore_snapshot(snapshot_path, extras))
     except Exception:
@@ -1172,7 +1160,7 @@ def restore_dependencies(
     total = len(node_paths)
     i = 1
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     for x in node_paths:
         print("----------------------------------------------------------------------------------------------------")
         print(f"Restoring [{i}/{total}]: {x}")
@@ -1191,7 +1179,7 @@ def post_install(
 ):
     path = os.path.expanduser(path)
 
-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
     unified_manager.execute_install_script('', path, instant_execution=True)
     pip_fixer.fix_broken()
 
@@ -1231,11 +1219,11 @@ def install_deps(
         with open(deps, 'r', encoding="UTF-8", errors="ignore") as json_file:
             try:
                 json_obj = json.load(json_file)
-            except Exception:
+            except:
                 print(f"[bold red]Invalid json file: {deps}[/bold red]")
                 exit(1)
 
-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
             for k in json_obj['custom_nodes'].keys():
                 state = core.simple_check_custom_node(k)
                 if state == 'installed':
@@ -1292,10 +1280,6 @@ def export_custom_node_ids(
                     print(f"{x['id']}@unknown", file=output_file)
 
 
-def main():
-    app()
-
-
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
     sys.exit(app())

cm-cli.sh

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

comfyui_manager/__init__.py

@@ -1,104 +0,0 @@
-import os
-import logging
-from aiohttp import web
-from .common.manager_security import HANDLER_POLICY
-from .common import manager_security
-from comfy.cli_args import args
-
-
-def prestartup():
-    from . import prestartup_script  # noqa: F401
-    logging.info('[PRE] ComfyUI-Manager')
-
-
-def start():
-    logging.info('[START] ComfyUI-Manager')
-    from .common import cm_global     # noqa: F401
-
-    if args.enable_manager:
-        if args.enable_manager_legacy_ui:
-            try:
-                from .legacy import manager_server  # noqa: F401
-                from .legacy import share_3rdparty  # noqa: F401
-                from .legacy import manager_core as core
-                import nodes
-
-                logging.info("[ComfyUI-Manager] Legacy UI is enabled.")
-                nodes.EXTENSION_WEB_DIRS['comfyui-manager-legacy'] = os.path.join(os.path.dirname(__file__), 'js')
-            except Exception as e:
-                print("Error enabling legacy ComfyUI Manager frontend:", e)
-                core = None
-        else:
-            from .glob import manager_server  # noqa: F401
-            from .glob import share_3rdparty  # noqa: F401
-            from .glob import manager_core as core
-
-        if core is not None:
-            manager_security.is_personal_cloud_mode = core.get_config()['network_mode'].lower() == 'personal_cloud'
-
-
-def should_be_disabled(fullpath:str) -> bool:
-    """
-    1. Disables the legacy ComfyUI-Manager.
-    2. The blocklist can be expanded later based on policies.
-    """
-    if args.enable_manager:
-        # In cases where installation is done via a zip archive, the directory name may not be comfyui-manager, and it may not contain a git repository.
-        # It is assumed that any installed legacy ComfyUI-Manager will have at least 'comfyui-manager' in its directory name.
-        dir_name = os.path.basename(fullpath).lower()
-        if 'comfyui-manager' in dir_name:
-            return True
-
-    return False
-
-
-def get_client_ip(request):
-    peername = request.transport.get_extra_info("peername")
-    if peername is not None:
-        host, port = peername
-        return host
-    
-    return "unknown"
-
-
-def create_middleware():
-    connected_clients = set()
-    is_local_mode = manager_security.is_loopback(args.listen)
-
-    @web.middleware
-    async def manager_middleware(request: web.Request, handler):
-        nonlocal connected_clients
-
-        # security policy for remote environments
-        prev_client_count = len(connected_clients)
-        client_ip = get_client_ip(request)
-        connected_clients.add(client_ip)
-        next_client_count = len(connected_clients)
-
-        if prev_client_count == 1 and next_client_count > 1:
-            manager_security.multiple_remote_alert()
-
-        policy = manager_security.get_handler_policy(handler)
-        is_banned = False
-
-        # policy check
-        if len(connected_clients) > 1:
-            if is_local_mode:
-                if HANDLER_POLICY.MULTIPLE_REMOTE_BAN_NON_LOCAL in policy:
-                    is_banned = True
-                if HANDLER_POLICY.MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD in policy:
-                    is_banned = not manager_security.is_personal_cloud_mode
-
-        if HANDLER_POLICY.BANNED in policy:
-            is_banned = True
-
-        if is_banned:
-            logging.warning(f"[Manager] Banning request from {client_ip}: {request.path}")
-            response = web.Response(text="[Manager] This request is banned.", status=403)
-        else:
-            response: web.Response = await handler(request)
-
-        return response
-
-    return manager_middleware
-    

comfyui_manager/channels.list.template

@@ -1,6 +0,0 @@
-default::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main
-recent::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/new
-legacy::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/legacy
-forked::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/forked
-dev::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/dev
-tutorial::https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main/node_db/tutorial

comfyui_manager/common/README.md

@@ -1,16 +0,0 @@
-# ComfyUI-Manager: Core Backend (glob)
-
-This directory contains the Python backend modules that power ComfyUI-Manager, handling the core functionality of node management, downloading, security, and server operations.
-
-## Core Modules
-
-- **manager_downloader.py**: Handles downloading operations for models, extensions, and other resources.
-- **manager_util.py**: Provides utility functions used throughout the system.
-
-## Specialized Modules
-
-- **cm_global.py**: Maintains global variables and state management across the system.
-- **cnr_utils.py**: Helper utilities for interacting with the custom node registry (CNR).
-- **git_utils.py**: Git-specific utilities for repository operations.
-- **node_package.py**: Handles the packaging and installation of node extensions.
-- **security_check.py**: Implements the multi-level security system for installation safety.

comfyui_manager/common/__init__.py

@@ -1,17 +0,0 @@
-from .timestamp_utils import (
-    current_timestamp,
-    get_timestamp_for_filename,
-    get_timestamp_for_path,
-    get_backup_branch_name,
-    get_now,
-    get_unix_timestamp,
-)
-
-__all__ = [
-    'current_timestamp',
-    'get_timestamp_for_filename',
-    'get_timestamp_for_path',
-    'get_backup_branch_name',
-    'get_now',
-    'get_unix_timestamp',
-]

comfyui_manager/common/context.py

@@ -1,105 +0,0 @@
-import sys
-import os
-import logging
-from . import manager_util
-import toml
-import git
-
-
-# read env vars
-comfy_path: str = os.environ.get('COMFYUI_PATH')
-comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
-
-if comfy_path is None:
-    try:
-        comfy_path = os.path.abspath(os.path.dirname(sys.modules['__main__'].__file__))
-        os.environ['COMFYUI_PATH'] = comfy_path
-    except Exception:
-        logging.error("[ComfyUI-Manager] environment variable 'COMFYUI_PATH' is not specified.")
-        exit(-1)
-
-if comfy_base_path is None:
-    comfy_base_path = comfy_path
-
-channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
-git_script_path = os.path.join(manager_util.comfyui_manager_path, "common", "git_helper.py")
-
-manager_files_path = None
-manager_config_path = None
-manager_channel_list_path = None
-manager_startup_script_path:str = None
-manager_snapshot_path = None
-manager_pip_overrides_path = None
-manager_pip_blacklist_path = None
-manager_batch_history_path = None
-
-def update_user_directory(manager_dir):
-    global manager_files_path
-    global manager_config_path
-    global manager_channel_list_path
-    global manager_startup_script_path
-    global manager_snapshot_path
-    global manager_pip_overrides_path
-    global manager_pip_blacklist_path
-    global manager_batch_history_path
-
-    manager_files_path = manager_dir
-    if not os.path.exists(manager_files_path):
-        os.makedirs(manager_files_path)
-
-    manager_snapshot_path = os.path.join(manager_files_path, "snapshots")
-    if not os.path.exists(manager_snapshot_path):
-        os.makedirs(manager_snapshot_path)
-
-    manager_startup_script_path = os.path.join(manager_files_path, "startup-scripts")
-    if not os.path.exists(manager_startup_script_path):
-        os.makedirs(manager_startup_script_path)
-
-    manager_config_path = os.path.join(manager_files_path, 'config.ini')
-    manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
-    manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
-    manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
-    manager_util.cache_dir = os.path.join(manager_files_path, "cache")
-    manager_batch_history_path = os.path.join(manager_files_path, "batch_history")
-
-    if not os.path.exists(manager_util.cache_dir):
-        os.makedirs(manager_util.cache_dir)
-
-    if not os.path.exists(manager_batch_history_path):
-        os.makedirs(manager_batch_history_path)
-
-try:
-    import folder_paths
-    update_user_directory(folder_paths.get_system_user_directory("manager"))
-
-except Exception:
-    # fallback:
-    # This case is only possible when running with cm-cli, and in practice, this case is not actually used.
-    update_user_directory(os.path.abspath(manager_util.comfyui_manager_path))
-
-
-def get_current_comfyui_ver():
-    """
-    Extract version from pyproject.toml
-    """
-    toml_path = os.path.join(comfy_path, 'pyproject.toml')
-    if not os.path.exists(toml_path):
-        return None
-    else:
-        try:
-            with open(toml_path, "r", encoding="utf-8") as f:
-                data = toml.load(f)
-
-                project = data.get('project', {})
-                return project.get('version')
-        except Exception:
-            return None
-
-
-def get_comfyui_tag():
-    try:
-        with git.Repo(comfy_path) as repo:
-            return repo.git.describe('--tags')
-    except Exception:
-        return None
-

comfyui_manager/common/enums.py

@@ -1,18 +0,0 @@
-import enum
-
-class NetworkMode(enum.Enum):
-    PUBLIC = "public"
-    PRIVATE = "private"
-    OFFLINE = "offline"
-    PERSONAL_CLOUD = "personal_cloud"
-
-class SecurityLevel(enum.Enum):
-    STRONG = "strong"
-    NORMAL = "normal"
-    NORMAL_MINUS = "normal-minus"
-    WEAK = "weak"
-
-class DBMode(enum.Enum):
-    LOCAL = "local"
-    CACHE = "cache"
-    REMOTE = "remote"

comfyui_manager/common/manager_security.py

@@ -1,36 +0,0 @@
-from enum import Enum
-
-is_personal_cloud_mode = False
-handler_policy = {}
-
-class HANDLER_POLICY(Enum):
-    MULTIPLE_REMOTE_BAN_NON_LOCAL = 1
-    MULTIPLE_REMOTE_BAN_NOT_PERSONAL_CLOUD = 2
-    BANNED = 3
-
-
-def is_loopback(address):
-    import ipaddress
-    try:
-        return ipaddress.ip_address(address).is_loopback
-    except ValueError:
-        return False
-
-
-def do_nothing():
-    pass
-
-
-def get_handler_policy(x):
-    return handler_policy.get(x) or set()
-
-def add_handler_policy(x, policy):
-    s = handler_policy.get(x)
-    if s is None:
-        s = set()
-        handler_policy[x] = s
-    
-    s.add(policy)
-    
-    
-multiple_remote_alert = do_nothing

comfyui_manager/common/timestamp_utils.py

@@ -1,136 +0,0 @@
-"""
-Robust timestamp utilities with datetime fallback.
-
-Some environments (especially Mac) have issues with the datetime module
-due to local file name conflicts or Homebrew Python module path issues.
-"""
-
-import logging
-import time as time_module
-import uuid
-
-_datetime_available = None
-_dt_datetime = None
-
-
-def _init_datetime():
-    """Initialize datetime availability check (lazy, once)."""
-    global _datetime_available, _dt_datetime
-    if _datetime_available is not None:
-        return
-
-    try:
-        import datetime as dt
-        if hasattr(dt, 'datetime'):
-            from datetime import datetime as dt_datetime
-            _dt_datetime = dt_datetime
-            _datetime_available = True
-            return
-    except Exception as e:
-        logging.debug(f"[ComfyUI-Manager] datetime import failed: {e}")
-
-    _datetime_available = False
-    logging.warning("[ComfyUI-Manager] datetime unavailable, using time module fallback")
-
-
-def current_timestamp() -> str:
-    """
-    Get current timestamp for logging.
-    Format: YYYY-MM-DD HH:MM:SS.mmm (or Unix timestamp if fallback)
-    """
-    _init_datetime()
-    if _datetime_available:
-        return _dt_datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')[:-3]
-    return str(time_module.time()).split('.')[0]
-
-
-def get_timestamp_for_filename() -> str:
-    """
-    Get timestamp suitable for filenames.
-    Format: YYYYMMDD_HHMMSS
-    """
-    _init_datetime()
-    if _datetime_available:
-        return _dt_datetime.now().strftime('%Y%m%d_%H%M%S')
-    return time_module.strftime('%Y%m%d_%H%M%S')
-
-
-def get_timestamp_for_path() -> str:
-    """
-    Get timestamp for path/directory names.
-    Format: YYYY-MM-DD_HH-MM-SS
-    """
-    _init_datetime()
-    if _datetime_available:
-        return _dt_datetime.now().strftime('%Y-%m-%d_%H-%M-%S')
-    return time_module.strftime('%Y-%m-%d_%H-%M-%S')
-
-
-def get_backup_branch_name(repo=None) -> str:
-    """
-    Get backup branch name with current timestamp.
-    Format: backup_YYYYMMDD_HHMMSS (or backup_YYYYMMDD_HHMMSS_N if exists)
-
-    Args:
-        repo: Optional git.Repo object. If provided, checks for name collisions
-              and adds sequential suffix if needed.
-
-    Returns:
-        Unique backup branch name.
-    """
-    base_name = f'backup_{get_timestamp_for_filename()}'
-
-    if repo is None:
-        return base_name
-
-    # Check if branch exists
-    try:
-        existing_branches = {b.name for b in repo.heads}
-    except Exception:
-        return base_name
-
-    if base_name not in existing_branches:
-        return base_name
-
-    # Add sequential suffix
-    for i in range(1, 100):
-        new_name = f'{base_name}_{i}'
-        if new_name not in existing_branches:
-            return new_name
-
-    # Ultimate fallback: use UUID (very unlikely to reach here)
-    return f'{base_name}_{uuid.uuid4().hex[:6]}'
-
-
-def get_now():
-    """
-    Get current datetime object.
-    Returns datetime.now() if available, otherwise a FakeDatetime object
-    that supports basic operations (timestamp(), strftime()).
-    """
-    _init_datetime()
-    if _datetime_available:
-        return _dt_datetime.now()
-
-    # Fallback: return object with basic datetime-like interface
-    t = time_module.localtime()
-
-    class FakeDatetime:
-        def timestamp(self):
-            return time_module.time()
-
-        def strftime(self, fmt):
-            return time_module.strftime(fmt, t)
-
-        def isoformat(self):
-            return time_module.strftime('%Y-%m-%dT%H:%M:%S', t)
-
-    return FakeDatetime()
-
-
-def get_unix_timestamp() -> float:
-    """Get current Unix timestamp."""
-    _init_datetime()
-    if _datetime_available:
-        return _dt_datetime.now().timestamp()
-    return time_module.time()

comfyui_manager/data_models/README.md

@@ -1,68 +0,0 @@
-# Data Models
-
-This directory contains Pydantic models for ComfyUI Manager, providing type safety, validation, and serialization for the API and internal data structures.
-
-## Overview
-
-- `generated_models.py` - All models auto-generated from OpenAPI spec
-- `__init__.py` - Package exports for all models
-
-**Note**: All models are now auto-generated from the OpenAPI specification. Manual model files (`task_queue.py`, `state_management.py`) have been deprecated in favor of a single source of truth.
-
-## Generating Types from OpenAPI
-
-The state management models are automatically generated from the OpenAPI specification using `datamodel-codegen`. This ensures type safety and consistency between the API specification and the Python code.
-
-### Prerequisites
-
-Install the code generator:
-```bash
-pipx install datamodel-code-generator
-```
-
-### Generation Command
-
-To regenerate all models after updating the OpenAPI spec:
-
-```bash
-datamodel-codegen \
-  --use-subclass-enum \
-  --field-constraints \
-  --strict-types bytes \
-  --use-double-quotes \
-  --input openapi.yaml \
-  --output comfyui_manager/data_models/generated_models.py \
-  --output-model-type pydantic_v2.BaseModel
-```
-
-### When to Regenerate
-
-You should regenerate the models when:
-
-1. **Adding new API endpoints** that return new data structures
-2. **Modifying existing schemas** in the OpenAPI specification  
-3. **Adding new state management features** that require new models
-
-### Important Notes
-
-- **Single source of truth**: All models are now generated from `openapi.yaml`
-- **No manual models**: All previously manual models have been migrated to the OpenAPI spec
-- **OpenAPI requirements**: New schemas must be referenced in API paths to be generated by datamodel-codegen
-- **Validation**: Always validate the OpenAPI spec before generation:
-  ```bash
-  python3 -c "import yaml; yaml.safe_load(open('openapi.yaml'))"
-  ```
-
-### Example: Adding New State Models
-
-1. Add your schema to `openapi.yaml` under `components/schemas/`
-2. Reference the schema in an API endpoint response
-3. Run the generation command above
-4. Update `__init__.py` to export the new models
-5. Import and use the models in your code
-
-### Troubleshooting
-
-- **Models not generated**: Ensure schemas are under `components/schemas/` (not `parameters/`)
-- **Missing models**: Verify schemas are referenced in at least one API path
-- **Import errors**: Check that new models are added to `__init__.py` exports

comfyui_manager/data_models/__init__.py

@@ -1,137 +0,0 @@
-"""
-Data models for ComfyUI Manager.
-
-This package contains Pydantic models used throughout the ComfyUI Manager
-for data validation, serialization, and type safety.
-
-All models are auto-generated from the OpenAPI specification to ensure
-consistency between the API and implementation.
-"""
-
-from .generated_models import (
-    # Core Task Queue Models
-    QueueTaskItem,
-    TaskHistoryItem,
-    TaskStateMessage,
-    TaskExecutionStatus,
-    
-    # WebSocket Message Models
-    MessageTaskDone,
-    MessageTaskStarted,
-    MessageTaskFailed,
-    MessageUpdate,
-    ManagerMessageName,
-    
-    # State Management Models
-    BatchExecutionRecord,
-    ComfyUISystemState,
-    BatchOperation,
-    InstalledNodeInfo,
-    InstalledModelInfo,
-    ComfyUIVersionInfo,
-    
-    # Import Fail Info Models
-    ImportFailInfoBulkRequest,
-    ImportFailInfoBulkResponse,
-    ImportFailInfoItem,
-    ImportFailInfoItem1,
-    
-    # Other models
-    OperationType,
-    OperationResult,
-    ManagerPackInfo,
-    ManagerPackInstalled,
-    SelectedVersion,
-    ManagerChannel,
-    ManagerDatabaseSource,
-    ManagerPackState,
-    ManagerPackInstallType,
-    ManagerPack,
-    InstallPackParams,
-    UpdatePackParams,
-    UpdateAllPacksParams,
-    UpdateComfyUIParams,
-    FixPackParams,
-    UninstallPackParams,
-    DisablePackParams,
-    EnablePackParams,
-    UpdateAllQueryParams,
-    UpdateComfyUIQueryParams,
-    ComfyUISwitchVersionQueryParams,
-    QueueStatus,
-    ManagerMappings,
-    ModelMetadata,
-    NodePackageMetadata,
-    SnapshotItem,
-    Error,
-    InstalledPacksResponse,
-    HistoryResponse,
-    HistoryListResponse,
-    InstallType,
-    SecurityLevel,
-    RiskLevel,
-)
-
-__all__ = [
-    # Core Task Queue Models
-    "QueueTaskItem",
-    "TaskHistoryItem",
-    "TaskStateMessage",
-    "TaskExecutionStatus",
-    
-    # WebSocket Message Models
-    "MessageTaskDone",
-    "MessageTaskStarted",
-    "MessageTaskFailed",
-    "MessageUpdate",
-    "ManagerMessageName",
-    
-    # State Management Models
-    "BatchExecutionRecord",
-    "ComfyUISystemState",
-    "BatchOperation",
-    "InstalledNodeInfo",
-    "InstalledModelInfo",
-    "ComfyUIVersionInfo",
-    
-    # Import Fail Info Models
-    "ImportFailInfoBulkRequest",
-    "ImportFailInfoBulkResponse",
-    "ImportFailInfoItem",
-    "ImportFailInfoItem1",
-    
-    # Other models
-    "OperationType",
-    "OperationResult",
-    "ManagerPackInfo",
-    "ManagerPackInstalled",
-    "SelectedVersion",
-    "ManagerChannel",
-    "ManagerDatabaseSource",
-    "ManagerPackState",
-    "ManagerPackInstallType",
-    "ManagerPack",
-    "InstallPackParams",
-    "UpdatePackParams",
-    "UpdateAllPacksParams",
-    "UpdateComfyUIParams",
-    "FixPackParams",
-    "UninstallPackParams",
-    "DisablePackParams",
-    "EnablePackParams",
-    "UpdateAllQueryParams",
-    "UpdateComfyUIQueryParams",
-    "ComfyUISwitchVersionQueryParams",
-    "QueueStatus",
-    "ManagerMappings",
-    "ModelMetadata",
-    "NodePackageMetadata",
-    "SnapshotItem",
-    "Error",
-    "InstalledPacksResponse",
-    "HistoryResponse",
-    "HistoryListResponse",
-    "InstallType",
-    "SecurityLevel",
-    "RiskLevel",
-]

comfyui_manager/data_models/generated_models.py

@@ -1,561 +0,0 @@
-# generated by datamodel-codegen:
-#   filename:  openapi.yaml
-#   timestamp: 2025-07-31T04:52:26+00:00
-
-from __future__ import annotations
-
-from datetime import datetime
-from enum import Enum
-from typing import Any, Dict, List, Optional, Union
-
-from pydantic import BaseModel, Field, RootModel
-
-
-class OperationType(str, Enum):
-    install = "install"
-    uninstall = "uninstall"
-    update = "update"
-    update_comfyui = "update-comfyui"
-    fix = "fix"
-    disable = "disable"
-    enable = "enable"
-    install_model = "install-model"
-
-
-class OperationResult(str, Enum):
-    success = "success"
-    failed = "failed"
-    skipped = "skipped"
-    error = "error"
-    skip = "skip"
-
-
-class TaskExecutionStatus(BaseModel):
-    status_str: OperationResult
-    completed: bool = Field(..., description="Whether the task completed")
-    messages: List[str] = Field(..., description="Additional status messages")
-
-
-class ManagerMessageName(str, Enum):
-    cm_task_completed = "cm-task-completed"
-    cm_task_started = "cm-task-started"
-    cm_queue_status = "cm-queue-status"
-
-
-class ManagerPackInfo(BaseModel):
-    id: str = Field(
-        ...,
-        description="Either github-author/github-repo or name of pack from the registry",
-    )
-    version: str = Field(..., description="Semantic version or Git commit hash")
-    ui_id: Optional[str] = Field(None, description="Task ID - generated internally")
-
-
-class ManagerPackInstalled(BaseModel):
-    ver: str = Field(
-        ...,
-        description="The version of the pack that is installed (Git commit hash or semantic version)",
-    )
-    cnr_id: Optional[str] = Field(
-        None, description="The name of the pack if installed from the registry"
-    )
-    aux_id: Optional[str] = Field(
-        None,
-        description="The name of the pack if installed from github (author/repo-name format)",
-    )
-    enabled: bool = Field(..., description="Whether the pack is enabled")
-
-
-class SelectedVersion(str, Enum):
-    latest = "latest"
-    nightly = "nightly"
-
-
-class ManagerChannel(str, Enum):
-    default = "default"
-    recent = "recent"
-    legacy = "legacy"
-    forked = "forked"
-    dev = "dev"
-    tutorial = "tutorial"
-
-
-class ManagerDatabaseSource(str, Enum):
-    remote = "remote"
-    local = "local"
-    cache = "cache"
-
-
-class ManagerPackState(str, Enum):
-    installed = "installed"
-    disabled = "disabled"
-    not_installed = "not_installed"
-    import_failed = "import_failed"
-    needs_update = "needs_update"
-
-
-class ManagerPackInstallType(str, Enum):
-    git_clone = "git-clone"
-    copy = "copy"
-    cnr = "cnr"
-
-
-class SecurityLevel(str, Enum):
-    strong = "strong"
-    normal = "normal"
-    normal_ = "normal-"
-    weak = "weak"
-
-
-class RiskLevel(str, Enum):
-    block = "block"
-    high_ = "high+"
-    high = "high"
-    middle_ = "middle+"
-    middle = "middle"
-
-
-class UpdateState(Enum):
-    false = "false"
-    true = "true"
-
-
-class ManagerPack(ManagerPackInfo):
-    author: Optional[str] = Field(
-        None, description="Pack author name or 'Unclaimed' if added via GitHub crawl"
-    )
-    files: Optional[List[str]] = Field(
-        None,
-        description="Repository URLs for installation (typically contains one GitHub URL)",
-    )
-    reference: Optional[str] = Field(
-        None, description="The type of installation reference"
-    )
-    title: Optional[str] = Field(None, description="The display name of the pack")
-    cnr_latest: Optional[SelectedVersion] = None
-    repository: Optional[str] = Field(None, description="GitHub repository URL")
-    state: Optional[ManagerPackState] = None
-    update_state: Optional[UpdateState] = Field(
-        None, alias="update-state", description="Update availability status"
-    )
-    stars: Optional[int] = Field(None, description="GitHub stars count")
-    last_update: Optional[datetime] = Field(None, description="Last update timestamp")
-    health: Optional[str] = Field(None, description="Health status of the pack")
-    description: Optional[str] = Field(None, description="Pack description")
-    trust: Optional[bool] = Field(None, description="Whether the pack is trusted")
-    install_type: Optional[ManagerPackInstallType] = None
-
-
-class InstallPackParams(ManagerPackInfo):
-    selected_version: Union[str, SelectedVersion] = Field(
-        ..., description="Semantic version, Git commit hash, latest, or nightly"
-    )
-    repository: Optional[str] = Field(
-        None,
-        description="GitHub repository URL (required if selected_version is nightly)",
-    )
-    pip: Optional[List[str]] = Field(None, description="PyPi dependency names")
-    mode: ManagerDatabaseSource
-    channel: ManagerChannel
-    skip_post_install: Optional[bool] = Field(
-        None, description="Whether to skip post-installation steps"
-    )
-
-
-class UpdateAllPacksParams(BaseModel):
-    mode: Optional[ManagerDatabaseSource] = None
-    ui_id: Optional[str] = Field(None, description="Task ID - generated internally")
-
-
-class UpdatePackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to update")
-    node_ver: Optional[str] = Field(
-        None, description="Current version of the node package"
-    )
-
-
-class UpdateComfyUIParams(BaseModel):
-    is_stable: Optional[bool] = Field(
-        True,
-        description="Whether to update to stable version (true) or nightly (false)",
-    )
-    target_version: Optional[str] = Field(
-        None,
-        description="Specific version to switch to (for version switching operations)",
-    )
-
-
-class FixPackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to fix")
-    node_ver: str = Field(..., description="Version of the node package")
-
-
-class UninstallPackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to uninstall")
-    is_unknown: Optional[bool] = Field(
-        False, description="Whether this is an unknown/unregistered package"
-    )
-
-
-class DisablePackParams(BaseModel):
-    node_name: str = Field(..., description="Name of the node package to disable")
-    is_unknown: Optional[bool] = Field(
-        False, description="Whether this is an unknown/unregistered package"
-    )
-
-
-class EnablePackParams(BaseModel):
-    cnr_id: str = Field(
-        ..., description="ComfyUI Node Registry ID of the package to enable"
-    )
-
-
-class UpdateAllQueryParams(BaseModel):
-    client_id: str = Field(
-        ..., description="Client identifier that initiated the request"
-    )
-    ui_id: str = Field(..., description="Base UI identifier for task tracking")
-    mode: Optional[ManagerDatabaseSource] = None
-
-
-class UpdateComfyUIQueryParams(BaseModel):
-    client_id: str = Field(
-        ..., description="Client identifier that initiated the request"
-    )
-    ui_id: str = Field(..., description="UI identifier for task tracking")
-    stable: Optional[bool] = Field(
-        True,
-        description="Whether to update to stable version (true) or nightly (false)",
-    )
-
-
-class ComfyUISwitchVersionQueryParams(BaseModel):
-    ver: str = Field(..., description="Version to switch to")
-    client_id: str = Field(
-        ..., description="Client identifier that initiated the request"
-    )
-    ui_id: str = Field(..., description="UI identifier for task tracking")
-
-
-class QueueStatus(BaseModel):
-    total_count: int = Field(
-        ..., description="Total number of tasks (pending + running)"
-    )
-    done_count: int = Field(..., description="Number of completed tasks")
-    in_progress_count: int = Field(..., description="Number of tasks currently running")
-    pending_count: Optional[int] = Field(
-        None, description="Number of tasks waiting to be executed"
-    )
-    is_processing: bool = Field(..., description="Whether the task worker is active")
-    client_id: Optional[str] = Field(
-        None, description="Client ID (when filtered by client)"
-    )
-
-
-class ManagerMappings1(BaseModel):
-    title_aux: Optional[str] = Field(None, description="The display name of the pack")
-
-
-class ManagerMappings(
-    RootModel[Optional[Dict[str, List[Union[List[str], ManagerMappings1]]]]]
-):
-    root: Optional[Dict[str, List[Union[List[str], ManagerMappings1]]]] = Field(
-        None, description="Tuple of [node_names, metadata]"
-    )
-
-
-class ModelMetadata(BaseModel):
-    name: str = Field(..., description="Name of the model")
-    type: str = Field(..., description="Type of model")
-    base: Optional[str] = Field(None, description="Base model type")
-    save_path: Optional[str] = Field(None, description="Path for saving the model")
-    url: str = Field(..., description="Download URL")
-    filename: str = Field(..., description="Target filename")
-    ui_id: Optional[str] = Field(None, description="ID for UI reference")
-
-
-class InstallType(str, Enum):
-    git = "git"
-    copy = "copy"
-    pip = "pip"
-
-
-class NodePackageMetadata(BaseModel):
-    title: Optional[str] = Field(None, description="Display name of the node package")
-    name: Optional[str] = Field(None, description="Repository/package name")
-    files: Optional[List[str]] = Field(None, description="Source URLs for the package")
-    description: Optional[str] = Field(
-        None, description="Description of the node package functionality"
-    )
-    install_type: Optional[InstallType] = Field(None, description="Installation method")
-    version: Optional[str] = Field(None, description="Version identifier")
-    id: Optional[str] = Field(
-        None, description="Unique identifier for the node package"
-    )
-    ui_id: Optional[str] = Field(None, description="ID for UI reference")
-    channel: Optional[str] = Field(None, description="Source channel")
-    mode: Optional[str] = Field(None, description="Source mode")
-
-
-class SnapshotItem(RootModel[str]):
-    root: str = Field(..., description="Name of the snapshot")
-
-
-class Error(BaseModel):
-    error: str = Field(..., description="Error message")
-
-
-class InstalledPacksResponse(RootModel[Optional[Dict[str, ManagerPackInstalled]]]):
-    root: Optional[Dict[str, ManagerPackInstalled]] = None
-
-
-class HistoryListResponse(BaseModel):
-    ids: Optional[List[str]] = Field(
-        None, description="List of available batch history IDs"
-    )
-
-
-class InstalledNodeInfo(BaseModel):
-    name: str = Field(..., description="Node package name")
-    version: str = Field(..., description="Installed version")
-    repository_url: Optional[str] = Field(None, description="Git repository URL")
-    install_method: str = Field(
-        ..., description="Installation method (cnr, git, pip, etc.)"
-    )
-    enabled: Optional[bool] = Field(
-        True, description="Whether the node is currently enabled"
-    )
-    install_date: Optional[datetime] = Field(
-        None, description="ISO timestamp of installation"
-    )
-
-
-class InstalledModelInfo(BaseModel):
-    name: str = Field(..., description="Model filename")
-    path: str = Field(..., description="Full path to model file")
-    type: str = Field(..., description="Model type (checkpoint, lora, vae, etc.)")
-    size_bytes: Optional[int] = Field(None, description="File size in bytes", ge=0)
-    hash: Optional[str] = Field(None, description="Model file hash for verification")
-    install_date: Optional[datetime] = Field(
-        None, description="ISO timestamp when added"
-    )
-
-
-class ComfyUIVersionInfo(BaseModel):
-    version: str = Field(..., description="ComfyUI version string")
-    commit_hash: Optional[str] = Field(None, description="Git commit hash")
-    branch: Optional[str] = Field(None, description="Git branch name")
-    is_stable: Optional[bool] = Field(
-        False, description="Whether this is a stable release"
-    )
-    last_updated: Optional[datetime] = Field(
-        None, description="ISO timestamp of last update"
-    )
-
-
-class BatchOperation(BaseModel):
-    operation_id: str = Field(..., description="Unique operation identifier")
-    operation_type: OperationType
-    target: str = Field(
-        ..., description="Target of the operation (node name, model name, etc.)"
-    )
-    target_version: Optional[str] = Field(
-        None, description="Target version for the operation"
-    )
-    result: OperationResult
-    error_message: Optional[str] = Field(
-        None, description="Error message if operation failed"
-    )
-    start_time: datetime = Field(
-        ..., description="ISO timestamp when operation started"
-    )
-    end_time: Optional[datetime] = Field(
-        None, description="ISO timestamp when operation completed"
-    )
-    client_id: Optional[str] = Field(
-        None, description="Client that initiated the operation"
-    )
-
-
-class ComfyUISystemState(BaseModel):
-    snapshot_time: datetime = Field(
-        ..., description="ISO timestamp when snapshot was taken"
-    )
-    comfyui_version: ComfyUIVersionInfo
-    frontend_version: Optional[str] = Field(
-        None, description="ComfyUI frontend version if available"
-    )
-    python_version: str = Field(..., description="Python interpreter version")
-    platform_info: str = Field(
-        ..., description="Operating system and platform information"
-    )
-    installed_nodes: Optional[Dict[str, InstalledNodeInfo]] = Field(
-        None, description="Map of installed node packages by name"
-    )
-    installed_models: Optional[Dict[str, InstalledModelInfo]] = Field(
-        None, description="Map of installed models by name"
-    )
-    manager_config: Optional[Dict[str, Any]] = Field(
-        None, description="ComfyUI Manager configuration settings"
-    )
-    comfyui_root_path: Optional[str] = Field(
-        None, description="ComfyUI root installation directory"
-    )
-    model_paths: Optional[Dict[str, List[str]]] = Field(
-        None, description="Map of model types to their configured paths"
-    )
-    manager_version: Optional[str] = Field(None, description="ComfyUI Manager version")
-    security_level: Optional[SecurityLevel] = None
-    network_mode: Optional[str] = Field(
-        None, description="Network mode (online, offline, private)"
-    )
-    cli_args: Optional[Dict[str, Any]] = Field(
-        None, description="Selected ComfyUI CLI arguments"
-    )
-    custom_nodes_count: Optional[int] = Field(
-        None, description="Total number of custom node packages", ge=0
-    )
-    failed_imports: Optional[List[str]] = Field(
-        None, description="List of custom nodes that failed to import"
-    )
-    pip_packages: Optional[Dict[str, str]] = Field(
-        None, description="Map of installed pip packages to their versions"
-    )
-    embedded_python: Optional[bool] = Field(
-        None,
-        description="Whether ComfyUI is running from an embedded Python distribution",
-    )
-
-
-class BatchExecutionRecord(BaseModel):
-    batch_id: str = Field(..., description="Unique batch identifier")
-    start_time: datetime = Field(..., description="ISO timestamp when batch started")
-    end_time: Optional[datetime] = Field(
-        None, description="ISO timestamp when batch completed"
-    )
-    state_before: ComfyUISystemState
-    state_after: Optional[ComfyUISystemState] = Field(
-        None, description="System state after batch execution"
-    )
-    operations: Optional[List[BatchOperation]] = Field(
-        None, description="List of operations performed in this batch"
-    )
-    total_operations: Optional[int] = Field(
-        0, description="Total number of operations in batch", ge=0
-    )
-    successful_operations: Optional[int] = Field(
-        0, description="Number of successful operations", ge=0
-    )
-    failed_operations: Optional[int] = Field(
-        0, description="Number of failed operations", ge=0
-    )
-    skipped_operations: Optional[int] = Field(
-        0, description="Number of skipped operations", ge=0
-    )
-
-
-class ImportFailInfoBulkRequest(BaseModel):
-    cnr_ids: Optional[List[str]] = Field(
-        None, description="A list of CNR IDs to check."
-    )
-    urls: Optional[List[str]] = Field(
-        None, description="A list of repository URLs to check."
-    )
-
-
-class ImportFailInfoItem1(BaseModel):
-    error: Optional[str] = None
-    traceback: Optional[str] = None
-
-
-class ImportFailInfoItem(RootModel[Optional[ImportFailInfoItem1]]):
-    root: Optional[ImportFailInfoItem1]
-
-
-class QueueTaskItem(BaseModel):
-    ui_id: str = Field(..., description="Unique identifier for the task")
-    client_id: str = Field(..., description="Client identifier that initiated the task")
-    kind: OperationType
-    params: Union[
-        InstallPackParams,
-        UpdatePackParams,
-        UpdateAllPacksParams,
-        UpdateComfyUIParams,
-        FixPackParams,
-        UninstallPackParams,
-        DisablePackParams,
-        EnablePackParams,
-        ModelMetadata,
-    ]
-
-
-class TaskHistoryItem(BaseModel):
-    ui_id: str = Field(..., description="Unique identifier for the task")
-    client_id: str = Field(..., description="Client identifier that initiated the task")
-    kind: str = Field(..., description="Type of task that was performed")
-    timestamp: datetime = Field(..., description="ISO timestamp when task completed")
-    result: str = Field(..., description="Task result message or details")
-    status: Optional[TaskExecutionStatus] = None
-    batch_id: Optional[str] = Field(
-        None, description="ID of the batch this task belongs to"
-    )
-    end_time: Optional[datetime] = Field(
-        None, description="ISO timestamp when task execution ended"
-    )
-
-
-class TaskStateMessage(BaseModel):
-    history: Dict[str, TaskHistoryItem] = Field(
-        ..., description="Map of task IDs to their history items"
-    )
-    running_queue: List[QueueTaskItem] = Field(
-        ..., description="Currently executing tasks"
-    )
-    pending_queue: List[QueueTaskItem] = Field(
-        ..., description="Tasks waiting to be executed"
-    )
-    installed_packs: Dict[str, ManagerPackInstalled] = Field(
-        ..., description="Map of currently installed node packages by name"
-    )
-
-
-class MessageTaskDone(BaseModel):
-    ui_id: str = Field(..., description="Task identifier")
-    result: str = Field(..., description="Task result message")
-    kind: str = Field(..., description="Type of task")
-    status: Optional[TaskExecutionStatus] = None
-    timestamp: datetime = Field(..., description="ISO timestamp when task completed")
-    state: TaskStateMessage
-
-
-class MessageTaskStarted(BaseModel):
-    ui_id: str = Field(..., description="Task identifier")
-    kind: str = Field(..., description="Type of task")
-    timestamp: datetime = Field(..., description="ISO timestamp when task started")
-    state: TaskStateMessage
-
-
-class MessageTaskFailed(BaseModel):
-    ui_id: str = Field(..., description="Task identifier")
-    error: str = Field(..., description="Error message")
-    kind: str = Field(..., description="Type of task")
-    timestamp: datetime = Field(..., description="ISO timestamp when task failed")
-    state: TaskStateMessage
-
-
-class MessageUpdate(
-    RootModel[Union[MessageTaskDone, MessageTaskStarted, MessageTaskFailed]]
-):
-    root: Union[MessageTaskDone, MessageTaskStarted, MessageTaskFailed] = Field(
-        ..., description="Union type for all possible WebSocket message updates"
-    )
-
-
-class HistoryResponse(BaseModel):
-    history: Optional[Dict[str, TaskHistoryItem]] = Field(
-        None, description="Map of task IDs to their history items"
-    )
-
-
-class ImportFailInfoBulkResponse(RootModel[Optional[Dict[str, ImportFailInfoItem]]]):
-    root: Optional[Dict[str, ImportFailInfoItem]] = None

comfyui_manager/glob/CLAUDE.md

@@ -1,11 +0,0 @@
-- Anytime you make a change to the data being sent or received, you should follow this process:
-  1. Adjust the openapi.yaml file first
-  2. Verify the syntax of the openapi.yaml file using `yaml.safe_load`
-  3. Regenerate the types following the instructions in the `data_models/README.md` file
-  4. Verify the new data model is generated
-  5. Verify the syntax of the generated types files
-  6. Run formatting and linting on the generated types files
-  7. Adjust the `__init__.py` files in the `data_models` directory to match/export the new data model
-  8. Only then, make the changes to the rest of the codebase
-  9. Run the CI tests to verify that the changes are working
-- The comfyui_manager is a python package that is used to manage the comfyui server. There are two sub-packages `glob` and `legacy`. These represent the current version (`glob`) and the previous version (`legacy`), not including common utilities and data models. When developing, we work in the `glob` package. You can ignore the `legacy` package entirely, unless you have a very good reason to research how things were done in the legacy or prior major versions of the package. But in those cases, you should just look for the sake of knowledge or reflection, not for changing code (unless explicitly asked to do so).

comfyui_manager/glob/constants.py

@@ -1,55 +0,0 @@
-
-SECURITY_MESSAGE_MIDDLE = "ERROR: To use this action, a security_level of `normal or below` is required. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_MIDDLE_P = "ERROR: To use this action, security_level must be `normal or below`, and network_mode must be set to `personal_cloud`. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_NORMAL_MINUS = "ERROR: To use this feature, you must either set '--listen' to a local IP and set the security level to 'normal-' or lower, or set the security level to 'middle' or 'weak'. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_GENERAL = "ERROR: This installation is not allowed in this security_level. Please contact the administrator.\nReference: https://github.com/ltdrdata/ComfyUI-Manager#security-policy"
-SECURITY_MESSAGE_NORMAL_MINUS_MODEL = "ERROR: Downloading models that are not in '.safetensors' format is only allowed for models registered in the 'default' channel at this security level. If you want to download this model, set the security level to 'normal-' or lower."
-
-
-def is_loopback(address):
-    import ipaddress
-
-    try:
-        return ipaddress.ip_address(address).is_loopback
-    except ValueError:
-        return False
-
-
-model_dir_name_map = {
-    "checkpoints": "checkpoints",
-    "checkpoint": "checkpoints",
-    "unclip": "checkpoints",
-    "text_encoders": "text_encoders",
-    "clip": "text_encoders",
-    "vae": "vae",
-    "lora": "loras",
-    "t2i-adapter": "controlnet",
-    "t2i-style": "controlnet",
-    "controlnet": "controlnet",
-    "clip_vision": "clip_vision",
-    "gligen": "gligen",
-    "upscale": "upscale_models",
-    "embedding": "embeddings",
-    "embeddings": "embeddings",
-    "unet": "diffusion_models",
-    "diffusion_model": "diffusion_models",
-}
-
-# List of all model directory names used for checking installed models
-MODEL_DIR_NAMES = [
-    "checkpoints",
-    "loras",
-    "vae",
-    "text_encoders",
-    "diffusion_models",
-    "clip_vision",
-    "embeddings",
-    "diffusers",
-    "vae_approx",
-    "controlnet",
-    "gligen",
-    "upscale_models",
-    "hypernetworks",
-    "photomaker",
-    "classifiers",
-]

comfyui_manager/glob/utils/environment_utils.py

@@ -1,126 +0,0 @@
-import os
-import git
-import logging
-import traceback
-
-from comfyui_manager.common import context
-import folder_paths
-
-from comfyui_manager.glob import manager_core as core
-from comfyui_manager.common import cm_global
-
-
-comfy_ui_hash = "-"
-comfyui_tag = None
-
-
-def print_comfyui_version():
-    global comfy_ui_hash
-    global comfyui_tag
-
-    is_detached = False
-    try:
-        repo = git.Repo(os.path.dirname(folder_paths.__file__))
-        core.comfy_ui_revision = len(list(repo.iter_commits("HEAD")))
-
-        comfy_ui_hash = repo.head.commit.hexsha
-        cm_global.variables["comfyui.revision"] = core.comfy_ui_revision
-
-        core.comfy_ui_commit_datetime = repo.head.commit.committed_datetime
-        cm_global.variables["comfyui.commit_datetime"] = core.comfy_ui_commit_datetime
-
-        is_detached = repo.head.is_detached
-        current_branch = repo.active_branch.name
-
-        comfyui_tag = context.get_comfyui_tag()
-
-        try:
-            if (
-                not os.environ.get("__COMFYUI_DESKTOP_VERSION__")
-                and core.comfy_ui_commit_datetime.date()
-                < core.comfy_ui_required_commit_datetime.date()
-            ):
-                logging.warning(
-                    f"\n\n## [WARN] ComfyUI-Manager: Your ComfyUI version ({core.comfy_ui_revision})[{core.comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version. ##\n\n"
-                )
-        except Exception:
-            pass
-
-        # process on_revision_detected -->
-        if "cm.on_revision_detected_handler" in cm_global.variables:
-            for k, f in cm_global.variables["cm.on_revision_detected_handler"]:
-                try:
-                    f(core.comfy_ui_revision)
-                except Exception:
-                    logging.error(f"[ERROR] '{k}' on_revision_detected_handler")
-                    traceback.print_exc()
-
-            del cm_global.variables["cm.on_revision_detected_handler"]
-        else:
-            logging.warning(
-                "[ComfyUI-Manager] Some features are restricted due to your ComfyUI being outdated."
-            )
-        # <--
-
-        if current_branch == "master":
-            if comfyui_tag:
-                logging.info(
-                    f"### ComfyUI Version: {comfyui_tag} | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-            else:
-                logging.info(
-                    f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-        else:
-            if comfyui_tag:
-                logging.info(
-                    f"### ComfyUI Version: {comfyui_tag} on '{current_branch}' | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-            else:
-                logging.info(
-                    f"### ComfyUI Revision: {core.comfy_ui_revision} on '{current_branch}' [{comfy_ui_hash[:8]}] | Released on '{core.comfy_ui_commit_datetime.date()}'"
-                )
-    except Exception:
-        if is_detached:
-            logging.info(
-                f"### ComfyUI Revision: {core.comfy_ui_revision} [{comfy_ui_hash[:8]}] *DETACHED | Released on '{core.comfy_ui_commit_datetime.date()}'"
-            )
-        else:
-            logging.info(
-                "### ComfyUI Revision: UNKNOWN (The currently installed ComfyUI is not a Git repository)"
-            )
-
-
-def set_update_policy(mode):
-    core.get_config()["update_policy"] = mode
-
-
-def set_db_mode(mode):
-    core.get_config()["db_mode"] = mode
-
-
-def setup_environment():
-    git_exe = core.get_config()["git_exe"]
-
-    if git_exe != "":
-        git.Git().update_environment(GIT_PYTHON_GIT_EXECUTABLE=git_exe)
-
-
-def initialize_environment():
-    context.comfy_path = os.path.dirname(folder_paths.__file__)
-    core.js_path = os.path.join(context.comfy_path, "web", "extensions")
-
-    # Legacy database paths - kept for potential future use
-    # local_db_model = os.path.join(manager_util.comfyui_manager_path, "model-list.json")
-    # local_db_alter = os.path.join(manager_util.comfyui_manager_path, "alter-list.json")
-    # local_db_custom_node_list = os.path.join(
-    #     manager_util.comfyui_manager_path, "custom-node-list.json"
-    # )
-    # local_db_extension_node_mappings = os.path.join(
-    #     manager_util.comfyui_manager_path, "extension-node-map.json"
-    # )
-
-    print_comfyui_version()
-    setup_environment()
-
-    core.check_invalid_nodes()

comfyui_manager/glob/utils/formatting_utils.py

@@ -1,60 +0,0 @@
-import locale
-import sys
-import re
-
-
-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 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>")

comfyui_manager/glob/utils/model_utils.py

@@ -1,161 +0,0 @@
-import os
-import logging
-import concurrent.futures
-import folder_paths
-
-from comfyui_manager.glob import manager_core as core
-from comfyui_manager.glob.constants import model_dir_name_map, MODEL_DIR_NAMES
-
-
-def get_model_dir(data, show_log=False):
-    if "download_model_base" in folder_paths.folder_names_and_paths:
-        models_base = folder_paths.folder_names_and_paths["download_model_base"][0][0]
-    else:
-        models_base = folder_paths.models_dir
-
-    # NOTE: Validate to prevent path traversal.
-    if any(char in data["filename"] for char in {"/", "\\", ":"}):
-        return None
-
-    def resolve_custom_node(save_path):
-        save_path = save_path[13:]  # remove 'custom_nodes/'
-
-        # NOTE: Validate to prevent path traversal.
-        if save_path.startswith(os.path.sep) or ":" in save_path:
-            return None
-
-        repo_name = save_path.replace("\\", "/").split("/")[
-            0
-        ]  # get custom node repo name
-
-        # NOTE: The creation of files within the custom node path should be removed in the future.
-        repo_path = core.lookup_installed_custom_nodes_legacy(repo_name)
-        if repo_path is not None and repo_path[0]:
-            # Returns the retargeted path based on the actually installed repository
-            return os.path.join(os.path.dirname(repo_path[1]), save_path)
-        else:
-            return None
-
-    if data["save_path"] != "default":
-        if ".." in data["save_path"] or data["save_path"].startswith("/"):
-            if show_log:
-                logging.info(
-                    f"[WARN] '{data['save_path']}' is not allowed path. So it will be saved into 'models/etc'."
-                )
-            base_model = os.path.join(models_base, "etc")
-        else:
-            if data["save_path"].startswith("custom_nodes"):
-                base_model = resolve_custom_node(data["save_path"])
-                if base_model is None:
-                    if show_log:
-                        logging.info(
-                            f"[ComfyUI-Manager] The target custom node for model download is not installed: {data['save_path']}"
-                        )
-                    return None
-            else:
-                base_model = os.path.join(models_base, data["save_path"])
-    else:
-        model_dir_name = model_dir_name_map.get(data["type"].lower())
-        if model_dir_name is not None:
-            base_model = folder_paths.folder_names_and_paths[model_dir_name][0][0]
-        else:
-            base_model = os.path.join(models_base, "etc")
-
-    return base_model
-
-
-def get_model_path(data, show_log=False):
-    base_model = get_model_dir(data, show_log)
-    if base_model is None:
-        return None
-    else:
-        if data["filename"] == "<huggingface>":
-            return os.path.join(base_model, os.path.basename(data["url"]))
-        else:
-            return os.path.join(base_model, data["filename"])
-
-
-def check_model_installed(json_obj):
-    def is_exists(model_dir_name, filename, url):
-        if filename == "<huggingface>":
-            filename = os.path.basename(url)
-
-        dirs = folder_paths.get_folder_paths(model_dir_name)
-
-        for x in dirs:
-            if os.path.exists(os.path.join(x, filename)):
-                return True
-
-        return False
-
-    total_models_files = set()
-    for x in MODEL_DIR_NAMES:
-        for y in folder_paths.get_filename_list(x):
-            total_models_files.add(y)
-
-    def process_model_phase(item):
-        if (
-            "diffusion" not in item["filename"]
-            and "pytorch" not in item["filename"]
-            and "model" not in item["filename"]
-        ):
-            # non-general name case
-            if item["filename"] in total_models_files:
-                item["installed"] = "True"
-                return
-
-        if item["save_path"] == "default":
-            model_dir_name = model_dir_name_map.get(item["type"].lower())
-            if model_dir_name is not None:
-                item["installed"] = str(
-                    is_exists(model_dir_name, item["filename"], item["url"])
-                )
-            else:
-                item["installed"] = "False"
-        else:
-            model_dir_name = item["save_path"].split("/")[0]
-            if model_dir_name in folder_paths.folder_names_and_paths:
-                if is_exists(model_dir_name, item["filename"], item["url"]):
-                    item["installed"] = "True"
-
-            if "installed" not in item:
-                if item["filename"] == "<huggingface>":
-                    filename = os.path.basename(item["url"])
-                else:
-                    filename = item["filename"]
-
-                fullpath = os.path.join(
-                    folder_paths.models_dir, item["save_path"], filename
-                )
-
-                item["installed"] = "True" if os.path.exists(fullpath) else "False"
-
-    with concurrent.futures.ThreadPoolExecutor(8) as executor:
-        for item in json_obj["models"]:
-            executor.submit(process_model_phase, item)
-
-
-async def check_whitelist_for_model(item):
-    from comfyui_manager.data_models import ManagerDatabaseSource
-    
-    json_obj = await core.get_data_by_mode(ManagerDatabaseSource.cache.value, "model-list.json")
-
-    for x in json_obj.get("models", []):
-        if (
-            x["save_path"] == item["save_path"]
-            and x["base"] == item["base"]
-            and x["filename"] == item["filename"]
-        ):
-            return True
-
-    json_obj = await core.get_data_by_mode(ManagerDatabaseSource.local.value, "model-list.json")
-
-    for x in json_obj.get("models", []):
-        if (
-            x["save_path"] == item["save_path"]
-            and x["base"] == item["base"]
-            and x["filename"] == item["filename"]
-        ):
-            return True
-
-    return False

comfyui_manager/glob/utils/node_pack_utils.py

@@ -1,65 +0,0 @@
-import concurrent.futures
-
-from comfyui_manager.glob import manager_core as core
-
-
-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("\x1b[2K\rFetching done.")
-    elif do_update:
-        update_exists = any(
-            item.get("updatable", False) for item in node_packs.values()
-        )
-        if update_exists:
-            print("\x1b[2K\rUpdate done.")
-        else:
-            print("\x1b[2K\rAll extensions are already up-to-date.")
-    elif do_update_check:
-        print("\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

comfyui_manager/glob/utils/security_utils.py

@@ -1,67 +0,0 @@
-from comfyui_manager.glob import manager_core as core
-from comfy.cli_args import args
-from comfyui_manager.data_models import SecurityLevel, RiskLevel, ManagerDatabaseSource
-
-
-def is_loopback(address):
-    import ipaddress
-    try:
-        return ipaddress.ip_address(address).is_loopback
-    except ValueError:
-        return False
-
-
-def is_allowed_security_level(level):
-    is_local_mode = is_loopback(args.listen)
-    is_personal_cloud = core.get_config()['network_mode'].lower() == 'personal_cloud'
-
-    if level == RiskLevel.block.value:
-        return False
-    elif level == RiskLevel.high_.value:
-        if is_local_mode:
-            return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value]
-        elif is_personal_cloud:
-            return core.get_config()['security_level'] == SecurityLevel.weak.value
-        else:
-            return False
-    elif level == RiskLevel.high.value:
-        if is_local_mode:
-            return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal_.value]
-        else:
-            return core.get_config()['security_level'] == SecurityLevel.weak.value
-    elif level == RiskLevel.middle_.value:
-        if is_local_mode or is_personal_cloud:
-            return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value]
-        else:
-            return False
-    elif level == RiskLevel.middle.value:
-        return core.get_config()['security_level'] in [SecurityLevel.weak.value, SecurityLevel.normal.value, SecurityLevel.normal_.value]
-    else:
-        return True
-
-
-async def get_risky_level(files, pip_packages):
-    json_data1 = await core.get_data_by_mode(ManagerDatabaseSource.local.value, "custom-node-list.json")
-    json_data2 = await core.get_data_by_mode(
-        ManagerDatabaseSource.cache.value,
-        "custom-node-list.json",
-        channel_url="https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main",
-    )
-
-    all_urls = set()
-    for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]:
-        all_urls.update(x.get("files", []))
-
-    for x in files:
-        if x not in all_urls:
-            return RiskLevel.high_.value
-
-    all_pip_packages = set()
-    for x in json_data1["custom_nodes"] + json_data2["custom_nodes"]:
-        all_pip_packages.update(x.get("pip", []))
-
-    for p in pip_packages:
-        if p not in all_pip_packages:
-            return RiskLevel.block.value
-
-    return RiskLevel.middle_.value

comfyui_manager/legacy/share_3rdparty.py

@@ -1,451 +0,0 @@
-import mimetypes
-from ..common import context
-from . import manager_core as core
-
-import os
-from aiohttp import web
-import aiohttp
-import json
-import hashlib
-
-import folder_paths
-from server import PromptServer
-import logging
-import sys
-
-
-try:
-    from nio import AsyncClient, LoginResponse, UploadResponse
-    matrix_nio_is_available = True
-except Exception:
-    logging.warning(f"[ComfyUI-Manager] The matrix sharing feature has been disabled because the `matrix-nio` dependency is not installed.\n\tTo use this feature, please run the following command:\n\t{sys.executable} -m pip install matrix-nio\n")
-    matrix_nio_is_available = False
-
-
-def extract_model_file_names(json_data):
-    """Extract unique file names from the input JSON data."""
-    file_names = set()
-    model_filename_extensions = {'.safetensors', '.ckpt', '.pt', '.pth', '.bin'}
-
-    # Recursively search for file names in the JSON data
-    def recursive_search(data):
-        if isinstance(data, dict):
-            for value in data.values():
-                recursive_search(value)
-        elif isinstance(data, list):
-            for item in data:
-                recursive_search(item)
-        elif isinstance(data, str) and '.' in data:
-            file_names.add(os.path.basename(data))  # file_names.add(data)
-
-    recursive_search(json_data)
-    return [f for f in list(file_names) if os.path.splitext(f)[1] in model_filename_extensions]
-
-
-def find_file_paths(base_dir, file_names):
-    """Find the paths of the files in the base directory."""
-    file_paths = {}
-
-    for root, dirs, files in os.walk(base_dir):
-        # Exclude certain directories
-        dirs[:] = [d for d in dirs if d not in ['.git']]
-
-        for file in files:
-            if file in file_names:
-                file_paths[file] = os.path.join(root, file)
-    return file_paths
-
-
-def compute_sha256_checksum(filepath):
-    """Compute the SHA256 checksum of a file, in chunks"""
-    sha256 = hashlib.sha256()
-    with open(filepath, 'rb') as f:
-        for chunk in iter(lambda: f.read(4096), b''):
-            sha256.update(chunk)
-    return sha256.hexdigest()
-
-
-@PromptServer.instance.routes.get("/v2/manager/share_option")
-async def share_option(request):
-    if "value" in request.rel_url.query:
-        core.get_config()['share_option'] = request.rel_url.query['value']
-        core.write_config()
-    else:
-        return web.Response(text=core.get_config()['share_option'], status=200)
-
-    return web.Response(status=200)
-
-
-def get_openart_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
-            openart_key = f.read().strip()
-        return openart_key if openart_key else None
-    except Exception:
-        return None
-
-
-def get_matrix_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_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:
-                return None
-        return {
-            "homeserver": homeserver,
-            "username": username,
-            "password": password,
-        }
-    except Exception:
-        return None
-
-
-def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
-            share_key = f.read()
-            if not share_key.strip():
-                return None
-        return share_key
-    except Exception:
-        return None
-
-
-def get_youml_settings():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
-        return None
-    try:
-        with open(os.path.join(context.manager_files_path, ".youml"), "r") as f:
-            youml_settings = f.read().strip()
-        return youml_settings if youml_settings else None
-    except Exception:
-        return None
-
-
-def set_youml_settings(settings):
-    with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
-        f.write(settings)
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
-async def api_get_openart_auth(request):
-    # print("Getting stored Matrix credentials...")
-    openart_key = get_openart_auth()
-    if not openart_key:
-        return web.Response(status=404)
-    return web.json_response({"openart_key": openart_key})
-
-
-@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
-async def api_set_openart_auth(request):
-    json_data = await request.json()
-    openart_key = json_data['openart_key']
-    with open(os.path.join(context.manager_files_path, ".openart_key"), "w") as f:
-        f.write(openart_key)
-    return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
-async def api_get_matrix_auth(request):
-    # print("Getting stored Matrix credentials...")
-    matrix_auth = get_matrix_auth()
-    if not matrix_auth:
-        return web.Response(status=404)
-    return web.json_response(matrix_auth)
-
-
-@PromptServer.instance.routes.get("/v2/manager/youml/settings")
-async def api_get_youml_settings(request):
-    youml_settings = get_youml_settings()
-    if not youml_settings:
-        return web.Response(status=404)
-    return web.json_response(json.loads(youml_settings))
-
-
-@PromptServer.instance.routes.post("/v2/manager/youml/settings")
-async def api_set_youml_settings(request):
-    json_data = await request.json()
-    set_youml_settings(json.dumps(json_data))
-    return web.Response(status=200)
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_comfyworkflows_auth")
-async def api_get_comfyworkflows_auth(request):
-    # Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
-    # in the same directory as the ComfyUI base folder
-    # print("Getting stored Comfyworkflows.com auth...")
-    comfyworkflows_auth = get_comfyworkflows_auth()
-    if not comfyworkflows_auth:
-        return web.Response(status=404)
-    return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
-
-
-@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
-async def set_esheep_workflow_and_images(request):
-    json_data = await request.json()
-    with open(os.path.join(context.manager_files_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("/v2/manager/get_esheep_workflow_and_images")
-async def get_esheep_workflow_and_images(request):
-    with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
-        data = json.load(file)
-        return web.Response(status=200, text=json.dumps(data))
-
-
-@PromptServer.instance.routes.get("/v2/manager/get_matrix_dep_status")
-async def get_matrix_dep_status(request):
-    if matrix_nio_is_available:
-        return web.Response(status=200, text='available')
-    else:
-        return web.Response(status=200, text='unavailable')
-
-
-def set_matrix_auth(json_data):
-    homeserver = json_data['homeserver']
-    username = json_data['username']
-    password = json_data['password']
-    with open(os.path.join(context.manager_files_path, "matrix_auth"), "w") as f:
-        f.write("\n".join([homeserver, username, password]))
-
-
-def set_comfyworkflows_auth(comfyworkflows_sharekey):
-    with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
-        f.write(comfyworkflows_sharekey)
-
-
-def has_provided_matrix_auth(matrix_auth):
-    return matrix_auth['homeserver'].strip() and matrix_auth['username'].strip() and matrix_auth['password'].strip()
-
-
-def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
-    return comfyworkflows_sharekey.strip()
-
-
-@PromptServer.instance.routes.post("/v2/manager/share")
-async def share_art(request):
-    # get json data
-    json_data = await request.json()
-
-    matrix_auth = json_data['matrix_auth']
-    comfyworkflows_sharekey = json_data['cw_auth']['cw_sharekey']
-
-    set_matrix_auth(matrix_auth)
-    set_comfyworkflows_auth(comfyworkflows_sharekey)
-
-    share_destinations = json_data['share_destinations']
-    credits = json_data['credits']
-    title = json_data['title']
-    description = json_data['description']
-    is_nsfw = json_data['is_nsfw']
-    prompt = json_data['prompt']
-    potential_outputs = json_data['potential_outputs']
-    selected_output_index = json_data['selected_output_index']
-
-    try:
-        output_to_share = potential_outputs[int(selected_output_index)]
-    except Exception:
-        # for now, pick the first output
-        output_to_share = potential_outputs[0]
-
-    assert output_to_share['type'] in ('image', 'output')
-    output_dir = folder_paths.get_output_directory()
-
-    if output_to_share['type'] == 'image':
-        asset_filename = output_to_share['image']['filename']
-        asset_subfolder = output_to_share['image']['subfolder']
-
-        if output_to_share['image']['type'] == 'temp':
-            output_dir = folder_paths.get_temp_directory()
-    else:
-        asset_filename = output_to_share['output']['filename']
-        asset_subfolder = output_to_share['output']['subfolder']
-
-    if asset_subfolder:
-        asset_filepath = os.path.join(output_dir, asset_subfolder, asset_filename)
-    else:
-        asset_filepath = os.path.join(output_dir, asset_filename)
-
-    # get the mime type of the asset
-    assetFileType = mimetypes.guess_type(asset_filepath)[0]
-
-    share_website_host = "UNKNOWN"
-    if "comfyworkflows" in share_destinations:
-        share_website_host = "https://comfyworkflows.com"
-        share_endpoint = f"{share_website_host}/api"
-
-        # get presigned urls
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.post(
-                    f"{share_endpoint}/get_presigned_urls",
-                    json={
-                        "assetFileName": asset_filename,
-                        "assetFileType": assetFileType,
-                        "workflowJsonFileName": 'workflow.json',
-                        "workflowJsonFileType": 'application/json',
-                    },
-            ) as resp:
-                assert resp.status == 200
-                presigned_urls_json = await resp.json()
-                assetFilePresignedUrl = presigned_urls_json["assetFilePresignedUrl"]
-                assetFileKey = presigned_urls_json["assetFileKey"]
-                workflowJsonFilePresignedUrl = presigned_urls_json["workflowJsonFilePresignedUrl"]
-                workflowJsonFileKey = presigned_urls_json["workflowJsonFileKey"]
-
-        # upload asset
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.put(assetFilePresignedUrl, data=open(asset_filepath, "rb")) as resp:
-                assert resp.status == 200
-
-        # upload workflow json
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            async with session.put(workflowJsonFilePresignedUrl, data=json.dumps(prompt['workflow']).encode('utf-8')) as resp:
-                assert resp.status == 200
-
-        model_filenames = extract_model_file_names(prompt['workflow'])
-        model_file_paths = find_file_paths(folder_paths.base_path, model_filenames)
-
-        models_info = {}
-        for filename, filepath in model_file_paths.items():
-            models_info[filename] = {
-                "filename": filename,
-                "sha256_checksum": compute_sha256_checksum(filepath),
-                "relative_path": os.path.relpath(filepath, folder_paths.base_path),
-            }
-
-        # make a POST request to /api/upload_workflow with form data key values
-        async with aiohttp.ClientSession(trust_env=True, connector=aiohttp.TCPConnector(verify_ssl=False)) as session:
-            form = aiohttp.FormData()
-            if comfyworkflows_sharekey:
-                form.add_field("shareKey", comfyworkflows_sharekey)
-            form.add_field("source", "comfyui_manager")
-            form.add_field("assetFileKey", assetFileKey)
-            form.add_field("assetFileType", assetFileType)
-            form.add_field("workflowJsonFileKey", workflowJsonFileKey)
-            form.add_field("sharedWorkflowWorkflowJsonString", json.dumps(prompt['workflow']))
-            form.add_field("sharedWorkflowPromptJsonString", json.dumps(prompt['output']))
-            form.add_field("shareWorkflowCredits", credits)
-            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("modelsInfo", json.dumps(models_info))
-
-            async with session.post(
-                    f"{share_endpoint}/upload_workflow",
-                    data=form,
-            ) as resp:
-                assert resp.status == 200
-                upload_workflow_json = await resp.json()
-                workflowId = upload_workflow_json["workflowId"]
-
-    # check if the user has provided Matrix credentials
-    if matrix_nio_is_available and "matrix" in share_destinations:
-        comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
-        filename = os.path.basename(asset_filepath)
-        content_type = assetFileType
-
-        try:
-            homeserver = 'matrix.org'
-            if matrix_auth:
-                homeserver = matrix_auth.get('homeserver', 'matrix.org')
-            homeserver = homeserver.replace("http://", "https://")
-            if not homeserver.startswith("https://"):
-                homeserver = "https://" + homeserver
-
-            client = AsyncClient(homeserver, matrix_auth['username'])
-
-            # Login
-            login_resp = await client.login(matrix_auth['password'])
-            if not isinstance(login_resp, LoginResponse) or not login_resp.access_token:
-                await client.close()
-                return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
-
-            # Upload asset
-            with open(asset_filepath, 'rb') as f:
-                upload_resp, _maybe_keys = await client.upload(f, content_type=content_type, filename=filename)
-                asset_data = f.seek(0) or f.read()  # get size for info below
-            if not isinstance(upload_resp, UploadResponse) or not upload_resp.content_uri:
-                await client.close()
-                return web.json_response({"error": "Failed to upload asset to Matrix."}, content_type='application/json', status=500)
-            mxc_url = upload_resp.content_uri
-
-            # Upload workflow JSON
-            import io
-            workflow_json_bytes = json.dumps(prompt['workflow']).encode('utf-8')
-            workflow_io = io.BytesIO(workflow_json_bytes)
-            upload_workflow_resp, _maybe_keys = await client.upload(workflow_io, content_type='application/json', filename='workflow.json')
-            workflow_io.seek(0)
-            if not isinstance(upload_workflow_resp, UploadResponse) or not upload_workflow_resp.content_uri:
-                await client.close()
-                return web.json_response({"error": "Failed to upload workflow to Matrix."}, content_type='application/json', status=500)
-            workflow_json_mxc_url = upload_workflow_resp.content_uri
-
-            # Send text message
-            text_content = ""
-            if title:
-                text_content += f"{title}\n"
-            if description:
-                text_content += f"{description}\n"
-            if credits:
-                text_content += f"\ncredits: {credits}\n"
-            await client.room_send(
-                room_id=comfyui_share_room_id,
-                message_type="m.room.message",
-                content={"msgtype": "m.text", "body": text_content}
-            )
-
-            # Send image
-            await client.room_send(
-                room_id=comfyui_share_room_id,
-                message_type="m.room.message",
-                content={
-                    "msgtype": "m.image",
-                    "body": filename,
-                    "url": mxc_url,
-                    "info": {
-                        "mimetype": content_type,
-                        "size": len(asset_data)
-                    }
-                }
-            )
-
-            # Send workflow JSON file
-            await client.room_send(
-                room_id=comfyui_share_room_id,
-                message_type="m.room.message",
-                content={
-                    "msgtype": "m.file",
-                    "body": "workflow.json",
-                    "url": workflow_json_mxc_url,
-                    "info": {
-                        "mimetype": "application/json",
-                        "size": len(workflow_json_bytes)
-                    }
-                }
-            )
-
-            await client.close()
-
-        except:
-            import traceback
-            traceback.print_exc()
-            return web.json_response({"error": "An error occurred when sharing your art to Matrix."}, content_type='application/json', status=500)
-
-    return web.json_response({
-        "comfyworkflows": {
-            "url": None if "comfyworkflows" not in share_destinations else f"{share_website_host}/workflows/{workflowId}",
-        },
-        "matrix": {
-            "success": None if "matrix" not in share_destinations else True
-        }
-    }, content_type='application/json', status=200)

docs/en/v3.38-userdata-security-migration.md

@@ -0,0 +1,230 @@
+# ComfyUI-Manager V3.38: Userdata Security Migration Guide
+
+## Introduction
+
+ComfyUI-Manager V3.38 introduces a **security patch** that migrates Manager's configuration and data to a protected system path. This change leverages ComfyUI's new System User Protection API (PR #10966) to provide enhanced security isolation.
+
+This guide explains what happens during the migration and how to handle various situations.
+
+---
+
+## What Changed
+
+### Finding Your Paths
+
+When ComfyUI starts, it displays the full paths in the terminal:
+
+```
+** User directory: /path/to/ComfyUI/user
+** ComfyUI-Manager config path: /path/to/ComfyUI/user/__manager/config.ini
+```
+
+Look for these lines in your startup log to find the exact location on your system. In this guide, paths are shown relative to the `user` directory.
+
+### Path Migration
+
+| Data | Legacy Path | New Path |
+|------|-------------|----------|
+| Configuration | `user/default/ComfyUI-Manager/` | `user/__manager/` |
+| Snapshots | `user/default/ComfyUI-Manager/snapshots/` | `user/__manager/snapshots/` |
+
+### Why This Change
+
+In older ComfyUI versions, the `default/` directory was **unprotected** and accessible via web APIs. If you ran ComfyUI with `--listen 0.0.0.0` or similar options to allow external connections, this data **may have been tampered with** by malicious actors.
+
+**Note:** If you only used ComfyUI locally (without `--listen` or with `--listen 127.0.0.1`), your data was not exposed to this vulnerability.
+
+The new `__manager` path uses ComfyUI's protected system directory, which:
+- **Cannot be accessed** from outside (protected by ComfyUI)
+- Isolates system settings from user data
+- Enables stricter security for remote access
+
+**This is why only `config.ini` is automatically migrated** - other files (snapshots) may have been compromised and should be manually verified before copying.
+
+---
+
+## Automatic Migration
+
+When you start ComfyUI with the new System User Protection API, Manager automatically handles the migration:
+
+### Step 1: Configuration Migration
+
+Only `config.ini` is migrated automatically.
+
+**Important**: Snapshots are **NOT** automatically migrated. You must copy them manually if needed.
+
+### Step 2: Security Level Check
+
+During migration, if your security level is below `normal` (i.e., `weak` or `normal-`), it will be automatically raised to `normal`. This is a safety measure because the security level setting itself may have been tampered with in the old version.
+
+```
+======================================================================
+[ComfyUI-Manager] WARNING: Security level adjusted
+  - Previous: 'weak' → New: 'normal'
+  - Raised to prevent unauthorized remote access.
+======================================================================
+```
+
+If you need a lower security level, you can manually edit the config after migration.
+
+### Step 3: Legacy Backup
+
+Your entire legacy directory is moved to a backup location:
+```
+user/__manager/.legacy-manager-backup/
+```
+
+This backup is preserved until you manually delete it.
+
+---
+
+## Persistent Backup Notification
+
+As long as the backup exists, Manager will remind you on **every startup**:
+
+```
+----------------------------------------------------------------------
+[ComfyUI-Manager] NOTICE: Legacy backup exists
+  - Your old Manager data was backed up to:
+      /path/to/ComfyUI/user/__manager/.legacy-manager-backup
+  - Please verify and remove it when no longer needed.
+----------------------------------------------------------------------
+```
+
+**To stop this notification**: Delete the `.legacy-manager-backup` folder inside `user/__manager/` after confirming you don't need any data from it.
+
+---
+
+## Recovering Old Data
+
+### Snapshots
+
+If you need your old snapshots, copy the contents of `.legacy-manager-backup/snapshots/` to `user/__manager/snapshots/`.
+
+---
+
+## Outdated ComfyUI Warning
+
+If you're running an older version of ComfyUI without the System User Protection API, Manager will:
+
+1. **Force security level to `strong`** - All installations are blocked
+2. **Display warning message**:
+
+```
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+[ComfyUI-Manager] ERROR: ComfyUI version is outdated!
+  - Most operations are blocked for security.
+  - ComfyUI update is still allowed.
+  - Please update ComfyUI to use Manager normally.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+```
+
+**Solution**: Update ComfyUI to v0.3.76 or later.
+
+---
+
+## Security Levels
+
+| Level | What's Allowed |
+|-------|----------------|
+| `strong` | ComfyUI update only. All other installations blocked. |
+| `normal` | Install/update/remove registered custom nodes and models. |
+| `normal-` | Above + Install via Git URL or pip (localhost only). |
+| `weak` | All operations allowed, including from remote connections. |
+
+**Notes:**
+- `strong` is forced on outdated ComfyUI versions.
+- `normal` is the default and recommended for most users.
+- `normal-` is for developers who need to install unregistered nodes locally.
+- `weak` should only be used in isolated development environments.
+
+### Changing Security Level
+
+Edit `user/__manager/config.ini`:
+```ini
+[default]
+security_level = normal
+```
+
+---
+
+## Error Messages
+
+### "comfyui_outdated" (HTTP 403)
+
+This error appears when:
+- Your ComfyUI doesn't have the System User Protection API
+- All installations are blocked until you update ComfyUI
+
+**Solution**: Update ComfyUI to the latest version.
+
+### "security_level" (HTTP 403)
+
+This error appears when:
+- Your security level blocks the requested operation
+- For example, `strong` level blocks all installations
+
+**Solution**: Lower your security level in config.ini if appropriate for your use case.
+
+---
+
+## Security Warning: Suspicious Path
+
+If you see this error on an **older** ComfyUI:
+
+```
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+[ComfyUI-Manager] ERROR: Suspicious path detected!
+  - '__manager' exists with low security level: 'weak'
+  - Please verify manually:
+      /path/to/ComfyUI/user/__manager/config.ini
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+```
+
+On older ComfyUI versions, the `__manager` directory is not normally created. If this directory exists, it may have been created externally. For safety, manually verify the contents of this directory before updating ComfyUI.
+
+---
+
+## Troubleshooting
+
+### All my installations are blocked
+
+**Check 1**: Is your ComfyUI updated?
+- Old ComfyUI forces `security_level = strong`
+- Update ComfyUI to resolve
+
+**Check 2**: What's your security level?
+- Check `user/__manager/config.ini`
+- `security_level = strong` blocks all installations
+
+### My snapshots are missing
+
+Snapshots are not automatically migrated. You need to manually copy the `snapshots` folder from inside `.legacy-manager-backup` to the `user/__manager/` directory.
+
+### I keep seeing the backup notification
+
+Delete the `.legacy-manager-backup` folder inside `user/__manager/` after confirming you don't need any data from it.
+
+### Snapshot restore is blocked
+
+On old ComfyUI (without System User API), snapshot restore is blocked because security is forced to `strong`. Update ComfyUI to enable snapshot restore.
+
+---
+
+## File Structure Reference
+
+```
+user/
+└── __manager/
+    ├── config.ini              # Manager configuration
+    ├── channels.list           # Custom node channels
+    ├── snapshots/              # Environment snapshots
+    └── .legacy-manager-backup/ # Backup of old Manager data (temporary)
+```
+
+---
+
+## Requirements
+
+- **ComfyUI**: v0.3.76 or later (with System User Protection API)
+- **ComfyUI-Manager**: V3.38 or later

git_helper.py

@@ -2,6 +2,7 @@ import subprocess
 import sys
 import os
 import traceback
+import time
 
 import git
 import json
@@ -9,19 +10,15 @@ import yaml
 import requests
 from tqdm.auto import tqdm
 from git.remote import RemoteProgress
-from comfyui_manager.common.timestamp_utils import get_backup_branch_name
 
 
 comfy_path = os.environ.get('COMFYUI_PATH')
 git_exe_path = os.environ.get('GIT_EXE_PATH')
 
 if comfy_path is None:
-    print("git_helper: environment variable 'COMFYUI_PATH' is not specified.")
-    exit(-1)
+    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__), '..', '..'))
 
-if not os.path.exists(os.path.join(comfy_path, 'folder_paths.py')):
-    print("git_helper: '{comfy_path}' is not a valid 'COMFYUI_PATH' location.")
-    exit(-1)
 
 def download_url(url, dest_folder, filename=None):
     # Ensure the destination folder exists
@@ -157,27 +154,27 @@ def switch_to_default_branch(repo):
         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 Exception:
+    except:
         # try checkout master
         # try checkout main if failed
         try:
             repo.git.checkout(repo.heads.master)
             return True
-        except Exception:
+        except:
             try:
                 if remote_name is not None:
                     repo.git.checkout('-b', 'master', f'{remote_name}/master')
                     return True
-            except Exception:
+            except:
                 try:
                     repo.git.checkout(repo.heads.main)
                     return True
-                except Exception:
+                except:
                     try:
                         if remote_name is not None:
                             repo.git.checkout('-b', 'main', f'{remote_name}/main')
                             return True
-                    except Exception:
+                    except:
                         pass
 
     print("[ComfyUI Manager] Failed to switch to the default branch")
@@ -226,7 +223,7 @@ def gitpull(path):
         try:
             repo.git.pull('--ff-only')
         except git.GitCommandError:
-            backup_name = get_backup_branch_name(repo)
+            backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
             repo.create_head(backup_name)
             print(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
             repo.git.reset('--hard', f'{remote_name}/{branch_name}')
@@ -455,7 +452,7 @@ def restore_pip_snapshot(pips, options):
         res = 1
         try:
             res = subprocess.check_call([sys.executable, '-m', 'pip', 'install'] + non_url)
-        except Exception:
+        except:
             pass
 
         # fallback
@@ -464,7 +461,7 @@ def restore_pip_snapshot(pips, options):
                 res = 1
                 try:
                     res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-                except Exception:
+                except:
                     pass
 
                 if res != 0:
@@ -475,7 +472,7 @@ def restore_pip_snapshot(pips, options):
             res = 1
             try:
                 res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except Exception:
+            except:
                 pass
 
             if res != 0:
@@ -486,7 +483,7 @@ def restore_pip_snapshot(pips, options):
             res = 1
             try:
                 res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except Exception:
+            except:
                 pass
 
             if res != 0:

glob/README.md

@@ -2,16 +2,20 @@
 
 This directory contains the Python backend modules that power ComfyUI-Manager, handling the core functionality of node management, downloading, security, and server operations.
 
-## Directory Structure
-- **glob/** - code for new cacheless ComfyUI-Manager
-- **legacy/** - code for legacy ComfyUI-Manager
-
 ## Core Modules
+
 - **manager_core.py**: The central implementation of management functions, handling configuration, installation, updates, and node management.
 - **manager_server.py**: Implements server functionality and API endpoints for the web interface to interact with the backend.
+- **manager_downloader.py**: Handles downloading operations for models, extensions, and other resources.
+- **manager_util.py**: Provides utility functions used throughout the system.
 
 ## Specialized Modules
 
+- **cm_global.py**: Maintains global variables and state management across the system.
+- **cnr_utils.py**: Helper utilities for interacting with the custom node registry (CNR).
+- **git_utils.py**: Git-specific utilities for repository operations.
+- **node_package.py**: Handles the packaging and installation of node extensions.
+- **security_check.py**: Implements the multi-level security system for installation safety.
 - **share_3rdparty.py**: Manages integration with third-party sharing platforms.
 
 ## Architecture

glob/cnr_utils.py

@@ -6,12 +6,10 @@ import time
 from dataclasses import dataclass
 from typing import List
 
-from . import context
-from . import manager_util
-
+import manager_core
+import manager_util
 import requests
 import toml
-import logging
 
 base_url = "https://api.comfy.org"
 
@@ -24,7 +22,7 @@ async def get_cnr_data(cache_mode=True, dont_wait=True):
     try:
         return await _get_cnr_data(cache_mode, dont_wait)
     except asyncio.TimeoutError:
-        logging.info("A timeout occurred during the fetch process from ComfyRegistry.")
+        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):
@@ -49,9 +47,9 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
         # Get ComfyUI version tag
         if is_desktop:
             # extract version from pyproject.toml instead of git tag
-            comfyui_ver = context.get_current_comfyui_ver() or 'unknown'
+            comfyui_ver = manager_core.get_current_comfyui_ver() or 'unknown'
         else:
-            comfyui_ver = context.get_comfyui_tag() or 'unknown'
+            comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
 
         if is_desktop:
             if is_windows:
@@ -69,10 +67,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
                 form_factor = 'git-linux'
             else:
                 form_factor = 'other'
-
-        from comfyui_manager.glob import manager_core
-        verbose = manager_core.get_config().get('verbose', False)
-
+        
         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}'
@@ -82,13 +77,13 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
             for x in sub_json_obj['nodes']:
                 full_nodes[x['id']] = x
 
-            if page % 5 == 0 and verbose:
-                logging.info(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
+            if page % 5 == 0:
+                print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
 
             page += 1
             time.sleep(0.5)
 
-        logging.info("FETCH ComfyRegistry Data [DONE]")
+        print("FETCH ComfyRegistry Data [DONE]")
 
         for v in full_nodes.values():
             if 'latest_version' not in v:
@@ -104,7 +99,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
             if cache_state == 'not-cached':
                 return {}
             else:
-                logging.info("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
+                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']
 
@@ -116,9 +111,9 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
         json_obj = await fetch_all()
         manager_util.save_to_cache(uri, json_obj)
         return json_obj['nodes']
-    except Exception:
+    except:
         res = {}
-        logging.warning("Cannot connect to comfyregistry.")
+        print("Cannot connect to comfyregistry.")
     finally:
         if cache_mode:
             is_cache_loading = False
@@ -215,7 +210,6 @@ def read_cnr_info(fullpath):
 
             project = data.get('project', {})
             name = project.get('name').strip().lower()
-            original_name = project.get('name')
 
             # normalize version
             # for example: 2.5 -> 2.5.0
@@ -227,7 +221,6 @@ def read_cnr_info(fullpath):
             if name and version:  # repository is optional
                 return {
                     "id": name,
-                    "original_name": original_name,
                     "version": version,
                     "url": repository
                 }
@@ -243,8 +236,8 @@ def generate_cnr_id(fullpath, cnr_id):
         if not os.path.exists(cnr_id_path):
             with open(cnr_id_path, "w") as f:
                 return f.write(cnr_id)
-    except Exception:
-        logging.error(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
+    except:
+        print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
 
 
 def read_cnr_id(fullpath):
@@ -253,7 +246,7 @@ def read_cnr_id(fullpath):
         if os.path.exists(cnr_id_path):
             with open(cnr_id_path) as f:
                 return f.read().strip()
-    except Exception:
+    except:
         pass
 
     return None

glob/git_utils.py

@@ -74,12 +74,6 @@ def normalize_to_github_id(url) -> str:
 
         return f"{author}/{repo_name}"
 
-    # Handle short format like "author/repo" (aux_id format)
-    if '/' in url and not url.startswith('http'):
-        parts = url.split('/')
-        if len(parts) == 2 and parts[0] and parts[1]:
-            return url
-
     return None
 
 

glob/manager_core.py

@@ -15,7 +15,6 @@ import platform
 from datetime import datetime
 
 import git
-from comfyui_manager.common.timestamp_utils import get_timestamp_for_path, get_backup_branch_name
 from git.remote import RemoteProgress
 from urllib.parse import urlparse
 from tqdm.auto import tqdm
@@ -24,6 +23,7 @@ import yaml
 import zipfile
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed
+import toml
 
 orig_print = print
 
@@ -32,25 +32,24 @@ from packaging import version
 
 import uuid
 
-from ..common import cm_global
-from ..common import cnr_utils
-from ..common import manager_util
-from ..common import git_utils
-from ..common import manager_downloader
-from ..common.node_package import InstalledNodePackage
-from ..common.enums import NetworkMode, SecurityLevel, DBMode
-from ..common import context
+glob_path = os.path.join(os.path.dirname(__file__))  # ComfyUI-Manager/glob
+sys.path.append(glob_path)
+
+import cm_global
+import cnr_utils
+import manager_util
+import git_utils
+import manager_downloader
+import manager_migration
+from node_package import InstalledNodePackage
 
 
-version_code = [4, 0, 3]
+version_code = [3, 39, 2]
 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/Comfy-Org/ComfyUI-Manager/main"
-DEFAULT_CHANNEL_LEGACY = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
+DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
 
-# SSH git URL pattern (e.g., git@github.com:user/repo.git)
-SSH_URL_PATTERN = re.compile(r"^(.+@|ssh://).+:.+$")
 
 default_custom_nodes_path = None
 
@@ -60,14 +59,13 @@ class InvalidChannel(Exception):
         self.channel = channel
         super().__init__(channel)
 
-
 def get_default_custom_nodes_path():
     global default_custom_nodes_path
     if default_custom_nodes_path is None:
         try:
             import folder_paths
             default_custom_nodes_path = folder_paths.get_folder_paths("custom_nodes")[0]
-        except Exception:
+        except:
             default_custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
 
     return default_custom_nodes_path
@@ -77,11 +75,37 @@ def get_custom_nodes_paths():
         try:
             import folder_paths
             return folder_paths.get_folder_paths("custom_nodes")
-        except Exception:
+        except:
             custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))
             return [custom_nodes_path]
 
 
+def get_comfyui_tag():
+    try:
+        repo = git.Repo(comfy_path)
+        return repo.git.describe('--tags')
+    except:
+        return None
+
+
+def get_current_comfyui_ver():
+    """
+    Extract version from pyproject.toml
+    """
+    toml_path = os.path.join(comfy_path, 'pyproject.toml')
+    if not os.path.exists(toml_path):
+        return None
+    else:
+        try:
+            with open(toml_path, "r", encoding="utf-8") as f:
+                data = toml.load(f)
+
+                project = data.get('project', {})
+                return project.get('version')
+        except:
+            return None
+
+
 def get_script_env():
     new_env = os.environ.copy()
     git_exe = get_config().get('git_exe')
@@ -89,10 +113,10 @@ def get_script_env():
         new_env['GIT_EXE_PATH'] = git_exe
 
     if 'COMFYUI_PATH' not in new_env:
-        new_env['COMFYUI_PATH'] = context.comfy_path
+        new_env['COMFYUI_PATH'] = comfy_path
 
     if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
-        new_env['COMFYUI_FOLDERS_BASE_PATH'] = context.comfy_path
+        new_env['COMFYUI_FOLDERS_BASE_PATH'] = comfy_path
 
     return new_env
 
@@ -114,12 +138,12 @@ def check_invalid_nodes():
 
     try:
         import folder_paths
-    except Exception:
+    except:
         try:
-            sys.path.append(context.comfy_path)
+            sys.path.append(comfy_path)
             import folder_paths
-        except Exception:
-            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {context.comfy_path}")
+        except:
+            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {comfy_path}")
 
     def check(root):
         global invalid_nodes
@@ -154,6 +178,76 @@ def check_invalid_nodes():
         print("\n---------------------------------------------------------------------------\n")
 
 
+# read env vars
+comfy_path: str = os.environ.get('COMFYUI_PATH')
+comfy_base_path = os.environ.get('COMFYUI_FOLDERS_BASE_PATH')
+
+if comfy_path is None:
+    try:
+        import folder_paths
+        comfy_path = os.path.join(os.path.dirname(folder_paths.__file__))
+    except:
+        comfy_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..', '..'))
+
+if comfy_base_path is None:
+    comfy_base_path = comfy_path
+
+
+channel_list_template_path = os.path.join(manager_util.comfyui_manager_path, 'channels.list.template')
+git_script_path = os.path.join(manager_util.comfyui_manager_path, "git_helper.py")
+
+manager_files_path = None
+manager_config_path = None
+manager_channel_list_path = None
+manager_startup_script_path:str = None
+manager_snapshot_path = None
+manager_pip_overrides_path = None
+manager_pip_blacklist_path = None
+manager_components_path = None
+
+def update_user_directory(user_dir):
+    global manager_files_path
+    global manager_config_path
+    global manager_channel_list_path
+    global manager_startup_script_path
+    global manager_snapshot_path
+    global manager_pip_overrides_path
+    global manager_pip_blacklist_path
+    global manager_components_path
+
+    manager_files_path = manager_migration.get_manager_path(user_dir)
+    if not os.path.exists(manager_files_path):
+        os.makedirs(manager_files_path)
+    manager_migration.run_migration_checks(user_dir, manager_files_path)
+
+    manager_snapshot_path = os.path.join(manager_files_path, "snapshots")
+    if not os.path.exists(manager_snapshot_path):
+        os.makedirs(manager_snapshot_path)
+
+    manager_startup_script_path = os.path.join(manager_files_path, "startup-scripts")
+    if not os.path.exists(manager_startup_script_path):
+        os.makedirs(manager_startup_script_path)
+
+    manager_config_path = os.path.join(manager_files_path, 'config.ini')
+    manager_channel_list_path = os.path.join(manager_files_path, 'channels.list')
+    manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
+    manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
+    manager_components_path = os.path.join(manager_files_path, "components")
+    manager_util.cache_dir = os.path.join(manager_files_path, "cache")
+
+    if not os.path.exists(manager_util.cache_dir):
+        os.makedirs(manager_util.cache_dir)
+
+try:
+    import folder_paths
+    update_user_directory(folder_paths.get_user_directory())
+
+except Exception:
+    # fallback:
+    # This case is only possible when running with cm-cli, and in practice, this case is not actually used.
+    update_user_directory(os.path.abspath(manager_util.comfyui_manager_path))
+
+
 cached_config = None
 js_path = None
 
@@ -164,7 +258,7 @@ comfy_ui_revision = "Unknown"
 comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)
 
 channel_dict = None
-valid_channels = {'default', 'local', DEFAULT_CHANNEL, DEFAULT_CHANNEL_LEGACY}
+valid_channels = {'default', 'local'}
 channel_list = None
 
 
@@ -529,7 +623,7 @@ class UnifiedManager:
                     ver = str(manager_util.StrictVersion(info['version']))
                     return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                 else:
-                    return {'id': info['id'], 'ver': info['version']}
+                    return None
             else:
                 return None
 
@@ -705,9 +799,7 @@ class UnifiedManager:
 
         return latest
 
-    async def reload(self, cache_mode, dont_wait=True, update_cnr_map=True):
-        import folder_paths
-
+    async def reload(self, cache_mode, dont_wait=True):
         self.custom_node_map_cache = {}
         self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
         self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -715,18 +807,17 @@ class UnifiedManager:
         self.unknown_active_nodes = {}    # node_id -> repo url * fullpath
         self.active_nodes = {}            # node_id -> node_version * fullpath
 
-        if get_config()['network_mode'] != 'public' or manager_util.is_manager_pip_package():
+        if get_config()['network_mode'] != 'public':
             dont_wait = True
 
-        if update_cnr_map:
-            # reload 'cnr_map' and 'repo_cnr_map'
-            cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
+        # reload 'cnr_map' and 'repo_cnr_map'
+        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
 
-            for x in cnrs:
-                self.cnr_map[x['id']] = x
-                if 'repository' in x:
-                    normalized_url = git_utils.normalize_url(x['repository'])
-                    self.repo_cnr_map[normalized_url] = x
+        for x in cnrs:
+            self.cnr_map[x['id']] = x
+            if 'repository' in x:
+                normalized_url = git_utils.normalize_url(x['repository'])
+                self.repo_cnr_map[normalized_url] = x
 
         # reload node status info from custom_nodes/*
         for custom_nodes_path in folder_paths.get_folder_paths('custom_nodes'):
@@ -774,7 +865,7 @@ class UnifiedManager:
                 if 'id' in x:
                     if x['id'] not in res:
                         res[x['id']] = (x, True)
-            except Exception:
+            except:
                 logging.error(f"[ComfyUI-Manager] broken item:{x}")
 
         return res
@@ -827,7 +918,7 @@ class UnifiedManager:
     def safe_version(ver_str):
         try:
             return version.parse(ver_str)
-        except Exception:
+        except:
             return version.parse("0.0.0")
 
     def execute_install_script(self, url, repo_path, instant_execution=False, lazy_mode=False, no_deps=False):
@@ -841,14 +932,15 @@ class UnifiedManager:
         else:
             if os.path.exists(requirements_path) and not no_deps:
                 print("Install: pip packages")
-                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
+                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
                 lines = manager_util.robust_readlines(requirements_path)
                 for line in lines:
                     package_name = remap_pip_package(line.strip())
                     if package_name and not package_name.startswith('#') and package_name not in self.processed_install:
                         self.processed_install.add(package_name)
-                        install_cmd = manager_util.make_pip_cmd(["install", package_name])
-                        if package_name.strip() != "" and not package_name.startswith('#'):
+                        clean_package_name = package_name.split('#')[0].strip()
+                        install_cmd = manager_util.make_pip_cmd(["install", clean_package_name])
+                        if clean_package_name != "" and not clean_package_name.startswith('#'):
                             res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)
 
                 pip_fixer.fix_broken()
@@ -862,7 +954,7 @@ class UnifiedManager:
         return res
 
     def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
-        script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
+        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
         with open(script_path, "a") as file:
             obj = [target, "#LAZY-CNR-SWITCH-SCRIPT", zip_url, from_path, to_path, no_deps, get_default_custom_nodes_path(), sys.executable]
             file.write(f"{obj}\n")
@@ -1268,7 +1360,7 @@ class UnifiedManager:
             print(f"Download: git clone '{clone_url}'")
 
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, context.git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                 if res != 0:
                     return result.fail(f"Failed to clone repo: {clone_url}")
             else:
@@ -1421,20 +1513,12 @@ class UnifiedManager:
             return self.unified_enable(node_id, version_spec)
 
         elif version_spec == 'unknown' or version_spec == 'nightly':
-            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
-
             if version_spec == 'nightly':
                 # disable cnr nodes
                 if self.is_enabled(node_id, 'cnr'):
                     self.unified_disable(node_id, False)
 
-                # use `repo name` as a dir name instead of `cnr id` if system added nodepack (i.e. publisher is null)
-                cnr = self.cnr_map.get(node_id)
-
-                if cnr is not None and cnr.get('publisher') is None:
-                    repo_name = os.path.basename(git_utils.normalize_url(repo_url))
-                    to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), repo_name))
-
+            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
             res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
             if res.result:
                 if version_spec == 'unknown':
@@ -1495,7 +1579,7 @@ def identify_node_pack_from_path(fullpath):
         if github_id is None:
             try:
                 github_id = os.path.basename(repo_url)
-            except Exception:
+            except:
                 logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
                 github_id = module_name
 
@@ -1550,10 +1634,10 @@ def get_channel_dict():
     if channel_dict is None:
         channel_dict = {}
 
-        if not os.path.exists(context.manager_channel_list_path):
-            shutil.copy(context.channel_list_template_path, context.manager_channel_list_path)
+        if not os.path.exists(manager_channel_list_path):
+            shutil.copy(channel_list_template_path, manager_channel_list_path)
 
-        with open(context.manager_channel_list_path, 'r') as file:
+        with open(manager_channel_list_path, 'r') as file:
             channels = file.read()
             for x in channels.split('\n'):
                 channel_info = x.split("::")
@@ -1579,6 +1663,9 @@ class ManagerFuncs:
     def __init__(self):
         pass
 
+    def get_current_preview_method(self):
+        return "none"
+
     def run_script(self, cmd, cwd='.'):
         if len(cmd) > 0 and cmd[0].startswith("#"):
             print(f"[ComfyUI-Manager] Unexpected behavior: `{cmd}`")
@@ -1596,12 +1683,14 @@ def write_config():
     config = configparser.ConfigParser(strict=False)
 
     config['default'] = {
+        'preview_method': manager_funcs.get_current_preview_method(),
         'git_exe': get_config()['git_exe'],
         'use_uv': get_config()['use_uv'],
         'channel_url': get_config()['channel_url'],
         'share_option': get_config()['share_option'],
         'bypass_ssl': get_config()['bypass_ssl'],
         "file_logging": get_config()['file_logging'],
+        'component_policy': get_config()['component_policy'],
         'update_policy': get_config()['update_policy'],
         'windows_selector_event_loop_policy': get_config()['windows_selector_event_loop_policy'],
         'model_download_by_agent': get_config()['model_download_by_agent'],
@@ -1612,18 +1701,23 @@ def write_config():
         'db_mode': get_config()['db_mode'],
     }
 
-    directory = os.path.dirname(context.manager_config_path)
+    # Sanitize all string values to prevent CRLF injection attacks
+    for key, value in config['default'].items():
+        if isinstance(value, str):
+            config['default'][key] = value.replace('\r', '').replace('\n', '').replace('\x00', '')
+
+    directory = os.path.dirname(manager_config_path)
     if not os.path.exists(directory):
         os.makedirs(directory)
 
-    with open(context.manager_config_path, 'w') as configfile:
+    with open(manager_config_path, 'w') as configfile:
         config.write(configfile)
 
 
 def read_config():
     try:
         config = configparser.ConfigParser(strict=False)
-        config.read(context.manager_config_path)
+        config.read(manager_config_path)
         default_conf = config['default']
 
         def get_bool(key, default_value):
@@ -1632,47 +1726,57 @@ def read_config():
         manager_util.use_uv = default_conf['use_uv'].lower() == 'true' if 'use_uv' in default_conf else False
         manager_util.bypass_ssl = get_bool('bypass_ssl', False)
 
-        return {
+        result = {
                     'http_channel_enabled': get_bool('http_channel_enabled', False),
+                    'preview_method': default_conf.get('preview_method', manager_funcs.get_current_preview_method()).lower(),
                     'git_exe': default_conf.get('git_exe', ''),
-                    'use_uv': get_bool('use_uv', True),
+                    'use_uv': get_bool('use_uv', False),
                     'channel_url': default_conf.get('channel_url', DEFAULT_CHANNEL),
                     'default_cache_as_channel_url': get_bool('default_cache_as_channel_url', False),
                     'share_option': default_conf.get('share_option', 'all').lower(),
                     'bypass_ssl': get_bool('bypass_ssl', False),
                     'file_logging': get_bool('file_logging', True),
+                    'component_policy': default_conf.get('component_policy', 'workflow').lower(),
                     'update_policy': default_conf.get('update_policy', 'stable-comfyui').lower(),
                     'windows_selector_event_loop_policy': get_bool('windows_selector_event_loop_policy', False),
                     'model_download_by_agent': get_bool('model_download_by_agent', False),
                     'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
                     'always_lazy_install': get_bool('always_lazy_install', False),
-                    'network_mode': default_conf.get('network_mode', NetworkMode.PUBLIC.value).lower(),
-                    'security_level': default_conf.get('security_level', SecurityLevel.NORMAL.value).lower(),
-                    'db_mode': default_conf.get('db_mode', DBMode.CACHE.value).lower(),
+                    'network_mode': default_conf.get('network_mode', 'public').lower(),
+                    'security_level': default_conf.get('security_level', 'normal').lower(),
+                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
                }
+        manager_migration.force_security_level_if_needed(result)
+        return result
 
     except Exception:
-        manager_util.use_uv = False
+        import importlib.util
+        # temporary disable `uv` on Windows by default (https://github.com/Comfy-Org/ComfyUI-Manager/issues/1969)
+        manager_util.use_uv = importlib.util.find_spec("uv") is not None and platform.system() != "Windows"
         manager_util.bypass_ssl = False
 
-        return {
+        result = {
             'http_channel_enabled': False,
+            'preview_method': manager_funcs.get_current_preview_method(),
             'git_exe': '',
-            'use_uv': True,
+            'use_uv': manager_util.use_uv,
             'channel_url': DEFAULT_CHANNEL,
             'default_cache_as_channel_url': False,
             'share_option': 'all',
             'bypass_ssl': manager_util.bypass_ssl,
             'file_logging': True,
+            'component_policy': 'workflow',
             'update_policy': 'stable-comfyui',
             'windows_selector_event_loop_policy': False,
             'model_download_by_agent': False,
             'downgrade_blacklist': '',
             'always_lazy_install': False,
-            'network_mode': NetworkMode.PUBLIC.value,
-            'security_level': SecurityLevel.NORMAL.value,
-            'db_mode': DBMode.CACHE.value,
+            'network_mode': 'public',   # public | private | offline
+            'security_level': 'normal', # strong | normal | normal- | weak
+            'db_mode': 'cache',         # local | cache | remote
         }
+        manager_migration.force_security_level_if_needed(result)
+        return result
 
 
 def get_config():
@@ -1715,27 +1819,27 @@ def switch_to_default_branch(repo):
         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 Exception:
+    except:
         # try checkout master
         # try checkout main if failed
         try:
             repo.git.checkout(repo.heads.master)
             return True
-        except Exception:
+        except:
             try:
                 if remote_name is not None:
                     repo.git.checkout('-b', 'master', f'{remote_name}/master')
                     return True
-            except Exception:
+            except:
                 try:
                     repo.git.checkout(repo.heads.main)
                     return True
-                except Exception:
+                except:
                     try:
                         if remote_name is not None:
                             repo.git.checkout('-b', 'main', f'{remote_name}/main')
                             return True
-                    except Exception:
+                    except:
                         pass
 
     print("[ComfyUI Manager] Failed to switch to the default branch")
@@ -1743,10 +1847,10 @@ def switch_to_default_branch(repo):
 
 
 def reserve_script(repo_path, install_cmds):
-    if not os.path.exists(context.manager_startup_script_path):
-        os.makedirs(context.manager_startup_script_path)
+    if not os.path.exists(manager_startup_script_path):
+        os.makedirs(manager_startup_script_path)
 
-    script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
+    script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
     with open(script_path, "a") as file:
         obj = [repo_path] + install_cmds
         file.write(f"{obj}\n")
@@ -1786,7 +1890,7 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
                     print(f"[WARN] ComfyUI-Manager: Your ComfyUI version ({comfy_ui_revision})[{comfy_ui_commit_datetime.date()}] is too old. Please update to the latest version.")
                     print("[WARN] The extension installation feature may not work properly in the current installed ComfyUI version on Windows environment.")
                     print("###################################################################\n\n")
-            except Exception:
+            except:
                 pass
 
         if code != 0:
@@ -1801,11 +1905,11 @@ def try_install_script(url, repo_path, install_cmd, instant_execution=False):
 # use subprocess to avoid file system lock by git (Windows)
 def __win_check_git_update(path, do_fetch=False, do_update=False):
     if do_fetch:
-        command = [sys.executable, context.git_script_path, "--fetch", path]
+        command = [sys.executable, git_script_path, "--fetch", path]
     elif do_update:
-        command = [sys.executable, context.git_script_path, "--pull", path]
+        command = [sys.executable, git_script_path, "--pull", path]
     else:
-        command = [sys.executable, context.git_script_path, "--check", path]
+        command = [sys.executable, git_script_path, "--check", path]
 
     new_env = get_script_env()
     process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=get_default_custom_nodes_path(), env=new_env)
@@ -1859,7 +1963,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
 
 
 def __win_check_git_pull(path):
-    command = [sys.executable, context.git_script_path, "--pull", path]
+    command = [sys.executable, git_script_path, "--pull", path]
     process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
     process.wait()
 
@@ -1875,7 +1979,7 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
     else:
         if os.path.exists(requirements_path) and not no_deps:
             print("Install: pip packages")
-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
             with open(requirements_path, "r") as requirements_file:
                 for line in requirements_file:
                     #handle comments
@@ -1907,27 +2011,6 @@ def execute_install_script(url, repo_path, lazy_mode=False, instant_execution=Fa
     return True
 
 
-def install_manager_requirements(repo_path):
-    """
-    Install packages from manager_requirements.txt if it exists.
-    This is specifically for ComfyUI's manager_requirements.txt.
-    """
-    manager_requirements_path = os.path.join(repo_path, "manager_requirements.txt")
-    if not os.path.exists(manager_requirements_path):
-        return
-
-    logging.info("[ComfyUI-Manager] Installing manager_requirements.txt")
-    with open(manager_requirements_path, "r") as f:
-        for line in f:
-            line = line.strip()
-            if line and not line.startswith('#'):
-                if '#' in line:
-                    line = line.split('#')[0].strip()
-                if line:
-                    install_cmd = manager_util.make_pip_cmd(["install", line])
-                    subprocess.run(install_cmd)
-
-
 def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=False):
     """
 
@@ -2006,15 +2089,7 @@ def git_repo_update_check_with(path, do_fetch=False, do_update=False, no_deps=Fa
                 return False, True
 
             try:
-                try:
-                    repo.git.pull('--ff-only')
-                except git.GitCommandError:
-                    backup_name = get_backup_branch_name(repo)
-                    repo.create_head(backup_name)
-                    logging.info(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
-                    repo.git.reset('--hard', f'{remote_name}/{branch_name}')
-                    logging.info(f"[ComfyUI-Manager] Reset to {remote_name}/{branch_name}")
-
+                remote.pull()
                 repo.git.submodule('update', '--init', '--recursive')
                 new_commit_hash = repo.head.commit.hexsha
 
@@ -2071,18 +2146,26 @@ class GitProgress(RemoteProgress):
 
 
 def is_valid_url(url):
-    # Check for HTTP/HTTPS URL format
-    result = urlparse(url)
-    if result.scheme and result.netloc:
-        return True
-
-    # Check for SSH git URL format
-    if SSH_URL_PATTERN.match(url):
-        return True
-
+    try:
+        # Check for HTTP/HTTPS URL format
+        result = urlparse(url)
+        if all([result.scheme, result.netloc]):
+            return True
+    finally:
+        # Check for SSH git URL format
+        pattern = re.compile(r"^(.+@|ssh://).+:.+$")
+        if pattern.match(url):
+            return True
     return False
 
 
+def extract_url_and_commit_id(s):
+    index = s.rfind('@')
+    if index == -1:
+        return (s, '')
+    else:
+        return (s[:index], s[index+1:])
+
 async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=False):
     await unified_manager.reload('cache')
     await unified_manager.get_custom_nodes('default', 'cache')
@@ -2100,8 +2183,11 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
         cnr = unified_manager.get_cnr_by_repo(url)
         if cnr:
             cnr_id = cnr['id']
-            return await unified_manager.install_by_id(cnr_id, version_spec='nightly', channel='default', mode='cache')
+            return await unified_manager.install_by_id(cnr_id, version_spec=None, channel='default', mode='cache')
         else:
+            new_url, commit_id = extract_url_and_commit_id(url)
+            if commit_id != "":
+                url = new_url
             repo_name = os.path.splitext(os.path.basename(url))[0]
 
             # NOTE: Keep original name as possible if unknown node
@@ -2129,11 +2215,15 @@ async def gitclone_install(url, instant_execution=False, msg_prefix='', no_deps=
             clone_url = git_utils.get_url_for_clone(url)
 
             if not instant_execution and platform.system() == 'Windows':
-                res = manager_funcs.run_script([sys.executable, context.git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
+                res = manager_funcs.run_script([sys.executable, git_script_path, "--clone", get_default_custom_nodes_path(), clone_url, repo_path], cwd=get_default_custom_nodes_path())
                 if res != 0:
                     return result.fail(f"Failed to clone '{clone_url}' into  '{repo_path}'")
             else:
                 repo = git.Repo.clone_from(clone_url, repo_path, recursive=True, progress=GitProgress())
+                if commit_id!= "":
+                    repo.git.checkout(commit_id)
+                    repo.git.submodule('update', '--init', '--recursive')
+
                 repo.git.clear_cache()
                 repo.close()
 
@@ -2168,12 +2258,12 @@ def git_pull(path):
 
         current_branch = repo.active_branch
         remote_name = current_branch.tracking_branch().remote_name
-        branch_name = current_branch.name
 
         try:
             repo.git.pull('--ff-only')
         except git.GitCommandError:
-            backup_name = get_backup_branch_name(repo)
+            branch_name = current_branch.name
+            backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
             repo.create_head(backup_name)
             logging.info(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
             repo.git.reset('--hard', f'{remote_name}/{branch_name}')
@@ -2204,7 +2294,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
             cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
             cache_uri = os.path.join(manager_util.cache_dir, cache_uri)
 
-            if get_config()['network_mode'] == 'offline' or manager_util.is_manager_pip_package():
+            if get_config()['network_mode'] == 'offline':
                 # offline network mode
                 if os.path.exists(cache_uri):
                     json_obj = await manager_util.get_data(cache_uri)
@@ -2224,7 +2314,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
                         with open(cache_uri, "w", encoding='utf-8') as file:
                             json.dump(json_obj, file, indent=4, sort_keys=True)
     except Exception as e:
-        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename} @ {channel_url}/{mode}\n=> {e}")
+        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
         uri = os.path.join(manager_util.comfyui_manager_path, filename)
         json_obj = await manager_util.get_data(uri)
 
@@ -2295,7 +2385,7 @@ def gitclone_uninstall(files):
             url = url[:-1]
         try:
             for custom_nodes_dir in get_custom_nodes_paths():
-                dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
+                dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
                 dir_path = os.path.join(custom_nodes_dir, dir_name)
 
                 # safety check
@@ -2343,7 +2433,7 @@ def gitclone_set_active(files, is_disable):
             url = url[:-1]
         try:
             for custom_nodes_dir in get_custom_nodes_paths():
-                dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
+                dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
                 dir_path = os.path.join(custom_nodes_dir, dir_name)
 
                 # safety check
@@ -2440,7 +2530,7 @@ def update_to_stable_comfyui(repo_path):
         repo = git.Repo(repo_path)
         try:
             repo.git.checkout(repo.heads.master)
-        except Exception:
+        except:
             logging.error(f"[ComfyUI-Manager] Failed to checkout 'master' branch.\nrepo_path={repo_path}\nAvailable branches:")
             for branch in repo.branches:
                 logging.error('\t'+branch.name)
@@ -2464,7 +2554,7 @@ def update_to_stable_comfyui(repo_path):
             repo.git.checkout(tag_ref.name)
             execute_install_script("ComfyUI", repo_path, instant_execution=False, no_deps=False)
             return 'updated', latest_tag
-    except Exception:
+    except:
         traceback.print_exc()
         return "fail", None
             
@@ -2621,7 +2711,7 @@ async def get_current_snapshot(custom_nodes_only = False):
     await unified_manager.get_custom_nodes('default', 'cache')
 
     # Get ComfyUI hash
-    repo_path = context.comfy_path
+    repo_path = comfy_path
 
     comfyui_commit_hash = None
     if not custom_nodes_only:
@@ -2666,7 +2756,7 @@ async def get_current_snapshot(custom_nodes_only = False):
                         commit_hash = git_utils.get_commit_hash(fullpath)
                         url = git_utils.git_url(fullpath)
                         git_custom_nodes[url] = dict(hash=commit_hash, disabled=is_disabled)
-                except Exception:
+                except:
                     print(f"Failed to extract snapshots for the custom node '{path}'.")
 
             elif path.endswith('.py'):
@@ -2692,10 +2782,12 @@ async def get_current_snapshot(custom_nodes_only = False):
 
 async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = False):
     if path is None:
-        date_time_format = get_timestamp_for_path()
+        now = datetime.now()
+
+        date_time_format = now.strftime("%Y-%m-%d_%H-%M-%S")
         file_name = f"{date_time_format}_{postfix}"
 
-        path = os.path.join(context.manager_snapshot_path, f"{file_name}.json")
+        path = os.path.join(manager_snapshot_path, f"{file_name}.json")
     else:
         file_name = path.replace('\\', '/').split('/')[-1]
         file_name = file_name.split('.')[-2]
@@ -2722,7 +2814,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
         with open(filepath, "r", encoding="UTF-8", errors="ignore") as json_file:
             try:
                 workflow = json.load(json_file)
-            except Exception:
+            except:
                 print(f"Invalid workflow file: {filepath}")
                 exit(-1)
 
@@ -2735,7 +2827,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
             else:
                 try:
                     workflow = json.loads(img.info['workflow'])
-                except Exception:
+                except:
                     print(f"This is not a valid .png file containing a ComfyUI workflow: {filepath}")
                     exit(-1)
 
@@ -3006,7 +3098,7 @@ def populate_github_stats(node_packs, json_obj_github):
                 v['stars'] = -1
                 v['last_update'] = -1
                 v['trust'] = False
-        except Exception:
+        except:
             logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")
 
 
@@ -3283,13 +3375,13 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):
 
 
 def get_comfyui_versions(repo=None):
-    repo = repo or git.Repo(context.comfy_path)
+    repo = repo or git.Repo(comfy_path)
 
     remote_name = None
     try:
         remote_name = get_remote_name(repo)
         repo.remotes[remote_name].fetch()
-    except Exception:
+    except:
         logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")
 
     def parse_semver(tag_name):
@@ -3330,12 +3422,7 @@ def get_comfyui_versions(repo=None):
             default_commit = default_head_ref.reference.commit
             head_is_default = repo.head.commit == default_commit
         except Exception:
-            # Fallback: compare directly with master branch
-            try:
-                if 'master' in [h.name for h in repo.heads]:
-                    head_is_default = repo.head.commit == repo.heads.master.commit
-            except Exception:
-                head_is_default = False
+            head_is_default = False
 
     nearest_semver = normalize_describe(described)
     exact_semver = exact_tag if parse_semver(exact_tag) else None
@@ -3367,7 +3454,7 @@ def get_comfyui_versions(repo=None):
 
 
 def switch_comfyui(tag):
-    repo = git.Repo(context.comfy_path)
+    repo = git.Repo(comfy_path)
 
     if tag == 'nightly':
         repo.git.checkout('master')
@@ -3407,5 +3494,5 @@ def repo_switch_commit(repo_path, commit_hash):
 
         repo.git.checkout(commit_hash)
         return True
-    except Exception:
+    except:
         return None

glob/manager_migration.py

@@ -0,0 +1,356 @@
+"""
+ComfyUI-Manager migration module.
+Handles migration from legacy paths to new __manager path structure.
+"""
+
+import os
+import sys
+import subprocess
+import configparser
+
+# Startup notices for notice board
+startup_notices = []  # List of (message, level) tuples
+
+
+def add_startup_notice(message, level='warning'):
+    """Add a notice to be displayed on Manager notice board.
+
+    Args:
+        message: HTML-formatted message string
+        level: 'warning', 'error', 'info'
+    """
+    global startup_notices
+    startup_notices.append((message, level))
+
+
+# Cache for API check (computed once per session)
+_cached_has_system_user_api = None
+
+
+def has_system_user_api():
+    """Check if ComfyUI has the System User Protection API (PR #10966).
+
+    Result is cached for performance.
+    """
+    global _cached_has_system_user_api
+    if _cached_has_system_user_api is None:
+        try:
+            import folder_paths
+            _cached_has_system_user_api = hasattr(folder_paths, 'get_system_user_directory')
+        except Exception:
+            _cached_has_system_user_api = False
+    return _cached_has_system_user_api
+
+
+def get_manager_path(user_dir):
+    """Get the appropriate manager files path based on ComfyUI version.
+
+    Returns:
+        str: manager_files_path
+    """
+    if has_system_user_api():
+        return os.path.abspath(os.path.join(user_dir, '__manager'))
+    else:
+        return os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
+
+
+def run_migration_checks(user_dir, manager_files_path):
+    """Run all migration and security checks.
+
+    Call this after get_manager_path() to handle:
+    - Legacy config migration (new ComfyUI)
+    - Legacy backup notification (every startup)
+    - Suspicious directory detection (old ComfyUI)
+    - Outdated ComfyUI warning (old ComfyUI)
+    """
+    if has_system_user_api():
+        migrated = migrate_legacy_config(user_dir, manager_files_path)
+        # Only check for legacy backup if migration didn't just happen
+        # (migration already shows backup location in its message)
+        if not migrated:
+            check_legacy_backup(manager_files_path)
+    else:
+        check_suspicious_manager(user_dir)
+        warn_outdated_comfyui()
+
+
+def check_legacy_backup(manager_files_path):
+    """Check for legacy backup and notify user to verify and remove it.
+
+    This runs on every startup to remind users about pending legacy backup.
+    """
+    backup_dir = os.path.join(manager_files_path, '.legacy-manager-backup')
+    if not os.path.exists(backup_dir):
+        return
+
+    # Terminal output
+    print("\n" + "-"*70)
+    print("[ComfyUI-Manager] NOTICE: Legacy backup exists")
+    print("  - Your old Manager data was backed up to:")
+    print(f"      {backup_dir}")
+    print("  - Please verify and remove it when no longer needed.")
+    print("-"*70 + "\n")
+
+    # Notice board output
+    add_startup_notice(
+        "Legacy ComfyUI-Manager data backup exists. Please verify and remove when no longer needed. See terminal for details.",
+        level='info'
+    )
+
+
+def check_suspicious_manager(user_dir):
+    """Check for suspicious __manager directory on old ComfyUI.
+
+    On old ComfyUI without System User API, if __manager exists with low security,
+    warn the user to verify manually.
+
+    Returns:
+        bool: True if suspicious setup detected
+    """
+    if has_system_user_api():
+        return False  # Not suspicious on new ComfyUI
+
+    suspicious_path = os.path.abspath(os.path.join(user_dir, '__manager'))
+    if not os.path.exists(suspicious_path):
+        return False
+
+    config_path = os.path.join(suspicious_path, 'config.ini')
+    if not os.path.exists(config_path):
+        return False
+
+    config = configparser.ConfigParser()
+    config.read(config_path)
+    sec_level = config.get('default', 'security_level', fallback='normal').lower()
+
+    if sec_level in ['weak', 'normal-']:
+        # Terminal output
+        print("\n" + "!"*70)
+        print("[ComfyUI-Manager] ERROR: Suspicious path detected!")
+        print(f"  - '__manager' exists with low security level: '{sec_level}'")
+        print("  - Please verify manually:")
+        print(f"      {config_path}")
+        print("!"*70 + "\n")
+
+        # Notice board output
+        add_startup_notice(
+            "[Security Alert] Suspicious path detected. See terminal log for details.",
+            level='error'
+        )
+        return True
+
+    return False
+
+
+def warn_outdated_comfyui():
+    """Warn user about outdated ComfyUI without System User API."""
+    if has_system_user_api():
+        return
+
+    # Terminal output
+    print("\n" + "!"*70)
+    print("[ComfyUI-Manager] ERROR: ComfyUI version is outdated!")
+    print("  - Most operations are blocked for security.")
+    print("  - ComfyUI update is still allowed.")
+    print("  - Please update ComfyUI to use Manager normally.")
+    print("!"*70 + "\n")
+
+    # Notice board output
+    add_startup_notice(
+        "[Security Alert] ComfyUI outdated. Installations blocked (update allowed).<BR>"
+        "Update ComfyUI for normal operation.",
+        level='error'
+    )
+
+
+def migrate_legacy_config(user_dir, manager_files_path):
+    """Migrate ONLY config.ini to new __manager path if needed.
+
+    IMPORTANT: Only config.ini is migrated. Other files (snapshots, cache, etc.)
+    are NOT migrated - users must recreate them.
+
+    Scenarios:
+    1. Legacy exists, New doesn't exist → Migrate config.ini
+    2. Legacy exists, New exists → First update after upgrade
+       - Run ComfyUI dependency installation
+       - Rename legacy to .backup
+    3. Legacy doesn't exist → No migration needed
+
+    Returns:
+        bool: True if migration was performed
+    """
+    if not has_system_user_api():
+        return False
+
+    legacy_dir = os.path.join(user_dir, 'default', 'ComfyUI-Manager')
+    legacy_config = os.path.join(legacy_dir, 'config.ini')
+    new_config = os.path.join(manager_files_path, 'config.ini')
+
+    if not os.path.exists(legacy_dir):
+        return False  # No legacy directory, nothing to migrate
+
+    # IMPORTANT: Check for config.ini existence, not just directory
+    # (because makedirs() creates __manager before this function is called)
+
+    # Case: Both configs exist (first update after ComfyUI upgrade)
+    # This means user ran new ComfyUI at least once, creating __manager/config.ini
+    if os.path.exists(legacy_config) and os.path.exists(new_config):
+        _handle_first_update_migration(user_dir, legacy_dir, manager_files_path)
+        return True
+
+    # Case: Legacy config exists but new config doesn't (normal migration)
+    # This is the first run after ComfyUI upgrade
+    if os.path.exists(legacy_config) and not os.path.exists(new_config):
+        pass  # Continue with normal migration below
+    else:
+        return False
+
+    # Terminal output
+    print("\n" + "-"*70)
+    print("[ComfyUI-Manager] NOTICE: Legacy config.ini detected")
+    print(f"  - Old: {legacy_config}")
+    print(f"  - New: {new_config}")
+    print("  - Migrating config.ini only (other files are NOT migrated).")
+    print("  - Security level below 'normal' will be raised.")
+    print("-"*70 + "\n")
+
+    _migrate_config_with_security_check(legacy_config, new_config)
+
+    # Move legacy directory to backup
+    _move_legacy_to_backup(legacy_dir, manager_files_path)
+
+    return True
+
+
+def _handle_first_update_migration(user_dir, legacy_dir, manager_files_path):
+    """Handle first ComfyUI update when both legacy and new directories exist.
+
+    This scenario happens when:
+    - User was on old ComfyUI (using default/ComfyUI-Manager)
+    - ComfyUI was updated (now has System User API)
+    - Manager already created __manager on first new run
+    - But legacy directory still exists
+
+    Actions:
+    1. Run ComfyUI dependency installation
+    2. Move legacy to __manager/.legacy-manager-backup
+    """
+    # Terminal output
+    print("\n" + "-"*70)
+    print("[ComfyUI-Manager] NOTICE: First update after ComfyUI upgrade detected")
+    print("  - Both legacy and new directories exist.")
+    print("  - Running ComfyUI dependency installation...")
+    print("-"*70 + "\n")
+
+    # Run ComfyUI dependency installation
+    # Path: glob/manager_migration.py → glob → comfyui-manager → custom_nodes → ComfyUI
+    try:
+        comfyui_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
+        requirements_path = os.path.join(comfyui_path, 'requirements.txt')
+        if os.path.exists(requirements_path):
+            subprocess.run([sys.executable, '-m', 'pip', 'install', '-r', requirements_path],
+                         capture_output=True, check=False)
+            print("[ComfyUI-Manager] ComfyUI dependencies installation completed.")
+    except Exception as e:
+        print(f"[ComfyUI-Manager] WARNING: Failed to install ComfyUI dependencies: {e}")
+
+    # Move legacy to backup inside __manager
+    _move_legacy_to_backup(legacy_dir, manager_files_path)
+
+
+def _move_legacy_to_backup(legacy_dir, manager_files_path):
+    """Move legacy directory to backup inside __manager.
+
+    Returns:
+        str: Path to backup directory if successful, None if failed
+    """
+    import shutil
+
+    backup_dir = os.path.join(manager_files_path, '.legacy-manager-backup')
+
+    try:
+        if os.path.exists(backup_dir):
+            shutil.rmtree(backup_dir)  # Remove old backup if exists
+        shutil.move(legacy_dir, backup_dir)
+
+        # Terminal output (full paths shown here only)
+        print("\n" + "-"*70)
+        print("[ComfyUI-Manager] NOTICE: Legacy settings migrated")
+        print(f"  - Old location: {legacy_dir}")
+        print(f"  - Backed up to: {backup_dir}")
+        print("  - Please verify and remove the backup when no longer needed.")
+        print("-"*70 + "\n")
+
+        # Notice board output (no full paths for security)
+        add_startup_notice(
+            "Legacy ComfyUI-Manager data migrated. See terminal for details.",
+            level='info'
+        )
+        return backup_dir
+    except Exception as e:
+        print(f"[ComfyUI-Manager] WARNING: Failed to backup legacy directory: {e}")
+        add_startup_notice(
+            f"[MIGRATION] Failed to backup legacy directory: {e}",
+            level='warning'
+        )
+        return None
+
+
+def _migrate_config_with_security_check(legacy_path, new_path):
+    """Migrate legacy config, raising security level only if below default."""
+    config = configparser.ConfigParser()
+    try:
+        config.read(legacy_path)
+    except Exception as e:
+        print(f"[ComfyUI-Manager] WARNING: Failed to parse config.ini: {e}")
+        print("  - Creating fresh config with default settings.")
+        add_startup_notice(
+            "[MIGRATION] Failed to parse legacy config. Using defaults.",
+            level='warning'
+        )
+        return  # Skip migration, let Manager create fresh config
+
+    # Security level hierarchy: strong > normal > normal- > weak
+    # Default is 'normal', only raise if below default
+    if 'default' in config:
+        current_level = config['default'].get('security_level', 'normal').lower()
+        below_default_levels = ['weak', 'normal-']
+
+        if current_level in below_default_levels:
+            config['default']['security_level'] = 'normal'
+
+            # Terminal output
+            print("\n" + "="*70)
+            print("[ComfyUI-Manager] WARNING: Security level adjusted")
+            print(f"  - Previous: '{current_level}' → New: 'normal'")
+            print("  - Raised to prevent unauthorized remote access.")
+            print("="*70 + "\n")
+
+            # Notice board output
+            add_startup_notice(
+                f"[MIGRATION] Security level raised: '{current_level}' → 'normal'.<BR>"
+                "To prevent unauthorized remote access.",
+                level='warning'
+            )
+        else:
+            print(f"  - Security level: '{current_level}' (no change needed)")
+
+    # Ensure directory exists
+    os.makedirs(os.path.dirname(new_path), exist_ok=True)
+
+    with open(new_path, 'w') as f:
+        config.write(f)
+
+
+def force_security_level_if_needed(config_dict):
+    """Force security level to 'strong' if on old ComfyUI.
+
+    Args:
+        config_dict: Configuration dictionary to modify in-place
+
+    Returns:
+        bool: True if security level was forced
+    """
+    if not has_system_user_api():
+        config_dict['security_level'] = 'strong'
+        return True
+    return False

glob/manager_util.py

@@ -8,18 +8,17 @@ 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 time
 from functools import lru_cache
 
 
 cache_lock = threading.Lock()
-session_lock = threading.Lock()
 
 comfyui_manager_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also updated together in **manager_core.update_user_directory**.
@@ -27,9 +26,6 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also up
 use_uv = False
 bypass_ssl = False
 
-def is_manager_pip_package():
-    return not os.path.exists(os.path.join(comfyui_manager_path, '..', 'custom_nodes'))
-
 def add_python_path_to_env():
     if platform.system() != "Windows":
         sep = ':'
@@ -59,7 +55,7 @@ def get_pip_cmd(force_uv=False):
             subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
             return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip']
         except Exception:
-            logging.warning("[ComfyUI-Manager] python -m pip not available. Falling back to uv.")
+            logging.warning("[ComfyUI-Manager] `python -m pip` not available. Falling back to `uv`.")
 
     # Try uv (either forced or pip failed)
     import shutil
@@ -68,19 +64,19 @@ def get_pip_cmd(force_uv=False):
     try:
         test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', '--version']
         subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
-        logging.info("[ComfyUI-Manager] Using uv as Python module for pip operations.")
+        logging.info("[ComfyUI-Manager] Using `uv` as Python module for pip operations.")
         return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', 'pip']
     except Exception:
         pass
 
     # Try standalone uv
     if shutil.which('uv'):
-        logging.info("[ComfyUI-Manager] Using standalone uv for pip operations.")
+        logging.info("[ComfyUI-Manager] Using standalone `uv` for pip operations.")
         return ['uv', 'pip']
 
     # Nothing worked
-    logging.error("[ComfyUI-Manager] Neither python -m pip nor uv are available. Cannot proceed with package operations.")
-    raise Exception("Neither pip nor uv are available for package management")
+    logging.error("[ComfyUI-Manager] Neither `python -m pip` nor `uv` are available. Cannot proceed with package operations.")
+    raise Exception("Neither `pip` nor `uv` are available for package management")
 
 
 def make_pip_cmd(cmd):
@@ -101,7 +97,7 @@ def make_pip_cmd(cmd):
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
 #     from distutils.version import StrictVersion
-# except Exception:
+# except:
 #     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
 class StrictVersion:
     def __init__(self, version_string):
@@ -176,7 +172,7 @@ def is_file_created_within_one_day(file_path):
         return False
 
     file_creation_time = os.path.getctime(file_path)
-    current_time = time.time()
+    current_time = datetime.now().timestamp()
     time_difference = current_time - file_creation_time
 
     return time_difference <= 86400
@@ -556,7 +552,7 @@ def robust_readlines(fullpath):
     try:
         with open(fullpath, "r") as f:
             return f.readlines()
-    except Exception:
+    except:
         encoding = None
         with open(fullpath, "rb") as f:
             raw_data = f.read()

glob/node_package.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 import os
 
-from .git_utils import get_commit_hash
+from git_utils import get_commit_hash
 
 
 @dataclass

glob/security_check.py

@@ -2,7 +2,7 @@ import sys
 import subprocess
 import os
 
-from . import manager_util
+import manager_util
 
 
 def security_check():

glob/share_3rdparty.py

@@ -1,7 +1,5 @@
 import mimetypes
-from ..common import context
-from . import manager_core as core
-
+import manager_core as core
 import os
 from aiohttp import web
 import aiohttp
@@ -10,16 +8,6 @@ import hashlib
 
 import folder_paths
 from server import PromptServer
-import logging
-import sys
-
-
-try:
-    from nio import AsyncClient, LoginResponse, UploadResponse
-    matrix_nio_is_available = True
-except Exception:
-    logging.warning(f"[ComfyUI-Manager] The matrix sharing feature has been disabled because the `matrix-nio` dependency is not installed.\n\tTo use this feature, please run the following command:\n\t{sys.executable} -m pip install matrix-nio\n")
-    matrix_nio_is_available = False
 
 
 def extract_model_file_names(json_data):
@@ -65,7 +53,7 @@ def compute_sha256_checksum(filepath):
     return sha256.hexdigest()
 
 
-@PromptServer.instance.routes.get("/v2/manager/share_option")
+@PromptServer.instance.routes.get("/manager/share_option")
 async def share_option(request):
     if "value" in request.rel_url.query:
         core.get_config()['share_option'] = request.rel_url.query['value']
@@ -77,21 +65,21 @@ async def share_option(request):
 
 
 def get_openart_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
+    if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
+        with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
             openart_key = f.read().strip()
         return openart_key if openart_key else None
-    except Exception:
+    except:
         return None
 
 
 def get_matrix_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
+    if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, "matrix_auth"), "r") as f:
+        with open(os.path.join(core.manager_files_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:
@@ -101,40 +89,40 @@ def get_matrix_auth():
             "username": username,
             "password": password,
         }
-    except Exception:
+    except:
         return None
 
 
 def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
+    if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
+        with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
             share_key = f.read()
             if not share_key.strip():
                 return None
         return share_key
-    except Exception:
+    except:
         return None
 
 
 def get_youml_settings():
-    if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
+    if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
         return None
     try:
-        with open(os.path.join(context.manager_files_path, ".youml"), "r") as f:
+        with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
             youml_settings = f.read().strip()
         return youml_settings if youml_settings else None
-    except Exception:
+    except:
         return None
 
 
 def set_youml_settings(settings):
-    with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
+    with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
         f.write(settings)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_openart_auth")
+@PromptServer.instance.routes.get("/manager/get_openart_auth")
 async def api_get_openart_auth(request):
     # print("Getting stored Matrix credentials...")
     openart_key = get_openart_auth()
@@ -143,16 +131,16 @@ async def api_get_openart_auth(request):
     return web.json_response({"openart_key": openart_key})
 
 
-@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
+@PromptServer.instance.routes.post("/manager/set_openart_auth")
 async def api_set_openart_auth(request):
     json_data = await request.json()
     openart_key = json_data['openart_key']
-    with open(os.path.join(context.manager_files_path, ".openart_key"), "w") as f:
+    with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
         f.write(openart_key)
     return web.Response(status=200)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
+@PromptServer.instance.routes.get("/manager/get_matrix_auth")
 async def api_get_matrix_auth(request):
     # print("Getting stored Matrix credentials...")
     matrix_auth = get_matrix_auth()
@@ -161,7 +149,7 @@ async def api_get_matrix_auth(request):
     return web.json_response(matrix_auth)
 
 
-@PromptServer.instance.routes.get("/v2/manager/youml/settings")
+@PromptServer.instance.routes.get("/manager/youml/settings")
 async def api_get_youml_settings(request):
     youml_settings = get_youml_settings()
     if not youml_settings:
@@ -169,14 +157,14 @@ async def api_get_youml_settings(request):
     return web.json_response(json.loads(youml_settings))
 
 
-@PromptServer.instance.routes.post("/v2/manager/youml/settings")
+@PromptServer.instance.routes.post("/manager/youml/settings")
 async def api_set_youml_settings(request):
     json_data = await request.json()
     set_youml_settings(json.dumps(json_data))
     return web.Response(status=200)
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_comfyworkflows_auth")
+@PromptServer.instance.routes.get("/manager/get_comfyworkflows_auth")
 async def api_get_comfyworkflows_auth(request):
     # Check if the user has provided Matrix credentials in a file called 'matrix_accesstoken'
     # in the same directory as the ComfyUI base folder
@@ -187,39 +175,31 @@ async def api_get_comfyworkflows_auth(request):
     return web.json_response({"comfyworkflows_sharekey": comfyworkflows_auth})
 
 
-@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
+@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(context.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
+    with open(os.path.join(core.manager_files_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("/v2/manager/get_esheep_workflow_and_images")
+@PromptServer.instance.routes.get("/manager/get_esheep_workflow_and_images")
 async def get_esheep_workflow_and_images(request):
-    with open(os.path.join(context.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
+    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
         data = json.load(file)
         return web.Response(status=200, text=json.dumps(data))
 
 
-@PromptServer.instance.routes.get("/v2/manager/get_matrix_dep_status")
-async def get_matrix_dep_status(request):
-    if matrix_nio_is_available:
-        return web.Response(status=200, text='available')
-    else:
-        return web.Response(status=200, text='unavailable')
-
-
 def set_matrix_auth(json_data):
     homeserver = json_data['homeserver']
     username = json_data['username']
     password = json_data['password']
-    with open(os.path.join(context.manager_files_path, "matrix_auth"), "w") as f:
+    with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
         f.write("\n".join([homeserver, username, password]))
 
 
 def set_comfyworkflows_auth(comfyworkflows_sharekey):
-    with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
+    with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
         f.write(comfyworkflows_sharekey)
 
 
@@ -231,7 +211,7 @@ def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
     return comfyworkflows_sharekey.strip()
 
 
-@PromptServer.instance.routes.post("/v2/manager/share")
+@PromptServer.instance.routes.post("/manager/share")
 async def share_art(request):
     # get json data
     json_data = await request.json()
@@ -253,7 +233,7 @@ async def share_art(request):
 
     try:
         output_to_share = potential_outputs[int(selected_output_index)]
-    except Exception:
+    except:
         # for now, pick the first output
         output_to_share = potential_outputs[0]
 
@@ -349,12 +329,14 @@ async def share_art(request):
                 workflowId = upload_workflow_json["workflowId"]
 
     # check if the user has provided Matrix credentials
-    if matrix_nio_is_available and "matrix" in share_destinations:
+    if "matrix" in share_destinations:
         comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
         filename = os.path.basename(asset_filepath)
         content_type = assetFileType
 
         try:
+            from nio import AsyncClient, LoginResponse, UploadResponse
+
             homeserver = 'matrix.org'
             if matrix_auth:
                 homeserver = matrix_auth.get('homeserver', 'matrix.org')

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, customConfirm, customAlert, handle403Response, show_message } from "./common.js";
 
 async function tryInstallCustomNode(event) {
 	let msg = '-= [ComfyUI Manager] extension installation request =-\n\n';
@@ -25,7 +25,7 @@ async function tryInstallCustomNode(event) {
 	const res = await customConfirm(msg);
 	if(res) {
 		if(event.detail.target.installed == 'Disabled') {
-			const response = await api.fetchApi(`/v2/customnode/toggle_active`, {
+			const response = await api.fetchApi(`/customnode/toggle_active`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
@@ -35,14 +35,14 @@ async function tryInstallCustomNode(event) {
 			await sleep(300);
 			app.ui.dialog.show(`Installing... '${event.detail.target.title}'`);
 
-			const response = await api.fetchApi(`/v2/customnode/install`, {
+			const response = await api.fetchApi(`/customnode/install`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
 									});
 
 			if(response.status == 403) {
-				show_message('This action is not allowed with this security level configuration.');
+				await handle403Response(response);
 				return false;
 			}
 			else if(response.status == 400) {
@@ -52,9 +52,9 @@ async function tryInstallCustomNode(event) {
 			}
 		}
 
-		let response = await api.fetchApi("/v2/manager/reboot");
+		let response = await api.fetchApi("/manager/reboot");
 		if(response.status == 403) {
-			show_message('This action is not allowed with this security level configuration.');
+			await handle403Response(response);
 			return false;
 		}
 

js/comfyui-manager.js

@@ -14,8 +14,9 @@ import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import {
 	free_models, install_pip, install_via_git_url, manager_instance,
 	rebootAPI, setManagerInstance, show_message, customAlert, customPrompt,
-	infoToast, showTerminal, setNeedRestart, generateUUID
+	infoToast, showTerminal, setNeedRestart, handle403Response
 } from "./common.js";
+import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
 import { CustomNodesManager } from "./custom-nodes-manager.js";
 import { ModelManager } from "./model-manager.js";
 import { SnapshotManager } from "./snapshot.js";
@@ -194,7 +195,8 @@ docStyle.innerHTML = `
 }
 `;
 
-function isBeforeFrontendVersion(compareVersion) {
+function is_legacy_front() {
+    let compareVersion = '1.2.49';
     try {
         const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
         if (typeof frontendVersion !== 'string') {
@@ -236,7 +238,7 @@ var restart_stop_button = null;
 var update_policy_combo = null;
 
 let share_option = 'all';
-var batch_id = null;
+var is_updating = false;
 
 
 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -407,7 +409,7 @@ const style = `
 `;
 
 async function init_share_option() {
-	api.fetchApi('/v2/manager/share_option')
+	api.fetchApi('/manager/share_option')
 		.then(response => response.text())
 		.then(data => {
 			share_option = data || 'all';
@@ -415,7 +417,7 @@ async function init_share_option() {
 }
 
 async function init_notice(notice) {
-	api.fetchApi('/v2/manager/notice')
+	api.fetchApi('/manager/notice')
 		.then(response => response.text())
 		.then(data => {
 			notice.innerHTML = data;
@@ -466,19 +468,14 @@ async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";
 
-//	set_inprogress_mode();
+	set_inprogress_mode();
+
+	const response = await api.fetchApi('/manager/queue/update_comfyui');
+
 	showTerminal();
 
-	batch_id = generateUUID();
-
-	let batch = {};
-	batch['batch_id'] = batch_id;
-	batch['update_comfyui'] = true;
-
-	const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-		method: 'POST',
-		body: JSON.stringify(batch)
-	});
+	is_updating = true;
+	await api.fetchApi('/manager/queue/start');
 }
 
 function showVersionSelectorDialog(versions, current, onSelect) {
@@ -609,7 +606,7 @@ async function switchComfyUI() {
 	switch_comfyui_button.disabled = true;
 	switch_comfyui_button.style.backgroundColor = "gray";
 	
-	let res = await api.fetchApi(`/v2/comfyui_manager/comfyui_versions`, { cache: "no-store" });
+	let res = await api.fetchApi(`/comfyui_manager/comfyui_versions`, { cache: "no-store" });
 
 	switch_comfyui_button.disabled = false;
 	switch_comfyui_button.style.backgroundColor = "";
@@ -628,14 +625,14 @@ async function switchComfyUI() {
 		showVersionSelectorDialog(versions, obj.current, async (selected_version) => {
 			if(selected_version == 'nightly') {
 				update_policy_combo.value = 'nightly-comfyui';
-				api.fetchApi('/v2/manager/policy/update?value=nightly-comfyui');
+				api.fetchApi('/manager/policy/update?value=nightly-comfyui');
 			}
 			else {
 				update_policy_combo.value = 'stable-comfyui';
-				api.fetchApi('/v2/manager/policy/update?value=stable-comfyui');
+				api.fetchApi('/manager/policy/update?value=stable-comfyui');
 			}
 
-			let response = await api.fetchApi(`/v2/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
+			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}`);
 			}
@@ -653,17 +650,18 @@ async function onQueueStatus(event) {
 	const isElectron = 'electronAPI' in window;
 
 	if(event.detail.status == 'in_progress') {
-//		set_inprogress_mode();
+		set_inprogress_mode();
 		update_all_button.innerText = `in progress.. (${event.detail.done_count}/${event.detail.total_count})`;
 	}
-	else if(event.detail.status == 'all-done') {
+	else if(event.detail.status == 'done') {
 		reset_action_buttons();
-	}
-	else if(event.detail.status == 'batch-done') {
-		if(batch_id != event.detail.batch_id) {
+
+		if(!is_updating)  {
 			return;
 		}
 
+		is_updating = false;
+
 		let success_list = [];
 		let failed_list = [];
 		let comfyui_state = null;
@@ -749,9 +747,9 @@ async function onQueueStatus(event) {
 
 		const rebootButton = document.getElementById('cm-reboot-button5');
 		rebootButton?.addEventListener("click",
-			function() {
-				if(rebootAPI()) {
-					manager_dialog.close();
+			async function() {
+				if(await rebootAPI()) {
+					manager_instance.close();
 				}
 			});
 	}
@@ -763,28 +761,46 @@ api.addEventListener("cm-queue-status", onQueueStatus);
 async function updateAll(update_comfyui) {
 	update_all_button.innerText = "Updating...";
 
-//	set_inprogress_mode();
+	set_inprogress_mode();
 
 	var mode = manager_instance.datasrc_combo.value;
 
 	showTerminal();
 
-	batch_id = generateUUID();
-
-	let batch = {};
 	if(update_comfyui) {
 		update_all_button.innerText = "Updating ComfyUI...";
-		batch['update_comfyui'] = true;
+		await api.fetchApi('/manager/queue/update_comfyui');
 	}
 
-	batch['update_all'] = mode;
+	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
 
-	const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-		method: 'POST',
-		body: JSON.stringify(batch)
-	});
+	if (response.status == 403) {
+		await handle403Response(response);
+		reset_action_buttons();
+	}
+	else if (response.status == 401) {
+		customAlert('Another task is already in progress. Please stop the ongoing task first.');
+		reset_action_buttons();
+	}
+	else if(response.status == 200) {
+		is_updating = true;
+		await api.fetchApi('/manager/queue/start');
+	}
 }
 
+function newDOMTokenList(initialTokens) {
+	const tmp = document.createElement(`div`);
+
+	const classList = tmp.classList;
+	if (initialTokens) {
+		initialTokens.forEach(token => {
+		classList.add(token);
+		});
+	}
+
+	return classList;
+	}
+
 /**
  * Check whether the node is a potential output node (img, gif or video output)
  */
@@ -797,7 +813,7 @@ function restartOrStop() {
 		rebootAPI();
 	}
 	else {
-		api.fetchApi('/v2/manager/queue/reset');
+		api.fetchApi('/manager/queue/reset');
 		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 	}
 }
@@ -946,21 +962,119 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'Local' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'Channel (remote)' }, []));
 
-		api.fetchApi('/v2/manager/db_mode')
+		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(`/v2/manager/db_mode?value=${event.target.value}`);
+			api.fetchApi(`/manager/db_mode?value=${event.target.value}`);
 		});
 
 		const dbRetrievalSetttingItem = createSettingsCombo("DB", this.datasrc_combo);
 
+		// preview method
+		let preview_combo = document.createElement("select");
+		preview_combo.setAttribute("title", "Configure how latent variables will be decoded during preview in the sampling process.");
+		preview_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
+
+		// Loading state to prevent flash of enabled state
+		preview_combo.appendChild($el('option', { value: '', text: 'Loading...', disabled: true }, []));
+		preview_combo.appendChild($el('option', { value: 'auto', text: 'Auto' }, []));
+		preview_combo.appendChild($el('option', { value: 'taesd', text: 'TAESD (slow)' }, []));
+		preview_combo.appendChild($el('option', { value: 'latent2rgb', text: 'Latent2RGB (fast)' }, []));
+		preview_combo.appendChild($el('option', { value: 'none', text: 'None (very fast)' }, []));
+
+		// Start disabled to prevent flash
+		preview_combo.disabled = true;
+		preview_combo.value = '';
+
+		// Fetch current state
+		api.fetchApi('/manager/preview_method')
+			.then(response => response.text())
+			.then(data => {
+				// Remove loading option
+				preview_combo.querySelector('option[value=""]')?.remove();
+
+				if (data === "DISABLED") {
+					// ComfyUI per-queue preview feature is active
+					preview_combo.disabled = true;
+					preview_combo.value = 'auto';
+
+					// Accessibility attributes
+					preview_combo.setAttribute("aria-disabled", "true");
+					preview_combo.setAttribute("aria-label",
+						"Preview method setting (disabled - managed by ComfyUI). " +
+						"Use Settings > Execution > Live preview method instead."
+					);
+
+					// Tooltip for mouse users
+					preview_combo.setAttribute("title",
+						"This feature is now provided natively by ComfyUI. " +
+						"Please use 'Settings > Execution > Live preview method' instead."
+					);
+
+					// Visual feedback
+					preview_combo.style.opacity = '0.6';
+					preview_combo.style.cursor = 'not-allowed';
+				} else {
+					// Manager feature is active
+					preview_combo.disabled = false;
+					preview_combo.value = data;
+
+					// Accessibility for enabled state
+					preview_combo.setAttribute("aria-label",
+						"Preview method setting. Select how latent variables are decoded during preview."
+					);
+				}
+			})
+			.catch(error => {
+				console.error('[ComfyUI-Manager] Failed to fetch preview method status:', error);
+				// Error recovery: fallback to enabled
+				preview_combo.querySelector('option[value=""]')?.remove();
+				preview_combo.disabled = false;
+				preview_combo.value = 'auto';
+			});
+
+		preview_combo.addEventListener('change', function (event) {
+			// Ignore if disabled
+			if (preview_combo.disabled) {
+				event.preventDefault();
+				return;
+			}
+
+			// Normal operation
+			api.fetchApi(`/manager/preview_method?value=${event.target.value}`)
+				.then(response => {
+					if (response.status === 403) {
+						// Feature transitioned to native
+						alert(
+							'This feature is now provided natively by ComfyUI.\n' +
+							'Please use \'Settings > Execution > Live preview method\' instead.'
+						);
+						preview_combo.disabled = true;
+						preview_combo.style.opacity = '0.6';
+						preview_combo.style.cursor = 'not-allowed';
+
+						// Update aria attributes
+						preview_combo.setAttribute("aria-disabled", "true");
+						preview_combo.setAttribute("aria-label",
+							"Preview method setting (disabled - managed by ComfyUI). " +
+							"Use Settings > Execution > Live preview method instead."
+						);
+					}
+				})
+				.catch(error => {
+					console.error('[ComfyUI-Manager] Preview method update failed:', error);
+				});
+		});
+
+		const previewSetttingItem = createSettingsCombo("Preview method", preview_combo);
+
 		// channel
 		let channel_combo = document.createElement("select");
 		channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
 		channel_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
-		api.fetchApi('/v2/manager/channel_url_list')
+		api.fetchApi('/manager/channel_url_list')
 			.then(response => response.json())
 			.then(async data => {
 				try {
@@ -973,7 +1087,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					}
 
 					channel_combo.addEventListener('change', function (event) {
-						api.fetchApi(`/v2/manager/channel_url_list?value=${event.target.value}`);
+						api.fetchApi(`/manager/channel_url_list?value=${event.target.value}`);
 					});
 
 					channel_combo.value = data.selected;
@@ -1003,7 +1117,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			share_combo.appendChild($el('option', { value: option[0], text: `${option[1]}` }, []));
 		}
 
-		api.fetchApi('/v2/manager/share_option')
+		api.fetchApi('/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
 				share_combo.value = data || 'all';
@@ -1013,7 +1127,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		share_combo.addEventListener('change', function (event) {
 			const value = event.target.value;
 			share_option = value;
-			api.fetchApi(`/v2/manager/share_option?value=${value}`);
+			api.fetchApi(`/manager/share_option?value=${value}`);
 			const shareButton = document.getElementById("shareButton");
 			if (value === 'none') {
 				shareButton.style.display = "none";
@@ -1024,20 +1138,40 @@ class ManagerMenuDialog extends ComfyDialog {
 
 		const shareSetttingItem = createSettingsCombo("Share", share_combo);
 
+		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 p-select p-component p-inputwrapper p-inputwrapper-filled";
+		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Use workflow version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Use higher version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'mine', text: '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);
+		});
+
+		const componentSetttingItem = createSettingsCombo("Component", component_policy_combo);
+
 		update_policy_combo = document.createElement("select");
 		
 		update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
 		update_policy_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
 		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'ComfyUI Stable Version' }, []));
 		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'ComfyUI Nightly Version' }, []));
-		api.fetchApi('/v2/manager/policy/update')
+		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(`/v2/manager/policy/update?value=${event.target.value}`);
+			api.fetchApi(`/manager/policy/update?value=${event.target.value}`);
 		});
 
 		const updateSetttingItem = createSettingsCombo("Update", update_policy_combo);
@@ -1048,7 +1182,9 @@ class ManagerMenuDialog extends ComfyDialog {
 		return [
 			dbRetrievalSetttingItem,
 			channelSetttingItem,
+			previewSetttingItem,
 			shareSetttingItem,
+			componentSetttingItem,
 			updateSetttingItem,
 			//[TODO] replace mt-2 with wrapper div with flex column gap
 			$el("filedset.cm-experimental.mt-auto", {}, [
@@ -1331,12 +1467,12 @@ class ManagerMenuDialog extends ComfyDialog {
 }
 
 async function getVersion() {
-	let version = await api.fetchApi(`/v2/manager/version`);
+	let version = await api.fetchApi(`/manager/version`);
 	return await version.text();
 }
 
 app.registerExtension({
-	name: "Comfy.Legacy.ManagerMenu",
+	name: "Comfy.ManagerMenu",
 
 	aboutPageBadges: [
 		{
@@ -1388,6 +1524,39 @@ app.registerExtension({
 		});
 	},
 	async setup() {
+		let orig_clear = app.graph.clear;
+		app.graph.clear = function () {
+			orig_clear.call(app.graph);
+			load_components();
+		};
+
+		load_components();
+
+		// Fetch and show startup alerts (critical errors like outdated ComfyUI)
+		// Poll until extensionManager.toast is ready (set in Vue onMounted)
+		const showStartupAlerts = async () => {
+			let toastWaitCount = 0;
+			const waitForToast = () => {
+				if (window['app']?.extensionManager?.toast) {
+					fetch('/manager/startup_alerts')
+						.then(response => response.ok ? response.json() : [])
+						.then(alerts => {
+							for (const alert of alerts) {
+								customAlert(alert.message);
+							}
+						})
+						.catch(e => console.warn('[ComfyUI-Manager] Failed to fetch startup alerts:', e));
+				} else if (toastWaitCount < 300) {  // Max 30 seconds (300 * 100ms)
+					toastWaitCount++;
+					setTimeout(waitForToast, 100);
+				} else {
+					console.warn('[ComfyUI-Manager] Timeout waiting for toast. Startup alerts skipped.');
+				}
+			};
+			waitForToast();
+		};
+		showStartupAlerts();
+
 		const menu = document.querySelector(".comfy-menu");
 		const separator = document.createElement("hr");
 
@@ -1459,6 +1628,8 @@ app.registerExtension({
 					tooltip: "Share"
 				}).element
 			);
+
+			app.menu?.settingsGroup.element.before(cmGroup.element);
 		}
 		catch(exception) {
 			console.log('ComfyUI is outdated. New style menu based features are disabled.');
@@ -1516,6 +1687,19 @@ app.registerExtension({
 		node.prototype.getExtraMenuOptions = function (_, options) {
 			origGetExtraMenuOptions?.apply?.(this, arguments);
 
+			if (node.category.startsWith('group nodes>')) {
+				options.push({
+					content: "Save As Component",
+					callback: (obj) => {
+						if (!ComponentBuilderDialog.instance) {
+							ComponentBuilderDialog.instance = new ComponentBuilderDialog();
+						}
+						ComponentBuilderDialog.instance.target_node = node;
+						ComponentBuilderDialog.instance.show();
+					}
+				}, null);
+			}
+
 			if (isOutputNode(node)) {
 				const { potential_outputs } = getPotentialOutputsAndOutputNodes([this]);
 				const hasOutput = potential_outputs.length > 0;

js/comfyui-share-common.js

@@ -172,7 +172,7 @@ export const shareToEsheep= () => {
 		const nodes = app.graph._nodes
 		const { potential_outputs, potential_output_nodes } = getPotentialOutputsAndOutputNodes(nodes);
 		const workflow = prompt['workflow']
-		api.fetchApi(`/v2/manager/set_esheep_workflow_and_images`, {
+		api.fetchApi(`/manager/set_esheep_workflow_and_images`, {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({
@@ -552,20 +552,6 @@ export class ShareDialog extends ComfyDialog {
 		this.matrix_destination_checkbox.style.color = "var(--fg-color)";
 		this.matrix_destination_checkbox.checked = this.share_option === 'matrix'; //true;
 
-		try {
-			api.fetchApi(`/v2/manager/get_matrix_dep_status`)
-				.then(response => response.text())
-				.then(data => {
-					if(data == 'unavailable') {
-						matrix_destination_checkbox_text.style.textDecoration = "line-through";
-						this.matrix_destination_checkbox.disabled = true;
-						this.matrix_destination_checkbox.title = "It has been disabled because the 'matrix-nio' dependency is not installed. Please install this dependency to use the matrix sharing feature.";
-						matrix_destination_checkbox_text.title = "It has been disabled because the 'matrix-nio' dependency is not installed. Please install this dependency to use the matrix sharing feature.";
-					}
-				})
-				.catch(error => {});
-		} catch (error) {}
-
 		this.comfyworkflows_destination_checkbox = $el("input", { type: 'checkbox', id: "comfyworkflows_destination" }, [])
 		const comfyworkflows_destination_checkbox_text = $el("label", {}, [" ComfyWorkflows.com"])
 		this.comfyworkflows_destination_checkbox.style.color = "var(--fg-color)";
@@ -826,7 +812,7 @@ export class ShareDialog extends ComfyDialog {
 		// get the user's existing matrix auth and share key
 		ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
 		try {
-			api.fetchApi(`/v2/manager/get_matrix_auth`)
+			api.fetchApi(`/manager/get_matrix_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.matrix_auth = data;
@@ -845,7 +831,7 @@ export class ShareDialog extends ComfyDialog {
 		ShareDialog.cw_sharekey = "";
 		try {
 			// console.log("Fetching comfyworkflows share key")
-			api.fetchApi(`/v2/manager/get_comfyworkflows_auth`)
+			api.fetchApi(`/manager/get_comfyworkflows_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.cw_sharekey = data.comfyworkflows_sharekey;
@@ -905,7 +891,7 @@ export class ShareDialog extends ComfyDialog {
 			// Change the text of the share button to "Sharing..." to indicate that the share process has started
 			this.share_button.textContent = "Sharing...";
 
-			const response = await api.fetchApi(`/v2/manager/share`, {
+			const response = await api.fetchApi(`/manager/share`, {
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify({

js/comfyui-share-openart.js

@@ -67,7 +67,7 @@ export class OpenArtShareDialog extends ComfyDialog {
   async readKey() {
     let key = ""
     try {
-      key = await api.fetchApi(`/v2/manager/get_openart_auth`)
+      key = await api.fetchApi(`/manager/get_openart_auth`)
         .then(response => response.json())
         .then(data => {
           return data.openart_key;
@@ -82,7 +82,7 @@ export class OpenArtShareDialog extends ComfyDialog {
   }
 
   async saveKey(value) {
-    await api.fetchApi(`/v2/manager/set_openart_auth`, {
+    await api.fetchApi(`/manager/set_openart_auth`, {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({
@@ -399,7 +399,7 @@ export class OpenArtShareDialog extends ComfyDialog {
     form.append("file", uploadFile);
     try {
       const res = await this.fetchApi(
-        `/v2/workflows/upload_thumbnail`,
+        `/workflows/upload_thumbnail`,
         {
           method: "POST",
           body: form,
@@ -459,7 +459,7 @@ export class OpenArtShareDialog extends ComfyDialog {
       throw new Error("Title is required");
     }
 
-    const current_snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
+    const current_snapshot = await api.fetchApi(`/snapshot/get_current`)
       .then(response => response.json())
       .catch(error => {
         // console.log(error);
@@ -489,7 +489,7 @@ export class OpenArtShareDialog extends ComfyDialog {
 
     try {
       const response = await this.fetchApi(
-        "/v2/workflows/publish",
+        "/workflows/publish",
         {
           method: "POST",
           headers: {"Content-Type": "application/json"},

js/comfyui-share-youml.js

@@ -179,7 +179,7 @@ export class YouMLShareDialog extends ComfyDialog {
   async loadToken() {
     let key = ""
     try {
-      const response = await api.fetchApi(`/v2/manager/youml/settings`)
+      const response = await api.fetchApi(`/manager/youml/settings`)
       const settings = await response.json()
       return settings.token
     } catch (error) {
@@ -188,7 +188,7 @@ export class YouMLShareDialog extends ComfyDialog {
   }
 
   async saveToken(value) {
-    await api.fetchApi(`/v2/manager/youml/settings`, {
+    await api.fetchApi(`/manager/youml/settings`, {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({
@@ -380,7 +380,7 @@ export class YouMLShareDialog extends ComfyDialog {
     try {
       let snapshotData = null;
       try {
-        const snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
+        const snapshot = await api.fetchApi(`/snapshot/get_current`)
         snapshotData = await snapshot.json()
       } catch (e) {
         console.error("Failed to get snapshot", e)

js/common.js

@@ -100,6 +100,19 @@ export function show_message(msg) {
 	app.ui.dialog.element.style.zIndex = 1100;
 }
 
+export async function handle403Response(res, defaultMessage) {
+	try {
+		const data = await res.json();
+		if(data.error === 'comfyui_outdated') {
+			show_message('ComfyUI version is outdated.<BR>Please update ComfyUI to use Manager normally.');
+		} else {
+			show_message(defaultMessage || 'This action is not allowed with this security level configuration.');
+		}
+	} catch {
+		show_message(defaultMessage || 'This action is not allowed with this security level configuration.');
+	}
+}
+
 export async function sleep(ms) {
 	return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -163,20 +176,23 @@ export async function customPrompt(title, message) {
 }
 
 
-export function rebootAPI() {
+export async function rebootAPI() {
 	if ('electronAPI' in window) {
 			window.electronAPI.restartApp();
 			return true;
 	}
 
-	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
-		if (isConfirmed) {
-			try {
-				api.fetchApi("/v2/manager/reboot");
+	const isConfirmed = await customConfirm("Are you sure you'd like to reboot the server?");
+	if (isConfirmed) {
+		try {
+			const response = await api.fetchApi("/manager/reboot");
+			if (response.status == 403) {
+				await handle403Response(response);
+				return false;
 			}
-			catch(exception) {}
 		}
-	});
+		catch(exception) {}
+	}
 
 	return false;
 }
@@ -210,13 +226,13 @@ export async function install_pip(packages) {
 	if(packages.includes('&'))
 		app.ui.dialog.show(`Invalid PIP package enumeration: '${packages}'`);
 
-	const res = await api.fetchApi("/v2/customnode/install/pip", {
+	const res = await api.fetchApi("/customnode/install/pip", {
 		method: "POST",
 		body: packages,
 	});
 
 	if(res.status == 403) {
-		show_message('This action is not allowed with this security level configuration.');
+		await handle403Response(res);
 		return;
 	}
 
@@ -245,13 +261,13 @@ export async function install_via_git_url(url, manager_dialog) {
 
 	show_message(`Wait...<BR><BR>Installing '${url}'`);
 
-	const res = await api.fetchApi("/v2/customnode/install/git_url", {
+	const res = await api.fetchApi("/customnode/install/git_url", {
 		method: "POST",
 		body: url,
 	});
 
 	if(res.status == 403) {
-		show_message('This action is not allowed with this security level configuration.');
+		await handle403Response(res);
 		return;
 	}
 
@@ -262,9 +278,9 @@ export async function install_via_git_url(url, manager_dialog) {
 		const self = this;
 
 		rebootButton.addEventListener("click",
-			function() {
-				if(rebootAPI()) {
-					manager_dialog.close();
+			async function() {
+				if(await rebootAPI()) {
+					manager_instance.close();
 				}
 			});
 	}
@@ -630,14 +646,6 @@ export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {
 	});
 }
 
-export function generateUUID() {
-	return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-		const r = Math.random() * 16 | 0;
-		const v = c === 'x' ? r : (r & 0x3 | 0x8);
-		return v.toString(16);
-	  });	
-}
-
 function initTooltip () {
 	const mouseenterHandler = (e) => {
         const target = e.target;

js/components-manager.js

@@ -0,0 +1,812 @@
+import { app } from "../../scripts/app.js";
+import { api } from "../../scripts/api.js"
+import { sleep, show_message, customConfirm, customAlert } from "./common.js";
+import { GroupNodeConfig, GroupNodeHandler } from "../../extensions/core/groupNode.js";
+import { ComfyDialog, $el } from "../../scripts/ui.js";
+
+const SEPARATOR = ">"
+
+let pack_map = {};
+let rpack_map = {};
+
+export function getPureName(node) {
+	// group nodes/
+	let category = null;
+	if(node.category) {
+		category = node.category.substring(12);
+	}
+	else {
+		category = node.constructor.category?.substring(12);
+	}
+	if(category) {
+		let purename = node.comfyClass.substring(category.length+1);
+		return purename;
+	}
+	else if(node.comfyClass.startsWith('workflow/') || node.comfyClass.startsWith(`workflow${SEPARATOR}`)) {
+		return node.comfyClass.substring(9);
+	}
+	else {
+		return node.comfyClass;
+	}
+}
+
+function isValidVersionString(version) {
+	const versionPattern = /^(\d+)\.(\d+)(\.(\d+))?$/;
+	
+	const match = version.match(versionPattern);
+
+	return match !== null &&
+			parseInt(match[1], 10) >= 0 &&
+			parseInt(match[2], 10) >= 0 &&
+			(!match[3] || parseInt(match[4], 10) >= 0);
+}
+
+function register_pack_map(name, data) {
+	if(data.packname) {
+		pack_map[data.packname] = name;
+		rpack_map[name] = data;
+	}
+	else {
+		rpack_map[name] = data;
+	}
+}
+
+function storeGroupNode(name, data, register=true) {
+	let extra = app.graph.extra;
+	if (!extra) app.graph.extra = extra = {};
+	let groupNodes = extra.groupNodes;
+	if (!groupNodes) extra.groupNodes = groupNodes = {};
+	groupNodes[name] = data;
+
+	if(register) {
+		register_pack_map(name, data);
+	}
+}
+
+export async function load_components() {
+	let data = await api.fetchApi('/manager/component/loads', {method: "POST"});
+	let components = await data.json();
+
+	let start_time = Date.now();
+	let failed = [];
+	let failed2 = [];
+
+	for(let name in components) {
+		if(app.graph.extra?.groupNodes?.[name]) {
+			if(data) {
+				let data = components[name];
+
+				let category = data.packname;
+				if(data.category) {
+					category += SEPARATOR + data.category;
+				}
+				if(category == '') {
+					category = 'components';
+				}
+
+				const config = new GroupNodeConfig(name, data);
+				await config.registerType(category);
+
+				register_pack_map(name, data);
+				continue;
+			}
+		}
+
+		let nodeData = components[name];
+
+		storeGroupNode(name, nodeData);
+
+		const config = new GroupNodeConfig(name, nodeData);
+
+		while(true) {
+			try {
+				let category = nodeData.packname;
+				if(nodeData.category) {
+					category += SEPARATOR + nodeData.category;
+				}
+				if(category == '') {
+					category = 'components';
+				}
+
+				await config.registerType(category);
+				register_pack_map(name, nodeData);
+				break;
+			}
+			catch {
+				let elapsed_time = Date.now() - start_time;
+				if (elapsed_time > 5000) {
+					failed.push(name);
+					break;
+				} else {
+					await sleep(100);
+				}
+			}
+		}
+	}
+
+	// fallback1
+	for(let i in failed) {
+		let name = failed[i];
+
+		if(app.graph.extra?.groupNodes?.[name]) {
+			continue;
+		}
+
+		let nodeData = components[name];
+
+		storeGroupNode(name, nodeData);
+
+		const config = new GroupNodeConfig(name, nodeData);
+		while(true) {
+			try {
+				let category = nodeData.packname;
+				if(nodeData.workflow.category) {
+					category += SEPARATOR + nodeData.category;
+				}
+				if(category == '') {
+					category = 'components';
+				}
+
+				await config.registerType(category);
+				register_pack_map(name, nodeData);
+				break;
+			}
+			catch {
+				let elapsed_time = Date.now() - start_time;
+				if (elapsed_time > 10000) {
+					failed2.push(name);
+					break;
+				} else {
+					await sleep(100);
+				}
+			}
+		}
+	}
+
+	// fallback2
+	for(let name in failed2) {
+		let name = failed2[i];
+
+		let nodeData = components[name];
+
+		storeGroupNode(name, nodeData);
+
+		const config = new GroupNodeConfig(name, nodeData);
+		while(true) {
+			try {
+				let category = nodeData.workflow.packname;
+				if(nodeData.workflow.category) {
+					category += SEPARATOR + nodeData.category;
+				}
+				if(category == '') {
+					category = 'components';
+				}
+
+				await config.registerType(category);
+				register_pack_map(name, nodeData);
+				break;
+			}
+			catch {
+				let elapsed_time = Date.now() - start_time;
+				if (elapsed_time > 30000) {
+					failed.push(name);
+					break;
+				} else {
+					await sleep(100);
+				}
+			}
+		}
+	}
+}
+
+async function save_as_component(node, version, author, prefix, nodename, packname, category) {
+	let component_name = `${prefix}::${nodename}`;
+
+	let subgraph = app.graph.extra?.groupNodes?.[component_name];
+	if(!subgraph) {
+		subgraph = app.graph.extra?.groupNodes?.[getPureName(node)];
+	}
+
+	subgraph.version = version;
+	subgraph.author = author;
+	subgraph.datetime = Date.now();
+	subgraph.packname = packname;
+	subgraph.category = category;
+
+	let body =
+		{
+			name: component_name,
+			workflow: subgraph
+		};
+
+	pack_map[packname] = component_name;
+	rpack_map[component_name] = subgraph;
+
+	const res = await api.fetchApi('/manager/component/save', {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+			},
+			body: JSON.stringify(body),
+		});
+
+	if(res.status == 200) {
+		storeGroupNode(component_name, subgraph);
+		const config = new GroupNodeConfig(component_name, subgraph);
+
+		let category = body.workflow.packname;
+		if(body.workflow.category) {
+			category += SEPARATOR + body.workflow.category;
+		}
+		if(category == '') {
+			category = 'components';
+		}
+
+		await config.registerType(category);
+
+		let path = await res.text();
+		show_message(`Component '${component_name}' is saved into:\n${path}`);
+	}
+	else
+		show_message(`Failed to save component.`);
+}
+
+async function import_component(component_name, component, mode) {
+	if(mode) {
+		let body =
+			{
+				name: component_name,
+				workflow: component
+			};
+
+		const res = await api.fetchApi('/manager/component/save', {
+						method: "POST",
+						headers: { "Content-Type": "application/json", },
+						body: JSON.stringify(body)
+					});
+	}
+
+	let category = component.packname;
+	if(component.category) {
+		category += SEPARATOR + component.category;
+	}
+	if(category == '') {
+		category = 'components';
+	}
+
+	storeGroupNode(component_name, component);
+	const config = new GroupNodeConfig(component_name, component);
+	await config.registerType(category);
+}
+
+function restore_to_loaded_component(component_name) {
+	if(rpack_map[component_name]) {
+		let component = rpack_map[component_name];
+		storeGroupNode(component_name, component, false);
+		const config = new GroupNodeConfig(component_name, component);
+		config.registerType(component.category);
+	}
+}
+
+// Using a timestamp prevents duplicate pastes and ensures the prevention of re-deletion of litegrapheditor_clipboard.
+let last_paste_timestamp = null;
+
+function versionCompare(v1, v2) {
+	let ver1;
+	let ver2;
+	if(v1 && v1 != '') {
+		ver1 = v1.split('.');
+		ver1[0] = parseInt(ver1[0]);
+		ver1[1] = parseInt(ver1[1]);
+		if(ver1.length == 2)
+			ver1.push(0);
+		else
+			ver1[2] = parseInt(ver2[2]);
+	}
+	else {
+		ver1 = [0,0,0];
+	}
+
+	if(v2 && v2 != '') {
+		ver2 = v2.split('.');
+		ver2[0] = parseInt(ver2[0]);
+		ver2[1] = parseInt(ver2[1]);
+		if(ver2.length == 2)
+			ver2.push(0);
+		else
+			ver2[2] = parseInt(ver2[2]);
+	}
+	else {
+		ver2 = [0,0,0];
+	}
+
+	if(ver1[0] > ver2[0])
+		return -1;
+	else if(ver1[0] < ver2[0])
+		return 1;
+
+	if(ver1[1] > ver2[1])
+		return -1;
+	else if(ver1[1] < ver2[1])
+		return 1;
+
+	if(ver1[2] > ver2[2])
+		return -1;
+	else if(ver1[2] < ver2[2])
+		return 1;
+
+	return 0;
+}
+
+function checkVersion(name, component) {
+	let msg = '';
+	if(rpack_map[name]) {
+		let old_version = rpack_map[name].version;
+		if(!old_version || old_version == '') {
+			msg = `  '${name}' Upgrade (V0.0 -> V${component.version})`;
+		}
+		else {
+			let c = versionCompare(old_version, component.version);
+			if(c < 0) {
+				msg = `  '${name}' Downgrade (V${old_version} -> V${component.version})`;
+			}
+			else if(c > 0) {
+				msg = `  '${name}' Upgrade (V${old_version} -> V${component.version})`;
+			}
+			else {
+				msg = `  '${name}' Same version (V${component.version})`;
+			}
+		}
+	}
+	else {
+		msg = `'${name}' NEW (V${component.version})`;
+	}
+
+	return msg;
+}
+
+async function handle_import_components(components) {
+	let msg = 'Components:\n';
+	let cnt = 0;
+	for(let name in components) {
+		let component = components[name];
+		let v = checkVersion(name, component);
+
+		if(cnt < 10) {
+			msg += v + '\n';
+		}
+		else if (cnt == 10) {
+			msg += '...\n';
+		}
+		else {
+			// do nothing
+		}
+
+		cnt++;
+	}
+
+	let last_name = null;
+	msg += '\nWill you load components?\n';
+	const confirmed = await customConfirm(msg);
+	if(confirmed) {
+		const mode = await customConfirm('\nWill you save components?\n(cancel=load without save)');
+
+		for(let name in components) {
+			let component = components[name];
+			import_component(name, component, mode);
+			last_name = name;
+		}
+
+		if(mode) {
+			show_message('Components are saved.');
+		}
+		else {
+			show_message('Components are loaded.');
+		}
+	}
+
+	if(cnt == 1 && last_name) {
+		const node = LiteGraph.createNode(`workflow${SEPARATOR}${last_name}`);
+		node.pos = [app.canvas.graph_mouse[0], app.canvas.graph_mouse[1]];
+		app.canvas.graph.add(node, false);
+	}
+}
+
+async function handlePaste(e) {
+	let data = (e.clipboardData || window.clipboardData);
+	const items = data.items;
+	for(const item of items) {
+		if(item.kind == 'string' && item.type == 'text/plain') {
+			data = data.getData("text/plain");
+			try {
+				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);
+
+					// disable paste node
+					localStorage.removeItem("litegrapheditor_clipboard", null);
+				}
+				else {
+					console.log('This components are already pasted: ignored');
+				}
+			}
+			catch {
+				// nothing to do
+			}
+		}
+	}
+}
+
+document.addEventListener("paste", handlePaste);
+
+
+export class ComponentBuilderDialog extends ComfyDialog {
+	constructor() {
+		super();
+	}
+
+	clear() {
+		while (this.element.children.length) {
+			this.element.removeChild(this.element.children[0]);
+		}
+	}
+
+	show() {
+		this.invalidateControl();
+
+		this.element.style.display = "block";
+		this.element.style.zIndex = 1099;
+		this.element.style.width = "500px";
+		this.element.style.height = "480px";
+	}
+
+	invalidateControl() {
+		this.clear();
+
+		let self = this;
+
+		const close_button = $el("button", { id: "cm-close-button", type: "button", textContent: "Close", onclick: () => self.close() });
+		this.save_button = $el("button",
+					{ id: "cm-save-button", type: "button", textContent: "Save", onclick: () =>
+							{
+								save_as_component(self.target_node, self.version_string.value.trim(), self.author.value.trim(), self.node_prefix.value.trim(),
+												  self.getNodeName(), self.getPackName(), self.category.value.trim());
+							}
+					});
+
+		let default_nodename = getPureName(this.target_node).trim();
+
+		let groupNode = app.graph.extra.groupNodes[default_nodename];
+		let default_packname = groupNode.packname;
+		if(!default_packname) {
+			default_packname = '';
+		}
+
+		let default_category = groupNode.category;
+		if(!default_category) {
+			default_category = '';
+		}
+
+		this.default_ver = groupNode.version;
+		if(!this.default_ver) {
+			this.default_ver = '0.0';
+		}
+
+		let default_author = groupNode.author;
+		if(!default_author) {
+			default_author = '';
+		}
+
+		let delimiterIndex = default_nodename.indexOf('::');
+		let default_prefix = "";
+		if(delimiterIndex != -1) {
+			default_prefix = default_nodename.substring(0, delimiterIndex);
+			default_nodename = default_nodename.substring(delimiterIndex + 2);
+		}
+
+		if(!default_prefix) {
+			this.save_button.disabled = true;
+		}
+
+		this.pack_list = this.createPackListCombo();
+
+		let version_string = this.createLabeledInput('input version (e.g. 1.0)', '*Version : ',  this.default_ver);
+		this.version_string = version_string[1];
+		this.version_string.disabled = true;
+
+		let author = this.createLabeledInput('input author (e.g. Dr.Lt.Data)', 'Author : ',  default_author);
+		this.author = author[1];
+
+		let node_prefix = this.createLabeledInput('input node prefix (e.g. mypack)', '*Prefix : ',  default_prefix);
+		this.node_prefix = node_prefix[1];
+
+		let manual_nodename = this.createLabeledInput('input node name (e.g. MAKE_BASIC_PIPE)', 'Nodename : ', default_nodename);
+		this.manual_nodename = manual_nodename[1];
+
+		let manual_packname = this.createLabeledInput('input pack name (e.g. mypack)', 'Packname : ',  default_packname);
+		this.manual_packname = manual_packname[1];
+
+		let category = this.createLabeledInput('input category (e.g. util/pipe)', 'Category : ',  default_category);
+		this.category = category[1];
+
+		this.node_label = this.createNodeLabel();
+
+		let author_mode = this.createAuthorModeCheck();
+		this.author_mode = author_mode[0];
+
+		const content =
+				$el("div.comfy-modal-content",
+					[
+						$el("tr.cm-title", {}, [
+								$el("font", {size:6, color:"white"}, [`ComfyUI-Manager: Component Builder`])]
+							),
+						$el("br", {}, []),
+						$el("div.cm-menu-container",
+							[
+								author_mode[0],
+								author_mode[1],
+								category[0],
+								author[0],
+								node_prefix[0],
+								manual_nodename[0],
+								manual_packname[0],
+								version_string[0],
+								this.pack_list,
+								$el("br", {}, []),
+								this.node_label
+							]),
+
+						$el("br", {}, []),
+						this.save_button,
+						close_button,
+					]
+				);
+
+		content.style.width = '100%';
+		content.style.height = '100%';
+
+		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
+	}
+
+	validateInput() {
+		let msg = "";
+
+		if(!isValidVersionString(this.version_string.value)) {
+			msg += 'Invalid version string: '+event.value+"\n";
+		}
+
+		if(this.node_prefix.value.trim() == '') {
+			msg += 'Node prefix cannot be empty\n';
+		}
+
+		if(this.manual_nodename.value.trim() == '') {
+			msg += 'Node name cannot be empty\n';
+		}
+
+		if(msg != '') {
+//			alert(msg);
+		}
+
+		this.save_button.disabled = msg != "";
+	}
+
+	getPackName() {
+		if(this.pack_list.selectedIndex == 0) {
+			return this.manual_packname.value.trim();
+		}
+
+		return this.pack_list.value.trim();
+	}
+
+	getNodeName() {
+		if(this.manual_nodename.value.trim() != '') {
+			return this.manual_nodename.value.trim();
+		}
+
+		return getPureName(this.target_node);
+	}
+
+	createAuthorModeCheck() {
+		let check = $el("input",{type:'checkbox', id:"author-mode"},[])
+		const check_label = $el("label",{for:"author-mode"},["Enable author mode"]);
+		check_label.style.color = "var(--fg-color)";
+		check_label.style.cursor = "pointer";
+		check.checked = false;
+
+		let self = this;
+		check.onchange = () => {
+			self.version_string.disabled = !check.checked;
+
+			if(!check.checked) {
+				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.');
+			}
+		};
+
+		return [check, check_label];
+	}
+
+	createNodeLabel() {
+		let label = $el('p');
+		label.className = 'cb-node-label';
+		if(this.target_node.comfyClass.includes('::'))
+			label.textContent = getPureName(this.target_node);
+		else
+			label.textContent = " _::" + getPureName(this.target_node);
+		return label;
+	}
+
+	createLabeledInput(placeholder, label, value) {
+		let textbox = $el('input.cb-widget-input', {type:'text', placeholder:placeholder, value:value}, []);
+
+		let self = this;
+		textbox.onchange = () => {
+			this.validateInput.call(self);
+			this.node_label.textContent = this.node_prefix.value + "::" + this.manual_nodename.value;
+		}
+		let row = $el('span.cb-widget', {}, [ $el('span.cb-widget-input-label', label), textbox]);
+
+		return [row, textbox];
+	}
+
+	createPackListCombo() {
+		let combo = document.createElement("select");
+		combo.className = "cb-widget";
+		let default_packname_option = { value: '##manual', text: 'Packname: Manual' };
+
+		combo.appendChild($el('option', default_packname_option, []));
+		for(let name in pack_map) {
+			combo.appendChild($el('option', { value: name, text: 'Packname: '+ name }, []));
+		}
+
+		let self = this;
+		combo.onchange = function () {
+			if(combo.selectedIndex == 0) {
+				self.manual_packname.disabled = false;
+			}
+			else {
+				self.manual_packname.disabled = true;
+			}
+		};
+
+		return combo;
+	}
+}
+
+let orig_handleFile = app.handleFile;
+
+async function handleFile(file) {
+	if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
+		const reader = new FileReader();
+		reader.onload = async () => {
+			let is_component = false;
+			const jsonContent = JSON.parse(reader.result);
+			for(let name in jsonContent) {
+				let cand = jsonContent[name];
+				is_component = cand.datetime && cand.version;
+				break;
+			}
+
+			if(is_component) {
+				await handle_import_components(jsonContent);
+			}
+			else {
+				orig_handleFile.call(app, file);
+			}
+		};
+		reader.readAsText(file);
+
+		return;
+	}
+
+	orig_handleFile.call(app, file);
+}
+
+app.handleFile = handleFile;
+
+let current_component_policy = 'workflow';
+try {
+	api.fetchApi('/manager/policy/component')
+		.then(response => response.text())
+		.then(data => { current_component_policy = data; });
+}
+catch {}
+
+function getChangedVersion(groupNodes) {
+	if(!Object.keys(pack_map).length || !groupNodes)
+		return null;
+
+	let res = {};
+	for(let component_name in groupNodes) {
+		let data = groupNodes[component_name];
+
+		if(rpack_map[component_name]) {
+			let v = versionCompare(data.version, rpack_map[component_name].version);
+			res[component_name] = v;
+		}
+	}
+
+	return res;
+}
+
+const loadGraphData = app.loadGraphData;
+app.loadGraphData = async function () {
+	if(arguments.length == 0)
+		return await loadGraphData.apply(this, arguments);
+
+	let graphData = arguments[0];
+	let groupNodes = graphData.extra?.groupNodes;
+	let res = getChangedVersion(groupNodes);
+
+	if(res) {
+		let target_components = null;
+		switch(current_component_policy) {
+		case 'higher':
+			target_components = Object.keys(res).filter(key => res[key] == 1);
+			break;
+
+		case 'mine':
+			target_components = Object.keys(res);
+			break;
+
+		default:
+			// do nothing
+		}
+
+		if(target_components) {
+			for(let i in target_components) {
+				let component_name = target_components[i];
+				let component = rpack_map[component_name];
+				if(component && graphData.extra?.groupNodes) {
+					graphData.extra.groupNodes[component_name] = component;
+				}
+			}
+		}
+	}
+	else {
+		console.log('Empty components: policy ignored');
+	}
+
+	arguments[0] = graphData;
+	return await loadGraphData.apply(this, arguments);
+};
+
+export function set_component_policy(v) {
+	current_component_policy = v;
+}
+
+let graphToPrompt = app.graphToPrompt;
+app.graphToPrompt = async function () {
+	let p = await graphToPrompt.call(app);
+	try {
+		let groupNodes = p.workflow.extra?.groupNodes;
+		if(groupNodes) {
+			p.workflow.extra = { ... p.workflow.extra};
+
+			// get used group nodes
+			let used_group_nodes = new Set();
+			for(let node of p.workflow.nodes) {
+				if(node.type.startsWith(`workflow/`) || node.type.startsWith(`workflow${SEPARATOR}`)) {
+					used_group_nodes.add(node.type.substring(9));
+				}
+			}
+
+			// remove unused group nodes
+			let new_groupNodes = {};
+			for (let key in p.workflow.extra.groupNodes) {
+				if (used_group_nodes.has(key)) {
+					new_groupNodes[key] = p.workflow.extra.groupNodes[key];
+				}
+			}
+			p.workflow.extra.groupNodes = new_groupNodes;
+		}
+	}
+	catch(e) {
+		console.log(`Failed to filtering group nodes: ${e}`);
+	}
+
+	return p;
+}

js/custom-nodes-manager.js

@@ -8,7 +8,7 @@ import {
 	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
 	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
 	storeColumnWidth, restoreColumnWidth, getTimeAgo, copyText, loadCss,
-	showPopover, hidePopover, generateUUID
+	showPopover, hidePopover, handle403Response
 } from  "./common.js";
 
 // https://cenfun.github.io/turbogrid/api.html
@@ -54,7 +54,7 @@ export class CustomNodesManager {
 		this.id = "cn-manager";
 
 		app.registerExtension({
-			name: "Comfy.Legacy.CustomNodesManager",
+			name: "Comfy.CustomNodesManager",
 			afterConfigureGraph: (missingNodeTypes) => {
 				const item = this.getFilterItem(ShowMode.MISSING);
 				if (item) {
@@ -462,7 +462,7 @@ export class CustomNodesManager {
 
 			".cn-manager-stop": {
 				click: () => {
-					api.fetchApi('/v2/manager/queue/reset');
+					api.fetchApi('/manager/queue/reset');
 					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
@@ -638,7 +638,7 @@ export class CustomNodesManager {
 			};
 		}
 
-		const response = await api.fetchApi(`/v2/customnode/import_fail_info`, {
+		const response = await api.fetchApi(`/customnode/import_fail_info`, {
 									method: 'POST',
 									headers: { 'Content-Type': 'application/json' },
 									body: JSON.stringify(info)
@@ -1246,7 +1246,7 @@ export class CustomNodesManager {
 	async loadNodes(node_packs) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading node mappings (${mode}) ...`);
-		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			console.log(res.error);
 			return;
@@ -1398,10 +1398,10 @@ export class CustomNodesManager {
 		this.showLoading();
 		let res;
 		if(is_enable) {
-			res = await api.fetchApi(`/v2/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
+			res = await api.fetchApi(`/customnode/disabled_versions/${node_id}`, { cache: "no-store" });
 		}
 		else {
-			res = await api.fetchApi(`/v2/customnode/versions/${node_id}`, { cache: "no-store" });
+			res = await api.fetchApi(`/customnode/versions/${node_id}`, { cache: "no-store" });
 		}
 		this.hideLoading();
 
@@ -1443,6 +1443,13 @@ export class CustomNodesManager {
 	}
 
 	async installNodes(list, btn, title, selected_version) {
+		let stats = await api.fetchApi('/manager/queue/status');
+		stats = await stats.json();
+		if(stats.is_processing) {
+			customAlert(`[ComfyUI-Manager] There are already tasks in progress. Please try again after it is completed. (${stats.done_count}/${stats.total_count})`);
+			return;
+		}
+
 		const { target, label, mode} = btn;
 
 		if(mode === "uninstall") {
@@ -1469,9 +1476,9 @@ export class CustomNodesManager {
 		let needRestart = false;
 		let errorMsg = "";
 
-		let target_items = [];
+		await api.fetchApi('/manager/queue/reset');
 
-		let batch = {};
+		let target_items = [];
 
 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
@@ -1514,11 +1521,32 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}
 
-			if(batch[api_mode]) {
-				batch[api_mode].push(data);
-			}
-			else {
-				batch[api_mode] = [data];
+			const res = await api.fetchApi(`/manager/queue/${api_mode}`, {
+				method: 'POST',
+				body: JSON.stringify(data)
+			});
+
+			if (res.status != 200) {
+				errorMsg = `'${item.title}': `;
+
+				if(res.status == 403) {
+					try {
+						const data = await res.json();
+						if(data.error === 'comfyui_outdated') {
+							errorMsg += `ComfyUI version is outdated. Please update ComfyUI to use Manager normally.\n`;
+						} else {
+							errorMsg += `This action is not allowed with this security level configuration.\n`;
+						}
+					} catch {
+						errorMsg += `This action is not allowed with this security level configuration.\n`;
+					}
+				} else if(res.status == 404) {
+					errorMsg += `With the current security level configuration, only custom nodes from the <B>"default channel"</B> can be installed.\n`;
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
 		}
 
@@ -1535,24 +1563,7 @@ export class CustomNodesManager {
 			}
 		}
 		else {
-			this.batch_id = generateUUID();
-			batch['batch_id'] = this.batch_id;
-
-			const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-				method: 'POST',
-				body: JSON.stringify(batch)
-			});
-
-			let failed = await res.json();
-
-			if(failed.length > 0) {
-				for(let k in failed) {
-					let hash = failed[k];
-					const item = this.grid.getRowItemBy("hash", hash);
-					errorMsg = `[FAIL] ${item.title}`;
-				}
-			}
-
+			await api.fetchApi('/manager/queue/start');
 			this.showStop();
 			showTerminal();
 		}
@@ -1560,9 +1571,6 @@ export class CustomNodesManager {
 
 	async onQueueStatus(event) {
 		let self = CustomNodesManager.instance;
-		// If legacy manager front is not open, return early (using new manager front)
-		if (self.element?.style.display === 'none') return
-
 		if(event.detail.status == 'in_progress' && event.detail.ui_target == 'nodepack_manager') {
 			const hash = event.detail.target;
 
@@ -1573,7 +1581,7 @@ export class CustomNodesManager {
 			self.grid.updateCell(item, "action");
 			self.grid.setRowSelected(item, false);
 		}
-		else if(event.detail.status == 'batch-done' && event.detail.batch_id == self.batch_id) {
+		else if(event.detail.status == 'done') {
 			self.hideStop();
 			self.onQueueCompleted(event.detail);
 		}
@@ -1767,7 +1775,7 @@ export class CustomNodesManager {
 	async getMissingNodesLegacy(hashMap, missing_nodes) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading missing nodes (${mode}) ...`);
-		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get custom node mappings: ${res.error}`);
 			return;
@@ -1882,7 +1890,7 @@ export class CustomNodesManager {
 	async getAlternatives() {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading alternatives (${mode}) ...`);
-		const res = await fetchData(`/v2/customnode/alternatives?mode=${mode}`);
+		const res = await fetchData(`/customnode/alternatives?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get alternatives: ${res.error}`);
 			return [];
@@ -1930,7 +1938,7 @@ export class CustomNodesManager {
 			infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
 		}
 
-		const res = await fetchData(`/v2/customnode/getlist?mode=${mode}${skip_update}`);
+		const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
 		if (res.error) {
 			this.showError("Failed to get custom node list.");
 			this.hideLoading();

js/model-manager.js

@@ -1,9 +1,9 @@
 import { app } from "../../scripts/app.js";
 import { $el } from "../../scripts/ui.js";
-import { 
-	manager_instance, rebootAPI, 
+import {
+	manager_instance, rebootAPI,
 	fetchData, md5, icons, show_message, customAlert, infoToast, showTerminal,
-	storeColumnWidth, restoreColumnWidth, loadCss, generateUUID
+	storeColumnWidth, restoreColumnWidth, loadCss, handle403Response
 } from  "./common.js";
 import { api } from "../../scripts/api.js";
 
@@ -170,7 +170,7 @@ export class ModelManager {
 
 			".cmm-manager-stop": {
 				click: () => {
-					api.fetchApi('/v2/manager/queue/reset');
+					api.fetchApi('/manager/queue/reset');
 					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
@@ -430,15 +430,23 @@ 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.showError("");
 
 		let needRefresh = false;
 		let errorMsg = "";
 
-		let target_items = [];
+		await api.fetchApi('/manager/queue/reset');
 
-		let batch = {};
+		let target_items = [];
 
 		for (const item of list) {
 			this.grid.scrollRowIntoView(item);
@@ -455,12 +463,30 @@ export class ModelManager {
 			const data = item.originalData;
 			data.ui_id = item.hash;
 
+			const res = await api.fetchApi(`/manager/queue/install_model`, {
+				method: 'POST',
+				body: JSON.stringify(data)
+			});
 
-			if(batch['install_model']) {
-				batch['install_model'].push(data);
-			}
-			else {
-				batch['install_model'] = [data];
+			if (res.status != 200) {
+				errorMsg = `'${item.name}': `;
+
+				if(res.status == 403) {
+					try {
+						const data = await res.json();
+						if(data.error === 'comfyui_outdated') {
+							errorMsg += `ComfyUI version is outdated. Please update ComfyUI to use Manager normally.\n`;
+						} else {
+							errorMsg += `This action is not allowed with this security level configuration.\n`;
+						}
+					} catch {
+						errorMsg += `This action is not allowed with this security level configuration.\n`;
+					}
+				} else {
+					errorMsg += await res.text() + '\n';
+				}
+
+				break;
 			}
 		}
 
@@ -477,24 +503,7 @@ export class ModelManager {
 			}
 		}
 		else {
-			this.batch_id = generateUUID();
-			batch['batch_id'] = this.batch_id;
-
-			const res = await api.fetchApi(`/v2/manager/queue/batch`, {
-				method: 'POST',
-				body: JSON.stringify(batch)
-			});
-
-			let failed = await res.json();
-
-			if(failed.length > 0) {
-				for(let k in failed) {
-					let hash = failed[k];
-					const item = self.grid.getRowItemBy("hash", hash);
-					errorMsg = `[FAIL] ${item.title}`;
-				}
-			}
-
+			await api.fetchApi('/manager/queue/start');
 			this.showStop();
 			showTerminal();
 		}
@@ -514,7 +523,7 @@ export class ModelManager {
 //			self.grid.updateCell(item, "tg-column-select");
 			self.grid.updateRow(item);
 		}
-		else if(event.detail.status == 'batch-done') {
+		else if(event.detail.status == 'done') {
 			self.hideStop();
 			self.onQueueCompleted(event.detail);
 		}
@@ -640,7 +649,7 @@ export class ModelManager {
 
 		const mode = manager_instance.datasrc_combo.value;
 
-		const res = await fetchData(`/v2/externalmodel/getlist?mode=${mode}`);
+		const res = await fetchData(`/externalmodel/getlist?mode=${mode}`);
 		if (res.error) {
 			this.showError("Failed to get external model list.");
 			this.hideLoading();

js/node_fixer.js

@@ -142,7 +142,7 @@ function node_info_copy(src, dest, connect_both, copy_shape) {
 }
 
 app.registerExtension({
-	name: "Comfy.Legacy.Manager.NodeFixer",
+	name: "Comfy.Manager.NodeFixer",
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({

js/snapshot.js

@@ -1,7 +1,7 @@
 import { app } from "../../scripts/app.js";
 import { api } from "../../scripts/api.js"
 import { ComfyDialog, $el } from "../../scripts/ui.js";
-import { manager_instance, rebootAPI, show_message, loadCss } from  "./common.js";
+import { manager_instance, rebootAPI, show_message, handle403Response, loadCss } from  "./common.js";
 import { buildGuiFrame } from "./comfyui-gui-builder.js";
 
 loadCss("./snapshot.css");
@@ -9,10 +9,10 @@ loadCss("./snapshot.css");
 async function restore_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/v2/snapshot/restore?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/snapshot/restore?target=${target}`, { cache: "no-store" });
 
 			if(response.status == 403) {
-				show_message('This action is not allowed with this security level configuration.');
+				await handle403Response(response);
 				return false;
 			}
 
@@ -37,10 +37,10 @@ async function restore_snapshot(target) {
 async function remove_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/v2/snapshot/remove?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/snapshot/remove?target=${target}`, { cache: "no-store" });
 
 			if(response.status == 403) {
-				show_message('This action is not allowed with this security level configuration.');
+				await handle403Response(response);
 				return false;
 			}
 
@@ -63,7 +63,7 @@ async function remove_snapshot(target) {
 
 async function save_current_snapshot() {
 	try {
-		const response = await api.fetchApi('/v2/snapshot/save', { cache: "no-store" });
+		const response = await api.fetchApi('/snapshot/save', { cache: "no-store" });
 		app.ui.dialog.close();
 		return true;
 	}
@@ -78,7 +78,7 @@ async function save_current_snapshot() {
 }
 
 async function getSnapshotList() {
-	const response = await api.fetchApi(`/v2/snapshot/getlist`);
+	const response = await api.fetchApi(`/snapshot/getlist`);
 	const data = await response.json();
 	return data;
 }
@@ -158,8 +158,8 @@ export class SnapshotManager extends ComfyDialog {
 		if(btn_id) {
 			const rebootButton = document.getElementById(btn_id);
 			const self = this;
-			rebootButton.onclick = function() {
-				if(rebootAPI()) {
+			rebootButton.onclick = async function() {
+				if(await rebootAPI()) {
 					self.close();
 					self.manager_dialog.close();
 				}

js/workflow-metadata.js

@@ -38,7 +38,7 @@ class WorkflowMetadataExtension {
    * enabled is true if the node is enabled, false if it is disabled
    */
   async getInstalledNodes() {
-    const res = await api.fetchApi("/v2/customnode/installed");
+    const res = await api.fetchApi("/customnode/installed");
     return await res.json();
   }
 

json-checker.py

@@ -1,25 +1,264 @@
-import json
-import argparse
+#!/usr/bin/env python3
+"""JSON Entry Validator
 
-def check_json_syntax(file_path):
+Validates JSON entries based on content structure.
+
+Validation rules based on JSON content:
+- {"custom_nodes": [...]}: Validates required fields (author, title, reference, files, install_type, description)
+- {"models": [...]}: Validates JSON syntax only (no required fields)
+- Other JSON structures: Validates JSON syntax only
+
+Git repository URL validation (for custom_nodes):
+1. URLs must NOT end with .git
+2. URLs must follow format: https://github.com/{author}/{reponame}
+3. .py and .js files are exempt from this check
+
+Supported formats:
+- Array format: [{...}, {...}]
+- Object format: {"custom_nodes": [...]} or {"models": [...]}
+"""
+
+import json
+import re
+import sys
+from pathlib import Path
+from typing import Dict, List, Tuple
+
+
+# Required fields for each entry type
+REQUIRED_FIELDS_CUSTOM_NODE = ['author', 'title', 'reference', 'files', 'install_type', 'description']
+REQUIRED_FIELDS_MODEL = []  # model-list.json doesn't require field validation
+
+# Pattern for valid GitHub repository URL (without .git suffix)
+GITHUB_REPO_PATTERN = re.compile(r'^https://github\.com/[^/]+/[^/]+$')
+
+
+def get_entry_context(entry: Dict) -> str:
+    """Get identifying information from entry for error messages
+
+    Args:
+        entry: JSON entry
+
+    Returns:
+        String with author and reference info
+    """
+    parts = []
+    if 'author' in entry:
+        parts.append(f"author={entry['author']}")
+    if 'reference' in entry:
+        parts.append(f"ref={entry['reference']}")
+    if 'title' in entry:
+        parts.append(f"title={entry['title']}")
+
+    if parts:
+        return " | ".join(parts)
+    else:
+        # No identifying info - show actual entry content (truncated)
+        import json
+        entry_str = json.dumps(entry, ensure_ascii=False)
+        if len(entry_str) > 100:
+            entry_str = entry_str[:100] + "..."
+        return f"content={entry_str}"
+
+
+def validate_required_fields(entry: Dict, entry_index: int, required_fields: List[str]) -> List[str]:
+    """Validate that all required fields are present
+
+    Args:
+        entry: JSON entry to validate
+        entry_index: Index of entry in array (for error reporting)
+        required_fields: List of required field names
+
+    Returns:
+        List of error descriptions (without entry prefix/context)
+    """
+    errors = []
+
+    for field in required_fields:
+        if field not in entry:
+            errors.append(f"Missing required field '{field}'")
+        elif entry[field] is None:
+            errors.append(f"Field '{field}' is null")
+        elif isinstance(entry[field], str) and not entry[field].strip():
+            errors.append(f"Field '{field}' is empty")
+        elif field == 'files' and not entry[field]:  # Empty array
+            errors.append("Field 'files' is empty array")
+
+    return errors
+
+
+def validate_git_repo_urls(entry: Dict, entry_index: int) -> List[str]:
+    """Validate git repository URLs in 'files' array
+
+    Requirements:
+    - Git repo URLs must NOT end with .git
+    - Must follow format: https://github.com/{author}/{reponame}
+    - .py and .js files are exempt
+
+    Args:
+        entry: JSON entry to validate
+        entry_index: Index of entry in array (for error reporting)
+
+    Returns:
+        List of error descriptions (without entry prefix/context)
+    """
+    errors = []
+
+    if 'files' not in entry or not isinstance(entry['files'], list):
+        return errors
+
+    for file_url in entry['files']:
+        if not isinstance(file_url, str):
+            continue
+
+        # Skip .py and .js files - they're exempt from git repo validation
+        if file_url.endswith('.py') or file_url.endswith('.js'):
+            continue
+
+        # Check if it's a GitHub URL (likely a git repo)
+        if 'github.com' in file_url:
+            # Error if URL ends with .git
+            if file_url.endswith('.git'):
+                errors.append(f"Git repo URL must NOT end with .git: {file_url}")
+                continue
+
+            # Validate format: https://github.com/{author}/{reponame}
+            if not GITHUB_REPO_PATTERN.match(file_url):
+                errors.append(f"Invalid git repo URL format (expected https://github.com/author/reponame): {file_url}")
+
+    return errors
+
+
+def validate_entry(entry: Dict, entry_index: int, required_fields: List[str]) -> List[str]:
+    """Validate a single JSON entry
+
+    Args:
+        entry: JSON entry to validate
+        entry_index: Index of entry in array (for error reporting)
+        required_fields: List of required field names
+
+    Returns:
+        List of error messages (empty if valid)
+    """
+    errors = []
+
+    # Check required fields
+    errors.extend(validate_required_fields(entry, entry_index, required_fields))
+
+    # Check git repository URLs
+    errors.extend(validate_git_repo_urls(entry, entry_index))
+
+    return errors
+
+
+def validate_json_file(file_path: str) -> Tuple[bool, List[str]]:
+    """Validate JSON file containing entries
+
+    Args:
+        file_path: Path to JSON file
+
+    Returns:
+        Tuple of (is_valid, error_messages)
+    """
+    errors = []
+
+    # Check file exists
+    path = Path(file_path)
+    if not path.exists():
+        return False, [f"File not found: {file_path}"]
+
+    # Load JSON
     try:
-        with open(file_path, 'r', encoding='utf-8') as file:
-            json_str = file.read()
-            json.loads(json_str)
-            print(f"[ OK ] {file_path}")
-    except UnicodeDecodeError as e:
-        print(f"Unicode decode error: {e}")
+        with open(path, 'r', encoding='utf-8') as f:
+            data = json.load(f)
     except json.JSONDecodeError as e:
-        print(f"[FAIL] {file_path}\n\n       {e}\n")
-    except FileNotFoundError:
-        print(f"[FAIL] {file_path}\n\n       File not found\n")
+        return False, [f"Invalid JSON: {e}"]
+    except Exception as e:
+        return False, [f"Error reading file: {e}"]
+
+    # Determine required fields based on JSON content
+    required_fields = []
+
+    # Validate structure - support both array and object formats
+    entries_to_validate = []
+
+    if isinstance(data, list):
+        # Direct array format: [{...}, {...}]
+        entries_to_validate = data
+    elif isinstance(data, dict):
+        # Object format: {"custom_nodes": [...]} or {"models": [...]}
+        # Determine validation based on keys
+        if 'custom_nodes' in data and isinstance(data['custom_nodes'], list):
+            required_fields = REQUIRED_FIELDS_CUSTOM_NODE
+            entries_to_validate = data['custom_nodes']
+        elif 'models' in data and isinstance(data['models'], list):
+            required_fields = REQUIRED_FIELDS_MODEL
+            entries_to_validate = data['models']
+        else:
+            # Other JSON structures (extension-node-map.json, etc.) - just validate JSON syntax
+            return True, []
+    else:
+        return False, ["JSON root must be either an array or an object containing arrays"]
+
+    # Validate each entry
+    for idx, entry in enumerate(entries_to_validate, start=1):
+        if not isinstance(entry, dict):
+            # Show actual value for type errors
+            entry_str = json.dumps(entry, ensure_ascii=False) if not isinstance(entry, str) else repr(entry)
+            if len(entry_str) > 150:
+                entry_str = entry_str[:150] + "..."
+            errors.append(f"\n❌ Entry #{idx}: Must be an object, got {type(entry).__name__}")
+            errors.append(f"   Actual value: {entry_str}")
+            continue
+
+        entry_errors = validate_entry(entry, idx, required_fields)
+        if entry_errors:
+            # Group errors by entry with context
+            context = get_entry_context(entry)
+            errors.append(f"\n❌ Entry #{idx} ({context}):")
+            for error in entry_errors:
+                errors.append(f"   - {error}")
+
+    is_valid = len(errors) == 0
+    return is_valid, errors
+
 
 def main():
-    parser = argparse.ArgumentParser(description="JSON File Syntax Checker")
-    parser.add_argument("file_path", type=str, help="Path to the JSON file for syntax checking")
+    """Main entry point"""
+    if len(sys.argv) < 2:
+        print("Usage: python json-checker.py <json-file>")
+        print("\nValidates JSON entries based on content:")
+        print("  - {\"custom_nodes\": [...]}: Validates required fields (author, title, reference, files, install_type, description)")
+        print("  - {\"models\": [...]}: Validates JSON syntax only (no required fields)")
+        print("  - Other JSON structures: Validates JSON syntax only")
+        print("\nGit repo URL validation (for custom_nodes):")
+        print("  - URLs must NOT end with .git")
+        print("  - URLs must follow: https://github.com/{author}/{reponame}")
+        sys.exit(1)
 
-    args = parser.parse_args()
-    check_json_syntax(args.file_path)
+    file_path = sys.argv[1]
 
-if __name__ == "__main__":
+    is_valid, errors = validate_json_file(file_path)
+
+    if is_valid:
+        print(f"✅ {file_path}: Validation passed")
+        sys.exit(0)
+    else:
+        print(f"Validating: {file_path}")
+        print("=" * 60)
+        print("❌ Validation failed!\n")
+        print("Errors:")
+        # Count actual errors (lines starting with "   -")
+        error_count = sum(1 for e in errors if e.strip().startswith('-'))
+        for error in errors:
+            # Don't add ❌ prefix to grouped entries (they already have it)
+            if error.strip().startswith('❌'):
+                print(error)
+            else:
+                print(error)
+        print(f"\nTotal errors: {error_count}")
+        sys.exit(1)
+
+
+if __name__ == '__main__':
     main()

node_db/forked/custom-node-list.json

@@ -1,5 +1,15 @@
 {
     "custom_nodes": [
+        {
+            "author": "Fossiel",
+            "title": "ComfyUI-MultiGPU-Patched",
+            "reference": "https://github.com/Fossiel/ComfyUI-MultiGPU-Patched",
+            "files": [
+                "https://github.com/Fossiel/ComfyUI-MultiGPU-Patched"
+            ],
+            "install_type": "git-clone",
+            "description": "Patched fork of ComfyUI-MultiGPU providing universal .safetensors and GGUF multi-GPU distribution with DisTorch 2.0 engine, model-driven allocation options (bytes/ratio modes), WanVideoWrapper integration, and up to 10% faster GGUF inference. (Description by CC)"
+        },        
         {
             "author": "synchronicity-labs",
             "title": "ComfyUI Sync Lipsync Node",

node_db/legacy/custom-node-list.json

@@ -1,5 +1,538 @@
 {
     "custom_nodes": [
+        {
+            "author": "r3dial",
+            "title": "Redial Discomphy - Discord Integration for ComfyUI [REMOVED]",
+            "reference": "https://github.com/r3dial/redial-discomphy",
+            "files": [
+                "https://github.com/r3dial/redial-discomphy"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom node for ComfyUI that enables direct posting of images, videos, and messages to Discord channels. This node seamlessly integrates your ComfyUI workflows with Discord communication, allowing you to automatically share your generated content."
+        },
+        {
+            "author": "EricRorich",
+            "title": "ComfyUI-Parametric-Face-Canvas [REMOVED]",
+            "reference": "https://github.com/EricRorich/ComfyUI-Parametric-Face-Canvas",
+            "files": [
+                "https://github.com/EricRorich/ComfyUI-Parametric-Face-Canvas"
+            ],
+            "install_type": "git-clone",
+            "description": "Generates a parametric 3D face wireframe and renders it as a 2D image with adjustable facial proportions and camera orientation for use in AI pipelines.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "pixixai",
+            "title": "ComfyUI_Pixix-Tools [UNSAFE/REMOVED]",
+            "reference": "https://github.com/pixixai/ComfyUI_pixixTools",
+            "files": [
+                "https://github.com/pixixai/ComfyUI_pixixTools"
+            ],
+            "install_type": "git-clone",
+            "description": "Load Text (from folder)\nNOTE: The files in the repo are not organized.[w/The contents of files from arbitrary paths can be read remotely through this node.]"
+        },
+        {
+            "author": "fllywaay",
+            "title": "Comfyui-TextLine-counter [REMOVED]",
+            "reference": "https://github.com/zpengcom/Comfyui-TextLine-counter",
+            "files": [
+                "https://github.com/zpengcom/Comfyui-TextLine-counter"
+            ],
+            "install_type": "git-clone",
+            "description": "A simple multi-line text processing tool, such as line count statistics, ignoring blank lines, etc."
+        },
+        {
+            "author": "daveand",
+            "title": "ComfyUI-daveand-utils [REMOVED]",
+            "reference": "https://github.com/daveand/ComfyUI-daveand-utils",
+            "files": [
+                "https://github.com/daveand/ComfyUI-daveand-utils"
+            ],
+            "install_type": "git-clone",
+            "description": "Utility nodes including ModelConfigSelector for saving checkpoint configurations and managing manual sampler overrides. (Description by CC)"
+        },
+        {
+            "author": "tristanvdb",
+            "title": "ComfyUI-toolset [REMOVED]",
+            "reference": "https://github.com/tristanvdb/ComfyUI-toolset",
+            "files": [
+                "https://github.com/tristanvdb/ComfyUI-toolset"
+            ],
+            "install_type": "git-clone",
+            "description": "Human-in-the-loop image selection tool for ComfyUI workflows using a Flask web server, enabling users to pause workflows and interactively select images via a web browser interface."
+        },
+        {
+            "author": "chuchu114514",
+            "title": "comfyui_proportion_solver [REMOVED]",
+            "reference": "https://github.com/chuchu114514/comfyui_proportion_solver",
+            "files": [
+                "https://github.com/chuchu114514/comfyui_proportion_solver"
+            ],
+            "install_type": "git-clone",
+            "description": "This plugin includes two core nodes designed to handle proportion optimization tasks of varying complexity"
+        },
+        {
+            "author": "chuchu114514",
+            "title": "comfyui_text_list_stepper [REMOVED]",
+            "reference": "https://github.com/chuchu114514/comfyui_text_list_stepper",
+            "files": [
+                "https://github.com/chuchu114514/comfyui_text_list_stepper"
+            ],
+            "install_type": "git-clone",
+            "description": "Used for batch extraction of prompt words."
+        },
+        {
+            "author": "balu112121",
+            "title": "ComfyUI URL Image Loader [REMOVED]",
+            "reference": "https://github.com/balu112121/comfyui-LoadImageFromURL",
+            "files": [
+                "https://github.com/balu112121/comfyui-LoadImageFromURL"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom ComfyUI node for loading images directly from URLs for AI image generation workflows."
+        },
+        {
+            "author": "huyl3-cpu",
+            "title": "ComfyUI_A100_Ultimate_Optimizer [REMOVED]",
+            "reference": "https://github.com/huyl3-cpu/ComfyUI_A100_Ultimate_Optimizer",
+            "files": [
+                "https://github.com/huyl3-cpu/ComfyUI_A100_Ultimate_Optimizer"
+            ],
+            "install_type": "git-clone",
+            "description": "A100 GPU batch processing and optimization node for ComfyUI. (Description by CC)"
+        },
+        {
+            "author": "BlackVortexAI",
+            "title": "BV Nodes [DEPRECATED]",
+            "reference": "https://github.com/BlackVortexAI/ComfyUI-BVortexNodes",
+            "files": [
+                "https://github.com/BlackVortexAI/ComfyUI-BVortexNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "This repository contains a user-defined node for ComfyUI, currently there are nodes for capturing captions. But will be expanded in the future."
+        },        
+        {
+            "author": "scott-createplay",
+            "title": "ComfyUI_frontend_tools [REMOVED]",
+            "reference": "https://github.com/scott-createplay/ComfyUI_frontend_tools",
+            "files": [
+                "https://github.com/scott-createplay/ComfyUI_frontend_tools"
+            ],
+            "install_type": "git-clone",
+            "description": "A comprehensive utility suite for ComfyUI that helps maintain clean, organized workflows with node cleaner, layout tools, HUD projection, and wireless connection management.\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "yutrodimitri-ship-it",
+            "title": "ComfyUI-YUTRO-CastingStudio-v2 [REMOVED]",
+            "reference": "https://github.com/yutrodimitri-ship-it/ComfyUI-YUTRO-CastingStudio-v2",
+            "files": [
+                "https://github.com/yutrodimitri-ship-it/ComfyUI-YUTRO-CastingStudio-v2"
+            ],
+            "install_type": "git-clone",
+            "description": "A professional modular suite of nodes for ComfyUI designed for virtual casting agencies, professional photographers, and content creators to generate high-quality model portfolios efficiently. (Description by CC)\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "amamisonlyuser",
+            "title": "MixvtonComfyui [REMOVED]",
+            "reference": "https://github.com/amamisonlyuser/MixvtonComfyui",
+            "files": [
+                "https://github.com/amamisonlyuser/MixvtonComfyui"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: CXH_Leffa_Viton_Load, CXH_Leffa_Viton_Run\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "AhBumm",
+            "title": "ComfyUI_MangaLineExtraction [REMOVED]",
+            "reference": "https://github.com/AhBumm/ComfyUI_MangaLineExtraction-hf",
+            "files": [
+               "https://github.com/AhBumm/ComfyUI_MangaLineExtraction-hf"
+            ],
+            "description": "p1atdev/MangaLineExtraction-hf as a node in comfyui",
+            "install_type": "git-clone"
+        },        
+        {
+            "author": "danieljanata",
+            "title": "ComfyUI-QwenVL-Override [REMOVED]",
+            "reference": "https://github.com/danieljanata/ComfyUI-QwenVL-Override",
+            "files": [
+                "https://github.com/danieljanata/ComfyUI-QwenVL-Override"
+            ],
+            "install_type": "git-clone",
+            "description": "Adds two nodes that reuse upstream ComfyUI-QwenVL presets but add a runtime override that can be wired/unwired without getting stuck."
+        },        
+        {
+            "author": "Futureversecom",
+            "title": "ComfyUI-JEN [REMOVED]",
+            "reference": "https://github.com/futureversecom/ComfyUI-JEN",
+            "files": [
+                "https://github.com/futureversecom/ComfyUI-JEN"
+            ],
+            "install_type": "git-clone",
+            "description": "Comfy UI custom nodes for JEN music generation powered by Futureverse"
+        },
+        {
+            "author": "TheBill2001",
+            "title": "comfyui-upscale-by-model [REMOVED]",
+            "reference": "https://github.com/TheBill2001/comfyui-upscale-by-model",
+            "files": [
+                "https://github.com/TheBill2001/comfyui-upscale-by-model"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node allow upscaling an image by a factor using a model."
+        },
+        {
+            "author": "XYMikky12138",
+            "title": "ComfyUI-NanoBanana-inpaint [REMOVED]",
+            "reference": "https://github.com/XYMikky12138/ComfyUI-NanoBanana-inpaint",
+            "files": [
+                "https://github.com/XYMikky12138/ComfyUI-NanoBanana-inpaint"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI nodes for API-based inpainting (Gemini, Imagen) with aspect ratio constraints, smart cropping, resize fitting, intelligent paste-back with transparency support. (Description by CC)"
+        },
+        {
+            "author": "Blonicx",
+            "title": "ComfyUI-Rework-X [REMOVED]",
+            "id": "rework-x",
+            "reference": "https://github.com/Blonicx/ComfyUI-X-Rework",
+            "files": [
+                "https://github.com/Blonicx/ComfyUI-X-Rework"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a plugin for ComfyUI that adds new Util Nodes and Nodes for easier image creation and sharing."
+        },
+        {
+            "author": "scott-createplay",
+            "title": "ComfyUI_video_essentials [REMOVED]",
+            "reference": "https://github.com/scott-createplay/ComfyUI_video_essentials",
+            "files": [
+                "https://github.com/scott-createplay/ComfyUI_video_essentials"
+            ],
+            "install_type": "git-clone",
+            "description": "Essential video processing nodes for ComfyUI"
+        },
+        {
+            "author": "thnikk",
+            "title": "comfyui-thnikk-utils [REMOVED]",
+            "reference": "https://github.com/thnikk/comfyui-thnikk-utils",
+            "files": [
+                "https://github.com/thnikk/comfyui-thnikk-utils"
+            ],
+            "install_type": "git-clone",
+            "description": "Nodes to clean up your workflow."
+        },
+        {
+            "author": "Tr1dae",
+            "title": "LoRA Matcher Nodes for ComfyUI [REMOVED]",
+            "reference": "https://github.com/Tr1dae/ComfyUI-LoraPromptMatcher",
+            "files": [
+                "https://github.com/Tr1dae/ComfyUI-LoraPromptMatcher"
+            ],
+            "install_type": "git-clone",
+            "description": "This custom node provides two different approaches to automatically match text prompts with LoRA models using their descriptions."
+        },
+
+        {
+            "author": "jkhayiying",
+            "title": "ImageLoadFromLocalOrUrl Node for ComfyUI [REMOVED]",
+            "id": "JkhaImageLoaderPathOrUrl",
+            "reference": "https://gitee.com/yyh915/jkha-load-img",
+            "files": [
+                "https://gitee.com/yyh915/jkha-load-img"
+            ],
+            "install_type": "git-clone",
+            "description": "This is a node to load an image from local path or url."
+        },
+        {
+            "author": "pizurny",
+            "title": "ComfyUI-Just-DWPose [REMOVED]",
+            "reference": "https://github.com/pizurny/ComfyUI-Just-DWPose",
+            "files": [
+                "https://github.com/pizurny/ComfyUI-Just-DWPose"
+            ],
+            "install_type": "git-clone",
+            "description": "An advanced DWPose annotator for ComfyUI with TorchScript and ONNX backends, featuring comprehensive pose detection, bone validation, temporal smoothing, and custom visualization tools."
+        },
+        {
+            "author": "lfelipegg",
+            "title": "lfgg_custom_nodes [REMOVED]",
+            "reference": "https://github.com/lfelipegg/lfgg_custom_nodes",
+            "files": [
+                "https://github.com/lfelipegg/lfgg_custom_nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: ModelMergeCombos\nNOTE: The files in the repo are not organized."
+        },
+        {
+            "author": "AndSni",
+            "title": "Comfy-FL-Nodes [REMOVED]",
+            "reference": "https://github.com/AndSni/Comfy-FL-Nodes",
+            "files": [
+                "https://github.com/AndSni/Comfy-FL-Nodes"
+            ],
+            "install_type": "git-clone",
+            "description": "Generates human characters for commerce applications in ComfyUI. (Description by CC)"
+        },
+        {
+            "author": "neeltheninja",
+            "title": "ComfyUI-ControlNeXt [REMOVED]",
+            "reference": "https://github.com/neverbiasu/ComfyUI-ControlNeXt",
+            "files": [
+                "https://github.com/neverbiasu/ComfyUI-ControlNeXt"
+            ],
+            "install_type": "git-clone",
+            "description": "In progress🚧"
+        },
+        {
+            "author": "TheArtOfficial",
+            "title": "ComfyUI-Nitra [REMOVED]",
+            "reference": "https://github.com/TheArtOfficial/ComfyUI-Nitra",
+            "files": [
+                "https://github.com/TheArtOfficial/ComfyUI-Nitra"
+            ],
+            "install_type": "git-clone",
+            "description": "Nitra custom node for ComfyUI"
+        },        
+        {
+            "author": "AngelCookies",
+            "title": "ComfyUI-Seed-Tracker [REMOVED]",
+            "reference": "https://github.com/AngelCookies/ComfyUI-Seed-Tracker",
+            "files": [
+                "https://github.com/AngelCookies/ComfyUI-Seed-Tracker"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI extension that tracks random seeds throughout your image generation workflows"
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-nothing-happened [REMOVED]",
+            "reference": "httphttps://github.com/shinich39/comfyui-nothing-happened",
+            "files": [
+               "https://github.com/shinich39/comfyui-nothing-happened"
+            ],
+            "description": "Save image and keep metadata.",
+            "install_type": "git-clone"
+        },
+        {
+            "author": "ashtar1984",
+            "title": "comfyui-switch-bypass-mute-by-group [REMOVED]",
+            "reference": "https://github.com/ashtar1984/comfyui-switch-bypass-mute-by-group",
+            "files": [
+                "https://github.com/ashtar1984/comfyui-switch-bypass-mute-by-group"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI custom node for group-based node switching, bypassing, and muting control. (Description by CC)"
+        },
+        {
+            "author": "wallen0322",
+            "title": "ComfyUI-TTM-WAN22 [REMOVED]",
+            "reference": "https://github.com/wallen0322/ComfyUI-TTM-WAN22",
+            "files": [
+                "https://github.com/wallen0322/ComfyUI-TTM-WAN22"
+            ],
+            "install_type": "git-clone",
+            "description": "TTM (Time-to-Move) node for ComfyUI enabling motion-controlled video generation with Wan2.2 models using dual-clock denoising for independent background and object animation control."
+        },
+        {
+            "author": "cdanielp",
+            "title": "COMFYUI_PROMPTMODELS [REMOVED]",
+            "reference": "https://github.com/cdanielp/COMFYUI_PROMPTMODELS",
+            "files": [
+                "https://github.com/cdanielp/COMFYUI_PROMPTMODELS"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI by PROMPTMODELS."
+        },
+        {
+            "author": "mcrataobrabo",
+            "title": "comfyui-smart-lora-downloader - Automatically Fetch Missing LoRAs [REMOVED]",
+            "reference": "https://github.com/mcrataobrabo/comfyui-smart-lora-downloader",
+            "files": [
+                "https://github.com/mcrataobrabo/comfyui-smart-lora-downloader"
+            ],
+            "install_type": "git-clone",
+            "description": "Automatically detect and download missing LoRAs for ComfyUI workflows"
+        },
+        {
+            "author": "KANAsho34636",
+            "title": "ComfyUI-NaturalSort-ImageLoader [REMOVED]",
+            "reference": "https://github.com/KANAsho34636/ComfyUI-NaturalSort-ImageLoader",
+            "files": [
+                "https://github.com/KANAsho34636/ComfyUI-NaturalSort-ImageLoader"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom image loader node supporting natural number sorting with multiple sort modes (natural, lexicographic, modification time, creation time, reverse natural). (Description by CC)"
+        },
+        {
+            "author": "johninthewinter",
+            "title": "comfyui-fal-flux-2-John [REMOVED]",
+            "reference": "https://github.com/johninthewinter/comfyui-fal-flux-2-John",
+            "files": [
+                "https://github.com/johninthewinter/comfyui-fal-flux-2-John"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom nodes for ComfyUI that integrate with fal.ai's FLUX 2 and FLUX 1 LoRA APIs for text-to-image generation."
+        },
+        {
+            "author": "LargeModGames",
+            "title": "ComfyUI LoRA Auto Downloader [REMOVED]",
+            "reference": "https://github.com/LargeModGames/comfyui-smart-lora-downloader",
+            "files": [
+                "https://github.com/LargeModGames/comfyui-smart-lora-downloader"
+            ],
+            "install_type": "git-clone",
+            "description": "Automatically download missing LoRAs from CivitAI and detect missing LoRAs in workflows. Features smart directory detection and easy installation."
+        },
+        {
+            "author": "DiffusionWave",
+            "title": "PickResolution_DiffusionWave [DEPRECATED]",
+            "reference": "https://github.com/DiffusionWave/PickResolution_DiffusionWave",
+            "files": [
+                "https://github.com/DiffusionWave/PickResolution_DiffusionWave"
+            ],
+            "install_type": "git-clone",
+            "description": "A custom node for ComfyUI that allows selecting a base resolution, applying a custom scaling value based on FLOAT (up to 10 decimal places), and adding an extra integer value. Outputs include both INT and FLOAT resolutions, making it perfect for you to play around with."
+        },
+        {
+            "author": "geltz",
+            "title": "ComfyUI-geltz [REMOVED]",
+            "reference": "https://github.com/geltz/ComfyUI-geltz",
+            "files": [
+                "https://github.com/geltz/ComfyUI-geltz"
+            ],
+            "install_type": "git-clone",
+            "description": "Various custom nodes; guidance, latents, sampling, tokenization, etc."
+        },
+        {
+            "author": "anilsathyan7",
+            "title": "ComfyUI-Crystal-Upscaler [REMOVED]",
+            "reference": "https://github.com/anilsathyan7/ComfyUI-Crystal-Upscaler",
+            "files": [
+                "https://github.com/anilsathyan7/ComfyUI-Crystal-Upscaler"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI custom node for image upscaling using crystal upscaling technology. (Description by CC)"
+        },
+        {
+            "author": "nohikomiso",
+            "title": "ComfyUI-ImageFolderPicker [REMOVED/UNSAFE]",
+            "reference": "https://github.com/nohikomiso/ComfyUI-ImageFolderPicker",
+            "files": [
+                "https://github.com/nohikomiso/ComfyUI-ImageFolderPicker"
+            ],
+            "install_type": "git-clone",
+            "description": "Custom ComfyUI node for browsing local server folders and selecting images via thumbnail display in a grid interface. (Description by CC)[w/This nodepack has a vulnerability that allows it to retrieve a list of files from arbitrary paths.]"
+        },
+        {
+            "author": "rzasharp79",
+            "title": "ComfyUI--SolarFlare [REMOVED]",
+            "reference": "https://github.com/rzasharp79/ComfyUI--SolarFlare",
+            "files": [
+                "https://github.com/rzasharp79/ComfyUI--SolarFlare"
+            ],
+            "install_type": "git-clone",
+            "description": "NODES: Qwen Image, ..."
+        },
+        {
+            "author": "shinich39",
+            "title": "comfyui-no-one-above-me [REMOVED]",
+            "reference": "https://github.com/shinich39/comfyui-no-one-above-me",
+            "files": [
+                "https://github.com/shinich39/comfyui-no-one-above-me"
+            ],
+            "install_type": "git-clone",
+            "description": "Fix node to top."
+        },
+        {
+            "author": "octapus8085",
+            "title": "OpenAI-comfyui-O [REMOVED]",
+            "reference": "https://github.com/Spicely/Comfyui-File-Utils",
+            "files": [
+                "https://github.com/Spicely/Comfyui-File-Utils"
+            ],
+            "install_type": "git-clone",
+            "description": "This plugin provides multiple file-handling and utility nodes for ComfyUI, including: image saving, audio saving, video saving, video composition, audio-to-subtitle conversion, and random number generation nodes. These nodes not only process files but also return their absolute file paths.\nNOTE: The files in the repo are not organized.[w/This nodepack contains a node that has a vulnerability allowing write to arbitrary file paths.]"
+        },        
+        {
+            "author": "yemanou",
+            "title": "NABA Image (Gemini REST) Node [REMOVED]",
+            "reference": "https://github.com/yemanou/ComfyUI-NABA",
+            "files": [
+                "https://github.com/yemanou/ComfyUI-NABA"
+            ],
+            "install_type": "git-clone",
+            "description": "Simplified Gemini 2.5 Flash Image Preview node for ComfyUI. REST-only for stability, two optional reference images, padded aspect ratio resizing (no stretching), and basic sampling controls. All extra debug layers, SDK path, multi-seed, and legacy compatibility code removed to avoid crashes."
+        },
+        {
+            "author": "comrender",
+            "title": "ComfyUI-Nano-Banana-Resizer [REMOVED]",
+            "reference": "https://github.com/comrender/ComfyUI-Nano-Banana-Resizer",
+            "files": [
+                "https://github.com/comrender/ComfyUI-Nano-Banana-Resizer"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node that automatically calculates optimal output dimensions for Google's Nano Banana image editing model, supporting 22 aspect ratio buckets and ensuring pixel-perfect outputs without shifting or cropping."
+        },
+        {
+            "author": "comrender",
+            "title": "ComfyUI-edge-match-checker [REMOVED]",
+            "reference": "https://github.com/comrender/ComfyUI-edge-match-checker",
+            "files": [
+                "https://github.com/comrender/ComfyUI-edge-match-checker"
+            ],
+            "install_type": "git-clone",
+            "description": "Node comparing two image masks or images with adjustable overlap threshold (default 95%) for detecting minor shifts and mismatches in proportions, suitable for automated post-processing validation. (Description by CC)"
+        },
+        {
+            "author": "comrender",
+            "title": "ComfyUI-gpt5_image_text [REMOVED]",
+            "reference": "https://github.com/comrender/ComfyUI-gpt5_image_text",
+            "files": [
+                "https://github.com/comrender/ComfyUI-gpt5_image_text"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node for vision + text analysis using GPT-5 and GPT-4o with direct API key input, system prompt, temperature, max tokens, and multi-image support."
+        },
+        {
+            "author": "PozzettiAndrea",
+            "title": "ComfyUI-CameraAnalysis [REMOVED]",
+            "reference": "https://github.com/PozzettiAndrea/ComfyUI-CameraAnalysis",
+            "files": [
+                "https://github.com/PozzettiAndrea/ComfyUI-CameraAnalysis"
+            ],
+            "install_type": "git-clone",
+            "description": "Extracts camera intrinsic parameters from image EXIF data."
+        },
+        {
+            "author": "fuzr0dah",
+            "title": "comfyui-sceneassembly [REMOVED]",
+            "reference": "https://github.com/fuzr0dah/comfyui-sceneassembly",
+            "files": [
+                "https://github.com/fuzr0dah/comfyui-sceneassembly"
+            ],
+            "install_type": "git-clone",
+            "description": "A bunch of nodes I created that I also find useful."
+        },
+        {
+            "author": "rslosch",
+            "title": "ComfyUI-EZ_Prompts [REMOVED]",
+            "reference": "https://github.com/rslosch/ComfyUI-EZ_Prompts",
+            "files": [
+                "https://github.com/rslosch/ComfyUI-EZ_Prompts"
+            ],
+            "install_type": "git-clone",
+            "description": "A ComfyUI custom node extension that provides easy-to-use prompt templates and wildcards for AI image generation."
+        },
+        {
+            "author": "hvppycoding",
+            "title": "hvppyflow [REMOVED]",
+            "reference": "https://github.com/hvppycoding/hvppyflow",
+            "files": [
+                "https://github.com/hvppycoding/hvppyflow"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI nodes for Automated Workflow"
+        },        
         {
             "author": "cedarconnor",
             "title": "ComfyUI-GEN3C-Gsplat [REMOVED]",

notebooks/comfyui_colab_with_manager.ipynb

@@ -0,0 +1,373 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "aaaaaaaaaa"
+   },
+   "source": [
+    "Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "bbbbbbbbbb"
+   },
+   "outputs": [],
+   "source": [
+    "# #@title Environment Setup\n",
+    "\n",
+    "from pathlib import Path\n",
+    "\n",
+    "OPTIONS = {}\n",
+    "\n",
+    "USE_GOOGLE_DRIVE = True  #@param {type:\"boolean\"}\n",
+    "UPDATE_COMFY_UI = True  #@param {type:\"boolean\"}\n",
+    "USE_COMFYUI_MANAGER = True  #@param {type:\"boolean\"}\n",
+    "INSTALL_CUSTOM_NODES_DEPENDENCIES = True  #@param {type:\"boolean\"}\n",
+    "OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
+    "OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
+    "OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
+    "OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
+    "\n",
+    "current_dir = !pwd\n",
+    "WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
+    "\n",
+    "if OPTIONS['USE_GOOGLE_DRIVE']:\n",
+    "    !echo \"Mounting Google Drive...\"\n",
+    "    %cd /\n",
+    "\n",
+    "    from google.colab import drive\n",
+    "    drive.mount('/content/drive')\n",
+    "\n",
+    "    WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
+    "    %cd /content/drive/MyDrive\n",
+    "\n",
+    "![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
+    "%cd $WORKSPACE\n",
+    "\n",
+    "if OPTIONS['UPDATE_COMFY_UI']:\n",
+    "  !echo -= Updating ComfyUI =-\n",
+    "\n",
+    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
+    "  ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
+    "  ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
+    "  ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
+    "  ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
+    "  ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
+    "  ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
+    "  ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
+    "\n",
+    "  !git pull\n",
+    "\n",
+    "!echo -= Install dependencies =-\n",
+    "!pip3 install accelerate\n",
+    "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
+    "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
+    "!pip3 install torchsde\n",
+    "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
+    "\n",
+    "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
+    "  %cd custom_nodes\n",
+    "\n",
+    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
+    "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
+    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
+    "\n",
+    "  ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
+    "  %cd ComfyUI-Manager\n",
+    "  !git pull\n",
+    "\n",
+    "%cd $WORKSPACE\n",
+    "\n",
+    "if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
+    "  !echo -= Install custom nodes dependencies =-\n",
+    "  !pip install GitPython\n",
+    "  !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "cccccccccc"
+   },
+   "source": [
+    "Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "dddddddddd"
+   },
+   "outputs": [],
+   "source": [
+    "# Checkpoints\n",
+    "\n",
+    "### SDXL\n",
+    "### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
+    "\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# SDXL ReVision\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
+    "\n",
+    "# SD1.5\n",
+    "!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
+    "\n",
+    "# SD2\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# Some SD1.5 anime style\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
+    "#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "\n",
+    "# unCLIP models\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
+    "\n",
+    "\n",
+    "# VAE\n",
+    "!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
+    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
+    "#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
+    "\n",
+    "\n",
+    "# Loras\n",
+    "#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
+    "#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
+    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
+    "\n",
+    "\n",
+    "# T2I-Adapter\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
+    "\n",
+    "# T2I Styles Model\n",
+    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
+    "\n",
+    "# CLIPVision model (needed for styles model)\n",
+    "#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
+    "\n",
+    "\n",
+    "# ControlNet\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
+    "\n",
+    "# ControlNet SDXL\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
+    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
+    "\n",
+    "# Controlnet Preprocessor nodes by Fannovel16\n",
+    "#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
+    "\n",
+    "\n",
+    "# GLIGEN\n",
+    "#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
+    "\n",
+    "\n",
+    "# ESRGAN upscale model\n",
+    "#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
+    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
+    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "kkkkkkkkkkkkkkk"
+   },
+   "source": [
+    "### Run ComfyUI with cloudflared (Recommended Way)\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "jjjjjjjjjjjjjj"
+   },
+   "outputs": [],
+   "source": [
+    "!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
+    "!dpkg -i ~/cloudflared-linux-amd64.deb\n",
+    "\n",
+    "import subprocess\n",
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "import urllib.request\n",
+    "\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
+    "\n",
+    "  p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
+    "  for line in p.stderr:\n",
+    "    l = line.decode()\n",
+    "    if \"trycloudflare.com \" in l:\n",
+    "      print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
+    "    #print(l, end='')\n",
+    "\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "kkkkkkkkkkkkkk"
+   },
+   "source": [
+    "### Run ComfyUI with localtunnel\n",
+    "\n",
+    "\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "jjjjjjjjjjjjj"
+   },
+   "outputs": [],
+   "source": [
+    "!npm install -g localtunnel\n",
+    "\n",
+    "import subprocess\n",
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "import urllib.request\n",
+    "\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
+    "\n",
+    "  print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
+    "  p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
+    "  for line in p.stdout:\n",
+    "    print(line.decode(), end='')\n",
+    "\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "id": "gggggggggg"
+   },
+   "source": [
+    "### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
+    "\n",
+    "You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
+    "\n",
+    "If you want to open it in another window use the link.\n",
+    "\n",
+    "Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "id": "hhhhhhhhhh"
+   },
+   "outputs": [],
+   "source": [
+    "import threading\n",
+    "import time\n",
+    "import socket\n",
+    "def iframe_thread(port):\n",
+    "  while True:\n",
+    "      time.sleep(0.5)\n",
+    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
+    "      result = sock.connect_ex(('127.0.0.1', port))\n",
+    "      if result == 0:\n",
+    "        break\n",
+    "      sock.close()\n",
+    "  from google.colab import output\n",
+    "  output.serve_kernel_port_as_iframe(port, height=1024)\n",
+    "  print(\"to open it in a window you can open this link here:\")\n",
+    "  output.serve_kernel_port_as_window(port)\n",
+    "\n",
+    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
+    "\n",
+    "!python main.py --dont-print-server"
+   ]
+  }
+ ],
+ "metadata": {
+  "accelerator": "GPU",
+  "colab": {
+   "provenance": []
+  },
+  "gpuClass": "standard",
+  "kernelspec": {
+   "display_name": "Python 3",
+   "name": "python3"
+  },
+  "language_info": {
+   "name": "python"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 0
+}

prestartup_script.py

@@ -12,15 +12,32 @@ import ast
 import logging
 import traceback
 
-from .common import security_check
-from .common import manager_util
-from .common import cm_global
-from .common import manager_downloader
-from .common.timestamp_utils import current_timestamp
+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]
+
 
 cm_global.pip_blacklist = {'torch', 'torchaudio', 'torchsde', 'torchvision'}
 cm_global.pip_downgrade_blacklist = ['torch', 'torchaudio', 'torchsde', 'torchvision', 'transformers', 'safetensors', 'kornia']
@@ -49,14 +66,16 @@ def is_import_failed_extension(name):
 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__))
-    os.environ['COMFYUI_PATH'] = comfy_path
 
 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)
@@ -66,12 +85,23 @@ cm_global.register_api('cm.is_import_failed_extension', is_import_failed_extensi
 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 = folder_paths.get_system_user_directory("manager")
+
+# Check for System User API availability (PR #10966)
+_has_system_user_api = hasattr(folder_paths, 'get_system_user_directory')
+
+if _has_system_user_api:
+    manager_files_path = os.path.abspath(os.path.join(folder_paths.get_user_directory(), '__manager'))
+else:
+    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():
@@ -340,10 +370,13 @@ try:
                 pass
 
             with std_log_lock:
-                if self.is_stdout:
-                    original_stdout.flush()
-                else:
-                    original_stderr.flush()
+                try:
+                    if self.is_stdout:
+                        original_stdout.flush()
+                    else:
+                        original_stderr.flush()
+                except (OSError, ValueError):
+                    pass
 
         def close(self):
             self.flush()
@@ -378,11 +411,7 @@ try:
         def emit(self, record):
             global is_start_mode
 
-            try:
-                message = record.getMessage()
-            except Exception as e:
-                message = f"<<logging error>>: {record} - {e}"
-                original_stderr.write(message)
+            message = record.getMessage()
 
             if is_start_mode:
                 match = re.search(pat_import_fail, message)
@@ -425,6 +454,35 @@ 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)
@@ -448,7 +506,7 @@ def read_downgrade_blacklist():
             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 Exception:
+    except:
         pass
 
 
@@ -469,6 +527,7 @@ check_bypass_ssl()
 
 # Perform install
 processed_install = set()
+# Use manager_files_path for consistency (fixes path inconsistency bug)
 script_list_path = os.path.join(manager_files_path, "startup-scripts", "install-scripts.txt")
 pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)
 
@@ -554,10 +613,7 @@ if os.path.exists(restore_snapshot_path):
         if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
             new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path
 
-        if 'COMFYUI_PATH' not in new_env:
-            new_env['COMFYUI_PATH'] = os.path.dirname(folder_paths.__file__)
-
-        cmd_str = [sys.executable, '-m', 'comfyui_manager.cm_cli', 'restore-snapshot', restore_snapshot_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:
@@ -749,7 +805,11 @@ def execute_startup_script():
 
 
 # Check if script_list_path exists
-if os.path.exists(script_list_path):
+# Block startup-scripts on old ComfyUI (security measure)
+if not _has_system_user_api:
+    if os.path.exists(script_list_path):
+        print("[ComfyUI-Manager] Startup scripts blocked on old ComfyUI version.")
+elif os.path.exists(script_list_path):
     execute_startup_script()
 
 

pyproject.toml

@@ -1,65 +1,15 @@
-[build-system]
-requires = ["setuptools >= 61.0"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "comfyui-manager"
-license = { text = "GPL-3.0-only" }
-version = "4.0.3"
-requires-python = ">= 3.9"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-readme = "README.md"
-keywords = ["comfyui", "comfyui-manager"]
-
-maintainers = [
-  { name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
-  { name = "Yoland Yan", email = "yoland@comfy.org" },
-  { name = "James Kwon", email = "hongilkwon316@gmail.com" },
-  { name = "Robin Huang", email = "robin@comfy.org" },
-]
-
-classifiers = [
-  "Development Status :: 5 - Production/Stable",
-  "Intended Audience :: Developers",
-  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-]
-
-dependencies = [
-    "GitPython",
-    "PyGithub",
-#    "matrix-nio",
-    "transformers",
-    "huggingface-hub>0.20",
-    "typer",
-    "rich",
-    "typing-extensions",
-    "toml",
-    "uv",
-    "chardet"
-]
-
-[project.optional-dependencies]
-dev = ["pre-commit", "pytest", "ruff", "pytest-cov"]
+version = "3.39.2"
+license = { file = "LICENSE.txt" }
+dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
 
 [project.urls]
 Repository = "https://github.com/ltdrdata/ComfyUI-Manager"
+#  Used by Comfy Registry https://comfyregistry.org
 
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["comfyui_manager*"]
-
-[project.scripts]
-cm-cli = "comfyui_manager.cm_cli.__main__:main"
-
-[tool.ruff]
-line-length = 120
-target-version = "py39"
-
-[tool.ruff.lint]
-select = [
-  "E4", # default
-  "E7", # default
-  "E9", # default
-  "F",  # default
-  "I",  # isort-like behavior (import statement sorting)
-]
+[tool.comfy]
+PublisherId = "drltdata"
+DisplayName = "ComfyUI-Manager"
+Icon = ""

requirements.txt

@@ -1,6 +1,6 @@
 GitPython
 PyGithub
-# matrix-nio
+matrix-nio
 transformers
 huggingface-hub
 typer

ruff.toml

@@ -9,4 +9,4 @@ lint.select = [
     "F",
 ]
 
-exclude = ["*.ipynb", "tests"]
+exclude = ["*.ipynb"]

scanner.py

@@ -16,6 +16,108 @@ import sys
 
 from urllib.parse import urlparse
 from github import Github, Auth
+from pathlib import Path
+from typing import Set, Dict, Optional
+
+# Scanner version for cache invalidation
+SCANNER_VERSION = "2.0.12"  # Add dict comprehension + export list detection
+
+# Cache for extract_nodes and extract_nodes_enhanced results
+_extract_nodes_cache: Dict[str, Set[str]] = {}
+_extract_nodes_enhanced_cache: Dict[str, Set[str]] = {}
+_file_mtime_cache: Dict[Path, float] = {}
+
+
+def _get_repo_root(file_path: Path) -> Optional[Path]:
+    """Find the repository root directory containing .git"""
+    current = file_path if file_path.is_dir() else file_path.parent
+    while current != current.parent:
+        if (current / ".git").exists():
+            return current
+        current = current.parent
+    return None
+
+
+def _get_repo_hash(repo_path: Path) -> str:
+    """Get git commit hash or fallback identifier"""
+    git_dir = repo_path / ".git"
+    if not git_dir.exists():
+        return ""
+
+    try:
+        # Read HEAD to get current commit
+        head_file = git_dir / "HEAD"
+        if head_file.exists():
+            head_content = head_file.read_text().strip()
+            if head_content.startswith("ref:"):
+                # HEAD points to a ref
+                ref_path = git_dir / head_content[5:].strip()
+                if ref_path.exists():
+                    commit_hash = ref_path.read_text().strip()
+                    return commit_hash[:16]  # First 16 chars
+            else:
+                # Detached HEAD
+                return head_content[:16]
+    except:
+        pass
+
+    return ""
+
+
+def _load_per_repo_cache(repo_path: Path) -> Optional[tuple]:
+    """Load nodes and metadata from per-repo cache
+
+    Returns:
+        tuple: (nodes_set, metadata_dict) or None if cache invalid
+    """
+    cache_file = repo_path / ".git" / "nodecache.json"
+
+    if not cache_file.exists():
+        return None
+
+    try:
+        with open(cache_file, 'r') as f:
+            cache_data = json.load(f)
+
+        # Verify scanner version
+        if cache_data.get('scanner_version') != SCANNER_VERSION:
+            return None
+
+        # Verify git hash
+        current_hash = _get_repo_hash(repo_path)
+        if cache_data.get('git_hash') != current_hash:
+            return None
+
+        # Return nodes and metadata
+        nodes = cache_data.get('nodes', [])
+        metadata = cache_data.get('metadata', {})
+        return (set(nodes) if nodes else set(), metadata)
+
+    except:
+        return None
+
+
+def _save_per_repo_cache(repo_path: Path, all_nodes: Set[str], metadata: dict = None):
+    """Save nodes and metadata to per-repo cache"""
+    cache_file = repo_path / ".git" / "nodecache.json"
+
+    if not cache_file.parent.exists():
+        return
+
+    git_hash = _get_repo_hash(repo_path)
+    cache_data = {
+        "scanner_version": SCANNER_VERSION,
+        "git_hash": git_hash,
+        "scanned_at": datetime.datetime.now().isoformat(),
+        "nodes": sorted(list(all_nodes)),
+        "metadata": metadata if metadata else {}
+    }
+
+    try:
+        with open(cache_file, 'w') as f:
+            json.dump(cache_data, f, indent=2)
+    except:
+        pass  # Silently fail - cache is optional
 
 
 def download_url(url, dest_folder, filename=None):
@@ -51,11 +153,12 @@ Examples:
   # Standard mode
   python3 scanner.py
   python3 scanner.py --skip-update
+  python3 scanner.py --skip-all --force-rescan
 
   # Scan-only mode
   python3 scanner.py --scan-only temp-urls-clean.list
   python3 scanner.py --scan-only urls.list --temp-dir /custom/temp
-  python3 scanner.py --scan-only urls.list --skip-update
+  python3 scanner.py --scan-only urls.list --skip-update --force-rescan
         '''
     )
 
@@ -69,6 +172,8 @@ Examples:
                        help='Skip GitHub stats collection')
     parser.add_argument('--skip-all', action='store_true',
                        help='Skip all update operations')
+    parser.add_argument('--force-rescan', action='store_true',
+                       help='Force rescan all nodes (ignore cache)')
 
     # Backward compatibility: positional argument for temp_dir
     parser.add_argument('temp_dir_positional', nargs='?', metavar='TEMP_DIR',
@@ -94,6 +199,11 @@ parse_cnt = 0
 def extract_nodes(code_text):
     global parse_cnt
 
+    # Check cache first
+    cache_key = hash(code_text)
+    if cache_key in _extract_nodes_cache:
+        return _extract_nodes_cache[cache_key].copy()
+
     try:
         if parse_cnt % 100 == 0:
             print(".", end="", flush=True)
@@ -128,12 +238,614 @@ def extract_nodes(code_text):
                     if key is not None and isinstance(key.value, str):
                         s.add(key.value.strip())
 
+            # Cache the result
+            _extract_nodes_cache[cache_key] = s
             return s
         else:
+            # Cache empty result
+            _extract_nodes_cache[cache_key] = set()
             return set()
-    except Exception:
+    except:
+        # Cache empty result on error
+        _extract_nodes_cache[cache_key] = set()
         return set()
 
+def extract_nodes_from_repo(repo_path: Path, verbose: bool = False, force_rescan: bool = False) -> tuple:
+    """
+    Extract all nodes and metadata from a repository with per-repo caching.
+
+    Automatically caches results in .git/nodecache.json.
+    Cache is invalidated when:
+    - Git commit hash changes
+    - Scanner version changes
+    - force_rescan flag is True
+
+    Args:
+        repo_path: Path to repository root
+        verbose: If True, print UI-only extension detection messages
+        force_rescan: If True, ignore cache and force fresh scan
+
+    Returns:
+        tuple: (nodes_set, metadata_dict)
+    """
+    # Ensure path is absolute
+    repo_path = repo_path.resolve()
+
+    # Check per-repo cache first (unless force_rescan is True)
+    if not force_rescan:
+        cached_result = _load_per_repo_cache(repo_path)
+        if cached_result is not None:
+            return cached_result
+
+    # Cache miss - scan all .py files
+    all_nodes = set()
+    all_metadata = {}
+    py_files = list(repo_path.rglob("*.py"))
+
+    # Filter out __pycache__, .git, and other hidden directories
+    filtered_files = []
+    for f in py_files:
+        try:
+            rel_path = f.relative_to(repo_path)
+            # Skip __pycache__, .git, and any directory starting with .
+            if '__pycache__' not in str(rel_path) and not any(part.startswith('.') for part in rel_path.parts):
+                filtered_files.append(f)
+        except:
+            continue
+    py_files = filtered_files
+
+    for py_file in py_files:
+        try:
+            # Read file with proper encoding
+            with open(py_file, 'r', encoding='utf-8', errors='ignore') as f:
+                code = f.read()
+
+            if code:
+                # Extract nodes using SAME logic as scan_in_file
+                # V1 nodes (enhanced with fallback patterns)
+                nodes = extract_nodes_enhanced(code, py_file, visited=set(), verbose=verbose)
+                all_nodes.update(nodes)
+
+                # V3 nodes detection
+                v3_nodes = extract_v3_nodes(code)
+                all_nodes.update(v3_nodes)
+
+                # Dict parsing - exclude commented NODE_CLASS_MAPPINGS lines
+                pattern = r"_CLASS_MAPPINGS\s*(?::\s*\w+\s*)?=\s*(?:\\\s*)?{([^}]*)}"
+                regex = re.compile(pattern, re.MULTILINE | re.DOTALL)
+
+                for match_obj in regex.finditer(code):
+                    # Get the line where NODE_CLASS_MAPPINGS is defined
+                    match_start = match_obj.start()
+                    line_start = code.rfind('\n', 0, match_start) + 1
+                    line_end = code.find('\n', match_start)
+                    if line_end == -1:
+                        line_end = len(code)
+                    line = code[line_start:line_end]
+
+                    # Skip if line starts with # (commented)
+                    if re.match(r'^\s*#', line):
+                        continue
+
+                    match = match_obj.group(1)
+
+                    # Filter out commented lines from dict content
+                    match_lines = match.split('\n')
+                    match_filtered = '\n'.join(
+                        line for line in match_lines
+                        if not re.match(r'^\s*#', line)
+                    )
+
+                    # Extract key-value pairs with double quotes
+                    key_value_pairs = re.findall(r"\"([^\"]*)\"\s*:\s*([^,\n]*)", match_filtered)
+                    for key, value in key_value_pairs:
+                        all_nodes.add(key.strip())
+
+                    # Extract key-value pairs with single quotes
+                    key_value_pairs = re.findall(r"'([^']*)'\s*:\s*([^,\n]*)", match_filtered)
+                    for key, value in key_value_pairs:
+                        all_nodes.add(key.strip())
+
+                # Handle .update() pattern (AFTER comment removal)
+                code_cleaned = re.sub(r'^#.*?$', '', code, flags=re.MULTILINE)
+
+                update_pattern = r"_CLASS_MAPPINGS\.update\s*\(\s*{([^}]*)}\s*\)"
+                update_match = re.search(update_pattern, code_cleaned, re.DOTALL)
+                if update_match:
+                    update_dict_text = update_match.group(1)
+                    # Extract key-value pairs (double quotes)
+                    update_pairs = re.findall(r'"([^"]*)"\s*:\s*([^,\n]*)', update_dict_text)
+                    for key, value in update_pairs:
+                        all_nodes.add(key.strip())
+                    # Extract key-value pairs (single quotes)
+                    update_pairs_single = re.findall(r"'([^']*)'\s*:\s*([^,\n]*)", update_dict_text)
+                    for key, value in update_pairs_single:
+                        all_nodes.add(key.strip())
+
+                # Additional regex patterns (AFTER comment removal)
+                patterns = [
+                    r'^[^=]*_CLASS_MAPPINGS\["(.*?)"\]',
+                    r'^[^=]*_CLASS_MAPPINGS\[\'(.*?)\'\]',
+                    r'@register_node\("(.+)",\s*\".+"\)',
+                    r'"(\w+)"\s*:\s*{"class":\s*\w+\s*'
+                ]
+
+                for pattern in patterns:
+                    keys = re.findall(pattern, code_cleaned)
+                    all_nodes.update(key.strip() for key in keys)
+
+                # Extract metadata from this file
+                metadata = extract_metadata_only(str(py_file))
+                all_metadata.update(metadata)
+        except Exception:
+            # Silently skip files that can't be read
+            continue
+
+    # Save to per-repo cache
+    _save_per_repo_cache(repo_path, all_nodes, all_metadata)
+
+    return (all_nodes, all_metadata)
+
+
+def _verify_class_exists(node_name: str, code_text: str, file_path: Optional[Path] = None) -> tuple[bool, Optional[str], Optional[int]]:
+    """
+    Verify that a node class exists and has ComfyUI node structure.
+
+    Returns: (exists: bool, file_path: str, line_number: int)
+
+    A valid ComfyUI node must have:
+    - Class definition (not commented)
+    - At least one of: INPUT_TYPES, RETURN_TYPES, FUNCTION method/attribute
+    """
+    try:
+        with warnings.catch_warnings():
+            warnings.filterwarnings('ignore', category=SyntaxWarning)
+            tree = ast.parse(code_text)
+    except:
+        return (False, None, None)
+
+    for node in ast.walk(tree):
+        if isinstance(node, ast.ClassDef):
+            if node.name == node_name or node.name.replace('_', '') == node_name.replace('_', ''):
+                # Found class definition - check if it has ComfyUI interface
+                has_input_types = False
+                has_return_types = False
+                has_function = False
+
+                for item in node.body:
+                    # Check for INPUT_TYPES method
+                    if isinstance(item, ast.FunctionDef) and item.name == 'INPUT_TYPES':
+                        has_input_types = True
+                    # Check for RETURN_TYPES attribute
+                    elif isinstance(item, ast.Assign):
+                        for target in item.targets:
+                            if isinstance(target, ast.Name):
+                                if target.id == 'RETURN_TYPES':
+                                    has_return_types = True
+                                elif target.id == 'FUNCTION':
+                                    has_function = True
+                    # Check for FUNCTION method
+                    elif isinstance(item, ast.FunctionDef):
+                        has_function = True
+
+                # Valid if has any ComfyUI signature
+                if has_input_types or has_return_types or has_function:
+                    file_str = str(file_path) if file_path else None
+                    return (True, file_str, node.lineno)
+
+    return (False, None, None)
+
+
+def _extract_display_name_mappings(code_text: str) -> Set[str]:
+    """
+    Extract node names from NODE_DISPLAY_NAME_MAPPINGS.
+
+    Pattern:
+        NODE_DISPLAY_NAME_MAPPINGS = {
+            "node_key": "Display Name",
+            ...
+        }
+
+    Returns:
+        Set of node keys from NODE_DISPLAY_NAME_MAPPINGS
+    """
+    try:
+        with warnings.catch_warnings():
+            warnings.filterwarnings('ignore', category=SyntaxWarning)
+            tree = ast.parse(code_text)
+    except:
+        return set()
+
+    nodes = set()
+
+    for node in tree.body:
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Name) and target.id == 'NODE_DISPLAY_NAME_MAPPINGS':
+                    if isinstance(node.value, ast.Dict):
+                        for key in node.value.keys:
+                            if isinstance(key, ast.Constant) and isinstance(key.value, str):
+                                nodes.add(key.value.strip())
+
+    return nodes
+
+
+def extract_nodes_enhanced(
+    code_text: str,
+    file_path: Optional[Path] = None,
+    visited: Optional[Set[Path]] = None,
+    verbose: bool = False
+) -> Set[str]:
+    """
+    Enhanced node extraction with multi-layer detection system.
+
+    Scanner 2.0.11 - Comprehensive detection strategy:
+    - Phase 1: NODE_CLASS_MAPPINGS dict literal
+    - Phase 2: Class.NAME attribute access (e.g., FreeChat.NAME)
+    - Phase 3: Item assignment (NODE_CLASS_MAPPINGS["key"] = value)
+    - Phase 4: Class existence verification (detects active classes even if registration commented)
+    - Phase 5: NODE_DISPLAY_NAME_MAPPINGS cross-reference
+    - Phase 6: Empty dict detection (UI-only extensions, logging only)
+
+    Fixed Bugs:
+    - Scanner 2.0.9: Fallback cascade prevented Phase 3 execution
+    - Scanner 2.0.10: Missed active classes with commented registrations (15 false negatives)
+
+    Args:
+        code_text: Python source code
+        file_path: Path to file (for logging and caching)
+        visited: Visited paths (for circular import prevention)
+        verbose: If True, print UI-only extension detection messages
+
+    Returns:
+        Set of node names (union of all detected patterns)
+    """
+    # Check file-based cache if file_path provided
+    if file_path is not None:
+        try:
+            file_path_obj = Path(file_path) if not isinstance(file_path, Path) else file_path
+            if file_path_obj.exists():
+                current_mtime = file_path_obj.stat().st_mtime
+
+                # Check if we have cached result with matching mtime and scanner version
+                if file_path_obj in _file_mtime_cache:
+                    cached_mtime = _file_mtime_cache[file_path_obj]
+                    cache_key = (str(file_path_obj), cached_mtime, SCANNER_VERSION)
+
+                    if current_mtime == cached_mtime and cache_key in _extract_nodes_enhanced_cache:
+                        return _extract_nodes_enhanced_cache[cache_key].copy()
+        except:
+            pass  # Ignore cache errors, proceed with normal execution
+
+    # Suppress warnings from AST parsing
+    with warnings.catch_warnings():
+        warnings.filterwarnings('ignore', category=SyntaxWarning)
+        warnings.filterwarnings('ignore', category=DeprecationWarning)
+
+        # Phase 1: Original extract_nodes() - dict literal
+        phase1_nodes = extract_nodes(code_text)
+
+    # Phase 2: Class.NAME pattern
+    if visited is None:
+        visited = set()
+    phase2_nodes = _fallback_classname_resolver(code_text, file_path)
+
+    # Phase 3: Item assignment pattern
+    phase3_nodes = _fallback_item_assignment(code_text)
+
+    # Phase 4: NODE_DISPLAY_NAME_MAPPINGS cross-reference (NEW in 2.0.11)
+    # This catches nodes that are in display names but not in NODE_CLASS_MAPPINGS
+    phase4_nodes = _extract_display_name_mappings(code_text)
+
+    # Phase 5: Class existence verification ONLY for display name candidates (NEW in 2.0.11)
+    # This phase is CONSERVATIVE - only verify classes that appear in display names
+    # This catches the specific Scanner 2.0.10 bug pattern:
+    #   - NODE_CLASS_MAPPINGS registration is commented
+    #   - NODE_DISPLAY_NAME_MAPPINGS still has the entry
+    #   - Class implementation exists
+    # Example: Bjornulf_ollamaLoader in Bjornulf_custom_nodes
+    phase5_nodes = set()
+    for node_name in phase4_nodes:
+        # Only check classes that appear in display names but not in registrations
+        if node_name not in (phase1_nodes | phase2_nodes | phase3_nodes):
+            exists, _, _ = _verify_class_exists(node_name, code_text, file_path)
+            if exists:
+                phase5_nodes.add(node_name)
+
+    # Phase 6: Dict comprehension pattern (NEW in 2.0.12)
+    # Detects: NODE_CLASS_MAPPINGS = {cls.__name__: cls for cls in to_export}
+    # Example: TobiasGlaubach/ComfyUI-TG_PyCode
+    phase6_nodes = _fallback_dict_comprehension(code_text, file_path)
+
+    # Phase 7: Import-based class names for dict comprehension (NEW in 2.0.12)
+    # Detects imported classes that are added to export lists
+    phase7_nodes = _fallback_import_class_names(code_text, file_path)
+
+    # Union all results (FIX: Scanner 2.0.9 bug + Scanner 2.0.10 bug + Scanner 2.0.12 dict comp)
+    # 2.0.9: Used early return which missed Phase 3 nodes
+    # 2.0.10: Only checked registrations, missed classes referenced in display names
+    # 2.0.12: Added dict comprehension and import-based class detection
+    all_nodes = phase1_nodes | phase2_nodes | phase3_nodes | phase4_nodes | phase5_nodes | phase6_nodes | phase7_nodes
+
+    # Phase 8: Empty dict detector (logging only, doesn't add nodes)
+    if not all_nodes:
+        _fallback_empty_dict_detector(code_text, file_path, verbose)
+
+    # Cache the result
+    if file_path is not None:
+        try:
+            file_path_obj = Path(file_path) if not isinstance(file_path, Path) else file_path
+            if file_path_obj.exists():
+                current_mtime = file_path_obj.stat().st_mtime
+                cache_key = (str(file_path_obj), current_mtime, SCANNER_VERSION)
+                _extract_nodes_enhanced_cache[cache_key] = all_nodes
+                _file_mtime_cache[file_path_obj] = current_mtime
+        except:
+            pass
+
+    return all_nodes
+
+
+def _fallback_classname_resolver(code_text: str, file_path: Optional[Path]) -> Set[str]:
+    """
+    Detect Class.NAME pattern in NODE_CLASS_MAPPINGS.
+
+    Pattern:
+        NODE_CLASS_MAPPINGS = {
+            FreeChat.NAME: FreeChat,
+            PaidChat.NAME: PaidChat
+        }
+    """
+    try:
+        with warnings.catch_warnings():
+            warnings.filterwarnings('ignore', category=SyntaxWarning)
+            parsed = ast.parse(code_text)
+    except:
+        return set()
+    
+    nodes = set()
+    
+    for node in parsed.body:
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Name) and target.id == 'NODE_CLASS_MAPPINGS':
+                    if isinstance(node.value, ast.Dict):
+                        for key in node.value.keys:
+                            # Detect Class.NAME pattern
+                            if isinstance(key, ast.Attribute):
+                                if isinstance(key.value, ast.Name):
+                                    # Use class name as node name
+                                    nodes.add(key.value.id)
+                            # Also handle literal strings
+                            elif isinstance(key, ast.Constant) and isinstance(key.value, str):
+                                nodes.add(key.value.strip())
+    
+    return nodes
+
+
+def _fallback_item_assignment(code_text: str) -> Set[str]:
+    """
+    Detect item assignment pattern.
+
+    Pattern:
+        NODE_CLASS_MAPPINGS = {}
+        NODE_CLASS_MAPPINGS["MyNode"] = MyNode
+    """
+    try:
+        with warnings.catch_warnings():
+            warnings.filterwarnings('ignore', category=SyntaxWarning)
+            parsed = ast.parse(code_text)
+    except:
+        return set()
+
+    nodes = set()
+
+    for node in ast.walk(parsed):
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Subscript):
+                    if (isinstance(target.value, ast.Name) and
+                        target.value.id in ['NODE_CLASS_MAPPINGS', 'NODE_CONFIG']):
+                        # Extract key
+                        if isinstance(target.slice, ast.Constant):
+                            if isinstance(target.slice.value, str):
+                                nodes.add(target.slice.value)
+
+    return nodes
+
+
+def _fallback_dict_comprehension(code_text: str, file_path: Optional[Path] = None) -> Set[str]:
+    """
+    Detect dict comprehension pattern with __name__ attribute access.
+
+    Pattern:
+        NODE_CLASS_MAPPINGS = {cls.__name__: cls for cls in to_export}
+        NODE_CLASS_MAPPINGS = {c.__name__: c for c in [ClassA, ClassB]}
+
+    This function detects dict comprehension assignments to NODE_CLASS_MAPPINGS
+    and extracts class names from the iterable (list literal or variable reference).
+
+    Returns:
+        Set of class names extracted from the dict comprehension
+    """
+    try:
+        with warnings.catch_warnings():
+            warnings.filterwarnings('ignore', category=SyntaxWarning)
+            parsed = ast.parse(code_text)
+    except:
+        return set()
+
+    nodes = set()
+    export_lists = {}  # Track list variables and their contents
+
+    # First pass: collect list assignments (to_export = [...], exports = [...])
+    for node in ast.walk(parsed):
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Name):
+                    var_name = target.id
+                    # Check for list literal
+                    if isinstance(node.value, ast.List):
+                        class_names = set()
+                        for elt in node.value.elts:
+                            if isinstance(elt, ast.Name):
+                                class_names.add(elt.id)
+                        export_lists[var_name] = class_names
+
+        # Handle augmented assignment: to_export += [...]
+        elif isinstance(node, ast.AugAssign):
+            if isinstance(node.target, ast.Name) and isinstance(node.op, ast.Add):
+                var_name = node.target.id
+                if isinstance(node.value, ast.List):
+                    class_names = set()
+                    for elt in node.value.elts:
+                        if isinstance(elt, ast.Name):
+                            class_names.add(elt.id)
+                    if var_name in export_lists:
+                        export_lists[var_name].update(class_names)
+                    else:
+                        export_lists[var_name] = class_names
+
+    # Second pass: find NODE_CLASS_MAPPINGS dict comprehension
+    for node in ast.walk(parsed):
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Name) and target.id in ['NODE_CLASS_MAPPINGS', 'NODE_CONFIG']:
+                    # Check for dict comprehension
+                    if isinstance(node.value, ast.DictComp):
+                        dictcomp = node.value
+
+                        # Check if key is cls.__name__ pattern
+                        key = dictcomp.key
+                        if isinstance(key, ast.Attribute) and key.attr == '__name__':
+                            # Get the iterable from the first generator
+                            for generator in dictcomp.generators:
+                                iter_node = generator.iter
+
+                                # Case 1: Inline list [ClassA, ClassB, ...]
+                                if isinstance(iter_node, ast.List):
+                                    for elt in iter_node.elts:
+                                        if isinstance(elt, ast.Name):
+                                            nodes.add(elt.id)
+
+                                # Case 2: Variable reference (to_export, exports, etc.)
+                                elif isinstance(iter_node, ast.Name):
+                                    var_name = iter_node.id
+                                    if var_name in export_lists:
+                                        nodes.update(export_lists[var_name])
+
+    return nodes
+
+
+def _fallback_import_class_names(code_text: str, file_path: Optional[Path] = None) -> Set[str]:
+    """
+    Extract class names from imports that are added to export lists.
+
+    Pattern:
+        from .module import ClassA, ClassB
+        to_export = [ClassA, ClassB]
+        NODE_CLASS_MAPPINGS = {cls.__name__: cls for cls in to_export}
+
+    This is a complementary fallback that works with _fallback_dict_comprehension
+    to resolve import-based node registrations.
+
+    Returns:
+        Set of imported class names that appear in export-like contexts
+    """
+    try:
+        with warnings.catch_warnings():
+            warnings.filterwarnings('ignore', category=SyntaxWarning)
+            parsed = ast.parse(code_text)
+    except:
+        return set()
+
+    # Collect imported names
+    imported_names = set()
+    for node in ast.walk(parsed):
+        if isinstance(node, ast.ImportFrom):
+            for alias in node.names:
+                name = alias.asname if alias.asname else alias.name
+                imported_names.add(name)
+
+    # Check if these names appear in list assignments that feed into NODE_CLASS_MAPPINGS
+    export_candidates = set()
+    has_dict_comp_mapping = False
+
+    for node in ast.walk(parsed):
+        # Check for dict comprehension NODE_CLASS_MAPPINGS
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Name) and target.id == 'NODE_CLASS_MAPPINGS':
+                    if isinstance(node.value, ast.DictComp):
+                        has_dict_comp_mapping = True
+
+        # Collect list contents
+        if isinstance(node, ast.Assign):
+            if isinstance(node.value, ast.List):
+                for elt in node.value.elts:
+                    if isinstance(elt, ast.Name) and elt.id in imported_names:
+                        export_candidates.add(elt.id)
+
+        # Handle augmented assignment
+        elif isinstance(node, ast.AugAssign):
+            if isinstance(node.value, ast.List):
+                for elt in node.value.elts:
+                    if isinstance(elt, ast.Name) and elt.id in imported_names:
+                        export_candidates.add(elt.id)
+
+    # Only return if there's a dict comprehension mapping
+    if has_dict_comp_mapping:
+        return export_candidates
+
+    return set()
+
+
+def _extract_repo_name(file_path: Path) -> str:
+    """
+    Extract repository name from file path.
+
+    Path structure: /home/rho/.tmp/analysis/temp/{author}_{reponame}/{path/to/file.py}
+    Returns: {author}_{reponame} or filename if extraction fails
+    """
+    try:
+        parts = file_path.parts
+        # Find 'temp' directory in path
+        if 'temp' in parts:
+            temp_idx = parts.index('temp')
+            if temp_idx + 1 < len(parts):
+                # Next part after 'temp' is the repo directory
+                return parts[temp_idx + 1]
+    except (ValueError, IndexError):
+        pass
+
+    # Fallback to filename if extraction fails
+    return file_path.name if hasattr(file_path, 'name') else str(file_path)
+
+
+def _fallback_empty_dict_detector(code_text: str, file_path: Optional[Path], verbose: bool = False) -> None:
+    """
+    Detect empty NODE_CLASS_MAPPINGS (UI-only extensions).
+    Logs for documentation purposes only (when verbose=True).
+
+    Args:
+        code_text: Python source code to analyze
+        file_path: Path to the file being analyzed
+        verbose: If True, print detection messages
+    """
+    empty_patterns = [
+        'NODE_CLASS_MAPPINGS = {}',
+        'NODE_CLASS_MAPPINGS={}',
+    ]
+
+    code_normalized = code_text.replace(' ', '').replace('\n', '')
+
+    for pattern in empty_patterns:
+        pattern_normalized = pattern.replace(' ', '')
+        if pattern_normalized in code_normalized:
+            if file_path and verbose:
+                repo_name = _extract_repo_name(file_path)
+                print(f"Info: UI-only extension (empty NODE_CLASS_MAPPINGS): {repo_name}")
+            return
 
 def has_comfy_node_base(class_node):
     """Check if class inherits from io.ComfyNode or ComfyNode"""
@@ -229,6 +941,25 @@ def extract_v3_nodes(code_text):
 
 
 # scan
+def extract_metadata_only(filename):
+    """Extract only metadata (@author, @title, etc) without node scanning"""
+    try:
+        with open(filename, encoding='utf-8', errors='ignore') as file:
+            code = file.read()
+
+        metadata = {}
+        lines = code.strip().split('\n')
+        for line in lines:
+            if line.startswith('@'):
+                if line.startswith("@author:") or line.startswith("@title:") or line.startswith("@nickname:") or line.startswith("@description:"):
+                    key, value = line[1:].strip().split(':', 1)
+                    metadata[key.strip()] = value.strip()
+
+        return metadata
+    except:
+        return {}
+
+
 def scan_in_file(filename, is_builtin=False):
     global builtin_nodes
 
@@ -242,8 +973,8 @@ def scan_in_file(filename, is_builtin=False):
     nodes = set()
     class_dict = {}
 
-    # V1 nodes detection
-    nodes |= extract_nodes(code)
+    # V1 nodes detection (enhanced with fallback patterns)
+    nodes |= extract_nodes_enhanced(code, file_path=Path(filename), visited=set())
 
     # V3 nodes detection
     nodes |= extract_v3_nodes(code)
@@ -609,10 +1340,10 @@ def update_custom_nodes(scan_only_mode=False, url_list_file=None):
             if name.endswith(".py"):
                 node_info[name] = (url, title, preemptions, node_pattern)
 
-        try:
-            download_url(url, temp_dir)
-        except Exception:
-            print(f"[ERROR] Cannot download '{url}'")
+            try:
+                download_url(url, temp_dir)
+            except:
+                print(f"[ERROR] Cannot download '{url}'")
 
         with concurrent.futures.ThreadPoolExecutor(10) as executor:
             executor.map(download_and_store_info, py_url_titles_and_pattern)
@@ -620,13 +1351,14 @@ def update_custom_nodes(scan_only_mode=False, url_list_file=None):
     return node_info
 
 
-def gen_json(node_info, scan_only_mode=False):
+def gen_json(node_info, scan_only_mode=False, force_rescan=False):
     """
     Generate extension-node-map.json from scanned node information
 
     Args:
         node_info (dict): Repository metadata mapping
         scan_only_mode (bool): If True, exclude metadata from output
+        force_rescan (bool): If True, ignore cache and force rescan all nodes
     """
     # scan from .py file
     node_files, node_dirs = get_nodes(temp_dir)
@@ -642,13 +1374,17 @@ def gen_json(node_info, scan_only_mode=False):
         py_files = get_py_file_paths(dirname)
         metadata = {}
 
-        nodes = set()
-        for py in py_files:
-            nodes_in_file, metadata_in_file = scan_in_file(py, dirname == "ComfyUI")
-            nodes.update(nodes_in_file)
-            # Include metadata from .py files in both modes
-            metadata.update(metadata_in_file)
-        
+        # Use per-repo cache for node AND metadata extraction
+        try:
+            nodes, metadata = extract_nodes_from_repo(Path(dirname), verbose=False, force_rescan=force_rescan)
+        except:
+            # Fallback to file-by-file scanning if extract_nodes_from_repo fails
+            nodes = set()
+            for py in py_files:
+                nodes_in_file, metadata_in_file = scan_in_file(py, dirname == "ComfyUI")
+                nodes.update(nodes_in_file)
+                metadata.update(metadata_in_file)
+
         dirname = os.path.basename(dirname)
 
         if 'Jovimetrix' in dirname:
@@ -810,11 +1546,14 @@ if __name__ == "__main__":
     print("\n# Generating 'extension-node-map.json'...\n")
 
     # Generate extension-node-map.json
-    gen_json(updated_node_info, scan_only_mode)
+    force_rescan = args.force_rescan if hasattr(args, 'force_rescan') else False
+    if force_rescan:
+        print("⚠️  Force rescan enabled - ignoring all cached results\n")
+    gen_json(updated_node_info, scan_only_mode, force_rescan)
 
     print("\n✅ DONE.\n")
 
     if scan_only_mode:
         print("Output: extension-node-map.json (node mappings only)")
     else:
-        print("Output: extension-node-map.json (full metadata)")
+        print("Output: extension-node-map.json (full metadata)")

scripts/colab-dependencies.py

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

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

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

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