fix: Issue where the ComfyUI hash difference was not appearing in v2/snapshot/diff.

added: /v2/snapshot/diff
modified: use 'packaging.version` instead custom StrictVersion
2025-07-29 23:22:19 +09:00 · 2025-07-29 23:15:11 +09:00 · 2025-07-29 12:18:55 +09:00 · 2025-07-27 16:07:57 +09:00 · 2025-07-25 12:26:42 +09:00 · 2025-07-24 12:41:48 +09:00
130 changed files with 28542 additions and 199212 deletions
@@ -0,0 +1 @@
+PYPI_TOKEN=your-pypi-token
@@ -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
@@ -4,7 +4,7 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - draft-v4
+      - main
    paths:
      - "pyproject.toml"

@@ -14,7 +14,7 @@ jobs:
  publish-node:
    name: Publish Custom Node to registry
    runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ltdrdata' }}
+    if: ${{ github.repository_owner == 'ltdrdata' || github.repository_owner == 'Comfy-Org' }}
    steps:
      - name: Check out code
        uses: actions/checkout@v4
@@ -16,7 +16,9 @@ comfyworkflows_sharekey
 github-stats-cache.json
 pip_overrides.json
 *.json
-# Track JSON test fixtures.
-!tests/cases/*.json
 check2.sh
 /venv/
+build
+dist
+*.egg-info
+.env
@@ -1,57 +0,0 @@
-# Changelog
-
-## Unreleased
-
-### Security policy: dedicated install flags (`allow_git_url_install` / `allow_pip_install`)
-
-Two new boolean keys in `config.ini` (`[default]` section), both defaulting to
-`false`, now govern the arbitrary-install surfaces:
-
-| Flag | Governs |
-|------|---------|
-| `allow_git_url_install` | `POST /customnode/install/git_url` and the unknown-git-URL arm of `POST /manager/queue/install` (incl. reinstall delegation) — the entire install transaction, transitive dependency pip installs included. On the batch queue path the flag applies **in addition to** the queue's `security_level` entry gate (see below) |
-| `allow_pip_install` | `POST /customnode/install/pip` only |
-
-These surfaces additionally require a **loopback listener** (`--listen` on a
-loopback IP such as `127.0.0.1` or `::1` — not a general LAN/private address);
-the flags never open a non-loopback deployment. On the two
-**direct** endpoints (`POST /customnode/install/git_url` and
-`POST /customnode/install/pip`), the flags fully **decouple** the surface
-from `security_level`: it no longer has any effect in either direction — a
-strict level cannot deny them when the flag is `true`, and a weak level
-cannot allow them when the flag is `false`. On the **batch queue path**
-(`POST /manager/queue/install`), the flag is **necessary but not
-sufficient**: it gates the unknown-git-URL arm at the risky position, while
-the queue's normal `security_level` entry gate (`middle`) remains in force —
-at `security_level = strong`, batch unknown-URL installs stay denied even
-with the flag set to `true`. `security_level` continues to govern every
-other gated endpoint unchanged. Only the case-insensitive string `true`
-enables a flag; a missing or malformed key reads as `false`.
-
-#### Migration note (no auto-seed)
-
-There is **no automatic migration** from `security_level`. Users who
-previously relied on `security_level = weak` (or `normal-`) to use
-install-via-git-URL / install-pip must now **opt in explicitly** by adding to
-`config.ini`:
-
-```ini
-[default]
-allow_git_url_install = true
-allow_pip_install = true
-```
-
-Changes take effect after a **restart** (no hot reload).
-
-#### Residual-risk note — outdated ComfyUI behavior change
-
-On outdated ComfyUI versions (no system-user API), the manager previously
-forced `security_level = strong`, which unconditionally denied the
-git-URL/pip install surfaces. After this change those surfaces are governed
-by the new flags instead: an operator who explicitly sets a flag to `true`
-on a **loopback** listener can now perform installs on outdated ComfyUI
-where the forced-strong policy previously denied them. This is an accepted,
-deliberate trade-off: it requires explicit operator opt-in, remains bounded
-to loopback listeners, and the flag-deny path on outdated ComfyUI still
-surfaces the `comfyui_outdated` notice. If you operate an outdated ComfyUI
-deployment, leave both flags at their default `false` and update ComfyUI.
@@ -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/
@@ -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
@@ -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` V3.0 and later, configuration files and dynamically generated files are located under `<USER_DIRECTORY>/default/ComfyUI-Manager/`.

-* <USER_DIRECTORY>
-  * If executed without any options, the path defaults to ComfyUI/user.
-  * It can be set using --user-directory <USER_DIRECTORY>.
+* <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>/default/ComfyUI-Manager/config.ini`
+* Configurable channel lists: `<USER_DIRECTORY>/default/ComfyUI-Manager/channels.ini`
+* Configurable pip overrides: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_overrides.json`
+* Configurable pip blacklist: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_blacklist.list`
+* Configurable pip auto fix: `<USER_DIRECTORY>/default/ComfyUI-Manager/pip_auto_fix.list`
+* Saved snapshot files: `<USER_DIRECTORY>/default/ComfyUI-Manager/snapshots`
+* Startup script files: `<USER_DIRECTORY>/default/ComfyUI-Manager/startup-scripts`
+* Component files: `<USER_DIRECTORY>/default/ComfyUI-Manager/components`


 ## `extra_model_paths.yaml` Configuration
@@ -184,7 +125,7 @@ The following settings are applied based on the section marked as `is_default`.
 ![model-install-dialog](https://raw.githubusercontent.com/ltdrdata/ComfyUI-extension-tutorials/Main/ComfyUI-Manager/images/snapshot.jpg)


-## cm-cli: command line tools for power users
+## cm-cli: command line tools for power user
 * A tool is provided that allows you to use the features of ComfyUI-Manager without running ComfyUI.
 * For more details, please refer to the [cm-cli documentation](docs/en/cm-cli.md).

@@ -230,7 +171,7 @@ 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`.
      * `<component name>`: The name should be in the format `<prefix>::<node name>`.
-        * `<component node data>`: In the node data of the group node.
+        * `<compnent nodeata>`: In the nodedata of the group node.
          * `<version>`: Only two formats are allowed: `major.minor.patch` or `major.minor`. (e.g. `1.0`, `2.2.1`)
          * `<datetime>`: Saved time
          * `<packname>`: If the packname is not empty, the category becomes packname/workflow, and it is saved in the <packname>.pack file in `<USER_DIRECTORY>/default/ComfyUI-Manager/components`.
@@ -248,7 +189,7 @@ The following settings are applied based on the section marked as `is_default`.
 * Dragging and dropping or pasting a single component will add a node. However, when adding multiple components, nodes will not be added.


-## Support for installing missing nodes
+## Support of missing nodes installation

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

@@ -274,23 +215,24 @@ 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
 * Logging to file feature
  * This feature is enabled by default and can be disabled by setting `file_logging = False` in the `config.ini`.

-* Fix node (recreate): When right-clicking on a node and selecting `Fix node (recreate)`, you can recreate the node. The widget's values are reset, while the connections maintain those with the same names.
+* Fix node(recreate): When right-clicking on a node and selecting `Fix node (recreate)`, you can recreate the node. The widget's values are reset, while the connections maintain those with the same names.
  * It is used to correct errors in nodes of old workflows created before, which are incompatible with the version changes of custom nodes.

-* Double-Click Node Title: You can set the double-click behavior of nodes in the ComfyUI-Manager menu.
+* Double-Click Node Title: You can set the double click behavior of nodes in the ComfyUI-Manager menu.
  * `Copy All Connections`, `Copy Input Connections`: Double-clicking a node copies the connections of the nearest node.
    * This action targets the nearest node within a straight-line distance of 1000 pixels from the center of the node.
    * In the case of `Copy All Connections`, it duplicates existing outputs, but since it does not allow duplicate connections, the existing output connections of the original node are disconnected.
@@ -356,7 +298,7 @@ When you run the `scan.sh` script:

 * It updates the `github-stats.json`.
  * This uses the GitHub API, so set your token with `export GITHUB_TOKEN=your_token_here` to avoid quickly reaching the rate limit and malfunctioning.
-  * To skip this step, add the `--skip-stat-update` option.
+  * To skip this step, add the `--skip-update-stat` option.

 * The `--skip-all` option applies both `--skip-update` and `--skip-stat-update`.

@@ -364,143 +306,40 @@ 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 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
+* If you encounter the error message `Overlapped Object has pending operation at deallocation on Comfyui Manager load` under Windows
  * Edit `config.ini` file: add `windows_selector_event_loop_policy = True`
-* If the `SSL: CERTIFICATE_VERIFY_FAILED` error occurs.
+* if `SSL: CERTIFICATE_VERIFY_FAILED` error is occured.
  * Edit `config.ini` file: add `bypass_ssl = True`


 ## Security policy
-  * Edit `config.ini` file: add `security_level = <LEVEL>`
-    * `strong`
-      * 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
-    * Downloading models that are not in `.safetensors` format and not
-      registered in the `default channel` model list
-    * NOTE: `Install via git url`, `pip install`, and installation of custom nodes
-      not registered in the `default channel` are **no longer governed by
-      `security_level`** — they are governed by the dedicated install flags
-      described below.
-  
-  * `middle` level risky features
-    * Uninstall/Update
-    * Installation of custom nodes registered in the `default channel`.
-    * Fix custom nodes
-    * Restore/Remove Snapshot
-    * Restart
-  
-  * `low` level risky features
-    * Update ComfyUI

-### Dedicated install flags: `allow_git_url_install` / `allow_pip_install`
+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`.

-The two arbitrary-install surfaces are governed by dedicated boolean keys in
-`config.ini` (`[default]` section), fully **decoupled** from `security_level`:
-
-  * `allow_git_url_install`
-    * governs `Install via Git URL` (`POST /customnode/install/git_url`) **and**
-      the unknown-git-URL arm of the batch install queue
-      (`POST /manager/queue/install`, including reinstall delegation) — i.e.
-      installing any custom node from a git URL that is not registered in the
-      `default channel` catalog
-    * on the **batch queue path**, the flag is **necessary but not
-      sufficient**: the queue's normal `security_level` entry gate (`middle`)
-      must ALSO pass — at `security_level = strong`, batch unknown-URL
-      installs stay denied even with the flag set to `true` (only the direct
-      `Install via Git URL` endpoint is fully independent of `security_level`)
-    * covers the **entire install transaction** it starts, including the
-      pack's transitive dependency pip installs
-  * `allow_pip_install`
-    * governs **only** the standalone `pip install` feature
-      (`POST /customnode/install/pip`)
-
-Key properties:
-
-  * **Decoupled from `security_level` (replace, not and)** — on the two
-    **direct endpoints** (`Install via Git URL` and `pip install`),
-    `security_level` no longer has any effect in either direction: a strict
-    level cannot deny them when the flag is `true`, and a weak level cannot
-    allow them when the flag is `false`. (The batch queue path keeps its
-    `security_level` entry gate in ADDITION to the flag — see the scope bullet
-    above.) Every other gated feature remains governed by `security_level` as
-    described above.
-  * **Loopback only** — the flags take effect **only** when the server listens
-    on a loopback address (e.g. `--listen 127.0.0.1`). On a non-loopback
-    listener these surfaces stay denied regardless of the flags; the flags
-    never widen the exposure of a public deployment.
-  * **Default deny / explicit opt-in** — both flags default to `false`. Only
-    the case-insensitive string `true` enables a flag; a missing or malformed
-    key reads as `false`.
-
-To opt in, edit `config.ini`:
-
-```ini
-[default]
-allow_git_url_install = true
-allow_pip_install = true
-```
-
-Changes take effect after a **restart** (no hot reload).
-
-> **Migration note**: there is no automatic migration from `security_level`.
-> If you previously relied on `security_level = weak` (or `normal-`) to use
-> install-via-git-URL / pip install, you must opt in explicitly with the flags
-> above. See `CHANGELOG.md` for details, including a behavior note for
-> outdated ComfyUI deployments.
+* **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`.


-### Flagged CNR versions: `allow_flagged_nodepack_install`
+### Risky Level Table

-Manager checks the version status in the existing CNR install response; no
-additional Registry request is needed. Active versions continue to install
-normally, subject to the existing security policy. Registry refusals (including
-HTTP 404) still prevent installation.
+| 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                                                                                                                      |

-Flagged versions must also satisfy the existing security policy and Registry
-checks. In addition, they require either **all** `--listen` addresses to be
-loopback, such as `127.0.0.1` or `::1`, or the explicit override below.
-A mixed loopback/non-loopback listener is non-local.

-For a **trusted private network**, administrators can explicitly allow flagged
-versions on non-loopback listeners:
+### Security Level Table

-```ini
-[default]
-allow_flagged_nodepack_install = true
-```
+| 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

-The default is `false`; only the case-insensitive value `true` enables it.
-Restart ComfyUI after editing the setting. This option does not detect private
-networks and is independent of `network_mode`. It does not bypass
-`security_level`, `allow_git_url_install`, or `allow_pip_install`.
-
-When the flagged-version check denies an action, the UI reports that the current
-security configuration does not allow it and directs users to the terminal.
-Only the terminal provides the loopback-only `--listen` examples, the private
-network override setting, and the instruction to restart ComfyUI after changes.
-
-Enabling an already installed version does not query the Registry or reinstall it.
-Older deferred switches without a stored status require loopback-only listeners
-or the override. Otherwise they are rejected without changing the installed pack;
-request the installation again so Manager can check its current Registry status.
-
-The check applies to server-initiated installation, reinstallation, version switches, updates,
-and snapshot restores. A policy refusal preserves the existing nodepack.
-Scheduled version switches save the returned status and check the current
-listener and setting again at startup, before downloading or running scripts.
-Server-scheduled snapshot restores inherit the permission computed from the
-server's current listener and setting. Standalone `cm-cli` commands remain local
-administrator operations and do not use the server listener policy.
-Saved statuses are not refreshed from the Registry.


 # Disclaimer
@@ -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']
-
-
-
@@ -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
@@ -37,7 +37,7 @@ find ~/.tmp/default -name "*.py" -print0 | xargs -0 grep -E "crypto|^_A="

 echo
 echo CHECK3
-find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*[^#]*https\?:"
-find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*[^#].*\.whl"
+find ~/.tmp/default -name "requirements.txt" | xargs grep "^\s*https\\?:"
+find ~/.tmp/default -name "requirements.txt" | xargs grep "\.whl"

 echo
@@ -1,2 +0,0 @@
-#!/bin/bash
-python cm-cli.py $*
@@ -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
@@ -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 not args.disable_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 not args.disable_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
+    
@@ -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
@@ -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())
@@ -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.
@@ -6,8 +6,9 @@ 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

@@ -47,9 +48,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:
@@ -77,8 +78,8 @@ async def _get_cnr_data(cache_mode=True, dont_wait=True):
            for x in sub_json_obj['nodes']:
                full_nodes[x['id']] = x

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

            page += 1
            time.sleep(0.5)
@@ -111,7 +112,7 @@ 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.")
    finally:
@@ -129,7 +130,6 @@ class NodeVersion:
    id: str
    version: str
    download_url: str
-    status: str = ''


 def map_node_version(api_node_version):
@@ -161,7 +161,6 @@ def map_node_version(api_node_version):
        download_url=api_node_version.get(
            "downloadUrl", ""
        ),  # Provide a default value if 'downloadUrl' is missing
-        status=api_node_version.get('status', ''),
    )


@@ -183,6 +182,7 @@ def install_node(node_id, version=None):

    response = requests.get(url, verify=not manager_util.bypass_ssl)
    if response.status_code == 200:
+        # Convert the API response to a NodeVersion object
        return map_node_version(response.json())
    else:
        return None
@@ -237,7 +237,7 @@ 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:
+    except Exception:
        print(f"[ComfyUI Manager] unable to create file: {cnr_id_path}")


@@ -247,7 +247,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
@@ -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(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
+    global manager_batch_history_path
+
+    manager_files_path = os.path.abspath(os.path.join(user_dir, 'default', 'ComfyUI-Manager'))
+    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_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))
+
+
+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
+
@@ -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"
@@ -2,7 +2,6 @@ import subprocess
 import sys
 import os
 import traceback
-import time

 import git
 import json
@@ -16,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
@@ -154,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")
@@ -220,14 +222,7 @@ def gitpull(path):
            repo.close()
            return

-        try:
-            repo.git.pull('--ff-only')
-        except git.GitCommandError:
-            backup_name = f'backup_{time.strftime("%Y%m%d_%H%M%S")}'
-            repo.create_head(backup_name)
-            print(f"[ComfyUI-Manager] Cannot fast-forward. Backup created: {backup_name}")
-            repo.git.reset('--hard', f'{remote_name}/{branch_name}')
-            print(f"[ComfyUI-Manager] Reset to {remote_name}/{branch_name}")
+        remote.pull()

        repo.git.submodule('update', '--init', '--recursive')
        new_commit_hash = repo.head.commit.hexsha
@@ -452,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
@@ -461,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:
@@ -472,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:
@@ -483,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:
@@ -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
@@ -3,8 +3,6 @@ description:
    `manager_util` is the lightest module shared across the prestartup_script, main code, and cm-cli of ComfyUI-Manager.
 """
 import traceback
-import ipaddress
-import socket

 import aiohttp
 import json
@@ -17,12 +15,10 @@ import re
 import logging
 import platform
 import shlex
-from functools import lru_cache
-from html import escape, unescape
-from html.entities import html5
-
+from packaging import version

 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**.
@@ -30,49 +26,8 @@ cache_dir = os.path.join(comfyui_manager_path, '.cache')  # This path is also up
 use_uv = False
 bypass_ssl = False

-FLAGGED_NODEPACK_INSTALL_ERROR = (
-    'This action is not allowed by the current security configuration. '
-    'See the terminal for details.'
-)
-FLAGGED_NODEPACK_INSTALL_GUIDANCE = (
-    'Installation of this flagged CNR version is blocked. To satisfy the additional '
-    'flagged-version requirement, choose one of the following:\n'
-    '1. Run ComfyUI with loopback-only listeners, for example --listen 127.0.0.1 '
-    'or --listen ::1. All configured listen addresses must be loopback.\n'
-    '   Do not use bare --listen or any non-loopback address, such as 0.0.0.0 or ::.\n'
-    '2. For a trusted private network, set allow_flagged_nodepack_install = true '
-    'in the [default] section of ComfyUI-Manager\'s config.ini.\n'
-    'Restart ComfyUI after changing the listener or configuration. '
-    'All other installation security checks still apply.'
-)
-
-
-def is_loopback_listener(listen_address: str) -> bool:
-    """All addresses bound by --listen must resolve exclusively to loopback."""
-    if not isinstance(listen_address, str) or not listen_address:
-        return False
-    for address in listen_address.split(','):
-        address = address.strip()
-        if not address:
-            return False
-        try:
-            if ipaddress.ip_address(address).is_loopback:
-                continue
-        except ValueError:
-            pass
-        try:
-            resolved = socket.getaddrinfo(address, None, type=socket.SOCK_STREAM)
-        except OSError:
-            return False
-        if not resolved or any(not ipaddress.ip_address(item[4][0]).is_loopback for item in resolved):
-            return False
-    return True
-
-
-def is_cnr_install_allowed(status: str, allow_flagged: bool, listen_address: str) -> bool:
-    """Only flagged versions require loopback or the private-network opt-in."""
-    return status != 'NodeVersionStatusFlagged' or bool(allow_flagged) or is_loopback_listener(listen_address)
-
+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":
@@ -83,128 +38,52 @@ def add_python_path_to_env():
    os.environ['PATH'] = os.path.dirname(sys.executable)+sep+os.environ['PATH']


-@lru_cache(maxsize=2)
-def get_pip_cmd(force_uv=False):
-    """
-    Get the base pip command, with automatic fallback to uv if pip is unavailable.
-
-    Args:
-        force_uv (bool): If True, use uv directly without trying pip
-
-    Returns:
-        list: Base command for pip operations
-    """
-    embedded = 'python_embeded' in sys.executable
-
-    # Try pip first (unless forcing uv)
-    if not force_uv:
-        try:
-            test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip', '--version']
-            subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
-            return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'pip']
-        except Exception:
-            logging.warning("[ComfyUI-Manager] `python -m pip` not available. Falling back to `uv`.")
-
-    # Try uv (either forced or pip failed)
-    import shutil
-
-    # Try uv as Python module
-    try:
-        test_cmd = [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', '--version']
-        subprocess.check_output(test_cmd, stderr=subprocess.DEVNULL, timeout=5)
-        logging.info("[ComfyUI-Manager] Using `uv` as Python module for pip operations.")
-        return [sys.executable] + (['-s'] if embedded else []) + ['-m', 'uv', 'pip']
-    except Exception:
-        pass
-
-    # Try standalone uv
-    if shutil.which('uv'):
-        logging.info("[ComfyUI-Manager] Using standalone `uv` for pip operations.")
-        return ['uv', 'pip']
-
-    # Nothing worked
-    logging.error("[ComfyUI-Manager] Neither `python -m pip` nor `uv` are available. Cannot proceed with package operations.")
-    raise Exception("Neither `pip` nor `uv` are available for package management")
-
-
 def make_pip_cmd(cmd):
-    """
-    Create a pip command by combining the cached base pip command with the given arguments.
-
-    Args:
-        cmd (list): List of pip command arguments (e.g., ['install', 'package'])
-
-    Returns:
-        list: Complete command list ready for subprocess execution
-    """
-    global use_uv
-    base_cmd = get_pip_cmd(force_uv=use_uv)
-    return base_cmd + cmd
-
+    if 'python_embeded' in sys.executable:
+        if use_uv:
+            return [sys.executable, '-s', '-m', 'uv', 'pip'] + cmd
+        else:
+            return [sys.executable, '-s', '-m', 'pip'] + cmd
+    else:
+        # FIXED: https://github.com/ltdrdata/ComfyUI-Manager/issues/1667
+        if use_uv:
+            return [sys.executable, '-m', 'uv', 'pip'] + cmd
+        else:
+            return [sys.executable, '-m', 'pip'] + cmd

 # DON'T USE StrictVersion - cannot handle pre_release version
 # try:
 #     from distutils.version import StrictVersion
-# except:
+# except Exception:
 #     print(f"[ComfyUI-Manager]  'distutils' package not found. Activating fallback mode for compatibility.")
 class StrictVersion:
    def __init__(self, version_string):
+        self.obj = version.parse(version_string)
        self.version_string = version_string
-        self.major = 0
-        self.minor = 0
-        self.patch = 0
-        self.pre_release = None
-        self.parse_version_string()
-
-    def parse_version_string(self):
-        parts = self.version_string.split('.')
-        if not parts:
-            raise ValueError("Version string must not be empty")
-
-        self.major = int(parts[0])
-        self.minor = int(parts[1]) if len(parts) > 1 else 0
-        self.patch = int(parts[2]) if len(parts) > 2 else 0
-
-        # Handling pre-release versions if present
-        if len(parts) > 3:
-            self.pre_release = parts[3]
+        self.major = self.obj.major
+        self.minor = self.obj.minor
+        self.patch = self.obj.micro

    def __str__(self):
-        version = f"{self.major}.{self.minor}.{self.patch}"
-        if self.pre_release:
-            version += f"-{self.pre_release}"
-        return version
+        return self.version_string

    def __eq__(self, other):
-        return (self.major, self.minor, self.patch, self.pre_release) == \
-            (other.major, other.minor, other.patch, other.pre_release)
+        return self.obj == other.obj

    def __lt__(self, other):
-        if (self.major, self.minor, self.patch) == (other.major, other.minor, other.patch):
-            return self.pre_release_compare(self.pre_release, other.pre_release) < 0
-        return (self.major, self.minor, self.patch) < (other.major, other.minor, other.patch)
-
-    @staticmethod
-    def pre_release_compare(pre1, pre2):
-        if pre1 == pre2:
-            return 0
-        if pre1 is None:
-            return 1
-        if pre2 is None:
-            return -1
-        return -1 if pre1 < pre2 else 1
+        return self.obj < other.obj

    def __le__(self, other):
-        return self == other or self < other
+        return self.obj == other.obj or self.obj < other.obj

    def __gt__(self, other):
-        return not self <= other
+        return not self.obj <= other.obj

    def __ge__(self, other):
-        return not self < other
+        return not self.obj < other.obj

    def __ne__(self, other):
-        return not self == other
+        return not self.obj == other.obj


 def simple_hash(input_string):
@@ -316,84 +195,6 @@ def sanitize_tag(x):
    return x.replace('<', '&lt;').replace('>', '&gt;')


-SAFE_URL_SCHEMES = frozenset({'http', 'https'})
-_URL_SCHEME_NOISE = re.compile(r'[\x00-\x20\x7f]')
-_URL_HEAD_DELIMITERS = ('/', '?', '#')
-
-
-def escape_html_attribute(value):
-    """Escape a value for a quoted HTML attribute."""
-    return escape(str(value), quote=True)
-
-
-_HTML_ENTITY = re.compile(r'&(#[0-9]+|#[xX][0-9a-fA-F]+|[A-Za-z][A-Za-z0-9]*);')
-_HTML_TEXT_TOKEN = re.compile(_HTML_ENTITY.pattern + "|[&<>\"']")
-
-
-def unescape_html_entities(text):
-    """Decode complete entities once, leaving query keys such as &notebook intact."""
-    def replace(match):
-        entity = match.group(1)
-        if entity.startswith('#'):
-            return unescape(match.group(0))
-        return html5.get(entity + ';', match.group(0))
-
-    return _HTML_ENTITY.sub(replace, text)
-
-
-def escape_html_text(value):
-    """Escape HTML text without double-escaping existing entities."""
-    return _HTML_TEXT_TOKEN.sub(
-        lambda m: m.group(0) if m.group(1) else escape_html_attribute(m.group(0)),
-        str(value).replace('\x00', ''),
-    )
-
-
-def sanitize_url(url):
-    """Allow HTTP(S), relative URLs and anchors.
-
-    HTML callers must also escape the result as an attribute."""
-    raw = '' if url is None else str(url)
-    probe = _URL_SCHEME_NOISE.sub('', raw)
-    if not probe:
-        return '#'
-
-    cut = len(probe)
-    for delimiter in _URL_HEAD_DELIMITERS:
-        found = probe.find(delimiter)
-        if found != -1:
-            cut = min(cut, found)
-    head = probe[:cut]
-
-    if ':' in head:
-        return raw.strip() if head.split(':', 1)[0].lower() in SAFE_URL_SCHEMES else '#'
-
-    return raw.strip()
-
-
-def sanitize_html_fragment(fragment):
-    """Sanitize notice HTML, preserving its formatting and opening links safely."""
-    # prestartup_script imports this module before installing dependencies.
-    import nh3
-
-    return nh3.clean(
-        '' if fragment is None else str(fragment),
-        tags=nh3.ALLOWED_TAGS | {'font'},
-        attributes={
-            **nh3.ALLOWED_ATTRIBUTES,
-            '*': {'class', 'title', 'align', 'width', 'height'},
-            'font': {'color'},
-        },
-        # These elements previously hid their contents from the notice.
-        clean_content_tags={
-            'script', 'style', 'iframe', 'object', 'embed', 'svg', 'math',
-            'template', 'noscript', 'textarea', 'title',
-        },
-        url_schemes=SAFE_URL_SCHEMES,
-        set_tag_attribute_values={'a': {'target': '_blank'}},
-    )
-
-
 def extract_package_as_zip(file_path, extract_path):
    import zipfile
    try:
@@ -678,7 +479,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()
@@ -756,4 +557,4 @@ def restore_pip_snapshot(pips, options):
            if res != 0:
                failed.append(x)

-    print(f"Installation failed for pip packages: {failed}")
+    print(f"Installation failed for pip packages: {failed}")
@@ -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
@@ -2,7 +2,7 @@ import sys
 import subprocess
 import os

-import manager_util
+from . import manager_util


 def security_check():
@@ -53,40 +53,6 @@ And kill and remove /tmp/ultralytics_runner

 The version 8.3.41 to 8.3.42 of the Ultralytics package you installed is compromised. Please uninstall that version and reinstall the latest version.
 https://blog.comfy.org/comfyui-statement-on-the-ultralytics-crypto-miner-situation/
-    """,
-    "litellm==1.82.7": f"""
-Execute following commands:
-    {sys.executable} -m pip uninstall litellm
-
-The litellm PyPI package versions 1.82.7 and 1.82.8 were compromised via a supply chain attack.
-Malicious code harvests SSH keys, environment variables, API keys, cloud credentials, and exfiltrates them to an attacker-controlled server.
-Version 1.82.8 also installs a .pth file that executes malware on ANY Python startup, even without importing litellm.
-
-1. Uninstall litellm immediately.
-2. Assume all credentials accessible to the litellm environment are compromised.
-3. Rotate all API keys, cloud credentials, SSH keys, and database passwords.
-4. Check site-packages for unexpected .pth files (e.g. litellm_init.pth) and remove them.
-5. Run a full malware scan.
-
-Details: https://github.com/BerriAI/litellm/issues/24518
-Advisory: PYSEC-2026-2
-    """,
-    "litellm==1.82.8": f"""
-Execute following commands:
-    {sys.executable} -m pip uninstall litellm
-
-The litellm PyPI package versions 1.82.7 and 1.82.8 were compromised via a supply chain attack.
-Malicious code harvests SSH keys, environment variables, API keys, cloud credentials, and exfiltrates them to an attacker-controlled server.
-Version 1.82.8 also installs a .pth file that executes malware on ANY Python startup, even without importing litellm.
-
-1. Uninstall litellm immediately.
-2. Assume all credentials accessible to the litellm environment are compromised.
-3. Rotate all API keys, cloud credentials, SSH keys, and database passwords.
-4. Check site-packages for unexpected .pth files (e.g. litellm_init.pth) and remove them.
-5. Run a full malware scan.
-
-Details: https://github.com/BerriAI/litellm/issues/24518
-Advisory: PYSEC-2026-2
    """
             }

@@ -94,10 +60,7 @@ Advisory: PYSEC-2026-2

    pip_blacklist = {
        "AppleBotzz": "ComfyUI_LLMVISION",
-        "ultralytics==8.3.41": "ultralytics==8.3.41",
-        "ultralytics==8.3.42": "ultralytics==8.3.42",
-        "litellm==1.82.7": "litellm==1.82.7",
-        "litellm==1.82.8": "litellm==1.82.8",
+        "ultralytics==8.3.41": "ultralytics==8.3.41"
    }

    file_blacklist = {
@@ -130,15 +93,10 @@ Advisory: PYSEC-2026-2
            print(f"[SECURITY ALERT] custom node '{k}' is dangerous.")
            detected.add(v)

-    installed_pip_set = set(installed_pips.strip().split('\n'))
-
    for k, v in pip_blacklist.items():
-        if '==' in k:
-            if k in installed_pip_set:
-                detected.add(v)
-        else:
-            if any(line.split('==')[0] == k for line in installed_pip_set):
-                detected.add(v)
+        if k in installed_pips:
+            detected.add(v)
+            break

    for k, v in file_blacklist.items():
        for x in v:
@@ -147,14 +105,10 @@ Advisory: PYSEC-2026-2
                break

    if len(detected) > 0:
-        for line in installed_pip_set:
+        for line in installed_pips.split('\n'):
            for k, v in pip_blacklist.items():
-                if '==' in k:
-                    if line == k:
-                        print(f"[SECURITY ALERT] '{line}' is dangerous.")
-                else:
-                    if line.split('==')[0] == k:
-                        print(f"[SECURITY ALERT] '{line}' is dangerous.")
+                if k in line:
+                    print(f"[SECURITY ALERT] '{line}' is dangerous.")

        print("\n########################################################################")
        print("   Malware has been detected, forcibly terminating ComfyUI execution.")
@@ -0,0 +1,136 @@
+from . import manager_util
+from . import git_utils
+import json
+import yaml
+import logging
+
+def read_snapshot(snapshot_path):
+    try:
+
+        with open(snapshot_path, 'r', encoding="UTF-8") as snapshot_file:
+            if snapshot_path.endswith('.json'):
+                info = json.load(snapshot_file)
+            elif snapshot_path.endswith('.yaml'):
+                info = yaml.load(snapshot_file, Loader=yaml.SafeLoader)
+                info = info['custom_nodes']
+
+            return info
+    except Exception as e:
+        logging.warning(f"Failed to read snapshot file: {snapshot_path}\nError: {e}")
+
+    return None
+
+
+def diff_snapshot(a, b):
+    if not a or not b:
+        return None
+
+    nodepack_diff = {
+        'added': {},
+        'removed': [],
+        'upgraded': {},
+        'downgraded': {},
+        'changed': []
+    }
+
+    pip_diff = {
+        'added': {},
+        'upgraded': {},
+        'downgraded': {}
+    }
+    
+    # check: comfyui
+    if a.get('comfyui') != b.get('comfyui'):
+        nodepack_diff['changed'].append('comfyui')
+
+    # check: cnr nodes
+    a_cnrs = a.get('cnr_custom_nodes', {})
+    b_cnrs = b.get('cnr_custom_nodes', {})
+
+    if 'comfyui-manager' in a_cnrs:
+        del a_cnrs['comfyui-manager']
+    if 'comfyui-manager' in b_cnrs:
+        del b_cnrs['comfyui-manager']
+
+    for k, v in a_cnrs.items():
+        if k not in b_cnrs.keys():
+            nodepack_diff['removed'].append(k)
+        elif a_cnrs[k] != b_cnrs[k]:
+            a_ver = manager_util.StrictVersion(a_cnrs[k])
+            b_ver = manager_util.StrictVersion(b_cnrs[k])
+            if a_ver < b_ver:
+                nodepack_diff['upgraded'][k] = {'from': a_cnrs[k], 'to': b_cnrs[k]}
+            elif a_ver > b_ver:
+                nodepack_diff['downgraded'][k] = {'from': a_cnrs[k], 'to': b_cnrs[k]}
+
+    added_cnrs = set(b_cnrs.keys()) - set(a_cnrs.keys())
+    for k in added_cnrs:
+        nodepack_diff['added'][k] = b_cnrs[k]
+
+    # check: git custom nodes
+    a_gits = a.get('git_custom_nodes', {})
+    b_gits = b.get('git_custom_nodes', {})
+
+    a_gits = {git_utils.normalize_url(k): v for k, v in a_gits.items() if k.lower() != 'comfyui-manager'}
+    b_gits = {git_utils.normalize_url(k): v for k, v in b_gits.items() if k.lower() != 'comfyui-manager'}
+
+    for k, v in a_gits.items():
+        if k not in b_gits.keys():
+            nodepack_diff['removed'].append(k)
+        elif not v['disabled'] and b_gits[k]['disabled']:
+            nodepack_diff['removed'].append(k)
+        elif v['disabled'] and not b_gits[k]['disabled']:
+            nodepack_diff['added'].append(k)
+        elif v['hash'] != b_gits[k]['hash']:
+            a_date = v.get('commit_timestamp')
+            b_date = b_gits[k].get('commit_timestamp')
+            if a_date is not None and b_date is not None:
+                if a_date < b_date:
+                    nodepack_diff['upgraded'].append(k)
+                elif a_date > b_date:
+                    nodepack_diff['downgraded'].append(k)
+            else:
+                nodepack_diff['changed'].append(k)
+
+    # check: pip packages
+    a_pip = a.get('pips', {})
+    b_pip = b.get('pips', {})
+    for k, v in a_pip.items():
+        if '==' in k:
+            package_name, version = k.split('==', 1)
+        else:
+            package_name, version = k, None
+        
+        for k2, v2 in b_pip.items():
+            if '==' in k2:
+                package_name2, version2 = k2.split('==', 1)
+            else:
+                package_name2, version2 = k2, None
+            
+            if package_name.lower() == package_name2.lower():
+                if version != version2:
+                    a_ver = manager_util.StrictVersion(version) if version else None
+                    b_ver = manager_util.StrictVersion(version2) if version2 else None
+                    if a_ver and b_ver:
+                        if a_ver < b_ver:
+                            pip_diff['upgraded'][package_name] = {'from': version, 'to': version2}
+                        elif a_ver > b_ver:
+                            pip_diff['downgraded'][package_name] = {'from': version, 'to': version2}
+                    elif not a_ver and b_ver:
+                        pip_diff['added'][package_name] = version2
+
+    a_pip_names = {k.split('==', 1)[0].lower() for k in a_pip.keys()}
+
+    for k in b_pip.keys():
+        if '==' in k:
+            package_name = k.split('==', 1)[0]
+            package_version = k.split('==', 1)[1]
+        else:
+            package_name = k
+            package_version = None
+        
+        if package_name.lower() not in a_pip_names:
+            if package_version:
+                pip_diff['added'][package_name] = package_version
+
+    return {'nodepack_diff': nodepack_diff, 'pip_diff': pip_diff}
@@ -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
@@ -0,0 +1,125 @@
+"""
+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,
+    
+    # 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",
+    
+    # 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",
+]
@@ -0,0 +1,539 @@
+# generated by datamodel-codegen:
+#   filename:  openapi.yaml
+#   timestamp: 2025-06-27T04:01:45+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 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"
+    )
@@ -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).
@@ -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",
+]
@@ -0,0 +1,386 @@
+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
+
+
+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))
+
+
+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" in share_destinations:
+        comfyui_share_room_id = '!LGYSoacpJPhIfBqVfb:matrix.org'
+        filename = os.path.basename(asset_filepath)
+        content_type = assetFileType
+
+        try:
+            from matrix_client.api import MatrixHttpApi
+            from matrix_client.client import MatrixClient
+
+            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 = MatrixClient(homeserver)
+            try:
+                token = client.login(username=matrix_auth['username'], password=matrix_auth['password'])
+                if not token:
+                    return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
+            except Exception:
+                return web.json_response({"error": "Invalid Matrix credentials."}, content_type='application/json', status=400)
+
+            matrix = MatrixHttpApi(homeserver, token=token)
+            with open(asset_filepath, 'rb') as f:
+                mxc_url = matrix.media_upload(f.read(), content_type, filename=filename)['content_uri']
+
+            workflow_json_mxc_url = matrix.media_upload(prompt['workflow'], 'application/json', filename='workflow.json')['content_uri']
+
+            text_content = ""
+            if title:
+                text_content += f"{title}\n"
+            if description:
+                text_content += f"{description}\n"
+            if credits:
+                text_content += f"\ncredits: {credits}\n"
+            matrix.send_message(comfyui_share_room_id, text_content)
+            matrix.send_content(comfyui_share_room_id, mxc_url, filename, 'm.image')
+            matrix.send_content(comfyui_share_room_id, workflow_json_mxc_url, 'workflow.json', 'm.file')
+        except Exception:
+            logging.exception("An error occurred")
+            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)
@@ -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()
@@ -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>")
@@ -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
@@ -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
@@ -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
@@ -9,12 +9,11 @@ This directory contains the JavaScript frontend implementation for ComfyUI-Manag
 - **model-manager.js**: Handles the model management interface for downloading and organizing AI models.
 - **components-manager.js**: Manages reusable workflow components system.
 - **snapshot.js**: Implements the snapshot system for backing up and restoring installations.
- **node-usage-analyzer.js**: Implements the UI for analyzing node usage in workflows.

 ## Sharing Components

 - **comfyui-share-common.js**: Base functionality for workflow sharing features.
- **comfyui-share-copus.js**: Integration with the ComfyUI Copus sharing platform.
+- **comfyui-share-copus.js**: Integration with the ComfyUI Opus sharing platform.
 - **comfyui-share-openart.js**: Integration with the OpenArt sharing platform.
 - **comfyui-share-youml.js**: Integration with the YouML sharing platform.

@@ -47,6 +46,5 @@ The frontend follows a modular component-based architecture:
 CSS files are included for specific components:
 - **custom-nodes-manager.css**: Styling for the node management UI
 - **model-manager.css**: Styling for the model management UI
- **node-usage-analyzer.css**: Styling for the node usage analyzer UI

-This frontend implementation provides a comprehensive yet user-friendly interface for managing the ComfyUI ecosystem.
+This frontend implementation provides a comprehensive yet user-friendly interface for managing the ComfyUI ecosystem.
@@ -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", { method: 'POST' });
+		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;
 		}

@@ -14,14 +14,12 @@ 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, sanitizeHTML, safeHref
+	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 { NodeUsageAnalyzer } from "./node-usage-analyzer.js";
 import { ModelManager } from "./model-manager.js";
 import { SnapshotManager } from "./snapshot.js";
-import { buildGuiFrame, createSettingsCombo } from "./comfyui-gui-builder.js";

 let manager_version = await getVersion();

@@ -46,16 +44,12 @@ docStyle.innerHTML = `

 #cm-manager-dialog {
 	width: 1000px;
-	height: auto;
+	height: 455px;
 	box-sizing: content-box;
 	z-index: 1000;
 	overflow-y: auto;
 }

-#cm-manager-dialog br {
-	margin-bottom: 1em;
-}
-
 .cb-widget {
 	width: 400px;
 	height: 25px;
@@ -86,7 +80,6 @@ docStyle.innerHTML = `
 }

 .cm-menu-container {
-	padding : calc(var(--spacing)*2);
 	column-gap: 20px;
 	display: flex;
 	flex-wrap: wrap;
@@ -147,8 +140,8 @@ docStyle.innerHTML = `
 }

 .cm-notice-board {
-	width: auto;
-	height: 280px;
+	width: 290px;
+	height: 230px;
 	overflow: auto;
 	color: var(--input-text);
 	border: 1px solid var(--descrip-text);
@@ -196,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') {
@@ -239,56 +231,74 @@ 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
 const style = `
 #workflowgallery-button {
-	height: 50px;
+	width: 310px;
+	height: 27px;
 	padding: 0px !important;
+	position: relative;
+	overflow: hidden;
+	font-size: 17px !important;
 }
 #cm-nodeinfo-button {
-	
+	width: 310px;
+	height: 27px;
+	padding: 0px !important;
+	position: relative;
+	overflow: hidden;
+	font-size: 17px !important;
 }
 #cm-manual-button {
-
+	width: 310px;
+	height: 27px;
+	position: relative;
+	overflow: hidden;
 }

 .cm-button {
-	width: auto;
+	width: 310px;
+	height: 30px;
 	position: relative;
 	overflow: hidden;
-	background-color: var(--comfy-menu-secondary-bg);
-	border-color: var(--border-color);
-	color: var(--input-text);
-}
-
-.cm-button:hover {
-	filter: brightness(125%);
+	font-size: 17px !important;
 }

 .cm-button-red {
+	width: 310px;
+	height: 30px;
+	position: relative;
+	overflow: hidden;
+	font-size: 17px !important;
 	background-color: #500000 !important;
-	border-color: #88181b !important;
 	color: white !important;
 }

-.cm-button-red:hover {
-	background-color: #88181b !important;
-}

 .cm-button-orange {
+	width: 310px;
+	height: 30px;
+	position: relative;
+	overflow: hidden;
+	font-size: 17px !important;
 	font-weight: bold;
 	background-color: orange !important;
 	color: black !important;
 }

 .cm-experimental-button {
-	width: 100%;
+	width: 290px;
+	height: 30px;
+	position: relative;
+	overflow: hidden;
+	font-size: 17px !important;
 }

 .cm-experimental {
+	width: 310px;
 	border: 1px solid #555;
 	border-radius: 5px;
 	padding: 10px;
@@ -315,14 +325,8 @@ const style = `

 .cm-menu-combo {
 	cursor: pointer;
-	padding: 0.5em 0.5em;
-	border: 1px solid var(--border-color);
-	border-radius: 6px;
-	background: var(--comfy-menu-secondary-bg);
-}
-
-.cm-menu-combo:hover {
-	filter: brightness(125%);
+	width: 310px;
+	box-sizing: border-box;
 }

 .cm-small-button {
@@ -410,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';
@@ -418,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;
@@ -469,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', { method: 'POST' });
-
+//	set_inprogress_mode();
 	showTerminal();

-	is_updating = true;
-	await api.fetchApi('/manager/queue/start', { method: 'POST' });
+	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) {
@@ -607,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 = "";
@@ -626,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', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: 'nightly-comfyui' }) });
+				api.fetchApi('/v2/manager/policy/update?value=nightly-comfyui');
 			}
 			else {
 				update_policy_combo.value = 'stable-comfyui';
-				api.fetchApi('/manager/policy/update', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: 'stable-comfyui' }) });
+				api.fetchApi('/v2/manager/policy/update?value=stable-comfyui');
 			}

-			let response = await api.fetchApi('/comfyui_manager/comfyui_switch_version', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ 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}`);
 			}
@@ -651,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;
@@ -713,12 +721,12 @@ async function onQueueStatus(event) {
 				for(let x in success_list) {
 					let k = success_list[x];
 					let url = event.detail.nodepack_result[k].url;
-					let title = sanitizeHTML(String(event.detail.nodepack_result[k].title ?? ''));
+					let title = event.detail.nodepack_result[k].title;
 					if(url) {
-						msg += `<li><a href='${safeHref(url)}' target='_blank' rel='noopener noreferrer'>${title}</a></li>`;
+						msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
 					}
 					else {
-						msg += `<li>${sanitizeHTML(String(k))}</li>`;
+						msg += `<li>${k}</li>`;
 					}
 				}
 				msg += "</ul>";
@@ -732,12 +740,12 @@ async function onQueueStatus(event) {
 			for(let x in failed_list) {
 				let k = failed_list[x];
 				let url = event.detail.nodepack_result[k].url;
-				let title = sanitizeHTML(String(event.detail.nodepack_result[k].title ?? ''));
+				let title = event.detail.nodepack_result[k].title;
 				if(url) {
-					msg += `<li><a href='${safeHref(url)}' target='_blank' rel='noopener noreferrer'>${title}</a></li>`;
+					msg += `<li><a href='${url}' target='_blank'>${title}</a></li>`;
 				}
 				else {
-					msg += `<li>${sanitizeHTML(String(k))}</li>`;
+					msg += `<li>${k}</li>`;
 				}
 			}

@@ -748,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();
 				}
 			});
 	}
@@ -762,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', { method: 'POST' });
+		batch['update_comfyui'] = true;
 	}

-	const response = await api.fetchApi('/manager/queue/update_all', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ 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', { method: 'POST' });
-	}
+	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)
 */
@@ -814,7 +804,7 @@ function restartOrStop() {
 		rebootAPI();
 	}
 	else {
-		api.fetchApi('/manager/queue/reset', { method: 'POST' });
+		api.fetchApi('/v2/manager/queue/reset');
 		infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
 	}
 }
@@ -826,7 +816,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		const isElectron = 'electronAPI' in window;
 		
 		update_comfyui_button =
-			$el("button.p-button.p-component.cm-button", {
+			$el("button.cm-button", {
 				type: "button",
 				textContent: "Update ComfyUI",
 				style: {
@@ -837,7 +827,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			});

 		switch_comfyui_button =
-			$el("button.p-button.p-component.cm-button", {
+			$el("button.cm-button", {
 				type: "button",
 				textContent: "Switch ComfyUI",
 				style: {
@@ -848,7 +838,7 @@ class ManagerMenuDialog extends ComfyDialog {
 			});

 		restart_stop_button =
-			$el("button.p-button.p-component.cm-button-red", {
+			$el("button.cm-button-red", {
 				type: "button",
 				textContent: "Restart",
 				onclick: () => restartOrStop()
@@ -856,7 +846,7 @@ class ManagerMenuDialog extends ComfyDialog {

 		if(isElectron) {
 			update_all_button =
-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Update All Custom Nodes",
 					onclick:
@@ -865,7 +855,7 @@ class ManagerMenuDialog extends ComfyDialog {
 		}
 		else {
 			update_all_button =
-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Update All",
 					onclick:
@@ -875,7 +865,7 @@ class ManagerMenuDialog extends ComfyDialog {

 		const res =
 			[
-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Custom Nodes Manager",
 					onclick:
@@ -887,7 +877,7 @@ class ManagerMenuDialog extends ComfyDialog {
 						}
 				}),

-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Install Missing Custom Nodes",
 					onclick:
@@ -899,7 +889,7 @@ class ManagerMenuDialog extends ComfyDialog {
 						}
 				}),

-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Custom Nodes In Workflow",
 					onclick:
@@ -910,20 +900,9 @@ class ManagerMenuDialog extends ComfyDialog {
 							CustomNodesManager.instance.show(CustomNodesManager.ShowMode.IN_WORKFLOW);
 						}
 				}),
-				$el("button.cm-button", {
-					type: "button",
-					textContent: "Node Usage Analyzer",
-					onclick:
-						() => {
-							if(!NodeUsageAnalyzer.instance) {
-								NodeUsageAnalyzer.instance = new NodeUsageAnalyzer(app, self);
-							}
-							NodeUsageAnalyzer.instance.show(NodeUsageAnalyzer.SortMode.BY_PACKAGE);
-						}
-				}),
 				
-				$el("div", {}, []),
-				$el("button.p-button.p-component.cm-button", {
+				$el("br", {}, []),
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Model Manager",
 					onclick:
@@ -935,7 +914,7 @@ class ManagerMenuDialog extends ComfyDialog {
 						}
 				}),

-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					type: "button",
 					textContent: "Install via Git URL",
 					onclick: async () => {
@@ -947,13 +926,13 @@ class ManagerMenuDialog extends ComfyDialog {
 					}
 				}),

-				$el("div", {}, []),
+				$el("br", {}, []),
 				update_all_button,
 				update_comfyui_button,
 				switch_comfyui_button,
 				// fetch_updates_button,

-				$el("div", {}, []),
+				$el("br", {}, []),
 				restart_stop_button,
 			];

@@ -966,127 +945,43 @@ class ManagerMenuDialog extends ComfyDialog {
 		let self = this;

 		// db mode
-
 		this.datasrc_combo = document.createElement("select");
 		this.datasrc_combo.setAttribute("title", "Configure where to retrieve node/model information. If set to 'local,' the channel is ignored, and if set to 'channel (remote),' it fetches the latest information each time the list is opened.");
-		this.datasrc_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled ";
-		this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'Channel (1day cache)' }, []));
-		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'Local' }, []));
-		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'Channel (remote)' }, []));
+		this.datasrc_combo.className = "cm-menu-combo";
+		this.datasrc_combo.appendChild($el('option', { value: 'cache', text: 'DB: Channel (1day cache)' }, []));
+		this.datasrc_combo.appendChild($el('option', { value: 'local', text: 'DB: Local' }, []));
+		this.datasrc_combo.appendChild($el('option', { value: 'remote', text: 'DB: Channel (remote)' }, []));

-		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', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: event.target.value }) });
+			api.fetchApi(`/v2/manager/db_mode?value=${event.target.value}`);
 		});

-		const dbRetrievalSetttingItem = createSettingsCombo("DB", this.datasrc_combo);
-
 		// preview method
 		let preview_combo = document.createElement("select");
 		preview_combo.setAttribute("title", "Configure how latent variables will be decoded during preview in the sampling process.");
-		preview_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
+		preview_combo.className = "cm-menu-combo";
+		preview_combo.appendChild($el('option', { value: 'auto', text: 'Preview method: Auto' }, []));
+		preview_combo.appendChild($el('option', { value: 'taesd', text: 'Preview method: TAESD (slow)' }, []));
+		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)' }, []));

-		// Loading state to prevent flash of enabled state
-		preview_combo.appendChild($el('option', { value: '', text: 'Loading...', disabled: true }, []));
-		preview_combo.appendChild($el('option', { value: 'auto', text: 'Auto' }, []));
-		preview_combo.appendChild($el('option', { value: 'taesd', text: 'TAESD (slow)' }, []));
-		preview_combo.appendChild($el('option', { value: 'latent2rgb', text: 'Latent2RGB (fast)' }, []));
-		preview_combo.appendChild($el('option', { value: 'none', text: 'None (very fast)' }, []));
-
-		// Start disabled to prevent flash
-		preview_combo.disabled = true;
-		preview_combo.value = '';
-
-		// Fetch current state
-		api.fetchApi('/manager/preview_method')
+		api.fetchApi('/v2/manager/preview_method')
 			.then(response => response.text())
-			.then(data => {
-				// Remove loading option
-				preview_combo.querySelector('option[value=""]')?.remove();
-
-				if (data === "DISABLED") {
-					// ComfyUI per-queue preview feature is active
-					preview_combo.disabled = true;
-					preview_combo.value = 'auto';
-
-					// Accessibility attributes
-					preview_combo.setAttribute("aria-disabled", "true");
-					preview_combo.setAttribute("aria-label",
-						"Preview method setting (disabled - managed by ComfyUI). " +
-						"Use Settings > Execution > Live preview method instead."
-					);
-
-					// Tooltip for mouse users
-					preview_combo.setAttribute("title",
-						"This feature is now provided natively by ComfyUI. " +
-						"Please use 'Settings > Execution > Live preview method' instead."
-					);
-
-					// Visual feedback
-					preview_combo.style.opacity = '0.6';
-					preview_combo.style.cursor = 'not-allowed';
-				} else {
-					// Manager feature is active
-					preview_combo.disabled = false;
-					preview_combo.value = data;
-
-					// Accessibility for enabled state
-					preview_combo.setAttribute("aria-label",
-						"Preview method setting. Select how latent variables are decoded during preview."
-					);
-				}
-			})
-			.catch(error => {
-				console.error('[ComfyUI-Manager] Failed to fetch preview method status:', error);
-				// Error recovery: fallback to enabled
-				preview_combo.querySelector('option[value=""]')?.remove();
-				preview_combo.disabled = false;
-				preview_combo.value = 'auto';
-			});
+			.then(data => { preview_combo.value = data; });

 		preview_combo.addEventListener('change', function (event) {
-			// Ignore if disabled
-			if (preview_combo.disabled) {
-				event.preventDefault();
-				return;
-			}
-
-			// Normal operation
-			api.fetchApi('/manager/preview_method', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: event.target.value }) })
-				.then(response => {
-					if (response.status === 403) {
-						// Feature transitioned to native
-						alert(
-							'This feature is now provided natively by ComfyUI.\n' +
-							'Please use \'Settings > Execution > Live preview method\' instead.'
-						);
-						preview_combo.disabled = true;
-						preview_combo.style.opacity = '0.6';
-						preview_combo.style.cursor = 'not-allowed';
-
-						// Update aria attributes
-						preview_combo.setAttribute("aria-disabled", "true");
-						preview_combo.setAttribute("aria-label",
-							"Preview method setting (disabled - managed by ComfyUI). " +
-							"Use Settings > Execution > Live preview method instead."
-						);
-					}
-				})
-				.catch(error => {
-					console.error('[ComfyUI-Manager] Preview method update failed:', error);
-				});
+			api.fetchApi(`/v2/manager/preview_method?value=${event.target.value}`);
 		});

-		const previewSetttingItem = createSettingsCombo("Preview method", preview_combo);
-
 		// channel
 		let channel_combo = document.createElement("select");
 		channel_combo.setAttribute("title", "Configure the channel for retrieving data from the Custom Node list (including missing nodes) or the Model list.");
-		channel_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
-		api.fetchApi('/manager/channel_url_list')
+		channel_combo.className = "cm-menu-combo";
+		api.fetchApi('/v2/manager/channel_url_list')
 			.then(response => response.json())
 			.then(async data => {
 				try {
@@ -1094,12 +989,12 @@ class ManagerMenuDialog extends ComfyDialog {
 					for (let i in urls) {
 						if (urls[i] != '') {
 							let name_url = urls[i].split('::');
-							channel_combo.appendChild($el('option', { value: name_url[0], text: `${name_url[0]}` }, []));
+							channel_combo.appendChild($el('option', { value: name_url[0], text: `Channel: ${name_url[0]}` }, []));
 						}
 					}

 					channel_combo.addEventListener('change', function (event) {
-						api.fetchApi('/manager/channel_url_list', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: event.target.value }) });
+						api.fetchApi(`/v2/manager/channel_url_list?value=${event.target.value}`);
 					});

 					channel_combo.value = data.selected;
@@ -1109,13 +1004,11 @@ class ManagerMenuDialog extends ComfyDialog {
 				}
 			});

-		const channelSetttingItem = createSettingsCombo("Channel", channel_combo);
-

 		// share
 		let share_combo = document.createElement("select");
 		share_combo.setAttribute("title", "Hide the share button in the main menu or set the default action upon clicking it. Additionally, configure the default share site when sharing via the context menu's share button.");
-		share_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
+		share_combo.className = "cm-menu-combo";
 		const share_options = [
 			['none', 'None'],
 			['openart', 'OpenArt AI'],
@@ -1126,10 +1019,10 @@ class ManagerMenuDialog extends ComfyDialog {
 			['all', 'All'],
 		];
 		for (const option of share_options) {
-			share_combo.appendChild($el('option', { value: option[0], text: `${option[1]}` }, []));
+			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';
@@ -1139,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";
@@ -1148,15 +1041,13 @@ class ManagerMenuDialog extends ComfyDialog {
 			}
 		});

-		const shareSetttingItem = createSettingsCombo("Share", share_combo);
-
 		let component_policy_combo = document.createElement("select");
 		component_policy_combo.setAttribute("title", "When loading the workflow, configure which version of the component to use.");
-		component_policy_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
-		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Use workflow version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Use higher version' }, []));
-		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Use my version' }, []));
-		api.fetchApi('/manager/policy/component')
+		component_policy_combo.className = "cm-menu-combo";
+		component_policy_combo.appendChild($el('option', { value: 'workflow', text: 'Component: Use workflow version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'higher', text: 'Component: Use higher version' }, []));
+		component_policy_combo.appendChild($el('option', { value: 'mine', text: 'Component: Use my version' }, []));
+		api.fetchApi('/v2/manager/policy/component')
 			.then(response => response.text())
 			.then(data => {
 				component_policy_combo.value = data;
@@ -1164,44 +1055,43 @@ class ManagerMenuDialog extends ComfyDialog {
 			});

 		component_policy_combo.addEventListener('change', function (event) {
-			api.fetchApi('/manager/policy/component', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: event.target.value }) });
+			api.fetchApi(`/v2/manager/policy/component?value=${event.target.value}`);
 			set_component_policy(event.target.value);
 		});

-		const componentSetttingItem = createSettingsCombo("Component", component_policy_combo);
-
 		update_policy_combo = document.createElement("select");
+
+		if(isElectron)
+			update_policy_combo.style.display = 'none';
 		
 		update_policy_combo.setAttribute("title", "Sets the policy to be applied when performing an update.");
-		update_policy_combo.className = "cm-menu-combo p-select p-component p-inputwrapper p-inputwrapper-filled";
-		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'ComfyUI Stable Version' }, []));
-		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'ComfyUI Nightly Version' }, []));
-		api.fetchApi('/manager/policy/update')
+		update_policy_combo.className = "cm-menu-combo";
+		update_policy_combo.appendChild($el('option', { value: 'stable-comfyui', text: 'Update: ComfyUI Stable Version' }, []));
+		update_policy_combo.appendChild($el('option', { value: 'nightly-comfyui', text: 'Update: ComfyUI Nightly Version' }, []));
+		api.fetchApi('/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', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ value: event.target.value }) });
+			api.fetchApi(`/v2/manager/policy/update?value=${event.target.value}`);
 		});

-		const updateSetttingItem = createSettingsCombo("Update", update_policy_combo);
-		
-		if(isElectron)
-			updateSetttingItem.style.display = 'none';
-
 		return [
-			dbRetrievalSetttingItem,
-			channelSetttingItem,
-			previewSetttingItem,
-			shareSetttingItem,
-			componentSetttingItem,
-			updateSetttingItem,
-			//[TODO] replace mt-2 with wrapper div with flex column gap
-			$el("filedset.cm-experimental.mt-auto", {}, [
+			$el("br", {}, []),
+			this.datasrc_combo,
+			channel_combo,
+			preview_combo,
+			share_combo,
+			component_policy_combo,
+			update_policy_combo,
+			$el("br", {}, []),
+
+			$el("br", {}, []),
+			$el("filedset.cm-experimental", {}, [
 					$el("legend.cm-experimental-legend", {}, ["EXPERIMENTAL"]),
-					$el("button.p-button.p-component.cm-button.cm-experimental-button", {
+					$el("button.cm-experimental-button", {
 						type: "button",
 						textContent: "Snapshot Manager",
 						onclick:
@@ -1211,7 +1101,7 @@ class ManagerMenuDialog extends ComfyDialog {
 								SnapshotManager.instance.show();
 							}
 					}),
-					$el("button.p-button.p-component.cm-button.cm-experimental-button.mt-2", {
+					$el("button.cm-experimental-button", {
 						type: "button",
 						textContent: "Install PIP packages",
 						onclick:
@@ -1229,7 +1119,7 @@ class ManagerMenuDialog extends ComfyDialog {

 	createControlsRight() {
 		const elts = [
-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					id: 'cm-manual-button',
 					type: "button",
 					textContent: "Community Manual",
@@ -1280,11 +1170,11 @@ class ManagerMenuDialog extends ComfyDialog {
 					})
 				]),

-				$el("button.p-button.p-component.cm-button", {
+				$el("button", {
 					id: 'workflowgallery-button',
 					type: "button",
 					style: {
-						// ...(localStorage.getItem("wg_last_visited") ? {height: '50px'} : {})
+						...(localStorage.getItem("wg_last_visited") ? {height: '50px'} : {})
 					},
 					onclick: (e) => {
 						const last_visited_site = localStorage.getItem("wg_last_visited")
@@ -1307,7 +1197,7 @@ class ManagerMenuDialog extends ComfyDialog {
 					}, [
 						$el("p", {
 							id: 'workflowgallery-button-last-visited-label',
-							textContent: `(${localStorage.getItem("wg_last_visited") ? localStorage.getItem("wg_last_visited").split('/')[2] : 'none selected'})`,
+							textContent: `(${localStorage.getItem("wg_last_visited") ? localStorage.getItem("wg_last_visited").split('/')[2] : ''})`,
 							style: {
 								'text-align': 'center',
 								'color': 'var(--input-text)',
@@ -1323,12 +1213,13 @@ class ManagerMenuDialog extends ComfyDialog {
 					})
 				]),

-				$el("button.p-button.p-component.cm-button", {
+				$el("button.cm-button", {
 					id: 'cm-nodeinfo-button',
 					type: "button",
 					textContent: "Nodes Info",
 					onclick: () => { window.open("https://ltdrdata.github.io/", "comfyui-node-info"); }
 				}),
+				$el("br", {}, []),
 		];

 		var textarea = document.createElement("div");
@@ -1343,23 +1234,31 @@ class ManagerMenuDialog extends ComfyDialog {
 	constructor() {
 		super();

-		const content =	$el("div.cm-menu-container",
-			[
-				$el("div.cm-menu-column.gap-2", [...this.createControlsLeft()]),
-				$el("div.cm-menu-column.gap-2", [...this.createControlsMid()]),
-				$el("div.cm-menu-column.gap-2", [...this.createControlsRight()])
-			]
-		);
+		const close_button = $el("button", { id: "cm-close-button", type: "button", textContent: "Close", onclick: () => this.close() });

-		const frame = buildGuiFrame(
-			'cm-manager-dialog', // dialog id
-			`ComfyUI Manager ${manager_version}`, // dialog title
-			"i.mdi.mdi-puzzle", // dialog icon class to show before title
-			content, // dialog content element
-			this
-		);	// send this so we can attach close functions
+		const content =
+				$el("div.comfy-modal-content",
+					[
+						$el("tr.cm-title", {}, [
+								$el("font", {size:6, color:"white"}, [`ComfyUI Manager ${manager_version}`])]
+							),
+						$el("br", {}, []),
+						$el("div.cm-menu-container",
+							[
+								$el("div.cm-menu-column", [...this.createControlsLeft()]),
+								$el("div.cm-menu-column", [...this.createControlsMid()]),
+								$el("div.cm-menu-column", [...this.createControlsRight()])
+							]),

-		this.element = frame;
+						$el("br", {}, []),
+						close_button,
+					]
+				);
+
+		content.style.width = '100%';
+		content.style.height = '100%';
+
+		this.element = $el("div.comfy-modal", { id:'cm-manager-dialog', parent: document.body }, [ content ]);
 	}

 	get isVisible() {
@@ -1367,7 +1266,7 @@ class ManagerMenuDialog extends ComfyDialog {
 	}

 	show() {
-		this.element.style.display = "flex";
+		this.element.style.display = "block";
 	}

 	toggleVisibility() {
@@ -1479,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: [
 		{
@@ -1544,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");

@@ -4,7 +4,7 @@ import { $el, ComfyDialog } from "../../scripts/ui.js";
 import { CopusShareDialog } from "./comfyui-share-copus.js";
 import { OpenArtShareDialog } from "./comfyui-share-openart.js";
 import { YouMLShareDialog } from "./comfyui-share-youml.js";
-import { customAlert, safeHref, sanitizeHTML } from "./common.js";
+import { customAlert } from "./common.js";

 export const SUPPORTED_OUTPUT_NODE_TYPES = [
 	"PreviewImage",
@@ -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({
@@ -812,7 +812,7 @@ export class ShareDialog extends ComfyDialog {
 		// get the user's existing matrix auth and share key
 		ShareDialog.matrix_auth = { homeserver: "matrix.org", username: "", password: "" };
 		try {
-			api.fetchApi(`/manager/get_matrix_auth`)
+			api.fetchApi(`/v2/manager/get_matrix_auth`)
 				.then(response => response.json())
 				.then(data => {
 					ShareDialog.matrix_auth = data;
@@ -831,7 +831,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 +891,7 @@ export class ShareDialog extends ComfyDialog {
 			// Change the text of the share button to "Sharing..." to indicate that the share process has started
 			this.share_button.textContent = "Sharing...";

-			const response = await api.fetchApi(`/manager/share`, {
+			const response = await api.fetchApi(`/v2/manager/share`, {
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
 				body: JSON.stringify({
@@ -937,7 +937,7 @@ export class ShareDialog extends ComfyDialog {
 			const response_json = await response.json();

 			if (response_json.comfyworkflows.url) {
-				this.final_message.innerHTML = "Your art has been shared: <a href='" + safeHref(response_json.comfyworkflows.url) + "' target='_blank' rel='noopener noreferrer'>" + sanitizeHTML(response_json.comfyworkflows.url) + "</a>";
+				this.final_message.innerHTML = "Your art has been shared: <a href='" + response_json.comfyworkflows.url + "' target='_blank'>" + response_json.comfyworkflows.url + "</a>";
 				if (response_json.matrix.success) {
 					this.final_message.innerHTML += "<br>Your art has been shared in the ComfyUI Matrix server's #share channel!";
 				}
@@ -1,6 +1,6 @@
 import { app } from "../../scripts/app.js";
 import { $el, ComfyDialog } from "../../scripts/ui.js";
-import { customAlert, safeHref } from "./common.js";
+import { customAlert } from "./common.js";

 const env = "prod";

@@ -201,15 +201,13 @@ export class CopusShareDialog extends ComfyDialog {
    });
    this.LockInput = $el("input", {
      type: "text",
-      placeholder: "0",
+      placeholder: "",
      style: {
        width: "100px",
        padding: "7px",
-        paddingLeft: "30px",
        borderRadius: "4px",
        border: "1px solid #ddd",
        boxSizing: "border-box",
-        position: "relative",
      },
      oninput: (event) => {
        let input = event.target.value;
@@ -377,7 +375,7 @@ export class CopusShareDialog extends ComfyDialog {
    });

    const blockChainSection_lock = $el("div", { style: sectionStyle }, [
-      $el("label", { style: labelStyle }, ["6️⃣ Download threshold"]),
+      $el("label", { style: labelStyle }, ["6️⃣ Pay to download"]),
      $el(
        "label",
        {
@@ -397,7 +395,6 @@ export class CopusShareDialog extends ComfyDialog {
                marginLeft: "5px",
                display: "flex",
                alignItems: "center",
-                position: "relative",
              },
            },
            [
@@ -411,18 +408,8 @@ export class CopusShareDialog extends ComfyDialog {
                    color: "#fff",
                  },
                },
-                ["Unlock with"]
+                ["Price US$"]
              ),
-              $el("img", {
-                style: {
-                  width: "16px",
-                  height: "16px",
-                  position: "absolute",
-                  right: "75px",
-                  zIndex: "100",
-                },
-                src: "https://static.copus.io/images/admin/202507/prod/e2919a1d8f3c2d99d3b8fe27ff94b841.png",
-              }),
              this.LockInput,
            ]
          ),
@@ -433,7 +420,7 @@ export class CopusShareDialog extends ComfyDialog {
        { style: { display: "flex", alignItems: "center", cursor: "pointer" } },
        [
          this.radioButtonsCheckOff_lock,
-          $el(
+            $el(
            "div",
            {
              style: {
@@ -442,7 +429,9 @@ export class CopusShareDialog extends ComfyDialog {
                alignItems: "center",
              },
            },
-            [$el("span", { style: { marginLeft: "5px" } }, ["OFF"])]
+            [
+              $el("span", { style: { marginLeft: "5px" } }, ["OFF"]),
+            ]
          ),
        ]
      ),
@@ -451,6 +440,7 @@ export class CopusShareDialog extends ComfyDialog {
        "p",
        { style: { fontSize: "16px", color: "#fff", margin: "10px 0 0 0" } },
        [
+          "Get paid from your workflow. You can change the price and withdraw your earnings on Copus.",
        ]
      ),
    ]);
@@ -883,7 +873,7 @@ export class CopusShareDialog extends ComfyDialog {
        const { data } = res.data;
        if (data) {
          const url = `${DEFAULT_HOMEPAGE_URL}/work/${data}`;
-          this.message.innerHTML = `Workflow has been shared successfully. <a href="${safeHref(url)}" target="_blank" rel="noopener noreferrer">Click here to view it.</a>`;
+          this.message.innerHTML = `Workflow has been shared successfully. <a href="${url}" target="_blank">Click here to view it.</a>`;
          this.previewImage.src = "";
          this.previewImage.style.display = "none";
          this.uploadedImages = [];
@@ -1,7 +1,7 @@
 import {app} from "../../scripts/app.js";
 import {api} from "../../scripts/api.js";
 import {ComfyDialog, $el} from "../../scripts/ui.js";
-import { customAlert, safeHref } from "./common.js";
+import { customAlert } from "./common.js";

 const LOCAL_STORAGE_KEY = "openart_comfy_workflow_key";
 const DEFAULT_HOMEPAGE_URL = "https://openart.ai/workflows/dev?developer=true";
@@ -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"},
@@ -511,7 +511,7 @@ export class OpenArtShareDialog extends ComfyDialog {
        const {workflow_id} = response.data;
        if (workflow_id) {
          const url = `https://openart.ai/workflows/-/-/${workflow_id}`;
-          this.message.innerHTML = `Workflow has been shared successfully. <a href="${safeHref(url)}" target="_blank" rel="noopener noreferrer">Click here to view it.</a>`;
+          this.message.innerHTML = `Workflow has been shared successfully. <a href="${url}" target="_blank">Click here to view it.</a>`;
          this.previewImage.src = "";
          this.previewImage.style.display = "none";
          this.uploadedImages = [];
@@ -1,7 +1,7 @@
 import {app} from "../../scripts/app.js";
 import {api} from "../../scripts/api.js";
 import {ComfyDialog, $el} from "../../scripts/ui.js";
-import { customAlert, safeHref } from "./common.js";
+import { customAlert } from "./common.js";

 const BASE_URL = "https://youml.com";
 //const BASE_URL = "http://localhost:3000";
@@ -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)
@@ -420,7 +420,7 @@ export class YouMLShareDialog extends ComfyDialog {
            }
          }
          this.message.innerHTML = `${messagePrefix} To turn your workflow into an interactive app, ` +
-            `<a href="${safeHref(recipePageUrl)}" target="_blank" rel="noopener noreferrer">visit it on YouML</a>`;
+            `<a href="${recipePageUrl}" target="_blank">visit it on YouML</a>`;

          this.uploadedImages = [];
          this.nameInput.value = "";
@@ -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));
 }
@@ -122,9 +109,9 @@ export async function customConfirm(message) {
 		let res = await
 			window['app'].extensionManager.dialog
 			.confirm({
-			title: 'Confirm',
-			message: message
-		});
+				title: 'Confirm',
+				message: message
+			});

 		return res;
 	}
@@ -164,9 +151,9 @@ export async function customPrompt(title, message) {
 		let res = await
 				window['app'].extensionManager.dialog
 				.prompt({
-			title: title,
-			message: message
-		});
+					title: title,
+					message: message
+				});

 		return res;
 	}
@@ -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", { method: 'POST' });
-			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;
 }
@@ -223,19 +207,16 @@ function isValidURL(url) {
 }

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

-	const res = await api.fetchApi("/customnode/install/pip", {
+	const res = await api.fetchApi("/v2/customnode/install/pip", {
 		method: "POST",
-		headers: { 'Content-Type': 'application/json' },
-		body: JSON.stringify({ packages: packages }),
+		body: packages,
 	});

 	if(res.status == 403) {
-		await handle403Response(res, "To use this feature you need BOTH: (1) 'allow_pip_install = true' in config.ini ([default] section), AND (2) ComfyUI launched with a loopback --listen (127.0.0.1 or ::1). Both values are read once at ComfyUI startup, so changing either one needs a restart, done with the server down: stop ComfyUI, change the setting, then start it again.");
+		show_message('This action is not allowed with this security level configuration.');
 		return;
 	}

@@ -264,14 +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",
-		headers: { 'Content-Type': 'application/json' },
-		body: JSON.stringify({ url: url }),
+		body: url,
 	});

 	if(res.status == 403) {
-		await handle403Response(res, "To use this feature you need BOTH: (1) 'allow_git_url_install = true' in config.ini ([default] section), AND (2) ComfyUI launched with a loopback --listen (127.0.0.1 or ::1). Both values are read once at ComfyUI startup, so changing either one needs a restart, done with the server down: stop ComfyUI, change the setting, then start it again.");
+		show_message('This action is not allowed with this security level configuration.');
 		return;
 	}

@@ -282,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();
 				}
 			});
 	}
@@ -427,40 +407,6 @@ export function sanitizeHTML(str) {
 		.replace(/'/g, "&#039;");
 }

-// Keep URL handling aligned with glob/manager_util.py; covered by shared cases.
-export const SAFE_URL_SCHEMES = ['http', 'https'];
-const URL_SCHEME_NOISE = /[\x00-\x20\x7f]/g;
-const URL_HEAD_DELIMITERS = ['/', '?', '#'];
-// Match Python str.strip(); JavaScript trim() uses different Unicode whitespace.
-const URL_TRIM = /^[\t-\r\x1c-\x20\x85\xa0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000]+|[\t-\r\x1c-\x20\x85\xa0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000]+$/g;
-const trimUrl = (value) => value.replace(URL_TRIM, '');
-
-export function sanitizeUrl(url) {
-	const raw = (url === null || url === undefined) ? '' : String(url);
-	const probe = raw.replace(URL_SCHEME_NOISE, '');
-	if (!probe) {
-		return '#';
-	}
-
-	let cut = probe.length;
-	for (const delimiter of URL_HEAD_DELIMITERS) {
-		const found = probe.indexOf(delimiter);
-		if (found !== -1) {
-			cut = Math.min(cut, found);
-		}
-	}
-	const head = probe.slice(0, cut);
-
-	if (head.includes(':')) {
-		return SAFE_URL_SCHEMES.includes(head.split(':', 1)[0].toLowerCase()) ? trimUrl(raw) : '#';
-	}
-
-	return trimUrl(raw);
-}
-
-// Validate the URL, then escape it for a quoted href attribute.
-export const safeHref = (url) => sanitizeHTML(sanitizeUrl(url));
-
 export function showTerminal() {
 	try {
 		const panel = app.extensionManager.bottomPanel;
@@ -648,447 +594,69 @@ export function showPopover(target, text, className, options) {
 	});
 }

-export async function uninstallNodes(nodeList, options = {}) {
-	const {
-		title = `${nodeList.length} custom nodes`,
-		onProgress = () => {},
-		onError = () => {},
-		onSuccess = () => {},
-		channel = 'default',
-		mode = 'default'
-	} = options;
-
-	// Check if queue is busy
-	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 { success: false, error: 'Queue is busy' };
-	}
-
-	// Confirmation dialog for uninstall
-	const confirmed = await customConfirm(`Are you sure uninstall ${title}?`);
-	if (!confirmed) {
-		return { success: false, error: 'User cancelled' };
-	}
-
-	let errorMsg = "";
-	let target_items = [];
-
-	await api.fetchApi('/manager/queue/reset');
-
-	for (const nodeItem of nodeList) {
-		target_items.push(nodeItem);
-
-		// Titles are escaped by the caller; the name fallback is a raw pack key.
-		const displayTitle = nodeItem.title || sanitizeHTML(String(nodeItem.name));
-		onProgress(`Uninstall ${displayTitle} ...`);
-
-		const data = nodeItem.originalData || nodeItem;
-		data.channel = channel;
-		data.mode = mode;
-		data.ui_id = nodeItem.hash || md5(nodeItem.name || nodeItem.title);
-
-		const res = await api.fetchApi(`/manager/queue/uninstall`, {
-			method: 'POST',
-			body: JSON.stringify(data)
-		});
-
-		if (res.status != 200) {
-			errorMsg = `'${displayTitle}': `;
-
-			if (res.status == 403) {
-				errorMsg += `This action is not allowed with this security level configuration.\n`;
-			} else {
-				errorMsg += sanitizeHTML(await res.text()) + '\n';
-			}
-
-			break;
-		}
-	}
-
-	if (errorMsg) {
-		onError(errorMsg);
-		show_message("[Uninstall Errors]\n" + errorMsg);
-		return { success: false, error: errorMsg, targets: target_items };
-	} else {
-		await api.fetchApi('/manager/queue/start');
-		onSuccess(target_items);
-		showTerminal();
-		return { success: true, targets: target_items };
+let $tooltip;
+export function hideTooltip(target) {
+	if ($tooltip) {
+		$tooltip.style.display = "none";
+		$tooltip.innerHTML = "";
+		$tooltip.style.top = "0px";
+		$tooltip.style.left = "0px";
 	}
 }
-
-// ===========================================================================================
-// Workflow Utilities Consolidation
-
-export async function getWorkflowNodeTypes() {
-	try {
-		const res = await fetchData('/customnode/get_node_types_in_workflows');
-		
-		if (res.status === 200) {
-			return { success: true, data: res.data };
-		} else if (res.status === 204) {
-			// No workflows found - return empty list
-			return { success: true, data: [] };
-		} else {
-			return { success: false, error: res.error };
-		}
-	} catch (error) {
-		return { success: false, error: error };
-	}
-}
-
-export function findPackageByCnrId(cnrId, nodePackages, installedOnly = true) {
-	if (!cnrId || !nodePackages) {
-		return null;
-	}
-	
-	// Tier 1: Direct key match
-	if (nodePackages[cnrId]) {
-		const pack = nodePackages[cnrId];
-		if (!installedOnly || pack.state !== "not-installed") {
-			return { key: cnrId, pack: pack };
-		}
-	}
-	
-	// Tier 2: Case-insensitive match
-	const cnrIdLower = cnrId.toLowerCase();
-	for (const packKey of Object.keys(nodePackages)) {
-		if (packKey.toLowerCase() === cnrIdLower) {
-			const pack = nodePackages[packKey];
-			if (!installedOnly || pack.state !== "not-installed") {
-				return { key: packKey, pack: pack };
-			}
-		}
-	}
-	
-	// Tier 3: URL/reference contains match
-	for (const packKey of Object.keys(nodePackages)) {
-		const pack = nodePackages[packKey];
-		
-		// Skip non-installed packages if installedOnly is true
-		if (installedOnly && pack.state === "not-installed") {
-			continue;
-		}
-		
-		// Check if reference URL contains cnr_id
-		if (pack.reference && pack.reference.includes(cnrId)) {
-			return { key: packKey, pack: pack };
-		}
-		
-		// Check if any file URL contains cnr_id
-		if (pack.files && Array.isArray(pack.files)) {
-			for (const fileUrl of pack.files) {
-				if (fileUrl.includes(cnrId)) {
-					return { key: packKey, pack: pack };
-				}
-			}
-		}
-	}
-	
-	return null;
-}
-
-export async function analyzeWorkflowUsage(nodePackages) {
-	const result = await getWorkflowNodeTypes();
-	
-	if (!result.success) {
-		return { success: false, error: result.error };
-	}
-	
-	const workflowNodeList = result.data;
-	const usageMap = new Map();
-	const workflowDetailsMap = new Map();
-	
-	if (workflowNodeList && Array.isArray(workflowNodeList)) {
-		const cnrIdCounts = new Map();
-		const cnrIdToWorkflows = new Map();
-		
-		// Process each workflow
-		workflowNodeList.forEach((workflowObj, workflowIndex) => {
-			if (workflowObj.node_types && Array.isArray(workflowObj.node_types)) {
-				const workflowCnrIds = new Set();
-				
-				// Get workflow filename
-				const workflowFilename = workflowObj.workflow_file_name ||
-										 workflowObj.filename ||
-										 workflowObj.file ||
-										 workflowObj.name ||
-										 workflowObj.path ||
-										 `Workflow ${workflowIndex + 1}`;
-				
-				// Count nodes per cnr_id in this workflow
-				const workflowCnrIdCounts = new Map();
-				workflowObj.node_types.forEach(nodeTypeObj => {
-					const cnrId = nodeTypeObj.cnr_id;
-					
-					if (cnrId && cnrId !== "comfy-core") {
-						// Track unique cnr_ids per workflow
-						workflowCnrIds.add(cnrId);
-						
-						// Count nodes per cnr_id in this specific workflow
-						const workflowNodeCount = workflowCnrIdCounts.get(cnrId) || 0;
-						workflowCnrIdCounts.set(cnrId, workflowNodeCount + 1);
-					}
-				});
-				
-				// Record workflow details for each unique cnr_id found in this workflow
-				workflowCnrIds.forEach(cnrId => {
-					// Count occurrences of this cnr_id across all workflows
-					const currentCount = cnrIdCounts.get(cnrId) || 0;
-					cnrIdCounts.set(cnrId, currentCount + 1);
-					
-					// Track workflow details
-					if (!cnrIdToWorkflows.has(cnrId)) {
-						cnrIdToWorkflows.set(cnrId, []);
-					}
-					cnrIdToWorkflows.get(cnrId).push({
-						filename: workflowFilename,
-						nodeCount: workflowCnrIdCounts.get(cnrId) || 0
-					});
-				});
-			}
-		});
-		
-		// Map cnr_id to installed packages with workflow details
-		cnrIdCounts.forEach((count, cnrId) => {
-			const workflowDetails = cnrIdToWorkflows.get(cnrId) || [];
-			
-			const foundPackage = findPackageByCnrId(cnrId, nodePackages, true);
-			if (foundPackage) {
-				usageMap.set(foundPackage.key, count);
-				workflowDetailsMap.set(foundPackage.key, workflowDetails);
-			}
-		});
-	}
-	
-	return {
-		success: true,
-		usageMap: usageMap,
-		workflowDetailsMap: workflowDetailsMap
-	};
-}
-
-// Size formatting utilities - consolidated from model-manager.js and node-usage-analyzer.js
-export function formatSize(v) {
-	const base = 1000;
-	const units = ['', 'K', 'M', 'G', 'T', 'P'];
-	const space = '';
-	const postfix = 'B';
-	if (v <= 0) {
-		return `0${space}${postfix}`;
-	}
-	for (let i = 0, l = units.length; i < l; i++) {
-		const min = Math.pow(base, i);
-		const max = Math.pow(base, i + 1);
-		if (v > min && v <= max) {
-			const unit = units[i];
-			if (unit) {
-				const n = v / min;
-				const nl = n.toString().split('.')[0].length;
-				const fl = Math.max(3 - nl, 1);
-				v = n.toFixed(fl);
-			}
-			v = v + space + unit + postfix;
-			break;
-		}
-	}
-	return v;
-}
-
-// for size sort
-export function sizeToBytes(v) {
-	if (typeof v === "number") {
-		return v;
-	}
-	if (typeof v === "string") {
-		const n = parseFloat(v);
-		const unit = v.replace(/[0-9.B]+/g, "").trim().toUpperCase();
-		if (unit === "K") {
-			return n * 1000;
-		}
-		if (unit === "M") {
-			return n * 1000 * 1000;
-		}
-		if (unit === "G") {
-			return n * 1000 * 1000 * 1000;
-		}
-		if (unit === "T") {
-			return n * 1000 * 1000 * 1000 * 1000;
-		}
-	}
-	return v;
-}
-
-// Flyover component - consolidated from custom-nodes-manager.js and node-usage-analyzer.js
-export function createFlyover(container, options = {}) {
-	const {
-		enableHover = false,
-		hoverHandler = null,
-		context = null
-	} = options;
-
-	const $flyover = document.createElement("div");
-	$flyover.className = "cn-flyover";
-	$flyover.innerHTML = `<div class="cn-flyover-header">
-		<div class="cn-flyover-close">${icons.arrowRight}</div>
-		<div class="cn-flyover-title"></div>
-		<div class="cn-flyover-close">${icons.close}</div>
-		</div>
-		<div class="cn-flyover-body"></div>`
-	container.appendChild($flyover);
-
-	const $flyoverTitle = $flyover.querySelector(".cn-flyover-title");
-	const $flyoverBody = $flyover.querySelector(".cn-flyover-body");
-	
-	let width = '50%';
-	let visible = false;
-
-	let timeHide;
-	const closeHandler = (e) => {
-		if ($flyover === e.target || $flyover.contains(e.target)) {
-			return;
-		}
-		clearTimeout(timeHide);
-		timeHide = setTimeout(() => {
-			flyover.hide();
-		}, 100);
+export function showTooltip(target, text, className = 'cn-tooltip', styleMap = {}) {
+	if (!$tooltip) {
+		$tooltip = document.createElement("div");
+		$tooltip.className = className;
+		$tooltip.style.cssText = `
+			pointer-events: none;
+			position: fixed;
+			z-index: 10001;
+			padding: 20px;
+			color: #1e1e1e;
+			max-width: 350px;
+			filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
+			${Object.keys(styleMap).map(k=>k+":"+styleMap[k]+";").join("")}
+		`;
+		document.body.appendChild($tooltip);
 	}

-	const displayHandler = () => {
-		if (visible) {
-			$flyover.classList.remove("cn-slide-in-right");
-		} else {
-			$flyover.classList.remove("cn-slide-out-right");
-			$flyover.style.width = '0px';
-			$flyover.style.display = "none";
-		}
-	}
-
-	const flyover = {
-		show: (titleHtml, bodyHtml) => {
-			clearTimeout(timeHide);
-			if (context && context.element) {
-				context.element.removeEventListener("click", closeHandler);
-			}
-			$flyoverTitle.innerHTML = titleHtml;
-			$flyoverBody.innerHTML = bodyHtml;
-			$flyover.style.display = "block";
-			$flyover.style.width = width;
-			if(!visible) {
-				$flyover.classList.add("cn-slide-in-right");
-			}
-			visible = true;
-			setTimeout(() => {
-				if (context && context.element) {
-					context.element.addEventListener("click", closeHandler);
-				}
-			}, 100);
-		},
-		hide: (now) => {
-			visible = false;
-			if (context && context.element) {
-				context.element.removeEventListener("click", closeHandler);
-			}
-			if(now) {
-				displayHandler();
-				return;
-			}
-			$flyover.classList.add("cn-slide-out-right");
-		}
-	}
-
-	$flyover.addEventListener("animationend", (e) => {
-		displayHandler();
+	$tooltip.innerHTML = text;
+	$tooltip.style.display = "block";
+	renderPopover($tooltip, target, {
+		positions: ['top', 'bottom', 'right', 'center'],
+		bgColor: "#ffffff",
+		borderColor: "#cccccc",
+		borderRadius: 5
 	});
-
-	// Add hover handlers if enabled
-	if (enableHover && hoverHandler) {
-		$flyover.addEventListener("mouseenter", hoverHandler, true);
-		$flyover.addEventListener("mouseleave", hoverHandler, true);
-	}
-
-	$flyover.addEventListener("click", (e) => {
-		if(e.target.classList.contains("cn-flyover-close")) {
-			flyover.hide();
-			return;
-		}
-		
-		// Forward other click events to the provided handler or context
-		if (context && context.handleFlyoverClick) {
-			context.handleFlyoverClick(e);
-		}
-	});
-
-	return flyover;
 }

-// Message methods accept HTML; callers escape raw data and preserve formatted content.
-export function createUIStateManager(element, selectors) {
-	return {
-		showSelection: (msg) => {
-			const el = element.querySelector(selectors.selection);
-			if (el) el.innerHTML = msg;
-		},
-
-		showError: (err) => {
-			const el = element.querySelector(selectors.message);
-			if (el) {
-				const msg = err ? `<font color="red">${err}</font>` : "";
-				el.innerHTML = msg;
-			}
-		},
-
-		showMessage: (msg, color) => {
-			const el = element.querySelector(selectors.message);
-			if (el) {
-				if (color) {
-					msg = `<font color="${color}">${msg}</font>`;
-				}
-				el.innerHTML = msg;
-			}
-		},
-
-		showStatus: (msg, color) => {
-			const el = element.querySelector(selectors.status);
-			if (el) {
-				if (color) {
-					msg = `<font color="${color}">${msg}</font>`;
-				}
-				el.innerHTML = msg;
-			}
-		},
-		
-		showLoading: (grid) => {
-			if (grid) {
-				grid.showLoading();
-				grid.showMask({
-					opacity: 0.05
-				});
-			}
-		},
-		
-		hideLoading: (grid) => {
-			if (grid) {
-				grid.hideLoading();
-				grid.hideMask();
-			}
-		},
-		
-		showRefresh: () => {
-			const el = element.querySelector(selectors.refresh);
-			if (el) el.style.display = "block";
-		},
-		
-		showStop: () => {
-			const el = element.querySelector(selectors.stop);
-			if (el) el.style.display = "block";
-		},
-		
-		hideStop: () => {
-			const el = element.querySelector(selectors.stop);
-			if (el) el.style.display = "none";
-		}
-	};
+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;
+        const text = target.getAttribute('tooltip');
+        if (text) {
+            showTooltip(target, text);
+        }
+    };
+	const mouseleaveHandler = (e) => {
+        const target = e.target;
+        const text = target.getAttribute('tooltip');
+        if (text) {
+            hideTooltip(target);
+        }
+    };
+	document.body.removeEventListener('mouseenter', mouseenterHandler, true);
+	document.body.removeEventListener('mouseleave', mouseleaveHandler, true);
+	document.body.addEventListener('mouseenter', mouseenterHandler, true);
+    document.body.addEventListener('mouseleave', mouseleaveHandler, true);
+}
+
+initTooltip();
@@ -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)
@@ -678,7 +678,7 @@ export class ComponentBuilderDialog extends ComfyDialog {

 let orig_handleFile = app.handleFile;

-async function handleFile(file, ...args) {
+async function handleFile(file) {
 	if (file.name?.endsWith(".json") || file.name?.endsWith(".pack")) {
 		const reader = new FileReader();
 		reader.onload = async () => {
@@ -694,7 +694,7 @@ async function handleFile(file, ...args) {
 				await handle_import_components(jsonContent);
 			}
 			else {
-				orig_handleFile.call(app, file, ...args);
+				orig_handleFile.call(app, file);
 			}
 		};
 		reader.readAsText(file);
@@ -702,14 +702,14 @@ async function handleFile(file, ...args) {
 		return;
 	}

-	orig_handleFile.call(app, file, ...args);
+	orig_handleFile.call(app, file);
 }

 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; });
 }
@@ -780,7 +780,7 @@ export function set_component_policy(v) {

 let graphToPrompt = app.graphToPrompt;
 app.graphToPrompt = async function () {
-	let p = await graphToPrompt.apply(app, arguments);
+	let p = await graphToPrompt.call(app);
 	try {
 		let groupNodes = p.workflow.extra?.groupNodes;
 		if(groupNodes) {
@@ -1,9 +1,8 @@
 .cn-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
 	z-index: 1099;
-	width: 80vw;
-	height: 75vh;
-	min-height: 30em;
+	width: 80%;
+	height: 80%;
 	display: flex;
 	flex-direction: column;
 	gap: 10px;
@@ -11,7 +10,6 @@
 	font-family: arial, sans-serif;
 	text-underline-offset: 3px;
 	outline: none;
-	margin: calc(var(--spacing)*2);
 }

 .cn-manager .cn-flex-auto {
@@ -19,21 +17,17 @@
 }

 .cn-manager button {
-	width: auto;
-	position: relative;
-	overflow: hidden;
 	font-size: 16px;
 	color: var(--input-text);
 	background-color: var(--comfy-input-bg);
+	border-radius: 8px;
 	border-color: var(--border-color);
+	border-style: solid;
 	margin: 0;
+	padding: 4px 8px;
 	min-width: 100px;
 }

-.cn-manager button:hover {
-	filter: brightness(125%);
-}
-
 .cn-manager button:disabled,
 .cn-manager input:disabled,
 .cn-manager select:disabled {
@@ -46,13 +40,8 @@

 .cn-manager .cn-manager-restart {
 	display: none;
-	background-color: #500000 !important;
-	border-color: #88181b !important;
-	color: white !important;
-}
-
-.cn-manager .cn-manager-restart:hover {
-	background-color: #88181b !important;
+	background-color: #500000;
+	color: white;
 }

 .cn-manager .cn-manager-stop {
@@ -90,6 +79,7 @@
 	flex-wrap: wrap;
 	gap: 5px;
 	align-items: center;
+	padding: 0 5px;
 }

 .cn-manager-header label {
@@ -101,32 +91,16 @@
 .cn-manager-filter {
 	height: 28px;
 	line-height: 28px;
-
-	cursor: pointer;
-	padding: 0.5em 0.5em;
-	border: 1px solid var(--border-color);
-	border-radius: 6px;
-	background: var(--comfy-input-bg);
-}
-
-.cn-manager-filter:hover {
-	filter: brightness(125%);
 }

 .cn-manager-keywords {
 	height: 28px;
 	line-height: 28px;
 	padding: 0 5px 0 26px;
-	background: var(--comfy-input-bg);
 	background-size: 16px;
 	background-position: 5px center;
 	background-repeat: no-repeat;
 	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-
-	border: 1px solid var(--border-color);
-	border-radius: 6px;
-
-	outline-color: transparent;
 }

 .cn-manager-status {
@@ -614,10 +588,6 @@
 	height: 100%;
 }

-.cn-install-buttons button {
-	padding: 4px 8px;
-}
-
 .cn-selected-buttons {
 	display: flex;
 	gap: 5px;
@@ -1,37 +1,49 @@
 import { app } from "../../scripts/app.js";
 import { ComfyDialog, $el } from "../../scripts/ui.js";
 import { api } from "../../scripts/api.js";
-import { buildGuiFrameCustomHeader,  createSettingsCombo } from "./comfyui-gui-builder.js";

 import {
 	manager_instance, rebootAPI, install_via_git_url,
 	fetchData, md5, icons, show_message, customConfirm, customAlert, customPrompt,
-	sanitizeHTML, sanitizeUrl, infoToast, showTerminal, setNeedRestart,
+	sanitizeHTML, infoToast, showTerminal, setNeedRestart,
 	storeColumnWidth, restoreColumnWidth, getTimeAgo, copyText, loadCss,
-	showPopover, hidePopover, getWorkflowNodeTypes, findPackageByCnrId, analyzeWorkflowUsage, createFlyover
+	showPopover, hidePopover, generateUUID
 } from  "./common.js";

 // https://cenfun.github.io/turbogrid/api.html
-import ManagerGrid from "./manager-grid.js";
+import TG from "./turbogrid.esm.js";

 loadCss("./custom-nodes-manager.css");

 const gridId = "node";

 const pageHtml = `
-<div class="cn-manager cn-manager-dark">
-	<div class="cn-manager-grid"></div>
-	<div class="cn-manager-selection"></div>
-	<div class="cn-manager-message"></div>
-	<div class="cn-manager-footer">
-		<button class="cn-manager-restart p-button p-component">Restart</button>
-		<button class="cn-manager-stop p-button p-component">Stop</button>
-		<div class="cn-flex-auto"></div>
-		<button class="cn-manager-used-in-workflow p-button p-component">Used In Workflow</button>
-		<button class="cn-manager-check-update p-button p-component">Check Update</button>
-		<button class="cn-manager-check-missing p-button p-component">Check Missing</button>
-		<button class="cn-manager-install-url p-button p-component">Install via Git URL</button>
-	</div>
+<div class="cn-manager-header">
+	<label>Filter
+		<select class="cn-manager-filter"></select>
+	</label>
+	<input class="cn-manager-keywords" type="search" placeholder="Search" />
+	<div class="cn-manager-status"></div>
+	<div class="cn-flex-auto"></div>
+	<div class="cn-manager-channel"></div>
+</div>
+<div class="cn-manager-grid"></div>
+<div class="cn-manager-selection"></div>
+<div class="cn-manager-message"></div>
+<div class="cn-manager-footer">
+	<button class="cn-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
+	<button class="cn-manager-restart">Restart</button>
+	<button class="cn-manager-stop">Stop</button>
+	<div class="cn-flex-auto"></div>
+	<button class="cn-manager-used-in-workflow">Used In Workflow</button>
+	<button class="cn-manager-check-update">Check Update</button>
+	<button class="cn-manager-check-missing">Check Missing</button>
+	<button class="cn-manager-install-url">Install via Git URL</button>
 </div>
 `;

@@ -42,8 +54,6 @@ const ShowMode = {
 	FAVORITES: "Favorites",
 	ALTERNATIVES: "Alternatives",
 	IN_WORKFLOW: "In Workflow",
-	USED_IN_ANY_WORKFLOW: "Used In Any Workflow",
-	NOT_USED_IN_ANY_WORKFLOW: "Installed and Unused",
 };

 export class CustomNodesManager {
@@ -56,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) {
@@ -79,26 +89,11 @@ export class CustomNodesManager {
 	}

 	init() {
-		const header = $el("div.cn-manager-header.px-2", {}, [
-			// $el("label", {}, [
-			// 	$el("span", { textContent: "Filter" }),
-			// 	$el("select.cn-manager-filter")
-			// ]),
-			createSettingsCombo("Filter", $el("select.cn-manager-filter")),
-			$el("input.cn-manager-keywords.p-inputtext.p-component", { type: "search", placeholder: "Search" }),
-			$el("div.cn-manager-status"),
-			$el("div.cn-flex-auto"),
-			$el("div.cn-manager-channel")
-		]);
-
-		const frame = buildGuiFrameCustomHeader(
-			'cn-manager-dialog', // dialog id
-			header, // custom header element
-			pageHtml, // dialog content element
-			this
-		);	// send this so we can attach close functions
-
-		this.element = frame;
+		this.element = $el("div", {
+			parent: document.body,
+			className: "comfy-modal cn-manager"
+		});
+		this.element.innerHTML = pageHtml;
 		this.element.setAttribute("tabindex", 0);
 		this.element.focus();

@@ -273,14 +268,6 @@ export class CustomNodesManager {
 			label: "In Workflow",
 			value: ShowMode.IN_WORKFLOW,
 			hasData: false
-		}, {
-			label: "Used In Any Workflow",
-			value: ShowMode.USED_IN_ANY_WORKFLOW,
-			hasData: false
-		}, {
-			label: "Installed and Unused",
-			value: ShowMode.NOT_USED_IN_ANY_WORKFLOW,
-			hasData: false
 		}, {
 			label: "Missing",
 			value: ShowMode.MISSING,
@@ -374,17 +361,18 @@ export class CustomNodesManager {
 		}

 		let list = installGroups[action];
-		if (!Array.isArray(list)) {
-			return "";
-		}

 		if(is_selected_button || rowItem?.version === "unknown") {
 			list = list.filter(it => it !== "switch");
 		}

+		if (!list) {
+			return "";
+		}
+
 		return list.map(id => {
 			const bt = buttons[id];
-			return `<button class="cn-btn-${id} p-button p-component" group="${sanitizeHTML(String(action))}" mode="${bt.mode}">${bt.label}</button>`;
+			return `<button class="cn-btn-${id}" group="${action}" mode="${bt.mode}">${bt.label}</button>`;
 		}).join("");
 	}

@@ -471,7 +459,7 @@ export class CustomNodesManager {

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

 	initGrid() {
 		const container = this.element.querySelector(".cn-manager-grid");
-		const grid = new ManagerGrid(container);
+		const grid = new TG.Grid(container);
 		this.grid = grid;

-		this.flyover = createFlyover(container, {
-			enableHover: true,
-			hoverHandler: this.handleFlyoverHover.bind(this),
-			context: this
-		});
+		this.flyover = this.createFlyover(container);
 		
 		let prevViewRowsLength = -1;
 		grid.bind('onUpdated', (e, d) => {
@@ -592,9 +576,6 @@ export class CustomNodesManager {


 		grid.setOption({
-			highlightKeywords: {
-				textGenerator: (row, column) => column === 'author' ? sanitizeHTML(String(row[column] ?? '')) : row[column]
-			},
 			theme: 'dark',
 			selectVisible: true,
 			selectMultiple: true,
@@ -654,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)
@@ -674,6 +655,7 @@ export class CustomNodesManager {
 	}

 	renderGrid() {
+
 		// update theme
 		const globalStyle = window.getComputedStyle(document.body);
 		this.colorVars = {
@@ -700,8 +682,7 @@ export class CustomNodesManager {
 			id: 'id',
 			name: 'ID',
 			width: 50,
-			align: 'center',
-			formatter: (value) => (value === null || value === undefined) ? value : sanitizeHTML(String(value))
+			align: 'center'
 		}, {
 			id: 'title',
 			name: 'Title',
@@ -727,13 +708,11 @@ export class CustomNodesManager {
 				}

 				const link = document.createElement('a');
-				// DOM href takes a validated raw URL, without HTML attribute escaping.
 				if(rowItem.originalData.repository)
-					link.href = sanitizeUrl(rowItem.originalData.repository);
+					link.href = rowItem.originalData.repository;
 				else
-					link.href = sanitizeUrl(rowItem.reference);
+					link.href = rowItem.reference;
 				link.target = '_blank';
-				link.rel = 'noopener noreferrer';
 				link.innerHTML = `<b>${title}</b>`;
 				link.title = rowItem.originalData.id;
 				container.appendChild(link);
@@ -751,15 +730,13 @@ export class CustomNodesManager {
 				if(!version) {
 					return;
 				}
-				const safeVersion = sanitizeHTML(String(version));
 				if(rowItem.cnr_latest && version != rowItem.cnr_latest) {
-					const safeLatest = sanitizeHTML(String(rowItem.cnr_latest));
 					if(version == 'nightly') {
-						return `<div>${safeVersion}</div><div>[${safeLatest}]</div>`;
+						return `<div>${version}</div><div>[${rowItem.cnr_latest}]</div>`;
 					}
-					return `<div>${safeVersion}</div><div>[↑${safeLatest}]</div>`;
+					return `<div>${version}</div><div>[↑${rowItem.cnr_latest}]</div>`;
 				}
-				return safeVersion;
+				return version;
 			}
 		}, {
 			id: 'action',
@@ -811,11 +788,10 @@ export class CustomNodesManager {
 			width: 120,
 			classMap: "cn-pack-author", 
 			formatter: (author, rowItem, columnItem) => {
-				const safeAuthor = sanitizeHTML(String(author ?? ''));
 				if (rowItem.trust) {
-					return `<span title="This author has been active for more than six months in GitHub">✅ ${safeAuthor}</span>`;
+					return `<span tooltip="This author has been active for more than six months in GitHub">✅ ${author}</span>`;
 				}
-				return safeAuthor;
+				return author;
 			}
 		}, {
 			id: 'stars',
@@ -829,7 +805,7 @@ export class CustomNodesManager {
 				if (typeof stars === 'number') {
 					return stars.toLocaleString();
 				}
-				return (stars === null || stars === undefined) ? stars : sanitizeHTML(String(stars));
+				return stars;
 			}
 		}, {
 			id: 'last_update',
@@ -843,8 +819,8 @@ export class CustomNodesManager {
 					return 'N/A';
 				}
 				const ago = getTimeAgo(last_update);
-				const short = sanitizeHTML(String(last_update).split(' ')[0]);
-				return `<span title="${ago}">${short}</span>`;
+				const short = `${last_update}`.split(' ')[0];
+				return `<span tooltip="${ago}">${short}</span>`;
 			}
 		}];

@@ -1085,63 +1061,143 @@ export class CustomNodesManager {
 		hidePopover();
 	}

-	handleFlyoverHover(e) {
-		if(e.type === "mouseenter") {
-			if(e.target.classList.contains("cn-nodes-name")) {
-				this.showNodePreview(e.target);
-			}
-			return;
-		}
-		this.hideNodePreview();
-	}
+	createFlyover(container) {
+		const $flyover = document.createElement("div");
+		$flyover.className = "cn-flyover";
+		$flyover.innerHTML = `<div class="cn-flyover-header">
+			<div class="cn-flyover-close">${icons.arrowRight}</div>
+			<div class="cn-flyover-title"></div>
+			<div class="cn-flyover-close">${icons.close}</div>
+			</div>
+			<div class="cn-flyover-body"></div>`
+		container.appendChild($flyover);

-	handleFlyoverClick(e) {
-		if(e.target.classList.contains("cn-nodes-name")) {
-			const nodeName = e.target.innerText;
-			const nodeItem = this.nodeMap[nodeName];
-			if (!nodeItem) {
-				copyText(nodeName).then((res) => {
-					if (res) {
-						e.target.setAttribute("action", "Copied");
-						e.target.classList.add("action");
-						setTimeout(() => {
-							e.target.classList.remove("action");
-							e.target.removeAttribute("action");
-						}, 1000);
-					}
-				});
+		const $flyoverTitle = $flyover.querySelector(".cn-flyover-title");
+		const $flyoverBody = $flyover.querySelector(".cn-flyover-body");
+		
+		let width = '50%';
+		let visible = false;
+
+		let timeHide;
+		const closeHandler = (e) => {
+            if ($flyover === e.target || $flyover.contains(e.target)) {
+                return;
+            }
+			clearTimeout(timeHide);
+			timeHide = setTimeout(() => {
+				flyover.hide();
+			}, 100);
+		}
+
+		const hoverHandler = (e) => {
+			if(e.type === "mouseenter") {
+				if(e.target.classList.contains("cn-nodes-name")) {
+					this.showNodePreview(e.target);
+				}
 				return;
 			}
+			this.hideNodePreview();
+		}

-			const [x, y, w, h] = app.canvas.ds.visible_area;
-			const dpi = Math.max(window.devicePixelRatio ?? 1, 1);
-			const node = window.LiteGraph?.createNode(
-				nodeItem.name,
-				nodeItem.display_name,
-				{
-					pos: [x + (w-300) / dpi / 2, y]
-				}
-			);
-			if (node) {
-				app.graph.add(node);
-				e.target.setAttribute("action", "Added to Workflow");
-				e.target.classList.add("action");
-				setTimeout(() => {
-					e.target.classList.remove("action");
-					e.target.removeAttribute("action");
-				}, 1000);
+		const displayHandler = () => {
+			if (visible) {
+				$flyover.classList.remove("cn-slide-in-right");
+			} else {
+				$flyover.classList.remove("cn-slide-out-right");
+				$flyover.style.width = '0px';
+				$flyover.style.display = "none";
 			}
-			
-			return;
 		}
-		if(e.target.classList.contains("cn-nodes-pack")) {
-			const hash = e.target.getAttribute("hash");
-			const rowItem = this.grid.getRowItemBy("hash", hash);
+
+		const flyover = {
+			show: (titleHtml, bodyHtml) => {
+				clearTimeout(timeHide);
+				this.element.removeEventListener("click", closeHandler);
+				$flyoverTitle.innerHTML = titleHtml;
+				$flyoverBody.innerHTML = bodyHtml;
+				$flyover.style.display = "block";
+				$flyover.style.width = width;
+				if(!visible) {
+					$flyover.classList.add("cn-slide-in-right");
+				}
+				visible = true;
+				setTimeout(() => {
+					this.element.addEventListener("click", closeHandler);
+				}, 100);
+			},
+			hide: (now) => {
+				visible = false;
+				this.element.removeEventListener("click", closeHandler);
+				if(now) {
+					displayHandler();
+					return;
+				}
+				$flyover.classList.add("cn-slide-out-right");
+			}
+		}
+
+		$flyover.addEventListener("animationend", (e) => {
+			displayHandler();
+		});
+
+		$flyover.addEventListener("mouseenter", hoverHandler, true);
+		$flyover.addEventListener("mouseleave", hoverHandler, true);
+
+		$flyover.addEventListener("click", (e) => {
+
+			if(e.target.classList.contains("cn-nodes-name")) {
+				const nodeName = e.target.innerText;
+				const nodeItem = this.nodeMap[nodeName];
+				if (!nodeItem) {
+					copyText(nodeName).then((res) => {
+						if (res) {
+							e.target.setAttribute("action", "Copied");
+							e.target.classList.add("action");
+							setTimeout(() => {
+								e.target.classList.remove("action");
+								e.target.removeAttribute("action");
+							}, 1000);
+						}
+					});
+					return;
+				}
+
+				const [x, y, w, h] = app.canvas.ds.visible_area;
+				const dpi = Math.max(window.devicePixelRatio ?? 1, 1);
+				const node = window.LiteGraph?.createNode(
+					nodeItem.name,
+					nodeItem.display_name,
+					{
+						pos: [x + (w-300) / dpi / 2, y]
+					}
+				);
+				if (node) {
+					app.graph.add(node);
+					e.target.setAttribute("action", "Added to Workflow");
+					e.target.classList.add("action");
+					setTimeout(() => {
+						e.target.classList.remove("action");
+						e.target.removeAttribute("action");
+					}, 1000);
+				}
+				
+				return;
+			}
+			if(e.target.classList.contains("cn-nodes-pack")) {
+				const hash = e.target.getAttribute("hash");
+				const rowItem = this.grid.getRowItemBy("hash", hash);
 				//console.log(rowItem);
-			this.grid.scrollToRow(rowItem);
-			this.addHighlight(rowItem);
-			return;
-		}
+				this.grid.scrollToRow(rowItem);
+				this.addHighlight(rowItem);
+				return;
+			}
+			if(e.target.classList.contains("cn-flyover-close")) {
+				flyover.hide();
+				return;
+			}
+		});
+
+		return flyover;
 	}

 	showNodes(d) {
@@ -1153,7 +1209,6 @@ export class CustomNodesManager {
 		const rowItem = d.rowItem;
 		const isNotInstalled = rowItem.action == "not-installed";

-		// Pack titles are already escaped by the server.
 		let titleHtml = `<div class="cn-nodes-pack" hash="${rowItem.hash}">${rowItem.title}</div>`;
 		if (isNotInstalled) {
 			titleHtml += '<div class="cn-pack-badge">Not Installed</div>'
@@ -1170,8 +1225,7 @@ export class CustomNodesManager {

 			list.push(`<div class="${rowClass}">`);
 			list.push(`<div class="cn-nodes-sn">${i+1}</div>`);
-			// extName via /customnode/getmappings, no server sanitize: escaped at the sink.
-			list.push(`<div class="cn-nodes-name">${sanitizeHTML(String(it.name))}</div>`);
+			list.push(`<div class="cn-nodes-name">${it.name}</div>`);

 			if (it.conflicts) {
 				list.push(`<div class="cn-conflicts-list"><div class="cn-nodes-conflict cn-icon">${icons.conflicts}</div><b>Conflict with</b>${it.conflicts.map(c => {
@@ -1190,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;
@@ -1293,7 +1347,7 @@ export class CustomNodesManager {
 			return;
 		}

-		const selectedMap = Object.create(null);
+		const selectedMap = {};
 		selectedList.forEach(item => {
 			let type = item.action;
 			if (item.restart) {
@@ -1312,7 +1366,7 @@ export class CustomNodesManager {
 		Object.keys(selectedMap).forEach(v => {
 			const filterItem = this.getFilterItem(v);
 			list.push(`<div class="cn-selected-buttons">
-				<span>Selected <b>${selectedMap[v].length}</b> ${sanitizeHTML(String(filterItem ? filterItem.label : v))}</span>
+				<span>Selected <b>${selectedMap[v].length}</b> ${filterItem ? filterItem.label : v}</span>
 				${this.grid.hasMask ? "" : this.getActionButtons(v, null, true)}
 			</div>`);
 		});
@@ -1342,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();

@@ -1387,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") {
@@ -1420,15 +1467,9 @@ export class CustomNodesManager {
 		let needRestart = false;
 		let errorMsg = "";

-		await api.fetchApi('/manager/queue/reset', { method: 'POST' });
-
-		// Set install_context BEFORE per-item queue enqueue calls so that any
-		// server-side synchronous completion (e.g., sync enable of an inactive
-		// node) that emits cm-queue-status before we return here still finds
-		// install_context populated in onQueueCompleted. target_items is shared
-		// by reference so further pushes below remain visible.
 		let target_items = [];
-		this.install_context = {btn: btn, targets: target_items};
+
+		let batch = {};

 		for (const hash of list) {
 			const item = this.grid.getRowItemBy("hash", hash);
@@ -1471,34 +1512,16 @@ 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) {
-				// The title is already escaped by populate_markdown.
-				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 {
-					errorMsg += sanitizeHTML(await res.text()) + '\n';
-				}
-
-				break;
+			if(batch[api_mode]) {
+				batch[api_mode].push(data);
+			}
+			else {
+				batch[api_mode] = [data];
 			}
 		}

+		this.install_context = {btn: btn, targets: target_items};
+
 		if(errorMsg) {
 			this.showError(errorMsg);
 			show_message("[Installation Errors]\n"+errorMsg);
@@ -1510,7 +1533,24 @@ export class CustomNodesManager {
 			}
 		}
 		else {
-			await api.fetchApi('/manager/queue/start', { method: 'POST' });
+			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();
 		}
@@ -1518,98 +1558,60 @@ 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;

 			const item = self.grid.getRowItemBy("hash", hash);

-			if (!item) {
-				return;
-			}
-
 			item.restart = true;
 			self.restartMap[item.hash] = true;
 			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();
-			// Await + error logging so any unhandled rejection surfaces to the
-			// console instead of silently swallowing completion finalization
-			// (root cause of disable/enable button staying loading with no toast).
-			try {
-				await self.onQueueCompleted(event.detail);
-			} catch (e) {
-				console.error("[ComfyUI-Manager] onQueueCompleted failed:", e);
-			}
+			self.onQueueCompleted(event.detail);
 		}
 	}

 	async onQueueCompleted(info) {
-		// `nodepack_result` is a dict serialized from a Python dict, not an array.
-		// `dict.length` is `undefined` and `undefined == 0` is `false`, so the
-		// previous `result.length == 0` guard was a no-op; switch to a correct
-		// empty-check that also tolerates null/undefined.
 		let result = info.nodepack_result;

-		if (!result || Object.keys(result).length === 0) {
+		if(result.length == 0) {
 			return;
 		}

 		let self = CustomNodesManager.instance;

-		if (!self || !self.install_context) {
+		if(!self.install_context) {
 			return;
 		}

 		const { target, label, mode } = self.install_context.btn;
-		const targets = self.install_context.targets || [];
+		target.classList.remove("cn-btn-loading");

-		// Compute errorMsg upfront so the downstream user-visible finalization
-		// (showRestart / showMessage / infoToast) fires regardless of whether
-		// any DOM-touching step below throws.
 		let errorMsg = "";
-		for (let hash in result) {
+
+		for(let hash in result){
 			let v = result[hash];
-			if (v != 'success' && v != 'skip') {
-				// Escape raw task errors for both HTML message destinations.
-				errorMsg += sanitizeHTML(String(v)) + '\n';
-			}
+
+			if(v != 'success' && v != 'skip')
+				errorMsg += v+'\n';
 		}

-		// Defensive: `target` may be a detached DOM node (the in_progress
-		// handler's updateCell can re-render the row and replace the button
-		// element). classList.remove on a detached node is a no-op, but we
-		// still guard in case target was torn down entirely.
-		try {
-			if (target && target.classList) {
-				target.classList.remove("cn-btn-loading");
-			}
-		} catch (e) {
-			console.warn("[ComfyUI-Manager] Failed to clear button loading state:", e);
-		}
-
-		// Defensive: grid.updateCell can throw if the item was removed or the
-		// grid was re-rendered between in_progress and done. Do NOT let this
-		// loop abort the completion finalization below — that was the observed
-		// failure mode for disable/enable (no toast, no "restart required"
-		// message).
-		try {
-			for (let k in targets) {
-				let item = targets[k];
-				if (item) {
-					self.grid.updateCell(item, "action");
-				}
-			}
-		} catch (e) {
-			console.warn("[ComfyUI-Manager] Failed to refresh target cells after queue completion:", e);
+		for(let k in self.install_context.targets) {
+			let item = self.install_context.targets[k];
+			self.grid.updateCell(item, "action");
 		}

 		if (errorMsg) {
 			self.showError(errorMsg);
-			show_message("Installation Error:\n" + errorMsg);
+			show_message("Installation Error:\n"+errorMsg);
 		} else {
-			self.showStatus(`${label} ${Object.keys(result).length} custom node(s) successfully`);
+			self.showStatus(`${label} ${result.length} custom node(s) successfully`);
 		}

 		self.showRestart();
@@ -1624,35 +1626,17 @@ export class CustomNodesManager {
 	getNodesInWorkflow() {
 		let usedGroupNodes = new Set();
 		let allUsedNodes = {};
-		const visitedGraphs = new Set();

-		const visitGraph = (graph) => {
-			if (!graph || visitedGraphs.has(graph)) return;
-			visitedGraphs.add(graph);
+		for(let k in app.graph._nodes) {
+			let node = app.graph._nodes[k];

-			const nodes = graph._nodes || graph.nodes || [];
-			for(let k in nodes) {
-				let node = nodes[k];
-				if (!node) continue;
-
-				// If it's a SubgraphNode, recurse into its graph and continue searching
-				if (node.isSubgraphNode?.() && node.subgraph) {
-					visitGraph(node.subgraph);
-				}
-
-				if (!node.type) continue;
-
-				// Group nodes / components
-				if(typeof node.type === 'string' && node.type.startsWith('workflow>')) {
-					usedGroupNodes.add(node.type.slice(9));
-					continue;
-				}
-
-				allUsedNodes[node.type] = node;
+			if(node.type.startsWith('workflow>')) {
+				usedGroupNodes.add(node.type.slice(9));
+				continue;
 			}
-		};

-		visitGraph(app.graph);
+			allUsedNodes[node.type] = node;
+		}

 		for(let k of usedGroupNodes) {
 			let subnodes = app.graph.extra.groupNodes[k]?.nodes;
@@ -1763,9 +1747,9 @@ 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: ${sanitizeHTML(String(res.error))}`);
+			this.showError(`Failed to get custom node mappings: ${res.error}`);
 			return;
 		}

@@ -1862,10 +1846,7 @@ export class CustomNodesManager {
 		for(let k in allUsedNodes) {
 			var item;
 			if(allUsedNodes[k].properties.cnr_id) {
-				const foundPackage = findPackageByCnrId(allUsedNodes[k].properties.cnr_id, this.custom_nodes, false);
-				if (foundPackage) {
-					item = foundPackage.pack;
-				}
+				item = this.custom_nodes[allUsedNodes[k].properties.cnr_id];
 			}
 			else if(allUsedNodes[k].properties.aux_id) {
 				item = aux_id_to_pack[allUsedNodes[k].properties.aux_id];
@@ -1881,9 +1862,9 @@ 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: ${sanitizeHTML(String(res.error))}`);
+			this.showError(`Failed to get alternatives: ${res.error}`);
 			return [];
 		}

@@ -1899,9 +1880,8 @@ export class CustomNodesManager {
 				continue;
 			}

-			// tags (alter-list.json) is not server-transformed, so escape before innerHTML.
 			const tags = `${item.tags}`.split(",").map(tag => {
-				return `<div>${sanitizeHTML(tag.trim())}</div>`;
+				return `<div>${tag.trim()}</div>`;
 			}).join("");

 			hashMap[custom_node.hash] = {
@@ -1913,48 +1893,6 @@ export class CustomNodesManager {
 		return hashMap;
 	}

-	async getUsedInAnyWorkflow() {
-		this.showStatus(`Loading workflow usage analysis ...`);
-		
-		const result = await analyzeWorkflowUsage(this.custom_nodes);
-		
-		if (!result.success) {
-			this.showError(`Failed to get workflow data: ${sanitizeHTML(String(result.error))}`);
-			return {};
-		}
-		
-		const hashMap = {};
-		
-		// Convert usage map keys to hash map
-		result.usageMap.forEach((count, packageKey) => {
-			const pack = this.custom_nodes[packageKey];
-			if (pack && pack.hash) {
-				hashMap[pack.hash] = true;
-			}
-		});
-		
-		return hashMap;
-	}
-
-	async getNotUsedInAnyWorkflow() {
-		this.showStatus(`Loading workflow usage analysis ...`);
-		
-		// Get the used packages first using common utility
-		const usedHashMap = await this.getUsedInAnyWorkflow();
-		const notUsedHashMap = {};
-		
-		// Find all installed packages that are NOT in the used list
-		for(let k in this.custom_nodes) {
-			let nodepack = this.custom_nodes[k];
-			// Only consider installed packages
-			if (nodepack.state !== "not-installed" && !usedHashMap[nodepack.hash]) {
-				notUsedHashMap[nodepack.hash] = true;
-			}
-		}
-		
-		return notUsedHashMap;
-	}
-
 	async loadData(show_mode = ShowMode.NORMAL) {
 		const isElectron = 'electronAPI' in window;

@@ -1972,7 +1910,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();
@@ -1990,7 +1928,7 @@ export class CustomNodesManager {
 		this.custom_nodes = node_packs;

 		if(this.channel !== 'default') {
-			this.element.querySelector(".cn-manager-channel").innerHTML = `Channel: ${sanitizeHTML(String(this.channel))} (Incomplete list)`;
+			this.element.querySelector(".cn-manager-channel").innerHTML = `Channel: ${this.channel} (Incomplete list)`;
 		}

 		for (const k in node_packs) {
@@ -2024,10 +1962,6 @@ export class CustomNodesManager {
 				hashMap = await this.getFavorites();
 			} else if(this.show_mode == ShowMode.IN_WORKFLOW) {
 				hashMap = await this.getNodepackInWorkflow();
-			} else if(this.show_mode == ShowMode.USED_IN_ANY_WORKFLOW) {
-				hashMap = await this.getUsedInAnyWorkflow();
-			} else if(this.show_mode == ShowMode.NOT_USED_IN_ANY_WORKFLOW) {
-				hashMap = await this.getNotUsedInAnyWorkflow();
 			}
 			filterItem.hashMap = hashMap;

@@ -2122,7 +2056,6 @@ export class CustomNodesManager {

 	// ===========================================================================================

-	// Messages accept HTML; see createUIStateManager in common.js.
 	showSelection(msg) {
 		this.element.querySelector(".cn-manager-selection").innerHTML = msg;
 	}
@@ -2240,4 +2173,4 @@ export class CustomNodesManager {
 	get isVisible() {
 		return this.element?.style?.display !== "none";
 	}
-}
+}
@@ -1,15 +1,13 @@
 .cmm-manager {
 	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
 	z-index: 1099;
-	width: 80vw;
-	height: 75vh;
-	min-height: 30em;
+	width: 80%;
+	height: 80%;
 	display: flex;
 	flex-direction: column;
 	gap: 10px;
 	color: var(--fg-color);
 	font-family: arial, sans-serif;
-	margin: calc(var(--spacing)*2);
 }

 .cmm-manager .cmm-flex-auto {
@@ -20,15 +18,14 @@
 	font-size: 16px;
 	color: var(--input-text);
    background-color: var(--comfy-input-bg);
+    border-radius: 8px;
    border-color: var(--border-color);
+    border-style: solid;
    margin: 0;
+	padding: 4px 8px;
 	min-width: 100px;
 }

-.cmm-manager button:hover {
-	filter: brightness(125%);
-}
-
 .cmm-manager button:disabled,
 .cmm-manager input:disabled,
 .cmm-manager select:disabled {
@@ -41,7 +38,7 @@

 .cmm-manager .cmm-manager-refresh {
 	display: none;
-	background-color: #000080 !important;
+	background-color: #000080;
 	color: white;
 }

@@ -56,6 +53,7 @@
 	flex-wrap: wrap;
 	gap: 5px;
 	align-items: center;
+	padding: 0 5px;
 }

 .cmm-manager-header label {
@@ -69,34 +67,16 @@
 .cmm-manager-filter {
 	height: 28px;
 	line-height: 28px;
-
-	cursor: pointer;
-	padding: 0.5em 0.5em;
-	border: 1px solid var(--border-color);
-	border-radius: 6px;
-	background: var(--comfy-input-bg);
-}
-
-.cmm-manager-type:hover,
-.cmm-manager-base:hover,
-.cmm-manager-filter:hover {
-	filter: brightness(125%);
 }

 .cmm-manager-keywords {
 	height: 28px;
 	line-height: 28px;
 	padding: 0 5px 0 26px;
-	background: var(--comfy-input-bg);
 	background-size: 16px;
 	background-position: 5px center;
 	background-repeat: no-repeat;
 	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-
-	border: 1px solid var(--border-color);
-	border-radius: 6px;
-
-	outline-color: transparent;
 }

 .cmm-manager-status {
@@ -168,10 +148,6 @@
 	color: white;
 }

-.cmm-btn-install {
-	padding: 4px 8px;
-}
-
 .cmm-btn-download {
 	width: 18px;
 	height: 18px;
@@ -1,40 +1,47 @@
 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, formatSize, sizeToBytes,
-	sanitizeHTML, safeHref
+	storeColumnWidth, restoreColumnWidth, loadCss, generateUUID
 } from  "./common.js";
 import { api } from "../../scripts/api.js";

 // https://cenfun.github.io/turbogrid/api.html
-import ManagerGrid from "./manager-grid.js";
-import { buildGuiFrameCustomHeader,  createSettingsCombo } from "./comfyui-gui-builder.js";
+import TG from "./turbogrid.esm.js";

 loadCss("./model-manager.css");

 const gridId = "model";

-// Escape raw cells while preserving empty values.
-const escapeCell = (value) => (value === null || value === undefined) ? value : sanitizeHTML(String(value));
-
-// Escape option markup while comparing the original values.
-const renderOptions = (list, current) => list.map(item => {
-	const selected = item.value === current ? " selected" : "";
-	return `<option value="${sanitizeHTML(String(item.value))}"${selected}>${sanitizeHTML(String(item.label))}</option>`;
-}).join("");
-
 const pageHtml = `
-<div class="cmm-manager cmm-manager-dark">
-	<div class="cmm-manager-grid"></div>
-	<div class="cmm-manager-selection"></div>
-	<div class="cmm-manager-message"></div>
-	<div class="cmm-manager-footer">
-		<button class="cmm-manager-refresh p-button p-component">Refresh</button>
-		<button class="cmm-manager-stop p-button p-component">Stop</button>
-		<div class="cmm-flex-auto"></div>
-	</div>
+<div class="cmm-manager-header">
+	<label>Filter
+		<select class="cmm-manager-filter"></select>
+	</label>
+	<label>Type
+		<select class="cmm-manager-type"></select>
+	</label>
+	<label>Base
+		<select class="cmm-manager-base"></select>
+	</label>
+	<input class="cmm-manager-keywords" type="search" placeholder="Search" />
+	<div class="cmm-manager-status"></div>
+	<div class="cmm-flex-auto"></div>
+</div>
+<div class="cmm-manager-grid"></div>
+<div class="cmm-manager-selection"></div>
+<div class="cmm-manager-message"></div>
+<div class="cmm-manager-footer">
+	<button class="cmm-manager-back">
+		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+		</svg>
+		Back
+	</button>
+	<button class="cmm-manager-refresh">Refresh</button>
+	<button class="cmm-manager-stop">Stop</button>
+	<div class="cmm-flex-auto"></div>
 </div>
 `;

@@ -57,23 +64,11 @@ export class ModelManager {
 	}

 	init() {
-		const header = $el("div.cmm-manager-header", {}, [
-			createSettingsCombo("Filter", $el("select.cmm-manager-filter")),
-			createSettingsCombo("Type", $el("select.cmm-manager-type")),
-			createSettingsCombo("Base", $el("select.cmm-manager-base")),
-			$el("input.cmm-manager-keywords.p-inputtext.p-component", { type: "search", placeholder: "Search" }),
-			$el("div.cmm-manager-status"),
-			$el("div.cmm-flex-auto")
-		]);
-
-		const frame = buildGuiFrameCustomHeader(
-			'cmm-manager-dialog', // dialog id
-			header, // custom header element
-			pageHtml, // dialog content element
-			this
-		);	// send this so we can attach close functions
-
-		this.element = frame;
+		this.element = $el("div", {
+			parent: document.body,
+			className: "comfy-modal cmm-manager"
+		});
+		this.element.innerHTML = pageHtml;
 		this.initFilter();
 		this.bindEvents();
 		this.initGrid();
@@ -111,13 +106,22 @@ export class ModelManager {

 	updateFilter() {
 		const $filter  = this.element.querySelector(".cmm-manager-filter");
-		$filter.innerHTML = renderOptions(this.filterList, this.filter);
+		$filter.innerHTML = this.filterList.map(item => {
+			const selected = item.value === this.filter ? " selected" : "";
+			return `<option value="${item.value}"${selected}>${item.label}</option>`
+		}).join("");

 		const $type  = this.element.querySelector(".cmm-manager-type");
-		$type.innerHTML = renderOptions(this.typeList, this.type);
+		$type.innerHTML = this.typeList.map(item => {
+			const selected = item.value === this.type ? " selected" : "";
+			return `<option value="${item.value}"${selected}>${item.label}</option>`
+		}).join("");

 		const $base  = this.element.querySelector(".cmm-manager-base");
-		$base.innerHTML = renderOptions(this.baseList, this.base);
+		$base.innerHTML = this.baseList.map(item => {
+			const selected = item.value === this.base ? " selected" : "";
+			return `<option value="${item.value}"${selected}>${item.label}</option>`
+		}).join("");

 	}

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

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

 	initGrid() {
 		const container = this.element.querySelector(".cmm-manager-grid");
-		const grid = new ManagerGrid(container);
+		const grid = new TG.Grid(container);
 		this.grid = grid;
 		
 		grid.bind('onUpdated', (e, d) => {
@@ -228,9 +232,6 @@ export class ModelManager {
        });

 		grid.setOption({
-			highlightKeywords: {
-				textGenerator: (row, column) => ['name', 'description'].includes(column) ? row[column] : escapeCell(row[column])
-			},
 			theme: 'dark',

 			selectVisible: true,
@@ -329,8 +330,7 @@ export class ModelManager {
 			maxWidth: 500,
 			classMap: 'cmm-node-name',
 			formatter: function(name, rowItem, columnItem, cellNode) {
-				// Names are server-escaped; raw references need URL and attribute handling.
-				return `<a href="${safeHref(rowItem.reference)}" target="_blank" rel="noopener noreferrer"><b>${name}</b></a>`;
+				return `<a href=${rowItem.reference} target="_blank"><b>${name}</b></a>`;
 			}
 		}, {
 			id: 'installed',
@@ -347,7 +347,7 @@ export class ModelManager {
 				if (installed === "True") {
 					return `<div class="cmm-icon-passed">${icons.passed}</div>`;
 				}
-				return `<button class="cmm-btn-install p-button p-component" mode="install">Install</button>`;
+				return `<button class="cmm-btn-install" mode="install">Install</button>`;
 			}
 		}, {
 			id: 'url',
@@ -356,7 +356,7 @@ export class ModelManager {
 			sortable: false,
 			align: 'center',
 			formatter: (url, rowItem, columnItem) => {
-				return `<a class="cmm-btn-download" title="Download file" href="${safeHref(url)}" target="_blank" rel="noopener noreferrer">${icons.download}</a>`;
+				return `<a class="cmm-btn-download" tooltip="Download file" href="${url}" target="_blank">${icons.download}</a>`;
 			}
 		}, {
 			id: 'size',
@@ -364,21 +364,18 @@ export class ModelManager {
 			width: 100,
 			formatter: (size) => {
 				if (typeof size === "number") {
-					return formatSize(size);
+					return this.formatSize(size);
 				}
 				return size;
 			}
 		}, {
 			id: 'type',
 			name: 'Type',
-			width: 100,
-			formatter: escapeCell
+			width: 100
 		}, {
 			id: 'base',
-			name: 'Base',
-			formatter: escapeCell
+			name: 'Base'
 		}, {
-			// Descriptions are formatted HTML from the server.
 			id: 'description',
 			name: 'Description',
 			width: 400,
@@ -387,13 +384,11 @@ export class ModelManager {
 		}, {
 			id: "save_path",
 			name: 'Save Path',
-			width: 200,
-			formatter: escapeCell
+			width: 200
 		}, {
 			id: 'filename',
 			name: 'Filename',
-			width: 200,
-			formatter: escapeCell
+			width: 200
 		}];

 		restoreColumnWidth(gridId, columns);
@@ -425,7 +420,7 @@ export class ModelManager {
 		}

 		this.selectedModels = selectedList;
-		this.showSelection(`<span>Selected <b>${selectedList.length}</b> models <button class="cmm-btn-install p-button p-component" mode="install">Install</button>`);
+		this.showSelection(`<span>Selected <b>${selectedList.length}</b> models <button class="cmm-btn-install" mode="install">Install</button>`);
 	}

 	focusInstall(item) {
@@ -440,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', { method: 'POST' });
-
 		let target_items = [];

+		let batch = {};
+
 		for (const item of list) {
 			this.grid.scrollRowIntoView(item);
 			target_items.push(item);
@@ -468,36 +455,17 @@ export class ModelManager {
 				});
 			}

-			// Model names are already escaped by the server.
 			this.showStatus(`Install ${item.name} ...`);

 			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 += sanitizeHTML(await res.text()) + '\n';
-				}
-
-				break;
+			if(batch['install_model']) {
+				batch['install_model'].push(data);
+			}
+			else {
+				batch['install_model'] = [data];
 			}
 		}

@@ -514,7 +482,24 @@ export class ModelManager {
 			}
 		}
 		else {
-			await api.fetchApi('/manager/queue/start', { method: 'POST' });
+			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();
 		}
@@ -534,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);
 		}
@@ -563,9 +548,8 @@ export class ModelManager {
 		for(let hash in result){
 			let v = result[hash];

-			// Escape raw task errors for both HTML message destinations.
 			if(v != 'success')
-				errorMsg += sanitizeHTML(String(v)) + '\n';
+				errorMsg += v + '\n';
 		}

 		for(let k in self.install_context.targets) {
@@ -594,7 +578,7 @@ export class ModelManager {
 		models.forEach((item, i) => {
 			const { type, base, name, reference, installed } = item;
 			item.originalData = JSON.parse(JSON.stringify(item));
-			item.size = sizeToBytes(item.size);
+			item.size = this.sizeToBytes(item.size);
 			item.hash = md5(name + reference);
 			item.id = i + 1;

@@ -661,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();
@@ -671,6 +655,7 @@ export class ModelManager {
 		const { models } = res.data;

 		this.modelList = this.getModelList(models);
+		// console.log("models", this.modelList);

 		this.updateFilter();
 		
@@ -682,7 +667,56 @@ export class ModelManager {

 	// ===========================================================================================

-	// Messages accept HTML; see createUIStateManager in common.js.
+	formatSize(v) {
+		const base = 1000;
+        const units = ['', 'K', 'M', 'G', 'T', 'P'];
+        const space = '';
+        const postfix = 'B';
+		if (v <= 0) {
+			return `0${space}${postfix}`;
+		}
+		for (let i = 0, l = units.length; i < l; i++) {
+			const min = Math.pow(base, i);
+			const max = Math.pow(base, i + 1);
+			if (v > min && v <= max) {
+				const unit = units[i];
+				if (unit) {
+					const n = v / min;
+					const nl = n.toString().split('.')[0].length;
+					const fl = Math.max(3 - nl, 1);
+					v = n.toFixed(fl);
+				}
+				v = v + space + unit + postfix;
+				break;
+			}
+		}
+		return v;
+	}
+
+	// for size sort
+	sizeToBytes(v) {
+		if (typeof v === "number") {
+			return v;
+		}
+		if (typeof v === "string") {
+			const n = parseFloat(v);
+			const unit = v.replace(/[0-9.B]+/g, "").trim().toUpperCase();
+			if (unit === "K") {
+				return n * 1000;
+			}
+			if (unit === "M") {
+				return n * 1000 * 1000;
+			}
+			if (unit === "G") {
+				return n * 1000 * 1000 * 1000;
+			}
+			if (unit === "T") {
+				return n * 1000 * 1000 * 1000 * 1000;
+			}
+		}
+		return v;
+	}
+
 	showSelection(msg) {
 		this.element.querySelector(".cmm-manager-selection").innerHTML = msg;
 	}
@@ -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({
@@ -1,18 +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, loadCss, sanitizeHTML } from  "./common.js";
-import { buildGuiFrame } from "./comfyui-gui-builder.js";
+import { manager_instance, rebootAPI, show_message } from  "./common.js";

-loadCss("./snapshot.css");

 async function restore_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi('/snapshot/restore', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ 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;
 			}

@@ -29,7 +27,7 @@ async function restore_snapshot(target) {
 		}
 		finally {
 			await SnapshotManager.instance.invalidateControl();
-			SnapshotManager.instance.updateMessage("<BR>To apply the snapshot, please <button id='cm-reboot-button2' class='p-button p-component'>RESTART</button> ComfyUI. And refresh browser.", 'cm-reboot-button2');
+			SnapshotManager.instance.updateMessage("<BR>To apply the snapshot, please <button id='cm-reboot-button2' class='cm-small-button'>RESTART</button> ComfyUI. And refresh browser.", 'cm-reboot-button2');
 		}
 	}
 }
@@ -37,10 +35,10 @@ async function restore_snapshot(target) {
 async function remove_snapshot(target) {
 	if(SnapshotManager.instance) {
 		try {
-			const response = await api.fetchApi('/snapshot/remove', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ 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;
 			}

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

 async function save_current_snapshot() {
 	try {
-		const response = await api.fetchApi('/snapshot/save', { method: 'POST', cache: "no-store" });
+		const response = await api.fetchApi('/v2/snapshot/save', { cache: "no-store" });
 		app.ui.dialog.close();
 		return true;
 	}
@@ -78,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;
 }
@@ -90,8 +88,6 @@ export class SnapshotManager extends ComfyDialog {
 	message_box = null;
 	data = null;

-	content = $el("div.snapshot-manager");
-
 	clear() {
 		this.restore_buttons = [];
 		this.message_box = null;
@@ -100,18 +96,9 @@ export class SnapshotManager extends ComfyDialog {

 	constructor(app, manager_dialog) {
 		super();
-		// this.manager_dialog = manager_dialog;
+		this.manager_dialog = manager_dialog;
 		this.search_keyword = '';
-
-		const frame = buildGuiFrame(
-			'snapshot-manager-dialog', // dialog id
-			'Snapshot Manager', // title
-			'i.mdi.mdi-puzzle', // icon class
-			this.content, // dialog content element
-			this
-		);	// send this so we can attach close functions
-
-		this.element = frame;
+		this.element = $el("div.comfy-modal", { parent: document.body }, []);
 	}

 	async remove_item() {
@@ -122,7 +109,7 @@ export class SnapshotManager extends ComfyDialog {

 	createControls() {
 		return [
-			$el("button.p-button.p-component", {
+			$el("button.cm-small-button", {
 				type: "button",
 				textContent: "Close",
 				onclick: () => { this.close(); }
@@ -133,7 +120,7 @@ export class SnapshotManager extends ComfyDialog {
 	startRestore(target) {
 		const self = SnapshotManager.instance;

-		self.updateMessage(`<BR><font color="green">Restore snapshot '${sanitizeHTML(target.name)}'</font>`);
+		self.updateMessage(`<BR><font color="green">Restore snapshot '${target.name}'</font>`);

 		for(let i in self.restore_buttons) {
 			self.restore_buttons[i].disabled = true;
@@ -145,8 +132,8 @@ export class SnapshotManager extends ComfyDialog {
 		this.clear();
 		this.data = (await getSnapshotList()).items;

-		while (this.content.children.length) {
-			this.content.removeChild(this.content.children[0]);
+		while (this.element.children.length) {
+			this.element.removeChild(this.element.children[0]);
 		}

 		await this.createGrid();
@@ -158,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();
 				}
@@ -214,24 +201,23 @@ export class SnapshotManager extends ComfyDialog {
 				data1.style.textAlign = "center";
 				data1.innerHTML = i+1;
 				var data2 = document.createElement('td');
-				data2.innerHTML = `&nbsp;${sanitizeHTML(data)}`;
+				data2.innerHTML = `&nbsp;${data}`;
 				var data_button = document.createElement('td');
 				data_button.style.textAlign = "center";
-				data_button.className = "data-btns";

 				var restoreBtn = document.createElement('button');
-				restoreBtn.className = "snapshot-restore-btn p-button p-component";
 				restoreBtn.innerHTML = 'Restore';
 				restoreBtn.style.width = "100px";
+				restoreBtn.style.backgroundColor = 'blue';

 				restoreBtn.addEventListener('click', function() {
 					restore_snapshot(data);
 				});

 				var removeBtn = document.createElement('button');
-				removeBtn.className = "snapshot-remove-btn p-button p-component";
 				removeBtn.innerHTML = 'Remove';
 				removeBtn.style.width = "100px";
+				removeBtn.style.backgroundColor = 'red';

 				removeBtn.addEventListener('click', function() {
 					remove_snapshot(data);
@@ -255,14 +241,13 @@ export class SnapshotManager extends ComfyDialog {
 		let self = this;
 		const panel = document.createElement('div');
 		panel.style.width = "100%";
-		panel.style.height = "100%";
 		panel.appendChild(grid);

 		function handleResize() {
 		  const parentHeight = self.element.clientHeight;
 		  const gridHeight = parentHeight - 200;

-		//   grid.style.height = gridHeight + "px";
+		  grid.style.height = gridHeight + "px";
 		}
 		window.addEventListener("resize", handleResize);

@@ -271,17 +256,25 @@ export class SnapshotManager extends ComfyDialog {
 		grid.style.width = "100%";
 		grid.style.height = "100%";
 		grid.style.overflowY = "scroll";
-
-		this.content.appendChild(panel);
+		this.element.style.height = "85%";
+		this.element.style.width = "80%";
+		this.element.appendChild(panel);

 		handleResize();
 	}

 	async createBottomControls() {
+		var close_button = document.createElement("button");
+		close_button.className = "cm-small-button";
+		close_button.innerHTML = "Close";
+		close_button.onclick = () => { this.close(); }
+		close_button.style.display = "inline-block";
+
 		var save_button = document.createElement("button");
-		save_button.className = "p-button p-component";
+		save_button.className = "cm-small-button";
 		save_button.innerHTML = "Save snapshot";
 		save_button.onclick = () => { save_current_snapshot(); }
+		save_button.style.display = "inline-block";
 		save_button.style.horizontalAlign = "right";
 		save_button.style.width = "170px";

@@ -289,19 +282,15 @@ export class SnapshotManager extends ComfyDialog {
 		this.message_box.style.height = '60px';
 		this.message_box.style.verticalAlign = 'middle';

-		const footer = $el("div.snapshot-footer");
-		const spacer = $el("div.cn-flex-auto");
-		footer.appendChild(spacer);
-		footer.appendChild(save_button);
-
-		this.content.appendChild(this.message_box);
-		this.content.appendChild(footer);
+		this.element.appendChild(this.message_box);
+		this.element.appendChild(close_button);
+		this.element.appendChild(save_button);
 	}

 	async show() {
 		try {
 			this.invalidateControl();
-			this.element.style.display = "flex";
+			this.element.style.display = "block";
 			this.element.style.zIndex = 1099;
 		}
 		catch(exception) {
@@ -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();
  }

@@ -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
@@ -53,7 +55,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 +67,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 +91,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 +133,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 +151,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 +159,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,17 +177,17 @@ 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))

@@ -194,12 +196,12 @@ def set_matrix_auth(json_data):
    homeserver = json_data['homeserver']
    username = json_data['username']
    password = json_data['password']
-    with open(os.path.join(core.manager_files_path, "matrix_auth"), "w") as f:
+    with open(os.path.join(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 +213,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 +235,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]

@@ -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 = os.path.abspath(os.path.join(folder_paths.get_user_directory(), 'default', 'ComfyUI-Manager'))
 manager_pip_overrides_path = os.path.join(manager_files_path, "pip_overrides.json")
 manager_pip_blacklist_path = os.path.join(manager_files_path, "pip_blacklist.list")
 restore_snapshot_path = os.path.join(manager_files_path, "startup-scripts", "restore-snapshot.json")
 manager_config_path = os.path.join(manager_files_path, 'config.ini')

-cm_cli_path = os.path.join(comfyui_manager_path, "cm-cli.py")
-
-
 default_conf = {}

 def read_config():
@@ -370,13 +354,10 @@ try:
                pass

            with std_log_lock:
-                try:
-                    if self.is_stdout:
-                        original_stdout.flush()
-                    else:
-                        original_stderr.flush()
-                except (OSError, ValueError):
-                    pass
+                if self.is_stdout:
+                    original_stdout.flush()
+                else:
+                    original_stderr.flush()

        def close(self):
            self.flush()
@@ -411,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)
@@ -454,51 +439,6 @@ except Exception as e:
    print(f"[ComfyUI-Manager] Logging failed: {e}")


-def ensure_dependencies():
-    requirements_path = os.path.join(os.path.dirname(__file__), "requirements.txt")
-    try:
-        import git     # noqa: F401
-        import toml    # noqa: F401
-        import rich    # noqa: F401
-        import chardet # noqa: F401
-        from importlib.metadata import version
-        from packaging.requirements import Requirement
-
-        # Check the declared version before loading the native extension, so an
-        # older nh3 can be upgraded without loading its binary into this process.
-        with open(requirements_path) as requirements:
-            for line in requirements:
-                line = re.split(r'\s+#', line.strip(), maxsplit=1)[0]
-                if not line or line.startswith(('#', '-')):
-                    continue
-                nh3_requirement = Requirement(line)
-                if nh3_requirement.name.lower() == 'nh3':
-                    break
-            else:
-                raise ValueError('requirements.txt does not declare nh3')
-        if version('nh3') not in nh3_requirement.specifier:
-            raise ModuleNotFoundError(str(nh3_requirement))
-        import nh3     # noqa: F401
-    except ModuleNotFoundError:
-        print("## ComfyUI-Manager: installing dependencies.")
-        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 required packages in the correct Python environment. Please install requirements.txt 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)
@@ -522,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


@@ -543,8 +483,7 @@ check_bypass_ssl()

 # Perform install
 processed_install = set()
-# Use manager_files_path for consistency (fixes path inconsistency bug)
-script_list_path = os.path.join(manager_files_path, "startup-scripts", "install-scripts.txt")
+script_list_path = os.path.join(folder_paths.user_directory, "default", "ComfyUI-Manager", "startup-scripts", "install-scripts.txt")
 pip_fixer = manager_util.PIPFixer(manager_util.get_installed_packages(), comfy_path, manager_files_path)


@@ -629,13 +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

-        from comfy.cli_args import args
+        if 'COMFYUI_PATH' not in new_env:
+            new_env['COMFYUI_PATH'] = os.path.dirname(folder_paths.__file__)

-        allow_flagged = default_conf.get('allow_flagged_nodepack_install', '').lower() == 'true'
-        new_env['_COMFYUI_MANAGER_CNR_ALLOW_FLAGGED'] = str(
-            allow_flagged or manager_util.is_loopback_listener(args.listen)
-        ).lower()
-        cmd_str = [sys.executable, cm_cli_path, 'restore-snapshot', restore_snapshot_path]
+        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:
@@ -683,18 +619,9 @@ def execute_lazy_install_script(repo_path, executable):
        process_wrap(install_cmd, repo_path, env=new_env)


-def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom_nodes_path, status=''):
+def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom_nodes_path):
    import uuid
    import shutil
-    from comfy.cli_args import args
-
-    allow_flagged = default_conf.get('allow_flagged_nodepack_install', '').lower() == 'true'
-    if not manager_util.is_cnr_install_allowed(status or 'NodeVersionStatusFlagged', allow_flagged, args.listen):
-        if not status:
-            logging.error("Cannot execute reserved CNR switch for '%s': stored Registry status is missing. Request the installation again so its current status can be checked.", target)
-        else:
-            logging.error(manager_util.FLAGGED_NODEPACK_INSTALL_GUIDANCE)
-        return False

    # 1. download
    archive_name = f"CNR_temp_{str(uuid.uuid4())}.zip"  # should be unpredictable name - security precaution
@@ -742,8 +669,6 @@ def execute_lazy_cnr_switch(target, zip_url, from_path, to_path, no_deps, custom
    with open(tracking_info_file, "w", encoding='utf-8') as file:
        file.write('\n'.join(list(extracted)))

-    return True
-

 script_executed = False

@@ -799,9 +724,8 @@ def execute_startup_script():
                        execute_lazy_install_script(script[0], script[2])

                    elif script[1] == "#LAZY-CNR-SWITCH-SCRIPT":
-                        status = script[8] if len(script) > 8 else ''
-                        if execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6], status):
-                            execute_lazy_install_script(script[3], script[7])
+                        execute_lazy_cnr_switch(script[0], script[2], script[3], script[4], script[5], script[6])
+                        execute_lazy_install_script(script[3], script[7])

                    elif script[1] == "#LAZY-DELETE-NODEPACK":
                        execute_lazy_delete(script[2])
@@ -839,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()


@@ -139,9 +139,9 @@ You can set whether to use ComfyUI-Manager solely via CLI.
 `restore-dependencies`

 * This command can be used if custom nodes are installed under the `ComfyUI/custom_nodes` path but their dependencies are not installed.
-* It is useful when starting a new cloud instance, like Colab, where dependencies need to be reinstalled and installation scripts re-executed.
+* It is useful when starting a new cloud instance, like colab, where dependencies need to be reinstalled and installation scripts re-executed.
 * It can also be utilized if ComfyUI is reinstalled and only the custom_nodes path has been backed up and restored.

 ### 7. Clear

-In the GUI, installations, updates, or snapshot restorations are scheduled to execute the next time ComfyUI is launched. The `clear` command clears this scheduled state, ensuring no pre-execution actions are applied.
+In the GUI, installations, updates, or snapshot restorations are scheduled to execute the next time ComfyUI is launched. The `clear` command clears this scheduled state, ensuring no pre-execution actions are applied.
@@ -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
@@ -23,13 +23,13 @@ OPTIONS:
 ## How To Use?
 * `python cm-cli.py` 를 통해서 실행 시킬 수 있습니다.
 * 예를 들어 custom node를 모두 업데이트 하고 싶다면
-    * ComfyUI-Manager 경로에서 `python cm-cli.py update all` 명령을 실행할 수 있습니다.
+    * ComfyUI-Manager경로 에서 `python cm-cli.py update all` 를 command를 실행할 수 있습니다.
    * ComfyUI 경로에서 실행한다면, `python custom_nodes/ComfyUI-Manager/cm-cli.py update all` 와 같이 cm-cli.py 의 경로를 지정할 수도 있습니다.

 ## Prerequisite
 * ComfyUI 를 실행하는 python과 동일한 python 환경에서 실행해야 합니다.
    * venv를 사용할 경우 해당 venv를 activate 한 상태에서 실행해야 합니다.
-* portable 버전을 사용할 경우 run_nvidia_gpu.bat 파일이 있는 경로인 경우, 다음과 같은 방식으로 명령을 실행해야 합니다.
+    * portable 버전을 사용할 경우 run_nvidia_gpu.bat 파일이 있는 경로인 경우, 다음과 같은 방식으로 코맨드를 실행해야 합니다.
        `.\python_embeded\python.exe ComfyUI\custom_nodes\ComfyUI-Manager\cm-cli.py update all`
 * ComfyUI 의 경로는 COMFYUI_PATH 환경 변수로 설정할 수 있습니다. 만약 생략할 경우 다음과 같은 경고 메시지가 나타나며, ComfyUI-Manager가 설치된 경로를 기준으로 상대 경로로 설정됩니다.
        ```
@@ -40,8 +40,8 @@ OPTIONS:

 ### 1. --channel, --mode
 * 정보 보기 기능과 커스텀 노드 관리 기능의 경우는 --channel과 --mode를 통해 정보 DB를 설정할 수 있습니다.
-* 예를 들어 `python cm-cli.py update all --channel recent --mode remote`와 같은 명령을 실행할 경우, 현재 ComfyUI-Manager repo에 내장된 로컬의 정보가 아닌 remote의 최신 정보를 기준으로 동작하며, recent channel에 있는 목록을 대상으로만 동작합니다.
-* --channel, --mode 는 `simple-show, show, install, uninstall, update, disable, enable, fix` 명령에서만 사용 가능합니다.
+* 예들 들어 `python cm-cli.py update all --channel recent --mode remote`와 같은 command를 실행할 경우, 현재 ComfyUI-Manager repo에 내장된 로컬의 정보가 아닌 remote의 최신 정보를 기준으로 동작하며, recent channel에 있는 목록을 대상으로만 동작합니다.
+* --channel, --mode 는 `simple-show, show, install, uninstall, update, disable, enable, fix` command에서만 사용 가능합니다.

 ### 2. 관리 정보 보기

@@ -51,7 +51,7 @@ OPTIONS:
 * `[show|simple-show]` - `show`는 상세하게 정보를 보여주며, `simple-show`는 간단하게 정보를 보여줍니다.


-`python cm-cli.py show installed` 와 같은 명령을 실행하면 설치된 커스텀 노드의 정보를 상세하게 보여줍니다.
+`python cm-cli.py show installed` 와 같은 코맨드를 실행하면 설치된 커스텀 노드의 정보를 상세하게 보여줍니다.
 ```
 -= ComfyUI-Manager CLI (V2.24) =-

@@ -67,7 +67,7 @@ FETCH DATA from: https://raw.githubusercontent.com/ltdrdata/ComfyUI-Manager/main
 [    DISABLED   ]  ComfyUI-Loopchain                                 (author: Fannovel16)
 ```

-`python cm-cli.py simple-show installed` 와 같은 명령을 이용해서 설치된 커스텀 노드의 정보를 간단하게 보여줍니다.
+`python cm-cli.py simple-show installed` 와 같은 코맨드를 이용해서 설치된 커스텀 노드의 정보를 간단하게 보여줍니다.

 ```
 -= ComfyUI-Manager CLI (V2.24) =-
@@ -89,7 +89,7 @@ ComfyUI-Loopchain
    * `installed`: enable, disable 여부와 상관없이 설치된 모든 노드를 보여줍니다
    * `not-installed`: 설치되지 않은 커스텀 노드의 목록을 보여줍니다.
    * `all`: 모든 커스텀 노드의 목록을 보여줍니다.
-    * `snapshot`: 현재 설치된 커스텀 노드의 snapshot 정보를 보여줍니다. `show`를 통해서 볼 경우는 json 출력 형태로 보여주며, `simple-show`를 통해서 볼 경우는 간단하게, 커밋 해시와 함께 보여줍니다.
+    * `snapshot`: 현재 설치된 커스텀 노드의 snapshot 정보를 보여줍니다. `show`롤 통해서 볼 경우는 json 출력 형태로  보여주며, `simple-show`를 통해서 볼 경우는 간단하게, 커밋 해시와 함께 보여줍니다.
    * `snapshot-list`: ComfyUI-Manager/snapshots 에 저장된 snapshot 파일의 목록을 보여줍니다.

 ### 3. 커스텀 노드 관리 하기
@@ -98,7 +98,7 @@ ComfyUI-Loopchain

 * `python cm-cli.py install ComfyUI-Impact-Pack ComfyUI-Inspire-Pack ComfyUI_experiments` 와 같이 커스텀 노드의 이름을 나열해서 관리 기능을 적용할 수 있습니다.
 * 커스텀 노드의 이름은 `show`를 했을 때 보여주는 이름이며, git repository의 이름입니다. 
-(추후 nickname을 사용 가능하도록 업데이트할 예정입니다.)
+(추후 nickname 을 사용가능하돌고 업데이트 할 예정입니다.)

 `[update|disable|enable|fix] all ?[--channel <channel name>] ?[--mode [remote|local|cache]]`

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

 ### 5. CLI only mode

@@ -133,7 +133,7 @@ ComfyUI-Manager를 CLI로만 사용할 것인지를 설정할 수 있습니다.
 `cli-only-mode [enable|disable]`

 * security 혹은 policy 의 이유로 GUI 를 통한 ComfyUI-Manager 사용을 제한하고 싶은 경우 이 모드를 사용할 수 있습니다.
-    * CLI only mode를 적용할 경우 ComfyUI-Manager 가 매우 제한된 상태로 로드되어, 내부적으로 제공하는 web API가 비활성화되며, 메인 메뉴에서도 Manager 버튼이 표시되지 않습니다.
+    * CLI only mode를 적용할 경우 ComfyUI-Manager 가 매우 제한된 상태로 로드되어, 내부적으로 제공하는 web API가 비활성화 되며, 메인 메뉴에서도 Manager 버튼이 표시되지 않습니다.


 ### 6. 의존성 설치
@@ -141,10 +141,10 @@ ComfyUI-Manager를 CLI로만 사용할 것인지를 설정할 수 있습니다.
 `restore-dependencies`

 * `ComfyUI/custom_nodes` 하위 경로에 커스텀 노드들이 설치되어 있긴 하지만, 의존성이 설치되지 않은 경우 사용할 수 있습니다.
-* Colab과 같이 cloud instance를 새로 시작하는 경우 의존성 재설치 및 설치 스크립트가 재실행되어야 하는 경우 사용합니다.
-* ComfyUI를 재설치할 경우, custom_nodes 경로만 백업했다가 재설치할 경우 활용 가능합니다.
+* colab 과 같이 cloud instance를 새로 시작하는 경우 의존성 재설치 및 설치 스크립트가 재실행 되어야 하는 경우 사용합니다.
+* ComfyUI을 재설치할 경우, custom_nodes 경로만 백업했다가 재설치 할 경우 활용 가능합니다.


 ### 7. clear

-GUI에서 install, update를 하거나 snapshot을 restore하는 경우 예약을 통해서 다음번 ComfyUI를 실행할 경우 실행되는 구조입니다. `clear` 는 이런 예약 상태를 clear해서, 아무런 사전 실행이 적용되지 않도록 합니다.
+GUI에서 install, update를 하거나 snapshot 을 restore하는 경우 예약을 통해서 다음번 ComfyUI를 실행할 경우 실행되는 구조입니다. `clear` 는 이런 예약 상태를 clear해서, 아무런 사전 실행이 적용되지 않도록 합니다.
@@ -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. See terminal for details.",
-        level='info'
-    )
-
-
-def check_suspicious_manager(user_dir):
-    """Check for suspicious __manager directory on old ComfyUI.
-
-    On old ComfyUI without System User API, if __manager exists with low security,
-    warn the user to verify manually.
-
-    Returns:
-        bool: True if suspicious setup detected
-    """
-    if has_system_user_api():
-        return False  # Not suspicious on new ComfyUI
-
-    suspicious_path = os.path.abspath(os.path.join(user_dir, '__manager'))
-    if not os.path.exists(suspicious_path):
-        return False
-
-    config_path = os.path.join(suspicious_path, 'config.ini')
-    if not os.path.exists(config_path):
-        return False
-
-    config = configparser.ConfigParser()
-    config.read(config_path)
-    sec_level = config.get('default', 'security_level', fallback='normal').lower()
-
-    if sec_level in ['weak', 'normal-']:
-        # Terminal output
-        print("\n" + "!"*70)
-        print("[ComfyUI-Manager] ERROR: Suspicious path detected!")
-        print(f"  - '__manager' exists with low security level: '{sec_level}'")
-        print("  - Please verify manually:")
-        print(f"      {config_path}")
-        print("!"*70 + "\n")
-
-        # Notice board output
-        add_startup_notice(
-            "[Security Alert] Suspicious path detected. See terminal log for details.",
-            level='error'
-        )
-        return True
-
-    return False
-
-
-def warn_outdated_comfyui():
-    """Warn user about outdated ComfyUI without System User API."""
-    if has_system_user_api():
-        return
-
-    # Terminal output
-    print("\n" + "!"*70)
-    print("[ComfyUI-Manager] ERROR: ComfyUI version is outdated!")
-    print("  - Most operations are blocked for security.")
-    print("  - ComfyUI update is still allowed.")
-    print("  - Please update ComfyUI to use Manager normally.")
-    print("!"*70 + "\n")
-
-    # Notice board output
-    add_startup_notice(
-        "[Security Alert] ComfyUI outdated. Installations blocked (update allowed).<BR>"
-        "Update ComfyUI for normal operation.",
-        level='error'
-    )
-
-
-def migrate_legacy_config(user_dir, manager_files_path):
-    """Migrate ONLY config.ini to new __manager path if needed.
-
-    IMPORTANT: Only config.ini is migrated. Other files (snapshots, cache, etc.)
-    are NOT migrated - users must recreate them.
-
-    Scenarios:
-    1. Legacy exists, New doesn't exist → Migrate config.ini
-    2. Legacy exists, New exists → First update after upgrade
-       - Run ComfyUI dependency installation
-       - Rename legacy to .backup
-    3. Legacy doesn't exist → No migration needed
-
-    Returns:
-        bool: True if migration was performed
-    """
-    if not has_system_user_api():
-        return False
-
-    legacy_dir = os.path.join(user_dir, 'default', 'ComfyUI-Manager')
-    legacy_config = os.path.join(legacy_dir, 'config.ini')
-    new_config = os.path.join(manager_files_path, 'config.ini')
-
-    if not os.path.exists(legacy_dir):
-        return False  # No legacy directory, nothing to migrate
-
-    # IMPORTANT: Check for config.ini existence, not just directory
-    # (because makedirs() creates __manager before this function is called)
-
-    # Case: Both configs exist (first update after ComfyUI upgrade)
-    # This means user ran new ComfyUI at least once, creating __manager/config.ini
-    if os.path.exists(legacy_config) and os.path.exists(new_config):
-        _handle_first_update_migration(user_dir, legacy_dir, manager_files_path)
-        return True
-
-    # Case: Legacy config exists but new config doesn't (normal migration)
-    # This is the first run after ComfyUI upgrade
-    if os.path.exists(legacy_config) and not os.path.exists(new_config):
-        pass  # Continue with normal migration below
-    else:
-        return False
-
-    # Terminal output
-    print("\n" + "-"*70)
-    print("[ComfyUI-Manager] NOTICE: Legacy config.ini detected")
-    print(f"  - Old: {legacy_config}")
-    print(f"  - New: {new_config}")
-    print("  - Migrating config.ini only (other files are NOT migrated).")
-    print("  - Security level below 'normal' will be raised.")
-    print("-"*70 + "\n")
-
-    _migrate_config_with_security_check(legacy_config, new_config)
-
-    # Move legacy directory to backup
-    _move_legacy_to_backup(legacy_dir, manager_files_path)
-
-    return True
-
-
-def _handle_first_update_migration(user_dir, legacy_dir, manager_files_path):
-    """Handle first ComfyUI update when both legacy and new directories exist.
-
-    This scenario happens when:
-    - User was on old ComfyUI (using default/ComfyUI-Manager)
-    - ComfyUI was updated (now has System User API)
-    - Manager already created __manager on first new run
-    - But legacy directory still exists
-
-    Actions:
-    1. Run ComfyUI dependency installation
-    2. Move legacy to __manager/.legacy-manager-backup
-    """
-    # Terminal output
-    print("\n" + "-"*70)
-    print("[ComfyUI-Manager] NOTICE: First update after ComfyUI upgrade detected")
-    print("  - Both legacy and new directories exist.")
-    print("  - Running ComfyUI dependency installation...")
-    print("-"*70 + "\n")
-
-    # Run ComfyUI dependency installation
-    # Path: glob/manager_migration.py → glob → comfyui-manager → custom_nodes → ComfyUI
-    try:
-        comfyui_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
-        requirements_path = os.path.join(comfyui_path, 'requirements.txt')
-        if os.path.exists(requirements_path):
-            subprocess.run([sys.executable, '-m', 'pip', 'install', '-r', requirements_path],
-                         capture_output=True, check=False)
-            print("[ComfyUI-Manager] ComfyUI dependencies installation completed.")
-    except Exception as e:
-        print(f"[ComfyUI-Manager] WARNING: Failed to install ComfyUI dependencies: {e}")
-
-    # Move legacy to backup inside __manager
-    _move_legacy_to_backup(legacy_dir, manager_files_path)
-
-
-def _move_legacy_to_backup(legacy_dir, manager_files_path):
-    """Move legacy directory to backup inside __manager.
-
-    Returns:
-        str: Path to backup directory if successful, None if failed
-    """
-    import shutil
-
-    backup_dir = os.path.join(manager_files_path, '.legacy-manager-backup')
-
-    try:
-        if os.path.exists(backup_dir):
-            shutil.rmtree(backup_dir)  # Remove old backup if exists
-        shutil.move(legacy_dir, backup_dir)
-
-        # Terminal output (full paths shown here only)
-        print("\n" + "-"*70)
-        print("[ComfyUI-Manager] NOTICE: Legacy settings migrated")
-        print(f"  - Old location: {legacy_dir}")
-        print(f"  - Backed up to: {backup_dir}")
-        print("  - Please verify and remove the backup when no longer needed.")
-        print("-"*70 + "\n")
-
-        # Notice board output (no full paths for security)
-        add_startup_notice(
-            "Legacy ComfyUI-Manager data migrated. See terminal for details.",
-            level='info'
-        )
-        return backup_dir
-    except Exception as e:
-        print(f"[ComfyUI-Manager] WARNING: Failed to backup legacy directory: {e}")
-        add_startup_notice(
-            f"[MIGRATION] Failed to backup legacy directory: {e}",
-            level='warning'
-        )
-        return None
-
-
-def _migrate_config_with_security_check(legacy_path, new_path):
-    """Migrate legacy config, raising security level only if below default."""
-    config = configparser.ConfigParser()
-    try:
-        config.read(legacy_path)
-    except Exception as e:
-        print(f"[ComfyUI-Manager] WARNING: Failed to parse config.ini: {e}")
-        print("  - Creating fresh config with default settings.")
-        add_startup_notice(
-            "[MIGRATION] Failed to parse legacy config. Using defaults.",
-            level='warning'
-        )
-        return  # Skip migration, let Manager create fresh config
-
-    # Security level hierarchy: strong > normal > normal- > weak
-    # Default is 'normal', only raise if below default
-    if 'default' in config:
-        current_level = config['default'].get('security_level', 'normal').lower()
-        below_default_levels = ['weak', 'normal-']
-
-        if current_level in below_default_levels:
-            config['default']['security_level'] = 'normal'
-
-            # Terminal output
-            print("\n" + "="*70)
-            print("[ComfyUI-Manager] WARNING: Security level adjusted")
-            print(f"  - Previous: '{current_level}' → New: 'normal'")
-            print("  - Raised to prevent unauthorized remote access.")
-            print("="*70 + "\n")
-
-            # Notice board output
-            add_startup_notice(
-                f"[MIGRATION] Security level raised: '{current_level}' → 'normal'.<BR>"
-                "To prevent unauthorized remote access.",
-                level='warning'
-            )
-        else:
-            print(f"  - Security level: '{current_level}' (no change needed)")
-
-    # Ensure directory exists
-    os.makedirs(os.path.dirname(new_path), exist_ok=True)
-
-    with open(new_path, 'w') as f:
-        config.write(f)
-
-
-def force_security_level_if_needed(config_dict):
-    """Force security level to 'strong' if on old ComfyUI.
-
-    Args:
-        config_dict: Configuration dictionary to modify in-place
-
-    Returns:
-        bool: True if security level was forced
-    """
-    if not has_system_user_api():
-        config_dict['security_level'] = 'strong'
-        return True
-    return False
@@ -1,227 +0,0 @@
-import { $el } from "../../scripts/ui.js";
-
-function normalizeContent(content) {
-	const tmp = document.createElement('div');
-	if (typeof content === 'string') {
-		tmp.innerHTML = content;
-		return Array.from(tmp.childNodes);
-	}
-	if (content instanceof Node) {
-		return content;
-	}
-	return content;
-}
-
-export function createSettingsCombo(label, content) {
-	const settingItem = $el("div.setting-item", {}, [
-		$el("div.flex.flex-row.items-center.gap-2",[
-				$el("div.form-label.flex.grow.items-center", [
-					$el("span.text-muted", { textContent: label },)
-				]),
-				$el("div.form-input.flex.justify-end",
-					[content]
-				)
-			]
-		)
-	]);
-	return settingItem;
-}
-
-export function buildGuiFrame(dialogId, title, iconClass, content, owner) {
-	const dialog_mask = $el("div.p-dialog-mask.p-overlay-mask.p-overlay-mask-enter", {
-		parent: document.body,
-		style: {
-			position: "fixed",
-			height: "100%",
-			width: "100%",
-			left: "0px",
-			top: "0px",
-			display: "flex",
-			justifyContent: "center",
-			alignItems: "center",
-			pointerEvents: "auto",
-			zIndex: "1000"
-		},
-		onclick: (e) => {
-			if (e.target === dialog_mask) {
-				owner.close();
-			}
-		}
-		// data-pc-section="mask"
-	});
-
-	const header_actions = $el("div.p-dialog-header-actions", {
-			// [TODO]
-			// data-pc-section="headeractions"
-		}
-	);
-
-	const close_button = $el("button.p-button.p-component.p-button-icon-only.p-button-secondary.p-button-rounded.p-button-text.p-dialog-close-button", {
-			parent: header_actions,
-			type: "button",
-			ariaLabel: "Close",
-			onclick: () => owner.close(),
-			// "data-pc-name": "pcclosebutton",
-			// "data-p-disabled": "false",
-			// "data-p-severity": "secondary",
-			// "data-pc-group-section": "headericon",
-			// "data-pc-extend": "button",
-			// "data-pc-section": "root",
-			// [FIXME] Not sure how to do most of the SVG using $el
-			innerHTML: '<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="p-icon p-button-icon" aria-hidden="true"><path d="M8.01186 7.00933L12.27 2.75116C12.341 2.68501 12.398 2.60524 12.4375 2.51661C12.4769 2.42798 12.4982 2.3323 12.4999 2.23529C12.5016 2.13827 12.4838 2.0419 12.4474 1.95194C12.4111 1.86197 12.357 1.78024 12.2884 1.71163C12.2198 1.64302 12.138 1.58893 12.0481 1.55259C11.9581 1.51625 11.8617 1.4984 11.7647 1.50011C11.6677 1.50182 11.572 1.52306 11.4834 1.56255C11.3948 1.60204 11.315 1.65898 11.2488 1.72997L6.99067 5.98814L2.7325 1.72997C2.59553 1.60234 2.41437 1.53286 2.22718 1.53616C2.03999 1.53946 1.8614 1.61529 1.72901 1.74767C1.59663 1.88006 1.5208 2.05865 1.5175 2.24584C1.5142 2.43303 1.58368 2.61419 1.71131 2.75116L5.96948 7.00933L1.71131 11.2675C1.576 11.403 1.5 11.5866 1.5 11.7781C1.5 11.9696 1.576 12.1532 1.71131 12.2887C1.84679 12.424 2.03043 12.5 2.2219 12.5C2.41338 12.5 2.59702 12.424 2.7325 12.2887L6.99067 8.03052L11.2488 12.2887C11.3843 12.424 11.568 12.5 11.7594 12.5C11.9509 12.5 12.1346 12.424 12.27 12.2887C12.4053 12.1532 12.4813 11.9696 12.4813 11.7781C12.4813 11.5866 12.4053 11.403 12.27 11.2675L8.01186 7.00933Z" fill="currentColor"></path></svg><span class="p-button-label" data-pc-section="label">&nbsp;</span><!---->'
-		}
-	);
-
-	const dialog_header = $el("div.p-dialog-header", 
-		[
-			$el("div", [
-				$el("div",
-					{
-						id: "frame-title-container",
-					},
-					[
-						$el("h2.px-4", [
-							$el(iconClass, {
-								style: {
-									"font-size": "1.25rem",
-									"margin-right": ".5rem"
-								}
-							}),
-							$el("span", { textContent: title })
-						])
-					]
-					)
-				]),
-			header_actions
-		]
-	);
-
-	const contentFrame = $el("div.p-dialog-content", {}, normalizeContent(content));
-	const manager_dialog = $el("div.p-dialog.p-component.global-dialog", {
-			id: dialogId,
-			parent: dialog_mask,
-			style: {
-				'display': 'flex',
-				'flex-direction': 'column',
-				'pointer-events': 'auto',
-				'margin': '0px',
-			},
-			role: 'dialog',
-			ariaModal: 'true',
-			// [TODO]
-			// ariaLabbelledby: 'cm-title',
-			// maximized: 'false',
-			// data-pc-name: 'dialog',
-			// data-pc-section: 'root',
-			// data-pd-focustrap: 'true'
-		},
-		[ dialog_header, contentFrame ]
-	);
-
-	const hidden_accessible = $el("span.p-hidden-accessible.p-hidden-focusable", {
-		parent: manager_dialog,
-		tabindex: "0",
-		role: "presentation",
-		ariaHidden: "true",
-		"data-p-hidden-accessible": "true",
-		"data-p-hidden-focusable": "true",
-		"data-pc-section": "firstfocusableelement"
-	});
-
-	return dialog_mask;
-}
-
-export function buildGuiFrameCustomHeader(dialogId, customHeader, content, owner) {
-	const dialog_mask = $el("div.p-dialog-mask.p-overlay-mask.p-overlay-mask-enter", {
-		parent: document.body,
-		style: {
-			position: "fixed",
-			height: "100%",
-			width: "100%",
-			left: "0px",
-			top: "0px",
-			display: "flex",
-			justifyContent: "center",
-			alignItems: "center",
-			pointerEvents: "auto",
-			zIndex: "1000"
-		},
-		onclick: (e) => {
-			if (e.target === dialog_mask) {
-				owner.close();
-			}
-		}
-		// data-pc-section="mask"
-	});
-
-	const header_actions = $el("div.p-dialog-header-actions", {
-			// [TODO]
-			// data-pc-section="headeractions"
-		}
-	);
-
-	const close_button = $el("button.p-button.p-component.p-button-icon-only.p-button-secondary.p-button-rounded.p-button-text.p-dialog-close-button", {
-			parent: header_actions,
-			type: "button",
-			ariaLabel: "Close",
-			onclick: () => owner.close(),
-			// "data-pc-name": "pcclosebutton",
-			// "data-p-disabled": "false",
-			// "data-p-severity": "secondary",
-			// "data-pc-group-section": "headericon",
-			// "data-pc-extend": "button",
-			// "data-pc-section": "root",
-			// [FIXME] Not sure how to do most of the SVG using $el
-			innerHTML: '<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="p-icon p-button-icon" aria-hidden="true"><path d="M8.01186 7.00933L12.27 2.75116C12.341 2.68501 12.398 2.60524 12.4375 2.51661C12.4769 2.42798 12.4982 2.3323 12.4999 2.23529C12.5016 2.13827 12.4838 2.0419 12.4474 1.95194C12.4111 1.86197 12.357 1.78024 12.2884 1.71163C12.2198 1.64302 12.138 1.58893 12.0481 1.55259C11.9581 1.51625 11.8617 1.4984 11.7647 1.50011C11.6677 1.50182 11.572 1.52306 11.4834 1.56255C11.3948 1.60204 11.315 1.65898 11.2488 1.72997L6.99067 5.98814L2.7325 1.72997C2.59553 1.60234 2.41437 1.53286 2.22718 1.53616C2.03999 1.53946 1.8614 1.61529 1.72901 1.74767C1.59663 1.88006 1.5208 2.05865 1.5175 2.24584C1.5142 2.43303 1.58368 2.61419 1.71131 2.75116L5.96948 7.00933L1.71131 11.2675C1.576 11.403 1.5 11.5866 1.5 11.7781C1.5 11.9696 1.576 12.1532 1.71131 12.2887C1.84679 12.424 2.03043 12.5 2.2219 12.5C2.41338 12.5 2.59702 12.424 2.7325 12.2887L6.99067 8.03052L11.2488 12.2887C11.3843 12.424 11.568 12.5 11.7594 12.5C11.9509 12.5 12.1346 12.424 12.27 12.2887C12.4053 12.1532 12.4813 11.9696 12.4813 11.7781C12.4813 11.5866 12.4053 11.403 12.27 11.2675L8.01186 7.00933Z" fill="currentColor"></path></svg><span class="p-button-label" data-pc-section="label">&nbsp;</span><!---->'
-		}
-	);
-
-	const _customHeader = normalizeContent(customHeader);
-	const dialog_header = $el("div.p-dialog-header",
-		[
-			$el("div", [
-				$el("div",
-					{
-						id: "frame-title-container",
-					},
-					Array.isArray(_customHeader) ? _customHeader : [_customHeader]
-					)
-				]),
-			header_actions
-		]
-	);
-
-	const contentFrame = $el("div.p-dialog-content", {}, normalizeContent(content));
-	const manager_dialog = $el("div.p-dialog.p-component.global-dialog", {
-			id: dialogId,
-			parent: dialog_mask,
-			style: {
-				'display': 'flex',
-				'flex-direction': 'column',
-				'pointer-events': 'auto',
-				'margin': '0px',
-			},
-			role: 'dialog',
-			ariaModal: 'true',
-			// [TODO]
-			// ariaLabbelledby: 'cm-title',
-			// maximized: 'false',
-			// data-pc-name: 'dialog',
-			// data-pc-section: 'root',
-			// data-pd-focustrap: 'true'
-		},
-		[ dialog_header, contentFrame ]
-	);
-
-	const hidden_accessible = $el("span.p-hidden-accessible.p-hidden-focusable", {
-		parent: manager_dialog,
-		tabindex: "0",
-		role: "presentation",
-		ariaHidden: "true",
-		"data-p-hidden-accessible": "true",
-		"data-p-hidden-focusable": "true",
-		"data-pc-section": "firstfocusableelement"
-	});
-
-	return dialog_mask;
-}
@@ -1,67 +0,0 @@
-import { Grid } from "./turbogrid.esm.js";
-
-// Keep Manager's search hardening outside the vendored TurboGrid bundle.
-export default class ManagerGrid extends Grid {
-	highlightKeywordsFilter(rowItem, columns, value) {
-		const { textKey, textGenerator, highlightKey } = this.options.highlightKeywords;
-		for (const column of columns) {
-			rowItem[`${highlightKey}${column}`] = null;
-		}
-		const keywords = value ? String(value).trim().toLowerCase().split(/\s+/).filter(Boolean) : [];
-		if (!keywords.length) return true;
-
-		let matched = false;
-		for (const column of columns) {
-			const value = typeof textGenerator === "function" ? textGenerator(rowItem, column) : rowItem[column];
-			if (value === null || value === undefined) continue;
-			let text = String(value).trim();
-			if (!text) continue;
-			const key = `${textKey}${column}`;
-			if (rowItem[key] === null || rowItem[key] === undefined) {
-				// A detached element's innerHTML can still run image handlers.
-				rowItem[key] = new DOMParser().parseFromString(text, "text/html").body.textContent;
-			}
-			text = rowItem[key].toLowerCase();
-			let offset = 0;
-			const found = keywords.every(keyword => {
-				const index = text.indexOf(keyword, offset);
-				if (index === -1) return false;
-				offset = index + keyword.length;
-				return true;
-			});
-			if (found) {
-				rowItem[`${highlightKey}${column}`] = true;
-				this.highlightKeywords = keywords;
-				matched = true;
-			}
-		}
-		return matched;
-	}
-
-	highlightTextNodes(nodes, keywords) {
-		if (!keywords.length) return;
-		let keywordIndex = 0;
-		for (const node of nodes) {
-			const text = node.textContent;
-			const lower = text.toLowerCase();
-			const wrapper = document.createElement("span");
-			let offset = 0;
-			while (offset < text.length) {
-				const keyword = keywords[keywordIndex];
-				const index = lower.indexOf(keyword, offset);
-				if (index === -1) break;
-				wrapper.append(text.slice(offset, index));
-				const mark = document.createElement("mark");
-				mark.textContent = text.slice(index, index + keyword.length);
-				wrapper.append(mark);
-				offset = index + keyword.length;
-				keywordIndex = (keywordIndex + 1) % keywords.length;
-			}
-			if (wrapper.childNodes.length) {
-				// Decoded cell text stays in text nodes, including inside <mark>.
-				wrapper.append(text.slice(offset));
-				node.replaceWith(wrapper);
-			}
-		}
-	}
-}
@@ -1,699 +0,0 @@
-.nu-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segue UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 1099;
-	width: 80%;
-	height: 80%;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-	text-underline-offset: 3px;
-	outline: none;
-}
-
-.nu-manager .nu-flex-auto {
-	flex: auto;
-}
-
-.nu-manager button {
-	font-size: 16px;
-	color: var(--input-text);
-	background-color: var(--comfy-input-bg);
-	border-radius: 8px;
-	border-color: var(--border-color);
-	border-style: solid;
-	margin: 0;
-	padding: 4px 8px;
-	min-width: 100px;
-}
-
-.nu-manager button:disabled,
-.nu-manager input:disabled,
-.nu-manager select:disabled {
-	color: gray;
-}
-
-.nu-manager button:disabled {
-	background-color: var(--comfy-input-bg);
-}
-
-.nu-manager .nu-manager-restart {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.nu-manager .nu-manager-stop {
-	display: none;
-	background-color: #500000;
-	color: white;
-}
-
-.nu-manager .nu-manager-back {
-	align-items: center;
-	justify-content: center;
-}
-
-.arrow-icon {
-	height: 1em;
-	width: 1em;
-	margin-right: 5px;
-	transform: translateY(2px);
-}
-
-.cn-icon {
-	display: block;
-	width: 16px;
-	height: 16px;
-}
-
-.cn-icon svg {
-	display: block;
-	margin: 0;
-	pointer-events: none;
-}
-
-.nu-manager-header {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 0 5px;
-}
-
-.nu-manager-header label {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-}
-
-.nu-manager-filter {
-	height: 28px;
-	line-height: 28px;
-}
-
-.nu-manager-keywords {
-	height: 28px;
-	line-height: 28px;
-	padding: 0 5px 0 26px;
-	background-size: 16px;
-	background-position: 5px center;
-	background-repeat: no-repeat;
-	background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20viewBox%3D%220%200%2024%2024%22%20width%3D%22100%25%22%20height%3D%22100%25%22%20pointer-events%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill%3D%22none%22%20stroke%3D%22%23888%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%20stroke-width%3D%222%22%20d%3D%22m21%2021-4.486-4.494M19%2010.5a8.5%208.5%200%201%201-17%200%208.5%208.5%200%200%201%2017%200%22%2F%3E%3C%2Fsvg%3E");
-}
-
-.nu-manager-status {
-	padding-left: 10px;
-}
-
-.nu-manager-grid {
-	flex: auto;
-	border: 1px solid var(--border-color);
-	overflow: hidden;
-	position: relative;
-}
-
-.nu-manager-selection {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.nu-manager-message {
-	position: relative;
-}
-
-.nu-manager-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.nu-manager-grid .tg-turbogrid {
-	font-family: var(--grid-font);
-	font-size: 15px;
-	background: var(--bg-color);
-}
-
-.nu-manager-grid .tg-turbogrid .tg-highlight::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	content: "";
-	display: block;
-	width: 100%;
-	height: 100%;
-	box-sizing: border-box;
-	background-color: #80bdff11;
-	pointer-events: none;
-}
-
-.nu-manager-grid .nu-pack-name a {
-	color: skyblue;
-	text-decoration: none;
-	word-break: break-word;
-}
-
-.nu-manager-grid .cn-pack-desc a {
-	color: #5555FF;
-	font-weight: bold;
-	text-decoration: none;
-}
-
-.nu-manager-grid .tg-cell a:hover {
-	text-decoration: underline;
-}
-
-.nu-manager-grid .cn-pack-version {
-	line-height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	height: 100%;
-	gap: 5px;
-}
-
-.nu-manager-grid .cn-pack-nodes {
-	line-height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	gap: 5px;
-	cursor: pointer;
-	height: 100%;
-}
-
-.nu-manager-grid .cn-pack-nodes:hover {
-	text-decoration: underline;
-}
-
-.nu-manager-grid .cn-pack-conflicts {
-	color: orange;
-}
-
-.cn-popover {
-	position: fixed;
-	z-index: 10000;
-	padding: 20px;
-	color: #1e1e1e;
-	filter: drop-shadow(1px 5px 5px rgb(0 0 0 / 30%));
-	overflow: hidden;
-}
-
-.cn-flyover {
-	position: absolute;
-    top: 0;
-	right: 0;
-    z-index: 1000;
-    display: none;
-    width: 50%;
-    height: 100%;
-    background-color: var(--comfy-menu-bg);
-    animation-duration: 0.2s;
-    animation-fill-mode: both;
-	flex-direction: column;
-}
-
-.cn-flyover::before {
-    position: absolute;
-    top: 0;
-    content: "";
-    z-index: 10;
-    display: block;
-    width: 10px;
-    height: 100%;
-    pointer-events: none;
-	left: -10px;
-    background-image: linear-gradient(to left, rgb(0 0 0 / 20%), rgb(0 0 0 / 0%));
-}
-
-.cn-flyover-header {
-	height: 45px;
-	display: flex;
-	align-items: center;
-	gap: 5px;
-	border-bottom: 1px solid var(--border-color);
-}
-
-.cn-flyover-close {
-	display: flex;
-	align-items: center;
-	padding: 0 10px;
-	justify-content: center;
-	cursor: pointer;
-	opacity: 0.8;
-	height: 100%;
-}
-
-.cn-flyover-close:hover {
-	opacity: 1;
-}
-
-.cn-flyover-close svg {
-	display: block;
-	margin: 0;
-	pointer-events: none;
-	width: 20px;
-	height: 20px;
-}
-
-.cn-flyover-title {
-	display: flex;
-	align-items: center;
-	font-weight: bold;
-	gap: 10px;
-	flex: auto;
-}
-
-.cn-flyover-body {
-	height: calc(100% - 45px);
-	overflow-y: auto;
-	position: relative;
-	background-color: var(--comfy-menu-secondary-bg);
-}
-
-@keyframes cn-slide-in-right {
-    from {
-        visibility: visible;
-        transform: translate3d(100%, 0, 0);
-    }
-
-    to {
-        transform: translate3d(0, 0, 0);
-    }
-}
-
-.cn-slide-in-right {
-    animation-name: cn-slide-in-right;
-}
-
-@keyframes cn-slide-out-right {
-    from {
-        transform: translate3d(0, 0, 0);
-    }
-
-    to {
-        visibility: hidden;
-        transform: translate3d(100%, 0, 0);
-    }
-}
-
-.cn-slide-out-right {
-    animation-name: cn-slide-out-right;
-}
-
-.cn-nodes-list {
-	width: 100%;
-}
-
-.cn-nodes-row {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-}
-
-.cn-nodes-row:nth-child(odd) {
-	background-color: rgb(0 0 0 / 5%);
-}
-
-.cn-nodes-row:hover {
-    background-color: rgb(0 0 0 / 10%);
-}
-
-.cn-nodes-sn {
-	text-align: right;
-	min-width: 35px;
-	color: var(--drag-text);
-	flex-shrink: 0;
-	font-size: 12px;
-	padding: 8px 5px;
-}
-
-.cn-nodes-name {
-	cursor: pointer;
-	white-space: nowrap;
-	flex-shrink: 0;
-	position: relative;
-	padding: 8px 5px;
-}
-
-.cn-nodes-name::after {
-	content: attr(action);
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	left: 100%;
-	transform: translate(5px, -50%);
-	font-size: 12px;
-	color: var(--drag-text);
-	background-color: var(--comfy-input-bg);
-	border-radius: 10px;
-	border: 1px solid var(--border-color);
-	padding: 3px 8px;
-	display: none;
-}
-
-.cn-nodes-name.action::after {
-	display: block;
-}
-
-.cn-nodes-name:hover {
-	text-decoration: underline;
-}
-
-.cn-nodes-conflict .cn-nodes-name,
-.cn-nodes-conflict .cn-icon {
-	color: orange;
-}
-
-.cn-conflicts-list {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	padding: 5px 0;
-}
-
-.cn-conflicts-list b {
-	font-weight: normal;
-	color: var(--descrip-text);
-}
-
-.cn-nodes-pack {
-	cursor: pointer;
-	color: skyblue;
-}
-
-.cn-nodes-pack:hover {
-	text-decoration: underline;
-}
-
-.cn-pack-badge {
-	font-size: 12px;
-	font-weight: normal;
-	background-color: var(--comfy-input-bg);
-	border-radius: 10px;
-	border: 1px solid var(--border-color);
-	padding: 3px 8px;
-	color: var(--error-text);
-}
-
-.cn-preview {
-	min-width: 300px;
-	max-width: 500px;
-	min-height: 120px;
-	overflow: hidden;
-  	font-size: 12px;
-	pointer-events: none;
-	padding: 12px;
-	color: var(--fg-color);
-}
-
-.cn-preview-header {
-	display: flex;
-	gap: 8px;
-	align-items: center;
-	border-bottom: 1px solid var(--comfy-input-bg);
-	padding: 5px 10px;
-}
-
-.cn-preview-dot {
-	width: 8px;
-	height: 8px;
-	border-radius: 50%;
-	background-color: grey;
-	position: relative;
-	filter: drop-shadow(1px 2px 3px rgb(0 0 0 / 30%));
-}
-
-.cn-preview-dot.cn-preview-optional::after {
-	content: "";
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	background-color: var(--comfy-input-bg);
-	border-radius: 50%;
-	width: 3px;
-  	height: 3px;
-}
-
-.cn-preview-dot.cn-preview-grid {
-	border-radius: 0;
-}
-
-.cn-preview-dot.cn-preview-grid::before {
-	content: '';
-	position: absolute;
-	border-left: 1px solid var(--comfy-input-bg);
-	border-right: 1px solid var(--comfy-input-bg);
-	width: 4px;
-	height: 100%;
-	left: 2px;
-	top: 0;
-	z-index: 1;
-}
-
-.cn-preview-dot.cn-preview-grid::after {
-	content: '';
-	position: absolute;
-	border-top: 1px solid var(--comfy-input-bg);
-	border-bottom: 1px solid var(--comfy-input-bg);
-	width: 100%;
-	height: 4px;
-	left: 0;
-	top: 2px;
-	z-index: 1;
-}
-
-.cn-preview-name {
-	flex: auto;
-	font-size: 14px;
-}
-
-.cn-preview-io {
-	display: flex;
-	justify-content: space-between;
-	padding: 10px 10px;
-}
-
-.cn-preview-column > div {
-	display: flex;
-	gap: 10px;
-	align-items: center;
-	height: 18px;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-.cn-preview-input {
-	justify-content: flex-start;
-}
-
-.cn-preview-output {
-	justify-content: flex-end;
-}
-
-.cn-preview-list {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	padding: 0 10px 10px 10px;
-}
-
-.cn-preview-switch {
-	position: relative;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	background: var(--bg-color);
-	border: 2px solid var(--border-color);
-	border-radius: 10px;
-	text-wrap: nowrap;
-	padding: 2px 20px;
-	gap: 10px;
-}
-
-.cn-preview-switch::before,
-.cn-preview-switch::after {
-	position: absolute;
-	pointer-events: none;
-	top: 50%;
-	transform: translate(0, -50%);
-	color: var(--fg-color);
-	opacity: 0.8;
-}
-
-.cn-preview-switch::before {
-	content: "◀";
-	left: 5px;
-}
-
-.cn-preview-switch::after {
-	content: "▶";
-	right: 5px;
-}
-
-.cn-preview-value {
-	color: var(--descrip-text);
-}
-
-.cn-preview-string {
-	min-height: 30px;
-	max-height: 300px;
-	background: var(--bg-color);
-	color: var(--descrip-text);
-	border-radius: 3px;
-	padding: 3px 5px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-.cn-preview-description {
-	margin: 0px 10px 10px 10px;
-	padding: 6px;
-	background: var(--border-color);
-	color: var(--descrip-text);
-	border-radius: 5px;
-	font-style: italic;
-	word-break: break-word;
-}
-
-.cn-tag-list {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 5px;
-	align-items: center;
-	margin-bottom: 5px;
-}
-
-.cn-tag-list > div {
-	background-color: var(--border-color);
-	border-radius: 5px;
-	padding: 0 5px;
-}
-
-.cn-install-buttons {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	padding: 3px;
-	align-items: center;
-	justify-content: center;
-	height: 100%;
-}
-
-.cn-selected-buttons {
-	display: flex;
-	gap: 5px;
-	align-items: center;
-	padding-right: 20px;
-}
-
-.nu-manager .cn-btn-enable {
-	background-color: #333399;
-	color: white;
-}
-
-.nu-manager .cn-btn-disable {
-	background-color: #442277;
-	color: white;
-}
-
-.nu-manager .cn-btn-update {
-	background-color: #1155AA;
-	color: white;
-}
-
-.nu-manager .cn-btn-try-update {
-	background-color: Gray;
-	color: white;
-}
-
-.nu-manager .cn-btn-try-fix {
-	background-color: #6495ED;
-	color: white;
-}
-
-.nu-manager .cn-btn-import-failed {
-	background-color: #AA1111;
-    font-size: 10px;
-	font-weight: bold;
-	color: white;
-}
-
-.nu-manager .cn-btn-install {
-	background-color: black;
-	color: white;
-}
-
-.nu-manager .cn-btn-try-install {
-	background-color: Gray;
-	color: white;
-}
-
-.nu-manager .cn-btn-uninstall {
-	background-color: #993333;
-	color: white;
-}
-
-.nu-manager .cn-btn-reinstall {
-	background-color: #993333;
-	color: white;
-}
-
-.nu-manager .cn-btn-switch {
-	background-color: #448833;
-	color: white;
-
-}
-
-@keyframes nu-btn-loading-bg {
-	0% {
-		left: 0;
-	}
-	100% {
-		left: -105px;
-	}
-}
-
-.nu-manager button.nu-btn-loading {
-	position: relative;
-	overflow: hidden;
-	border-color: rgb(0 119 207 / 80%);
-	background-color: var(--comfy-input-bg);
-}
-
-.nu-manager button.nu-btn-loading::after {
-	position: absolute;
-	top: 0;
-	left: 0;
-	content: "";
-	width: 500px;
-	height: 100%;
-	background-image: repeating-linear-gradient(
-		-45deg,
-		rgb(0 119 207 / 30%),
-		rgb(0 119 207 / 30%) 10px,
-		transparent 10px,
-		transparent 15px
-	);
-	animation: nu-btn-loading-bg 2s linear infinite;
-}
-
-.nu-manager-light .nu-pack-name a {
-	color: blue;
-}
-
-.nu-manager-light .cm-warn-note {
-	background-color: #ccc !important;
-}
-
-.nu-manager-light .cn-btn-install {
-	background-color: #333;
-}
@@ -1,750 +0,0 @@
-import { app } from "../../scripts/app.js";
-import { $el } from "../../scripts/ui.js";
-import {
-	manager_instance,
-	fetchData, md5, show_message, customAlert, infoToast, showTerminal,
-	storeColumnWidth, restoreColumnWidth, loadCss, uninstallNodes,
-	analyzeWorkflowUsage, sizeToBytes, createFlyover, createUIStateManager,
-	sanitizeHTML, safeHref
-} from "./common.js";
-import { api } from "../../scripts/api.js";
-
-// https://cenfun.github.io/turbogrid/api.html
-import TG from "./turbogrid.esm.js";
-
-loadCss("./node-usage-analyzer.css");
-
-const gridId = "model";
-
-const pageHtml = `
-<div class="nu-manager-header">
-	<div class="nu-manager-status"></div>
-	<input type="text" class="nu-manager-keywords" placeholder="Filter keywords..." />
-	<div class="nu-flex-auto"></div>
-</div>
-<div class="nu-manager-grid"></div>
-<div class="nu-manager-selection"></div>
-<div class="nu-manager-message"></div>
-<div class="nu-manager-footer">
-	<button class="nu-manager-back">
-		<svg class="arrow-icon" width="14" height="14" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-			<path d="M2 8H18M2 8L8 2M2 8L8 14" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-		</svg>
-		Back
-	</button>
-	<button class="nu-manager-refresh">Refresh</button>
-	<button class="nu-manager-stop">Stop</button>
-	<div class="nu-flex-auto"></div>
-</div>
-`;
-
-export class NodeUsageAnalyzer {
-	static instance = null;
-
-	static SortMode = {
-		BY_PACKAGE: 'by_package'
-	};
-
-	constructor(app, manager_dialog) {
-		this.app = app;
-		this.manager_dialog = manager_dialog;
-		this.id = "nu-manager";
-
-		this.filter = '';
-		this.type = '';
-		this.base = '';
-		this.keywords = '';
-
-		this.init();
-
-		// Initialize shared UI state manager
-		this.ui = createUIStateManager(this.element, {
-			selection: ".nu-manager-selection",
-			message: ".nu-manager-message",
-			status: ".nu-manager-status",
-			refresh: ".nu-manager-refresh",
-			stop: ".nu-manager-stop"
-		});
-
-		api.addEventListener("cm-queue-status", this.onQueueStatus);
-	}
-
-	init() {
-		this.element = $el("div", {
-			parent: document.body,
-			className: "comfy-modal nu-manager"
-		});
-		this.element.innerHTML = pageHtml;
-		this.bindEvents();
-		this.initGrid();
-	}
-
-	bindEvents() {
-		const eventsMap = {
-			".nu-manager-selection": {
-				click: (e) => {
-					const target = e.target;
-					const mode = target.getAttribute("mode");
-					if (mode === "install") {
-						this.installModels(this.selectedModels, target);
-					} else if (mode === "uninstall") {
-						this.uninstallModels(this.selectedModels, target);
-					}
-				}
-			},
-
-			".nu-manager-refresh": {
-				click: () => {
-					app.refreshComboInNodes();
-				}
-			},
-
-			".nu-manager-stop": {
-				click: () => {
-					api.fetchApi('/manager/queue/reset');
-					infoToast('Cancel', 'Remaining tasks will stop after completing the current task.');
-				}
-			},
-
-			".nu-manager-back": {
-				click: (e) => {
-					this.close()
-					manager_instance.show();
-				}
-			}
-		};
-		Object.keys(eventsMap).forEach(selector => {
-			const target = this.element.querySelector(selector);
-			if (target) {
-				const events = eventsMap[selector];
-				if (events) {
-					Object.keys(events).forEach(type => {
-						target.addEventListener(type, events[type]);
-					});
-				}
-			}
-		});
-	}
-
-	// ===========================================================================================
-
-	initGrid() {
-		const container = this.element.querySelector(".nu-manager-grid");
-		const grid = new TG.Grid(container);
-		this.grid = grid;
-
-		this.flyover = createFlyover(container, { context: this });
-
-		grid.bind('onUpdated', (e, d) => {
-			this.ui.showStatus(`${grid.viewRows.length.toLocaleString()} installed packages`);
-
-		});
-
-		grid.bind('onSelectChanged', (e, changes) => {
-			this.renderSelected();
-		});
-
-		grid.bind("onColumnWidthChanged", (e, columnItem) => {
-			storeColumnWidth(gridId, columnItem)
-		});
-
-		grid.bind('onClick', (e, d) => {
-			const { rowItem } = d;
-			const target = d.e.target;
-			const mode = target.getAttribute("mode");
-
-			if (mode === "install") {
-				this.installModels([rowItem], target);
-				return;
-			}
-
-			if (mode === "uninstall") {
-				this.uninstallModels([rowItem], target);
-				return;
-			}
-
-			// Handle click on usage count
-			if (d.columnItem.id === "used_in_count" && rowItem.used_in_count > 0) {
-				this.showUsageDetails(rowItem);
-				return;
-			}
-
-		});
-
-		grid.setOption({
-			theme: 'dark',
-
-			selectVisible: true,
-			selectMultiple: true,
-			selectAllVisible: true,
-
-			textSelectable: true,
-			scrollbarRound: true,
-
-			frozenColumn: 1,
-			rowNotFound: "No Results",
-
-			rowHeight: 40,
-			bindWindowResize: true,
-			bindContainerResize: true,
-
-			cellResizeObserver: (rowItem, columnItem) => {
-				const autoHeightColumns = ['name', 'description'];
-				return autoHeightColumns.includes(columnItem.id)
-			}
-		});
-
-	}
-
-	renderGrid() {
-
-		// update theme
-		const colorPalette = this.app.ui.settings.settingsValues['Comfy.ColorPalette'];
-		Array.from(this.element.classList).forEach(cn => {
-			if (cn.startsWith("nu-manager-")) {
-				this.element.classList.remove(cn);
-			}
-		});
-		this.element.classList.add(`nu-manager-${colorPalette}`);
-
-		const options = {
-			theme: colorPalette === "light" ? "" : "dark"
-		};
-
-		const rows = this.modelList || [];
-
-		const columns = [{
-			id: 'title',
-			name: 'Title',
-			width: 200,
-			minWidth: 100,
-			maxWidth: 500,
-			classMap: 'nu-pack-name',
-			formatter: function (name, rowItem, columnItem, cellNode) {
-				// Names are escaped during loadData; references need URL and attribute handling.
-				return `<a href="${safeHref(rowItem.reference)}" target="_blank" rel="noopener noreferrer"><b>${name}</b></a>`;
-			}
-		}, {
-			id: 'used_in_count',
-			name: 'Used in',
-			width: 100,
-			formatter: function (usedCount, rowItem, columnItem) {
-				if (!usedCount || usedCount === 0) {
-					return '0';
-				}
-				const plural = usedCount > 1 ? 's' : '';
-				return `<div class="cn-pack-nodes" style="cursor: pointer;">${usedCount} workflow${plural}</div>`;
-			}
-		}, {
-			id: 'action',
-			name: 'Action',
-			width: 160,
-			minWidth: 140,
-			maxWidth: 200,
-			sortable: false,
-			align: 'center',
-			formatter: function (action, rowItem, columnItem) {
-				// Only show uninstall button for installed packages
-				if (rowItem.originalData && rowItem.originalData.state && rowItem.originalData.state !== "not-installed") {
-					return `<div class="cn-install-buttons"><button class="nu-btn-uninstall" mode="uninstall">Uninstall</button></div>`;
-				}
-				return '';
-			}
-		}];
-
-		restoreColumnWidth(gridId, columns);
-
-		this.grid.setData({
-			options,
-			rows,
-			columns
-		});
-
-		this.grid.render();
-
-	}
-
-	updateGrid() {
-		if (this.grid) {
-			this.grid.update();
-		}
-	}
-
-
-	showUsageDetails(rowItem) {
-		const workflowList = rowItem.workflowDetails;
-		if (!workflowList || workflowList.length === 0) {
-			return;
-		}
-
-		let titleHtml = `<div class="cn-nodes-pack">${rowItem.title}</div>`;
-
-		const list = [];
-		list.push(`<div class="cn-nodes-list">`);
-
-		workflowList.forEach((workflow, i) => {
-			list.push(`<div class="cn-nodes-row">`);
-			list.push(`<div class="cn-nodes-sn">${i + 1}</div>`);
-			// Workflow filenames are raw server data.
-			list.push(`<div class="cn-nodes-name">${sanitizeHTML(String(workflow.filename))}</div>`);
-			list.push(`<div class="cn-nodes-details">${workflow.nodeCount} node${workflow.nodeCount > 1 ? 's' : ''}</div>`);
-			list.push(`</div>`);
-		});
-
-		list.push("</div>");
-		const bodyHtml = list.join("");
-
-		this.flyover.show(titleHtml, bodyHtml);
-	}
-
-	renderSelected() {
-		const selectedList = this.grid.getSelectedRows();
-		if (!selectedList.length) {
-			this.ui.showSelection("");
-			return;
-		}
-
-		const installedSelected = selectedList.filter(item =>
-			item.originalData && item.originalData.state && item.originalData.state !== "not-installed"
-		);
-
-		if (installedSelected.length === 0) {
-			this.ui.showSelection(`<span>Selected <b>${selectedList.length}</b> packages (none can be uninstalled)</span>`);
-			return;
-		}
-
-		this.selectedModels = installedSelected;
-
-		this.ui.showSelection(`
-			<div class="nu-selected-buttons">
-				<span>Selected <b>${installedSelected.length}</b> installed packages</span>
-				<button class="nu-btn-uninstall" mode="uninstall">Uninstall Selected</button>
-			</div>
-		`);
-	}
-
-	// ===========================================================================================
-
-	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("nu-btn-loading");
-		this.ui.showError("");
-
-		let needRefresh = false;
-		let errorMsg = "";
-
-		await api.fetchApi('/manager/queue/reset');
-
-		let target_items = [];
-
-		for (const item of list) {
-			this.grid.scrollRowIntoView(item);
-			target_items.push(item);
-
-
-			// Here item.name is a raw pack key, not a server-escaped title.
-			this.ui.showStatus(`Install ${sanitizeHTML(String(item.name))} ...`);
-
-			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) {
-				// Escape raw task errors for both HTML message destinations.
-				errorMsg = `'${sanitizeHTML(String(item.name))}': `;
-
-				if (res.status == 403) {
-					errorMsg += `This action is not allowed with this security level configuration.\n`;
-				} else {
-					errorMsg += sanitizeHTML(await res.text()) + '\n';
-				}
-
-				break;
-			}
-		}
-
-		this.install_context = { btn: btn, targets: target_items };
-
-		if (errorMsg) {
-			this.ui.showError(errorMsg);
-			show_message("[Installation Errors]\n" + errorMsg);
-
-			// reset
-			for (let k in target_items) {
-				const item = target_items[k];
-				this.grid.updateCell(item, "installed");
-			}
-		}
-		else {
-			await api.fetchApi('/manager/queue/start');
-			this.ui.showStop();
-			showTerminal();
-		}
-	}
-
-	async uninstallModels(list, btn) {
-		btn.classList.add("nu-btn-loading");
-		this.ui.showError("");
-
-		const result = await uninstallNodes(list, {
-			title: list.length === 1 ? list[0].title || list[0].name : `${list.length} custom nodes`,
-			channel: 'default',
-			mode: 'default',
-			onProgress: (msg) => {
-				this.showStatus(msg);
-			},
-			onError: (errorMsg) => {
-				this.showError(errorMsg);
-			},
-			onSuccess: (targets) => {
-				this.showStatus(`Uninstalled ${targets.length} custom node(s) successfully`);
-				this.showMessage(`To apply the uninstalled custom nodes, please restart ComfyUI and refresh browser.`, "red");
-				// Update the grid to reflect changes
-				for (let item of targets) {
-					if (item.originalData) {
-						item.originalData.state = "not-installed";
-					}
-					this.grid.updateRow(item);
-				}
-			}
-		});
-
-		if (result.success) {
-			this.showStop();
-		}
-
-		btn.classList.remove("nu-btn-loading");
-	}
-
-	async onQueueStatus(event) {
-		let self = NodeUsageAnalyzer.instance;
-
-		if (event.detail.status == 'in_progress' && (event.detail.ui_target == 'model_manager' || event.detail.ui_target == 'nodepack_manager')) {
-			const hash = event.detail.target;
-
-			const item = self.grid.getRowItemBy("hash", hash);
-
-			if (item) {
-				item.refresh = true;
-				self.grid.setRowSelected(item, false);
-				item.selectable = false;
-				self.grid.updateRow(item);
-			}
-		}
-		else if (event.detail.status == 'done') {
-			self.hideStop();
-			self.onQueueCompleted(event.detail);
-		}
-	}
-
-	async onQueueCompleted(info) {
-		let result = info.model_result || info.nodepack_result;
-
-		if (!result || result.length == 0) {
-			return;
-		}
-
-		let self = NodeUsageAnalyzer.instance;
-
-		if (!self.install_context) {
-			return;
-		}
-
-		let btn = self.install_context.btn;
-
-		self.hideLoading();
-		btn.classList.remove("nu-btn-loading");
-
-		let errorMsg = "";
-
-		for (let hash in result) {
-			let v = result[hash];
-
-			// Escape raw task errors for both HTML message destinations.
-			if (v != 'success' && v != 'skip')
-				errorMsg += sanitizeHTML(String(v)) + '\n';
-		}
-
-		for (let k in self.install_context.targets) {
-			let item = self.install_context.targets[k];
-			if (info.model_result) {
-				self.grid.updateCell(item, "installed");
-			} else if (info.nodepack_result) {
-				// Handle uninstall completion
-				if (item.originalData) {
-					item.originalData.state = "not-installed";
-				}
-				self.grid.updateRow(item);
-			}
-		}
-
-		if (errorMsg) {
-			self.showError(errorMsg);
-			show_message("Operation Error:\n" + errorMsg);
-		} else {
-			if (info.model_result) {
-				self.showStatus(`Install ${Object.keys(result).length} models successfully`);
-				self.showRefresh();
-				self.showMessage(`To apply the installed model, please click the 'Refresh' button.`, "red");
-			} else if (info.nodepack_result) {
-				self.showStatus(`Uninstall ${Object.keys(result).length} custom node(s) successfully`);
-				self.showMessage(`To apply the uninstalled custom nodes, please restart ComfyUI and refresh browser.`, "red");
-			}
-		}
-
-		infoToast('Tasks done', `[ComfyUI-Manager] All tasks in the queue have been completed.\n${info.done_count}/${info.total_count}`);
-		self.install_context = undefined;
-	}
-
-	getModelList(models) {
-		const typeMap = new Map();
-		const baseMap = new Map();
-
-		models.forEach((item, i) => {
-			const { type, base, name, reference, installed } = item;
-			// CRITICAL FIX: Do NOT overwrite originalData - it contains the needed state field!
-			item.size = sizeToBytes(item.size);
-			item.hash = md5(name + reference);
-
-			if (installed === "True") {
-				item.selectable = false;
-			}
-
-			typeMap.set(type, type);
-			baseMap.set(base, base);
-
-		});
-
-		const typeList = [];
-		typeMap.forEach(type => {
-			typeList.push({
-				label: type,
-				value: type
-			});
-		});
-		typeList.sort((a, b) => {
-			const au = a.label.toUpperCase();
-			const bu = b.label.toUpperCase();
-			if (au !== bu) {
-				return au > bu ? 1 : -1;
-			}
-			return 0;
-		});
-		this.typeList = [{
-			label: "All",
-			value: ""
-		}].concat(typeList);
-
-
-		const baseList = [];
-		baseMap.forEach(base => {
-			baseList.push({
-				label: base,
-				value: base
-			});
-		});
-		baseList.sort((a, b) => {
-			const au = a.label.toUpperCase();
-			const bu = b.label.toUpperCase();
-			if (au !== bu) {
-				return au > bu ? 1 : -1;
-			}
-			return 0;
-		});
-		this.baseList = [{
-			label: "All",
-			value: ""
-		}].concat(baseList);
-
-		return models;
-	}
-
-	// ===========================================================================================
-
-	async loadData() {
-
-		this.showLoading();
-		this.showStatus(`Analyzing node usage ...`);
-
-		const mode = manager_instance.datasrc_combo.value;
-
-		const nodeListRes = await fetchData(`/customnode/getlist?mode=${mode}&skip_update=true`);
-		if (nodeListRes.error) {
-			this.showError("Failed to get custom node list.");
-			this.hideLoading();
-			return;
-		}
-
-		const { channel, node_packs } = nodeListRes.data;
-		delete node_packs['comfyui-manager'];
-		this.installed_custom_node_packs = node_packs;
-
-		// Use the consolidated workflow analysis utility
-		const result = await analyzeWorkflowUsage(node_packs);
-
-		if (!result.success) {
-			if (result.error.toString().includes('204')) {
-				this.showMessage("No workflows were found for analysis.");
-			} else {
-				this.showError(sanitizeHTML(String(result.error)));
-				this.hideLoading();
-				return;
-			}
-		}
-
-		// Transform node_packs into models format - ONLY INSTALLED PACKAGES
-		const models = [];
-
-		Object.keys(node_packs).forEach((packKey, index) => {
-			const pack = node_packs[packKey];
-
-			// Only include installed packages (filter out "not-installed" packages)
-			if (pack.state === "not-installed") {
-				return; // Skip non-installed packages
-			}
-
-			const usedCount = result.usageMap?.get(packKey) || 0;
-			const workflowDetails = result.workflowDetailsMap?.get(packKey) || [];
-
-			models.push({
-				// Preserve server-escaped titles; escape only the raw pack-key fallback.
-				title: pack.title || sanitizeHTML(String(packKey)),
-				reference: pack.reference || pack.files?.[0] || '#',
-				used_in_count: usedCount,
-				workflowDetails: workflowDetails,
-				name: packKey,
-				originalData: pack
-			});
-		});
-
-		// Sort by usage count (descending) then by title
-		models.sort((a, b) => {
-			if (b.used_in_count !== a.used_in_count) {
-				return b.used_in_count - a.used_in_count;
-			}
-			return a.title.localeCompare(b.title);
-		});
-
-		this.modelList = this.getModelList(models);
-
-		this.renderGrid();
-
-		this.hideLoading();
-
-	}
-
-	// ===========================================================================================
-
-	// Messages accept HTML; see createUIStateManager in common.js.
-	showSelection(msg) {
-		this.element.querySelector(".nu-manager-selection").innerHTML = msg;
-	}
-
-	showError(err) {
-		this.showMessage(err, "red");
-	}
-
-	showMessage(msg, color) {
-		if (color) {
-			msg = `<font color="${color}">${msg}</font>`;
-		}
-		this.element.querySelector(".nu-manager-message").innerHTML = msg;
-	}
-
-	showStatus(msg, color) {
-		if (color) {
-			msg = `<font color="${color}">${msg}</font>`;
-		}
-		this.element.querySelector(".nu-manager-status").innerHTML = msg;
-	}
-
-	showLoading() {
-		//		this.setDisabled(true);
-		if (this.grid) {
-			this.grid.showLoading();
-			this.grid.showMask({
-				opacity: 0.05
-			});
-		}
-	}
-
-	hideLoading() {
-		//		this.setDisabled(false);
-		if (this.grid) {
-			this.grid.hideLoading();
-			this.grid.hideMask();
-		}
-	}
-
-	setDisabled(disabled) {
-		const $close = this.element.querySelector(".nu-manager-close");
-		const $refresh = this.element.querySelector(".nu-manager-refresh");
-		const $stop = this.element.querySelector(".nu-manager-stop");
-
-		const list = [
-			".nu-manager-header input",
-			".nu-manager-header select",
-			".nu-manager-footer button",
-			".nu-manager-selection button"
-		].map(s => {
-			return Array.from(this.element.querySelectorAll(s));
-		})
-			.flat()
-			.filter(it => {
-				return it !== $close && it !== $refresh && it !== $stop;
-			});
-
-		list.forEach($elem => {
-			if (disabled) {
-				$elem.setAttribute("disabled", "disabled");
-			} else {
-				$elem.removeAttribute("disabled");
-			}
-		});
-
-		Array.from(this.element.querySelectorAll(".nu-btn-loading")).forEach($elem => {
-			$elem.classList.remove("nu-btn-loading");
-		});
-
-	}
-
-	showRefresh() {
-		this.element.querySelector(".nu-manager-refresh").style.display = "block";
-	}
-
-	showStop() {
-		this.element.querySelector(".nu-manager-stop").style.display = "block";
-	}
-
-	hideStop() {
-		this.element.querySelector(".nu-manager-stop").style.display = "none";
-	}
-
-	setKeywords(keywords = "") {
-		this.keywords = keywords;
-		this.element.querySelector(".nu-manager-keywords").value = keywords;
-	}
-
-	show(sortMode) {
-		this.element.style.display = "flex";
-		this.setKeywords("");
-		this.showSelection("");
-		this.showMessage("");
-		this.loadData();
-	}
-
-	close() {
-		this.element.style.display = "none";
-	}
-}
@@ -1,65 +0,0 @@
-.snapshot-manager {
-	--grid-font: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	z-index: 1099;
-	width: 80vw;
-	height: 75vh;
-	min-height: 30em;
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	color: var(--fg-color);
-	font-family: arial, sans-serif;
-	text-underline-offset: 3px;
-	outline: none;
-	margin: calc(var(--spacing)*2);
-}
-
-.snapshot-manager button {
-	width: auto;
-	position: relative;
-	overflow: hidden;
-	font-size: 16px;
-	color: var(--input-text);
-	background-color: var(--comfy-input-bg);
-	border-color: var(--border-color);
-	margin: 0;
-	min-width: 100px;
-	padding: 4px 8px;
-}
-
-.snapshot-manager .snapshot-restore-btn {
-	background-color: #00158f !important;
-	border-color: #2025b9 !important;
-	color: white !important;
-}
-
-.snapshot-manager .snapshot-remove-btn  {
-	background-color: #970000 !important;
-	border-color: #be2127 !important;
-	color: white !important;
-}
-
-.snapshot-manager button:hover {
-	filter: brightness(125%);
-}
-
-.snapshot-manager .data-btns {
-	display: flex;
-	flex-direction: column;
-	gap: calc(var(--spacing)*2);
-	padding: calc(var(--spacing)*2);
-	align-items: center;
-	justify-content: center;
-	height: 100%;
-}
-
-.snapshot-footer {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 10px;
-	align-items: center;
-}
-
-.snapshot-manager .cn-flex-auto {
-	flex: auto;
-}
@@ -1,264 +1,25 @@
-#!/usr/bin/env python3
-"""JSON Entry Validator
-
-Validates JSON entries based on content structure.
-
-Validation rules based on JSON content:
- {"custom_nodes": [...]}: Validates required fields (author, title, reference, files, install_type, description)
- {"models": [...]}: Validates JSON syntax only (no required fields)
- Other JSON structures: Validates JSON syntax only
-
-Git repository URL validation (for custom_nodes):
-1. URLs must NOT end with .git
-2. URLs must follow format: https://github.com/{author}/{reponame}
-3. .py and .js files are exempt from this check
-
-Supported formats:
- Array format: [{...}, {...}]
- Object format: {"custom_nodes": [...]} or {"models": [...]}
-"""
-
 import json
-import re
-import sys
-from pathlib import Path
-from typing import Dict, List, Tuple
+import argparse

-
-# Required fields for each entry type
-REQUIRED_FIELDS_CUSTOM_NODE = ['author', 'title', 'reference', 'files', 'install_type', 'description']
-REQUIRED_FIELDS_MODEL = []  # model-list.json doesn't require field validation
-
-# Pattern for valid GitHub repository URL (without .git suffix)
-GITHUB_REPO_PATTERN = re.compile(r'^https://github\.com/[^/]+/[^/]+$')
-
-
-def get_entry_context(entry: Dict) -> str:
-    """Get identifying information from entry for error messages
-
-    Args:
-        entry: JSON entry
-
-    Returns:
-        String with author and reference info
-    """
-    parts = []
-    if 'author' in entry:
-        parts.append(f"author={entry['author']}")
-    if 'reference' in entry:
-        parts.append(f"ref={entry['reference']}")
-    if 'title' in entry:
-        parts.append(f"title={entry['title']}")
-
-    if parts:
-        return " | ".join(parts)
-    else:
-        # No identifying info - show actual entry content (truncated)
-        import json
-        entry_str = json.dumps(entry, ensure_ascii=False)
-        if len(entry_str) > 100:
-            entry_str = entry_str[:100] + "..."
-        return f"content={entry_str}"
-
-
-def validate_required_fields(entry: Dict, entry_index: int, required_fields: List[str]) -> List[str]:
-    """Validate that all required fields are present
-
-    Args:
-        entry: JSON entry to validate
-        entry_index: Index of entry in array (for error reporting)
-        required_fields: List of required field names
-
-    Returns:
-        List of error descriptions (without entry prefix/context)
-    """
-    errors = []
-
-    for field in required_fields:
-        if field not in entry:
-            errors.append(f"Missing required field '{field}'")
-        elif entry[field] is None:
-            errors.append(f"Field '{field}' is null")
-        elif isinstance(entry[field], str) and not entry[field].strip():
-            errors.append(f"Field '{field}' is empty")
-        elif field == 'files' and not entry[field]:  # Empty array
-            errors.append("Field 'files' is empty array")
-
-    return errors
-
-
-def validate_git_repo_urls(entry: Dict, entry_index: int) -> List[str]:
-    """Validate git repository URLs in 'files' array
-
-    Requirements:
-    - Git repo URLs must NOT end with .git
-    - Must follow format: https://github.com/{author}/{reponame}
-    - .py and .js files are exempt
-
-    Args:
-        entry: JSON entry to validate
-        entry_index: Index of entry in array (for error reporting)
-
-    Returns:
-        List of error descriptions (without entry prefix/context)
-    """
-    errors = []
-
-    if 'files' not in entry or not isinstance(entry['files'], list):
-        return errors
-
-    for file_url in entry['files']:
-        if not isinstance(file_url, str):
-            continue
-
-        # Skip .py and .js files - they're exempt from git repo validation
-        if file_url.endswith('.py') or file_url.endswith('.js'):
-            continue
-
-        # Check if it's a GitHub URL (likely a git repo)
-        if 'github.com' in file_url:
-            # Error if URL ends with .git
-            if file_url.endswith('.git'):
-                errors.append(f"Git repo URL must NOT end with .git: {file_url}")
-                continue
-
-            # Validate format: https://github.com/{author}/{reponame}
-            if not GITHUB_REPO_PATTERN.match(file_url):
-                errors.append(f"Invalid git repo URL format (expected https://github.com/author/reponame): {file_url}")
-
-    return errors
-
-
-def validate_entry(entry: Dict, entry_index: int, required_fields: List[str]) -> List[str]:
-    """Validate a single JSON entry
-
-    Args:
-        entry: JSON entry to validate
-        entry_index: Index of entry in array (for error reporting)
-        required_fields: List of required field names
-
-    Returns:
-        List of error messages (empty if valid)
-    """
-    errors = []
-
-    # Check required fields
-    errors.extend(validate_required_fields(entry, entry_index, required_fields))
-
-    # Check git repository URLs
-    errors.extend(validate_git_repo_urls(entry, entry_index))
-
-    return errors
-
-
-def validate_json_file(file_path: str) -> Tuple[bool, List[str]]:
-    """Validate JSON file containing entries
-
-    Args:
-        file_path: Path to JSON file
-
-    Returns:
-        Tuple of (is_valid, error_messages)
-    """
-    errors = []
-
-    # Check file exists
-    path = Path(file_path)
-    if not path.exists():
-        return False, [f"File not found: {file_path}"]
-
-    # Load JSON
+def check_json_syntax(file_path):
    try:
-        with open(path, 'r', encoding='utf-8') as f:
-            data = json.load(f)
+        with open(file_path, 'r', encoding='utf-8') as file:
+            json_str = file.read()
+            json.loads(json_str)
+            print(f"[ OK ] {file_path}")
+    except UnicodeDecodeError as e:
+        print(f"Unicode decode error: {e}")
    except json.JSONDecodeError as e:
-        return False, [f"Invalid JSON: {e}"]
-    except Exception as e:
-        return False, [f"Error reading file: {e}"]
-
-    # Determine required fields based on JSON content
-    required_fields = []
-
-    # Validate structure - support both array and object formats
-    entries_to_validate = []
-
-    if isinstance(data, list):
-        # Direct array format: [{...}, {...}]
-        entries_to_validate = data
-    elif isinstance(data, dict):
-        # Object format: {"custom_nodes": [...]} or {"models": [...]}
-        # Determine validation based on keys
-        if 'custom_nodes' in data and isinstance(data['custom_nodes'], list):
-            required_fields = REQUIRED_FIELDS_CUSTOM_NODE
-            entries_to_validate = data['custom_nodes']
-        elif 'models' in data and isinstance(data['models'], list):
-            required_fields = REQUIRED_FIELDS_MODEL
-            entries_to_validate = data['models']
-        else:
-            # Other JSON structures (extension-node-map.json, etc.) - just validate JSON syntax
-            return True, []
-    else:
-        return False, ["JSON root must be either an array or an object containing arrays"]
-
-    # Validate each entry
-    for idx, entry in enumerate(entries_to_validate, start=1):
-        if not isinstance(entry, dict):
-            # Show actual value for type errors
-            entry_str = json.dumps(entry, ensure_ascii=False) if not isinstance(entry, str) else repr(entry)
-            if len(entry_str) > 150:
-                entry_str = entry_str[:150] + "..."
-            errors.append(f"\n❌ Entry #{idx}: Must be an object, got {type(entry).__name__}")
-            errors.append(f"   Actual value: {entry_str}")
-            continue
-
-        entry_errors = validate_entry(entry, idx, required_fields)
-        if entry_errors:
-            # Group errors by entry with context
-            context = get_entry_context(entry)
-            errors.append(f"\n❌ Entry #{idx} ({context}):")
-            for error in entry_errors:
-                errors.append(f"   - {error}")
-
-    is_valid = len(errors) == 0
-    return is_valid, errors
-
+        print(f"[FAIL] {file_path}\n\n       {e}\n")
+    except FileNotFoundError:
+        print(f"[FAIL] {file_path}\n\n       File not found\n")

 def main():
-    """Main entry point"""
-    if len(sys.argv) < 2:
-        print("Usage: python json-checker.py <json-file>")
-        print("\nValidates JSON entries based on content:")
-        print("  - {\"custom_nodes\": [...]}: Validates required fields (author, title, reference, files, install_type, description)")
-        print("  - {\"models\": [...]}: Validates JSON syntax only (no required fields)")
-        print("  - Other JSON structures: Validates JSON syntax only")
-        print("\nGit repo URL validation (for custom_nodes):")
-        print("  - URLs must NOT end with .git")
-        print("  - URLs must follow: https://github.com/{author}/{reponame}")
-        sys.exit(1)
+    parser = argparse.ArgumentParser(description="JSON File Syntax Checker")
+    parser.add_argument("file_path", type=str, help="Path to the JSON file for syntax checking")

-    file_path = sys.argv[1]
+    args = parser.parse_args()
+    check_json_syntax(args.file_path)

-    is_valid, errors = validate_json_file(file_path)
-
-    if is_valid:
-        print(f"✅ {file_path}: Validation passed")
-        sys.exit(0)
-    else:
-        print(f"Validating: {file_path}")
-        print("=" * 60)
-        print("❌ Validation failed!\n")
-        print("Errors:")
-        # Count actual errors (lines starting with "   -")
-        error_count = sum(1 for e in errors if e.strip().startswith('-'))
-        for error in errors:
-            # Don't add ❌ prefix to grouped entries (they already have it)
-            if error.strip().startswith('❌'):
-                print(error)
-            else:
-                print(error)
-        print(f"\nTotal errors: {error_count}")
-        sys.exit(1)
-
-
-if __name__ == '__main__':
+if __name__ == "__main__":
    main()
@@ -1,25 +1,5 @@
 {
    "custom_nodes": [
-        {
-            "author": "Fossiel",
-            "title": "ComfyUI-MultiGPU-Patched",
-            "reference": "https://github.com/Fossiel/ComfyUI-MultiGPU-Patched",
-            "files": [
-                "https://github.com/Fossiel/ComfyUI-MultiGPU-Patched"
-            ],
-            "install_type": "git-clone",
-            "description": "Patched fork of ComfyUI-MultiGPU providing universal .safetensors and GGUF multi-GPU distribution with DisTorch 2.0 engine, model-driven allocation options (bytes/ratio modes), WanVideoWrapper integration, and up to 10% faster GGUF inference. (Description by CC)"
-        },        
-        {
-            "author": "synchronicity-labs",
-            "title": "ComfyUI Sync Lipsync Node",
-            "reference": "https://github.com/synchronicity-labs/sync-comfyui",
-            "files": [
-                "https://github.com/synchronicity-labs/sync-comfyui"
-            ],
-            "install_type": "git-clone",
-            "description": "This custom node allows you to perform audio-video lip synchronization inside ComfyUI using a simple interface."
-        },
        {
            "author": "joaomede",
            "title": "ComfyUI-Unload-Model-Fork",
@@ -179,16 +159,6 @@
            ],
            "install_type": "git-clone",
            "description": "A fork of KJNodes for ComfyUI.\nVarious quality of life -nodes for ComfyUI, mostly just visual stuff to improve usability"
-        },
-        {
-            "author": "huixingyun",
-            "title": "ComfyUI-SoundFlow",
-            "reference": "https://github.com/huixingyun/ComfyUI-SoundFlow",
-            "files": [
-                "https://github.com/huixingyun/ComfyUI-SoundFlow"
-            ],
-            "install_type": "git-clone",
-            "description": "forked from https://github.com/fredconex/ComfyUI-SoundFlow (removed)"
        }
    ]
 }
@@ -1,106 +1,5 @@
 {
  "models": [
-
-    {
-      "name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for i2v high noise 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_i2v_high_noise_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 i2v high noise 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for i2v high noise 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_high_noise_14B_fp8_scaled.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for i2v low noise 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_i2v_low_noise_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 i2v low noise 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for i2v low noise 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_i2v_low_noise_14B_fp8_scaled.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for t2v high noise 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_t2v_high_noise_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 t2v high noise 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for t2v high noise 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for t2v low noise 14B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_t2v_low_noise_14B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp16.safetensors",
-      "size": "28.6GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 t2v low noise 14B (fp8_scaled)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for t2v low noise 14B (fp8_scaled)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
-      "size": "14.3GB"
-    },
-    {
-      "name": "Comfy-Org/Wan2.2 ti2v 5B (fp16)",
-      "type": "diffusion_model",
-      "base": "Wan2.2",
-      "save_path": "diffusion_models/Wan2.2",
-      "description": "Wan2.2 diffusion model for ti2v 5B (fp16)",
-      "reference": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged",
-      "filename": "wan2.2_ti2v_5B_fp16.safetensors",
-      "url": "https://huggingface.co/Comfy-Org/Wan_2.2_ComfyUI_Repackaged/resolve/main/split_files/diffusion_models/wan2.2_ti2v_5B_fp16.safetensors",
-      "size": "10.0GB"
-    },
-
    {
      "name": "sam2.1_hiera_tiny.pt",
      "type": "sam2.1",
@@ -687,6 +586,109 @@
      "filename": "llava_llama3_fp16.safetensors",
      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/text_encoders/llava_llama3_fp16.safetensors",
      "size": "16.1GB"
+    },
+
+    {
+      "name": "PixArt-Sigma-XL-2-512-MS.safetensors (diffusion)",
+      "type": "diffusion_model",
+      "base": "pixart-sigma",
+      "save_path": "diffusion_models/PixArt-Sigma",
+      "description": "PixArt-Sigma Diffusion model",
+      "reference": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-512-MS",
+      "filename": "PixArt-Sigma-XL-2-512-MS.safetensors",
+      "url": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-512-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
+      "size": "2.44GB"
+    },
+    {
+      "name": "PixArt-Sigma-XL-2-1024-MS.safetensors (diffusion)",
+      "type": "diffusion_model",
+      "base": "pixart-sigma",
+      "save_path": "diffusion_models/PixArt-Sigma",
+      "description": "PixArt-Sigma Diffusion model",
+      "reference": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-1024-MS",
+      "filename": "PixArt-Sigma-XL-2-1024-MS.safetensors",
+      "url": "https://huggingface.co/PixArt-alpha/PixArt-Sigma-XL-2-1024-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
+      "size": "2.44GB"
+    },
+    {
+      "name": "PixArt-XL-2-1024-MS.safetensors (diffusion)",
+      "type": "diffusion_model",
+      "base": "pixart-alpha",
+      "save_path": "diffusion_models/PixArt-Alpha",
+      "description": "PixArt-Alpha Diffusion model",
+      "reference": "https://huggingface.co/PixArt-alpha/PixArt-XL-2-1024-MS",
+      "filename": "PixArt-XL-2-1024-MS.safetensors",
+      "url": "https://huggingface.co/PixArt-alpha/PixArt-XL-2-1024-MS/resolve/main/transformer/diffusion_pytorch_model.safetensors",
+      "size": "2.45GB"
+    },
+    
+    {
+      "name": "Comfy-Org/hunyuan_video_t2v_720p_bf16.safetensors",
+      "type": "diffusion_model",
+      "base": "Hunyuan Video",
+      "save_path": "diffusion_models/hunyuan_video",
+      "description": "Huyuan Video diffusion model. repackaged version.",
+      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
+      "filename": "hunyuan_video_t2v_720p_bf16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/diffusion_models/hunyuan_video_t2v_720p_bf16.safetensors",
+      "size": "25.6GB"
+    },
+    {
+      "name": "Comfy-Org/hunyuan_video_vae_bf16.safetensors",
+      "type": "VAE",
+      "base": "Hunyuan Video",
+      "save_path": "VAE",
+      "description": "Huyuan Video VAE model. repackaged version.",
+      "reference": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged",
+      "filename": "hunyuan_video_vae_bf16.safetensors",
+      "url": "https://huggingface.co/Comfy-Org/HunyuanVideo_repackaged/resolve/main/split_files/vae/hunyuan_video_vae_bf16.safetensors",
+      "size": "493MB"
+    },
+
+    {
+      "name": "LTX-Video 2B v0.9.1 Checkpoint",
+      "type": "checkpoint",
+      "base": "LTX-Video",
+      "save_path": "checkpoints/LTXV",
+      "description": "LTX-Video is the first DiT-based video generation model capable of generating high-quality videos in real-time. It produces 24 FPS videos at a 768x512 resolution faster than they can be watched. Trained on a large-scale dataset of diverse videos, the model generates high-resolution videos with realistic and varied content.",
+      "reference": "https://huggingface.co/Lightricks/LTX-Video",
+      "filename": "ltx-video-2b-v0.9.1.safetensors",
+      "url": "https://huggingface.co/Lightricks/LTX-Video/resolve/main/ltx-video-2b-v0.9.1.safetensors",
+      "size": "5.72GB"
+    },
+
+    {
+      "name": "XLabs-AI/flux-canny-controlnet-v3.safetensors",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "xlabs/controlnets",
+      "description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
+      "reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
+      "filename": "flux-canny-controlnet-v3.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-canny-controlnet-v3.safetensors",
+      "size": "1.49GB"
+    },
+    {
+      "name": "XLabs-AI/flux-depth-controlnet-v3.safetensors",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "xlabs/controlnets",
+      "description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
+      "reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
+      "filename": "flux-depth-controlnet-v3.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-depth-controlnet-v3.safetensors",
+      "size": "1.49GB"
+    },
+    {
+      "name": "XLabs-AI/flux-hed-controlnet-v3.safetensors",
+      "type": "controlnet",
+      "base": "FLUX.1",
+      "save_path": "xlabs/controlnets",
+      "description": "ControlNet checkpoints for FLUX.1-dev model by Black Forest Labs.",
+      "reference": "https://huggingface.co/XLabs-AI/flux-controlnet-collections",
+      "filename": "flux-hed-controlnet-v3.safetensors",
+      "url": "https://huggingface.co/XLabs-AI/flux-controlnet-collections/resolve/main/flux-hed-controlnet-v3.safetensors",
+      "size": "1.49GB"
    }
  ]
 }
@@ -10,16 +10,6 @@
            "install_type": "git-clone",
            "description": "A minimal template for creating React/TypeScript frontend extensions for ComfyUI, with complete boilerplate setup including internationalization and unit testing."
        },
-        {
-            "author": "comfyui-wiki",
-            "title": "ComfyUI-i18n-demo",
-            "reference": "https://github.com/comfyui-wiki/ComfyUI-i18n-demo",
-            "files": [
-                "https://github.com/comfyui-wiki/ComfyUI-i18n-demo"
-            ],
-            "install_type": "git-clone",
-            "description": "ComfyUI custom node develop i18n support demo "
-        },
        {
            "author": "Suzie1",
            "title": "Guide To Making Custom Nodes in ComfyUI",
@@ -351,36 +341,6 @@
            ],
            "install_type": "git-clone",
            "description": "A minimal test suite demonstrating how remote COMBO inputs behave in ComfyUI, with and without force_input"
-        },
-        {
-            "author": "J1mB091",
-            "title": "ComfyUI-J1mB091 Custom Nodes",
-            "reference": "https://github.com/J1mB091/ComfyUI-J1mB091",
-            "files": [
-                "https://github.com/J1mB091/ComfyUI-J1mB091"
-            ],
-            "install_type": "git-clone",
-            "description": "Vibe Coded ComfyUI Custom Nodes"
-        },
-        {
-            "author": "aiforhumans",
-            "title": "XDev Nodes - Complete Toolkit",
-            "reference": "https://github.com/aiforhumans/comfyui-xdev-nodes",
-            "files": [
-                "https://github.com/aiforhumans/comfyui-xdev-nodes"
-            ],
-            "install_type": "git-clone",
-            "description": "Complete ComfyUI development toolkit with 8 professional nodes including VAE tools, universal type testing, and comprehensive debugging infrastructure."
-        },
-        {
-            "author": "ganlvtech",
-            "title": "ComfyUI-CustomModelPatcher",
-            "reference": "https://github.com/ganlvtech/ComfyUI-CustomModelPatcher",
-            "files": [
-                "https://github.com/ganlvtech/ComfyUI-CustomModelPatcher"
-            ],
-            "install_type": "git-clone",
-            "description": "Demonstrates GPU memory management techniques for external models like onnxruntime and InsightFace in ComfyUI by pre-allocating VRAM. (Description by CC)"
-        }        
+        }
    ]
 }
@@ -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
-}
@@ -1,16 +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.0-beta.10"
+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.42"
-license = { file = "LICENSE.txt" }
-requires-python = ">=3.9"
-dependencies = ["GitPython", "PyGithub", "matrix-nio", "transformers", "huggingface-hub>0.20", "typer", "rich", "typing-extensions", "toml", "uv", "chardet", "packaging", "nh3>=0.3.7"]
+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 :: 4 - Beta",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+]
+
+dependencies = [
+    "GitPython",
+    "PyGithub",
+    "matrix-client==0.4.0",
+    "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://registry.comfy.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)
+]
@@ -2,12 +2,10 @@ GitPython
 PyGithub
 matrix-nio
 transformers
-huggingface-hub
+huggingface-hub>0.20
 typer
 rich
 typing-extensions
 toml
 uv
 chardet
-packaging
-nh3>=0.3.7
@@ -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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dr.Lt.Data	24ca0ab538	fix: Issue where the ComfyUI hash difference was not appearing in `v2/snapshot/diff`.	2025-07-29 23:22:19 +09:00
Dr.Lt.Data	62da330182	added: /v2/snapshot/diff modified: use 'packaging.version` instead custom StrictVersion	2025-07-29 23:15:11 +09:00
Dr.Lt.Data	5316ec1b4d	Merge branch 'main' into draft-v4	2025-07-29 12:18:55 +09:00
Dr.Lt.Data	a2a7349ce4	Merge branch 'main' into draft-v4	2025-07-27 16:07:57 +09:00
Dr.Lt.Data	6867616973	Merge branch 'main' into draft-v4	2025-07-25 12:26:42 +09:00
Dr.Lt.Data	cf8029ecd4	Merge branch 'main' into draft-v4	2025-07-24 12:41:48 +09:00
Dr.Lt.Data	59264c1fd9	Merge branch 'main' into draft-v4	2025-07-20 19:23:24 +09:00
Dr.Lt.Data	22725b0188	add missing file	2025-07-15 18:52:17 +09:00
Dr.Lt.Data	a0b0c2b963	feat: initial implementation of middleware-based security policy	2025-07-12 11:31:07 +09:00
Dr.Lt.Data	f4ce0fd5f1	Merge branch 'main' into draft-v4	2025-07-08 12:21:47 +09:00
Dr.Lt.Data	086040f858	bump version	2025-07-01 12:55:13 +09:00
Dr.Lt.Data	adbeb527d6	added: middleware manager for security policy	2025-07-01 12:54:29 +09:00
Dr.Lt.Data	043176168d	Merge branch 'main' into draft-v4	2025-07-01 12:35:39 +09:00
Dr.Lt.Data	ad79a2ef45	Merge branch 'main' into draft-v4	2025-06-28 19:59:19 +09:00
Dr.Lt.Data	43041cebed	modified: Do not modify `generated_models.py` directly; use `openapi.yaml` instead.	2025-06-28 07:54:17 +09:00
Dr.Lt.Data	002e549a86	modified: security policy - Strengthened the default security policy - Subdivided the risky levels high and middle into high+, high, middle+, and middle - Added support for personal_cloud network mode - Updated README.md fixed: invalid security message fixed: legacy - crash when security policy violation occurred modified: default 'use_uv' is now True	2025-06-27 01:38:38 +09:00
Dr.Lt.Data	1de6f859bf	Merge branch 'main' into draft-v4	2025-06-26 23:21:04 +09:00
Dr.Lt.Data	89530fc4e7	Merge branch 'main' into draft-v4	2025-06-25 12:58:50 +09:00
Dr.Lt.Data	223d6dad51	Merge branch 'main' into draft-v4	2025-06-25 00:46:12 +09:00
Christian Byrne	cb0fa5829d	Merge pull request #1915 from Comfy-Org/feat/implement-batch-tracking-clean [feat] Implement comprehensive batch tracking and OpenAPI-driven data models	2025-06-21 19:46:23 -07:00
bymyself	a66f86d4af	cleanup records older than 16 days	2025-06-21 16:57:54 -07:00
bymyself	35d98dcea8	add batch_id to history task items	2025-06-21 16:45:50 -07:00
bymyself	38fefde06d	add embedded python to system state	2025-06-21 16:29:40 -07:00
bymyself	75ecb31f8c	add frontend version to system state capture	2025-06-21 16:28:00 -07:00
bymyself	77133375ad	[fix] Ensure batch history is written when queue becomes empty	2025-06-21 16:01:25 -07:00
bymyself	d1ca6288a3	apply formatting	2025-06-19 16:41:16 -07:00
bymyself	624ad4cfe6	remove debug comments	2025-06-19 16:39:14 -07:00
bymyself	d912fb0f8b	[fix] Remove unused imports to fix Ruff linting errors	2025-06-17 15:27:21 -07:00
bymyself	e8fc053a32	[fix] Update data models to Pydantic v2 syntax to fix TypeError	2025-06-17 15:12:25 -07:00
bymyself	ce3b2bab39	refactor	2025-06-17 14:58:34 -07:00
bymyself	15e3699535	[cleanup] Remove outdated temp_queue_batch comment	2025-06-17 14:44:58 -07:00
bymyselfandClaude	a4bf6bddbf	[refactor] Use Pydantic models for query parameter validation - Added query parameter models to OpenAPI spec for GET endpoints - Regenerated data models to include new query param models - Replaced manual validation with Pydantic model validation - Removed obsolete validate_required_params helper function - Provides better error messages and type safety for API endpoints Co-Authored-By: Claude <noreply@anthropic.com>	2025-06-17 14:42:25 -07:00
bymyself	f1b3c6b735	[refactor] Move model utility functions to model_utils module	2025-06-17 14:24:31 -07:00
bymyself	e923434d08	[fix] Update client filtering to handle tuple structure in pending_tasks	2025-06-17 13:52:00 -07:00
bymyself	ddc9cd0fd5	[fix] Use tuples in TaskQueue heap for proper comparison support	2025-06-17 13:42:47 -07:00
bymyselfandClaude	d081db0c30	[cleanup] Remove dead code do_update_all function - Removed do_update_all function that was never called and only returned an error - Removed "update-all" from OperationType enum as it's no longer used - Regenerated data models to reflect the enum change The update_all functionality now properly creates individual update tasks through the API endpoint rather than being a single monolithic task. Co-Authored-By: Claude <noreply@anthropic.com>	2025-06-17 13:27:51 -07:00
bymyself	14298b0859	[fix] Remove unused imports to fix linting errors	2025-06-17 13:08:52 -07:00
bymyself	03ecda3cfe	[feat] Implement comprehensive system state capture for batch records	2025-06-17 13:08:35 -07:00
bymyselfandClaude	350cb767c3	[feat] Regenerate data models with enhanced ComfyUISystemState - Add SecurityLevel and RiskLevel enums to generated models - Enhance ComfyUISystemState with additional system information fields: - comfyui_root_path: ComfyUI installation directory - model_paths: Map of model types to configured paths - manager_version: ComfyUI Manager version - security_level: Current security configuration - network_mode: Network mode (online/offline/private) - cli_args: Selected CLI arguments - custom_nodes_count: Total number of custom nodes - failed_imports: List of failed imports - pip_packages: Installed pip packages 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-06-17 13:06:14 -07:00
bymyselfandClaude	f450dcbb57	[feat] Add SecurityLevel and RiskLevel enums to OpenAPI schema - Add SecurityLevel enum with strong/normal/normal-/weak values - Add RiskLevel enum with block/high/middle values - These will be used for security policy management 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-06-17 13:05:59 -07:00
bymyself	32e003965a	fix `files` description in api	2025-06-17 10:36:52 -07:00
bymyself	65f0764338	fix duplicated schemas in openapi	2025-06-17 10:36:31 -07:00
bymyself	1bdb026079	explain glob vs legacy in claude memory	2025-06-17 10:36:08 -07:00
Dr.Lt.Data	7e51286313	Merge branch 'main' into draft-v4	2025-06-17 00:33:31 +09:00
bymyself	c888ea6435	[fix] Reduce excessive logging output to debug level - Convert batch tracking messages to debug level (batch start, history saved) - Convert task processing details to debug level - Convert cache update messages to debug level - Replace print() with logging.debug() for task processing - Keep user-relevant messages at info level (ComfyUI updates, installation success) - Resolves verbose output appearing without --verbose flag	2025-06-13 20:39:18 -07:00
bymyself	b089db79c5	[fix] Restore proper thread-based TaskQueue worker management - Fix async/sync mismatch in TaskQueue worker implementation - Use threading.Thread with asyncio.run() as originally designed - Remove incorrect async task approach that caused blocking issues - TaskQueue now properly manages its own thread lifecycle - Resolves WebSocket message delivery and task processing issues	2025-06-13 20:27:41 -07:00
bymyself	7a73f5db73	[fix] Update CI to only check changed files - Add tj-actions/changed-files to detect modified files in PR - Only run OpenAPI validation if openapi.yaml was changed - Only run Python linting on changed Python files (excluding legacy/) - Remove incorrect "pip install ast" dependency - Remove non-standard AST parsing and import checks - Makes CI more efficient and prevents unrelated failures	2025-06-13 19:41:07 -07:00
bymyself	a96e7b114e	[chore] Regenerate data models after OpenAPI fixes - Updated generated_models.py to reflect OpenAPI 3.1 nullable format changes - Models now use Optional[type] instead of nullable: true - All affected models regenerated with datamodel-codegen - Syntax and linting checks pass	2025-06-13 19:41:07 -07:00
bymyself	0148b5a3cc	[fix] Fix OpenAPI validation errors for CI compliance - Convert all nullable: true to OpenAPI 3.1 format using type: [type, 'null'] - Fix invalid array schema definition in ManagerMappings using oneOf - Add default security: [] configuration to satisfy security-defined rule - All 41 validation errors resolved, spec now passes with 0 errors - 141 warnings remain (mostly missing operationId and example validation)	2025-06-13 19:41:07 -07:00
bymyself	2120a0aa79	[chore] Add dist/ to gitignore to exclude build artifacts	2025-06-13 19:40:27 -07:00
bymyself	706b6d8317	[refactor] Remove legacy thread management for TaskQueue - Add proper async worker management to TaskQueue class - Remove redundant task_worker_thread and task_worker_lock global variables - Replace manual threading with async task management - Update is_processing() logic to use TaskQueue state instead of thread status - Implement automatic worker cleanup when queue processing completes - Simplify queue start endpoint to use TaskQueue.start_worker()	2025-06-13 19:40:27 -07:00
bymyself	a59e6e176e	[refactor] Remove redundant ExecutionStatus NamedTuple - Eliminate TaskQueue.ExecutionStatus NamedTuple in favor of generated TaskExecutionStatus Pydantic model - Remove manual conversion logic between NamedTuple and Pydantic model - Use single source of truth for task execution status - Clean up unused imports (Literal, NamedTuple) - Maintain consistent data model usage throughout TaskQueue	2025-06-13 19:37:57 -07:00
bymyself	1d575fb654	[refactor] Replace non-standard OpenAPI validation with Redoc CLI - Replace deprecated openapi-spec-validator with @redocly/cli - Remove fragile custom regex-based route alignment script - Use industry-standard OpenAPI validation tooling - Switch from Python to Node.js for validation pipeline - New validation catches 41 errors and 141 warnings that old validator missed	2025-06-13 19:37:57 -07:00
bymyself	98af8dc849	add claude memory	2025-06-13 19:37:57 -07:00
bymyself	4d89c69109	add installed packs to openapi	2025-06-13 19:37:57 -07:00
bymyself	b73dc6121f	refresh cache before reporting status	2025-06-13 19:37:57 -07:00
bymyself	b55e1404b1	return installed pack list on status update	2025-06-13 19:37:57 -07:00
bymyself	0be0a2e6d7	migrate to data models for all routes	2025-06-13 19:37:57 -07:00
bymyself	3afafdb884	remove dist dir	2025-06-13 19:37:57 -07:00
bymyself	884b503728	[feat] Add comprehensive Pydantic validation to all API endpoints - Updated all POST endpoints to use proper Pydantic model validation: - `/v2/manager/queue/task` - validates QueueTaskItem - `/v2/manager/queue/install_model` - validates ModelMetadata - `/v2/manager/queue/reinstall` - validates InstallPackParams - `/v2/customnode/import_fail_info` - validates cnr_id/url fields - Added proper error handling with ValidationError for detailed error messages - Updated TaskQueue.put() to handle both dict and Pydantic model inputs - Added missing imports: InstallPackParams, ModelMetadata, ValidationError Benefits: - Early validation catches invalid data at API boundaries - Better error messages for clients with specific validation failures - Type safety throughout the request processing pipeline - Consistent validation behavior across all endpoints All ruff checks pass and validation is now enabled by default.	2025-06-13 19:37:57 -07:00
bymyself	7f1ebbe081	[cleanup] Remove completed TODO comments and fix ruff issues - Removed completed TODO comments about code quality checks and client_id handling - Updated comments to reflect implemented features - Fixed ruff linting errors: - Removed duplicate constant definitions - Added missing locale import - Fixed unused imports - Moved is_local_mode logic to security_utils module - Added model_dir_name_map import to model_utils All ruff checks now pass successfully.	2025-06-13 19:37:57 -07:00
bymyself	c8882dcb7c	[feat] Implement comprehensive batch tracking and OpenAPI-driven data models Enhances ComfyUI Manager with robust batch execution tracking and unified data model architecture: - Implemented automatic batch history serialization with before/after system state snapshots - Added comprehensive state management capturing installed nodes, models, and ComfyUI version info - Enhanced task queue with proper client ID handling and WebSocket notifications - Migrated all data models to OpenAPI-generated Pydantic models for consistency - Added documentation for new TaskQueue methods (done_count, total_count, finalize) - Fixed 64 linting errors with proper imports and code cleanup Technical improvements: - All models now auto-generated from openapi.yaml ensuring API/implementation consistency - Batch tracking captures complete system state at operation start and completion - Enhanced REST endpoints with comprehensive documentation - Removed manual model files in favor of single source of truth - Added helper methods for system state capture and batch lifecycle management	2025-06-13 19:36:55 -07:00
bymyself	601f1bf452	[feat] Add client_id support to task queue system - Add client_id field to QueueTaskItem and TaskHistoryItem models - Implement client-specific WebSocket message routing - Add client filtering to queue status and history endpoints - Follow ComfyUI patterns for session management - Create data_models package for better code organization	2025-06-13 19:33:05 -07:00
Dr.Lt.Data	3870abfd2d	Merge branch 'main' into draft-v4	2025-06-09 12:37:10 +09:00
Dr.Lt.Data	8303e7c043	Merge branch 'main' into draft-v4 # Conflicts: # comfyui_manager/common/README.md # comfyui_manager/glob/manager_core.py # comfyui_manager/js/README.md # pyproject.toml	2025-06-01 06:23:11 +09:00
Dr.Lt.Data	35464654c1	fixed: `cm_global` importing error	2025-05-19 06:10:25 +09:00
Dr.Lt.Data	ec9d52d482	Merge branch 'main' into draft-v4	2025-05-19 06:07:31 +09:00
Dr.Lt.Data	90ce448380	Merge branch 'main' into draft-v4	2025-05-12 12:21:18 +09:00
Dr.Lt.Data	56125839ac	Merge branch 'main' into draft-v4	2025-04-29 00:30:02 +09:00
Dr.Lt.Data	cd49799bed	fixed: crash related to deleted CNR node after installed modified: convert cm-cli.sh to cm-cli command	2025-04-28 00:13:31 +09:00
Dr.Lt.Data	d547a05106	Merge branch 'main' into draft-v4	2025-04-27 23:17:18 +09:00
Dr.Lt.Data	db0b57a14c	Merge branch 'main' into draft-v4	2025-04-24 08:44:50 +09:00
Dr.Lt.Data	2048ac87a9	modified: glob.core - make default network mode as public. Network mode does not simply determine whether the CNR cache is used. Even after switching to cacheless in the future, it will continue to be used as a policy for user environments.	2025-04-24 08:41:17 +09:00
Dr.Lt.Data	9adf6de850	fixed: missing channels.list.template modified: /ltdrdata -> /Comfy-Org modified: set default network as public instead of offline	2025-04-23 08:58:47 +09:00
Dr.Lt.Data	7657c7866f	fixed: perform reload when starting task worker	2025-04-22 12:39:09 +09:00
Dr.Lt.Data	d638f75117	modified: prevent displaying ComfyUI-Manager on list	2025-04-22 02:39:56 +09:00
Dr.Lt.Data	efff6b2c18	Merge branch 'main' into draft-v4	2025-04-22 01:20:57 +09:00
Dr.Lt.Data	0c46434164	fixed: avoid `except:` fixed: prestartup_script - remove useless exception handling when fallback resolving comfy_path	2025-04-21 12:42:50 +09:00
Dr.Lt.Data	0bb8947c02	Merge branch 'main' into draft-v4	2025-04-21 12:12:27 +09:00
Christian Byrne	09e8e8798c	Add `is_legacy_manager_ui` route from the `legacy` package as well (#1748 ) * add `is_legacy_manager_ui` route to `legacy` package as well * add static	2025-04-15 18:36:38 +09:00
Christian Byrne	abfd85602e	Only load legacy FE extension if `--enable-manager-legacy-ui` is set (#1746 ) * only load JS extensions when legacy arg is set * add `is_legacy_manager_ui` endpoint	2025-04-15 08:03:04 +09:00
Dr.Lt.Data	1816bb748e	use --enable-manager-legacy-ui cli arg instead of env variable	2025-04-15 01:36:35 +09:00
Dr.Lt.Data	05ceab68f8	restructuring the existing cache-based implementation will be retained as a fallback under legacy/..., while glob/... will be updated to a cacheless implementation.	2025-04-13 09:26:02 +09:00
Christian Byrne	46a37907e6	add development guide (#1739 )	2025-04-13 08:40:28 +09:00
Dr.Lt.Data	7fc8ba587e	fixed: don't disable legacy ComfyUI-Manager unless --disable-comfyui is set	2025-04-12 21:24:29 +09:00
Dr.Lt.Data	7a35bd9d9a	Merge branch 'main' into draft-v4	2025-04-12 21:22:34 +09:00
Dr.Lt.Data	a76ef49d2d	Merge branch 'feat/cacheless-v2' into draft-v4	2025-04-12 20:11:33 +09:00
Dr.Lt.Data	bb0fcf6ea6	added: should_be_disabled function	2025-04-12 19:35:41 +09:00
Dr.Lt.Data	539e0a1534	Merge branch 'main' into draft-v4	2025-04-12 19:06:24 +09:00
Dr.Lt.Data	aaae6ce304	Merge branch 'feat/queue_batch' into draft-v4	2025-04-12 19:05:48 +09:00
bymyself	3c413840d7	use parsed version and id even when no cnr map exists	2025-04-11 16:33:12 -07:00
bymyself	29ca93fcb4	fix: installed nodes should still be initialized in offline mode	2025-04-11 15:56:03 -07:00
bymyself	9dc8e630a0	fix is_legacy_front should be a function still	2025-04-10 18:24:34 -07:00
bymyself	10105ad737	if pip package, force offline mode	2025-04-10 13:09:56 -07:00
bymyself	5738ea861a	don't load legacy web dir when --disable-manager arg set	2025-04-09 22:19:56 -07:00
Dr.Lt.Data	dbd25b0f0a	Merge branch 'main' into feat/cacheless	2025-04-10 12:20:29 +09:00
bymyself	0de9d36c28	enable legacy manager frontend during beta phase	2025-04-09 14:59:32 -07:00
bymyself	05f1a8ab0d	add missing v2 prefix to customnode/installed route	2025-04-09 14:59:06 -07:00
bymyself	5ce170b7ce	don't handle queue in legacy front if element is not visible	2025-04-09 14:58:39 -07:00
bymyself	2b47aad076	don't show menu buttons if past comfyui front 1.16	2025-04-09 14:58:21 -07:00
bymyself	b4dc59331d	fix merge conflict	2025-04-09 14:57:53 -07:00
bymyself	81e84fad78	add workflow to publish to pypi	2025-04-09 08:59:39 -07:00
Dr.Lt.Data	42e8a959dd	Modify the structure to be installable via pip.	2025-04-09 08:59:37 -07:00
Dr.Lt.Data	208ca31836	support installation of system added nodepack modified: install_by_id - Change the install path of the CNR node added by the system to be based on the repo URL instead of the CNR ID.	2025-04-09 08:57:56 -07:00
Dr.Lt.Data	a128baf894	fixed: ruff check	2025-03-25 23:40:15 +09:00
Dr.Lt.Data	57b847eebf	fixed: failed[..].ui_id -> failed	2025-03-24 23:12:45 +09:00
Dr.Lt.Data	149257e4f1	Merge branch 'main' into feat/queue_batch	2025-03-24 22:53:13 +09:00
Dr.Lt.Data	212b8e7ed2	feat: support task batch POST /v2/manager/queue/batch GET /v2/manager/queue/history_list GET /v2/manager/queue/history?id={id} GET /v2/manager/queue/abort_current	2025-03-24 22:49:38 +09:00
Dr.Lt.Data	01ac9c895a	Modify the structure to be installable via pip.	2025-03-19 22:15:53 +09:00
Dr.Lt.Data	ebcb14e6aa	support installation of system added nodepack modified: install_by_id - Change the install path of the CNR node added by the system to be based on the repo URL instead of the CNR ID.	2025-03-19 07:41:39 +09:00