@salesforce/plugin-omnistudio-migration-tool 2.0.0-rc.4 → 2.0.0-rc.41

package/lib/migration/omniscript.js

@@ -9,6 +9,7 @@ const Element_1 = __importDefault(require("../mappings/Element"));
 const OmniScriptDefinition_1 = __importDefault(require("../mappings/OmniScriptDefinition"));
 const utils_1 = require("../utils");
 const base_1 = require("./base");
+const interfaces_1 = require("./interfaces");
 const net_1 = require("../utils/net");
 const FormulaUtil_1 = require("../utils/formula/FormulaUtil");
 const stringval_1 = require("../utils/StringValue/stringval");
@@ -19,11 +20,22 @@ const storageUtil_1 = require("../utils/storageUtil");
 class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
     constructor(exportType, namespace, connection, logger, messages, ux, allVersions) {
         super(namespace, connection, logger, messages, ux);
+        // Reserved keys that should not be used for storing output
+        this.reservedKeys = new Set(['Request', 'Response', 'Condition']);
+        // Tags to validate in PropertySet for reserved key usage
+        this.tagsToValidate = new Set(['additionalOutput']);
+        // constants
+        this.OMNISCRIPT = 'OmniScript';
         this.exportType = exportType;
         this.allVersions = allVersions;
     }
-    getName() {
-        return 'OmniScript / Integration Procedures';
+    getName(singular = false) {
+        if (this.exportType === OmniScriptExportType.IP) {
+            return singular ? 'Integration Procedure' : 'Integration Procedures';
+        }
+        else if (this.exportType === OmniScriptExportType.OS) {
+            return singular ? 'Omniscript' : 'Omniscripts';
+        }
     }
     getRecordName(record) {
         return (record[this.namespacePrefix + 'Type__c'] +
@@ -116,13 +128,18 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
     }
     async assess(dataRaptorAssessmentInfos, flexCardAssessmentInfos) {
         try {
-            logger_1.Logger.log(this.messages.getMessage('startingOmniScriptAssessment'));
+            const exportComponentType = this.getName();
+            logger_1.Logger.log(this.messages.getMessage('startingOmniScriptAssessment', [exportComponentType]));
             const omniscripts = await this.getAllOmniScripts();
-            logger_1.Logger.log(this.messages.getMessage('foundOmniScriptsToAssess', [omniscripts.length]));
+            logger_1.Logger.log(this.messages.getMessage('foundOmniScriptsToAssess', [omniscripts.length, exportComponentType]));
             const omniAssessmentInfos = await this.processOmniComponents(omniscripts, dataRaptorAssessmentInfos, flexCardAssessmentInfos);
+            await this.updateStorageForOmniscriptAssessment(omniAssessmentInfos === null || omniAssessmentInfos === void 0 ? void 0 : omniAssessmentInfos.osAssessmentInfos);
             return omniAssessmentInfos;
         }
         catch (err) {
+            if (err instanceof interfaces_1.InvalidEntityTypeError) {
+                throw err;
+            }
             logger_1.Logger.error(this.messages.getMessage('errorDuringOmniScriptAssessment'), err);
         }
     }
@@ -133,7 +150,8 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         const existingOmniscriptNames = new Set();
         const existingDataRaptorNames = new Set(dataRaptorAssessmentInfos.map((info) => info.name));
         const existingFlexCardNames = new Set(flexCardAssessmentInfos.map((info) => info.name));
-        const progressBar = (0, base_2.createProgressBar)('Assessing', 'Omniscript and Integration Procedure');
+        const progressBarType = this.getName();
+        const progressBar = (0, base_2.createProgressBar)('Assessing', progressBarType);
         let progressCounter = 0;
         progressBar.start(omniscripts.length, progressCounter);
         // First, collect all OmniScript names from the omniscripts array
@@ -161,7 +179,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                         infos: [],
                         warnings: [],
                         errors: [this.messages.getMessage('unexpectedError')],
-                        migrationStatus: 'Can be Automated',
+                        migrationStatus: 'Failed',
                         type: 'OmniScript',
                         missingIP: [],
                         missingDR: [],
@@ -181,6 +199,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                         warnings: [],
                         errors: [this.messages.getMessage('unexpectedError')],
                         path: '',
+                        migrationStatus: 'Failed',
                     });
                 }
                 const error = e;
@@ -189,11 +208,6 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             }
             if (omniAssessmentInfo.type === 'OmniScript') {
                 const type = omniscript[this.namespacePrefix + 'IsLwcEnabled__c'] ? 'LWC' : 'Angular';
-                let migrationStatus = 'Can be Automated';
-                if (type === 'Angular') {
-                    omniAssessmentInfo.warnings.unshift(this.messages.getMessage('angularOSWarning'));
-                    migrationStatus = 'Need Manual Intervention';
-                }
                 const osAssessmentInfo = {
                     name: omniAssessmentInfo.name,
                     type: type,
@@ -210,7 +224,8 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                     infos: [],
                     warnings: omniAssessmentInfo.warnings,
                     errors: [],
-                    migrationStatus: migrationStatus,
+                    migrationStatus: omniAssessmentInfo.migrationStatus,
+                    nameMapping: omniAssessmentInfo.nameMapping,
                 };
                 osAssessmentInfos.push(osAssessmentInfo);
             }
@@ -225,6 +240,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                     dependenciesRemoteAction: omniAssessmentInfo.dependenciesRemoteAction,
                     infos: [],
                     warnings: omniAssessmentInfo.warnings,
+                    migrationStatus: omniAssessmentInfo.migrationStatus,
                     errors: [],
                     path: '',
                 };
@@ -250,10 +266,26 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         const dependenciesRA = [];
         const dependenciesLWC = [];
         //const missingRA: string[] = [];
+        // Check for duplicate element names within the same OmniScript
+        const elementNames = new Set();
+        const duplicateElementNames = new Set();
+        // Track reserved keys found in PropertySet
+        const foundReservedKeys = new Set();
+        for (const elem of elements) {
+            const elemName = elem['Name'];
+            if (elementNames.has(elemName)) {
+                duplicateElementNames.add(elemName);
+            }
+            else {
+                elementNames.add(elemName);
+            }
+        }
         for (const elem of elements) {
             const type = elem[this.namespacePrefix + 'Type__c'];
             const elemName = `${elem['Name']}`;
             const propertySet = JSON.parse(elem[this.namespacePrefix + 'PropertySet__c'] || '{}');
+            // Collect reserved keys from PropertySet
+            this.collectReservedKeys(propertySet, foundReservedKeys);
             // Check for OmniScript dependencies
             if (type === 'OmniScript') {
                 const nameVal = `${elemName}`;
@@ -278,7 +310,12 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                 }
             }
             // Check for DataRaptor dependencies
-            if (['DataRaptor Extract Action', 'DataRaptor Turbo Action', 'DataRaptor Post Action'].includes(type)) {
+            if ([
+                'DataRaptor Extract Action',
+                'DataRaptor Turbo Action',
+                'DataRaptor Transform Action',
+                'DataRaptor Post Action',
+            ].includes(type)) {
                 const nameVal = `${elemName}`;
                 dependencyDR.push({ name: propertySet['bundle'], location: nameVal });
                 if (!existingOmniscriptNames.has(nameVal) && !existingDataRaptorNames.has(nameVal)) {
@@ -318,12 +355,36 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         const existingSubTypeVal = new stringval_1.StringVal(existingSubType, 'sub type');
         const omniScriptName = omniscript[this.namespacePrefix + 'Name'];
         const existingOmniScriptNameVal = new stringval_1.StringVal(omniScriptName, 'name');
+        let assessmentStatus = 'Ready for migration';
         const warnings = [];
-        if (omniProcessType === 'OmniScript') {
-            this.addToAssessmentStorage(existingTypeVal, existingSubTypeVal, omniscript[this.namespacePrefix + 'Language__c']);
+        const errors = [];
+        // Check for missing mandatory fields for Integration Procedures
+        if (omniProcessType === 'Integration Procedure') {
+            if (!existingType || existingType.trim() === '') {
+                errors.push(this.messages.getMessage('missingMandatoryField', ['Type', 'Integration Procedure']));
+                assessmentStatus = 'Needs Manual Intervention';
+            }
+            if (!existingSubType || existingSubType.trim() === '') {
+                errors.push(this.messages.getMessage('missingMandatoryField', ['SubType', 'Integration Procedure']));
+                assessmentStatus = 'Needs Manual Intervention';
+            }
+        }
+        // Check for Angular OmniScript dependencies
+        for (const osDep of dependencyOS) {
+            if (this.nameRegistry.isAngularOmniScript(osDep.name)) {
+                warnings.push(this.messages.getMessage('angularOmniScriptDependencyWarning', [osDep.location, osDep.name]));
+                assessmentStatus = 'Needs Manual Intervention';
+            }
         }
-        const recordName = `${existingTypeVal.cleanName()}_` +
-            `${existingSubTypeVal.cleanName()}` +
+        // This we need broken down, better create an object and propagate it
+        // Here break it and then combine it
+        const newType = existingTypeVal.cleanName();
+        const newSubType = existingSubTypeVal.cleanName();
+        const newLanguage = omniscript[this.namespacePrefix + 'Language__c']
+            ? `${omniscript[this.namespacePrefix + 'Language__c']}`
+            : '';
+        const recordName = `${newType}_` +
+            `${newSubType}` +
             (omniscript[this.namespacePrefix + 'Language__c'] ? `_${omniscript[this.namespacePrefix + 'Language__c']}` : '') +
             `_${omniscript[this.namespacePrefix + 'Version__c']}`;
         const oldName = `${existingTypeVal.val}_` +
@@ -331,18 +392,32 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             (omniscript[this.namespacePrefix + 'Language__c'] ? `_${omniscript[this.namespacePrefix + 'Language__c']}` : '') +
             `_${omniscript[this.namespacePrefix + 'Version__c']}`;
         if (!existingTypeVal.isNameCleaned()) {
-            warnings.push(this.messages.getMessage('changeMessage', [
-                existingTypeVal.type,
-                existingTypeVal.val,
-                existingTypeVal.cleanName(),
-            ]));
+            if (omniProcessType === 'Integration Procedure' && (!newType || newType.trim() === '')) {
+                warnings.push(this.messages.getMessage('integrationProcedureTypeEmptyAfterCleaning', [existingTypeVal.val]));
+                assessmentStatus = 'Needs Manual Intervention';
+            }
+            else {
+                warnings.push(this.messages.getMessage('changeMessage', [
+                    existingTypeVal.type,
+                    existingTypeVal.val,
+                    existingTypeVal.cleanName(),
+                ]));
+                assessmentStatus = 'Warnings';
+            }
         }
         if (!existingSubTypeVal.isNameCleaned()) {
-            warnings.push(this.messages.getMessage('changeMessage', [
-                existingSubTypeVal.type,
-                existingSubTypeVal.val,
-                existingSubTypeVal.cleanName(),
-            ]));
+            if (omniProcessType === 'Integration Procedure' && (!newSubType || newSubType.trim() === '')) {
+                warnings.push(this.messages.getMessage('integrationProcedureSubtypeEmptyAfterCleaning', [existingSubTypeVal.val]));
+                assessmentStatus = 'Needs Manual Intervention';
+            }
+            else {
+                warnings.push(this.messages.getMessage('changeMessage', [
+                    existingSubTypeVal.type,
+                    existingSubTypeVal.val,
+                    existingSubTypeVal.cleanName(),
+                ]));
+                assessmentStatus = 'Warnings';
+            }
         }
         if (!existingOmniScriptNameVal.isNameCleaned()) {
             warnings.push(this.messages.getMessage('changeMessage', [
@@ -350,14 +425,35 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                 existingOmniScriptNameVal.val,
                 existingOmniScriptNameVal.cleanName(),
             ]));
+            assessmentStatus = 'Warnings';
         }
         if (existingOmniscriptNames.has(recordName)) {
             warnings.push(this.messages.getMessage('duplicatedName') + '  ' + recordName);
+            assessmentStatus = 'Needs Manual Intervention';
         }
         else {
             existingOmniscriptNames.add(recordName);
         }
-        return {
+        // Add warning for duplicate element names within the same OmniScript
+        if (duplicateElementNames.size > 0) {
+            const duplicateNamesList = Array.from(duplicateElementNames).join(', ');
+            warnings.unshift(this.messages.getMessage('invalidOrRepeatingOmniscriptElementNames', [duplicateNamesList]));
+            assessmentStatus = 'Needs Manual Intervention';
+        }
+        // Add warning for reserved keys found in PropertySet
+        if (foundReservedKeys.size > 0) {
+            const reservedKeysList = Array.from(foundReservedKeys).join(', ');
+            warnings.unshift(this.messages.getMessage('reservedKeysFoundInPropertySet', [reservedKeysList]));
+            assessmentStatus = 'Needs Manual Intervention';
+        }
+        if (omniProcessType === this.OMNISCRIPT) {
+            const type = omniscript[this.namespacePrefix + 'IsLwcEnabled__c'] ? 'LWC' : 'Angular';
+            if (type === 'Angular') {
+                warnings.unshift(this.messages.getMessage('angularOSWarning'));
+                assessmentStatus = 'Needs Manual Intervention';
+            }
+        }
+        const result = {
             name: recordName,
             id: omniscript['Id'],
             oldName: oldName,
@@ -369,12 +465,74 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             infos: [],
             warnings: warnings,
             errors: [],
-            migrationStatus: 'Can be Automated',
+            migrationStatus: assessmentStatus,
             type: omniProcessType,
             missingDR: missingDR,
             missingIP: missingIP,
             missingOS: missingOS,
         };
+        if (omniProcessType === this.OMNISCRIPT) {
+            const nameMapping = {
+                oldType: existingType,
+                oldSubtype: existingSubType,
+                oldLanguage: omniscript[this.namespacePrefix + 'Language__c'],
+                newType: newType,
+                newSubType: newSubType,
+                newLanguage: newLanguage,
+            };
+            result.nameMapping = nameMapping;
+        }
+        return result;
+    }
+    updateStorageForOmniscriptAssessment(osAssessmentInfo) {
+        if (osAssessmentInfo === undefined || osAssessmentInfo === null) {
+            logger_1.Logger.error(this.messages.getMessage('missingInfo'));
+            return;
+        }
+        let storage = storageUtil_1.StorageUtil.getOmnistudioAssessmentStorage();
+        logger_1.Logger.logVerbose(this.messages.getMessage('updatingStorageForOmniscipt', ['Assessment']));
+        for (let currentOsRecordInfo of osAssessmentInfo) {
+            try {
+                let nameMapping = currentOsRecordInfo.nameMapping;
+                if (nameMapping === undefined) {
+                    logger_1.Logger.logVerbose(this.messages.getMessage('nameMappingUndefined'));
+                    continue;
+                }
+                let value = {
+                    type: nameMapping.newType,
+                    subtype: nameMapping.newSubType,
+                    language: nameMapping.newLanguage,
+                    isDuplicate: false,
+                };
+                if (currentOsRecordInfo.errors && currentOsRecordInfo.errors.length > 0) {
+                    value.error = currentOsRecordInfo.errors;
+                    value.migrationSuccess = false;
+                }
+                else {
+                    value.migrationSuccess = true;
+                }
+                let finalKey = `${nameMapping.oldType}${nameMapping.oldSubtype}${this.cleanLanguageName(nameMapping.oldLanguage)}`;
+                finalKey = finalKey.toLowerCase();
+                if (storage.osStorage.has(finalKey)) {
+                    // Key already exists - handle accordingly
+                    logger_1.Logger.logVerbose(this.messages.getMessage('keyAlreadyInStorage', [finalKey]));
+                    value.isDuplicate = true;
+                    storage.osStorage.set(finalKey, value);
+                }
+                else {
+                    // Key doesn't exist - safe to set
+                    storage.osStorage.set(finalKey, value);
+                }
+            }
+            catch (error) {
+                logger_1.Logger.error(error);
+            }
+        }
+        storageUtil_1.StorageUtil.printAssessmentStorage();
+    }
+    cleanLanguageName(language) {
+        // replace -, ( and ) and space with ''
+        return language.replace(/[-() ]/g, '');
     }
     async migrate() {
         // Get All Records from OmniScript__c (IP & OS Parent Records)
@@ -385,10 +543,14 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         // Variables to be returned After Migration
         let originalOsRecords = new Map();
         let osUploadInfo = new Map();
-        logger_1.Logger.log(this.messages.getMessage('foundOmniScriptsToMigrate', [omniscripts.length]));
-        const progressBar = (0, base_2.createProgressBar)('Migrating', 'Omniscript and Integration Procedure');
+        const exportComponentType = this.getName();
+        logger_1.Logger.log(this.messages.getMessage('foundOmniScriptsToMigrate', [omniscripts.length, exportComponentType]));
+        const progressBarType = exportComponentType;
+        const progressBar = (0, base_2.createProgressBar)('Migrating', progressBarType);
         let progressCounter = 0;
         progressBar.start(omniscripts.length, progressCounter);
+        let foundAngularBasedOmniScripts = false;
+        const angularWarningMessage = this.messages.getMessage('angularOmniscriptWarningMessage');
         for (let omniscript of omniscripts) {
             const mappedRecords = [];
             // const originalRecords = new Map<string, AnyJson>();
@@ -405,20 +567,18 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                 const type = omniscript[this.namespacePrefix + 'IsLwcEnabled__c'] ? 'LWC' : 'Angular';
                 if (type === 'Angular') {
                     // Skip Angular OmniScripts and add a warning record
-                    const warningMessage = this.messages.getMessage('angularOmniscriptWarningMessage');
                     const skippedResponse = {
                         referenceId: recordId,
                         id: '',
                         success: false,
-                        hasErrors: true,
-                        errors: [warningMessage],
-                        warnings: [],
+                        hasErrors: false,
+                        errors: [],
+                        warnings: [angularWarningMessage],
                         newName: '',
+                        skipped: true,
                     };
                     osUploadInfo.set(recordId, skippedResponse);
-                    progressBar.stop();
-                    logger_1.Logger.warn(warningMessage);
-                    progressBar.start(omniscripts.length, progressCounter);
+                    foundAngularBasedOmniScripts = true;
                     continue;
                 }
             }
@@ -426,11 +586,78 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             omniscript[`${this.namespacePrefix}IsActive__c`] = false;
             // Get All elements for each OmniScript__c record(i.e IP/OS)
             const elements = await this.getAllElementsForOmniScript(recordId);
+            // Check for duplicate element names within the same OmniScript
+            const elementNames = new Set();
+            const duplicateElementNames = new Set();
+            for (const elem of elements) {
+                const elemName = elem['Name'];
+                if (elementNames.has(elemName)) {
+                    duplicateElementNames.add(elemName);
+                }
+                else {
+                    elementNames.add(elemName);
+                }
+            }
+            // If duplicate element names found, skip this OmniScript
+            if (duplicateElementNames.size > 0) {
+                const duplicateNamesList = Array.from(duplicateElementNames).join(', ');
+                const skippedResponse = {
+                    referenceId: recordId,
+                    id: '',
+                    success: false,
+                    hasErrors: false,
+                    errors: [],
+                    warnings: [this.messages.getMessage('invalidOrRepeatingOmniscriptElementNames', [duplicateNamesList])],
+                    newName: '',
+                    skipped: true,
+                };
+                osUploadInfo.set(recordId, skippedResponse);
+                originalOsRecords.set(recordId, omniscript);
+                continue;
+            }
             if (omniscript[`${this.namespacePrefix}IsProcedure__c`] === true) {
+                // Check for missing mandatory fields for Integration Procedures
+                const existingType = omniscript[this.namespacePrefix + 'Type__c'];
+                const existingSubType = omniscript[this.namespacePrefix + 'SubType__c'];
+                if (!existingType || existingType.trim() === '') {
+                    const skippedResponse = {
+                        referenceId: recordId,
+                        id: '',
+                        success: false,
+                        hasErrors: true,
+                        errors: [this.messages.getMessage('missingMandatoryField', ['Type', 'Integration Procedure'])],
+                        warnings: [],
+                        newName: '',
+                        skipped: true,
+                    };
+                    osUploadInfo.set(recordId, skippedResponse);
+                    originalOsRecords.set(recordId, omniscript);
+                    continue;
+                }
+                if (!existingSubType || existingSubType.trim() === '') {
+                    const skippedResponse = {
+                        referenceId: recordId,
+                        id: '',
+                        success: false,
+                        hasErrors: true,
+                        errors: [this.messages.getMessage('missingMandatoryField', ['SubType', 'Integration Procedure'])],
+                        warnings: [],
+                        newName: '',
+                        skipped: true,
+                    };
+                    osUploadInfo.set(recordId, skippedResponse);
+                    originalOsRecords.set(recordId, omniscript);
+                    continue;
+                }
+                // Check for reserved keys in PropertySet for Integration Procedures
+                const foundReservedKeys = new Set();
                 // do the formula replacement from custom to standard notation
                 if (functionDefinitionMetadata.length > 0 && elements.length > 0) {
                     for (let ipElement of elements) {
                         if (ipElement[`${this.namespacePrefix}PropertySet__c`] != null) {
+                            // Check for reserved keys while processing the PropertySet
+                            const propertySet = JSON.parse(ipElement[`${this.namespacePrefix}PropertySet__c`] || '{}');
+                            this.collectReservedKeys(propertySet, foundReservedKeys);
                             var originalString = ipElement[`${this.namespacePrefix}PropertySet__c`];
                             try {
                                 originalString = (0, FormulaUtil_1.getReplacedString)(this.namespacePrefix, ipElement[`${this.namespacePrefix}PropertySet__c`], functionDefinitionMetadata);
@@ -443,12 +670,66 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                         }
                     }
                 }
+                // If reserved keys found, skip this IP
+                if (foundReservedKeys.size > 0) {
+                    const reservedKeysList = Array.from(foundReservedKeys).join(', ');
+                    const skippedResponse = {
+                        referenceId: recordId,
+                        id: '',
+                        success: false,
+                        hasErrors: false,
+                        errors: [],
+                        warnings: [this.messages.getMessage('reservedKeysFoundInPropertySet', [reservedKeysList])],
+                        newName: '',
+                        skipped: true,
+                    };
+                    osUploadInfo.set(recordId, skippedResponse);
+                    originalOsRecords.set(recordId, omniscript);
+                    continue;
+                }
             }
             // Perform the transformation for OS/IP Parent Record from OmniScript__c
             const mappedOmniScript = this.mapOmniScriptRecord(omniscript);
             // Clean type, subtype
             mappedOmniScript[OmniScript_1.default.Type__c] = this.cleanName(mappedOmniScript[OmniScript_1.default.Type__c]);
             mappedOmniScript[OmniScript_1.default.SubType__c] = this.cleanName(mappedOmniScript[OmniScript_1.default.SubType__c]);
+            // Check if Type or SubType becomes empty after cleaning for Integration Procedures
+            if (omniscript[`${this.namespacePrefix}IsProcedure__c`]) {
+                const originalType = omniscript[this.namespacePrefix + 'Type__c'];
+                const originalSubType = omniscript[this.namespacePrefix + 'SubType__c'];
+                if (!mappedOmniScript[OmniScript_1.default.Type__c] ||
+                    mappedOmniScript[OmniScript_1.default.Type__c].trim() === '') {
+                    const skippedResponse = {
+                        referenceId: recordId,
+                        id: '',
+                        success: false,
+                        hasErrors: true,
+                        errors: [this.messages.getMessage('integrationProcedureTypeEmptyAfterCleaning', [originalType])],
+                        warnings: [],
+                        newName: '',
+                        skipped: true,
+                    };
+                    osUploadInfo.set(recordId, skippedResponse);
+                    originalOsRecords.set(recordId, omniscript);
+                    continue;
+                }
+                if (!mappedOmniScript[OmniScript_1.default.SubType__c] ||
+                    mappedOmniScript[OmniScript_1.default.SubType__c].trim() === '') {
+                    const skippedResponse = {
+                        referenceId: recordId,
+                        id: '',
+                        success: false,
+                        hasErrors: true,
+                        errors: [this.messages.getMessage('integrationProcedureSubtypeEmptyAfterCleaning', [originalSubType])],
+                        warnings: [],
+                        newName: '',
+                        skipped: true,
+                    };
+                    osUploadInfo.set(recordId, skippedResponse);
+                    originalOsRecords.set(recordId, omniscript);
+                    continue;
+                }
+            }
             // Check duplicated name
             let mappedOsName;
             if (this.allVersions) {
@@ -474,17 +755,17 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                         '_1';
             }
             if (duplicatedNames.has(mappedOsName)) {
-                this.setRecordErrors(omniscript, this.messages.getMessage('duplicatedOSName'));
                 originalOsRecords.set(recordId, omniscript);
-                const warningMessage = this.messages.getMessage('duplicatedOSName');
+                const warningMessage = this.messages.getMessage('duplicatedOSName', [this.getName(true), mappedOsName]);
                 const skippedResponse = {
                     referenceId: recordId,
                     id: '',
                     success: false,
-                    hasErrors: true,
-                    errors: [warningMessage],
-                    warnings: [],
+                    hasErrors: false,
+                    errors: [],
+                    warnings: [warningMessage],
                     newName: '',
+                    skipped: true,
                 };
                 osUploadInfo.set(recordId, skippedResponse);
                 continue;
@@ -494,25 +775,44 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             mappedRecords.push(mappedOmniScript);
             // Save the OmniScript__c records to Standard BPO i.e OmniProcess
             const osUploadResponse = await net_1.NetUtils.createOne(this.connection, OmniScriptMigrationTool.OMNIPROCESS_NAME, recordId, mappedOmniScript);
-            if (osUploadResponse.success) {
+            if (!(osUploadResponse === null || osUploadResponse === void 0 ? void 0 : osUploadResponse.success)) {
+                osUploadResponse.errors = Array.isArray(osUploadResponse.errors)
+                    ? osUploadResponse.errors
+                    : [osUploadResponse.errors];
+                osUploadInfo.set(recordId, osUploadResponse);
+                continue;
+            }
+            if (osUploadResponse === null || osUploadResponse === void 0 ? void 0 : osUploadResponse.success) {
                 // Fix errors
-                if (!osUploadResponse.success) {
-                    osUploadResponse.errors = Array.isArray(osUploadResponse.errors)
-                        ? osUploadResponse.errors
-                        : [osUploadResponse.errors];
-                }
                 osUploadResponse.warnings = osUploadResponse.warnings || [];
                 osUploadResponse.type = mappedOmniScript[OmniScript_1.default.Type__c];
                 osUploadResponse.subtype = mappedOmniScript[OmniScript_1.default.SubType__c];
                 osUploadResponse.language = mappedOmniScript[OmniScript_1.default.Language__c];
-                const originalOsName = omniscript[this.namespacePrefix + 'Type__c'] +
-                    '_' +
-                    omniscript[this.namespacePrefix + 'SubType__c'] +
-                    '_' +
-                    omniscript[this.namespacePrefix + 'Language__c'];
+                let originalOsName;
+                if (this.allVersions) {
+                    originalOsName =
+                        omniscript[this.namespacePrefix + 'Type__c'] +
+                            '_' +
+                            omniscript[this.namespacePrefix + 'SubType__c'] +
+                            '_' +
+                            omniscript[this.namespacePrefix + 'Language__c'] +
+                            '_' +
+                            (omniscript[this.namespacePrefix + 'Version__c'] || '1');
+                }
+                else {
+                    originalOsName =
+                        omniscript[this.namespacePrefix + 'Type__c'] +
+                            '_' +
+                            omniscript[this.namespacePrefix + 'SubType__c'] +
+                            '_' +
+                            omniscript[this.namespacePrefix + 'Language__c'] +
+                            '_1';
+                }
+                // Always set the new name to show the migrated name
+                osUploadResponse.newName = mappedOsName;
+                // Only add warning if the name was actually modified
                 if (originalOsName !== mappedOsName) {
-                    osUploadResponse.newName = mappedOsName;
-                    osUploadResponse.warnings.unshift('WARNING: OmniScript name has been modified to fit naming rules: ' + mappedOsName);
+                    osUploadResponse.warnings.unshift(`${this.getName(true)} name has been modified to fit naming rules: ${mappedOsName}`);
                 }
                 try {
                     // Upload All elements for each OmniScript__c record(i.e IP/OS)
@@ -534,7 +834,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                         if (!updateResult.success) {
                             osUploadResponse.hasErrors = true;
                             osUploadResponse.errors = osUploadResponse.errors || [];
-                            osUploadResponse.errors.push(this.messages.getMessage('errorWhileActivatingOs') + updateResult.errors);
+                            osUploadResponse.errors.push(this.messages.getMessage('errorWhileActivatingOs', [this.getName(true)]) + updateResult.errors);
                         }
                     }
                 }
@@ -557,7 +857,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                             error = e.toString();
                         }
                     }
-                    osUploadResponse.errors.push(this.messages.getMessage('errorWhileCreatingElements') + error);
+                    osUploadResponse.errors.push(this.messages.getMessage('errorWhileCreatingElements', [this.getName(true)]) + error);
                 }
                 finally {
                     // Create the return records and response which have been processed
@@ -567,13 +867,16 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             originalOsRecords.set(recordId, omniscript);
         }
         progressBar.stop();
+        if (foundAngularBasedOmniScripts) {
+            logger_1.Logger.warn(angularWarningMessage);
+        }
         this.updateStorageForOmniscript(osUploadInfo, originalOsRecords);
         const objectMigrationResults = [];
         if (this.exportType === OmniScriptExportType.All || this.exportType === OmniScriptExportType.IP) {
             objectMigrationResults.push(this.getMigratedRecordsByType('Integration Procedures', osUploadInfo, originalOsRecords));
         }
         if (this.exportType === OmniScriptExportType.All || this.exportType === OmniScriptExportType.OS) {
-            objectMigrationResults.push(this.getMigratedRecordsByType('OmniScripts', osUploadInfo, originalOsRecords));
+            objectMigrationResults.push(this.getMigratedRecordsByType('Omniscripts', osUploadInfo, originalOsRecords));
         }
         return objectMigrationResults;
     }
@@ -585,7 +888,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         let resultMap = new Map();
         for (let record of Array.from(records.values())) {
             if ((type === 'Integration Procedures' && record[`${this.namespacePrefix}IsProcedure__c`]) ||
-                (type === 'OmniScripts' && !record[`${this.namespacePrefix}IsProcedure__c`])) {
+                (type === 'Omniscripts' && !record[`${this.namespacePrefix}IsProcedure__c`])) {
                 recordMap.set(record['Id'], records.get(record['Id']));
                 if (results.get(record['Id'])) {
                     resultMap.set(record['Id'], results.get(record['Id']));
@@ -598,24 +901,9 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
             results: resultMap,
         };
     }
-    addToAssessmentStorage(type, subtype, language) {
-        let storage = storageUtil_1.StorageUtil.getOmnistudioAssessmentStorage();
-        const key = `${type.val}${subtype.val}${language}`;
-        if (storage.osStorage.has(key)) {
-            storage.osStorage.get(key).isDuplicate = true;
-        }
-        else {
-            storage.osStorage.set(key, {
-                type: type.cleanName(),
-                subtype: subtype.cleanName(),
-                language: language || 'English',
-                isDuplicate: false,
-            });
-        }
-    }
     updateStorageForOmniscript(osUploadInfo, originalOsRecords) {
         let storage = storageUtil_1.StorageUtil.getOmnistudioMigrationStorage();
-        logger_1.Logger.logVerbose('Started updating migration storage for omniscript');
+        logger_1.Logger.logVerbose(this.messages.getMessage('updatingStorageForOmniscipt', ['Migration']));
         for (let key of Array.from(originalOsRecords.keys())) {
             try {
                 let oldrecord = originalOsRecords.get(key);
@@ -627,17 +915,24 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                         language: newrecord['language'],
                         isDuplicate: false,
                     };
-                    if (newrecord.hasErrors) {
-                        value.error = newrecord.errors;
+                    // New record can be undefined
+                    if (newrecord === undefined) {
                         value.migrationSuccess = false;
                     }
                     else {
-                        value.migrationSuccess = true;
+                        if (newrecord.hasErrors) {
+                            value.error = newrecord.errors;
+                            value.migrationSuccess = false;
+                        }
+                        else {
+                            value.migrationSuccess = true;
+                        }
                     }
-                    let finalKey = `${oldrecord[this.namespacePrefix + 'Type__c']}${oldrecord[this.namespacePrefix + 'SubType__c']}${oldrecord[this.namespacePrefix + 'Language__c']}`;
+                    let finalKey = `${oldrecord[this.namespacePrefix + 'Type__c']}${oldrecord[this.namespacePrefix + 'SubType__c']}${this.cleanLanguageName(oldrecord[this.namespacePrefix + 'Language__c'])}`;
+                    finalKey = finalKey.toLowerCase();
                     if (storage.osStorage.has(finalKey)) {
                         // Key already exists - handle accordingly
-                        logger_1.Logger.logVerbose(`Key ${finalKey} already exists in storage`);
+                        logger_1.Logger.logVerbose(this.messages.getMessage('keyAlreadyInStorage', [finalKey]));
                         value.isDuplicate = true;
                         storage.osStorage.set(finalKey, value);
                     }
@@ -670,11 +965,21 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                 { field: this.namespacePrefix + 'SubType__c', direction: utils_1.SortDirection.ASC },
                 { field: this.namespacePrefix + 'Version__c', direction: utils_1.SortDirection.ASC },
             ];
-            return await utils_1.QueryTools.queryWithFilterAndSort(this.connection, this.namespace, OmniScriptMigrationTool.OMNISCRIPT_NAME, this.getOmniScriptFields(), filters, sortFields);
+            return await utils_1.QueryTools.queryWithFilterAndSort(this.connection, this.namespace, OmniScriptMigrationTool.OMNISCRIPT_NAME, this.getOmniScriptFields(), filters, sortFields).catch((err) => {
+                if (err.errorCode === 'INVALID_TYPE') {
+                    throw new interfaces_1.InvalidEntityTypeError(`${OmniScriptMigrationTool.OMNISCRIPT_NAME} type is not found under this namespace`);
+                }
+                throw err;
+            });
         }
         else {
             filters.set(this.namespacePrefix + 'IsActive__c', true);
-            return await utils_1.QueryTools.queryWithFilter(this.connection, this.namespace, OmniScriptMigrationTool.OMNISCRIPT_NAME, this.getOmniScriptFields(), filters);
+            return await utils_1.QueryTools.queryWithFilter(this.connection, this.namespace, OmniScriptMigrationTool.OMNISCRIPT_NAME, this.getOmniScriptFields(), filters).catch((err) => {
+                if (err.errorCode === 'INVALID_TYPE') {
+                    throw new interfaces_1.InvalidEntityTypeError(`${OmniScriptMigrationTool.OMNISCRIPT_NAME} type is not found under this namespace`);
+                }
+                throw err;
+            });
         }
     }
     // Get All Elements w.r.t OmniScript__c i.e Elements tagged to passed in IP/OS
@@ -793,6 +1098,7 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
     }
     // Maps an individual Element into an OmniProcessElement record
     mapElementData(elementRecord, omniProcessId, parentElementUploadResponse, invalidIpReferences) {
+        var _a, _b;
         // Transformed object
         const mappedObject = {};
         // Get the fields of the record
@@ -813,37 +1119,128 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         // We need to fix the child references
         const elementType = mappedObject[Element_1.default.Type__c];
         const propertySet = JSON.parse(mappedObject[Element_1.default.PropertySet__c] || '{}');
+        // Use NameMappingRegistry to update all dependency references
+        const updatedPropertySet = this.nameRegistry.updateDependencyReferences(propertySet);
         switch (elementType) {
             case 'OmniScript':
-                propertySet['Type'] = this.cleanName(propertySet['Type']);
-                propertySet['Sub Type'] = this.cleanName(propertySet['Sub Type']);
+                // Use registry for OmniScript references with explicit fallback
+                const osType = propertySet['Type'] || '';
+                const osSubType = propertySet['Sub Type'] || '';
+                const osLanguage = propertySet['Language'] || 'English';
+                // Construct full OmniScript name to check registry
+                const fullOmniScriptName = `${osType}_${osSubType}_${osLanguage}`;
+                if (this.nameRegistry.isAngularOmniScript(fullOmniScriptName)) {
+                    // Referenced OmniScript is Angular - add warning and keep original reference
+                    logger_1.Logger.logVerbose(`\n${this.messages.getMessage('angularOmniScriptDependencyWarning', [
+                        'OmniScript element',
+                        fullOmniScriptName,
+                    ])}`);
+                    // Keep original reference as-is since Angular OmniScript won't be migrated
+                    updatedPropertySet['Type'] = osType;
+                    updatedPropertySet['Sub Type'] = osSubType;
+                    updatedPropertySet['Language'] = osLanguage;
+                }
+                else if (this.nameRegistry.hasOmniScriptMapping(fullOmniScriptName)) {
+                    // Registry has mapping for this LWC OmniScript - extract cleaned parts
+                    const cleanedFullName = this.nameRegistry.getCleanedName(fullOmniScriptName, 'OmniScript');
+                    const parts = cleanedFullName.split('_');
+                    if (parts.length >= 2) {
+                        updatedPropertySet['Type'] = parts[0];
+                        updatedPropertySet['Sub Type'] = parts[1];
+                        // Language doesn't typically change, but update if provided
+                        if (parts.length >= 3) {
+                            updatedPropertySet['Language'] = parts[2];
+                        }
+                    }
+                }
+                else {
+                    // No registry mapping - use original fallback approach
+                    logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['OmniScript', fullOmniScriptName])}`);
+                    updatedPropertySet['Type'] = this.cleanName(osType);
+                    updatedPropertySet['Sub Type'] = this.cleanName(osSubType);
+                }
                 break;
             case 'Integration Procedure Action':
-                const remoteOptions = propertySet['remoteOptions'] || {};
-                remoteOptions['preTransformBundle'] = this.cleanName(remoteOptions['preTransformBundle']);
-                remoteOptions['postTransformBundle'] = this.cleanName(remoteOptions['postTransformBundle']);
-                propertySet['remoteOptions'] = remoteOptions;
-                propertySet['preTransformBundle'] = this.cleanName(propertySet['preTransformBundle']);
-                propertySet['postTransformBundle'] = this.cleanName(propertySet['postTransformBundle']);
-                // We can't update the IP references, we need to let the user know
+                const remoteOptions = updatedPropertySet['remoteOptions'] || {};
+                // Use registry for DataMapper references with explicit fallback
+                const preTransformBundle = (_a = propertySet['remoteOptions']) === null || _a === void 0 ? void 0 : _a['preTransformBundle'];
+                if (preTransformBundle) {
+                    if (this.nameRegistry.hasDataMapperMapping(preTransformBundle)) {
+                        remoteOptions['preTransformBundle'] = this.nameRegistry.getDataMapperCleanedName(preTransformBundle);
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['DataMapper', preTransformBundle])}`);
+                        remoteOptions['preTransformBundle'] = this.cleanName(preTransformBundle);
+                    }
+                }
+                const postTransformBundle = (_b = propertySet['remoteOptions']) === null || _b === void 0 ? void 0 : _b['postTransformBundle'];
+                if (postTransformBundle) {
+                    if (this.nameRegistry.hasDataMapperMapping(postTransformBundle)) {
+                        remoteOptions['postTransformBundle'] = this.nameRegistry.getDataMapperCleanedName(postTransformBundle);
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['DataMapper', postTransformBundle])}`);
+                        remoteOptions['postTransformBundle'] = this.cleanName(postTransformBundle);
+                    }
+                }
+                updatedPropertySet['remoteOptions'] = remoteOptions;
+                const preBundle = propertySet['preTransformBundle'];
+                if (preBundle) {
+                    if (this.nameRegistry.hasDataMapperMapping(preBundle)) {
+                        updatedPropertySet['preTransformBundle'] = this.nameRegistry.getDataMapperCleanedName(preBundle);
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['DataMapper', preBundle])}`);
+                        updatedPropertySet['preTransformBundle'] = this.cleanName(preBundle);
+                    }
+                }
+                const postBundle = propertySet['postTransformBundle'];
+                if (postBundle) {
+                    if (this.nameRegistry.hasDataMapperMapping(postBundle)) {
+                        updatedPropertySet['postTransformBundle'] = this.nameRegistry.getDataMapperCleanedName(postBundle);
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['DataMapper', postBundle])}`);
+                        updatedPropertySet['postTransformBundle'] = this.cleanName(postBundle);
+                    }
+                }
+                // Use registry for Integration Procedure references
                 const key = propertySet['integrationProcedureKey'] || '';
                 if (key) {
-                    const parts = key.split('_');
-                    const newKey = parts.map((p) => this.cleanName(p, true)).join('_');
-                    if (parts.length > 2) {
-                        invalidIpReferences.set(mappedObject[Element_1.default.Name], key);
+                    const hasRegistryMapping = this.nameRegistry.hasIntegrationProcedureMapping(key);
+                    if (hasRegistryMapping) {
+                        const cleanedIpName = this.nameRegistry.getIntegrationProcedureCleanedName(key);
+                        updatedPropertySet['integrationProcedureKey'] = cleanedIpName;
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['IntegrationProcedure', key])}`);
+                        const parts = key.split('_');
+                        const newKey = parts.map((p) => this.cleanName(p, true)).join('_');
+                        if (parts.length > 2) {
+                            invalidIpReferences.set(mappedObject[Element_1.default.Name], key);
+                        }
+                        updatedPropertySet['integrationProcedureKey'] = newKey;
                     }
-                    propertySet['integrationProcedureKey'] = newKey;
                 }
                 break;
             case 'DataRaptor Turbo Action':
             case 'DataRaptor Transform Action':
             case 'DataRaptor Post Action':
             case 'DataRaptor Extract Action':
-                propertySet['bundle'] = this.cleanName(propertySet['bundle']);
+                // Use registry for DataMapper references with explicit fallback
+                const bundleName = propertySet['bundle'];
+                if (bundleName) {
+                    if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                        updatedPropertySet['bundle'] = this.nameRegistry.getDataMapperCleanedName(bundleName);
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['DataMapper', bundleName])}`);
+                        updatedPropertySet['bundle'] = this.cleanName(bundleName);
+                    }
+                }
                 break;
         }
-        mappedObject[Element_1.default.PropertySet__c] = JSON.stringify(propertySet);
+        mappedObject[Element_1.default.PropertySet__c] = JSON.stringify(updatedPropertySet);
         // BATCH framework requires that each record has an "attributes" property
         mappedObject['attributes'] = {
             type: OmniScriptMigrationTool.OMNIPROCESSELEMENT_NAME,
@@ -873,8 +1270,12 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
                 content = JSON.parse(content);
                 if (content && content['sOmniScriptId']) {
                     content['sOmniScriptId'] = omniProcessId;
-                    mappedObject[OmniScriptDefinition_1.default.Content__c] = JSON.stringify(content);
                 }
+                // Process the nested JSON structure to update bundle/reference names
+                if (content && content['children']) {
+                    this.processContentChildren(content['children']);
+                }
+                mappedObject[OmniScriptDefinition_1.default.Content__c] = JSON.stringify(content);
             }
             catch (ex) {
                 // Log
@@ -887,6 +1288,201 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
         };
         return mappedObject;
     }
+    /**
+     * Recursively processes children elements in the content JSON to update bundle/reference names
+     * @param children Array of child elements from the content JSON
+     */
+    processContentChildren(children) {
+        if (!Array.isArray(children)) {
+            return;
+        }
+        children.forEach((child) => {
+            if (child && child.type && child.propSetMap) {
+                this.processContentElement(child);
+            }
+            // Process nested children in Step elements
+            if (child && child.children && Array.isArray(child.children)) {
+                child.children.forEach((nestedChild) => {
+                    if (nestedChild && nestedChild.eleArray && Array.isArray(nestedChild.eleArray)) {
+                        nestedChild.eleArray.forEach((element) => {
+                            if (element && element.type && element.propSetMap) {
+                                this.processContentElement(element);
+                            }
+                        });
+                    }
+                });
+            }
+        });
+    }
+    /**
+     * Processes individual content element to update bundle/reference names based on type
+     * @param element Individual element from the content JSON
+     */
+    processContentElement(element) {
+        const elementType = element.type;
+        const propSetMap = element.propSetMap;
+        if (!elementType || !propSetMap) {
+            return;
+        }
+        switch (elementType) {
+            case 'Integration Procedure Action':
+                this.processIntegrationProcedureAction(propSetMap);
+                break;
+            case 'DataRaptor Turbo Action':
+            case 'DataRaptor Transform Action':
+            case 'DataRaptor Post Action':
+            case 'DataRaptor Extract Action':
+                this.processDataRaptorAction(propSetMap);
+                break;
+            case 'OmniScript':
+                this.processOmniScriptAction(propSetMap);
+                break;
+            case 'Step':
+                this.processStepAction(propSetMap);
+                break;
+            default:
+                // Handle other element types if needed
+                break;
+        }
+    }
+    /**
+     * Processes Integration Procedure Action elements to update reference names
+     * @param propSetMap Property set map from the element
+     */
+    processIntegrationProcedureAction(propSetMap) {
+        // Handle remoteOptions pre/post transform bundles
+        if (propSetMap.remoteOptions) {
+            if (propSetMap.remoteOptions.preTransformBundle) {
+                const bundleName = propSetMap.remoteOptions.preTransformBundle;
+                if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                    propSetMap.remoteOptions.preTransformBundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+                }
+                else {
+                    propSetMap.remoteOptions.preTransformBundle = this.cleanName(bundleName);
+                }
+            }
+            if (propSetMap.remoteOptions.postTransformBundle) {
+                const bundleName = propSetMap.remoteOptions.postTransformBundle;
+                if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                    propSetMap.remoteOptions.postTransformBundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+                }
+                else {
+                    propSetMap.remoteOptions.postTransformBundle = this.cleanName(bundleName);
+                }
+            }
+        }
+        // Handle direct pre/post transform bundles
+        if (propSetMap.preTransformBundle) {
+            const bundleName = propSetMap.preTransformBundle;
+            if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                propSetMap.preTransformBundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+            }
+            else {
+                propSetMap.preTransformBundle = this.cleanName(bundleName);
+            }
+        }
+        if (propSetMap.postTransformBundle) {
+            const bundleName = propSetMap.postTransformBundle;
+            if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                propSetMap.postTransformBundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+            }
+            else {
+                propSetMap.postTransformBundle = this.cleanName(bundleName);
+            }
+        }
+        // Handle integrationProcedureKey
+        if (propSetMap.integrationProcedureKey) {
+            const key = propSetMap.integrationProcedureKey;
+            if (this.nameRegistry.hasIntegrationProcedureMapping(key)) {
+                propSetMap.integrationProcedureKey = this.nameRegistry.getIntegrationProcedureCleanedName(key);
+            }
+            else {
+                const parts = key.split('_');
+                // Integration Procedures should have Type_SubType format (2 parts)
+                if (parts.length > 2) {
+                    logger_1.Logger.logVerbose(this.messages.getMessage('integrationProcedureInvalidUnderscoreFormat', [key]));
+                    return;
+                }
+                propSetMap.integrationProcedureKey = parts.map((p) => this.cleanName(p, true)).join('_');
+            }
+        }
+    }
+    /**
+     * Processes DataRaptor Action elements to update bundle names
+     * @param propSetMap Property set map from the element
+     */
+    processDataRaptorAction(propSetMap) {
+        if (propSetMap.bundle) {
+            const bundleName = propSetMap.bundle;
+            if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                propSetMap.bundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+            }
+            else {
+                propSetMap.bundle = this.cleanName(bundleName);
+            }
+        }
+    }
+    /**
+     * Processes OmniScript Action elements to update reference names
+     * @param propSetMap Property set map from the element
+     */
+    processOmniScriptAction(propSetMap) {
+        const osType = propSetMap['Type'] || '';
+        const osSubType = propSetMap['Sub Type'] || '';
+        const osLanguage = propSetMap['Language'] || 'English';
+        // Construct full OmniScript name to check registry
+        const fullOmniScriptName = `${osType}_${osSubType}_${osLanguage}`;
+        if (this.nameRegistry.isAngularOmniScript(fullOmniScriptName)) {
+            // Keep original reference as-is since Angular OmniScript won't be migrated
+            return;
+        }
+        else if (this.nameRegistry.hasOmniScriptMapping(fullOmniScriptName)) {
+            // Registry has mapping for this LWC OmniScript - extract cleaned parts
+            const cleanedFullName = this.nameRegistry.getCleanedName(fullOmniScriptName, 'OmniScript');
+            const parts = cleanedFullName.split('_');
+            if (parts.length >= 2) {
+                propSetMap['Type'] = parts[0];
+                propSetMap['Sub Type'] = parts[1];
+                // Language doesn't typically change, but update if provided
+                if (parts.length >= 3) {
+                    propSetMap['Language'] = parts[2];
+                }
+            }
+        }
+        else {
+            // No registry mapping - use original fallback approach
+            propSetMap['Type'] = this.cleanName(osType);
+            propSetMap['Sub Type'] = this.cleanName(osSubType);
+        }
+    }
+    /**
+     * Processes Step elements to update reference names
+     * @param propSetMap Property set map from the element
+     */
+    processStepAction(propSetMap) {
+        // Handle remoteOptions pre/post transform bundles if they exist in Step elements
+        // Note: remoteClass and remoteMethod cleaning is not required for omniscript content step dependencies
+        if (propSetMap.remoteOptions) {
+            if (propSetMap.remoteOptions.preTransformBundle) {
+                const bundleName = propSetMap.remoteOptions.preTransformBundle;
+                if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                    propSetMap.remoteOptions.preTransformBundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+                }
+                else {
+                    propSetMap.remoteOptions.preTransformBundle = this.cleanName(bundleName);
+                }
+            }
+            if (propSetMap.remoteOptions.postTransformBundle) {
+                const bundleName = propSetMap.remoteOptions.postTransformBundle;
+                if (this.nameRegistry.hasDataMapperMapping(bundleName)) {
+                    propSetMap.remoteOptions.postTransformBundle = this.nameRegistry.getDataMapperCleanedName(bundleName);
+                }
+                else {
+                    propSetMap.remoteOptions.postTransformBundle = this.cleanName(bundleName);
+                }
+            }
+        }
+    }
     getOmniScriptFields() {
         return Object.keys(OmniScript_1.default);
     }
@@ -896,6 +1492,34 @@ class OmniScriptMigrationTool extends base_1.BaseMigrationTool {
     getOmniScriptDefinitionFields() {
         return Object.keys(OmniScriptDefinition_1.default);
     }
+    /**
+     * Collects reserved keys found in PropertySet tagsToValidate
+     * @param propertySet - The PropertySet JSON object to validate
+     * @param foundReservedKeys - Set to collect found reserved keys
+     */
+    collectReservedKeys(propertySet, foundReservedKeys) {
+        // Iterate through each tag that needs validation
+        for (const tagToValidate of this.tagsToValidate) {
+            const tagValue = propertySet[tagToValidate];
+            if (tagValue) {
+                if (typeof tagValue === 'object' && tagValue !== null) {
+                    // If it's an object, check all its keys
+                    const keys = Object.keys(tagValue);
+                    for (const key of keys) {
+                        if (this.reservedKeys.has(key)) {
+                            foundReservedKeys.add(key);
+                        }
+                    }
+                }
+                else if (typeof tagValue === 'string') {
+                    // If it's a string, check if the value itself is a reserved key
+                    if (this.reservedKeys.has(tagValue)) {
+                        foundReservedKeys.add(tagValue);
+                    }
+                }
+            }
+        }
+    }
     sleep() {
         return new Promise((resolve) => {
             setTimeout(resolve, 5000);