@payfit/iac 1.0.3 → 1.0.4-ephemeral-iac-migration-docs.1

package/dist/executors/stack-migration/lib/migration-tool.js

@@ -9,9 +9,8 @@ const spacelift_client_1 = require("./spacelift-client");
 const templates_1 = require("./templates");
 class MigrationTool extends migration_helper_1.MigrationHelper {
     async setupRepositories(options) {
-        this.logger.step(1, 9, 'Repository Setup and Validation');
-        // Check spacectl CLI installation first
-        this.logger.info('\nChecking spacectl CLI installation...');
+        this.logger.step(1, 9, 'Repository Setup');
+        this.logger.info('Checking spacectl CLI...');
         await this.ensureSpacectlInstalled();
         if (this.config.resuming &&
             this.config.serviceRepository.name &&
@@ -34,7 +33,7 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
                 .map(g => g.trim())
                 .filter(g => g.length > 0);
         }
-        this.logger.info('\nCloning required repositories...');
+        this.logger.info('Cloning repositories...');
         if (!this.files.exists(this.paths.tmpDir)) {
             this.files.mkdir(this.paths.tmpDir, { recursive: true });
         }
@@ -42,24 +41,30 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
             const repoPath = this.paths.clonedRepo(key);
             // Check if already cloned
             if (this.files.exists(repoPath)) {
-                this.logger.info(`Repository ${key} already cloned, pulling latest...`);
-                if (!this.dryRun) {
+                if (this.dryRun) {
+                    this.logger.info(`[DRY RUN] Would pull ${key}`);
+                }
+                else {
+                    this.logger.info(`${key} already cloned, pulling latest`);
                     await this.git.pull(repoPath);
                 }
             }
             else {
-                await this.git.clone(url, repoPath, this.paths.tmpDir);
-                this.logger.success(`Cloned ${key}`);
+                if (this.dryRun) {
+                    this.logger.info(`[DRY RUN] Would clone ${key}`);
+                }
+                else {
+                    await this.git.clone(url, repoPath, this.paths.tmpDir);
+                    this.logger.success(`Cloned ${key}`);
+                }
             }
             this.config.repositories[key] =
                 repoPath;
         }
-        // Check spacectl authentication
-        this.logger.info('\nChecking spacectl authentication...');
+        this.logger.info('Checking spacectl authentication...');
         await this.ensureSpacectlAuthentication();
-        this.logger.success('All repositories cloned and ready');
-        // Update .gitignore to exclude migration temporary files
-        this.logger.info('\nUpdating .gitignore...');
+        this.logger.success('Repositories ready');
+        this.logger.info('Updating .gitignore...');
         const gitignorePath = this.paths.serviceRepoGitignore();
         let gitignoreContent = '';
         if (this.files.exists(gitignorePath)) {
@@ -69,18 +74,13 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         if (!gitignoreContent.includes('.migration-tmp/')) {
             gitignoreContent += '\n' + constants_1.GITIGNORE_ENTRIES;
             this.files.writeFile(gitignorePath, gitignoreContent);
-            if (!this.dryRun) {
-                this.logger.success('Updated .gitignore with migration entries');
-            }
-        }
-        else {
-            this.logger.info('.gitignore already contains migration entries');
         }
         // Save initial state (only set timestamp if not resuming)
         if (!this.config.migrationStartedAt) {
             this.config.migrationStartedAt = new Date().toISOString();
         }
         this.saveMigrationState();
+        this.logger.success('Repository setup complete');
     }
     /**
      * Step 2: Load Configuration
@@ -99,21 +99,21 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         if (!this.files.exists(iacConfigPath)) {
             throw new Error(`Stack configuration not found at: ${iacConfigPath}`);
         }
-        this.logger.info(`Reading stack configuration from iac-deploy...`);
+        this.logger.info('Reading stack configuration...');
         const iacConfig = this.files.readYaml(iacConfigPath);
         // Extract stacks
         if (iacConfig.stacks && Array.isArray(iacConfig.stacks)) {
             this.config.stacks = iacConfig.stacks;
-            this.logger.success(`Found ${this.config.stacks.length} stack(s) in configuration`);
         }
         // Save state
         this.saveMigrationState();
+        this.logger.success(`Configuration loaded (${this.config.stacks.length} stacks)`);
     }
     /**
      * Step 3: Create Safety Net PR (disable autodeploy for stacks)
      */
     async createSafetyNetPR() {
-        this.logger.step(3, 9, 'Create Safety Net PR (disable autodeploy for stacks being migrated)');
+        this.logger.step(3, 9, 'Safety Net PR');
         // Skip if already created
         if (this.config.generatedFiles.safetyNetPR) {
             this.logger.success(`Safety net PR already exists: ${this.config.generatedFiles.safetyNetPR.url}`);
@@ -144,14 +144,21 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         }
         // Create branch
         const branchName = this.generateBranchName(`safety-net-${this.config.serviceRepository.name}`);
+        if (this.dryRun) {
+            const stacks = iacConfig.stacks || [];
+            const stackNames = stacks.map(s => s.name).filter(Boolean);
+            this.logger.info(`[DRY RUN] Would create safety net PR`);
+            this.logger.info(`  → branch: ${branchName}`);
+            this.logger.info(`  → stacks: ${stackNames.join(', ')}`);
+            this.logger.success('Safety net PR step complete (dry run)');
+            return;
+        }
         await this.git.createBranch(branchName, this.config.repositories.iacDeploy);
         // Update all stacks to have autodeploy: false
         this.files.updateAutodeployInYaml(iacConfigPath, false);
         await this.git.add(['.'], this.config.repositories.iacDeploy);
         await this.git.commit(`chore: disable autodeploy for ${this.config.serviceRepository.name} stacks (migration safety net)`, this.config.repositories.iacDeploy);
-        if (!this.dryRun) {
-            this.logger.success(`Created safety net branch: ${branchName}`);
-        }
+        this.logger.success(`Created safety net branch: ${branchName}`);
         // Push and create draft PR
         const prUrl = await this.git.createPR(branchName, `chore: disable autodeploy for ${this.config.serviceRepository.name} stacks (migration safety net)`, templates_1.PRTemplates.safetyNetPRBody(this.config.serviceRepository.name, this.config.jiraTicket), this.config.repositories.iacDeploy);
         this.config.generatedFiles.safetyNetPR = {
@@ -160,13 +167,12 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         };
         this.saveMigrationState();
         this.logger.success(`Safety net PR created: ${prUrl}`);
-        this.logger.warn(templates_1.MessageTemplates.SAFETY_NET_IMPORTANT);
     }
     /**
      * Step 4: Create Domain Enrollment PR
      */
     async createDomainEnrollmentPR() {
-        this.logger.step(4, 9, 'Create Domain Enrollment PR (adds domain for service repository)');
+        this.logger.step(4, 9, 'Domain Enrollment PR');
         // Skip if already created
         if (this.config.generatedFiles.domainEnrollmentPR) {
             this.logger.success(`Domain enrollment PR already exists: ${this.config.generatedFiles.domainEnrollmentPR.url}`);
@@ -208,8 +214,14 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
                         },
                     },
                 };
-                this.files.writeYaml(spaceliftYamlPath, initialConfig);
-                if (!this.dryRun) {
+                if (this.dryRun) {
+                    this.logger.info('[DRY RUN] Would create new domain directory');
+                    this.logger.info(`  → domain: ${this.config.serviceRepository.domain}`);
+                    this.logger.info(`  → team: ${this.config.serviceRepository.team}`);
+                    this.logger.info(`  → okta: ${(this.config.serviceRepository.oktaGroups ?? []).join(', ')}`);
+                }
+                else {
+                    this.files.writeYaml(spaceliftYamlPath, initialConfig);
                     this.logger.success('Created domain directory and spacelift.yaml');
                 }
                 needsEnrollment = true;
@@ -242,8 +254,12 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
                     autodeploy: false,
                 };
                 spaceliftConfig.metastacks = metastacks;
-                this.files.writeYaml(spaceliftYamlPath, spaceliftConfig);
-                if (!this.dryRun) {
+                if (this.dryRun) {
+                    this.logger.info('[DRY RUN] Would add metastack to existing domain');
+                    this.logger.info(`  → domain: ${this.config.serviceRepository.domain}`);
+                }
+                else {
+                    this.files.writeYaml(spaceliftYamlPath, spaceliftConfig);
                     this.logger.success('Added repository to domain enrollment');
                 }
                 needsEnrollment = true;
@@ -252,23 +268,24 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         // Only create branch and commit if there are changes
         if (needsEnrollment) {
             const branchName = this.generateBranchName(`enroll-${this.config.serviceRepository.name}`);
+            if (this.dryRun) {
+                this.logger.info('[DRY RUN] Would create domain enrollment PR');
+                this.logger.info(`  → branch: ${branchName}`);
+                this.logger.success('Domain enrollment PR step complete (dry run)');
+                return;
+            }
             await this.git.createBranch(branchName, this.config.repositories.domainEnrollment);
             await this.git.add(['.'], this.config.repositories.domainEnrollment);
             await this.git.commit(`chore: enroll ${this.config.serviceRepository.name} in ${this.config.serviceRepository.domain} domain`, this.config.repositories.domainEnrollment);
-            if (!this.dryRun) {
-                this.logger.success(`Created branch: ${branchName}`);
-            }
+            this.logger.success(`Created branch: ${branchName}`);
             // Push and create draft PR
-            const prUrl = await this.git.createPR(branchName, `chore: enroll ${this.config.serviceRepository.name} in ${this.config.serviceRepository.domain} domain`, templates_1.PRTemplates.domainEnrollmentPRBody(this.config.serviceRepository.name, this.config.serviceRepository.domain, this.config.jiraTicket), this.config.repositories.domainEnrollment);
+            const prUrl = await this.git.createPR(branchName, `chore: enroll ${this.config.serviceRepository.name} in ${this.config.serviceRepository.domain} domain`, templates_1.PRTemplates.domainEnrollmentPRBody(this.config.serviceRepository.name, this.config.serviceRepository.domain, this.config.jiraTicket, this.config.generatedFiles.safetyNetPR?.url), this.config.repositories.domainEnrollment);
             this.config.generatedFiles.domainEnrollmentPR = {
                 branch: branchName,
                 url: prUrl,
             };
             this.saveMigrationState();
-            this.logger.info('\nNext steps for domain enrollment:');
-            this.logger.info(`1. Review PR: ${prUrl}`);
-            this.logger.info(`2. Get it reviewed and approved`);
-            this.logger.info('3. Merge PR to deploy repository metastack');
+            this.logger.info(`Next: Review, approve and merge the PR: ${prUrl}`);
             const shouldContinue = await this.confirm('\nHave you merged the domain enrollment PR?', false);
             if (!shouldContinue) {
                 this.exitWithMessage('Please merge the PR before continuing');
@@ -291,13 +308,13 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         }
     }
     /**
-     * Step 5: Create Service Repository PR (spacelift.yaml, import.tf)
+     * Step 6: Create Service Repository PR (spacelift.yaml, import.tf)
      */
     async createServiceRepositoryPR() {
-        this.logger.step(5, 9, 'Create Service Repository PR (spacelift.yaml, .metastack/import.tf)');
+        this.logger.step(6, 9, 'Service Repository PR');
         // Create safety net PR first if not already created
         if (!this.config.generatedFiles.safetyNetPR) {
-            this.logger.info('\nSafety net PR not yet created, creating it first...');
+            this.logger.info('Creating safety net PR first...');
             await this.createSafetyNetPR();
         }
         // Skip if already created
@@ -315,8 +332,11 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         // Copy spacelift.yaml from iac-deploy
         const iacConfigPath = this.paths.iacConfigFile(this.config.serviceRepository.name);
         const targetSpacelliftPath = this.paths.serviceRepoSpacelliftYaml();
-        this.files.copyFile(iacConfigPath, targetSpacelliftPath);
-        if (!this.dryRun) {
+        if (this.dryRun) {
+            this.logger.info('[DRY RUN] Would copy spacelift.yaml from iac-deploy');
+        }
+        else {
+            this.files.copyFile(iacConfigPath, targetSpacelliftPath);
             this.logger.success('Created spacelift.yaml');
         }
         // Create .metastack/import.tf
@@ -329,30 +349,41 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         }
         // Only add if not already present
         if (!gitignoreContent.includes('.migration-tmp/')) {
-            gitignoreContent += constants_1.GITIGNORE_ENTRIES + '\n';
-            this.files.writeFile(gitignorePath, gitignoreContent);
-            if (!this.dryRun) {
+            if (this.dryRun) {
+                this.logger.info('[DRY RUN] Would update .gitignore');
+            }
+            else {
+                gitignoreContent += constants_1.GITIGNORE_ENTRIES + '\n';
+                this.files.writeFile(gitignorePath, gitignoreContent);
                 this.logger.success('Updated .gitignore');
             }
         }
         // Create branch and commit
         const branchName = this.generateBranchName('metastack-migration');
+        if (this.dryRun) {
+            this.logger.info('[DRY RUN] Would create service repository PR');
+            this.logger.info(`  → branch: ${branchName}`);
+            this.logger.info(`  → files: spacelift.yaml, .metastack/, .gitignore`);
+            this.logger.success('Service repository PR step complete (dry run)');
+            return;
+        }
         await this.git.createBranch(branchName, this.config.serviceRepository.path);
         await this.git.add(['spacelift.yaml', '.metastack/', '.gitignore'], this.config.serviceRepository.path);
         await this.git.commit(`chore: migrate to metastack\n\nAdd spacelift.yaml and import.tf for metastack migration`, this.config.serviceRepository.path);
-        if (!this.dryRun) {
-            this.logger.success(`Created branch: ${branchName}`);
-        }
+        this.logger.success(`Created branch: ${branchName}`);
         // Push and create draft PR
-        const prUrl = await this.git.createPR(branchName, `chore: migrate to metastack`, templates_1.PRTemplates.serviceRepoPRBody(this.config.serviceRepository.name, this.config.jiraTicket), this.config.serviceRepository.path);
+        const prUrl = await this.git.createPR(branchName, `chore: migrate to metastack`, templates_1.PRTemplates.serviceRepoPRBody(this.config.serviceRepository.name, this.config.jiraTicket, {
+            safetyNet: this.config.generatedFiles.safetyNetPR?.url,
+            domainEnrollment: this.config.generatedFiles.domainEnrollmentPR?.url,
+            iacDeployCleanup: this.config.generatedFiles.iacDeployPR?.url,
+        }), this.config.serviceRepository.path);
         this.config.generatedFiles.serviceRepoPR = {
             branch: branchName,
             url: prUrl,
         };
         this.saveMigrationState();
+        this.logger.success(`Service repository PR created: ${prUrl}`);
         this.logger.warn(templates_1.MessageTemplates.CLEANUP_PR_NOT_MERGE_WARNING);
-        this.logger.info(templates_1.MessageTemplates.CLEANUP_PR_MERGE_TIMING);
-        this.logger.info(`PR URL: ${prUrl}`);
     }
     /**
      * Generate import.tf file with import blocks for stacks
@@ -362,12 +393,12 @@ class MigrationTool extends migration_helper_1.MigrationHelper {
         this.files.mkdir(metastackDir, { recursive: true });
         // Ensure spacectl is authenticated before fetching resources
         await this.ensureSpacectlAuthentication();
-        this.logger.info('Fetching stack resources from projects-manager...');
+        this.logger.info('Fetching stack resources...');
         // Fetch all resources from projects-manager
         let projectManagerResources = '';
         try {
             projectManagerResources = this.getStackResourcesFromDirectory(constants_1.STACK_MANAGERS.projectsManager, this.config.repositories.iacDeploy);
-            this.logger.success('Fetched resources from projects-manager');
+            this.logger.success('Fetched resources');
         }
         catch (error) {
             this.logger.error(`Failed to fetch resources from projects-manager: ${error}`);
@@ -456,10 +487,17 @@ import {
             }
         }
         const importPath = this.paths.importTfFile();
-        this.files.writeFile(importPath, importTf);
-        if (!this.dryRun) {
-            this.logger.success('Created .metastack/import.tf with import blocks');
-            this.logger.info(`  Total stacks: ${this.config.stacks.length}`);
+        if (this.dryRun) {
+            const stackIds = this.config.stacks.map(s => s.identifier).slice(0, 5);
+            const more = this.config.stacks.length > 5
+                ? ` (+${this.config.stacks.length - 5} more)`
+                : '';
+            this.logger.info(`[DRY RUN] Would create import.tf (${this.config.stacks.length} stacks)`);
+            this.logger.info(`  → stacks: ${stackIds.join(', ')}${more}`);
+        }
+        else {
+            this.files.writeFile(importPath, importTf);
+            this.logger.success(`Created .metastack/import.tf (${this.config.stacks.length} stacks)`);
         }
         // Update version.tf with Spacelift provider
         const versionTfPath = path.join(metastackDir, 'version.tf');
@@ -472,20 +510,23 @@ import {
         const existingContent = this.files.readFile(versionTfPath);
         // Check if spacelift provider is already configured
         if (!existingContent.includes('spacelift')) {
-            this.logger.info('Updating version.tf to include Spacelift provider...');
+            this.logger.info('Adding Spacelift provider to version.tf...');
             const updatedContent = this.addSpaceliftProviderToVersionTf(existingContent);
             if (updatedContent !== existingContent) {
-                this.files.writeFile(versionTfPath, updatedContent);
-                if (!this.dryRun) {
-                    this.logger.success('Updated version.tf with Spacelift provider');
+                if (this.dryRun) {
+                    this.logger.info('[DRY RUN] Would add Spacelift provider to version.tf');
+                }
+                else {
+                    this.files.writeFile(versionTfPath, updatedContent);
+                    this.logger.success('Added Spacelift provider');
                 }
             }
             else {
-                this.logger.warn('Could not update version.tf automatically - please add Spacelift provider manually');
+                this.logger.warn('Could not update version.tf, you should add the Spacelift provider manually');
             }
         }
         else {
-            this.logger.info('version.tf already contains Spacelift provider');
+            this.logger.info('Spacelift provider already in version.tf');
         }
     }
     /**
@@ -594,53 +635,61 @@ $2`);
         return { contexts, dependencies };
     }
     /**
-     * Step 6: Create Cleanup PR for iac-deploy
+     * Step 5: Create iac-deploy Cleanup PR
      */
-    async createCleanupPRs() {
-        this.logger.step(6, 9, 'Create Cleanup PR for iac-deploy (remove old resources)');
+    async createIacDeployCleanupPR() {
+        this.logger.step(5, 9, 'iac-deploy Cleanup PR');
         // Ask for confirmation before creating cleanup PR
         const shouldCreate = await this.confirm('\nCreate and push cleanup PR (iac-deploy)?', true);
         if (!shouldCreate) {
             this.logger.warn('Skipping cleanup PR creation');
             return;
         }
-        await this.createIacDeployCleanupPR();
+        await this.doCreateIacDeployCleanupPR();
         await this.generateMigrationProcedure();
+        this.logger.success('iac-deploy Cleanup PR step complete');
         this.logger.warn(templates_1.MessageTemplates.CLEANUP_PR_NOT_MERGE_WARNING);
-        this.logger.info(templates_1.MessageTemplates.CLEANUP_PR_STATE_REMOVAL_WARNING);
     }
     /**
-     * Create cleanup PR for iac-deploy
+     * Create cleanup PR for iac-deploy (internal)
      */
-    async createIacDeployCleanupPR() {
-        this.logger.info('\nCreating iac-deploy cleanup PR...');
+    async doCreateIacDeployCleanupPR() {
+        this.logger.info('Creating iac-deploy cleanup PR...');
         const configPath = this.paths.iacConfigFile(this.config.serviceRepository.name);
         // Remove the config file
         const shouldDelete = await this.confirm(`Delete ${this.config.serviceRepository.name}.yaml from iac-deploy?`, true);
         if (shouldDelete) {
             const branchName = this.generateBranchName(`cleanup-${this.config.serviceRepository.name}`);
+            if (this.dryRun) {
+                this.logger.info('[DRY RUN] Would create iac-deploy cleanup PR');
+                this.logger.info(`  → branch: ${branchName}`);
+                this.logger.info(`  → removes: ${this.config.serviceRepository.name}.yaml`);
+                this.logger.success('iac-deploy cleanup PR step complete (dry run)');
+                return;
+            }
             await this.git.createBranch(branchName, this.config.repositories.iacDeploy);
             this.files.deleteFile(configPath);
             await this.git.add(['.'], this.config.repositories.iacDeploy);
             await this.git.commit(`chore: remove ${this.config.serviceRepository.name} config (migrated to metastack)`, this.config.repositories.iacDeploy);
-            if (!this.dryRun) {
-                this.logger.success(`Created iac-deploy cleanup branch: ${branchName}`);
-            }
+            this.logger.success(`Created iac-deploy cleanup branch: ${branchName}`);
             // Push and create draft PR
-            const prUrl = await this.git.createPR(branchName, `chore: remove ${this.config.serviceRepository.name} config (migrated to metastack)`, templates_1.PRTemplates.iacDeployCleanupPRBody(this.config.serviceRepository.name, this.config.jiraTicket), this.config.repositories.iacDeploy);
+            const prUrl = await this.git.createPR(branchName, `chore: remove ${this.config.serviceRepository.name} config (migrated to metastack)`, templates_1.PRTemplates.iacDeployCleanupPRBody(this.config.serviceRepository.name, this.config.jiraTicket, {
+                safetyNet: this.config.generatedFiles.safetyNetPR?.url,
+                domainEnrollment: this.config.generatedFiles.domainEnrollmentPR?.url,
+            }), this.config.repositories.iacDeploy);
             this.config.generatedFiles.iacDeployPR = {
                 branch: branchName,
                 url: prUrl,
             };
             this.saveMigrationState();
-            this.logger.info(`PR URL: ${prUrl}`);
+            this.logger.success(`iac-deploy cleanup PR created: ${prUrl}`);
         }
     }
     /**
      * Step 7: Generate State Removal Commands
      */
     async generateStateRemovalCommands() {
-        this.logger.step(7, 9, 'Generate State Removal Commands (spacectl stacks task)');
+        this.logger.step(7, 9, 'State Removal Commands');
         let commands = `# State Removal Commands
 # These commands must be run BEFORE merging cleanup PRs
 # They use spacectl to safely remove resources from Terraform state
@@ -666,24 +715,18 @@ $2`);
         }
         const commandsPath = this.paths.stateRemovalCommands;
         this.files.writeFile(commandsPath, commands);
-        if (!this.dryRun) {
-            this.logger.success(`Generated state removal commands: ${commandsPath}`);
-            this.config.generatedFiles.stateRemovalCommands = commandsPath;
-            // Save state after generating commands
-            this.saveMigrationState();
-            this.logger.info(templates_1.MessageTemplates.STATE_REMOVAL_REVIEW_WARNING);
-        }
+        this.config.generatedFiles.stateRemovalCommands = commandsPath;
+        this.saveMigrationState();
+        this.logger.success(`State removal commands generated: ${commandsPath}`);
+        this.logger.warn(templates_1.MessageTemplates.STATE_REMOVAL_REVIEW_WARNING);
     }
     /**
      * Step 8: Update Stack Spaces
      */
     async updateStackSpaces() {
-        this.logger.step(8, 9, 'Update Stack Spaces (Move stacks to domain space)');
+        this.logger.step(8, 9, 'Update Stack Spaces to domain space');
         this.logger.info(templates_1.MessageTemplates.STACK_SPACES_DESCRIPTION);
-        this.logger.info(templates_1.MessageTemplates.STACK_SPACES_REASON);
-        this.logger.info('');
         this.logger.warn(templates_1.MessageTemplates.STACK_SPACES_IMPORTANT_TIMING);
-        this.logger.info('');
         const shouldUpdate = await this.confirm('Update stack spaces now?', false);
         if (!shouldUpdate) {
             this.logger.warn('Skipping stack space update');
@@ -696,26 +739,24 @@ $2`);
         const targetSpaceName = `domain-${this.config.serviceRepository.domain}`;
         this.logger.info(`Target space: ${targetSpaceName}`);
         if (this.dryRun) {
-            this.logger.info('\n[DRY RUN] Would update stack spaces:');
-            this.logger.info(`  Target space: ${targetSpaceName}`);
-            this.logger.info(`  Stacks to update: ${this.config.stacks.length}`);
-            for (const stack of this.config.stacks) {
-                const stackId = this.getStackModuleKey(stack);
-                this.logger.info(`    - ${stackId}`);
-            }
+            const stackIds = this.config.stacks.map(s => s.identifier).slice(0, 5);
+            const more = this.config.stacks.length > 5
+                ? ` (+${this.config.stacks.length - 5} more)`
+                : '';
+            this.logger.info(`[DRY RUN] Would move ${this.config.stacks.length} stacks to ${targetSpaceName}`);
+            this.logger.info(`  → stacks: ${stackIds.join(', ')}${more}`);
+            this.logger.success('Migrate spaces step complete (dry run)');
             return;
         }
         // Initialize GraphQL client
         const client = new spacelift_client_1.SpaceliftGraphQLClient();
-        // Get the target space ID
-        this.logger.info(`\nLooking up space ID for "${targetSpaceName}"...`);
+        this.logger.info(`Looking up space ID for ${targetSpaceName}...`);
         const targetSpaceId = await client.getSpaceByPath(targetSpaceName);
         if (!targetSpaceId) {
             throw new Error(`Space "${targetSpaceName}" not found. Please ensure the domain enrollment PR has been merged and the space has been created.`);
         }
         this.logger.success(`Found target space ID: ${targetSpaceId}`);
-        // Update each stack
-        this.logger.info(`\nUpdating ${this.config.stacks.length} stacks...`);
+        this.logger.info(`Updating ${this.config.stacks.length} stacks...`);
         const results = [];
         for (const stack of this.config.stacks) {
             const stackId = this.getStackModuleKey(stack);
@@ -758,35 +799,35 @@ $2`);
         const successful = results.filter(r => r.success).length;
         const alreadyInTarget = results.filter(r => r.alreadyInTargetSpace).length;
         const failed = results.filter(r => !r.success).length;
-        this.logger.info('\nStack space update summary:');
-        this.logger.info(`  Successful updates: ${successful - alreadyInTarget}`);
-        this.logger.info(`  Already in target space: ${alreadyInTarget}`);
+        this.logger.info(`Summary: ${successful - alreadyInTarget} updated, ${alreadyInTarget} already in place`);
         if (failed > 0) {
-            this.logger.error(`  Failed: ${failed}`);
-            this.logger.info('\nFailed stacks:');
+            this.logger.error(`Failed: ${failed}`);
             results
                 .filter(r => !r.success)
-                .forEach(r => {
-                this.logger.error(`  - ${r.stackId}: ${r.error}`);
-            });
-            throw new Error(`Failed to update ${failed} stack(s). Please review the errors above.`);
+                .forEach(r => this.logger.error(`  ${r.stackId}: ${r.error}`));
+            throw new Error(`Failed to update ${failed} stack(s)`);
         }
-        this.logger.success('\nAll stacks successfully updated to target space');
+        this.logger.success('All stacks updated');
     }
     /**
      * Step 9: Generate Migration Procedure
      */
     async generateMigrationProcedure() {
-        this.logger.step(9, 9, 'Generate Migration Procedure Documentation');
+        this.logger.step(9, 9, 'Generate Procedure doc');
         const procedure = (0, templates_1.generateMigrationProcedure)(this.config);
         const procedurePath = this.paths.procedure;
-        this.files.writeFile(procedurePath, procedure);
-        if (!this.dryRun) {
-            this.logger.success(`Generated migration procedure: ${procedurePath}`);
-            this.config.generatedFiles.migrationProcedure = procedurePath;
-            // Save final state
-            this.saveMigrationState();
+        if (this.dryRun) {
+            this.logger.info('[DRY RUN] Would generate migration procedure');
+            this.logger.info(`  → path: ${procedurePath}`);
+            this.logger.info(`  → domain: ${this.config.serviceRepository.domain}`);
+            this.logger.info(`  → stacks: ${this.config.stacks.length}`);
+            this.logger.success('Generate procedure step complete (dry run)');
+            return;
         }
+        this.files.writeFile(procedurePath, procedure);
+        this.logger.success(`Generated migration procedure: ${procedurePath}`);
+        this.config.generatedFiles.migrationProcedure = procedurePath;
+        this.saveMigrationState();
     }
     /**
      * Display migration state
@@ -844,21 +885,65 @@ $2`);
         }
     }
     /**
-     * Clean up migration files
+     * Clean up migration (creates PR + removes local files)
      */
     async cleanupMigration() {
         this.logger.section('Migration Cleanup');
-        this.logger.info('This will remove all migration-related files:');
-        this.logger.info(`  - ${this.paths.tmpDir} (cloned repositories)`);
-        this.logger.info(`  - ${this.paths.migrationState} (migration state)`);
-        this.logger.info(`  - ${this.paths.stateRemovalCommands}`);
-        this.logger.info(`  - ${this.paths.procedure}`);
+        this.logger.warn('⚠️  Only run this AFTER all migration PRs are merged and resources are imported!');
+        this.logger.info('');
+        this.logger.info('This will:');
+        this.logger.info('  1. Create a PR to remove import.tf and spacelift provider');
+        this.logger.info('  2. Remove local temp files (.migration-tmp, state, scripts)');
         this.logger.info('');
-        const shouldCleanup = await this.confirm('Remove all migration files?', false);
+        const shouldCleanup = await this.confirm('Proceed with cleanup?', true);
         if (!shouldCleanup) {
             this.logger.info('Cleanup cancelled');
             return;
         }
+        // --- Part 1: Create cleanup PR ---
+        const importTfPath = this.paths.importTfFile();
+        const versionTfPath = path.join(this.paths.metastackDir, 'version.tf');
+        const branchName = this.generateBranchName('cleanup');
+        const canCreatePR = this.files.exists(importTfPath) && this.files.exists(versionTfPath);
+        if (canCreatePR) {
+            if (this.dryRun) {
+                this.logger.info('[DRY RUN] Would create cleanup PR');
+                this.logger.info(`  → branch: ${branchName}`);
+                this.logger.info(`  → removes: import.tf, spacelift provider`);
+            }
+            else {
+                await this.git.createBranch(branchName, this.config.serviceRepository.path);
+                // Remove import.tf
+                this.files.deleteFile(importTfPath);
+                this.logger.success('Deleted .metastack/import.tf');
+                // Remove spacelift provider from version.tf
+                const versionTfContent = this.files.readFile(versionTfPath);
+                const updatedVersionTf = this.removeSpaceliftProviderFromVersionTf(versionTfContent);
+                if (updatedVersionTf !== versionTfContent) {
+                    this.files.writeFile(versionTfPath, updatedVersionTf);
+                    this.logger.success('Removed Spacelift provider from version.tf');
+                }
+                // Commit and create PR
+                await this.git.add(['.metastack/'], this.config.serviceRepository.path);
+                await this.git.commit(`chore: remove migration files (import.tf and spacelift provider)`, this.config.serviceRepository.path);
+                const prUrl = await this.git.createPR(branchName, 'chore: remove migration files (import.tf and spacelift provider)', templates_1.PRTemplates.postMigrationCleanupPRBody(this.config.serviceRepository.name, this.config.jiraTicket), this.config.serviceRepository.path);
+                this.logger.success(`Cleanup PR created: ${prUrl}`);
+            }
+        }
+        else {
+            this.logger.info('Skipping PR creation (import.tf already removed)');
+        }
+        // --- Part 2: Remove local temp files ---
+        this.logger.info('');
+        if (this.dryRun) {
+            this.logger.info('[DRY RUN] Would remove local temp files');
+            this.logger.info(`  → ${this.paths.tmpDir}`);
+            this.logger.info(`  → ${this.paths.migrationState}`);
+            this.logger.info(`  → ${this.paths.stateRemovalCommands}`);
+            this.logger.info(`  → ${this.paths.procedure}`);
+            this.logger.success('Cleanup step complete (dry run)');
+            return;
+        }
         const filesToRemove = [
             this.paths.tmpDir,
             this.paths.migrationState,
@@ -869,82 +954,15 @@ $2`);
             if (this.files.exists(file)) {
                 if (this.files.isDirectory(file)) {
                     this.files.deleteDirectory(file);
-                    this.logger.success(`Removed directory: ${path.basename(file)}`);
+                    this.logger.success(`Removed: ${path.basename(file)}`);
                 }
                 else {
                     this.files.deleteFile(file);
-                    this.logger.success(`Removed file: ${path.basename(file)}`);
+                    this.logger.success(`Removed: ${path.basename(file)}`);
                 }
             }
         }
-        this.logger.info('');
-        const shouldRemoveScript = await this.confirm('Remove the migration script (migrate-to-metastack.ts)?', false);
-        if (shouldRemoveScript) {
-            const scriptPath = path.join(this.config.serviceRepository.path, 'migrate-to-metastack.ts');
-            this.files.deleteFile(scriptPath);
-            this.logger.success('Removed migrate-to-metastack.ts');
-        }
         this.logger.success('\nCleanup complete!');
-        this.logger.info('Migration files have been removed');
-    }
-    /**
-     * Create Final Cleanup PR (remove import.tf and spacelift provider from version.tf)
-     */
-    async createFinalCleanupPR() {
-        this.logger.section('Final Cleanup PR');
-        this.logger.info('This command creates a PR to remove temporary migration files:');
-        this.logger.info('  - .metastack/import.tf');
-        this.logger.info('  - Spacelift provider from .metastack/version.tf');
-        this.logger.info('');
-        this.logger.warn('⚠️  Only run this AFTER all migration PRs are merged and resources are imported!');
-        this.logger.info('');
-        const shouldCreate = await this.confirm('Create final cleanup PR on service repository?', true);
-        if (!shouldCreate) {
-            this.logger.warn('Skipping final cleanup PR creation');
-            return;
-        }
-        const importTfPath = this.paths.importTfFile();
-        const versionTfPath = path.join(this.paths.metastackDir, 'version.tf');
-        // Check if files exist
-        if (!this.files.exists(importTfPath)) {
-            this.logger.warn(`import.tf not found at ${importTfPath} - it may have already been removed`);
-            return;
-        }
-        if (!this.files.exists(versionTfPath)) {
-            this.logger.error(`version.tf not found at ${versionTfPath}`);
-            return;
-        }
-        // Create branch
-        const branchName = this.generateBranchName('final-cleanup');
-        await this.git.createBranch(branchName, this.config.serviceRepository.path);
-        // Remove import.tf
-        this.files.deleteFile(importTfPath);
-        if (!this.dryRun) {
-            this.logger.success('Deleted .metastack/import.tf');
-        }
-        // Remove spacelift provider from version.tf
-        const versionTfContent = this.files.readFile(versionTfPath);
-        const updatedVersionTf = this.removeSpaceliftProviderFromVersionTf(versionTfContent);
-        if (updatedVersionTf !== versionTfContent) {
-            this.files.writeFile(versionTfPath, updatedVersionTf);
-            if (!this.dryRun) {
-                this.logger.success('Removed Spacelift provider from version.tf');
-            }
-        }
-        else {
-            this.logger.warn('Spacelift provider not found in version.tf or could not be removed');
-        }
-        // Commit changes
-        await this.git.add(['.metastack/'], this.config.serviceRepository.path);
-        await this.git.commit(`chore: remove migration files (import.tf and spacelift provider)\n\nRemove temporary migration files after successful import`, this.config.serviceRepository.path);
-        if (!this.dryRun) {
-            this.logger.success(`Created branch: ${branchName}`);
-        }
-        // Push and create draft PR
-        const prUrl = await this.git.createPR(branchName, 'chore: remove migration files (import.tf and spacelift provider)', templates_1.PRTemplates.finalCleanupPRBody(this.config.serviceRepository.name, this.config.jiraTicket), this.config.serviceRepository.path);
-        this.logger.success(`Final cleanup PR created: ${prUrl}`);
-        this.logger.info('');
-        this.logger.warn('⚠️  Only merge this PR after confirming all resources are imported!');
     }
     /**
      * Full migration workflow
@@ -952,10 +970,8 @@ $2`);
     async run() {
         this.logger.section('Metastack Migration Tool');
         this.logger.info('This tool will guide you through the metastack migration');
-        this.logger.info('');
         if (this.dryRun) {
             this.logger.warn(templates_1.MessageTemplates.DRY_RUN_MODE_WARNING);
-            this.logger.info('');
         }
         // Load existing migration state if available
         const hasExistingState = this.loadMigrationState();
@@ -967,42 +983,28 @@ $2`);
         await this.loadConfiguration();
         await this.createSafetyNetPR();
         await this.createDomainEnrollmentPR();
+        await this.createIacDeployCleanupPR();
         await this.createServiceRepositoryPR();
-        await this.createCleanupPRs();
         await this.generateStateRemovalCommands();
         await this.generateMigrationProcedure();
         this.logger.section('Migration Setup Complete!');
-        this.logger.success('All preparation complete');
         this.logger.info('');
         // Display PR URLs
         this.logger.info('Created Pull Requests:');
         if (this.config.generatedFiles.safetyNetPR) {
-            this.logger.info(`  Safety Net (autodeploy=false): ${this.config.generatedFiles.safetyNetPR.url}`);
+            this.logger.info(`  1. Safety Net: ${this.config.generatedFiles.safetyNetPR.url}`);
         }
         if (this.config.generatedFiles.domainEnrollmentPR) {
-            this.logger.info(`  Domain Enrollment: ${this.config.generatedFiles.domainEnrollmentPR.url}`);
-        }
-        if (this.config.generatedFiles.serviceRepoPR) {
-            this.logger.info(`  Service Repository: ${this.config.generatedFiles.serviceRepoPR.url}`);
+            this.logger.info(`  2. Domain Enrollment: ${this.config.generatedFiles.domainEnrollmentPR.url}`);
         }
         if (this.config.generatedFiles.iacDeployPR) {
-            this.logger.info(`  iac-deploy Cleanup: ${this.config.generatedFiles.iacDeployPR.url}`);
+            this.logger.info(`  3. iac-deploy Cleanup: ${this.config.generatedFiles.iacDeployPR.url}`);
+        }
+        if (this.config.generatedFiles.serviceRepoPR) {
+            this.logger.info(`  4. Service Repository: ${this.config.generatedFiles.serviceRepoPR.url}`);
         }
         this.logger.info('');
-        this.logger.info('Generated files:');
-        this.logger.info(`  - ${this.config.generatedFiles.migrationProcedure}`);
-        this.logger.info(`  - ${this.config.generatedFiles.stateRemovalCommands}`);
-        this.logger.info('');
-        this.logger.warn(templates_1.MessageTemplates.FINAL_WORKFLOW_NEXT_STEPS);
-        this.logger.info('1. Review the PRs above');
-        this.logger.info('2. Review METASTACK_MIGRATION_PROCEDURE.md');
-        this.logger.info('3. Execute state removal commands from METASTACK_STATE_REMOVAL_COMMANDS.sh');
-        this.logger.info('4. Run migrate-spaces command manually: nx run <project>:stack-migration --command=migrate-spaces');
-        this.logger.info('5. Follow the migration procedure to merge PRs in correct order');
-        this.logger.info('');
-        this.logger.warn(templates_1.MessageTemplates.FINAL_WORKFLOW_EXECUTE_ORDER_WARNING);
-        this.logger.info('');
-        this.logger.info('Note: Migration state saved to .migration-state.json for resumability');
+        this.logger.info('Follow the migration procedure in METASTACK_MIGRATION_PROCEDURE.md');
     }
 }
 exports.MigrationTool = MigrationTool;