From 98462ab45c030cda1a592ce7192c43351b7937b3 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Fri, 27 Mar 2026 09:53:23 -0700
Subject: [PATCH 1/9] [AB#32347] Fix DataTable button default styling

---
 .../src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js      | 3 +++
 .../Views/Shared/Components/ReviewList/ReviewList.js           | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
index 29a5068c9..8d973ba7f 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
@@ -53,6 +53,9 @@ if ($.fn.dataTable !== undefined && $.fn.dataTable.ext) {
             return csv;
         },
     };
+
+    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn unt-btn-outline-primary btn-outline-primary';
+    $.fn.dataTable.Buttons.defaults.dom.button.liner.tag = false;
 }
 
 // ============================================================================
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 5d97ad08d..61c45c526 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
@@ -52,9 +52,6 @@ $(function () {
         renderEnum: (data) => l('Enum:AssessmentState.' + data),
     };
 
-    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn unt-btn-outline-primary btn-outline-primary';
-    $.fn.dataTable.Buttons.defaults.dom.button.liner.tag = false;
-
     $.extend(DataTable.ext.buttons, {
         unityWorkflow: {
             className: 'btn unt-btn-outline-primary btn-outline-primary',

From ff3a3fd8192b5ab64320bec5a3f14bb1f4699a3a Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:29:07 -0700
Subject: [PATCH 2/9] [AB#32347] Fix DataTable button default styling

---
 .../src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
index 8d973ba7f..1a44299df 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
@@ -54,7 +54,7 @@ if ($.fn.dataTable !== undefined && $.fn.dataTable.ext) {
         },
     };
 
-    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn unt-btn-outline-primary btn-outline-primary';
+    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn btn-light custom-table-btn flex-none btn-secondary';
     $.fn.dataTable.Buttons.defaults.dom.button.liner.tag = false;
 }
 

From d3af6dde2b010a27880bb22ebcc6a008907452f9 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Fri, 27 Mar 2026 10:44:34 -0700
Subject: [PATCH 3/9] [AB#31022] Fix email notification table x-overflow cutoff

---
 .../Components/EmailHistoryWidget/Default.js  | 14 ++---
 .../EmailHistoryWidget/EmailHistory.css       | 60 +++++++++++++------
 2 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
index a6de4c4a8..02d9cdaab 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/Default.js
@@ -28,7 +28,7 @@
                 style: 'single'
             },
             info: false,
-            scrollX: true,
+            scrollX: false,
             ajax: abp.libs.datatables.createAjax(
                 unity.notifications.emailNotifications.emailNotification.getHistoryByApplicationId, inputAction, responseCallback
             ),
@@ -37,26 +37,26 @@
                     className: 'dt-control',
                     orderable: false,
                     data: null,
-                    width: '30px',
+                    width: '2%',
                     defaultContent: ''
                 },
                 {
                     title: 'Subject',
                     data: 'subject',
                     className: 'data-table-header text-break',
-                    width: '30%'
+                    width: '38%'
                 },
                 {
                     title: 'Status',
                     data: 'status',
                     className: 'data-table-header',
-                    width: '15%'
+                    width: '13%'
                 },
                 {
                     title: 'Created',
                     data: 'creationTime',
                     className: 'data-table-header',
-                    width: '180px',
+                    width: '23%',
                     render: function (data) {
                         return data != null ? luxon.DateTime.fromISO(data, {
                             locale: abp.localization.currentCulture.name,
@@ -74,7 +74,7 @@
                     title: 'Sent By',
                     data: 'sentBy',
                     className: 'data-table-header',
-                    width: '20%',
+                    width: '16%',
                     render: function (data) {
                         return data ? data.name + ' ' + data.surname : '—';
                     },
@@ -99,7 +99,7 @@
                 },
                 {
                     data: 'status',
-                    width: '60px',
+                    width: '8%',
                     className: 'text-center',
                     render: function (data, _, full, meta) {
                         if (data === 'Draft' && abp.auth.isGranted('Notifications.Email.Send')) {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
index 6f4d3d3cd..41687251b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailHistoryWidget/EmailHistory.css
@@ -1,27 +1,53 @@
-/* Updated for DataTables v2 - ensure proper width handling with scrollX */
-#EmailHistoryTable_wrapper .dt-scroll-body {
-    overflow: unset !important;
-}
+/* Email History Table - Responsive layout without horizontal overflow */
 
-/* Ensure table wrapper uses full width */
+/* Container constraints */
 #EmailHistoryTable_wrapper {
     width: 100%;
+    box-sizing: border-box;
+    overflow: hidden;
 }
 
-    /* Ensure scroll container properly sizes */
-    #EmailHistoryTable_wrapper .dt-scroll {
-        overflow-x: auto;
-    }
+/* Disable scrolling and force fixed layout */
+#EmailHistoryTable_wrapper .dt-scroll {
+    overflow: visible !important;
+    width: 100%;
+    box-sizing: border-box;
+}
 
-    /* Ensure inner scroll elements take full width */
-    #EmailHistoryTable_wrapper .dt-scroll-head .dt-scroll-headInner,
-    #EmailHistoryTable_wrapper .dt-scroll-head .dt-scroll-headInner table {
-        width: 100% !important;
-    }
+#EmailHistoryTable_wrapper .dt-scroll-body {
+    overflow: visible !important;
+    width: 100%;
+    box-sizing: border-box;
+}
 
-    #EmailHistoryTable_wrapper .dt-scroll-body table {
-        width: 100% !important;
-    }
+#EmailHistoryTable_wrapper .dt-scroll-head,
+#EmailHistoryTable_wrapper .dt-scroll-body {
+    max-width: 100%;
+}
+
+/* Force fixed table layout to prevent column expansion */
+#EmailHistoryTable {
+    width: 100% !important;
+    table-layout: fixed !important;
+    box-sizing: border-box;
+}
+
+/* Consistent cell sizing and text handling */
+#EmailHistoryTable th,
+#EmailHistoryTable td {
+    box-sizing: border-box;
+    word-wrap: break-word;
+    word-break: break-word;
+    overflow-wrap: break-word;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+/* Allow expansion for text content in Subject column only */
+#EmailHistoryTable td:nth-child(2),
+#EmailHistoryTable th:nth-child(2) {
+    white-space: normal;
+}
 
 @media (max-height: 768px) {
     .dt-scroll-body {

From 1fa8c817867e2047ce1933e72c01d79760b86f21 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Fri, 27 Mar 2026 11:00:33 -0700
Subject: [PATCH 4/9] [AB#32348] Fix datatables default classes

---
 .../src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
index 1a44299df..f897b99dd 100644
--- a/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
+++ b/applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js
@@ -54,7 +54,7 @@ if ($.fn.dataTable !== undefined && $.fn.dataTable.ext) {
         },
     };
 
-    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn btn-light custom-table-btn flex-none btn-secondary';
+    $.fn.dataTable.Buttons.defaults.dom.button.className = 'btn custom-table-btn flex-none';
     $.fn.dataTable.Buttons.defaults.dom.button.liner.tag = false;
 }
 

From 40c50a81b48df973756a6ae5fdd74ead2fe236b9 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Fri, 27 Mar 2026 13:37:07 -0700
Subject: [PATCH 5/9] [AB#28856] Reorder Additional Contact section in
 Applicant Info

---
 .../Components/ApplicantInfo/Default.cshtml   | 19 ++++++++-----------
 .../Components/ApplicantInfo/Default.css      |  2 +-
 .../ApplicationContactsWidget/Default.cshtml  |  4 +++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
index e5b8c9694..960f806cc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml
@@ -241,6 +241,14 @@
             </abp-row>
         </zone-fieldset>
 
+        @* Zone Section : AdditionalContact *@
+        <zone id="@UnitySelector.Applicant.AdditionalContact.Default"
+              permission-requirement="@UnitySelector.Applicant.AdditionalContact.Default"
+              form-id="@Model.ApplicationFormId" show-legend="false"
+              editable-if="IsAdditionalContactEditable">
+            @await Component.InvokeAsync("ApplicationContactsWidget", new { applicationId = Model.ApplicationId })
+        </zone>
+
         @* Zone Section : Address *@
         <zone-fieldset id="@UnitySelector.Applicant.Location.Default" form-id="@Model.ApplicationFormId" show-legend="true"
                        update-permission-requirement="@UnitySelector.Applicant.Location.Update">
@@ -363,17 +371,6 @@
     </form>
 </abp-row>
 
-@* Zone Section : AdditionalContact *@
-<zone id="@UnitySelector.Applicant.AdditionalContact.Default"
-      permission-requirement="@UnitySelector.Applicant.AdditionalContact.Default"
-      form-id="@Model.ApplicationFormId" show-legend="false"
-      editable-if="IsAdditionalContactEditable">
-    <abp-row class="px-1 pb-2 mb-4 summary-container">
-        @await Component.InvokeAsync("ApplicationContactsWidget", new { applicationId = Model.ApplicationId })
-    </abp-row>
-</zone>
-
-
 <div class="modal fade" id="mergeDuplicateApplicantsModal" tabindex="-1" aria-labelledby="mergeApplicantsModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-xl modal-dialog-centered">
         <div class="modal-content">
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.css
index ea2742a9c..367a8782e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.css
@@ -28,7 +28,7 @@
     border-bottom: 0.25rem solid var(--bc-colors-white-background);
 }
 
-.contact-info-form, .mailing-address-form, .physical-address-form, .project-info-location, .signin-authority-form {
+.contact-info-form, .mailing-address-form, .physical-address-form, .project-info-location, .signin-authority-form, .summary-container {
     border-bottom: 0.25rem solid var(--bc-colors-white-background);
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationContactsWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationContactsWidget/Default.cshtml
index 1f127697b..636b1e16a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationContactsWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicationContactsWidget/Default.cshtml
@@ -17,7 +17,8 @@
     bool IsAdditionalContactEditable = await PermissionChecker.IsGrantedAsync(UnitySelector.Applicant.AdditionalContact.Update);
 }
 
-<h6 class="ps-2 mb-3 fw-bold">@L["Summary:ContactsTitle"].Value</h6>
+<div class="pb-2 summary-container">
+<h6 class="ps-1 pb-3 pt-2 mt-3 fw-bold">@L["Summary:ContactsTitle"].Value</h6>
 <input id="ApplicationContactsWidget_ApplicationId" value="@Model.ApplicationId" type="hidden"/>
 @if (Model.ApplicationContacts.Count > 0) {
     <p class="px-2 mb-0 fw-bold text-muted">Info</p>
@@ -75,3 +76,4 @@
             button-type="Light" />
     </div>
 }
+</div>

From 8c8a59302c411d77b20ed7b68d656ff5791e2090 Mon Sep 17 00:00:00 2001
From: Patrick <135162612+plavoie-BC@users.noreply.github.com>
Date: Fri, 27 Mar 2026 14:43:09 -0700
Subject: [PATCH 6/9] [AB#32138] Ensure User Import grid is unique by UserGuid

---
 .../Identity/UserImportAppService.cs                            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
index dbf527204..8c9585998 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Identity/UserImportAppService.cs
@@ -166,7 +166,7 @@ public async Task<IList<UserDto>> SearchAsync(UserSearchDto importUserSearchDto)
                 }
             }
 
-            return users;
+            return users.GroupBy(u => u.UserGuid).Select(g => g.First()).ToList();
         }
 
         private async Task<IdentityUser?> CreateNewIdentityUserAsync(Guid newUserId, string? username, string? firstName, string? lastName, string? emailAddress)

From ed165221a207cbe941872cb063e8a363f561c527 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 27 Mar 2026 14:57:17 -0700
Subject: [PATCH 7/9] AB#32228 enrich AI token usage logging

---
 .../AI/Runtime/AIProviderResult.cs            |  1 +
 .../AI/Runtime/OpenAIRuntimeService.cs        | 71 +++++++++++++------
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResult.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResult.cs
index fc5105df8..a3b117062 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResult.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResult.cs
@@ -5,6 +5,7 @@ internal sealed record AIProviderResult(
         string RawResponse = "",
         string? Model = null,
         string? FinishReason = null,
+        int? HttpStatusCode = null,
         int? PromptTokens = null,
         int? CompletionTokens = null,
         int? TotalTokens = null,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
index 9ca732947..e4506e001 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -143,7 +143,8 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                     applicationAnalysisContent,
                     systemPrompt,
                     ApplicationAnalysisCompletionTokens,
-                    operationName: ApplicationAnalysisPromptType),
+                    operationName: ApplicationAnalysisPromptType,
+                    promptVersion: promptVersion),
                 AIProviderPayloadValidator.IsValidApplicationAnalysisJson,
                 "application analysis");
             await LogPromptOutputAsync(ApplicationAnalysisPromptType, promptVersion, result.CaptureOutput);
@@ -161,7 +162,9 @@ private async Task<AIOperationResult> GenerateSummaryAsync(
             string? systemPrompt,
             int maxTokens = 150,
             double? temperature = null,
-            string? operationName = null)
+            string? operationName = null,
+            string? promptVersion = null,
+            string? fileName = null)
         {
             var providerName = ResolveProviderName(operationName);
             if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
@@ -216,13 +219,17 @@ private async Task<AIOperationResult> GenerateSummaryAsync(
                 var response = await _httpClient.PostAsync(ResolveApiUrl(operationName), httpContent);
                 var responseContent = await response.Content.ReadAsStringAsync();
                 var metadata = TryExtractProviderMetadata(responseContent);
-                var providerResponse = BuildProviderResponseFromMetadata(string.Empty, responseContent, metadata);
+                var providerResponse = BuildProviderResponseFromMetadata(
+                    string.Empty,
+                    responseContent,
+                    metadata,
+                    (int)response.StatusCode);
 
                 _logger.LogDebug(
                     "OpenAI chat completions response received. StatusCode: {StatusCode}, ResponseLength: {ResponseLength}",
                     response.StatusCode,
                     responseContent?.Length ?? 0);
-                LogProviderMetadata(operationName, providerResponse, response.IsSuccessStatusCode);
+                LogProviderMetadata(operationName, promptVersion, fileName, providerResponse, response.IsSuccessStatusCode);
 
                 if (!response.IsSuccessStatusCode)
                 {
@@ -245,7 +252,11 @@ private async Task<AIOperationResult> GenerateSummaryAsync(
                         var modelOutput = message.GetProperty("content").GetString();
                         return string.IsNullOrWhiteSpace(modelOutput)
                             ? AIOperationResult.InvalidOutput(providerResponse)
-                            : AIOperationResult.Success(BuildProviderResponseFromMetadata(modelOutput, responseContent, metadata));
+                            : AIOperationResult.Success(BuildProviderResponseFromMetadata(
+                                modelOutput,
+                                responseContent,
+                                metadata,
+                                (int)response.StatusCode));
                     }
 
                     return AIOperationResult.InvalidOutput(providerResponse);
@@ -298,11 +309,13 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
 
                 await LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, prompt, contentToAnalyze);
                 var result = await GenerateWithRetryAsync(
-                    () => GenerateSummaryAsync(
-                        contentToAnalyze,
-                        prompt,
-                        AttachmentSummaryCompletionTokens,
-                        operationName: AttachmentSummaryPromptType),
+                () => GenerateSummaryAsync(
+                    contentToAnalyze,
+                    prompt,
+                    AttachmentSummaryCompletionTokens,
+                    operationName: AttachmentSummaryPromptType,
+                    promptVersion: promptVersion,
+                    fileName: fileName),
                     AIProviderPayloadValidator.IsValidAttachmentSummaryText,
                     "attachment summary");
                 await LogPromptOutputAsync(AttachmentSummaryPromptType, promptVersion, result.CaptureOutput);
@@ -462,11 +475,12 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
 
                 await LogPromptInputAsync(ApplicationScoringPromptType, promptVersion, systemPrompt, applicationScoringContent);
                 var result = await GenerateWithRetryAsync(
-                    () => GenerateSummaryAsync(
-                        applicationScoringContent,
-                        systemPrompt,
-                        ApplicationScoringCompletionTokens,
-                        operationName: ApplicationScoringPromptType),
+                () => GenerateSummaryAsync(
+                    applicationScoringContent,
+                    systemPrompt,
+                    ApplicationScoringCompletionTokens,
+                    operationName: ApplicationScoringPromptType,
+                    promptVersion: promptVersion),
                     content => AIProviderPayloadValidator.IsValidApplicationScoringJson(content, sectionJson),
                     $"application scoring section {request.SectionName}");
                 await LogPromptOutputAsync(ApplicationScoringPromptType, promptVersion, result.CaptureOutput);
@@ -564,13 +578,18 @@ private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AI
             return AIOperationResult.PermanentFailure(response);
         }
 
-        private static AIProviderResult BuildProviderResponseFromMetadata(string content, string? rawResponse, AIProviderResponseMetadata? metadata)
+        private static AIProviderResult BuildProviderResponseFromMetadata(
+            string content,
+            string? rawResponse,
+            AIProviderResponseMetadata? metadata,
+            int? httpStatusCode = null)
         {
             return new AIProviderResult(
                 content,
                 rawResponse ?? string.Empty,
                 metadata?.Model,
                 metadata?.FinishReason,
+                httpStatusCode,
                 metadata?.PromptTokens,
                 metadata?.CompletionTokens,
                 metadata?.TotalTokens,
@@ -629,10 +648,16 @@ private static AIProviderResult BuildProviderResponseFromMetadata(string content
             }
         }
 
-        private void LogProviderMetadata(string? operationName, AIProviderResult response, bool success)
+        private void LogProviderMetadata(
+            string? operationName,
+            string? promptVersion,
+            string? fileName,
+            AIProviderResult response,
+            bool success)
         {
             if (string.IsNullOrWhiteSpace(response.Model)
                 && string.IsNullOrWhiteSpace(response.FinishReason)
+                && response.HttpStatusCode == null
                 && response.PromptTokens == null
                 && response.CompletionTokens == null
                 && response.TotalTokens == null
@@ -644,21 +669,27 @@ private void LogProviderMetadata(string? operationName, AIProviderResult respons
             if (response.PromptTokens != null || response.CompletionTokens != null || response.TotalTokens != null)
             {
                 _logger.LogInformation(
-                    "AI token usage. FeatureName={FeatureName}, InputTokens={InputTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, Environment={Environment}, TenantId={TenantId}, Status={Status}",
+                    "AI token usage. FeatureName={FeatureName}, OperationName={OperationName}, InputTokens={InputTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, Environment={Environment}, TenantId={TenantId}, Status={Status}, PromptVersion={PromptVersion}, Model={Model}, HttpStatusCode={HttpStatusCode}, FileName={FileName}",
+                    operationName ?? "completion",
                     operationName ?? "completion",
                     response.PromptTokens,
                     response.CompletionTokens,
                     response.TotalTokens,
                     _hostEnvironment.EnvironmentName,
                     _currentTenant.Id,
-                    success ? "success" : "failed");
+                    success ? "success" : "failed",
+                    promptVersion,
+                    response.Model,
+                    response.HttpStatusCode,
+                    fileName);
             }
 
             _logger.LogDebug(
-                "AI provider response metadata for {OperationName}: Model={Model}, FinishReason={FinishReason}, PromptTokens={PromptTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, ReasoningTokens={ReasoningTokens}",
+                "AI provider response metadata for {OperationName}: Model={Model}, FinishReason={FinishReason}, HttpStatusCode={HttpStatusCode}, PromptTokens={PromptTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, ReasoningTokens={ReasoningTokens}",
                 operationName ?? "completion",
                 response.Model,
                 response.FinishReason,
+                response.HttpStatusCode,
                 response.PromptTokens,
                 response.CompletionTokens,
                 response.TotalTokens,

From df1a85beb40dce7ca725dfe29d87b7f1e95213d4 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 27 Mar 2026 15:01:11 -0700
Subject: [PATCH 8/9] AB#32228 simplify AI token usage log naming

---
 .../AI/Runtime/OpenAIRuntimeService.cs                         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
index e4506e001..6335c3b76 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -669,8 +669,7 @@ private void LogProviderMetadata(
             if (response.PromptTokens != null || response.CompletionTokens != null || response.TotalTokens != null)
             {
                 _logger.LogInformation(
-                    "AI token usage. FeatureName={FeatureName}, OperationName={OperationName}, InputTokens={InputTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, Environment={Environment}, TenantId={TenantId}, Status={Status}, PromptVersion={PromptVersion}, Model={Model}, HttpStatusCode={HttpStatusCode}, FileName={FileName}",
-                    operationName ?? "completion",
+                    "AI token usage. OperationName={OperationName}, InputTokens={InputTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, Environment={Environment}, TenantId={TenantId}, Status={Status}, PromptVersion={PromptVersion}, Model={Model}, HttpStatusCode={HttpStatusCode}, FileName={FileName}",
                     operationName ?? "completion",
                     response.PromptTokens,
                     response.CompletionTokens,

From 35f1de48dbb15d40b18632d835e51721dd5531df Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 27 Mar 2026 15:29:21 -0700
Subject: [PATCH 9/9] AB#32228 rerun PR checks