Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
5846117
migrate manager menu items
christian-byrne Apr 9, 2025
d96265a
Update locales [skip ci]
invalid-email-address Apr 9, 2025
d2d8565
switch to v2 manager API endpoints
christian-byrne Apr 9, 2025
cd7d64a
re-arrange menu items
christian-byrne Apr 11, 2025
fd3362e
await promises. update settings schema
christian-byrne Apr 14, 2025
61fa2fd
move legacy option to startup arg
christian-byrne Apr 14, 2025
be7433b
Add banner indicating how to use legacy manager UI
christian-byrne Apr 14, 2025
29cdd57
Update locales [skip ci]
invalid-email-address Apr 14, 2025
7ec70e5
add "Check for Updates", "Install Missing" menu items
christian-byrne Apr 14, 2025
226f84e
Update locales [skip ci]
invalid-email-address Apr 14, 2025
cf174d3
use correct response shape
christian-byrne Apr 14, 2025
e8e558b
improve command names
christian-byrne Apr 14, 2025
8a2747f
dont show missing nodes button in legacy manager mode
christian-byrne Apr 15, 2025
0f97a6f
[Update to v2 API] update WS done message
christian-byrne Apr 15, 2025
2d117b1
Update locales [skip ci]
invalid-email-address Jul 19, 2025
ec923e2
[fix] Fix json syntax error from rebase (#4607)
christian-byrne Jul 30, 2025
8ceb5e4
Fix errors from rebase (removed `Tag` component import and duplicated…
christian-byrne Jul 30, 2025
a2df972
Update locales [skip ci]
invalid-email-address Jul 30, 2025
808adc0
[Manager] "Restarting" state after clicking restart button (#4637)
viva-jinyi Aug 1, 2025
b7f778b
[feat] Add reactive feature flags foundation (#4817)
christian-byrne Aug 7, 2025
2e4b510
[feat] Add v2/ prefix to manager service base URL (#4872)
christian-byrne Aug 9, 2025
3c3ed2b
[cleanup] Remove unused manager route enums (#4875)
christian-byrne Aug 9, 2025
3352c06
fix: v2 prefix (#5145)
viva-jinyi Aug 21, 2025
7d1659c
Fix: Restore api.ts from main branch after incorrect rebase (#5150)
viva-jinyi Aug 22, 2025
6470869
feat: Add loading state to PackInstallButton and improve UI (#5153)
viva-jinyi Aug 23, 2025
3e3448e
[restore] conflict notification commits restore
viva-jinyi Aug 2, 2025
a1ea18c
[fix] Restore conflict notification work and fix tests
viva-jinyi Aug 2, 2025
aefa3a9
[fix] Use Vue 3.5 destructuring syntax for props with defaults
viva-jinyi Aug 2, 2025
7389790
[feature] dual modal supported
viva-jinyi Aug 2, 2025
134341d
[fix] Fix date format in PackCard test for locale consistency
viva-jinyi Aug 2, 2025
ff31e2d
[fix] title text modified
viva-jinyi Aug 5, 2025
42ad8eb
[fix] Fix conflict red dot not syncing
viva-jinyi Aug 5, 2025
63b6af5
[fix] Add conflict detection when installed packages list updates
viva-jinyi Aug 6, 2025
73f2489
fix: use selected target_branch for PR base in update-manager-types w…
viva-jinyi Aug 6, 2025
87db9cc
[fix] test code timeout error fixed
viva-jinyi Aug 6, 2025
7d0e971
[chore] Update ComfyUI-Manager API types from ComfyUI-Manager@4e6f970…
comfy-pr-bot Aug 6, 2025
4c99172
[types] Add proper types for ImportFailInfo API endpoints (#4783)
viva-jinyi Aug 6, 2025
33bf377
[fix] ci error fixed & button max-width modified
viva-jinyi Aug 7, 2025
59e1945
fix: node pack card width adapted
viva-jinyi Aug 12, 2025
35873fa
fix: prevent duplicate api calls & installedPacksWithVersions instead…
viva-jinyi Aug 12, 2025
a5153cd
feat: run conflict detection after Apply Changes
viva-jinyi Aug 17, 2025
267e07e
refactor: simplify PackInstallButton isInstalling state management
viva-jinyi Aug 27, 2025
91e462d
feat: improve multi-package selection handling (#5116)
viva-jinyi Aug 27, 2025
380f335
feat: Integrate ComfyUI Manager migration with v2 API and enhanced UI
christian-byrne Aug 30, 2025
b5bf6fd
fix: Restore correct interfaces from PR #3367
christian-byrne Aug 31, 2025
154dbb5
fix: Add missing IconTextButton import in PackUninstallButton
christian-byrne Aug 31, 2025
86baabc
docs: Update backup documentation with working state backup
christian-byrne Aug 31, 2025
6426861
[feat] Add manager capability feature flags
christian-byrne Aug 18, 2025
2415b97
[feat] Add managerStateStore for three-state manager UI logic
christian-byrne Aug 18, 2025
8a26b7e
[fix] Fix API URL prefix slash and add error handling
christian-byrne Sep 1, 2025
e1ac09f
[docs] Update backup documentation with PR #5063 integration status
christian-byrne Sep 1, 2025
d2eaffe
[fix] Fix manager button visibility when manager is disabled
christian-byrne Sep 1, 2025
e6aff69
[fix] Correct Install All button visibility for manager UI states
christian-byrne Sep 1, 2025
3853dca
feat: Complete manager migration with bug fixes and locale updates
christian-byrne Sep 1, 2025
183bba0
Complete PR #4654 integration with manager migration
christian-byrne Sep 1, 2025
fdf4ffd
feat: Complete manager migration with conflict detection integration
christian-byrne Sep 1, 2025
3df0a8a
Remove temporary error log files from commits
christian-byrne Sep 1, 2025
2c5b6da
Remove temporary documentation files
christian-byrne Sep 1, 2025
a74085f
feat: Complete manager migration cleanup and integration
christian-byrne Sep 1, 2025
74c03fb
fix: Update CustomNodesManager command to use tri-state manager system
christian-byrne Sep 1, 2025
d673fba
refactor: Remove no-op refreshTaskState function
christian-byrne Sep 1, 2025
a0630cc
Merge branch 'main' into test-pr4654-integration-v2
christian-byrne Sep 1, 2025
7c88dbc
fix: Replace lodash with es-toolkit/compat in useManagerQueue
christian-byrne Sep 1, 2025
bb767a5
fix: Add missing whats-new-dismissed event emission in WhatsNewPopup
christian-byrne Sep 1, 2025
2d922ad
ci: Force CI run for Playwright tests
christian-byrne Sep 1, 2025
2ef8899
test: Temporarily disable workflow.avif test due to missing nodes dialog
christian-byrne Sep 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: Complete manager migration with conflict detection integration
This completes the integration of ComfyUI Manager migration features with enhanced conflict detection system. Key changes include:

## Manager Migration & Conflict Detection
- Integrated PR #4637 (4-state manager restart workflow) with PR #4654 (comprehensive conflict detection)
- Fixed conflict detection to properly check `latest_version` fields for registry API compatibility
- Added conflict detection to PackCardFooter and InfoPanelHeader for comprehensive warning coverage
- Merged missing English locale translations from main branch with proper conflict resolution

## Bug Fixes
- Fixed double API path issue (`/api/v2/v2/`) in manager service routes
- Corrected PackUpdateButton payload structure and service method calls
- Enhanced conflict detection system to handle both installed and registry package structures

## Technical Improvements
- Updated conflict detection composable to handle both installed and registry package structures
- Enhanced manager service with proper error handling and route corrections
- Improved type safety across manager components with proper TypeScript definitions
  • Loading branch information
christian-byrne committed Sep 1, 2025
commit fdf4ffd94adc0fd04510c1fc85c2635da353406b
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,33 @@ import VerifiedIcon from '@/components/icons/VerifiedIcon.vue'
import { useConflictDetection } from '@/composables/useConflictDetection'
import { useComfyRegistryService } from '@/services/comfyRegistryService'
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
import {
ManagerChannel,
ManagerDatabaseSource,
SelectedVersion
} from '@/types/comfyManagerTypes'
import { components } from '@/types/comfyRegistryTypes'
import { components as ManagerComponents } from '@/types/generatedManagerTypes'
import { getJoinedConflictMessages } from '@/utils/conflictMessageUtil'
import { isSemVer } from '@/utils/formatUtil'

type ManagerChannel = ManagerComponents['schemas']['ManagerChannel']
type ManagerDatabaseSource =
ManagerComponents['schemas']['ManagerDatabaseSource']
type SelectedVersion = ManagerComponents['schemas']['SelectedVersion']

// Enum values for runtime use
const SelectedVersionValues = {
LATEST: 'latest' as SelectedVersion,
NIGHTLY: 'nightly' as SelectedVersion
}

const ManagerChannelValues = {
STABLE: 'stable' as ManagerChannel,
DEV: 'dev' as ManagerChannel
}

const ManagerDatabaseSourceValues = {
CACHE: 'cache' as ManagerDatabaseSource,
REMOTE: 'remote' as ManagerDatabaseSource,
LOCAL: 'local' as ManagerDatabaseSource
}

const { nodePack } = defineProps<{
nodePack: components['schemas']['Node']
}>()
Expand All @@ -118,19 +136,21 @@ const { checkNodeCompatibility } = useConflictDetection()

const isQueueing = ref(false)

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

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

// If unclaimed, set selected version to nightly
if (nodePack.publisher?.name === 'Unclaimed') return SelectedVersion.NIGHTLY
if (nodePack.publisher?.name === 'Unclaimed')
return SelectedVersionValues.NIGHTLY

// If node pack is installed, set selected version to the installed version
if (managerStore.isPackInstalled(nodePack.id))
Expand Down Expand Up @@ -180,15 +200,15 @@ const onNodePackChange = async () => {
// Add Latest option
const defaultVersions = [
{
value: SelectedVersion.LATEST,
value: SelectedVersionValues.LATEST,
label: latestLabel
}
]

// Add Nightly option if there is a non-empty `repository` field
if (nodePack.repository?.length) {
defaultVersions.push({
value: SelectedVersion.NIGHTLY,
value: SelectedVersionValues.NIGHTLY,
label: t('manager.nightlyVersion')
})
}
Expand Down Expand Up @@ -222,8 +242,8 @@ const handleSubmit = async () => {
await managerStore.installPack.call({
id: nodePack.id,
repository: nodePack.repository ?? '',
channel: ManagerChannel.DEFAULT,
mode: ManagerDatabaseSource.CACHE,
channel: ManagerChannelValues.STABLE,
mode: ManagerDatabaseSourceValues.CACHE,
version: actualVersion,
selected_version: selectedVersion.value
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import { useConflictAcknowledgment } from '@/composables/useConflictAcknowledgme
import { useDialogService } from '@/services/dialogService'
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
import { useConflictDetectionStore } from '@/stores/conflictDetectionStore'
import { components as ManagerComponents } from '@/types/generatedManagerTypes'
import type { components } from '@/types/comfyRegistryTypes'
import { components as ManagerComponents } from '@/types/generatedManagerTypes'

const TOGGLE_DEBOUNCE_MS = 256

Expand Down Expand Up @@ -108,8 +108,12 @@ const handleEnable = () => {
}
return enablePack.call({
id: nodePack.id,
version: version.value ?? ('latest' as ManagerComponents['schemas']['SelectedVersion']),
selected_version: version.value ?? ('latest' as ManagerComponents['schemas']['SelectedVersion']),
version:
version.value ??
('latest' as ManagerComponents['schemas']['SelectedVersion']),
selected_version:
version.value ??
('latest' as ManagerComponents['schemas']['SelectedVersion']),
repository: nodePack.repository ?? '',
channel: 'default' as ManagerComponents['schemas']['ManagerChannel'],
mode: 'cache' as ManagerComponents['schemas']['ManagerDatabaseSource'],
Expand All @@ -123,7 +127,9 @@ const handleDisable = () => {
}
return disablePack({
id: nodePack.id,
version: version.value ?? ('latest' as ManagerComponents['schemas']['SelectedVersion'])
version:
version.value ??
('latest' as ManagerComponents['schemas']['SelectedVersion'])
})
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ import { useDialogService } from '@/services/dialogService'
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
import { ButtonSize } from '@/types/buttonTypes'
import type { components } from '@/types/comfyRegistryTypes'
import { components as ManagerComponents } from '@/types/generatedManagerTypes'
import {
type ConflictDetail,
ConflictDetectionResult
} from '@/types/conflictDetectionTypes'
import { components as ManagerComponents } from '@/types/generatedManagerTypes'

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

Expand Down Expand Up @@ -123,7 +123,7 @@ const installAllPacks = async () => {
})
return
}

// No conflicts or conflicts acknowledged - proceed with installation
const uninstalledPacks = nodePacks.filter(
(pack) => !managerStore.isPackInstalled(pack.id)
Expand Down
38 changes: 16 additions & 22 deletions src/components/dialog/content/manager/button/PackUpdateButton.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
<template>
<PackActionButton
<IconTextButton
v-bind="$attrs"
variant="black"
type="transparent"
:label="$t('manager.updateAll')"
:loading="isUpdating"
:loading-message="$t('g.updating')"
@action="updateAllPacks"
/>
:border="true"
size="sm"
:disabled="isUpdating"
@click="updateAllPacks"
>
<template v-if="isUpdating" #icon>
<DotSpinner duration="1s" :size="12" />
</template>
</IconTextButton>
</template>

<script setup lang="ts">
import { ref } from 'vue'

import PackActionButton from '@/components/dialog/content/manager/button/PackActionButton.vue'
import IconTextButton from '@/components/button/IconTextButton.vue'
import DotSpinner from '@/components/common/DotSpinner.vue'
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
import type { components } from '@/types/comfyRegistryTypes'
import { components as ManagerComponents } from '@/types/generatedManagerTypes'

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

Expand All @@ -27,16 +32,10 @@ const isUpdating = ref<boolean>(false)

const managerStore = useComfyManagerStore()

const createPayload = (
updateItem: NodePack
): ManagerComponents['schemas']['ManagerPackInfo'] => {
if (!updateItem.id) {
throw new Error('Node ID is required for update')
}

const createPayload = (updateItem: NodePack) => {
return {
id: updateItem.id,
version: updateItem.latest_version?.version || 'latest'
id: updateItem.id!,
version: updateItem.latest_version!.version!
}
}

Expand All @@ -53,21 +52,16 @@ const updateAllPacks = async () => {
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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
size="md"
:is-installing="isInstalling"
:node-packs="nodePacks"
:has-conflict="hasConflict"
:has-conflict="hasConflict || computedHasConflict"
:conflict-info="conflictInfo"
/>
</slot>
</div>
Expand All @@ -48,8 +49,10 @@ import NoResultsPlaceholder from '@/components/common/NoResultsPlaceholder.vue'
import PackInstallButton from '@/components/dialog/content/manager/button/PackInstallButton.vue'
import PackUninstallButton from '@/components/dialog/content/manager/button/PackUninstallButton.vue'
import PackIcon from '@/components/dialog/content/manager/packIcon/PackIcon.vue'
import { useConflictDetection } from '@/composables/useConflictDetection'
import { useComfyManagerStore } from '@/stores/comfyManagerStore'
import { components } from '@/types/comfyRegistryTypes'
import type { ConflictDetail } from '@/types/conflictDetectionTypes'
import { ImportFailedKey } from '@/types/importFailedTypes'

const { nodePacks, hasConflict } = defineProps<{
Expand Down Expand Up @@ -79,4 +82,23 @@ const isInstalling = computed(() => {
if (!nodePacks?.length) return false
return nodePacks.some((pack) => managerStore.isPackInstalling(pack.id))
})

// Add conflict detection for install button dialog
const { checkNodeCompatibility } = useConflictDetection()

// Compute conflict info for all node packs
const conflictInfo = computed<ConflictDetail[]>(() => {
if (!nodePacks?.length) return []

const allConflicts: ConflictDetail[] = []
for (const nodePack of nodePacks) {
const compatibilityCheck = checkNodeCompatibility(nodePack)
if (compatibilityCheck.conflicts) {
allConflicts.push(...compatibilityCheck.conflicts)
}
}
return allConflicts
})

const computedHasConflict = computed(() => conflictInfo.value.length > 0)
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
v-if="!isInstalled"
:node-packs="[nodePack]"
:is-installing="isInstalling"
:has-conflict="hasConflicts"
:conflict-info="conflictInfo"
/>
<PackEnableToggle v-else :node-pack="nodePack" />
</div>
Expand All @@ -21,9 +23,11 @@ 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 { useComfyManagerStore } from '@/stores/comfyManagerStore'
import { IsInstallingKey } from '@/types/comfyManagerTypes'
import type { components } from '@/types/comfyRegistryTypes'
import type { ConflictDetail } from '@/types/conflictDetectionTypes'

const { nodePack } = defineProps<{
nodePack: components['schemas']['Node']
Expand All @@ -38,4 +42,16 @@ const { n } = useI18n()
const formattedDownloads = computed(() =>
nodePack.downloads ? n(nodePack.downloads) : ''
)

// Add conflict detection for the card button
const { checkNodeCompatibility } = useConflictDetection()

// Check for conflicts with this specific node pack
const conflictInfo = computed<ConflictDetail[]>(() => {
if (!nodePack) return []
const compatibilityCheck = checkNodeCompatibility(nodePack)
return compatibilityCheck.conflicts || []
})

const hasConflicts = computed(() => conflictInfo.value.length > 0)
</script>
39 changes: 31 additions & 8 deletions src/composables/useConflictDetection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -712,16 +712,27 @@ export function useConflictDetection() {
const conflicts: ConflictDetail[] = []

// Check OS compatibility using centralized function
if (node.supported_os && node.supported_os.length > 0) {
// First try latest_version (most accurate), then fallback to top level
const supportedOS =
('latest_version' in node ? node.latest_version?.supported_os : null) ||
node.supported_os

if (supportedOS && supportedOS.length > 0) {
const currentOS = systemStats.system?.os || 'unknown'
const osConflict = checkOSConflict(node.supported_os, currentOS)
const osConflict = checkOSConflict(supportedOS, currentOS)
if (osConflict) {
conflicts.push(osConflict)
}
}

// Check accelerator compatibility using centralized function
if (node.supported_accelerators && node.supported_accelerators.length > 0) {
// First try latest_version (most accurate), then fallback to top level
const supportedAccelerators =
('latest_version' in node
? node.latest_version?.supported_accelerators
: null) || node.supported_accelerators

if (supportedAccelerators && supportedAccelerators.length > 0) {
// Extract available accelerators from system stats
const acceleratorInfo = extractAcceleratorInfo(systemStats)
const availableAccelerators: Node['supported_accelerators'] = []
Expand All @@ -733,7 +744,7 @@ export function useConflictDetection() {
})

const acceleratorConflict = checkAcceleratorConflict(
node.supported_accelerators,
supportedAccelerators,
availableAccelerators
)
if (acceleratorConflict) {
Expand All @@ -742,13 +753,19 @@ export function useConflictDetection() {
}

// Check ComfyUI version compatibility
if (node.supported_comfyui_version) {
// First try latest_version (most accurate), then fallback to top level
const comfyuiVersionRequirement =
('latest_version' in node
? node.latest_version?.supported_comfyui_version
: null) || node.supported_comfyui_version

if (comfyuiVersionRequirement) {
const currentComfyUIVersion = systemStats.system?.comfyui_version
if (currentComfyUIVersion && currentComfyUIVersion !== 'unknown') {
const versionConflict = utilCheckVersionCompatibility(
'comfyui_version',
currentComfyUIVersion,
node.supported_comfyui_version
comfyuiVersionRequirement
)
if (versionConflict) {
conflicts.push(versionConflict)
Expand All @@ -757,13 +774,19 @@ export function useConflictDetection() {
}

// Check ComfyUI Frontend version compatibility
if (node.supported_comfyui_frontend_version) {
// First try latest_version (most accurate), then fallback to top level
const frontendVersionRequirement =
('latest_version' in node
? node.latest_version?.supported_comfyui_frontend_version
: null) || node.supported_comfyui_frontend_version

if (frontendVersionRequirement) {
const currentFrontendVersion = config.app_version
if (currentFrontendVersion && currentFrontendVersion !== 'unknown') {
const versionConflict = utilCheckVersionCompatibility(
'frontend_version',
currentFrontendVersion,
node.supported_comfyui_frontend_version
frontendVersionRequirement
)
if (versionConflict) {
conflicts.push(versionConflict)
Expand Down
Loading