diff --git a/MANAGER_MIGRATION_BACKUPS.md b/MANAGER_MIGRATION_BACKUPS.md deleted file mode 100644 index 91af85fe5..000000000 --- a/MANAGER_MIGRATION_BACKUPS.md +++ /dev/null @@ -1,127 +0,0 @@ -# ComfyUI Manager Migration - Backup Documentation - -This document tracks backup branches created during the manager migration recovery process. - -## Backup Branches - -### `manager-migration-clean-backup` -- **Created**: 2025-08-30 -- **Source Branch**: `manager-migration-clean` -- **Source Commit**: `9de0f17ac` - "fix: resolve duplicate function in useManagerQueue test" -- **Purpose**: Full backup before interactive squash of 80 commits into single commit -- **Contains**: - - Complete 70-commit rebase from `pr-3367-latest` onto `main` - - All recovered manager functionality from original recovery work - - TypeScript compatibility fixes - - v2 API endpoints (`/v2/manager/queue/*`) - - Complete manager service with task queuing - - Updated type definitions and store interfaces - - Resolved merge conflicts and formatting fixes - -### `manager-migration-clean-tested` -- **Created**: 2025-08-30 -- **Source Branch**: `manager-migration-clean` -- **Source Commit**: `380f335bf` - "feat: Integrate ComfyUI Manager migration with v2 API and enhanced UI" -- **Purpose**: Backup before manual testing via dev server -- **Contains**: - - Single squashed commit with complete manager migration - - All recovered functionality from PR #3367 - - v2 API integration and enhanced UI components - - Resolved TypeScript issues and quality checks passed - - Clean, production-ready state ready for manual testing - -### `manager-migration-clean-working-backup` -- **Created**: 2025-08-30 -- **Source Branch**: `manager-migration-clean` -- **Source Commit**: `154dbb5dd` - "fix: Add missing IconTextButton import in PackUninstallButton" -- **Purpose**: Backup of working state before merging additional PRs -- **Contains**: - - All manager migration functionality from PR #3367 - - Fixed duplicate setting runtime error - - Fixed interface compatibility issues - - Fixed missing component imports - - Verified working state in dev server - - Ready for integration of PR #4654 and PR #5063 - -### `manager-migration-pr4654-integrated` -- **Created**: 2025-08-30 -- **Source Branch**: `manager-migration-clean` -- **Source Commit**: `b5bf6fd6e` - "fix: Restore correct interfaces from PR #3367" -- **Purpose**: Backup after successfully integrating PR #4654 (conflict detection system) -- **Contains**: - - All manager migration functionality from PR #3367 - - Complete conflict detection system from PR #4654 - - Node conflict detection and acknowledgment features - - Warning tab and conflict message utilities - - Import failed detection system - - Package selection and status management - -### `manager-migration-pr5063-integrated` -- **Created**: 2025-08-30 -- **Source Branch**: `manager-migration-clean` -- **Source Commit**: `8a26b7ef6` - "[fix] Fix API URL prefix slash and add error handling" -- **Purpose**: Backup after successfully integrating PR #5063 (manager capability feature flags) -- **Contains**: - - All previous functionality from manager migration and PR #4654 - - Manager capability feature flags system (`MANAGER_SUPPORTS_V4`) - - Three-state manager UI logic (DISABLED, LEGACY_UI, NEW_UI) - - Dynamic API client creation with conditional v2 prefix - - Manager state detection with command line arg support - - Enhanced error handling and state management - -### `manager-migration-upstream-backup` -- **Created**: Earlier in recovery process -- **Purpose**: Backup of upstream state before major changes -- **Contains**: Original recovery work before rebase process - -## Key Recovery Elements Preserved - -### Critical Manager Service Features -- **v2 API Base URL**: `/v2/` prefix for all manager endpoints -- **Queue Task Endpoint**: `QUEUE_TASK = 'manager/queue/task'` -- **WebSocket Status**: `cm-queue-status` message handling -- **Client-side Queuing**: `useManagerQueue` composable with `enqueueTask` - -### Manager Store Integration -- Complete manager store with progress dialog support -- Task logging and status tracking -- Pack installation/uninstallation functionality -- WebSocket integration for real-time updates - -### Type System -- Complete `comfyManagerTypes.ts` with all PR #3367 type definitions -- Enum exports: `ManagerChannel`, `ManagerDatabaseSource`, `SelectedVersion` -- Interface definitions: `InstallPackParams`, `ManagerPackInfo`, etc. - -## Recovery Verification Status ✅ - -### Core Manager Migration (PR #3367) -- ✅ All work from PR #3367 maintained -- ✅ Task queue changes preserved -- ✅ No conflicts with main branch -- ✅ Critical v2 API endpoints present -- ✅ Manager service functionality complete -- ✅ TypeScript compatibility restored - -### Additional PR Integrations -- ✅ PR #4654 (conflict detection system) successfully integrated -- ✅ PR #5063 (manager capability feature flags) successfully integrated -- ✅ Dynamic API client creation based on backend v4 support -- ✅ Three-state manager UI logic (DISABLED, LEGACY_UI, NEW_UI) -- ✅ Command line argument detection for manager state -- ✅ Enhanced error handling and state management - -## Next Steps - -1. ✅ ~~Interactive squash of 80 commits into single meaningful commit~~ -2. ✅ ~~Successfully integrate PR #4654 (conflict detection system)~~ -3. ✅ ~~Successfully integrate PR #5063 (manager capability feature flags)~~ -4. **Current**: Create clean PR for comprehensive manager migration -5. Address remaining test compatibility issues (non-blocking) - -## Notes - -- Some TypeScript test compatibility issues remain due to interface changes -- Core functionality is verified and working -- Lint timeout encountered but formatting passes -- All critical manager functionality has been preserved and verified \ No newline at end of file diff --git a/TASK_QUEUE_RESTORATION_PLAN.md b/TASK_QUEUE_RESTORATION_PLAN.md deleted file mode 100644 index 42d6b6cc2..000000000 --- a/TASK_QUEUE_RESTORATION_PLAN.md +++ /dev/null @@ -1,80 +0,0 @@ -# Task Queue Restoration Plan - -## Problem Statement - -An accidental revert occurred in commit range `730b278f..8075db41f` that removed critical task queue and client_id-aware changes from the manager system. Since then, months of additional features have been built on top of the reverted (broken) state. - -## What We CANNOT Do - -- ❌ Simple git revert - would lose months of subsequent work -- ❌ Cherry-pick entire files - would overwrite newer features -- ❌ Restore entire files to previous state - would break new functionality - -## What We MUST Do - -**Manual analysis and selective restoration** for each affected file: - -1. **Compare each file** between: - - `730b278f` (correct task queue implementation) - - `8075db41f` (after accidental revert) - - `current state` (months of features built on broken foundation) - -2. **Identify specific changes** that were lost in the revert: - - **Task queue API usage** (`QUEUE_TASK = 'v2/manager/queue/task'`) - - **Generated types migration** (`components` from `generatedManagerTypes` ONLY, stop using `comfyManagerTypes.ts`) - - **Client ID awareness** (`client_id` parameters in all API calls) - - **UUID generation** for task tracking (`ui_id` with `uuidv4()`) - - **Task history features** (`getTaskHistory`, `TASK_HISTORY` routes) - - **Proper task queueing logic** (`queueTask` function that creates `QueueTaskItem`) - -3. **Selectively restore** only the task queue changes while preserving: - - All feature flag logic added since the revert - - All UI enhancements added since the revert - - All new components and functionality added since the revert - - All bug fixes and improvements added since the revert - -## Key Migration Pattern - -**CRITICAL**: Switch from `comfyManagerTypes.ts` to `generatedManagerTypes.ts`: - -```typescript -// OLD (reverted state): -import { type InstallPackParams } from '@/types/comfyManagerTypes' - -// NEW (correct task queue state): -import { components } from '@/types/generatedManagerTypes' -type InstallPackParams = components['schemas']['InstallPackParams'] -``` - -## Files Requiring Analysis - -1. `src/services/comfyManagerService.ts` ✅ COMPLETED -2. `src/stores/comfyManagerStore.ts` -3. `src/types/comfyManagerTypes.ts` (check if it should be deprecated) -4. `src/composables/useManagerQueue.ts` -5. `src/components/dialog/content/manager/ManagerDialogContent.vue` -6. `src/components/dialog/content/ManagerProgressDialogContent.vue` -7. `src/components/dialog/footer/ManagerProgressFooter.vue` -8. Manager button components (PackInstallButton, PackUpdateButton, etc.) -9. Manager pack card components -10. Related test files - -## Analysis Process for Each File - -For each file: - -1. **Extract the correct implementation**: `git show 730b278f:path/to/file.ts` -2. **Extract the reverted implementation**: `git show 8075db41f:path/to/file.ts` -3. **Compare with current state**: What we have now -4. **Identify lost task queue features**: What specific functionality was removed -5. **Manually merge**: Add back only the task queue features to current code -6. **Preserve new features**: Keep all functionality added since the revert - -## Expected Outcome - -- Manager operations use proper task queue API (`/v2/manager/queue/task`) -- All operations include `client_id` and `ui_id` for tracking -- Task history is properly implemented -- **Generated types are used exclusively** instead of manual `comfyManagerTypes.ts` -- UUID generation works for task identification -- ALL existing features and enhancements since the revert are preserved \ No newline at end of file