✨ Enhanced rollback progress tracking with step-by-step indicators - Added ProgressTracker integration to rollback service - Implemented step activation logic with startStep() calls - Enhanced frontend progress UI with pink pulsing animations - Fixed TypeScript compilation errors for deployment - Added comprehensive rollback documentation to DEVELOPER_ARCHITECTURE.md - Updated USAGE-GUIDE.md with enhanced progress tracking features - All 669 unit tests passing

Author: LuiseFreese

docs/DEVELOPER_ARCHITECTURE.md

@@ -85,7 +85,7 @@ The application provides a **modern React wizard interface** with Fluent UI v9 c
 - **Real-time Validation**: Final validation before deployment
 - **Deploy**: Select **Deploy to Dataverse** to create your solution with live progress tracking
 
-![Deployment progress](media/step-4-deploying.png)
+![Deployment progress](media/step-4-progress-indicator.png)
 
 And finally 
 
@@ -322,6 +322,30 @@ The application provides **modular rollback** functionality, giving you granular
 
 ![complete rollback](media/rollback-complete.png)
 
+### Enhanced Progress Tracking
+
+The rollback process includes **real-time progress indicators** with step-by-step visibility:
+
+**Visual Progress Features:**
+- **Step-by-Step Display**: Each rollback component shown as individual progress steps
+- **Active Step Highlighting**: Currently processing step highlighted with pink pulsing animation
+- **Status Badges**: Clear "Preparing", "In Progress", "Completed" indicators for each step
+- **Time Estimation**: Real-time elapsed time and estimated remaining time
+- **Spinner Animations**: Visual feedback for active operations
+
+**Progress Steps Include:**
+1. **Preparation** - Validating rollback requirements
+2. **Relationships** - Removing entity relationships 
+3. **Custom Entities** - Deleting custom tables
+4. **Global Choices** - Removing custom choice sets
+5. **Solution** - Deleting solution container
+6. **Publisher** - Removing publisher
+7. **Cleanup** - Final cleanup operations
+
+This enhanced progress tracking matches the same visual style and functionality as deployment progress, providing consistent user experience throughout the application.
+
+![rollback progress indicator](/rollback-progress-indicator.png)
+
 ### Rollback Options
 
 You can choose exactly what to rollback:

docs/USAGE-GUIDE.md

@@ -0,0 +1,10 @@
+{
+    "confirm": true,
+    "options": {
+        "relationships": true,
+        "customEntities": false,
+        "customGlobalChoices": false,
+        "solution": false,
+        "publisher": false
+    }
+}

docs/media/rollback-progress-indicator.png

@@ -119,27 +119,23 @@ class RollbackController {
             // Update status to in-progress
             this.statusTracker.updateStatus(rollbackId, 'in-progress');
 
-            // Track progress phases
-            const phases = ['relationships', 'entities', 'globalChoices', 'solution', 'publisher'];
-            let currentPhaseIndex = 0;
-            
             // Progress callback to update tracker
-            // Receives (status, message) where status is the phase name
-            const progressCallback = (status, message) => {
-                console.log(`Rollback ${rollbackId}: ${status} - ${message}`);
+            // Updated to handle new format: (type, message, progressData)
+            const progressCallback = (type, message, progressData) => {
+                console.log(`Rollback ${rollbackId}: ${type} - ${message}`);
 
-                // Update current phase
-                const phaseIndex = phases.indexOf(status);
-                if (phaseIndex >= 0) {
-                    currentPhaseIndex = phaseIndex + 1;
+                if (type === 'progress' && progressData) {
+                    // Extract progress information from progressData
+                    const percentage = progressData.percentage || 0;
+                    const total = progressData.steps ? progressData.steps.length : 100;
+                    const current = Math.round((percentage / 100) * total);
+                    
+                    // Update progress with enhanced data for the frontend
+                    this.statusTracker.updateProgressWithData(rollbackId, current, total, message, progressData);
+                } else {
+                    // Fallback for any unexpected format
+                    console.log(`Unexpected progress format: ${type}, ${message}`);
                 }
-                
-                // Calculate progress (each phase is a step)
-                const total = phases.length;
-                const current = currentPhaseIndex;
-                
-                // Just pass the message without phase numbers
-                this.statusTracker.updateProgress(rollbackId, current, total, message);
             };
 
             // Execute the rollback with progress tracking

docs/media/step-4-progress-indicator.png

@@ -338,8 +338,14 @@ class DataverseClient {
       } catch (error) {
         const isRetryable = retryableStatusCodes.includes(error.status);
         const isLastAttempt = attempt === maxRetries;
+        
+        // Check for EntityCustomization conflict error
+        const isEntityCustomizationConflict = error.message && 
+          (error.message.includes('0x80071151') || 
+           error.message.includes('EntityCustomization') ||
+           error.message.includes('solution installation or removal failed'));
 
-        if (!isRetryable || isLastAttempt) {
+        if ((!isRetryable && !isEntityCustomizationConflict) || isLastAttempt) {
           // Not retryable or out of retries, throw the error
           throw error;
         }
@@ -357,7 +363,12 @@ class DataverseClient {
 
         // Handle rate limiting with Retry-After header
         let delayMs = retryDelays[attempt];
-        if (error.status === 429) {
+        
+        // Special handling for EntityCustomization conflicts - use longer delays
+        if (isEntityCustomizationConflict) {
+          delayMs = Math.max(delayMs, 10000 + (attempt * 5000)); // Minimum 10s, increasing by 5s each attempt
+          this._log(`⚠️  EntityCustomization conflict detected. Retrying in ${delayMs / 1000} seconds (attempt ${attempt + 1}/${maxRetries + 1})...`);
+        } else if (error.status === 429) {
           // Check for Retry-After header (in seconds)
           const retryAfter = error.response?.headers?.['retry-after'];
           if (retryAfter) {