diff --git a/package-lock.json b/package-lock.json
index 9ec9420c2..f9cc3e4dc 100644
--- 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",
@@ -18028,4 +18098,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index 85b36240c..1a4068a27 100644
--- 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>
diff --git a/src/components/dialog/GlobalDialog.vue b/src/components/dialog/GlobalDialog.vue
index bdc3a28bb..0b37462c5 100644
--- 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>
diff --git a/src/components/dialog/content/manager/ManagerDialogContent.vue b/src/components/dialog/content/manager/ManagerDialogContent.vue
index 3ef98806b..7ad6c860f 100644
--- 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:
@@ -472,6 +521,10 @@ watch([searchQuery, selectedTab], () => {
   }
 })
 
+watchEffect(() => {
+  dismissRedDotNotification()
+})
+
 onBeforeUnmount(() => {
   persistedState.persistState({
     selectedTabId: selectedTab.value?.id,
diff --git a/src/components/dialog/content/manager/NodeConflictDialogContent.vue b/src/components/dialog/content/manager/NodeConflictDialogContent.vue
new file mode 100644
index 000000000..ae4f08c70
--- /dev/null
+++ 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>
diff --git a/src/components/dialog/content/manager/NodeConflictFooter.vue b/src/components/dialog/content/manager/NodeConflictFooter.vue
new file mode 100644
index 000000000..c76f77908
--- /dev/null
+++ b/src/components/dialog/content/manager/NodeConflictFooter.vue
@@ -0,0 +1,54 @@
+<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>
diff --git a/src/components/dialog/content/manager/NodeConflictHeader.vue b/src/components/dialog/content/manager/NodeConflictHeader.vue
new file mode 100644
index 000000000..70e30d129
--- /dev/null
+++ 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>
diff --git a/src/components/dialog/content/manager/PackStatusMessage.vue b/src/components/dialog/content/manager/PackStatusMessage.vue
index b31f880e9..ab2b38a45 100644
--- 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,13 @@ 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>
diff --git a/src/components/dialog/content/manager/PackVersionBadge.test.ts b/src/components/dialog/content/manager/PackVersionBadge.test.ts
index 9bd897986..71d3383d8 100644
--- 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 () => {
diff --git a/src/components/dialog/content/manager/PackVersionBadge.vue b/src/components/dialog/content/manager/PackVersionBadge.vue
index 5a6ee32e2..d43134eeb 100644
--- 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
diff --git a/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts b/src/components/dialog/content/manager/PackVersionSelectorPopover.test.ts
index 6a1d9dc56..83b4d320e 100644
--- 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)
     })
   })
 })
diff --git a/src/components/dialog/content/manager/PackVersionSelectorPopover.vue b/src/components/dialog/content/manager/PackVersionSelectorPopover.vue
index 020b3e352..8a4b4a3cf 100644
--- 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,11 +84,13 @@ 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 {
@@ -75,6 +99,7 @@ import {
   SelectedVersion
 } from '@/types/comfyManagerTypes'
 import { components } from '@/types/comfyRegistryTypes'
+import { getJoinedConflictMessages } from '@/utils/conflictMessageUtil'
 import { isSemVer } from '@/utils/formatUtil'
 
 const { nodePack } = defineProps<{
@@ -89,6 +114,7 @@ const emit = defineEmits<{
 const { t } = useI18n()
 const registryService = useComfyRegistryService()
 const managerStore = useComfyManagerStore()
+const { checkNodeCompatibility } = useConflictDetection()
 
 const isQueueing = ref(false)
 
@@ -126,6 +152,8 @@ const versionOptions = ref<
   }[]
 >([])
 
+const fetchedVersions = ref<components['schemas']['NodeVersion'][]>([])
+
 const isLoadingVersions = ref(false)
 
 const onNodePackChange = async () => {
@@ -133,18 +161,27 @@ const onNodePackChange = async () => {
 
   // Fetch versions from the registry
   const versions = await fetchVersions()
+  fetchedVersions.value = versions
+
+  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')
+      label: latestLabel
     }
   ]
 
@@ -172,16 +209,86 @@ 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,
     repository: nodePack.repository ?? '',
     channel: ManagerChannel.DEFAULT,
     mode: ManagerDatabaseSource.CACHE,
-    version: selectedVersion.value,
+    version: actualVersion,
     selected_version: selectedVersion.value
   })
 
   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>
diff --git a/src/components/dialog/content/manager/button/PackActionButton.vue b/src/components/dialog/content/manager/button/PackActionButton.vue
index fc7730e4c..15849a257 100644
--- 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<{
diff --git a/src/components/dialog/content/manager/button/PackEnableToggle.test.ts b/src/components/dialog/content/manager/button/PackEnableToggle.test.ts
index 77299d266..4df7d7e94 100644
--- 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 = {
diff --git a/src/components/dialog/content/manager/button/PackEnableToggle.vue b/src/components/dialog/content/manager/button/PackEnableToggle.vue
index 8f994aeb6..328d71c92 100644
--- 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"
@@ -8,13 +28,16 @@
     />
   </div>
 </template>
-
 <script setup lang="ts">
 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 { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
 import {
   InstallPackParams,
   ManagerChannel,
@@ -24,12 +47,17 @@ import type { components } from '@/types/comfyRegistryTypes'
 
 const TOGGLE_DEBOUNCE_MS = 256
 
-const { nodePack } = defineProps<{
+const { nodePack, hasConflict } = defineProps<{
   nodePack: components['schemas']['Node']
+  hasConflict?: boolean
 }>()
 
+const { t } = useI18n()
 const { isPackEnabled, enablePack, disablePack, installedPacks } =
   useComfyManagerStore()
+const { getConflictsForPackageByID } = useConflictDetectionStore()
+const { showNodeConflictDialog } = useDialogService()
+const { acknowledgmentState, markConflictsAsSeen } = useConflictAcknowledgment()
 
 const isLoading = ref(false)
 
@@ -44,21 +72,64 @@ const version = computed(() => {
   )
 })
 
-const handleEnable = () =>
-  enablePack.call({
+const packageConflict = computed(() =>
+  getConflictsForPackageByID(nodePack.id || '')
+)
+const canToggleDirectly = computed(() => {
+  return !(
+    hasConflict &&
+    !acknowledgmentState.value.modal_dismissed &&
+    packageConflict.value
+  )
+})
+
+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 handleEnable = () => {
+  if (!nodePack.id) {
+    throw new Error('Node ID is required for enabling')
+  }
+  return enablePack.call({
     id: nodePack.id,
-    version: version.value,
-    selected_version: version.value,
+    version: version.value ?? SelectedVersion.LATEST,
+    selected_version: version.value ?? SelectedVersion.LATEST,
     repository: nodePack.repository ?? '',
     channel: ManagerChannel.DEFAULT,
-    mode: 'default' as InstallPackParams['mode']
+    mode: 'default' as InstallPackParams['mode'],
+    skip_post_install: false
   })
+}
 
-const handleDisable = () =>
-  disablePack({
+const handleDisable = () => {
+  if (!nodePack.id) {
+    throw new Error('Node ID is required for disabling')
+  }
+  return disablePack({
     id: nodePack.id,
-    version: version.value
+    version: version.value ?? SelectedVersion.LATEST
   })
+}
 
 const handleToggle = async (enable: boolean) => {
   if (isLoading.value) return
@@ -67,10 +138,22 @@ 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>
diff --git a/src/components/dialog/content/manager/button/PackInstallButton.vue b/src/components/dialog/content/manager/button/PackInstallButton.vue
index 2f9751d0f..4228eb92e 100644
--- a/src/components/dialog/content/manager/button/PackInstallButton.vue
+++ b/src/components/dialog/content/manager/button/PackInstallButton.vue
@@ -9,6 +9,7 @@
     :variant="variant"
     :loading="isInstalling"
     :loading-message="$t('g.installing')"
+    :has-warning="hasConflict"
     @action="installAllPacks"
   />
 </template>
@@ -17,6 +18,8 @@
 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,
@@ -25,20 +28,31 @@ import {
   SelectedVersion
 } from '@/types/comfyManagerTypes'
 import type { components } from '@/types/comfyRegistryTypes'
+import {
+  type ConflictDetail,
+  ConflictDetectionResult
+} from '@/types/conflictDetectionTypes'
 
 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 managerStore = useComfyManagerStore()
+const { showNodeConflictDialog } = useDialogService()
 
 const createPayload = (installItem: NodePack) => {
+  if (!installItem.id) {
+    throw new Error('Node ID is required for installation')
+  }
+
   const isUnclaimedPack = installItem.publisher?.name === 'Unclaimed'
   const versionToInstall = isUnclaimedPack
     ? SelectedVersion.NIGHTLY
@@ -60,12 +74,35 @@ const installPack = (item: NodePack) =>
 const installAllPacks = async () => {
   if (!nodePacks?.length) return
 
-  const uninstalledPacks = nodePacks.filter(
-    (pack) => !managerStore.isPackInstalled(pack.id)
-  )
-  if (!uninstalledPacks.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
+      })
+    )
 
-  await Promise.all(uninstalledPacks.map(installPack))
+    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 performInstallation = async (packs: NodePack[]) => {
+  await Promise.all(packs.map(installPack))
   managerStore.installPack.clear()
 }
 </script>
diff --git a/src/components/dialog/content/manager/button/PackUninstallButton.vue b/src/components/dialog/content/manager/button/PackUninstallButton.vue
index 5a740f65f..52d94014c 100644
--- a/src/components/dialog/content/manager/button/PackUninstallButton.vue
+++ b/src/components/dialog/content/manager/button/PackUninstallButton.vue
@@ -6,16 +6,14 @@
         ? $t('manager.uninstallSelected')
         : $t('manager.uninstall')
     "
-    severity="danger"
+    variant="red"
     :loading-message="$t('manager.uninstalling')"
     @action="uninstallItems"
   />
 </template>
-
 <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 +24,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))
diff --git a/src/components/dialog/content/manager/button/PackUpdateButton.vue b/src/components/dialog/content/manager/button/PackUpdateButton.vue
new file mode 100644
index 000000000..9fab52e82
--- /dev/null
+++ b/src/components/dialog/content/manager/button/PackUpdateButton.vue
@@ -0,0 +1,67 @@
+<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>
diff --git a/src/components/dialog/content/manager/infoPanel/InfoPanel.vue b/src/components/dialog/content/manager/infoPanel/InfoPanel.vue
index 0dc957c8c..2dc64ba42 100644
--- 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>
diff --git a/src/components/dialog/content/manager/infoPanel/InfoPanelHeader.vue b/src/components/dialog/content/manager/infoPanel/InfoPanelHeader.vue
index c2573981b..8d8fe99e4 100644
--- 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],
diff --git a/src/components/dialog/content/manager/infoPanel/InfoPanelMultiItem.vue b/src/components/dialog/content/manager/infoPanel/InfoPanelMultiItem.vue
index a4bd12c0b..f89628dce 100644
--- 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" />
diff --git a/src/components/dialog/content/manager/infoPanel/InfoTabs.vue b/src/components/dialog/content/manager/infoPanel/InfoTabs.vue
index bc96d9908..42851ad28 100644
--- 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>
diff --git a/src/components/dialog/content/manager/infoPanel/InfoTextSection.vue b/src/components/dialog/content/manager/infoPanel/InfoTextSection.vue
index 80a7e3a3a..b7a2a6c1e 100644
--- 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">
diff --git a/src/components/dialog/content/manager/infoPanel/MetadataRow.vue b/src/components/dialog/content/manager/infoPanel/MetadataRow.vue
index d8e55c9e2..68daa0d29 100644
--- 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>
diff --git a/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.vue b/src/components/dialog/content/manager/infoPanel/tabs/DescriptionTabPanel.vue
index 439d26991..d966325dc 100644
--- 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"
diff --git a/src/components/dialog/content/manager/infoPanel/tabs/NodesTabPanel.vue b/src/components/dialog/content/manager/infoPanel/tabs/NodesTabPanel.vue
index cf4d7b081..6126de081 100644
--- 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"
diff --git a/src/components/dialog/content/manager/infoPanel/tabs/WarningTabPanel.vue b/src/components/dialog/content/manager/infoPanel/tabs/WarningTabPanel.vue
new file mode 100644
index 000000000..30d196913
--- /dev/null
+++ b/src/components/dialog/content/manager/infoPanel/tabs/WarningTabPanel.vue
@@ -0,0 +1,43 @@
+<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>
diff --git a/src/components/dialog/content/manager/packCard/PackCard.vue b/src/components/dialog/content/manager/packCard/PackCard.vue
index ee2cef92d..13c22c558 100644
--- 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 max-h-12 line-clamp-3 my-0 leading-4 mb-1 overflow-hidden"
             >
               {{ nodePack.description }}
             </p>
diff --git a/src/components/dialog/content/manager/packCard/PackCardFooter.vue b/src/components/dialog/content/manager/packCard/PackCardFooter.vue
index 1062f2cac..06aa88627 100644
--- 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>
diff --git a/src/components/dialog/content/manager/packCard/PackCardHeader.vue b/src/components/dialog/content/manager/packCard/PackCardHeader.vue
index 77049e571..6e41e0227 100644
--- 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>
diff --git a/src/components/dialog/content/manager/packIcon/PackIcon.vue b/src/components/dialog/content/manager/packIcon/PackIcon.vue
index 47fd826cf..71ec4a400 100644
--- 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>
diff --git a/src/components/dialog/content/manager/packIcon/PackIconStacked.vue b/src/components/dialog/content/manager/packIcon/PackIconStacked.vue
index 3815fb36c..475d5b9f6 100644
--- 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>
 
diff --git a/src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue b/src/components/dialog/content/manager/registrySearchBar/RegistrySearchBar.vue
index 90e13b54d..904d43264 100644
--- 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
 )
diff --git a/src/components/helpcenter/HelpCenterMenuContent.vue b/src/components/helpcenter/HelpCenterMenuContent.vue
index 45a6da119..a8622bfd4 100644
--- 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>
@@ -120,9 +130,19 @@
 
 <script setup lang="ts">
 import Button from 'primevue/button'
-import { type CSSProperties, computed, nextTick, onMounted, ref } from 'vue'
+import {
+  type CSSProperties,
+  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 +153,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 +191,7 @@ const { t, locale } = useI18n()
 const releaseStore = useReleaseStore()
 const commandStore = useCommandStore()
 const settingStore = useSettingStore()
+const dialogService = useDialogService()
 
 // Emits
 const emit = defineEmits<{
@@ -192,6 +214,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 +297,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,6 +542,13 @@ onMounted(async () => {
   box-shadow: none;
 }
 
+.help-menu-icon-container {
+  position: relative;
+  margin-right: 0.75rem;
+  width: 16px;
+  flex-shrink: 0;
+}
+
 .help-menu-icon {
   margin-right: 0.75rem;
   font-size: 1rem;
@@ -512,9 +556,26 @@ onMounted(async () => {
   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;
 }
diff --git a/src/components/helpcenter/WhatsNewPopup.vue b/src/components/helpcenter/WhatsNewPopup.vue
index 26d1dc8a0..ed9716bdd 100644
--- 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
diff --git a/src/components/icons/PuzzleIcon.vue b/src/components/icons/PuzzleIcon.vue
new file mode 100644
index 000000000..320b1cf37
--- /dev/null
+++ b/src/components/icons/PuzzleIcon.vue
@@ -0,0 +1,41 @@
+<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>
diff --git a/src/components/icons/VerifiedIcon.vue b/src/components/icons/VerifiedIcon.vue
new file mode 100644
index 000000000..c8072507a
--- /dev/null
+++ b/src/components/icons/VerifiedIcon.vue
@@ -0,0 +1,27 @@
+<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>
diff --git a/src/components/sidebar/SidebarHelpCenterIcon.vue b/src/components/sidebar/SidebarHelpCenterIcon.vue
index c37cd973e..28453e081 100644
--- 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,20 @@ 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 +101,36 @@ 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
diff --git a/src/composables/nodePack/useInstalledPacks.ts b/src/composables/nodePack/useInstalledPacks.ts
index fd671d33b..2fea94e5c 100644
--- a/src/composables/nodePack/useInstalledPacks.ts
+++ b/src/composables/nodePack/useInstalledPacks.ts
@@ -20,7 +20,9 @@ export const useInstalledPacks = (options: UseNodePacksOptions = {}) => {
     packs.filter((pack) => comfyManagerStore.isPackInstalled(pack.id))
 
   const startFetchInstalled = async () => {
-    await comfyManagerStore.refreshInstalledList()
+    if (comfyManagerStore.installedPacksIds.size === 0) {
+      await comfyManagerStore.refreshInstalledList()
+    }
     await startFetch()
   }
 
@@ -33,11 +35,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
   }
diff --git a/src/composables/nodePack/useUpdateAvailableNodes.ts b/src/composables/nodePack/useUpdateAvailableNodes.ts
new file mode 100644
index 000000000..516ffffdb
--- /dev/null
+++ 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
+  }
+}
diff --git a/src/composables/useConflictAcknowledgment.ts b/src/composables/useConflictAcknowledgment.ts
new file mode 100644
index 000000000..b352a21a9
--- /dev/null
+++ 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
+  }
+}
diff --git a/src/composables/useConflictDetection.ts b/src/composables/useConflictDetection.ts
new file mode 100644
index 000000000..fb5b67750
--- /dev/null
+++ b/src/composables/useConflictDetection.ts
@@ -0,0 +1,1338 @@
+import { uniqBy } from 'lodash'
+import { computed, getCurrentInstance, onUnmounted, readonly, ref } from 'vue'
+
+import { useInstalledPacks } from '@/composables/nodePack/useInstalledPacks'
+import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgment'
+import config from '@/config'
+import { useComfyManagerService } from '@/services/comfyManagerService'
+import { useComfyRegistryService } from '@/services/comfyRegistryService'
+import { useComfyManagerStore } from '@/stores/comfyManagerStore'
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
+import { useSystemStatsStore } from '@/stores/systemStatsStore'
+import type { SystemStats } from '@/types'
+import type { components } from '@/types/comfyRegistryTypes'
+import type {
+  ConflictDetail,
+  ConflictDetectionResponse,
+  ConflictDetectionResult,
+  ConflictDetectionSummary,
+  ConflictType,
+  Node,
+  NodePackRequirements,
+  SystemEnvironment
+} from '@/types/conflictDetectionTypes'
+import {
+  cleanVersion,
+  satisfiesVersion,
+  utilCheckVersionCompatibility
+} from '@/utils/versionUtil'
+
+/**
+ * Composable for conflict detection system.
+ * Error-resilient and asynchronous to avoid affecting other components.
+ */
+export function useConflictDetection() {
+  const managerStore = useComfyManagerStore()
+
+  const {
+    startFetchInstalled,
+    installedPacks,
+    installedPacksWithVersions,
+    isReady: installedPacksReady
+  } = useInstalledPacks()
+
+  const isDetecting = ref(false)
+  const lastDetectionTime = ref<string | null>(null)
+  const detectionError = ref<string | null>(null)
+
+  const systemEnvironment = ref<SystemEnvironment | null>(null)
+
+  const detectionResults = ref<ConflictDetectionResult[]>([])
+  // Store merged conflicts separately for testing
+  const storedMergedConflicts = ref<ConflictDetectionResult[]>([])
+  const detectionSummary = ref<ConflictDetectionSummary | null>(null)
+
+  // Registry API request cancellation
+  const abortController = ref<AbortController | null>(null)
+
+  const acknowledgment = useConflictAcknowledgment()
+
+  const conflictStore = useConflictDetectionStore()
+
+  const hasConflicts = computed(() => conflictStore.hasConflicts)
+  const conflictedPackages = computed(() => {
+    return conflictStore.conflictedPackages
+  })
+
+  const bannedPackages = computed(() => conflictStore.bannedPackages)
+  const securityPendingPackages = computed(
+    () => conflictStore.securityPendingPackages
+  )
+
+  /**
+   * Collects current system environment information.
+   * Continues with default values even if errors occur.
+   * @returns Promise that resolves to system environment information
+   */
+  async function detectSystemEnvironment(): Promise<SystemEnvironment> {
+    try {
+      // Get system stats from store (primary source of system information)
+      const systemStatsStore = useSystemStatsStore()
+      await systemStatsStore.fetchSystemStats()
+
+      // Fetch version information from backend (with error resilience)
+      const [frontendVersion] = await Promise.allSettled([
+        fetchFrontendVersion()
+      ])
+
+      // Extract system information from system stats
+      const systemStats = systemStatsStore.systemStats
+      const comfyuiVersion = systemStats?.system?.comfyui_version || 'unknown'
+
+      // Use system stats for OS detection (more accurate than browser detection)
+      const systemOS = systemStats?.system?.os || 'unknown'
+
+      // Extract architecture from system stats device information
+      const architecture = extractArchitectureFromSystemStats(systemStats)
+
+      // Detect GPU/accelerator information from system stats
+      const acceleratorInfo = extractAcceleratorInfo(systemStats)
+
+      // Enhanced OS detection using multiple sources
+      const detectedOS = detectOSFromSystemStats(systemOS, systemStats)
+
+      const environment: SystemEnvironment = {
+        // Version information (use 'unknown' on failure)
+        comfyui_version: comfyuiVersion,
+        frontend_version:
+          frontendVersion.status === 'fulfilled'
+            ? frontendVersion.value
+            : 'unknown',
+
+        // Platform information (from system stats)
+        os: detectedOS,
+        platform_details: systemOS,
+        architecture: architecture,
+
+        // GPU/accelerator information
+        available_accelerators: acceleratorInfo.available,
+        primary_accelerator: acceleratorInfo.primary,
+        gpu_memory_mb: acceleratorInfo.memory_mb,
+
+        // Runtime information
+        node_env: import.meta.env.MODE as 'development' | 'production',
+        user_agent: navigator.userAgent
+      }
+
+      systemEnvironment.value = environment
+      console.log(
+        '[ConflictDetection] System environment detection completed:',
+        environment
+      )
+      return environment
+    } catch (error) {
+      console.warn(
+        '[ConflictDetection] Error during system environment detection:',
+        error
+      )
+
+      // Try to get frontend version even in fallback mode
+      let frontendVersion = 'unknown'
+      try {
+        frontendVersion = await fetchFrontendVersion()
+      } catch {
+        frontendVersion = 'unknown'
+      }
+
+      // Provide basic environment information even on error
+      const fallbackEnvironment: SystemEnvironment = {
+        comfyui_version: 'unknown',
+        frontend_version: frontendVersion,
+        os: detectOSFromSystemStats(navigator.platform),
+        platform_details: navigator.platform,
+        architecture: getArchitecture(),
+        available_accelerators: ['CPU'],
+        primary_accelerator: 'CPU',
+        node_env: import.meta.env.MODE as 'development' | 'production',
+        user_agent: navigator.userAgent
+      }
+
+      systemEnvironment.value = fallbackEnvironment
+      return fallbackEnvironment
+    }
+  }
+
+  /**
+   * Fetches requirement information for installed packages using Registry Store.
+   *
+   * This function combines local installation data with Registry API compatibility metadata
+   * using the established store layer pattern with caching and batch requests.
+   *
+   * Process
+   * 1. Get locally installed packages
+   * 2. Batch fetch Registry data using store layer
+   * 3. Combine local + Registry data
+   * 4. Extract compatibility requirements
+   *
+   * @returns Promise that resolves to array of node pack requirements
+   */
+  async function fetchPackageRequirements(): Promise<NodePackRequirements[]> {
+    try {
+      // Step 1: Use installed packs composable instead of direct API calls
+      await startFetchInstalled() // Ensure data is loaded
+
+      if (
+        !installedPacksReady.value ||
+        !installedPacks.value ||
+        installedPacks.value.length === 0
+      ) {
+        console.warn(
+          '[ConflictDetection] No installed packages available from useInstalledPacks'
+        )
+        return []
+      }
+
+      // Step 2: Get Registry service for bulk API calls
+      const registryService = useComfyRegistryService()
+
+      // Step 3: Setup abort controller for request cancellation
+      abortController.value = new AbortController()
+
+      // Step 4: Use bulk API to fetch all version data in a single request
+      const versionDataMap = new Map<
+        string,
+        components['schemas']['NodeVersion']
+      >()
+
+      // Prepare bulk request with actual installed versions from Manager API
+      const nodeVersions = installedPacksWithVersions.value.map((pack) => ({
+        node_id: pack.id,
+        version: pack.version
+      }))
+
+      if (nodeVersions.length > 0) {
+        try {
+          const bulkResponse = await registryService.getBulkNodeVersions(
+            nodeVersions,
+            abortController.value?.signal
+          )
+
+          if (bulkResponse && bulkResponse.node_versions) {
+            // Process bulk response
+            bulkResponse.node_versions.forEach((result) => {
+              if (result.status === 'success' && result.node_version) {
+                versionDataMap.set(
+                  result.identifier.node_id,
+                  result.node_version
+                )
+              } else if (result.status === 'error') {
+                console.warn(
+                  `[ConflictDetection] Failed to fetch version data for ${result.identifier.node_id}@${result.identifier.version}:`,
+                  result.error_message
+                )
+              }
+            })
+          }
+        } catch (error) {
+          console.warn(
+            '[ConflictDetection] Failed to fetch bulk version data:',
+            error
+          )
+        }
+      }
+
+      // Step 5: Combine local installation data with Registry version data
+      const requirements: NodePackRequirements[] = []
+
+      // Create a map for quick access to version info
+      const versionInfoMap = new Map(
+        installedPacksWithVersions.value.map((pack) => [pack.id, pack.version])
+      )
+
+      for (const pack of installedPacks.value) {
+        const packageId = pack.id || ''
+        const versionData = versionDataMap.get(packageId)
+        const installedVersion = versionInfoMap.get(packageId) || 'unknown'
+
+        // Check if package is enabled using store method
+        const isEnabled = managerStore.isPackEnabled(packageId)
+
+        if (versionData) {
+          // Combine local installation data with version-specific Registry data
+          const requirement: NodePackRequirements = {
+            // Basic package info
+            id: pack.id,
+            name: pack.name,
+            installed_version: installedVersion,
+            is_enabled: isEnabled,
+
+            // Version-specific compatibility data
+            supported_comfyui_version: versionData.supported_comfyui_version,
+            supported_comfyui_frontend_version:
+              versionData.supported_comfyui_frontend_version,
+            supported_os: normalizeOSValues(versionData.supported_os),
+            supported_accelerators: versionData.supported_accelerators,
+
+            // Status information
+            version_status: versionData.status,
+            is_banned: versionData.status === 'NodeVersionStatusBanned',
+            is_pending: versionData.status === 'NodeVersionStatusPending'
+          }
+
+          requirements.push(requirement)
+        } else {
+          console.warn(
+            `[ConflictDetection] No Registry data found for ${packageId}, using fallback`
+          )
+
+          // Create fallback requirement without Registry data
+          const fallbackRequirement: NodePackRequirements = {
+            id: pack.id,
+            name: pack.name,
+            installed_version: installedVersion,
+            is_enabled: isEnabled,
+            is_banned: false,
+            is_pending: false
+          }
+
+          requirements.push(fallbackRequirement)
+        }
+      }
+
+      return requirements
+    } catch (error) {
+      console.warn(
+        '[ConflictDetection] Failed to fetch package requirements:',
+        error
+      )
+      return []
+    }
+  }
+
+  /**
+   * Detects conflicts for an individual package using Registry API data.
+   *
+   * @param packageReq Package requirements from Registry
+   * @param sysEnv Current system environment
+   * @returns Conflict detection result for the package
+   */
+  function detectPackageConflicts(
+    packageReq: NodePackRequirements,
+    sysEnv: SystemEnvironment
+  ): ConflictDetectionResult {
+    const conflicts: ConflictDetail[] = []
+
+    // Helper function to check if a value indicates "compatible with all"
+    const isCompatibleWithAll = (value: any): boolean => {
+      if (value === null || value === undefined) return true
+      if (typeof value === 'string' && value.trim() === '') return true
+      if (Array.isArray(value) && value.length === 0) return true
+      return false
+    }
+
+    // 1. ComfyUI version conflict check
+    if (!isCompatibleWithAll(packageReq.supported_comfyui_version)) {
+      const versionConflict = checkVersionConflict(
+        'comfyui_version',
+        sysEnv.comfyui_version,
+        packageReq.supported_comfyui_version!
+      )
+      if (versionConflict) conflicts.push(versionConflict)
+    }
+
+    // 2. Frontend version conflict check
+    if (!isCompatibleWithAll(packageReq.supported_comfyui_frontend_version)) {
+      const versionConflict = checkVersionConflict(
+        'frontend_version',
+        sysEnv.frontend_version,
+        packageReq.supported_comfyui_frontend_version!
+      )
+      if (versionConflict) conflicts.push(versionConflict)
+    }
+
+    // 3. OS compatibility check
+    if (!isCompatibleWithAll(packageReq.supported_os)) {
+      const osConflict = checkOSConflict(packageReq.supported_os!, sysEnv.os)
+      if (osConflict) conflicts.push(osConflict)
+    }
+
+    // 4. Accelerator compatibility check
+    if (!isCompatibleWithAll(packageReq.supported_accelerators)) {
+      const acceleratorConflict = checkAcceleratorConflict(
+        packageReq.supported_accelerators!,
+        sysEnv.available_accelerators
+      )
+      if (acceleratorConflict) conflicts.push(acceleratorConflict)
+    }
+
+    // 5. Banned package check using shared logic
+    const bannedConflict = checkBannedStatus(packageReq.is_banned)
+    if (bannedConflict) {
+      conflicts.push(bannedConflict)
+    }
+
+    // 6. Registry data availability check using shared logic
+    const pendingConflict = checkPendingStatus(packageReq.is_pending)
+    if (pendingConflict) {
+      conflicts.push(pendingConflict)
+    }
+
+    // Generate result
+    const hasConflict = conflicts.length > 0
+
+    return {
+      package_id: packageReq.id ?? '',
+      package_name: packageReq.name ?? '',
+      has_conflict: hasConflict,
+      conflicts,
+      is_compatible: !hasConflict
+    }
+  }
+
+  /**
+   * Fetches Python import failure information from ComfyUI Manager.
+   * Gets installed packages and checks each one for import failures using bulk API.
+   * @returns Promise that resolves to import failure data
+   */
+  async function fetchImportFailInfo(): Promise<Record<string, any>> {
+    try {
+      const comfyManagerService = useComfyManagerService()
+
+      // Use installed packs from useInstalledPacks composable
+      if (
+        !installedPacksReady.value ||
+        !installedPacks.value ||
+        installedPacks.value.length === 0
+      ) {
+        console.warn(
+          '[ConflictDetection] No installed packages available from useInstalledPacks'
+        )
+        return {}
+      }
+
+      const packageIds = installedPacks.value.map((pack) => pack.id || '')
+
+      // Use bulk API to get import failure info for all packages at once
+      const bulkResult = await comfyManagerService.getImportFailInfoBulk(
+        { cnr_ids: packageIds },
+        abortController.value?.signal
+      )
+
+      if (bulkResult) {
+        // Filter out null values (packages without import failures)
+        const importFailures: Record<string, any> = {}
+
+        Object.entries(bulkResult).forEach(([packageId, failInfo]) => {
+          if (failInfo !== null) {
+            importFailures[packageId] = failInfo
+            console.log(
+              `[ConflictDetection] Import failure found for ${packageId}:`,
+              failInfo
+            )
+          }
+        })
+
+        return importFailures
+      }
+
+      return {}
+    } catch (error) {
+      console.warn(
+        '[ConflictDetection] Failed to fetch import failure information:',
+        error
+      )
+      return {}
+    }
+  }
+
+  /**
+   * Detects runtime conflicts from Python import failures.
+   * @param importFailInfo Import failure data from Manager API
+   * @returns Array of conflict detection results for failed imports
+   */
+  function detectImportFailConflicts(
+    importFailInfo: Record<string, { msg: string; name: string; path: string }>
+  ): ConflictDetectionResult[] {
+    const results: ConflictDetectionResult[] = []
+
+    console.log('@@@', importFailInfo)
+
+    if (!importFailInfo || typeof importFailInfo !== 'object') {
+      return results
+    }
+
+    // Process import failures
+    for (const [packageId, failureInfo] of Object.entries(importFailInfo)) {
+      if (failureInfo && typeof failureInfo === 'object') {
+        // Extract error information from Manager API response
+        const errorMsg = failureInfo.msg || 'Unknown import error'
+        const modulePath = failureInfo.path || ''
+
+        results.push({
+          package_id: packageId,
+          package_name: packageId,
+          has_conflict: true,
+          conflicts: [
+            {
+              type: 'import_failed',
+              current_value: 'installed',
+              required_value: failureInfo.msg
+            }
+          ],
+          is_compatible: false
+        })
+
+        console.warn(
+          `[ConflictDetection] Python import failure detected for ${packageId}:`,
+          {
+            path: modulePath,
+            error: errorMsg
+          }
+        )
+      }
+    }
+
+    return results
+  }
+
+  /**
+   * Performs complete conflict detection.
+   * @returns Promise that resolves to conflict detection response
+   */
+  async function performConflictDetection(): Promise<ConflictDetectionResponse> {
+    if (isDetecting.value) {
+      console.log('[ConflictDetection] Already detecting, skipping')
+      return {
+        success: false,
+        error_message: 'Already detecting conflicts',
+        summary: detectionSummary.value!,
+        results: detectionResults.value
+      }
+    }
+
+    isDetecting.value = true
+    detectionError.value = null
+    const startTime = Date.now()
+
+    try {
+      // 1. Collect system environment information
+      const sysEnv = await detectSystemEnvironment()
+
+      // 2. Collect package requirement information
+      const packageRequirements = await fetchPackageRequirements()
+
+      // 3. Detect conflicts for each package (parallel processing)
+      const conflictDetectionTasks = packageRequirements.map(
+        async (packageReq) => {
+          try {
+            return detectPackageConflicts(packageReq, sysEnv)
+          } catch (error) {
+            console.warn(
+              `[ConflictDetection] Failed to detect conflicts for package ${packageReq.name}:`,
+              error
+            )
+            // Return null for failed packages, will be filtered out
+            return null
+          }
+        }
+      )
+
+      const conflictResults = await Promise.allSettled(conflictDetectionTasks)
+      const packageResults: ConflictDetectionResult[] = conflictResults
+        .map((result) => (result.status === 'fulfilled' ? result.value : null))
+        .filter((result): result is ConflictDetectionResult => result !== null)
+
+      // 4. Detect Python import failures
+      const importFailInfo = await fetchImportFailInfo()
+      const importFailResults = detectImportFailConflicts(importFailInfo)
+      console.log(
+        '[ConflictDetection] Python import failures detected:',
+        importFailResults
+      )
+
+      // 5. Combine all results
+      const allResults = [...packageResults, ...importFailResults]
+
+      // 6. Generate summary information
+      const summary = generateSummary(allResults, Date.now() - startTime)
+
+      // 7. Update state
+      detectionResults.value = allResults
+      detectionSummary.value = summary
+      lastDetectionTime.value = new Date().toISOString()
+
+      console.log('[ConflictDetection] Conflict detection completed:', summary)
+
+      // Store conflict results for later UI display
+      // Dialog will be shown based on specific events, not on app mount
+      if (allResults.some((result) => result.has_conflict)) {
+        const conflictedResults = allResults.filter(
+          (result) => result.has_conflict
+        )
+
+        // Merge conflicts for packages with the same name
+        const mergedConflicts = mergeConflictsByPackageName(conflictedResults)
+
+        console.log(
+          '[ConflictDetection] Conflicts detected (stored for UI):',
+          mergedConflicts
+        )
+
+        // Store merged conflicts in Pinia store for UI usage
+        conflictStore.setConflictedPackages(mergedConflicts)
+
+        // Also update local state for backward compatibility
+        detectionResults.value.splice(
+          0,
+          detectionResults.value.length,
+          ...mergedConflicts
+        )
+        storedMergedConflicts.value = [...mergedConflicts]
+
+        // Use merged conflicts in response as well
+        const response: ConflictDetectionResponse = {
+          success: true,
+          summary,
+          results: mergedConflicts,
+          detected_system_environment: sysEnv
+        }
+        return response
+      } else {
+        // No conflicts detected, clear the results
+        conflictStore.clearConflicts()
+        detectionResults.value = []
+      }
+
+      const response: ConflictDetectionResponse = {
+        success: true,
+        summary,
+        results: allResults,
+        detected_system_environment: sysEnv
+      }
+
+      return response
+    } catch (error) {
+      console.error(
+        '[ConflictDetection] Error during conflict detection:',
+        error
+      )
+      detectionError.value =
+        error instanceof Error ? error.message : String(error)
+
+      return {
+        success: false,
+        error_message: detectionError.value,
+        summary: detectionSummary.value || getEmptySummary(),
+        results: []
+      }
+    } finally {
+      isDetecting.value = false
+      // Clear abort controller to prevent memory leaks
+      if (abortController.value) {
+        abortController.value = null
+      }
+    }
+  }
+
+  /**
+   * Error-resilient initialization (called on app mount).
+   * Async function that doesn't block UI setup.
+   */
+  async function initializeConflictDetection(): Promise<void> {
+    try {
+      await performConflictDetection()
+    } catch (error) {
+      console.warn(
+        '[ConflictDetection] Error during initialization (ignored):',
+        error
+      )
+      // Errors do not affect other parts of the app
+    }
+  }
+
+  // Cleanup function for request cancellation
+  function cancelRequests(): void {
+    if (abortController.value) {
+      abortController.value.abort()
+      abortController.value = null
+    }
+  }
+
+  // Auto-cleanup on component unmount
+  // Only register lifecycle hooks if we're in a Vue component context
+  const instance = getCurrentInstance()
+  if (instance) {
+    onUnmounted(() => {
+      cancelRequests()
+    })
+  }
+
+  // Helper functions (implementations at the bottom of the file)
+
+  /**
+   * Check if conflicts should trigger modal display after "What's New" dismissal
+   */
+  async function shouldShowConflictModalAfterUpdate(): Promise<boolean> {
+    console.log(
+      '[ConflictDetection] Checking if conflict modal should show after update...'
+    )
+
+    // Ensure conflict detection has run
+    if (detectionResults.value.length === 0) {
+      console.log(
+        '[ConflictDetection] No detection results, running conflict detection...'
+      )
+      await performConflictDetection()
+    }
+
+    // Check if this is a version update scenario
+    // In a real scenario, this would check actual version change
+    // For now, we'll assume it's an update if we have conflicts and modal hasn't been dismissed
+    const hasActualConflicts = hasConflicts.value
+    const canShowModal = acknowledgment.shouldShowConflictModal.value
+
+    console.log('[ConflictDetection] Modal check:', {
+      hasConflicts: hasActualConflicts,
+      canShowModal: canShowModal,
+      conflictedPackagesCount: conflictedPackages.value.length
+    })
+
+    return hasActualConflicts && canShowModal
+  }
+
+  /**
+   * Check compatibility for a node.
+   * Used by components like PackVersionSelectorPopover.
+   */
+  function checkNodeCompatibility(
+    node: Node | components['schemas']['NodeVersion']
+  ) {
+    const systemStatsStore = useSystemStatsStore()
+    const systemStats = systemStatsStore.systemStats
+    if (!systemStats) return { hasConflict: false, conflicts: [] }
+
+    const conflicts: ConflictDetail[] = []
+
+    // Check OS compatibility using centralized function
+    if (node.supported_os && node.supported_os.length > 0) {
+      const currentOS = systemStats.system?.os || 'unknown'
+      const osConflict = checkOSConflict(node.supported_os, currentOS)
+      if (osConflict) {
+        conflicts.push(osConflict)
+      }
+    }
+
+    // Check accelerator compatibility using centralized function
+    if (node.supported_accelerators && node.supported_accelerators.length > 0) {
+      // Extract available accelerators from system stats
+      const acceleratorInfo = extractAcceleratorInfo(systemStats)
+      const availableAccelerators: Node['supported_accelerators'] = []
+
+      acceleratorInfo.available?.forEach((accel) => {
+        if (accel === 'CUDA') availableAccelerators.push('CUDA')
+        if (accel === 'Metal') availableAccelerators.push('Metal')
+        if (accel === 'CPU') availableAccelerators.push('CPU')
+      })
+
+      const acceleratorConflict = checkAcceleratorConflict(
+        node.supported_accelerators,
+        availableAccelerators
+      )
+      if (acceleratorConflict) {
+        conflicts.push(acceleratorConflict)
+      }
+    }
+
+    // Check ComfyUI version compatibility
+    if (node.supported_comfyui_version) {
+      const currentComfyUIVersion = systemStats.system?.comfyui_version
+      if (currentComfyUIVersion && currentComfyUIVersion !== 'unknown') {
+        const versionConflict = utilCheckVersionCompatibility(
+          'comfyui_version',
+          currentComfyUIVersion,
+          node.supported_comfyui_version
+        )
+        if (versionConflict) {
+          conflicts.push(versionConflict)
+        }
+      }
+    }
+
+    // Check ComfyUI Frontend version compatibility
+    if (node.supported_comfyui_frontend_version) {
+      const currentFrontendVersion = config.app_version
+      if (currentFrontendVersion && currentFrontendVersion !== 'unknown') {
+        const versionConflict = utilCheckVersionCompatibility(
+          'frontend_version',
+          currentFrontendVersion,
+          node.supported_comfyui_frontend_version
+        )
+        if (versionConflict) {
+          conflicts.push(versionConflict)
+        }
+      }
+    }
+
+    // Check banned package status using shared logic
+    const bannedConflict = checkBannedStatus(
+      node.status === 'NodeStatusBanned' ||
+        node.status === 'NodeVersionStatusBanned'
+    )
+    if (bannedConflict) {
+      conflicts.push(bannedConflict)
+    }
+
+    // Check pending status using shared logic
+    const pendingConflict = checkPendingStatus(
+      node.status === 'NodeVersionStatusPending'
+    )
+    if (pendingConflict) {
+      conflicts.push(pendingConflict)
+    }
+
+    return {
+      hasConflict: conflicts.length > 0,
+      conflicts
+    }
+  }
+
+  return {
+    // State
+    isDetecting: readonly(isDetecting),
+    lastDetectionTime: readonly(lastDetectionTime),
+    detectionError: readonly(detectionError),
+    systemEnvironment: readonly(systemEnvironment),
+    detectionResults: readonly(detectionResults),
+    detectionSummary: readonly(detectionSummary),
+
+    // Computed
+    hasConflicts,
+    conflictedPackages,
+    bannedPackages,
+    securityPendingPackages,
+
+    // Methods
+    performConflictDetection,
+    detectSystemEnvironment,
+    initializeConflictDetection,
+    cancelRequests,
+    shouldShowConflictModalAfterUpdate,
+
+    // Helper functions for other components
+    checkNodeCompatibility
+  }
+}
+
+// Helper Functions Implementation
+
+/**
+ * Merges conflict results for packages with the same name.
+ * Combines all conflicts from different detection sources (registry, python, extension)
+ * into a single result per package name.
+ * @param conflicts Array of conflict detection results
+ * @returns Array of merged conflict detection results
+ */
+function mergeConflictsByPackageName(
+  conflicts: ConflictDetectionResult[]
+): ConflictDetectionResult[] {
+  const mergedMap = new Map<string, ConflictDetectionResult>()
+
+  conflicts.forEach((conflict) => {
+    // Normalize package name by removing version suffix (@1_0_3) for consistent merging
+    const normalizedPackageName = conflict.package_name.includes('@')
+      ? conflict.package_name.substring(0, conflict.package_name.indexOf('@'))
+      : conflict.package_name
+
+    if (mergedMap.has(normalizedPackageName)) {
+      // Package already exists, merge conflicts
+      const existing = mergedMap.get(normalizedPackageName)!
+
+      // Combine all conflicts, avoiding duplicates using lodash uniqBy for O(n) performance
+      const allConflicts = [...existing.conflicts, ...conflict.conflicts]
+      const uniqueConflicts = uniqBy(
+        allConflicts,
+        (conflict) =>
+          `${conflict.type}|${conflict.current_value}|${conflict.required_value}`
+      )
+
+      // Update the existing entry with normalized package name
+      mergedMap.set(normalizedPackageName, {
+        ...existing,
+        package_name: normalizedPackageName,
+        conflicts: uniqueConflicts,
+        has_conflict: uniqueConflicts.length > 0,
+        is_compatible: uniqueConflicts.length === 0
+      })
+    } else {
+      // New package, add with normalized package name
+      mergedMap.set(normalizedPackageName, {
+        ...conflict,
+        package_name: normalizedPackageName
+      })
+    }
+  })
+
+  return Array.from(mergedMap.values())
+}
+
+/**
+ * Fetches frontend version from config.
+ * @returns Promise that resolves to frontend version string
+ */
+async function fetchFrontendVersion(): Promise<string> {
+  try {
+    // Get frontend version from vite build-time constant or fallback to config
+    return config.app_version || import.meta.env.VITE_APP_VERSION || 'unknown'
+  } catch {
+    return 'unknown'
+  }
+}
+
+/**
+ * Detects system architecture from user agent.
+ * Note: Browser architecture detection has limitations and may not be 100% accurate.
+ * @returns Architecture string
+ */
+function getArchitecture(): string {
+  const ua = navigator.userAgent.toLowerCase()
+  if (ua.includes('arm64') || ua.includes('aarch64')) return 'arm64'
+  if (ua.includes('arm')) return 'arm'
+  if (ua.includes('x86_64') || ua.includes('x64')) return 'x64'
+  if (ua.includes('x86')) return 'x86'
+  return 'unknown'
+}
+
+/**
+ * Normalizes OS values from Registry API to match our SupportedOS type.
+ * Registry Admin guide specifies: Windows, macOS, Linux
+ * @param osValues OS values from Registry API
+ * @returns Normalized OS values
+ */
+function normalizeOSValues(
+  osValues: string[] | undefined
+): Node['supported_os'] {
+  if (!osValues || osValues.length === 0) {
+    return []
+  }
+
+  return osValues.map((os) => {
+    // Map to standard Registry values (case-sensitive)
+    if (os === 'Windows' || os.toLowerCase().includes('win')) {
+      return 'Windows'
+    }
+    if (os === 'macOS' || os.toLowerCase().includes('mac') || os === 'darwin') {
+      return 'macOS'
+    }
+    if (os === 'Linux' || os.toLowerCase().includes('linux')) {
+      return 'Linux'
+    }
+    if (os.toLowerCase() === 'any') {
+      return 'any'
+    }
+
+    // Return as-is if it matches standard format
+    return os
+  })
+}
+
+/**
+ * Detects operating system from system stats OS string and additional system information.
+ * @param systemOS OS string from system stats API
+ * @param systemStats Full system stats object for additional context
+ * @returns Operating system type
+ */
+function detectOSFromSystemStats(
+  systemOS: string,
+  systemStats?: SystemStats | null
+): string {
+  const os = systemOS.toLowerCase()
+
+  // Handle specific OS strings (return Registry standard format)
+  if (os.includes('darwin') || os.includes('mac')) return 'macOS'
+  if (os.includes('linux')) return 'Linux'
+  if (os.includes('win') || os === 'nt') return 'Windows'
+
+  // Handle Python's os.name values
+  if (os === 'posix') {
+    // posix could be macOS or Linux, need additional detection
+
+    // Method 1: Check for MPS device (Metal Performance Shaders = macOS)
+    if (systemStats?.devices) {
+      const hasMpsDevice = systemStats.devices.some(
+        (device) => device.type === 'mps'
+      )
+      if (hasMpsDevice) {
+        return 'macOS' // Registry standard format
+      }
+    }
+
+    // Method 2: Check user agent as fallback
+    const userAgent = navigator.userAgent.toLowerCase()
+    if (userAgent.includes('mac')) return 'macOS'
+    if (userAgent.includes('linux')) return 'Linux'
+
+    // Default to 'any' if we can't determine
+    return 'any'
+  }
+
+  return 'any'
+}
+
+/**
+ * Extracts architecture information from system stats.
+ * @param systemStats System stats data from API
+ * @returns Architecture string
+ */
+function extractArchitectureFromSystemStats(
+  systemStats: SystemStats | null
+): string {
+  try {
+    if (systemStats?.devices && systemStats.devices.length > 0) {
+      // Check if we have MPS device (indicates Apple Silicon)
+      const hasMpsDevice = systemStats.devices.some(
+        (device) => device.type === 'mps'
+      )
+
+      if (hasMpsDevice) {
+        // MPS is only available on Apple Silicon Macs
+        return 'arm64'
+      }
+
+      // Check device names for architecture hints (fallback)
+      for (const device of systemStats.devices) {
+        if (!device?.name || typeof device.name !== 'string') {
+          continue
+        }
+
+        const deviceName = device.name.toLowerCase()
+
+        // Apple Silicon detection
+        if (
+          deviceName.includes('apple m1') ||
+          deviceName.includes('apple m2') ||
+          deviceName.includes('apple m3') ||
+          deviceName.includes('apple m4')
+        ) {
+          return 'arm64'
+        }
+
+        // Intel/AMD detection
+        if (
+          deviceName.includes('intel') ||
+          deviceName.includes('amd') ||
+          deviceName.includes('nvidia') ||
+          deviceName.includes('geforce') ||
+          deviceName.includes('radeon')
+        ) {
+          return 'x64'
+        }
+      }
+    }
+
+    // Fallback to basic User-Agent detection if system stats don't provide clear info
+    return getArchitecture()
+  } catch (error) {
+    console.warn(
+      '[ConflictDetection] Failed to extract architecture from system stats:',
+      error
+    )
+    return getArchitecture()
+  }
+}
+
+/**
+ * Extracts accelerator information from system stats.
+ * @param systemStats System stats data from store
+ * @returns Accelerator information object
+ */
+function extractAcceleratorInfo(systemStats: SystemStats | null): {
+  available: Node['supported_accelerators']
+  primary: string
+  memory_mb?: number
+} {
+  try {
+    if (systemStats?.devices && systemStats.devices.length > 0) {
+      const accelerators = new Set<string>()
+      let primaryDevice: string = 'CPU'
+      let totalMemory = 0
+      let maxDevicePriority = 0
+
+      // Device type priority (higher = better)
+      const getDevicePriority = (type: string): number => {
+        switch (type.toLowerCase()) {
+          case 'cuda':
+            return 5
+          case 'mps':
+            return 4
+          case 'rocm':
+            return 3
+          case 'xpu':
+            return 2 // Intel GPU
+          case 'npu':
+            return 1 // Neural Processing Unit
+          case 'mlu':
+            return 1 // Cambricon MLU
+          case 'cpu':
+            return 0
+          default:
+            return 0
+        }
+      }
+
+      // Process all devices
+      for (const device of systemStats.devices) {
+        const deviceType = device.type.toLowerCase()
+        const priority = getDevicePriority(deviceType)
+
+        // Map device type to SupportedAccelerator (Registry standard format)
+        let acceleratorType: string = 'CPU'
+        if (deviceType === 'cuda') {
+          acceleratorType = 'CUDA'
+        } else if (deviceType === 'mps') {
+          acceleratorType = 'Metal' // MPS = Metal Performance Shaders
+        } else if (deviceType === 'rocm') {
+          acceleratorType = 'ROCm'
+        }
+
+        accelerators.add(acceleratorType)
+
+        // Update primary device if this one has higher priority
+        if (priority > maxDevicePriority) {
+          primaryDevice = acceleratorType
+          maxDevicePriority = priority
+        }
+
+        // Accumulate memory from all devices
+        if (device.vram_total) {
+          totalMemory += device.vram_total
+        }
+      }
+
+      accelerators.add('CPU') // CPU is always available
+
+      return {
+        available: Array.from(accelerators),
+        primary: primaryDevice,
+        memory_mb:
+          totalMemory > 0 ? Math.round(totalMemory / 1024 / 1024) : undefined
+      }
+    }
+  } catch (error) {
+    console.warn(
+      '[ConflictDetection] Failed to extract GPU information:',
+      error
+    )
+  }
+
+  // Default values
+  return {
+    available: ['CPU'],
+    primary: 'CPU',
+    memory_mb: undefined
+  }
+}
+
+/**
+ * Unified version conflict check using Registry API version strings.
+ * Uses shared versionUtil functions for consistent version handling.
+ * @param type Type of version being checked
+ * @param currentVersion Current version string
+ * @param supportedVersion Supported version from Registry
+ * @returns Conflict detail if conflict exists, null otherwise
+ */
+function checkVersionConflict(
+  type: ConflictType,
+  currentVersion: string,
+  supportedVersion: string
+): ConflictDetail | null {
+  // If current version is unknown, assume compatible (no conflict)
+  if (currentVersion === 'unknown') {
+    return null
+  }
+
+  // If Registry doesn't specify version requirements, assume compatible
+  if (!supportedVersion || supportedVersion.trim() === '') {
+    return null
+  }
+
+  try {
+    // Clean the current version using shared utility
+    const cleanCurrent = cleanVersion(currentVersion)
+
+    // Check version compatibility using shared utility
+    const isCompatible = satisfiesVersion(cleanCurrent, supportedVersion)
+
+    if (!isCompatible) {
+      return {
+        type,
+        current_value: currentVersion,
+        required_value: supportedVersion
+      }
+    }
+
+    return null
+  } catch (error) {
+    console.warn(
+      `[ConflictDetection] Failed to parse version requirement: ${supportedVersion}`,
+      error
+    )
+    return {
+      type,
+      current_value: currentVersion,
+      required_value: supportedVersion
+    }
+  }
+}
+
+/**
+ * Checks for OS compatibility conflicts.
+ */
+function checkOSConflict(
+  supportedOS: Node['supported_os'],
+  currentOS: string
+): ConflictDetail | null {
+  if (supportedOS?.includes('any') || supportedOS?.includes(currentOS)) {
+    return null
+  }
+
+  return {
+    type: 'os',
+    current_value: currentOS,
+    required_value: supportedOS ? supportedOS?.join(', ') : ''
+  }
+}
+
+/**
+ * Checks for accelerator compatibility conflicts.
+ */
+function checkAcceleratorConflict(
+  supportedAccelerators: Node['supported_accelerators'],
+  availableAccelerators: Node['supported_accelerators']
+): ConflictDetail | null {
+  if (
+    supportedAccelerators?.includes('any') ||
+    supportedAccelerators?.some((acc) => availableAccelerators?.includes(acc))
+  ) {
+    return null
+  }
+
+  return {
+    type: 'accelerator',
+    current_value: availableAccelerators
+      ? availableAccelerators.join(', ')
+      : '',
+    required_value: supportedAccelerators
+      ? supportedAccelerators.join(', ')
+      : ''
+  }
+}
+
+/**
+ * Checks for banned package status conflicts.
+ */
+function checkBannedStatus(isBanned?: boolean): ConflictDetail | null {
+  if (isBanned === true) {
+    return {
+      type: 'banned',
+      current_value: 'installed',
+      required_value: 'not_banned'
+    }
+  }
+  return null
+}
+
+/**
+ * Checks for pending package status conflicts.
+ */
+function checkPendingStatus(isPending?: boolean): ConflictDetail | null {
+  if (isPending === true) {
+    return {
+      type: 'pending',
+      current_value: 'installed',
+      required_value: 'not_pending'
+    }
+  }
+  return null
+}
+
+/**
+ * Generates summary of conflict detection results.
+ */
+function generateSummary(
+  results: ConflictDetectionResult[],
+  durationMs: number
+): ConflictDetectionSummary {
+  const conflictsByType: Record<ConflictType, number> = {
+    comfyui_version: 0,
+    frontend_version: 0,
+    import_failed: 0,
+    os: 0,
+    accelerator: 0,
+    banned: 0,
+    pending: 0
+    // python_version: 0
+  }
+
+  const conflictsByTypeDetails: Record<ConflictType, string[]> = {
+    comfyui_version: [],
+    frontend_version: [],
+    import_failed: [],
+    os: [],
+    accelerator: [],
+    banned: [],
+    pending: []
+    // python_version: [],
+  }
+
+  let bannedCount = 0
+  let securityPendingCount = 0
+
+  results.forEach((result) => {
+    result.conflicts.forEach((conflict) => {
+      conflictsByType[conflict.type]++
+
+      if (!conflictsByTypeDetails[conflict.type].includes(result.package_id)) {
+        conflictsByTypeDetails[conflict.type].push(result.package_id)
+      }
+
+      if (conflict.type === 'banned') bannedCount++
+      if (conflict.type === 'pending') securityPendingCount++
+    })
+  })
+
+  return {
+    total_packages: results.length,
+    compatible_packages: results.filter((r) => r.is_compatible).length,
+    conflicted_packages: results.filter((r) => r.has_conflict).length,
+    banned_packages: bannedCount,
+    pending_packages: securityPendingCount,
+    conflicts_by_type_details: conflictsByTypeDetails,
+    last_check_timestamp: new Date().toISOString(),
+    check_duration_ms: durationMs
+  }
+}
+
+/**
+ * Creates an empty summary for error cases.
+ */
+function getEmptySummary(): ConflictDetectionSummary {
+  return {
+    total_packages: 0,
+    compatible_packages: 0,
+    conflicted_packages: 0,
+    banned_packages: 0,
+    pending_packages: 0,
+    conflicts_by_type_details: {
+      comfyui_version: [],
+      frontend_version: [],
+      import_failed: [],
+      os: [],
+      accelerator: [],
+      banned: [],
+      pending: []
+      // python_version: [],
+    },
+    last_check_timestamp: new Date().toISOString(),
+    check_duration_ms: 0
+  }
+}
diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts
index 2b7f904b3..ffa2c6807 100644
--- a/src/composables/useCoreCommands.ts
+++ b/src/composables/useCoreCommands.ts
@@ -687,7 +687,7 @@ export function useCoreCommands(): ComfyCommand[] {
     },
     {
       id: 'Comfy.Manager.CustomNodesManager.ShowCustomNodesMenu',
-      icon: 'pi pi-objects-column',
+      icon: 'pi pi-puzzle',
       label: 'Custom Nodes Manager',
       versionAdded: '1.12.10',
       function: async () => {
diff --git a/src/composables/useImportFailedDetection.ts b/src/composables/useImportFailedDetection.ts
new file mode 100644
index 000000000..b6cd8c791
--- /dev/null
+++ 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
+  }
+}
diff --git a/src/locales/en/main.json b/src/locales/en/main.json
index b3871790e..3ecba74db 100644
--- 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",
@@ -152,7 +153,10 @@
     "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 ({count})",
+    "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",
@@ -175,6 +179,8 @@
     "uninstalling": "Uninstalling",
     "update": "Update",
     "uninstallSelected": "Uninstall Selected",
+    "updateSelected": "Update Selected",
+    "updateAll": "Update All",
     "updatingAllPacks": "Updating all packages",
     "license": "License",
     "nightlyVersion": "Nightly",
@@ -193,14 +199,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",
@@ -212,6 +220,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": {
@@ -503,6 +539,7 @@
     "docs": "Docs",
     "github": "Github",
     "helpFeedback": "Help & Feedback",
+    "managerExtension": "Manager Extension",
     "more": "More...",
     "whatsNew": "What's New?",
     "clickToLearnMore": "Click to learn more →",
@@ -997,6 +1034,7 @@
     "Custom Nodes Manager": "Custom Nodes Manager",
     "Custom Nodes (Legacy)": "Custom Nodes (Legacy)",
     "Manager Menu (Legacy)": "Manager Menu (Legacy)",
+    "Install Missing": "Install Missing",
     "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",
diff --git a/src/services/comfyManagerService.ts b/src/services/comfyManagerService.ts
index 83f1be080..d62afc6dc 100644
--- a/src/services/comfyManagerService.ts
+++ b/src/services/comfyManagerService.ts
@@ -31,6 +31,7 @@ enum ManagerRoute {
   FIX_NODE = 'manager/queue/fix',
   LIST_INSTALLED = 'customnode/installed',
   IMPORT_FAIL_INFO = 'customnode/import_fail_info',
+  IMPORT_FAIL_INFO_BULK = 'customnode/import_fail_info_bulk',
   REBOOT = 'manager/reboot',
   IS_LEGACY_MANAGER_UI = 'manager/is_legacy_manager_ui'
 }
@@ -154,6 +155,21 @@ export const useComfyManagerService = () => {
     )
   }
 
+  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 installPack = async (
     params: InstallPackParams,
     signal?: AbortSignal
@@ -269,6 +285,7 @@ export const useComfyManagerService = () => {
     // Pack management
     listInstalledPacks,
     getImportFailInfo,
+    getImportFailInfoBulk,
     installPack,
     uninstallPack,
     enablePack: installPack, // enable is done via install
diff --git a/src/services/comfyRegistryService.ts b/src/services/comfyRegistryService.ts
index 20b418cfa..0221bd00c 100644
--- 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
   }
 }
diff --git a/src/services/dialogService.ts b/src/services/dialogService.ts
index 9b9c577a9..615424ab1 100644
--- 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,
@@ -443,6 +499,7 @@ export const useDialogService = () => {
     prompt,
     confirm,
     toggleManagerDialog,
-    toggleManagerProgressDialog
+    toggleManagerProgressDialog,
+    showNodeConflictDialog
   }
 }
diff --git a/src/stores/comfyManagerStore.ts b/src/stores/comfyManagerStore.ts
index b9840f421..9bc486e90 100644
--- a/src/stores/comfyManagerStore.ts
+++ b/src/stores/comfyManagerStore.ts
@@ -1,4 +1,5 @@
 import { whenever } from '@vueuse/core'
+import { mapKeys } from 'lodash'
 import { defineStore } from 'pinia'
 import { ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -114,7 +115,14 @@ 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
   }
 
diff --git a/src/stores/conflictDetectionStore.ts b/src/stores/conflictDetectionStore.ts
new file mode 100644
index 000000000..598d17896
--- /dev/null
+++ 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
+    }
+  }
+)
diff --git a/src/stores/dialogStore.ts b/src/stores/dialogStore.ts
index 0e670bbbb..73ff4962b 100644
--- 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 {
@@ -52,6 +52,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 +126,7 @@ export const useDialogStore = defineStore('dialog', () => {
     footerComponent?: Component
     component: Component
     props?: Record<string, any>
+    footerProps?: Record<string, any>
     dialogComponentProps?: DialogComponentProps
     priority?: number
   }) {
@@ -144,6 +146,7 @@ export const useDialogStore = defineStore('dialog', () => {
         : undefined,
       component: markRaw(options.component),
       contentProps: { ...options.props },
+      footerProps: { ...options.footerProps },
       priority: options.priority ?? 1,
       dialogComponentProps: {
         maximizable: false,
diff --git a/src/types/conflictDetectionTypes.ts b/src/types/conflictDetectionTypes.ts
new file mode 100644
index 000000000..c513782ab
--- /dev/null
+++ 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>
+}
diff --git a/src/types/importFailedTypes.ts b/src/types/importFailedTypes.ts
new file mode 100644
index 000000000..d12bb1427
--- /dev/null
+++ 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')
diff --git a/src/utils/conflictMessageUtil.ts b/src/utils/conflictMessageUtil.ts
new file mode 100644
index 000000000..2fa913371
--- /dev/null
+++ 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)
+}
diff --git a/src/utils/versionUtil.ts b/src/utils/versionUtil.ts
new file mode 100644
index 000000000..2688b234f
--- /dev/null
+++ 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
+    }
+  }
+}
diff --git a/tailwind.config.js b/tailwind.config.js
index 598163bb6..92bdeeb77 100644
--- 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'
         }
       },
 
diff --git a/tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts b/tests-ui/tests/components/dialog/content/manager/NodeConflictDialogContent.test.ts
new file mode 100644
index 000000000..b5226d38f
--- /dev/null
+++ 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')
+    })
+  })
+})
diff --git a/tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts b/tests-ui/tests/components/dialog/content/manager/packCard/PackCard.test.ts
new file mode 100644
index 000000000..ed60645b5
--- /dev/null
+++ 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')
+    })
+  })
+})
diff --git a/tests-ui/tests/components/helpcenter/WhatsNewPopup.test.ts b/tests-ui/tests/components/helpcenter/WhatsNewPopup.test.ts
new file mode 100644
index 000000000..1026228d2
--- /dev/null
+++ 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')
+    })
+  })
+})
diff --git a/tests-ui/tests/composables/useConflictAcknowledgment.spec.ts b/tests-ui/tests/composables/useConflictAcknowledgment.spec.ts
new file mode 100644
index 000000000..8df790243
--- /dev/null
+++ 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()
+  })
+})
diff --git a/tests-ui/tests/composables/useConflictAcknowledgment.test.ts b/tests-ui/tests/composables/useConflictAcknowledgment.test.ts
new file mode 100644
index 000000000..879bde1e4
--- /dev/null
+++ 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()
+    })
+  })
+})
diff --git a/tests-ui/tests/composables/useConflictDetection.test.ts b/tests-ui/tests/composables/useConflictDetection.test.ts
new file mode 100644
index 000000000..9d4a2cdd3
--- /dev/null
+++ b/tests-ui/tests/composables/useConflictDetection.test.ts
@@ -0,0 +1,1015 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { nextTick } from 'vue'
+
+import { useConflictDetection } from '@/composables/useConflictDetection'
+import type { components } from '@/types/comfyRegistryTypes'
+import type { components as ManagerComponents } from '@/types/generatedManagerTypes'
+
+// Mock dependencies
+vi.mock('@/scripts/api', () => ({
+  api: {
+    fetchApi: vi.fn(),
+    addEventListener: vi.fn(),
+    removeEventListener: vi.fn(),
+    interrupt: vi.fn(),
+    init: vi.fn(),
+    internalURL: vi.fn(),
+    apiURL: vi.fn(),
+    fileURL: vi.fn(),
+    dispatchCustomEvent: vi.fn(),
+    dispatchEvent: vi.fn(),
+    getExtensions: vi.fn(),
+    freeMemory: vi.fn()
+  }
+}))
+
+vi.mock('@/services/comfyManagerService', () => ({
+  useComfyManagerService: vi.fn()
+}))
+
+vi.mock('@/services/comfyRegistryService', () => ({
+  useComfyRegistryService: vi.fn()
+}))
+
+vi.mock('@/stores/systemStatsStore', () => ({
+  useSystemStatsStore: vi.fn()
+}))
+
+vi.mock('@/config', () => ({
+  default: {
+    app_version: '1.24.0-1'
+  }
+}))
+
+vi.mock('@/composables/useConflictAcknowledgment', () => ({
+  useConflictAcknowledgment: vi.fn()
+}))
+
+vi.mock('@/composables/nodePack/useInstalledPacks', () => ({
+  useInstalledPacks: vi.fn(() => ({
+    installedPacks: { value: [] },
+    refreshInstalledPacks: vi.fn(),
+    startFetchInstalled: vi.fn()
+  }))
+}))
+
+vi.mock('@/stores/comfyManagerStore', () => ({
+  useComfyManagerStore: vi.fn(() => ({
+    isPackInstalled: vi.fn(),
+    installedPacks: { value: [] }
+  }))
+}))
+
+vi.mock('@/stores/conflictDetectionStore', () => ({
+  useConflictDetectionStore: vi.fn(() => ({
+    conflictResults: { value: [] },
+    updateConflictResults: vi.fn(),
+    clearConflicts: vi.fn(),
+    setConflictResults: vi.fn()
+  }))
+}))
+
+describe.skip('useConflictDetection with Registry Store', () => {
+  let pinia: ReturnType<typeof createPinia>
+
+  const mockComfyManagerService = {
+    listInstalledPacks: vi.fn(),
+    getImportFailInfo: vi.fn()
+  }
+
+  const mockRegistryService = {
+    getPackByVersion: vi.fn()
+  }
+
+  const mockAcknowledgment = {
+    checkComfyUIVersionChange: vi.fn(),
+    shouldShowConflictModal: { value: true },
+    shouldShowRedDot: { value: true },
+    acknowledgedPackageIds: { value: [] },
+    dismissConflictModal: vi.fn(),
+    dismissRedDotNotification: vi.fn(),
+    acknowledgeConflict: vi.fn()
+  }
+
+  const mockSystemStatsStore = {
+    fetchSystemStats: vi.fn(),
+    systemStats: {
+      system: {
+        comfyui_version: '0.3.41',
+        os: 'Darwin'
+      },
+      devices: [
+        {
+          name: 'Apple M1 Pro',
+          type: 'mps',
+          vram_total: 17179869184
+        }
+      ]
+    } as any
+  }
+
+  beforeEach(async () => {
+    vi.clearAllMocks()
+    pinia = createPinia()
+    setActivePinia(pinia)
+
+    // Reset mock system stats to default state
+    mockSystemStatsStore.systemStats = {
+      system: {
+        comfyui_version: '0.3.41',
+        os: 'Darwin'
+      },
+      devices: [
+        {
+          name: 'Apple M1 Pro',
+          type: 'mps',
+          vram_total: 17179869184
+        }
+      ]
+    } as any
+
+    // Reset mock functions
+    mockSystemStatsStore.fetchSystemStats.mockResolvedValue(undefined)
+    mockComfyManagerService.listInstalledPacks.mockReset()
+    mockComfyManagerService.getImportFailInfo.mockReset()
+    mockRegistryService.getPackByVersion.mockReset()
+
+    // Mock useComfyManagerService
+    const { useComfyManagerService } = await import(
+      '@/services/comfyManagerService'
+    )
+    vi.mocked(useComfyManagerService).mockReturnValue(
+      mockComfyManagerService as any
+    )
+
+    // Mock useComfyRegistryService
+    const { useComfyRegistryService } = await import(
+      '@/services/comfyRegistryService'
+    )
+    vi.mocked(useComfyRegistryService).mockReturnValue(
+      mockRegistryService as any
+    )
+
+    // Mock useSystemStatsStore
+    const { useSystemStatsStore } = await import('@/stores/systemStatsStore')
+    vi.mocked(useSystemStatsStore).mockReturnValue(mockSystemStatsStore as any)
+
+    // Mock useConflictAcknowledgment
+    const { useConflictAcknowledgment } = await import(
+      '@/composables/useConflictAcknowledgment'
+    )
+    vi.mocked(useConflictAcknowledgment).mockReturnValue(
+      mockAcknowledgment as any
+    )
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  describe('system environment detection', () => {
+    it('should collect system environment information successfully', async () => {
+      const { detectSystemEnvironment } = useConflictDetection()
+      const environment = await detectSystemEnvironment()
+
+      expect(environment.comfyui_version).toBe('0.3.41')
+      expect(environment.frontend_version).toBe('1.24.0-1')
+      expect(environment.available_accelerators).toContain('Metal')
+      expect(environment.available_accelerators).toContain('CPU')
+      expect(environment.primary_accelerator).toBe('Metal')
+    })
+
+    it('should return fallback environment information when systemStatsStore fails', async () => {
+      // Mock systemStatsStore failure
+      mockSystemStatsStore.fetchSystemStats.mockRejectedValue(
+        new Error('Store failure')
+      )
+      mockSystemStatsStore.systemStats = null
+
+      const { detectSystemEnvironment } = useConflictDetection()
+      const environment = await detectSystemEnvironment()
+
+      expect(environment.comfyui_version).toBe('unknown')
+      expect(environment.frontend_version).toBe('1.24.0-1')
+      expect(environment.available_accelerators).toEqual(['CPU'])
+    })
+  })
+
+  describe('package requirements detection with Registry Store', () => {
+    it('should fetch and combine local + Registry data successfully', async () => {
+      // Mock installed packages
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          'ComfyUI-Manager': {
+            ver: 'cb0fa5829d5378e5dddb8e8515b30a3ff20e1471',
+            cnr_id: '',
+            aux_id: 'viva-jinyi/ComfyUI-Manager',
+            enabled: true
+          },
+          'ComfyUI-TestNode': {
+            ver: '1.0.0',
+            cnr_id: 'test-node',
+            aux_id: null,
+            enabled: false
+          }
+        }
+
+      // Mock Registry data
+      const mockRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'ComfyUI-Manager',
+          name: 'ComfyUI Manager',
+          supported_os: ['Windows', 'Linux', 'macOS'],
+          supported_accelerators: ['CUDA', 'Metal', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node'],
+        {
+          id: 'ComfyUI-TestNode',
+          name: 'Test Node',
+          supported_os: ['Windows', 'Linux'],
+          supported_accelerators: ['CUDA'],
+          supported_comfyui_version: '>=0.2.0',
+          status: 'NodeStatusBanned'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+
+      // Mock Registry Service individual calls
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockRegistryPacks.find(
+            (p) => p.id === packageName
+          )
+          if (packageData) {
+            return Promise.resolve({
+              ...packageData,
+              supported_comfyui_version: packageData.supported_comfyui_version,
+              supported_os: packageData.supported_os,
+              supported_accelerators: packageData.supported_accelerators,
+              status: packageData.status
+            })
+          }
+          return Promise.resolve(null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.total_packages).toBeGreaterThanOrEqual(1)
+      expect(result.results.length).toBeGreaterThanOrEqual(1)
+
+      // Verify individual calls were made
+      expect(mockRegistryService.getPackByVersion).toHaveBeenCalledWith(
+        'ComfyUI-Manager',
+        'cb0fa5829d5378e5dddb8e8515b30a3ff20e1471',
+        expect.anything()
+      )
+      expect(mockRegistryService.getPackByVersion).toHaveBeenCalledWith(
+        'ComfyUI-TestNode',
+        '1.0.0',
+        expect.anything()
+      )
+
+      // Check that at least one package was processed
+      expect(result.results.length).toBeGreaterThan(0)
+
+      // If we have results, check their structure
+      if (result.results.length > 0) {
+        const firstResult = result.results[0]
+        expect(firstResult).toHaveProperty('package_id')
+        expect(firstResult).toHaveProperty('conflicts')
+        expect(firstResult).toHaveProperty('is_compatible')
+      }
+    })
+
+    it('should handle Registry Store failures gracefully', async () => {
+      // Mock installed packages
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          'Unknown-Package': {
+            ver: '1.0.0',
+            cnr_id: 'unknown',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+
+      // Mock Registry Service returning null (no packages found)
+      mockRegistryService.getPackByVersion.mockResolvedValue(null)
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.total_packages).toBe(1)
+      expect(result.results).toHaveLength(1)
+
+      // Should have warning about missing Registry data
+      const unknownPackage = result.results[0]
+      expect(unknownPackage.conflicts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: 'pending',
+            current_value: 'no_registry_data',
+            required_value: 'registry_data_available'
+          })
+        ])
+      )
+    })
+
+    it('should return empty array when local package information cannot be retrieved', async () => {
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(null)
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.total_packages).toBe(0)
+      expect(result.results).toHaveLength(0)
+    })
+  })
+
+  describe('conflict detection logic with Registry Store', () => {
+    it('should detect no conflicts for fully compatible packages', async () => {
+      // Mock compatible package
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          CompatibleNode: {
+            ver: '1.0.0',
+            cnr_id: 'compatible-node',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockCompatibleRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'CompatibleNode',
+          name: 'Compatible Node',
+          supported_os: ['Windows', 'Linux', 'macOS'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      // Mock Registry Service for compatible package
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockCompatibleRegistryPacks.find(
+            (p) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.conflicted_packages).toBe(0)
+      expect(result.summary.compatible_packages).toBe(1)
+      expect(result.results[0].conflicts).toHaveLength(0)
+    })
+
+    it('should detect OS incompatibility conflicts', async () => {
+      // Mock OS-incompatible package
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          WindowsOnlyNode: {
+            ver: '1.0.0',
+            cnr_id: 'windows-only',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockWindowsOnlyRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'WindowsOnlyNode',
+          name: 'Windows Only Node',
+          supported_os: ['Windows'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockWindowsOnlyRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.conflicted_packages).toBe(1)
+
+      const windowsNode = result.results[0]
+      expect(windowsNode.conflicts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: 'os',
+            current_value: 'macOS',
+            required_value: expect.stringContaining('Windows')
+          })
+        ])
+      )
+    })
+
+    it('should detect accelerator incompatibility conflicts', async () => {
+      // Mock CUDA-only package
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          CudaOnlyNode: {
+            ver: '1.0.0',
+            cnr_id: 'cuda-only',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockCudaOnlyRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'CudaOnlyNode',
+          name: 'CUDA Only Node',
+          supported_os: ['windows', 'linux', 'macos'],
+          supported_accelerators: ['CUDA'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockCudaOnlyRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.conflicted_packages).toBe(1)
+
+      const cudaNode = result.results[0]
+      expect(cudaNode.conflicts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: 'accelerator',
+            current_value: expect.any(String),
+            required_value: expect.stringContaining('CUDA')
+          })
+        ])
+      )
+    })
+
+    it('should treat Registry-banned packages as conflicts', async () => {
+      // Mock Registry-banned package
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          BannedNode: {
+            ver: '1.0.0',
+            cnr_id: 'banned-node',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockBannedRegistryPacks: components['schemas']['NodeVersion'][] = [
+        {
+          id: 'BannedNode',
+          supported_os: ['windows', 'linux', 'macos'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeVersionStatusBanned'
+        } as components['schemas']['NodeVersion']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockBannedRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.banned_packages).toBe(1)
+
+      const bannedNode = result.results[0]
+      expect(bannedNode.conflicts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: 'banned',
+            current_value: 'installed',
+            required_value: 'not_banned'
+          })
+        ])
+      )
+      // Banned nodes should have 'banned' conflict type
+      expect(bannedNode.conflicts.some((c) => c.type === 'banned')).toBe(true)
+    })
+
+    it('should treat locally disabled packages as banned', async () => {
+      // Mock locally disabled package
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          DisabledNode: {
+            ver: '1.0.0',
+            cnr_id: 'disabled-node',
+            aux_id: null,
+            enabled: false
+          }
+        }
+
+      const mockActiveRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'DisabledNode',
+          name: 'Disabled Node',
+          supported_os: ['windows', 'linux', 'macos'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockActiveRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.banned_packages).toBe(1)
+
+      const disabledNode = result.results[0]
+      expect(disabledNode.conflicts).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            type: 'banned',
+            current_value: 'installed',
+            required_value: 'not_banned'
+          })
+        ])
+      )
+      // Disabled nodes should have 'banned' conflict type
+      expect(disabledNode.conflicts.some((c) => c.type === 'banned')).toBe(true)
+    })
+  })
+
+  describe('computed properties with Registry Store', () => {
+    it('should return true for hasConflicts when Registry conflicts exist', async () => {
+      // Mock package with OS incompatibility
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          ConflictedNode: {
+            ver: '1.0.0',
+            cnr_id: 'conflicted-node',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockConflictedRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'ConflictedNode',
+          name: 'Conflicted Node',
+          supported_os: ['Windows'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockConflictedRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { hasConflicts, performConflictDetection } = useConflictDetection()
+
+      // Initial value should be false
+      expect(hasConflicts.value).toBe(false)
+
+      // Execute conflict detection
+      await performConflictDetection()
+      await nextTick()
+
+      // Should be true when conflicts are detected
+      expect(hasConflicts.value).toBe(true)
+    })
+
+    it('should return packages with conflicts', async () => {
+      // Mock package with conflicts
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          ErrorNode: {
+            ver: '1.0.0',
+            cnr_id: 'error-node',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockErrorRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'ErrorNode',
+          name: 'Error Node',
+          supported_os: ['Windows'],
+          supported_accelerators: ['CUDA'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockErrorRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { conflictedPackages, performConflictDetection } =
+        useConflictDetection()
+
+      await performConflictDetection()
+      await nextTick()
+
+      expect(conflictedPackages.value.length).toBeGreaterThan(0)
+      expect(
+        conflictedPackages.value.every((result) => result.has_conflict === true)
+      ).toBe(true)
+    })
+
+    it('should return only banned packages for bannedPackages', async () => {
+      // Mock one banned and one normal package
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          BannedNode: {
+            ver: '1.0.0',
+            cnr_id: 'banned-node',
+            aux_id: null,
+            enabled: false
+          },
+          NormalNode: {
+            ver: '1.0.0',
+            cnr_id: 'normal-node',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'BannedNode',
+          name: 'Banned Node',
+          supported_os: ['windows', 'linux', 'macos'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node'],
+        {
+          id: 'NormalNode',
+          name: 'Normal Node',
+          supported_os: ['windows', 'linux', 'macos'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { bannedPackages, performConflictDetection } =
+        useConflictDetection()
+
+      await performConflictDetection()
+      await nextTick()
+
+      expect(bannedPackages.value).toHaveLength(1)
+      expect(bannedPackages.value[0].package_id).toBe('BannedNode')
+    })
+  })
+
+  describe('error resilience with Registry Store', () => {
+    it('should continue execution even when system environment detection fails', async () => {
+      // Mock system stats store failure
+      mockSystemStatsStore.fetchSystemStats.mockRejectedValue(
+        new Error('Store error')
+      )
+      mockSystemStatsStore.systemStats = null
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue({})
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = [].find((p: any) => p.id === packageName)
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.detected_system_environment?.comfyui_version).toBe(
+        'unknown'
+      )
+    })
+
+    it('should continue system operation even when local package information fails', async () => {
+      // Mock local package service failure
+      mockComfyManagerService.listInstalledPacks.mockRejectedValue(
+        new Error('Service error')
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.total_packages).toBe(0)
+    })
+
+    it('should handle Registry Store partial data gracefully', async () => {
+      // Mock successful local data but partial Registry data
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          'Package-A': {
+            ver: '1.0.0',
+            cnr_id: 'a',
+            aux_id: null,
+            enabled: true
+          },
+          'Package-B': {
+            ver: '2.0.0',
+            cnr_id: 'b',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+
+      // Only first package found in Registry / Registry에서 첫 번째 패키지만 찾음
+      const mockPartialRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'Package-A',
+          name: 'Package A',
+          supported_os: ['windows', 'linux', 'macos'],
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+        // Package-B is missing from Registry results
+      ]
+
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockPartialRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true)
+      expect(result.summary.total_packages).toBeGreaterThanOrEqual(1)
+
+      // Check that packages were processed
+      expect(result.results.length).toBeGreaterThan(0)
+
+      // If packages exist, verify they have proper structure
+      if (result.results.length > 0) {
+        for (const pkg of result.results) {
+          expect(pkg).toHaveProperty('package_id')
+          expect(pkg).toHaveProperty('conflicts')
+          expect(Array.isArray(pkg.conflicts)).toBe(true)
+        }
+      }
+    })
+
+    it('should handle complete system failure gracefully', async () => {
+      // Mock all stores/services failing
+      mockSystemStatsStore.fetchSystemStats.mockRejectedValue(
+        new Error('Critical error')
+      )
+      mockSystemStatsStore.systemStats = null
+      mockComfyManagerService.listInstalledPacks.mockRejectedValue(
+        new Error('Critical error')
+      )
+      mockRegistryService.getPackByVersion.mockRejectedValue(
+        new Error('Critical error')
+      )
+
+      const { performConflictDetection } = useConflictDetection()
+      const result = await performConflictDetection()
+
+      expect(result.success).toBe(true) // Error resilience maintains success
+      expect(result.summary.total_packages).toBe(0)
+    })
+  })
+
+  describe('acknowledgment integration', () => {
+    it('should check ComfyUI version change during conflict detection', async () => {
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue({
+        TestNode: {
+          ver: '1.0.0',
+          cnr_id: 'test-node',
+          aux_id: null,
+          enabled: true
+        }
+      })
+
+      mockRegistryService.getPackByVersion.mockResolvedValue({
+        id: 'TestNode',
+        supported_os: ['Windows'],
+        supported_accelerators: ['CUDA'],
+        supported_comfyui_version: '>=0.3.0',
+        status: 'NodeVersionStatusActive'
+      })
+
+      const { performConflictDetection } = useConflictDetection()
+      await performConflictDetection()
+
+      expect(mockAcknowledgment.checkComfyUIVersionChange).toHaveBeenCalledWith(
+        '0.3.41'
+      )
+    })
+
+    it('should expose conflict modal display method', () => {
+      const { shouldShowConflictModalAfterUpdate } = useConflictDetection()
+
+      expect(shouldShowConflictModalAfterUpdate).toBeDefined()
+    })
+
+    it('should determine conflict modal display after update correctly', async () => {
+      const { shouldShowConflictModalAfterUpdate } = useConflictDetection()
+
+      // With no conflicts initially, should return false
+      const result = await shouldShowConflictModalAfterUpdate()
+      expect(result).toBe(false) // No conflicts initially
+    })
+
+    it('should show conflict modal after update when conflicts exist', async () => {
+      // Mock package with conflicts
+      const mockInstalledPacks: ManagerComponents['schemas']['InstalledPacksResponse'] =
+        {
+          ConflictedNode: {
+            ver: '1.0.0',
+            cnr_id: 'conflicted-node',
+            aux_id: null,
+            enabled: true
+          }
+        }
+
+      const mockConflictedRegistryPacks: components['schemas']['Node'][] = [
+        {
+          id: 'ConflictedNode',
+          name: 'Conflicted Node',
+          supported_os: ['Windows'], // Will conflict with macOS
+          supported_accelerators: ['Metal', 'CUDA', 'CPU'],
+          supported_comfyui_version: '>=0.3.0',
+          status: 'NodeStatusActive'
+        } as components['schemas']['Node']
+      ]
+
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue(
+        mockInstalledPacks
+      )
+      mockRegistryService.getPackByVersion.mockImplementation(
+        (packageName: string) => {
+          const packageData = mockConflictedRegistryPacks.find(
+            (p: any) => p.id === packageName
+          )
+          return Promise.resolve(packageData || null)
+        }
+      )
+
+      const { shouldShowConflictModalAfterUpdate, performConflictDetection } =
+        useConflictDetection()
+
+      // First run conflict detection to populate conflicts
+      await performConflictDetection()
+      await nextTick()
+
+      // Now check if modal should show after update
+      const result = await shouldShowConflictModalAfterUpdate()
+      expect(result).toBe(true) // Should show modal when conflicts exist and not dismissed
+    })
+
+    it('should detect system environment correctly', async () => {
+      // Mock system environment
+      mockSystemStatsStore.systemStats = {
+        system: {
+          comfyui_version: '0.3.41',
+          os: 'Darwin'
+        },
+        devices: []
+      }
+
+      const { detectSystemEnvironment } = useConflictDetection()
+
+      // Detect system environment
+      const environment = await detectSystemEnvironment()
+
+      expect(environment.comfyui_version).toBe('0.3.41')
+    })
+  })
+
+  describe('initialization', () => {
+    it('should execute initializeConflictDetection without errors', async () => {
+      mockComfyManagerService.listInstalledPacks.mockResolvedValue({})
+
+      const { initializeConflictDetection } = useConflictDetection()
+
+      await expect(initializeConflictDetection()).resolves.not.toThrow()
+    })
+
+    it('should set initial state values correctly', () => {
+      const {
+        isDetecting,
+        lastDetectionTime,
+        detectionError,
+        systemEnvironment,
+        detectionResults,
+        detectionSummary
+      } = useConflictDetection()
+
+      expect(isDetecting.value).toBe(false)
+      expect(lastDetectionTime.value).toBeNull()
+      expect(detectionError.value).toBeNull()
+      expect(systemEnvironment.value).toBeNull()
+      expect(detectionResults.value).toEqual([])
+      expect(detectionSummary.value).toBeNull()
+    })
+  })
+})
diff --git a/tests-ui/tests/composables/useImportFailedDetection.test.ts b/tests-ui/tests/composables/useImportFailedDetection.test.ts
new file mode 100644
index 000000000..d8d4ff362
--- /dev/null
+++ 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)
+  })
+})
diff --git a/tests-ui/tests/composables/useUpdateAvailableNodes.test.ts b/tests-ui/tests/composables/useUpdateAvailableNodes.test.ts
new file mode 100644
index 000000000..f574b5fe7
--- /dev/null
+++ 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')
+    })
+  })
+})
diff --git a/tests-ui/tests/stores/conflictDetectionStore.test.ts b/tests-ui/tests/stores/conflictDetectionStore.test.ts
new file mode 100644
index 000000000..875079227
--- /dev/null
+++ b/tests-ui/tests/stores/conflictDetectionStore.test.ts
@@ -0,0 +1,271 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
+import type { ConflictDetectionResult } from '@/types/conflictDetectionTypes'
+
+describe('useConflictDetectionStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  const mockConflictedPackages: ConflictDetectionResult[] = [
+    {
+      package_id: 'ComfyUI-Manager',
+      package_name: 'ComfyUI-Manager',
+      has_conflict: true,
+      is_compatible: false,
+      conflicts: [
+        {
+          type: 'pending',
+          current_value: 'no_registry_data',
+          required_value: 'registry_data_available'
+        }
+      ]
+    },
+    {
+      package_id: 'comfyui-easy-use',
+      package_name: 'comfyui-easy-use',
+      has_conflict: true,
+      is_compatible: false,
+      conflicts: [
+        {
+          type: 'comfyui_version',
+          current_value: '0.3.43',
+          required_value: '<0.3.40'
+        }
+      ]
+    },
+    {
+      package_id: 'img2colors-comfyui-node',
+      package_name: 'img2colors-comfyui-node',
+      has_conflict: true,
+      is_compatible: false,
+      conflicts: [
+        {
+          type: 'banned',
+          current_value: 'installed',
+          required_value: 'not_banned'
+        }
+      ]
+    }
+  ]
+
+  describe('initial state', () => {
+    it('should have empty initial state', () => {
+      const store = useConflictDetectionStore()
+
+      expect(store.conflictedPackages).toEqual([])
+      expect(store.isDetecting).toBe(false)
+      expect(store.lastDetectionTime).toBeNull()
+      expect(store.hasConflicts).toBe(false)
+    })
+  })
+
+  describe('setConflictedPackages', () => {
+    it('should set conflicted packages', () => {
+      const store = useConflictDetectionStore()
+
+      store.setConflictedPackages(mockConflictedPackages)
+
+      expect(store.conflictedPackages).toEqual(mockConflictedPackages)
+      expect(store.conflictedPackages).toHaveLength(3)
+    })
+
+    it('should update hasConflicts computed property', () => {
+      const store = useConflictDetectionStore()
+
+      expect(store.hasConflicts).toBe(false)
+
+      store.setConflictedPackages(mockConflictedPackages)
+
+      expect(store.hasConflicts).toBe(true)
+    })
+  })
+
+  describe('getConflictsForPackageByID', () => {
+    it('should find package by exact ID match', () => {
+      const store = useConflictDetectionStore()
+      store.setConflictedPackages(mockConflictedPackages)
+
+      const result = store.getConflictsForPackageByID('ComfyUI-Manager')
+
+      expect(result).toBeDefined()
+      expect(result?.package_id).toBe('ComfyUI-Manager')
+      expect(result?.conflicts).toHaveLength(1)
+    })
+
+    it('should return undefined for non-existent package', () => {
+      const store = useConflictDetectionStore()
+      store.setConflictedPackages(mockConflictedPackages)
+
+      const result = store.getConflictsForPackageByID('non-existent-package')
+
+      expect(result).toBeUndefined()
+    })
+  })
+
+  describe('bannedPackages', () => {
+    it('should filter packages with banned conflicts', () => {
+      const store = useConflictDetectionStore()
+      store.setConflictedPackages(mockConflictedPackages)
+
+      const bannedPackages = store.bannedPackages
+
+      expect(bannedPackages).toHaveLength(1)
+      expect(bannedPackages[0].package_id).toBe('img2colors-comfyui-node')
+    })
+
+    it('should return empty array when no banned packages', () => {
+      const store = useConflictDetectionStore()
+      const noBannedPackages = mockConflictedPackages.filter(
+        (pkg) => !pkg.conflicts.some((c) => c.type === 'banned')
+      )
+      store.setConflictedPackages(noBannedPackages)
+
+      const bannedPackages = store.bannedPackages
+
+      expect(bannedPackages).toHaveLength(0)
+    })
+  })
+
+  describe('securityPendingPackages', () => {
+    it('should filter packages with pending conflicts', () => {
+      const store = useConflictDetectionStore()
+      store.setConflictedPackages(mockConflictedPackages)
+
+      const securityPendingPackages = store.securityPendingPackages
+
+      expect(securityPendingPackages).toHaveLength(1)
+      expect(securityPendingPackages[0].package_id).toBe('ComfyUI-Manager')
+    })
+  })
+
+  describe('clearConflicts', () => {
+    it('should clear all conflicted packages', () => {
+      const store = useConflictDetectionStore()
+      store.setConflictedPackages(mockConflictedPackages)
+
+      expect(store.conflictedPackages).toHaveLength(3)
+      expect(store.hasConflicts).toBe(true)
+
+      store.clearConflicts()
+
+      expect(store.conflictedPackages).toEqual([])
+      expect(store.hasConflicts).toBe(false)
+    })
+  })
+
+  describe('detection state management', () => {
+    it('should set detecting state', () => {
+      const store = useConflictDetectionStore()
+
+      expect(store.isDetecting).toBe(false)
+
+      store.setDetecting(true)
+
+      expect(store.isDetecting).toBe(true)
+
+      store.setDetecting(false)
+
+      expect(store.isDetecting).toBe(false)
+    })
+
+    it('should set last detection time', () => {
+      const store = useConflictDetectionStore()
+      const timestamp = '2024-01-01T00:00:00Z'
+
+      expect(store.lastDetectionTime).toBeNull()
+
+      store.setLastDetectionTime(timestamp)
+
+      expect(store.lastDetectionTime).toBe(timestamp)
+    })
+  })
+
+  describe('reactivity', () => {
+    it('should update computed properties when conflicted packages change', () => {
+      const store = useConflictDetectionStore()
+
+      // Initially no conflicts
+      expect(store.hasConflicts).toBe(false)
+      expect(store.bannedPackages).toHaveLength(0)
+
+      // Add conflicts
+      store.setConflictedPackages(mockConflictedPackages)
+
+      // Computed properties should update
+      expect(store.hasConflicts).toBe(true)
+      expect(store.bannedPackages).toHaveLength(1)
+      expect(store.securityPendingPackages).toHaveLength(1)
+
+      // Clear conflicts
+      store.clearConflicts()
+
+      // Computed properties should update again
+      expect(store.hasConflicts).toBe(false)
+      expect(store.bannedPackages).toHaveLength(0)
+      expect(store.securityPendingPackages).toHaveLength(0)
+    })
+  })
+
+  describe('edge cases', () => {
+    it('should handle empty conflicts array', () => {
+      const store = useConflictDetectionStore()
+      store.setConflictedPackages([])
+
+      expect(store.conflictedPackages).toEqual([])
+      expect(store.hasConflicts).toBe(false)
+      expect(store.bannedPackages).toHaveLength(0)
+      expect(store.securityPendingPackages).toHaveLength(0)
+    })
+
+    it('should handle packages with multiple conflict types', () => {
+      const store = useConflictDetectionStore()
+      const multiConflictPackage: ConflictDetectionResult = {
+        package_id: 'multi-conflict-package',
+        package_name: 'Multi Conflict Package',
+        has_conflict: true,
+        is_compatible: false,
+        conflicts: [
+          {
+            type: 'banned',
+            current_value: 'installed',
+            required_value: 'not_banned'
+          },
+          {
+            type: 'pending',
+            current_value: 'no_registry_data',
+            required_value: 'registry_data_available'
+          }
+        ]
+      }
+
+      store.setConflictedPackages([multiConflictPackage])
+
+      // Should appear in both banned and security pending
+      expect(store.bannedPackages).toHaveLength(1)
+      expect(store.securityPendingPackages).toHaveLength(1)
+      expect(store.bannedPackages[0].package_id).toBe('multi-conflict-package')
+      expect(store.securityPendingPackages[0].package_id).toBe(
+        'multi-conflict-package'
+      )
+    })
+
+    it('should handle packages with has_conflict false', () => {
+      const store = useConflictDetectionStore()
+      const noConflictPackage: ConflictDetectionResult = {
+        package_id: 'no-conflict-package',
+        package_name: 'No Conflict Package',
+        has_conflict: false,
+        is_compatible: true,
+        conflicts: []
+      }
+
+      store.setConflictedPackages([noConflictPackage])
+
+      // hasConflicts should check has_conflict property
+      expect(store.hasConflicts).toBe(false)
+    })
+  })
+})
diff --git a/tests-ui/tests/stores/nodeCompatibilityStore.test.ts b/tests-ui/tests/stores/nodeCompatibilityStore.test.ts
new file mode 100644
index 000000000..70e54a319
--- /dev/null
+++ b/tests-ui/tests/stores/nodeCompatibilityStore.test.ts
@@ -0,0 +1,129 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it } from 'vitest'
+
+import { useNodeCompatibilityStore } from '@/stores/nodeCompatibilityStore'
+
+describe('useNodeCompatibilityStore', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+  })
+
+  it('should initialize with empty state', () => {
+    const store = useNodeCompatibilityStore()
+
+    expect(store.isChecking).toBe(false)
+    expect(store.lastCheckTime).toBeNull()
+    expect(store.checkError).toBeNull()
+    expect(store.hasIncompatibleNodes).toBe(false)
+    expect(store.totalIncompatibleCount).toBe(0)
+    expect(store.shouldShowNotification).toBe(false)
+  })
+
+  it('should add incompatible nodes correctly', () => {
+    const store = useNodeCompatibilityStore()
+
+    store.addIncompatibleNode(
+      'test-node',
+      'Test Node',
+      'banned',
+      'Node is banned for testing'
+    )
+
+    expect(store.hasIncompatibleNodes).toBe(true)
+    expect(store.totalIncompatibleCount).toBe(1)
+    expect(store.hasNodeCompatibilityIssues('test-node')).toBe(true)
+
+    const compatibilityInfo = store.getNodeCompatibilityInfo('test-node')
+    expect(compatibilityInfo).toBeDefined()
+    expect(compatibilityInfo?.disableReason).toBe('banned')
+  })
+
+  it('should remove incompatible nodes correctly', () => {
+    const store = useNodeCompatibilityStore()
+
+    store.addIncompatibleNode(
+      'test-node',
+      'Test Node',
+      'banned',
+      'Node is banned for testing'
+    )
+
+    expect(store.hasIncompatibleNodes).toBe(true)
+
+    store.removeIncompatibleNode('test-node')
+
+    expect(store.hasIncompatibleNodes).toBe(false)
+    expect(store.hasNodeCompatibilityIssues('test-node')).toBe(false)
+  })
+
+  it('should handle notification modal state correctly', () => {
+    const store = useNodeCompatibilityStore()
+
+    // Add an incompatible node
+    store.addIncompatibleNode(
+      'test-node',
+      'Test Node',
+      'banned',
+      'Node is banned for testing'
+    )
+
+    expect(store.shouldShowNotification).toBe(true)
+    expect(store.pendingNotificationNodes).toHaveLength(1)
+
+    store.markNotificationModalShown()
+
+    expect(store.shouldShowNotification).toBe(false)
+    expect(store.pendingNotificationNodes).toHaveLength(0)
+  })
+
+  it('should clear all results correctly', () => {
+    const store = useNodeCompatibilityStore()
+
+    store.addIncompatibleNode(
+      'test-node',
+      'Test Node',
+      'banned',
+      'Node is banned for testing'
+    )
+    store.recordCheckError('Test error')
+
+    expect(store.hasIncompatibleNodes).toBe(true)
+    expect(store.checkError).toBe('Test error')
+
+    store.clearResults()
+
+    expect(store.hasIncompatibleNodes).toBe(false)
+    expect(store.checkError).toBeNull()
+  })
+
+  it('should track checking state correctly', () => {
+    const store = useNodeCompatibilityStore()
+
+    expect(store.isChecking).toBe(false)
+
+    store.setCheckingState(true)
+    expect(store.isChecking).toBe(true)
+
+    store.recordCheckCompletion()
+    expect(store.isChecking).toBe(false)
+    expect(store.lastCheckTime).toBeDefined()
+  })
+
+  it('should provide compatibility summary', () => {
+    const store = useNodeCompatibilityStore()
+
+    store.addIncompatibleNode(
+      'banned-node',
+      'Banned Node',
+      'banned',
+      'Node is banned'
+    )
+
+    const summary = store.getCompatibilitySummary()
+
+    expect(summary.incompatibleCount).toBe(1)
+    expect(summary.bannedCount).toBe(0) // bannedNodes is separate from incompatibleNodes
+    expect(summary.totalIssues).toBe(1)
+    expect(summary.hasError).toBe(false)
+  })
+})
diff --git a/vitest.setup.ts b/vitest.setup.ts
index e70abf32a..042efb8cd 100644
--- a/vitest.setup.ts
+++ b/vitest.setup.ts
@@ -1 +1,9 @@
 import 'vue'
+
+// Define global variables for tests
+globalThis.__COMFYUI_FRONTEND_VERSION__ = '1.24.0'
+globalThis.__SENTRY_ENABLED__ = false
+globalThis.__SENTRY_DSN__ = ''
+globalThis.__ALGOLIA_APP_ID__ = ''
+globalThis.__ALGOLIA_API_KEY__ = ''
+globalThis.__USE_PROD_CONFIG__ = false