Dev

applications/Unity.AutoUI/cypress/e2e/lists.cy.ts

@@ -10,31 +10,34 @@ describe('Grant Manager Login and List Navigation', () => {
     const appsPage = ApplicationsPageInstance()
 
     function setDashboardIntakeToTestIfAvailable() {
-        const btnSel = 'button[data-id="dashboardIntakeId"]'
-        const listboxSel = '#bs-select-1[role="listbox"]'
-        const searchSel = 'input[type="search"][aria-controls="bs-select-1"]'
-
-        cy.get(btnSel, { timeout: 30000 })
+        // The INTAKES filter is a Select2 (bootstrap-5 theme) multi-select, not
+        // bootstrap-select — the toggle is the [role="combobox"] wrapping the
+        // rendered-choices <ul id="select2-dashboardIntakeId-container">.
+        const renderedSel = '#select2-dashboardIntakeId-container'
+        const dropdownSel = '.select2-dropdown'
+        const optionSel = `${dropdownSel} li.select2-results__option`
+
+        cy.get(renderedSel, { timeout: 30000 })
             .should('be.visible')
-            .first()
+            .closest('[role="combobox"]')
+            .as('intakeCombobox')
             .click({ force: true })
 
-        cy.get(listboxSel, { timeout: 30000 }).should('be.visible')
+        cy.get(dropdownSel, { timeout: 30000 }).should('be.visible')
 
-        cy.get(searchSel, { timeout: 30000 })
+        cy.get(renderedSel)
+            .parent()
+            .find('textarea.select2-search__field', { timeout: 30000 })
             .should('be.visible')
             .clear()
             .type('Test')
 
-        cy.contains(`${listboxSel} a.dropdown-item[role="option"] span.text`, /^Test$/, { timeout: 30000 })
-            .closest('a.dropdown-item')
+        cy.contains(optionSel, /^Test$/, { timeout: 30000 })
             .then(($opt) => {
-                const selected =
-                    $opt.attr('aria-selected') === 'true' ||
-                    $opt.hasClass('selected')
+                const selected = $opt.attr('aria-selected') === 'true'
 
                 if (!selected) {
-                    cy.wrap($opt).scrollIntoView().click({ force: true })
+                    cy.wrap($opt).click({ force: true })
                 }
             })
 
@@ -43,8 +46,8 @@ describe('Grant Manager Login and List Navigation', () => {
             expect(texts).to.include('Test')
         })
 
-        cy.get(btnSel).first().click({ force: true })
-        cy.get(btnSel).first().should('have.attr', 'aria-expanded', 'false')
+        cy.get('@intakeCombobox').click({ force: true })
+        cy.get('@intakeCombobox').should('have.attr', 'aria-expanded', 'false')
     }
 
     it('Verify Login', () => {

applications/Unity.GrantManager/modules/Unity.AI/docs/implementation-playbook.md

@@ -21,6 +21,25 @@ Use these existing operations as the canonical references:
 6. Expose a generate surface and UI only when users need one.
 7. Add focused catalog, runtime, executor, and persistence tests.
 
+## Staged form mapping
+
+`FormMapping` and `FormWorksheet` remain independent operations. The Mapping
+tab can guide an administrator through them as a staged form-configuration flow:
+
+1. Generate mapping suggestions using the form fields, core fields, assigned
+   custom fields, and current saved mapping.
+2. Persist suggestions for review; accept them individually so existing
+   non-empty mappings always win.
+3. Generate and review `FormWorksheet` suggestions, either after mapping review
+   or directly from the idle state.
+4. Publish and assign created worksheet drafts through the normal worksheet
+   configuration UI.
+5. Invoke the same `FormMapping` operation again after publication and
+   assignment.
+
+Keep mapping review state scoped to the form version. Do not auto-link unpublished
+AI worksheet drafts to a UI anchor just to make their fields visible to mapping.
+
 ## Rules
 - Keep prompt content and operation/model configuration in the database.
 - Reuse the shared generation pipeline.

applications/Unity.GrantManager/modules/Unity.AI/docs/operations/form-worksheet.md

@@ -22,6 +22,7 @@ Generate a recommended worksheet definition for a form version.
 
 ## Output Shape
 - A `fields` collection containing the suggested additional worksheet fields.
+- Include all applicable additional fields in the collection; do not limit the response to one suggestion.
 - Each suggestion supplies the field key, label, and supported custom-field type.
 - The executor builds the worksheet and its `Suggested Fields` section from the validated suggestions.
 - Keep the result valid JSON and include only fields that the form needs beyond core Unity fields.

applications/Unity.GrantManager/modules/Unity.AI/docs/prompt-map.md

@@ -8,6 +8,12 @@
 - `FormWorksheet` - worksheet generation
 - `FormScoresheet` - scoresheet generation
 
+`FormMapping` and `FormWorksheet` are independent operations with complete
+context inputs. The Mapping tab can guide them through mapping review, worksheet
+review, publish and assignment, and another mapping run. Review suggestions are
+persisted until accepted or discarded. Initial-review suggestions preserve existing
+non-empty mappings; accepted final-review suggestions may replace conflicting mappings.
+
 ## Versions
 - Built-in prompt rows are defined and seeded by `AIPromptDataSeeder`.
 - Families may have `v0`, `v1`, and `v2` rows; a new operation only needs the versions it supports.

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Permissions/AIPermissionDefinitionProvider.cs

@@ -95,7 +95,8 @@ public override void Define(IPermissionDefinitionContext context)
             "Unity.AI.ApplicationAnalysis",
             "Unity.AI.FormMapping",
             "Unity.AI.FormWorksheet",
-            "Unity.AI.FormScoresheet"));
+            "Unity.AI.FormScoresheet",
+            "Unity.AIReporting"));
     }
 
     private static LocalizableString L(string name)

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormMappingResponse.cs

@@ -7,6 +7,8 @@ public class FormMappingResponse
 {
     public string Mapping { get; set; } = string.Empty;
 
+    public string? FailureReason { get; set; }
+
     [JsonPropertyName("coreFieldMatches")]
     public List<FormMappingMatchResponse> CoreFieldMatches { get; set; } = [];
 

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Responses/FormScoresheetResponse.cs

@@ -7,6 +7,8 @@ public class FormScoresheetResponse
 {
     public string Scoresheet { get; set; } = string.Empty;
 
+    public string? FailureReason { get; set; }
+
     [JsonPropertyName("title")]
     public string Title { get; set; } = string.Empty;
 

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/AITenantConfigurationDto.cs

@@ -4,4 +4,5 @@ public class AITenantConfigurationDto
 {
     public bool AutomaticGenerationEnabled { get; set; }
     public bool ManualGenerationEnabled { get; set; }
+    public bool ReportingEnabled { get; set; }
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Settings/UpdateAITenantConfigurationDto.cs

@@ -4,4 +4,5 @@ public class UpdateAITenantConfigurationDto
 {
     public bool AutomaticGenerationEnabled { get; set; }
     public bool ManualGenerationEnabled { get; set; }
+    public bool ReportingEnabled { get; set; }
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIOperationDataSeeder.cs

@@ -28,7 +28,7 @@ public class AIOperationDataSeeder(
         new(AIPromptTypes.ApplicationScoring, 8000),
         new(AIPromptTypes.FormMapping, 2000),
         new(AIPromptTypes.FormWorksheet, 4000),
-        new(AIPromptTypes.FormScoresheet, 4000)
+        new(AIPromptTypes.FormScoresheet, 8000)
     ];
 
     public async Task SeedAsync(DataSeedContext context)

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs

@@ -868,7 +868,8 @@ Return only valid JSON.
         }
 
         Rules:
-        - Return one field-suggestion JSON object only.
+        - Return one JSON object containing all applicable field suggestions. Review the full form schema and every unmapped CHEFS field before responding; include every additional custom field genuinely needed, not just the first match.
+        - Return an empty fields array when no additional custom fields are needed.
         - chefsFields contains the available CHEFS source fields.
         - unityCoreFields contains existing Unity core fields. Do not create a custom field when one of these already fits.
         - existingMapping contains the current saved Unity-to-CHEFS mappings. Do not duplicate those mappings with a custom field.
@@ -932,6 +933,8 @@ Return only valid JSON.
 
         Rules:
         - Return one scoresheet definition JSON object only.
+        - Title and Name must be non-empty strings; Sections must contain at least one section and every section must contain at least one field.
+        - Every field Name and Label must be non-empty, Order and Type must be non-negative integers, and Definition must be a valid JSON object encoded as a string.
         - The context contains CHEFS form fields, allowed Unity Flex question types, and a scoresheet template.
         - Fill out the scoresheet template to generate the rubric assessors use to score submitted applications.
         - Use CHEFS form fields as evidence for assessment criteria, but do not create one question per form field.

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIOperationResult.cs

@@ -20,7 +20,8 @@ public enum AIFailureCategory
     public sealed record AIOperationResult(
         AIOperationOutcome Outcome,
         AIProviderResult Response,
-        AIFailureCategory FailureCategory = AIFailureCategory.None)
+        AIFailureCategory FailureCategory = AIFailureCategory.None,
+        string? FailureReason = null)
     {
         public string Content => Response.Content;
 
@@ -41,8 +42,8 @@ public static AIOperationResult ProviderUnavailable(AIProviderResult? response =
         public static AIOperationResult InvalidOutput(AIProviderResult? response = null) =>
             new(AIOperationOutcome.InvalidOutput, response ?? AIProviderResult.Empty, AIFailureCategory.InvalidOutput);
 
-        public AIOperationResult WithOutcome(AIOperationOutcome outcome, AIFailureCategory? failureCategory = null) =>
-            new(outcome, Response, failureCategory ?? ResolveFailureCategory(outcome));
+        public AIOperationResult WithOutcome(AIOperationOutcome outcome, AIFailureCategory? failureCategory = null, string? failureReason = null) =>
+            new(outcome, Response, failureCategory ?? ResolveFailureCategory(outcome), failureReason ?? FailureReason);
 
         private static AIFailureCategory ResolveFailureCategory(AIOperationOutcome outcome)
         {

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/AIProviderPayloadValidator.cs

@@ -206,7 +206,8 @@ private static AIResponseValidationResult ValidateSections(JsonElement root, str
                     return sectionNameResult;
                 }
 
-                if (!sectionNames.Add(section.GetProperty("Name").GetString()!))
+                if (!TryGetProperty(section, "Name", out var sectionName)
+                    || !sectionNames.Add(sectionName.GetString()!))
                 {
                     return AIResponseValidationResult.Invalid($"{responseName} response contains duplicate section names.");
                 }
@@ -235,7 +236,8 @@ private static AIResponseValidationResult ValidateSections(JsonElement root, str
                         return result;
                     }
 
-                    if (!fieldNames.Add(field.GetProperty("Name").GetString()!))
+                    if (!TryGetProperty(field, "Name", out var fieldName)
+                        || !fieldNames.Add(fieldName.GetString()!))
                     {
                         return AIResponseValidationResult.Invalid($"{responseName} response contains duplicate field names.");
                     }
@@ -355,6 +357,18 @@ private static bool TryGetProperty(JsonElement element, string propertyName, out
                 return true;
             }
 
+            if (element.ValueKind == JsonValueKind.Object)
+            {
+                foreach (var candidate in element.EnumerateObject())
+                {
+                    if (string.Equals(candidate.Name, propertyName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        property = candidate.Value;
+                        return true;
+                    }
+                }
+            }
+
             property = default;
             return false;
         }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Runtime/Execution/OpenAIRuntimeService.cs

@@ -357,9 +357,8 @@ public async Task<FormScoresheetResponse> GenerateFormScoresheetAsync(FormScores
 
                 return new FormScoresheetResponse
                 {
-                    Scoresheet = result.Outcome == AIOperationOutcome.Success
-                        ? AIResponseJson.CleanJsonResponse(result.Content)
-                        : "{}"
+                    Scoresheet = AIResponseJson.CleanJsonResponse(result.Content),
+                    FailureReason = result.FailureReason
                 };
             }
             catch (OperationCanceledException)
@@ -406,7 +405,10 @@ private async Task<FormMappingResponse> GenerateFormMappingCoreAsync(FormMapping
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
-                    return new FormMappingResponse();
+                    return new FormMappingResponse
+                    {
+                        FailureReason = result.FailureReason ?? $"Mapping generation failed with outcome {result.Outcome}."
+                    };
                 }
 
                 return new FormMappingResponse
@@ -421,7 +423,7 @@ private async Task<FormMappingResponse> GenerateFormMappingCoreAsync(FormMapping
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Mapping suggestion generation failed.");
-                return new FormMappingResponse();
+                return new FormMappingResponse { FailureReason = ex.Message };
             }
         }
 
@@ -449,7 +451,10 @@ private async Task<AIOperationResult> GenerateWithRetryAsync(
                         return lastResult;
                     }
 
-                    lastResult = lastResult.WithOutcome(AIOperationOutcome.InvalidOutput, validationResult.FailureCategory);
+                    lastResult = lastResult.WithOutcome(
+                        AIOperationOutcome.InvalidOutput,
+                        validationResult.FailureCategory,
+                        validationResult.Reason);
 
                     _logger.LogWarning(
                         "AI {OperationName} attempt {Attempt}/{MaxAttempts} returned invalid response shape ({FailureCategory}): {Reason}; will retry if attempts remain",

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AIConfigurationAppService.cs

@@ -27,7 +27,9 @@ public virtual async Task<AITenantConfigurationDto> GetTenantConfigurationAsync(
             AutomaticGenerationEnabled = await _settingProvider.GetAsync<bool>(
                 AISettings.AutomaticGenerationEnabled, defaultValue: false),
             ManualGenerationEnabled = await _settingProvider.GetAsync<bool>(
-                AISettings.ManualGenerationEnabled, defaultValue: false)
+                AISettings.ManualGenerationEnabled, defaultValue: false),
+            ReportingEnabled = await _settingProvider.GetAsync<bool>(
+                AISettings.ReportingEnabled, defaultValue: false)
         };
     }
 
@@ -46,5 +48,11 @@ await _settingManager.SetAsync(
             input.ManualGenerationEnabled.ToString().ToLowerInvariant(),
             TenantSettingValueProvider.ProviderName,
             _currentTenant.Id?.ToString());
+
+        await _settingManager.SetAsync(
+            AISettings.ReportingEnabled,
+            input.ReportingEnabled.ToString().ToLowerInvariant(),
+            TenantSettingValueProvider.ProviderName,
+            _currentTenant.Id?.ToString());
     }
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Settings/AISettingDefinitionProvider.cs

@@ -29,6 +29,17 @@ public override void Define(ISettingDefinitionContext context)
                 isEncrypted: false)
             .WithProviders(TenantSettingValueProvider.ProviderName)
         );
+
+        context.Add(
+            new SettingDefinition(
+                AISettings.ReportingEnabled,
+                "false",
+                L("Setting:AI.ReportingEnabled"),
+                isVisibleToClients: false,
+                isInherited: false,
+                isEncrypted: false)
+            .WithProviders(TenantSettingValueProvider.ProviderName)
+        );
     }
 
     private static LocalizableString L(string name)