docs: update manager data path to __manager

feat(security): use system user directory for manager data
Use folder_paths.get_system_user_directory("manager") to protect manager config and data from HTTP endpoint access. Ref: comfyanonymous/ComfyUI#10966
2025-12-03 02:38:15 +09:00 · 2025-12-03 02:34:57 +09:00 · 2025-11-26 22:35:03 +09:00 · 2025-11-26 22:14:11 +09:00 · 2025-10-21 07:25:56 +09:00 · 2025-10-21 07:16:57 +09:00
91 changed files with 15566 additions and 9972 deletions
--- a/.env.example
+++ b/.env.example
@@ -0,0 +1 @@
+PYPI_TOKEN=your-pypi-token
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,70 @@
+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
--- a/.github/workflows/publish-to-pypi.yml
+++ b/.github/workflows/publish-to-pypi.yml
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - draft-v4
+      - manager-v4
    paths:
      - "pyproject.toml"

@@ -21,7 +21,7 @@ jobs:
      - name: Set up Python
        uses: actions/setup-python@v4
        with:
-          python-version: '3.9'
+          python-version: '3.x'

      - 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: ${{ secrets.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: ${{ github.token }}
+      #   with:
+      #     files: dist/*
+      #     tag_name: v${{ steps.current_version.outputs.version }}
+      #     draft: false
+      #     prerelease: false
+      #     generate_release_notes: true

      - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc
        with:
          password: ${{ secrets.PYPI_TOKEN }}
          skip-existing: true
-          verbose: true 
+          verbose: true
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,25 +0,0 @@
-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 }}
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,8 @@ github-stats-cache.json
 pip_overrides.json
 *.json
 check2.sh
-/venv/
+/venv/
+build
+dist
+*.egg-info
+.env
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,47 @@
+## 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/
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -0,0 +1,14 @@
+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
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 ![menu](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/refs/heads/Main/ComfyUI-Manager/images/dialog.jpg)

 ## NOTICE
-* V3.38: **Security patch** - Manager data migrated to protected path. See [Migration Guide](docs/en/v3.38-userdata-security-migration.md).
+* V4.0: Modify the structure to be installable via pip instead of using git clone.
 * V3.16: Support for `uv` has been added. Set `use_uv` in `config.ini`.
 * V3.10: `double-click feature` is removed
  * This feature has been moved to https://github.com/ltdrdata/comfyui-connection-helper
@@ -14,78 +14,26 @@

 ## Installation

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

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

-1. 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


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

-To install ComfyUI with ComfyUI-Manager on Linux using a venv environment, you can follow these steps:
-* **prerequisite: python-is-python3, python3-venv, git**
-
-1. Download [scripts/install-comfyui-venv-linux.sh](https://github.com/ltdrdata/ComfyUI-Manager/raw/main/scripts/install-comfyui-venv-linux.sh) into empty install directory
- Don't click. Right-click the link and 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.
+* The built-in front-end of ComfyUI-Manager is the legacy front-end. The front-end for ComfyUI-Manager is now provided via [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend).
+* To enable the legacy front-end, set the environment variable `ENABLE_LEGACY_COMFYUI_MANAGER_FRONT` to `true` before running.


 ## How To Use
@@ -141,27 +89,20 @@ This repository provides Colab notebooks that allow you to install and use Comfy


 ## Paths
-Starting from V3.38, Manager uses a protected system path for enhanced security.
+In `ComfyUI-Manager` V4.0.3b4 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/__manager/`.

 * <USER_DIRECTORY>
  * If executed without any options, the path defaults to ComfyUI/user.
  * It can be set using --user-directory <USER_DIRECTORY>.

-| 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.
+* 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`


 ## `extra_model_paths.yaml` Configuration
@@ -174,12 +115,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>/default/ComfyUI-Manager/snapshots`
+  * Snapshot file dir: `<USER_DIRECTORY>/__manager/snapshots`
  * You can rename snapshot file.
 * Press the "Restore" button to revert to the installation status of the respective snapshot.
  * However, for custom nodes not managed by Git, snapshot support is incomplete.
 * When you press `Restore`, it will take effect on the next ComfyUI startup.
-  * The selected snapshot file is saved in `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts/restore-snapshot.json`, and upon restarting ComfyUI, the snapshot is applied and then deleted.
+  * The selected snapshot file is saved in `<USER_DIRECTORY>/__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)

@@ -228,12 +169,12 @@ The following settings are applied based on the section marked as `is_default`.
    }
    ```
  * `<current timestamp>` Ensure that the timestamp is always unique.
-    * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
+    * "components" should have the same structure as the content of the file stored in `<USER_DIRECTORY>/__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>/default/ComfyUI-Manager/components`.
+          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/__manager/components`.
          * `<category>`: If there is neither a category nor a packname, it is saved in the components category.
          ```
              "version":"1.0",
@@ -274,13 +215,14 @@ 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>
+    network_mode = <Set the network mode => public|private|offline|personal_cloud>
    ```

    * 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
@@ -362,7 +304,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>/default/ComfyUI-Manager/config.ini` file that is generated.
+* If your `git.exe` is installed in a specific location other than system git, please install ComfyUI-Manager and run ComfyUI. Then, specify the path including the file name in `git_exe = ` in the `<USER_DIRECTORY>/__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`
@@ -371,31 +313,33 @@ When you run the `scan.sh` script:


 ## Security policy
-  * 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
+
+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
+


 # Disclaimer
--- a/init.py
+++ b/init.py
@@ -1,25 +0,0 @@
-"""
-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']
-
-
-
--- a/channels.list.template
+++ b/channels.list.template
@@ -1,6 +0,0 @@
-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
--- a/cm-cli.sh
+++ b/cm-cli.sh
@@ -1,2 +0,0 @@
-#!/bin/bash
-python cm-cli.py $*
--- a/comfyui_manager/README.md
+++ b/comfyui_manager/README.md
@@ -2,20 +2,16 @@

 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
+## 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
--- a/comfyui_manager/init.py
+++ b/comfyui_manager/init.py
@@ -0,0 +1,104 @@
+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
+    
--- a/comfyui_manager/alter-list.json
+++ b/comfyui_manager/alter-list.json
--- a/comfyui_manager/channels.list.template
+++ b/comfyui_manager/channels.list.template
@@ -0,0 +1,6 @@
+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
--- a/snapshots/the_snapshot_files_are_located_here
+++ b/snapshots/the_snapshot_files_are_located_here
--- a/comfyui_manager/cm_cli/main.py
+++ b/comfyui_manager/cm_cli/main.py
@@ -15,31 +15,31 @@ import git
 import importlib


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

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

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

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

 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:
+    except Exception:
        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(core.manager_config.path)
+        config.read(context.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:
+    except Exception:
        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(core.comfy_base_path, 'custom_nodes')]
+        self.custom_nodes_paths = [os.path.join(context.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)

-        core.update_user_directory(user_directory)
+        context.update_user_directory(user_directory)

-        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:
+        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:
                cm_global.pip_overrides = json.load(json_file)

-        if os.path.exists(core.manager_pip_blacklist_path):
-            with open(core.manager_pip_blacklist_path, 'r', encoding="UTF-8", errors="ignore") as f:
+        if os.path.exists(context.manager_pip_blacklist_path):
+            with open(context.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(core.manager_startup_script_path, "install-scripts.txt")
+        return os.path.join(context.manager_startup_script_path, "install-scripts.txt")

    @staticmethod
    def get_restore_snapshot_path():
-        return os.path.join(core.manager_startup_script_path, "restore-snapshot.json")
+        return os.path.join(context.manager_startup_script_path, "restore-snapshot.json")

    @staticmethod
    def get_snapshot_path():
-        return core.manager_snapshot_path
+        return context.manager_snapshot_path

    @staticmethod
    def get_custom_nodes_paths():
@@ -438,8 +438,11 @@ 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[k]
-            processed[k] = "[    ENABLED    ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
+            cnr = unified_manager.cnr_map.get(k)
+            if cnr:
+                processed[k] = "[    ENABLED    ] ", cnr['name'], k, cnr['publisher']['name'], v[0]
+            else:
+                processed[k] = None
        else:
            processed[k] = None

@@ -459,8 +462,11 @@ def show_list(kind, simple=False):
            continue

        if flag:
-            cnr = unified_manager.cnr_map[k]
-            processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], ", ".join(list(v.keys()))
+            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
        else:
            processed[k] = None

@@ -469,8 +475,11 @@ def show_list(kind, simple=False):
            continue

        if flag:
-            cnr = unified_manager.cnr_map[k]
-            processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
+            cnr = unified_manager.cnr_map.get(k)
+            if cnr:
+                processed[k] = "[    DISABLED   ] ", cnr['name'], k, cnr['publisher']['name'], 'nightly'
+            else:
+                processed[k] = None
        else:
            processed[k] = None

@@ -490,9 +499,12 @@ def show_list(kind, simple=False):
            continue

        if flag:
-            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
+            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
        else:
            processed[k] = None

@@ -658,7 +670,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, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
    for_each_nodes(nodes, act=install_node, exit_on_fail=exit_on_fail)
    pip_fixer.fix_broken()

@@ -696,7 +708,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, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
    for_each_nodes(nodes, act=reinstall_node)
    pip_fixer.fix_broken()

@@ -750,7 +762,7 @@ def update(
    if 'all' in nodes:
        asyncio.run(auto_save_snapshot())

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)

    for x in nodes:
        if x.lower() in ['comfyui', 'comfy', 'all']:
@@ -851,7 +863,7 @@ def fix(
    if 'all' in nodes:
        asyncio.run(auto_save_snapshot())

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
    for_each_nodes(nodes, fix_node, allow_all=True)
    pip_fixer.fix_broken()

@@ -1128,7 +1140,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, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
    try:
        asyncio.run(core.restore_snapshot(snapshot_path, extras))
    except Exception:
@@ -1160,7 +1172,7 @@ def restore_dependencies(
    total = len(node_paths)
    i = 1

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
    for x in node_paths:
        print("----------------------------------------------------------------------------------------------------")
        print(f"Restoring [{i}/{total}]: {x}")
@@ -1179,7 +1191,7 @@ def post_install(
 ):
    path = os.path.expanduser(path)

-    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
+    pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
    unified_manager.execute_install_script('', path, instant_execution=True)
    pip_fixer.fix_broken()

@@ -1219,11 +1231,11 @@ def install_deps(
        with open(deps, 'r', encoding="UTF-8", errors="ignore") as json_file:
            try:
                json_obj = json.load(json_file)
-            except:
+            except Exception:
                print(f"[bold red]Invalid json file: {deps}[/bold red]")
                exit(1)

-            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, core.manager_files_path)
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, context.manager_files_path)
            for k in json_obj['custom_nodes'].keys():
                state = core.simple_check_custom_node(k)
                if state == 'installed':
@@ -1280,6 +1292,10 @@ 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())
--- a/comfyui_manager/common/README.md
+++ b/comfyui_manager/common/README.md
@@ -0,0 +1,16 @@
+# 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.
--- a/comfyui_manager/common/init.py
+++ b/comfyui_manager/common/init.py
--- a/comfyui_manager/common/cm_global.py
+++ b/comfyui_manager/common/cm_global.py
--- a/comfyui_manager/common/cnr_utils.py
+++ b/comfyui_manager/common/cnr_utils.py
@@ -6,10 +6,12 @@ import time
 from dataclasses import dataclass
 from typing import List

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

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

@@ -22,7 +24,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:
-        print("A timeout occurred during the fetch process from ComfyRegistry.")
+        logging.info("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):
@@ -47,9 +49,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 = manager_core.get_current_comfyui_ver() or 'unknown'
+            comfyui_ver = context.get_current_comfyui_ver() or 'unknown'
        else:
-            comfyui_ver = manager_core.get_comfyui_tag() or 'unknown'
+            comfyui_ver = context.get_comfyui_tag() or 'unknown'

        if is_desktop:
            if is_windows:
@@ -78,12 +80,12 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
                full_nodes[x['id']] = x

            if page % 5 == 0:
-                print(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")
+                logging.info(f"FETCH ComfyRegistry Data: {page}/{sub_json_obj['totalPages']}")

            page += 1
            time.sleep(0.5)

-        print("FETCH ComfyRegistry Data [DONE]")
+        logging.info("FETCH ComfyRegistry Data [DONE]")

        for v in full_nodes.values():
            if 'latest_version' not in v:
@@ -99,7 +101,7 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
            if cache_state == 'not-cached':
                return {}
            else:
-                print("[ComfyUI-Manager] The ComfyRegistry cache update is still in progress, so an outdated cache is being used.")
+                logging.info("[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']

@@ -111,9 +113,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:
+    except Exception:
        res = {}
-        print("Cannot connect to comfyregistry.")
+        logging.warning("Cannot connect to comfyregistry.")
    finally:
        if cache_mode:
            is_cache_loading = False
@@ -210,6 +212,7 @@ 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
@@ -221,6 +224,7 @@ def read_cnr_info(fullpath):
            if name and version:  # repository is optional
                return {
                    "id": name,
+                    "original_name": original_name,
                    "version": version,
                    "url": repository
                }
@@ -236,8 +240,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:
-        print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")
+    except Exception:
+        logging.error(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")


 def read_cnr_id(fullpath):
@@ -246,7 +250,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:
+    except Exception:
        pass

    return None
--- a/comfyui_manager/common/context.py
+++ b/comfyui_manager/common/context.py
@@ -0,0 +1,108 @@
+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, "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
+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_components_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_components_path = os.path.join(manager_files_path, "components")
+    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
+
--- a/comfyui_manager/common/enums.py
+++ b/comfyui_manager/common/enums.py
@@ -0,0 +1,18 @@
+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"
--- a/comfyui_manager/common/git_helper.py
+++ b/comfyui_manager/common/git_helper.py
@@ -15,9 +15,12 @@ comfy_path = os.environ.get('COMFYUI_PATH')
 git_exe_path = os.environ.get('GIT_EXE_PATH')

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

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

 def download_url(url, dest_folder, filename=None):
    # Ensure the destination folder exists
@@ -153,27 +156,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:
+    except Exception:
        # try checkout master
        # try checkout main if failed
        try:
            repo.git.checkout(repo.heads.master)
            return True
-        except:
+        except Exception:
            try:
                if remote_name is not None:
                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
                    return True
-            except:
+            except Exception:
                try:
                    repo.git.checkout(repo.heads.main)
                    return True
-                except:
+                except Exception:
                    try:
                        if remote_name is not None:
                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
                            return True
-                    except:
+                    except Exception:
                        pass

    print("[ComfyUI Manager] Failed to switch to the default branch")
@@ -444,7 +447,7 @@ def restore_pip_snapshot(pips, options):
        res = 1
        try:
            res = subprocess.check_call([sys.executable, '-m', 'pip', 'install'] + non_url)
-        except:
+        except Exception:
            pass

        # fallback
@@ -453,7 +456,7 @@ def restore_pip_snapshot(pips, options):
                res = 1
                try:
                    res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-                except:
+                except Exception:
                    pass

                if res != 0:
@@ -464,7 +467,7 @@ def restore_pip_snapshot(pips, options):
            res = 1
            try:
                res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except:
+            except Exception:
                pass

            if res != 0:
@@ -475,7 +478,7 @@ def restore_pip_snapshot(pips, options):
            res = 1
            try:
                res = subprocess.check_call([sys.executable, '-m', 'pip', 'install', x])
-            except:
+            except Exception:
                pass

            if res != 0:
--- a/comfyui_manager/common/git_utils.py
+++ b/comfyui_manager/common/git_utils.py
--- a/comfyui_manager/common/manager_downloader.py
+++ b/comfyui_manager/common/manager_downloader.py
--- a/comfyui_manager/common/manager_security.py
+++ b/comfyui_manager/common/manager_security.py
@@ -0,0 +1,36 @@
+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
--- a/comfyui_manager/common/manager_util.py
+++ b/comfyui_manager/common/manager_util.py
@@ -19,6 +19,7 @@ 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**.
@@ -26,6 +27,9 @@ 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 = ':'
@@ -97,7 +101,7 @@ def make_pip_cmd(cmd):
 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
 #     from distutils.version import StrictVersion
-# except:
+# except Exception:
 #     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
 class StrictVersion:
    def __init__(self, version_string):
@@ -552,7 +556,7 @@ def robust_readlines(fullpath):
    try:
        with open(fullpath, "r") as f:
            return f.readlines()
-    except:
+    except Exception:
        encoding = None
        with open(fullpath, "rb") as f:
            raw_data = f.read()
--- a/comfyui_manager/common/node_package.py
+++ b/comfyui_manager/common/node_package.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 import os

-from git_utils import get_commit_hash
+from .git_utils import get_commit_hash


@dataclass
--- a/comfyui_manager/common/security_check.py
+++ b/comfyui_manager/common/security_check.py
@@ -2,7 +2,7 @@ import sys
 import subprocess
 import os

-import manager_util
+from . import manager_util


 def security_check():
--- a/comfyui_manager/custom-node-list.json
+++ b/comfyui_manager/custom-node-list.json
@@ -13625,16 +13625,6 @@
            "install_type": "git-clone",
            "description": "This custom node for ComfyUI integrates the Flux-Prompt-Enhance model, allowing you to enhance your prompts directly within your ComfyUI workflows."
        },
-        {
-            "author": "marduk191",
-            "title": "comfyui_qwen_runninghub",
-            "reference": "https://github.com/marduk191/comfyui_qwen_runninghub",
-            "files": [
-                "https://github.com/marduk191/comfyui_qwen_runninghub"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom ComfyUI nodes for integrating RunningHub's AI image and video generation services into workflows. (Description by CC)"
-        },
        {
            "author": "haohaocreates",
            "title": "ComfyUI-HH-Image-Selector",
@@ -16824,16 +16814,6 @@
            "install_type": "git-clone",
            "description": "pass up to 8 images and visually place, rotate and scale them to build the perfect composition. group move and group rescale. remember their position and scaling value across generations to easy swap images. use the buffer zone to to park an asset you don't want to use or easily reach transformations controls"
        },
-        {
-            "author": "erosDiffusion",
-            "title": "ComfyUI-ZImageDit",
-            "reference": "https://github.com/erosDiffusion/ComfyUI-ZImageDit",
-            "files": [
-                "https://github.com/erosDiffusion/ComfyUI-ZImageDit"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial diffusers integration of the official SDNQ pipeline to run in ComfyUI. (Description by CC)"
-        },
        {
            "author": "Steudio",
            "title": "ComfyUI Steudio",
@@ -26404,16 +26384,6 @@
            "install_type": "git-clone",
            "description": "ComfyUI nodes for generating and editing speech from SRT subtitle files using VoxCPM text-to-speech model, supporting multi-speaker dialogue and audio replacement workflows."
        },
-        {
-            "author": "judian17",
-            "title": "ComfyUI-multiple-inputs",
-            "reference": "https://github.com/judian17/ComfyUI-multiple-inputs",
-            "files": [
-                "https://github.com/judian17/ComfyUI-multiple-inputs"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of utility nodes for ComfyUI, focusing on batch processing, stitching, and visualization."
-        },
        {
            "author": "AngelCookies",
            "title": "ComfyUI-Seed-Tracker",
@@ -31795,14 +31765,13 @@
        },
        {
            "author": "Rzgar Espo",
-            "title": "ComfyUI Qwen Image Size Picker",
-            "id": "QwenImg-latent",
+            "title": "ComfyUI-Qwen-Image-Size-Picker",
            "reference": "https://github.com/rzgarespo/ComfyUI-qwen-image-size-picker",
            "files": [
                "https://github.com/rzgarespo/ComfyUI-qwen-image-size-picker"
            ],
            "install_type": "git-clone",
-            "description": "An empty latent size picker with support for Qwen Image, SDXL, and Flux models."
+            "description": "A universal node for generating empty latent tensors with support for Qwen Image, SDXL and Flux models. Features extended aspect ratio support, batch processing, and flexible dimension overrides."
        },
        {
            "author": "luke-mino-altherr",
@@ -32459,7 +32428,6 @@
            "author": "RUiNtheExtinct",
            "title": "comfyui-save-file-extended",
            "reference": "https://github.com/RUiNtheExtinct/comfyui-save-file-extended",
-            "reference2": "https://github.com/bytes2pro/comfyui-save-file-extended",
            "files": [
                "https://github.com/RUiNtheExtinct/comfyui-save-file-extended"
            ],
@@ -32516,6 +32484,16 @@
            "install_type": "git-clone",
            "description": "A tool that organizes workflow nodes into clean, user-friendly layouts"
        },
+        {
+            "author": "rslosch",
+            "title": "ComfyUI-EZ_Prompts",
+            "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": "rslosch",
            "title": "ComfyUI Batch BBox Detector",
@@ -32849,16 +32827,6 @@
            "install_type": "git-clone",
            "description": "This project provides a collection of custom nodes designed for enhanced audio effects in ComfyUI. With an intuitive pedalboard interface, users can easily integrate and manipulate various audio effects within their workflows."
        },
-        {
-            "author": "MushroomFleet",
-            "title": "ComfyUI-FLUX2-JSON",
-            "reference": "https://github.com/MushroomFleet/ComfyUI-FLUX2-JSON",
-            "files": [
-                "https://github.com/MushroomFleet/ComfyUI-FLUX2-JSON"
-            ],
-            "install_type": "git-clone",
-            "description": "A comprehensive suite of custom nodes for building structured JSON prompts for FLUX.2 image generation with precision and control."
-        },
        {
            "author": "Urabewe",
            "title": "ComfyUI Video Extend Counter",
@@ -35416,6 +35384,16 @@
            "install_type": "git-clone",
            "description": "A ComfyUI scheduler that finds the shift value required to align high/low sampling steps with a target sigma boundary."
        },
+        {
+            "author": "hvppycoding",
+            "title": "hvppyflow",
+            "reference": "https://github.com/hvppycoding/hvppyflow",
+            "files": [
+                "https://github.com/hvppycoding/hvppyflow"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI nodes for Automated Workflow"
+        },
        {
            "author": "l33chking",
            "title": "ComfyUI Channel Ops",
@@ -36267,16 +36245,6 @@
            "install_type": "git-clone",
            "description": "Control different parts of your image with separate prompts using visual box drawing."
        },
-        {
-            "author": "EnragedAntelope",
-            "title": "comfyui-sdnq",
-            "reference": "https://github.com/EnragedAntelope/comfyui-sdnq",
-            "files": [
-                "https://github.com/EnragedAntelope/comfyui-sdnq"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom node pack for loading SDNQ quantized models"
-        },
        {
            "author": "tester4488",
            "title": "mc_qwen",
@@ -36488,29 +36456,7 @@
            ],
            "install_type": "git-clone",
            "description": "A dual-model image-to-video sampler for ComfyUI that combines high-noise and low-noise models in a single node, replacing two KSamplerAdvanced nodes with zero overhead and bit-identical frame generation. (Description by CC)"
-        },
-        {
-            "author": "princepainter",
-            "title": "Comfyui-PainterVRAM",
-            "reference": "https://github.com/princepainter/Comfyui-PainterVRAM",
-            "files": [
-                "https://github.com/princepainter/Comfyui-PainterVRAM"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI node that reserves GPU VRAM before workflow execution to prevent OOM crashes with manual or auto mode options."
-        },
-        {
-            "author": "princepainter",
-            "title": "PainterFLF2V - First/Last Frame Video Enhancer",
-            "id": "painterflf2v",
-            "reference": "https://github.com/princepainter/Comfyui-PainterFLF2V",
-            "files": [
-                "https://github.com/princepainter/Comfyui-PainterFLF2V"
-            ],
-            "install_type": "git-clone",
-            "description": "Enhance first and last frames for smooth video loop generation in ComfyUI. Based on WAN Video workflow.",
-            "tags": ["video", "frame", "loop", "workflow"]
-        },
+        },        
        {
            "author": "rafacost",
            "title": "rafacostComfy",
@@ -37041,17 +36987,6 @@
            "description": "Adds shortcuts for commenting and deleting lines of text, with a configurable comment symbol. Includes a node that cleans comments from text and splits content using tags for Regional Prompting.",
            "tags": ["frontend", "shortcut", "utility"]
        },
-        {
-            "author": "akawana",
-            "title": "Utils Extra",
-            "reference": "https://github.com/akawana/ComfyUI-Utils-extra",
-            "files": [
-                "https://github.com/akawana/ComfyUI-Utils-extra"
-            ],
-            "install_type": "git-clone",
-            "description": "Utility tools. Index Multiple is used for expanding multiple values from a list, IsOneOfGroupsActive to identify groups state, RepeatGroupState group enable/disable like rg but without connection etc.",
-            "tags": ["utility", "list", "batch"]
-        }, 
        {
            "author": "lovisdotio",
            "title": "ComfyUI-Replace-First-Frame-Last-Frame",
@@ -37102,16 +37037,6 @@
            "install_type": "git-clone",
            "description": "Custom ComfyUI nodes that split large images into overlapping tiles for processing and merge them back seamlessly with feathering blending. (Description by CC)"
        },
-        {
-            "author": "tuki0918",
-            "title": "ComfyUI_Cooldown_Node",
-            "reference": "https://github.com/tuki0918/ComfyUI_Cooldown_Node",
-            "files": [
-                "https://github.com/tuki0918/ComfyUI_Cooldown_Node"
-            ],
-            "install_type": "git-clone",
-            "description": "Provides custom nodes with a cooldown feature for ComfyUI. (Description by CC)"
-        },        
        {
            "author": "NeoDroleDeGueule",
            "title": "NDDG_Great_Nodes",
@@ -37132,167 +37057,12 @@
            "install_type": "git-clone",
            "description": "Collection of image processing utility nodes for ComfyUI including intelligent cropping, aspect ratio scaling, and crop box restoration capabilities. (Description by CC)"
        },
-        {
-            "author": "chchchadzilla",
-            "title": "ComfyUI-ChomfyNodes",
-            "reference": "https://github.com/chchchadzilla/ComfyUI-ChomfyNodes",
-            "files": [
-                "https://github.com/chchchadzilla/ComfyUI-ChomfyNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "A professional suite of utility nodes for ComfyUI, featuring forensic logging, massive wildcard control, universal noise injection, and persistent counters."
-        },
-        {
-            "author": "nitingrg",
-            "title": "comfyui-ntools",
-            "reference": "https://github.com/nitingrg/comfyui-ntools",
-            "files": [
-                "https://github.com/nitingrg/comfyui-ntools"
-            ],
-            "install_type": "git-clone",
-            "description": "Essential little utilities that should have been in ComfyUI from day one. (Description by CC)"
-        },
-        {
-            "author": "jav12z",
-            "title": "ComfyUI-ToyShaders",
-            "reference": "https://github.com/jav12z/ComfyUI-ToyShaders",
-            "files": [
-                "https://github.com/jav12z/ComfyUI-ToyShaders"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom node for ComfyUI that allows you to render GLSL shaders (Shadertoy-style) directly inside your workflows. (Description by CC)"
-        },
-        {
-            "author": "Nynxz",
-            "title": "ComfyUI-NynxzNodes",
-            "reference": "https://github.com/Nynxz/ComfyUI-NynxzNodes",
-            "files": [
-                "https://github.com/Nynxz/ComfyUI-NynxzNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom ComfyUI nodes providing video comparison utilities, including wipe and fade compare video generation in multiple directions. (Description by CC)"
-        },
-        {
-            "author": "huygiatrng",
-            "title": "Facefusion_comfyui",
-            "reference": "https://github.com/huygiatrng/Facefusion_comfyui",
-            "files": [
-                "https://github.com/huygiatrng/Facefusion_comfyui"
-            ],
-            "install_type": "git-clone",
-            "description": "Advanced face swapping for ComfyUI with local ONNX inference - no API required!"
-        },
-        {
-            "author": "Ada123-a",
-            "title": "ComfyUI-Kandinsky",
-            "reference": "https://github.com/Ada123-a/ComfyUI-Kandinsky",
-            "files": [
-                "https://github.com/Ada123-a/ComfyUI-Kandinsky"
-            ],
-            "install_type": "git-clone",
-            "description": "Kandinsky 2/20B ComfyUI support with FP8/GGUF/blockswap support."
-        },
-        {
-            "author": "obvirm",
-            "title": "ComfyUI-WhisperXX",
-            "reference": "https://github.com/obvirm/ComfyUI-WhisperXX",
-            "files": [
-                "https://github.com/obvirm/ComfyUI-WhisperXX"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom node for ComfyUI that provides advanced transcription, alignment, and diarization capabilities using the WhisperX library."
-        },
-        {
-            "author": "geroldmeisinger",
-            "title": "ComfyUI-outputlists-combiner",
-            "reference": "https://github.com/geroldmeisinger/ComfyUI-outputlists-combiner",
-            "files": [
-                "https://github.com/geroldmeisinger/ComfyUI-outputlists-combiner"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom nodes to create output lists with strings and numbers, make combinations of them, and help with XYZ-Gridplots"
-        },
-        {
-            "author": "agavesunset",
-            "title": "AgaveLogicCounter",
-            "reference": "https://github.com/agavesunset/AgaveLogicCounter",
-            "files": [
-                "https://github.com/agavesunset/AgaveLogicCounter"
-            ],
-            "install_type": "git-clone",
-            "description": "Solves the complex 'For-Loop' logic in ComfyUI. Perfect for controlling multi-subject vs. multi-scene batch workflows."
-        },
-        {
-            "author": "idvdii",
-            "title": "ComfyUI-DvD-LoraTriggerwordsManager",
-            "reference": "https://github.com/idvdii/ComfyUI-DvD-LoraTriggerwordsManager",
-            "files": [
-                "https://github.com/idvdii/ComfyUI-DvD-LoraTriggerwordsManager"
-            ],
-            "install_type": "git-clone",
-            "description": "Professional ComfyUI custom nodes for managing LoRA trigger words, with auto-read, smart lookup via Civitai, editing, and WebUI-compatible JSON format support. (Description by CC)"
-        },
-        {
-            "author": "zhanglongxiao111",
-            "title": "Comfyui-geminiapi",
-            "reference": "https://github.com/zhanglongxiao111/Comfyui-geminiapi",
-            "files": [
-                "https://github.com/zhanglongxiao111/Comfyui-geminiapi"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom nodes for integrating multiple external APIs including Gemini, OpenAI, Replicate, and ElevenLabs directly into local workflows. (Description by CC)"
-        },

-        {
-            "author": "keghoang",
-            "title": "ComfyUI-Charon",
-            "reference": "https://github.com/keghoang/ComfyUI-Charon",
-            "files": [
-                "https://github.com/keghoang/ComfyUI-Charon"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom ComfyUI nodes for CHARON auto-alignment and DA3 camera export."
-        },
-        {
-            "author": "mobcat40",
-            "title": "ComfyUI-PromptChain",
-            "reference": "https://github.com/mobcat40/ComfyUI-PromptChain",
-            "files": [
-                "https://github.com/mobcat40/ComfyUI-PromptChain"
-            ],
-            "install_type": "git-clone",
-            "description": "A visual tool for prompt randomization and advanced combinations inside of your ComfyUI workflows."
-        },
-        {
-            "author": "tpc2233",
-            "title": "ComfyUI-Z-Image-Turbo",
-            "reference": "https://github.com/tpc2233/ComfyUI-Z-Image-Turbo",
-            "files": [
-                "https://github.com/tpc2233/ComfyUI-Z-Image-Turbo"
-            ],
-            "install_type": "git-clone",
-            "description": "Comfy UI nodes for Z-Image-Turbo to run native weights with automatic model downloading and support for 2048x2048 resolution. (Description by CC)"
-        },
-        {
-            "author": "Rathius-Saranoth",
-            "title": "Rathius_ComfyNodes",
-            "reference": "https://github.com/Rathius-Saranoth/Rathius_ComfyNodes",
-            "files": [
-                "https://github.com/Rathius-Saranoth/Rathius_ComfyNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Collection of quality-of-life ComfyUI nodes including a text file loader for parsing descriptions and managing prompts without manual copy-paste. (Description by CC)"
-        },
-        {
-            "author": "jrabek",
-            "title": "BokehDiffusionComfyUI",
-            "reference": "https://github.com/jrabek/BokehDiffusionComfyUI",
-            "files": [
-                "https://github.com/jrabek/BokehDiffusionComfyUI"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom nodes for Bokeh Diffusion - Defocus Blur Control in Text-to-Image Diffusion Models."
-        },
+
+
+
+
+



@@ -37722,6 +37492,6 @@
            ],
            "install_type": "unzip",
            "description": "This is a node to convert an image into a CMYK Halftone dot image."
-        }
+        }		
    ]
 }
--- a/comfyui_manager/data_models/README.md
+++ b/comfyui_manager/data_models/README.md
@@ -0,0 +1,68 @@
+# 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
--- a/comfyui_manager/data_models/init.py
+++ b/comfyui_manager/data_models/init.py
@@ -0,0 +1,137 @@
+"""
+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",
+]
--- a/comfyui_manager/data_models/generated_models.py
+++ b/comfyui_manager/data_models/generated_models.py
@@ -0,0 +1,561 @@
+# 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
--- a/comfyui_manager/extension-node-map.json
+++ b/comfyui_manager/extension-node-map.json
--- a/comfyui_manager/extras.json
+++ b/comfyui_manager/extras.json
--- a/comfyui_manager/github-stats.json
+++ b/comfyui_manager/github-stats.json
--- a/comfyui_manager/glob/CLAUDE.md
+++ b/comfyui_manager/glob/CLAUDE.md
@@ -0,0 +1,11 @@
+- 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).
--- a/comfyui_manager/glob/init.py
+++ b/comfyui_manager/glob/init.py
--- a/comfyui_manager/glob/constants.py
+++ b/comfyui_manager/glob/constants.py
@@ -0,0 +1,55 @@
+
+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",
+]
--- a/comfyui_manager/glob/manager_core.py
+++ b/comfyui_manager/glob/manager_core.py
--- a/comfyui_manager/glob/manager_server.py
+++ b/comfyui_manager/glob/manager_server.py
--- a/comfyui_manager/glob/share_3rdparty.py
+++ b/comfyui_manager/glob/share_3rdparty.py
@@ -1,5 +1,7 @@
 import mimetypes
-import manager_core as core
+from ..common import context
+from . import manager_core as core
+
 import os
 from aiohttp import web
 import aiohttp
@@ -8,6 +10,16 @@ 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):
@@ -53,7 +65,7 @@ def compute_sha256_checksum(filepath):
    return sha256.hexdigest()


-@PromptServer.instance.routes.get("/manager/share_option")
+@PromptServer.instance.routes.get("/v2/manager/share_option")
 async def share_option(request):
    if "value" in request.rel_url.query:
        core.get_config()['share_option'] = request.rel_url.query['value']
@@ -65,21 +77,21 @@ async def share_option(request):


 def get_openart_auth():
-    if not os.path.exists(os.path.join(core.manager_files_path, ".openart_key")):
+    if not os.path.exists(os.path.join(context.manager_files_path, ".openart_key")):
        return None
    try:
-        with open(os.path.join(core.manager_files_path, ".openart_key"), "r") as f:
+        with open(os.path.join(context.manager_files_path, ".openart_key"), "r") as f:
            openart_key = f.read().strip()
        return openart_key if openart_key else None
-    except:
+    except Exception:
        return None


 def get_matrix_auth():
-    if not os.path.exists(os.path.join(core.manager_files_path, "matrix_auth")):
+    if not os.path.exists(os.path.join(context.manager_files_path, "matrix_auth")):
        return None
    try:
-        with open(os.path.join(core.manager_files_path, "matrix_auth"), "r") as f:
+        with open(os.path.join(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:
@@ -89,40 +101,40 @@ def get_matrix_auth():
            "username": username,
            "password": password,
        }
-    except:
+    except Exception:
        return None


 def get_comfyworkflows_auth():
-    if not os.path.exists(os.path.join(core.manager_files_path, "comfyworkflows_sharekey")):
+    if not os.path.exists(os.path.join(context.manager_files_path, "comfyworkflows_sharekey")):
        return None
    try:
-        with open(os.path.join(core.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
+        with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "r") as f:
            share_key = f.read()
            if not share_key.strip():
                return None
        return share_key
-    except:
+    except Exception:
        return None


 def get_youml_settings():
-    if not os.path.exists(os.path.join(core.manager_files_path, ".youml")):
+    if not os.path.exists(os.path.join(context.manager_files_path, ".youml")):
        return None
    try:
-        with open(os.path.join(core.manager_files_path, ".youml"), "r") as f:
+        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:
+    except Exception:
        return None


 def set_youml_settings(settings):
-    with open(os.path.join(core.manager_files_path, ".youml"), "w") as f:
+    with open(os.path.join(context.manager_files_path, ".youml"), "w") as f:
        f.write(settings)


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


-@PromptServer.instance.routes.post("/manager/set_openart_auth")
+@PromptServer.instance.routes.post("/v2/manager/set_openart_auth")
 async def api_set_openart_auth(request):
    json_data = await request.json()
    openart_key = json_data['openart_key']
-    with open(os.path.join(core.manager_files_path, ".openart_key"), "w") as f:
+    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("/manager/get_matrix_auth")
+@PromptServer.instance.routes.get("/v2/manager/get_matrix_auth")
 async def api_get_matrix_auth(request):
    # print("Getting stored Matrix credentials...")
    matrix_auth = get_matrix_auth()
@@ -149,7 +161,7 @@ async def api_get_matrix_auth(request):
    return web.json_response(matrix_auth)


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


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


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


-@PromptServer.instance.routes.post("/manager/set_esheep_workflow_and_images")
+@PromptServer.instance.routes.post("/v2/manager/set_esheep_workflow_and_images")
 async def set_esheep_workflow_and_images(request):
    json_data = await request.json()
-    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), "w", encoding='utf-8') as file:
+    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("/manager/get_esheep_workflow_and_images")
+@PromptServer.instance.routes.get("/v2/manager/get_esheep_workflow_and_images")
 async def get_esheep_workflow_and_images(request):
-    with open(os.path.join(core.manager_files_path, "esheep_share_message.json"), 'r', encoding='utf-8') as file:
+    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(core.manager_files_path, "matrix_auth"), "w") as f:
+    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(core.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
+    with open(os.path.join(context.manager_files_path, "comfyworkflows_sharekey"), "w") as f:
        f.write(comfyworkflows_sharekey)


@@ -211,7 +231,7 @@ def has_provided_comfyworkflows_auth(comfyworkflows_sharekey):
    return comfyworkflows_sharekey.strip()


-@PromptServer.instance.routes.post("/manager/share")
+@PromptServer.instance.routes.post("/v2/manager/share")
 async def share_art(request):
    # get json data
    json_data = await request.json()
@@ -233,7 +253,7 @@ async def share_art(request):

    try:
        output_to_share = potential_outputs[int(selected_output_index)]
-    except:
+    except Exception:
        # for now, pick the first output
        output_to_share = potential_outputs[0]

@@ -329,14 +349,12 @@ async def share_art(request):
                workflowId = upload_workflow_json["workflowId"]

    # check if the user has provided Matrix credentials
-    if "matrix" in share_destinations:
+    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:
-            from nio import AsyncClient, LoginResponse, UploadResponse
-
            homeserver = 'matrix.org'
            if matrix_auth:
                homeserver = matrix_auth.get('homeserver', 'matrix.org')
--- a/comfyui_manager/glob/utils/init.py
+++ b/comfyui_manager/glob/utils/init.py
--- a/comfyui_manager/glob/utils/environment_utils.py
+++ b/comfyui_manager/glob/utils/environment_utils.py
@@ -0,0 +1,142 @@
+import os
+import git
+import logging
+import traceback
+
+from comfyui_manager.common import context
+import folder_paths
+from comfy.cli_args import args
+import latent_preview
+
+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_preview_method(method):
+    if method == "auto":
+        args.preview_method = latent_preview.LatentPreviewMethod.Auto
+    elif method == "latent2rgb":
+        args.preview_method = latent_preview.LatentPreviewMethod.Latent2RGB
+    elif method == "taesd":
+        args.preview_method = latent_preview.LatentPreviewMethod.TAESD
+    else:
+        args.preview_method = latent_preview.LatentPreviewMethod.NoPreviews
+
+    core.get_config()["preview_method"] = method
+
+
+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"
+    # )
+
+    set_preview_method(core.get_config()["preview_method"])
+    print_comfyui_version()
+    setup_environment()
+
+    core.check_invalid_nodes()
--- a/comfyui_manager/glob/utils/formatting_utils.py
+++ b/comfyui_manager/glob/utils/formatting_utils.py
@@ -0,0 +1,60 @@
+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>")
--- a/comfyui_manager/glob/utils/model_utils.py
+++ b/comfyui_manager/glob/utils/model_utils.py
@@ -0,0 +1,161 @@
+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
--- a/comfyui_manager/glob/utils/node_pack_utils.py
+++ b/comfyui_manager/glob/utils/node_pack_utils.py
@@ -0,0 +1,65 @@
+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
--- a/comfyui_manager/glob/utils/security_utils.py
+++ b/comfyui_manager/glob/utils/security_utils.py
@@ -0,0 +1,67 @@
+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
--- a/comfyui_manager/js/README.md
+++ b/comfyui_manager/js/README.md
--- a/comfyui_manager/js/cm-api.js
+++ b/comfyui_manager/js/cm-api.js
@@ -1,6 +1,6 @@
 import { api } from "../../scripts/api.js";
 import { app } from "../../scripts/app.js";
-import { sleep, customConfirm, customAlert, handle403Response, show_message } from "./common.js";
+import { sleep, customConfirm, customAlert } 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(`/customnode/toggle_active`, {
+			const response = await api.fetchApi(`/v2/customnode/toggle_active`, {
 										method: 'POST',
 										headers: { 'Content-Type': 'application/json' },
 										body: JSON.stringify(event.detail.target)
@@ -35,14 +35,14 @@ async function tryInstallCustomNode(event) {
 			await sleep(300);
 			app.ui.dialog.show(`Installing... '${event.detail.target.title}'`);

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

 			if(response.status == 403) {
-				await handle403Response(response);
+				show_message('This action is not allowed with this security level configuration.');
 				return false;
 			}
 			else if(response.status == 400) {
@@ -52,9 +52,9 @@ async function tryInstallCustomNode(event) {
 			}
 		}

-		let response = await api.fetchApi("/manager/reboot");
+		let response = await api.fetchApi("/v2/manager/reboot");
 		if(response.status == 403) {
-			await handle403Response(response);
+			show_message('This action is not allowed with this security level configuration.');
 			return false;
 		}

--- a/comfyui_manager/js/comfyui-manager.js
+++ b/comfyui_manager/js/comfyui-manager.js
@@ -14,9 +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, handle403Response
+	infoToast, showTerminal, setNeedRestart, generateUUID
 } from "./common.js";
-import { ComponentBuilderDialog, getPureName, load_components, set_component_policy } from "./components-manager.js";
+import { ComponentBuilderDialog, 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";
@@ -189,8 +189,7 @@ docStyle.innerHTML = `
 }
 `;

-function is_legacy_front() {
-    let compareVersion = '1.2.49';
+function isBeforeFrontendVersion(compareVersion) {
    try {
        const frontendVersion = window['__COMFYUI_FRONTEND_VERSION__'];
        if (typeof frontendVersion !== 'string') {
@@ -232,7 +231,7 @@ var restart_stop_button = null;
 var update_policy_combo = null;

 let share_option = 'all';
-var is_updating = false;
+var batch_id = null;


 // copied style from https://github.com/pythongosssss/ComfyUI-Custom-Scripts
@@ -415,7 +414,7 @@ const style = `
 `;

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

 async function init_notice(notice) {
-	api.fetchApi('/manager/notice')
+	api.fetchApi('/v2/manager/notice')
 		.then(response => response.text())
 		.then(data => {
 			notice.innerHTML = data;
@@ -474,14 +473,19 @@ async function updateComfyUI() {
 	let prev_text = update_comfyui_button.innerText;
 	update_comfyui_button.innerText = "Updating ComfyUI...";

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

-	is_updating = true;
-	await api.fetchApi('/manager/queue/start');
+	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)
+	});
 }

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

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

-			let response = await api.fetchApi(`/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
+			let response = await api.fetchApi(`/v2/comfyui_manager/comfyui_switch_version?ver=${selected_version}`, { cache: "no-store" });
 			if (response.status == 200) {
 				infoToast(`ComfyUI version is switched to ${selected_version}`);
 			}
@@ -656,18 +660,17 @@ 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 == 'done') {
+	else if(event.detail.status == 'all-done') {
 		reset_action_buttons();
-
-		if(!is_updating)  {
+	}
+	else if(event.detail.status == 'batch-done') {
+		if(batch_id != event.detail.batch_id) {
 			return;
 		}

-		is_updating = false;
-
 		let success_list = [];
 		let failed_list = [];
 		let comfyui_state = null;
@@ -753,9 +756,9 @@ async function onQueueStatus(event) {

 		const rebootButton = document.getElementById('cm-reboot-button5');
 		rebootButton?.addEventListener("click",
-			async function() {
-				if(await rebootAPI()) {
-					manager_instance.close();
+			function() {
+				if(rebootAPI()) {
+					manager_dialog.close();
 				}
 			});
 	}
@@ -767,46 +770,28 @@ 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...";
-		await api.fetchApi('/manager/queue/update_comfyui');
+		batch['update_comfyui'] = true;
 	}

-	const response = await api.fetchApi(`/manager/queue/update_all?mode=${mode}`);
+	batch['update_all'] = mode;

-	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');
-	}
+	const res = await api.fetchApi(`/v2/manager/queue/batch`, {
+		method: 'POST',
+		body: JSON.stringify(batch)
+	});
 }

-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)
 */
@@ -819,7 +804,7 @@ function restartOrStop() {
 		rebootAPI();
 	}
 	else {
-		api.fetchApi('/manager/queue/reset');
+		api.fetchApi('/v2/manager/queue/reset');
 		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 	}
 }
@@ -967,12 +952,12 @@ class ManagerMenuDialog extends ComfyDialog {
 		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
 		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));

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

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

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

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

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

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

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

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

-		api.fetchApi('/manager/share_option')
+		api.fetchApi('/v2/manager/share_option')
 			.then(response => response.text())
 			.then(data => {
 				share_combo.value = data || 'all';
@@ -1047,7 +1032,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		share_combo.addEventListener('change', function (event) {
 			const value = event.target.value;
 			share_option = value;
-			api.fetchApi(`/manager/share_option?value=${value}`);
+			api.fetchApi(`/v2/manager/share_option?value=${value}`);
 			const shareButton = document.getElementById("shareButton");
 			if (value === 'none') {
 				shareButton.style.display = "none";
@@ -1062,7 +1047,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
 		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
 		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
-		api.fetchApi('/manager/policy/component')
+		api.fetchApi('/v2/manager/policy/component')
 			.then(response => response.text())
 			.then(data => {
 				component_policy_combo.value = data;
@@ -1070,7 +1055,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			});

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

@@ -1083,14 +1068,14 @@ class ManagerMenuDialog extends ComfyDialog {
 		update_policy_combo.className = "cm-menu-combo";
 		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
 		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
-		api.fetchApi('/manager/policy/update')
+		api.fetchApi('/v2/manager/policy/update')
 			.then(response => response.text())
 			.then(data => {
 				update_policy_combo.value = data;
 			});

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

 		return [
@@ -1393,12 +1378,12 @@ class ManagerMenuDialog extends ComfyDialog {
 }

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

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

 	aboutPageBadges: [
 		{
@@ -1458,31 +1443,6 @@ app.registerExtension({

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

@@ -1554,8 +1514,6 @@ 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.');
--- a/comfyui_manager/js/comfyui-share-common.js
+++ b/comfyui_manager/js/comfyui-share-common.js
@@ -172,7 +172,7 @@ export const shareToEsheep= () => {
 		const nodes = app.graph._nodes
 		const { potential_outputs, potential_output_nodes } = getPotentialOutputsAndOutputNodes(nodes);
 		const workflow = prompt['workflow']
-		api.fetchApi(`/manager/set_esheep_workflow_and_images`, {
+		api.fetchApi(`/v2/manager/set_esheep_workflow_and_images`, {
 			method: 'POST',
 			headers: { 'Content-Type': 'application/json' },
 			body: JSON.stringify({
@@ -552,6 +552,20 @@ 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)";
@@ -812,7 +826,7 @@ export class ShareDialog extends ComfyDialog {
 		// get the user's existing matrix auth and share key
 		ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
 		try {
-			api.fetchApi(`/manager/get_matrix_auth`)
+			api.fetchApi(`/v2/manager/get_matrix_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.matrix_auth = data;
@@ -831,7 +845,7 @@ export class ShareDialog extends ComfyDialog {
 		ShareDialog.cw_sharekey = "";
 		try {
 			// console.log("Fetching comfyworkflows share key")
-			api.fetchApi(`/manager/get_comfyworkflows_auth`)
+			api.fetchApi(`/v2/manager/get_comfyworkflows_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.cw_sharekey = data.comfyworkflows_sharekey;
@@ -891,7 +905,7 @@ export class ShareDialog extends ComfyDialog {
 			// Change the text of the share button to "Sharing..." to indicate that the share process has started
 			this.share_button.textContent = "Sharing...";

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

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

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

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

  async saveToken(value) {
-    await api.fetchApi(`/manager/youml/settings`, {
+    await api.fetchApi(`/v2/manager/youml/settings`, {
      method: 'POST',
      headers: {'Content-Type': 'application/json'},
      body: JSON.stringify({
@@ -380,7 +380,7 @@ export class YouMLShareDialog extends ComfyDialog {
    try {
      let snapshotData = null;
      try {
-        const snapshot = await api.fetchApi(`/snapshot/get_current`)
+        const snapshot = await api.fetchApi(`/v2/snapshot/get_current`)
        snapshotData = await snapshot.json()
      } catch (e) {
        console.error("Failed to get snapshot", e)
--- a/comfyui_manager/js/common.js
+++ b/comfyui_manager/js/common.js
@@ -100,19 +100,6 @@ 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));
 }
@@ -176,23 +163,20 @@ export async function customPrompt(title, message) {
 }


-export async function rebootAPI() {
+export function rebootAPI() {
 	if ('electronAPI' in window) {
 			window.electronAPI.restartApp();
 			return true;
 	}

-	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;
+	customConfirm("Are you sure you'd like to reboot the server?").then((isConfirmed) => {
+		if (isConfirmed) {
+			try {
+				api.fetchApi("/v2/manager/reboot");
 			}
+			catch(exception) {}
 		}
-		catch(exception) {}
-	}
+	});

 	return false;
 }
@@ -226,13 +210,13 @@ export async function install_pip(packages) {
 	if(packages.includes('&'))
 		app.ui.dialog.show(`Invalid PIP package enumeration: '${packages}'`);

-	const res = await api.fetchApi("/customnode/install/pip", {
+	const res = await api.fetchApi("/v2/customnode/install/pip", {
 		method: "POST",
 		body: packages,
 	});

 	if(res.status == 403) {
-		await handle403Response(res);
+		show_message('This action is not allowed with this security level configuration.');
 		return;
 	}

@@ -261,13 +245,13 @@ export async function install_via_git_url(url, manager_dialog) {

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

-	const res = await api.fetchApi("/customnode/install/git_url", {
+	const res = await api.fetchApi("/v2/customnode/install/git_url", {
 		method: "POST",
 		body: url,
 	});

 	if(res.status == 403) {
-		await handle403Response(res);
+		show_message('This action is not allowed with this security level configuration.');
 		return;
 	}

@@ -278,9 +262,9 @@ export async function install_via_git_url(url, manager_dialog) {
 		const self = this;

 		rebootButton.addEventListener("click",
-			async function() {
-				if(await rebootAPI()) {
-					manager_instance.close();
+			function() {
+				if(rebootAPI()) {
+					manager_dialog.close();
 				}
 			});
 	}
@@ -646,6 +630,14 @@ 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;
--- a/comfyui_manager/js/components-manager.js
+++ b/comfyui_manager/js/components-manager.js
@@ -64,7 +64,7 @@ function storeGroupNode(name, data, register=true) {
 }

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

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

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

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

 let current_component_policy = 'workflow';
 try {
-	api.fetchApi('/manager/policy/component')
+	api.fetchApi('/v2/manager/policy/component')
 		.then(response => response.text())
 		.then(data => { current_component_policy = data; });
 }
--- a/comfyui_manager/js/custom-nodes-manager.css
+++ b/comfyui_manager/js/custom-nodes-manager.css
--- a/comfyui_manager/js/custom-nodes-manager.js
+++ b/comfyui_manager/js/custom-nodes-manager.js
@@ -7,7 +7,7 @@ import {
 	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
 	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
 	storeColumnWidth, restoreColumnWidth, getTimeAgo, copyText, loadCss,
-	showPopover, hidePopover, handle403Response
+	showPopover, hidePopover, generateUUID
 } from  "./common.js";

 // https://cenfun.github.io/turbogrid/api.html
@@ -66,7 +66,7 @@ export class CustomNodesManager {
 		this.id = "cn-manager";

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

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

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

@@ -1441,13 +1441,6 @@ 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") {
@@ -1474,10 +1467,10 @@ export class CustomNodesManager {
 		let needRestart = false;
 		let errorMsg = "";

-		await api.fetchApi('/manager/queue/reset');
-
 		let target_items = [];

+		let batch = {};
+
 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
 			target_items.push(item);
@@ -1519,32 +1512,11 @@ export class CustomNodesManager {
 				api_mode = 'reinstall';
 			}

-			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;
+			if(batch[api_mode]) {
+				batch[api_mode].push(data);
+			}
+			else {
+				batch[api_mode] = [data];
 			}
 		}

@@ -1561,7 +1533,24 @@ export class CustomNodesManager {
 			}
 		}
 		else {
-			await api.fetchApi('/manager/queue/start');
+			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}`;
+				}
+			}
+
 			this.showStop();
 			showTerminal();
 		}
@@ -1569,6 +1558,9 @@ export class CustomNodesManager {

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

@@ -1579,7 +1571,7 @@ export class CustomNodesManager {
 			self.grid.updateCell(item, "action");
 			self.grid.setRowSelected(item, false);
 		}
-		else if(event.detail.status == 'done') {
+		else if(event.detail.status == 'batch-done' && event.detail.batch_id == self.batch_id) {
 			self.hideStop();
 			self.onQueueCompleted(event.detail);
 		}
@@ -1773,7 +1765,7 @@ export class CustomNodesManager {
 	async getMissingNodesLegacy(hashMap, missing_nodes) {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading missing nodes (${mode}) ...`);
-		const res = await fetchData(`/customnode/getmappings?mode=${mode}`);
+		const res = await fetchData(`/v2/customnode/getmappings?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get custom node mappings: ${res.error}`);
 			return;
@@ -1888,7 +1880,7 @@ export class CustomNodesManager {
 	async getAlternatives() {
 		const mode = manager_instance.datasrc_combo.value;
 		this.showStatus(`Loading alternatives (${mode}) ...`);
-		const res = await fetchData(`/customnode/alternatives?mode=${mode}`);
+		const res = await fetchData(`/v2/customnode/alternatives?mode=${mode}`);
 		if (res.error) {
 			this.showError(`Failed to get alternatives: ${res.error}`);
 			return [];
@@ -1936,7 +1928,7 @@ export class CustomNodesManager {
 			infoToast('Fetching updated information. This may take some time if many custom nodes are installed.');
 		}

-		const res = await fetchData(`/customnode/getlist?mode=${mode}${skip_update}`);
+		const res = await fetchData(`/v2/customnode/getlist?mode=${mode}${skip_update}`);
 		if (res.error) {
 			this.showError("Failed to get custom node list.");
 			this.hideLoading();
--- a/comfyui_manager/js/model-manager.css
+++ b/comfyui_manager/js/model-manager.css
--- a/comfyui_manager/js/model-manager.js
+++ b/comfyui_manager/js/model-manager.js
@@ -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, handle403Response
+	storeColumnWidth, restoreColumnWidth, loadCss, generateUUID
 } from  "./common.js";
 import { api } from "../../scripts/api.js";

@@ -175,7 +175,7 @@ export class ModelManager {

 			".cmm-manager-stop": {
 				click: () => {
-					api.fetchApi('/manager/queue/reset');
+					api.fetchApi('/v2/manager/queue/reset');
 					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 				}
 			},
@@ -435,24 +435,16 @@ 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 = "";

-		await api.fetchApi('/manager/queue/reset');
-
 		let target_items = [];

+		let batch = {};
+
 		for (const item of list) {
 			this.grid.scrollRowIntoView(item);
 			target_items.push(item);
@@ -468,30 +460,12 @@ 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 (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;
+			if(batch['install_model']) {
+				batch['install_model'].push(data);
+			}
+			else {
+				batch['install_model'] = [data];
 			}
 		}

@@ -508,7 +482,24 @@ export class ModelManager {
 			}
 		}
 		else {
-			await api.fetchApi('/manager/queue/start');
+			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}`;
+				}
+			}
+
 			this.showStop();
 			showTerminal();
 		}
@@ -528,7 +519,7 @@ export class ModelManager {
 //			self.grid.updateCell(item, "tg-column-select");
 			self.grid.updateRow(item);
 		}
-		else if(event.detail.status == 'done') {
+		else if(event.detail.status == 'batch-done') {
 			self.hideStop();
 			self.onQueueCompleted(event.detail);
 		}
@@ -654,7 +645,7 @@ export class ModelManager {

 		const mode = manager_instance.datasrc_combo.value;

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

 app.registerExtension({
-	name: "Comfy.Manager.NodeFixer",
+	name: "Comfy.Legacy.Manager.NodeFixer",
 	beforeRegisterNodeDef(nodeType, nodeData, app) {
 		addMenuHandler(nodeType, function (_, options) {
 			options.push({
--- a/comfyui_manager/js/popover-helper.js
+++ b/comfyui_manager/js/popover-helper.js
--- a/comfyui_manager/js/snapshot.js
+++ b/comfyui_manager/js/snapshot.js
@@ -1,16 +1,16 @@
 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, handle403Response } from  "./common.js";
+import { manager_instance, rebootAPI, show_message } from  "./common.js";


 async function restore_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/snapshot/restore?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/v2/snapshot/restore?target=${target}`, { cache: "no-store" });

 			if(response.status == 403) {
-				await handle403Response(response);
+				show_message('This action is not allowed with this security level configuration.');
 				return false;
 			}

@@ -35,10 +35,10 @@ async function restore_snapshot(target) {
 async function remove_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi(`/snapshot/remove?target=${target}`, { cache: "no-store" });
+			const response = await api.fetchApi(`/v2/snapshot/remove?target=${target}`, { cache: "no-store" });

 			if(response.status == 403) {
-				await handle403Response(response);
+				show_message('This action is not allowed with this security level configuration.');
 				return false;
 			}

@@ -61,7 +61,7 @@ async function remove_snapshot(target) {

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

 async function getSnapshotList() {
-	const response = await api.fetchApi(`/snapshot/getlist`);
+	const response = await api.fetchApi(`/v2/snapshot/getlist`);
 	const data = await response.json();
 	return data;
 }
@@ -145,8 +145,8 @@ export class SnapshotManager extends ComfyDialog {
 		if(btn_id) {
 			const rebootButton = document.getElementById(btn_id);
 			const self = this;
-			rebootButton.onclick = async function() {
-				if(await rebootAPI()) {
+			rebootButton.onclick = function() {
+				if(rebootAPI()) {
 					self.close();
 					self.manager_dialog.close();
 				}
--- a/comfyui_manager/js/turbogrid.esm.js
+++ b/comfyui_manager/js/turbogrid.esm.js
--- a/comfyui_manager/js/workflow-metadata.js
+++ b/comfyui_manager/js/workflow-metadata.js
@@ -38,7 +38,7 @@ class WorkflowMetadataExtension {
   * enabled is true if the node is enabled, false if it is disabled
   */
  async getInstalledNodes() {
-    const res = await api.fetchApi("/customnode/installed");
+    const res = await api.fetchApi("/v2/customnode/installed");
    return await res.json();
  }

--- a/comfyui_manager/legacy/init.py
+++ b/comfyui_manager/legacy/init.py
--- a/comfyui_manager/legacy/manager_core.py
+++ b/comfyui_manager/legacy/manager_core.py
@@ -23,7 +23,6 @@ import yaml
 import zipfile
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed
-import toml

 orig_print = print

@@ -32,23 +31,22 @@ from packaging import version

 import uuid

-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
+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


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


-DEFAULT_CHANNEL = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"
+DEFAULT_CHANNEL = "https://raw.githubusercontent.com/Comfy-Org/ComfyUI-Manager/main"
+DEFAULT_CHANNEL_LEGACY = "https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main"


 default_custom_nodes_path = None
@@ -59,13 +57,14 @@ 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:
+        except Exception:
            default_custom_nodes_path = os.path.abspath(os.path.join(manager_util.comfyui_manager_path, '..'))

    return default_custom_nodes_path
@@ -75,37 +74,11 @@ def get_custom_nodes_paths():
        try:
            import folder_paths
            return folder_paths.get_folder_paths("custom_nodes")
-        except:
+        except Exception:
            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')
@@ -113,10 +86,10 @@ def get_script_env():
        new_env['GIT_EXE_PATH'] = git_exe

    if 'COMFYUI_PATH' not in new_env:
-        new_env['COMFYUI_PATH'] = comfy_path
+        new_env['COMFYUI_PATH'] = context.comfy_path

    if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
-        new_env['COMFYUI_FOLDERS_BASE_PATH'] = comfy_path
+        new_env['COMFYUI_FOLDERS_BASE_PATH'] = context.comfy_path

    return new_env

@@ -138,12 +111,12 @@ def check_invalid_nodes():

    try:
        import folder_paths
-    except:
+    except Exception:
        try:
-            sys.path.append(comfy_path)
+            sys.path.append(context.comfy_path)
            import folder_paths
-        except:
-            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {comfy_path}")
+        except Exception:
+            raise Exception(f"Invalid COMFYUI_FOLDERS_BASE_PATH: {context.comfy_path}")

    def check(root):
        global invalid_nodes
@@ -178,76 +151,6 @@ 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

@@ -258,7 +161,7 @@ comfy_ui_revision = "Unknown"
 comfy_ui_commit_datetime = datetime(1900, 1, 1, 0, 0, 0)

 channel_dict = None
-valid_channels = {'default', 'local'}
+valid_channels = {'default', 'local', DEFAULT_CHANNEL, DEFAULT_CHANNEL_LEGACY}
 channel_list = None


@@ -623,7 +526,7 @@ class UnifiedManager:
                    ver = str(manager_util.StrictVersion(info['version']))
                    return {'id': cnr['id'], 'cnr': cnr, 'ver': ver}
                else:
-                    return None
+                    return {'id': info['id'], 'ver': info['version']}
            else:
                return None

@@ -799,7 +702,9 @@ class UnifiedManager:

        return latest

-    async def reload(self, cache_mode, dont_wait=True):
+    async def reload(self, cache_mode, dont_wait=True, update_cnr_map=True):
+        import folder_paths
+
        self.custom_node_map_cache = {}
        self.cnr_inactive_nodes = {}      # node_id -> node_version -> fullpath
        self.nightly_inactive_nodes = {}  # node_id -> fullpath
@@ -807,17 +712,18 @@ class UnifiedManager:
        self.unknown_active_nodes = {}    # node_id -> repo url * fullpath
        self.active_nodes = {}            # node_id -> node_version * fullpath

-        if get_config()['network_mode'] != 'public':
+        if get_config()['network_mode'] != 'public' or manager_util.is_manager_pip_package():
            dont_wait = True

-        # reload 'cnr_map' and 'repo_cnr_map'
-        cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)
+        if update_cnr_map:
+            # reload 'cnr_map' and 'repo_cnr_map'
+            cnrs = await cnr_utils.get_cnr_data(cache_mode=cache_mode=='cache', dont_wait=dont_wait)

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

        # reload node status info from custom_nodes/*
        for custom_nodes_path in folder_paths.get_folder_paths('custom_nodes'):
@@ -865,7 +771,7 @@ class UnifiedManager:
                if 'id' in x:
                    if x['id'] not in res:
                        res[x['id']] = (x, True)
-            except:
+            except Exception:
                logging.error(f"[ComfyUI-Manager] broken item:{x}")

        return res
@@ -918,7 +824,7 @@ class UnifiedManager:
    def safe_version(ver_str):
        try:
            return version.parse(ver_str)
-        except:
+        except Exception:
            return version.parse("0.0.0")

    def execute_install_script(self, url, repo_path, instant_execution=False, lazy_mode=False, no_deps=False):
@@ -932,15 +838,14 @@ 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(), comfy_path, manager_files_path)
+                pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.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)
-                        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('#'):
+                        install_cmd = manager_util.make_pip_cmd(["install", package_name])
+                        if package_name.strip() != "" and not package_name.startswith('#'):
                            res = res and try_install_script(url, repo_path, install_cmd, instant_execution=instant_execution)

                pip_fixer.fix_broken()
@@ -954,7 +859,7 @@ class UnifiedManager:
        return res

    def reserve_cnr_switch(self, target, zip_url, from_path, to_path, no_deps):
-        script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
+        script_path = os.path.join(context.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")
@@ -1360,7 +1265,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, 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, context.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:
@@ -1513,12 +1418,20 @@ class UnifiedManager:
            return self.unified_enable(node_id, version_spec)

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

-            to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), node_id))
+                # use `repo name` as a dir name instead of `cnr id` if system added nodepack (i.e. publisher is null)
+                cnr = self.cnr_map.get(node_id)
+
+                if cnr is not None and cnr.get('publisher') is None:
+                    repo_name = os.path.basename(git_utils.normalize_url(repo_url))
+                    to_path = os.path.abspath(os.path.join(get_default_custom_nodes_path(), repo_name))
+
            res = self.repo_install(repo_url, to_path, instant_execution=instant_execution, no_deps=no_deps, return_postinstall=return_postinstall)
            if res.result:
                if version_spec == 'unknown':
@@ -1579,7 +1492,7 @@ def identify_node_pack_from_path(fullpath):
        if github_id is None:
            try:
                github_id = os.path.basename(repo_url)
-            except:
+            except Exception:
                logging.warning(f"[ComfyUI-Manager] unexpected repo url: {repo_url}")
                github_id = module_name

@@ -1634,10 +1547,10 @@ def get_channel_dict():
    if channel_dict is None:
        channel_dict = {}

-        if not os.path.exists(manager_channel_list_path):
-            shutil.copy(channel_list_template_path, manager_channel_list_path)
+        if not os.path.exists(context.manager_channel_list_path):
+            shutil.copy(context.channel_list_template_path, context.manager_channel_list_path)

-        with open(manager_channel_list_path, 'r') as file:
+        with open(context.manager_channel_list_path, 'r') as file:
            channels = file.read()
            for x in channels.split('\n'):
                channel_info = x.split("::")
@@ -1701,18 +1614,18 @@ def write_config():
        'db_mode': get_config()['db_mode'],
    }

-    directory = os.path.dirname(manager_config_path)
+    directory = os.path.dirname(context.manager_config_path)
    if not os.path.exists(directory):
        os.makedirs(directory)

-    with open(manager_config_path, 'w') as configfile:
+    with open(context.manager_config_path, 'w') as configfile:
        config.write(configfile)


 def read_config():
    try:
        config = configparser.ConfigParser(strict=False)
-        config.read(manager_config_path)
+        config.read(context.manager_config_path)
        default_conf = config['default']

        def get_bool(key, default_value):
@@ -1721,11 +1634,11 @@ 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)

-        result = {
+        return {
                    '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', False),
+                    'use_uv': get_bool('use_uv', True),
                    '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(),
@@ -1737,24 +1650,20 @@ def read_config():
                    'model_download_by_agent': get_bool('model_download_by_agent', False),
                    'downgrade_blacklist': default_conf.get('downgrade_blacklist', '').lower(),
                    'always_lazy_install': get_bool('always_lazy_install', False),
-                    'network_mode': default_conf.get('network_mode', 'public').lower(),
-                    'security_level': default_conf.get('security_level', 'normal').lower(),
-                    'db_mode': default_conf.get('db_mode', 'cache').lower(),
+                    'network_mode': default_conf.get('network_mode', NetworkMode.PUBLIC.value).lower(),
+                    'security_level': default_conf.get('security_level', SecurityLevel.NORMAL.value).lower(),
+                    'db_mode': default_conf.get('db_mode', DBMode.CACHE.value).lower(),
               }
-        manager_migration.force_security_level_if_needed(result)
-        return result

    except Exception:
-        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.use_uv = False
        manager_util.bypass_ssl = False

-        result = {
+        return {
            'http_channel_enabled': False,
            'preview_method': manager_funcs.get_current_preview_method(),
            'git_exe': '',
-            'use_uv': manager_util.use_uv,
+            'use_uv': True,
            'channel_url': DEFAULT_CHANNEL,
            'default_cache_as_channel_url': False,
            'share_option': 'all',
@@ -1766,12 +1675,10 @@ def read_config():
            'model_download_by_agent': False,
            'downgrade_blacklist': '',
            'always_lazy_install': False,
-            'network_mode': 'public',   # public | private | offline
-            'security_level': 'normal', # strong | normal | normal- | weak
-            'db_mode': 'cache',         # local | cache | remote
+            'network_mode': NetworkMode.PUBLIC.value,
+            'security_level': SecurityLevel.NORMAL.value,
+            'db_mode': DBMode.CACHE.value,
        }
-        manager_migration.force_security_level_if_needed(result)
-        return result


 def get_config():
@@ -1814,27 +1721,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:
+    except Exception:
        # try checkout master
        # try checkout main if failed
        try:
            repo.git.checkout(repo.heads.master)
            return True
-        except:
+        except Exception:
            try:
                if remote_name is not None:
                    repo.git.checkout('-b', 'master', f'{remote_name}/master')
                    return True
-            except:
+            except Exception:
                try:
                    repo.git.checkout(repo.heads.main)
                    return True
-                except:
+                except Exception:
                    try:
                        if remote_name is not None:
                            repo.git.checkout('-b', 'main', f'{remote_name}/main')
                            return True
-                    except:
+                    except Exception:
                        pass

    print("[ComfyUI Manager] Failed to switch to the default branch")
@@ -1842,10 +1749,10 @@ def switch_to_default_branch(repo):


 def reserve_script(repo_path, install_cmds):
-    if not os.path.exists(manager_startup_script_path):
-        os.makedirs(manager_startup_script_path)
+    if not os.path.exists(context.manager_startup_script_path):
+        os.makedirs(context.manager_startup_script_path)

-    script_path = os.path.join(manager_startup_script_path, "install-scripts.txt")
+    script_path = os.path.join(context.manager_startup_script_path, "install-scripts.txt")
    with open(script_path, "a") as file:
        obj = [repo_path] + install_cmds
        file.write(f"{obj}\n")
@@ -1885,7 +1792,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:
+            except Exception:
                pass

        if code != 0:
@@ -1900,11 +1807,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, git_script_path, "--fetch", path]
+        command = [sys.executable, context.git_script_path, "--fetch", path]
    elif do_update:
-        command = [sys.executable, git_script_path, "--pull", path]
+        command = [sys.executable, context.git_script_path, "--pull", path]
    else:
-        command = [sys.executable, git_script_path, "--check", path]
+        command = [sys.executable, context.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)
@@ -1958,7 +1865,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):


 def __win_check_git_pull(path):
-    command = [sys.executable, git_script_path, "--pull", path]
+    command = [sys.executable, context.git_script_path, "--pull", path]
    process = subprocess.Popen(command, env=get_script_env(), cwd=get_default_custom_nodes_path())
    process.wait()

@@ -1974,7 +1881,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(), comfy_path, manager_files_path)
+            pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), context.comfy_path, context.manager_files_path)
            with open(requirements_path, "r") as requirements_file:
                for line in requirements_file:
                    #handle comments
@@ -2006,6 +1913,27 @@ 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):
    """

@@ -2154,13 +2082,6 @@ def is_valid_url(url):
    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')
@@ -2178,11 +2099,8 @@ 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=None, channel='default', mode='cache')
+            return await unified_manager.install_by_id(cnr_id, version_spec='nightly', 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
@@ -2210,15 +2128,11 @@ 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, 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, context.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()

@@ -2281,7 +2195,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
            cache_uri = str(manager_util.simple_hash(uri))+'_'+filename
            cache_uri = os.path.join(manager_util.cache_dir, cache_uri)

-            if get_config()['network_mode'] == 'offline':
+            if get_config()['network_mode'] == 'offline' or manager_util.is_manager_pip_package():
                # offline network mode
                if os.path.exists(cache_uri):
                    json_obj = await manager_util.get_data(cache_uri)
@@ -2301,7 +2215,7 @@ async def get_data_by_mode(mode, filename, channel_url=None):
                        with open(cache_uri, "w", encoding='utf-8') as file:
                            json.dump(json_obj, file, indent=4, sort_keys=True)
    except Exception as e:
-        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename}\n=> {e}")
+        print(f"[ComfyUI-Manager] Due to a network error, switching to local mode.\n=> {filename} @ {channel_url}/{mode}\n=> {e}")
        uri = os.path.join(manager_util.comfyui_manager_path, filename)
        json_obj = await manager_util.get_data(uri)

@@ -2372,7 +2286,7 @@ def gitclone_uninstall(files):
            url = url[:-1]
        try:
            for custom_nodes_dir in get_custom_nodes_paths():
-                dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
+                dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
                dir_path = os.path.join(custom_nodes_dir, dir_name)

                # safety check
@@ -2420,7 +2334,7 @@ def gitclone_set_active(files, is_disable):
            url = url[:-1]
        try:
            for custom_nodes_dir in get_custom_nodes_paths():
-                dir_name = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
+                dir_name:str = os.path.splitext(os.path.basename(url))[0].replace(".git", "")
                dir_path = os.path.join(custom_nodes_dir, dir_name)

                # safety check
@@ -2517,7 +2431,7 @@ def update_to_stable_comfyui(repo_path):
        repo = git.Repo(repo_path)
        try:
            repo.git.checkout(repo.heads.master)
-        except:
+        except Exception:
            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)
@@ -2541,7 +2455,7 @@ def update_to_stable_comfyui(repo_path):
            repo.git.checkout(latest_tag)
            execute_install_script("ComfyUI", repo_path, instant_execution=False, no_deps=False)
            return 'updated', latest_tag
-    except:
+    except Exception:
        traceback.print_exc()
        return "fail", None
            
@@ -2698,7 +2612,7 @@ async def get_current_snapshot(custom_nodes_only = False):
    await unified_manager.get_custom_nodes('default', 'cache')

    # Get ComfyUI hash
-    repo_path = comfy_path
+    repo_path = context.comfy_path

    comfyui_commit_hash = None
    if not custom_nodes_only:
@@ -2743,7 +2657,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:
+                except Exception:
                    print(f"Failed to extract snapshots for the custom node '{path}'.")

            elif path.endswith('.py'):
@@ -2774,7 +2688,7 @@ async def save_snapshot_with_postfix(postfix, path=None, custom_nodes_only = Fal
        date_time_format = now.strftime("%Y-%m-%d_%H-%M-%S")
        file_name = f"{date_time_format}_{postfix}"

-        path = os.path.join(manager_snapshot_path, f"{file_name}.json")
+        path = os.path.join(context.manager_snapshot_path, f"{file_name}.json")
    else:
        file_name = path.replace('\\', '/').split('/')[-1]
        file_name = file_name.split('.')[-2]
@@ -2801,7 +2715,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:
+            except Exception:
                print(f"Invalid workflow file: {filepath}")
                exit(-1)

@@ -2814,7 +2728,7 @@ async def extract_nodes_from_workflow(filepath, mode='local', channel_url='defau
            else:
                try:
                    workflow = json.loads(img.info['workflow'])
-                except:
+                except Exception:
                    print(f"This is not a valid .png file containing a ComfyUI workflow: {filepath}")
                    exit(-1)

@@ -3085,7 +2999,7 @@ def populate_github_stats(node_packs, json_obj_github):
                v['stars'] = -1
                v['last_update'] = -1
                v['trust'] = False
-        except:
+        except Exception:
            logging.error(f"[ComfyUI-Manager] DB item is broken:\n{v}")


@@ -3363,12 +3277,12 @@ async def restore_snapshot(snapshot_path, git_helper_extras=None):

 def get_comfyui_versions(repo=None):
    if repo is None:
-        repo = git.Repo(comfy_path)
+        repo = git.Repo(context.comfy_path)

    try:
-        remote = get_remote_name(repo)
-        repo.remotes[remote].fetch()
-    except:
+        remote = get_remote_name(repo)   
+        repo.remotes[remote].fetch()    
+    except Exception:
        logging.error("[ComfyUI-Manager] Failed to fetch ComfyUI")

    versions = [x.name for x in repo.tags if x.name.startswith('v')]
@@ -3397,7 +3311,7 @@ def get_comfyui_versions(repo=None):


 def switch_comfyui(tag):
-    repo = git.Repo(comfy_path)
+    repo = git.Repo(context.comfy_path)

    if tag == 'nightly':
        repo.git.checkout('master')
@@ -3437,5 +3351,5 @@ def repo_switch_commit(repo_path, commit_hash):

        repo.git.checkout(commit_hash)
        return True
-    except:
+    except Exception:
        return None
--- a/comfyui_manager/legacy/manager_server.py
+++ b/comfyui_manager/legacy/manager_server.py
--- a/comfyui_manager/legacy/share_3rdparty.py
+++ b/comfyui_manager/legacy/share_3rdparty.py
@@ -0,0 +1,451 @@
+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)
--- a/comfyui_manager/model-list.json
+++ b/comfyui_manager/model-list.json
--- a/comfyui_manager/prestartup_script.py
+++ b/comfyui_manager/prestartup_script.py
@@ -12,13 +12,10 @@ import ast
 import logging
 import traceback

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

 manager_util.add_python_path_to_env()
@@ -66,16 +63,14 @@ 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)
@@ -85,23 +80,12 @@ 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]
-
-# 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_files_path = folder_paths.get_system_user_directory("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():
@@ -408,7 +392,11 @@ try:
        def emit(self, record):
            global is_start_mode

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

            if is_start_mode:
                match = re.search(pat_import_fail, message)
@@ -451,35 +439,6 @@ 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)
@@ -503,7 +462,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:
+    except Exception:
        pass


@@ -524,7 +483,6 @@ 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)

@@ -610,7 +568,10 @@ if os.path.exists(restore_snapshot_path):
        if 'COMFYUI_FOLDERS_BASE_PATH' not in new_env:
            new_env["COMFYUI_FOLDERS_BASE_PATH"] = comfy_path

-        cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
+        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]
        exit_code = process_wrap(cmd_str, custom_nodes_base_path, handler=msg_capture, env=new_env)

        if exit_code != 0:
@@ -802,11 +763,7 @@ def execute_startup_script():


 # Check if script_list_path exists
-# 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):
+if os.path.exists(script_list_path):
    execute_startup_script()


--- a/docs/en/v3.38-userdata-security-migration.md
+++ b/docs/en/v3.38-userdata-security-migration.md
@@ -1,230 +0,0 @@
-# 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
--- a/glob/manager_migration.py
+++ b/glob/manager_migration.py
@@ -1,356 +0,0 @@
-"""
-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.",
-        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
--- a/node_db/dev/custom-node-list.json
+++ b/node_db/dev/custom-node-list.json
@@ -1,85 +1,5 @@
 {
    "custom_nodes": [
-        {
-            "author": "starsFriday",
-            "title": "ComfyUI-Tracker-Person [WIP]",
-            "reference": "https://github.com/starsFriday/ComfyUI-Tracker-Person",
-            "files": [
-                "https://github.com/starsFriday/ComfyUI-Tracker-Person"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom node using YOLO instance segmentation to track specific people in video frames with color histogram re-identification for robust tracking across occlusions. (Description by CC)\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "judian17",
-            "title": "ComfyUI-MIDI-3D [WIP]",
-            "reference": "https://github.com/judian17/ComfyUI-MIDI-3D",
-            "files": [
-                "https://github.com/judian17/ComfyUI-MIDI-3D"
-            ],
-            "install_type": "git-clone",
-            "description": "Partial implementation of the MIDI-3D project for ComfyUI with multi-view normal/depth map generation and texture baking. (Description by CC)\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "IAFFeng",
-            "title": "Comfyui_XF_Custom_Actual-Node",
-            "reference": "https://github.com/IAFFeng/Comfyui_XF_Custom_Actual-Node",
-            "files": [
-                "https://github.com/IAFFeng/Comfyui_XF_Custom_Actual-Node"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom node providing GeminiMatting functionality for image matting operations. (Description by CC)"
-        },
-        {
-            "author": "LvyuanW",
-            "title": "ComfyUI-6yuan [WIP]",
-            "reference": "https://github.com/LvyuanW/ComfyUI-6yuan",
-            "files": [
-                "https://github.com/LvyuanW/ComfyUI-6yuan"
-            ],
-            "install_type": "git-clone",
-            "description": "A curated set of ComfyUI nodes under 6yuan namespace."
-        },
-        {
-            "author": "wciq1208",
-            "title": "even-comfyui-plugin",
-            "reference": "https://github.com/wciq1208/even-comfyui-plugin",
-            "files": [
-                "https://github.com/wciq1208/even-comfyui-plugin"
-            ],
-            "install_type": "git-clone",
-            "description": "NODES: Gemini, NanoBanana"
-        },
-        {
-            "author": "Fuhze73",
-            "title": "ComfyUI-PainterI2V-StartEndImage-Tiled [WIP]",
-            "reference": "https://github.com/Fuhze73/ComfyUI-PainterI2V-StartEndImage-Tiled",
-            "files": [
-                "https://github.com/Fuhze73/ComfyUI-PainterI2V-StartEndImage-Tiled"
-            ],
-            "install_type": "git-clone",
-            "description": "Wan2.2 image-to-video enhancement node optimized for 4-step LoRAs, reducing slow-motion and enhancing camera movement. (Description by CC)\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "stevanisya",
-            "title": "comfyui_txt_selector  [WIP]",
-            "reference": "https://github.com/stevanisya/comfyui_txt_selector",
-            "files": [
-                "https://github.com/stevanisya/comfyui_txt_selector"
-            ],
-            "install_type": "git-clone",
-            "description": "A simple ComfyUI node that lets you choose one text from up to 10 inputs.\nNOTE: The files in the repo are not organized."
-        },
-        {
-            "author": "Isi-dev",
-            "title": "ComfyUI_DeleteModelPassthrough_ExecutionFlowControl [WIP]",
-            "reference": "https://github.com/Isi-dev/ComfyUI_DeleteModelPassthrough_ExecutionFlowControl",
-            "files": [
-                "https://github.com/Isi-dev/ComfyUI_DeleteModelPassthrough_ExecutionFlowControl"
-            ],
-            "install_type": "git-clone",
-            "description": "Memory management custom node that deletes specific models from VRAM and RAM while passing through other input types unchanged, useful for low-memory environments. (Description by CC)"
-        },        
        {
            "author": "K1maran",
            "title": "ComfyUI-Kimaran",
@@ -300,6 +220,16 @@
            "install_type": "git-clone",
            "description": "Adds a node that outputs the workflow's name as a string\nNOTE: The files in the repo are not organized."
        },
+        {
+            "author": "PozzettiAndrea",
+            "title": "ComfyUI-CameraAnalysis",
+            "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": "newraina",
            "title": "comfyui-photoshop-v2 [WIP]",
@@ -411,16 +341,15 @@
            "description": "A slimmed down collection of ComfyUI nodes either from elsewhere, custom creation or updated independently. (Description by CC)"
        },
        {
-            "author": "Sida Liu",
+            "author": "liusida",
            "title": "ComfyUI-Notebook [UNSAFE]",
-            "id": "notebook",
            "reference": "https://github.com/liusida/ComfyUI-Notebook",
            "files": [
                "https://github.com/liusida/ComfyUI-Notebook"
            ],
            "install_type": "git-clone",
-            "description": "A Jupyter-style custom node for executing Python code and plotting within ComfyUI workflows.[w/This extension allows remote command execution.]"
-        },        
+            "description": "A Jupyter-style custom node for executing Python code within ComfyUI workflows, featuring syntax highlighting, shared variables, and pre-loaded libraries like numpy, torch, and matplotlib.[w/This extension allows remote command execution.]"
+        },
        {
            "author": "pznodes",
            "title": "ComfyUI-UniRig [WIP]",
@@ -4567,6 +4496,16 @@
            "install_type": "git-clone",
            "description": "Node for LoRA stack management in ComfyUI\nNOTE: The files in the repo are not organized."
        },
+        {
+            "author": "fuzr0dah",
+            "title": "comfyui-sceneassembly",
+            "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": "PabloGrant",
            "title": "comfyui-giraffe-test-panel",
--- a/node_db/dev/extension-node-map.json
+++ b/node_db/dev/extension-node-map.json
@@ -423,7 +423,6 @@
            "A1r KSampler Config",
            "A1r KSampler Config Values",
            "A1r Latent Encode Transform",
-            "A1r Latent Observer",
            "A1r Latent Upscale Transform",
            "A1r LoRA Config",
            "A1r LoRA Config Advance",
@@ -814,17 +813,13 @@
            "TS Equirectangular to Cube",
            "TS Files Downloader",
            "TS Youtube Chapters",
-            "TSAutoTileSize",
            "TSCropToMask",
            "TSRestoreFromCrop",
            "TSWhisper",
-            "TS_BGRM_BiRefNet",
-            "TS_Color_Grade",
            "TS_DeflickerNode",
            "TS_FilePathLoader",
            "TS_FilmEmulation",
            "TS_FilmGrain",
-            "TS_Film_Emulation",
            "TS_Free_Video_Memory",
            "TS_ImageResize",
            "TS_MarianTranslator",
@@ -832,12 +827,10 @@
            "TS_ModelConverterAdvanced",
            "TS_Qwen2.5_VL",
            "TS_Qwen3",
-            "TS_Qwen3_VL",
            "TS_QwenCanvas",
            "TS_QwenSafeResize",
            "TS_VideoDepthNode",
-            "TS_Video_Upscale_With_Model",
-            "TS_WAN_SafeResize"
+            "TS_Video_Upscale_With_Model"
        ],
        {
            "title_aux": "ComfyUI Timesaver Nodes"
@@ -1853,15 +1846,6 @@
            "title_aux": "ComfyUI-Airtable [WIP]"
        }
    ],
-    "https://github.com/Fuhze73/ComfyUI-PainterI2V-StartEndImage-Tiled": [
-        [
-            "PainterI2V",
-            "PainterI2VTiled"
-        ],
-        {
-            "title_aux": "ComfyUI-PainterI2V-StartEndImage-Tiled [WIP]"
-        }
-    ],
    "https://github.com/GalactusX31/ComfyUI-FileBrowserAPI": [
        [
            "PathSelectorNode"
@@ -2030,14 +2014,6 @@
            "title_aux": "ComfyUI-LLMs-Toolkit [WIP]"
        }
    ],
-    "https://github.com/IAFFeng/Comfyui_XF_Custom_Actual-Node": [
-        [
-            "GeminiMattingNode"
-        ],
-        {
-            "title_aux": "Comfyui_XF_Custom_Actual-Node"
-        }
-    ],
    "https://github.com/IXIWORKS-KIMJUNGHO/comfyui-ixiworks": [
        [
            "BuildCharacterPromptNode",
@@ -2062,7 +2038,6 @@
    ],
    "https://github.com/IgPoly/ComfyUI-igTools": [
        [
-            "IGT_ImageTilesCalc",
            "IGT_SimpleTilesCalc"
        ],
        {
@@ -2090,22 +2065,6 @@
            "title_aux": "comfyui-HandDetect"
        }
    ],
-    "https://github.com/Isi-dev/ComfyUI_DeleteModelPassthrough_ExecutionFlowControl": [
-        [
-            "ControlledCLIPTextEncode",
-            "ControlledControlNetLoader",
-            "ControlledModelPatchLoader",
-            "ControlledUNETLoader",
-            "ControlledUnetLoaderGGUF",
-            "ControlledVAELoader",
-            "DeleteModelPassthrough",
-            "DeleteModelPassthroughLight",
-            "SmartClipDeleter"
-        ],
-        {
-            "title_aux": "ComfyUI_DeleteModelPassthrough_ExecutionFlowControl [WIP]"
-        }
-    ],
    "https://github.com/IvanZhd/comfyui-codeformer": [
        [
            "RedBeanie_CustomImageInverter"
@@ -2267,8 +2226,7 @@
        [
            "LoadFromUrl",
            "S3UploadPresigned",
-            "SaveImageToDisk",
-            "WeaverAnimator"
+            "SaveImageToDisk"
        ],
        {
            "title_aux": "ComfyUI-Easy-s3"
@@ -2440,37 +2398,18 @@
    ],
    "https://github.com/LSDJesus/ComfyUI-Luna-Collection": [
        [
-            "LunaAssembler",
-            "LunaBasePrompt",
+            "LunaAdvancedUpscaler",
            "LunaCacheManager",
            "LunaCheckpointLoader",
-            "LunaCivitaiBatchScraper",
-            "LunaCivitaiScraper",
-            "LunaConditionals",
-            "LunaConnectionEditor",
-            "LunaConnectionMatcher",
-            "LunaConnectionStats",
-            "LunaDaemonConfig",
-            "LunaDaemonConfigFromLoaders",
-            "LunaDaemonModelSwitch",
-            "LunaDaemonStatus",
            "LunaEmbeddingCache",
            "LunaEmbeddingManager",
            "LunaEmbeddingManagerRandom",
-            "LunaExpanders",
-            "LunaExpressionBatchSaver",
-            "LunaExpressionList",
-            "LunaExpressionPromptBuilder",
-            "LunaExpressionSheetSlicer",
            "LunaListPreprocessedPrompts",
-            "LunaLoRALinker",
-            "LunaLoRARandomizer",
            "LunaLoRAStacker",
            "LunaLoRAStackerRandom",
            "LunaLoadParameters",
            "LunaLoadPreprocessedPrompt",
-            "LunaLogicResolver",
-            "LunaModifiers",
+            "LunaMediaPipeDetailer",
            "LunaModifyPreprocessedPrompt",
            "LunaMultiSaver",
            "LunaOptimizedPreprocessedLoader",
@@ -2484,26 +2423,19 @@
            "LunaSampler",
            "LunaSaveNegativePrompt",
            "LunaSelectPromptFolder",
-            "LunaSharedCLIPEncode",
-            "LunaSharedCLIPEncodeDual",
-            "LunaSharedCLIPEncodeSDXL",
-            "LunaSharedVAEDecode",
-            "LunaSharedVAEEncode",
+            "LunaSimpleUpscaler",
            "LunaSinglePromptProcessor",
-            "LunaSmartLoRALinker",
            "LunaTextProcessor",
            "LunaUnifiedPromptProcessor",
-            "LunaWildcardBuilder",
            "LunaWildcardPromptGenerator",
-            "LunaYAMLInjector",
-            "LunaYAMLPathExplorer",
-            "LunaYAMLWildcard",
-            "LunaYAMLWildcardBatch",
-            "LunaYAMLWildcardExplorer",
            "Luna_Advanced_Upscaler",
            "Luna_Detailer",
+            "Luna_MediaPipe_Detailer",
+            "Luna_MediaPipe_Segs",
            "Luna_SimpleUpscaler",
-            "Luna_UltimateSDUpscale"
+            "Luna_UltimateSDUpscale",
+            "Luna_YOLO_Annotation_Exporter",
+            "luna_image_caption"
        ],
        {
            "title_aux": "ComfyUI-Pyrite-Core [WIP]"
@@ -2648,20 +2580,6 @@
            "title_aux": "ComfyUI-invAIder-Nodes"
        }
    ],
-    "https://github.com/LvyuanW/ComfyUI-6yuan": [
-        [
-            "ColorKMeans",
-            "CropAlpha",
-            "RemoveBackground",
-            "RemoveBackgroundAdvanced",
-            "ShapeLanguageSummary",
-            "ShrinkImage",
-            "StringPreview"
-        ],
-        {
-            "title_aux": "ComfyUI-6yuan [WIP]"
-        }
-    ],
    "https://github.com/LyazS/ComfyUI-aznodes": [
        [
            "CrossFadeImageSequence",
@@ -3443,7 +3361,6 @@
            "CAD_Mesh_Gmsh",
            "CAD_Mesh_Gmsh_Advanced",
            "CAD_Quality_Metrics",
-            "CAD_Remesh_OCC",
            "LoadPoint2CADModel",
            "LoadPointCloudXYZ",
            "ML_FeatureDetection",
@@ -3465,6 +3382,14 @@
            "title_aux": "CADabra [WIP]"
        }
    ],
+    "https://github.com/PozzettiAndrea/ComfyUI-CameraAnalysis": [
+        [
+            "CameraAnalysis"
+        ],
+        {
+            "title_aux": "ComfyUI-CameraAnalysis"
+        }
+    ],
    "https://github.com/PozzettiAndrea/ComfyUI-Hunyuan3D-Part": [
        [
            "ClearAllModelCaches",
@@ -3640,7 +3565,6 @@
    "https://github.com/Randomwalkforest/Comfyui-Koi-Toolkit": [
        [
            "AliyunChat",
-            "AliyunVLChat",
            "Florence2CoordinateExtractor",
            "Florence2JsonShow",
            "ImageDesaturateEdgeBinarize",
@@ -3651,7 +3575,6 @@
            "PreviewSVG",
            "SVGToImage",
            "SaveSVG",
-            "SearchIconFreepik",
            "SimpleImageStitch",
            "TextSplitLines",
            "imageStitchForICImproved",
@@ -4324,7 +4247,9 @@
            "Color Cast Detector",
            "Color Harmony Analyzer",
            "Color Temperature Estimator",
+            "ColorTemperatureEstimator",
            "Contrast Analysis",
+            "ContrastAnalysis",
            "Defocus Analysis",
            "Edge Density Analysis",
            "Entropy Analysis",
@@ -5887,7 +5812,6 @@
        [
            "AdaptiveTessellate",
            "BarycentricWarp",
-            "BidirectionalFlowExtractor",
            "DepthEstimator",
            "FlowSRRefine",
            "FlowToSTMap",
@@ -6266,14 +6190,14 @@
            "LatentUpscaleModelLoader",
            "LazyCache",
            "Load3D",
+            "Load3DAnimation",
            "LoadAudio",
            "LoadImage",
-            "LoadImageDataSetFromFolder",
            "LoadImageMask",
            "LoadImageOutput",
-            "LoadImageTextDataSetFromFolder",
+            "LoadImageSetFromFolderNode",
+            "LoadImageTextSetFromFolderNode",
            "LoadLatent",
-            "LoadTrainingDataset",
            "LoadVideo",
            "LoraLoader",
            "LoraLoaderModelOnly",
@@ -6290,7 +6214,6 @@
            "LumaReferenceNode",
            "LumaVideoNode",
            "Mahiro",
-            "MakeTrainingDataset",
            "MaskComposite",
            "MaskPreview",
            "MaskToImage",
@@ -6360,6 +6283,7 @@
            "PolyexponentialScheduler",
            "PorterDuffImageComposite",
            "Preview3D",
+            "Preview3DAnimation",
            "PreviewAny",
            "PreviewAudio",
            "PreviewImage",
@@ -6430,13 +6354,10 @@
            "SaveAudioOpus",
            "SaveGLB",
            "SaveImage",
-            "SaveImageDataSetToFolder",
-            "SaveImageTextDataSetToFolder",
            "SaveImageWebsocket",
            "SaveLatent",
-            "SaveLoRA",
+            "SaveLoRANode",
            "SaveSVGNode",
-            "SaveTrainingDataset",
            "SaveVideo",
            "SaveWEBM",
            "ScaleROPE",
@@ -6444,7 +6365,6 @@
            "SetFirstSigma",
            "SetLatentNoiseMask",
            "SetUnionControlNetType",
-            "ShuffleImageTextDataset",
            "SkipLayerGuidanceDiT",
            "SkipLayerGuidanceDiTSimple",
            "SkipLayerGuidanceSD3",
@@ -6569,7 +6489,6 @@
            "VAELoader",
            "VAESave",
            "VPScheduler",
-            "Veo3FirstLastFrameNode",
            "VeoVideoGenerationNode",
            "VideoLinearCFGGuidance",
            "VideoTriangleCFGGuidance",
@@ -7347,7 +7266,6 @@
        [
            "FBTextEncodeQwenImageEditPlus",
            "OpaqueAlpha",
-            "QwenAspectRatio",
            "SAMPreprocessNHWC",
            "SaveScene",
            "SceneCreate",
@@ -7608,6 +7526,7 @@
    ],
    "https://github.com/grinlau18/ComfyUI_XISER_Nodes": [
        [
+            "CreatePointsString",
            "XISER_Canvas",
            "XIS_BooleanSwitch",
            "XIS_CanvasConfig",
@@ -7634,14 +7553,13 @@
            "XIS_ImageAdjustAndBlend",
            "XIS_ImageManager",
            "XIS_ImageMaskMirror",
-            "XIS_ImagePuzzle",
+            "XIS_ImageStitcher",
            "XIS_ImageSwitch",
            "XIS_IntSwitch",
            "XIS_InvertMask",
            "XIS_IsThereAnyData",
            "XIS_KSamplerSettingsNode",
            "XIS_KSamplerSettingsUnpackNode",
-            "XIS_LLMOrchestrator",
            "XIS_Label",
            "XIS_LatentBlendNode",
            "XIS_LoadImage",
@@ -7663,8 +7581,7 @@
            "XIS_SetColor",
            "XIS_ShapeAndText",
            "XIS_ShapeData",
-            "XIS_StringSwitch",
-            "XIS_UnpackImages"
+            "XIS_StringSwitch"
        ],
        {
            "title_aux": "Xiser_Nodes [WIP]"
@@ -8057,7 +7974,6 @@
            "Alta:AddInt(Math)",
            "Alta:AudioDenoise",
            "Alta:BuildFilePath",
-            "Alta:CompareFolders(File)",
            "Alta:DeleteAudioFromMemory",
            "Alta:DeleteFile(Util)",
            "Alta:FileDownloader",
@@ -8554,18 +8470,6 @@
            "title_aux": "ComfyUI Frontend Vue Basic [WIP]"
        }
    ],
-    "https://github.com/judian17/ComfyUI-MIDI-3D": [
-        [
-            "MIDI3DAllPassRenderer",
-            "MIDI3DInstanceCropper",
-            "MIDI3DLoader",
-            "MIDI3DSampler",
-            "MIDI3DTextureBaker"
-        ],
-        {
-            "title_aux": "ComfyUI-MIDI-3D [WIP]"
-        }
-    ],
    "https://github.com/junhe421/comfyui_batch_image_processor": [
        [
            "BatchImageDifferenceToPromptFiles",
@@ -8878,24 +8782,10 @@
    ],
    "https://github.com/kongds1999/ComfyUI_was_image": [
        [
-            "BBoxToCoco",
-            "BBoxToXYWH",
-            "BBoxVisNode",
            "Check Person In Text",
-            "CocoToNumber",
            "ConvertGrayToImage",
-            "ConvertToDict",
-            "CustomUltralyticsModelLoader",
            "Generate Color Palette",
-            "GetImageSize",
-            "ImageResizeAdvanced",
-            "Replace Color By Palette",
-            "UltralyticsCheckCategory",
-            "UltralyticsInference",
-            "UltralyticsListIndexToNames",
-            "UltralyticsModelLoader",
-            "UltralyticsVisualization",
-            "ViewText"
+            "Replace Color By Palette"
        ],
        {
            "title_aux": "ComfyUI_was_image"
@@ -9347,7 +9237,7 @@
            "LF_BlurImages",
            "LF_Boolean",
            "LF_Brightness",
-            "LF_CaptionImageWD14Onnx",
+            "LF_CaptionImageWD14",
            "LF_CharacterImpersonator",
            "LF_CheckpointSelector",
            "LF_CivitAIMetadataSetup",
@@ -9402,7 +9292,6 @@
            "LF_LoadLoraTags",
            "LF_LoadMetadata",
            "LF_LoadWD14Model",
-            "LF_LoadWD14Onnx",
            "LF_LoraAndEmbeddingSelector",
            "LF_LoraSelector",
            "LF_MarkdownDocGenerator",
@@ -11141,7 +11030,6 @@
    "https://github.com/silveroxides/ComfyUI_SamplingUtils": [
        [
            "GetJsonKeyValue",
-            "Image_Color_Noise",
            "SamplingParameters"
        ],
        {
@@ -11342,16 +11230,12 @@
    "https://github.com/stalkervr/comfyui-custom-path-nodes": [
        [
            "AnyCollector",
-            "AutoAspectRatioAdjustFixer",
            "BatchImageCrop",
            "ContextPipeIn",
            "ContextPipeOut",
            "ContextPipeReroute",
            "DataFileLoader",
-            "ImageAspectFixer",
            "ImageGridCropper",
-            "JsonFieldRemover",
-            "JsonFieldReplaceAdvanced",
            "JsonFieldValueExtractor",
            "ListItemExtractor",
            "ListToString",
@@ -11379,14 +11263,6 @@
            "title_aux": "ComfyUI-Audio-Subtitle [WIP]"
        }
    ],
-    "https://github.com/starsFriday/ComfyUI-Tracker-Person": [
-        [
-            "YoloTrackNode"
-        ],
-        {
-            "title_aux": "ComfyUI-Tracker-Person [WIP]"
-        }
-    ],
    "https://github.com/steelan9199/ComfyUI-Teeth": [
        [
            "teeth FindContours",
@@ -11404,14 +11280,6 @@
            "title_aux": "ComfyUI-Teeth [UNSAFE]"
        }
    ],
-    "https://github.com/stevanisya/comfyui_txt_selector": [
-        [
-            "TextSelector"
-        ],
-        {
-            "title_aux": "comfyui_txt_selector  [WIP]"
-        }
-    ],
    "https://github.com/sthao42/comfyui-melodkeet-tts": [
        [
            "MelodkeetTTS"
@@ -12127,16 +11995,13 @@
        [
            "ConditionalTagProcessorNode",
            "LoadTextFile",
-            "ParsePromptCustom",
-            "ParsePromptFull",
            "ProcessWildcard",
            "PromptsFromTextbox",
            "RemoveComments",
            "ReplaceVariables",
            "ReplaceVariablesAndProcessWildcard",
            "SaveTextFile",
-            "StringsFromTextbox",
-            "StringsToList"
+            "StringsFromTextbox"
        ],
        {
            "title_aux": "ComfyUI-Text-Utility [UNSAFE]"
@@ -12160,15 +12025,6 @@
            "title_aux": "FindBrightestSpot [WIP]"
        }
    ],
-    "https://github.com/wciq1208/even-comfyui-plugin": [
-        [
-            "Gemini",
-            "NanoBanana"
-        ],
-        {
-            "title_aux": "even-comfyui-plugin"
-        }
-    ],
    "https://github.com/whmc76/ComfyUI-AudioSuiteAdvanced": [
        [
            "AudioConcatenateFree",
@@ -12427,6 +12283,7 @@
            "AppendTagsNode",
            "AspectRatiosNode",
            "Base64ToImageNode",
+            "DitherNode",
            "DivideNode",
            "DownloadImageNode",
            "ExcludeTagsNode",
@@ -12435,6 +12292,7 @@
            "FloatNode",
            "FloatToIntNode",
            "IfNode",
+            "ImageResizeNode",
            "ImageSizeNode",
            "ImageToBase64Node",
            "ImageToVideoNode",
@@ -12452,9 +12310,6 @@
            "LoraLoaderDualNode",
            "MaxNode",
            "MinNode",
-            "ModulationDirectionNode",
-            "ModulationNode",
-            "MultiplyIntNode",
            "MultiplyNode",
            "NumberNode",
            "OutpaintingPadNode",
@@ -12463,7 +12318,6 @@
            "PrintImageNode",
            "PythonScriptNode",
            "RangeStringNode",
-            "ResizeImageNode",
            "SaveImageToDirectoryNode",
            "SaveStringToDirectoryNode",
            "ShowStringNode",
--- a/node_db/dev/github-stats.json
+++ b/node_db/dev/github-stats.json
--- a/node_db/legacy/custom-node-list.json
+++ b/node_db/legacy/custom-node-list.json
@@ -1,45 +1,5 @@
 {
    "custom_nodes": [
-        {
-            "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]",
--- a/node_db/new/custom-node-list.json
+++ b/node_db/new/custom-node-list.json
@@ -1,269 +1,5 @@
 {
    "custom_nodes": [
-        {
-            "author": "princepainter",
-            "title": "PainterFLF2V - First/Last Frame Video Enhancer",
-            "id": "painterflf2v",
-            "reference": "https://github.com/princepainter/Comfyui-PainterFLF2V",
-            "files": [
-                "https://github.com/princepainter/Comfyui-PainterFLF2V"
-            ],
-            "install_type": "git-clone",
-            "description": "Enhance first and last frames for smooth video loop generation in ComfyUI. Based on WAN Video workflow.",
-            "tags": ["video", "frame", "loop", "workflow"]
-        },        
-        {
-            "author": "EnragedAntelope",
-            "title": "comfyui-sdnq",
-            "reference": "https://github.com/EnragedAntelope/comfyui-sdnq",
-            "files": [
-                "https://github.com/EnragedAntelope/comfyui-sdnq"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom node pack for loading SDNQ quantized models"
-        },
-        {
-            "author": "geroldmeisinger",
-            "title": "ComfyUI-outputlists-combiner",
-            "reference": "https://github.com/geroldmeisinger/ComfyUI-outputlists-combiner",
-            "files": [
-                "https://github.com/geroldmeisinger/ComfyUI-outputlists-combiner"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom nodes to create output lists with strings and numbers, make combinations of them, and help with XYZ-Gridplots"
-        },
-        {
-            "author": "judian17",
-            "title": "ComfyUI-multiple-inputs",
-            "reference": "https://github.com/judian17/ComfyUI-multiple-inputs",
-            "files": [
-                "https://github.com/judian17/ComfyUI-multiple-inputs"
-            ],
-            "install_type": "git-clone",
-            "description": "A collection of utility nodes for ComfyUI, focusing on batch processing, stitching, and visualization."
-        },
-        {
-            "author": "erosDiffusion",
-            "title": "ComfyUI-ZImageDit",
-            "reference": "https://github.com/erosDiffusion/ComfyUI-ZImageDit",
-            "files": [
-                "https://github.com/erosDiffusion/ComfyUI-ZImageDit"
-            ],
-            "install_type": "git-clone",
-            "description": "Unofficial diffusers integration of the official SDNQ pipeline to run in ComfyUI. (Description by CC)"
-        },
-        {
-            "author": "jrabek",
-            "title": "BokehDiffusionComfyUI",
-            "reference": "https://github.com/jrabek/BokehDiffusionComfyUI",
-            "files": [
-                "https://github.com/jrabek/BokehDiffusionComfyUI"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom nodes for Bokeh Diffusion - Defocus Blur Control in Text-to-Image Diffusion Models."
-        },
-        {
-            "author": "marduk191",
-            "title": "comfyui_qwen_runninghub",
-            "reference": "https://github.com/marduk191/comfyui_qwen_runninghub",
-            "files": [
-                "https://github.com/marduk191/comfyui_qwen_runninghub"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom ComfyUI nodes for integrating RunningHub's AI image and video generation services into workflows. (Description by CC)"
-        },
-        {
-            "author": "keghoang",
-            "title": "ComfyUI-Charon",
-            "reference": "https://github.com/keghoang/ComfyUI-Charon",
-            "files": [
-                "https://github.com/keghoang/ComfyUI-Charon"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom ComfyUI nodes for CHARON auto-alignment and DA3 camera export."
-        },
-        {
-            "author": "mobcat40",
-            "title": "ComfyUI-PromptChain",
-            "reference": "https://github.com/mobcat40/ComfyUI-PromptChain",
-            "files": [
-                "https://github.com/mobcat40/ComfyUI-PromptChain"
-            ],
-            "install_type": "git-clone",
-            "description": "A visual tool for prompt randomization and advanced combinations inside of your ComfyUI workflows."
-        },
-        {
-            "author": "tpc2233",
-            "title": "ComfyUI-Z-Image-Turbo",
-            "reference": "https://github.com/tpc2233/ComfyUI-Z-Image-Turbo",
-            "files": [
-                "https://github.com/tpc2233/ComfyUI-Z-Image-Turbo"
-            ],
-            "install_type": "git-clone",
-            "description": "Comfy UI nodes for Z-Image-Turbo to run native weights with automatic model downloading and support for 2048x2048 resolution. (Description by CC)"
-        },
-        {
-            "author": "Rathius-Saranoth",
-            "title": "Rathius_ComfyNodes",
-            "reference": "https://github.com/Rathius-Saranoth/Rathius_ComfyNodes",
-            "files": [
-                "https://github.com/Rathius-Saranoth/Rathius_ComfyNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Collection of quality-of-life ComfyUI nodes including a text file loader for parsing descriptions and managing prompts without manual copy-paste. (Description by CC)"
-        },
-        {
-            "author": "princepainter",
-            "title": "Comfyui-PainterVRAM",
-            "reference": "https://github.com/princepainter/Comfyui-PainterVRAM",
-            "files": [
-                "https://github.com/princepainter/Comfyui-PainterVRAM"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI node that reserves GPU VRAM before workflow execution to prevent OOM crashes with manual or auto mode options."
-        },
-        {
-            "author": "zhanglongxiao111",
-            "title": "Comfyui-geminiapi",
-            "reference": "https://github.com/zhanglongxiao111/Comfyui-geminiapi",
-            "files": [
-                "https://github.com/zhanglongxiao111/Comfyui-geminiapi"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom nodes for integrating multiple external APIs including Gemini, OpenAI, Replicate, and ElevenLabs directly into local workflows. (Description by CC)"
-        },        
-        {
-            "author": "MushroomFleet",
-            "title": "ComfyUI-FLUX2-JSON",
-            "reference": "https://github.com/MushroomFleet/ComfyUI-FLUX2-JSON",
-            "files": [
-                "https://github.com/MushroomFleet/ComfyUI-FLUX2-JSON"
-            ],
-            "install_type": "git-clone",
-            "description": "A comprehensive suite of custom nodes for building structured JSON prompts for FLUX.2 image generation with precision and control."
-        },
-        {
-            "author": "agavesunset",
-            "title": "AgaveLogicCounter",
-            "reference": "https://github.com/agavesunset/AgaveLogicCounter",
-            "files": [
-                "https://github.com/agavesunset/AgaveLogicCounter"
-            ],
-            "install_type": "git-clone",
-            "description": "Solves the complex 'For-Loop' logic in ComfyUI. Perfect for controlling multi-subject vs. multi-scene batch workflows."
-        },
-        {
-            "author": "idvdii",
-            "title": "ComfyUI-DvD-LoraTriggerwordsManager",
-            "reference": "https://github.com/idvdii/ComfyUI-DvD-LoraTriggerwordsManager",
-            "files": [
-                "https://github.com/idvdii/ComfyUI-DvD-LoraTriggerwordsManager"
-            ],
-            "install_type": "git-clone",
-            "description": "Professional ComfyUI custom nodes for managing LoRA trigger words, with auto-read, smart lookup via Civitai, editing, and WebUI-compatible JSON format support. (Description by CC)"
-        },
-        {
-            "author": "Rzgar Espo",
-            "title": "ComfyUI Qwen Image Size Picker",
-            "id": "QwenImg-latent",
-            "reference": "https://github.com/rzgarespo/ComfyUI-qwen-image-size-picker",
-            "files": [
-                "https://github.com/rzgarespo/ComfyUI-qwen-image-size-picker"
-            ],
-            "install_type": "git-clone",
-            "description": "An empty latent size picker with support for Qwen Image, SDXL, and Flux models."
-        },
-        {
-            "author": "obvirm",
-            "title": "ComfyUI-WhisperXX",
-            "reference": "https://github.com/obvirm/ComfyUI-WhisperXX",
-            "files": [
-                "https://github.com/obvirm/ComfyUI-WhisperXX"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom node for ComfyUI that provides advanced transcription, alignment, and diarization capabilities using the WhisperX library."
-		},        
-        {
-            "author": "tuki0918",
-            "title": "ComfyUI_Cooldown_Node",
-            "reference": "https://github.com/tuki0918/ComfyUI_Cooldown_Node",
-            "files": [
-                "https://github.com/tuki0918/ComfyUI_Cooldown_Node"
-            ],
-            "install_type": "git-clone",
-            "description": "Provides custom nodes with a cooldown feature for ComfyUI. (Description by CC)"
-        },
-        {
-            "author": "akawana",
-            "title": "Utils Extra",
-            "reference": "https://github.com/akawana/ComfyUI-Utils-extra",
-            "files": [
-                "https://github.com/akawana/ComfyUI-Utils-extra"
-            ],
-            "install_type": "git-clone",
-            "description": "Utility tools. Index Multiple is used for expanding multiple values from a list, IsOneOfGroupsActive to identify groups state, RepeatGroupState group enable/disable like rg but without connection etc.",
-            "tags": ["utility", "list", "batch"]
-        },
-        {
-            "author": "huygiatrng",
-            "title": "Facefusion_comfyui",
-            "reference": "https://github.com/huygiatrng/Facefusion_comfyui",
-            "files": [
-                "https://github.com/huygiatrng/Facefusion_comfyui"
-            ],
-            "install_type": "git-clone",
-            "description": "Advanced face swapping for ComfyUI with local ONNX inference - no API required!"
-        },
-        {
-            "author": "Ada123-a",
-            "title": "ComfyUI-Kandinsky",
-            "reference": "https://github.com/Ada123-a/ComfyUI-Kandinsky",
-            "files": [
-                "https://github.com/Ada123-a/ComfyUI-Kandinsky"
-            ],
-            "install_type": "git-clone",
-            "description": "Kandinsky 2/20B ComfyUI support with FP8/GGUF/blockswap support."
-        },
-        {
-            "author": "chchchadzilla",
-            "title": "ComfyUI-ChomfyNodes",
-            "reference": "https://github.com/chchchadzilla/ComfyUI-ChomfyNodes",
-            "files": [
-                "https://github.com/chchchadzilla/ComfyUI-ChomfyNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "A professional suite of utility nodes for ComfyUI, featuring forensic logging, massive wildcard control, universal noise injection, and persistent counters."
-        },
-        {
-            "author": "nitingrg",
-            "title": "comfyui-ntools",
-            "reference": "https://github.com/nitingrg/comfyui-ntools",
-            "files": [
-                "https://github.com/nitingrg/comfyui-ntools"
-            ],
-            "install_type": "git-clone",
-            "description": "Essential little utilities that should have been in ComfyUI from day one. (Description by CC)"
-        },
-        {
-            "author": "jav12z",
-            "title": "ComfyUI-ToyShaders",
-            "reference": "https://github.com/jav12z/ComfyUI-ToyShaders",
-            "files": [
-                "https://github.com/jav12z/ComfyUI-ToyShaders"
-            ],
-            "install_type": "git-clone",
-            "description": "A custom node for ComfyUI that allows you to render GLSL shaders (Shadertoy-style) directly inside your workflows. (Description by CC)"
-        },
-        {
-            "author": "Nynxz",
-            "title": "ComfyUI-NynxzNodes",
-            "reference": "https://github.com/Nynxz/ComfyUI-NynxzNodes",
-            "files": [
-                "https://github.com/Nynxz/ComfyUI-NynxzNodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Custom ComfyUI nodes providing video comparison utilities, including wipe and fade compare video generation in multiple directions. (Description by CC)"
-        },        
        {
            "author": "comrender",
            "title": "ComfyUI-edge-match-checker",
@@ -846,6 +582,117 @@
            ],
            "install_type": "git-clone",
            "description": "ComfyUI toolkit with custom nodes for BBox canvas visualization, image brush mask drawing, and coordinate annotation for debugging and external data bridging. (Description by CC)"
+        },
+        {
+            "author": "hua1995116",
+            "title": "comfyui_goenhance_ffmpeg_wm",
+            "reference": "https://github.com/hua1995116/comfyui_goenhance_ffmpeg_wm",
+            "files": [
+                "https://github.com/hua1995116/comfyui_goenhance_ffmpeg_wm"
+            ],
+            "install_type": "git-clone",
+            "description": "ComfyUI custom node for adding watermarks to videos using FFmpeg, with configurable position, opacity, scale, and hardware acceleration support."
+        },
+        {
+            "author": "EricRollei",
+            "title": "Comfy_HunyuanImage3",
+            "reference": "https://github.com/EricRollei/Comfy_HunyuanImage3",
+            "files": [
+                "https://github.com/EricRollei/Comfy_HunyuanImage3"
+            ],
+            "install_type": "git-clone",
+            "description": "Professional ComfyUI custom nodes for Tencent's HunyuanImage-3.0 80B multimodal model, with multiple loading modes, smart memory management, large image generation with CPU offload, and optional prompt enhancement via LLM APIs."
+        },
+        {
+            "author": "Devin Garner",
+            "title": "ComfyUI_Make-It-Animatable",
+            "reference": "https://github.com/speige/ComfyUI_Make-It-Animatable",
+            "files": [
+                "https://github.com/speige/ComfyUI_Make-It-Animatable"
+            ],
+            "install_type": "git-clone",
+            "description": "Auto-Rigging humanoid 3D meshes for Mixamo animations"
+        },
+        {
+            "author": "alexjx",
+            "title": "ComfyUI-XJNodes",
+            "reference": "https://github.com/alexjx/ComfyUI-XJNodes",
+            "files": [
+                "https://github.com/alexjx/ComfyUI-XJNodes"
+            ],
+            "install_type": "git-clone",
+            "description": "A modular collection of custom nodes for ComfyUI, organized by data type for easy navigation and maintenance."
+        },
+
+        {
+            "author": "princepainter",
+            "title": "Comfyui-PainterSampler",
+            "reference": "https://github.com/princepainter/Comfyui-PainterSampler",
+            "files": [
+                "https://github.com/princepainter/Comfyui-PainterSampler"
+            ],
+            "install_type": "git-clone",
+            "description": "A dual-model image-to-video sampler for ComfyUI that combines high-noise and low-noise models in a single node, replacing two KSamplerAdvanced nodes with zero overhead and bit-identical frame generation. (Description by CC)"
+        },
+        {
+            "author": "comrender",
+            "title": "ComfyUI-Nano-Banana-Resizer",
+            "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": "hum-ma",
+            "title": "ComfyUI-TiledVaeLite",
+            "reference": "https://github.com/hum-ma/ComfyUI-TiledVaeLite",
+            "files": [
+                "https://github.com/hum-ma/ComfyUI-TiledVaeLite"
+            ],
+            "install_type": "git-clone",
+            "description": "A faster tiled VAE decode node for ComfyUI based on LTXV, optimized for low VRAM scenarios with configurable tiling, progress bars, and improved logging for decoding large images and videos."
+        },
+        {
+            "author": "tristanvdb",
+            "title": "ComfyUI-toolset",
+            "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": "smthemex",
+            "title": "ComfyUI_DyPE",
+            "reference": "https://github.com/smthemex/ComfyUI_DyPE",
+            "files": [
+                "https://github.com/smthemex/ComfyUI_DyPE"
+            ],
+            "install_type": "git-clone",
+            "description": "DyPE: Dynamic Position Extrapolation for Ultra High Resolution Diffusion ,you can use a wrapper node it in comfyUI"
+        },
+        {
+            "author": "ailab",
+            "title": "ComfyUI-FlashVSR",
+            "reference": "https://github.com/1038lab/ComfyUI-FlashVSR",
+            "files": [
+                "https://github.com/1038lab/ComfyUI-FlashVSR"
+            ],
+            "install_type": "git-clone",
+            "description": "Powerful ComfyUI custom node built on the FlashVSR model, facilitating real-time diffusion-based video super-resolution for streaming applications."
+        },
+        {
+            "author": "shammi-g",
+            "title": "ComfyUI-Simple_Readable_Metadata-SG",
+            "reference": "https://github.com/ShammiG/ComfyUI-Simple_Readable_Metadata-SG",
+            "files": [
+                "https://github.com/ShammiG/ComfyUI-Simple_Readable_Metadata-SG"
+            ],
+            "install_type": "git-clone",
+            "description": "View Image Metadata of ComfyUI as well as of ForgeUI or Automatic 1111 generated images in Easily Readable Format"
        }
    ]
 }
--- a/node_db/new/extension-node-map.json
+++ b/node_db/new/extension-node-map.json
--- a/notebooks/comfyui_colab_with_manager.ipynb
+++ b/notebooks/comfyui_colab_with_manager.ipynb
@@ -1,373 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "aaaaaaaaaa"
-   },
-   "source": [
-    "Git clone the repo and install the requirements. (ignore the pip errors about protobuf)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "bbbbbbbbbb"
-   },
-   "outputs": [],
-   "source": [
-    "# #@title Environment Setup\n",
-    "\n",
-    "from pathlib import Path\n",
-    "\n",
-    "OPTIONS = {}\n",
-    "\n",
-    "USE_GOOGLE_DRIVE = True  #@param {type:\"boolean\"}\n",
-    "UPDATE_COMFY_UI = True  #@param {type:\"boolean\"}\n",
-    "USE_COMFYUI_MANAGER = True  #@param {type:\"boolean\"}\n",
-    "INSTALL_CUSTOM_NODES_DEPENDENCIES = True  #@param {type:\"boolean\"}\n",
-    "OPTIONS['USE_GOOGLE_DRIVE'] = USE_GOOGLE_DRIVE\n",
-    "OPTIONS['UPDATE_COMFY_UI'] = UPDATE_COMFY_UI\n",
-    "OPTIONS['USE_COMFYUI_MANAGER'] = USE_COMFYUI_MANAGER\n",
-    "OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES'] = INSTALL_CUSTOM_NODES_DEPENDENCIES\n",
-    "\n",
-    "current_dir = !pwd\n",
-    "WORKSPACE = f\"{current_dir[0]}/ComfyUI\"\n",
-    "\n",
-    "if OPTIONS['USE_GOOGLE_DRIVE']:\n",
-    "    !echo \"Mounting Google Drive...\"\n",
-    "    %cd /\n",
-    "\n",
-    "    from google.colab import drive\n",
-    "    drive.mount('/content/drive')\n",
-    "\n",
-    "    WORKSPACE = \"/content/drive/MyDrive/ComfyUI\"\n",
-    "    %cd /content/drive/MyDrive\n",
-    "\n",
-    "![ ! -d $WORKSPACE ] && echo -= Initial setup ComfyUI =- && git clone https://github.com/comfyanonymous/ComfyUI\n",
-    "%cd $WORKSPACE\n",
-    "\n",
-    "if OPTIONS['UPDATE_COMFY_UI']:\n",
-    "  !echo -= Updating ComfyUI =-\n",
-    "\n",
-    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
-    "  ![ -f \".ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/nightly/update_windows/update_comfyui_and_python_dependencies.bat\n",
-    "  ![ -f \".ci/nightly/windows_base_files/run_nvidia_gpu.bat\" ] && chmod 755 .ci/nightly/windows_base_files/run_nvidia_gpu.bat\n",
-    "  ![ -f \".ci/update_windows/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows/update_comfyui_and_python_dependencies.bat\n",
-    "  ![ -f \".ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\" ] && chmod 755 .ci/update_windows_cu118/update_comfyui_and_python_dependencies.bat\n",
-    "  ![ -f \".ci/update_windows/update.py\" ] && chmod 755 .ci/update_windows/update.py\n",
-    "  ![ -f \".ci/update_windows/update_comfyui.bat\" ] && chmod 755 .ci/update_windows/update_comfyui.bat\n",
-    "  ![ -f \".ci/update_windows/README_VERY_IMPORTANT.txt\" ] && chmod 755 .ci/update_windows/README_VERY_IMPORTANT.txt\n",
-    "  ![ -f \".ci/update_windows/run_cpu.bat\" ] && chmod 755 .ci/update_windows/run_cpu.bat\n",
-    "  ![ -f \".ci/update_windows/run_nvidia_gpu.bat\" ] && chmod 755 .ci/update_windows/run_nvidia_gpu.bat\n",
-    "\n",
-    "  !git pull\n",
-    "\n",
-    "!echo -= Install dependencies =-\n",
-    "!pip3 install accelerate\n",
-    "!pip3 install einops transformers>=4.28.1 safetensors>=0.4.2 aiohttp pyyaml Pillow scipy tqdm psutil tokenizers>=0.13.3\n",
-    "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121\n",
-    "!pip3 install torchsde\n",
-    "!pip3 install kornia>=0.7.1 spandrel soundfile sentencepiece\n",
-    "\n",
-    "if OPTIONS['USE_COMFYUI_MANAGER']:\n",
-    "  %cd custom_nodes\n",
-    "\n",
-    "  # Correction of the issue of permissions being deleted on Google Drive.\n",
-    "  ![ -f \"ComfyUI-Manager/check.sh\" ] && chmod 755 ComfyUI-Manager/check.sh\n",
-    "  ![ -f \"ComfyUI-Manager/scan.sh\" ] && chmod 755 ComfyUI-Manager/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/node_db/dev/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/dev/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/node_db/tutorial/scan.sh\" ] && chmod 755 ComfyUI-Manager/node_db/tutorial/scan.sh\n",
-    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-linux.sh\n",
-    "  ![ -f \"ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\" ] && chmod 755 ComfyUI-Manager/scripts/install-comfyui-venv-win.bat\n",
-    "\n",
-    "  ![ ! -d ComfyUI-Manager ] && echo -= Initial setup ComfyUI-Manager =- && git clone https://github.com/ltdrdata/ComfyUI-Manager\n",
-    "  %cd ComfyUI-Manager\n",
-    "  !git pull\n",
-    "\n",
-    "%cd $WORKSPACE\n",
-    "\n",
-    "if OPTIONS['INSTALL_CUSTOM_NODES_DEPENDENCIES']:\n",
-    "  !echo -= Install custom nodes dependencies =-\n",
-    "  !pip install GitPython\n",
-    "  !python custom_nodes/ComfyUI-Manager/cm-cli.py restore-dependencies\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "cccccccccc"
-   },
-   "source": [
-    "Download some models/checkpoints/vae or custom comfyui nodes (uncomment the commands for the ones you want)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "dddddddddd"
-   },
-   "outputs": [],
-   "source": [
-    "# Checkpoints\n",
-    "\n",
-    "### SDXL\n",
-    "### I recommend these workflow examples: https://comfyanonymous.github.io/ComfyUI_examples/sdxl/\n",
-    "\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_base_1.0.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-refiner-1.0/resolve/main/sd_xl_refiner_1.0.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "# SDXL ReVision\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/clip_vision_g/resolve/main/clip_vision_g.safetensors -P ./models/clip_vision/\n",
-    "\n",
-    "# SD1.5\n",
-    "!wget -c https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt -P ./models/checkpoints/\n",
-    "\n",
-    "# SD2\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1-base/resolve/main/v2-1_512-ema-pruned.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-2-1/resolve/main/v2-1_768-ema-pruned.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "# Some SD1.5 anime style\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix2/AbyssOrangeMix2_hard.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A1_orangemixs.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/Models/AbyssOrangeMix3/AOM3A3_orangemixs.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/Linaqruf/anything-v3.0/resolve/main/anything-v3-fp16-pruned.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "# Waifu Diffusion 1.5 (anime style SD2.x 768-v)\n",
-    "#!wget -c https://huggingface.co/waifu-diffusion/wd-1-5-beta3/resolve/main/wd-illusion-fp16.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "\n",
-    "# unCLIP models\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/illuminatiDiffusionV1_v11_unCLIP/resolve/main/illuminatiDiffusionV1_v11-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/wd-1.5-beta2_unCLIP/resolve/main/wd-1-5-beta2-aesthetic-unclip-h-fp16.safetensors -P ./models/checkpoints/\n",
-    "\n",
-    "\n",
-    "# VAE\n",
-    "!wget -c https://huggingface.co/stabilityai/sd-vae-ft-mse-original/resolve/main/vae-ft-mse-840000-ema-pruned.safetensors -P ./models/vae/\n",
-    "#!wget -c https://huggingface.co/WarriorMama777/OrangeMixs/resolve/main/VAEs/orangemix.vae.pt -P ./models/vae/\n",
-    "#!wget -c https://huggingface.co/hakurei/waifu-diffusion-v1-4/resolve/main/vae/kl-f8-anime2.ckpt -P ./models/vae/\n",
-    "\n",
-    "\n",
-    "# Loras\n",
-    "#!wget -c https://civitai.com/api/download/models/10350 -O ./models/loras/theovercomer8sContrastFix_sd21768.safetensors #theovercomer8sContrastFix SD2.x 768-v\n",
-    "#!wget -c https://civitai.com/api/download/models/10638 -O ./models/loras/theovercomer8sContrastFix_sd15.safetensors #theovercomer8sContrastFix SD1.x\n",
-    "#!wget -c https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors -P ./models/loras/ #SDXL offset noise lora\n",
-    "\n",
-    "\n",
-    "# T2I-Adapter\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_depth_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_seg_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_sketch_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_keypose_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_openpose_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_color_sd14v1.pth -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_canny_sd14v1.pth -P ./models/controlnet/\n",
-    "\n",
-    "# T2I Styles Model\n",
-    "#!wget -c https://huggingface.co/TencentARC/T2I-Adapter/resolve/main/models/t2iadapter_style_sd14v1.pth -P ./models/style_models/\n",
-    "\n",
-    "# CLIPVision model (needed for styles model)\n",
-    "#!wget -c https://huggingface.co/openai/clip-vit-large-patch14/resolve/main/pytorch_model.bin -O ./models/clip_vision/clip_vit14.bin\n",
-    "\n",
-    "\n",
-    "# ControlNet\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_ip2p_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11e_sd15_shuffle_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_canny_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11f1p_sd15_depth_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_inpaint_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_lineart_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_mlsd_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_normalbae_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_openpose_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_scribble_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_seg_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15_softedge_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11p_sd15s2_lineart_anime_fp16.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/ControlNet-v1-1_fp16_safetensors/resolve/main/control_v11u_sd15_tile_fp16.safetensors -P ./models/controlnet/\n",
-    "\n",
-    "# ControlNet SDXL\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-canny-rank256.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-recolor-rank256.safetensors -P ./models/controlnet/\n",
-    "#!wget -c https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-sketch-rank256.safetensors -P ./models/controlnet/\n",
-    "\n",
-    "# Controlnet Preprocessor nodes by Fannovel16\n",
-    "#!cd custom_nodes && git clone https://github.com/Fannovel16/comfy_controlnet_preprocessors; cd comfy_controlnet_preprocessors && python install.py\n",
-    "\n",
-    "\n",
-    "# GLIGEN\n",
-    "#!wget -c https://huggingface.co/comfyanonymous/GLIGEN_pruned_safetensors/resolve/main/gligen_sd14_textbox_pruned_fp16.safetensors -P ./models/gligen/\n",
-    "\n",
-    "\n",
-    "# ESRGAN upscale model\n",
-    "#!wget -c https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth -P ./models/upscale_models/\n",
-    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x2.pth -P ./models/upscale_models/\n",
-    "#!wget -c https://huggingface.co/sberbank-ai/Real-ESRGAN/resolve/main/RealESRGAN_x4.pth -P ./models/upscale_models/\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "kkkkkkkkkkkkkkk"
-   },
-   "source": [
-    "### Run ComfyUI with cloudflared (Recommended Way)\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "jjjjjjjjjjjjjj"
-   },
-   "outputs": [],
-   "source": [
-    "!wget -P ~ https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb\n",
-    "!dpkg -i ~/cloudflared-linux-amd64.deb\n",
-    "\n",
-    "import subprocess\n",
-    "import threading\n",
-    "import time\n",
-    "import socket\n",
-    "import urllib.request\n",
-    "\n",
-    "def iframe_thread(port):\n",
-    "  while True:\n",
-    "      time.sleep(0.5)\n",
-    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-    "      result = sock.connect_ex(('127.0.0.1', port))\n",
-    "      if result == 0:\n",
-    "        break\n",
-    "      sock.close()\n",
-    "  print(\"\\nComfyUI finished loading, trying to launch cloudflared (if it gets stuck here cloudflared is having issues)\\n\")\n",
-    "\n",
-    "  p = subprocess.Popen([\"cloudflared\", \"tunnel\", \"--url\", \"http://127.0.0.1:{}\".format(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n",
-    "  for line in p.stderr:\n",
-    "    l = line.decode()\n",
-    "    if \"trycloudflare.com \" in l:\n",
-    "      print(\"This is the URL to access ComfyUI:\", l[l.find(\"http\"):], end='')\n",
-    "    #print(l, end='')\n",
-    "\n",
-    "\n",
-    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-    "\n",
-    "!python main.py --dont-print-server"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "kkkkkkkkkkkkkk"
-   },
-   "source": [
-    "### Run ComfyUI with localtunnel\n",
-    "\n",
-    "\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "jjjjjjjjjjjjj"
-   },
-   "outputs": [],
-   "source": [
-    "!npm install -g localtunnel\n",
-    "\n",
-    "import subprocess\n",
-    "import threading\n",
-    "import time\n",
-    "import socket\n",
-    "import urllib.request\n",
-    "\n",
-    "def iframe_thread(port):\n",
-    "  while True:\n",
-    "      time.sleep(0.5)\n",
-    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-    "      result = sock.connect_ex(('127.0.0.1', port))\n",
-    "      if result == 0:\n",
-    "        break\n",
-    "      sock.close()\n",
-    "  print(\"\\nComfyUI finished loading, trying to launch localtunnel (if it gets stuck here localtunnel is having issues)\\n\")\n",
-    "\n",
-    "  print(\"The password/enpoint ip for localtunnel is:\", urllib.request.urlopen('https://ipv4.icanhazip.com').read().decode('utf8').strip(\"\\n\"))\n",
-    "  p = subprocess.Popen([\"lt\", \"--port\", \"{}\".format(port)], stdout=subprocess.PIPE)\n",
-    "  for line in p.stdout:\n",
-    "    print(line.decode(), end='')\n",
-    "\n",
-    "\n",
-    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-    "\n",
-    "!python main.py --dont-print-server"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "id": "gggggggggg"
-   },
-   "source": [
-    "### Run ComfyUI with colab iframe (use only in case the previous way with localtunnel doesn't work)\n",
-    "\n",
-    "You should see the ui appear in an iframe. If you get a 403 error, it's your firefox settings or an extension that's messing things up.\n",
-    "\n",
-    "If you want to open it in another window use the link.\n",
-    "\n",
-    "Note that some UI features like live image previews won't work because the colab iframe blocks websockets."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "id": "hhhhhhhhhh"
-   },
-   "outputs": [],
-   "source": [
-    "import threading\n",
-    "import time\n",
-    "import socket\n",
-    "def iframe_thread(port):\n",
-    "  while True:\n",
-    "      time.sleep(0.5)\n",
-    "      sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n",
-    "      result = sock.connect_ex(('127.0.0.1', port))\n",
-    "      if result == 0:\n",
-    "        break\n",
-    "      sock.close()\n",
-    "  from google.colab import output\n",
-    "  output.serve_kernel_port_as_iframe(port, height=1024)\n",
-    "  print(\"to open it in a window you can open this link here:\")\n",
-    "  output.serve_kernel_port_as_window(port)\n",
-    "\n",
-    "threading.Thread(target=iframe_thread, daemon=True, args=(8188,)).start()\n",
-    "\n",
-    "!python main.py --dont-print-server"
-   ]
-  }
- ],
- "metadata": {
-  "accelerator": "GPU",
-  "colab": {
-   "provenance": []
-  },
-  "gpuClass": "standard",
-  "kernelspec": {
-   "display_name": "Python 3",
-   "name": "python3"
-  },
-  "language_info": {
-   "name": "python"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 0
-}
--- a/openapi.yaml
+++ b/openapi.yaml
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,15 +1,65 @@
+[build-system]
+requires = ["setuptools >= 61.0"]
+build-backend = "setuptools.build_meta"
+
 [project]
 name = "comfyui-manager"
+license = { text = "GPL-3.0-only" }
+version = "4.0.3b4"
+requires-python = ">= 3.9"
 description = "ComfyUI-Manager provides features to install and manage custom nodes for ComfyUI, as well as various functionalities to assist with ComfyUI."
-version = "3.38"
-license = { file = "LICENSE.txt" }
-dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet"]
+readme = "README.md"
+keywords = ["comfyui", "comfyui-manager"]
+
+maintainers = [
+  { name = "Dr.Lt.Data", email = "dr.lt.data@gmail.com" },
+  { name = "Yoland Yan", email = "yoland@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"]

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

-[tool.comfy]
-PublisherId = "drltdata"
-DisplayName = "ComfyUI-Manager"
-Icon = ""
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["comfyui_manager*"]
+
+[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)
+]
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 GitPython
 PyGithub
-matrix-nio
+# matrix-nio
 transformers
 huggingface-hub
 typer
--- a/ruff.toml
+++ b/ruff.toml
@@ -9,4 +9,4 @@ lint.select = [
    "F",
 ]

-exclude = ["*.ipynb"]
+exclude = ["*.ipynb", "tests"]
--- a/scanner.py
+++ b/scanner.py
@@ -131,7 +131,7 @@ def extract_nodes(code_text):
            return s
        else:
            return set()
-    except:
+    except Exception:
        return set()


@@ -609,10 +609,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:
-                print(f"[ERROR] Cannot download '{url}'")
+        try:
+            download_url(url, temp_dir)
+        except Exception:
+            print(f"[ERROR] Cannot download '{url}'")

        with concurrent.futures.ThreadPoolExecutor(10) as executor:
            executor.map(download_and_store_info, py_url_titles_and_pattern)
--- a/scripts/colab-dependencies.py
+++ b/scripts/colab-dependencies.py
@@ -1,39 +0,0 @@
-import os
-import subprocess
-
-
-def get_enabled_subdirectories_with_files(base_directory):
-    subdirs_with_files = []
-    for subdir in os.listdir(base_directory):
-        try:
-            full_path = os.path.join(base_directory, subdir)
-            if os.path.isdir(full_path) and not subdir.endswith(".disabled") and not subdir.startswith('.') and subdir != '__pycache__':
-                print(f"## Install dependencies for '{subdir}'")
-                requirements_file = os.path.join(full_path, "requirements.txt")
-                install_script = os.path.join(full_path, "install.py")
-
-                if os.path.exists(requirements_file) or os.path.exists(install_script):
-                    subdirs_with_files.append((full_path, requirements_file, install_script))
-        except Exception as e:
-            print(f"EXCEPTION During Dependencies INSTALL on '{subdir}':\n{e}")
-
-    return subdirs_with_files
-
-
-def install_requirements(requirements_file_path):
-    if os.path.exists(requirements_file_path):
-        subprocess.run(["pip", "install", "-r", requirements_file_path])
-
-
-def run_install_script(install_script_path):
-    if os.path.exists(install_script_path):
-        subprocess.run(["python", install_script_path])
-
-
-custom_nodes_directory = "custom_nodes"
-subdirs_with_files = get_enabled_subdirectories_with_files(custom_nodes_directory)
-
-
-for subdir, requirements_file, install_script in subdirs_with_files:
-    install_requirements(requirements_file)
-    run_install_script(install_script)
--- a/scripts/install-comfyui-venv-linux.sh
+++ b/scripts/install-comfyui-venv-linux.sh
@@ -1,21 +0,0 @@
-git clone https://github.com/comfyanonymous/ComfyUI
-cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
-cd ..
-python -m venv venv
-source venv/bin/activate
-python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
-python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
-cd ..
-echo "#!/bin/bash" > run_gpu.sh
-echo "cd ComfyUI" >> run_gpu.sh
-echo "source venv/bin/activate" >> run_gpu.sh
-echo "python main.py --preview-method auto" >> run_gpu.sh
-chmod +x run_gpu.sh
-
-echo "#!/bin/bash" > run_cpu.sh
-echo "cd ComfyUI" >> run_cpu.sh
-echo "source venv/bin/activate" >> run_cpu.sh
-echo "python main.py --preview-method auto --cpu" >> run_cpu.sh
-chmod +x run_cpu.sh
--- a/scripts/install-comfyui-venv-win.bat
+++ b/scripts/install-comfyui-venv-win.bat
@@ -1,17 +0,0 @@
-git clone https://github.com/comfyanonymous/ComfyUI
-cd ComfyUI/custom_nodes
-git clone https://github.com/ltdrdata/ComfyUI-Manager comfyui-manager
-cd ..
-python -m venv venv
-call venv/Scripts/activate
-python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu121
-python -m pip install -r requirements.txt
-python -m pip install -r custom_nodes/comfyui-manager/requirements.txt
-cd ..
-echo "cd ComfyUI" >> run_gpu.bat
-echo "call venv/Scripts/activate" >> run_gpu.bat
-echo "python main.py" >> run_gpu.bat
-
-echo "cd ComfyUI" >> run_cpu.bat
-echo "call venv/Scripts/activate" >> run_cpu.bat
-echo "python main.py --cpu" >> run_cpu.bat
--- a/scripts/install-manager-for-portable-version.bat
+++ b/scripts/install-manager-for-portable-version.bat
@@ -1,3 +0,0 @@
-.\python_embeded\python.exe -s -m pip install gitpython
-.\python_embeded\python.exe -c "import git; git.Repo.clone_from('https://github.com/ltdrdata/ComfyUI-Manager', './ComfyUI/custom_nodes/comfyui-manager')"
-.\python_embeded\python.exe -m pip install -r ./ComfyUI/custom_nodes/comfyui-manager/requirements.txt