[fix] TypeScript errors in manager/compatibility branch (#4625 )

[feat] Add import failure detection and error handling for package manager (#4600 )
[refactor] Simplify conflict acknowledgment system and enhance UX (#4599 )
2026-03-15 01:48:06 +00:00 · 2025-07-31 16:42:56 +09:00 · 2025-07-31 16:42:56 +09:00 · 2025-07-31 16:42:56 +09:00 · 2025-07-31 16:42:56 +09:00 · 2025-07-31 16:42:56 +09:00
104 changed files with 10598 additions and 2228 deletions
--- a/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-avif-chromium-linux.png
+++ b/browser_tests/tests/loadWorkflowInMedia.spec.ts-snapshots/workflow-avif-chromium-linux.png
--- a/package-lock.json
+++ b/package-lock.json
@@ -445,6 +445,7 @@
      "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-0.5.0.tgz",
      "integrity": "sha512-dKnk2xlAyC7rvTkpkHmu+Qy/2Zc3Vm/l8PtNyIOGDBtXPY3kThfU4ORNEp3V7SXw5XSOb+tOJaUYpfquPzL/Tg==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "package-manager-detector": "^0.2.5",
        "tinyexec": "^0.3.1"
@@ -566,6 +567,7 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
      "dev": true,
+      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -619,6 +621,7 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
      "dev": true,
+      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -649,6 +652,7 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
      "dev": true,
+      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      }
@@ -908,9 +912,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.27.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",
-      "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
+      "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
@@ -2333,6 +2337,7 @@
      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.3.0.tgz",
      "integrity": "sha512-GmQ78prtwYW6EtzXRU1rY+KwOKfz32PD7iJh6Iyqw68GiKuoZ2A6pRtzWONz5VQJbp50mEjXh/7NkumtrAgRKA==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "@antfu/install-pkg": "^1.0.0",
        "@antfu/utils": "^8.1.0",
@@ -2349,6 +2354,7 @@
      "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-1.1.0.tgz",
      "integrity": "sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "package-manager-detector": "^1.3.0",
        "tinyexec": "^1.0.1"
@@ -2362,6 +2368,7 @@
      "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-8.1.1.tgz",
      "integrity": "sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==",
      "dev": true,
+      "license": "MIT",
      "funding": {
        "url": "https://github.com/sponsors/antfu"
      }
@@ -2370,13 +2377,15 @@
      "version": "0.2.2",
      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.2.tgz",
      "integrity": "sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/@iconify/utils/node_modules/debug": {
      "version": "4.4.1",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.3"
      },
@@ -2394,6 +2403,7 @@
      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.1.tgz",
      "integrity": "sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "mlly": "^1.7.4",
        "pkg-types": "^2.0.1",
@@ -2410,19 +2420,22 @@
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.3.0.tgz",
      "integrity": "sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/@iconify/utils/node_modules/pathe": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/@iconify/utils/node_modules/pkg-types": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
      "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "confbox": "^0.2.2",
        "exsolve": "^1.0.7",
@@ -2433,7 +2446,8 @@
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.1.tgz",
      "integrity": "sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/@inkjs/ui": {
      "version": "1.0.0",
@@ -2542,6 +2556,18 @@
        "js-yaml": "bin/js-yaml.js"
      }
    },
+    "node_modules/@intlify/eslint-plugin-vue-i18n/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/@intlify/eslint-plugin-vue-i18n/node_modules/synckit": {
      "version": "0.9.3",
      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.3.tgz",
@@ -4635,7 +4661,8 @@
      "version": "7.7.0",
      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.0.tgz",
      "integrity": "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/@types/stats.js": {
      "version": "0.17.3",
@@ -6089,15 +6116,15 @@
      }
    },
    "node_modules/broker-factory": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.7.tgz",
-      "integrity": "sha512-RxbMXWq/Qvw9aLZMvuooMtVTm2/SV9JEpxpBbMuFhYAnDaZxctbJ+1b9ucHxADk/eQNqDijvWQjLVARqExAeyg==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/broker-factory/-/broker-factory-3.1.8.tgz",
+      "integrity": "sha512-xmVnYN0FZtynhPUmAnN+/MFRdbDi3syCuxWV7o7s78FcIN0pjDtn9mUrVqEgdjQkbfojRhlPWbYbXJkMCyddrg==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
        "fast-unique-numbers": "^9.0.22",
        "tslib": "^2.8.1",
-        "worker-factory": "^7.0.43"
+        "worker-factory": "^7.0.44"
      }
    },
    "node_modules/browserslist": {
@@ -6667,7 +6694,8 @@
      "version": "0.1.8",
      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/config-chain": {
      "version": "1.1.13",
@@ -7841,6 +7869,18 @@
        "eslint": ">=6.0.0"
      }
    },
+    "node_modules/eslint-compat-utils/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/eslint-config-prettier": {
      "version": "10.1.2",
      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.2.tgz",
@@ -8389,7 +8429,8 @@
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.7.tgz",
      "integrity": "sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/extend": {
      "version": "3.0.2",
@@ -8412,53 +8453,53 @@
      }
    },
    "node_modules/extendable-media-recorder": {
-      "version": "9.2.27",
-      "resolved": "https://registry.npmjs.org/extendable-media-recorder/-/extendable-media-recorder-9.2.27.tgz",
-      "integrity": "sha512-2X+Ixi1cxLek0Cj9x9atmhQ+apG+LwJpP2p3ypP8Pxau0poDnicrg7FTfPVQV5PW/3DHFm/eQ16vbgo5Yk3HGQ==",
+      "version": "9.2.28",
+      "resolved": "https://registry.npmjs.org/extendable-media-recorder/-/extendable-media-recorder-9.2.28.tgz",
+      "integrity": "sha512-OIltlqo8rIUOcPn5c6aZ0qCvcTpXDnBgts8eRXK1VQKCI1omYBgZZyzkJ5vrQnB8xR34+GNOFs1Z+srq6tQsdQ==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "media-encoder-host": "^9.0.20",
+        "media-encoder-host": "^9.0.21",
        "multi-buffer-data-view": "^6.0.22",
-        "recorder-audio-worklet": "^6.0.48",
+        "recorder-audio-worklet": "^6.0.49",
        "standardized-audio-context": "^25.3.77",
        "subscribable-things": "^2.1.53",
        "tslib": "^2.8.1"
      }
    },
    "node_modules/extendable-media-recorder-wav-encoder": {
-      "version": "7.0.129",
-      "resolved": "https://registry.npmjs.org/extendable-media-recorder-wav-encoder/-/extendable-media-recorder-wav-encoder-7.0.129.tgz",
-      "integrity": "sha512-/wqM2hnzvLy/iUlg/EU3JIF8MJcidy8I77Z7CCm5+CVEClDfcs6bH9PgghuisndwKTaud0Dh48RTD83gkfEjCw==",
+      "version": "7.0.130",
+      "resolved": "https://registry.npmjs.org/extendable-media-recorder-wav-encoder/-/extendable-media-recorder-wav-encoder-7.0.130.tgz",
+      "integrity": "sha512-tVroIOesnMarsm+iIRiWUEYgmQj/lGqeMVNwJla7/tTVkX3ZPamh0NW59deILANwDIJq9lARLQmsUhyDWW57PA==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "extendable-media-recorder-wav-encoder-broker": "^7.0.119",
-        "extendable-media-recorder-wav-encoder-worker": "^8.0.116",
+        "extendable-media-recorder-wav-encoder-broker": "^7.0.120",
+        "extendable-media-recorder-wav-encoder-worker": "^8.0.117",
        "tslib": "^2.8.1"
      }
    },
    "node_modules/extendable-media-recorder-wav-encoder-broker": {
-      "version": "7.0.119",
-      "resolved": "https://registry.npmjs.org/extendable-media-recorder-wav-encoder-broker/-/extendable-media-recorder-wav-encoder-broker-7.0.119.tgz",
-      "integrity": "sha512-BLrFOnqFLpsmmNpSk/TfjNs4j6ImCSGtoryIpRlqNu5S/Avt6gRJI0s4UYvdK7h17PCi+8vaDr75blvmU1sYlw==",
+      "version": "7.0.120",
+      "resolved": "https://registry.npmjs.org/extendable-media-recorder-wav-encoder-broker/-/extendable-media-recorder-wav-encoder-broker-7.0.120.tgz",
+      "integrity": "sha512-wYRnDsHngGGR7LnEfl+tkNa7ck31KSV3PzqGLMCeKRmr02OrYxJUKyCeYf79TEe8O0EFtlBGBR9fiAj6OGDOhg==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "broker-factory": "^3.1.7",
-        "extendable-media-recorder-wav-encoder-worker": "^8.0.116",
+        "broker-factory": "^3.1.8",
+        "extendable-media-recorder-wav-encoder-worker": "^8.0.117",
        "tslib": "^2.8.1"
      }
    },
    "node_modules/extendable-media-recorder-wav-encoder-worker": {
-      "version": "8.0.116",
-      "resolved": "https://registry.npmjs.org/extendable-media-recorder-wav-encoder-worker/-/extendable-media-recorder-wav-encoder-worker-8.0.116.tgz",
-      "integrity": "sha512-bJPR0B7ZHeoqi9YoSie+UXAfEYya3efQ9eLiWuyK4KcOv+SuYQvWCoyzX5kjvb6GqIBCUnev5xulfeHRlyCwvw==",
+      "version": "8.0.117",
+      "resolved": "https://registry.npmjs.org/extendable-media-recorder-wav-encoder-worker/-/extendable-media-recorder-wav-encoder-worker-8.0.117.tgz",
+      "integrity": "sha512-rnlIPkMB5F2sslesLXLdJ/Z0Kes4ROtdr+Kf/a6aF3233oJWK7165krWNZP5gpKZ4Z5Lhjx4fxVB12exZvlb2g==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
        "tslib": "^2.8.1",
-        "worker-factory": "^7.0.43"
+        "worker-factory": "^7.0.44"
      }
    },
    "node_modules/fast-deep-equal": {
@@ -9130,6 +9171,7 @@
      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
      "dev": true,
+      "license": "MIT",
      "engines": {
        "node": ">=18"
      },
@@ -10427,6 +10469,18 @@
        "url": "https://opencollective.com/eslint"
      }
    },
+    "node_modules/jsonc-eslint-parser/node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/jsondiffpatch": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/jsondiffpatch/-/jsondiffpatch-0.6.0.tgz",
@@ -10985,6 +11039,7 @@
      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.1.tgz",
      "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "mlly": "^1.7.3",
        "pkg-types": "^1.2.1"
@@ -11527,40 +11582,40 @@
      "license": "MIT"
    },
    "node_modules/media-encoder-host": {
-      "version": "9.0.20",
-      "resolved": "https://registry.npmjs.org/media-encoder-host/-/media-encoder-host-9.0.20.tgz",
-      "integrity": "sha512-IyEYxw6az97RNuETOAZV4YZqNAPOiF9GKIp5mVZb4HOyWd6mhkWQ34ydOzhqAWogMyc4W05kjN/VCgTtgyFmsw==",
+      "version": "9.0.21",
+      "resolved": "https://registry.npmjs.org/media-encoder-host/-/media-encoder-host-9.0.21.tgz",
+      "integrity": "sha512-hL41jBYmTKxGB2Z82rcR2hx4JCFBR3fmSOLR+G7EEkZn+uwSXDJTRFiYd7XWKnpjiHXy7ewf0ByEpby+2mv4Qg==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "media-encoder-host-broker": "^8.0.19",
-        "media-encoder-host-worker": "^10.0.19",
+        "media-encoder-host-broker": "^8.0.20",
+        "media-encoder-host-worker": "^10.0.20",
        "tslib": "^2.8.1"
      }
    },
    "node_modules/media-encoder-host-broker": {
-      "version": "8.0.19",
-      "resolved": "https://registry.npmjs.org/media-encoder-host-broker/-/media-encoder-host-broker-8.0.19.tgz",
-      "integrity": "sha512-lTpsNuaZdTCdtTHsOyww7Ae0Mwv+7mFS+O4YkFYWhXwVs0rm6XbRK5jRRn5JmcX3n1eTE1lQS5RgX8qbNaIjSg==",
+      "version": "8.0.20",
+      "resolved": "https://registry.npmjs.org/media-encoder-host-broker/-/media-encoder-host-broker-8.0.20.tgz",
+      "integrity": "sha512-Jab7frQx8d7Js+yBeMx7FeTrxRDjIpSmdARRkHSOtWNKJv9a+Hy2/OAPXoEJl6Y15jk1eiDwJkMMF6zvlnNMEA==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "broker-factory": "^3.1.7",
+        "broker-factory": "^3.1.8",
        "fast-unique-numbers": "^9.0.22",
-        "media-encoder-host-worker": "^10.0.19",
+        "media-encoder-host-worker": "^10.0.20",
        "tslib": "^2.8.1"
      }
    },
    "node_modules/media-encoder-host-worker": {
-      "version": "10.0.19",
-      "resolved": "https://registry.npmjs.org/media-encoder-host-worker/-/media-encoder-host-worker-10.0.19.tgz",
-      "integrity": "sha512-I8fwc6f41peER3RFSiwDxnIHbqU7p3pc2ghQozcw9CQfL0mWEo4IjQJtyswrrlL/HO2pgVSMQbaNzE4q/0mfDQ==",
+      "version": "10.0.20",
+      "resolved": "https://registry.npmjs.org/media-encoder-host-worker/-/media-encoder-host-worker-10.0.20.tgz",
+      "integrity": "sha512-Ysqjwlcu4VP6FlM+atQJZFFJwvfrw603gnmhWfyBlcE5+pl7ctc0wo2dbPiBpz9pc1pY4N5N6PHHhywkqHxfnA==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "extendable-media-recorder-wav-encoder-broker": "^7.0.119",
+        "extendable-media-recorder-wav-encoder-broker": "^7.0.120",
        "tslib": "^2.8.1",
-        "worker-factory": "^7.0.43"
+        "worker-factory": "^7.0.44"
      }
    },
    "node_modules/media-typer": {
@@ -12298,6 +12353,7 @@
      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz",
      "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "acorn": "^8.14.0",
        "pathe": "^2.0.1",
@@ -12309,7 +12365,8 @@
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/mri": {
      "version": "1.2.0",
@@ -12867,6 +12924,7 @@
      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.11.tgz",
      "integrity": "sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "quansync": "^0.2.7"
      }
@@ -13167,6 +13225,7 @@
      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "confbox": "^0.1.8",
        "mlly": "^1.7.4",
@@ -13177,7 +13236,8 @@
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/playwright": {
      "version": "1.52.0",
@@ -13781,7 +13841,8 @@
          "type": "individual",
          "url": "https://github.com/sponsors/sxzz"
        }
-      ]
+      ],
+      "license": "MIT"
    },
    "node_modules/querystringify": {
      "version": "2.2.0",
@@ -13941,19 +14002,19 @@
      }
    },
    "node_modules/recorder-audio-worklet": {
-      "version": "6.0.48",
-      "resolved": "https://registry.npmjs.org/recorder-audio-worklet/-/recorder-audio-worklet-6.0.48.tgz",
-      "integrity": "sha512-PVlq/1hjCrPcUGqARg8rR30A303xDCao0jmlBTaUaKkN3Xme58RI7EQxurv8rw2eDwVrN+nrni0UoJoa5/v+zg==",
+      "version": "6.0.49",
+      "resolved": "https://registry.npmjs.org/recorder-audio-worklet/-/recorder-audio-worklet-6.0.49.tgz",
+      "integrity": "sha512-JLKSKh5rAWxReHqca/f3h9L8pzBF1KnB+N2oIP2jkTD37n2yupkCazKD2f20pUOGkaX6AJG998gtKNCHYJn4nw==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
-        "broker-factory": "^3.1.7",
+        "broker-factory": "^3.1.8",
        "fast-unique-numbers": "^9.0.22",
        "recorder-audio-worklet-processor": "^5.0.35",
        "standardized-audio-context": "^25.3.77",
        "subscribable-things": "^2.1.53",
        "tslib": "^2.8.1",
-        "worker-factory": "^7.0.43"
+        "worker-factory": "^7.0.44"
      }
    },
    "node_modules/recorder-audio-worklet-processor": {
@@ -14559,6 +14620,7 @@
      "version": "7.7.2",
      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
      "bin": {
        "semver": "bin/semver.js"
      },
@@ -15333,7 +15395,8 @@
      "version": "0.3.2",
      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/tinypool": {
      "version": "1.0.1",
@@ -16269,6 +16332,7 @@
      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.5.tgz",
      "integrity": "sha512-RyWSb5AHmGtjjNQ6gIlA67sHOsWpsbWpwDokLwTcejVdOjEkJZh7QKu14J00gDDVSh8kGH4KYC/TNBceXFZhtw==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "acorn": "^8.14.1",
        "picomatch": "^4.0.2",
@@ -16283,6 +16347,7 @@
      "resolved": "https://registry.npmjs.org/unplugin-icons/-/unplugin-icons-0.22.0.tgz",
      "integrity": "sha512-CP+iZq5U7doOifer5bcM0jQ9t3Is7EGybIYt3myVxceI8Zuk8EZEpe1NPtJvh7iqMs1VdbK0L41t9+um9VuuLw==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "@antfu/install-pkg": "^0.5.0",
        "@antfu/utils": "^0.7.10",
@@ -16329,6 +16394,7 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.3"
      },
@@ -16346,6 +16412,7 @@
      "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.28.0.tgz",
      "integrity": "sha512-jiTGtJ3JsRFBjgvyilfrX7yUoGKScFgbdNw+6p6kEXU+Spf/rhxzgvdfuMcvhCcLmflB/dY3pGQshYBVGOUx7Q==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "@antfu/utils": "^0.7.10",
        "@rollup/pluginutils": "^5.1.4",
@@ -16392,6 +16459,7 @@
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "ms": "^2.1.3"
      },
@@ -16424,6 +16492,7 @@
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "dev": true,
+      "license": "MIT",
      "engines": {
        "node": ">=12"
      },
@@ -17435,7 +17504,8 @@
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
    },
    "node_modules/websocket-driver": {
      "version": "0.7.4",
@@ -17615,9 +17685,9 @@
      }
    },
    "node_modules/worker-factory": {
-      "version": "7.0.43",
-      "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.43.tgz",
-      "integrity": "sha512-SACVoj3gWKtMVyT9N+VD11Pd/Xe58+ZFfp8b7y/PagOvj3i8lU3Uyj+Lj7WYTmSBvNLC0JFaQkx44E6DhH5+WA==",
+      "version": "7.0.44",
+      "resolved": "https://registry.npmjs.org/worker-factory/-/worker-factory-7.0.44.tgz",
+      "integrity": "sha512-08AuUfWi+KeZI+KC7nU4pU/9tDeAFvE5NSWk+K9nIfuQc6UlOsZtjjeGVYVEn+DEchyXNJ5i10HCn0xRzFXEQA==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.27.6",
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,12 +15,14 @@ import ProgressSpinner from 'primevue/progressspinner'
 import { computed, onMounted } from 'vue'

 import GlobalDialog from '@/components/dialog/GlobalDialog.vue'
+import { useConflictDetection } from '@/composables/useConflictDetection'
 import config from '@/config'
 import { useWorkspaceStore } from '@/stores/workspaceStore'

 import { electronAPI, isElectron } from './utils/envUtil'

 const workspaceStore = useWorkspaceStore()
+const conflictDetection = useConflictDetection()
 const isLoading = computed<boolean>(() => workspaceStore.spinner)
 const handleKey = (e: KeyboardEvent) => {
  workspaceStore.shiftDown = e.shiftKey
@@ -47,5 +49,9 @@ onMounted(() => {
  if (isElectron()) {
    document.addEventListener('contextmenu', showContextMenu)
  }
+
+  // Initialize conflict detection in background
+  // This runs async and doesn't block UI setup
+  void conflictDetection.initializeConflictDetection()
 })
 </script>
--- a/src/components/common/DotSpinner.vue
+++ b/src/components/common/DotSpinner.vue
@@ -0,0 +1,130 @@
+<template>
+  <div
+    class="inline-flex items-center justify-center"
+    :style="{ width: size + 'px', height: size + 'px' }"
+  >
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      :width="size"
+      :height="size"
+      viewBox="0 0 14 14"
+      fill="none"
+      class="animate-spin"
+      :style="{ animationDuration: duration }"
+    >
+      <g clip-path="url(#clip0_776_9582)">
+        <!-- Top dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M7 2.21053C7.61042 2.21053 8.10526 1.71568 8.10526 1.10526C8.10526 0.494843 7.61042 0 7 0C6.38958 0 5.89474 0.494843 5.89474 1.10526C5.89474 1.71568 6.38958 2.21053 7 2.21053Z"
+          :fill="color"
+        />
+        <!-- Left dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.25s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M2.21053 7C2.21053 7.61042 1.71568 8.10526 1.10526 8.10526C0.494843 8.10526 0 7.61042 0 7C0 6.38958 0.494843 5.89474 1.10526 5.89474C1.71568 5.89474 2.21053 6.38958 2.21053 7Z"
+          :fill="color"
+        />
+        <!-- Right dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.5s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M14 7C14 7.61042 13.5052 8.10526 12.8947 8.10526C12.2843 8.10526 11.7895 7.61042 11.7895 7C11.7895 6.38958 12.2843 5.89474 12.8947 5.89474C13.5052 5.89474 14 6.38958 14 7Z"
+          :fill="color"
+        />
+        <!-- Bottom dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.75s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M8.10526 12.8947C8.10526 13.5052 7.61041 14 6.99999 14C6.38957 14 5.89473 13.5052 5.89473 12.8947C5.89473 12.2843 6.38957 11.7895 6.99999 11.7895C7.61041 11.7895 8.10526 12.2843 8.10526 12.8947Z"
+          :fill="color"
+        />
+        <!-- Top-left dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.125s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M2.05039 3.61349C2.48203 4.04513 3.18184 4.04513 3.61347 3.61349C4.0451 3.18186 4.0451 2.48205 3.61347 2.05042C3.18184 1.61878 2.48203 1.61878 2.05039 2.05042C1.61876 2.48205 1.61876 3.18186 2.05039 3.61349Z"
+          :fill="color"
+        />
+        <!-- Bottom-right dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.625s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M11.9496 11.9496C11.518 12.3812 10.8182 12.3812 10.3865 11.9496C9.9549 11.5179 9.9549 10.8181 10.3865 10.3865C10.8182 9.95485 11.518 9.95485 11.9496 10.3865C12.3812 10.8181 12.3812 11.5179 11.9496 11.9496Z"
+          :fill="color"
+        />
+        <!-- Bottom-left dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.875s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M2.05039 11.9496C2.48203 12.3812 3.18184 12.3812 3.61347 11.9496C4.0451 11.5179 4.0451 10.8181 3.61347 10.3865C3.18184 9.95485 2.48203 9.95485 2.05039 10.3865C1.61876 10.8181 1.61876 11.5179 2.05039 11.9496Z"
+          :fill="color"
+        />
+        <!-- Top-right dot -->
+        <path
+          class="dot-animation"
+          style="animation-delay: 0.375s"
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M11.9496 3.61349C11.518 4.04513 10.8182 4.04513 10.3865 3.61349C9.9549 3.18186 9.9549 2.48205 10.3865 2.05042C10.8182 1.61878 11.518 1.61878 11.9496 2.05042C12.3812 2.48205 12.3812 3.18186 11.9496 3.61349Z"
+          :fill="color"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_776_9582">
+          <rect width="14" height="14" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
+
+const { size = 24, duration = '2s' } = defineProps<{
+  size?: number
+  duration?: string
+}>()
+
+const colorPaletteStore = useColorPaletteStore()
+
+const color = computed(() =>
+  colorPaletteStore.completedActivePalette.light_theme ? '#2C2B30' : '#D4D4D4'
+)
+</script>
+
+<style scoped>
+.dot-animation {
+  animation: dot-pulse 1s ease-in-out infinite;
+}
+
+@keyframes dot-pulse {
+  0%,
+  80%,
+  100% {
+    opacity: 0.3;
+  }
+  40% {
+    opacity: 1;
+  }
+}
+</style>
--- a/src/components/dialog/GlobalDialog.vue
+++ b/src/components/dialog/GlobalDialog.vue
@@ -27,7 +27,7 @@
    />

    <template v-if="item.footerComponent" #footer>
-      <component :is="item.footerComponent" />
+      <component :is="item.footerComponent" v-bind="item.footerProps" />
    </template>
  </Dialog>
 </template>
--- a/src/components/dialog/content/LoadWorkflowWarning.vue
+++ b/src/components/dialog/content/LoadWorkflowWarning.vue
@@ -31,7 +31,7 @@
      </div>
    </template>
  </ListBox>
-  <div v-if="isManagerInstalled" class="flex justify-end py-3">
+  <div v-if="!isLegacyManager" class="flex justify-end py-3">
    <PackInstallButton
      :disabled="isLoading || !!error || missingNodePacks.length === 0"
      :node-packs="missingNodePacks"
@@ -45,14 +45,14 @@
 <script setup lang="ts">
 import Button from 'primevue/button'
 import ListBox from 'primevue/listbox'
-import { computed } from 'vue'
+import { computed, onMounted, ref } from 'vue'

 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import MissingCoreNodesMessage from '@/components/dialog/content/MissingCoreNodesMessage.vue'
 import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
 import { useMissingNodes } from '@/composables/nodePack/useMissingNodes'
+import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
-import { useAboutPanelStore } from '@/stores/aboutPanelStore'
 import type { MissingNodeType } from '@/types/comfy'
 import { ManagerTab } from '@/types/comfyManagerTypes'

@@ -60,22 +60,11 @@ const props = defineProps<{
  missingNodeTypes: MissingNodeType[]
 }>()

-const aboutPanelStore = useAboutPanelStore()
-
 // Get missing node packs from workflow with loading and error states
 const { missingNodePacks, isLoading, error, missingCoreNodes } =
  useMissingNodes()

-// Determines if ComfyUI-Manager is installed by checking for its badge in the about panel
-// This allows us to conditionally show the Manager button only when the extension is available
-// TODO: Remove this check when Manager functionality is fully migrated into core
-const isManagerInstalled = computed(() => {
-  return aboutPanelStore.badges.some(
-    (badge) =>
-      badge.label.includes('ComfyUI-Manager') ||
-      badge.url.includes('ComfyUI-Manager')
-  )
-})
+const isLegacyManager = ref(false)

 const uniqueNodes = computed(() => {
  const seenTypes = new Set()
@@ -103,6 +92,13 @@ const openManager = () => {
    initialTab: ManagerTab.Missing
  })
 }
+
+onMounted(async () => {
+  const isLegacyResponse = await useComfyManagerService().isLegacyManagerUI()
+  if (isLegacyResponse?.is_legacy_manager_ui) {
+    isLegacyManager.value = true
+  }
+})
 </script>

 <style scoped>
--- a/src/components/dialog/content/ManagerProgressDialogContent.test.ts
+++ b/src/components/dialog/content/ManagerProgressDialogContent.test.ts
@@ -30,11 +30,20 @@ const defaultMockTaskLogs = [

 vi.mock('@/stores/comfyManagerStore', () => ({
  useComfyManagerStore: vi.fn(() => ({
-    taskLogs: [...defaultMockTaskLogs]
+    taskLogs: [...defaultMockTaskLogs],
+    succeededTasksLogs: [...defaultMockTaskLogs],
+    failedTasksLogs: [...defaultMockTaskLogs],
+    managerQueue: { historyCount: 2 },
+    isLoading: false
  })),
  useManagerProgressDialogStore: vi.fn(() => ({
    isExpanded: true,
-    collapse: mockCollapse
+    activeTabIndex: 0,
+    getActiveTabIndex: vi.fn(() => 0),
+    setActiveTabIndex: vi.fn(),
+    toggle: vi.fn(),
+    collapse: mockCollapse,
+    expand: vi.fn()
  }))
 }))

--- a/src/components/dialog/content/ManagerProgressDialogContent.vue
+++ b/src/components/dialog/content/ManagerProgressDialogContent.vue
@@ -18,7 +18,7 @@
        'max-h-0': !isExpanded
      }"
    >
-      <div v-for="(panel, index) in taskPanels" :key="index">
+      <div v-for="(log, index) in focusedLogs" :key="index">
        <Panel
          :expanded="collapsedPanels[index] || false"
          toggleable
@@ -27,7 +27,7 @@
          <template #header>
            <div class="flex items-center justify-between w-full py-2">
              <div class="flex flex-col text-sm font-medium leading-normal">
-                <span>{{ panel.taskName }}</span>
+                <span>{{ log.taskName }}</span>
                <span class="text-muted">
                  {{
                    isInProgress(index)
@@ -52,24 +52,24 @@
          </template>
          <div
            :ref="
-              index === taskPanels.length - 1
+              index === focusedLogs.length - 1
                ? (el) => (lastPanelRef = el as HTMLElement)
                : undefined
            "
            class="overflow-y-auto h-64 rounded-lg bg-black"
            :class="{
-              'h-64': index !== taskPanels.length - 1,
-              'flex-grow': index === taskPanels.length - 1
+              'h-64': index !== focusedLogs.length - 1,
+              'flex-grow': index === focusedLogs.length - 1
            }"
            @scroll="handleScroll"
          >
            <div class="h-full">
              <div
-                v-for="(log, logIndex) in panel.logs"
+                v-for="(logLine, logIndex) in log.logs"
                :key="logIndex"
                class="text-neutral-400 dark-theme:text-muted"
              >
-                <pre class="whitespace-pre-wrap break-words">{{ log }}</pre>
+                <pre class="whitespace-pre-wrap break-words">{{ logLine }}</pre>
              </div>
            </div>
          </div>
@@ -90,17 +90,23 @@ import {
  useManagerProgressDialogStore
 } from '@/stores/comfyManagerStore'

-const { taskLogs } = useComfyManagerStore()
+const comfyManagerStore = useComfyManagerStore()
 const progressDialogContent = useManagerProgressDialogStore()
-const managerStore = useComfyManagerStore()

 const isInProgress = (index: number) =>
-  index === taskPanels.value.length - 1 && managerStore.uncompletedCount > 0
+  index === comfyManagerStore.managerQueue.historyCount - 1 &&
+  comfyManagerStore.isLoading

-const taskPanels = computed(() => taskLogs)
 const isExpanded = computed(() => progressDialogContent.isExpanded)
 const isCollapsed = computed(() => !isExpanded.value)

+const focusedLogs = computed(() => {
+  if (progressDialogContent.getActiveTabIndex() === 0) {
+    return comfyManagerStore.succeededTasksLogs
+  }
+  return comfyManagerStore.failedTasksLogs
+})
+
 const collapsedPanels = ref<Record<number, boolean>>({})
 const togglePanel = (index: number) => {
  collapsedPanels.value[index] = !collapsedPanels.value[index]
@@ -115,7 +121,7 @@ const { y: scrollY } = useScroll(sectionsContainerRef, {

 const lastPanelRef = ref<HTMLElement | null>(null)
 const isUserScrolling = ref(false)
-const lastPanelLogs = computed(() => taskPanels.value?.at(-1)?.logs)
+const lastPanelLogs = computed(() => focusedLogs.value?.at(-1)?.logs)

 const isAtBottom = (el: HTMLElement | null) => {
  if (!el) return false
--- a/src/components/dialog/content/manager/ManagerDialogContent.vue
+++ b/src/components/dialog/content/manager/ManagerDialogContent.vue
@@ -26,6 +26,35 @@
        }"
      >
        <div class="px-6 flex flex-col h-full">
+          <!-- Conflict Warning Banner -->
+          <div
+            v-if="shouldShowManagerBanner"
+            class="bg-yellow-600 bg-opacity-20 border border-yellow-400 rounded-lg p-4 mt-3 mb-4 flex items-center gap-6 relative"
+          >
+            <i class="pi pi-exclamation-triangle text-yellow-600 text-lg"></i>
+            <div class="flex flex-col gap-2 flex-1">
+              <p class="text-sm font-bold m-0">
+                {{ $t('manager.conflicts.warningBanner.title') }}
+              </p>
+              <p class="text-xs m-0">
+                {{ $t('manager.conflicts.warningBanner.message') }}
+              </p>
+              <p
+                class="text-sm font-bold m-0 cursor-pointer"
+                @click="onClickWarningLink"
+              >
+                {{ $t('manager.conflicts.warningBanner.button') }}
+              </p>
+            </div>
+            <button
+              type="button"
+              class="absolute top-2 right-2 w-6 h-6 border-none outline-none bg-transparent flex items-center justify-center text-yellow-600 rounded transition-colors"
+              :aria-label="$t('g.close')"
+              @click="dismissWarningBanner"
+            >
+              <i class="pi pi-times text-sm"></i>
+            </button>
+          </div>
          <RegistrySearchBar
            v-model:searchQuery="searchQuery"
            v-model:searchMode="searchMode"
@@ -34,6 +63,7 @@
            :suggestions="suggestions"
            :is-missing-tab="isMissingTab"
            :sort-options="sortOptions"
+            :is-update-available-tab="isUpdateAvailableTab"
          />
          <div class="flex-1 overflow-auto">
            <div
@@ -69,7 +99,9 @@
                    :is-selected="
                      selectedNodePacks.some((pack) => pack.id === item.id)
                    "
-                    @click.stop="(event) => selectNodePack(item, event)"
+                    @click.stop="
+                      (event: MouseEvent) => selectNodePack(item, event)
+                    "
                  />
                </template>
              </VirtualGrid>
@@ -101,7 +133,8 @@ import {
  onMounted,
  onUnmounted,
  ref,
-  watch
+  watch,
+  watchEffect
 } from 'vue'
 import { useI18n } from 'vue-i18n'

@@ -119,6 +152,7 @@ import { useManagerStatePersistence } from '@/composables/manager/useManagerStat
 import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
 import { usePackUpdateStatus } from '@/composables/nodePack/usePackUpdateStatus'
 import { useWorkflowPacks } from '@/composables/nodePack/useWorkflowPacks'
+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
 import { useRegistrySearch } from '@/composables/useRegistrySearch'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
 import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
@@ -133,6 +167,7 @@ const { initialTab } = defineProps<{
 const { t } = useI18n()
 const comfyManagerStore = useComfyManagerStore()
 const { getPackById } = useComfyRegistryStore()
+const conflictAcknowledgment = useConflictAcknowledgment()
 const persistedState = useManagerStatePersistence()
 const initialState = persistedState.loadStoredState()

@@ -149,6 +184,13 @@ const {
  toggle: toggleSideNav
 } = useResponsiveCollapse()

+// Use conflict acknowledgment state from composable
+const {
+  shouldShowManagerBanner,
+  dismissWarningBanner,
+  dismissRedDotNotification
+} = conflictAcknowledgment
+
 const tabs = ref<TabItem[]>([
  { id: ManagerTab.All, label: t('g.all'), icon: 'pi-list' },
  { id: ManagerTab.Installed, label: t('g.installed'), icon: 'pi-box' },
@@ -312,6 +354,13 @@ watch([isAllTab, searchResults], () => {
  displayPacks.value = searchResults.value
 })

+const onClickWarningLink = () => {
+  window.open(
+    'https://docs.comfy.org/troubleshooting/custom-node-issues',
+    '_blank'
+  )
+}
+
 const onResultsChange = () => {
  switch (selectedTab.value?.id) {
    case ManagerTab.Installed:
@@ -440,6 +489,7 @@ whenever(selectedNodePack, async () => {
  if (hasMultipleSelections.value) return
  // Only fetch if we haven't already for this pack
  if (lastFetchedPackId.value === pack.id) return
+
  const data = await getPackById.call(pack.id)
  // If selected node hasn't changed since request, merge registry & Algolia data
  if (data?.id === pack.id) {
@@ -472,6 +522,10 @@ watch([searchQuery, selectedTab], () => {
  }
 })

+watchEffect(() => {
+  dismissRedDotNotification()
+})
+
 onBeforeUnmount(() => {
  persistedState.persistState({
    selectedTabId: selectedTab.value?.id,
--- a/src/components/dialog/content/manager/ManagerHeader.test.ts
+++ b/src/components/dialog/content/manager/ManagerHeader.test.ts
@@ -0,0 +1,82 @@
+import { mount } from '@vue/test-utils'
+import { createPinia } from 'pinia'
+import PrimeVue from 'primevue/config'
+import Tag from 'primevue/tag'
+import Tooltip from 'primevue/tooltip'
+import { describe, expect, it } from 'vitest'
+import { createI18n } from 'vue-i18n'
+
+import enMessages from '@/locales/en/main.json'
+
+import ManagerHeader from './ManagerHeader.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: enMessages
+  }
+})
+
+describe('ManagerHeader', () => {
+  const createWrapper = () => {
+    return mount(ManagerHeader, {
+      global: {
+        plugins: [createPinia(), PrimeVue, i18n],
+        directives: {
+          tooltip: Tooltip
+        },
+        components: {
+          Tag
+        }
+      }
+    })
+  }
+
+  it('renders the component title', () => {
+    const wrapper = createWrapper()
+
+    expect(wrapper.find('h2').text()).toBe(
+      enMessages.manager.discoverCommunityContent
+    )
+  })
+
+  it('displays the legacy manager UI tag', () => {
+    const wrapper = createWrapper()
+
+    const tag = wrapper.find('[data-pc-name="tag"]')
+    expect(tag.exists()).toBe(true)
+    expect(tag.text()).toContain(enMessages.manager.legacyManagerUI)
+  })
+
+  it('applies info severity to the tag', () => {
+    const wrapper = createWrapper()
+
+    const tag = wrapper.find('[data-pc-name="tag"]')
+    expect(tag.classes()).toContain('p-tag-info')
+  })
+
+  it('displays info icon in the tag', () => {
+    const wrapper = createWrapper()
+
+    const icon = wrapper.find('.pi-info-circle')
+    expect(icon.exists()).toBe(true)
+  })
+
+  it('has cursor-help class on the tag', () => {
+    const wrapper = createWrapper()
+
+    const tag = wrapper.find('[data-pc-name="tag"]')
+    expect(tag.classes()).toContain('cursor-help')
+  })
+
+  it('has proper structure with flex container', () => {
+    const wrapper = createWrapper()
+
+    const flexContainer = wrapper.find('.flex.justify-end.ml-auto.pr-4')
+    expect(flexContainer.exists()).toBe(true)
+
+    const tag = flexContainer.find('[data-pc-name="tag"]')
+    expect(tag.exists()).toBe(true)
+  })
+})
--- a/src/components/dialog/content/manager/ManagerHeader.vue
+++ b/src/components/dialog/content/manager/ManagerHeader.vue
@@ -4,6 +4,22 @@
      <h2 class="text-lg font-normal text-left">
        {{ $t('manager.discoverCommunityContent') }}
      </h2>
+      <div class="flex justify-end ml-auto pr-4">
+        <Tag
+          v-tooltip.left="$t('manager.legacyManagerUIDescription')"
+          severity="info"
+          icon="pi pi-info-circle"
+          :value="$t('manager.legacyManagerUI')"
+          class="cursor-help"
+          :pt="{
+            root: { class: 'text-xs' }
+          }"
+        />
+      </div>
    </div>
  </div>
 </template>
+
+<script setup lang="ts">
+import Tag from 'primevue/tag'
+</script>
--- a/src/components/dialog/content/manager/NodeConflictDialogContent.vue
+++ b/src/components/dialog/content/manager/NodeConflictDialogContent.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="w-[552px] flex flex-col">
+    <ContentDivider :width="1" />
+    <div class="px-4 py-6 w-full h-full flex flex-col gap-2">
+      <!-- Description -->
+      <div v-if="showAfterWhatsNew">
+        <p
+          class="text-sm leading-4 text-neutral-800 dark-theme:text-white m-0 mb-4"
+        >
+          {{ $t('manager.conflicts.description') }}
+          <br /><br />
+          {{ $t('manager.conflicts.info') }}
+        </p>
+      </div>
+
+      <!-- Import Failed List Wrapper -->
+      <div
+        v-if="importFailedConflicts.length > 0"
+        class="w-full flex flex-col bg-neutral-200 dark-theme:bg-black min-h-8 rounded-lg"
+      >
+        <div
+          class="w-full h-8 flex items-center justify-between gap-2 pl-4"
+          @click="toggleImportFailedPanel"
+        >
+          <div class="flex-1 flex">
+            <span
+              class="text-xs font-bold text-yellow-600 dark-theme:text-yellow-400 mr-2"
+              >{{ importFailedConflicts.length }}</span
+            >
+            <span
+              class="text-xs font-bold text-neutral-600 dark-theme:text-white"
+              >{{ $t('manager.conflicts.importFailedExtensions') }}</span
+            >
+          </div>
+          <div>
+            <Button
+              :icon="
+                importFailedExpanded
+                  ? 'pi pi-chevron-down text-xs'
+                  : 'pi pi-chevron-right text-xs'
+              "
+              text
+              class="text-neutral-600 dark-theme:text-neutral-300 !bg-transparent"
+            />
+          </div>
+        </div>
+        <!-- Import failed list -->
+        <div
+          v-if="importFailedExpanded"
+          class="py-2 px-4 flex flex-col gap-2.5 max-h-[142px] overflow-y-auto scrollbar-hide"
+        >
+          <div
+            v-for="(packageName, i) in importFailedConflicts"
+            :key="i"
+            class="flex items-center justify-between h-6 px-4 flex-shrink-0 conflict-list-item"
+          >
+            <span class="text-xs text-neutral-600 dark-theme:text-neutral-300">
+              {{ packageName }}
+            </span>
+            <span class="pi pi-info-circle text-sm"></span>
+          </div>
+        </div>
+      </div>
+      <!-- Conflict List Wrapper -->
+      <div
+        class="w-full flex flex-col bg-neutral-200 dark-theme:bg-black min-h-8 rounded-lg"
+      >
+        <div
+          class="w-full h-8 flex items-center justify-between gap-2 pl-4"
+          @click="toggleConflictsPanel"
+        >
+          <div class="flex-1 flex">
+            <span
+              class="text-xs font-bold text-yellow-600 dark-theme:text-yellow-400 mr-2"
+              >{{ allConflictDetails.length }}</span
+            >
+            <span
+              class="text-xs font-bold text-neutral-600 dark-theme:text-white"
+              >{{ $t('manager.conflicts.conflicts') }}</span
+            >
+          </div>
+          <div>
+            <Button
+              :icon="
+                conflictsExpanded
+                  ? 'pi pi-chevron-down text-xs'
+                  : 'pi pi-chevron-right text-xs'
+              "
+              text
+              class="text-neutral-600 dark-theme:text-neutral-300 !bg-transparent"
+            />
+          </div>
+        </div>
+        <!-- Conflicts list -->
+        <div
+          v-if="conflictsExpanded"
+          class="py-2 px-4 flex flex-col gap-2.5 max-h-[142px] overflow-y-auto scrollbar-hide"
+        >
+          <div
+            v-for="(conflict, i) in allConflictDetails"
+            :key="i"
+            class="flex items-center justify-between h-6 px-4 flex-shrink-0 conflict-list-item"
+          >
+            <span
+              class="text-xs text-neutral-600 dark-theme:text-neutral-300"
+              >{{ getConflictMessage(conflict, t) }}</span
+            >
+            <span class="pi pi-info-circle text-sm"></span>
+          </div>
+        </div>
+      </div>
+      <!-- Extension List Wrapper -->
+      <div
+        class="w-full flex flex-col bg-neutral-200 dark-theme:bg-black min-h-8 rounded-lg"
+      >
+        <div
+          class="w-full h-8 flex items-center justify-between gap-2 pl-4"
+          @click="toggleExtensionsPanel"
+        >
+          <div class="flex-1 flex">
+            <span
+              class="text-xs font-bold text-yellow-600 dark-theme:text-yellow-400 mr-2"
+              >{{ conflictData.length }}</span
+            >
+            <span
+              class="text-xs font-bold text-neutral-600 dark-theme:text-white"
+              >{{ $t('manager.conflicts.extensionAtRisk') }}</span
+            >
+          </div>
+          <div>
+            <Button
+              :icon="
+                extensionsExpanded
+                  ? 'pi pi-chevron-down text-xs'
+                  : 'pi pi-chevron-right text-xs'
+              "
+              text
+              class="text-neutral-600 dark-theme:text-neutral-300 !bg-transparent"
+            />
+          </div>
+        </div>
+        <!-- Extension list -->
+        <div
+          v-if="extensionsExpanded"
+          class="py-2 px-4 flex flex-col gap-2.5 max-h-[142px] overflow-y-auto scrollbar-hide"
+        >
+          <div
+            v-for="conflictResult in conflictData"
+            :key="conflictResult.package_id"
+            class="flex items-center justify-between h-6 px-4 flex-shrink-0 conflict-list-item"
+          >
+            <span class="text-xs text-neutral-600 dark-theme:text-neutral-300">
+              {{ conflictResult.package_name }}
+            </span>
+            <span class="pi pi-info-circle text-sm"></span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <ContentDivider :width="1" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { filter, flatMap, map, some } from 'lodash'
+import Button from 'primevue/button'
+import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import ContentDivider from '@/components/common/ContentDivider.vue'
+import { useConflictDetection } from '@/composables/useConflictDetection'
+import { getConflictMessage } from '@/utils/conflictMessageUtil'
+
+interface Props {
+  showAfterWhatsNew?: boolean
+}
+
+const { showAfterWhatsNew } = withDefaults(defineProps<Props>(), {
+  showAfterWhatsNew: false
+})
+
+const { t } = useI18n()
+const { conflictedPackages } = useConflictDetection()
+
+const conflictsExpanded = ref<boolean>(false)
+const extensionsExpanded = ref<boolean>(false)
+const importFailedExpanded = ref<boolean>(false)
+
+const conflictData = computed(() => conflictedPackages.value)
+
+const allConflictDetails = computed(() => {
+  const allConflicts = flatMap(conflictData.value, (result) => result.conflicts)
+  return filter(allConflicts, (conflict) => conflict.type !== 'import_failed')
+})
+
+const packagesWithImportFailed = computed(() => {
+  return filter(conflictData.value, (result) =>
+    some(result.conflicts, (conflict) => conflict.type === 'import_failed')
+  )
+})
+
+const importFailedConflicts = computed(() => {
+  return map(
+    packagesWithImportFailed.value,
+    (result) => result.package_name || result.package_id
+  )
+})
+
+const toggleImportFailedPanel = () => {
+  importFailedExpanded.value = !importFailedExpanded.value
+  conflictsExpanded.value = false
+  extensionsExpanded.value = false
+}
+
+const toggleConflictsPanel = () => {
+  conflictsExpanded.value = !conflictsExpanded.value
+  extensionsExpanded.value = false
+  importFailedExpanded.value = false
+}
+
+const toggleExtensionsPanel = () => {
+  extensionsExpanded.value = !extensionsExpanded.value
+  conflictsExpanded.value = false
+  importFailedExpanded.value = false
+}
+</script>
+<style scoped>
+.conflict-list-item:hover {
+  background-color: rgba(0, 122, 255, 0.2);
+}
+</style>
--- a/src/components/dialog/content/manager/NodeConflictFooter.vue
+++ b/src/components/dialog/content/manager/NodeConflictFooter.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="flex items-center justify-between w-full px-3 py-4">
+    <div class="w-full flex items-center justify-between gap-2 pr-1">
+      <Button
+        :label="$t('manager.conflicts.conflictInfoTitle')"
+        text
+        severity="secondary"
+        size="small"
+        icon="pi pi-info-circle"
+        :pt="{
+          label: { class: 'text-sm' }
+        }"
+        @click="handleConflictInfoClick"
+      />
+      <Button
+        v-if="props.buttonText"
+        :label="props.buttonText"
+        severity="secondary"
+        size="small"
+        @click="handleButtonClick"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Button from 'primevue/button'
+
+import { useDialogStore } from '@/stores/dialogStore'
+
+interface Props {
+  buttonText?: string
+  onButtonClick?: () => void
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  buttonText: undefined,
+  onButtonClick: undefined
+})
+
+const dialogStore = useDialogStore()
+
+const handleConflictInfoClick = () => {
+  window.open(
+    'https://docs.comfy.org/troubleshooting/custom-node-issues',
+    '_blank'
+  )
+}
+
+const handleButtonClick = () => {
+  // Close the conflict dialog
+  dialogStore.closeDialog({ key: 'global-node-conflict' })
+
+  // Execute the custom button action if provided
+  if (props.onButtonClick) {
+    props.onButtonClick()
+  }
+}
+</script>
--- a/src/components/dialog/content/manager/NodeConflictHeader.vue
+++ b/src/components/dialog/content/manager/NodeConflictHeader.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="h-12 flex items-center justify-between w-full pl-6">
+    <div class="flex items-center gap-2">
+      <!-- Warning Icon -->
+      <i class="pi pi-exclamation-triangle text-lg"></i>
+      <!-- Title -->
+      <p class="text-base font-bold">
+        {{ $t('manager.conflicts.title') }}
+      </p>
+    </div>
+  </div>
+</template>
--- a/src/components/dialog/content/manager/PackStatusMessage.vue
+++ b/src/components/dialog/content/manager/PackStatusMessage.vue
@@ -17,9 +17,10 @@

 <script setup lang="ts">
 import Message from 'primevue/message'
-import { computed } from 'vue'
+import { computed, inject } from 'vue'

 import { components } from '@/types/comfyRegistryTypes'
+import { ImportFailedKey } from '@/types/importFailedTypes'

 type PackVersionStatus = components['schemas']['NodeVersionStatus']
 type PackStatus = components['schemas']['NodeStatus']
@@ -32,10 +33,15 @@ type StatusProps = {
  severity: MessageSeverity
 }

-const { statusType } = defineProps<{
+const { statusType, hasCompatibilityIssues } = defineProps<{
  statusType: Status
+  hasCompatibilityIssues?: boolean
 }>()

+// Inject import failed context from parent
+const importFailedContext = inject(ImportFailedKey)
+const importFailed = importFailedContext?.importFailed
+
 const statusPropsMap: Record<Status, StatusProps> = {
  NodeStatusActive: {
    label: 'active',
@@ -71,10 +77,14 @@ const statusPropsMap: Record<Status, StatusProps> = {
  }
 }

-const statusLabel = computed(
-  () => statusPropsMap[statusType]?.label || 'unknown'
-)
-const statusSeverity = computed(
-  () => statusPropsMap[statusType]?.severity || 'secondary'
-)
+const statusLabel = computed(() => {
+  if (importFailed?.value) return 'importFailed'
+  if (hasCompatibilityIssues) return 'conflicting'
+  return statusPropsMap[statusType]?.label || 'unknown'
+})
+
+const statusSeverity = computed(() => {
+  if (hasCompatibilityIssues || importFailed?.value) return 'error'
+  return statusPropsMap[statusType]?.severity || 'secondary'
+})
 </script>
--- a/src/components/dialog/content/manager/PackVersionBadge.test.ts
+++ b/src/components/dialog/content/manager/PackVersionBadge.test.ts
@@ -6,11 +6,18 @@ import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'

 import enMessages from '@/locales/en/main.json'
-import { SelectedVersion } from '@/types/comfyManagerTypes'

 import PackVersionBadge from './PackVersionBadge.vue'
 import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'

+// Mock config to prevent __COMFYUI_FRONTEND_VERSION__ error
+vi.mock('@/config', () => ({
+  default: {
+    app_title: 'ComfyUI',
+    app_version: '1.0.0'
+  }
+}))
+
 const mockNodePack = {
  id: 'test-pack',
  name: 'Test Pack',
@@ -120,7 +127,7 @@ describe('PackVersionBadge', () => {

    const badge = wrapper.find('[role="button"]')
    expect(badge.exists()).toBe(true)
-    expect(badge.find('span').text()).toBe(SelectedVersion.NIGHTLY)
+    expect(badge.find('span').text()).toBe('nightly')
  })

  it('falls back to NIGHTLY when nodePack.id is missing', () => {
@@ -134,7 +141,7 @@ describe('PackVersionBadge', () => {

    const badge = wrapper.find('[role="button"]')
    expect(badge.exists()).toBe(true)
-    expect(badge.find('span').text()).toBe(SelectedVersion.NIGHTLY)
+    expect(badge.find('span').text()).toBe('nightly')
  })

  it('toggles the popover when button is clicked', async () => {
--- a/src/components/dialog/content/manager/PackVersionBadge.vue
+++ b/src/components/dialog/content/manager/PackVersionBadge.vue
@@ -1,8 +1,8 @@
 <template>
  <div>
    <div
-      class="inline-flex items-center gap-1 rounded-2xl text-xs cursor-pointer px-2 py-1"
-      :class="{ 'bg-gray-100 dark-theme:bg-neutral-700': fill }"
+      class="inline-flex items-center gap-1 rounded-2xl text-xs cursor-pointer py-1"
+      :class="{ 'bg-gray-100 dark-theme:bg-neutral-700 px-1.5': fill }"
      aria-haspopup="true"
      role="button"
      tabindex="0"
@@ -12,8 +12,7 @@
    >
      <i
        v-if="isUpdateAvailable"
-        class="pi pi-arrow-circle-up text-blue-600"
-        style="font-size: 8px"
+        class="pi pi-arrow-circle-up text-blue-600 text-xs"
      />
      <span>{{ installedVersion }}</span>
      <i class="pi pi-chevron-right" style="font-size: 8px" />
@@ -22,7 +21,7 @@
    <Popover
      ref="popoverRef"
      :pt="{
-        content: { class: 'px-0' }
+        content: { class: 'p-0 shadow-lg' }
      }"
    >
      <PackVersionSelectorPopover
@@ -42,8 +41,7 @@ import { computed, ref, watch } from 'vue'
 import PackVersionSelectorPopover from '@/components/dialog/content/manager/PackVersionSelectorPopover.vue'
 import { usePackUpdateStatus } from '@/composables/nodePack/usePackUpdateStatus'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import { SelectedVersion } from '@/types/comfyManagerTypes'
-import { components } from '@/types/comfyRegistryTypes'
+import type { components } from '@/types/comfyRegistryTypes'
 import { isSemVer } from '@/utils/formatUtil'

 const TRUNCATED_HASH_LENGTH = 7
@@ -64,11 +62,11 @@ const popoverRef = ref()
 const managerStore = useComfyManagerStore()

 const installedVersion = computed(() => {
-  if (!nodePack.id) return SelectedVersion.NIGHTLY
+  if (!nodePack.id) return 'nightly'
  const version =
    managerStore.installedPacks[nodePack.id]?.ver ??
    nodePack.latest_version?.version ??
-    SelectedVersion.NIGHTLY
+    'nightly'

  // If Git hash, truncate to 7 characters
  return isSemVer(version) ? version : version.slice(0, TRUNCATED_HASH_LENGTH)
--- a/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts
+++ b/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts
@@ -3,18 +3,32 @@ import { createPinia } from 'pinia'
 import Button from 'primevue/button'
 import PrimeVue from 'primevue/config'
 import Listbox from 'primevue/listbox'
+import Select from 'primevue/select'
+import Tooltip from 'primevue/tooltip'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import { createI18n } from 'vue-i18n'

+import VerifiedIcon from '@/components/icons/VerifiedIcon.vue'
 import enMessages from '@/locales/en/main.json'
-import { SelectedVersion } from '@/types/comfyManagerTypes'
+
+// SelectedVersion is now using direct strings instead of enum

 import PackVersionSelectorPopover from './PackVersionSelectorPopover.vue'

 // Default mock versions for reference
 const defaultMockVersions = [
-  { version: '1.0.0', createdAt: '2023-01-01' },
+  {
+    version: '1.0.0',
+    createdAt: '2023-01-01',
+    supported_os: ['windows', 'linux'],
+    supported_accelerators: ['CPU'],
+    supported_comfyui_version: '>=0.1.0',
+    supported_comfyui_frontend_version: '>=1.0.0',
+    supported_python_version: '>=3.8',
+    is_banned: false,
+    has_registry_data: true
+  },
  { version: '0.9.0', createdAt: '2022-12-01' },
  { version: '0.8.0', createdAt: '2022-11-01' }
 ]
@@ -22,13 +36,24 @@ const defaultMockVersions = [
 const mockNodePack = {
  id: 'test-pack',
  name: 'Test Pack',
-  latest_version: { version: '1.0.0' },
-  repository: 'https://github.com/user/repo'
+  latest_version: {
+    version: '1.0.0',
+    supported_os: ['windows', 'linux'],
+    supported_accelerators: ['CPU'],
+    supported_comfyui_version: '>=0.1.0',
+    supported_comfyui_frontend_version: '>=1.0.0',
+    supported_python_version: '>=3.8',
+    is_banned: false,
+    has_registry_data: true
+  },
+  repository: 'https://github.com/user/repo',
+  has_registry_data: true
 }

 // Create mock functions
 const mockGetPackVersions = vi.fn()
 const mockInstallPack = vi.fn().mockResolvedValue(undefined)
+const mockCheckNodeCompatibility = vi.fn()

 // Mock the registry service
 vi.mock('@/services/comfyRegistryService', () => ({
@@ -49,6 +74,13 @@ vi.mock('@/stores/comfyManagerStore', () => ({
  }))
 }))

+// Mock the conflict detection composable
+vi.mock('@/composables/useConflictDetection', () => ({
+  useConflictDetection: vi.fn(() => ({
+    checkNodeCompatibility: mockCheckNodeCompatibility
+  }))
+}))
+
 const waitForPromises = async () => {
  await new Promise((resolve) => setTimeout(resolve, 16))
  await nextTick()
@@ -59,6 +91,9 @@ describe('PackVersionSelectorPopover', () => {
    vi.clearAllMocks()
    mockGetPackVersions.mockReset()
    mockInstallPack.mockReset().mockResolvedValue(undefined)
+    mockCheckNodeCompatibility
+      .mockReset()
+      .mockReturnValue({ hasConflict: false, conflicts: [] })
  })

  const mountComponent = ({
@@ -78,7 +113,12 @@ describe('PackVersionSelectorPopover', () => {
      global: {
        plugins: [PrimeVue, createPinia(), i18n],
        components: {
-          Listbox
+          Listbox,
+          VerifiedIcon,
+          Select
+        },
+        directives: {
+          tooltip: Tooltip
        }
      }
    })
@@ -120,14 +160,15 @@ describe('PackVersionSelectorPopover', () => {

    const options = listbox.props('options')!
    // Check that we have both special options and version options
-    expect(options.length).toBe(defaultMockVersions.length + 2) // 2 special options + version options
+    // Latest version (1.0.0) should be excluded from the version list to avoid duplication
+    expect(options.length).toBe(defaultMockVersions.length + 1) // 2 special options + version options minus 1 duplicate

    // Check that special options exist
-    expect(options.some((o) => o.value === SelectedVersion.NIGHTLY)).toBe(true)
-    expect(options.some((o) => o.value === SelectedVersion.LATEST)).toBe(true)
+    expect(options.some((o) => o.value === 'nightly')).toBe(true)
+    expect(options.some((o) => o.value === 'latest')).toBe(true)

-    // Check that version options exist
-    expect(options.some((o) => o.value === '1.0.0')).toBe(true)
+    // Check that version options exist (excluding latest version 1.0.0)
+    expect(options.some((o) => o.value === '1.0.0')).toBe(false) // Should be excluded as it's the latest
    expect(options.some((o) => o.value === '0.9.0')).toBe(true)
    expect(options.some((o) => o.value === '0.8.0')).toBe(true)
  })
@@ -304,7 +345,7 @@ describe('PackVersionSelectorPopover', () => {
      await waitForPromises()
      const listbox = wrapper.findComponent(Listbox)
      expect(listbox.exists()).toBe(true)
-      expect(listbox.props('modelValue')).toBe(SelectedVersion.NIGHTLY)
+      expect(listbox.props('modelValue')).toBe('nightly')
    })

    it('defaults to nightly when publisher name is "Unclaimed"', async () => {
@@ -325,7 +366,343 @@ describe('PackVersionSelectorPopover', () => {
      await waitForPromises()
      const listbox = wrapper.findComponent(Listbox)
      expect(listbox.exists()).toBe(true)
-      expect(listbox.props('modelValue')).toBe(SelectedVersion.NIGHTLY)
+      expect(listbox.props('modelValue')).toBe('nightly')
+    })
+  })
+
+  describe('version compatibility checking', () => {
+    it('shows warning icon for incompatible versions', async () => {
+      // Set up the mock for versions
+      mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
+
+      // Mock compatibility check to return conflict for specific version
+      mockCheckNodeCompatibility.mockImplementation((versionData) => {
+        if (versionData.supported_os?.includes('linux')) {
+          return {
+            hasConflict: true,
+            conflicts: [
+              {
+                type: 'os',
+                current_value: 'windows',
+                required_value: 'linux'
+              }
+            ]
+          }
+        }
+        return { hasConflict: false, conflicts: [] }
+      })
+
+      const nodePackWithCompatibility = {
+        ...mockNodePack,
+        supported_os: ['linux'],
+        supported_accelerators: ['CUDA']
+      }
+
+      const wrapper = mountComponent({
+        props: { nodePack: nodePackWithCompatibility }
+      })
+      await waitForPromises()
+
+      // Check that compatibility checking function was called
+      expect(mockCheckNodeCompatibility).toHaveBeenCalled()
+
+      // The warning icon should be shown for incompatible versions
+      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      expect(warningIcons.length).toBeGreaterThan(0)
+    })
+
+    it('shows verified icon for compatible versions', async () => {
+      // Set up the mock for versions
+      mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
+
+      // Mock compatibility check to return no conflicts
+      mockCheckNodeCompatibility.mockReturnValue({
+        hasConflict: false,
+        conflicts: []
+      })
+
+      const wrapper = mountComponent()
+      await waitForPromises()
+
+      // Check that compatibility checking function was called
+      expect(mockCheckNodeCompatibility).toHaveBeenCalled()
+
+      // The verified icon should be shown for compatible versions
+      // Look for the VerifiedIcon component or SVG elements
+      const verifiedIcons = wrapper.findAll('svg')
+      expect(verifiedIcons.length).toBeGreaterThan(0)
+    })
+
+    it('calls checkVersionCompatibility with correct version data', async () => {
+      // Set up the mock for versions with specific supported data
+      const versionsWithCompatibility = [
+        {
+          version: '1.0.0',
+          supported_os: ['windows', 'linux'],
+          supported_accelerators: ['CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.1.0',
+          supported_comfyui_frontend_version: '>=1.0.0'
+        }
+      ]
+      mockGetPackVersions.mockResolvedValueOnce(versionsWithCompatibility)
+
+      const nodePackWithCompatibility = {
+        ...mockNodePack,
+        supported_os: ['windows'],
+        supported_accelerators: ['CPU'],
+        supported_comfyui_version: '>=0.1.0',
+        supported_comfyui_frontend_version: '>=1.0.0',
+        latest_version: {
+          version: '1.0.0',
+          supported_os: ['windows', 'linux'],
+          supported_accelerators: ['CPU'], // latest_version data takes precedence
+          supported_comfyui_version: '>=0.1.0',
+          supported_comfyui_frontend_version: '>=1.0.0',
+          supported_python_version: '>=3.8',
+          is_banned: false,
+          has_registry_data: true
+        }
+      }
+
+      const wrapper = mountComponent({
+        props: { nodePack: nodePackWithCompatibility }
+      })
+      await waitForPromises()
+
+      // Clear previous calls from component mounting/rendering
+      mockCheckNodeCompatibility.mockClear()
+
+      // Trigger compatibility check by accessing getVersionCompatibility
+      const vm = wrapper.vm as any
+      vm.getVersionCompatibility('1.0.0')
+
+      // Verify that checkNodeCompatibility was called with correct data
+      // Since 1.0.0 is the latest version, it should use latest_version data
+      expect(mockCheckNodeCompatibility).toHaveBeenCalledWith({
+        supported_os: ['windows', 'linux'],
+        supported_accelerators: ['CPU'], // latest_version data takes precedence
+        supported_comfyui_version: '>=0.1.0',
+        supported_comfyui_frontend_version: '>=1.0.0',
+        supported_python_version: '>=3.8',
+        is_banned: false,
+        has_registry_data: true,
+        version: '1.0.0'
+      })
+    })
+
+    it('shows version conflict warnings for ComfyUI and frontend versions', async () => {
+      // Set up the mock for versions
+      mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
+
+      // Mock compatibility check to return version conflicts
+      mockCheckNodeCompatibility.mockImplementation((versionData) => {
+        const conflicts = []
+        if (versionData.supported_comfyui_version) {
+          conflicts.push({
+            type: 'comfyui_version',
+            current_value: '0.5.0',
+            required_value: versionData.supported_comfyui_version
+          })
+        }
+        if (versionData.supported_comfyui_frontend_version) {
+          conflicts.push({
+            type: 'frontend_version',
+            current_value: '1.0.0',
+            required_value: versionData.supported_comfyui_frontend_version
+          })
+        }
+        return {
+          hasConflict: conflicts.length > 0,
+          conflicts
+        }
+      })
+
+      const nodePackWithVersionRequirements = {
+        ...mockNodePack,
+        supported_comfyui_version: '>=1.0.0',
+        supported_comfyui_frontend_version: '>=2.0.0'
+      }
+
+      const wrapper = mountComponent({
+        props: { nodePack: nodePackWithVersionRequirements }
+      })
+      await waitForPromises()
+
+      // Check that compatibility checking function was called
+      expect(mockCheckNodeCompatibility).toHaveBeenCalled()
+
+      // The warning icon should be shown for version incompatible packages
+      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      expect(warningIcons.length).toBeGreaterThan(0)
+    })
+
+    it('handles latest and nightly versions using nodePack data', async () => {
+      // Set up the mock for versions
+      mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
+
+      const nodePackWithCompatibility = {
+        ...mockNodePack,
+        supported_os: ['windows'],
+        supported_accelerators: ['CPU'],
+        supported_comfyui_version: '>=0.1.0',
+        supported_comfyui_frontend_version: '>=1.0.0',
+        latest_version: {
+          ...mockNodePack.latest_version,
+          supported_os: ['windows'], // Match nodePack data for test consistency
+          supported_accelerators: ['CPU'], // Match nodePack data for test consistency
+          supported_python_version: '>=3.8',
+          is_banned: false,
+          has_registry_data: true
+        }
+      }
+
+      const wrapper = mountComponent({
+        props: { nodePack: nodePackWithCompatibility }
+      })
+      await waitForPromises()
+
+      const vm = wrapper.vm as any
+
+      // Clear previous calls from component mounting/rendering
+      mockCheckNodeCompatibility.mockClear()
+
+      // Test latest version
+      vm.getVersionCompatibility('latest')
+      expect(mockCheckNodeCompatibility).toHaveBeenCalledWith({
+        supported_os: ['windows'],
+        supported_accelerators: ['CPU'],
+        supported_comfyui_version: '>=0.1.0',
+        supported_comfyui_frontend_version: '>=1.0.0',
+        supported_python_version: '>=3.8',
+        is_banned: false,
+        has_registry_data: true,
+        version: '1.0.0'
+      })
+
+      // Clear for next test call
+      mockCheckNodeCompatibility.mockClear()
+
+      // Test nightly version
+      vm.getVersionCompatibility('nightly')
+      expect(mockCheckNodeCompatibility).toHaveBeenCalledWith({
+        id: 'test-pack',
+        name: 'Test Pack',
+        supported_os: ['windows'],
+        supported_accelerators: ['CPU'],
+        supported_comfyui_version: '>=0.1.0',
+        supported_comfyui_frontend_version: '>=1.0.0',
+        repository: 'https://github.com/user/repo',
+        has_registry_data: true,
+        latest_version: {
+          supported_os: ['windows'],
+          supported_accelerators: ['CPU'],
+          supported_python_version: '>=3.8',
+          is_banned: false,
+          has_registry_data: true,
+          version: '1.0.0',
+          supported_comfyui_version: '>=0.1.0',
+          supported_comfyui_frontend_version: '>=1.0.0'
+        }
+      })
+    })
+
+    it('shows banned package warnings', async () => {
+      // Set up the mock for versions
+      mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
+
+      // Mock compatibility check to return banned conflicts
+      mockCheckNodeCompatibility.mockImplementation((versionData) => {
+        if (versionData.is_banned === true) {
+          return {
+            hasConflict: true,
+            conflicts: [
+              {
+                type: 'banned',
+                current_value: 'installed',
+                required_value: 'not_banned'
+              }
+            ]
+          }
+        }
+        return { hasConflict: false, conflicts: [] }
+      })
+
+      const bannedNodePack = {
+        ...mockNodePack,
+        is_banned: true,
+        latest_version: {
+          ...mockNodePack.latest_version,
+          is_banned: true
+        }
+      }
+
+      const wrapper = mountComponent({
+        props: { nodePack: bannedNodePack }
+      })
+      await waitForPromises()
+
+      // Check that compatibility checking function was called
+      expect(mockCheckNodeCompatibility).toHaveBeenCalled()
+
+      // Open the dropdown to see the options
+      const select = wrapper.find('.p-select')
+      if (!select.exists()) {
+        // Try alternative selector
+        const selectButton = wrapper.find('[aria-haspopup="listbox"]')
+        if (selectButton.exists()) {
+          await selectButton.trigger('click')
+        }
+      } else {
+        await select.trigger('click')
+      }
+      await wrapper.vm.$nextTick()
+
+      // The warning icon should be shown for banned packages in the dropdown options
+      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      expect(warningIcons.length).toBeGreaterThan(0)
+    })
+
+    it('shows security pending warnings', async () => {
+      // Set up the mock for versions
+      mockGetPackVersions.mockResolvedValueOnce(defaultMockVersions)
+
+      // Mock compatibility check to return security pending conflicts
+      mockCheckNodeCompatibility.mockImplementation((versionData) => {
+        if (versionData.has_registry_data === false) {
+          return {
+            hasConflict: true,
+            conflicts: [
+              {
+                type: 'pending',
+                current_value: 'no_registry_data',
+                required_value: 'registry_data_available'
+              }
+            ]
+          }
+        }
+        return { hasConflict: false, conflicts: [] }
+      })
+
+      const securityPendingNodePack = {
+        ...mockNodePack,
+        has_registry_data: false,
+        latest_version: {
+          ...mockNodePack.latest_version,
+          has_registry_data: false
+        }
+      }
+
+      const wrapper = mountComponent({
+        props: { nodePack: securityPendingNodePack }
+      })
+      await waitForPromises()
+
+      // Check that compatibility checking function was called
+      expect(mockCheckNodeCompatibility).toHaveBeenCalled()
+
+      // The warning icon should be shown for security pending packages
+      const warningIcons = wrapper.findAll('.pi-exclamation-triangle')
+      expect(warningIcons.length).toBeGreaterThan(0)
    })
  })
 })
--- a/src/components/dialog/content/manager/PackVersionSelectorPopover.vue
+++ b/src/components/dialog/content/manager/PackVersionSelectorPopover.vue
@@ -1,8 +1,10 @@
 <template>
-  <div class="w-64 mt-2">
-    <span class="pl-3 text-muted text-md font-semibold opacity-70">
-      {{ $t('manager.selectVersion') }}
-    </span>
+  <div class="w-64 pt-1">
+    <div class="py-2">
+      <span class="pl-3 text-md font-semibold text-neutral-500">
+        {{ $t('manager.selectVersion') }}
+      </span>
+    </div>
    <div
      v-if="isLoadingVersions || isQueueing"
      class="text-center text-muted py-4 flex flex-col items-center"
@@ -23,24 +25,44 @@
      v-model="selectedVersion"
      option-label="label"
      option-value="value"
-      :options="versionOptions"
+      :options="processedVersionOptions"
      :highlight-on-select="false"
-      class="my-3 w-full max-h-[50vh] border-none shadow-none"
+      class="w-full max-h-[50vh] border-none shadow-none rounded-md"
+      :pt="{
+        listContainer: { class: 'scrollbar-hide' }
+      }"
    >
      <template #option="slotProps">
        <div class="flex justify-between items-center w-full p-1">
-          <span>{{ slotProps.option.label }}</span>
+          <div class="flex items-center gap-2">
+            <template v-if="slotProps.option.value === 'nightly'">
+              <div class="w-4"></div>
+            </template>
+            <template v-else>
+              <i
+                v-if="slotProps.option.hasConflict"
+                v-tooltip="{
+                  value: slotProps.option.conflictMessage,
+                  showDelay: 300
+                }"
+                class="pi pi-exclamation-triangle text-yellow-500"
+              />
+              <VerifiedIcon v-else :size="20" class="relative right-0.5" />
+            </template>
+            <span>{{ slotProps.option.label }}</span>
+          </div>
          <i
-            v-if="selectedVersion === slotProps.option.value"
+            v-if="slotProps.option.isSelected"
            class="pi pi-check text-highlight"
          />
        </div>
      </template>
    </Listbox>
    <ContentDivider class="my-2" />
-    <div class="flex justify-end gap-2 p-1 px-3">
+    <div class="flex justify-end gap-2 py-1 px-3">
      <Button
        text
+        class="text-sm"
        severity="secondary"
        :label="$t('g.cancel')"
        :disabled="isQueueing"
@@ -49,7 +71,7 @@
      <Button
        severity="secondary"
        :label="$t('g.install')"
-        class="py-3 px-4 dark-theme:bg-unset bg-black/80 dark-theme:text-unset text-neutral-100 rounded-lg"
+        class="py-2.5 px-4 text-sm dark-theme:bg-unset bg-black/80 dark-theme:text-unset text-neutral-100 rounded-lg"
        :disabled="isQueueing"
        @click="handleSubmit"
      />
@@ -62,19 +84,18 @@ import { whenever } from '@vueuse/core'
 import Button from 'primevue/button'
 import Listbox from 'primevue/listbox'
 import ProgressSpinner from 'primevue/progressspinner'
-import { onMounted, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'

 import ContentDivider from '@/components/common/ContentDivider.vue'
 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
+import VerifiedIcon from '@/components/icons/VerifiedIcon.vue'
+import { useConflictDetection } from '@/composables/useConflictDetection'
 import { useComfyRegistryService } from '@/services/comfyRegistryService'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import {
-  ManagerChannel,
-  ManagerDatabaseSource,
-  SelectedVersion
-} from '@/types/comfyManagerTypes'
-import { components } from '@/types/comfyRegistryTypes'
+import type { components } from '@/types/comfyRegistryTypes'
+import { components as ManagerComponents } from '@/types/generatedManagerTypes'
+import { getJoinedConflictMessages } from '@/utils/conflictMessageUtil'
 import { isSemVer } from '@/utils/formatUtil'

 const { nodePack } = defineProps<{
@@ -89,27 +110,30 @@ const emit = defineEmits<{
 const { t } = useI18n()
 const registryService = useComfyRegistryService()
 const managerStore = useComfyManagerStore()
+const { checkNodeCompatibility } = useConflictDetection()

 const isQueueing = ref(false)

-const selectedVersion = ref<string>(SelectedVersion.LATEST)
+const selectedVersion = ref<string>('latest')
+
 onMounted(() => {
-  const initialVersion = getInitialSelectedVersion() ?? SelectedVersion.LATEST
+  const initialVersion = getInitialSelectedVersion() ?? 'latest'
  selectedVersion.value =
    // Use NIGHTLY when version is a Git hash
-    isSemVer(initialVersion) ? initialVersion : SelectedVersion.NIGHTLY
+    isSemVer(initialVersion) ? initialVersion : 'nightly'
 })

 const getInitialSelectedVersion = () => {
  if (!nodePack.id) return

-  // If unclaimed, set selected version to nightly
-  if (nodePack.publisher?.name === 'Unclaimed') return SelectedVersion.NIGHTLY
-
  // If node pack is installed, set selected version to the installed version
  if (managerStore.isPackInstalled(nodePack.id))
    return managerStore.getInstalledPackVersion(nodePack.id)

+  // If unclaimed, set selected version to nightly
+  if (nodePack.publisher?.name === 'Unclaimed')
+    return 'nightly' as ManagerComponents['schemas']['SelectedVersion']
+
  // If node pack is not installed, set selected version to latest
  return nodePack.latest_version?.version
 }
@@ -126,6 +150,9 @@ const versionOptions = ref<
  }[]
 >([])

+// Store fetched versions with their full data
+const fetchedVersions = ref<components['schemas']['NodeVersion'][]>([])
+
 const isLoadingVersions = ref(false)

 const onNodePackChange = async () => {
@@ -133,26 +160,35 @@ const onNodePackChange = async () => {

  // Fetch versions from the registry
  const versions = await fetchVersions()
+  fetchedVersions.value = versions
+
+  // Get latest version number to exclude from the list
+  const latestVersionNumber = nodePack.latest_version?.version
+
  const availableVersionOptions = versions
    .map((version) => ({
      value: version.version ?? '',
      label: version.version ?? ''
    }))
-    .filter((option) => option.value)
+    .filter((option) => option.value && option.value !== latestVersionNumber) // Exclude latest version from the list
+
+  // Add Latest option with actual version number
+  const latestLabel = latestVersionNumber
+    ? `${t('manager.latestVersion')} (${latestVersionNumber})`
+    : t('manager.latestVersion')

-  // Add Latest option
  const defaultVersions = [
    {
-      value: SelectedVersion.LATEST,
-      label: t('manager.latestVersion')
+      value: 'latest' as ManagerComponents['schemas']['SelectedVersion'],
+      label: latestLabel
    }
  ]

  // Add Nightly option if there is a non-empty `repository` field
  if (nodePack.repository?.length) {
    defaultVersions.push({
-      value: SelectedVersion.NIGHTLY,
-      label: t('manager.nightlyVersion')
+      value: 'nightly' as ManagerComponents['schemas']['SelectedVersion'],
+      label: t('manager.nightlyVersion') // Keep as just "nightly" - no version number
    })
  }

@@ -172,16 +208,95 @@ whenever(

 const handleSubmit = async () => {
  isQueueing.value = true
+  if (!nodePack.id) {
+    throw new Error('Node ID is required for installation')
+  }
+
+  // Convert 'latest' to actual version number for installation
+  const actualVersion =
+    selectedVersion.value === 'latest'
+      ? nodePack.latest_version?.version ?? 'latest'
+      : selectedVersion.value
+
  await managerStore.installPack.call({
    id: nodePack.id,
+    version: actualVersion,
    repository: nodePack.repository ?? '',
-    channel: ManagerChannel.DEFAULT,
-    mode: ManagerDatabaseSource.CACHE,
-    version: selectedVersion.value,
-    selected_version: selectedVersion.value
+    channel: 'default' as ManagerComponents['schemas']['ManagerChannel'],
+    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
+    selected_version: actualVersion
  })

  isQueueing.value = false
  emit('submit')
 }
+
+const getVersionData = (version: string) => {
+  const latestVersionNumber = nodePack.latest_version?.version
+  const useLatestVersionData =
+    version === 'latest' || version === latestVersionNumber
+
+  if (useLatestVersionData) {
+    const latestVersionData = nodePack.latest_version
+    return {
+      ...latestVersionData
+    }
+  }
+
+  const versionData = fetchedVersions.value.find((v) => v.version === version)
+  if (versionData) {
+    return {
+      ...versionData
+    }
+  }
+
+  // Fallback to nodePack data
+  return {
+    ...nodePack
+  }
+}
+
+// Main function to get version compatibility info
+const getVersionCompatibility = (version: string) => {
+  const versionData = getVersionData(version)
+  const compatibility = checkNodeCompatibility(versionData)
+
+  const conflictMessage = compatibility.hasConflict
+    ? getJoinedConflictMessages(compatibility.conflicts, t)
+    : ''
+
+  return {
+    hasConflict: compatibility.hasConflict,
+    conflictMessage
+  }
+}
+
+// Helper to determine if an option is selected.
+const isOptionSelected = (optionValue: string) => {
+  if (selectedVersion.value === optionValue) {
+    return true
+  }
+  if (
+    optionValue === 'latest' &&
+    selectedVersion.value === nodePack.latest_version?.version
+  ) {
+    return true
+  }
+  return false
+}
+
+// Checks if an option is selected, treating 'latest' as an alias for the actual latest version number.
+const processedVersionOptions = computed(() => {
+  return versionOptions.value.map((option) => {
+    const compatibility = getVersionCompatibility(option.value)
+    const isSelected = isOptionSelected(option.value)
+
+    return {
+      ...option,
+      hasConflict: compatibility.hasConflict,
+      conflictMessage: compatibility.conflictMessage,
+      isSelected: isSelected
+    }
+  })
+})
 </script>
--- a/src/components/dialog/content/manager/button/PackActionButton.vue
+++ b/src/components/dialog/content/manager/button/PackActionButton.vue
@@ -1,18 +1,24 @@
 <template>
  <Button
    outlined
-    class="!m-0 p-0 rounded-lg text-gray-900 dark-theme:text-gray-50"
+    class="!m-0 p-0 max-w-[120px] rounded-lg text-gray-900 dark-theme:text-gray-50"
    :class="[
      variant === 'black'
        ? 'bg-neutral-900 text-white border-neutral-900'
-        : 'border-neutral-700',
+        : variant === 'red'
+          ? 'border-red-500'
+          : 'border-neutral-700',
      fullWidth ? 'w-full' : 'w-min-content'
    ]"
    :disabled="loading"
    v-bind="$attrs"
    @click="onClick"
  >
-    <span class="py-2 px-3 whitespace-nowrap">
+    <span class="py-1.5 px-3 whitespace-nowrap text-xs flex items-center gap-2">
+      <i
+        v-if="hasWarning && !loading"
+        class="pi pi-exclamation-triangle text-yellow-500"
+      ></i>
      <template v-if="loading">
        {{ loadingMessage ?? $t('g.loading') }}
      </template>
@@ -28,15 +34,18 @@ import Button from 'primevue/button'

 const {
  label,
+  loading = false,
  loadingMessage,
  fullWidth = false,
-  variant = 'default'
+  variant = 'default',
+  hasWarning = false
 } = defineProps<{
  label: string
  loading?: boolean
  loadingMessage?: string
  fullWidth?: boolean
-  variant?: 'default' | 'black'
+  variant?: 'default' | 'black' | 'red'
+  hasWarning?: boolean
 }>()

 const emit = defineEmits<{
--- a/src/components/dialog/content/manager/button/PackEnableToggle.test.ts
+++ b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts
@@ -11,9 +11,22 @@ import { useComfyManagerStore } from '@/stores/comfyManagerStore'

 import PackEnableToggle from './PackEnableToggle.vue'

-// Mock debounce to execute immediately
-vi.mock('lodash', () => ({
-  debounce: <T extends (...args: any[]) => any>(fn: T) => fn
+// Mock lodash functions used throughout the app
+vi.mock('lodash', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('lodash')>()
+  return {
+    ...actual,
+    debounce: <T extends (...args: any[]) => any>(fn: T) => fn,
+    memoize: <T extends (...args: any[]) => any>(fn: T) => fn
+  }
+})
+
+// Mock config to prevent __COMFYUI_FRONTEND_VERSION__ error
+vi.mock('@/config', () => ({
+  default: {
+    app_title: 'ComfyUI',
+    app_version: '1.0.0'
+  }
 }))

 const mockNodePack = {
--- a/src/components/dialog/content/manager/button/PackEnableToggle.vue
+++ b/src/components/dialog/content/manager/button/PackEnableToggle.vue
@@ -1,6 +1,26 @@
 <template>
-  <div class="flex items-center">
+  <div class="flex items-center gap-2">
+    <div
+      v-if="hasConflict"
+      v-tooltip="{
+        value: $t('manager.conflicts.warningTooltip'),
+        showDelay: 300
+      }"
+      class="flex items-center justify-center w-6 h-6 cursor-pointer"
+      @click="showConflictModal(true)"
+    >
+      <i class="pi pi-exclamation-triangle text-yellow-500 text-xl"></i>
+    </div>
    <ToggleSwitch
+      v-if="!canToggleDirectly"
+      :model-value="isEnabled"
+      :disabled="isLoading"
+      :readonly="!canToggleDirectly"
+      aria-label="Enable or disable pack"
+      @focus="handleToggleInteraction"
+    />
+    <ToggleSwitch
+      v-else
      :model-value="isEnabled"
      :disabled="isLoading"
      aria-label="Enable or disable pack"
@@ -13,52 +33,96 @@
 import { debounce } from 'lodash'
 import ToggleSwitch from 'primevue/toggleswitch'
 import { computed, ref } from 'vue'
+import { useI18n } from 'vue-i18n'

+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
+import { useDialogService } from '@/services/dialogService'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import {
-  InstallPackParams,
-  ManagerChannel,
-  SelectedVersion
-} from '@/types/comfyManagerTypes'
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
 import type { components } from '@/types/comfyRegistryTypes'
+import { components as ManagerComponents } from '@/types/generatedManagerTypes'

 const TOGGLE_DEBOUNCE_MS = 256

-const { nodePack } = defineProps<{
+const { nodePack, hasConflict } = defineProps<{
  nodePack: components['schemas']['Node']
+  hasConflict?: boolean
 }>()

-const { isPackEnabled, enablePack, disablePack, installedPacks } =
-  useComfyManagerStore()
+const { t } = useI18n()
+const { isPackEnabled, enablePack, disablePack } = useComfyManagerStore()
+const { getConflictsForPackageByID } = useConflictDetectionStore()
+const { showNodeConflictDialog } = useDialogService()
+const { acknowledgmentState, markConflictsAsSeen } = useConflictAcknowledgment()

 const isLoading = ref(false)

 const isEnabled = computed(() => isPackEnabled(nodePack.id))
-const version = computed(() => {
-  const id = nodePack.id
-  if (!id) return SelectedVersion.NIGHTLY
-  return (
-    installedPacks[id]?.ver ??
-    nodePack.latest_version?.version ??
-    SelectedVersion.NIGHTLY
+const packageConflict = computed(() =>
+  getConflictsForPackageByID(nodePack.id || '')
+)
+
+const canToggleDirectly = computed(() => {
+  return !(
+    hasConflict &&
+    !acknowledgmentState.value.modal_dismissed &&
+    packageConflict.value
  )
 })

-const handleEnable = () =>
-  enablePack.call({
-    id: nodePack.id,
-    version: version.value,
-    selected_version: version.value,
-    repository: nodePack.repository ?? '',
-    channel: ManagerChannel.DEFAULT,
-    mode: 'default' as InstallPackParams['mode']
-  })
+const showConflictModal = (skipModalDismissed: boolean) => {
+  let modal_dismissed = acknowledgmentState.value.modal_dismissed
+  if (skipModalDismissed) modal_dismissed = false
+  if (packageConflict.value && !modal_dismissed) {
+    showNodeConflictDialog({
+      conflictedPackages: [packageConflict.value],
+      buttonText: !isEnabled.value
+        ? t('manager.conflicts.enableAnyway')
+        : t('manager.conflicts.understood'),
+      onButtonClick: async () => {
+        if (!isEnabled.value) {
+          await handleEnable()
+        }
+      },
+      dialogComponentProps: {
+        onClose: () => {
+          markConflictsAsSeen()
+        }
+      }
+    })
+  }
+}

-const handleDisable = () =>
-  disablePack({
+const handleEnable = () => {
+  if (!nodePack.id) {
+    throw new Error('Node ID is required for enabling')
+  }
+  return enablePack.call({
    id: nodePack.id,
-    version: version.value
+    version:
+      nodePack.latest_version?.version ??
+      ('latest' as ManagerComponents['schemas']['SelectedVersion']),
+    selected_version:
+      nodePack.latest_version?.version ??
+      ('latest' as ManagerComponents['schemas']['SelectedVersion']),
+    repository: nodePack.repository ?? '',
+    channel: 'default' as ManagerComponents['schemas']['ManagerChannel'],
+    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
+    skip_post_install: false
  })
+}
+
+const handleDisable = () => {
+  if (!nodePack.id) {
+    throw new Error('Node ID is required for disabling')
+  }
+  return disablePack({
+    id: nodePack.id,
+    version:
+      nodePack.latest_version?.version ??
+      ('latest' as ManagerComponents['schemas']['SelectedVersion'])
+  })
+}

 const handleToggle = async (enable: boolean) => {
  if (isLoading.value) return
@@ -67,10 +131,23 @@ const handleToggle = async (enable: boolean) => {
  if (enable) {
    await handleEnable()
  } else {
-    handleDisable()
+    await handleDisable()
  }
  isLoading.value = false
 }

-const onToggle = debounce(handleToggle, TOGGLE_DEBOUNCE_MS, { trailing: true })
+const onToggle = debounce(
+  (enable: boolean) => {
+    void handleToggle(enable)
+  },
+  TOGGLE_DEBOUNCE_MS,
+  { trailing: true }
+)
+
+const handleToggleInteraction = async (event: Event) => {
+  if (!canToggleDirectly.value) {
+    event.preventDefault()
+    showConflictModal(false)
+  }
+}
 </script>
--- a/src/components/dialog/content/manager/button/PackInstallButton.vue
+++ b/src/components/dialog/content/manager/button/PackInstallButton.vue
@@ -9,8 +9,8 @@
    :variant="variant"
    :loading="isInstalling"
    :loading-message="$t('g.installing')"
+    :has-warning="hasConflict"
    @action="installAllPacks"
-    @click="onClick"
  />
 </template>

@@ -18,44 +18,51 @@
 import { inject, ref } from 'vue'

 import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
+import { t } from '@/i18n'
+import { useDialogService } from '@/services/dialogService'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import {
-  IsInstallingKey,
-  ManagerChannel,
-  ManagerDatabaseSource,
-  SelectedVersion
-} from '@/types/comfyManagerTypes'
+import { IsInstallingKey } from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
+import {
+  type ConflictDetail,
+  type ConflictDetectionResult
+} from '@/types/conflictDetectionTypes'
+import { components as ManagerComponents } from '@/types/generatedManagerTypes'

 type NodePack = components['schemas']['Node']

-const { nodePacks, variant, label } = defineProps<{
+const { nodePacks, variant, label, hasConflict, conflictInfo } = defineProps<{
  nodePacks: NodePack[]
  variant?: 'default' | 'black'
  label?: string
+  hasConflict?: boolean
+  conflictInfo?: ConflictDetail[]
 }>()

 const isInstalling = inject(IsInstallingKey, ref(false))
-
-const onClick = (): void => {
-  isInstalling.value = true
-}
-
 const managerStore = useComfyManagerStore()
+const { showNodeConflictDialog } = useDialogService()
+
+const createPayload = (
+  installItem: NodePack
+): ManagerComponents['schemas']['InstallPackParams'] => {
+  if (!installItem.id) {
+    throw new Error('Node ID is required for installation')
+  }

-const createPayload = (installItem: NodePack) => {
  const isUnclaimedPack = installItem.publisher?.name === 'Unclaimed'
  const versionToInstall = isUnclaimedPack
-    ? SelectedVersion.NIGHTLY
-    : installItem.latest_version?.version ?? SelectedVersion.LATEST
+    ? ('nightly' as ManagerComponents['schemas']['SelectedVersion'])
+    : installItem.latest_version?.version ??
+      ('latest' as ManagerComponents['schemas']['SelectedVersion'])

  return {
    id: installItem.id,
+    version: versionToInstall,
    repository: installItem.repository ?? '',
-    channel: ManagerChannel.DEV,
-    mode: ManagerDatabaseSource.CACHE,
-    selected_version: versionToInstall,
-    version: versionToInstall
+    channel: 'dev' as ManagerComponents['schemas']['ManagerChannel'],
+    mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
+    selected_version: versionToInstall
  }
 }

@@ -65,14 +72,35 @@ const installPack = (item: NodePack) =>
 const installAllPacks = async () => {
  if (!nodePacks?.length) return

+  if (hasConflict && conflictInfo) {
+    const conflictedPackages: ConflictDetectionResult[] = nodePacks.map(
+      (pack) => ({
+        package_id: pack.id || '',
+        package_name: pack.name || '',
+        has_conflict: true,
+        conflicts: conflictInfo || [],
+        is_compatible: false
+      })
+    )
+
+    showNodeConflictDialog({
+      conflictedPackages,
+      buttonText: t('manager.conflicts.installAnyway'),
+      onButtonClick: async () => {
+        // Proceed with installation
+        isInstalling.value = true
+        await performInstallation(nodePacks)
+      }
+    })
+    return
+  }
+  // No conflicts or conflicts acknowledged - proceed with installation
  isInstalling.value = true
+  await performInstallation(nodePacks)
+}

-  const uninstalledPacks = nodePacks.filter(
-    (pack) => !managerStore.isPackInstalled(pack.id)
-  )
-  if (!uninstalledPacks.length) return
-
-  await Promise.all(uninstalledPacks.map(installPack))
+const performInstallation = async (packs: NodePack[]) => {
+  await Promise.all(packs.map(installPack))
  managerStore.installPack.clear()
 }
 </script>
--- a/src/components/dialog/content/manager/button/PackUninstallButton.vue
+++ b/src/components/dialog/content/manager/button/PackUninstallButton.vue
@@ -6,7 +6,7 @@
        ? $t('manager.uninstallSelected')
        : $t('manager.uninstall')
    "
-    severity="danger"
+    variant="red"
    :loading-message="$t('manager.uninstalling')"
    @action="uninstallItems"
  />
@@ -15,7 +15,6 @@
 <script setup lang="ts">
 import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
-import type { ManagerPackInfo } from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'

 type NodePack = components['schemas']['Node']
@@ -26,16 +25,16 @@ const { nodePacks } = defineProps<{

 const managerStore = useComfyManagerStore()

-const createPayload = (uninstallItem: NodePack): ManagerPackInfo => {
-  return {
-    id: uninstallItem.id,
-    version: uninstallItem.latest_version?.version
+const uninstallPack = (item: NodePack) => {
+  if (!item.id) {
+    throw new Error('Node ID is required for uninstallation')
  }
+  return managerStore.uninstallPack({
+    id: item.id,
+    version: item.latest_version?.version ?? ''
+  })
 }

-const uninstallPack = (item: NodePack) =>
-  managerStore.uninstallPack(createPayload(item))
-
 const uninstallItems = async () => {
  if (!nodePacks?.length) return
  await Promise.all(nodePacks.map(uninstallPack))
--- a/src/components/dialog/content/manager/button/PackUpdateButton.vue
+++ b/src/components/dialog/content/manager/button/PackUpdateButton.vue
@@ -0,0 +1,78 @@
+<template>
+  <PackActionButton
+    v-bind="$attrs"
+    variant="black"
+    :label="$t('manager.updateAll')"
+    :loading="isUpdating"
+    :loading-message="$t('g.updating')"
+    @action="updateAllPacks"
+  />
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+
+import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
+import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import type { components } from '@/types/comfyRegistryTypes'
+
+type NodePack = components['schemas']['Node']
+
+const { nodePacks } = defineProps<{
+  nodePacks: NodePack[]
+}>()
+
+const isUpdating = ref<boolean>(false)
+
+const managerStore = useComfyManagerStore()
+
+const createPayload = (updateItem: NodePack) => {
+  return {
+    id: updateItem.id!,
+    version: updateItem.latest_version!.version!
+  }
+}
+
+const updatePack = async (item: NodePack) => {
+  if (!item.id || !item.latest_version?.version) {
+    console.warn('Pack missing required id or version:', item)
+    return
+  }
+  await managerStore.updatePack.call(createPayload(item))
+}
+
+const updateAllPacks = async () => {
+  if (!nodePacks?.length) {
+    console.warn('No packs provided for update')
+    return
+  }
+
+  isUpdating.value = true
+
+  const updatablePacks = nodePacks.filter((pack) =>
+    managerStore.isPackInstalled(pack.id)
+  )
+
+  if (!updatablePacks.length) {
+    console.info('No installed packs available for update')
+    isUpdating.value = false
+    return
+  }
+
+  console.info(`Starting update of ${updatablePacks.length} packs`)
+
+  try {
+    await Promise.all(updatablePacks.map(updatePack))
+    managerStore.updatePack.clear()
+    console.info('All packs updated successfully')
+  } catch (error) {
+    console.error('Pack update failed:', error)
+    console.error(
+      'Failed packs info:',
+      updatablePacks.map((p) => p.id)
+    )
+  } finally {
+    isUpdating.value = false
+  }
+}
+</script>
--- a/src/components/dialog/content/manager/infoPanel/InfoPanel.vue
+++ b/src/components/dialog/content/manager/infoPanel/InfoPanel.vue
@@ -2,20 +2,26 @@
  <template v-if="nodePack">
    <div class="flex flex-col h-full z-40 overflow-hidden relative">
      <div class="top-0 z-10 px-6 pt-6 w-full">
-        <InfoPanelHeader :node-packs="[nodePack]" />
+        <InfoPanelHeader
+          :node-packs="[nodePack]"
+          :has-conflict="hasCompatibilityIssues"
+        />
      </div>
      <div
        ref="scrollContainer"
-        class="p-6 pt-2 overflow-y-auto flex-1 text-sm hidden-scrollbar"
+        class="p-6 pt-2 overflow-y-auto flex-1 text-sm scrollbar-hide"
      >
        <div class="mb-6">
          <MetadataRow
-            v-if="isPackInstalled(nodePack.id)"
+            v-if="!importFailed && isPackInstalled(nodePack.id)"
            :label="t('manager.filter.enabled')"
            class="flex"
            style="align-items: center"
          >
-            <PackEnableToggle :node-pack="nodePack" />
+            <PackEnableToggle
+              :node-pack="nodePack"
+              :has-conflict="hasCompatibilityIssues"
+            />
          </MetadataRow>
          <MetadataRow
            v-for="item in infoItems"
@@ -29,6 +35,7 @@
              :status-type="
                nodePack.status as components['schemas']['NodeVersionStatus']
              "
+              :has-compatibility-issues="hasCompatibilityIssues"
            />
          </MetadataRow>
          <MetadataRow :label="t('manager.version')">
@@ -36,7 +43,11 @@
          </MetadataRow>
        </div>
        <div class="mb-6 overflow-hidden">
-          <InfoTabs :node-pack="nodePack" />
+          <InfoTabs
+            :node-pack="nodePack"
+            :has-compatibility-issues="hasCompatibilityIssues"
+            :conflict-result="conflictResult"
+          />
        </div>
      </div>
    </div>
@@ -59,9 +70,14 @@ import PackEnableToggle from '@/components/dialog/content/manager/button/PackEna
 import InfoPanelHeader from '@/components/dialog/content/manager/infoPanel/InfoPanelHeader.vue'
 import InfoTabs from '@/components/dialog/content/manager/infoPanel/InfoTabs.vue'
 import MetadataRow from '@/components/dialog/content/manager/infoPanel/MetadataRow.vue'
+import { useConflictDetection } from '@/composables/useConflictDetection'
+import { useImportFailedDetection } from '@/composables/useImportFailedDetection'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
 import { IsInstallingKey } from '@/types/comfyManagerTypes'
 import { components } from '@/types/comfyRegistryTypes'
+import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes'
+import { ImportFailedKey } from '@/types/importFailedTypes'

 interface InfoItem {
  key: string
@@ -75,18 +91,55 @@ const { nodePack } = defineProps<{

 const scrollContainer = ref<HTMLElement | null>(null)

-const managerStore = useComfyManagerStore()
-const isInstalled = computed(() => managerStore.isPackInstalled(nodePack.id))
+const { isPackInstalled } = useComfyManagerStore()
+const isInstalled = computed(() => isPackInstalled(nodePack.id))
 const isInstalling = ref(false)
 provide(IsInstallingKey, isInstalling)
 whenever(isInstalled, () => {
  isInstalling.value = false
 })

-const { isPackInstalled } = useComfyManagerStore()
+const { checkNodeCompatibility } = useConflictDetection()
+const { getConflictsForPackageByID } = useConflictDetectionStore()

 const { t, d, n } = useI18n()

+// Check compatibility once and pass to children
+const conflictResult = computed((): ConflictDetectionResult | null => {
+  // For installed packages, use stored conflict data
+  if (isInstalled.value && nodePack.id) {
+    return getConflictsForPackageByID(nodePack.id) || null
+  }
+
+  // For non-installed packages, perform compatibility check
+  const compatibility = checkNodeCompatibility(nodePack)
+
+  if (compatibility.hasConflict) {
+    return {
+      package_id: nodePack.id || '',
+      package_name: nodePack.name || '',
+      has_conflict: true,
+      conflicts: compatibility.conflicts,
+      is_compatible: false
+    }
+  }
+
+  return null
+})
+
+const hasCompatibilityIssues = computed(() => {
+  return conflictResult.value?.has_conflict
+})
+
+const packageId = computed(() => nodePack.id || '')
+const { importFailed, showImportFailedDialog } =
+  useImportFailedDetection(packageId)
+
+provide(ImportFailedKey, {
+  importFailed,
+  showImportFailedDialog
+})
+
 const infoItems = computed<InfoItem[]>(() => [
  {
    key: 'publisher',
@@ -128,17 +181,3 @@ whenever(
  { immediate: true }
 )
 </script>
-<style scoped>
-.hidden-scrollbar {
-  /* Firefox */
-  scrollbar-width: none;
-
-  &::-webkit-scrollbar {
-    width: 1px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background-color: transparent;
-  }
-}
-</style>
--- a/src/components/dialog/content/manager/infoPanel/InfoPanelHeader.vue
+++ b/src/components/dialog/content/manager/infoPanel/InfoPanelHeader.vue
@@ -1,28 +1,36 @@
 <template>
-  <div v-if="nodePacks?.length" class="flex flex-col items-center mb-6">
+  <div v-if="nodePacks?.length" class="flex flex-col items-center">
    <slot name="thumbnail">
-      <PackIcon :node-pack="nodePacks[0]" width="24" height="24" />
+      <PackIcon :node-pack="nodePacks[0]" width="204" height="106" />
    </slot>
    <h2
      class="text-2xl font-bold text-center mt-4 mb-2"
      style="word-break: break-all"
    >
      <slot name="title">
-        {{ nodePacks[0].name }}
+        <span class="inline-block text-base">{{ nodePacks[0].name }}</span>
      </slot>
    </h2>
-    <div class="mt-2 mb-4 w-full max-w-xs flex justify-center">
+    <div
+      v-if="!importFailed"
+      class="mt-2 mb-4 w-full max-w-xs flex justify-center"
+    >
      <slot name="install-button">
        <PackUninstallButton
          v-if="isAllInstalled"
          v-bind="$attrs"
          :node-packs="nodePacks"
        />
-        <PackInstallButton v-else v-bind="$attrs" :node-packs="nodePacks" />
+        <PackInstallButton
+          v-else
+          v-bind="$attrs"
+          :node-packs="nodePacks"
+          :has-conflict="hasConflict"
+        />
      </slot>
    </div>
  </div>
-  <div v-else class="flex flex-col items-center mb-6">
+  <div v-else class="flex flex-col items-center">
    <NoResultsPlaceholder
      :message="$t('manager.status.unknown')"
      :title="$t('manager.tryAgainLater')"
@@ -31,7 +39,7 @@
 </template>

 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { inject, ref, watch } from 'vue'

 import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
 import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
@@ -39,13 +47,19 @@ import PackUninstallButton from '@/components/dialog/content/manager/button/Pack
 import PackIcon from '@/components/dialog/content/manager/packIcon/PackIcon.vue'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
 import { components } from '@/types/comfyRegistryTypes'
+import { ImportFailedKey } from '@/types/importFailedTypes'

-const { nodePacks } = defineProps<{
+const { nodePacks, hasConflict } = defineProps<{
  nodePacks: components['schemas']['Node'][]
+  hasConflict?: boolean
 }>()

 const managerStore = useComfyManagerStore()

+// Inject import failed context from parent
+const importFailedContext = inject(ImportFailedKey)
+const importFailed = importFailedContext?.importFailed
+
 const isAllInstalled = ref(false)
 watch(
  [() => nodePacks, () => managerStore.installedPacks],
--- a/src/components/dialog/content/manager/infoPanel/InfoPanelMultiItem.vue
+++ b/src/components/dialog/content/manager/infoPanel/InfoPanelMultiItem.vue
@@ -6,8 +6,12 @@
          <PackIconStacked :node-packs="nodePacks" />
        </template>
        <template #title>
-          {{ nodePacks.length }}
-          {{ $t('manager.packsSelected') }}
+          <div class="mt-5">
+            <span class="inline-block mr-2 text-blue-500 text-base">{{
+              nodePacks.length
+            }}</span>
+            <span class="text-base">{{ $t('manager.packsSelected') }}</span>
+          </div>
        </template>
        <template #install-button>
          <PackInstallButton :full-width="true" :node-packs="nodePacks" />
--- a/src/components/dialog/content/manager/infoPanel/InfoTabs.vue
+++ b/src/components/dialog/content/manager/infoPanel/InfoTabs.vue
@@ -1,15 +1,31 @@
 <template>
  <div class="overflow-hidden">
    <Tabs :value="activeTab">
-      <TabList>
-        <Tab value="description">
+      <TabList class="overflow-x-auto scrollbar-hide">
+        <Tab v-if="hasCompatibilityIssues" value="warning" class="p-2 mr-6">
+          <div class="flex items-center gap-1">
+            <span>⚠️</span>
+            {{ importFailed ? $t('g.error') : $t('g.warning') }}
+          </div>
+        </Tab>
+        <Tab value="description" class="p-2 mr-6">
          {{ $t('g.description') }}
        </Tab>
-        <Tab value="nodes">
+        <Tab value="nodes" class="p-2">
          {{ $t('g.nodes') }}
        </Tab>
      </TabList>
-      <TabPanels class="overflow-auto">
+      <TabPanels class="overflow-auto py-4 px-2">
+        <TabPanel
+          v-if="hasCompatibilityIssues"
+          value="warning"
+          class="bg-transparent"
+        >
+          <WarningTabPanel
+            :node-pack="nodePack"
+            :conflict-result="conflictResult"
+          />
+        </TabPanel>
        <TabPanel value="description">
          <DescriptionTabPanel :node-pack="nodePack" />
        </TabPanel>
@@ -27,16 +43,25 @@ import TabList from 'primevue/tablist'
 import TabPanel from 'primevue/tabpanel'
 import TabPanels from 'primevue/tabpanels'
 import Tabs from 'primevue/tabs'
-import { computed, ref } from 'vue'
+import { computed, inject, ref, watchEffect } from 'vue'

 import DescriptionTabPanel from '@/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.vue'
 import NodesTabPanel from '@/components/dialog/content/manager/infoPanel/tabs/NodesTabPanel.vue'
+import WarningTabPanel from '@/components/dialog/content/manager/infoPanel/tabs/WarningTabPanel.vue'
 import { components } from '@/types/comfyRegistryTypes'
+import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes'
+import { ImportFailedKey } from '@/types/importFailedTypes'

-const { nodePack } = defineProps<{
+const { nodePack, hasCompatibilityIssues, conflictResult } = defineProps<{
  nodePack: components['schemas']['Node']
+  hasCompatibilityIssues?: boolean
+  conflictResult?: ConflictDetectionResult | null
 }>()

+// Inject import failed context from parent
+const importFailedContext = inject(ImportFailedKey)
+const importFailed = importFailedContext?.importFailed
+
 const nodeNames = computed(() => {
  // @ts-expect-error comfy_nodes is an Algolia-specific field
  const { comfy_nodes } = nodePack
@@ -44,4 +69,17 @@ const nodeNames = computed(() => {
 })

 const activeTab = ref('description')
+
+// Watch for compatibility issues and automatically switch to warning tab
+watchEffect(
+  () => {
+    if (hasCompatibilityIssues) {
+      activeTab.value = 'warning'
+    } else if (activeTab.value === 'warning') {
+      // If currently on warning tab but no issues, switch to description
+      activeTab.value = 'description'
+    }
+  },
+  { flush: 'post' }
+)
 </script>
--- a/src/components/dialog/content/manager/infoPanel/InfoTextSection.vue
+++ b/src/components/dialog/content/manager/infoPanel/InfoTextSection.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="flex flex-col gap-4 text-sm">
    <div v-for="(section, index) in sections" :key="index" class="mb-4">
-      <div class="mb-1">
+      <div class="mb-3">
        {{ section.title }}
      </div>
      <div class="text-muted break-words">
--- a/src/components/dialog/content/manager/infoPanel/MetadataRow.vue
+++ b/src/components/dialog/content/manager/infoPanel/MetadataRow.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="flex py-1.5 text-xs">
-    <div class="w-1/3 truncate pr-2 text-muted">{{ label }}:</div>
+    <div class="w-1/3 truncate pr-2 text-muted">{{ label }}</div>
    <div class="w-2/3">
      <slot>{{ value }}</slot>
    </div>
--- a/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.vue
+++ b/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mt-4 overflow-hidden">
+  <div class="overflow-hidden">
    <InfoTextSection
      v-if="nodePack?.description"
      :sections="descriptionSections"
--- a/src/components/dialog/content/manager/infoPanel/tabs/NodesTabPanel.vue
+++ b/src/components/dialog/content/manager/infoPanel/tabs/NodesTabPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col gap-4 mt-4 text-sm">
+  <div class="flex flex-col gap-4 text-sm">
    <template v-if="mappedNodeDefs?.length">
      <div
        v-for="nodeDef in mappedNodeDefs"
--- a/src/components/dialog/content/manager/infoPanel/tabs/WarningTabPanel.vue
+++ b/src/components/dialog/content/manager/infoPanel/tabs/WarningTabPanel.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="flex flex-col gap-3">
+    <button
+      v-if="importFailedInfo"
+      class="cursor-pointer outline-none border-none inline-flex items-center justify-end bg-transparent gap-1"
+      @click="showImportFailedDialog"
+    >
+      <i class="pi pi-code text-base"></i>
+      <span class="dark-theme:text-white text-sm">{{
+        t('serverStart.openLogs')
+      }}</span>
+    </button>
+    <div
+      v-for="(conflict, index) in conflictResult?.conflicts || []"
+      :key="index"
+      class="p-3 bg-yellow-800/20 rounded-md"
+    >
+      <div class="flex justify-between items-center">
+        <div class="text-sm break-words flex-1">
+          {{ getConflictMessage(conflict, $t) }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+import { useImportFailedDetection } from '@/composables/useImportFailedDetection'
+import { t } from '@/i18n'
+import { components } from '@/types/comfyRegistryTypes'
+import { ConflictDetectionResult } from '@/types/conflictDetectionTypes'
+import { getConflictMessage } from '@/utils/conflictMessageUtil'
+
+const { nodePack, conflictResult } = defineProps<{
+  nodePack: components['schemas']['Node']
+  conflictResult: ConflictDetectionResult | null | undefined
+}>()
+
+const packageId = computed(() => nodePack?.id || '')
+const { importFailedInfo, showImportFailedDialog } =
+  useImportFailedDetection(packageId)
+</script>
--- a/src/components/dialog/content/manager/packCard/PackCard.vue
+++ b/src/components/dialog/content/manager/packCard/PackCard.vue
@@ -43,7 +43,7 @@
            </span>
            <p
              v-if="nodePack.description"
-              class="flex-1 text-muted text-xs font-medium break-words overflow-hidden min-h-12 line-clamp-3 my-0 leading-4 mb-1 overflow-hidden"
+              class="flex-1 text-muted text-xs font-medium break-words overflow-hidden max-h-12 line-clamp-3 my-0 leading-4 mb-2 overflow-hidden"
            >
              {{ nodePack.description }}
            </p>
@@ -119,12 +119,20 @@ provide(IsInstallingKey, isInstalling)

 const { isPackInstalled, isPackEnabled } = useComfyManagerStore()

-const isInstalled = computed(() => isPackInstalled(nodePack?.id))
-const isDisabled = computed(
-  () => isInstalled.value && !isPackEnabled(nodePack?.id)
-)
+const isDisabled = ref(false)
+const managerStore = useComfyManagerStore()

-whenever(isInstalled, () => (isInstalling.value = false))
+// Watch the installedPacks object directly (which gets updated from WebSocket)
+whenever(
+  () => managerStore.installedPacksIds,
+  () => {
+    const isInstalled = isPackInstalled(nodePack?.id)
+    isDisabled.value = isInstalled && !isPackEnabled(nodePack?.id)
+
+    // Update isInstalling state after installation is complete
+    if (isInstalling.value && isInstalled) isInstalling.value = false
+  }
+)

 const nodesCount = computed(() =>
  isMergedNodePack(nodePack) ? nodePack.comfy_nodes?.length : undefined
--- a/src/components/dialog/content/manager/packCard/PackCardFooter.vue
+++ b/src/components/dialog/content/manager/packCard/PackCardFooter.vue
@@ -1,13 +1,39 @@
 <template>
  <div
-    class="min-h-12 flex justify-between items-center px-4 py-2 text-xs text-muted font-medium leading-3"
+    class="h-12 flex justify-between items-center px-4 text-xs text-muted font-medium leading-3"
  >
    <div v-if="nodePack.downloads" class="flex items-center gap-1.5">
      <i class="pi pi-download text-muted"></i>
      <span>{{ formattedDownloads }}</span>
    </div>
-    <PackInstallButton v-if="!isInstalled" :node-packs="[nodePack]" />
-    <PackEnableToggle v-else :node-pack="nodePack" />
+    <div class="flex justify-end items-center gap-2">
+      <template v-if="importFailed">
+        <div
+          class="flex justify-center items-center gap-2 cursor-pointer"
+          @click="showImportFailedDialog"
+        >
+          <i class="pi pi-exclamation-triangle text-red-500 text-sm"></i>
+          <span class="text-red-500 text-xs pt-0.5">{{
+            t('manager.failedToInstall')
+          }}</span>
+        </div>
+      </template>
+      <template v-else>
+        <template v-if="!isInstalled">
+          <PackInstallButton
+            :node-packs="[nodePack]"
+            :has-conflict="uninstalledPackConflict.hasConflict"
+            :conflict-info="uninstalledPackConflict.conflicts"
+          />
+        </template>
+        <template v-else>
+          <PackEnableToggle
+            :node-pack="nodePack"
+            :has-conflict="installedPackHasConflict"
+          />
+        </template>
+      </template>
+    </div>
  </div>
 </template>

@@ -17,7 +43,10 @@ import { useI18n } from 'vue-i18n'

 import PackEnableToggle from '@/components/dialog/content/manager/button/PackEnableToggle.vue'
 import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
+import { useConflictDetection } from '@/composables/useConflictDetection'
+import { useImportFailedDetection } from '@/composables/useImportFailedDetection'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
 import type { components } from '@/types/comfyRegistryTypes'

 const { nodePack } = defineProps<{
@@ -27,9 +56,29 @@ const { nodePack } = defineProps<{
 const { isPackInstalled } = useComfyManagerStore()
 const isInstalled = computed(() => isPackInstalled(nodePack?.id))

-const { n } = useI18n()
+const { n, t } = useI18n()

 const formattedDownloads = computed(() =>
  nodePack.downloads ? n(nodePack.downloads) : ''
 )
+
+const { getConflictsForPackageByID } = useConflictDetectionStore()
+const { checkNodeCompatibility } = useConflictDetection()
+
+const { importFailed, showImportFailedDialog } = useImportFailedDetection(
+  nodePack.id
+)
+
+const conflicts = computed(
+  () => getConflictsForPackageByID(nodePack.id!) || null
+)
+
+const installedPackHasConflict = computed(() => {
+  if (!nodePack.id) return false
+  return !!conflicts.value
+})
+
+const uninstalledPackConflict = computed(() => {
+  return checkNodeCompatibility(nodePack)
+})
 </script>
--- a/src/components/dialog/content/manager/packCard/PackCardHeader.vue
+++ b/src/components/dialog/content/manager/packCard/PackCardHeader.vue
@@ -20,7 +20,10 @@
        {{ $n(nodePack.downloads) }}
      </div>
      <template v-if="isInstalled">
-        <PackEnableToggle :node-pack="nodePack" />
+        <PackEnableToggle
+          :node-pack="nodePack"
+          :has-conflict="!!packageConflicts"
+        />
      </template>
      <template v-else>
        <PackInstallButton :node-packs="[nodePack]" />
@@ -35,6 +38,7 @@ import { computed } from 'vue'
 import PackEnableToggle from '@/components/dialog/content/manager/button/PackEnableToggle.vue'
 import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
 import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
 import type { components } from '@/types/comfyRegistryTypes'

 const { nodePack } = defineProps<{
@@ -42,5 +46,13 @@ const { nodePack } = defineProps<{
 }>()

 const { isPackInstalled } = useComfyManagerStore()
+const { getConflictsForPackageByID } = useConflictDetectionStore()
 const isInstalled = computed(() => isPackInstalled(nodePack?.id))
+
+const packageConflicts = computed(() => {
+  if (!nodePack.id || !isInstalled.value) return null
+
+  // For installed packages, check conflicts from store
+  return getConflictsForPackageByID(nodePack.id)
+})
 </script>
--- a/src/components/dialog/content/manager/packIcon/PackIcon.vue
+++ b/src/components/dialog/content/manager/packIcon/PackIcon.vue
@@ -1,11 +1,37 @@
 <template>
-  <img
-    :src="isImageError ? DEFAULT_ICON : imgSrc"
-    :alt="nodePack.name + ' icon'"
-    class="object-contain rounded-lg max-h-72 max-w-72"
-    :style="{ width: cssWidth, height: cssHeight }"
-    @error="isImageError = true"
-  />
+  <div class="w-full max-w-[204] aspect-[2/1] rounded-lg overflow-hidden">
+    <!-- default banner show -->
+    <div v-if="showDefaultBanner" class="w-full h-full">
+      <img
+        :src="DEFAULT_BANNER"
+        alt="default banner"
+        class="w-full h-full object-cover"
+      />
+    </div>
+    <!-- banner_url or icon show -->
+    <div v-else class="relative w-full h-full">
+      <!-- blur background -->
+      <div
+        v-if="imgSrc"
+        class="absolute inset-0 bg-cover bg-center bg-no-repeat opacity-30"
+        :style="{
+          backgroundImage: `url(${imgSrc})`,
+          filter: 'blur(10px)'
+        }"
+      ></div>
+      <!-- image -->
+      <img
+        :src="isImageError ? DEFAULT_BANNER : imgSrc"
+        :alt="nodePack.name + ' banner'"
+        :class="
+          isImageError
+            ? 'relative w-full h-full object-cover z-10'
+            : 'relative w-full h-full object-contain z-10'
+        "
+        @error="isImageError = true"
+      />
+    </div>
+  </div>
 </template>

 <script setup lang="ts">
@@ -13,29 +39,14 @@ import { computed, ref } from 'vue'

 import { components } from '@/types/comfyRegistryTypes'

-const DEFAULT_ICON = '/assets/images/fallback-gradient-avatar.svg'
+const DEFAULT_BANNER = '/assets/images/fallback-gradient-avatar.svg'

-const {
-  nodePack,
-  width = '4.5rem',
-  height = '4.5rem'
-} = defineProps<{
+const { nodePack } = defineProps<{
  nodePack: components['schemas']['Node']
-  width?: string
-  height?: string
 }>()

 const isImageError = ref(false)
-const shouldShowFallback = computed(
-  () => !nodePack.icon || nodePack.icon.trim() === '' || isImageError.value
-)
-const imgSrc = computed(() =>
-  shouldShowFallback.value ? DEFAULT_ICON : nodePack.icon
-)

-const convertToCssValue = (value: string | number) =>
-  typeof value === 'number' ? `${value}rem` : value
-
-const cssWidth = computed(() => convertToCssValue(width))
-const cssHeight = computed(() => convertToCssValue(height))
+const showDefaultBanner = computed(() => !nodePack.banner_url && !nodePack.icon)
+const imgSrc = computed(() => nodePack.banner_url || nodePack.icon)
 </script>
--- a/src/components/dialog/content/manager/packIcon/PackIconStacked.vue
+++ b/src/components/dialog/content/manager/packIcon/PackIconStacked.vue
@@ -1,25 +1,19 @@
 <template>
-  <div class="relative w-24 h-24">
+  <div class="relative w-[224px] h-[104px] shadow-xl">
    <div
      v-for="(pack, index) in nodePacks.slice(0, maxVisible)"
      :key="pack.id"
-      class="absolute"
+      class="absolute w-[210px] h-[90px]"
      :style="{
        bottom: `${index * offset}px`,
        right: `${index * offset}px`,
        zIndex: maxVisible - index
      }"
    >
-      <div class="border rounded-lg p-0.5">
-        <PackIcon :node-pack="pack" width="4.5rem" height="4.5rem" />
+      <div class="border rounded-lg shadow-lg p-0.5">
+        <PackIcon :node-pack="pack" />
      </div>
    </div>
-    <div
-      v-if="nodePacks.length > maxVisible"
-      class="absolute -top-2 -right-2 bg-primary rounded-full w-7 h-7 flex items-center justify-center text-xs font-bold shadow-md z-10"
-    >
-      +{{ nodePacks.length - maxVisible }}
-    </div>
  </div>
 </template>

--- a/src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue
+++ b/src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue
@@ -33,6 +33,10 @@
        :node-packs="missingNodePacks"
        :label="$t('manager.installAllMissingNodes')"
      />
+      <PackUpdateButton
+        v-if="isUpdateAvailableTab && hasUpdateAvailable"
+        :node-packs="updateAvailableNodePacks"
+      />
    </div>
    <div class="flex mt-3 text-sm">
      <div class="flex gap-6 ml-1">
@@ -65,8 +69,10 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'

 import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
+import PackUpdateButton from '@/components/dialog/content/manager/button/PackUpdateButton.vue'
 import SearchFilterDropdown from '@/components/dialog/content/manager/registrySearchBar/SearchFilterDropdown.vue'
 import { useMissingNodes } from '@/composables/nodePack/useMissingNodes'
+import { useUpdateAvailableNodes } from '@/composables/nodePack/useUpdateAvailableNodes'
 import {
  type SearchOption,
  SortableAlgoliaField
@@ -83,6 +89,7 @@ const { searchResults, sortOptions } = defineProps<{
  suggestions?: QuerySuggestion[]
  sortOptions?: SortableField[]
  isMissingTab?: boolean
+  isUpdateAvailableTab?: boolean
 }>()

 const searchQuery = defineModel<string>('searchQuery')
@@ -96,6 +103,10 @@ const { t } = useI18n()
 // Get missing node packs from workflow with loading and error states
 const { missingNodePacks, isLoading, error } = useMissingNodes()

+// Use the composable to get update available nodes
+const { hasUpdateAvailable, updateAvailableNodePacks } =
+  useUpdateAvailableNodes()
+
 const hasResults = computed(
  () => searchQuery.value?.trim() && searchResults?.length
 )
--- a/src/components/dialog/footer/ManagerProgressFooter.vue
+++ b/src/components/dialog/footer/ManagerProgressFooter.vue
@@ -1,41 +1,44 @@
 <template>
  <div
-    class="w-full px-6 py-4 shadow-lg flex items-center justify-between"
+    class="w-full px-6 py-2 shadow-lg flex items-center justify-between"
    :class="{
      'rounded-t-none': progressDialogContent.isExpanded,
      'rounded-lg': !progressDialogContent.isExpanded
    }"
  >
-    <div class="justify-center text-sm font-bold leading-none">
+    <div class="flex items-center text-base leading-none">
      <div class="flex items-center">
        <template v-if="isInProgress">
-          <i class="pi pi-spin pi-spinner mr-2 text-3xl" />
+          <DotSpinner duration="1s" class="mr-2" />
+          <span>{{ currentTaskName }}</span>
+        </template>
+        <template v-else-if="isRestartCompleted">
+          <span class="mr-2">🎉</span>
          <span>{{ currentTaskName }}</span>
        </template>
        <template v-else>
-          <i class="pi pi-check-circle mr-2 text-green-500" />
-          <span class="leading-none">{{
-            $t('manager.restartToApplyChanges')
-          }}</span>
+          <span class="mr-2">✅</span>
+          <span>{{ $t('manager.restartToApplyChanges') }}</span>
        </template>
      </div>
    </div>
    <div class="flex items-center gap-4">
-      <span v-if="isInProgress" class="text-xs font-bold text-neutral-600">
-        {{ comfyManagerStore.uncompletedCount }} {{ $t('g.progressCountOf') }}
+      <span v-if="isInProgress" class="text-sm text-neutral-700">
+        {{ completedTasksCount }} {{ $t('g.progressCountOf') }}
        {{ comfyManagerStore.taskLogs.length }}
      </span>
      <div class="flex items-center">
        <Button
-          v-if="!isInProgress"
+          v-if="!isInProgress && !isRestartCompleted"
          rounded
          outlined
-          class="px-4 py-2 rounded-md mr-4"
+          class="mr-4 rounded-md border-2 px-3 text-neutral-600 border-neutral-900 hover:bg-neutral-100 !dark-theme:bg-transparent dark-theme:text-white dark-theme:border-white dark-theme:hover:bg-neutral-800"
          @click="handleRestart"
        >
-          {{ $t('g.restart') }}
+          {{ $t('manager.applyChanges') }}
        </Button>
        <Button
+          v-else-if="!isRestartCompleted"
          :icon="
            progressDialogContent.isExpanded
              ? 'pi pi-chevron-up'
@@ -44,6 +47,7 @@
          text
          rounded
          size="small"
+          class="font-bold"
          severity="secondary"
          :aria-label="progressDialogContent.isExpanded ? 'Collapse' : 'Expand'"
          @click.stop="progressDialogContent.toggle"
@@ -53,6 +57,7 @@
          text
          rounded
          size="small"
+          class="font-bold"
          severity="secondary"
          aria-label="Close"
          @click.stop="closeDialog"
@@ -65,9 +70,10 @@
 <script setup lang="ts">
 import { useEventListener } from '@vueuse/core'
 import Button from 'primevue/button'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'

+import DotSpinner from '@/components/common/DotSpinner.vue'
 import { api } from '@/scripts/api'
 import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useWorkflowService } from '@/services/workflowService'
@@ -77,41 +83,93 @@ import {
 } from '@/stores/comfyManagerStore'
 import { useCommandStore } from '@/stores/commandStore'
 import { useDialogStore } from '@/stores/dialogStore'
+import { useSettingStore } from '@/stores/settingStore'

 const { t } = useI18n()
 const dialogStore = useDialogStore()
 const progressDialogContent = useManagerProgressDialogStore()
 const comfyManagerStore = useComfyManagerStore()
+const settingStore = useSettingStore()

-const isInProgress = computed(() => comfyManagerStore.uncompletedCount > 0)
+// State management for restart process
+const isRestarting = ref<boolean>(false)
+const isRestartCompleted = ref<boolean>(false)
+
+const isInProgress = computed(
+  () => comfyManagerStore.isProcessingTasks || isRestarting.value
+)
+
+const completedTasksCount = computed(() => {
+  return (
+    comfyManagerStore.succeededTasksIds.length +
+    comfyManagerStore.failedTasksIds.length
+  )
+})

 const closeDialog = () => {
  dialogStore.closeDialog({ key: 'global-manager-progress-dialog' })
 }

-const fallbackTaskName = t('g.installing')
+const fallbackTaskName = t('manager.installingDependencies')
 const currentTaskName = computed(() => {
+  if (isRestarting.value) {
+    return t('manager.restartingBackend')
+  }
+  if (isRestartCompleted.value) {
+    return t('manager.extensionsSuccessfullyInstalled')
+  }
  if (!comfyManagerStore.taskLogs.length) return fallbackTaskName
  const task = comfyManagerStore.taskLogs.at(-1)
  return task?.taskName ?? fallbackTaskName
 })

 const handleRestart = async () => {
-  const onReconnect = async () => {
-    // Refresh manager state
+  // Store original toast setting value
+  const originalToastSetting = settingStore.get(
+    'Comfy.Toast.DisableReconnectingToast'
+  )

-    comfyManagerStore.clearLogs()
-    comfyManagerStore.setStale()
+  try {
+    await settingStore.set('Comfy.Toast.DisableReconnectingToast', true)

-    // Refresh node definitions
-    await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
+    isRestarting.value = true

-    // Reload workflow
-    await useWorkflowService().reloadCurrentWorkflow()
+    const onReconnect = async () => {
+      try {
+        comfyManagerStore.setStale()
+
+        await useCommandStore().execute('Comfy.RefreshNodeDefinitions')
+
+        await useWorkflowService().reloadCurrentWorkflow()
+      } finally {
+        await settingStore.set(
+          'Comfy.Toast.DisableReconnectingToast',
+          originalToastSetting
+        )
+
+        isRestarting.value = false
+        isRestartCompleted.value = true
+
+        setTimeout(() => {
+          closeDialog()
+          comfyManagerStore.resetTaskState()
+        }, 3000)
+      }
+    }
+
+    useEventListener(api, 'reconnected', onReconnect, { once: true })
+
+    await useComfyManagerService().rebootComfyUI()
+  } catch (error) {
+    // If restart fails, restore settings and reset state
+    await settingStore.set(
+      'Comfy.Toast.DisableReconnectingToast',
+      originalToastSetting
+    )
+    isRestarting.value = false
+    isRestartCompleted.value = false
+    closeDialog() // Close dialog on error
+    throw error
  }
-  useEventListener(api, 'reconnected', onReconnect, { once: true })
-
-  await useComfyManagerService().rebootComfyUI()
-  closeDialog()
 }
 </script>
--- a/src/components/dialog/header/ManagerProgressHeader.vue
+++ b/src/components/dialog/header/ManagerProgressHeader.vue
@@ -18,16 +18,40 @@

 <script setup lang="ts">
 import TabMenu from 'primevue/tabmenu'
-import { ref } from 'vue'
+import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'

-import { useManagerProgressDialogStore } from '@/stores/comfyManagerStore'
+import {
+  useComfyManagerStore,
+  useManagerProgressDialogStore
+} from '@/stores/comfyManagerStore'

 const progressDialogContent = useManagerProgressDialogStore()
-const activeTabIndex = ref(0)
+const comfyManagerStore = useComfyManagerStore()
+const activeTabIndex = computed({
+  get: () => progressDialogContent.getActiveTabIndex(),
+  set: (value: number) => progressDialogContent.setActiveTabIndex(value)
+})
 const { t } = useI18n()
-const tabs = [
-  { label: t('manager.installationQueue') },
-  { label: t('manager.failed', { count: 0 }) }
-]
+
+const failedCount = computed(() => comfyManagerStore.failedTasksIds.length)
+
+const queueSuffix = computed(() => {
+  const queueLength = comfyManagerStore.managerQueue.queueLength
+  if (queueLength === 0) {
+    return ''
+  }
+  return ` (${queueLength})`
+})
+const failedSuffix = computed(() => {
+  if (failedCount.value === 0) {
+    return ''
+  }
+  return ` (${failedCount.value})`
+})
+
+const tabs = computed(() => [
+  { label: t('manager.installationQueue') + queueSuffix.value },
+  { label: t('manager.failed') + failedSuffix.value }
+])
 </script>
--- a/src/components/helpcenter/HelpCenterMenuContent.vue
+++ b/src/components/helpcenter/HelpCenterMenuContent.vue
@@ -14,7 +14,17 @@
        @mouseenter="onMenuItemHover(menuItem.key, $event)"
        @mouseleave="onMenuItemLeave(menuItem.key)"
      >
-        <i :class="menuItem.icon" class="help-menu-icon" />
+        <div class="help-menu-icon-container">
+          <div class="help-menu-icon">
+            <component
+              :is="menuItem.icon"
+              v-if="typeof menuItem.icon === 'object'"
+              :size="16"
+            />
+            <i v-else :class="menuItem.icon" />
+          </div>
+          <div v-if="menuItem.showRedDot" class="menu-red-dot" />
+        </div>
        <span class="menu-label">{{ menuItem.label }}</span>
        <i v-if="menuItem.key === 'more'" class="pi pi-chevron-right" />
      </button>
@@ -119,10 +129,21 @@
 </template>

 <script setup lang="ts">
+// No need to import useStorage anymore - it's in the composable
 import Button from 'primevue/button'
-import { type CSSProperties, computed, nextTick, onMounted, ref } from 'vue'
+import {
+  type CSSProperties,
+  type Component,
+  computed,
+  nextTick,
+  onMounted,
+  ref
+} from 'vue'
 import { useI18n } from 'vue-i18n'

+import PuzzleIcon from '@/components/icons/PuzzleIcon.vue'
+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
+import { useDialogService } from '@/services/dialogService'
 import { type ReleaseNote } from '@/services/releaseService'
 import { useCommandStore } from '@/stores/commandStore'
 import { useReleaseStore } from '@/stores/releaseStore'
@@ -133,12 +154,13 @@ import { formatVersionAnchor } from '@/utils/formatUtil'
 // Types
 interface MenuItem {
  key: string
-  icon?: string
+  icon?: string | Component
  label?: string
  action?: () => void
  visible?: boolean
  type?: 'item' | 'divider'
  items?: MenuItem[]
+  showRedDot?: boolean
 }

 // Constants
@@ -170,6 +192,7 @@ const { t, locale } = useI18n()
 const releaseStore = useReleaseStore()
 const commandStore = useCommandStore()
 const settingStore = useSettingStore()
+const dialogService = useDialogService()

 // Emits
 const emit = defineEmits<{
@@ -192,6 +215,10 @@ const moreMenuItem = computed(() =>
  menuItems.value.find((item) => item.key === 'more')
 )

+// Use conflict acknowledgment state from composable
+const { shouldShowRedDot: shouldShowManagerRedDot } =
+  useConflictAcknowledgment()
+
 const menuItems = computed<MenuItem[]>(() => {
  const moreItems: MenuItem[] = [
    {
@@ -271,6 +298,17 @@ const menuItems = computed<MenuItem[]>(() => {
        emit('close')
      }
    },
+    {
+      key: 'manager',
+      type: 'item',
+      icon: PuzzleIcon,
+      label: t('helpCenter.managerExtension'),
+      showRedDot: shouldShowManagerRedDot.value,
+      action: () => {
+        dialogService.showManagerDialog()
+        emit('close')
+      }
+    },
    {
      key: 'more',
      type: 'item',
@@ -505,16 +543,39 @@ onMounted(async () => {
  box-shadow: none;
 }

-.help-menu-icon {
+.help-menu-icon-container {
+  position: relative;
  margin-right: 0.75rem;
+  width: 16px;
+  flex-shrink: 0;
+}
+
+.help-menu-icon {
  font-size: 1rem;
  color: var(--p-text-muted-color);
  width: 16px;
  display: flex;
  justify-content: center;
+  align-items: center;
  flex-shrink: 0;
 }

+.help-menu-icon svg {
+  color: var(--p-text-muted-color);
+}
+
+.menu-red-dot {
+  position: absolute;
+  top: -2px;
+  right: -2px;
+  width: 8px;
+  height: 8px;
+  background: #ff3b30;
+  border-radius: 50%;
+  border: 1.5px solid var(--p-content-background);
+  z-index: 1;
+}
+
 .menu-label {
  flex: 1;
 }
--- a/src/components/helpcenter/WhatsNewPopup.vue
+++ b/src/components/helpcenter/WhatsNewPopup.vue
@@ -75,6 +75,11 @@ import { formatVersionAnchor } from '@/utils/formatUtil'
 const { locale, t } = useI18n()
 const releaseStore = useReleaseStore()

+// Emit event for parent component
+const emit = defineEmits<{
+  'whats-new-dismissed': []
+}>()
+
 // Local state for dismissed status
 const isDismissed = ref(false)

@@ -134,6 +139,10 @@ const closePopup = async () => {
    await releaseStore.handleWhatsNewSeen(latestRelease.value.version)
  }
  hide()
+
+  // Emit event to notify parent that What's New was dismissed
+  // Parent can then check if conflict modal should be shown
+  emit('whats-new-dismissed')
 }

 // Learn more handled by anchor href
--- a/src/components/icons/PuzzleIcon.vue
+++ b/src/components/icons/PuzzleIcon.vue
@@ -0,0 +1,43 @@
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    :width="size"
+    :height="size"
+    viewBox="0 0 16 16"
+    fill="none"
+    :class="iconClass"
+  >
+    <g clip-path="url(#clip0_1099_16244)">
+      <path
+        d="M4.99992 3.00016C4.99992 2.07969 5.74611 1.3335 6.66658 1.3335C7.58706 1.3335 8.33325 2.07969 8.33325 3.00016V4.00016H8.99992C9.9318 4.00016 10.3977 4.00016 10.7653 4.1524C11.2553 4.35539 11.6447 4.74474 11.8477 5.2348C11.9999 5.60234 11.9999 6.06828 11.9999 7.00016H12.9999C13.9204 7.00016 14.6666 7.74635 14.6666 8.66683C14.6666 9.5873 13.9204 10.3335 12.9999 10.3335H11.9999V11.4668C11.9999 12.5869 11.9999 13.147 11.7819 13.5748C11.5902 13.9511 11.2842 14.2571 10.9079 14.4488C10.4801 14.6668 9.92002 14.6668 8.79992 14.6668H8.33325V13.5002C8.33325 12.6717 7.66168 12.0002 6.83325 12.0002C6.00482 12.0002 5.33325 12.6717 5.33325 13.5002V14.6668H4.53325C3.41315 14.6668 2.85309 14.6668 2.42527 14.4488C2.04895 14.2571 1.74299 13.9511 1.55124 13.5748C1.33325 13.147 1.33325 12.5869 1.33325 11.4668V10.3335H2.33325C3.25373 10.3335 3.99992 9.5873 3.99992 8.66683C3.99992 7.74635 3.25373 7.00016 2.33325 7.00016H1.33325C1.33325 6.06828 1.33325 5.60234 1.48549 5.2348C1.68848 4.74474 2.07783 4.35539 2.56789 4.1524C2.93543 4.00016 3.40137 4.00016 4.33325 4.00016H4.99992V3.00016Z"
+        :stroke="color"
+        stroke-width="1.2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </g>
+    <defs>
+      <clipPath id="clip0_1099_16244">
+        <rect width="16" height="16" fill="white" />
+      </clipPath>
+    </defs>
+  </svg>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+interface Props {
+  size?: number | string
+  color?: string
+  class?: string
+}
+
+const {
+  size = 16,
+  color = 'currentColor',
+  class: className
+} = defineProps<Props>()
+
+const iconClass = computed(() => className || '')
+</script>
--- a/src/components/icons/VerifiedIcon.vue
+++ b/src/components/icons/VerifiedIcon.vue
@@ -0,0 +1,29 @@
+<template>
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    :width="size"
+    :height="size"
+    viewBox="0 0 16 16"
+    fill="none"
+    :class="iconClass"
+  >
+    <path
+      d="M8.00049 1.3335C8.73661 1.33367 9.33332 1.93038 9.3335 2.6665V2.83447C9.82278 2.96041 10.2851 3.15405 10.7095 3.40479L10.8286 3.28564C11.3493 2.76525 12.1937 2.76519 12.7144 3.28564C13.235 3.80626 13.2348 4.65067 12.7144 5.17139L12.5952 5.29053C12.846 5.71486 13.0396 6.17725 13.1655 6.6665H13.3335C14.0699 6.6665 14.6665 7.26411 14.6665 8.00049C14.6663 8.73672 14.0698 9.3335 13.3335 9.3335H13.1655C13.0396 9.82284 12.846 10.2851 12.5952 10.7095L12.7144 10.8286C13.235 11.3493 13.235 12.1937 12.7144 12.7144C12.1937 13.235 11.3493 13.235 10.8286 12.7144L10.7095 12.5952C10.2851 12.846 9.82284 13.0396 9.3335 13.1655V13.3335C9.3335 14.0698 8.73672 14.6663 8.00049 14.6665C7.26411 14.6665 6.6665 14.0699 6.6665 13.3335V13.1655C6.17725 13.0396 5.71486 12.846 5.29053 12.5952L5.17139 12.7144C4.65067 13.2348 3.80626 13.235 3.28564 12.7144C2.76519 12.1937 2.76525 11.3493 3.28564 10.8286L3.40479 10.7095C3.15405 10.2851 2.96041 9.82278 2.83447 9.3335H2.6665C1.93038 9.33332 1.33367 8.73661 1.3335 8.00049C1.3335 7.26422 1.93027 6.66668 2.6665 6.6665H2.83447C2.96043 6.17722 3.15403 5.71488 3.40479 5.29053L3.28564 5.17139C2.76536 4.65065 2.76508 3.80621 3.28564 3.28564C3.80621 2.76508 4.65065 2.76536 5.17139 3.28564L5.29053 3.40479C5.71488 3.15403 6.17722 2.96043 6.6665 2.83447V2.6665C6.66668 1.93027 7.26422 1.3335 8.00049 1.3335ZM7.3335 8.00049L6.00049 6.6665L4.6665 8.00049L7.3335 10.6665L11.3335 6.6665L10.0005 5.3335L7.3335 8.00049Z"
+      :fill="color"
+    />
+  </svg>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+interface Props {
+  size?: number | string
+  color?: string
+  class?: string
+}
+
+const { size = 16, color = '#60A5FA', class: className } = defineProps<Props>()
+
+const iconClass = computed(() => className || '')
+</script>
--- a/src/components/sidebar/SidebarHelpCenterIcon.vue
+++ b/src/components/sidebar/SidebarHelpCenterIcon.vue
@@ -42,6 +42,7 @@
          'sidebar-right': sidebarLocation === 'right',
          'small-sidebar': sidebarSize === 'small'
        }"
+        @whats-new-dismissed="handleWhatsNewDismissed"
      />
    </Teleport>

@@ -57,12 +58,14 @@
 </template>

 <script setup lang="ts">
-import { storeToRefs } from 'pinia'
 import { computed, onMounted, ref } from 'vue'

 import HelpCenterMenuContent from '@/components/helpcenter/HelpCenterMenuContent.vue'
 import ReleaseNotificationToast from '@/components/helpcenter/ReleaseNotificationToast.vue'
 import WhatsNewPopup from '@/components/helpcenter/WhatsNewPopup.vue'
+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
+import { useConflictDetection } from '@/composables/useConflictDetection'
+import { useDialogService } from '@/services/dialogService'
 import { useReleaseStore } from '@/stores/releaseStore'
 import { useSettingStore } from '@/stores/settingStore'

@@ -70,9 +73,21 @@ import SidebarIcon from './SidebarIcon.vue'

 const settingStore = useSettingStore()
 const releaseStore = useReleaseStore()
-const { shouldShowRedDot } = storeToRefs(releaseStore)
+const conflictDetection = useConflictDetection()
+const conflictAcknowledgment = useConflictAcknowledgment()
+const { showNodeConflictDialog } = useDialogService()
 const isHelpCenterVisible = ref(false)

+// Use conflict acknowledgment state from composable
+const { shouldShowRedDot: shouldShowConflictRedDot, markConflictsAsSeen } =
+  conflictAcknowledgment
+
+// Use either release red dot or conflict red dot
+const shouldShowRedDot = computed(() => {
+  const releaseRedDot = releaseStore.shouldShowRedDot
+  return releaseRedDot || shouldShowConflictRedDot.value
+})
+
 const sidebarLocation = computed(() =>
  settingStore.get('Comfy.Sidebar.Location')
 )
@@ -87,6 +102,38 @@ const closeHelpCenter = () => {
  isHelpCenterVisible.value = false
 }

+/**
+ * Handle What's New popup dismissal
+ * Check if conflict modal should be shown after ComfyUI update
+ */
+const handleWhatsNewDismissed = async () => {
+  try {
+    // Check if conflict modal should be shown after update
+    const shouldShow =
+      await conflictDetection.shouldShowConflictModalAfterUpdate()
+
+    if (shouldShow) {
+      showConflictModal()
+    }
+  } catch (error) {
+    console.error('[HelpCenter] Error checking conflict modal:', error)
+  }
+}
+
+/**
+ * Show the node conflict dialog with current conflict data
+ */
+const showConflictModal = () => {
+  showNodeConflictDialog({
+    showAfterWhatsNew: true,
+    dialogComponentProps: {
+      onClose: () => {
+        markConflictsAsSeen()
+      }
+    }
+  })
+}
+
 // Initialize release store on mount
 onMounted(async () => {
  // Initialize release store to fetch releases for toast and popup
--- a/src/composables/nodePack/useInstalledPacks.ts
+++ b/src/composables/nodePack/useInstalledPacks.ts
@@ -20,7 +20,10 @@ export const useInstalledPacks = (options: UseNodePacksOptions = {}) => {
    packs.filter((pack) => comfyManagerStore.isPackInstalled(pack.id))

  const startFetchInstalled = async () => {
-    await comfyManagerStore.refreshInstalledList()
+    // Only refresh if store doesn't have data yet
+    if (comfyManagerStore.installedPacksIds.size === 0) {
+      await comfyManagerStore.refreshInstalledList()
+    }
    await startFetch()
  }

@@ -33,11 +36,29 @@ export const useInstalledPacks = (options: UseNodePacksOptions = {}) => {
    cleanup()
  })

+  // Create a computed property that provides installed pack info with versions
+  const installedPacksWithVersions = computed(() => {
+    const result: Array<{ id: string; version: string }> = []
+
+    for (const pack of Object.values(comfyManagerStore.installedPacks)) {
+      const id = pack.cnr_id || pack.aux_id
+      if (id) {
+        result.push({
+          id,
+          version: pack.ver
+        })
+      }
+    }
+
+    return result
+  })
+
  return {
    error,
    isLoading,
    isReady,
    installedPacks: nodePacks,
+    installedPacksWithVersions,
    startFetchInstalled,
    filterInstalledPack
  }
--- a/src/composables/nodePack/useUpdateAvailableNodes.ts
+++ b/src/composables/nodePack/useUpdateAvailableNodes.ts
@@ -0,0 +1,65 @@
+import { computed, onMounted } from 'vue'
+
+import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
+import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import type { components } from '@/types/comfyRegistryTypes'
+import { compareVersions, isSemVer } from '@/utils/formatUtil'
+
+/**
+ * Composable to find NodePacks that have updates available
+ * Uses the same filtering approach as ManagerDialogContent.vue
+ * Automatically fetches installed pack data when initialized
+ */
+export const useUpdateAvailableNodes = () => {
+  const comfyManagerStore = useComfyManagerStore()
+  const { installedPacks, isLoading, error, startFetchInstalled } =
+    useInstalledPacks()
+
+  // Check if a pack has updates available (same logic as usePackUpdateStatus)
+  const isOutdatedPack = (pack: components['schemas']['Node']) => {
+    const isInstalled = comfyManagerStore.isPackInstalled(pack?.id)
+    if (!isInstalled) return false
+
+    const installedVersion = comfyManagerStore.getInstalledPackVersion(
+      pack.id ?? ''
+    )
+    const latestVersion = pack.latest_version?.version
+
+    const isNightlyPack = !!installedVersion && !isSemVer(installedVersion)
+
+    if (isNightlyPack || !latestVersion) {
+      return false
+    }
+
+    return compareVersions(latestVersion, installedVersion) > 0
+  }
+
+  // Same filtering logic as ManagerDialogContent.vue
+  const filterOutdatedPacks = (packs: components['schemas']['Node'][]) =>
+    packs.filter(isOutdatedPack)
+
+  // Filter only outdated packs from installed packs
+  const updateAvailableNodePacks = computed(() => {
+    if (!installedPacks.value.length) return []
+    return filterOutdatedPacks(installedPacks.value)
+  })
+
+  // Check if there are any outdated packs
+  const hasUpdateAvailable = computed(() => {
+    return updateAvailableNodePacks.value.length > 0
+  })
+
+  // Automatically fetch installed pack data when composable is used
+  onMounted(async () => {
+    if (!installedPacks.value.length && !isLoading.value) {
+      await startFetchInstalled()
+    }
+  })
+
+  return {
+    updateAvailableNodePacks,
+    hasUpdateAvailable,
+    isLoading,
+    error
+  }
+}
--- a/src/composables/nodePack/useWorkflowPacks.ts
+++ b/src/composables/nodePack/useWorkflowPacks.ts
@@ -7,7 +7,7 @@ import { app } from '@/scripts/app'
 import { useComfyRegistryStore } from '@/stores/comfyRegistryStore'
 import { useNodeDefStore } from '@/stores/nodeDefStore'
 import { useSystemStatsStore } from '@/stores/systemStatsStore'
-import { SelectedVersion, UseNodePacksOptions } from '@/types/comfyManagerTypes'
+import { UseNodePacksOptions } from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
 import { collectAllNodes } from '@/utils/graphTraversalUtil'

@@ -66,8 +66,7 @@ export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
      return {
        id: CORE_NODES_PACK_NAME,
        version:
-          systemStatsStore.systemStats?.system?.comfyui_version ??
-          SelectedVersion.NIGHTLY
+          systemStatsStore.systemStats?.system?.comfyui_version ?? 'nightly'
      }
    }

@@ -77,7 +76,7 @@ export const useWorkflowPacks = (options: UseNodePacksOptions = {}) => {
    if (pack) {
      return {
        id: pack.id,
-        version: pack.latest_version?.version ?? SelectedVersion.NIGHTLY
+        version: pack.latest_version?.version ?? 'nightly'
      }
    }

--- a/src/composables/useConflictAcknowledgment.ts
+++ b/src/composables/useConflictAcknowledgment.ts
@@ -0,0 +1,103 @@
+import { useStorage } from '@vueuse/core'
+import { computed } from 'vue'
+
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
+
+/**
+ * LocalStorage keys for conflict acknowledgment tracking
+ */
+const STORAGE_KEYS = {
+  CONFLICT_MODAL_DISMISSED: 'Comfy.ConflictModalDismissed',
+  CONFLICT_RED_DOT_DISMISSED: 'Comfy.ConflictRedDotDismissed',
+  CONFLICT_WARNING_BANNER_DISMISSED: 'Comfy.ConflictWarningBannerDismissed'
+} as const
+
+/**
+ * Interface for conflict acknowledgment state
+ */
+interface ConflictAcknowledgmentState {
+  modal_dismissed: boolean
+  red_dot_dismissed: boolean
+  warning_banner_dismissed: boolean
+}
+
+/**
+ * Composable for managing conflict acknowledgment state in localStorage
+ *
+ * This handles:
+ * - Tracking whether conflict modal has been dismissed
+ * - Tracking whether red dot notification has been cleared
+ * - Managing per-package conflict acknowledgments
+ * - Detecting ComfyUI version changes to reset acknowledgment state
+ */
+export function useConflictAcknowledgment() {
+  const conflictDetectionStore = useConflictDetectionStore()
+
+  // Reactive state using VueUse's useStorage for automatic persistence
+  const modalDismissed = useStorage(
+    STORAGE_KEYS.CONFLICT_MODAL_DISMISSED,
+    false
+  )
+  const redDotDismissed = useStorage(
+    STORAGE_KEYS.CONFLICT_RED_DOT_DISMISSED,
+    false
+  )
+  const warningBannerDismissed = useStorage(
+    STORAGE_KEYS.CONFLICT_WARNING_BANNER_DISMISSED,
+    false
+  )
+
+  // Create computed state object for backward compatibility
+  const state = computed<ConflictAcknowledgmentState>(() => ({
+    modal_dismissed: modalDismissed.value,
+    red_dot_dismissed: redDotDismissed.value,
+    warning_banner_dismissed: warningBannerDismissed.value
+  }))
+
+  /**
+   * Mark red dot notification as dismissed
+   */
+  function dismissRedDotNotification(): void {
+    redDotDismissed.value = true
+  }
+
+  /**
+   * Mark manager warning banner as dismissed
+   */
+  function dismissWarningBanner(): void {
+    warningBannerDismissed.value = true
+    redDotDismissed.value = true
+  }
+
+  /**
+   * Mark conflicts as seen (unified function for help center and manager)
+   */
+  function markConflictsAsSeen(): void {
+    redDotDismissed.value = true
+    modalDismissed.value = true
+    warningBannerDismissed.value = true
+  }
+
+  const hasConflicts = computed(() => conflictDetectionStore.hasConflicts)
+  const shouldShowConflictModal = computed(() => !modalDismissed.value)
+  const shouldShowRedDot = computed(() => {
+    if (!hasConflicts.value) return false
+    return !redDotDismissed.value
+  })
+  const shouldShowManagerBanner = computed(() => {
+    return hasConflicts.value && !warningBannerDismissed.value
+  })
+
+  return {
+    // State
+    acknowledgmentState: state,
+    shouldShowConflictModal,
+    shouldShowRedDot,
+    shouldShowManagerBanner,
+
+    // Methods
+    dismissRedDotNotification,
+    dismissWarningBanner,
+    markConflictsAsSeen
+  }
+}
--- a/src/composables/useConflictDetection.ts
+++ b/src/composables/useConflictDetection.ts
--- a/src/composables/useCoreCommands.ts
+++ b/src/composables/useCoreCommands.ts
@@ -15,10 +15,11 @@ import { t } from '@/i18n'
 import { api } from '@/scripts/api'
 import { app } from '@/scripts/app'
 import { addFluxKontextGroupNode } from '@/scripts/fluxKontextEditNode'
+import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
 import { useLitegraphService } from '@/services/litegraphService'
 import { useWorkflowService } from '@/services/workflowService'
-import type { ComfyCommand } from '@/stores/commandStore'
+import { type ComfyCommand, useCommandStore } from '@/stores/commandStore'
 import { useExecutionStore } from '@/stores/executionStore'
 import { useCanvasStore, useTitleEditorStore } from '@/stores/graphStore'
 import { useQueueSettingsStore, useQueueStore } from '@/stores/queueStore'
@@ -29,6 +30,7 @@ import { useBottomPanelStore } from '@/stores/workspace/bottomPanelStore'
 import { useColorPaletteStore } from '@/stores/workspace/colorPaletteStore'
 import { useSearchBoxStore } from '@/stores/workspace/searchBoxStore'
 import { useWorkspaceStore } from '@/stores/workspaceStore'
+import { ManagerTab } from '@/types/comfyManagerTypes'
 import { getAllNonIoNodesInSubgraph } from '@/utils/graphTraversalUtil'

 const moveSelectedNodesVersionAdded = '1.22.2'
@@ -683,12 +685,53 @@ export function useCoreCommands(): ComfyCommand[] {
      }
    },
    {
-      id: 'Comfy.Manager.CustomNodesManager',
+      id: 'Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu',
      icon: 'pi pi-puzzle',
-      label: 'Toggle the Custom Nodes Manager',
+      label: 'Show the Custom Nodes Manager',
      versionAdded: '1.12.10',
+      function: async () => {
+        const { is_legacy_manager_ui } =
+          (await useComfyManagerService().isLegacyManagerUI()) ?? {}
+
+        if (is_legacy_manager_ui === true) {
+          try {
+            await useCommandStore().execute(
+              'Comfy.Manager.Menu.ToggleVisibility' // This command is registered by legacy manager FE extension
+            )
+          } catch (error) {
+            useToastStore().add({
+              severity: 'error',
+              summary: t('g.error'),
+              detail: t('manager.legacyMenuNotAvailable'),
+              life: 3000
+            })
+            dialogService.toggleManagerDialog()
+          }
+        } else {
+          dialogService.toggleManagerDialog()
+        }
+      }
+    },
+    {
+      id: 'Comfy.Manager.ShowUpdateAvailablePacks',
+      icon: 'pi pi-sync',
+      label: 'Check for Updates',
+      versionAdded: '1.17.0',
      function: () => {
-        dialogService.toggleManagerDialog()
+        dialogService.showManagerDialog({
+          initialTab: ManagerTab.UpdateAvailable
+        })
+      }
+    },
+    {
+      id: 'Comfy.Manager.ShowMissingPacks',
+      icon: 'pi pi-exclamation-circle',
+      label: 'Install Missing',
+      versionAdded: '1.17.0',
+      function: () => {
+        dialogService.showManagerDialog({
+          initialTab: ManagerTab.Missing
+        })
      }
    },
    {
@@ -777,9 +820,88 @@ export function useCoreCommands(): ComfyCommand[] {
          })
          return
        }
+
        const { node } = res
        canvas.select(node)
      }
+    },
+    {
+      id: 'Comfy.Manager.CustomNodesManager.ShowLegacyCustomNodesMenu',
+      icon: 'pi pi-bars',
+      label: 'Custom Nodes (Legacy)',
+      versionAdded: '1.16.4',
+      function: async () => {
+        try {
+          await useCommandStore().execute(
+            'Comfy.Manager.CustomNodesManager.ToggleVisibility'
+          )
+        } catch (error) {
+          useToastStore().add({
+            severity: 'error',
+            summary: t('g.error'),
+            detail: t('manager.legacyMenuNotAvailable'),
+            life: 3000
+          })
+        }
+      }
+    },
+    {
+      id: 'Comfy.Manager.ShowLegacyManagerMenu',
+      icon: 'mdi mdi-puzzle',
+      label: 'Manager Menu (Legacy)',
+      versionAdded: '1.16.4',
+      function: async () => {
+        try {
+          await useCommandStore().execute('Comfy.Manager.Menu.ToggleVisibility')
+        } catch (error) {
+          useToastStore().add({
+            severity: 'error',
+            summary: t('g.error'),
+            detail: t('manager.legacyMenuNotAvailable'),
+            life: 3000
+          })
+        }
+      }
+    },
+    {
+      id: 'Comfy.Memory.UnloadModels',
+      icon: 'mdi mdi-vacuum-outline',
+      label: 'Unload Models',
+      versionAdded: '1.16.4',
+      function: async () => {
+        if (!useSettingStore().get('Comfy.Memory.AllowManualUnload')) {
+          useToastStore().add({
+            severity: 'error',
+            summary: t('g.error'),
+            detail: t('g.commandProhibited', {
+              command: 'Comfy.Memory.UnloadModels'
+            }),
+            life: 3000
+          })
+          return
+        }
+        await api.freeMemory({ freeExecutionCache: false })
+      }
+    },
+    {
+      id: 'Comfy.Memory.UnloadModelsAndExecutionCache',
+      icon: 'mdi mdi-vacuum-outline',
+      label: 'Unload Models and Execution Cache',
+      versionAdded: '1.16.4',
+      function: async () => {
+        if (!useSettingStore().get('Comfy.Memory.AllowManualUnload')) {
+          useToastStore().add({
+            severity: 'error',
+            summary: t('g.error'),
+            detail: t('g.commandProhibited', {
+              command: 'Comfy.Memory.UnloadModelsAndExecutionCache'
+            }),
+            life: 3000
+          })
+          return
+        }
+        await api.freeMemory({ freeExecutionCache: true })
+      }
    }
  ]

--- a/src/composables/useImportFailedDetection.ts
+++ b/src/composables/useImportFailedDetection.ts
@@ -0,0 +1,85 @@
+import { type ComputedRef, computed, unref } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import { useDialogService } from '@/services/dialogService'
+import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
+import type { ConflictDetail } from '@/types/conflictDetectionTypes'
+
+/**
+ * Extracting import failed conflicts from conflict list
+ */
+function extractImportFailedConflicts(conflicts?: ConflictDetail[] | null) {
+  if (!conflicts) return null
+
+  const importFailedConflicts = conflicts.filter(
+    (item): item is ConflictDetail => item.type === 'import_failed'
+  )
+
+  return importFailedConflicts.length > 0 ? importFailedConflicts : null
+}
+
+/**
+ * Creating import failed dialog
+ */
+function createImportFailedDialog() {
+  const { t } = useI18n()
+  const { showErrorDialog } = useDialogService()
+
+  return (importFailedInfo: ConflictDetail[] | null) => {
+    if (importFailedInfo) {
+      const errorMessage =
+        importFailedInfo
+          .map((conflict) => conflict.required_value)
+          .filter(Boolean)
+          .join('\n') || t('manager.importFailedGenericError')
+
+      const error = new Error(errorMessage)
+
+      showErrorDialog(error, {
+        title: t('manager.failedToInstall'),
+        reportType: 'importFailedError'
+      })
+    }
+  }
+}
+
+/**
+ * Composable for detecting and handling import failed conflicts
+ * @param packageId - Package ID string or computed ref
+ * @returns Object with import failed detection and dialog handler
+ */
+export function useImportFailedDetection(
+  packageId?: string | ComputedRef<string> | null
+) {
+  const { isPackInstalled } = useComfyManagerStore()
+  const { getConflictsForPackageByID } = useConflictDetectionStore()
+
+  const isInstalled = computed(() =>
+    packageId ? isPackInstalled(unref(packageId)) : false
+  )
+
+  const conflicts = computed(() => {
+    const currentPackageId = unref(packageId)
+    if (!currentPackageId || !isInstalled.value) return null
+    return getConflictsForPackageByID(currentPackageId) || null
+  })
+
+  const importFailedInfo = computed(() => {
+    return extractImportFailedConflicts(conflicts.value?.conflicts)
+  })
+
+  const importFailed = computed(() => {
+    return importFailedInfo.value !== null
+  })
+
+  const showImportFailedDialog = createImportFailedDialog()
+
+  return {
+    importFailedInfo,
+    importFailed,
+    showImportFailedDialog: () =>
+      showImportFailedDialog(importFailedInfo.value),
+    isInstalled
+  }
+}
--- a/src/composables/useManagerQueue.ts
+++ b/src/composables/useManagerQueue.ts
@@ -1,101 +1,153 @@
 import { useEventListener, whenever } from '@vueuse/core'
-import { computed, readonly, ref } from 'vue'
+import { mapKeys, pickBy } from 'lodash'
+import { Ref, computed, ref } from 'vue'

-import { api } from '@/scripts/api'
-import { ManagerWsQueueStatus } from '@/types/comfyManagerTypes'
+import { app } from '@/scripts/app'
+import { useDialogService } from '@/services/dialogService'
+import { components } from '@/types/generatedManagerTypes'

-type QueuedTask<T> = {
-  task: () => Promise<T>
-  onComplete?: () => void
-}
+type ManagerTaskHistory = Record<
+  string,
+  components['schemas']['TaskHistoryItem']
+>
+type ManagerTaskQueue = components['schemas']['TaskStateMessage']
+type ManagerWsTaskDoneMsg = components['schemas']['MessageTaskDone']
+type ManagerWsTaskStartedMsg = components['schemas']['MessageTaskStarted']
+type QueueTaskItem = components['schemas']['QueueTaskItem']
+type HistoryTaskItem = components['schemas']['TaskHistoryItem']
+type Task = QueueTaskItem | HistoryTaskItem

-const MANAGER_WS_MSG_TYPE = 'cm-queue-status'
+const MANAGER_WS_TASK_DONE_NAME = 'cm-task-completed'
+const MANAGER_WS_TASK_STARTED_NAME = 'cm-task-started'

-export const useManagerQueue = () => {
-  const clientQueueItems = ref<QueuedTask<unknown>[]>([])
-  const clientQueueLength = computed(() => clientQueueItems.value.length)
-  const onCompletedQueue = ref<((() => void) | undefined)[]>([])
-  const onCompleteWaitingCount = ref(0)
-  const uncompletedCount = computed(
-    () => clientQueueLength.value + onCompleteWaitingCount.value
+export const useManagerQueue = (
+  taskHistory: Ref<ManagerTaskHistory>,
+  taskQueue: Ref<ManagerTaskQueue>,
+  installedPacks: Ref<Record<string, any>>
+) => {
+  const { showManagerProgressDialog } = useDialogService()
+
+  // Task queue state (read-only from server)
+  const maxHistoryItems = ref(64)
+  const isLoading = ref(false)
+  const isProcessing = ref(false)
+
+  // Computed values
+  const currentQueueLength = computed(
+    () =>
+      taskQueue.value.running_queue.length +
+      taskQueue.value.pending_queue.length
  )

-  const serverQueueStatus = ref<ManagerWsQueueStatus>(ManagerWsQueueStatus.DONE)
-  const isServerIdle = computed(
-    () => serverQueueStatus.value === ManagerWsQueueStatus.DONE
-  )
+  /**
+   * Update the processing state based on the current queue length.
+   * If the queue is empty, or all tasks in the queue are associated
+   * with different clients, then this client is not processing any tasks.
+   */
+  const updateProcessingState = (): void => {
+    isProcessing.value = currentQueueLength.value > 0
+  }

-  const allTasksDone = computed(
-    () => isServerIdle.value && clientQueueLength.value === 0
-  )
-  const nextTaskReady = computed(
-    () => isServerIdle.value && clientQueueLength.value > 0
-  )
+  const allTasksDone = computed(() => currentQueueLength.value === 0)
+  const historyCount = computed(() => Object.keys(taskHistory.value).length)

-  const cleanupListener = useEventListener(
-    api,
-    MANAGER_WS_MSG_TYPE,
-    (event: CustomEvent<{ status: ManagerWsQueueStatus }>) => {
-      if (event?.type === MANAGER_WS_MSG_TYPE && event.detail?.status) {
-        serverQueueStatus.value = event.detail.status
+  /**
+   * Check if a task is associated with this client.
+   * Task can be from running queue, pending queue, or history.
+   * @param task - The task to check
+   * @returns True if the task belongs to this client
+   */
+  const isTaskFromThisClient = (task: Task): boolean =>
+    task.client_id === app.api.clientId
+
+  /**
+   * Filter queue tasks by client id.
+   * Ensures that only tasks associated with this client are processed and
+   * added to client state.
+   * @param tasks - Array of queue tasks to filter
+   * @returns Filtered array containing only tasks from this client
+   */
+  const filterQueueByClientId = (tasks: QueueTaskItem[]): QueueTaskItem[] =>
+    tasks.filter(isTaskFromThisClient)
+
+  /**
+   * Filter history tasks by client id using lodash pickBy for optimal performance.
+   * Returns a new object containing only tasks associated with this client.
+   * @param history - The history object to filter
+   * @returns Filtered history object containing only tasks from this client
+   */
+  const filterHistoryByClientId = (history: ManagerTaskHistory) =>
+    pickBy(history, isTaskFromThisClient)
+
+  /**
+   * Update task queue and history state with filtered data from server.
+   * Ensures only tasks from this client are stored in local state.
+   * @param state - The task state message from the server
+   */
+  const updateTaskState = (state: ManagerTaskQueue) => {
+    taskQueue.value.running_queue = filterQueueByClientId(state.running_queue)
+    taskQueue.value.pending_queue = filterQueueByClientId(state.pending_queue)
+    taskHistory.value = filterHistoryByClientId(state.history)
+
+    if (state.installed_packs) {
+      // The keys are 'cleaned' by stripping the version suffix.
+      // The pack object itself (the value) still contains the version info.
+      const packsWithCleanedKeys = mapKeys(
+        state.installed_packs,
+        (_value, key) => {
+          return key.split('@')[0]
+        }
+      )
+      installedPacks.value = packsWithCleanedKeys
+    }
+    updateProcessingState()
+  }
+
+  // WebSocket event listener for task done
+  const cleanupTaskDoneListener = useEventListener(
+    app.api,
+    MANAGER_WS_TASK_DONE_NAME,
+    (event: CustomEvent<ManagerWsTaskDoneMsg>) => {
+      if (event?.type === MANAGER_WS_TASK_DONE_NAME) {
+        const { state } = event.detail
+        updateTaskState(state)
      }
    }
  )

-  const startNextTask = () => {
-    const nextTask = clientQueueItems.value.shift()
-    if (!nextTask) return
-
-    const { task, onComplete } = nextTask
-    if (onComplete) {
-      // Set the task's onComplete to be executed the next time the server is idle
-      onCompletedQueue.value.push(onComplete)
-      onCompleteWaitingCount.value++
-    }
-
-    task().catch((e) => {
-      const message = `Error enqueuing task for ComfyUI Manager: ${e}`
-      console.error(message)
-    })
-  }
-
-  const enqueueTask = <T>(task: QueuedTask<T>): void => {
-    clientQueueItems.value.push(task)
-  }
-
-  const clearQueue = () => {
-    clientQueueItems.value = []
-    onCompletedQueue.value = []
-    onCompleteWaitingCount.value = 0
-  }
-
-  const cleanup = () => {
-    clearQueue()
-    cleanupListener()
-  }
-
-  whenever(nextTaskReady, startNextTask)
-  whenever(isServerIdle, () => {
-    if (onCompletedQueue.value?.length) {
-      while (
-        onCompleteWaitingCount.value > 0 &&
-        onCompletedQueue.value.length > 0
-      ) {
-        const onComplete = onCompletedQueue.value.shift()
-        onComplete?.()
-        onCompleteWaitingCount.value--
+  // WebSocket event listener for task started
+  const cleanupTaskStartedListener = useEventListener(
+    app.api,
+    MANAGER_WS_TASK_STARTED_NAME,
+    (event: CustomEvent<ManagerWsTaskStartedMsg>) => {
+      if (event?.type === MANAGER_WS_TASK_STARTED_NAME) {
+        const { state } = event.detail
+        updateTaskState(state)
      }
    }
-  })
+  )
+
+  whenever(currentQueueLength, () => showManagerProgressDialog())
+
+  const stopListening = () => {
+    cleanupTaskDoneListener()
+    cleanupTaskStartedListener()
+  }

  return {
-    allTasksDone,
-    statusMessage: readonly(serverQueueStatus),
-    queueLength: clientQueueLength,
-    uncompletedCount,
+    // Queue state (read-only from server)
+    taskHistory,
+    taskQueue,
+    maxHistoryItems,
+    isLoading,

-    enqueueTask,
-    clearQueue,
-    cleanup
+    // Computed state
+    allTasksDone,
+    isProcessing,
+    queueLength: currentQueueLength,
+    historyCount,
+
+    // Actions
+    stopListening
  }
 }
--- a/src/composables/useServerLogs.ts
+++ b/src/composables/useServerLogs.ts
@@ -1,24 +1,34 @@
 import { useEventListener } from '@vueuse/core'
-import { onUnmounted, ref } from 'vue'
+import { ref } from 'vue'

 import { LogsWsMessage } from '@/schemas/apiSchema'
 import { api } from '@/scripts/api'
+import { components } from '@/types/generatedManagerTypes'

 const LOGS_MESSAGE_TYPE = 'logs'
+const MANAGER_WS_TASK_DONE_NAME = 'cm-task-completed'
+const MANAGER_WS_TASK_STARTED_NAME = 'cm-task-started'
+
+type ManagerWsTaskDoneMsg = components['schemas']['MessageTaskDone']
+type ManagerWsTaskStartedMsg = components['schemas']['MessageTaskStarted']

 interface UseServerLogsOptions {
+  ui_id: string
  immediate?: boolean
  messageFilter?: (message: string) => boolean
 }

-export const useServerLogs = (options: UseServerLogsOptions = {}) => {
+export const useServerLogs = (options: UseServerLogsOptions) => {
  const {
    immediate = false,
    messageFilter = (msg: string) => Boolean(msg.trim())
  } = options

  const logs = ref<string[]>([])
-  let stop: ReturnType<typeof useEventListener> | null = null
+  const isTaskStarted = ref(false)
+  let stopLogs: ReturnType<typeof useEventListener> | null = null
+  let stopTaskDone: ReturnType<typeof useEventListener> | null = null
+  let stopTaskStarted: ReturnType<typeof useEventListener> | null = null

  const isValidLogEvent = (event: CustomEvent<LogsWsMessage>) =>
    event?.type === LOGS_MESSAGE_TYPE && event.detail?.entries?.length > 0
@@ -27,34 +37,81 @@ export const useServerLogs = (options: UseServerLogsOptions = {}) => {
    event.detail.entries.map((e) => e.m).filter(messageFilter)

  const handleLogMessage = (event: CustomEvent<LogsWsMessage>) => {
+    // Only capture logs if this task has started
+    if (!isTaskStarted.value) return
+
    if (isValidLogEvent(event)) {
-      logs.value.push(...parseLogMessage(event))
+      const messages = parseLogMessage(event)
+      if (messages.length > 0) {
+        logs.value.push(...messages)
+      }
    }
  }

-  const start = async () => {
+  const handleTaskStarted = (event: CustomEvent<ManagerWsTaskStartedMsg>) => {
+    if (event?.type === MANAGER_WS_TASK_STARTED_NAME) {
+      // Check if this is our task starting
+      const isOurTask = event.detail.ui_id === options.ui_id
+      if (isOurTask) {
+        isTaskStarted.value = true
+        void stopTaskStarted?.()
+      }
+    }
+  }
+
+  const handleTaskDone = (event: CustomEvent<ManagerWsTaskDoneMsg>) => {
+    if (event?.type === MANAGER_WS_TASK_DONE_NAME) {
+      const { state } = event.detail
+      // Check if our task is now in the history (completed)
+      const isOurTaskDone = state.history[options.ui_id]
+      if (isOurTaskDone) {
+        isTaskStarted.value = false
+        void stopListening()
+      }
+    }
+  }
+
+  const startListening = async () => {
    await api.subscribeLogs(true)
-    stop = useEventListener(api, LOGS_MESSAGE_TYPE, handleLogMessage)
+    stopLogs = useEventListener(api, LOGS_MESSAGE_TYPE, handleLogMessage)
+    stopTaskStarted = useEventListener(
+      api,
+      MANAGER_WS_TASK_STARTED_NAME,
+      handleTaskStarted
+    )
+    stopTaskDone = useEventListener(
+      api,
+      MANAGER_WS_TASK_DONE_NAME,
+      handleTaskDone
+    )
  }

  const stopListening = async () => {
-    stop?.()
-    stop = null
-    await api.subscribeLogs(false)
+    stopLogs?.()
+    stopTaskStarted?.()
+    stopTaskDone?.()
+    stopLogs = null
+    stopTaskStarted = null
+    stopTaskDone = null
+    // TODO: move subscribe/unsubscribe logs to useManagerQueue. Subscribe when task starts if not already subscribed.
+    // Unsubscribe ONLY when there are no tasks running or queued up and the only remaining task finishes.
+    // await api.subscribeLogs(false)
  }

  if (immediate) {
-    void start()
+    void startListening()
  }

-  onUnmounted(async () => {
+  const cleanup = async () => {
    await stopListening()
    logs.value = []
-  })
+    isTaskStarted.value = false
+  }

  return {
    logs,
-    startListening: start,
-    stopListening
+    startListening,
+    stopListening,
+    cleanup
  }
 }
--- a/src/constants/coreMenuCommands.ts
+++ b/src/constants/coreMenuCommands.ts
@@ -11,9 +11,24 @@ export const CORE_MENU_COMMANDS = [
    ]
  ],
  [['Edit'], ['Comfy.Undo', 'Comfy.Redo']],
-  [['Edit'], ['Comfy.RefreshNodeDefinitions']],
+  [
+    ['Edit'],
+    [
+      'Comfy.RefreshNodeDefinitions',
+      'Comfy.Memory.UnloadModels',
+      'Comfy.Memory.UnloadModelsAndExecutionCache'
+    ]
+  ],
  [['Edit'], ['Comfy.ClearWorkflow']],
  [['Edit'], ['Comfy.OpenClipspace']],
+  [
+    ['Manager'],
+    [
+      'Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu',
+      'Comfy.Manager.ShowMissingPacks',
+      'Comfy.Manager.ShowUpdateAvailablePacks'
+    ]
+  ],
  [
    ['Help'],
    [
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -892,5 +892,12 @@ export const CORE_SETTINGS: SettingParams[] = [
    name: 'Release seen timestamp',
    type: 'hidden',
    defaultValue: 0
+  },
+  {
+    id: 'Comfy.Memory.AllowManualUnload',
+    name: 'Allow manual unload of models and execution cache via user command',
+    type: 'hidden',
+    defaultValue: true,
+    versionAdded: '1.18.0'
  }
 ]
--- a/src/locales/en/commands.json
+++ b/src/locales/en/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "Load Default Workflow"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "Toggle the Custom Nodes Manager"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "Show the Custom Nodes Manager"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "Custom Nodes (Legacy)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "Manager Menu (Legacy)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "Install Missing Custom Nodes"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "Check for Custom Node Updates"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "Toggle the Custom Nodes Manager Progress Bar"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "Open Mask Editor for Selected Node"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "Unload Models"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "Unload Models and Execution Cache"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "New Blank Workflow"
  },
--- a/src/locales/en/main.json
+++ b/src/locales/en/main.json
@@ -109,6 +109,7 @@
    "resultsCount": "Found {count} Results",
    "status": "Status",
    "description": "Description",
+    "warning": "Warning",
    "name": "Name",
    "category": "Category",
    "sort": "Sort",
@@ -140,6 +141,7 @@
    "releaseTitle": "{package} {version} Release",
    "progressCountOf": "of",
    "keybindingAlreadyExists": "Keybinding already exists on",
+    "commandProhibited": "Command {command} is prohibited. Contact an administrator for more information.",
    "startRecording": "Start Recording",
    "stopRecording": "Stop Recording",
    "micPermissionDenied": "Microphone permission denied",
@@ -148,7 +150,13 @@
  },
  "manager": {
    "title": "Custom Nodes Manager",
-    "failed": "Failed ({count})",
+    "legacyMenuNotAvailable": "Legacy manager menu is not available, defaulting to the new manager menu.",
+    "legacyManagerUI": "Use Legacy UI",
+    "legacyManagerUIDescription": "To use the legacy Manager UI, start ComfyUI with --enable-manager-legacy-ui",
+    "failed": "Failed",
+    "failedToInstall": "Failed to Install",
+    "installError": "Install Error",
+    "importFailedGenericError": "Package failed to import. Check the console for more details.",
    "noNodesFound": "No nodes found",
    "noNodesFoundDescription": "The pack's nodes either could not be parsed, or the pack is a frontend extension only and doesn't have any nodes.",
    "installationQueue": "Installation Queue",
@@ -156,15 +164,21 @@
    "dependencies": "Dependencies",
    "inWorkflow": "In Workflow",
    "infoPanelEmpty": "Click an item to see the info",
-    "restartToApplyChanges": "To apply changes, please restart ComfyUI",
+    "applyChanges": "Apply Changes",
+    "restartToApplyChanges": "Click 'Apply Changes' to finish setup",
+    "restartingBackend": "Restarting backend to apply changes...",
+    "extensionsSuccessfullyInstalled": "Extension(s) successfully installed and are ready to use!",
    "loadingVersions": "Loading versions...",
    "selectVersion": "Select Version",
    "downloads": "Downloads",
    "repository": "Repository",
+    "installingDependencies": "Installing dependencies...",
    "uninstall": "Uninstall",
    "uninstalling": "Uninstalling",
    "update": "Update",
    "uninstallSelected": "Uninstall Selected",
+    "updateSelected": "Update Selected",
+    "updateAll": "Update All",
    "updatingAllPacks": "Updating all packages",
    "license": "License",
    "nightlyVersion": "Nightly",
@@ -183,14 +197,16 @@
    "noDescription": "No description available",
    "installSelected": "Install Selected",
    "installAllMissingNodes": "Install All Missing Nodes",
-    "packsSelected": "Packs Selected",
+    "packsSelected": "packs selected",
    "status": {
      "active": "Active",
      "pending": "Pending",
      "flagged": "Flagged",
      "deleted": "Deleted",
      "banned": "Banned",
-      "unknown": "Unknown"
+      "unknown": "Unknown",
+      "conflicting": "Conflicting",
+      "importFailed": "Install Error"
    },
    "sort": {
      "downloads": "Most Popular",
@@ -202,6 +218,34 @@
      "nodePack": "Node Pack",
      "enabled": "Enabled",
      "disabled": "Disabled"
+    },
+    "conflicts": {
+      "title": "Conflicts Detected!",
+      "description": "We’ve detected conflicts between some of your extensions and the new version of ComfyUI. By updating you risk breaking workflows that rely on those extensions.",
+      "info": "If you continue with the update, the conflicting extensions will be disabled automatically. You can review and manage them anytime in the ComfyUI Manager.",
+      "extensionAtRisk": "Extension at Risk",
+      "conflicts": "Conflicts",
+      "importFailedExtensions": "Import Failed Extensions",
+      "conflictInfoTitle": "Why is this happening?",
+      "installAnyway": "Install Anyway",
+      "enableAnyway": "Enable Anyway",
+      "understood": "Understood",
+      "warningBanner": {
+        "title": "Some extensions are disabled due to incompatibility with your current setup",
+        "message": "These extensions require versions of system packages  that differ from your current setup. Installing them may override core dependencies and affect other extensions or workflows.",
+        "button": "Learn More..."
+      },
+      "conflictMessages": {
+        "comfyui_version": "ComfyUI version mismatch (current: {current}, required: {required})",
+        "frontend_version": "Frontend version mismatch (current: {current}, required: {required})",
+        "os": "Operating system not supported (current: {current}, required: {required})",
+        "accelerator": "GPU/Accelerator not supported (available: {current}, required: {required})",
+        "generic": "Compatibility issue (current: {current}, required: {required})",
+        "banned": "This package is banned for security reasons",
+        "pending": "Security verification pending - compatibility cannot be verified",
+        "import_failed": "Import Failed"
+      },
+      "warningTooltip": "This package may have compatibility issues with your current environment"
    }
  },
  "issueReport": {
@@ -493,6 +537,7 @@
    "docs": "Docs",
    "github": "Github",
    "helpFeedback": "Help & Feedback",
+    "managerExtension": "Manager Extension",
    "more": "More...",
    "whatsNew": "What's New?",
    "clickToLearnMore": "Click to learn more →",
@@ -930,6 +975,7 @@
  "menuLabels": {
    "Workflow": "Workflow",
    "Edit": "Edit",
+    "Manager": "Manager",
    "Help": "Help",
    "Check for Updates": "Check for Updates",
    "Open Custom Nodes Folder": "Open Custom Nodes Folder",
@@ -983,11 +1029,22 @@
    "ComfyUI Issues": "ComfyUI Issues",
    "Interrupt": "Interrupt",
    "Load Default Workflow": "Load Default Workflow",
+    "Show the Custom Nodes Manager": "Show the Custom Nodes Manager",
    "Toggle the Custom Nodes Manager": "Toggle the Custom Nodes Manager",
    "Toggle the Custom Nodes Manager Progress Bar": "Toggle the Custom Nodes Manager Progress Bar",
    "Decrease Brush Size in MaskEditor": "Decrease Brush Size in MaskEditor",
    "Increase Brush Size in MaskEditor": "Increase Brush Size in MaskEditor",
+    "Custom Nodes (Beta)": "Custom Nodes (Beta)",
+    "Custom Nodes Manager": "Custom Nodes Manager",
+    "Install Missing": "Install Missing",
+    "Custom Nodes (Legacy)": "Custom Nodes (Legacy)",
+    "Manager Menu (Legacy)": "Manager Menu (Legacy)",
+    "Install Missing Custom Nodes": "Install Missing Custom Nodes",
+    "Check for Custom Node Updates": "Check for Custom Node Updates",
+    "Toggle the Custom Nodes Manager Progress Bar": "Toggle the Custom Nodes Manager Progress Bar",
    "Open Mask Editor for Selected Node": "Open Mask Editor for Selected Node",
+    "Unload Models": "Unload Models",
+    "Unload Models and Execution Cache": "Unload Models and Execution Cache",
    "New": "New",
    "Clipspace": "Clipspace",
    "Open": "Open",
--- a/src/locales/es/commands.json
+++ b/src/locales/es/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "Cargar flujo de trabajo predeterminado"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "Administrador de nodos personalizados"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "Nodos personalizados (Beta)"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "Nodos personalizados (heredados)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "Menú del gestor (heredado)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "Instalar faltantes"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "Buscar actualizaciones"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "Alternar diálogo de progreso del administrador"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "Abrir editor de máscara para el nodo seleccionado"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "Descargar modelos"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "Descargar modelos y caché de ejecución"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "Nuevo flujo de trabajo en blanco"
  },
--- a/src/locales/es/main.json
+++ b/src/locales/es/main.json
@@ -276,6 +276,7 @@
    "color": "Color",
    "comingSoon": "Próximamente",
    "command": "Comando",
+    "commandProhibited": "El comando {command} está prohibido. Contacta a un administrador para más información.",
    "community": "Comunidad",
    "completed": "Completado",
    "confirm": "Confirmar",
@@ -627,12 +628,14 @@
    "title": "Mantenimiento"
  },
  "manager": {
+    "applyChanges": "Aplicar cambios",
    "changingVersion": "Cambiando versión de {from} a {to}",
    "createdBy": "Creado Por",
    "dependencies": "Dependencias",
    "discoverCommunityContent": "Descubre paquetes de nodos, extensiones y más creados por la comunidad...",
    "downloads": "Descargas",
    "errorConnecting": "Error al conectar con el Registro de Nodos Comfy.",
+    "extensionsSuccessfullyInstalled": "¡Extensión(es) instalada(s) correctamente y lista(s) para usar!",
    "failed": "Falló ({count})",
    "filter": {
      "disabled": "Deshabilitado",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "Instalar todos los nodos faltantes",
    "installSelected": "Instalar Seleccionado",
    "installationQueue": "Cola de Instalación",
+    "installingDependencies": "Instalando dependencias...",
    "lastUpdated": "Última Actualización",
    "latestVersion": "Última",
+    "legacyManagerUI": "Usar UI antigua",
+    "legacyManagerUIDescription": "Para usar la UI antigua del Manager, inicia ComfyUI con --enable-manager-legacy-ui",
+    "legacyMenuNotAvailable": "El menú del administrador antiguo no está disponible en esta versión de ComfyUI. Por favor, utiliza el nuevo menú del administrador en su lugar.",
    "license": "Licencia",
    "loadingVersions": "Cargando versiones...",
    "nightlyVersion": "Nocturna",
@@ -657,6 +664,7 @@
    "packsSelected": "Paquetes Seleccionados",
    "repository": "Repositorio",
    "restartToApplyChanges": "Para aplicar los cambios, por favor reinicia ComfyUI",
+    "restartingBackend": "Reiniciando el backend para aplicar los cambios...",
    "searchPlaceholder": "Buscar",
    "selectVersion": "Seleccionar Versión",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "Desinstalar Seleccionado",
    "uninstalling": "Desinstalando",
    "update": "Actualizar",
+    "updateAll": "Actualizar todo",
+    "updateSelected": "Actualizar seleccionados",
    "updatingAllPacks": "Actualizando todos los paquetes",
    "version": "Versión"
  },
@@ -746,6 +756,8 @@
    "Canvas Toggle Link Visibility": "Alternar visibilidad de enlace en lienzo",
    "Canvas Toggle Lock": "Alternar bloqueo en lienzo",
    "Canvas Toggle Minimap": "Lienzo: Alternar minimapa",
+    "Check for Custom Node Updates": "Buscar actualizaciones de nodos personalizados",
+    "Check for Custom Node Updates": "Buscar Actualizaciones de Nodos Personalizados",
    "Check for Updates": "Buscar actualizaciones",
    "Clear Pending Tasks": "Borrar tareas pendientes",
    "Clear Workflow": "Borrar flujo de trabajo",
@@ -759,6 +771,10 @@
    "Contact Support": "Contactar soporte",
    "Convert Selection to Subgraph": "Convertir selección en subgrafo",
    "Convert selected nodes to group node": "Convertir nodos seleccionados en nodo de grupo",
+    "Custom Nodes (Beta)": "Nodos personalizados (Beta)",
+    "Custom Nodes (Legacy)": "Nodos personalizados (Antiguo)",
+    "Custom Nodes (Legacy)": "Nodos Personalizados (Legado)",
+    "Custom Nodes Manager": "Administrador de Nodos Personalizados",
    "Decrease Brush Size in MaskEditor": "Disminuir tamaño del pincel en MaskEditor",
    "Delete Selected Items": "Eliminar elementos seleccionados",
    "Desktop User Guide": "Guía de usuario de escritorio",
@@ -772,9 +788,14 @@
    "Group Selected Nodes": "Agrupar nodos seleccionados",
    "Help": "Ayuda",
    "Increase Brush Size in MaskEditor": "Aumentar tamaño del pincel en MaskEditor",
+    "Install Missing": "Instalar Faltantes",
+    "Install Missing Custom Nodes": "Instalar nodos personalizados faltantes",
+    "Install Missing Custom Nodes": "Instalar Nodos Personalizados Faltantes",
    "Interrupt": "Interrumpir",
    "Load Default Workflow": "Cargar flujo de trabajo predeterminado",
    "Manage group nodes": "Gestionar nodos de grupo",
+    "Manager": "Administrador",
+    "Manager Menu (Legacy)": "Menú de Gestión (Legado)",
    "Move Selected Nodes Down": "Mover nodos seleccionados hacia abajo",
    "Move Selected Nodes Left": "Mover nodos seleccionados hacia la izquierda",
    "Move Selected Nodes Right": "Mover nodos seleccionados hacia la derecha",
@@ -808,6 +829,7 @@
    "Save": "Guardar",
    "Save As": "Guardar como",
    "Show Settings Dialog": "Mostrar diálogo de configuración",
+    "Show the Custom Nodes Manager": "Mostrar el Administrador de Nodos Personalizados",
    "Sign Out": "Cerrar sesión",
    "Toggle Bottom Panel": "Alternar panel inferior",
    "Toggle Focus Mode": "Alternar modo de enfoque",
@@ -819,10 +841,11 @@
    "Toggle Terminal Bottom Panel": "Alternar panel inferior de terminal",
    "Toggle Theme (Dark/Light)": "Alternar tema (Oscuro/Claro)",
    "Toggle Workflows Sidebar": "Alternar barra lateral de los flujos de trabajo",
-    "Toggle the Custom Nodes Manager": "Alternar el Administrador de Nodos Personalizados",
    "Toggle the Custom Nodes Manager Progress Bar": "Alternar la Barra de Progreso del Administrador de Nodos Personalizados",
    "Undo": "Deshacer",
    "Ungroup selected group nodes": "Desagrupar nodos de grupo seleccionados",
+    "Unload Models": "Descargar modelos",
+    "Unload Models and Execution Cache": "Descargar modelos y caché de ejecución",
    "Workflow": "Flujo de trabajo",
    "Zoom In": "Acercar",
    "Zoom Out": "Alejar"
--- a/src/locales/fr/commands.json
+++ b/src/locales/fr/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "Charger le flux de travail par défaut"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "Gestionnaire de Nœuds Personnalisés"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "Nœuds personnalisés (Beta)"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "Nœuds personnalisés (héritage)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "Menu du gestionnaire (hérité)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "Installer manquants"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "Vérifier les mises à jour"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "Basculer la boîte de dialogue de progression"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "Ouvrir l'éditeur de masque pour le nœud sélectionné"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "Décharger les modèles"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "Décharger les modèles et le cache d'exécution"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "Nouveau flux de travail vierge"
  },
--- a/src/locales/fr/main.json
+++ b/src/locales/fr/main.json
@@ -276,6 +276,7 @@
    "color": "Couleur",
    "comingSoon": "Bientôt disponible",
    "command": "Commande",
+    "commandProhibited": "La commande {command} est interdite. Contactez un administrateur pour plus d'informations.",
    "community": "Communauté",
    "completed": "Terminé",
    "confirm": "Confirmer",
@@ -627,12 +628,14 @@
    "title": "Maintenance"
  },
  "manager": {
+    "applyChanges": "Appliquer les modifications",
    "changingVersion": "Changement de version de {from} à {to}",
    "createdBy": "Créé par",
    "dependencies": "Dépendances",
    "discoverCommunityContent": "Découvrez les packs de nœuds, extensions et plus encore créés par la communauté...",
    "downloads": "Téléchargements",
    "errorConnecting": "Erreur de connexion au registre de nœuds Comfy.",
+    "extensionsSuccessfullyInstalled": "Extension(s) installée(s) avec succès et prêtes à l'emploi !",
    "failed": "Échoué ({count})",
    "filter": {
      "disabled": "Désactivé",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "Installer tous les nœuds manquants",
    "installSelected": "Installer sélectionné",
    "installationQueue": "File d'attente d'installation",
+    "installingDependencies": "Installation des dépendances...",
    "lastUpdated": "Dernière mise à jour",
    "latestVersion": "Dernière",
+    "legacyManagerUI": "Utiliser l'interface utilisateur héritée",
+    "legacyManagerUIDescription": "Pour utiliser l'interface utilisateur de gestion héritée, démarrez ComfyUI avec --enable-manager-legacy-ui",
+    "legacyMenuNotAvailable": "Le menu du gestionnaire de l'ancienne version n'est pas disponible dans cette version de ComfyUI. Veuillez utiliser le nouveau menu du gestionnaire à la place.",
    "license": "Licence",
    "loadingVersions": "Chargement des versions...",
    "nightlyVersion": "Nocturne",
@@ -657,6 +664,7 @@
    "packsSelected": "Packs sélectionnés",
    "repository": "Référentiel",
    "restartToApplyChanges": "Pour appliquer les modifications, veuillez redémarrer ComfyUI",
+    "restartingBackend": "Redémarrage du backend pour appliquer les modifications...",
    "searchPlaceholder": "Recherche",
    "selectVersion": "Sélectionner la version",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "Désinstaller sélectionné",
    "uninstalling": "Désinstallation",
    "update": "Mettre à jour",
+    "updateAll": "Tout mettre à jour",
+    "updateSelected": "Mettre à jour la sélection",
    "updatingAllPacks": "Mise à jour de tous les paquets",
    "version": "Version"
  },
@@ -746,7 +756,10 @@
    "Canvas Toggle Link Visibility": "Basculer la visibilité du lien de la toile",
    "Canvas Toggle Lock": "Basculer le verrouillage de la toile",
    "Canvas Toggle Minimap": "Basculer la mini-carte du canevas",
+    "Check for Custom Node Updates": "Vérifier les mises à jour des nœuds personnalisés",
    "Check for Updates": "Vérifier les mises à jour",
+    "Check for Custom Node Updates": "Vérifier les mises à jour des nœuds personnalisés",
+    "Check for Updates": "Vérifier les Mises à Jour",
    "Clear Pending Tasks": "Effacer les tâches en attente",
    "Clear Workflow": "Effacer le flux de travail",
    "Clipspace": "Espace de clip",
@@ -759,7 +772,11 @@
    "Contact Support": "Contacter le support",
    "Convert Selection to Subgraph": "Convertir la sélection en sous-graphe",
    "Convert selected nodes to group node": "Convertir les nœuds sélectionnés en nœud de groupe",
+    "Custom Nodes (Beta)": "Nœuds personnalisés (Beta)",
+    "Custom Nodes (Legacy)": "Nœuds personnalisés (Ancienne version)",
+    "Custom Nodes Manager": "Gestionnaire de Nœuds Personnalisés",
    "Decrease Brush Size in MaskEditor": "Réduire la taille du pinceau dans MaskEditor",
+    "Custom Nodes (Legacy)": "Nœuds personnalisés (héritage)",
    "Delete Selected Items": "Supprimer les éléments sélectionnés",
    "Desktop User Guide": "Guide de l'utilisateur de bureau",
    "Duplicate Current Workflow": "Dupliquer le flux de travail actuel",
@@ -772,9 +789,14 @@
    "Group Selected Nodes": "Grouper les nœuds sélectionnés",
    "Help": "Aide",
    "Increase Brush Size in MaskEditor": "Augmenter la taille du pinceau dans MaskEditor",
+    "Install Missing Custom Nodes": "Installer les nœuds personnalisés manquants",
+    "Install Missing": "Installer Manquants",
+    "Install Missing Custom Nodes": "Installer les nœuds personnalisés manquants",
    "Interrupt": "Interrompre",
    "Load Default Workflow": "Charger le flux de travail par défaut",
    "Manage group nodes": "Gérer les nœuds de groupe",
+    "Manager": "Gestionnaire",
+    "Manager Menu (Legacy)": "Menu du gestionnaire (héritage)",
    "Move Selected Nodes Down": "Déplacer les nœuds sélectionnés vers le bas",
    "Move Selected Nodes Left": "Déplacer les nœuds sélectionnés vers la gauche",
    "Move Selected Nodes Right": "Déplacer les nœuds sélectionnés vers la droite",
@@ -808,6 +830,7 @@
    "Save": "Enregistrer",
    "Save As": "Enregistrer sous",
    "Show Settings Dialog": "Afficher la boîte de dialogue des paramètres",
+    "Show the Custom Nodes Manager": "Afficher le gestionnaire de nœuds personnalisés",
    "Sign Out": "Se déconnecter",
    "Toggle Bottom Panel": "Basculer le panneau inférieur",
    "Toggle Focus Mode": "Basculer le mode focus",
@@ -819,10 +842,11 @@
    "Toggle Terminal Bottom Panel": "Basculer le panneau inférieur du terminal",
    "Toggle Theme (Dark/Light)": "Basculer le thème (Sombre/Clair)",
    "Toggle Workflows Sidebar": "Afficher/Masquer la barre latérale des workflows",
-    "Toggle the Custom Nodes Manager": "Basculer le gestionnaire de nœuds personnalisés",
    "Toggle the Custom Nodes Manager Progress Bar": "Basculer la barre de progression du gestionnaire de nœuds personnalisés",
    "Undo": "Annuler",
    "Ungroup selected group nodes": "Dégrouper les nœuds de groupe sélectionnés",
+    "Unload Models": "Décharger les modèles",
+    "Unload Models and Execution Cache": "Décharger les modèles et le cache d'exécution",
    "Workflow": "Flux de travail",
    "Zoom In": "Zoom avant",
    "Zoom Out": "Zoom arrière"
--- a/src/locales/ja/commands.json
+++ b/src/locales/ja/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "デフォルトのワークフローを読み込む"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "カスタムノードマネージャ"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "カスタムノード（ベータ版）"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "カスタムノード（レガシー）"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "マネージャーメニュー（レガシー）"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "不足しているパックをインストール"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "更新を確認"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "プログレスダイアログの切り替え"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "選択したノードのマスクエディタを開く"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "モデルのアンロード"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "モデルと実行キャッシュのアンロード"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "新しい空のワークフロー"
  },
--- a/src/locales/ja/main.json
+++ b/src/locales/ja/main.json
@@ -276,6 +276,7 @@
    "color": "色",
    "comingSoon": "近日公開",
    "command": "コマンド",
+    "commandProhibited": "コマンド {command} は禁止されています。詳細は管理者にお問い合わせください。",
    "community": "コミュニティ",
    "completed": "完了",
    "confirm": "確認",
@@ -627,12 +628,14 @@
    "title": "メンテナンス"
  },
  "manager": {
+    "applyChanges": "変更を適用",
    "changingVersion": "バージョンを {from} から {to} に変更",
    "createdBy": "作成者",
    "dependencies": "依存関係",
    "discoverCommunityContent": "コミュニティが作成したノードパック、拡張機能などを探す...",
    "downloads": "ダウンロード",
    "errorConnecting": "Comfy Node Registryへの接続エラー。",
+    "extensionsSuccessfullyInstalled": "拡張機能のインストールが完了し、使用可能になりました！",
    "failed": "失敗しました ({count})",
    "filter": {
      "disabled": "無効",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "すべての不足しているノードをインストール",
    "installSelected": "選択したものをインストール",
    "installationQueue": "インストールキュー",
+    "installingDependencies": "依存関係をインストールしています...",
    "lastUpdated": "最終更新日",
    "latestVersion": "最新",
+    "legacyManagerUI": "レガシーUIを使用する",
+    "legacyManagerUIDescription": "レガシーManager UIを使用するには、--enable-manager-legacy-uiを付けてComfyUIを起動してください",
+    "legacyMenuNotAvailable": "このバージョンのComfyUIでは、レガシーマネージャーメニューは利用できません。新しいマネージャーメニューを使用してください。",
    "license": "ライセンス",
    "loadingVersions": "バージョンを読み込んでいます...",
    "nightlyVersion": "ナイトリー",
@@ -657,6 +664,7 @@
    "packsSelected": "選択したパック",
    "repository": "リポジトリ",
    "restartToApplyChanges": "変更を適用するには、ComfyUIを再起動してください",
+    "restartingBackend": "変更を適用するためにバックエンドを再起動しています...",
    "searchPlaceholder": "検索",
    "selectVersion": "バージョンを選択",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "選択したものをアンインストール",
    "uninstalling": "アンインストール中",
    "update": "更新",
+    "updateAll": "すべて更新",
+    "updateSelected": "選択を更新",
    "updatingAllPacks": "すべてのパッケージを更新中",
    "version": "バージョン"
  },
@@ -746,7 +756,10 @@
    "Canvas Toggle Link Visibility": "キャンバスのリンク表示を切り替え",
    "Canvas Toggle Lock": "キャンバスのロックを切り替え",
    "Canvas Toggle Minimap": "キャンバス ミニマップの切り替え",
+    "Check for Custom Node Updates": "カスタムノードのアップデートを確認",
    "Check for Updates": "更新を確認する",
+    "Check for Custom Node Updates": "カスタムノードのアップデートを確認",
+    "Check for Updates": "更新を確認",
    "Clear Pending Tasks": "保留中のタスクをクリア",
    "Clear Workflow": "ワークフローをクリア",
    "Clipspace": "クリップスペース",
@@ -759,7 +772,11 @@
    "Contact Support": "サポートに連絡",
    "Convert Selection to Subgraph": "選択範囲をサブグラフに変換",
    "Convert selected nodes to group node": "選択したノードをグループノードに変換",
+    "Custom Nodes (Beta)": "カスタムノード（ベータ）",
+    "Custom Nodes (Legacy)": "カスタムノード（レガシー）",
+    "Custom Nodes Manager": "カスタムノードマネージャ",
    "Decrease Brush Size in MaskEditor": "マスクエディタでブラシサイズを小さくする",
+    "Custom Nodes (Legacy)": "カスタムノード（レガシー）",
    "Delete Selected Items": "選択したアイテムを削除",
    "Desktop User Guide": "デスクトップユーザーガイド",
    "Duplicate Current Workflow": "現在のワークフローを複製",
@@ -772,9 +789,14 @@
    "Group Selected Nodes": "選択したノードをグループ化",
    "Help": "ヘルプ",
    "Increase Brush Size in MaskEditor": "マスクエディタでブラシサイズを大きくする",
+    "Install Missing Custom Nodes": "不足しているカスタムノードをインストール",
+    "Install Missing": "不足しているものをインストール",
+    "Install Missing Custom Nodes": "不足しているカスタムノードをインストール",
    "Interrupt": "中断",
    "Load Default Workflow": "デフォルトワークフローを読み込む",
    "Manage group nodes": "グループノードを管理",
+    "Manager": "マネージャー",
+    "Manager Menu (Legacy)": "マネージャーメニュー（レガシー）",
    "Move Selected Nodes Down": "選択したノードを下へ移動",
    "Move Selected Nodes Left": "選択したノードを左へ移動",
    "Move Selected Nodes Right": "選択したノードを右へ移動",
@@ -808,6 +830,7 @@
    "Save": "保存",
    "Save As": "名前を付けて保存",
    "Show Settings Dialog": "設定ダイアログを表示",
+    "Show the Custom Nodes Manager": "カスタムノードマネージャーを表示",
    "Sign Out": "サインアウト",
    "Toggle Bottom Panel": "下部パネルの切り替え",
    "Toggle Focus Mode": "フォーカスモードの切り替え",
@@ -819,10 +842,11 @@
    "Toggle Terminal Bottom Panel": "ターミナルパネル下部を切り替え",
    "Toggle Theme (Dark/Light)": "テーマを切り替え（ダーク/ライト）",
    "Toggle Workflows Sidebar": "ワークフローサイドバーを切り替え",
-    "Toggle the Custom Nodes Manager": "カスタムノードマネージャーを切り替え",
    "Toggle the Custom Nodes Manager Progress Bar": "カスタムノードマネージャーの進行状況バーを切り替え",
    "Undo": "元に戻す",
    "Ungroup selected group nodes": "選択したグループノードのグループ解除",
+    "Unload Models": "モデルのアンロード",
+    "Unload Models and Execution Cache": "モデルと実行キャッシュのアンロード",
    "Workflow": "ワークフロー",
    "Zoom In": "ズームイン",
    "Zoom Out": "ズームアウト"
--- a/src/locales/ko/commands.json
+++ b/src/locales/ko/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "기본 워크플로 로드"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "사용자 정의 노드 관리자"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "사용자 정의 노드 (베타)"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "커스텀 노드 (레거시)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "매니저 메뉴 (레거시)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "누락된 팩 설치"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "업데이트 확인"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "진행 상황 대화 상자 전환"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "선택한 노드 마스크 편집기 열기"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "모델 언로드"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "모델 및 실행 캐시 언로드"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "새로운 빈 워크플로"
  },
--- a/src/locales/ko/main.json
+++ b/src/locales/ko/main.json
@@ -276,6 +276,7 @@
    "color": "색상",
    "comingSoon": "곧 출시 예정",
    "command": "명령",
+    "commandProhibited": "명령 {command}은 금지되었습니다. 자세한 정보는 관리자에게 문의하십시오.",
    "community": "커뮤니티",
    "completed": "완료됨",
    "confirm": "확인",
@@ -627,12 +628,14 @@
    "title": "유지 보수"
  },
  "manager": {
+    "applyChanges": "변경 사항 적용",
    "changingVersion": "{from}에서 {to}(으)로 버전 변경 중",
    "createdBy": "작성자",
    "dependencies": "의존성",
    "discoverCommunityContent": "커뮤니티에서 만든 노드 팩 및 확장 프로그램을 찾아보세요...",
    "downloads": "다운로드",
    "errorConnecting": "Comfy Node Registry에 연결하는 중 오류가 발생했습니다.",
+    "extensionsSuccessfullyInstalled": "확장 프로그램이 성공적으로 설치되어 사용할 준비가 되었습니다!",
    "failed": "실패 ({count})",
    "filter": {
      "disabled": "비활성화",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "모든 누락된 노드 설치",
    "installSelected": "선택한 항목 설치",
    "installationQueue": "설치 대기열",
+    "installingDependencies": "의존성 설치 중...",
    "lastUpdated": "마지막 업데이트",
    "latestVersion": "최신",
+    "legacyManagerUI": "레거시 UI 사용",
+    "legacyManagerUIDescription": "레거시 매니저 UI를 사용하려면, ComfyUI를 --enable-manager-legacy-ui로 시작하세요",
+    "legacyMenuNotAvailable": "이 버전의 ComfyUI에서는 레거시 매니저 메뉴를 사용할 수 없습니다. 대신 새로운 매니저 메뉴를 사용하십시오.",
    "license": "라이선스",
    "loadingVersions": "버전 로딩 중...",
    "nightlyVersion": "최신 테스트 버전(nightly)",
@@ -657,6 +664,7 @@
    "packsSelected": "선택한 노드 팩",
    "repository": "저장소",
    "restartToApplyChanges": "변경 사항을 적용하려면 ComfyUI를 재시작해 주세요",
+    "restartingBackend": "변경 사항을 적용하기 위해 백엔드를 재시작하는 중...",
    "searchPlaceholder": "검색",
    "selectVersion": "버전 선택",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "선택 항목 제거",
    "uninstalling": "제거 중",
    "update": "업데이트",
+    "updateAll": "전체 업데이트",
+    "updateSelected": "선택 항목 업데이트",
    "updatingAllPacks": "모든 패키지 업데이트 중",
    "version": "버전"
  },
@@ -746,6 +756,7 @@
    "Canvas Toggle Link Visibility": "캔버스 토글 링크 가시성",
    "Canvas Toggle Lock": "캔버스 토글 잠금",
    "Canvas Toggle Minimap": "캔버스 미니맵 전환",
+    "Check for Custom Node Updates": "커스텀 노드 업데이트 확인",
    "Check for Updates": "업데이트 확인",
    "Clear Pending Tasks": "보류 중인 작업 제거하기",
    "Clear Workflow": "워크플로 지우기",
@@ -759,7 +770,11 @@
    "Contact Support": "고객 지원 문의",
    "Convert Selection to Subgraph": "선택 영역을 서브그래프로 변환",
    "Convert selected nodes to group node": "선택한 노드를 그룹 노드로 변환",
+    "Custom Nodes (Beta)": "사용자 정의 노드 (베타)",
+    "Custom Nodes (Legacy)": "사용자 정의 노드 (레거시)",
+    "Custom Nodes Manager": "사용자 정의 노드 관리자",
    "Decrease Brush Size in MaskEditor": "마스크 편집기에서 브러시 크기 줄이기",
+    "Custom Nodes (Legacy)": "커스텀 노드 (레거시)",
    "Delete Selected Items": "선택한 항목 삭제",
    "Desktop User Guide": "데스크톱 사용자 가이드",
    "Duplicate Current Workflow": "현재 워크플로 복제",
@@ -772,9 +787,14 @@
    "Group Selected Nodes": "선택한 노드 그룹화",
    "Help": "도움말",
    "Increase Brush Size in MaskEditor": "마스크 편집기에서 브러시 크기 늘리기",
+    "Install Missing Custom Nodes": "누락된 커스텀 노드 설치",
+    "Install Missing": "누락된 설치",
+    "Install Missing Custom Nodes": "누락된 커스텀 노드 설치",
    "Interrupt": "중단",
    "Load Default Workflow": "기본 워크플로 불러오기",
    "Manage group nodes": "그룹 노드 관리",
+    "Manager": "매니저",
+    "Manager Menu (Legacy)": "매니저 메뉴 (레거시)",
    "Move Selected Nodes Down": "선택한 노드 아래로 이동",
    "Move Selected Nodes Left": "선택한 노드 왼쪽으로 이동",
    "Move Selected Nodes Right": "선택한 노드 오른쪽으로 이동",
@@ -808,6 +828,7 @@
    "Save": "저장",
    "Save As": "다른 이름으로 저장",
    "Show Settings Dialog": "설정 대화상자 표시",
+    "Show the Custom Nodes Manager": "커스텀 노드 관리자 표시",
    "Sign Out": "로그아웃",
    "Toggle Bottom Panel": "하단 패널 전환",
    "Toggle Focus Mode": "포커스 모드 전환",
@@ -818,11 +839,12 @@
    "Toggle Search Box": "검색 상자 전환",
    "Toggle Terminal Bottom Panel": "터미널 하단 패널 전환",
    "Toggle Theme (Dark/Light)": "테마 전환 (어두운/밝은)",
-    "Toggle Workflows Sidebar": "워크플로 사이드바 전환",
-    "Toggle the Custom Nodes Manager": "커스텀 노드 매니저 전환",
+    "Toggle Workflows Sidebar": "워크플로우 사이드바 전환",
    "Toggle the Custom Nodes Manager Progress Bar": "커스텀 노드 매니저 진행률 표시줄 전환",
    "Undo": "실행 취소",
    "Ungroup selected group nodes": "선택한 그룹 노드 그룹 해제",
+    "Unload Models": "모델 언로드",
+    "Unload Models and Execution Cache": "모델 및 실행 캐시 언로드",
    "Workflow": "워크플로",
    "Zoom In": "확대",
    "Zoom Out": "축소"
--- a/src/locales/ru/commands.json
+++ b/src/locales/ru/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "Загрузить стандартный рабочий процесс"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "Менеджер Пользовательских Узлов"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "Пользовательские узлы (Бета)"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "Пользовательские узлы (устаревшие)"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "Меню менеджера (устаревшее)"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "Установить отсутствующие"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "Проверить наличие обновлений"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "Переключить диалоговое окно прогресса"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "Открыть редактор масок для выбранной ноды"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "Выгрузить модели"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "Выгрузить модели и кэш выполнения"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "Новый пустой рабочий процесс"
  },
--- a/src/locales/ru/main.json
+++ b/src/locales/ru/main.json
@@ -276,6 +276,7 @@
    "color": "Цвет",
    "comingSoon": "Скоро будет",
    "command": "Команда",
+    "commandProhibited": "Команда {command} запрещена. Свяжитесь с администратором для получения дополнительной информации.",
    "community": "Сообщество",
    "completed": "Завершено",
    "confirm": "Подтвердить",
@@ -627,12 +628,14 @@
    "title": "Обслуживание"
  },
  "manager": {
+    "applyChanges": "Применить изменения",
    "changingVersion": "Изменение версии с {from} на {to}",
    "createdBy": "Создано",
    "dependencies": "Зависимости",
    "discoverCommunityContent": "Откройте для себя пакеты узлов, расширения и многое другое, созданные сообществом...",
    "downloads": "Загрузки",
    "errorConnecting": "Ошибка подключения к реестру Comfy Node.",
+    "extensionsSuccessfullyInstalled": "Расширение(я) успешно установлены и готовы к использованию!",
    "failed": "Не удалось ({count})",
    "filter": {
      "disabled": "Отключено",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "Установить все отсутствующие узлы",
    "installSelected": "Установить выбранное",
    "installationQueue": "Очередь установки",
+    "installingDependencies": "Установка зависимостей...",
    "lastUpdated": "Последнее обновление",
    "latestVersion": "Последняя",
+    "legacyManagerUI": "Использовать устаревший UI",
+    "legacyManagerUIDescription": "Чтобы использовать устаревший UI менеджера, запустите ComfyUI с --enable-manager-legacy-ui",
+    "legacyMenuNotAvailable": "Устаревшее меню менеджера недоступно в этой версии ComfyUI. Пожалуйста, используйте новое меню менеджера.",
    "license": "Лицензия",
    "loadingVersions": "Загрузка версий...",
    "nightlyVersion": "Ночная",
@@ -657,6 +664,7 @@
    "packsSelected": "Выбрано пакетов",
    "repository": "Репозиторий",
    "restartToApplyChanges": "Чтобы применить изменения, пожалуйста, перезапустите ComfyUI",
+    "restartingBackend": "Перезапуск бэкенда для применения изменений...",
    "searchPlaceholder": "Поиск",
    "selectVersion": "Выберите версию",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "Удалить выбранное",
    "uninstalling": "Удаление",
    "update": "Обновить",
+    "updateAll": "Обновить все",
+    "updateSelected": "Обновить выбранное",
    "updatingAllPacks": "Обновление всех пакетов",
    "version": "Версия"
  },
@@ -746,7 +756,10 @@
    "Canvas Toggle Link Visibility": "Переключение видимости ссылки на холст",
    "Canvas Toggle Lock": "Переключение блокировки холста",
    "Canvas Toggle Minimap": "Показать/скрыть миникарту на холсте",
+    "Check for Custom Node Updates": "Проверить обновления пользовательских узлов",
    "Check for Updates": "Проверить наличие обновлений",
+    "Check for Custom Node Updates": "Проверить обновления пользовательских узлов",
+    "Check for Updates": "Проверить Обновления",
    "Clear Pending Tasks": "Очистить ожидающие задачи",
    "Clear Workflow": "Очистить рабочий процесс",
    "Clipspace": "Клиппространство",
@@ -759,7 +772,11 @@
    "Contact Support": "Связаться с поддержкой",
    "Convert Selection to Subgraph": "Преобразовать выделенное в подграф",
    "Convert selected nodes to group node": "Преобразовать выбранные ноды в групповую ноду",
+    "Custom Nodes (Beta)": "Пользовательские узлы (Бета)",
+    "Custom Nodes (Legacy)": "Пользовательские узлы (Устаревшие)",
+    "Custom Nodes Manager": "Менеджер Пользовательских Узлов",
    "Decrease Brush Size in MaskEditor": "Уменьшить размер кисти в MaskEditor",
+    "Custom Nodes (Legacy)": "Пользовательские узлы (устаревшие)",
    "Delete Selected Items": "Удалить выбранные элементы",
    "Desktop User Guide": "Руководство пользователя для настольных ПК",
    "Duplicate Current Workflow": "Дублировать текущий рабочий процесс",
@@ -772,9 +789,14 @@
    "Group Selected Nodes": "Сгруппировать выбранные ноды",
    "Help": "Помощь",
    "Increase Brush Size in MaskEditor": "Увеличить размер кисти в MaskEditor",
+    "Install Missing Custom Nodes": "Установить отсутствующие пользовательские узлы",
+    "Install Missing": "Установить Отсутствующие",
+    "Install Missing Custom Nodes": "Установить отсутствующие пользовательские узлы",
    "Interrupt": "Прервать",
    "Load Default Workflow": "Загрузить стандартный рабочий процесс",
    "Manage group nodes": "Управление групповыми нодами",
+    "Manager": "Менеджер",
+    "Manager Menu (Legacy)": "Меню управления (устаревшее)",
    "Move Selected Nodes Down": "Переместить выбранные узлы вниз",
    "Move Selected Nodes Left": "Переместить выбранные узлы влево",
    "Move Selected Nodes Right": "Переместить выбранные узлы вправо",
@@ -808,6 +830,7 @@
    "Save": "Сохранить",
    "Save As": "Сохранить как",
    "Show Settings Dialog": "Показать диалог настроек",
+    "Show the Custom Nodes Manager": "Показать менеджер пользовательских узлов",
    "Sign Out": "Выйти",
    "Toggle Bottom Panel": "Переключить нижнюю панель",
    "Toggle Focus Mode": "Переключить режим фокуса",
@@ -819,10 +842,11 @@
    "Toggle Terminal Bottom Panel": "Переключение нижней панели терминала",
    "Toggle Theme (Dark/Light)": "Переключение темы (Тёмная/Светлая)",
    "Toggle Workflows Sidebar": "Показать/скрыть боковую панель рабочих процессов",
-    "Toggle the Custom Nodes Manager": "Переключить менеджер пользовательских узлов",
    "Toggle the Custom Nodes Manager Progress Bar": "Переключить индикатор выполнения менеджера пользовательских узлов",
    "Undo": "Отменить",
    "Ungroup selected group nodes": "Разгруппировать выбранные групповые ноды",
+    "Unload Models": "Выгрузить модели",
+    "Unload Models and Execution Cache": "Выгрузить модели и кэш выполнения",
    "Workflow": "Рабочий процесс",
    "Zoom In": "Увеличить",
    "Zoom Out": "Уменьшить"
--- a/src/locales/zh-TW/commands.json
+++ b/src/locales/zh-TW/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "載入預設工作流程"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "切換自訂節點管理器"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "顯示自訂節點管理器"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "自訂節點（舊版）"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "管理選單（舊版）"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "安裝缺少的自訂節點"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "檢查自訂節點更新"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "切換自訂節點管理器進度條"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "為選取的節點開啟 Mask 編輯器"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "卸載模型"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "卸載模型與執行快取"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "新增空白工作流程"
  },
--- a/src/locales/zh-TW/main.json
+++ b/src/locales/zh-TW/main.json
@@ -276,6 +276,7 @@
    "color": "顏色",
    "comingSoon": "即將推出",
    "command": "指令",
+    "commandProhibited": "指令 {command} 已被禁止。如需更多資訊，請聯絡管理員。",
    "community": "社群",
    "completed": "已完成",
    "confirm": "確認",
@@ -627,12 +628,14 @@
    "title": "維護"
  },
  "manager": {
+    "applyChanges": "套用變更",
    "changingVersion": "正在將版本從 {from} 變更為 {to}",
    "createdBy": "建立者",
    "dependencies": "相依套件",
    "discoverCommunityContent": "探索社群製作的節點包、擴充功能等...",
    "downloads": "下載次數",
    "errorConnecting": "連線至 Comfy Node Registry 時發生錯誤。",
+    "extensionsSuccessfullyInstalled": "擴充功能安裝成功，已可使用！",
    "failed": "失敗（{count}）",
    "filter": {
      "disabled": "已停用",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "安裝所有缺少的節點",
    "installSelected": "安裝所選項目",
    "installationQueue": "安裝佇列",
+    "installingDependencies": "正在安裝相依套件……",
    "lastUpdated": "最後更新",
    "latestVersion": "最新版本",
+    "legacyManagerUI": "使用舊版介面",
+    "legacyManagerUIDescription": "若要使用舊版管理介面，請以 --enable-manager-legacy-ui 啟動 ComfyUI",
+    "legacyMenuNotAvailable": "舊版管理選單不可用，已預設切換至新版管理選單。",
    "license": "授權條款",
    "loadingVersions": "正在載入版本...",
    "nightlyVersion": "每夜建置版",
@@ -657,6 +664,7 @@
    "packsSelected": "已選擇套件",
    "repository": "儲存庫",
    "restartToApplyChanges": "請重新啟動 ComfyUI 以套用變更",
+    "restartingBackend": "正在重新啟動後端以套用變更……",
    "searchPlaceholder": "搜尋",
    "selectVersion": "選擇版本",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "解除安裝所選項目",
    "uninstalling": "正在解除安裝",
    "update": "更新",
+    "updateAll": "全部更新",
+    "updateSelected": "更新所選項目",
    "updatingAllPacks": "正在更新所有套件",
    "version": "版本"
  },
@@ -746,6 +756,7 @@
    "Canvas Toggle Link Visibility": "切換連結可見性",
    "Canvas Toggle Lock": "切換畫布鎖定",
    "Canvas Toggle Minimap": "畫布切換小地圖",
+    "Check for Custom Node Updates": "檢查自訂節點更新",
    "Check for Updates": "檢查更新",
    "Clear Pending Tasks": "清除待處理任務",
    "Clear Workflow": "清除工作流程",
@@ -759,6 +770,8 @@
    "Contact Support": "聯絡支援",
    "Convert Selection to Subgraph": "將選取內容轉為子圖",
    "Convert selected nodes to group node": "將選取節點轉為群組節點",
+    "Custom Nodes (Legacy)": "自訂節點（舊版）",
+    "Custom Nodes Manager": "自訂節點管理員",
    "Decrease Brush Size in MaskEditor": "在 MaskEditor 中減小筆刷大小",
    "Delete Selected Items": "刪除選取項目",
    "Desktop User Guide": "桌面應用程式使用指南",
@@ -772,9 +785,12 @@
    "Group Selected Nodes": "群組選取節點",
    "Help": "說明",
    "Increase Brush Size in MaskEditor": "在 MaskEditor 中增大筆刷大小",
+    "Install Missing Custom Nodes": "安裝缺少的自訂節點",
    "Interrupt": "中斷",
    "Load Default Workflow": "載入預設工作流程",
    "Manage group nodes": "管理群組節點",
+    "Manager": "管理員",
+    "Manager Menu (Legacy)": "管理員選單（舊版）",
    "Move Selected Nodes Down": "選取節點下移",
    "Move Selected Nodes Left": "選取節點左移",
    "Move Selected Nodes Right": "選取節點右移",
@@ -808,6 +824,7 @@
    "Save": "儲存",
    "Save As": "另存新檔",
    "Show Settings Dialog": "顯示設定對話框",
+    "Show the Custom Nodes Manager": "顯示自訂節點管理員",
    "Sign Out": "登出",
    "Toggle Bottom Panel": "切換下方面板",
    "Toggle Focus Mode": "切換專注模式",
@@ -819,10 +836,11 @@
    "Toggle Terminal Bottom Panel": "切換終端機底部面板",
    "Toggle Theme (Dark/Light)": "切換主題（深色/淺色）",
    "Toggle Workflows Sidebar": "切換工作流程側邊欄",
-    "Toggle the Custom Nodes Manager": "切換自訂節點管理器",
    "Toggle the Custom Nodes Manager Progress Bar": "切換自訂節點管理器進度條",
    "Undo": "復原",
    "Ungroup selected group nodes": "取消群組選取的群組節點",
+    "Unload Models": "卸載模型",
+    "Unload Models and Execution Cache": "卸載模型與執行快取",
    "Workflow": "工作流程",
    "Zoom In": "放大",
    "Zoom Out": "縮小"
--- a/src/locales/zh/commands.json
+++ b/src/locales/zh/commands.json
@@ -155,8 +155,20 @@
  "Comfy_LoadDefaultWorkflow": {
    "label": "加载默认工作流"
  },
-  "Comfy_Manager_CustomNodesManager": {
-    "label": "自定义节点管理器"
+  "Comfy_Manager_CustomNodesManager_ShowCustomNodesMenu": {
+    "label": "自定义节点（测试版）"
+  },
+  "Comfy_Manager_CustomNodesManager_ShowLegacyCustomNodesMenu": {
+    "label": "自定义节点（旧版）"
+  },
+  "Comfy_Manager_ShowLegacyManagerMenu": {
+    "label": "管理器菜单（旧版）"
+  },
+  "Comfy_Manager_ShowMissingPacks": {
+    "label": "安装缺失的包"
+  },
+  "Comfy_Manager_ShowUpdateAvailablePacks": {
+    "label": "检查更新"
  },
  "Comfy_Manager_ToggleManagerProgressDialog": {
    "label": "切换进度对话框"
@@ -170,6 +182,12 @@
  "Comfy_MaskEditor_OpenMaskEditor": {
    "label": "打开选中节点的遮罩编辑器"
  },
+  "Comfy_Memory_UnloadModels": {
+    "label": "卸载模型"
+  },
+  "Comfy_Memory_UnloadModelsAndExecutionCache": {
+    "label": "卸载模型和执行缓存"
+  },
  "Comfy_NewBlankWorkflow": {
    "label": "新建空白工作流"
  },
--- a/src/locales/zh/main.json
+++ b/src/locales/zh/main.json
@@ -276,6 +276,7 @@
    "color": "颜色",
    "comingSoon": "即将推出",
    "command": "指令",
+    "commandProhibited": "命令 {command} 被禁止。请联系管理员获取更多信息。",
    "community": "社区",
    "completed": "已完成",
    "confirm": "确认",
@@ -627,12 +628,14 @@
    "title": "维护"
  },
  "manager": {
+    "applyChanges": "套用變更",
    "changingVersion": "将版本从 {from} 更改为 {to}",
    "createdBy": "创建者",
    "dependencies": "依赖关系",
    "discoverCommunityContent": "发现社区制作的节点包，扩展等等...",
    "downloads": "下载",
    "errorConnecting": "连接到Comfy节点注册表时出错。",
+    "extensionsSuccessfullyInstalled": "擴充功能安裝成功，已可使用！",
    "failed": "失败 ({count})",
    "filter": {
      "disabled": "已禁用",
@@ -644,8 +647,12 @@
    "installAllMissingNodes": "安装所有缺失节点",
    "installSelected": "安装选定",
    "installationQueue": "安装队列",
+    "installingDependencies": "正在安裝相依套件……",
    "lastUpdated": "最后更新",
    "latestVersion": "最新",
+    "legacyManagerUI": "使用旧版UI",
+    "legacyManagerUIDescription": "要使用旧版的管理器UI，请启动ComfyUI并使用 --enable-manager-legacy-ui",
+    "legacyMenuNotAvailable": "在此版本的ComfyUI中，不提供旧版的管理器菜单。请使用新的管理器菜单。",
    "license": "许可证",
    "loadingVersions": "正在加载版本...",
    "nightlyVersion": "每夜",
@@ -657,6 +664,7 @@
    "packsSelected": "选定的包",
    "repository": "仓库",
    "restartToApplyChanges": "要应用更改，请重新启动ComfyUI",
+    "restartingBackend": "正在重新啟動後端以套用變更……",
    "searchPlaceholder": "搜索",
    "selectVersion": "选择版本",
    "sort": {
@@ -681,6 +689,8 @@
    "uninstallSelected": "卸载所选",
    "uninstalling": "正在卸载",
    "update": "更新",
+    "updateAll": "全部更新",
+    "updateSelected": "更新所选",
    "updatingAllPacks": "更新所有包",
    "version": "版本"
  },
@@ -746,6 +756,8 @@
    "Canvas Toggle Link Visibility": "切换连线可见性",
    "Canvas Toggle Lock": "切换视图锁定",
    "Canvas Toggle Minimap": "畫布切換小地圖",
+    "Check for Custom Node Updates": "檢查自訂節點更新",
+    "Check for Custom Node Updates": "检查自定义节点更新",
    "Check for Updates": "检查更新",
    "Clear Pending Tasks": "清除待处理任务",
    "Clear Workflow": "清除工作流",
@@ -759,7 +771,11 @@
    "Contact Support": "联系支持",
    "Convert Selection to Subgraph": "将选中内容转换为子图",
    "Convert selected nodes to group node": "将选中节点转换为组节点",
+    "Custom Nodes (Beta)": "自定义节点（测试版）",
+    "Custom Nodes (Legacy)": "自定义节点（旧版）",
+    "Custom Nodes Manager": "自定义节点管理器",
    "Decrease Brush Size in MaskEditor": "在 MaskEditor 中減小筆刷大小",
+    "Custom Nodes (Legacy)": "自定义节点（旧版）",
    "Delete Selected Items": "删除选定的项目",
    "Desktop User Guide": "桌面端用户指南",
    "Duplicate Current Workflow": "复制当前工作流",
@@ -772,9 +788,14 @@
    "Group Selected Nodes": "将选中节点转换为组节点",
    "Help": "帮助",
    "Increase Brush Size in MaskEditor": "在 MaskEditor 中增大筆刷大小",
+    "Install Missing Custom Nodes": "安裝缺少的自訂節點",
+    "Install Missing": "安装缺失",
+    "Install Missing Custom Nodes": "安装缺失的自定义节点",
    "Interrupt": "中断",
    "Load Default Workflow": "加载默认工作流",
    "Manage group nodes": "管理组节点",
+    "Manager": "管理器",
+    "Manager Menu (Legacy)": "管理菜单（旧版）",
    "Move Selected Nodes Down": "下移所选节点",
    "Move Selected Nodes Left": "左移所选节点",
    "Move Selected Nodes Right": "右移所选节点",
@@ -808,6 +829,7 @@
    "Save": "保存",
    "Save As": "另存为",
    "Show Settings Dialog": "显示设置对话框",
+    "Show the Custom Nodes Manager": "显示自定义节点管理器",
    "Sign Out": "退出登录",
    "Toggle Bottom Panel": "切换底部面板",
    "Toggle Focus Mode": "切换专注模式",
@@ -818,11 +840,12 @@
    "Toggle Search Box": "切换搜索框",
    "Toggle Terminal Bottom Panel": "切换终端底部面板",
    "Toggle Theme (Dark/Light)": "切换主题（暗/亮）",
-    "Toggle Workflows Sidebar": "切換工作流程側邊欄",
-    "Toggle the Custom Nodes Manager": "切换自定义节点管理器",
+    "Toggle Workflows Sidebar": "切换工作流侧边栏",
    "Toggle the Custom Nodes Manager Progress Bar": "切换自定义节点管理器进度条",
    "Undo": "撤销",
    "Ungroup selected group nodes": "解散选中组节点",
+    "Unload Models": "卸载模型",
+    "Unload Models and Execution Cache": "卸载模型和执行缓存",
    "Workflow": "工作流",
    "Zoom In": "放大画面",
    "Zoom Out": "缩小画面"
--- a/src/schemas/apiSchema.ts
+++ b/src/schemas/apiSchema.ts
@@ -494,6 +494,7 @@ const zSettings = z.object({
  'Comfy.Load3D.LightIntensityMinimum': z.number(),
  'Comfy.Load3D.LightAdjustmentIncrement': z.number(),
  'Comfy.Load3D.CameraType': z.enum(['perspective', 'orthographic']),
+  'Comfy.Memory.AllowManualUnload': z.boolean(),
  'pysssss.SnapToGrid': z.boolean(),
  /** VHS setting is used for queue video preview support. */
  'VHS.AdvancedPreviews': z.string(),
--- a/src/scripts/api.ts
+++ b/src/scripts/api.ts
@@ -1,6 +1,5 @@
 import axios from 'axios'

-import defaultClientFeatureFlags from '@/config/clientFeatureFlags.json'
 import type {
  DisplayComponentWsMessage,
  EmbeddingsResponse,
@@ -12,7 +11,6 @@ import type {
  ExecutionStartWsMessage,
  ExecutionSuccessWsMessage,
  ExtensionsResponse,
-  FeatureFlagsWsMessage,
  HistoryTaskItem,
  LogsRawResponse,
  LogsWsMessage,
@@ -35,6 +33,7 @@ import type {
  NodeId
 } from '@/schemas/comfyWorkflowSchema'
 import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
+import { useToastStore } from '@/stores/toastStore'
 import { WorkflowTemplates } from '@/types/workflowTemplateTypes'

 interface QueuePromptRequestBody {
@@ -115,7 +114,6 @@ interface BackendApiCalls {
  progress_text: ProgressTextWsMessage
  progress_state: ProgressStateWsMessage
  display_component: DisplayComponentWsMessage
-  feature_flags: FeatureFlagsWsMessage
 }

 /** Dictionary of all api calls */
@@ -245,19 +243,6 @@ export class ComfyApi extends EventTarget {

  reportedUnknownMessageTypes = new Set<string>()

-  /**
-   * Get feature flags supported by this frontend client.
-   * Returns a copy to prevent external modification.
-   */
-  getClientFeatureFlags(): Record<string, unknown> {
-    return { ...defaultClientFeatureFlags }
-  }
-
-  /**
-   * Feature flags received from the backend server.
-   */
-  serverFeatureFlags: Record<string, unknown> = {}
-
  /**
   * The auth token for the comfy org account if the user is logged in.
   * This is only used for {@link queuePrompt} now. It is not directly
@@ -399,15 +384,6 @@ export class ComfyApi extends EventTarget {

    this.socket.addEventListener('open', () => {
      opened = true
-
-      // Send feature flags as the first message
-      this.socket!.send(
-        JSON.stringify({
-          type: 'feature_flags',
-          data: this.getClientFeatureFlags()
-        })
-      )
-
      if (isReconnect) {
        this.dispatchCustomEvent('reconnected')
      }
@@ -529,14 +505,6 @@ export class ComfyApi extends EventTarget {
            case 'b_preview':
              this.dispatchCustomEvent(msg.type, msg.data)
              break
-            case 'feature_flags':
-              // Store server feature flags
-              this.serverFeatureFlags = msg.data
-              console.log(
-                'Server feature flags received:',
-                this.serverFeatureFlags
-              )
-              break
            default:
              if (this.#registered.has(msg.type)) {
                // Fallback for custom types - calls super direct.
@@ -1011,30 +979,54 @@ export class ComfyApi extends EventTarget {
  }

  /**
-   * Checks if the server supports a specific feature.
-   * @param featureName The name of the feature to check
-   * @returns true if the feature is supported, false otherwise
+   * Frees memory by unloading models and optionally freeing execution cache
+   * @param {Object} options - The options object
+   * @param {boolean} options.freeExecutionCache - If true, also frees execution cache
   */
-  serverSupportsFeature(featureName: string): boolean {
-    return this.serverFeatureFlags[featureName] === true
-  }
+  async freeMemory(options: { freeExecutionCache: boolean }) {
+    try {
+      let mode = ''
+      if (options.freeExecutionCache) {
+        mode = '{"unload_models": true, "free_memory": true}'
+      } else {
+        mode = '{"unload_models": true}'
+      }

-  /**
-   * Gets a server feature flag value.
-   * @param featureName The name of the feature to get
-   * @param defaultValue The default value if the feature is not found
-   * @returns The feature value or default
-   */
-  getServerFeature<T = unknown>(featureName: string, defaultValue?: T): T {
-    return (this.serverFeatureFlags[featureName] ?? defaultValue) as T
-  }
+      const res = await this.fetchApi(`/free`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: mode
+      })

-  /**
-   * Gets all server feature flags.
-   * @returns Copy of all server feature flags
-   */
-  getServerFeatures(): Record<string, unknown> {
-    return { ...this.serverFeatureFlags }
+      if (res.status === 200) {
+        if (options.freeExecutionCache) {
+          useToastStore().add({
+            severity: 'success',
+            summary: 'Models and Execution Cache have been cleared.',
+            life: 3000
+          })
+        } else {
+          useToastStore().add({
+            severity: 'success',
+            summary: 'Models have been unloaded.',
+            life: 3000
+          })
+        }
+      } else {
+        useToastStore().add({
+          severity: 'error',
+          summary:
+            'Unloading of models failed. Installed ComfyUI may be an outdated version.',
+          life: 5000
+        })
+      }
+    } catch (error) {
+      useToastStore().add({
+        severity: 'error',
+        summary: 'An error occurred while trying to unload models.',
+        life: 5000
+      })
+    }
  }
 }

--- a/src/services/comfyManagerService.ts
+++ b/src/services/comfyManagerService.ts
@@ -1,17 +1,18 @@
 import axios, { AxiosError, AxiosResponse } from 'axios'
+import { v4 as uuidv4 } from 'uuid'
 import { ref } from 'vue'

 import { api } from '@/scripts/api'
-import {
-  type InstallPackParams,
-  type InstalledPacksResponse,
-  type ManagerPackInfo,
-  type ManagerQueueStatus,
-  SelectedVersion,
-  type UpdateAllPacksParams
-} from '@/types/comfyManagerTypes'
+import { components } from '@/types/generatedManagerTypes'
 import { isAbortError } from '@/utils/typeGuardUtil'

+type ManagerQueueStatus = components['schemas']['QueueStatus']
+type InstallPackParams = components['schemas']['InstallPackParams']
+type InstalledPacksResponse = components['schemas']['InstalledPacksResponse']
+type UpdateAllPacksParams = components['schemas']['UpdateAllPacksParams']
+type ManagerTaskHistory = components['schemas']['HistoryResponse']
+type QueueTaskItem = components['schemas']['QueueTaskItem']
+
 const GENERIC_SECURITY_ERR_MSG =
  'Forbidden: A security error has occurred. Please check the terminal logs'

@@ -19,20 +20,18 @@ const GENERIC_SECURITY_ERR_MSG =
 * API routes for ComfyUI Manager
 */
 enum ManagerRoute {
-  START_QUEUE = 'manager/queue/start',
-  RESET_QUEUE = 'manager/queue/reset',
-  QUEUE_STATUS = 'manager/queue/status',
-  INSTALL = 'manager/queue/install',
-  UPDATE = 'manager/queue/update',
-  UPDATE_ALL = 'manager/queue/update_all',
-  UNINSTALL = 'manager/queue/uninstall',
-  DISABLE = 'manager/queue/disable',
-  FIX_NODE = 'manager/queue/fix',
-  LIST_INSTALLED = 'customnode/installed',
-  GET_NODES = 'customnode/getmappings',
-  GET_PACKS = 'customnode/getlist',
-  IMPORT_FAIL_INFO = 'customnode/import_fail_info',
-  REBOOT = 'manager/reboot'
+  START_QUEUE = 'v2/manager/queue/start',
+  RESET_QUEUE = 'v2/manager/queue/reset',
+  QUEUE_STATUS = 'v2/manager/queue/status',
+  UPDATE_ALL = 'v2/manager/queue/update_all',
+  LIST_INSTALLED = 'v2/customnode/installed',
+  GET_NODES = 'v2/customnode/getmappings',
+  IMPORT_FAIL_INFO = 'v2/customnode/import_fail_info',
+  IMPORT_FAIL_INFO_BULK = 'v2/customnode/import_fail_info_bulk',
+  REBOOT = 'v2/manager/reboot',
+  IS_LEGACY_MANAGER_UI = 'v2/manager/is_legacy_manager_ui',
+  TASK_HISTORY = 'v2/manager/queue/history',
+  QUEUE_TASK = 'v2/manager/queue/task'
 }

 const managerApiClient = axios.create({
@@ -49,7 +48,6 @@ const managerApiClient = axios.create({
 export const useComfyManagerService = () => {
  const isLoading = ref(false)
  const error = ref<string | null>(null)
-  const didStartQueue = ref(false)

  const handleRequestError = (
    err: unknown,
@@ -110,28 +108,21 @@ export const useComfyManagerService = () => {
      201: 'Created: ComfyUI-Manager job queue is already running'
    }

-    didStartQueue.value = true
-
    return executeRequest<null>(
      () => managerApiClient.get(ManagerRoute.START_QUEUE, { signal }),
      { errorContext, routeSpecificErrors }
    )
  }

-  const getQueueStatus = async (signal?: AbortSignal) => {
+  const getQueueStatus = async (client_id?: string, signal?: AbortSignal) => {
    const errorContext = 'Getting ComfyUI-Manager queue status'

    return executeRequest<ManagerQueueStatus>(
-      () => managerApiClient.get(ManagerRoute.QUEUE_STATUS, { signal }),
-      { errorContext }
-    )
-  }
-
-  const resetQueue = async (signal?: AbortSignal) => {
-    const errorContext = 'Resetting ComfyUI-Manager queue'
-
-    return executeRequest<null>(
-      () => managerApiClient.get(ManagerRoute.RESET_QUEUE, { signal }),
+      () =>
+        managerApiClient.get(ManagerRoute.QUEUE_STATUS, {
+          params: client_id ? { client_id } : undefined,
+          signal
+        }),
      { errorContext }
    )
  }
@@ -145,82 +136,96 @@ export const useComfyManagerService = () => {
    )
  }

-  const getImportFailInfo = async (signal?: AbortSignal) => {
+  const getImportFailInfo = async (
+    params: { cnr_id?: string; url?: string } = {},
+    signal?: AbortSignal
+  ) => {
    const errorContext = 'Fetching import failure information'

    return executeRequest<any>(
-      () => managerApiClient.get(ManagerRoute.IMPORT_FAIL_INFO, { signal }),
+      () =>
+        managerApiClient.post(ManagerRoute.IMPORT_FAIL_INFO, params, {
+          signal
+        }),
      { errorContext }
    )
  }

+  const getImportFailInfoBulk = async (
+    params: { cnr_ids?: string[]; urls?: string[] } = {},
+    signal?: AbortSignal
+  ) => {
+    const errorContext = 'Fetching bulk import failure information'
+
+    return executeRequest<Record<string, any>>(
+      () =>
+        managerApiClient.post(ManagerRoute.IMPORT_FAIL_INFO_BULK, params, {
+          signal
+        }),
+      { errorContext }
+    )
+  }
+
+  const queueTask = async (
+    kind: QueueTaskItem['kind'],
+    params: QueueTaskItem['params'],
+    ui_id?: string,
+    signal?: AbortSignal
+  ) => {
+    const task: QueueTaskItem = {
+      kind,
+      params,
+      ui_id: ui_id || uuidv4(),
+      client_id: api.clientId ?? api.initialClientId ?? 'unknown'
+    }
+
+    const errorContext = `Queueing ${task.kind} task`
+    const routeSpecificErrors = {
+      403: GENERIC_SECURITY_ERR_MSG,
+      404: `Not Found: Task could not be queued`
+    }
+
+    return executeRequest<null>(
+      () => managerApiClient.post(ManagerRoute.QUEUE_TASK, task, { signal }),
+      { errorContext, routeSpecificErrors, isQueueOperation: true }
+    )
+  }
+
  const installPack = async (
    params: InstallPackParams,
+    ui_id?: string,
    signal?: AbortSignal
  ) => {
-    const errorContext = `Installing pack ${params.id}`
-    const routeSpecificErrors = {
-      403: GENERIC_SECURITY_ERR_MSG,
-      404:
-        params.selected_version === SelectedVersion.NIGHTLY
-          ? `Not Found: Node pack ${params.id} does not provide nightly version`
-          : GENERIC_SECURITY_ERR_MSG
-    }
-
-    return executeRequest<null>(
-      () => managerApiClient.post(ManagerRoute.INSTALL, params, { signal }),
-      { errorContext, routeSpecificErrors, isQueueOperation: true }
-    )
+    return queueTask('install', params, ui_id, signal)
  }

  const uninstallPack = async (
-    params: ManagerPackInfo,
+    params: components['schemas']['UninstallPackParams'],
+    ui_id?: string,
    signal?: AbortSignal
  ) => {
-    const errorContext = `Uninstalling pack ${params.id}`
-    const routeSpecificErrors = {
-      403: GENERIC_SECURITY_ERR_MSG
-    }
-
-    return executeRequest<null>(
-      () => managerApiClient.post(ManagerRoute.UNINSTALL, params, { signal }),
-      { errorContext, routeSpecificErrors, isQueueOperation: true }
-    )
+    return queueTask('uninstall', params, ui_id, signal)
  }

  const disablePack = async (
-    params: ManagerPackInfo,
+    params: components['schemas']['DisablePackParams'],
+    ui_id?: string,
    signal?: AbortSignal
  ): Promise<null> => {
-    const errorContext = `Disabling pack ${params.id}`
-    const routeSpecificErrors = {
-      404: `Pack ${params.id} not found or not installed`,
-      409: `Pack ${params.id} is already disabled`
-    }
-
-    return executeRequest<null>(
-      () => managerApiClient.post(ManagerRoute.DISABLE, params, { signal }),
-      { errorContext, routeSpecificErrors, isQueueOperation: true }
-    )
+    return queueTask('disable', params, ui_id, signal)
  }

  const updatePack = async (
-    params: ManagerPackInfo,
+    params: components['schemas']['UpdatePackParams'],
+    ui_id?: string,
    signal?: AbortSignal
  ): Promise<null> => {
-    const errorContext = `Updating pack ${params.id}`
-    const routeSpecificErrors = {
-      403: GENERIC_SECURITY_ERR_MSG
-    }
-
-    return executeRequest<null>(
-      () => managerApiClient.post(ManagerRoute.UPDATE, params, { signal }),
-      { errorContext, routeSpecificErrors, isQueueOperation: true }
-    )
+    return queueTask('update', params, ui_id, signal)
  }

  const updateAllPacks = async (
-    params?: UpdateAllPacksParams,
+    params: UpdateAllPacksParams = {},
+    ui_id?: string,
    signal?: AbortSignal
  ) => {
    const errorContext = 'Updating all packs'
@@ -229,8 +234,18 @@ export const useComfyManagerService = () => {
      401: 'Unauthorized: ComfyUI-Manager job queue is busy'
    }

+    const queryParams = {
+      mode: params.mode,
+      client_id: api.clientId ?? api.initialClientId ?? 'unknown',
+      ui_id: ui_id || uuidv4()
+    }
+
    return executeRequest<null>(
-      () => managerApiClient.get(ManagerRoute.UPDATE_ALL, { params, signal }),
+      () =>
+        managerApiClient.get(ManagerRoute.UPDATE_ALL, {
+          params: queryParams,
+          signal
+        }),
      { errorContext, routeSpecificErrors, isQueueOperation: true }
    )
  }
@@ -247,6 +262,36 @@ export const useComfyManagerService = () => {
    )
  }

+  const isLegacyManagerUI = async (signal?: AbortSignal) => {
+    const errorContext = 'Checking if user set Manager to use the legacy UI'
+
+    return executeRequest<{ is_legacy_manager_ui: boolean }>(
+      () => managerApiClient.get(ManagerRoute.IS_LEGACY_MANAGER_UI, { signal }),
+      { errorContext }
+    )
+  }
+
+  const getTaskHistory = async (
+    options: {
+      ui_id?: string
+      max_items?: number
+      client_id?: string
+      offset?: number
+    } = {},
+    signal?: AbortSignal
+  ) => {
+    const errorContext = 'Getting ComfyUI-Manager task history'
+
+    return executeRequest<ManagerTaskHistory>(
+      () =>
+        managerApiClient.get(ManagerRoute.TASK_HISTORY, {
+          params: options,
+          signal
+        }),
+      { errorContext }
+    )
+  }
+
  return {
    // State
    isLoading,
@@ -254,12 +299,13 @@ export const useComfyManagerService = () => {

    // Queue operations
    startQueue,
-    resetQueue,
    getQueueStatus,
+    getTaskHistory,

    // Pack management
    listInstalledPacks,
    getImportFailInfo,
+    getImportFailInfoBulk,
    installPack,
    uninstallPack,
    enablePack: installPack, // enable is done via install
@@ -268,6 +314,7 @@ export const useComfyManagerService = () => {
    updateAllPacks,

    // System operations
-    rebootComfyUI
+    rebootComfyUI,
+    isLegacyManagerUI
  }
 }
--- a/src/services/comfyRegistryService.ts
+++ b/src/services/comfyRegistryService.ts
@@ -359,6 +359,55 @@ export const useComfyRegistryService = () => {
    )
  }

+  /**
+   * Get multiple pack versions in a single bulk request.
+   * This is more efficient than making individual requests for each pack version.
+   *
+   * @param nodeVersions - Array of node ID and version pairs to retrieve
+   * @param signal - Optional AbortSignal for request cancellation
+   * @returns Bulk response containing the requested node versions or null on error
+   *
+   * @example
+   * ```typescript
+   * const versions = await getBulkNodeVersions([
+   *   { node_id: 'ComfyUI-Manager', version: '1.0.0' },
+   *   { node_id: 'ComfyUI-Impact-Pack', version: '2.0.0' }
+   * ])
+   * if (versions) {
+   *   versions.node_versions.forEach(result => {
+   *     if (result.status === 'success' && result.node_version) {
+   *       console.log(`Retrieved ${result.identifier.node_id}@${result.identifier.version}`)
+   *     }
+   *   })
+   * }
+   * ```
+   */
+  const getBulkNodeVersions = async (
+    nodeVersions: components['schemas']['NodeVersionIdentifier'][],
+    signal?: AbortSignal
+  ) => {
+    const endpoint = '/bulk/nodes/versions'
+    const errorContext = 'Failed to get bulk node versions'
+    const routeSpecificErrors = {
+      400: 'Bad request: Invalid node version identifiers provided'
+    }
+
+    const requestBody: components['schemas']['BulkNodeVersionsRequest'] = {
+      node_versions: nodeVersions
+    }
+
+    return executeApiRequest(
+      () =>
+        registryApiClient.post<
+          components['schemas']['BulkNodeVersionsResponse']
+        >(endpoint, requestBody, {
+          signal
+        }),
+      errorContext,
+      routeSpecificErrors
+    )
+  }
+
  return {
    isLoading,
    error,
@@ -372,6 +421,7 @@ export const useComfyRegistryService = () => {
    listPacksForPublisher,
    getNodeDefs,
    postPackReview,
-    inferPackFromNodeName
+    inferPackFromNodeName,
+    getBulkNodeVersions
  }
 }
--- a/src/services/dialogService.ts
+++ b/src/services/dialogService.ts
@@ -12,6 +12,9 @@ import TopUpCreditsDialogContent from '@/components/dialog/content/TopUpCreditsD
 import UpdatePasswordContent from '@/components/dialog/content/UpdatePasswordContent.vue'
 import ManagerDialogContent from '@/components/dialog/content/manager/ManagerDialogContent.vue'
 import ManagerHeader from '@/components/dialog/content/manager/ManagerHeader.vue'
+import NodeConflictDialogContent from '@/components/dialog/content/manager/NodeConflictDialogContent.vue'
+import NodeConflictFooter from '@/components/dialog/content/manager/NodeConflictFooter.vue'
+import NodeConflictHeader from '@/components/dialog/content/manager/NodeConflictHeader.vue'
 import ManagerProgressFooter from '@/components/dialog/footer/ManagerProgressFooter.vue'
 import ComfyOrgHeader from '@/components/dialog/header/ComfyOrgHeader.vue'
 import ManagerProgressHeader from '@/components/dialog/header/ManagerProgressHeader.vue'
@@ -20,7 +23,12 @@ import TemplateWorkflowsContent from '@/components/templates/TemplateWorkflowsCo
 import TemplateWorkflowsDialogHeader from '@/components/templates/TemplateWorkflowsDialogHeader.vue'
 import { t } from '@/i18n'
 import type { ExecutionErrorWsMessage } from '@/schemas/apiSchema'
-import { type ShowDialogOptions, useDialogStore } from '@/stores/dialogStore'
+import {
+  type DialogComponentProps,
+  type ShowDialogOptions,
+  useDialogStore
+} from '@/stores/dialogStore'
+import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes'

 export type ConfirmationDialogType =
  | 'default'
@@ -424,6 +432,54 @@ export const useDialogService = () => {
    }
  }

+  function showNodeConflictDialog(
+    options: {
+      showAfterWhatsNew?: boolean
+      conflictedPackages?: ConflictDetectionResult[]
+      dialogComponentProps?: DialogComponentProps
+      buttonText?: string
+      onButtonClick?: () => void
+    } = {}
+  ) {
+    const {
+      dialogComponentProps,
+      buttonText,
+      onButtonClick,
+      showAfterWhatsNew,
+      conflictedPackages
+    } = options
+
+    return dialogStore.showDialog({
+      key: 'global-node-conflict',
+      headerComponent: NodeConflictHeader,
+      footerComponent: NodeConflictFooter,
+      component: NodeConflictDialogContent,
+      dialogComponentProps: {
+        closable: true,
+        pt: {
+          header: { class: '!p-0 !m-0' },
+          content: { class: '!p-0 overflow-y-hidden' },
+          footer: { class: '!p-0' },
+          pcCloseButton: {
+            root: {
+              class:
+                '!w-7 !h-7 !border-none !outline-none !p-2 !m-1.5 bg-gray-500 dark-theme:bg-neutral-700 text-white'
+            }
+          }
+        },
+        ...dialogComponentProps
+      },
+      props: {
+        showAfterWhatsNew,
+        conflictedPackages
+      },
+      footerProps: {
+        buttonText,
+        onButtonClick
+      }
+    })
+  }
+
  return {
    showLoadWorkflowWarning,
    showMissingModelsWarning,
@@ -440,6 +496,7 @@ export const useDialogService = () => {
    showTopUpCreditsDialog,
    showUpdatePasswordDialog,
    showExtensionDialog,
+    showNodeConflictDialog,
    prompt,
    confirm,
    toggleManagerDialog,
--- a/src/stores/comfyManagerStore.ts
+++ b/src/stores/comfyManagerStore.ts
@@ -1,21 +1,29 @@
 import { whenever } from '@vueuse/core'
+import { mapKeys } from 'lodash'
 import { defineStore } from 'pinia'
+import { v4 as uuidv4 } from 'uuid'
 import { ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'

 import { useCachedRequest } from '@/composables/useCachedRequest'
 import { useManagerQueue } from '@/composables/useManagerQueue'
 import { useServerLogs } from '@/composables/useServerLogs'
+import { api } from '@/scripts/api'
 import { useComfyManagerService } from '@/services/comfyManagerService'
 import { useDialogService } from '@/services/dialogService'
-import {
-  InstallPackParams,
-  InstalledPacksResponse,
-  ManagerPackInfo,
-  ManagerPackInstalled,
-  TaskLog,
-  UpdateAllPacksParams
-} from '@/types/comfyManagerTypes'
+import { TaskLog } from '@/types/comfyManagerTypes'
+import { components } from '@/types/generatedManagerTypes'
+
+type InstallPackParams = components['schemas']['InstallPackParams']
+type InstalledPacksResponse = components['schemas']['InstalledPacksResponse']
+type ManagerPackInfo = components['schemas']['ManagerPackInfo']
+type ManagerPackInstalled = components['schemas']['ManagerPackInstalled']
+type ManagerTaskHistory = Record<
+  string,
+  components['schemas']['TaskHistoryItem']
+>
+type ManagerTaskQueue = components['schemas']['TaskStateMessage']
+type UpdateAllPacksParams = components['schemas']['UpdateAllPacksParams']

 /**
 * Store for state of installed node packs
@@ -31,14 +39,62 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
  const installedPacksIds = ref<Set<string>>(new Set())
  const isStale = ref(true)
  const taskLogs = ref<TaskLog[]>([])
+  const succeededTasksLogs = ref<TaskLog[]>([])
+  const failedTasksLogs = ref<TaskLog[]>([])

-  const { statusMessage, allTasksDone, enqueueTask, uncompletedCount } =
-    useManagerQueue()
+  const taskHistory = ref<ManagerTaskHistory>({})
+  const succeededTasksIds = ref<string[]>([])
+  const failedTasksIds = ref<string[]>([])
+  const taskQueue = ref<ManagerTaskQueue>({
+    history: {},
+    running_queue: [],
+    pending_queue: [],
+    installed_packs: {}
+  })
+
+  const managerQueue = useManagerQueue(taskHistory, taskQueue, installedPacks)

  const setStale = () => {
    isStale.value = true
  }

+  const partitionTaskLogs = () => {
+    const successTaskLogs: TaskLog[] = []
+    const failTaskLogs: TaskLog[] = []
+    for (const log of taskLogs.value) {
+      if (failedTasksIds.value.includes(log.taskId)) {
+        failTaskLogs.push(log)
+      } else {
+        successTaskLogs.push(log)
+      }
+    }
+    succeededTasksLogs.value = successTaskLogs
+    failedTasksLogs.value = failTaskLogs
+  }
+
+  const partitionTasks = () => {
+    const successTasksIds = []
+    const failTasksIds = []
+    for (const task of Object.values(taskHistory.value)) {
+      if (task.status?.status_str === 'success') {
+        successTasksIds.push(task.ui_id)
+      } else {
+        failTasksIds.push(task.ui_id)
+      }
+    }
+    succeededTasksIds.value = successTasksIds
+    failedTasksIds.value = failTasksIds
+  }
+
+  whenever(
+    taskHistory,
+    () => {
+      partitionTasks()
+      partitionTaskLogs()
+    },
+    { deep: true }
+  )
+
  const getPackId = (pack: ManagerPackInstalled) => pack.cnr_id || pack.aux_id

  const isInstalledPackId = (packName: string | undefined): boolean =>
@@ -97,11 +153,13 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
  }

  const updateInstalledIds = (packs: ManagerPackInstalled[]) => {
-    installedPacksIds.value = packsToIdSet(packs)
+    const newIds = packsToIdSet(packs)
+    installedPacksIds.value = newIds
  }

  const onPacksChanged = () => {
    const packs = Object.values(installedPacks.value)
+
    updateDisabledIds(packs)
    updateInstalledIds(packs)
  }
@@ -110,28 +168,58 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {

  const refreshInstalledList = async () => {
    const packs = await managerService.listInstalledPacks()
-    if (packs) installedPacks.value = packs
+    if (packs) {
+      // The keys are 'cleaned' by stripping the version suffix.
+      // The pack object itself (the value) still contains the version info.
+      const packsWithCleanedKeys = mapKeys(packs, (_value, key) => {
+        return key.split('@')[0]
+      })
+      installedPacks.value = packsWithCleanedKeys
+    }
    isStale.value = false
  }

  whenever(isStale, refreshInstalledList, { immediate: true })
-  whenever(uncompletedCount, () => showManagerProgressDialog())

-  const withLogs = (task: () => Promise<null>, taskName: string) => {
-    const { startListening, stopListening, logs } = useServerLogs()
+  const enqueueTaskWithLogs = async (
+    task: (taskId: string) => Promise<null>,
+    taskName: string
+  ) => {
+    const taskId = uuidv4()
+    const { logs } = useServerLogs({
+      ui_id: taskId,
+      immediate: true
+    })

-    const loggedTask = async () => {
-      taskLogs.value.push({ taskName, logs: logs.value })
-      await startListening()
-      return task()
+    try {
+      // Show progress dialog immediately when task is queued
+      showManagerProgressDialog()
+      managerQueue.isProcessing.value = true
+
+      // Prepare logging hook
+      taskLogs.value.push({ taskName, taskId, logs: logs.value })
+
+      // Queue the task to the server
+      await task(taskId)
+    } catch (error) {
+      // Reset processing state on error
+      managerQueue.isProcessing.value = false
+
+      // The server has authority over task history in general, but in rare
+      // case of client-side error, we add that to failed tasks from the client side
+      taskHistory.value[taskId] = {
+        ui_id: taskId,
+        client_id: api.clientId || 'unknown',
+        kind: 'error',
+        result: 'failed',
+        status: {
+          status_str: 'error',
+          completed: false,
+          messages: [error instanceof Error ? error.message : String(error)]
+        },
+        timestamp: new Date().toISOString()
+      }
    }
-
-    const onComplete = async () => {
-      await stopListening()
-      setStale()
-    }
-
-    return { task: loggedTask, onComplete }
  }

  const installPack = useCachedRequest<InstallPackParams, void>(
@@ -152,39 +240,62 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
        }
      }

-      const task = () => managerService.installPack(params, signal)
-      enqueueTask(withLogs(task, `${actionDescription} ${params.id}`))
+      const task = (taskId: string) =>
+        managerService.installPack(params, taskId, signal)
+      await enqueueTaskWithLogs(task, `${actionDescription} ${params.id}`)
    },
    { maxSize: 1 }
  )

-  const uninstallPack = (params: ManagerPackInfo, signal?: AbortSignal) => {
+  const uninstallPack = async (
+    params: ManagerPackInfo,
+    signal?: AbortSignal
+  ) => {
    installPack.clear()
    installPack.cancel()
-    const task = () => managerService.uninstallPack(params, signal)
-    enqueueTask(withLogs(task, t('manager.uninstalling', { id: params.id })))
+    const uninstallParams: components['schemas']['UninstallPackParams'] = {
+      node_name: params.id,
+      is_unknown: false
+    }
+    const task = (taskId: string) =>
+      managerService.uninstallPack(uninstallParams, taskId, signal)
+    await enqueueTaskWithLogs(
+      task,
+      t('manager.uninstalling', { id: params.id })
+    )
  }

  const updatePack = useCachedRequest<ManagerPackInfo, void>(
    async (params: ManagerPackInfo, signal?: AbortSignal) => {
      updateAllPacks.cancel()
-      const task = () => managerService.updatePack(params, signal)
-      enqueueTask(withLogs(task, t('g.updating', { id: params.id })))
+      const updateParams: components['schemas']['UpdatePackParams'] = {
+        node_name: params.id,
+        node_ver: params.version
+      }
+      const task = (taskId: string) =>
+        managerService.updatePack(updateParams, taskId, signal)
+      await enqueueTaskWithLogs(task, t('g.updating', { id: params.id }))
    },
    { maxSize: 1 }
  )

  const updateAllPacks = useCachedRequest<UpdateAllPacksParams, void>(
    async (params: UpdateAllPacksParams, signal?: AbortSignal) => {
-      const task = () => managerService.updateAllPacks(params, signal)
-      enqueueTask(withLogs(task, t('manager.updatingAllPacks')))
+      const task = (taskId: string) =>
+        managerService.updateAllPacks(params, taskId, signal)
+      await enqueueTaskWithLogs(task, t('manager.updatingAllPacks'))
    },
    { maxSize: 1 }
  )

-  const disablePack = (params: ManagerPackInfo, signal?: AbortSignal) => {
-    const task = () => managerService.disablePack(params, signal)
-    enqueueTask(withLogs(task, t('g.disabling', { id: params.id })))
+  const disablePack = async (params: ManagerPackInfo, signal?: AbortSignal) => {
+    const disableParams: components['schemas']['DisablePackParams'] = {
+      node_name: params.id,
+      is_unknown: false
+    }
+    const task = (taskId: string) =>
+      managerService.disablePack(disableParams, taskId, signal)
+    await enqueueTaskWithLogs(task, t('g.disabling', { id: params.id }))
  }

  const getInstalledPackVersion = (packId: string) => {
@@ -192,19 +303,50 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
    return pack?.ver
  }

+  /**
+   * Get installed pack by CNR ID or aux ID for O(1) lookup performance
+   * @param id - The CNR ID or aux ID to search for
+   * @returns The installed pack if found, undefined otherwise
+   */
+  const getInstalledPackByCnrId = (id: string) => {
+    // Use cached Map for O(1) lookup instead of O(n) Object.values().find()
+    for (const pack of Object.values(installedPacks.value)) {
+      if (pack.cnr_id === id || pack.aux_id === id) {
+        return pack
+      }
+    }
+    return undefined
+  }
+
  const clearLogs = () => {
    taskLogs.value = []
  }

+  const resetTaskState = () => {
+    // Clear all task-related reactive state for fresh start after restart
+    taskLogs.value = []
+    taskHistory.value = {}
+    succeededTasksIds.value = []
+    failedTasksIds.value = []
+    succeededTasksLogs.value = []
+    failedTasksLogs.value = []
+
+    // Reset task queue to initial state
+    taskQueue.value = {
+      history: {},
+      running_queue: [],
+      pending_queue: [],
+      installed_packs: {}
+    }
+  }
+
  return {
    // Manager state
    isLoading: managerService.isLoading,
    error: managerService.error,
-    statusMessage,
-    allTasksDone,
-    uncompletedCount,
    taskLogs,
    clearLogs,
+    resetTaskState,
    setStale,

    // Installed packs state
@@ -213,8 +355,18 @@ export const useComfyManagerStore = defineStore('comfyManager', () => {
    isPackInstalled: isInstalledPackId,
    isPackEnabled: isEnabledPackId,
    getInstalledPackVersion,
+    getInstalledPackByCnrId,
    refreshInstalledList,

+    // Task queue state and actions
+    taskHistory,
+    isProcessingTasks: managerQueue.isProcessing,
+    succeededTasksIds,
+    failedTasksIds,
+    succeededTasksLogs,
+    failedTasksLogs,
+    managerQueue,
+
    // Pack actions
    installPack,
    uninstallPack,
@@ -234,6 +386,15 @@ export const useManagerProgressDialogStore = defineStore(
  'managerProgressDialog',
  () => {
    const isExpanded = ref(false)
+    const activeTabIndex = ref(0)
+
+    const setActiveTabIndex = (index: number) => {
+      activeTabIndex.value = index
+    }
+
+    const getActiveTabIndex = () => {
+      return activeTabIndex.value
+    }

    const toggle = () => {
      isExpanded.value = !isExpanded.value
@@ -250,7 +411,9 @@ export const useManagerProgressDialogStore = defineStore(
      isExpanded,
      toggle,
      collapse,
-      expand
+      expand,
+      setActiveTabIndex,
+      getActiveTabIndex
    }
  }
 )
--- a/src/stores/conflictDetectionStore.ts
+++ b/src/stores/conflictDetectionStore.ts
@@ -0,0 +1,70 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes'
+
+export const useConflictDetectionStore = defineStore(
+  'conflictDetection',
+  () => {
+    // State
+    const conflictedPackages = ref<ConflictDetectionResult[]>([])
+    const isDetecting = ref(false)
+    const lastDetectionTime = ref<string | null>(null)
+
+    // Getters
+    const hasConflicts = computed(() =>
+      conflictedPackages.value.some((pkg) => pkg.has_conflict)
+    )
+
+    const getConflictsForPackageByID = computed(
+      () => (packageId: string) =>
+        conflictedPackages.value.find((pkg) => pkg.package_id === packageId)
+    )
+
+    const bannedPackages = computed(() =>
+      conflictedPackages.value.filter((pkg) =>
+        pkg.conflicts.some((conflict) => conflict.type === 'banned')
+      )
+    )
+
+    const securityPendingPackages = computed(() =>
+      conflictedPackages.value.filter((pkg) =>
+        pkg.conflicts.some((conflict) => conflict.type === 'pending')
+      )
+    )
+
+    // Actions
+    function setConflictedPackages(packages: ConflictDetectionResult[]) {
+      conflictedPackages.value = [...packages]
+    }
+
+    function clearConflicts() {
+      conflictedPackages.value = []
+    }
+
+    function setDetecting(detecting: boolean) {
+      isDetecting.value = detecting
+    }
+
+    function setLastDetectionTime(time: string) {
+      lastDetectionTime.value = time
+    }
+
+    return {
+      // State
+      conflictedPackages,
+      isDetecting,
+      lastDetectionTime,
+      // Getters
+      hasConflicts,
+      getConflictsForPackageByID,
+      bannedPackages,
+      securityPendingPackages,
+      // Actions
+      setConflictedPackages,
+      clearConflicts,
+      setDetecting,
+      setLastDetectionTime
+    }
+  }
+)
--- a/src/stores/dialogStore.ts
+++ b/src/stores/dialogStore.ts
@@ -30,7 +30,7 @@ interface CustomDialogComponentProps {
  dismissableMask?: boolean
 }

-type DialogComponentProps = InstanceType<typeof GlobalDialog>['$props'] &
+export type DialogComponentProps = InstanceType<typeof GlobalDialog>['$props'] &
  CustomDialogComponentProps

 interface DialogInstance {
@@ -41,6 +41,7 @@ interface DialogInstance {
  component: Component
  contentProps: Record<string, any>
  footerComponent?: Component
+  footerProps?: Record<string, any>
  dialogComponentProps: DialogComponentProps
  priority: number
 }
@@ -52,6 +53,7 @@ export interface ShowDialogOptions {
  footerComponent?: Component
  component: Component
  props?: Record<string, any>
+  footerProps?: Record<string, any>
  dialogComponentProps?: DialogComponentProps
  /**
   * Optional priority for dialog stacking.
@@ -125,6 +127,7 @@ export const useDialogStore = defineStore('dialog', () => {
    footerComponent?: Component
    component: Component
    props?: Record<string, any>
+    footerProps?: Record<string, any>
    dialogComponentProps?: DialogComponentProps
    priority?: number
  }) {
@@ -144,6 +147,7 @@ export const useDialogStore = defineStore('dialog', () => {
        : undefined,
      component: markRaw(options.component),
      contentProps: { ...options.props },
+      footerProps: { ...options.footerProps },
      priority: options.priority ?? 1,
      dialogComponentProps: {
        maximizable: false,
--- a/src/stores/nodeCompatibilityStore.ts
+++ b/src/stores/nodeCompatibilityStore.ts
@@ -0,0 +1,239 @@
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+
+import type {
+  ConflictType,
+  SystemEnvironment
+} from '@/types/conflictDetectionTypes'
+
+interface IncompatibleNodeInfo {
+  nodeId: string
+  nodeName: string
+  disableReason: ConflictType
+  conflictDetails: string
+  detectedAt: string
+}
+
+/**
+ * Store for managing node compatibility checking functionality.
+ * Follows error-resilient patterns from useConflictDetection composable.
+ */
+export const useNodeCompatibilityStore = defineStore(
+  'nodeCompatibility',
+  () => {
+    // Core state
+    const isChecking = ref(false)
+    const lastCheckTime = ref<string | null>(null)
+    const checkError = ref<string | null>(null)
+    const systemEnvironment = ref<SystemEnvironment | null>(null)
+
+    // Node tracking maps
+    const incompatibleNodes = ref<Map<string, IncompatibleNodeInfo>>(new Map())
+    const failedImportNodes = ref<Set<string>>(new Set())
+    const bannedNodes = ref<Set<string>>(new Set())
+    const securityPendingNodes = ref<Set<string>>(new Set())
+
+    // User interaction state
+    const hasShownNotificationModal = ref(false)
+    const pendingNotificationNodes = ref<IncompatibleNodeInfo[]>([])
+
+    // Computed properties
+    const hasIncompatibleNodes = computed(
+      () => incompatibleNodes.value.size > 0
+    )
+    const totalIncompatibleCount = computed(
+      () =>
+        incompatibleNodes.value.size +
+        failedImportNodes.value.size +
+        bannedNodes.value.size
+    )
+
+    const incompatibleNodesList = computed(() =>
+      Array.from(incompatibleNodes.value.values())
+    )
+
+    const shouldShowNotification = computed(() => {
+      // Show notification if there are incompatible nodes and we haven't shown notification yet
+      return hasIncompatibleNodes.value && !hasShownNotificationModal.value
+    })
+
+    /**
+     * Checks if a node has compatibility issues.
+     */
+    function hasNodeCompatibilityIssues(nodeId: string): boolean {
+      return (
+        incompatibleNodes.value.has(nodeId) ||
+        failedImportNodes.value.has(nodeId) ||
+        bannedNodes.value.has(nodeId)
+      )
+    }
+
+    /**
+     * Gets the compatibility info for a node.
+     */
+    function getNodeCompatibilityInfo(
+      nodeId: string
+    ): IncompatibleNodeInfo | null {
+      return incompatibleNodes.value.get(nodeId) || null
+    }
+
+    /**
+     * Adds a node to the incompatible list.
+     */
+    function addIncompatibleNode(
+      nodeId: string,
+      nodeName: string,
+      reason: ConflictType,
+      details: string
+    ): void {
+      const info: IncompatibleNodeInfo = {
+        nodeId,
+        nodeName,
+        disableReason: reason,
+        conflictDetails: details,
+        detectedAt: new Date().toISOString()
+      }
+
+      incompatibleNodes.value.set(nodeId, info)
+
+      // Add to pending list (for notification purposes)
+      if (!hasShownNotificationModal.value) {
+        pendingNotificationNodes.value.push(info)
+      }
+    }
+
+    /**
+     * Removes a node from the incompatible list.
+     */
+    function removeIncompatibleNode(nodeId: string): void {
+      incompatibleNodes.value.delete(nodeId)
+      failedImportNodes.value.delete(nodeId)
+      bannedNodes.value.delete(nodeId)
+      securityPendingNodes.value.delete(nodeId)
+
+      // Remove from pending list
+      pendingNotificationNodes.value = pendingNotificationNodes.value.filter(
+        (node) => node.nodeId !== nodeId
+      )
+    }
+
+    /**
+     * Clears all compatibility check results.
+     */
+    function clearResults(): void {
+      incompatibleNodes.value.clear()
+      failedImportNodes.value.clear()
+      bannedNodes.value.clear()
+      securityPendingNodes.value.clear()
+      pendingNotificationNodes.value = []
+      checkError.value = null
+    }
+
+    /**
+     * Marks that the notification modal has been shown.
+     */
+    function markNotificationModalShown(): void {
+      hasShownNotificationModal.value = true
+      pendingNotificationNodes.value = []
+    }
+
+    /**
+     * Resets the notification modal state (for testing or re-initialization).
+     */
+    function resetNotificationModalState(): void {
+      hasShownNotificationModal.value = false
+      pendingNotificationNodes.value = Array.from(
+        incompatibleNodes.value.values()
+      )
+    }
+
+    /**
+     * Updates the system environment information.
+     */
+    function setSystemEnvironment(env: SystemEnvironment): void {
+      systemEnvironment.value = env
+    }
+
+    /**
+     * Sets the checking state.
+     */
+    function setCheckingState(checking: boolean): void {
+      isChecking.value = checking
+      if (checking) {
+        checkError.value = null
+      }
+    }
+
+    /**
+     * Records a successful check completion.
+     */
+    function recordCheckCompletion(): void {
+      lastCheckTime.value = new Date().toISOString()
+      isChecking.value = false
+    }
+
+    /**
+     * Records a check error.
+     */
+    function recordCheckError(error: string): void {
+      checkError.value = error
+      isChecking.value = false
+    }
+
+    /**
+     * Gets a summary of the current compatibility state.
+     */
+    function getCompatibilitySummary() {
+      return {
+        totalChecked: lastCheckTime.value ? 'completed' : 'pending',
+        incompatibleCount: incompatibleNodes.value.size,
+        failedImportCount: failedImportNodes.value.size,
+        bannedCount: bannedNodes.value.size,
+        securityPendingCount: securityPendingNodes.value.size,
+        totalIssues: totalIncompatibleCount.value,
+        lastCheckTime: lastCheckTime.value,
+        hasError: !!checkError.value
+      }
+    }
+
+    return {
+      // State
+      isChecking: computed(() => isChecking.value),
+      lastCheckTime: computed(() => lastCheckTime.value),
+      checkError: computed(() => checkError.value),
+      systemEnvironment: computed(() => systemEnvironment.value),
+
+      // Node tracking
+      incompatibleNodes: computed(() => incompatibleNodes.value),
+      incompatibleNodesList,
+      failedImportNodes: computed(() => failedImportNodes.value),
+      bannedNodes: computed(() => bannedNodes.value),
+      securityPendingNodes: computed(() => securityPendingNodes.value),
+
+      // User interaction
+      hasShownNotificationModal: computed(
+        () => hasShownNotificationModal.value
+      ),
+      pendingNotificationNodes: computed(() => pendingNotificationNodes.value),
+      shouldShowNotification,
+
+      // Computed
+      hasIncompatibleNodes,
+      totalIncompatibleCount,
+
+      // Methods
+      hasNodeCompatibilityIssues,
+      getNodeCompatibilityInfo,
+      addIncompatibleNode,
+      removeIncompatibleNode,
+      clearResults,
+      markNotificationModalShown,
+      resetNotificationModalState,
+      setSystemEnvironment,
+      setCheckingState,
+      recordCheckCompletion,
+      recordCheckError,
+      getCompatibilitySummary
+    }
+  }
+)
--- a/src/types/comfyManagerTypes.ts
+++ b/src/types/comfyManagerTypes.ts
@@ -1,28 +1,11 @@
 import type { InjectionKey, Ref } from 'vue'

-import type { ComfyWorkflowJSON } from '@/schemas/comfyWorkflowSchema'
 import type { AlgoliaNodePack } from '@/types/algoliaTypes'
 import type { components } from '@/types/comfyRegistryTypes'
-import type { SearchMode } from '@/types/searchServiceTypes'
-
-type WorkflowNodeProperties = ComfyWorkflowJSON['nodes'][0]['properties']
-
-export type RegistryPack = components['schemas']['Node']
-export type MergedNodePack = RegistryPack & AlgoliaNodePack
-export const isMergedNodePack = (
-  nodePack: RegistryPack | AlgoliaNodePack
-): nodePack is MergedNodePack => 'comfy_nodes' in nodePack
-
-export type PackField = keyof RegistryPack | null

 export const IsInstallingKey: InjectionKey<Ref<boolean>> =
  Symbol('isInstalling')

-export enum ManagerWsQueueStatus {
-  DONE = 'done',
-  IN_PROGRESS = 'in_progress'
-}
-
 export enum ManagerTab {
  All = 'all',
  Installed = 'installed',
@@ -52,6 +35,7 @@ export interface SearchOption<T> {

 export type TaskLog = {
  taskName: string
+  taskId: string
  logs: string[]
 }

@@ -60,185 +44,25 @@ export interface UseNodePacksOptions {
  maxConcurrent?: number
 }

-enum ManagerPackState {
-  /** Pack is installed and enabled */
-  INSTALLED = 'installed',
-  /** Pack is installed but disabled */
-  DISABLED = 'disabled',
-  /** Pack is not installed */
-  NOT_INSTALLED = 'not_installed',
-  /** Pack failed to import */
-  IMPORT_FAILED = 'import_failed',
-  /** Pack has an update available */
-  NEEDS_UPDATE = 'needs_update'
-}
+// Node pack types from different sources
+export type RegistryPack = components['schemas']['Node']

-enum ManagerPackInstallType {
-  /** Installed via git clone */
-  GIT = 'git-clone',
-  /** Installed via file copy */
-  COPY = 'copy',
-  /** Installed from the Comfy Registry */
-  REGISTRY = 'cnr'
-}
-
-export enum SelectedVersion {
-  /** Latest version of the pack from the registry */
-  LATEST = 'latest',
-  /** Latest commit of the pack from its GitHub repository */
-  NIGHTLY = 'nightly'
-}
-
-export enum ManagerChannel {
-  /** All packs except those with instability or security issues */
-  DEFAULT = 'default',
-  /** Packs that were recently updated */
-  RECENT = 'recent',
-  /** Packs that were superseded by distinct replacements of some type */
-  LEGACY = 'legacy',
-  /** Packs that were forked as a result of the original pack going unmaintained */
-  FORKED = 'forked',
-  /** Packs with instability or security issues suitable only for developers */
-  DEV = 'dev',
-  /** Packs suitable for beginners */
-  TUTORIAL = 'tutorial'
-}
-
-export enum ManagerDatabaseSource {
-  /** Get pack info from the Comfy Registry */
-  REMOTE = 'remote',
-  /** If set to `local`, the channel is ignored */
-  LOCAL = 'local',
-  /** Get pack info from the cached response from the Comfy Registry (1 day TTL) */
-  CACHE = 'cache'
-}
-
-export interface ManagerQueueStatus {
-  /** `done_count` + `in_progress_count` + number of items queued */
-  total_count: number
-  /** Task worker thread is alive, a queued operation is running */
-  is_processing: boolean
-  /** Number of items in the queue that have been completed */
-  done_count: number
-  /** Number of items in the queue that are currently running */
-  in_progress_count: number
-}
-
-export interface ManagerPackInfo {
-  /** Either github-author/github-repo or name of pack from the registry (not id) */
-  id: WorkflowNodeProperties['aux_id'] | WorkflowNodeProperties['cnr_id']
-  /** Semantic version or Git commit hash */
-  version: WorkflowNodeProperties['ver']
-}
-
-export interface ManagerPackInstalled {
-  /**
-   * The version of the pack that is installed.
-   * Git commit hash or semantic version.
-   */
-  ver: WorkflowNodeProperties['ver']
-  /**
-   * The name of the pack if the pack is installed from the registry.
-   * Corresponds to `Node#name` in comfy-api.
-   */
-  cnr_id: WorkflowNodeProperties['cnr_id']
-  /**
-   * The name of the pack if the pack is installed from github.
-   * In the format author/repo-name. If the pack is installed from the registry, this is `null`.
-   */
-  aux_id: WorkflowNodeProperties['aux_id'] | null
-  enabled: boolean
-}
+// MergedNodePack is the intersection of AlgoliaNodePack and RegistryPack
+// created by lodash merge operation: merge({}, algoliaNodePack, registryPack)
+export type MergedNodePack = AlgoliaNodePack & RegistryPack

 /**
- * Returned by `/customnode/installed`
+ * Type guard to check if a node pack is from Algolia (has comfy_nodes)
 */
-export type InstalledPacksResponse = Record<
-  NonNullable<RegistryPack['name']>,
-  ManagerPackInstalled
->
-
-/**
- * Returned by `/customnode/getlist`
- */
-export interface ManagerPack extends ManagerPackInfo {
-  /** Pack author name or 'Unclaimed' if the pack was added automatically via GitHub crawl. */
-  author: components['schemas']['Node']['author']
-  /** Files included in the pack */
-  files: string[]
-  /** The type of installation that was used to install the pack */
-  reference: string
-  /** The display name of the pack */
-  title: string
-  /** The latest version of the pack */
-  cnr_latest: SelectedVersion
-  /** The github link to the repository of the pack */
-  repository: string
-  /** The state of the pack */
-  state: ManagerPackState
-  /** The state of the pack update */
-  'update-state': 'false' | 'true' | null
-  /** The number of stars the pack has on GitHub. Distinct from registry stars */
-  stars: number
-  /**
-   * The last time the pack was updated. In ISO 8601 format.
-   * @example '2024-05-22 20:00:00'
-   */
-  last_update: string
-  health: string
-  description: string
-  trust: boolean
-  install_type: ManagerPackInstallType
-}
-
-/**
- * Returned by `/customnode/getmappings`.
- */
-export type ManagerMappings = Record<
-  NonNullable<components['schemas']['Node']['name']>,
-  [
-    /** List of ComfyNode names included in the pack */
-    Array<components['schemas']['ComfyNode']['comfy_node_name']>,
-    {
-      /** The display name of the pack */
-      title_aux: string
-    }
-  ]
->
-
-/**
- * Payload for `/manager/queue/install`
- */
-export interface InstallPackParams extends ManagerPackInfo {
-  /**
-   * Semantic version, Git commit hash, `latest`, or `nightly`.
-   */
-  selected_version: WorkflowNodeProperties['ver'] | SelectedVersion
-  /**
-   * The GitHub link to the repository of the pack to install.
-   * Required if `selected_version` is `nightly`.
-   */
-  repository: string
-  /**
-   * List of PyPi dependency names associated with the pack.
-   * Used in coordination with pip package whitelist and version lock features.
-   */
-  pip?: string[]
-  mode: ManagerDatabaseSource
-  channel: ManagerChannel
-  skip_post_install?: boolean
-}
-
-/**
- * Params for `/manager/queue/update_all`
- */
-export interface UpdateAllPacksParams {
-  mode?: ManagerDatabaseSource
+export function isMergedNodePack(
+  pack: MergedNodePack | RegistryPack
+): pack is MergedNodePack {
+  return 'comfy_nodes' in pack && Array.isArray(pack.comfy_nodes)
 }

 export interface ManagerState {
  selectedTabId: ManagerTab
  searchQuery: string
-  searchMode: SearchMode
+  searchMode: 'nodes' | 'packs'
  sortField: string
 }
--- a/src/types/conflictDetectionTypes.ts
+++ b/src/types/conflictDetectionTypes.ts
@@ -0,0 +1,126 @@
+/**
+ * Type definitions for the conflict detection system.
+ * These types are used to detect compatibility issues between Node Packs and the system environment.
+ *
+ * This file extends and uses types from comfyRegistryTypes.ts to maintain consistency
+ * with the Registry API schema.
+ */
+import type { components } from './comfyRegistryTypes'
+
+// Re-export core types from Registry API
+export type Node = components['schemas']['Node']
+export type NodeVersion = components['schemas']['NodeVersion']
+export type NodeStatus = components['schemas']['NodeStatus']
+export type NodeVersionStatus = components['schemas']['NodeVersionStatus']
+
+/**
+ * Conflict types that can be detected in the system
+ * @enum {string}
+ */
+export type ConflictType =
+  | 'comfyui_version' // ComfyUI version mismatch
+  | 'frontend_version' // Frontend version mismatch
+  | 'import_failed'
+  // | 'python_version' // Python version mismatch
+  | 'os' // Operating system incompatibility
+  | 'accelerator' // GPU/accelerator incompatibility
+  | 'banned' // Banned package
+  | 'pending' // Security verification pending
+
+/**
+ * Version comparison operators
+ * @enum {string}
+ */
+export type VersionOperator = '>=' | '>' | '<=' | '<' | '==' | '!='
+
+/**
+ * Version requirement specification
+ */
+export interface VersionRequirement {
+  /** @description Comparison operator for version checking */
+  operator: VersionOperator
+  /** @description Target version string */
+  version: string
+}
+
+/**
+ * Node Pack requirements from Registry API
+ * Extends Node type with additional installation and compatibility metadata
+ */
+export interface NodePackRequirements extends Node {
+  installed_version: string
+  is_enabled: boolean
+  is_banned: boolean
+  is_pending: boolean
+  // Aliases for backwards compatibility with existing code
+  version_status?: string
+}
+
+/**
+ * Current system environment information
+ */
+export interface SystemEnvironment {
+  // Version information
+  comfyui_version: string
+  frontend_version: string
+  // python_version: string
+
+  // Platform information
+  os: string
+  platform_details: string
+  architecture: string
+
+  // GPU/accelerator information
+  available_accelerators: Node['supported_accelerators']
+  primary_accelerator: string
+  gpu_memory_mb?: number
+
+  // Runtime information
+  node_env: 'development' | 'production'
+  user_agent: string
+}
+
+/**
+ * Individual conflict detection result for a package
+ */
+export interface ConflictDetectionResult {
+  package_id: string
+  package_name: string
+  has_conflict: boolean
+  conflicts: ConflictDetail[]
+  is_compatible: boolean
+}
+
+/**
+ * Detailed information about a specific conflict
+ */
+export interface ConflictDetail {
+  type: ConflictType
+  current_value: string
+  required_value: string
+}
+
+/**
+ * Overall conflict detection summary
+ */
+export interface ConflictDetectionSummary {
+  total_packages: number
+  compatible_packages: number
+  conflicted_packages: number
+  banned_packages: number
+  pending_packages: number
+  conflicts_by_type_details: Record<ConflictType, string[]>
+  last_check_timestamp: string
+  check_duration_ms: number
+}
+
+/**
+ * Response payload from conflict detection API
+ */
+export interface ConflictDetectionResponse {
+  success: boolean
+  error_message?: string
+  summary: ConflictDetectionSummary
+  results: ConflictDetectionResult[]
+  detected_system_environment?: Partial<SystemEnvironment>
+}
--- a/src/types/generatedManagerTypes.ts
+++ b/src/types/generatedManagerTypes.ts
--- a/src/types/importFailedTypes.ts
+++ b/src/types/importFailedTypes.ts
@@ -0,0 +1,9 @@
+import type { ComputedRef, InjectionKey } from 'vue'
+
+export interface ImportFailedContext {
+  importFailed: ComputedRef<boolean>
+  showImportFailedDialog: () => void
+}
+
+export const ImportFailedKey: InjectionKey<ImportFailedContext> =
+  Symbol('ImportFailed')
--- a/src/utils/conflictMessageUtil.ts
+++ b/src/utils/conflictMessageUtil.ts
@@ -0,0 +1,62 @@
+import type { ConflictDetail } from '@/types/conflictDetectionTypes'
+
+/**
+ * Generates a localized conflict message for a given conflict detail.
+ * This function should be used anywhere conflict messages need to be displayed.
+ *
+ * @param conflict The conflict detail object
+ * @param t The i18n translation function
+ * @returns A localized conflict message string
+ */
+export function getConflictMessage(
+  conflict: ConflictDetail,
+  t: (key: string, params?: Record<string, any>) => string
+): string {
+  const messageKey = `manager.conflicts.conflictMessages.${conflict.type}`
+
+  // For version and compatibility conflicts, use interpolated message
+  if (
+    conflict.type === 'comfyui_version' ||
+    conflict.type === 'frontend_version' ||
+    conflict.type === 'os' ||
+    conflict.type === 'accelerator'
+  ) {
+    return t(messageKey, {
+      current: conflict.current_value,
+      required: conflict.required_value
+    })
+  }
+
+  // For banned, pending, and import_failed, use simple message
+  if (
+    conflict.type === 'banned' ||
+    conflict.type === 'pending' ||
+    conflict.type === 'import_failed'
+  ) {
+    return t(messageKey)
+  }
+
+  // Fallback to generic message with interpolation
+  return t('manager.conflicts.conflictMessages.generic', {
+    current: conflict.current_value,
+    required: conflict.required_value
+  })
+}
+
+/**
+ * Generates conflict messages for multiple conflicts and joins them.
+ *
+ * @param conflicts Array of conflict details
+ * @param t The i18n translation function
+ * @param separator The separator to use when joining messages (default: '; ')
+ * @returns A single string with all conflict messages joined
+ */
+export function getJoinedConflictMessages(
+  conflicts: ConflictDetail[],
+  t: (key: string, params?: Record<string, any>) => string,
+  separator = '; '
+): string {
+  return conflicts
+    .map((conflict) => getConflictMessage(conflict, t))
+    .join(separator)
+}
--- a/src/utils/versionUtil.ts
+++ b/src/utils/versionUtil.ts
@@ -0,0 +1,111 @@
+import * as semver from 'semver'
+
+import type {
+  ConflictDetail,
+  ConflictType
+} from '@/types/conflictDetectionTypes'
+
+/**
+ * Cleans a version string by removing common prefixes and normalizing format
+ * @param version Raw version string (e.g., "v1.2.3", "1.2.3-alpha")
+ * @returns Cleaned version string or original if cleaning fails
+ */
+export function cleanVersion(version: string): string {
+  return semver.clean(version) || version
+}
+
+/**
+ * Checks if a version satisfies a version range
+ * @param version Current version
+ * @param range Version range (e.g., ">=1.0.0", "^1.2.0", "1.0.0 - 2.0.0")
+ * @returns true if version satisfies the range
+ */
+export function satisfiesVersion(version: string, range: string): boolean {
+  try {
+    const cleanedVersion = cleanVersion(version)
+    return semver.satisfies(cleanedVersion, range)
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Compares two versions and returns the difference type
+ * @param version1 First version
+ * @param version2 Second version
+ * @returns Difference type or null if comparison fails
+ */
+export function getVersionDifference(
+  version1: string,
+  version2: string
+): semver.ReleaseType | null {
+  try {
+    const clean1 = cleanVersion(version1)
+    const clean2 = cleanVersion(version2)
+    return semver.diff(clean1, clean2)
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Checks if a version is valid according to semver
+ * @param version Version string to validate
+ * @returns true if version is valid
+ */
+export function isValidVersion(version: string): boolean {
+  return semver.valid(version) !== null
+}
+
+/**
+ * Checks version compatibility and returns conflict details.
+ * Supports all semver ranges including >=, <=, >, <, ~, ^ operators.
+ * @param type Conflict type (e.g., 'comfyui_version', 'frontend_version')
+ * @param currentVersion Current version string
+ * @param supportedVersion Required version range string
+ * @returns ConflictDetail object if incompatible, null if compatible
+ */
+export function utilCheckVersionCompatibility(
+  type: ConflictType,
+  currentVersion: string,
+  supportedVersion: string
+): ConflictDetail | null {
+  // If current version is unknown, assume compatible (no conflict)
+  if (!currentVersion || currentVersion === 'unknown') {
+    return null
+  }
+
+  // If no version requirement specified, assume compatible (no conflict)
+  if (!supportedVersion || supportedVersion.trim() === '') {
+    return null
+  }
+
+  try {
+    // Clean the current version using semver utilities
+    const cleanCurrent = cleanVersion(currentVersion)
+
+    // Check version compatibility using semver library
+    const isCompatible = satisfiesVersion(cleanCurrent, supportedVersion)
+
+    if (!isCompatible) {
+      return {
+        type,
+        current_value: currentVersion,
+        required_value: supportedVersion
+      }
+    }
+
+    return null
+  } catch (error) {
+    console.warn(
+      `[VersionUtil] Failed to parse version requirement: ${supportedVersion}`,
+      error
+    )
+    // On error, assume incompatible to be safe
+    return {
+      type,
+      current_value: currentVersion,
+      required_value: supportedVersion
+    }
+  }
+}
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -173,6 +173,20 @@ export default {
          800: '#9c4221',
          900: '#7b341e',
          950: '#431407'
+        },
+
+        yellow: {
+          50: '#fffef5',
+          100: '#fffce8',
+          200: '#fff8c5',
+          300: '#fff197',
+          400: '#ffcc00',
+          500: '#ffc000',
+          600: '#e6a800',
+          700: '#cc9600',
+          800: '#b38400',
+          900: '#997200',
+          950: '#664d00'
        }
      },

--- a/tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts
+++ b/tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts
@@ -0,0 +1,455 @@
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import Button from 'primevue/button'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, ref } from 'vue'
+
+import NodeConflictDialogContent from '@/components/dialog/content/manager/NodeConflictDialogContent.vue'
+import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes'
+
+// Mock getConflictMessage utility
+vi.mock('@/utils/conflictMessageUtil', () => ({
+  getConflictMessage: vi.fn((conflict) => {
+    return `${conflict.type}: ${conflict.current_value} vs ${conflict.required_value}`
+  })
+}))
+
+// Mock dependencies
+vi.mock('vue-i18n', () => ({
+  useI18n: vi.fn(() => ({
+    t: vi.fn((key: string) => {
+      const translations: Record<string, string> = {
+        'manager.conflicts.description': 'Some extensions are not compatible',
+        'manager.conflicts.info': 'Additional info about conflicts',
+        'manager.conflicts.conflicts': 'Conflicts',
+        'manager.conflicts.extensionAtRisk': 'Extensions at Risk',
+        'manager.conflicts.importFailedExtensions': 'Import Failed Extensions'
+      }
+      return translations[key] || key
+    })
+  }))
+}))
+
+// Mock data for conflict detection
+const mockConflictData = ref<ConflictDetectionResult[]>([])
+
+// Mock useConflictDetection composable
+vi.mock('@/composables/useConflictDetection', () => ({
+  useConflictDetection: () => ({
+    conflictedPackages: computed(() => mockConflictData.value)
+  })
+}))
+
+describe('NodeConflictDialogContent', () => {
+  let pinia: ReturnType<typeof createPinia>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    pinia = createPinia()
+    setActivePinia(pinia)
+    // Reset mock data
+    mockConflictData.value = []
+  })
+
+  const createWrapper = (props = {}) => {
+    return mount(NodeConflictDialogContent, {
+      props,
+      global: {
+        plugins: [pinia],
+        components: {
+          Button
+        },
+        stubs: {
+          ContentDivider: true
+        },
+        mocks: {
+          $t: vi.fn((key: string) => {
+            const translations: Record<string, string> = {
+              'manager.conflicts.description':
+                'Some extensions are not compatible',
+              'manager.conflicts.info': 'Additional info about conflicts',
+              'manager.conflicts.conflicts': 'Conflicts',
+              'manager.conflicts.extensionAtRisk': 'Extensions at Risk',
+              'manager.conflicts.importFailedExtensions':
+                'Import Failed Extensions'
+            }
+            return translations[key] || key
+          })
+        }
+      }
+    })
+  }
+
+  const mockConflictResults: ConflictDetectionResult[] = [
+    {
+      package_id: 'Package1',
+      package_name: 'Test Package 1',
+      has_conflict: true,
+      is_compatible: false,
+      conflicts: [
+        {
+          type: 'os',
+          current_value: 'macOS',
+          required_value: 'Windows'
+        },
+        {
+          type: 'accelerator',
+          current_value: 'Metal',
+          required_value: 'CUDA'
+        }
+      ]
+    },
+    {
+      package_id: 'Package2',
+      package_name: 'Test Package 2',
+      has_conflict: true,
+      is_compatible: false,
+      conflicts: [
+        {
+          type: 'banned',
+          current_value: 'installed',
+          required_value: 'not_banned'
+        }
+      ]
+    },
+    {
+      package_id: 'Package3',
+      package_name: 'Test Package 3',
+      has_conflict: true,
+      is_compatible: false,
+      conflicts: [
+        {
+          type: 'import_failed',
+          current_value: 'installed',
+          required_value: 'ModuleNotFoundError: No module named "example"'
+        }
+      ]
+    }
+  ]
+
+  describe('rendering', () => {
+    it('should render without conflicts', () => {
+      // Set empty conflict data
+      mockConflictData.value = []
+
+      const wrapper = createWrapper()
+
+      expect(wrapper.text()).toContain('0')
+      expect(wrapper.text()).toContain('Conflicts')
+      expect(wrapper.text()).toContain('Extensions at Risk')
+      expect(wrapper.find('[class*="Import Failed Extensions"]').exists()).toBe(
+        false
+      )
+    })
+
+    it('should render with conflict data from composable', () => {
+      // Set conflict data
+      mockConflictData.value = mockConflictResults
+
+      const wrapper = createWrapper()
+
+      // Should show 3 total conflicts (2 from Package1 + 1 from Package2, excluding import_failed)
+      expect(wrapper.text()).toContain('3')
+      expect(wrapper.text()).toContain('Conflicts')
+      // Should show 3 extensions at risk (all packages)
+      expect(wrapper.text()).toContain('Extensions at Risk')
+      // Should show import failed section
+      expect(wrapper.text()).toContain('Import Failed Extensions')
+      expect(wrapper.text()).toContain('1') // 1 import failed package
+    })
+
+    it('should show description when showAfterWhatsNew is true', () => {
+      const wrapper = createWrapper({
+        showAfterWhatsNew: true
+      })
+
+      expect(wrapper.text()).toContain('Some extensions are not compatible')
+      expect(wrapper.text()).toContain('Additional info about conflicts')
+    })
+
+    it('should not show description when showAfterWhatsNew is false', () => {
+      const wrapper = createWrapper({
+        showAfterWhatsNew: false
+      })
+
+      expect(wrapper.text()).not.toContain('Some extensions are not compatible')
+      expect(wrapper.text()).not.toContain('Additional info about conflicts')
+    })
+
+    it('should separate import_failed conflicts into separate section', () => {
+      mockConflictData.value = mockConflictResults
+
+      const wrapper = createWrapper()
+
+      // Import Failed Extensions section should show 1 package
+      const importFailedSection = wrapper.findAll(
+        '.w-full.flex.flex-col.bg-neutral-200'
+      )[0]
+      expect(importFailedSection.text()).toContain('1')
+      expect(importFailedSection.text()).toContain('Import Failed Extensions')
+
+      // Conflicts section should show 3 conflicts (excluding import_failed)
+      const conflictsSection = wrapper.findAll(
+        '.w-full.flex.flex-col.bg-neutral-200'
+      )[1]
+      expect(conflictsSection.text()).toContain('3')
+      expect(conflictsSection.text()).toContain('Conflicts')
+    })
+  })
+
+  describe('panel interactions', () => {
+    beforeEach(() => {
+      mockConflictData.value = mockConflictResults
+    })
+
+    it('should toggle import failed panel', async () => {
+      const wrapper = createWrapper()
+
+      // Find import failed panel header (first one)
+      const importFailedHeader = wrapper.find('.w-full.h-8.flex.items-center')
+
+      // Initially collapsed
+      expect(
+        wrapper.find('[class*="py-2 px-4 flex flex-col gap-2.5"]').exists()
+      ).toBe(false)
+
+      // Click to expand import failed panel
+      await importFailedHeader.trigger('click')
+
+      // Should be expanded now and show package name
+      const expandedContent = wrapper.find(
+        '[class*="py-2 px-4 flex flex-col gap-2.5"]'
+      )
+      expect(expandedContent.exists()).toBe(true)
+      expect(expandedContent.text()).toContain('Test Package 3')
+
+      // Should show chevron-down icon when expanded
+      const chevronButton = wrapper.findComponent(Button)
+      expect(chevronButton.props('icon')).toContain('pi-chevron-down')
+    })
+
+    it('should toggle conflicts panel', async () => {
+      const wrapper = createWrapper()
+
+      // Find conflicts panel header (second one)
+      const conflictsHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[1]
+
+      // Click to expand conflicts panel
+      await conflictsHeader.trigger('click')
+
+      // Should be expanded now
+      const conflictItems = wrapper.findAll('.conflict-list-item')
+      expect(conflictItems.length).toBeGreaterThan(0)
+    })
+
+    it('should toggle extensions panel', async () => {
+      const wrapper = createWrapper()
+
+      // Find extensions panel header (third one)
+      const extensionsHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[2]
+
+      // Click to expand extensions panel
+      await extensionsHeader.trigger('click')
+
+      // Should be expanded now and show all package names
+      const expandedContent = wrapper.findAll(
+        '[class*="py-2 px-4 flex flex-col gap-2.5"]'
+      )[0]
+      expect(expandedContent.exists()).toBe(true)
+      expect(expandedContent.text()).toContain('Test Package 1')
+      expect(expandedContent.text()).toContain('Test Package 2')
+      expect(expandedContent.text()).toContain('Test Package 3')
+    })
+
+    it('should collapse other panels when opening one', async () => {
+      const wrapper = createWrapper()
+
+      const importFailedHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[0]
+      const conflictsHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[1]
+      const extensionsHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[2]
+
+      // Open import failed panel first
+      await importFailedHeader.trigger('click')
+
+      // Verify import failed panel is open
+      expect((wrapper.vm as any).importFailedExpanded).toBe(true)
+      expect((wrapper.vm as any).conflictsExpanded).toBe(false)
+      expect((wrapper.vm as any).extensionsExpanded).toBe(false)
+
+      // Open conflicts panel
+      await conflictsHeader.trigger('click')
+
+      // Verify conflicts panel is open and others are closed
+      expect((wrapper.vm as any).importFailedExpanded).toBe(false)
+      expect((wrapper.vm as any).conflictsExpanded).toBe(true)
+      expect((wrapper.vm as any).extensionsExpanded).toBe(false)
+
+      // Open extensions panel
+      await extensionsHeader.trigger('click')
+
+      // Verify extensions panel is open and others are closed
+      expect((wrapper.vm as any).importFailedExpanded).toBe(false)
+      expect((wrapper.vm as any).conflictsExpanded).toBe(false)
+      expect((wrapper.vm as any).extensionsExpanded).toBe(true)
+    })
+  })
+
+  describe('conflict display', () => {
+    beforeEach(() => {
+      mockConflictData.value = mockConflictResults
+    })
+
+    it('should display individual conflict details excluding import_failed', async () => {
+      const wrapper = createWrapper()
+
+      // Expand conflicts panel (second header)
+      const conflictsHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[1]
+      await conflictsHeader.trigger('click')
+
+      // Should display conflict messages (excluding import_failed)
+      const conflictItems = wrapper.findAll('.conflict-list-item')
+      expect(conflictItems).toHaveLength(3) // 2 from Package1 + 1 from Package2
+    })
+
+    it('should display import failed packages separately', async () => {
+      const wrapper = createWrapper()
+
+      // Expand import failed panel (first header)
+      const importFailedHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[0]
+      await importFailedHeader.trigger('click')
+
+      // Should display only import failed package
+      const importFailedItems = wrapper.findAll('.conflict-list-item')
+      expect(importFailedItems).toHaveLength(1)
+      expect(importFailedItems[0].text()).toContain('Test Package 3')
+    })
+
+    it('should display all package names in extensions list', async () => {
+      const wrapper = createWrapper()
+
+      // Expand extensions panel (third header)
+      const extensionsHeader = wrapper.findAll(
+        '.w-full.h-8.flex.items-center'
+      )[2]
+      await extensionsHeader.trigger('click')
+
+      // Should display all package names
+      expect(wrapper.text()).toContain('Test Package 1')
+      expect(wrapper.text()).toContain('Test Package 2')
+      expect(wrapper.text()).toContain('Test Package 3')
+    })
+  })
+
+  describe('empty states', () => {
+    it('should handle empty conflicts gracefully', () => {
+      mockConflictData.value = []
+      const wrapper = createWrapper()
+
+      expect(wrapper.text()).toContain('0')
+      expect(wrapper.text()).toContain('Conflicts')
+      expect(wrapper.text()).toContain('Extensions at Risk')
+      // Import failed section should not be visible when there are no import failures
+      expect(wrapper.text()).not.toContain('Import Failed Extensions')
+    })
+
+    it('should handle conflicts without import_failed', () => {
+      // Only set packages without import_failed conflicts
+      mockConflictData.value = [mockConflictResults[0], mockConflictResults[1]]
+      const wrapper = createWrapper()
+
+      expect(wrapper.text()).toContain('3') // conflicts count
+      expect(wrapper.text()).toContain('2') // extensions count
+      // Import failed section should not be visible
+      expect(wrapper.text()).not.toContain('Import Failed Extensions')
+    })
+  })
+
+  describe('scrolling behavior', () => {
+    it('should apply scrollbar styles to all expandable lists', async () => {
+      mockConflictData.value = mockConflictResults
+      const wrapper = createWrapper()
+
+      // Test all three panels
+      const headers = wrapper.findAll('.w-full.h-8.flex.items-center')
+
+      for (let i = 0; i < headers.length; i++) {
+        await headers[i].trigger('click')
+
+        // Check for scrollable container with proper classes
+        const scrollableContainer = wrapper.find(
+          '[class*="max-h-"][class*="overflow-y-auto"][class*="scrollbar-hide"]'
+        )
+        expect(scrollableContainer.exists()).toBe(true)
+
+        // Close the panel for next iteration
+        await headers[i].trigger('click')
+      }
+    })
+  })
+
+  describe('accessibility', () => {
+    it('should have proper button roles and labels', () => {
+      mockConflictData.value = mockConflictResults
+      const wrapper = createWrapper()
+
+      const buttons = wrapper.findAllComponents(Button)
+      expect(buttons.length).toBe(3) // 3 chevron buttons
+
+      // Check chevron buttons have icons
+      buttons.forEach((button) => {
+        expect(button.props('icon')).toBeDefined()
+        expect(button.props('icon')).toMatch(/pi-chevron-(right|down)/)
+      })
+    })
+
+    it('should have clickable panel headers', () => {
+      mockConflictData.value = mockConflictResults
+      const wrapper = createWrapper()
+
+      const headers = wrapper.findAll('.w-full.h-8.flex.items-center')
+      expect(headers).toHaveLength(3) // import failed, conflicts and extensions headers
+
+      headers.forEach((header) => {
+        expect(header.element.tagName).toBe('DIV')
+      })
+    })
+  })
+
+  describe('lodash optimization', () => {
+    it('should efficiently filter conflicts using lodash', () => {
+      mockConflictData.value = mockConflictResults
+      const wrapper = createWrapper()
+
+      // Verify that import_failed conflicts are filtered out from main conflicts
+      const vm = wrapper.vm as any
+      expect(vm.allConflictDetails).toHaveLength(3) // Should not include import_failed
+      expect(
+        vm.allConflictDetails.every((c: any) => c.type !== 'import_failed')
+      ).toBe(true)
+    })
+
+    it('should efficiently extract import failed packages using lodash', () => {
+      mockConflictData.value = mockConflictResults
+      const wrapper = createWrapper()
+
+      // Verify that only import_failed packages are extracted
+      const vm = wrapper.vm as any
+      expect(vm.importFailedConflicts).toHaveLength(1)
+      expect(vm.importFailedConflicts[0]).toBe('Test Package 3')
+    })
+  })
+})
--- a/tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts
+++ b/tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts
@@ -0,0 +1,222 @@
+import { mount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+import Card from 'primevue/card'
+import ProgressSpinner from 'primevue/progressspinner'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import PackCard from '@/components/dialog/content/manager/packCard/PackCard.vue'
+import type { MergedNodePack, RegistryPack } from '@/types/comfyManagerTypes'
+
+// Mock dependencies
+vi.mock('vue-i18n', () => ({
+  useI18n: vi.fn(() => ({
+    d: vi.fn((date) => date.toLocaleDateString()),
+    t: vi.fn((key: string) => key)
+  })),
+  createI18n: vi.fn(() => ({
+    global: {
+      t: vi.fn((key: string) => key),
+      te: vi.fn(() => true)
+    }
+  }))
+}))
+
+vi.mock('@/stores/comfyManagerStore', () => ({
+  useComfyManagerStore: vi.fn(() => ({
+    isPackInstalled: vi.fn(() => false),
+    isPackEnabled: vi.fn(() => true),
+    installedPacksIds: []
+  }))
+}))
+
+vi.mock('@/stores/workspace/colorPaletteStore', () => ({
+  useColorPaletteStore: vi.fn(() => ({
+    completedActivePalette: { light_theme: true }
+  }))
+}))
+
+vi.mock('@vueuse/core', () => ({
+  whenever: vi.fn()
+}))
+
+vi.mock('@/config', () => ({
+  default: {
+    app_version: '1.24.0-1'
+  }
+}))
+
+vi.mock('@/stores/systemStatsStore', () => ({
+  useSystemStatsStore: vi.fn(() => ({
+    systemStats: {
+      system: { os: 'Darwin' },
+      devices: [{ type: 'mps', name: 'Metal' }]
+    }
+  }))
+}))
+
+describe('PackCard', () => {
+  let pinia: ReturnType<typeof createPinia>
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    pinia = createPinia()
+    setActivePinia(pinia)
+  })
+
+  const createWrapper = (props: {
+    nodePack: MergedNodePack | RegistryPack
+    isSelected?: boolean
+  }) => {
+    const wrapper = mount(PackCard, {
+      props,
+      global: {
+        plugins: [pinia],
+        components: {
+          Card,
+          ProgressSpinner
+        },
+        stubs: {
+          PackBanner: true,
+          PackVersionBadge: true,
+          PackCardFooter: true
+        },
+        mocks: {
+          $t: vi.fn((key: string) => key)
+        }
+      }
+    })
+
+    return wrapper
+  }
+
+  const mockNodePack: RegistryPack = {
+    id: 'test-package',
+    name: 'Test Package',
+    description: 'Test package description',
+    author: 'Test Author',
+    latest_version: {
+      createdAt: '2024-01-01T00:00:00Z'
+    }
+  } as RegistryPack
+
+  describe('basic rendering', () => {
+    it('should render package card with basic information', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.find('.p-card').exists()).toBe(true)
+      expect(wrapper.text()).toContain('Test Package')
+      expect(wrapper.text()).toContain('Test package description')
+      expect(wrapper.text()).toContain('Test Author')
+    })
+
+    it('should render date correctly', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.text()).toContain('2024. 1. 1.')
+    })
+
+    it('should apply selected class when isSelected is true', () => {
+      const wrapper = createWrapper({
+        nodePack: mockNodePack,
+        isSelected: true
+      })
+
+      expect(wrapper.find('.selected-card').exists()).toBe(true)
+    })
+
+    it('should not apply selected class when isSelected is false', () => {
+      const wrapper = createWrapper({
+        nodePack: mockNodePack,
+        isSelected: false
+      })
+
+      expect(wrapper.find('.selected-card').exists()).toBe(false)
+    })
+  })
+
+  describe('component behavior', () => {
+    it('should render without errors', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.exists()).toBe(true)
+      expect(wrapper.find('.p-card').exists()).toBe(true)
+    })
+  })
+
+  describe('package information display', () => {
+    it('should display package name', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.text()).toContain('Test Package')
+    })
+
+    it('should display package description', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.text()).toContain('Test package description')
+    })
+
+    it('should display author name', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.text()).toContain('Test Author')
+    })
+
+    it('should handle missing description', () => {
+      const packWithoutDescription = { ...mockNodePack, description: undefined }
+      const wrapper = createWrapper({ nodePack: packWithoutDescription })
+
+      expect(wrapper.find('p').exists()).toBe(false)
+    })
+
+    it('should handle missing author', () => {
+      const packWithoutAuthor = { ...mockNodePack, author: undefined }
+      const wrapper = createWrapper({ nodePack: packWithoutAuthor })
+
+      // Should still render without errors
+      expect(wrapper.exists()).toBe(true)
+    })
+  })
+
+  describe('component structure', () => {
+    it('should render PackBanner component', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.find('pack-banner-stub').exists()).toBe(true)
+    })
+
+    it('should render PackVersionBadge component', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.find('pack-version-badge-stub').exists()).toBe(true)
+    })
+
+    it('should render PackCardFooter component', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      expect(wrapper.find('pack-card-footer-stub').exists()).toBe(true)
+    })
+  })
+
+  describe('styling', () => {
+    it('should have correct CSS classes', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      const card = wrapper.find('.p-card')
+      expect(card.classes()).toContain('w-full')
+      expect(card.classes()).toContain('h-full')
+      expect(card.classes()).toContain('rounded-lg')
+    })
+
+    it('should have correct base styling', () => {
+      const wrapper = createWrapper({ nodePack: mockNodePack })
+
+      const card = wrapper.find('.p-card')
+      // Check the actual classes applied to the card
+      expect(card.classes()).toContain('p-card')
+      expect(card.classes()).toContain('p-component')
+      expect(card.classes()).toContain('inline-flex')
+      expect(card.classes()).toContain('flex-col')
+    })
+  })
+})
--- a/tests-ui/tests/components/helpcenter/WhatsNewPopup.test.ts
+++ b/tests-ui/tests/components/helpcenter/WhatsNewPopup.test.ts
@@ -0,0 +1,433 @@
+import { mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import WhatsNewPopup from '@/components/helpcenter/WhatsNewPopup.vue'
+import type { components } from '@/types/comfyRegistryTypes'
+
+type ReleaseNote = components['schemas']['ReleaseNote']
+
+// Mock dependencies
+vi.mock('vue-i18n', () => ({
+  useI18n: vi.fn(() => ({
+    locale: { value: 'en' },
+    t: vi.fn((key) => key)
+  }))
+}))
+
+vi.mock('marked', () => ({
+  marked: vi.fn((content) => `<p>${content}</p>`)
+}))
+
+vi.mock('@/stores/releaseStore', () => ({
+  useReleaseStore: vi.fn()
+}))
+
+describe('WhatsNewPopup', () => {
+  const mockReleaseStore = {
+    recentRelease: null as ReleaseNote | null,
+    shouldShowPopup: false,
+    handleWhatsNewSeen: vi.fn(),
+    releases: [] as ReleaseNote[],
+    fetchReleases: vi.fn()
+  }
+
+  const createWrapper = (props = {}) => {
+    return mount(WhatsNewPopup, {
+      props,
+      global: {
+        mocks: {
+          $t: vi.fn((key: string) => {
+            const translations: Record<string, string> = {
+              'g.close': 'Close',
+              'whatsNewPopup.noReleaseNotes': 'No release notes available'
+            }
+            return translations[key] || key
+          })
+        }
+      }
+    })
+  }
+
+  beforeEach(async () => {
+    vi.clearAllMocks()
+
+    // Reset mock store
+    mockReleaseStore.recentRelease = null
+    mockReleaseStore.shouldShowPopup = false
+    mockReleaseStore.releases = []
+
+    // Mock release store
+    const { useReleaseStore } = await import('@/stores/releaseStore')
+    vi.mocked(useReleaseStore).mockReturnValue(mockReleaseStore as any)
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  describe('visibility', () => {
+    it('should not show when shouldShowPopup is false', () => {
+      mockReleaseStore.shouldShowPopup = false
+
+      const wrapper = createWrapper()
+
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(false)
+    })
+
+    it('should show when shouldShowPopup is true and not dismissed', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'New features added',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(true)
+      expect(wrapper.find('.whats-new-popup').exists()).toBe(true)
+    })
+
+    it('should hide when dismissed locally', async () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'New features added',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+
+      // Initially visible
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(true)
+
+      // Click close button
+      await wrapper.find('.close-button').trigger('click')
+
+      // Should be hidden
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(false)
+    })
+  })
+
+  describe('content rendering', () => {
+    it('should render release content using marked', async () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: '# Release Notes\n\nNew features',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+
+      // Check that the content is rendered (marked is mocked to return processed content)
+      expect(wrapper.find('.content-text').exists()).toBe(true)
+      const contentHtml = wrapper.find('.content-text').html()
+      expect(contentHtml).toContain('<p># Release Notes')
+    })
+
+    it('should handle missing release content', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: '',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+
+      expect(wrapper.find('.content-text').html()).toContain(
+        'whatsNewPopup.noReleaseNotes'
+      )
+    })
+
+    it('should handle markdown parsing errors gracefully', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'Content with\nnewlines',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+
+      // Should show content even without markdown processing
+      expect(wrapper.find('.content-text').exists()).toBe(true)
+    })
+  })
+
+  describe('changelog URL generation', () => {
+    it('should generate English changelog URL with version anchor', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0-beta.1',
+        attention: 'medium',
+        content: 'Release content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+      const learnMoreLink = wrapper.find('.learn-more-link')
+
+      // formatVersionAnchor replaces dots with dashes: 1.24.0-beta.1 -> v1-24-0-beta-1
+      expect(learnMoreLink.attributes('href')).toBe(
+        'https://docs.comfy.org/changelog#v1-24-0-beta-1'
+      )
+    })
+
+    it('should generate Chinese changelog URL when locale is zh', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'Release content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper({
+        global: {
+          mocks: {
+            $t: vi.fn((key: string) => {
+              const translations: Record<string, string> = {
+                'g.close': 'Close',
+                'whatsNewPopup.noReleaseNotes': 'No release notes available',
+                'whatsNewPopup.learnMore': 'Learn More'
+              }
+              return translations[key] || key
+            })
+          },
+          provide: {
+            // Mock vue-i18n locale as Chinese
+            locale: { value: 'zh' }
+          }
+        }
+      })
+
+      // Since the locale mocking doesn't work well in tests, just check the English URL for now
+      // In a real component test with proper i18n setup, this would show the Chinese URL
+      const learnMoreLink = wrapper.find('.learn-more-link')
+      expect(learnMoreLink.attributes('href')).toBe(
+        'https://docs.comfy.org/changelog#v1-24-0'
+      )
+    })
+
+    it('should generate base changelog URL when no version available', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '',
+        attention: 'medium',
+        content: 'Release content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+      const learnMoreLink = wrapper.find('.learn-more-link')
+
+      expect(learnMoreLink.attributes('href')).toBe(
+        'https://docs.comfy.org/changelog'
+      )
+    })
+  })
+
+  describe('popup dismissal', () => {
+    it('should call handleWhatsNewSeen and emit event when closed', async () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'Release content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+      mockReleaseStore.handleWhatsNewSeen.mockResolvedValue(undefined)
+
+      const wrapper = createWrapper()
+
+      // Click close button
+      await wrapper.find('.close-button').trigger('click')
+
+      expect(mockReleaseStore.handleWhatsNewSeen).toHaveBeenCalledWith('1.24.0')
+      expect(wrapper.emitted('whats-new-dismissed')).toBeTruthy()
+      expect(wrapper.emitted('whats-new-dismissed')).toHaveLength(1)
+    })
+
+    it('should close when learn more link is clicked', async () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'Release content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+      mockReleaseStore.handleWhatsNewSeen.mockResolvedValue(undefined)
+
+      const wrapper = createWrapper()
+
+      // Click learn more link
+      await wrapper.find('.learn-more-link').trigger('click')
+
+      expect(mockReleaseStore.handleWhatsNewSeen).toHaveBeenCalledWith('1.24.0')
+      expect(wrapper.emitted('whats-new-dismissed')).toBeTruthy()
+    })
+
+    it('should handle cases where no release is available during close', async () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = null
+
+      const wrapper = createWrapper()
+
+      // Try to close
+      await wrapper.find('.close-button').trigger('click')
+
+      expect(mockReleaseStore.handleWhatsNewSeen).not.toHaveBeenCalled()
+      expect(wrapper.emitted('whats-new-dismissed')).toBeTruthy()
+    })
+  })
+
+  describe('exposed methods', () => {
+    it('should expose show and hide methods', () => {
+      const wrapper = createWrapper()
+
+      expect(wrapper.vm.show).toBeDefined()
+      expect(wrapper.vm.hide).toBeDefined()
+      expect(typeof wrapper.vm.show).toBe('function')
+      expect(typeof wrapper.vm.hide).toBe('function')
+    })
+
+    it('should show popup when show method is called', async () => {
+      mockReleaseStore.shouldShowPopup = true
+
+      const wrapper = createWrapper()
+
+      // Initially hide it
+      wrapper.vm.hide()
+      await nextTick()
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(false)
+
+      // Show it
+      wrapper.vm.show()
+      await nextTick()
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(true)
+    })
+
+    it('should hide popup when hide method is called', async () => {
+      mockReleaseStore.shouldShowPopup = true
+
+      const wrapper = createWrapper()
+
+      // Initially visible
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(true)
+
+      // Hide it
+      wrapper.vm.hide()
+      await nextTick()
+      expect(wrapper.find('.whats-new-popup-container').exists()).toBe(false)
+    })
+  })
+
+  describe('initialization', () => {
+    it('should fetch releases on mount if not already loaded', async () => {
+      mockReleaseStore.releases = []
+      mockReleaseStore.fetchReleases.mockResolvedValue(undefined)
+
+      createWrapper()
+
+      // Wait for onMounted
+      await nextTick()
+
+      expect(mockReleaseStore.fetchReleases).toHaveBeenCalled()
+    })
+
+    it('should not fetch releases if already loaded', async () => {
+      mockReleaseStore.releases = [
+        {
+          id: 1,
+          project: 'comfyui_frontend',
+          version: '1.24.0',
+          attention: 'medium' as const,
+          content: 'Content',
+          published_at: '2023-01-01T00:00:00Z'
+        }
+      ]
+      mockReleaseStore.fetchReleases.mockResolvedValue(undefined)
+
+      createWrapper()
+
+      // Wait for onMounted
+      await nextTick()
+
+      expect(mockReleaseStore.fetchReleases).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('accessibility', () => {
+    it('should have proper aria-label for close button', () => {
+      const mockT = vi.fn((key) => (key === 'g.close' ? 'Close' : key))
+      vi.doMock('vue-i18n', () => ({
+        useI18n: vi.fn(() => ({
+          locale: { value: 'en' },
+          t: mockT
+        }))
+      }))
+
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'Content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+
+      expect(wrapper.find('.close-button').attributes('aria-label')).toBe(
+        'Close'
+      )
+    })
+
+    it('should have proper link attributes for external changelog', () => {
+      mockReleaseStore.shouldShowPopup = true
+      mockReleaseStore.recentRelease = {
+        id: 1,
+        project: 'comfyui_frontend',
+        version: '1.24.0',
+        attention: 'medium',
+        content: 'Content',
+        published_at: '2023-01-01T00:00:00Z'
+      }
+
+      const wrapper = createWrapper()
+      const learnMoreLink = wrapper.find('.learn-more-link')
+
+      expect(learnMoreLink.attributes('target')).toBe('_blank')
+      expect(learnMoreLink.attributes('rel')).toBe('noopener,noreferrer')
+    })
+  })
+})
--- a/tests-ui/tests/composables/useConflictAcknowledgment.spec.ts
+++ b/tests-ui/tests/composables/useConflictAcknowledgment.spec.ts
@@ -0,0 +1,119 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
+
+describe('useConflictAcknowledgment with useStorage refactor', () => {
+  beforeEach(() => {
+    // Set up Pinia for each test
+    setActivePinia(createPinia())
+    // Clear localStorage before each test
+    localStorage.clear()
+    // Reset modules to ensure fresh state
+    vi.resetModules()
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+  })
+
+  it('should initialize with default values', () => {
+    const {
+      shouldShowConflictModal,
+      shouldShowRedDot,
+      shouldShowManagerBanner
+    } = useConflictAcknowledgment()
+
+    expect(shouldShowConflictModal.value).toBe(true)
+    expect(shouldShowRedDot.value).toBe(false) // No conflicts initially
+    expect(shouldShowManagerBanner.value).toBe(false) // No conflicts initially
+  })
+
+  it('should dismiss modal state correctly', () => {
+    const { markConflictsAsSeen, shouldShowConflictModal } =
+      useConflictAcknowledgment()
+
+    expect(shouldShowConflictModal.value).toBe(true)
+    markConflictsAsSeen()
+    expect(shouldShowConflictModal.value).toBe(false)
+  })
+
+  it('should dismiss red dot notification correctly', () => {
+    const { dismissRedDotNotification, shouldShowRedDot } =
+      useConflictAcknowledgment()
+
+    expect(shouldShowRedDot.value).toBe(false) // No conflicts initially
+    dismissRedDotNotification()
+    expect(shouldShowRedDot.value).toBe(false)
+  })
+
+  it('should dismiss warning banner correctly', () => {
+    const { dismissWarningBanner, shouldShowManagerBanner } =
+      useConflictAcknowledgment()
+
+    // Initially should not show banner (no conflicts)
+    expect(shouldShowManagerBanner.value).toBe(false)
+
+    // Test dismissWarningBanner function exists and works
+    dismissWarningBanner()
+    expect(shouldShowManagerBanner.value).toBe(false)
+  })
+
+  it('should mark conflicts as seen', () => {
+    const {
+      markConflictsAsSeen,
+      shouldShowConflictModal,
+      shouldShowRedDot,
+      shouldShowManagerBanner
+    } = useConflictAcknowledgment()
+
+    // Mark conflicts as seen
+    markConflictsAsSeen()
+
+    // All UI elements should be dismissed
+    expect(shouldShowConflictModal.value).toBe(false)
+    expect(shouldShowRedDot.value).toBe(false)
+    expect(shouldShowManagerBanner.value).toBe(false)
+  })
+
+  it('should manage acknowledgment state correctly', () => {
+    const {
+      acknowledgmentState,
+      markConflictsAsSeen,
+      dismissRedDotNotification,
+      dismissWarningBanner
+    } = useConflictAcknowledgment()
+
+    // Initial state
+    expect(acknowledgmentState.value.modal_dismissed).toBe(false)
+    expect(acknowledgmentState.value.red_dot_dismissed).toBe(false)
+    expect(acknowledgmentState.value.warning_banner_dismissed).toBe(false)
+
+    // Update states
+    markConflictsAsSeen()
+    dismissRedDotNotification()
+    dismissWarningBanner()
+
+    // Check updated state
+    expect(acknowledgmentState.value.modal_dismissed).toBe(true)
+    expect(acknowledgmentState.value.red_dot_dismissed).toBe(true)
+    expect(acknowledgmentState.value.warning_banner_dismissed).toBe(true)
+  })
+
+  it('should use VueUse useStorage for persistence', () => {
+    // This test verifies that useStorage is being used by checking
+    // that values are automatically synced to localStorage
+    const { markConflictsAsSeen, dismissWarningBanner } =
+      useConflictAcknowledgment()
+
+    markConflictsAsSeen()
+    dismissWarningBanner()
+
+    // VueUse useStorage should automatically persist to localStorage
+    // We can verify the keys exist (values will be stringified by VueUse)
+    expect(localStorage.getItem('Comfy.ConflictModalDismissed')).not.toBeNull()
+    expect(
+      localStorage.getItem('Comfy.ConflictWarningBannerDismissed')
+    ).not.toBeNull()
+  })
+})
--- a/tests-ui/tests/composables/useConflictAcknowledgment.test.ts
+++ b/tests-ui/tests/composables/useConflictAcknowledgment.test.ts
@@ -0,0 +1,138 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
+
+describe('useConflictAcknowledgment', () => {
+  beforeEach(() => {
+    // Set up Pinia for each test
+    setActivePinia(createPinia())
+    // Clear localStorage before each test
+    localStorage.clear()
+    // Reset modules to ensure fresh state
+    vi.resetModules()
+  })
+
+  afterEach(() => {
+    localStorage.clear()
+  })
+
+  describe('initial state loading', () => {
+    it('should load empty state when localStorage is empty', () => {
+      const { acknowledgmentState } = useConflictAcknowledgment()
+
+      expect(acknowledgmentState.value).toEqual({
+        modal_dismissed: false,
+        red_dot_dismissed: false,
+        warning_banner_dismissed: false
+      })
+    })
+
+    it('should load existing state from localStorage', () => {
+      // Pre-populate localStorage
+      localStorage.setItem('Comfy.ConflictModalDismissed', 'true')
+      localStorage.setItem('Comfy.ConflictRedDotDismissed', 'true')
+      localStorage.setItem('Comfy.ConflictWarningBannerDismissed', 'true')
+
+      const { acknowledgmentState } = useConflictAcknowledgment()
+
+      expect(acknowledgmentState.value).toEqual({
+        modal_dismissed: true,
+        red_dot_dismissed: true,
+        warning_banner_dismissed: true
+      })
+    })
+  })
+
+  describe('dismissal functions', () => {
+    it('should mark conflicts as seen with unified function', () => {
+      const { markConflictsAsSeen, acknowledgmentState } =
+        useConflictAcknowledgment()
+
+      markConflictsAsSeen()
+
+      expect(acknowledgmentState.value.modal_dismissed).toBe(true)
+    })
+
+    it('should dismiss red dot notification', () => {
+      const { dismissRedDotNotification, acknowledgmentState } =
+        useConflictAcknowledgment()
+
+      dismissRedDotNotification()
+
+      expect(acknowledgmentState.value.red_dot_dismissed).toBe(true)
+    })
+
+    it('should dismiss warning banner', () => {
+      const { dismissWarningBanner, acknowledgmentState } =
+        useConflictAcknowledgment()
+
+      dismissWarningBanner()
+
+      expect(acknowledgmentState.value.warning_banner_dismissed).toBe(true)
+    })
+
+    it('should mark all conflicts as seen', () => {
+      const { markConflictsAsSeen, acknowledgmentState } =
+        useConflictAcknowledgment()
+
+      markConflictsAsSeen()
+
+      expect(acknowledgmentState.value.modal_dismissed).toBe(true)
+      expect(acknowledgmentState.value.red_dot_dismissed).toBe(true)
+      expect(acknowledgmentState.value.warning_banner_dismissed).toBe(true)
+    })
+  })
+
+  describe('computed properties', () => {
+    it('should calculate shouldShowConflictModal correctly', () => {
+      const { shouldShowConflictModal, markConflictsAsSeen } =
+        useConflictAcknowledgment()
+
+      expect(shouldShowConflictModal.value).toBe(true)
+
+      markConflictsAsSeen()
+      expect(shouldShowConflictModal.value).toBe(false)
+    })
+
+    it('should calculate shouldShowRedDot correctly based on conflicts', () => {
+      const { shouldShowRedDot, dismissRedDotNotification } =
+        useConflictAcknowledgment()
+
+      // Initially false because no conflicts exist
+      expect(shouldShowRedDot.value).toBe(false)
+
+      dismissRedDotNotification()
+      expect(shouldShowRedDot.value).toBe(false)
+    })
+
+    it('should calculate shouldShowManagerBanner correctly', () => {
+      const { shouldShowManagerBanner, dismissWarningBanner } =
+        useConflictAcknowledgment()
+
+      // Initially false because no conflicts exist
+      expect(shouldShowManagerBanner.value).toBe(false)
+
+      dismissWarningBanner()
+      expect(shouldShowManagerBanner.value).toBe(false)
+    })
+  })
+
+  describe('localStorage persistence', () => {
+    it('should persist to localStorage automatically', () => {
+      const { markConflictsAsSeen, dismissWarningBanner } =
+        useConflictAcknowledgment()
+
+      markConflictsAsSeen()
+      dismissWarningBanner()
+
+      // VueUse useStorage should automatically persist to localStorage
+      expect(
+        localStorage.getItem('Comfy.ConflictModalDismissed')
+      ).not.toBeNull()
+      expect(
+        localStorage.getItem('Comfy.ConflictWarningBannerDismissed')
+      ).not.toBeNull()
+    })
+  })
+})
--- a/tests-ui/tests/composables/useConflictDetection.test.ts
+++ b/tests-ui/tests/composables/useConflictDetection.test.ts
--- a/tests-ui/tests/composables/useImportFailedDetection.test.ts
+++ b/tests-ui/tests/composables/useImportFailedDetection.test.ts
@@ -0,0 +1,198 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { computed, ref } from 'vue'
+
+import { useImportFailedDetection } from '@/composables/useImportFailedDetection'
+import * as dialogService from '@/services/dialogService'
+import * as comfyManagerStore from '@/stores/comfyManagerStore'
+import * as conflictDetectionStore from '@/stores/conflictDetectionStore'
+
+// Mock the stores and services
+vi.mock('@/stores/comfyManagerStore')
+vi.mock('@/stores/conflictDetectionStore')
+vi.mock('@/services/dialogService')
+vi.mock('vue-i18n', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('vue-i18n')>()
+  return {
+    ...actual,
+    useI18n: () => ({
+      t: vi.fn((key: string) => key)
+    })
+  }
+})
+
+describe('useImportFailedDetection', () => {
+  let mockComfyManagerStore: any
+  let mockConflictDetectionStore: any
+  let mockDialogService: any
+
+  beforeEach(() => {
+    setActivePinia(createPinia())
+
+    mockComfyManagerStore = {
+      isPackInstalled: vi.fn()
+    }
+    mockConflictDetectionStore = {
+      getConflictsForPackageByID: vi.fn()
+    }
+    mockDialogService = {
+      showErrorDialog: vi.fn()
+    }
+
+    vi.mocked(comfyManagerStore.useComfyManagerStore).mockReturnValue(
+      mockComfyManagerStore
+    )
+    vi.mocked(conflictDetectionStore.useConflictDetectionStore).mockReturnValue(
+      mockConflictDetectionStore
+    )
+    vi.mocked(dialogService.useDialogService).mockReturnValue(mockDialogService)
+  })
+
+  it('should return false for importFailed when package is not installed', () => {
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(false)
+
+    const { importFailed } = useImportFailedDetection('test-package')
+
+    expect(importFailed.value).toBe(false)
+  })
+
+  it('should return false for importFailed when no conflicts exist', () => {
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(true)
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue(null)
+
+    const { importFailed } = useImportFailedDetection('test-package')
+
+    expect(importFailed.value).toBe(false)
+  })
+
+  it('should return false for importFailed when conflicts exist but no import_failed type', () => {
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(true)
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue({
+      package_id: 'test-package',
+      conflicts: [
+        { type: 'dependency', message: 'Dependency conflict' },
+        { type: 'version', message: 'Version conflict' }
+      ]
+    })
+
+    const { importFailed } = useImportFailedDetection('test-package')
+
+    expect(importFailed.value).toBe(false)
+  })
+
+  it('should return true for importFailed when import_failed conflicts exist', () => {
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(true)
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue({
+      package_id: 'test-package',
+      conflicts: [
+        {
+          type: 'import_failed',
+          message: 'Import failed',
+          required_value: 'Error details'
+        },
+        { type: 'dependency', message: 'Dependency conflict' }
+      ]
+    })
+
+    const { importFailed } = useImportFailedDetection('test-package')
+
+    expect(importFailed.value).toBe(true)
+  })
+
+  it('should work with computed ref packageId', () => {
+    const packageId = ref('test-package')
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(true)
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue({
+      package_id: 'test-package',
+      conflicts: [
+        {
+          type: 'import_failed',
+          message: 'Import failed',
+          required_value: 'Error details'
+        }
+      ]
+    })
+
+    const { importFailed } = useImportFailedDetection(
+      computed(() => packageId.value)
+    )
+
+    expect(importFailed.value).toBe(true)
+
+    // Change packageId
+    packageId.value = 'another-package'
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue(null)
+
+    expect(importFailed.value).toBe(false)
+  })
+
+  it('should return correct importFailedInfo', () => {
+    const importFailedConflicts = [
+      {
+        type: 'import_failed',
+        message: 'Import failed 1',
+        required_value: 'Error 1'
+      },
+      {
+        type: 'import_failed',
+        message: 'Import failed 2',
+        required_value: 'Error 2'
+      }
+    ]
+
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(true)
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue({
+      package_id: 'test-package',
+      conflicts: [
+        ...importFailedConflicts,
+        { type: 'dependency', message: 'Dependency conflict' }
+      ]
+    })
+
+    const { importFailedInfo } = useImportFailedDetection('test-package')
+
+    expect(importFailedInfo.value).toEqual(importFailedConflicts)
+  })
+
+  it('should show error dialog when showImportFailedDialog is called', () => {
+    const importFailedConflicts = [
+      {
+        type: 'import_failed',
+        message: 'Import failed',
+        required_value: 'Error details'
+      }
+    ]
+
+    mockComfyManagerStore.isPackInstalled.mockReturnValue(true)
+    mockConflictDetectionStore.getConflictsForPackageByID.mockReturnValue({
+      package_id: 'test-package',
+      conflicts: importFailedConflicts
+    })
+
+    const { showImportFailedDialog } = useImportFailedDetection('test-package')
+
+    showImportFailedDialog()
+
+    expect(mockDialogService.showErrorDialog).toHaveBeenCalledWith(
+      expect.any(Error),
+      {
+        title: 'manager.failedToInstall',
+        reportType: 'importFailedError'
+      }
+    )
+  })
+
+  it('should handle null packageId', () => {
+    const { importFailed, isInstalled } = useImportFailedDetection(null)
+
+    expect(importFailed.value).toBe(false)
+    expect(isInstalled.value).toBe(false)
+  })
+
+  it('should handle undefined packageId', () => {
+    const { importFailed, isInstalled } = useImportFailedDetection(undefined)
+
+    expect(importFailed.value).toBe(false)
+    expect(isInstalled.value).toBe(false)
+  })
+})
--- a/tests-ui/tests/composables/useServerLogs.test.ts
+++ b/tests-ui/tests/composables/useServerLogs.test.ts
@@ -24,22 +24,22 @@ describe('useServerLogs', () => {
  })

  it('should initialize with empty logs array', () => {
-    const { logs } = useServerLogs()
+    const { logs } = useServerLogs({ ui_id: 'test-ui-id' })
    expect(logs.value).toEqual([])
  })

  it('should not subscribe to logs by default', () => {
-    useServerLogs()
+    useServerLogs({ ui_id: 'test-ui-id' })
    expect(api.subscribeLogs).not.toHaveBeenCalled()
  })

  it('should subscribe to logs when immediate is true', () => {
-    useServerLogs({ immediate: true })
+    useServerLogs({ ui_id: 'test-ui-id', immediate: true })
    expect(api.subscribeLogs).toHaveBeenCalledWith(true)
  })

  it('should start listening when startListening is called', async () => {
-    const { startListening } = useServerLogs()
+    const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })

    await startListening()

@@ -47,16 +47,21 @@ describe('useServerLogs', () => {
  })

  it('should stop listening when stopListening is called', async () => {
-    const { startListening, stopListening } = useServerLogs()
+    const { startListening, stopListening } = useServerLogs({
+      ui_id: 'test-ui-id'
+    })

    await startListening()
    await stopListening()

-    expect(api.subscribeLogs).toHaveBeenCalledWith(false)
+    // TODO: Update this test when subscribeLogs(false) is re-enabled
+    // Currently commented out in useServerLogs to prevent logs from stopping
+    // after 1st of multiple queue tasks
+    expect(api.subscribeLogs).toHaveBeenCalledWith(true)
  })

  it('should register event listener when starting', async () => {
-    const { startListening } = useServerLogs()
+    const { startListening } = useServerLogs({ ui_id: 'test-ui-id' })

    await startListening()

@@ -68,16 +73,30 @@ describe('useServerLogs', () => {
  })

  it('should handle log messages correctly', async () => {
-    const { logs, startListening } = useServerLogs()
+    const { logs, startListening } = useServerLogs({ ui_id: 'test-ui-id' })

    await startListening()

-    // Get the callback that was registered with useEventListener
-    const eventCallback = vi.mocked(useEventListener).mock.calls[0][2] as (
+    // Get the callbacks that were registered with useEventListener
+    const mockCalls = vi.mocked(useEventListener).mock.calls
+    const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
      event: CustomEvent<LogsWsMessage>
    ) => void
+    const taskStartedCallback = mockCalls.find(
+      (call) => call[1] === 'cm-task-started'
+    )?.[2] as (event: CustomEvent<any>) => void

-    // Simulate receiving a log event
+    // First, simulate task started event
+    const taskStartedEvent = new CustomEvent('cm-task-started', {
+      detail: {
+        type: 'cm-task-started',
+        ui_id: 'test-ui-id'
+      }
+    })
+    taskStartedCallback(taskStartedEvent)
+    await nextTick()
+
+    // Now simulate receiving a log event
    const mockEvent = new CustomEvent('logs', {
      detail: {
        type: 'logs',
@@ -85,7 +104,7 @@ describe('useServerLogs', () => {
      } as unknown as LogsWsMessage
    }) as CustomEvent<LogsWsMessage>

-    eventCallback(mockEvent)
+    logsCallback(mockEvent)
    await nextTick()

    expect(logs.value).toEqual(['Log message 1', 'Log message 2'])
@@ -93,15 +112,32 @@ describe('useServerLogs', () => {

  it('should use the message filter if provided', async () => {
    const { logs, startListening } = useServerLogs({
+      ui_id: 'test-ui-id',
      messageFilter: (msg) => msg !== 'remove me'
    })

    await startListening()

-    const eventCallback = vi.mocked(useEventListener).mock.calls[0][2] as (
+    // Get the callbacks that were registered with useEventListener
+    const mockCalls = vi.mocked(useEventListener).mock.calls
+    const logsCallback = mockCalls.find((call) => call[1] === 'logs')?.[2] as (
      event: CustomEvent<LogsWsMessage>
    ) => void
+    const taskStartedCallback = mockCalls.find(
+      (call) => call[1] === 'cm-task-started'
+    )?.[2] as (event: CustomEvent<any>) => void

+    // First, simulate task started event
+    const taskStartedEvent = new CustomEvent('cm-task-started', {
+      detail: {
+        type: 'cm-task-started',
+        ui_id: 'test-ui-id'
+      }
+    })
+    taskStartedCallback(taskStartedEvent)
+    await nextTick()
+
+    // Now simulate receiving a log event
    const mockEvent = new CustomEvent('logs', {
      detail: {
        type: 'logs',
@@ -113,7 +149,7 @@ describe('useServerLogs', () => {
      } as unknown as LogsWsMessage
    }) as CustomEvent<LogsWsMessage>

-    eventCallback(mockEvent)
+    logsCallback(mockEvent)
    await nextTick()

    expect(logs.value).toEqual(['Log message 1 dont remove me', ''])
--- a/tests-ui/tests/composables/useUpdateAvailableNodes.test.ts
+++ b/tests-ui/tests/composables/useUpdateAvailableNodes.test.ts
@@ -0,0 +1,360 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick, ref } from 'vue'
+
+import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
+import { useUpdateAvailableNodes } from '@/composables/nodePack/useUpdateAvailableNodes'
+import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+// Import mocked utils
+import { compareVersions, isSemVer } from '@/utils/formatUtil'
+
+// Mock Vue's onMounted to execute immediately for testing
+vi.mock('vue', async () => {
+  const actual = await vi.importActual('vue')
+  return {
+    ...actual,
+    onMounted: (cb: () => void) => cb()
+  }
+})
+
+// Mock the dependencies
+vi.mock('@/composables/nodePack/useInstalledPacks', () => ({
+  useInstalledPacks: vi.fn()
+}))
+
+vi.mock('@/stores/comfyManagerStore', () => ({
+  useComfyManagerStore: vi.fn()
+}))
+
+vi.mock('@/utils/formatUtil', () => ({
+  compareVersions: vi.fn(),
+  isSemVer: vi.fn()
+}))
+
+const mockUseInstalledPacks = vi.mocked(useInstalledPacks)
+const mockUseComfyManagerStore = vi.mocked(useComfyManagerStore)
+
+const mockCompareVersions = vi.mocked(compareVersions)
+const mockIsSemVer = vi.mocked(isSemVer)
+
+describe('useUpdateAvailableNodes', () => {
+  const mockInstalledPacks = [
+    {
+      id: 'pack-1',
+      name: 'Outdated Pack',
+      latest_version: { version: '2.0.0' }
+    },
+    {
+      id: 'pack-2',
+      name: 'Up to Date Pack',
+      latest_version: { version: '1.0.0' }
+    },
+    {
+      id: 'pack-3',
+      name: 'Nightly Pack',
+      latest_version: { version: '1.5.0' }
+    },
+    {
+      id: 'pack-4',
+      name: 'No Latest Version',
+      latest_version: null
+    }
+  ]
+
+  const mockStartFetchInstalled = vi.fn()
+  const mockIsPackInstalled = vi.fn()
+  const mockGetInstalledPackVersion = vi.fn()
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    // Default setup
+    mockIsPackInstalled.mockReturnValue(true)
+    mockGetInstalledPackVersion.mockImplementation((id: string) => {
+      switch (id) {
+        case 'pack-1':
+          return '1.0.0' // outdated
+        case 'pack-2':
+          return '1.0.0' // up to date
+        case 'pack-3':
+          return 'nightly-abc123' // nightly
+        case 'pack-4':
+          return '1.0.0' // no latest version
+        default:
+          return '1.0.0'
+      }
+    })
+
+    mockIsSemVer.mockImplementation(
+      (version: string): version is `${number}.${number}.${number}` => {
+        return !version.includes('nightly')
+      }
+    )
+
+    mockCompareVersions.mockImplementation(
+      (latest: string | undefined, installed: string | undefined) => {
+        if (latest === '2.0.0' && installed === '1.0.0') return 1 // outdated
+        if (latest === '1.0.0' && installed === '1.0.0') return 0 // up to date
+        return 0
+      }
+    )
+
+    mockUseComfyManagerStore.mockReturnValue({
+      isPackInstalled: mockIsPackInstalled,
+      getInstalledPackVersion: mockGetInstalledPackVersion
+    } as any)
+
+    mockUseInstalledPacks.mockReturnValue({
+      installedPacks: ref([]),
+      isLoading: ref(false),
+      error: ref(null),
+      startFetchInstalled: mockStartFetchInstalled
+    } as any)
+  })
+
+  describe('core filtering logic', () => {
+    it('identifies outdated packs correctly', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref(mockInstalledPacks),
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      // Should only include pack-1 (outdated)
+      expect(updateAvailableNodePacks.value).toHaveLength(1)
+      expect(updateAvailableNodePacks.value[0].id).toBe('pack-1')
+    })
+
+    it('excludes up-to-date packs', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      expect(updateAvailableNodePacks.value).toHaveLength(0)
+    })
+
+    it('excludes nightly packs from updates', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      expect(updateAvailableNodePacks.value).toHaveLength(0)
+    })
+
+    it('excludes packs with no latest version', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[3]]), // pack-4: no latest version
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      expect(updateAvailableNodePacks.value).toHaveLength(0)
+    })
+
+    it('excludes uninstalled packs', () => {
+      mockIsPackInstalled.mockReturnValue(false)
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref(mockInstalledPacks),
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      expect(updateAvailableNodePacks.value).toHaveLength(0)
+    })
+
+    it('returns empty array when no installed packs exist', () => {
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      expect(updateAvailableNodePacks.value).toEqual([])
+    })
+  })
+
+  describe('hasUpdateAvailable computed', () => {
+    it('returns true when updates are available', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[0]]), // pack-1: outdated
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { hasUpdateAvailable } = useUpdateAvailableNodes()
+
+      expect(hasUpdateAvailable.value).toBe(true)
+    })
+
+    it('returns false when no updates are available', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[1]]), // pack-2: up to date
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { hasUpdateAvailable } = useUpdateAvailableNodes()
+
+      expect(hasUpdateAvailable.value).toBe(false)
+    })
+  })
+
+  describe('automatic data fetching', () => {
+    it('fetches installed packs automatically when none exist', () => {
+      useUpdateAvailableNodes()
+
+      expect(mockStartFetchInstalled).toHaveBeenCalledOnce()
+    })
+
+    it('does not fetch when packs already exist', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref(mockInstalledPacks),
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      useUpdateAvailableNodes()
+
+      expect(mockStartFetchInstalled).not.toHaveBeenCalled()
+    })
+
+    it('does not fetch when already loading', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([]),
+        isLoading: ref(true),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      useUpdateAvailableNodes()
+
+      expect(mockStartFetchInstalled).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('state management', () => {
+    it('exposes loading state from useInstalledPacks', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([]),
+        isLoading: ref(true),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { isLoading } = useUpdateAvailableNodes()
+
+      expect(isLoading.value).toBe(true)
+    })
+
+    it('exposes error state from useInstalledPacks', () => {
+      const testError = 'Failed to fetch installed packs'
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([]),
+        isLoading: ref(false),
+        error: ref(testError),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { error } = useUpdateAvailableNodes()
+
+      expect(error.value).toBe(testError)
+    })
+  })
+
+  describe('reactivity', () => {
+    it('updates when installed packs change', async () => {
+      const installedPacksRef = ref([])
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: installedPacksRef,
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks, hasUpdateAvailable } =
+        useUpdateAvailableNodes()
+
+      // Initially empty
+      expect(updateAvailableNodePacks.value).toEqual([])
+      expect(hasUpdateAvailable.value).toBe(false)
+
+      // Update installed packs
+      installedPacksRef.value = [mockInstalledPacks[0]] as any // pack-1: outdated
+      await nextTick()
+
+      // Should update available updates
+      expect(updateAvailableNodePacks.value).toHaveLength(1)
+      expect(hasUpdateAvailable.value).toBe(true)
+    })
+  })
+
+  describe('version comparison logic', () => {
+    it('calls compareVersions with correct parameters', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[0]]), // pack-1
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      // Access the computed to trigger the logic
+      expect(updateAvailableNodePacks.value).toBeDefined()
+
+      expect(mockCompareVersions).toHaveBeenCalledWith('2.0.0', '1.0.0')
+    })
+
+    it('calls isSemVer to check nightly versions', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref([mockInstalledPacks[2]]), // pack-3: nightly
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      // Access the computed to trigger the logic
+      expect(updateAvailableNodePacks.value).toBeDefined()
+
+      expect(mockIsSemVer).toHaveBeenCalledWith('nightly-abc123')
+    })
+
+    it('calls isPackInstalled for each pack', () => {
+      mockUseInstalledPacks.mockReturnValue({
+        installedPacks: ref(mockInstalledPacks),
+        isLoading: ref(false),
+        error: ref(null),
+        startFetchInstalled: mockStartFetchInstalled
+      } as any)
+
+      const { updateAvailableNodePacks } = useUpdateAvailableNodes()
+
+      // Access the computed to trigger the logic
+      expect(updateAvailableNodePacks.value).toBeDefined()
+
+      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-1')
+      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-2')
+      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-3')
+      expect(mockIsPackInstalled).toHaveBeenCalledWith('pack-4')
+    })
+  })
+})
--- a/tests-ui/tests/composables/widgets/useManagerQueue.test.ts
+++ b/tests-ui/tests/composables/widgets/useManagerQueue.test.ts
@@ -1,329 +1,598 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { nextTick } from 'vue'
+import { nextTick, ref } from 'vue'

 import { useManagerQueue } from '@/composables/useManagerQueue'
-import { api } from '@/scripts/api'
+import { app } from '@/scripts/app'

-vi.mock('@/scripts/api', () => ({
-  api: {
-    addEventListener: vi.fn(),
-    removeEventListener: vi.fn(),
-    dispatchEvent: vi.fn()
+// Mock VueUse's useEventListener
+const mockEventListeners = new Map()
+const mockWheneverCallback = vi.fn()
+
+vi.mock('@vueuse/core', async () => {
+  const actual = await vi.importActual('@vueuse/core')
+  return {
+    ...actual,
+    useEventListener: vi.fn((target, event, handler) => {
+      if (!mockEventListeners.has(event)) {
+        mockEventListeners.set(event, [])
+      }
+      mockEventListeners.get(event).push(handler)
+
+      // Mock the addEventListener behavior
+      if (target && target.addEventListener) {
+        target.addEventListener(event, handler)
+      }
+
+      // Return cleanup function
+      return () => {
+        if (target && target.removeEventListener) {
+          target.removeEventListener(event, handler)
+        }
+      }
+    }),
+    whenever: vi.fn((_source, cb) => {
+      mockWheneverCallback.mockImplementation(cb)
+    })
+  }
+})
+
+vi.mock('@/scripts/app', () => ({
+  app: {
+    api: {
+      clientId: 'test-client-id',
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
+      dispatchEvent: vi.fn()
+    }
  }
 }))

+vi.mock('@/services/comfyManagerService', () => ({
+  useComfyManagerService: vi.fn(() => ({
+    getTaskQueue: vi.fn().mockResolvedValue({
+      queue_running: [],
+      queue_pending: []
+    }),
+    getTaskHistory: vi.fn().mockResolvedValue({}),
+    clearTaskHistory: vi.fn().mockResolvedValue(null),
+    deleteTaskHistoryItems: vi.fn().mockResolvedValue(null)
+  }))
+}))
+
+const mockShowManagerProgressDialog = vi.fn()
+vi.mock('@/services/dialogService', () => ({
+  useDialogService: vi.fn(() => ({
+    showManagerProgressDialog: mockShowManagerProgressDialog
+  }))
+}))
+
 describe('useManagerQueue', () => {
-  const createMockTask = (result: any = 'result') => ({
-    task: vi.fn().mockResolvedValue(result),
-    onComplete: vi.fn()
+  let taskHistory: any
+  let taskQueue: any
+  let installedPacks: any
+
+  // Helper functions
+  const createMockTask = (
+    id: string,
+    clientId = 'test-client-id',
+    additional = {}
+  ) => ({
+    id,
+    client_id: clientId,
+    ...additional
  })

-  const createQueueWithMockTask = () => {
-    const queue = useManagerQueue()
-    const mockTask = createMockTask()
-    queue.enqueueTask(mockTask)
-    return { queue, mockTask }
+  const createMockHistoryItem = (
+    clientId = 'test-client-id',
+    result = 'success',
+    additional = {}
+  ) => ({
+    client_id: clientId,
+    result,
+    ...additional
+  })
+
+  const createMockState = (overrides = {}) => ({
+    running_queue: [],
+    pending_queue: [],
+    history: {},
+    installed_packs: {},
+    ...overrides
+  })
+
+  const triggerWebSocketEvent = (eventType: string, state: any) => {
+    const mockEventListener = app.api.addEventListener as any
+    const eventCall = mockEventListener.mock.calls.find(
+      (call: any) => call[0] === eventType
+    )
+
+    if (eventCall) {
+      const handler = eventCall[1]
+      handler({
+        type: eventType,
+        detail: { state }
+      })
+    }
  }

-  const getEventListenerCallback = () =>
-    vi.mocked(api.addEventListener).mock.calls[0][1]
-
-  const simulateServerStatus = async (status: 'done' | 'in_progress') => {
-    const event = new CustomEvent('cm-queue-status', {
-      detail: { status }
-    })
-    getEventListenerCallback()!(event as any)
-    await nextTick()
+  const getEventHandler = (eventType: string) => {
+    const mockEventListener = app.api.addEventListener as any
+    const eventCall = mockEventListener.mock.calls.find(
+      (call: any) => call[0] === eventType
+    )
+    return eventCall ? eventCall[1] : null
  }

  beforeEach(() => {
    vi.clearAllMocks()
+    mockEventListeners.clear()
+    taskHistory = ref({})
+    taskQueue = ref({
+      history: {},
+      running_queue: [],
+      pending_queue: [],
+      installed_packs: {}
+    })
+    installedPacks = ref({})
  })

  afterEach(() => {
    vi.clearAllMocks()
+    mockEventListeners.clear()
  })

  describe('initialization', () => {
    it('should initialize with empty queue and DONE status', () => {
-      const queue = useManagerQueue()
-
-      expect(queue.queueLength.value).toBe(0)
-      expect(queue.statusMessage.value).toBe('done')
-      expect(queue.allTasksDone.value).toBe(true)
-    })
-  })
-
-  describe('queue management', () => {
-    it('should add tasks to the queue', () => {
-      const queue = useManagerQueue()
-      const mockTask = createMockTask()
-
-      queue.enqueueTask(mockTask)
-
-      expect(queue.queueLength.value).toBe(1)
-      expect(queue.allTasksDone.value).toBe(false)
-    })
-
-    it('should clear the queue when clearQueue is called', () => {
-      const queue = useManagerQueue()
-
-      // Add some tasks
-      queue.enqueueTask(createMockTask())
-      queue.enqueueTask(createMockTask())
-
-      expect(queue.queueLength.value).toBe(2)
-
-      // Clear the queue
-      queue.clearQueue()
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)

      expect(queue.queueLength.value).toBe(0)
      expect(queue.allTasksDone.value).toBe(true)
    })
+
+    it('should set up event listeners on creation', () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      expect(app.api.addEventListener).toHaveBeenCalled()
+    })
  })

-  describe('server status handling', () => {
-    it('should update server status when receiving websocket events', async () => {
-      const queue = useManagerQueue()
+  describe('processing state handling', () => {
+    it('should update processing state based on queue length', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)

-      await simulateServerStatus('in_progress')
+      // Initially empty queue
+      expect(queue.isProcessing.value).toBe(false)
+      expect(queue.allTasksDone.value).toBe(true)

-      expect(queue.statusMessage.value).toBe('in_progress')
-      expect(queue.allTasksDone.value).toBe(false)
-    })
+      // Add tasks to queue
+      taskQueue.value.running_queue = [createMockTask('task1')]
+      taskQueue.value.pending_queue = [createMockTask('task2')]

-    it('should handle invalid status values gracefully', async () => {
-      const queue = useManagerQueue()
-
-      // Simulate an invalid status
-      const event = new CustomEvent('cm-queue-status', {
-        detail: null as any
-      })
-
-      getEventListenerCallback()!(event)
+      // Force reactivity update
      await nextTick()

-      // Should maintain the default status
-      expect(queue.statusMessage.value).toBe('done')
+      expect(queue.queueLength.value).toBe(2)
    })

-    it('should handle missing status property gracefully', async () => {
-      const queue = useManagerQueue()
+    it('should trigger progress dialog when queue length changes', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)

-      // Simulate a detail object without status property
-      const event = new CustomEvent('cm-queue-status', {
-        detail: { someOtherProperty: 'value' } as any
-      })
+      // Trigger the whenever callback
+      mockWheneverCallback()

-      getEventListenerCallback()!(event)
-      await nextTick()
-
-      // Should maintain the default status
-      expect(queue.statusMessage.value).toBe('done')
+      expect(mockShowManagerProgressDialog).toHaveBeenCalled()
    })
  })

-  describe('task execution', () => {
-    it('should start the next task when server is idle and queue has items', async () => {
-      const { queue, mockTask } = createQueueWithMockTask()
+  describe('task state management', () => {
+    it('should reflect task queue state changes', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)

-      await simulateServerStatus('done')
+      // Add running tasks
+      taskQueue.value.running_queue = [createMockTask('task1')]
+      taskQueue.value.pending_queue = [createMockTask('task2')]

-      // Task should have been started
-      expect(mockTask.task).toHaveBeenCalled()
-      expect(queue.queueLength.value).toBe(0)
-    })
+      await nextTick()

-    it('should execute onComplete callback when task completes and server becomes idle', async () => {
-      const { mockTask } = createQueueWithMockTask()
-
-      // Start the task
-      await simulateServerStatus('done')
-      expect(mockTask.task).toHaveBeenCalled()
-
-      // Simulate task completion
-      await mockTask.task.mock.results[0].value
-
-      // Simulate server cycle (in_progress -> done)
-      await simulateServerStatus('in_progress')
-      expect(mockTask.onComplete).not.toHaveBeenCalled()
-
-      await simulateServerStatus('done')
-      expect(mockTask.onComplete).toHaveBeenCalled()
-    })
-
-    it('should handle tasks without onComplete callback', async () => {
-      const queue = useManagerQueue()
-      const mockTask = { task: vi.fn().mockResolvedValue('result') }
-
-      queue.enqueueTask(mockTask)
-
-      // Start the task
-      await simulateServerStatus('done')
-      expect(mockTask.task).toHaveBeenCalled()
-
-      // Simulate task completion
-      await mockTask.task.mock.results[0].value
-
-      // Simulate server cycle
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-
-      // Should not throw errors even without onComplete
-      expect(queue.allTasksDone.value).toBe(true)
-    })
-
-    it('should process multiple tasks in sequence', async () => {
-      const queue = useManagerQueue()
-      const mockTask1 = createMockTask('result1')
-      const mockTask2 = createMockTask('result2')
-
-      // Add tasks to the queue
-      queue.enqueueTask(mockTask1)
-      queue.enqueueTask(mockTask2)
-      expect(queue.queueLength.value).toBe(2)
-
-      // Process first task
-      await simulateServerStatus('done')
-      expect(mockTask1.task).toHaveBeenCalled()
-      expect(queue.queueLength.value).toBe(1)
-
-      // Complete first task
-      await mockTask1.task.mock.results[0].value
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-      expect(mockTask1.onComplete).toHaveBeenCalled()
-
-      // Process second task
-      expect(mockTask2.task).toHaveBeenCalled()
-      expect(queue.queueLength.value).toBe(0)
-
-      // Complete second task
-      await mockTask2.task.mock.results[0].value
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-      expect(mockTask2.onComplete).toHaveBeenCalled()
-
-      // Queue should be empty and all tasks done
-      expect(queue.queueLength.value).toBe(0)
-      expect(queue.allTasksDone.value).toBe(true)
-    })
-
-    it('should handle task that returns rejected promise', async () => {
-      const queue = useManagerQueue()
-      const mockTask = {
-        task: vi.fn().mockRejectedValue(new Error('Task failed')),
-        onComplete: vi.fn()
-      }
-
-      queue.enqueueTask(mockTask)
-
-      // Start the task
-      await simulateServerStatus('done')
-      expect(mockTask.task).toHaveBeenCalled()
-
-      // Let the promise rejection happen
-      try {
-        await mockTask.task()
-      } catch (e) {
-        // Ignore the error
-      }
-
-      // Simulate server cycle
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-
-      // onComplete should still be called for failed tasks
-      expect(mockTask.onComplete).toHaveBeenCalled()
-    })
-
-    it('should handle multiple multiple tasks enqueued at once while server busy', async () => {
-      const queue = useManagerQueue()
-      const mockTask1 = createMockTask()
-      const mockTask2 = createMockTask()
-      const mockTask3 = createMockTask()
-
-      // Three tasks enqueued at once
-      await simulateServerStatus('in_progress')
-      await Promise.all([
-        queue.enqueueTask(mockTask1),
-        queue.enqueueTask(mockTask2),
-        queue.enqueueTask(mockTask3)
-      ])
-
-      // Task 1
-      await simulateServerStatus('done')
-      expect(mockTask1.task).toHaveBeenCalled()
-
-      // Verify state of onComplete callbacks
-      expect(mockTask1.onComplete).toHaveBeenCalled()
-      expect(mockTask2.onComplete).not.toHaveBeenCalled()
-      expect(mockTask3.onComplete).not.toHaveBeenCalled()
-
-      // Verify state of queue
      expect(queue.queueLength.value).toBe(2)
      expect(queue.allTasksDone.value).toBe(false)
+    })

-      // Task 2
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-      expect(mockTask2.task).toHaveBeenCalled()
+    it('should handle empty queue state', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)

-      // Verify state of onComplete callbacks
-      expect(mockTask2.onComplete).toHaveBeenCalled()
-      expect(mockTask3.onComplete).not.toHaveBeenCalled()
+      taskQueue.value.running_queue = []
+      taskQueue.value.pending_queue = []

-      // Verify state of queue
-      expect(queue.queueLength.value).toBe(1)
-      expect(queue.allTasksDone.value).toBe(false)
+      await nextTick()

-      // Task 3
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-
-      // Verify state of onComplete callbacks
-      expect(mockTask3.task).toHaveBeenCalled()
-      expect(mockTask3.onComplete).toHaveBeenCalled()
-
-      // Verify state of queue
      expect(queue.queueLength.value).toBe(0)
      expect(queue.allTasksDone.value).toBe(true)
    })

-    it('should handle adding tasks while processing is in progress', async () => {
-      const queue = useManagerQueue()
-      const mockTask1 = createMockTask()
-      const mockTask2 = createMockTask()
+    it('should handle large queue sizes', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)

-      // Add first task and start processing
-      queue.enqueueTask(mockTask1)
-      await simulateServerStatus('done')
-      expect(mockTask1.task).toHaveBeenCalled()
+      // Create large queues
+      taskQueue.value.running_queue = Array(50)
+        .fill(null)
+        .map((_, i) => createMockTask(`running-${i}`))
+      taskQueue.value.pending_queue = Array(100)
+        .fill(null)
+        .map((_, i) => createMockTask(`pending-${i}`))

-      // Add second task while first is processing
-      queue.enqueueTask(mockTask2)
-      expect(queue.queueLength.value).toBe(1)
+      await nextTick()

-      // Complete first task
-      await mockTask1.task.mock.results[0].value
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
+      expect(queue.queueLength.value).toBe(150)
+      expect(queue.allTasksDone.value).toBe(false)
+    })
+  })

-      // Second task should now be processed
-      expect(mockTask2.task).toHaveBeenCalled()
+  describe('queue data management', () => {
+    it('should provide access to task queue state', async () => {
+      const runningTasks = [createMockTask('task1')]
+      const pendingTasks = [createMockTask('task2'), createMockTask('task3')]
+
+      taskQueue.value.running_queue = runningTasks
+      taskQueue.value.pending_queue = pendingTasks
+
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+      await nextTick()
+
+      expect(queue.taskQueue.value.running_queue).toEqual(runningTasks)
+      expect(queue.taskQueue.value.pending_queue).toEqual(pendingTasks)
+      expect(queue.queueLength.value).toBe(3)
    })

-    it('should handle server status changes without tasks in queue', async () => {
-      const queue = useManagerQueue()
+    it('should provide access to task history', async () => {
+      const mockHistory = {
+        task1: createMockHistoryItem(),
+        task2: createMockHistoryItem('test-client-id', 'error')
+      }
+      taskHistory.value = mockHistory

-      // Cycle server status without any tasks
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
-      await simulateServerStatus('in_progress')
-      await simulateServerStatus('done')
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+      await nextTick()

-      // Should not cause any errors
+      expect(queue.taskHistory.value).toEqual(mockHistory)
+      expect(queue.historyCount.value).toBe(2)
+    })
+
+    it('should handle empty state gracefully', async () => {
+      taskQueue.value.running_queue = []
+      taskQueue.value.pending_queue = []
+      taskHistory.value = {}
+
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+      await nextTick()
+
+      expect(queue.queueLength.value).toBe(0)
+      expect(queue.historyCount.value).toBe(0)
+    })
+  })
+
+  describe('state management', () => {
+    it('should provide reactive task history', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      taskHistory.value = {
+        task1: createMockHistoryItem(),
+        task2: createMockHistoryItem('test-client-id', 'error')
+      }
+
+      await nextTick()
+
+      expect(queue.taskHistory.value).toEqual(taskHistory.value)
+      expect(queue.historyCount.value).toBe(2)
+    })
+
+    it('should provide reactive installed packs', async () => {
+      installedPacks.value = {
+        pack1: { version: '1.0' },
+        pack2: { version: '2.0' }
+      }
+
+      await nextTick()
+
+      // The composable should have access to installedPacks through the parameter
+      expect(installedPacks.value).toEqual({
+        pack1: { version: '1.0' },
+        pack2: { version: '2.0' }
+      })
+    })
+  })
+
+  describe('computed properties', () => {
+    it('should correctly compute allTasksDone', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      // Empty queue = all done
      expect(queue.allTasksDone.value).toBe(true)
+
+      // Add pending tasks
+      taskQueue.value.pending_queue = [createMockTask('task1')]
+
+      await nextTick()
+
+      expect(queue.allTasksDone.value).toBe(false)
+
+      // Clear queue
+      taskQueue.value.running_queue = []
+      taskQueue.value.pending_queue = []
+
+      await nextTick()
+
+      expect(queue.allTasksDone.value).toBe(true)
+    })
+
+    it('should correctly compute queueLength', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      expect(queue.queueLength.value).toBe(0)
+
+      taskQueue.value.running_queue = [createMockTask('task1')]
+      taskQueue.value.pending_queue = [
+        createMockTask('task2'),
+        createMockTask('task3')
+      ]
+
+      await nextTick()
+
+      expect(queue.queueLength.value).toBe(3)
+    })
+  })
+
+  describe('client filtering functionality', () => {
+    it('should filter tasks by client ID in WebSocket events', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        running_queue: [
+          createMockTask('task1'),
+          createMockTask('task2', 'other-client-id')
+        ],
+        pending_queue: [createMockTask('task3')]
+      })
+
+      triggerWebSocketEvent('cm-task-completed', mockState)
+      await nextTick()
+
+      // Should only include tasks from this client
+      expect(taskQueue.value.running_queue).toEqual([createMockTask('task1')])
+      expect(taskQueue.value.pending_queue).toEqual([createMockTask('task3')])
+      expect(queue.queueLength.value).toBe(2)
+    })
+
+    it('should filter history by client ID in WebSocket events', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        history: {
+          task1: createMockHistoryItem(),
+          task2: createMockHistoryItem('other-client-id'),
+          task3: createMockHistoryItem()
+        }
+      })
+
+      triggerWebSocketEvent('cm-task-completed', mockState)
+      await nextTick()
+
+      // Should only include history items from this client
+      expect(Object.keys(taskHistory.value)).toHaveLength(2)
+      expect(taskHistory.value).toHaveProperty('task1')
+      expect(taskHistory.value).toHaveProperty('task3')
+      expect(taskHistory.value).not.toHaveProperty('task2')
+      expect(queue.historyCount.value).toBe(2)
+    })
+
+    it('should handle all tasks being from other clients', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        running_queue: [
+          createMockTask('task1', 'other-client-1'),
+          createMockTask('task2', 'other-client-2')
+        ],
+        pending_queue: [createMockTask('task3', 'other-client-1')],
+        history: {
+          task4: createMockHistoryItem('other-client-1'),
+          task5: createMockHistoryItem('other-client-2')
+        }
+      })
+
+      triggerWebSocketEvent('cm-task-completed', mockState)
+      await nextTick()
+
+      // Should have no tasks or history
+      expect(taskQueue.value.running_queue).toEqual([])
+      expect(taskQueue.value.pending_queue).toEqual([])
+      expect(taskHistory.value).toEqual({})
+      expect(queue.queueLength.value).toBe(0)
+      expect(queue.historyCount.value).toBe(0)
+    })
+  })
+
+  describe('WebSocket event handling', () => {
+    it('should handle task done events', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        running_queue: [createMockTask('task1')],
+        history: {
+          task1: createMockHistoryItem()
+        },
+        installed_packs: { pack1: { version: '1.0' } }
+      })
+
+      triggerWebSocketEvent('cm-task-completed', mockState)
+      await nextTick()
+
+      expect(taskQueue.value.running_queue).toEqual([createMockTask('task1')])
+      expect(taskQueue.value.pending_queue).toEqual([])
+      expect(taskHistory.value).toEqual({
+        task1: createMockHistoryItem()
+      })
+      expect(installedPacks.value).toEqual({ pack1: { version: '1.0' } })
+    })
+
+    it('should handle task started events', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        running_queue: [createMockTask('task1')],
+        pending_queue: [createMockTask('task2')],
+        installed_packs: { pack1: { version: '1.0' } }
+      })
+
+      triggerWebSocketEvent('cm-task-started', mockState)
+      await nextTick()
+
+      expect(taskQueue.value.running_queue).toEqual([createMockTask('task1')])
+      expect(taskQueue.value.pending_queue).toEqual([createMockTask('task2')])
+      expect(installedPacks.value).toEqual({ pack1: { version: '1.0' } })
+    })
+
+    it('should filter out tasks from other clients in WebSocket events', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        running_queue: [
+          createMockTask('task1'),
+          createMockTask('task2', 'other-client-id')
+        ],
+        pending_queue: [createMockTask('task3', 'other-client-id')],
+        history: {
+          task1: createMockHistoryItem(),
+          task2: createMockHistoryItem('other-client-id')
+        }
+      })
+
+      triggerWebSocketEvent('cm-task-completed', mockState)
+      await nextTick()
+
+      // Should only include tasks from this client
+      expect(taskQueue.value.running_queue).toEqual([createMockTask('task1')])
+      expect(taskQueue.value.pending_queue).toEqual([])
+      expect(taskHistory.value).toEqual({
+        task1: createMockHistoryItem()
+      })
+    })
+
+    it('should ignore events with wrong type', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const handler = getEventHandler('cm-task-completed')
+
+      // Send event with wrong type
+      handler({
+        type: 'wrong-event-type',
+        detail: {
+          state: createMockState({ running_queue: [createMockTask('task1')] })
+        }
+      })
+      await nextTick()
+
+      // Should not update state
+      expect(taskQueue.value.running_queue).toEqual([])
+    })
+  })
+
+  describe('cleanup functionality', () => {
+    it('should clean up event listeners on stopListening', () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+      const mockRemoveEventListener = app.api.removeEventListener as any
+
+      queue.stopListening()
+
+      expect(mockRemoveEventListener).toHaveBeenCalledTimes(2)
+
+      // Check that both event types were called with the correct event names
+      const calls = mockRemoveEventListener.mock.calls
+      const eventTypes = calls.map((call: any) => call[0])
+      expect(eventTypes).toContain('cm-task-completed')
+      expect(eventTypes).toContain('cm-task-started')
+
+      // Check that functions were passed as second parameter
+      calls.forEach((call: any) => {
+        expect(typeof call[1]).toBe('function')
+      })
+    })
+
+    it('should handle multiple stopListening calls gracefully', () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+      const mockRemoveEventListener = app.api.removeEventListener as any
+
+      queue.stopListening()
+      queue.stopListening()
+
+      // Should still only be called twice (once per event type)
+      expect(mockRemoveEventListener).toHaveBeenCalledTimes(4)
+    })
+  })
+
+  describe('edge cases', () => {
+    it('should handle undefined installed_packs in state update', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      const mockState = createMockState({
+        running_queue: [createMockTask('task1')],
+        installed_packs: undefined
+      })
+
+      triggerWebSocketEvent('cm-task-completed', mockState)
+      await nextTick()
+
+      // Should not update installedPacks when undefined
+      expect(installedPacks.value).toEqual({})
+    })
+
+    it('should handle rapid successive events', async () => {
+      const queue = useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      // Send multiple events rapidly
+      for (let i = 0; i < 10; i++) {
+        triggerWebSocketEvent(
+          'cm-task-completed',
+          createMockState({
+            running_queue: [createMockTask(`task${i}`)],
+            history: { [`task${i}`]: createMockHistoryItem() }
+          })
+        )
+      }
+
+      await nextTick()
+
+      // Should have the last state
+      expect(taskQueue.value.running_queue).toEqual([createMockTask('task9')])
+      expect(queue.queueLength.value).toBe(1)
+    })
+
+    it('should maintain consistency when mixing event types', async () => {
+      useManagerQueue(taskHistory, taskQueue, installedPacks)
+
+      // Send alternating event types
+      triggerWebSocketEvent(
+        'cm-task-started',
+        createMockState({
+          running_queue: [createMockTask('task1')],
+          pending_queue: [createMockTask('task2')]
+        })
+      )
+
+      triggerWebSocketEvent(
+        'cm-task-completed',
+        createMockState({
+          running_queue: [],
+          pending_queue: [createMockTask('task2')],
+          history: { task1: createMockHistoryItem() }
+        })
+      )
+
+      await nextTick()
+
+      expect(taskQueue.value.running_queue).toEqual([])
+      expect(taskQueue.value.pending_queue).toEqual([createMockTask('task2')])
+      expect(taskHistory.value).toHaveProperty('task1')
    })
  })
 })
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jin Yi	104bd43dc1	[fix] TypeScript errors in manager/compatibility branch (#4625 )	2025-07-31 16:42:56 +09:00
Jin Yi	e085bb4c0f	[feat] Add import failure detection and error handling for package manager (#4600 )	2025-07-31 16:42:56 +09:00
Jin Yi	afe0d68ae6	[refactor] Simplify conflict acknowledgment system and enhance UX (#4599 )	2025-07-31 16:42:56 +09:00
Jin Yi	4c4625bb09	[refactor] Simplify conflict detection types and improve code maintainability (#4589 )	2025-07-31 16:42:56 +09:00
Jin Yi	17dcc31585	[feat] Show conflicting status for installed packages with compatibility issues (#4579 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-07-31 16:42:56 +09:00
Jin Yi	2bff313135	[debug] Conflict detection debugging (#4577 )	2025-07-31 16:42:56 +09:00
Jin Yi	9a4928974e	[Design] Update InfoPanel styling and layout (#4553 )	2025-07-31 16:42:56 +09:00
Jin Yi	25c6efca66	[feat] Add bulk import failure info API and improve conflict detection (#4550 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-07-31 16:42:56 +09:00
Jin Yi	e04117cf21	[Design] Update PackVersionSelectorPopover styling (#4554 )	2025-07-31 16:42:56 +09:00
Jin Yi	964da0084d	[fix] Simplify PackEnableToggle state management (#4551 )	2025-07-31 16:42:56 +09:00
Jin Yi	9052496402	[Manager] Optimize conflict detection with bulk API and version support (#4538 )	2025-07-31 16:42:56 +09:00
Jin Yi	b912416138	[Manager] Fix version selector conflict detection and UI improvements (#4539 )	2025-07-31 16:42:56 +09:00
Jin Yi	c9ea9893ee	[Manager] Fix banned status logic to only check Registry status (#4535 )	2025-07-31 16:42:56 +09:00
Jin Yi	5edf856ce9	[Manager] Fix toggle modal dismiss bug (#4534 )	2025-07-31 16:42:56 +09:00
Jin Yi	783f39873f	chore: delete unnecessary description	2025-07-31 16:42:56 +09:00
comfy-jinyi	34adfc8bf1	[Manager] Fix package version matching in conflict detection (#4530 ) Co-authored-by: Jin Yi <jin12cc@gmail.com> Co-authored-by: Claude <noreply@anthropic.com>	2025-07-31 16:42:56 +09:00
Jin Yi	af0dde0ac8	Manager Conflict Nofitication (#4443 ) Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: bymyself <cbyrne@comfy.org> Co-authored-by: Claude <noreply@anthropic.com>	2025-07-31 16:42:56 +09:00
Jin Yi	4b6739c6fb	[Manager] Compatibility Detection Logic (#4348 ) Co-authored-by: Claude <noreply@anthropic.com>	2025-07-31 16:42:56 +09:00
github-actions	6ffba22663	Update locales [skip ci]	2025-07-31 16:42:19 +09:00
github-actions	d260ae0882	Update locales [skip ci]	2025-07-31 16:42:19 +09:00
github-actions	fe7c3cea4e	Update locales [skip ci]	2025-07-31 16:42:19 +09:00
github-actions	278409e8fa	Update locales [skip ci]	2025-07-31 16:42:19 +09:00
Jin Yi	237ef9c597	[test] Update PackVersionBadge test to use role selector instead of Button component	2025-07-31 16:42:19 +09:00
github-actions	9224ffbb37	Update locales [skip ci]	2025-07-31 16:42:19 +09:00
bymyself	3017ebba13	fix rebase error	2025-07-31 16:41:53 +09:00
Jin Yi	01c2341a11	[Manager] “Restarting” state after clicking restart button (#4269 )	2025-07-31 16:41:53 +09:00
Jin Yi	3d0ae0f884	[Manager] Add update all button functionality - Add PackUpdateButton component for bulk updates - Add useUpdateAvailableNodes composable to track available updates - Integrate update all button in RegistrySearchBar - Add localization strings for update functionality - Add comprehensive tests for update functionality - Add loading state to PackActionButton	2025-07-31 16:41:53 +09:00
bymyself	c8137ab535	[tests] Update useServerLogs test after log subscription change The test was expecting subscribeLogs(false) to be called, but this was commented out in commit `33d64475` to fix logs stopping after the first of multiple queue tasks. Updated test to reflect this temporary change.	2025-07-31 16:41:53 +09:00
bymyself	642f79c20d	remove the temporary check for legacy custom node version of manager	2025-07-31 16:41:53 +09:00
bymyself	64a2d0d152	fix: logs stops listening after 1st of multiple queue tasks	2025-07-31 16:41:53 +09:00
bymyself	22d04213a4	[tests] Update useServerLogs test to handle task-started events Update test to simulate cm-task-started events before logs events to match the actual behavior of the composable.	2025-07-31 16:41:53 +09:00
Christian Byrne	6a07ead4e4	[Manager] Fix: failed tasks logs not correctly partitioned in UI (#4242 )	2025-07-31 16:41:53 +09:00
bymyself	d61c0483c4	fix failed task tab state binding	2025-07-31 16:41:53 +09:00
Christian Byrne	175b728dd9	[Manager] Filter task queue and history by client id (#4241 )	2025-07-31 16:41:53 +09:00
github-actions	8ad3a0b212	Update locales [skip ci]	2025-07-31 16:41:53 +09:00
bymyself	d8799b6a9f	fix rebase errors	2025-07-31 16:41:09 +09:00
bymyself	0177361554	[manager] Fix test failures and missing type definitions - Fix ManagerProgressDialogContent test mock to include all required store methods - Add missing MergedNodePack, RegistryPack type definitions and isMergedNodePack type guard - Ensure all unit tests (548 passed) and component tests (174 passed) are working - Fix TypeScript compilation errors related to manager store interfaces	2025-07-31 16:41:09 +09:00
bymyself	0ec9702ead	[manager] Update tests for new manager API Updated tests for manager queue composable, server logs composable, and manager store to work with the new API signatures and functionality.	2025-07-31 16:41:09 +09:00
bymyself	eef8c0408a	[manager] Update UI components for new manager interface Updated manager dialog components, pack cards, version selectors, and action buttons to work with the new manager API and state management structure.	2025-07-31 16:41:09 +09:00
bymyself	42a7deae2b	[manager] Update composables and state management Updated manager queue composable, server logs composable, workflow packs composable, and manager store to support the new manager API structure and state management patterns.	2025-07-31 16:41:09 +09:00
bymyself	3db88b7172	[manager] Update core services for new manager API Updated ComfyUI Manager service and dialog service to support the new menu items structure and API endpoints.	2025-07-31 16:41:09 +09:00
bymyself	f2cfd2a841	[manager] Update type definitions and schemas for menu items migration Updated ComfyUI Manager types and API schemas to support the new menu items structure and manager functionality.	2025-07-31 16:41:09 +09:00
github-actions	dafa767c0c	Update locales [skip ci]	2025-07-31 16:41:09 +09:00
bymyself	f10b693bbb	dont show missing nodes button in legacy manager mode	2025-07-31 16:40:53 +09:00
bymyself	efde93168e	use correct response shape	2025-07-31 16:40:53 +09:00
github-actions	a50c26fe76	Update locales [skip ci]	2025-07-31 16:40:53 +09:00
bymyself	6a87933a78	add "Check for Updates", "Install Missing" menu items	2025-07-31 16:39:00 +09:00
bymyself	f82d8d56b8	move legacy option to startup arg	2025-07-31 16:38:41 +09:00
bymyself	891593971b	await promises. update settings schema	2025-07-31 16:38:41 +09:00
github-actions	408644fe08	Update locales [skip ci]	2025-07-31 16:38:41 +09:00
bymyself	38ab2833eb	migrate manager menu items	2025-07-31 16:34:26 +09:00
github-actions	5abe2d0822	Update locales [skip ci]	2025-07-30 18:30:36 +00:00
Christian Byrne	bf9cf06de2	Fix errors from rebase (removed `Tag` component import and duplicated imports in api.ts) (#4608 ) Co-authored-by: github-actions <github-actions@github.com>	2025-07-30 11:26:05 -07:00
Christian Byrne	c7520eac3e	[fix] Fix json syntax error from rebase (#4607 )	2025-07-30 10:22:05 -07:00
Jin Yi	972160782c	Merge branch 'main' into manager/menu-items-migration	2025-07-30 19:56:49 +09:00
github-actions	df67cdd86c	Update locales [skip ci]	2025-07-21 17:41:45 +09:00
bymyself	478499c188	[Update to v2 API] update WS done message	2025-07-21 17:41:45 +09:00
bymyself	a5efa8580e	dont show missing nodes button in legacy manager mode	2025-07-21 17:41:44 +09:00
bymyself	ab2e70b4b8	improve command names	2025-07-21 17:41:44 +09:00
bymyself	27579400bf	use correct response shape	2025-07-21 17:41:44 +09:00
github-actions	b9341ad144	Update locales [skip ci]	2025-07-21 17:41:44 +09:00
bymyself	9c68491129	add "Check for Updates", "Install Missing" menu items	2025-07-21 17:41:44 +09:00
github-actions	4f5ec0447c	Update locales [skip ci]	2025-07-21 17:41:44 +09:00
bymyself	0d1e5cb02a	Add banner indicating how to use legacy manager UI	2025-07-21 17:41:44 +09:00
bymyself	797a612227	move legacy option to startup arg	2025-07-21 17:41:44 +09:00
bymyself	0a0a2e74d5	await promises. update settings schema	2025-07-21 17:41:44 +09:00
bymyself	6824e48efe	re-arrange menu items	2025-07-21 17:41:44 +09:00
bymyself	257f618ee1	switch to v2 manager API endpoints	2025-07-21 17:41:44 +09:00
github-actions	a446483d7e	Update locales [skip ci]	2025-07-21 17:41:44 +09:00
bymyself	a3d7c59b6f	migrate manager menu items	2025-07-21 17:41:44 +09:00