From 0ae0f3d2ce9d8f907ec508bfd68eed8efc69c8e8 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Sat, 30 May 2026 15:37:58 -0700
Subject: [PATCH 01/10] AB#32531: Fix Styling of Email Attachments Table and
 Button

---
 .../Views/Shared/Components/EmailsWidget/Default.cshtml        | 2 +-
 .../Views/Shared/Components/EmailsWidget/Default.css           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
index 3cd452a9c6..3762c96b59 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml
@@ -120,7 +120,7 @@
         </fieldset>
         <div id="email-attachments-section" style="display:none">
             <abp-row class="m-0 p-0">
-                <abp-column size="_10" class="px-1">
+                <abp-column size="_12" class="px-0">
                     <h6 class="fw-bold pt-3 pb-1 m-0">Attachments</h6>
                     <abp-table id="EmailAttachmentsTable"
                                hoverable-rows="true"
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
index 8d852c7702..2a3f2197b6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.css
@@ -252,6 +252,9 @@
 
 #applicationEmailsWidget button {
     margin: 2px;
+}
+
+#applicationEmailsWidget button:hover {
     border: 1px solid var(--bc-colors-blue-primary);
 }
 

From 2f3e12bf7e935f38ffb3515a36ba07634d467a15 Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Tue, 2 Jun 2026 09:52:31 -0700
Subject: [PATCH 02/10] bugfix/AB#33298-FixDBContext

---
 .../Norifications/NotificationsAppService.cs                   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs
index b01b2881d1..908079048e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Norifications/NotificationsAppService.cs
@@ -7,6 +7,7 @@
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.Uow;
 
 namespace Unity.GrantManager.Notifications
 {
@@ -24,6 +25,7 @@ public NotificationsAppService(IDynamicUrlRepository dynamicUrlRepository)
             _teamsNotificationService = new TeamsNotificationService();
         }
 
+        [UnitOfWork]
         public async Task<string> InitializeTeamsChannelAsync(string keyName)
         {
             DynamicUrl? teamsChannel = await _dynamicUrlRepository.FirstOrDefaultAsync(q => q.KeyName == keyName);
@@ -50,6 +52,7 @@ public async Task NotifyChefsEventToTeamsAsync(string factName, string factValue
             await _teamsNotificationService.PostFactsToTeamsAsync(teamsChannel, activityTitle, activitySubtitle);
         }
 
+        [UnitOfWork]
         public async Task PostToTeamsAsync(string activityTitle, string activitySubtitle, List<Fact> facts)
         {
             string teamsChannel = await InitializeTeamsChannelAsync(TeamsNotificationService.TEAMS_NOTIFICATION);

From 7d9db29e664ec279476c88e07e4564932183b61d Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 2 Jun 2026 10:09:30 -0700
Subject: [PATCH 03/10] [AB#29848] Refactor form synchronization to handle
 descriptions

---
 .../Applications/ApplicationFormManager.cs        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
index 31ee0d2851..d58bd3c0ff 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
@@ -1,9 +1,9 @@
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Services;
-using Unity.GrantManager.Intakes;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
 using Unity.GrantManager.Events;
+using Unity.GrantManager.Intakes;
 using Volo.Abp.Domain.Repositories;
-using Newtonsoft.Json.Linq;
+using Volo.Abp.Domain.Services;
 
 namespace Unity.GrantManager.Applications
 {
@@ -58,9 +58,14 @@ public ApplicationForm SynchronizePublishedForm(ApplicationForm applicationForm,
                     JObject formObject = JObject.Parse(form.ToString());
                     var formName = formObject.SelectToken("name");
                     var formDescription = formObject.SelectToken("description");
-                    if(formName != null && formDescription != null)
+                    
+                    if(formName != null)
                     {
                         applicationForm.ApplicationFormName = formName.ToString();
+                    }
+
+                    if (formDescription != null && applicationForm.ApplicationFormDescription == null)
+                    {
                         applicationForm.ApplicationFormDescription = formDescription.ToString();
                     }
 

From 611779c325065368234b4af58a3b79d76bae1091 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Tue, 2 Jun 2026 10:21:55 -0700
Subject: [PATCH 04/10] [AB#29848] Support form description whitespace
 overwrite on sync

---
 .../Applications/ApplicationFormManager.cs                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
index d58bd3c0ff..d72db21f77 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Applications/ApplicationFormManager.cs
@@ -59,12 +59,12 @@ public ApplicationForm SynchronizePublishedForm(ApplicationForm applicationForm,
                     var formName = formObject.SelectToken("name");
                     var formDescription = formObject.SelectToken("description");
                     
-                    if(formName != null)
+                    if (formName != null)
                     {
                         applicationForm.ApplicationFormName = formName.ToString();
                     }
 
-                    if (formDescription != null && applicationForm.ApplicationFormDescription == null)
+                    if (formDescription != null && string.IsNullOrWhiteSpace(applicationForm.ApplicationFormDescription))
                     {
                         applicationForm.ApplicationFormDescription = formDescription.ToString();
                     }

From ce04675703aee5abc696c43949ed73051740a995 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Tue, 2 Jun 2026 14:38:57 -0700
Subject: [PATCH 05/10] AB#33270 - update docs

---
 ...olidated_formversion_data_specification.md | 189 ++++++++++++++
 ...nsolidated_worksheet_data_specification.md | 198 +++++++++++++++
 .../get_formversion_data_specification.md     | 233 ++++++++++++++++++
 .../get_scoresheet_data_specification.md      | 230 +++++++++++++++++
 .../reporting/reporting-architecture.md       |   5 +-
 .../reporting/reporting-configuration.md      | 218 +++++++++++++---
 6 files changed, 1035 insertions(+), 38 deletions(-)
 create mode 100644 documentation/reporting/get_consolidated_formversion_data_specification.md
 create mode 100644 documentation/reporting/get_consolidated_worksheet_data_specification.md
 create mode 100644 documentation/reporting/get_formversion_data_specification.md
 create mode 100644 documentation/reporting/get_scoresheet_data_specification.md

diff --git a/documentation/reporting/get_consolidated_formversion_data_specification.md b/documentation/reporting/get_consolidated_formversion_data_specification.md
new file mode 100644
index 0000000000..ea13d31dd2
--- /dev/null
+++ b/documentation/reporting/get_consolidated_formversion_data_specification.md
@@ -0,0 +1,189 @@
+# get_consolidated_formversion_data.sql Function Specification
+
+## Overview
+
+`get_consolidated_formversion_data` is a PostgreSQL PL/pgSQL function that generates a dynamic SQL query spanning **all versions** of a CHEFS form. It is called by `generate_consolidated_formversion_view`. Rather than targeting a single form version, it iterates over every version recorded in the mapping metadata and generates a query per version, combining them with `UNION ALL`. Each output row includes a `form_version_label` column identifying which version it came from.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_consolidated_formversion_data(
+    form_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a multi-version UNION ALL query covering all form versions for a given form
+- Reads version IDs and labels from the mapping's `Metadata.Info` dictionary
+- Applies **version gating** — fields that belong to specific versions produce NULLs for other versions
+- Inherits the dual-schema (legacy/current) UNION ALL pattern from `get_formversion_data`
+- Supports both root fields and DataGrid fields
+- Returns a complete SQL query string ready for use as a consolidated view body
+
+## Input Parameters
+
+- **form_id** — UUID of the application form (not a form version ID). Determines which versions to include via the metadata keys.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the consolidated mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a UNION ALL query across all form versions and field types.
+
+---
+
+## Version Iteration
+
+Form version IDs and labels are stored in the mapping's `Metadata.Info` dictionary at save time, keyed as `formversion_{versionId}` with the version label as the value (e.g., `v1`, `v2`).
+
+The function reads these at query time:
+
+```sql
+SELECT replace(kv.key, 'formversion_', '')::uuid, kv.value
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = report_map_id
+  AND kv.key LIKE 'formversion_%'
+ORDER BY kv.value
+```
+
+For each version, one or more query pairs (root + DataGrid, each legacy + current) are generated and accumulated. All are combined into a final `UNION ALL`.
+
+---
+
+## Version Gating
+
+Fields in a consolidated mapping carry a `VersionLabel` that indicates which versions they belong to:
+
+| VersionLabel | Meaning |
+| ------------ | ------- |
+| `NULL` | Field is present and identical in **all** versions — always emit the real value |
+| `'v1'` | Field exists only in version 1 — emit real value for v1, NULL for other versions |
+| `'v1, v3'` | Field exists in v1 and v3 — emit real value for those, NULL for others |
+
+When processing a specific version, any field whose `VersionLabel` is non-null and does not contain the current `version_lbl` is **skipped** — its NULL placeholder is left in place rather than replaced with a data extraction expression.
+
+---
+
+## Dual-Schema Design
+
+Identical to `get_formversion_data`: each version generates two query branches (legacy and current submission schema), split by whether `submission->'submission'->'submission'` IS NULL:
+
+- **Legacy**: `afs."Submission"->'submission'->'data'`
+- **Current**: `afs."Submission"->'submission'->'submission'->'data'`
+
+Each pair is combined with `UNION ALL` before the per-version UNION ALL accumulation.
+
+---
+
+## Core Processing Logic
+
+### Pass 1 — Column inventory and DataGrid detection
+
+Same as `get_formversion_data`: collect all unique column names, types, and DataGrid names.
+
+No type-conflict fallback — the consolidated function uses the first occurrence of each column name's type and does not emit TEXT fallback for conflicts (fields from different versions with different types are handled via version gating instead).
+
+### Pass 2 — NULL column list construction
+
+Builds a typed NULL placeholder list ordered by column name, same as other functions.
+
+### Pass 3 — Per-version query generation
+
+For each version (ordered by label):
+
+1. Initialise SELECT with fixed columns + typed NULL placeholders
+2. Add `form_version_label` as a literal string constant
+3. For each field in the mapping, check version gating — skip if this version is not in the field's `VersionLabel`
+4. Replace NULL placeholders with JSON extraction expressions for applicable fields
+5. Emit a legacy + current UNION ALL pair for root fields
+6. Emit a legacy + current UNION ALL pair per DataGrid
+7. Append all version queries to the accumulation array
+
+### Final assembly
+
+All accumulated queries are combined with `UNION ALL`.
+
+---
+
+## Data Sources
+
+- `public."ApplicationFormSubmissions"` — filtered by `ApplicationFormVersionId = version_id` for each version in the loop
+
+---
+
+## Output Columns
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `submission_id` | `afs."Id"` | UUID of the form submission record |
+| `application_id` | `afs."ApplicationId"` | UUID of the parent application |
+| `row_identifier` | `'root'` or `'{datagrid}_r{n}'` | Row type identifier |
+| `form_version_label` | literal from metadata | Version label (e.g., `'v1'`, `'v2'`) |
+| *(dynamic columns)* | Extracted from JSON | One column per mapped field; NULL for versions where the field doesn't exist |
+
+---
+
+## Field Type Handling
+
+Same as `get_formversion_data`:
+
+| Type | SQL Type |
+| ---- | -------- |
+| `textfield` / `textarea` / `email` / `select` / `phoneNumber` | TEXT |
+| `number` | NUMERIC |
+| `currency` | DECIMAL(18,2) |
+| `option` / `checkbox` | BOOLEAN |
+
+---
+
+## Differences from get_formversion_data
+
+| Aspect | `get_consolidated_formversion_data` | `get_formversion_data` |
+| ------ | ----------------------------------- | ---------------------- |
+| Parameter | `form_id` (all versions) | `correlation_id` (one version) |
+| Version loop | Iterates over metadata keys | No loop — single version |
+| Version gating | Yes — per-field NULL for other versions | Not applicable |
+| Extra output column | `form_version_label` | Not present |
+| Type conflict handling | First-occurrence wins (no TEXT fallback) | TEXT fallback for conflicts |
+
+---
+
+## Common Use Cases
+
+### 1. Field present in all versions (VersionLabel = null)
+
+The field produces a real value for every version's query — no NULLs due to version gating.
+
+### 2. Field exclusive to one version
+
+Produces a real value only in that version's query; all other version queries leave it as a typed NULL.
+
+### 3. Field with type conflict across versions
+
+The first occurrence's type is used for the NULL column list. The field may be a NULL for versions where it doesn't apply, avoiding the conflict at query time.
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check what versions are stored in the mapping metadata
+SELECT kv.key, kv.value
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = '<report_map_id>'
+  AND kv.key LIKE 'formversion_%';
+
+-- Check field VersionLabels in the mapping
+SELECT row_data->>'ColumnName', row_data->>'VersionLabel'
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_array_elements(rcm."Mapping"->'Rows') row_data
+WHERE rcm."Id" = '<report_map_id>';
+
+-- Test function output
+SELECT "Reporting".get_consolidated_formversion_data('<form_id>', '<report_map_id>');
+```
diff --git a/documentation/reporting/get_consolidated_worksheet_data_specification.md b/documentation/reporting/get_consolidated_worksheet_data_specification.md
new file mode 100644
index 0000000000..19806706c0
--- /dev/null
+++ b/documentation/reporting/get_consolidated_worksheet_data_specification.md
@@ -0,0 +1,198 @@
+# get_consolidated_worksheet_data.sql Function Specification
+
+## Overview
+
+`get_consolidated_worksheet_data` is a PostgreSQL PL/pgSQL function (implemented as pure CTE-based SQL) that generates a dynamic SQL query spanning **all form versions** for a consolidated worksheet view. It is called by `generate_consolidated_worksheet_view`. Like `get_worksheet_data`, it reads from `Flex.WorksheetInstances`, but iterates over every form version recorded in the mapping metadata, applying version gating per field, and adds a `form_version_label` column to each output row.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_consolidated_worksheet_data(
+    form_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a multi-version UNION ALL query covering worksheet data from all form versions for a given form
+- Reads version IDs and labels from the mapping's `Metadata.Info` dictionary
+- Reads worksheet link IDs from the same metadata (`ws_{versionId}_{worksheetId}` keys)
+- Applies **version gating** — fields for specific versions produce NULLs in queries for other versions
+- Supports both root fields and DataGrid fields per worksheet per version
+- Implemented as a CTE-based approach (like `get_worksheet_data`), not imperative PL/pgSQL loops
+- Returns a complete SQL query string ready for use as a view body
+
+## Input Parameters
+
+- **form_id** — UUID of the application form. Determines which versions and worksheets to include via the metadata.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the consolidated mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a UNION ALL query across all (version, worksheet, field-group) combinations.
+
+---
+
+## Version and Worksheet Iteration
+
+### Version info
+
+Version IDs and labels are stored in `Metadata.Info` keyed as `formversion_{versionId}` → `v1`, `v2`, etc.:
+
+```sql
+-- version_info CTE
+SELECT replace(kv.key, 'formversion_', '')::uuid AS version_id, kv.value AS version_label
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = report_map_id
+  AND kv.key LIKE 'formversion_%'
+```
+
+### Worksheet links
+
+Worksheet link IDs are stored keyed as `ws_{versionId}_{worksheetId}` → worksheet display info. These are used to scope worksheet instance queries to specific versions.
+
+---
+
+## Version Gating
+
+Fields carry a `VersionLabel` indicating which versions they belong to (same semantics as the consolidated formversion function):
+
+| VersionLabel | Meaning |
+| ------------ | ------- |
+| `NULL` | Field present and identical in **all** versions — always emit the real value |
+| `'v1'` | Field exclusive to version 1 |
+| `'v1, v3'` | Field present in v1 and v3 only |
+
+When generating a query for a specific version, fields whose `VersionLabel` does not include the current version label are left as typed NULL placeholders.
+
+---
+
+## CTE-Based Implementation
+
+Unlike `get_consolidated_formversion_data` (which uses PL/pgSQL loops), this function uses a nested CTE structure to build and assemble query fragments. The key CTEs are:
+
+| CTE | Purpose |
+| --- | ------- |
+| `mapping_data` | Extracts all mapping rows from `ReportColumnsMaps`, parses worksheet name and clean DataPath |
+| `unique_mappings` | `DISTINCT ON (column_name)` — one mapping per column |
+| `version_info` | Reads form version IDs and labels from metadata |
+| `unique_worksheet_names` | Distinct worksheet names from the mapping |
+| `unique_datagrid_combinations` | Distinct `(worksheet_name, datagrid_name)` pairs for DataGrid fields |
+| `datagrid_queries` | One query fragment per `(version, worksheet, datagrid)` triple |
+| `root_queries` | One query fragment per `(version, worksheet)` for root-level fields |
+| *(final assembly)* | `UNION ALL` of datagrid and root query fragments |
+
+---
+
+## Data Sources
+
+| Table | Schema | Purpose |
+| ----- | ------ | ------- |
+| `WorksheetInstances` | `Flex` | Worksheet data per application; `CorrelationId` = application ID |
+| `Worksheets` | `Flex` | Worksheet metadata (name, title) |
+| `ReportColumnsMaps` | `Reporting` | Mapping configuration and metadata |
+
+---
+
+## Output Columns
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `worksheet_instance_id` | `wi."Id"` | UUID of the worksheet instance |
+| `application_id` | `wi."CorrelationId"` | UUID of the parent application |
+| `worksheet_name` | `w."Name"` | Worksheet name from definition |
+| `row_identifier` | `'root'` or `'{datagrid}_r{n}'` | Row type identifier |
+| `form_version_label` | literal from metadata | Version label (e.g., `'v1'`, `'v2'`) |
+| *(dynamic columns)* | Extracted from `CurrentValue` | One column per mapped field; NULL for non-applicable versions |
+
+---
+
+## DataPath and Worksheet Name Parsing
+
+The CTE extracts `worksheet_name` and `clean_data_path` from the stored `DataPath` and `Path` fields:
+
+```sql
+CASE
+  WHEN data_path_raw ~ '^\('         -- starts with (worksheet_name)
+  THEN substring(data_path_raw from '^\(([^)]+)\)')  -- extract from parentheses
+  ELSE split_part(path, '->', 1)     -- first segment of Path
+END AS worksheet_name,
+
+CASE
+  WHEN data_path_raw ~ '^\('
+  THEN regexp_replace(data_path_raw, '^\([^)]+\)', '')  -- strip leading (name)
+  ELSE data_path_raw
+END AS clean_data_path
+```
+
+DataPath format for worksheet fields: `(WorksheetName)FieldName` or `(WorksheetName)DataGridName->FieldName`.
+
+---
+
+## Field Type Handling
+
+Same as `get_worksheet_data`:
+
+| Type | SQL Type | Extraction |
+| ---- | -------- | ---------- |
+| `text` / `textarea` | TEXT | Direct string from `CurrentValue` |
+| `currency` | DECIMAL(18,2) | Locale commas stripped, numeric validated |
+| `number` | NUMERIC | Numeric validated |
+| `date` | TIMESTAMP | Date validated |
+| `checkbox` | BOOLEAN | True/false value list |
+| `checkboxgroup` | BOOLEAN per option | JSON array parsed, individual option extracted |
+| `radio` | TEXT | Selected option value |
+
+---
+
+## Differences from get_worksheet_data
+
+| Aspect | `get_consolidated_worksheet_data` | `get_worksheet_data` |
+| ------ | --------------------------------- | -------------------- |
+| Parameter | `form_id` (all versions) | `correlation_id` (one form version) |
+| Version loop | Yes — all versions from metadata | No loop — single version |
+| Version gating | Yes — per-field NULL for other versions | Not applicable |
+| Extra output column | `form_version_label` | Not present |
+| Worksheet scope | Per-(version, worksheet) | Per-worksheet for one version |
+
+---
+
+## Differences from get_consolidated_formversion_data
+
+| Aspect | `get_consolidated_worksheet_data` | `get_consolidated_formversion_data` |
+| ------ | --------------------------------- | ------------------------------------ |
+| Data source | `Flex.WorksheetInstances` | `ApplicationFormSubmissions` |
+| Implementation | CTE-based SQL | Procedural PL/pgSQL loops |
+| Dual-schema | No (single worksheet JSON schema) | Yes (legacy + current CHEFS schema) |
+| Worksheet identity | Worksheet name from DataPath | Not applicable |
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check versions and worksheet links stored in mapping metadata
+SELECT kv.key, kv.value
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_each_text(rcm."Mapping"->'Metadata'->'Info') kv
+WHERE rcm."Id" = '<report_map_id>';
+
+-- Check VersionLabels in the mapping
+SELECT row_data->>'ColumnName', row_data->>'VersionLabel', row_data->>'DataPath'
+FROM "Reporting"."ReportColumnsMaps" rcm,
+     jsonb_array_elements(rcm."Mapping"->'Rows') row_data
+WHERE rcm."Id" = '<report_map_id>';
+
+-- Inspect worksheet instances linked to a form (via WorksheetLinkCorrelationId matching form version IDs)
+SELECT wi."Id", wi."WorksheetId", wi."CorrelationId", w."Name"
+FROM "Flex"."WorksheetInstances" wi
+JOIN "Flex"."Worksheets" w ON wi."WorksheetId" = w."Id"
+LIMIT 10;
+
+-- Test function output
+SELECT "Reporting".get_consolidated_worksheet_data('<form_id>', '<report_map_id>');
+```
diff --git a/documentation/reporting/get_formversion_data_specification.md b/documentation/reporting/get_formversion_data_specification.md
new file mode 100644
index 0000000000..e55e59e9ac
--- /dev/null
+++ b/documentation/reporting/get_formversion_data_specification.md
@@ -0,0 +1,233 @@
+# get_formversion_data.sql Function Specification
+
+## Overview
+
+`get_formversion_data` is a PostgreSQL PL/pgSQL function that generates a dynamic SQL query for extracting CHEFS form submission data from a specific form version. It is called by the `generate_formversion_view` stored procedure to create flat, queryable database views from raw CHEFS JSON submission blobs.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_formversion_data(
+    correlation_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a dynamic SQL SELECT query based on the report column mappings for a form version
+- Extracts individual field values from CHEFS JSON submission data
+- Handles both root fields and DataGrid (repeating row) fields
+- Supports the two CHEFS submission JSON schemas (legacy and current) via UNION ALL
+- Detects type conflicts and applies TEXT fallback for affected columns
+- Returns a complete SQL query string ready for execution as a view body
+
+## Input Parameters
+
+- **correlation_id** — UUID of the form version (`ApplicationFormVersionId`). Used to filter `ApplicationFormSubmissions`.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the field-to-column mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a complete SQL query (or UNION ALL of queries) that can be executed or used as a view definition.
+
+---
+
+## Dual-Schema Design
+
+CHEFS form submissions are stored in two different JSON structures depending on when the submission was created. The function detects which schema applies to each row and generates queries for both, combined with `UNION ALL`.
+
+### Legacy schema
+
+Used for older submissions where `submission->'submission'->'submission'` **IS NULL**:
+
+```sql
+afs."Submission"->'submission'->'data'->'fieldKey'
+```
+
+### Current schema
+
+Used for newer submissions where `submission->'submission'->'submission'` **IS NOT NULL**:
+
+```sql
+afs."Submission"->'submission'->'submission'->'data'->'fieldKey'
+```
+
+### Detection
+
+Each generated query pair is split into two branches combined with `UNION ALL`:
+
+```sql
+(SELECT ... FROM ApplicationFormSubmissions afs
+ WHERE afs."ApplicationFormVersionId" = '<id>'
+   AND afs."Submission"->'submission'->'submission' IS NULL)      -- legacy
+UNION ALL
+(SELECT ... FROM ApplicationFormSubmissions afs
+ WHERE afs."ApplicationFormVersionId" = '<id>'
+   AND afs."Submission"->'submission'->'submission' IS NOT NULL)  -- current
+```
+
+Both branches select identical columns so their types are always consistent across the UNION.
+
+---
+
+## Core Processing Logic
+
+### Pass 1 — Column inventory and type-conflict detection
+
+Iterates all mapping rows to:
+- Collect unique column names and their declared types
+- Detect **type conflicts**: if the same column name appears in two rows with different types, the column is flagged for TEXT fallback (`use_text_fallback = true`)
+- Identify DataGrid fields (TypePath contains `'datagrid'`) and collect unique DataGrid names
+- Identify root-level fields (TypePath does not contain `'datagrid'`)
+
+### Pass 2 — NULL column list construction
+
+Builds a typed NULL placeholder list ordered by column name, used as a consistent column template in all UNION ALL branches:
+
+```sql
+NULL::TEXT AS first_name, NULL::NUMERIC AS budget, NULL::BOOLEAN AS consent_given
+```
+
+This ensures all UNION ALL branches have identical column sets and types.
+
+### Pass 3 — Query generation
+
+For each unique DataGrid and for root fields, generates a UNION ALL pair (legacy + current) substituting NULL placeholders with actual JSON extraction expressions.
+
+---
+
+## Data Sources
+
+- `public."ApplicationFormSubmissions"` — contains the raw CHEFS submission JSON and the `ApplicationFormVersionId` foreign key
+
+---
+
+## Field Type Handling
+
+| Type | SQL Type | Extraction |
+| ---- | -------- | ---------- |
+| `textfield` / `textarea` / `email` / `select` / `phoneNumber` | TEXT | `->>` operator on JSON path |
+| `number` | NUMERIC | Numeric regex validation → cast, or NULL |
+| `currency` | DECIMAL(18,2) | Numeric regex validation → cast, or NULL |
+| `option` / `checkbox` | BOOLEAN | `true/t/1/yes` → true, `false/f/0/no` → false, else NULL |
+| *(type conflict fallback)* | TEXT | All values cast to TEXT with type-aware formatting |
+
+### Type conflict TEXT fallback
+
+When a column has conflicting types across mapping rows, the function converts values to TEXT and emits them as strings rather than typed values. This prevents UNION ALL type mismatches in the generated view.
+
+---
+
+## DataGrid Handling
+
+DataGrid fields are identified by TypePath containing `'datagrid'`. For each unique DataGrid:
+
+1. A `CROSS JOIN LATERAL jsonb_array_elements(...)` expands the DataGrid JSON array into individual rows
+2. Row numbers are tracked with `row_number() OVER()` to generate row identifiers: `{datagrid_name}_r{n}`
+3. A separate UNION ALL pair (legacy + current) is generated for each DataGrid
+
+DataPath format for DataGrid fields: `(DKn)dataGridKey->fieldKey` or `dataGridKey->fieldKey`.
+
+---
+
+## Output Columns
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `submission_id` | `afs."Id"` | UUID of the form submission record |
+| `application_id` | `afs."ApplicationId"` | UUID of the parent application |
+| `row_identifier` | `'root'` or `'{datagrid}_r{n}'` | `root` for flat fields; `{datagrid_name}_r{n}` for DataGrid rows |
+| *(dynamic columns)* | Extracted from JSON | One column per mapped field, typed per mapping |
+
+---
+
+## Path Parsing Logic
+
+### DataPath format
+
+- **Root field**: `fieldKey` or `panel->fieldKey` (containers stripped)
+- **DataGrid field**: `dataGridName->fieldName` or `(DK1)dataGridName->fieldName`
+
+The function splits DataPath on `'->'` to build the JSONB navigation path. The final segment uses the `->>` text-extract operator; intermediate segments use `->`.
+
+### DK prefix handling
+
+If DataPath begins with `(DK{n})`, the prefix is stripped before extracting the DataGrid name, and the stripped path is used for navigation. The prefix itself is not used for data extraction.
+
+---
+
+## Data Type Mapping
+
+| Field Type | Normal SQL Type | Type-Conflict SQL Type |
+| ---------- | --------------- | ---------------------- |
+| `textfield` / `textarea` / `email` / `select` / `phoneNumber` | TEXT | TEXT |
+| `number` | NUMERIC | TEXT (as string representation) |
+| `currency` | DECIMAL(18,2) | TEXT (as string representation) |
+| `option` / `checkbox` | BOOLEAN | TEXT (`'true'` / `'false'`) |
+
+---
+
+## Relationship to `get_worksheet_data`
+
+Both functions serve the same role (query generation), but differ in data source and schema:
+
+| Aspect | `get_formversion_data` | `get_worksheet_data` |
+| ------ | ---------------------- | -------------------- |
+| Data source | `ApplicationFormSubmissions` | `Flex.WorksheetInstances` |
+| JSON location | `submission->'submission'->'data'` (dual-schema) | `CurrentValue->'values'` array |
+| Schema handling | Dual legacy/current UNION ALL | Single schema |
+| Implementation style | Procedural PL/pgSQL | CTE-based SQL |
+| Correlation ID | Form Version ID | Form Version ID |
+| DataGrid support | Yes | Yes |
+
+---
+
+## Common Use Cases
+
+### 1. Flat submission with root fields only
+
+Generates two branches (legacy + current), each returning one row per submission with all field values as flat columns. `row_identifier` = `'root'` for all rows.
+
+### 2. Submission with DataGrid fields
+
+Generates a separate UNION ALL pair per DataGrid, expanding each DataGrid array entry into its own row. `row_identifier` = `'{datagrid_name}_r1'`, `'{datagrid_name}_r2'`, etc.
+
+### 3. Mixed root and DataGrid fields
+
+One root query pair + one query pair per DataGrid, all combined with `UNION ALL`. Root columns are NULL in DataGrid rows and vice versa.
+
+### 4. Type conflict (field mapped with different types)
+
+Affected columns fall back to TEXT for both value and NULL type, allowing the UNION ALL to be well-typed.
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check the mapping configuration
+SELECT "Mapping"->'Rows' FROM "Reporting"."ReportColumnsMaps" WHERE "Id" = '<report_map_id>';
+
+-- Inspect raw submissions for a form version
+SELECT "Id", "ApplicationId", "Submission"->'submission' FROM public."ApplicationFormSubmissions"
+WHERE "ApplicationFormVersionId" = '<correlation_id>'
+LIMIT 5;
+
+-- Detect which schema variant a submission uses
+SELECT "Id",
+  CASE WHEN "Submission"->'submission'->'submission' IS NULL THEN 'legacy' ELSE 'current' END AS schema_version
+FROM public."ApplicationFormSubmissions"
+WHERE "ApplicationFormVersionId" = '<correlation_id>';
+
+-- Test function output
+SELECT "Reporting".get_formversion_data('<correlation_id>', '<report_map_id>');
+```
+
+---
+
+## Version Notes
+
+This function uses the same column-name generation and type-handling patterns as `get_worksheet_data`. Key differences are the dual-schema UNION ALL approach and the procedural (rather than CTE-based) implementation style.
diff --git a/documentation/reporting/get_scoresheet_data_specification.md b/documentation/reporting/get_scoresheet_data_specification.md
new file mode 100644
index 0000000000..8e0df49255
--- /dev/null
+++ b/documentation/reporting/get_scoresheet_data_specification.md
@@ -0,0 +1,230 @@
+# get_scoresheet_data.sql Function Specification
+
+## Overview
+
+`get_scoresheet_data` is a PostgreSQL PL/pgSQL function that generates a dynamic SQL query for extracting Unity.Flex scoresheet answer data. It is called by the `generate_scoresheet_view` stored procedure. Unlike the form version and worksheet equivalents, scoresheet field values are read from the normalised `Flex.Answers` table via a correlated subquery per field — not from a JSON blob on the scoresheet instance itself.
+
+## Function Signature
+
+```sql
+CREATE OR REPLACE FUNCTION "Reporting".get_scoresheet_data(
+    correlation_id uuid,
+    report_map_id uuid
+)
+RETURNS text
+LANGUAGE plpgsql
+```
+
+## Purpose
+
+- Generates a dynamic SQL SELECT query for scoresheet instance data
+- Reads field values from `Flex.Answers` joined to `Flex.Questions` (one correlated subquery per mapped field)
+- Always includes a `total_score` column calculated via `calculate_scoresheet_total_score()`
+- Handles scoresheet-specific field types (`number`, `yesno`, text variants)
+- No DataGrid support — scoresheets are flat (one row per scoresheet instance)
+- Returns a complete SQL query string ready for use as a view body
+
+## Input Parameters
+
+- **correlation_id** — UUID of the application form (`ApplicationFormId`). Used to filter applications linked to scoresheet instances.
+- **report_map_id** — UUID of the `ReportColumnsMaps` record containing the field-to-column mapping configuration.
+
+## Return Value
+
+Returns a `TEXT` string containing a complete SQL SELECT query.
+
+---
+
+## Data Sources
+
+| Table | Schema | Purpose |
+| ----- | ------ | ------- |
+| `ScoresheetInstances` | `Flex` | One row per assessor's completed scoresheet; CorrelationId → Assessment |
+| `Assessments` | *(public)* | Links scoresheet instances to applications via `ApplicationId` |
+| `Applications` | *(public)* | Application record; filtered by `ApplicationFormId = correlation_id` |
+| `Answers` | `Flex` | Normalised answer rows; one per question per scoresheet instance |
+| `Questions` | `Flex` | Question definitions including `Name` used to match answers |
+
+### Join path
+
+```
+ScoresheetInstances (si)
+  JOIN Assessments (a)   ON si."CorrelationId" = a."Id"
+  JOIN Applications (ap) ON a."ApplicationId"  = ap."Id"
+```
+
+Filtered by: `ap."ApplicationFormId" = correlation_id`
+
+---
+
+## Field Value Extraction
+
+Each mapped field's value is retrieved via a **correlated subquery** embedded directly in the SELECT clause:
+
+```sql
+(
+  SELECT a_1."CurrentValue"->>'value'
+  FROM "Flex"."Answers" a_1
+  JOIN "Flex"."Questions" q ON a_1."QuestionId" = q."Id"
+  WHERE a_1."ScoresheetInstanceId" = si."Id"
+    AND q."Name" = '<field_key>'
+  LIMIT 1
+)
+```
+
+The `<field_key>` value is resolved using the following priority:
+
+1. **Key** (`row_data->>'Key'`) — used if non-empty
+2. **PropertyName** (`row_data->>'PropertyName'`) — used if Key is empty
+3. **DataPath** (`row_data->>'DataPath'`) — used if PropertyName is also empty
+4. **ColumnName** — final fallback
+
+---
+
+## Core Processing Logic
+
+### Pass 1 — Column inventory and type-conflict detection
+
+Iterates all mapping rows to collect unique column names and their types (normalised to lowercase). Detects type conflicts (same column name with different types) and marks them for TEXT fallback.
+
+### Pass 2 — NULL column list construction
+
+Builds a typed NULL placeholder list ordered by column name, using scoresheet-specific types:
+
+- `number` → `NULL::NUMERIC`
+- `yesno` → `NULL::BOOLEAN`
+- All other types → `NULL::TEXT`
+
+### Pass 3 — Query construction
+
+Initialises a base SELECT with fixed columns, then iterates mapping rows to replace each NULL placeholder with the appropriate correlated subquery + type cast.
+
+### Final query shape
+
+```sql
+SELECT
+    si."Id"                                    AS scoresheet_instance_id,
+    ap."Id"                                    AS application_id,
+    si."CorrelationId"                         AS assessment_id,
+    si."ScoresheetId"                          AS scoresheet_id,
+    "Reporting".calculate_scoresheet_total_score(si."Id") AS total_score,
+    <field_subquery>::<type>                   AS <column_name>,
+    ...
+FROM "Flex"."ScoresheetInstances" si
+JOIN "Assessments" a  ON si."CorrelationId" = a."Id"
+JOIN "Applications" ap ON a."ApplicationId" = ap."Id"
+WHERE ap."ApplicationFormId" = '<correlation_id>'
+```
+
+---
+
+## Fixed Output Columns
+
+Every generated query includes these columns regardless of the field mapping:
+
+| Column | Source | Description |
+| ------ | ------ | ----------- |
+| `scoresheet_instance_id` | `si."Id"` | UUID of the scoresheet instance |
+| `application_id` | `ap."Id"` | UUID of the parent application |
+| `assessment_id` | `si."CorrelationId"` | UUID of the assessment linking instance to application |
+| `scoresheet_id` | `si."ScoresheetId"` | UUID of the scoresheet definition |
+| `total_score` | `calculate_scoresheet_total_score(si."Id")` | Computed total score for the instance |
+
+---
+
+## Field Type Handling
+
+Scoresheet question types differ from Forms.io types. The function normalises all types to lowercase before comparison.
+
+| Type | SQL Type | Extraction |
+| ---- | -------- | ---------- |
+| `number` | NUMERIC | Numeric regex validation → cast, or NULL |
+| `yesno` | BOOLEAN | `true/t/1/yes` → true, `false/f/0/no` → false, else NULL |
+| `text` / `textarea` / `selectlist` / *(any other)* | TEXT | Direct string value |
+| *(type conflict fallback)* | TEXT | Cast to TEXT |
+
+---
+
+## No DataGrid Support
+
+Scoresheets do not have DataGrid (repeating row) components. The function generates a single flat query — one output row per scoresheet instance. There is no `row_identifier` column.
+
+---
+
+## calculate_scoresheet_total_score
+
+This companion function (`Reporting.calculate_scoresheet_total_score(instance_id)`) is always called as part of the generated query. It iterates all answers for the given instance and applies scoring logic:
+
+- **Number questions**: uses the numeric answer value directly
+- **YesNo questions**: applies the `yes_value` or `no_value` from the question definition
+- **SelectList questions**: applies the `numeric_value` from the selected option
+- **Text / TextArea questions**: contributes 0 to the total
+
+---
+
+## Data Type Mapping
+
+| Question Type | Normal SQL Type | Type-Conflict SQL Type |
+| ------------- | --------------- | ---------------------- |
+| `number` | NUMERIC | TEXT |
+| `yesno` | BOOLEAN | TEXT |
+| `text` / `textarea` / `selectlist` / others | TEXT | TEXT |
+
+---
+
+## Differences from get_worksheet_data and get_formversion_data
+
+| Aspect | `get_scoresheet_data` | `get_worksheet_data` | `get_formversion_data` |
+| ------ | --------------------- | -------------------- | ---------------------- |
+| Data source | `Flex.Answers` (normalised rows) | `Flex.WorksheetInstances` (JSON blob) | `ApplicationFormSubmissions` (JSON blob) |
+| Field extraction | Correlated subquery per field | JSONB path expression | JSONB path expression |
+| Total score | Always included | Not applicable | Not applicable |
+| DataGrid support | No | Yes | Yes |
+| Row identifier | Not present | `root` or `{grid}_r{n}` | `root` or `{grid}_r{n}` |
+| Types | `number`, `yesno`, text | CHEFS types | CHEFS types |
+| Correlation ID | Form ID | Form Version ID | Form Version ID |
+
+---
+
+## Common Use Cases
+
+### 1. Standard scoresheet with number and text questions
+
+Generates one row per scoresheet instance with NUMERIC and TEXT columns, plus `total_score`.
+
+### 2. YesNo questions (boolean)
+
+`yesno` fields are extracted as BOOLEAN using a simple true/false lookup.
+
+### 3. SelectList questions
+
+`selectlist` fields are returned as TEXT (the selected option's label or value).
+
+---
+
+## Debugging Queries
+
+```sql
+-- Check the mapping configuration
+SELECT "Mapping"->'Rows' FROM "Reporting"."ReportColumnsMaps" WHERE "Id" = '<report_map_id>';
+
+-- List scoresheet instances linked to a form
+SELECT si."Id", si."ScoresheetId", si."CorrelationId", ap."Id" AS application_id
+FROM "Flex"."ScoresheetInstances" si
+JOIN "Assessments" a ON si."CorrelationId" = a."Id"
+JOIN "Applications" ap ON a."ApplicationId" = ap."Id"
+WHERE ap."ApplicationFormId" = '<correlation_id>'
+LIMIT 10;
+
+-- Inspect answers for a scoresheet instance
+SELECT q."Name", a."CurrentValue"->>'value' AS answer_value
+FROM "Flex"."Answers" a
+JOIN "Flex"."Questions" q ON a."QuestionId" = q."Id"
+WHERE a."ScoresheetInstanceId" = '<instance_id>';
+
+-- Test function output
+SELECT "Reporting".get_scoresheet_data('<correlation_id>', '<report_map_id>');
+
+-- Test total score calculation
+SELECT "Reporting".calculate_scoresheet_total_score('<scoresheet_instance_id>');
+```
diff --git a/documentation/reporting/reporting-architecture.md b/documentation/reporting/reporting-architecture.md
index 063a15e266..422ce2f0fa 100644
--- a/documentation/reporting/reporting-architecture.md
+++ b/documentation/reporting/reporting-architecture.md
@@ -96,8 +96,9 @@ sequenceDiagram
     Service->>Job: Enqueue GenerateViewBackgroundJob
     Job->>DB: CALL Reporting.generate_*_view(correlationId)
     DB-->>Job: View created/updated
-    Job->>DB: GRANT SELECT ON view TO reporting_role
-    Job-->>Config: Status → SUCCESS
+    Job->>DB: Update ViewStatus → SUCCESS
+    Job->>RoleJob: Enqueue AssignViewRoleBackgroundJob
+    RoleJob->>DB: GRANT SELECT ON view TO reporting_role
 ```
 
 **Provider types and data characteristics:**
diff --git a/documentation/reporting/reporting-configuration.md b/documentation/reporting/reporting-configuration.md
index 846023fb3f..7deb364e05 100644
--- a/documentation/reporting/reporting-configuration.md
+++ b/documentation/reporting/reporting-configuration.md
@@ -2,13 +2,19 @@
 
 ## Overview
 
-The Reporting Configuration system allows administrators to define how source field data maps to PostgreSQL database columns for generated reporting views. It supports three correlation providers, each sourcing field metadata from a different system:
+The Reporting Configuration system allows administrators to define how source field data maps to PostgreSQL database columns for generated reporting views. It supports five correlation providers, each sourcing field metadata from a different system:
 
-| Provider | Source | Correlation ID | Description |
-|----------|--------|----------------|-------------|
-| `formversion` | CHEFS form submissions | Form Version ID | Immutable form schema fields |
-| `worksheet` | Unity.Flex worksheets | Form Version ID | Dynamic worksheet fields |
-| `scoresheet` | Unity.Flex scoresheets | Form ID | Evaluation/scoring fields |
+| Provider                   | Source                                | Correlation ID  | Description                                                |
+| -------------------------- | ------------------------------------- | --------------- | ---------------------------------------------------------- |
+| `formversion`              | CHEFS form submissions                | Form Version ID | Static field schema for a specific form version            |
+| `formversion_consolidated` | CHEFS form submissions (all versions) | Form ID         | Merged submission fields across all versions of a form     |
+| `worksheet`                | Unity.Flex worksheets                 | Form Version ID | Dynamic worksheet fields linked to a specific form version |
+| `worksheet_consolidated`   | Unity.Flex worksheets (all versions)  | Form ID         | Merged worksheet fields across all versions of a form      |
+| `scoresheet`               | Unity.Flex scoresheets                | Form ID         | Evaluation/scoring fields linked to a form                 |
+
+> **Key distinction:** Per-version providers (`formversion`, `worksheet`) use a **Form Version ID** as the CorrelationId. Consolidated and scoresheet providers (`formversion_consolidated`, `worksheet_consolidated`, `scoresheet`) use the **Form ID**.
+
+---
 
 ## Architecture
 
@@ -16,7 +22,7 @@ The Reporting Configuration system allows administrators to define how source fi
 
 - **`ReportMappingUtils`** (`Unity.Reporting.Application`) — Static utility methods for column name sanitization, validation, uniqueness enforcement, and mapping creation/update logic.
 - **`ReportMappingService`** (`Unity.Reporting.Application`) — Application service orchestrating CRUD operations, field metadata retrieval, view generation, and provider resolution.
-- **`IFieldsProvider`** (`Unity.Reporting.Application`) — Interface for correlation-specific field metadata extraction and change detection.
+- **`IFieldsProvider`** (`Unity.Reporting.Application`) — Interface for correlation-specific field metadata extraction and change detection. Each provider registers itself by its `CorrelationProvider` string identifier.
 - **`ReportingConfigurationController`** (`Unity.Reporting.Web`) — MVC controller providing AJAX API endpoints for the UI.
 - **`Default.js`** (`Unity.Reporting.Web`) — Client-side DataTable configuration, validation, and provider-aware UI logic.
 
@@ -24,9 +30,36 @@ The Reporting Configuration system allows administrators to define how source fi
 
 Each provider implements `IFieldsProvider`:
 
-- **`FormVersionFieldsProvider`** — Retrieves field metadata from immutable CHEFS form version schemas. Change detection always returns null since form versions are immutable.
-- **`WorksheetFieldsProvider`** — Retrieves field metadata from Unity.Flex worksheet definitions. Supports change detection for dynamic schema evolution.
-- **`ScoresheetFieldsProvider`** — Retrieves field metadata from Unity.Flex scoresheet definitions. Supports change detection for scoring structure changes.
+- **`FormVersionFieldsProvider`** — Retrieves field metadata from immutable CHEFS form version schemas via `IFormMetadataService`. Change detection always returns null since form versions cannot change after creation.
+- **`ConsolidatedFormVersionFieldsProvider`** — Retrieves and merges submission field metadata across **all versions** of a form (CorrelationId = Form ID). Change detection tracks added/removed form versions.
+- **`WorksheetFieldsProvider`** — Retrieves field metadata from Unity.Flex worksheet definitions linked to a specific form version. Stamps duplicate DataPaths within a version with `(DK1)`, `(DK2)`, etc. to ensure uniqueness before returning. Change detection tracks worksheet link additions/removals.
+- **`ConsolidatedWorksheetFieldsProvider`** — Retrieves and merges worksheet field metadata across **all versions** of a form (CorrelationId = Form ID). Applies the same DataPath uniqueification per version before merging. Change detection tracks added/removed form versions and worksheets within versions.
+- **`ScoresheetFieldsProvider`** — Retrieves field metadata from the Unity.Flex scoresheet linked to a form via `IApplicationFormAppService`. CorrelationId is the Form ID. Change detection compares the stored scoresheet ID against the form's current scoresheet.
+
+---
+
+## Consolidated Providers
+
+The `formversion_consolidated` and `worksheet_consolidated` providers create a single unified view that spans all versions of a form. Because the CorrelationId is the Form ID (not a version ID), one mapping configuration covers the entire form history.
+
+### Field Merging Logic
+
+When multiple form versions each contribute fields, the provider merges them using the following rules based on (Label, Path, Type) matching:
+
+| Scenario                                                          | Outcome                         | VersionLabel                                                    |
+| ----------------------------------------------------------------- | ------------------------------- | --------------------------------------------------------------- |
+| Field has identical (Label, Path, Type) across **all** versions   | Single merged row               | None (field is universal across all versions)                   |
+| Field has identical (Label, Path, Type) in **some** versions only | Single row for that exact match | Comma-joined list of versions where it appears (e.g., `v1, v3`) |
+| Same (Label, Path) but **different Type** across versions         | One row **per distinct type**   | Comma-joined list of versions carrying that specific type       |
+
+The `VersionLabel` property on a field row is displayed in the mapping UI to help administrators understand which form versions contain that field. Fields with no VersionLabel are consistent across all versions.
+
+### Change Detection for Consolidated Providers
+
+- **`formversion_consolidated`** — A form version is added or removed. Tracked via `formversion_{versionId}` metadata keys stored in the mapping at save time.
+- **`worksheet_consolidated`** — A form version is added/removed, or a worksheet is linked/unlinked within a version. Tracked via both `formversion_{versionId}` and `ws_{versionId}_{worksheetId}` metadata keys.
+
+---
 
 ## Default Column Name Generation
 
@@ -36,24 +69,27 @@ When a user creates or saves a report configuration for the first time (or when
 
 The source used for generating default column names differs by provider:
 
-| Provider | Default Column Name Source | Rationale |
-|----------|---------------------------|-----------|
-| `formversion` | **Key** (CHEFS Property Name, e.g., `firstName`) | CHEFS property names are stable, developer-defined identifiers that produce clean, predictable column names (e.g., `firstname`). Labels can be verbose or contain special characters. |
-| `worksheet` | **Label** (e.g., `First Name`) | Worksheet labels are human-readable names configured by administrators, producing descriptive column names (e.g., `first_name`). |
-| `scoresheet` | **Label** (e.g., `Score One`) | Scoresheet labels provide meaningful, user-facing descriptions that map well to reporting column names. |
+- **`formversion`** — uses the field **Key** (CHEFS Property Name, e.g., `firstName`). CHEFS property names are stable, developer-defined identifiers that produce clean, predictable column names (e.g., `firstname`). Labels can be verbose or contain special characters.
+- **`formversion_consolidated`** — uses the field **Label**. Consolidated views span multiple versions; labels are the primary human-readable identifiers across versions.
+- **`worksheet`** — uses the field **Label**. Worksheet labels are human-readable names configured by administrators, producing descriptive column names (e.g., `first_name`).
+- **`worksheet_consolidated`** — uses the field **Label**. Same rationale as `worksheet`.
+- **`scoresheet`** — uses the field **Label**. Scoresheet labels provide meaningful, user-facing descriptions that map well to reporting column names.
+
+> **Note:** Only the `formversion` provider uses the field Key as its default source. All other providers use the field Label. The `GetDefaultColumnNameSource()` method checks for an exact case-insensitive match against the string `"formversion"` — the consolidated variant `"formversion_consolidated"` does **not** match and therefore uses Label.
 
 ### Column Name Sanitization
 
 All auto-generated column names go through the same sanitization pipeline regardless of provider:
 
-1. Convert to lowercase
-2. Replace spaces and hyphens with underscores
-3. Remove all non-alphanumeric characters (except underscores)
-4. Remove consecutive underscores
-5. Trim leading/trailing underscores
-6. Prefix with `col_` if name starts with a digit
-7. Truncate to 60 characters maximum
-8. Ensure uniqueness by appending numeric suffixes (`_1`, `_2`, etc.) when collisions occur
+1. Replace spaces and hyphens with underscores
+2. Remove all characters that are not letters, digits, or underscores
+3. Remove consecutive underscores (collapse `__` → `_`)
+4. Trim leading/trailing underscores
+5. Substitute `"col"` if nothing remains after trimming
+6. Prefix with `col_` if the name starts with a digit
+7. Truncate to 60 characters; trim any trailing underscore introduced by truncation
+8. Convert to lowercase
+9. Ensure uniqueness by appending numeric suffixes (`_1`, `_2`, etc.) when collisions occur — suffix length is accounted for during truncation to stay within the 60-character limit
 
 ### Implementation Details
 
@@ -62,42 +98,152 @@ The column name source selection is implemented identically on server and client
 - **Server-side** — `ReportMappingUtils.GetDefaultColumnNameSource()` returns `field.Key ?? ""` for `formversion`, or `field.Label ?? ""` for all other providers. Used by `CreateNewMap()` and `UpdateExistingMap()` when auto-generating column names for unmapped or newly discovered fields. The provider comparison is case-insensitive via `StringComparison.OrdinalIgnoreCase`.
 - **Client-side** — `getDefaultColumnNameSource()` in `Default.js` uses the same logic: `field.key || ''` when `currentProvider === 'formversion'`, otherwise `field.label || ''`. This is used by `transformFieldsMetadata()` to set initial column name values in the DataTable when no saved configuration exists.
 
-> **Important:** Neither implementation falls back from Key to Label or vice versa. If the source value is null/empty, an empty string is used, and the downstream sanitization produces `"col_1"` as a placeholder. This ensures client and server always produce identical defaults.
+> **Important:** Neither implementation falls back from Key to Label or vice versa. If the source value is null/empty, an empty string is used, and the downstream sanitization produces `"col_1"` as a placeholder (null/whitespace input returns `"col_1"` directly). This ensures client and server always produce identical defaults.
+
+### Column Name Priority During Updates
+
+When saving an updated configuration, column names are resolved using a three-tier priority system:
+
+1. **User-provided** — a column name explicitly set by the administrator in the current save operation
+2. **Existing** — the column name already persisted in the database for that field path
+3. **Auto-generated** — a new sanitized name derived from the field Key or Label, generated only for fields not covered by tiers 1 or 2
+
+This ensures established mappings are preserved and only genuinely new fields receive auto-generated names.
 
 ### Impact on Existing Configurations
 
 - **Existing saved configurations are not affected.** Column names are persisted in the database; the provider-specific logic only determines defaults for new/unsaved fields.
-- **Existing column names are preserved during updates.** The three-tier priority system (user-provided → existing → auto-generated) ensures established mappings are maintained.
+- **Existing column names are preserved during updates.** The three-tier priority system ensures established mappings are maintained.
+
+---
+
+## Field Column Definitions
+
+The configuration table displays one row per mappable field from the source. The first three column headers change depending on the active provider tab; the remaining three are constant across all providers.
+
+**Provider-specific headers (columns 1–3):**
+
+- `formversion` / `formversion_consolidated` — **CHEFS Label**, **CHEFS Property Name**, **CHEFS Type**
+- `worksheet` / `worksheet_consolidated` — **Worksheet Label**, **Worksheet Property Name**, **Worksheet Type**
+- `scoresheet` — **Scoresheet Label**, **Scoresheet Property Name**, **Scoresheet Type**
+
+**Constant headers (columns 4–6):** **Path**, **Report Column**, **Type Path**
+
+### Label *(CHEFS Label / Worksheet Label / Scoresheet Label)*
+
+The human-readable display name as it appears in the source form or worksheet UI. For checkbox group options this is the individual option's label (e.g., `Urban`, `Rural`). Used as the default column name source for all providers except `formversion`.
+
+### Property Name *(CHEFS Property Name / Worksheet Property Name / Scoresheet Property Name)*
+
+The developer-assigned key from the source schema (e.g., `firstName`, `projectBudget`). Stable and unique within a form component — it does not change when the label is edited. For checkbox group options the property name is `{parentKey}-{optionValue}` (e.g., `sector-urban`). Used as the default column name source for the `formversion` provider.
+
+### Type *(CHEFS Type / Worksheet Type / Scoresheet Type)*
+
+The component type from Forms.io or Unity.Flex that determines how the raw data is stored and how the view generation SQL extracts it. Common values:
+
+| Type | Description |
+| ---- | ----------- |
+| `textfield` / `textarea` | Free-text input — extracted as TEXT |
+| `number` | Numeric input — extracted as NUMERIC |
+| `currency` | Currency input — extracted as DECIMAL(18,2), locale commas stripped |
+| `datetime` | Date/time input — extracted as TIMESTAMP |
+| `radio` | Single-select radio group — extracted as TEXT (the selected value) |
+| `simplecheckboxes` | Multi-select checkbox group — each option becomes a separate row with type `option` |
+| `checkbox` | Single boolean checkbox — extracted as BOOLEAN |
+| `option` | An individual option within a checkbox group |
+| `datagrid` | Repeating data grid — each row becomes a separate view row with a row identifier |
+
+### Path *(UI column — displays DataPath)*
+
+> **Important naming note:** The UI column labelled **"Path"** actually displays the `DataPath` field from the data model — not the internal `path` field. The internal `path` is stored in the mapping for row-identity purposes but is not shown as its own column.
+
+The **Path** column shows the data-centric navigation path used by the PostgreSQL view generation SQL function to extract values from the JSON. Container segments that do not exist in the actual submitted JSON (panels, tabs, columns, fieldsets) are stripped from this path:
+
+| Internal `path` (not displayed) | Internal `typePath` | Displayed "Path" (DataPath) | Why |
+| -------------------------------- | ------------------- | --------------------------- | --- |
+| `panel1->firstName` | `panel->textfield` | `firstName` | `panel` is a container — stripped |
+| `datagrid1->itemName` | `datagrid->textfield` | `datagrid1->itemName` | `datagrid` is kept — it IS in the JSON |
+| `checkboxField->optionA` | `simplecheckboxes->option` | `checkboxField->optionA` | Both segments present in data |
+
+The internal `path` (the full key-based breadcrumb including container ancestors) is stored in the mapping and used as the stable identity key when matching rows across saves and updates. If two fields resolve to the same key chain, duplicates are prefixed with `(DK1)`, `(DK2)`, etc. on both `path` and `dataPath`.
+
+### Report Column
+
+The user-editable PostgreSQL column name this field will occupy in the generated database view. Auto-generated from the field Property Name or Label (depending on provider) using the sanitization pipeline. Must be unique within the configuration and conform to PostgreSQL identifier rules (see [Column Name Validation](#column-name-validation)).
+
+### Type Path
+
+The same schema hierarchy as the internal `path` but using component types instead of keys (e.g., `panel->textfield`, `datagrid->textarea`). Not user-editable. Used internally by the view generation SQL function to determine how to navigate the JSON structure — for example, a `datagrid` segment signals that `jsonb_array_elements` is needed. Also used to identify which segments are containers when computing the DataPath.
+
+### Version Label *(consolidated providers only)*
+
+Indicates which form versions contain this field. Only present when using `formversion_consolidated` or `worksheet_consolidated`:
+
+- Blank — field is present in all versions with the same type; merged into a single column
+- `v1` — field exists only in version 1
+- `v1, v3` — field exists in versions 1 and 3 but not in all versions
+
+---
 
 ## Column Name Validation
 
 Both client-side and server-side enforce PostgreSQL column name rules:
 
 - Maximum 60 characters
-- Must start with a letter or underscore
+- Must start with a letter or underscore (not a digit)
 - Contains only letters, digits, and underscores
-- Cannot be a PostgreSQL reserved word
+- Cannot be a PostgreSQL reserved word (enforced against a comprehensive built-in list)
 - Must be unique within the configuration
 
+---
+
 ## View Generation
 
 After saving a configuration, users can generate a PostgreSQL database view:
 
 1. User provides a view name (validated for availability and PostgreSQL compliance)
-2. A background job is queued to create/update the view in the `Reporting` schema
-3. View status is tracked and displayed via a widget
+2. The service normalises the view name to lowercase and checks availability for the given correlation
+3. The mapping's `ViewStatus` is set to `GENERATING` and persisted
+4. A `GenerateViewBackgroundJob` is queued to perform the actual view creation asynchronously
+5. The background job runs within the correct tenant context; if the view name has changed, the old view is deleted first
+6. On success, `ViewStatus` is updated to `SUCCESS` and a second job (`AssignViewRoleBackgroundJob`) is automatically queued to grant `SELECT` on the new view to the tenant's configured reporting role
+7. On failure, `ViewStatus` is set to `FAILED` and the error is logged
+8. View status is polled and displayed to the administrator via a widget
 
 View names follow similar sanitization rules with a 63-character maximum (PostgreSQL identifier limit).
 
+### View Name Availability
+
+Two availability checks exist:
+
+- **Global check** (`IsViewNameAvailableAsync(viewName)`) — Returns true if no view with that name exists in the Reporting schema. Used for name suggestions before a configuration is saved.
+- **Correlation-aware check** (`IsViewNameAvailableAsync(viewName, correlationId, correlationProvider)`) — Returns true if no view with that name exists, **or** if the existing view belongs to the same correlation. This allows regenerating a view under the same name without a false conflict error.
+
+---
+
+## Change Detection
+
+When an existing configuration is loaded, the provider's `DetectChangesAsync` method compares the current state of the source data against what was stored in the mapping's metadata at the time of the last save. Detected changes are surfaced as a human-readable description string in `ReportColumnsMapDto.DetectedChanges`, which the UI displays as an alert to the administrator.
+
+- **`formversion`** — No change detection. Form versions are immutable by design; always returns null.
+- **`formversion_consolidated`** — Compares stored `formversion_{versionId}` metadata keys against the current list of form versions with fields.
+- **`worksheet`** — Compares stored `worksheet_{worksheetId}` metadata keys against the current list of worksheet links for the form version.
+- **`worksheet_consolidated`** — Compares stored `formversion_{versionId}` and `ws_{versionId}_{worksheetId}` metadata keys against current worksheet links across all versions.
+- **`scoresheet`** — Compares stored `scoresheet_{scoresheetId}` metadata key against the form's current scoresheet assignment.
+
+---
+
 ## Configuration Lifecycle
 
-```
+```text
 Fields Metadata → [Save] → Configuration → [Generate View] → Database View
-                                ↓
-                          [Delete] → Removes configuration and optionally the view
+                                ↓                                   ↓
+                          [Delete]                         [Assign Role Job]
+                      Removes config                      Grants SELECT to
+                    and drops the view                    reporting role
 ```
 
-1. **Initial Load**: Field metadata is fetched from the appropriate provider; default column names are generated.
-2. **Save**: Creates or updates the mapping configuration with user-specified and auto-generated column names.
-3. **Generate View**: Creates a PostgreSQL view in the `Reporting` schema based on the saved mapping.
-4. **Delete**: Removes the configuration and optionally drops the associated database view.
+1. **Initial Load** — Field metadata is fetched from the appropriate provider; default column names are generated client-side for display.
+2. **Save** — Creates or updates the mapping configuration in the database with user-specified and auto-generated column names.
+3. **Generate View** — Queues a background job that creates or replaces a PostgreSQL view in the `Reporting` schema based on the saved mapping. Role assignment is queued automatically on success.
+4. **Delete** — Removes the mapping configuration record and drops the associated database view if it exists. View deletion failure is logged but does not prevent the mapping from being removed.

From 31a667d8db859e1aff61a9302322fe8568a05d84 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 8 May 2026 09:26:58 -0700
Subject: [PATCH 06/10] AB#33267 structure empty AI attachment context

---
 .../Versions/v1/application-analysis.system.txt  |  4 ++--
 .../Versions/v1/application-scoring.system.txt   |  4 ++--
 .../AI/Prompts/Versions/v1/common.rules.txt      |  1 +
 .../AI/Runtime/OpenAIRuntimeService.cs           |  2 +-
 .../DataSeed/AIPromptDataSeeder.cs               |  5 +++--
 .../AI/Runtime/OpenAIPromptRendererTests.cs      | 16 ++++++++++++++++
 6 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
index cfd2fe2d47..b05196b8ab 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
@@ -3,7 +3,7 @@ You are a careful grant review assistant for human reviewers. Do not fill gaps,
 
 TASK
 Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
-1. Review the application and attachments for the strongest reviewer-relevant evidence.
+1. Review the application and any provided attachments for the strongest reviewer-relevant evidence.
 2. Determine which conclusions are directly supported by that evidence.
 3. Exclude weak, repetitive, or loosely supported conclusions.
-4. Return only the strongest evidence-backed reviewer conclusions.
\ No newline at end of file
+4. Return only the strongest evidence-backed reviewer conclusions.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
index 297a9f351f..aefebf06d5 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
@@ -5,7 +5,7 @@ TASK
 Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES:
 1. Review each question in SECTION one at a time.
 2. Identify the exact condition the question asks about.
-3. Consider only the most relevant evidence in DATA and ATTACHMENTS for that condition.
+3. Consider only the most relevant evidence in DATA and any provided ATTACHMENTS for that condition.
 4. Choose the most conservative valid answer supported by that evidence.
 5. If evidence is incomplete or indirect, explain the uncertainty in the rationale.
-6. Repeat for every question in SECTION.
\ No newline at end of file
+6. Repeat for every question in SECTION.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt
index ada24e7e87..790f34fb73 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/common.rules.txt
@@ -1,4 +1,5 @@
 - Any narrative text response must be at least 12 words.
+- If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material to the specific conclusion or question.
 - Return values exactly as specified in OUTPUT.
 - Do not return keys outside OUTPUT.
 - Return valid JSON only.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index b61fed77c1..869bc67acf 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -198,7 +198,7 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
             {
                 var attachments = attachmentSummaries.Count > 0
                     ? string.Join("\n- ", attachmentSummaries.Select((summary, index) => $"Attachment {index + 1}: {summary}"))
-                    : "No attachments provided.";
+                    : "[]";
 
                 var section = OpenAIPromptRenderer.BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
                 var response = OpenAIPromptRenderer.BuildApplicationScoringResponseTemplate(section);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
index 58859a5e83..6ee4261528 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
@@ -278,7 +278,7 @@ OPTIONAL FIELDS (may be left blank):
 
         TASK
         Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
-        1. Review the application and attachments for the strongest reviewer-relevant evidence.
+        1. Review the application and any provided attachments for the strongest reviewer-relevant evidence.
         2. Determine which conclusions are directly supported by that evidence.
         3. Exclude weak, repetitive, or loosely supported conclusions.
         4. Return only the strongest evidence-backed reviewer conclusions.
@@ -520,7 +520,7 @@ 2. A brief rationale (1-2 complete sentences) citing concrete supporting evidenc
         Using DATA, ATTACHMENTS, SECTION, RESPONSE, OUTPUT, and RULES:
         1. Review each question in SECTION one at a time.
         2. Identify the exact condition the question asks about.
-        3. Consider only the most relevant evidence in DATA and ATTACHMENTS for that condition.
+        3. Consider only the most relevant evidence in DATA and any provided ATTACHMENTS for that condition.
         4. Choose the most conservative valid answer supported by that evidence.
         5. If evidence is incomplete or indirect, explain the uncertainty in the rationale.
         6. Repeat for every question in SECTION.
@@ -583,6 +583,7 @@ 4. Choose the most conservative valid answer supported by that evidence.
     // ── v1/common.rules.txt ──────────────────────────────────────────────────
     private const string CommonRules = """
         - Any narrative text response must be at least 12 words.
+        - If ATTACHMENTS is empty, use DATA only and do not mention missing attachments unless their absence is material to the specific conclusion or question.
         - Return values exactly as specified in OUTPUT.
         - Do not return keys outside OUTPUT.
         - Return valid JSON only.
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs
index 7d7258808b..cc2c48823d 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/AI/Runtime/OpenAIPromptRendererTests.cs
@@ -26,4 +26,20 @@ public void ResolvePromptVersion_Should_Throw_When_Version_Is_Missing_Or_Unsuppo
     {
         Should.Throw<InvalidOperationException>(() => OpenAIPromptRenderer.ResolvePromptVersion(version));
     }
+
+    [Fact]
+    public void BuildApplicationScoringUserPrompt_Should_Render_Structured_Empty_Attachments()
+    {
+        var prompt = OpenAIPromptRenderer.BuildApplicationScoringUserPrompt(
+            "v1",
+            "{}",
+            "[]",
+            "{\"name\":\"Test\",\"questions\":[]}",
+            "{}");
+
+        prompt.ShouldContain("ATTACHMENTS");
+        prompt.ShouldContain("[]");
+        prompt.ShouldContain("If ATTACHMENTS is empty, use DATA only");
+        prompt.ShouldNotContain("No attachments provided.");
+    }
 }

From f2ca4623cafa2e2b04bbb1f38bde4f5cdacce248 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 3 Jun 2026 08:40:37 -0700
Subject: [PATCH 07/10] AB#33313 remove large AI model output logging

---
 .../src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index b61fed77c1..8735419847 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -318,14 +318,12 @@ private async Task<AIOperationResult> GenerateWithRetryAsync(
         private async Task LogPromptInputAsync(string promptType, string promptVersion, string? systemPrompt, string userPrompt, CancellationToken cancellationToken = default)
         {
             var formattedInput = FormatPromptInputForLog(systemPrompt, userPrompt);
-            _logger.LogInformation("AI {PromptType} ({PromptVersion}) input payload: {PromptInput}", promptType, promptVersion, formattedInput);
             await WritePromptLogFileAsync(promptType, promptVersion, "INPUT", formattedInput, cancellationToken);
         }
 
         private async Task LogPromptOutputAsync(string promptType, string promptVersion, string output, CancellationToken cancellationToken = default)
         {
             var formattedOutput = FormatPromptOutputForLog(output);
-            _logger.LogInformation("AI {PromptType} ({PromptVersion}) model output payload: {ModelOutput}", promptType, promptVersion, formattedOutput);
             await WritePromptLogFileAsync(promptType, promptVersion, "OUTPUT", formattedOutput, cancellationToken);
         }
 

From 600f41f605c3da9716bc53c474eb02651c3ea941 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 3 Jun 2026 09:41:07 -0700
Subject: [PATCH 08/10] AB#33315 align AI analysis tab height

---
 .../Pages/GrantApplications/Details.css       | 66 +++++++------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
index 9adb01aaff..73828d06ba 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
@@ -272,9 +272,18 @@ select.selected {
     margin-top: 0.8rem;
 }
 
-.details-nav .nav-link {
-    display: flex;
-}
+.details-nav .nav-link {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    height: 42px;
+    line-height: 1.5;
+}
+
+.details-nav .nav-link i {
+    line-height: 1;
+}
 
 .details-nav .nav-link .fl {
     margin-right: 4px;
@@ -338,15 +347,15 @@ select.selected {
     z-index: 999;
 }
 
-#detailsTab .nav-item .nav-link {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.action-bar {
-    display: flex !important;
-}
+#detailsTab .nav-item .nav-link {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.action-bar {
+    display: flex !important;
+}
 
 #DetailsActionBarStart {
     margin-right: 0.5rem;
@@ -677,36 +686,7 @@ form label.error {
     border-color: #f5c2c7;
 }
 
-#ai-analysis-tab {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: 6px;
-}
-
-.ai-analysis-tab-icon-wrap {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-}
-
-.ai-analysis-tab-indicator {
-    width: 8px;
-    height: 8px;
-    border-radius: 999px;
-    background-color: #adb5bd;
-    flex-shrink: 0;
-}
-
-.ai-analysis-tab-indicator.proceed {
-    background-color: #198754;
-}
-
-.ai-analysis-tab-indicator.hold {
-    background-color: #dc3545;
-}
-
-.ai-analysis-action-btn {
+.ai-analysis-action-btn {
     background: #ffffff;
     border: 1px solid #d1d5db;
     padding: 4px 10px;
@@ -728,4 +708,4 @@ form label.error {
 
 .worksheet_AssessmentInfo {
     padding-left: 0.5rem;
-}
\ No newline at end of file
+}

From 9ce32e654f59fe2e724b4371381e08db749bd68b Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 3 Jun 2026 12:46:45 -0700
Subject: [PATCH 09/10] AB#33223: Bugfix - Selective Attachment Download

---
 .../Components/ChefsAttachments/ChefsAttachments.js   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
index 827ec58c0a..ca6e5734c4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
@@ -33,7 +33,7 @@ $(function () {
                 });
             }, 10);
 
-            $(downloadAll).prop('disabled', result.length === 0);
+            $(downloadAll).prop('disabled', true);
             selectedAttachmentIds = [];
             setGenerateSummariesEnabled();
 
@@ -68,6 +68,10 @@ $(function () {
         $('#generateAiSummaries').prop('disabled', selectedAttachmentIds.length === 0);
     }
 
+    function setDownloadAllEnabled() {
+        $(downloadAll).prop('disabled', selectedAttachmentIds.length === 0);
+    }
+
     function setSelectAllState() {
         const totalCheckboxes = $('#ChefsAttachmentsTable .chkbox').length;
         const selectedCheckboxes = $('#ChefsAttachmentsTable .chkbox:checked').length;
@@ -83,6 +87,7 @@ $(function () {
         chefsDataTable.$('.chkbox').prop('checked', false);
         $('.select-all-chefs-files').prop('checked', false);
         setGenerateSummariesEnabled();
+        setDownloadAllEnabled();
     }
 
     function setAllAttachmentSelections(isSelected) {
@@ -335,6 +340,7 @@ $(function () {
         });
         setGenerateSummariesEnabled();
         setSelectAllState();
+        setDownloadAllEnabled();
     });
 
     chefsDataTable.on('deselect', function (e, dt, type, indexes) {
@@ -352,6 +358,7 @@ $(function () {
         });
         setGenerateSummariesEnabled();
         setSelectAllState();
+        setDownloadAllEnabled();
     });
 
     $('#resyncSubmissionAttachments').on('click', function () {
@@ -381,7 +388,7 @@ $(function () {
         const _this = $(this);
         const existingHTML = _this.html();
         const zip = new JSZip();
-        const tempFiles = chefsDataTable.rows().data().toArray().map((row) => ({
+        const tempFiles = chefsDataTable.rows({ selected: true }).data().toArray().map((row) => ({
             FormSubmissionId: row.chefsSubmissionId,
             ChefsFileId: row.chefsFileId,
             Filename: row.fileName,

From d29603ae44ce1dabe110ab2ae231b628e9f4d20b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 3 Jun 2026 13:28:07 -0700
Subject: [PATCH 10/10] AB#33319 unify active AI generation status

---
 .../AIGenerationRequestDto.cs                 |  2 +
 .../GrantApplicationAppService.cs             | 53 ++++++++++++++-----
 .../GrantManagerApplicationMapperlyProfile.cs | 12 ++++-
 .../Pages/GrantApplications/ai-analysis.js    |  2 +-
 .../ai-generation-button-state.js             | 45 ++++++++++++++--
 .../Pages/GrantApplications/ai-rate-limit.js  | 25 +++++----
 .../AssessmentScoresWidget/Default.js         |  2 +-
 .../ChefsAttachments/ChefsAttachments.js      |  5 +-
 .../Components/ReviewList/ReviewList.js       |  2 +-
 9 files changed, 113 insertions(+), 35 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs
index 0dfccaa949..5c1ac1ee8c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/AIGenerationRequestDto.cs
@@ -13,4 +13,6 @@ public class AIGenerationRequestDto : EntityDto<Guid>
     public DateTime? CompletedAt { get; set; }
     public string? FailureReason { get; set; }
     public bool IsActive { get; set; }
+    public bool IsGenerating { get; set; }
+    public int RetryAfterSeconds { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
index 6178fea11f..be44fb379e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -13,9 +13,10 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Unity.Flex.WorksheetInstances;
-using Unity.Flex.Worksheets;
-using Unity.AI.Models;
-using Unity.AI.Responses;
+using Unity.Flex.Worksheets;
+using Unity.AI.Models;
+using Unity.AI.RateLimit;
+using Unity.AI.Responses;
 using Unity.GrantManager.Applicants;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
@@ -55,10 +56,11 @@ public class GrantApplicationAppService(
     IApplicantAgentRepository applicantAgentRepository,
     IApplicantAddressRepository applicantAddressRepository,
     IApplicantSupplierAppService applicantSupplierService,
-    IPaymentRequestAppService paymentRequestService,
-    IApplicationAIGenerationQueue aiGenerationQueue,
-    IAIGenerationStatusAppService aiGenerationStatusAppService,
-    IFeatureChecker featureChecker)
+    IPaymentRequestAppService paymentRequestService,
+    IApplicationAIGenerationQueue aiGenerationQueue,
+    IAIGenerationStatusAppService aiGenerationStatusAppService,
+    IAIRateLimiter aiRateLimiter,
+    IFeatureChecker featureChecker)
     : GrantManagerAppService, IGrantApplicationAppService
 #pragma warning restore S107 // Methods should not have too many parameters
 {
@@ -1180,7 +1182,8 @@ public async Task<AIGenerationRequestDto> QueueApplicationAnalysisAsync(Guid app
             AIGenerationRequestKeyHelper.ApplicationAnalysisOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI analysis request.");
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI analysis request."));
     }
 
     [Authorize(AIPermissions.Analysis.GenerateAttachmentSummaries)]
@@ -1195,7 +1198,8 @@ public async Task<AIGenerationRequestDto> QueueAttachmentSummaryAsync(QueueAttac
             AIGenerationRequestKeyHelper.AttachmentSummaryOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI attachment summary request.");
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI attachment summary request."));
     }
 
     [Authorize(AIPermissions.Analysis.GenerateScoring)]
@@ -1209,13 +1213,15 @@ public async Task<AIGenerationRequestDto> QueueApplicationScoringAsync(Guid appl
             AIGenerationRequestKeyHelper.ApplicationScoringOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI scoring request.");
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI scoring request."));
     }
 
     public async Task<AIGenerationRequestDto?> GetAIGenerationStatusAsync(Guid applicationId, string operationType, string? promptVersion = null)
     {
-        await EnsureAIGenerationStatusAccessAsync(operationType);
-        return await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, CurrentTenant.Id);
+        await EnsureAIGenerationStatusAccessAsync(operationType);
+        return await ApplyRateLimitStateOrDefaultAsync(
+            await aiGenerationStatusAppService.GetLatestAsync(applicationId, operationType, CurrentTenant.Id));
     }
 
     [Authorize(AIPermissions.Analysis.GenerateApplicationAnalysis)]
@@ -1233,8 +1239,27 @@ public async Task<AIGenerationRequestDto> QueueAllAIStagesAsync(Guid application
             AIGenerationRequestKeyHelper.PipelineOperationType,
             CurrentTenant.Id);
 
-        return request ?? throw new UserFriendlyException("Unable to queue AI generation request.");
-    }
+        return await ApplyRateLimitStateAsync(
+            request ?? throw new UserFriendlyException("Unable to queue AI generation request."));
+    }
+
+    private async Task<AIGenerationRequestDto?> ApplyRateLimitStateOrDefaultAsync(AIGenerationRequestDto? request)
+    {
+        if (request is null)
+        {
+            return null;
+        }
+
+        return await ApplyRateLimitStateAsync(request);
+    }
+
+    private async Task<AIGenerationRequestDto> ApplyRateLimitStateAsync(AIGenerationRequestDto request)
+    {
+        var state = await aiRateLimiter.GetStateAsync();
+        request.IsGenerating = state.IsGenerating;
+        request.RetryAfterSeconds = state.RetryAfterSeconds;
+        return request;
+    }
 
     private async Task EnsureAIGenerationStatusAccessAsync(string operationType)
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
index c2eca7860d..6a8b608d1f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationMapperlyProfile.cs
@@ -536,7 +536,17 @@ public partial class ApplicationActionResultItemToDtoMapper : MapperBase<Applica
 [Mapper] public partial class CommunityToDtoMapper : MapperBase<Community, CommunityDto> { public override partial CommunityDto Map(Community source); public override partial void Map(Community source, CommunityDto destination); }
 [Mapper] public partial class RegionalDistrictToDtoMapper : MapperBase<RegionalDistrict, RegionalDistrictDto> { public override partial RegionalDistrictDto Map(RegionalDistrict source); public override partial void Map(RegionalDistrict source, RegionalDistrictDto destination); }
 [Mapper] public partial class ApplicationTagsToDtoMapper : MapperBase<ApplicationTags, ApplicationTagsDto> { public override partial ApplicationTagsDto Map(ApplicationTags source); public override partial void Map(ApplicationTags source, ApplicationTagsDto destination); }
-[Mapper] public partial class AIGenerationRequestToDtoMapper : MapperBase<AIGenerationRequest, AIGenerationRequestDto> { public override partial AIGenerationRequestDto Map(AIGenerationRequest source); public override partial void Map(AIGenerationRequest source, AIGenerationRequestDto destination); }
+[Mapper]
+public partial class AIGenerationRequestToDtoMapper : MapperBase<AIGenerationRequest, AIGenerationRequestDto>
+{
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.IsGenerating))]
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.RetryAfterSeconds))]
+    public override partial AIGenerationRequestDto Map(AIGenerationRequest source);
+
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.IsGenerating))]
+    [MapperIgnoreTarget(nameof(AIGenerationRequestDto.RetryAfterSeconds))]
+    public override partial void Map(AIGenerationRequest source, AIGenerationRequestDto destination);
+}
 [Mapper(AllowNullPropertyAssignment = true)]
 public partial class ApplicantToGrantApplicationApplicantDtoMapper : MapperBase<Applicant, GrantApplicationApplicantDto>
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js
index c608d0f2ce..a29267f48d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-analysis.js
@@ -456,8 +456,8 @@ globalThis.queueApplicationAnalysis = function(triggerButton = null) {
 
             if (status === 'Completed') {
                 globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                globalThis.AIGenerationButtonState?.applyStatusState(request);
                 loadAIAnalysis();
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js
index 7424d1591a..02aea6030d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-generation-button-state.js
@@ -13,6 +13,16 @@
             .prop('disabled', true);
     }
 
+    function applyRateLimitState(request, options = {}) {
+        global.applyAIRateLimitState?.(
+            {
+                isGenerating: request?.isGenerating === true || request?.isActive === true,
+                retryAfterSeconds: Number(request?.retryAfterSeconds) || 0
+            },
+            { pollWhenGenerating: options.pollWhenGenerating === true }
+        );
+    }
+
     global.AIGenerationButtonState = {
         resolveStatus(status) {
             switch (Number(status)) {
@@ -29,7 +39,7 @@
             }
         },
         setGenerating($button) {
-            global.setAIGenerationButtonsGenerating?.();
+            global.setAIGenerationButtonsGenerating?.({ poll: false });
         },
         restore($button) {
             $button.removeClass('disabled');
@@ -37,11 +47,17 @@
         restoreForCooldownCheck($button, html) {
             restoreButtonForCooldownCheck($button, html);
         },
+        applyStatusState(request) {
+            applyRateLimitState(request, { pollWhenGenerating: true });
+        },
         monitor(options) {
             const intervalMs = options.intervalMs || 15000;
+            const activeIntervalMs = options.activeIntervalMs || 2000;
+            const activePollCount = options.activePollCount || 10;
             const maxFailures = options.maxFailures || 3;
             let timeoutId = null;
             let failures = 0;
+            let pollCount = 0;
 
             const stop = () => {
                 if (timeoutId) {
@@ -50,6 +66,15 @@
                 }
             };
 
+            const scheduleNextPoll = () => {
+                pollCount += 1;
+                const nextIntervalMs = pollCount <= activePollCount
+                    ? activeIntervalMs
+                    : intervalMs;
+
+                timeoutId = setTimeout(poll, nextIntervalMs);
+            };
+
             const poll = () => {
                 options.getStatus()
                     .done((request) => {
@@ -59,19 +84,29 @@
                         if (status === 'Failed') {
                             stop();
                             restoreButton(options.$button, options.originalHtml);
+                            applyRateLimitState(request, { pollWhenGenerating: true });
                             options.onFailed?.(request);
                             return;
                         }
 
-                        if (!request || request.isActive === false || status === 'Completed') {
+                        if (!request) {
+                            stop();
+                            restoreButton(options.$button, options.originalHtml);
+                            global.refreshAIRateLimitState?.();
+                            options.onMissing?.();
+                            return;
+                        }
+
+                        if (request.isActive === false || status === 'Completed') {
                             stop();
                             restoreButtonForCooldownCheck(options.$button, options.originalHtml);
+                            applyRateLimitState(request, { pollWhenGenerating: true });
                             options.onComplete?.(request);
-                            global.syncAIRateLimitButtons?.();
                             return;
                         }
 
-                        timeoutId = setTimeout(poll, intervalMs);
+                        applyRateLimitState(request);
+                        scheduleNextPoll();
                     })
                     .fail((error) => {
                         failures += 1;
@@ -82,7 +117,7 @@
                             return;
                         }
 
-                        timeoutId = setTimeout(poll, intervalMs);
+                        scheduleNextPoll();
                     });
             };
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
index 6ee671727d..f822be6c42 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/ai-rate-limit.js
@@ -121,12 +121,14 @@
         }
     }
 
-    function applyGenerating() {
+    function applyGenerating(options = {}) {
         currentState = { mode: 'generating' };
         renderState();
 
         clearStatePollTimer();
-        statePollTimer = setTimeout(() => fetchState(true), 2000);
+        if (options.poll !== false) {
+            statePollTimer = setTimeout(() => fetchState(true), 2000);
+        }
     }
 
     function renderGenerating() {
@@ -223,29 +225,34 @@
                 return;
             }
             const data = await res.json();
-            if (data.isGenerating === true) {
-                applyGenerating();
-                return;
-            }
-
-            applyCooldown(Number(data.retryAfterSeconds) || 0);
+            applyRateLimitState(data);
         } catch (_) {
             // Best-effort; the server is the source of truth.
             handleStateFetchFailure();
         }
     }
 
+    function applyRateLimitState(data, options = {}) {
+        if (data?.isGenerating === true) {
+            applyGenerating({ poll: options.pollWhenGenerating !== false });
+            return;
+        }
+
+        applyCooldown(Number(data?.retryAfterSeconds) || 0);
+    }
+
     globalThis.syncAIRateLimitButtons = () => {
         renderState();
         fetchState(true);
     };
     globalThis.setAIGenerationButtonsGenerating = applyGenerating;
+    globalThis.applyAIRateLimitState = applyRateLimitState;
     globalThis.refreshAIRateLimitState = globalThis.syncAIRateLimitButtons;
 
     document.addEventListener('click', (e) => {
         const btn = e.target.closest(BUTTON_SELECTOR);
         if (!btn) return;
-        applyGenerating();
+        applyGenerating({ poll: false });
     });
 
     document.addEventListener('DOMContentLoaded', () => {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js
index 9cbc185d6b..4f17bbbb06 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.js
@@ -699,8 +699,8 @@ function queueApplicationScoring(triggerButton = null) {
 
             if (status === 'Completed') {
                 globalThis.AIGenerationButtonState?.restoreForCooldownCheck($button, existingHtml);
+                globalThis.AIGenerationButtonState?.applyStatusState(request);
                 PubSub.publish('refresh_assessment_scores', null);
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
index 827ec58c0a..332412f0a9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.js
@@ -212,9 +212,8 @@ $(function () {
                         resetAttachmentSelection();
                         chefsDataTable.ajax.reload();
                         abp.notify.success('AI summaries generated successfully.');
-                        globalThis.AIGenerationButtonState?.restore($activeButton);
-                        $activeButton.html(existingHTML).prop('disabled', false);
-                        globalThis.syncAIRateLimitButtons?.();
+                        globalThis.AIGenerationButtonState?.restoreForCooldownCheck($activeButton, existingHTML);
+                        globalThis.AIGenerationButtonState?.applyStatusState(request);
                         return;
                     }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js
index a52d5b6467..53c123bb51 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.js
@@ -477,8 +477,8 @@ function generateAiButtonAction(e, dt, button, config) {
 
             if (status === 'Completed') {
                 restoreReviewListAiButtonForCooldownCheck($button);
+                globalThis.AIGenerationButtonState?.applyStatusState(request);
                 refreshReviewListAfterAiScoring();
-                globalThis.syncAIRateLimitButtons?.();
                 return;
             }