Upstream ComfyUI Manager frontend and add custom node conflict detection #5291

christian-byrne · 2025-09-01T09:54:10Z

Combines all manager features:

Start on 730b278 of [Manager] Upstream ComfyUI-Manager #3367, keep all changes related to new Task Queue API, client_id support, and API-driven design. Then re-add proceeding commits from [Manager] Upstream ComfyUI-Manager #3367
Add [Manager] Add node conflict detection and notification system #4654 commits
Add [feat] Add manager capability feature flags #5063 commits
Rebase on main
Fix failing tests

resolves #4069

… imports in api.ts) (#4608) Co-authored-by: github-actions <github-actions@github.com>

* fix: api.ts file is different with main branch * Update locales [skip ci] * fix: restore support dotprop access * fix: apply locales based on manager/menu-items-migration * fix: Add missing shortcuts translation section for CI tests - Added shortcuts section with keyboardShortcuts key - Fixes failing Playwright test looking for 'Keyboard Shortcuts' aria-label - Issue was caused by incomplete rebase from main branch 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * fix: Add missing versionMismatchWarning translations for CI tests - Added versionMismatchWarning section with all required keys - Added general versionMismatch related keys (updateFrontend, dismiss, etc.) - Fixes failing Playwright tests for version mismatch warnings - These keys were lost during the rebase from main branch 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Claude <noreply@anthropic.com>

- Fix missing footerProps property in DialogInstance interface - Add missing InstalledPacksResponse type import in tests - Add missing getImportFailInfoBulk method to test mock - Remove unused ManagerComponents import causing type error - All unit and component tests now pass successfully

Remove deprecated withDefaults usage in NodeConflictDialogContent.vue and use destructuring with default values instead

@ts-expect-error

- Remove outdated legacy manager detection from LoadWorkflowWarning - Update InfoPanelHeader with conflict detection improvements - Fix all failing unit tests from state management transition - Clean up algolia search provider type mappings - Remove unused @ts-expect-error directives - Add .nx to .gitignore 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>

Replace legacy isLegacyManagerUI() call with new ManagerUIState system: - Use useManagerStateStore().managerUIState instead of async API call - Handle DISABLED state by showing settings dialog - Handle LEGACY_UI state with fallback to new UI on error - Handle NEW_UI state by showing manager dialog - Remove unused useComfyManagerService import 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>

- Remove unused refreshTaskState function from useManagerQueue - Function was left as no-op only to make tests pass - Since queue is now push-based (WebSocket), no need to refresh state - Clean up export and remove extra blank lines 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>

Merge latest main branch changes including: - Nx monorepo architecture and build system - Updated package management with pnpm - Enhanced CI/CD workflows and testing - UI component improvements and fixes - Updated documentation and project setup All conflicts resolved by taking main's infrastructure changes while preserving our manager migration work.

github-actions · 2025-09-01T21:20:02Z

🎭 Playwright Test Results

✅ All tests passed across all browsers!

⏰ Completed at: 09/01/2025, 10:38:49 PM UTC

📊 Test Reports by Browser

🎉 Your tests are passing across all browsers!

Replace lodash import with es-toolkit/compat to match project standards: - Change 'lodash' import to 'es-toolkit/compat' for pickBy function - Add specific type helper for history task filtering - Update JSDoc comment to remove lodash reference - Fixes component test failures from missing lodash dependency

During merge with main, the event emission was lost from the hide() function. - Add defineEmits for 'whats-new-dismissed' event - Emit event in hide() function to maintain test compatibility - Fixes 3 failing unit tests in WhatsNewPopup.test.ts

Previous commits contained [skip ci] which prevented test execution. This empty commit ensures all CI checks run properly.

christian-byrne · 2025-09-01T22:11:12Z

Only one test is failing which is expected because the button only appears when the backend has the manager feature flags set.

For now, we can disable this test. We need to adjust the test asset to use a core node so it doesn't open the missing nodes dialog, as that is generally outside the scope of AVIF loading functionality which the test covers.

The workflow.avif test asset contains custom nodes that trigger the missing nodes dialog, which is outside the scope of AVIF loading functionality testing. TODO: Update test asset to use core nodes only, then re-enable the test.

DrJKL

Not an actual review, but I hope this works 🤞🏻

christian-byrne and others added 30 commits August 21, 2025 15:42

migrate manager menu items

5846117

Update locales [skip ci]

d96265a

switch to v2 manager API endpoints

d2d8565

re-arrange menu items

cd7d64a

await promises. update settings schema

fd3362e

move legacy option to startup arg

61fa2fd

Add banner indicating how to use legacy manager UI

be7433b

Update locales [skip ci]

29cdd57

add "Check for Updates", "Install Missing" menu items

7ec70e5

Update locales [skip ci]

226f84e

use correct response shape

cf174d3

improve command names

e8e558b

dont show missing nodes button in legacy manager mode

8a2747f

[Update to v2 API] update WS done message

0f97a6f

Update locales [skip ci]

2d117b1

[fix] Fix json syntax error from rebase (#4607)

ec923e2

Fix errors from rebase (removed Tag component import and duplicated…

8ceb5e4

… imports in api.ts) (#4608) Co-authored-by: github-actions <github-actions@github.com>

Update locales [skip ci]

a2df972

[Manager] "Restarting" state after clicking restart button (#4637)

808adc0

[feat] Add reactive feature flags foundation (#4817)

b7f778b

[feat] Add v2/ prefix to manager service base URL (#4872)

2e4b510

[cleanup] Remove unused manager route enums (#4875)

3c3ed2b

fix: v2 prefix (#5145)

3352c06

feat: Add loading state to PackInstallButton and improve UI (#5153)

6470869

[restore] conflict notification commits restore

3e3448e

[fix] Use Vue 3.5 destructuring syntax for props with defaults

aefa3a9

Remove deprecated withDefaults usage in NodeConflictDialogContent.vue and use destructuring with default values instead

[feature] dual modal supported

7389790

[fix] Fix date format in PackCard test for locale consistency

134341d

dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:XL This PR changes 500-999 lines, ignoring generated files. labels Sep 1, 2025

christian-byrne force-pushed the test-pr4654-integration-v2 branch from 1dc386a to a74085f Compare September 1, 2025 20:52

dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:XXL This PR changes 1000+ lines, ignoring generated files. labels Sep 1, 2025

christian-byrne and others added 3 commits September 1, 2025 14:06

dosubot bot added size:XXL This PR changes 1000+ lines, ignoring generated files. and removed size:L This PR changes 100-499 lines, ignoring generated files. labels Sep 1, 2025

christian-byrne added 3 commits September 1, 2025 14:27

ci: Force CI run for Playwright tests

2d922ad

Previous commits contained [skip ci] which prevented test execution. This empty commit ensures all CI checks run properly.

This was referenced Sep 1, 2025

[Manager] Upstream ComfyUI-Manager #3367

Closed

Upstream ComfyUI-Manager. #5234

Closed

Upstream ComfyUI-Manager #5228

Closed

christian-byrne added the area:manager label Sep 1, 2025

This was referenced Sep 1, 2025

[Manager] Add node conflict detection and notification system #4654

Closed

[feat] Add manager capability feature flags #5063

Closed

christian-byrne added New Browser Test Expectations New browser test screenshot should be set by github action and removed New Browser Test Expectations New browser test screenshot should be set by github action labels Sep 1, 2025

christian-byrne changed the title ~~Complete manager migration with conflict detection integration~~ Upstream ComfyUI Manager frontend and add custom node conflict detection Sep 1, 2025

DrJKL approved these changes Sep 2, 2025

View reviewed changes

christian-byrne merged commit 66a76c0 into main Sep 3, 2025
11 checks passed

christian-byrne deleted the test-pr4654-integration-v2 branch September 3, 2025 02:14

benceruleanlu mentioned this pull request Sep 3, 2025

1.26.9 #5322

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upstream ComfyUI Manager frontend and add custom node conflict detection #5291

Upstream ComfyUI Manager frontend and add custom node conflict detection #5291

Uh oh!

christian-byrne commented Sep 1, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Sep 1, 2025 •

edited

Loading

Uh oh!

christian-byrne commented Sep 1, 2025 •

edited

Loading

Uh oh!

DrJKL left a comment

Uh oh!

Uh oh!

Uh oh!

Upstream ComfyUI Manager frontend and add custom node conflict detection #5291

Upstream ComfyUI Manager frontend and add custom node conflict detection #5291

Uh oh!

Conversation

christian-byrne commented Sep 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Sep 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎭 Playwright Test Results

📊 Test Reports by Browser

Uh oh!

christian-byrne commented Sep 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrJKL left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

christian-byrne commented Sep 1, 2025 •

edited

Loading

github-actions bot commented Sep 1, 2025 •

edited

Loading

christian-byrne commented Sep 1, 2025 •

edited

Loading