@memberjunction/codegen-lib 2.115.0 → 2.116.0

package/dist/Database/manage-metadata.js

@@ -38,7 +38,6 @@ const uuid_1 = require("uuid");
 const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const sql_logging_1 = require("../Misc/sql_logging");
-const aiengine_1 = require("@memberjunction/aiengine");
 class ValidatorResult {
     entityName = "";
     fieldName;
@@ -99,7 +98,7 @@ class ManageMetadataBase {
         let bSuccess = true;
         let start = new Date();
         (0, status_logging_1.logStatus)('   Creating new entities...');
-        if (!await this.createNewEntities(pool)) {
+        if (!await this.createNewEntities(pool, currentUser)) {
             (0, status_logging_1.logError)('   Error creating new entities');
             bSuccess = false;
         }
@@ -133,7 +132,8 @@ class ManageMetadataBase {
         (0, status_logging_1.logStatus)(`    > Recompiled base views in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         start = new Date();
         (0, status_logging_1.logStatus)('   Managing entity fields...');
-        if (!await this.manageEntityFields(pool, excludeSchemas, false, false, currentUser)) {
+        // note that we skip Advanced Generation here because we do it again later when the manageSQLScriptsAndExecution occurs in SQLCodeGen class
+        if (!await this.manageEntityFields(pool, excludeSchemas, false, false, currentUser, true)) {
             (0, status_logging_1.logError)('   Error managing entity fields');
             bSuccess = false;
         }
@@ -146,13 +146,20 @@ class ManageMetadataBase {
         }
         (0, status_logging_1.logStatus)(`    > Managed entity relationships in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         if (ManageMetadataBase.newEntityList.length > 0) {
-            await this.generateNewEntityDescriptions(pool, md); // don't pass excludeSchemas becuase by definition this is the NEW entities we created
+            await this.generateNewEntityDescriptions(pool, md, currentUser); // don't pass excludeSchemas becuase by definition this is the NEW entities we created
         }
         const veResult = await this.manageVirtualEntities(pool);
         if (!veResult.success) {
             (0, status_logging_1.logError)('   Error managing virtual entities');
             bSuccess = false;
         }
+        start = new Date();
+        (0, status_logging_1.logStatus)('   Syncing schema info from database...');
+        if (!await this.updateSchemaInfoFromDatabase(pool, excludeSchemas)) {
+            (0, status_logging_1.logError)('   Error syncing schema info');
+            bSuccess = false;
+        }
+        (0, status_logging_1.logStatus)(`    > Synced schema info in ${(new Date().getTime() - start.getTime()) / 1000} seconds`);
         return bSuccess;
     }
     async manageVirtualEntities(pool) {
@@ -484,7 +491,7 @@ class ManageMetadataBase {
      * @param excludeSchemas
      * @returns
      */
-    async manageEntityFields(pool, excludeSchemas, skipCreatedAtUpdatedAtDeletedAtFieldValidation, skipEntityFieldValues, currentUser) {
+    async manageEntityFields(pool, excludeSchemas, skipCreatedAtUpdatedAtDeletedAtFieldValidation, skipEntityFieldValues, currentUser, skipAdvancedGeneration) {
         let bSuccess = true;
         const startTime = new Date();
         if (!skipCreatedAtUpdatedAtDeletedAtFieldValidation) {
@@ -540,6 +547,15 @@ class ManageMetadataBase {
             }
             (0, status_logging_1.logStatus)(`      Managed entity field values in ${(new Date().getTime() - step6StartTime.getTime()) / 1000} seconds`);
         }
+        // Advanced Generation - Smart field identification and form layout
+        if (!skipAdvancedGeneration) {
+            const step7StartTime = new Date();
+            if (!await this.applyAdvancedGeneration(pool, excludeSchemas, currentUser)) {
+                (0, status_logging_1.logError)('Error applying advanced generation features');
+                // Don't fail the entire process - advanced generation is optional
+            }
+            (0, status_logging_1.logStatus)(`      Applied advanced generation features in ${(new Date().getTime() - step7StartTime.getTime()) / 1000} seconds`);
+        }
         (0, status_logging_1.logStatus)(`      Total time to manage entity fields: ${(new Date().getTime() - startTime.getTime()) / 1000} seconds`);
         return bSuccess;
     }
@@ -740,58 +756,26 @@ class ManageMetadataBase {
      * to be invoked, the EntityDescriptions feature must be enabled in the Advanced Generation configuration.
      * @param pool
      * @param md
+     * @param currentUser
      */
-    async generateNewEntityDescriptions(pool, md) {
+    async generateNewEntityDescriptions(pool, md, currentUser) {
         // for the list of new entities, go through and attempt to generate new entity descriptions
         const ag = new advanced_generation_1.AdvancedGeneration();
         if (ag.featureEnabled('EntityDescriptions')) {
             // we have the feature enabled, so let's loop through the new entities and generate descriptions for them
-            const llm = ag.LLM;
-            const prompt = ag.getPrompt('EntityDescriptions');
-            const systemPrompt = prompt.systemPrompt;
-            const userMessage = prompt.userMessage + '\n\n';
-            // now loop through the new entities and generate descriptions for them
             for (let e of ManageMetadataBase.newEntityList) {
                 const dataResult = await pool.request().query(`SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwEntities WHERE Name = '${e}'`);
                 const data = dataResult.recordset;
                 const fieldsResult = await pool.request().query(`SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwEntityFields WHERE EntityID='${data[0].ID}'`);
                 const fields = fieldsResult.recordset;
-                const entityUserMessage = userMessage + `Entity Name: ${e},
-                                                     Base Table: ${data[0].BaseTable},
-                                                     Schema: ${data[0].SchemaName}.
-                                                     Fields:
-                                                     ${fields.map((f) => `   ${f.Name}: ${f.Type}`).join('\n')}`;
-                const result = await llm.ChatCompletion({
-                    model: ag.AIModel,
-                    messages: [
-                        {
-                            role: 'system',
-                            content: systemPrompt
-                        },
-                        {
-                            role: 'user',
-                            content: entityUserMessage
-                        }
-                    ]
-                });
-                if (result?.success) {
-                    const resultText = result?.data.choices[0].message.content;
-                    try {
-                        const structuredResult = JSON.parse(resultText);
-                        if (structuredResult?.entityDescription && structuredResult.entityDescription.length > 0) {
-                            const sSQL = `UPDATE [${(0, config_1.mj_core_schema)()}].Entity SET Description = '${structuredResult.entityDescription}' WHERE Name = '${e}'`;
-                            await this.LogSQLAndExecute(pool, sSQL, `SQL text to update entity description for entity ${e}`);
-                        }
-                        else {
-                            console.warn('   >>> Advanced Generation Error: LLM returned a blank entity description, skipping entity description for entity ' + e);
-                        }
-                    }
-                    catch (e) {
-                        console.warn('   >>> Advanced Generation Error: LLM returned invalid result, skipping entity description for entity ' + e + '. Result from LLM: ' + resultText, e);
-                    }
+                // Use new API to generate entity description
+                const result = await ag.generateEntityDescription(e, data[0].BaseTable, fields.map((f) => ({ Name: f.Name, Type: f.Type, IsNullable: f.AllowsNull, Description: f.Description })), currentUser);
+                if (result?.entityDescription && result.entityDescription.length > 0) {
+                    const sSQL = `UPDATE [${(0, config_1.mj_core_schema)()}].Entity SET Description = '${result.entityDescription}' WHERE Name = '${e}'`;
+                    await this.LogSQLAndExecute(pool, sSQL, `SQL text to update entity description for entity ${e}`);
                 }
                 else {
-                    console.warn('   >>> Advanced Generation Error: LLM call failed, skipping entity description for entity ' + e);
+                    console.warn('   >>> Advanced Generation Error: LLM returned invalid result, skipping entity description for entity ' + e);
                 }
             }
         }
@@ -1197,6 +1181,28 @@ NumberedRows AS (
             return false;
         }
     }
+    /**
+     * Syncs SchemaInfo records from database schemas, capturing extended properties as descriptions.
+     * Creates new SchemaInfo records for schemas that don't exist yet and updates descriptions
+     * from schema extended properties for existing records.
+     * @param pool - SQL connection pool
+     * @param excludeSchemas - Array of schema names to exclude from processing
+     * @returns Promise<boolean> - true if successful, false otherwise
+     */
+    async updateSchemaInfoFromDatabase(pool, excludeSchemas) {
+        try {
+            const sSQL = `EXEC [${(0, config_1.mj_core_schema)()}].spUpdateSchemaInfoFromDatabase @ExcludedSchemaNames='${excludeSchemas.join(',')}'`;
+            const result = await this.LogSQLAndExecute(pool, sSQL, `SQL text to sync schema info from database schemas`, true);
+            if (result && result.length > 0) {
+                (0, status_logging_1.logStatus)(`   > Updated/created ${result.length} SchemaInfo records`);
+            }
+            return true;
+        }
+        catch (e) {
+            (0, status_logging_1.logError)(e);
+            return false;
+        }
+    }
     async deleteUnneededEntityFields(pool, excludeSchemas) {
         try {
             const sSQL = `EXEC [${(0, config_1.mj_core_schema)()}].spDeleteUnneededEntityFields @ExcludedSchemaNames='${excludeSchemas.join(',')}'`;
@@ -1349,65 +1355,21 @@ NumberedRows AS (
         }
         try {
             if (generateNewCode && config_1.configInfo.advancedGeneration?.enableAdvancedGeneration && config_1.configInfo.advancedGeneration?.features.find(f => f.name === 'ParseCheckConstraints' && f.enabled)) {
-                // feature is enabled, so let's call the LLM to generate a function for us
+                // feature is enabled, so let's call the AI to generate a function for us
                 const ag = new advanced_generation_1.AdvancedGeneration();
-                const llm = ag.LLM;
-                if (!llm) {
-                    // we weren't able to get an LLM instance, so log an error and return
-                    (0, status_logging_1.logError)('   >>> Error generating validator function from check constraint. Unable to get an LLM instance.');
-                    return returnResult;
-                }
-                await aiengine_1.AIEngine.Instance.Config(false, currentUser); // make sure metadata loaded
-                const model = aiengine_1.AIEngine.Instance.Models.find(m => {
-                    const modelMatch = m.APINameOrName.trim().toLowerCase() === ag.AIModel.trim().toLowerCase();
-                    if (!modelMatch)
-                        return false;
-                    // Check if model has a vendor matching the specified vendor
-                    const hasVendor = aiengine_1.AIEngine.Instance.ModelVendors.some(mv => mv.ModelID === m.ID &&
-                        mv.Vendor.trim().toLowerCase() === ag.AIVendor.trim().toLowerCase() &&
-                        mv.Status === 'Active');
-                    return hasVendor;
-                });
-                if (!model)
-                    throw new Error(`   >>> Error generating validator function from check constraint. Unable to find AI Model with name ${ag.AIModel} and vendor ${ag.AIVendor}.`);
-                const prompt = ag.getPrompt('CheckConstraintParser');
                 const entityFieldListInfo = allEntityFields.filter(item => item.Entity.trim().toLowerCase() === data.EntityName.trim().toLowerCase()).map(item => `   * ${item.Name} - ${item.Type}${item.AllowsNull ? ' (nullable)' : ' (not null)'}`).join('\n');
-                const existingMethodNameBlock = generatedValidationFunctionName ? `Existing Method Name: ${generatedValidationFunctionName}\n Please reuse this SAME method name for the new generation` : '';
-                const markedUpSysPrompt = ag.fillTemplate(prompt.systemPrompt, {
-                    ENTITY_FIELD_LIST: entityFieldListInfo,
-                    EXISTING_METHOD_NAME: existingMethodNameBlock
-                }); // prompt.systemPrompt.replace(/{{ENTITY_FIELD_LIST}}/g, entityFieldListInfo);
-                const result = await llm.ChatCompletion({
-                    messages: [
-                        {
-                            role: 'system',
-                            content: markedUpSysPrompt
-                        },
-                        {
-                            role: 'user',
-                            content: `${constraintDefinition}`
-                        }
-                    ],
-                    model: ag.AIModel,
-                    responseFormat: 'JSON'
-                });
-                if (result && result.success) {
-                    const jsonResult = result.data.choices[0].message.content;
-                    const structuredResult = (0, global_1.SafeJSONParse)(jsonResult);
-                    if (structuredResult?.Description && structuredResult?.Code && structuredResult?.MethodName) {
-                        returnResult.functionText = structuredResult.Code;
-                        returnResult.functionName = structuredResult.MethodName;
-                        returnResult.functionDescription = structuredResult.Description;
-                        returnResult.aiModelID = model.ID;
-                        returnResult.wasGenerated = true; // we just generated this code
-                        returnResult.success = true;
-                    }
-                    else {
-                        (0, status_logging_1.logError)(`Error generating field validator function from check constraint for entity ${entityName} and field ${fieldName}. LLM returned invalid result.`);
-                    }
+                // Use new API to parse check constraint
+                const result = await ag.parseCheckConstraint(constraintDefinition, entityFieldListInfo, generatedValidationFunctionName, currentUser);
+                if (result?.Description && result?.Code && result?.MethodName) {
+                    returnResult.functionText = result.Code;
+                    returnResult.functionName = result.MethodName;
+                    returnResult.functionDescription = result.Description;
+                    returnResult.aiModelID = result.ModelID;
+                    returnResult.wasGenerated = true; // we just generated this code
+                    returnResult.success = true;
                 }
                 else {
-                    (0, status_logging_1.logError)(`Error generating field validator function from check constraint for entity ${entityName} and field ${fieldName}. LLM call failed.`);
+                    (0, status_logging_1.logError)(`Error generating field validator function from check constraint for entity ${entityName} and field ${fieldName}. LLM returned invalid result.`);
                 }
             }
         }
@@ -1552,7 +1514,7 @@ NumberedRows AS (
             (sExcludeSchemas.length > 0 ? (sExcludeTables.length > 0 ? ` AND ` : ``) + '(' + sExcludeSchemas + ')' : '');
         return sWhere;
     }
-    async createNewEntities(pool) {
+    async createNewEntities(pool, currentUser) {
         try {
             const sSQL = `SELECT * FROM [${(0, config_1.mj_core_schema)()}].vwSQLTablesAndEntities WHERE EntityID IS NULL ` + this.createExcludeTablesAndSchemasFilter('');
             const newEntitiesResult = await pool.request().query(sSQL);
@@ -1565,7 +1527,7 @@ NumberedRows AS (
                     // wrap in a transaction so we get all of it or none of it
                     for (let i = 0; i < newEntities.length; ++i) {
                         // process each of the new entities
-                        await this.createNewEntity(pool, newEntities[i], md);
+                        await this.createNewEntity(pool, newEntities[i], md, currentUser);
                     }
                     await transaction.commit();
                 }
@@ -1606,10 +1568,10 @@ NumberedRows AS (
             return { shouldCreate: false, validationMessage: errorMsg };
         }
     }
-    async createNewEntityName(newEntity) {
+    async createNewEntityName(newEntity, currentUser) {
         const ag = new advanced_generation_1.AdvancedGeneration();
         if (ag.featureEnabled('EntityNames')) {
-            return this.newEntityNameWithAdvancedGeneration(ag, newEntity);
+            return this.newEntityNameWithAdvancedGeneration(ag, newEntity, currentUser);
         }
         else {
             return this.simpleNewEntityName(newEntity.SchemaName, newEntity.TableName);
@@ -1636,44 +1598,13 @@ NumberedRows AS (
         }
         return null; // nothing to do here, the DisplayName can be null as it will just end up being the entity name
     }
-    async newEntityNameWithAdvancedGeneration(ag, newEntity) {
-        // get the LLM for this entity
-        const chat = ag.LLM;
-        const prompt = ag.getPrompt('EntityNames');
-        const systemPrompt = ag.fillTemplate(prompt.systemPrompt, newEntity);
-        const userMessage = ag.fillTemplate(prompt.userMessage, newEntity);
-        const result = await chat.ChatCompletion({
-            model: ag.AIModel,
-            messages: [
-                {
-                    role: 'system',
-                    content: systemPrompt
-                },
-                {
-                    role: 'user',
-                    content: userMessage
-                }
-            ]
-        });
-        if (result?.success) {
-            const resultText = result?.data.choices[0].message.content;
-            try {
-                const structuredResult = JSON.parse(resultText);
-                if (structuredResult?.entityName) {
-                    return this.markupEntityName(newEntity.SchemaName, structuredResult.entityName);
-                }
-                else {
-                    console.warn('   >>> Advanced Generation Error: LLM returned a blank entity name, falling back to simple generated entity name');
-                    return this.simpleNewEntityName(newEntity.SchemaName, newEntity.TableName);
-                }
-            }
-            catch (e) {
-                console.warn('   >>> Advanced Generation Error: LLM returned invalid result, falling back to simple generated entity name. Result from LLM: ' + resultText, e);
-                return this.simpleNewEntityName(newEntity.SchemaName, newEntity.TableName);
-            }
+    async newEntityNameWithAdvancedGeneration(ag, newEntity, currentUser) {
+        const result = await ag.generateEntityName(newEntity.TableName, currentUser);
+        if (result?.entityName) {
+            return this.markupEntityName(newEntity.SchemaName, result.entityName);
         }
         else {
-            console.warn('   >>> Advanced Generation Error: LLM call failed, falling back to simple generated entity name.');
+            console.warn('   >>> Advanced Generation Error: LLM returned invalid result, falling back to simple generated entity name');
             return this.simpleNewEntityName(newEntity.SchemaName, newEntity.TableName);
         }
     }
@@ -1712,12 +1643,12 @@ NumberedRows AS (
     createNewUUID() {
         return (0, uuid_1.v4)();
     }
-    async createNewEntity(pool, newEntity, md) {
+    async createNewEntity(pool, newEntity, md, currentUser) {
         try {
             const { shouldCreate, validationMessage } = await this.shouldCreateNewEntity(pool, newEntity);
             if (shouldCreate) {
                 // process a single new entity
-                let newEntityName = await this.createNewEntityName(newEntity);
+                let newEntityName = await this.createNewEntityName(newEntity, currentUser);
                 const newEntityDisplayName = this.createNewEntityDisplayName(newEntity, newEntityName);
                 let suffix = '';
                 const existingEntity = md.Entities.find(e => e.Name.toLowerCase() === newEntityName.toLowerCase());
@@ -1897,6 +1828,291 @@ NumberedRows AS (
    `;
         return sSQLInsert;
     }
+    /**
+     * Apply Advanced Generation features - Smart Field Identification and Form Layout Generation
+     */
+    async applyAdvancedGeneration(pool, excludeSchemas, currentUser) {
+        try {
+            const ag = new advanced_generation_1.AdvancedGeneration();
+            if (!ag.enabled) {
+                return true;
+            }
+            // Get list of entities to process
+            // If forceRegeneration.enabled is true, process ALL entities
+            // Otherwise, only process new or modified entities
+            let entitiesToProcess = [];
+            let whereClause = '';
+            if (config_1.configInfo.forceRegeneration?.enabled) {
+                // Force regeneration mode - process all entities (or filtered by entityWhereClause)
+                (0, status_logging_1.logStatus)(`      Force regeneration enabled - processing all entities...`);
+                whereClause = 'e.VirtualEntity = 0';
+                if (config_1.configInfo.forceRegeneration.entityWhereClause && config_1.configInfo.forceRegeneration.entityWhereClause.trim().length > 0) {
+                    whereClause += ` AND (${config_1.configInfo.forceRegeneration.entityWhereClause})`;
+                    (0, status_logging_1.logStatus)(`         Filtered by: ${config_1.configInfo.forceRegeneration.entityWhereClause}`);
+                }
+                whereClause += ` AND e.SchemaName NOT IN (${excludeSchemas.map(s => `'${s}'`).join(',')})`;
+            }
+            else {
+                // Normal mode - only process new or modified entities
+                // Deduplicate in case an entity appears in both lists
+                entitiesToProcess = [
+                    ...new Set([
+                        ...ManageMetadataBase.newEntityList,
+                        ...ManageMetadataBase.modifiedEntityList
+                    ])
+                ];
+                if (entitiesToProcess.length === 0) {
+                    return true;
+                }
+                (0, status_logging_1.logStatus)(`      Advanced Generation enabled, processing ${entitiesToProcess.length} entities...`);
+                whereClause = `e.VirtualEntity = 0 AND e.Name IN (${entitiesToProcess.map(name => `'${name}'`).join(',')}) AND e.SchemaName NOT IN (${excludeSchemas.map(s => `'${s}'`).join(',')})`;
+            }
+            // Get entity details for entities that need processing
+            const entitiesSQL = `
+            SELECT
+               e.ID,
+               e.Name,
+               e.Description,
+               e.SchemaName,
+               e.BaseTable
+            FROM
+               [${(0, config_1.mj_core_schema)()}].vwEntities e
+            WHERE
+               ${whereClause}
+            ORDER BY
+               e.Name
+         `;
+            const entitiesResult = await pool.request().query(entitiesSQL);
+            const entities = entitiesResult.recordset;
+            if (entities.length === 0) {
+                return true;
+            }
+            // Get ALL fields for ALL entities in a single query
+            const entityIds = entities.map((e) => `'${e.ID}'`).join(',');
+            const fieldsSQL = `
+            SELECT
+               ef.EntityID,
+               ef.ID,
+               ef.Name,
+               ef.Type,
+               ef.AllowsNull,
+               ef.IsPrimaryKey,
+               ef.IsUnique,
+               ef.Description,
+               ef.AutoUpdateIsNameField,
+               ef.AutoUpdateDefaultInView,
+               ef.AutoUpdateCategory
+            FROM
+               [${(0, config_1.mj_core_schema)()}].vwEntityFields ef
+            WHERE
+               ef.EntityID IN (${entityIds})
+            ORDER BY
+               ef.EntityID,
+               ef.Sequence
+         `;
+            const fieldsResult = await pool.request().query(fieldsSQL);
+            const allFields = fieldsResult.recordset;
+            // Process entities in batches with parallelization
+            return await this.processEntitiesBatched(pool, entities, allFields, ag, currentUser);
+        }
+        catch (error) {
+            (0, status_logging_1.logError)(`Advanced Generation failed: ${error}`);
+            return false;
+        }
+    }
+    /**
+     * Process entities in batches with parallel execution
+     * @param pool Database connection pool
+     * @param entities Entities to process
+     * @param allFields All fields for all entities (will be filtered per entity)
+     * @param ag AdvancedGeneration instance
+     * @param currentUser User context
+     * @param batchSize Number of entities to process in parallel (default 5)
+     */
+    async processEntitiesBatched(pool, entities, allFields, ag, currentUser, batchSize = 5) {
+        let processedCount = 0;
+        let errorCount = 0;
+        // Process in batches
+        for (let i = 0; i < entities.length; i += batchSize) {
+            const batch = entities.slice(i, i + batchSize);
+            // Process batch in parallel
+            const batchResults = await Promise.allSettled(batch.map(entity => this.processEntityAdvancedGeneration(pool, entity, allFields, ag, currentUser)));
+            // Tally results
+            for (const result of batchResults) {
+                if (result.status === 'fulfilled') {
+                    processedCount++;
+                }
+                else {
+                    errorCount++;
+                    (0, status_logging_1.logError)(`         Error processing entity: ${result.reason}`);
+                }
+            }
+            (0, status_logging_1.logStatus)(`      Progress: ${processedCount}/${entities.length} entities processed`);
+        }
+        (0, status_logging_1.logStatus)(`      Advanced Generation complete: ${processedCount} entities processed, ${errorCount} errors`);
+        return errorCount === 0;
+    }
+    /**
+     * Process advanced generation for a single entity
+     * @param pool Database connection pool
+     * @param entity Entity to process
+     * @param allFields All fields for all entities (will be filtered for this entity)
+     * @param ag AdvancedGeneration instance
+     * @param currentUser User context
+     */
+    async processEntityAdvancedGeneration(pool, entity, allFields, ag, currentUser) {
+        // Filter fields for this entity (client-side filtering)
+        const fields = allFields.filter((f) => f.EntityID === entity.ID);
+        // Smart Field Identification
+        // Only run if at least one field allows auto-update
+        if (fields.some((f) => f.AutoUpdateIsNameField || f.AutoUpdateDefaultInView)) {
+            const fieldAnalysis = await ag.identifyFields({
+                Name: entity.Name,
+                Description: entity.Description,
+                Fields: fields
+            }, currentUser);
+            if (fieldAnalysis) {
+                await this.applySmartFieldIdentification(pool, entity.ID, fields, fieldAnalysis);
+            }
+        }
+        // Form Layout Generation
+        // Only run if at least one field allows auto-update
+        if (fields.some((f) => f.AutoUpdateCategory)) {
+            const layoutAnalysis = await ag.generateFormLayout({
+                Name: entity.Name,
+                Description: entity.Description,
+                Fields: fields
+            }, currentUser);
+            if (layoutAnalysis) {
+                await this.applyFormLayout(pool, entity.ID, fields, layoutAnalysis);
+                (0, status_logging_1.logStatus)(`         Applied form layout for ${entity.Name}`);
+            }
+        }
+    }
+    /**
+     * Apply smart field identification results to entity fields
+     */
+    async applySmartFieldIdentification(pool, entityId, fields, result) {
+        const sqlStatements = [];
+        // Find the name field (exactly one)
+        const nameField = fields.find(f => f.Name === result.nameField);
+        if (nameField && nameField.AutoUpdateIsNameField && nameField.ID) {
+            sqlStatements.push(`
+            UPDATE [${(0, config_1.mj_core_schema)()}].EntityField
+            SET IsNameField = 1
+            WHERE ID = '${nameField.ID}'
+            AND AutoUpdateIsNameField = 1
+         `);
+        }
+        else if (!nameField) {
+            (0, status_logging_1.logError)(`Smart field identification returned invalid nameField: '${result.nameField}' not found in entity fields`);
+        }
+        // Find all default in view fields (one or more)
+        const defaultInViewFields = fields.filter(f => result.defaultInView.includes(f.Name) && f.AutoUpdateDefaultInView && f.ID);
+        // Warn about any fields that weren't found
+        const missingFields = result.defaultInView.filter(name => !fields.some(f => f.Name === name));
+        if (missingFields.length > 0) {
+            (0, status_logging_1.logError)(`Smart field identification returned invalid defaultInView fields: ${missingFields.join(', ')} not found in entity`);
+        }
+        // Build update statements for all default in view fields
+        for (const field of defaultInViewFields) {
+            sqlStatements.push(`
+            UPDATE [${(0, config_1.mj_core_schema)()}].EntityField
+            SET DefaultInView = 1
+            WHERE ID = '${field.ID}'
+            AND AutoUpdateDefaultInView = 1
+         `);
+        }
+        // Execute all updates in one batch
+        if (sqlStatements.length > 0) {
+            const combinedSQL = sqlStatements.join('\n');
+            await this.LogSQLAndExecute(pool, combinedSQL, `Set field properties for entity`, false);
+        }
+    }
+    /**
+     * Apply form layout generation results to set category on entity fields
+     */
+    async applyFormLayout(pool, entityId, fields, result) {
+        // Collect all SQL statements for batch execution
+        const sqlStatements = [];
+        // Assign category to each field
+        for (const fieldCategory of result.fieldCategories) {
+            const field = fields.find(f => f.Name === fieldCategory.fieldName);
+            if (field && field.AutoUpdateCategory && field.ID) {
+                // Override category to "System Metadata" for __mj_ fields (system audit fields)
+                let category = fieldCategory.category;
+                if (field.Name.startsWith('__mj_')) {
+                    category = 'System Metadata';
+                }
+                const updateSQL = `UPDATE [${(0, config_1.mj_core_schema)()}].EntityField
+   SET Category = '${category.replace(/'/g, "''")}',
+       GeneratedFormSection = 'Category'
+   WHERE ID = '${field.ID}'
+   AND AutoUpdateCategory = 1`;
+                sqlStatements.push(updateSQL);
+            }
+            else if (!field) {
+                (0, status_logging_1.logError)(`Form layout generation returned invalid fieldName: '${fieldCategory.fieldName}' not found in entity`);
+            }
+        }
+        // Execute all field updates in one batch
+        if (sqlStatements.length > 0) {
+            const combinedSQL = sqlStatements.join('\n');
+            await this.LogSQLAndExecute(pool, combinedSQL, `Set categories for ${sqlStatements.length} fields`, false);
+        }
+        // Store entity icon if provided and entity doesn't already have one
+        if (result.entityIcon && result.entityIcon.trim().length > 0) {
+            // Check if entity already has an icon
+            const checkEntitySQL = `
+            SELECT Icon FROM [${(0, config_1.mj_core_schema)()}].Entity
+            WHERE ID = '${entityId}'
+         `;
+            const entityCheck = await pool.request().query(checkEntitySQL);
+            if (entityCheck.recordset.length > 0) {
+                const currentIcon = entityCheck.recordset[0].Icon;
+                // Only update if entity doesn't have an icon set
+                if (!currentIcon || currentIcon.trim().length === 0) {
+                    const escapedIcon = result.entityIcon.replace(/'/g, "''");
+                    const updateEntitySQL = `
+                  UPDATE [${(0, config_1.mj_core_schema)()}].Entity
+                  SET Icon = '${escapedIcon}',
+                      __mj_UpdatedAt = GETUTCDATE()
+                  WHERE ID = '${entityId}'
+               `;
+                    await this.LogSQLAndExecute(pool, updateEntitySQL, `Set entity icon to ${result.entityIcon}`, false);
+                    (0, status_logging_1.logStatus)(`  ✓ Set entity icon: ${result.entityIcon}`);
+                }
+            }
+        }
+        // Store category icons in EntitySetting if provided
+        if (result.categoryIcons && Object.keys(result.categoryIcons).length > 0) {
+            const iconsJSON = JSON.stringify(result.categoryIcons).replace(/'/g, "''");
+            // First check if setting already exists
+            const checkSQL = `
+            SELECT ID FROM [${(0, config_1.mj_core_schema)()}].EntitySetting
+            WHERE EntityID = '${entityId}' AND Name = 'FieldCategoryIcons'
+         `;
+            const existing = await pool.request().query(checkSQL);
+            if (existing.recordset.length > 0) {
+                // Update existing setting
+                const updateSQL = `
+               UPDATE [${(0, config_1.mj_core_schema)()}].EntitySetting
+               SET Value = '${iconsJSON}',
+                   __mj_UpdatedAt = GETUTCDATE()
+               WHERE EntityID = '${entityId}' AND Name = 'FieldCategoryIcons'
+            `;
+                await this.LogSQLAndExecute(pool, updateSQL, `Update FieldCategoryIcons setting for entity`, false);
+            }
+            else {
+                // Insert new setting
+                const insertSQL = `
+               INSERT INTO [${(0, config_1.mj_core_schema)()}].EntitySetting (ID, EntityID, Name, Value, __mj_CreatedAt, __mj_UpdatedAt)
+               VALUES (NEWID(), '${entityId}', 'FieldCategoryIcons', '${iconsJSON}', GETUTCDATE(), GETUTCDATE())
+            `;
+                await this.LogSQLAndExecute(pool, insertSQL, `Insert FieldCategoryIcons setting for entity`, false);
+            }
+        }
+    }
     /**
      * Executes the given SQL query using the given ConnectionPool object.
      * If the appendToLogFile parameter is true, the query will also be appended to the log file.