From d6959985b50bb1354e1f3ab0c9ff963e97a25c00 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:14:27 -0700
Subject: [PATCH 01/38] AB#32012 move AI files into concern folders

---
 .../AI/{ => Capture}/AIPromptCaptureStore.cs                      | 0
 .../AI/{ => Capture}/IAIPromptCaptureStore.cs                     | 0
 .../AI/{ => Extraction}/TextExtractionService.cs                  | 0
 .../AI/{ => Operations}/ApplicationAnalysisService.cs             | 0
 .../AI/{ => Operations}/ApplicationScoresheetAnalysisService.cs   | 0
 .../AI/{ => Operations}/IApplicationAnalysisService.cs            | 0
 .../AI/{ => Operations}/IApplicationScoresheetAnalysisService.cs  | 0
 .../AI/{ => Prompts}/AIPromptTypes.cs                             | 0
 .../AI/{ => Prompts}/PromptDataPayloadBuilder.cs                  | 0
 .../AI/{ => Runtime}/AIOperationResult.cs                         | 0
 .../AI/{ => Runtime}/AIProviderResponse.cs                        | 0
 .../AI/{ => Runtime}/AIProviderResponseMetadata.cs                | 0
 .../AI/{ => Runtime}/AIResponseJson.cs                            | 0
 .../AI/{ => Runtime}/AIResponseValidator.cs                       | 0
 .../AI/{ => Runtime}/OpenAIService.cs                             | 0
 15 files changed, 0 insertions(+), 0 deletions(-)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Capture}/AIPromptCaptureStore.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Capture}/IAIPromptCaptureStore.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Extraction}/TextExtractionService.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Operations}/ApplicationAnalysisService.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Operations}/ApplicationScoresheetAnalysisService.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Operations}/IApplicationAnalysisService.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Operations}/IApplicationScoresheetAnalysisService.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Prompts}/AIPromptTypes.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Prompts}/PromptDataPayloadBuilder.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Runtime}/AIOperationResult.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Runtime}/AIProviderResponse.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Runtime}/AIProviderResponseMetadata.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Runtime}/AIResponseJson.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Runtime}/AIResponseValidator.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/{ => Runtime}/OpenAIService.cs (100%)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIPromptCaptureStore.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/AIPromptCaptureStore.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIPromptCaptureStore.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/AIPromptCaptureStore.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IAIPromptCaptureStore.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/IAIPromptCaptureStore.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IAIPromptCaptureStore.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/IAIPromptCaptureStore.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/TextExtractionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/TextExtractionService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationScoresheetAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoresheetAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/ApplicationScoresheetAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoresheetAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationScoresheetAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoresheetAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/IApplicationScoresheetAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoresheetAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIPromptTypes.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIPromptTypes.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/PromptDataPayloadBuilder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/PromptDataPayloadBuilder.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIOperationResult.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIOperationResult.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIProviderResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponse.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIProviderResponse.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponse.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIProviderResponseMetadata.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIProviderResponseMetadata.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIResponseJson.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIResponseJson.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIResponseValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseValidator.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/AIResponseValidator.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseValidator.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/OpenAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/OpenAIService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIService.cs

From 1a48664d71fff425b9b54b2cfd8f51ec82591ae3 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:14:44 -0700
Subject: [PATCH 02/38] AB#32012 rename AI runtime and operation files

---
 ...licationAnalysisService.cs => ApplicationAIAnalysisService.cs} | 0
 ...coresheetAnalysisService.cs => ApplicationAIScoringService.cs} | 0
 ...icationAnalysisService.cs => IApplicationAIAnalysisService.cs} | 0
 ...oresheetAnalysisService.cs => IApplicationAIScoringService.cs} | 0
 .../{AIResponseValidator.cs => AIProviderPayloadValidator.cs}     | 0
 .../AI/Runtime/{AIProviderResponse.cs => AIProviderResult.cs}     | 0
 .../AI/Runtime/{OpenAIService.cs => OpenAIRuntimeService.cs}      | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{ApplicationAnalysisService.cs => ApplicationAIAnalysisService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{ApplicationScoresheetAnalysisService.cs => ApplicationAIScoringService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{IApplicationAnalysisService.cs => IApplicationAIAnalysisService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{IApplicationScoresheetAnalysisService.cs => IApplicationAIScoringService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/{AIResponseValidator.cs => AIProviderPayloadValidator.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/{AIProviderResponse.cs => AIProviderResult.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/{OpenAIService.cs => OpenAIRuntimeService.cs} (100%)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoresheetAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoresheetAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoresheetAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoresheetAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseValidator.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResult.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponse.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResult.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/OpenAIRuntimeService.cs

From 44891b4732dd343c60f2ea7afa03bf382c566a74 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:19:08 -0700
Subject: [PATCH 03/38] AB#32012 extract attachment AI orchestration and align
 runtime types

---
 .../ApplicationAIAnalysisService.cs           |   4 +-
 .../Operations/ApplicationAIScoringService.cs |   4 +-
 .../Operations/AttachmentAISummaryService.cs  | 106 ++++++++++++++++++
 .../IApplicationAIAnalysisService.cs          |   2 +-
 .../IApplicationAIScoringService.cs           |   2 +-
 .../Operations/IAttachmentAISummaryService.cs |  12 ++
 .../AI/Prompts/Versions/README.md             |   2 +-
 .../AI/Runtime/AIOperationResult.cs           |  18 +--
 .../AI/Runtime/AIProviderPayloadValidator.cs  |   2 +-
 .../AI/Runtime/AIProviderResult.cs            |   4 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        |  33 +++---
 .../Attachments/AttachmentAppService.cs       |  91 +--------------
 .../ApplicationAIAnalysisAppService.cs        |   2 +-
 .../ApplicationAIScoringAppService.cs         |   2 +-
 .../Handlers/GenerateAIContentHandler.cs      |  73 +-----------
 15 files changed, 165 insertions(+), 192 deletions(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
index 4b633cfd82..fc73aed9ae 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
@@ -10,13 +10,13 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ApplicationAnalysisService(
+    public class ApplicationAIAnalysisService(
         IApplicationRepository applicationRepository,
         IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
         IApplicationFormVersionRepository applicationFormVersionRepository,
         IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
         IAIService aiService,
-        ILogger<ApplicationAnalysisService> logger) : IApplicationAnalysisService, ITransientDependency
+        ILogger<ApplicationAIAnalysisService> logger) : IApplicationAIAnalysisService, ITransientDependency
     {
         private readonly JsonSerializerOptions _jsonOptionsIndented = new()
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
index 82b7c12ae4..01c8c5516a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
@@ -10,7 +10,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ApplicationScoresheetAnalysisService(
+    public class ApplicationAIScoringService(
         IApplicationRepository applicationRepository,
         IApplicationFormRepository applicationFormRepository,
         IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
@@ -18,7 +18,7 @@ public class ApplicationScoresheetAnalysisService(
         IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
         IScoresheetRepository scoresheetRepository,
         IAIService aiService,
-        ILogger<ApplicationScoresheetAnalysisService> logger) : IApplicationScoresheetAnalysisService, ITransientDependency
+        ILogger<ApplicationAIScoringService> logger) : IApplicationAIScoringService, ITransientDependency
     {
         private readonly JsonSerializerOptions _jsonOptions = new()
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
new file mode 100644
index 0000000000..2007dee084
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
@@ -0,0 +1,106 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Intakes;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.GrantManager.AI;
+
+public class AttachmentAISummaryService(
+    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    ISubmissionAppService submissionAppService,
+    IAIService aiService,
+    ILogger<AttachmentAISummaryService> logger) : IAttachmentAISummaryService, ITransientDependency
+{
+    private const string DefaultContentType = "application/octet-stream";
+    private const string SummaryGenerationFailedMessage = "AI summary generation failed.";
+
+    public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false)
+    {
+        var attachment = await applicationChefsFileAttachmentRepository.GetAsync(attachmentId);
+        var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? "unknown" : attachment.FileName;
+        var (fileContent, contentType) = await GetAttachmentContentForSummaryAsync(attachment, fileName);
+
+        var summaryResponse = await aiService.GenerateAttachmentSummaryAsync(new AttachmentSummaryRequest
+        {
+            FileName = fileName,
+            FileContent = fileContent,
+            ContentType = contentType,
+            PromptVersion = promptVersion,
+            CapturePromptIo = capturePromptIo,
+            CaptureContextId = attachment.ApplicationId.ToString()
+        });
+
+        attachment.AISummary = summaryResponse.Summary;
+        await applicationChefsFileAttachmentRepository.UpdateAsync(attachment);
+
+        return summaryResponse.Summary;
+    }
+
+    public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false)
+    {
+        var summaries = new List<string>();
+
+        foreach (var attachmentId in attachmentIds)
+        {
+            try
+            {
+                summaries.Add(await GenerateAndSaveAsync(attachmentId, promptVersion, capturePromptIo));
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error generating AI summary for attachment {AttachmentId}", attachmentId);
+                summaries.Add(SummaryGenerationFailedMessage);
+            }
+        }
+
+        return summaries;
+    }
+
+    public async Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
+    {
+        var attachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a =>
+                a.ApplicationId == applicationId && string.IsNullOrWhiteSpace(a.AISummary)))
+            .Select(a => a.Id)
+            .ToList();
+
+        return await GenerateAndSaveAsync(attachmentIds, promptVersion, capturePromptIo);
+    }
+
+    private async Task<(byte[] Content, string ContentType)> GetAttachmentContentForSummaryAsync(ApplicationChefsFileAttachment attachment, string fileName)
+    {
+        if (!Guid.TryParse(attachment.ChefsSubmissionId, out var submissionId) ||
+            !Guid.TryParse(attachment.ChefsFileId, out var fileId))
+        {
+            logger.LogWarning(
+                "Attachment {AttachmentId} has invalid CHEFS IDs. Falling back to metadata-only summary generation.",
+                attachment.Id);
+            return (Array.Empty<byte>(), DefaultContentType);
+        }
+
+        try
+        {
+            var fileDto = await submissionAppService.GetChefsFileAttachment(submissionId, fileId, fileName);
+            if (fileDto?.Content == null)
+            {
+                logger.LogWarning(
+                    "Attachment {AttachmentId} has no retrievable content. Falling back to metadata-only summary generation.",
+                    attachment.Id);
+                return (Array.Empty<byte>(), DefaultContentType);
+            }
+
+            return (fileDto.Content, string.IsNullOrWhiteSpace(fileDto.ContentType) ? DefaultContentType : fileDto.ContentType);
+        }
+        catch (Exception ex)
+        {
+            logger.LogWarning(
+                ex,
+                "Failed retrieving CHEFS content for attachment {AttachmentId}. Falling back to metadata-only summary generation.",
+                attachment.Id);
+            return (Array.Empty<byte>(), DefaultContentType);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
index 172a3b9c5a..382cee8120 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public interface IApplicationAnalysisService
+    public interface IApplicationAIAnalysisService
     {
         Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
index 1cc4ef1ffa..01b1241069 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public interface IApplicationScoresheetAnalysisService
+    public interface IApplicationAIScoringService
     {
         Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs
new file mode 100644
index 0000000000..021f9128c6
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Unity.GrantManager.AI;
+
+public interface IAttachmentAISummaryService
+{
+    Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false);
+    Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false);
+    Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
index 0a2ae41b7b..fa8d0bf790 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
@@ -1,7 +1,7 @@
 # Runtime Prompt Templates
 
 These files are the source of truth for runtime prompts.
-`OpenAIService` resolves templates from:
+`OpenAIRuntimeService` resolves templates from:
 
 - `AI/Prompts/Versions/<version>/<template>.txt`
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
index f1ffbda307..01e817f776 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
@@ -10,23 +10,23 @@ internal enum AIOperationOutcome
 
     internal sealed record AIOperationResult(
         AIOperationOutcome Outcome,
-        AIProviderResponse Response)
+        AIProviderResult Response)
     {
         public string Content => Response.Content;
 
         public string CaptureOutput => Response.CaptureOutput;
 
-        public static AIOperationResult Success(AIProviderResponse? response = null) =>
-            new(AIOperationOutcome.Success, response ?? AIProviderResponse.Empty);
+        public static AIOperationResult Success(AIProviderResult? response = null) =>
+            new(AIOperationOutcome.Success, response ?? AIProviderResult.Empty);
 
-        public static AIOperationResult TransientFailure(AIProviderResponse? response = null) =>
-            new(AIOperationOutcome.TransientFailure, response ?? AIProviderResponse.Empty);
+        public static AIOperationResult TransientFailure(AIProviderResult? response = null) =>
+            new(AIOperationOutcome.TransientFailure, response ?? AIProviderResult.Empty);
 
-        public static AIOperationResult PermanentFailure(AIProviderResponse? response = null) =>
-            new(AIOperationOutcome.PermanentFailure, response ?? AIProviderResponse.Empty);
+        public static AIOperationResult PermanentFailure(AIProviderResult? response = null) =>
+            new(AIOperationOutcome.PermanentFailure, response ?? AIProviderResult.Empty);
 
-        public static AIOperationResult InvalidOutput(AIProviderResponse? response = null) =>
-            new(AIOperationOutcome.InvalidOutput, response ?? AIProviderResponse.Empty);
+        public static AIOperationResult InvalidOutput(AIProviderResult? response = null) =>
+            new(AIOperationOutcome.InvalidOutput, response ?? AIProviderResult.Empty);
 
         public AIOperationResult WithOutcome(AIOperationOutcome outcome) => new(outcome, Response);
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
index 7d80341dfb..a583a7f206 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    internal static class AIResponseValidator
+    internal static class AIProviderPayloadValidator
     {
         public static bool IsValidAttachmentSummaryText(string response)
         {
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 973af81507..c756da7b46 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
@@ -1,6 +1,6 @@
 namespace Unity.GrantManager.AI
 {
-    internal sealed record AIProviderResponse(
+    internal sealed record AIProviderResult(
         string Content,
         string RawResponse = "",
         string? Model = null,
@@ -10,7 +10,7 @@ internal sealed record AIProviderResponse(
         int? TotalTokens = null,
         int? ReasoningTokens = null)
     {
-        public static AIProviderResponse Empty { get; } = new(string.Empty);
+        public static AIProviderResult Empty { get; } = new(string.Empty);
 
         public string CaptureOutput => string.IsNullOrWhiteSpace(RawResponse) ? Content : RawResponse;
     }
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 1ffa2cdee2..3b934588e5 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
@@ -14,11 +14,12 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class OpenAIService : IAIService, ITransientDependency
+    [ExposeServices(typeof(IAIService))]
+    public class OpenAIRuntimeService : IAIService, ITransientDependency
     {
         private readonly HttpClient _httpClient;
         private readonly IConfiguration _configuration;
-        private readonly ILogger<OpenAIService> _logger;
+        private readonly ILogger<OpenAIRuntimeService> _logger;
         private readonly ITextExtractionService _textExtractionService;
         private readonly IAIPromptCaptureStore _promptIoCaptureStore;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
@@ -66,10 +67,10 @@ public class OpenAIService : IAIService, ITransientDependency
             };
         private static readonly ConcurrentDictionary<string, string> PromptTemplateCache = new(StringComparer.OrdinalIgnoreCase);
 
-        public OpenAIService(
+        public OpenAIRuntimeService(
             HttpClient httpClient,
             IConfiguration configuration,
-            ILogger<OpenAIService> logger,
+            ILogger<OpenAIRuntimeService> logger,
             ITextExtractionService textExtractionService,
             IAIPromptCaptureStore promptIoCaptureStore)
         {
@@ -99,7 +100,7 @@ public async Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequ
                 null,
                 request?.MaxTokens ?? DefaultCompletionTokens,
                 request?.Temperature),
-                AIResponseValidator.IsValidAttachmentSummaryText,
+                AIProviderPayloadValidator.IsValidAttachmentSummaryText,
                 "completion");
             return new AICompletionResponse { Content = ResolveNarrativeContent(result) };
         }
@@ -134,7 +135,7 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                     systemPrompt,
                     ApplicationAnalysisCompletionTokens,
                     operationName: ApplicationAnalysisPromptType),
-                AIResponseValidator.IsValidApplicationAnalysisJson,
+                AIProviderPayloadValidator.IsValidApplicationAnalysisJson,
                 "application analysis");
             await LogPromptOutputAsync(ApplicationAnalysisPromptType, promptVersion, result.CaptureOutput);
             SavePromptCapture(capturePromptIo, request.CaptureContextId, ApplicationAnalysisPromptType, promptVersion, "Application Analysis", systemPrompt, analysisContent, result.CaptureOutput);
@@ -157,15 +158,15 @@ private async Task<AIOperationResult> GenerateSummaryAsync(
             var providerName = ResolveProviderName(operationName);
             if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
             {
-                _logger.LogWarning("Provider {ProviderName} is not supported by OpenAIService.", providerName);
-                return AIOperationResult.PermanentFailure(new AIProviderResponse($"Unsupported provider: {providerName}"));
+                _logger.LogWarning("Provider {ProviderName} is not supported by OpenAIRuntimeService.", providerName);
+                return AIOperationResult.PermanentFailure(new AIProviderResult($"Unsupported provider: {providerName}"));
             }
 
             var apiKey = ResolveApiKey(operationName);
             if (string.IsNullOrEmpty(apiKey))
             {
                 _logger.LogWarning("Error: {Message}", MissingApiKeyMessage);
-                return AIOperationResult.PermanentFailure(new AIProviderResponse(MissingApiKeyMessage));
+                return AIOperationResult.PermanentFailure(new AIProviderResult(MissingApiKeyMessage));
             }
 
             _logger.LogDebug("Calling OpenAI chat completions. PromptLength: {PromptLength}, MaxTokens: {MaxTokens}", content?.Length ?? 0, maxTokens);
@@ -250,7 +251,7 @@ private async Task<AIOperationResult> GenerateSummaryAsync(
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Error generating AI summary");
-                return AIOperationResult.TransientFailure(new AIProviderResponse(ex.Message));
+                return AIOperationResult.TransientFailure(new AIProviderResult(ex.Message));
             }
         }
 
@@ -295,7 +296,7 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
                         prompt,
                         AttachmentSummaryCompletionTokens,
                         operationName: AttachmentSummaryPromptType),
-                    AIResponseValidator.IsValidAttachmentSummaryText,
+                    AIProviderPayloadValidator.IsValidAttachmentSummaryText,
                     "attachment summary");
                 await LogPromptOutputAsync(AttachmentSummaryPromptType, promptVersion, result.CaptureOutput);
                 SavePromptCapture(capturePromptIo, request.CaptureContextId, AttachmentSummaryPromptType, promptVersion, fileName, prompt, contentToAnalyze, result.CaptureOutput);
@@ -461,7 +462,7 @@ public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(Scor
                         systemPrompt,
                         ScoresheetSectionCompletionTokens,
                         operationName: ScoresheetSectionPromptType),
-                    content => AIResponseValidator.IsValidScoresheetSectionJson(content, sectionJson),
+                    content => AIProviderPayloadValidator.IsValidScoresheetSectionJson(content, sectionJson),
                     $"scoresheet section {request.SectionName}");
                 await LogPromptOutputAsync(ScoresheetSectionPromptType, promptVersion, result.CaptureOutput);
                 SavePromptCapture(capturePromptIo, request.CaptureContextId, ScoresheetSectionPromptType, promptVersion, request.SectionName, systemPrompt, analysisContent, result.CaptureOutput);
@@ -545,7 +546,7 @@ private static string ResolveNarrativeContent(AIOperationResult result)
             };
         }
 
-        private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AIProviderResponse response)
+        private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AIProviderResult response)
         {
             var statusCodeValue = (int)statusCode;
 
@@ -559,9 +560,9 @@ private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AI
             return AIOperationResult.PermanentFailure(response);
         }
 
-        private static AIProviderResponse BuildProviderResponseFromMetadata(string content, string? rawResponse, AIProviderResponseMetadata? metadata)
+        private static AIProviderResult BuildProviderResponseFromMetadata(string content, string? rawResponse, AIProviderResponseMetadata? metadata)
         {
-            return new AIProviderResponse(
+            return new AIProviderResult(
                 content,
                 rawResponse ?? string.Empty,
                 metadata?.Model,
@@ -624,7 +625,7 @@ private static AIProviderResponse BuildProviderResponseFromMetadata(string conte
             }
         }
 
-        private void LogProviderMetadata(string? operationName, AIProviderResponse response)
+        private void LogProviderMetadata(string? operationName, AIProviderResult response)
         {
             if (string.IsNullOrWhiteSpace(response.Model)
                 && string.IsNullOrWhiteSpace(response.FinishReason)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index a9398d1547..a7ef596d12 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -28,13 +28,9 @@ public class AttachmentAppService(
     IAssessmentAttachmentRepository assessmentAttachmentRepository,
     IIntakeFormSubmissionManager intakeFormSubmissionManager,
     IPersonRepository personUserRepository, 
-    IAIService aiService,
-    ISubmissionAppService submissionAppService,
+    IAttachmentAISummaryService attachmentAISummaryService,
     IFeatureChecker featureChecker) : ApplicationService, IAttachmentAppService
 {
-    private const string DefaultContentType = "application/octet-stream";
-    private const string SummaryGenerationFailedMessage = "AI summary generation failed.";
-
     public async Task<IList<ApplicationAttachmentDto>> GetApplicationAsync(Guid applicationId)
     {
         return (await GetAttachmentsAsync(new AttachmentParametersDto(AttachmentType.APPLICATION, applicationId)))
@@ -201,30 +197,7 @@ public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, st
             throw new UserFriendlyException("AI attachment summaries are not enabled.");
         }
 
-        if (!await aiService.IsAvailableAsync())
-        {
-            Logger.LogWarning("AI service is not available for attachment summary generation. AttachmentId: {AttachmentId}", attachmentId);
-            return SummaryGenerationFailedMessage;
-        }
-
-        var attachment = await applicationChefsFileAttachmentRepository.GetAsync(attachmentId);
-        var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? "unknown" : attachment.FileName;
-        var (fileContent, contentType) = await GetAttachmentContentForSummaryAsync(attachment, fileName);
-
-        var summaryResponse = await aiService.GenerateAttachmentSummaryAsync(new AttachmentSummaryRequest
-        {
-            FileName = fileName,
-            FileContent = fileContent,
-            ContentType = contentType,
-            PromptVersion = promptVersion,
-            CapturePromptIo = capturePromptIo,
-            CaptureContextId = attachment.ApplicationId.ToString()
-        });
-
-        attachment.AISummary = summaryResponse.Summary;
-        await applicationChefsFileAttachmentRepository.UpdateAsync(attachment);
-
-        return summaryResponse.Summary;
+        return await attachmentAISummaryService.GenerateAndSaveAsync(attachmentId, promptVersion, capturePromptIo);
     }
     
     [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
@@ -235,63 +208,7 @@ public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> a
             throw new UserFriendlyException("AI attachment summaries are not enabled.");
         }
 
-        if (!await aiService.IsAvailableAsync())
-        {
-            Logger.LogWarning("AI service is not available for bulk attachment summary generation.");
-            return attachmentIds.Select(_ => SummaryGenerationFailedMessage).ToList();
-        }
-
-        var summaries = new List<string>();
-        
-        foreach (var attachmentId in attachmentIds)
-        {
-            try
-            {
-                var summary = await GenerateAISummaryAttachmentAsync(attachmentId, promptVersion, capturePromptIo);
-                summaries.Add(summary);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Error generating AI summary for attachment {AttachmentId}", attachmentId);
-                summaries.Add(SummaryGenerationFailedMessage);
-            }
-        }
-        
-        return summaries;
-    }
-
-    private async Task<(byte[] Content, string ContentType)> GetAttachmentContentForSummaryAsync(ApplicationChefsFileAttachment attachment, string fileName)
-    {
-        if (!Guid.TryParse(attachment.ChefsSubmissionId, out var submissionId) ||
-            !Guid.TryParse(attachment.ChefsFileId, out var fileId))
-        {
-            Logger.LogWarning(
-                "Attachment {AttachmentId} has invalid CHEFS IDs. Falling back to metadata-only summary generation.",
-                attachment.Id);
-            return (Array.Empty<byte>(), DefaultContentType);
-        }
-
-        try
-        {
-            var fileDto = await submissionAppService.GetChefsFileAttachment(submissionId, fileId, fileName);
-            if (fileDto?.Content == null)
-            {
-                Logger.LogWarning(
-                    "Attachment {AttachmentId} has no retrievable content. Falling back to metadata-only summary generation.",
-                    attachment.Id);
-                return (Array.Empty<byte>(), DefaultContentType);
-            }
-
-            return (fileDto.Content, string.IsNullOrWhiteSpace(fileDto.ContentType) ? DefaultContentType : fileDto.ContentType);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogWarning(
-                ex,
-                "Failed retrieving CHEFS content for attachment {AttachmentId}. Falling back to metadata-only summary generation.",
-                attachment.Id);
-            return (Array.Empty<byte>(), DefaultContentType);
-        }
+        return await attachmentAISummaryService.GenerateAndSaveManyAsync(attachmentIds, promptVersion, capturePromptIo);
     }
 
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
index 2aa5d540d6..ca557eabef 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
@@ -11,7 +11,7 @@ namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault)]
 public class ApplicationAIAnalysisAppService(
-    IApplicationAnalysisService applicationAnalysisService,
+    IApplicationAIAnalysisService applicationAnalysisService,
     IFeatureChecker featureChecker)
     : GrantManagerAppService, IApplicationAIAnalysisAppService
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
index a0b00cfd29..eb66360084 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
@@ -14,7 +14,7 @@ namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
 public class ApplicationAIScoringAppService(
-    IApplicationScoresheetAnalysisService applicationScoresheetAnalysisService,
+    IApplicationAIScoringService applicationScoresheetAnalysisService,
     IApplicationRepository applicationRepository,
     ILocalEventBus localEventBus,
     IFeatureChecker featureChecker)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
index 21cc065690..8e43753564 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
@@ -18,14 +18,13 @@ namespace Unity.GrantManager.Intakes.Handlers
 {
     public class GenerateAIContentHandler : ILocalEventHandler<ApplicationProcessEvent>, ITransientDependency
     {
-        private const string DefaultContentType = "application/octet-stream";
         private const string ArrayFieldType = "array";
         private const string ObjectFieldType = "object";
         private const string AttachmentSummariesFeatureName = "Unity.AI.AttachmentSummaries";
         private const string ApplicationAnalysisFeatureName = "Unity.AI.ApplicationAnalysis";
         private const string ScoringFeatureName = "Unity.AI.Scoring";
         private readonly IAIService _aiService;
-        private readonly ISubmissionAppService _submissionAppService;
+        private readonly IAttachmentAISummaryService _attachmentAISummaryService;
         private readonly IApplicationChefsFileAttachmentRepository _attachmentRepository;
         private readonly IApplicationRepository _applicationRepository;
         private readonly IApplicationFormSubmissionRepository _applicationFormSubmissionRepository;
@@ -75,7 +74,7 @@ public class GenerateAIContentHandler : ILocalEventHandler<ApplicationProcessEve
 
         public GenerateAIContentHandler(
             IAIService aiService,
-            ISubmissionAppService submissionAppService,
+            IAttachmentAISummaryService attachmentAISummaryService,
             IApplicationChefsFileAttachmentRepository attachmentRepository,
             IApplicationRepository applicationRepository,
             IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
@@ -86,7 +85,7 @@ public GenerateAIContentHandler(
             IFeatureChecker featureChecker)
         {
             _aiService = aiService;
-            _submissionAppService = submissionAppService;
+            _attachmentAISummaryService = attachmentAISummaryService;
             _attachmentRepository = attachmentRepository;
             _applicationRepository = applicationRepository;
             _applicationFormSubmissionRepository = applicationFormSubmissionRepository;
@@ -173,17 +172,8 @@ private async Task ProcessAttachmentSummaryAsync(ApplicationChefsFileAttachment
                     return;
                 }
 
-                var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? "unknown" : attachment.FileName;
-                _logger.LogDebug("Generating AI summary for attachment {FileName}", fileName);
-
-                var (fileContent, contentType) = await GetAttachmentContentForSummaryAsync(attachment, fileName);
-                var summary = await _aiService.GenerateAttachmentSummaryAsync(new AttachmentSummaryRequest
-                {
-                    FileName = fileName,
-                    FileContent = fileContent,
-                    ContentType = contentType
-                });
-                await SaveAttachmentSummaryAsync(attachment, fileName, summary.Summary, fileContent.Length == 0);
+                _logger.LogDebug("Generating AI summary for attachment {FileName}", attachment.FileName);
+                await _attachmentAISummaryService.GenerateAndSaveAsync(attachment);
             }
             catch (Exception ex)
             {
@@ -193,59 +183,6 @@ private async Task ProcessAttachmentSummaryAsync(ApplicationChefsFileAttachment
             }
         }
 
-        private async Task<(byte[] Content, string ContentType)> GetAttachmentContentForSummaryAsync(ApplicationChefsFileAttachment attachment, string fileName)
-        {
-            if (!Guid.TryParse(attachment.ChefsSubmissionId, out var submissionId) ||
-                !Guid.TryParse(attachment.ChefsFileId, out var fileId))
-            {
-                _logger.LogWarning("Attachment {FileName} has invalid CHEFS IDs. Falling back to metadata-only summary.", fileName);
-                return (Array.Empty<byte>(), DefaultContentType);
-            }
-
-            try
-            {
-                var fileDto = await _submissionAppService.GetChefsFileAttachment(submissionId, fileId, fileName);
-                if (fileDto?.Content == null)
-                {
-                    _logger.LogWarning("Could not retrieve content for attachment {FileName}. Falling back to metadata-only summary.", fileName);
-                    return (Array.Empty<byte>(), DefaultContentType);
-                }
-
-                _logger.LogDebug(
-                    "Processing {FileName} ({ContentType}, {Size} bytes) for AI summary generation",
-                    fileName,
-                    fileDto.ContentType,
-                    fileDto.Content.Length);
-
-                var resolvedContentType = string.IsNullOrWhiteSpace(fileDto.ContentType)
-                    ? DefaultContentType
-                    : fileDto.ContentType;
-                return (fileDto.Content, resolvedContentType);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Could not access CHEFS file {FileName}. Falling back to metadata-only summary.", fileName);
-                return (Array.Empty<byte>(), DefaultContentType);
-            }
-        }
-
-        private async Task SaveAttachmentSummaryAsync(ApplicationChefsFileAttachment attachment, string fileName, string summary, bool usedMetadataFallback)
-        {
-            attachment.AISummary = summary;
-            await _attachmentRepository.UpdateAsync(attachment);
-
-            if (usedMetadataFallback)
-            {
-                _logger.LogDebug("Generated fallback AI summary for attachment {FileName} from metadata only", fileName);
-                return;
-            }
-
-            var preview = summary is { Length: > 0 } s
-                ? string.Concat(s.AsSpan(0, Math.Min(100, s.Length)), "...")
-                : "...";
-            _logger.LogDebug("Successfully generated AI summary for attachment {FileName}: {SummaryPreview}", fileName, preview);
-        }
-
         private async Task GenerateApplicationAnalysisAsync(Application application, List<ApplicationChefsFileAttachment> attachments)
         {
             try

From 7a0401f08e7ca625acc23740a22d789d03f898b0 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:07:19 -0700
Subject: [PATCH 04/38] AB#32012 align AI action gating across review surfaces

---
 .../Assessments/AssessmentAppService.cs       | 16 +++++---
 .../Pages/GrantApplications/Details.cshtml    | 27 +++++++++++---
 .../Pages/GrantApplications/ai-analysis.js    | 16 ++------
 .../AssessmentScoresWidget/Default.js         |  9 +----
 .../ChefsAttachments/ChefsAttachments.js      | 34 ++++++-----------
 .../Components/ReviewList/Default.cshtml      | 11 +++---
 .../Components/ReviewList/ReviewList.cs       | 37 ++++++++++++-------
 .../Components/ReviewList/ReviewList.js       | 27 ++++----------
 8 files changed, 85 insertions(+), 92 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
index 4cbc3f3ff4..ab304c2b9b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Assessments/AssessmentAppService.cs
@@ -395,11 +395,17 @@ public async Task UpdateAssessmentScore(AssessmentScoresDto dto)
         /// <exception cref="BusinessException">
         /// Thrown when the specified assessment is not an AI assessment.
         /// </exception>
-        public async Task<AssessmentDto> CloneFromAiAsync(Guid aiAssessmentId)
-        {
-            var aiAssessment = await _assessmentRepository.GetAsync(aiAssessmentId);
-            if (!aiAssessment.IsAiAssessment)
-            {
+        [Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
+        public async Task<AssessmentDto> CloneFromAiAsync(Guid aiAssessmentId)
+        {
+            if (!await _featureChecker.IsEnabledAsync("Unity.AI.Scoring"))
+            {
+                throw new UserFriendlyException("AI scoring is not enabled.");
+            }
+
+            var aiAssessment = await _assessmentRepository.GetAsync(aiAssessmentId);
+            if (!aiAssessment.IsAiAssessment)
+            {
                 throw new BusinessException(GrantManagerDomainErrorCodes.CannotCloneNonAiAssessment);
             }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
index f52738140b..485c3f6dd9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -507,6 +507,10 @@
                                             </span>
                                         </button>
                                     }
+                                    else
+                                    {
+                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
+                                    }
                                 </div>
                                 <div id="attachmentPromptCaptureContainer" class="ai-prompt-capture-container">
                                     <div class="ai-prompt-capture-actions">
@@ -521,12 +525,19 @@
                             <div class="dev-prompt-section">
                                 <div class="dev-prompt-section-header">
                                     <h6 class="fw-bold m-0">Analysis</h6>
-                                    <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIAnalysis(true, this)">
-                                        <span class="ai-button-content">
-                                            <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                            <span>Generate</span>
-                                        </span>
-                                    </button>
+                                    @if (aiApplicationAnalysisEnabled)
+                                    {
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIAnalysis(true, this)">
+                                            <span class="ai-button-content">
+                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                                <span>Generate</span>
+                                            </span>
+                                        </button>
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
+                                    }
                                 </div>
                                 <div id="aiAnalysisPromptCaptureContainer" class="ai-prompt-capture-container">
                                     <div class="ai-prompt-capture-actions">
@@ -550,6 +561,10 @@
                                             </span>
                                         </button>
                                     }
+                                    else
+                                    {
+                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
+                                    }
                                 </div>
                                 <div id="aiScoringPromptCaptureContainer" class="ai-prompt-capture-container">
                                     <div class="ai-prompt-capture-actions">
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 26f9c97ac2..4aa1eda967 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
@@ -79,7 +79,7 @@ function normalizeFindings(items, fallbackType) {
     };
 
     return (items || [])
-        .filter(Boolean)
+        .filter(item => item)
         .map((item, index) => ({
             ...item,
             id: item.id || `${fallbackType}-${index}`,
@@ -412,20 +412,10 @@ globalThis.regenerateAIAnalysis = function(capturePromptIo = false, triggerButto
     unity.grantManager.grantApplications.applicationAIAnalysis
         .generateAIAnalysis(applicationId, promptVersion, capturePromptIo)
         .then(function() {
-            abp.notify.success('AI analysis refreshed successfully.');
-            loadAIAnalysis();
-            if (capturePromptIo && globalThis.loadAIPromptCapture) {
-                return globalThis.loadAIPromptCapture(
-                    applicationId,
-                    'ApplicationAnalysis',
-                    promptVersion,
-                    '#aiAnalysisPromptCaptureContainer',
-                    '#aiAnalysisPromptCaptureOutput'
-                );
-            }
+            abp.notify.success('AI analysis queued successfully. Refresh after processing completes.');
         })
         .catch(function() {
-            abp.message.error('Failed to refresh AI analysis. Please try again.');
+            abp.message.error('Failed to queue AI analysis. Please try again.');
         })
         .always(function() {
             $button.html(existingHtml).prop('disabled', false);
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 992aeefffa..109b88e180 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
@@ -600,16 +600,11 @@ function regenerateAIScoresheetAnswers(capturePromptIo = false, triggerButton =
     unity.grantManager.grantApplications.applicationAIScoring
         .generateAIScoresheetAnswers(applicationId, promptVersion, capturePromptIo)
         .done(function () {
-            abp.notify.success('AI scoring refreshed successfully.');
-            PubSub.publish('refresh_assessment_scores', {
-                promptVersion: promptVersion,
-                capturePromptIo: capturePromptIo,
-                applicationId: applicationId,
-            });
+            abp.notify.success('AI scoring queued successfully. Refresh after processing completes.');
         })
         .fail(function () {
             abp.message.error(
-                'Failed to refresh AI scoring. Please try again.'
+                'Failed to queue AI scoring. Please try again.'
             );
         })
         .always(function () {
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 3e98c528a7..56a7b7f7ef 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
@@ -266,35 +266,19 @@ $(function () {
                 },
                 success: function (summaries) {
                     abp.notify.success(
-                        'AI summaries generated successfully for ' +
+                        'AI summaries queued successfully for ' +
                             summaries.length +
                             ' attachment(s).'
                     );
 
                     resetAttachmentSelectionState();
 
-                    // Reload the table to show new summaries
-                    chefsDataTable.ajax.reload();
-
-                    // Enable the toggle button now that we have summaries
-                    $('#toggleAllAISummaries').prop('disabled', false);
-
-                    if (capturePromptIo && globalThis.loadAIPromptCapture) {
-                        globalThis.loadAIPromptCapture(
-                            applicationId,
-                            'AttachmentSummary',
-                            promptVersion,
-                            '#attachmentPromptCaptureContainer',
-                            '#attachmentPromptCaptureOutput'
-                        );
-                    }
-
                     $activeButton.html(existingHTML).prop('disabled', false);
                 },
                 error: function (error) {
                     console.error('Error generating AI summaries:', error);
                     abp.notify.error(
-                        'An error occurred while generating AI summaries. Please try again.'
+                        'An error occurred while queueing AI summaries. Please try again.'
                     );
                     $activeButton.html(existingHTML).prop('disabled', false);
                 },
@@ -310,7 +294,9 @@ $(function () {
         $toggleAllAISummariesButton.on('click', function () {
             const $button = $(this);
             const $icon = $button.find('i');
-            const $text = $button.find('.toggle-ai-summaries-label');
+            const $text = $button.contents().filter(function () {
+                return this.nodeType === 3;
+            });
 
             // Don't do anything if button is disabled
             if ($button.prop('disabled')) {
@@ -337,7 +323,7 @@ $(function () {
                     }
                 });
                 $icon.removeClass('fa-chevron-up').addClass('fa-chevron-down');
-                $text.text('Show Summaries');
+                $text.replaceWith('Show Summaries');
                 $button.attr('title', 'Show AI Summaries');
                 allAISummariesExpanded = false;
             } else {
@@ -365,7 +351,7 @@ $(function () {
                     }
                 });
                 $icon.removeClass('fa-chevron-down').addClass('fa-chevron-up');
-                $text.text('Hide Summaries');
+                $text.replaceWith('Hide Summaries');
                 $button.attr('title', 'Hide AI Summaries');
                 allAISummariesExpanded = true;
             }
@@ -377,9 +363,11 @@ $(function () {
         if (allAISummariesExpanded) {
             const $button = $('#toggleAllAISummaries');
             const $icon = $button.find('i');
-            const $text = $button.find('.toggle-ai-summaries-label');
+            const $text = $button.contents().filter(function () {
+                return this.nodeType === 3;
+            });
             $icon.removeClass('fa-chevron-up').addClass('fa-chevron-down');
-            $text.text('Show Summaries');
+            $text.replaceWith('Show Summaries');
             $button.attr('title', 'Show AI Summaries');
             allAISummariesExpanded = false;
         }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml
index 8ef45f1c8a..781bbdaab6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml
@@ -1,8 +1,9 @@
-<abp-row class="p-2 pt-0">
-    <abp-column size="_12" class="d-flex justify-content-between align-items-center pb-2 pt-2">
-        <div id="AdjudicationTitleRegion" class="d-flex align-items-center justify-content-start">
-            <h6 class="ps-1 fw-bold m-0">Assessments</h6>
-        </div>
+<abp-row class="p-2 pt-0">
+    <abp-column size="_12" class="d-flex justify-content-between align-items-center pb-2 pt-2">
+        <input type="hidden" id="ReviewListAIScoringEnabled" value="@((bool?)ViewBag.IsAIScoringEnabled == true)" />
+        <div id="AdjudicationTitleRegion" class="d-flex align-items-center justify-content-start">
+            <h6 class="ps-1 fw-bold m-0">Assessments</h6>
+        </div>
         <div id="AdjudicationTeamLeadActionBar" class="d-flex align-items-center justify-content-end gap-2 flex-wrap">
             @* Button items can be included here through the Review List JS*@
         </div>
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs
index e23072cdd0..48de3fe0e1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs
@@ -1,9 +1,12 @@
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
-
-namespace Unity.GrantManager.Web.Views.Shared.Components.ReviewList
-{
+using Microsoft.AspNetCore.Mvc;
+using Unity.AI.Permissions;
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
+using Volo.Abp.Features;
+
+namespace Unity.GrantManager.Web.Views.Shared.Components.ReviewList
+{
     [Widget(
         ScriptFiles = new[]
         {
@@ -13,11 +16,17 @@ namespace Unity.GrantManager.Web.Views.Shared.Components.ReviewList
         {
             "/Views/Shared/Components/ReviewList/ReviewList.css"
         })]
-    public class ReviewList : AbpViewComponent
-    {
-        public IViewComponentResult Invoke()
-        {
-            return View();
-        }
-    }
-}
+    public class ReviewList(
+        IFeatureChecker featureChecker,
+        IPermissionChecker permissionChecker) : AbpViewComponent
+    {
+        public async Task<IViewComponentResult> InvokeAsync()
+        {
+            ViewBag.IsAIScoringEnabled =
+                await featureChecker.IsEnabledAsync("Unity.AI.Scoring") &&
+                await permissionChecker.IsGrantedAsync(AIPermissions.ScoringAssistant.ScoringAssistantDefault);
+
+            return View();
+        }
+    }
+}
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 eed32018c7..ca0fd31ce7 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
@@ -1,6 +1,8 @@
 const l = abp.localization.getResource('GrantManager');
 const pageApplicationId = decodeURIComponent(document.querySelector("#DetailsViewApplicationId").value);
-const isAiScoringEnabled = document.querySelector("#AIScoringFeatureEnabled")?.value === 'True';
+const isAiScoringEnabled =
+    document.querySelector("#ReviewListAIScoringEnabled")?.value === 'True'
+    || document.querySelector("#AIScoringFeatureEnabled")?.value === 'True';
 const canUseAiScoring = isAiScoringEnabled;
 
 const actionButtonConfigMap = {
@@ -460,19 +462,19 @@ function unityWorkflowButtonAction(e, dt, button, config) {
 
 function generateAiButtonAction(e, dt, button, config) {
     const triggerButton = button?.node ? $(button.node) : null;
+    const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
 
     if (triggerButton?.length) {
         triggerButton.prop('disabled', true);
         triggerButton.html('<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Generating...</span></span>');
     }
 
-    unity.grantManager.grantApplications.applicationAIScoring.generateAIScoresheetAnswers(pageApplicationId)
+    unity.grantManager.grantApplications.applicationAIScoring.generateAIScoresheetAnswers(pageApplicationId, promptVersion, false)
         .done(function () {
-            refreshReviewListSelectingAiAssessment(dt);
-            abp.notify.success('AI scoring generated successfully.');
+            abp.notify.success('AI scoring queued successfully. Refresh after processing completes.');
         })
         .fail(function () {
-            abp.message.error('Failed to generate AI scoring. Please try again.');
+            abp.message.error('Failed to queue AI scoring. Please try again.');
         })
         .always(function () {
             if (triggerButton?.length) {
@@ -482,20 +484,7 @@ function generateAiButtonAction(e, dt, button, config) {
         });
 }
 
-function refreshReviewListSelectingAiAssessment(reviewListTable) {
-    reviewListTable.ajax.reload(function () {
-        const aiRowIndexes = reviewListTable.rows().eq(0).filter(function (rowIdx) {
-            const rowData = reviewListTable.row(rowIdx).data();
-            return rowData?.isAiAssessment === true;
-        });
-
-        if (aiRowIndexes.length > 0) {
-            reviewListTable.row(aiRowIndexes[0]).selectWithParams({ refreshSidePanel: true });
-        }
-    });
-}
-
-function executeAssessmentAction(assessmentId, triggerAction) {
+function executeAssessmentAction(assessmentId, triggerAction) {
     unity.grantManager.assessments.assessment.executeAssessmentAction(assessmentId, triggerAction, {})
         .then(function (result) {
             PubSub.publish('assessment_action_completed');

From 3dda50384c1a7ff0fe81a8b29ac6dff561e098d8 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:07:26 -0700
Subject: [PATCH 05/38] AB#32012 detach AI generation into background jobs

---
 ...eApplicationAIAnalysisBackgroundJobArgs.cs |  11 +
 ...teApplicationAIContentBackgroundJobArgs.cs |   9 +
 ...pplicationAIScoresheetBackgroundJobArgs.cs |  11 +
 ...ateAttachmentSummariesBackgroundJobArgs.cs |  12 +
 ...erateApplicationAIAnalysisBackgroundJob.cs |  30 +
 ...nerateApplicationAIContentBackgroundJob.cs |  75 ++
 ...ateApplicationAIScoresheetBackgroundJob.cs |  41 +
 ...enerateAttachmentSummariesBackgroundJob.cs |  33 +
 .../Attachments/AttachmentAppService.cs       |  93 +-
 .../ApplicationAIAnalysisAppService.cs        |  19 +-
 .../ApplicationAIScoringAppService.cs         |  31 +-
 .../AiScoresheetAnswersGeneratedEvent.cs      |   4 +-
 .../Handlers/CreateAiAssessmentHandler.cs     |  13 +-
 .../Handlers/GenerateAIContentHandler.cs      | 914 +-----------------
 14 files changed, 333 insertions(+), 963 deletions(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
new file mode 100644
index 0000000000..4b426e5209
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateApplicationAIAnalysisBackgroundJobArgs
+{
+    public Guid ApplicationId { get; set; }
+    public string? PromptVersion { get; set; }
+    public bool CapturePromptIo { get; set; }
+    public Guid? TenantId { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
new file mode 100644
index 0000000000..9138aa659b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateApplicationAIContentBackgroundJobArgs
+{
+    public Guid ApplicationId { get; set; }
+    public Guid? TenantId { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
new file mode 100644
index 0000000000..ba0fc44314
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateApplicationAIScoresheetBackgroundJobArgs
+{
+    public Guid ApplicationId { get; set; }
+    public string? PromptVersion { get; set; }
+    public bool CapturePromptIo { get; set; }
+    public Guid? TenantId { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
new file mode 100644
index 0000000000..c36637a7e0
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateAttachmentSummariesBackgroundJobArgs
+{
+    public List<Guid> AttachmentIds { get; set; } = [];
+    public string? PromptVersion { get; set; }
+    public bool CapturePromptIo { get; set; }
+    public Guid? TenantId { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
new file mode 100644
index 0000000000..6ed1232261
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateApplicationAIAnalysisBackgroundJob(
+    IApplicationAIAnalysisService applicationAnalysisService,
+    ICurrentTenant currentTenant,
+    ILogger<GenerateApplicationAIAnalysisBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAIAnalysisBackgroundJobArgs>, ITransientDependency
+{
+    public override async Task ExecuteAsync(GenerateApplicationAIAnalysisBackgroundJobArgs args)
+    {
+        using (currentTenant.Change(args.TenantId))
+        {
+            try
+            {
+                logger.LogInformation("Executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
+                await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion, args.CapturePromptIo);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
new file mode 100644
index 0000000000..cc2f300113
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
@@ -0,0 +1,75 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.Intakes.Events;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Local;
+using Volo.Abp.Features;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateApplicationAIContentBackgroundJob(
+    IAttachmentAISummaryService attachmentAISummaryService,
+    IApplicationAIAnalysisService applicationAnalysisService,
+    IApplicationAIScoringService applicationScoresheetAnalysisService,
+    IAIService aiService,
+    IFeatureChecker featureChecker,
+    ILocalEventBus localEventBus,
+    ICurrentTenant currentTenant,
+    ILogger<GenerateApplicationAIContentBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAIContentBackgroundJobArgs>, ITransientDependency
+{
+    public override async Task ExecuteAsync(GenerateApplicationAIContentBackgroundJobArgs args)
+    {
+        using (currentTenant.Change(args.TenantId))
+        {
+            try
+            {
+                var attachmentSummariesEnabled = await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries");
+                var applicationAnalysisEnabled = await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis");
+                var scoringEnabled = await featureChecker.IsEnabledAsync("Unity.AI.Scoring");
+
+                if (!attachmentSummariesEnabled && !applicationAnalysisEnabled && !scoringEnabled)
+                {
+                    logger.LogDebug("All AI features are disabled, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
+                    return;
+                }
+
+                if (!await aiService.IsAvailableAsync())
+                {
+                    logger.LogWarning("AI service is not available, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
+                    return;
+                }
+
+                logger.LogInformation("Executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
+
+                if (attachmentSummariesEnabled)
+                {
+                    await attachmentAISummaryService.GenerateMissingForApplicationAsync(args.ApplicationId);
+                }
+
+                if (applicationAnalysisEnabled)
+                {
+                    await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId);
+                }
+
+                if (scoringEnabled)
+                {
+                    var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId);
+                    if (!string.Equals(result, "{}", StringComparison.Ordinal))
+                    {
+                        await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
+                        {
+                            ApplicationId = args.ApplicationId
+                        });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
new file mode 100644
index 0000000000..e8be57392e
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
@@ -0,0 +1,41 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.Intakes.Events;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Local;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateApplicationAIScoresheetBackgroundJob(
+    IApplicationAIScoringService applicationScoresheetAnalysisService,
+    ILocalEventBus localEventBus,
+    ICurrentTenant currentTenant,
+    ILogger<GenerateApplicationAIScoresheetBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAIScoresheetBackgroundJobArgs>, ITransientDependency
+{
+    public override async Task ExecuteAsync(GenerateApplicationAIScoresheetBackgroundJobArgs args)
+    {
+        using (currentTenant.Change(args.TenantId))
+        {
+            try
+            {
+                logger.LogInformation("Executing AI scoresheet background job for application {ApplicationId}.", args.ApplicationId);
+
+                var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion, args.CapturePromptIo);
+                if (!string.Equals(result, "{}", StringComparison.Ordinal))
+                {
+                    await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
+                    {
+                        ApplicationId = args.ApplicationId
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error executing AI scoresheet background job for application {ApplicationId}.", args.ApplicationId);
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs
new file mode 100644
index 0000000000..42950e82b7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs
@@ -0,0 +1,33 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.GrantManager.AI.BackgroundJobs;
+
+public class GenerateAttachmentSummariesBackgroundJob(
+    IAttachmentAISummaryService attachmentAISummaryService,
+    ICurrentTenant currentTenant,
+    ILogger<GenerateAttachmentSummariesBackgroundJob> logger) : AsyncBackgroundJob<GenerateAttachmentSummariesBackgroundJobArgs>, ITransientDependency
+{
+    public override async Task ExecuteAsync(GenerateAttachmentSummariesBackgroundJobArgs args)
+    {
+        using (currentTenant.Change(args.TenantId))
+        {
+            try
+            {
+                logger.LogInformation(
+                    "Executing AI attachment summary background job for {AttachmentCount} attachment(s).",
+                    args.AttachmentIds.Count);
+
+                await attachmentAISummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion, args.CapturePromptIo);
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "Error executing AI attachment summary background job.");
+            }
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index a7ef596d12..363009e22b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -1,17 +1,17 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Unity.AI.Permissions;
 using Unity.GrantManager.AI;
+using Unity.GrantManager.AI.BackgroundJobs;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Identity;
 using Unity.GrantManager.Intakes;
 using Volo.Abp;
 using Volo.Abp.Application.Services;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
@@ -27,21 +27,23 @@ public class AttachmentAppService(
     IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
     IAssessmentAttachmentRepository assessmentAttachmentRepository,
     IIntakeFormSubmissionManager intakeFormSubmissionManager,
-    IPersonRepository personUserRepository, 
-    IAttachmentAISummaryService attachmentAISummaryService,
+    IPersonRepository personUserRepository,
+    IBackgroundJobManager backgroundJobManager,
     IFeatureChecker featureChecker) : ApplicationService, IAttachmentAppService
 {
+    private const string SummaryGenerationQueuedMessage = "AI summary generation queued.";
+
     public async Task<IList<ApplicationAttachmentDto>> GetApplicationAsync(Guid applicationId)
     {
         return (await GetAttachmentsAsync(new AttachmentParametersDto(AttachmentType.APPLICATION, applicationId)))
             .Select(attachment => new ApplicationAttachmentDto
             {
-                AttachedBy  = attachment.AttachedBy,
-                Id          = attachment.Id,
-                FileName    = attachment.FileName,
+                AttachedBy = attachment.AttachedBy,
+                Id = attachment.Id,
+                FileName = attachment.FileName,
                 S3ObjectKey = attachment.S3ObjectKey,
-                Time        = attachment.Time,
-                CreatorId   = attachment.CreatorId,
+                Time = attachment.Time,
+                CreatorId = attachment.CreatorId,
                 DisplayName = attachment.DisplayName
             }).ToList();
     }
@@ -51,12 +53,12 @@ public async Task<IList<AssessmentAttachmentDto>> GetAssessmentAsync(Guid assess
         return (await GetAttachmentsAsync(new AttachmentParametersDto(AttachmentType.ASSESSMENT, assessmentId)))
             .Select(attachment => new AssessmentAttachmentDto
             {
-                AttachedBy  = attachment.AttachedBy,
-                Id          = attachment.Id,
-                FileName    = attachment.FileName,
+                AttachedBy = attachment.AttachedBy,
+                Id = attachment.Id,
+                FileName = attachment.FileName,
                 S3ObjectKey = attachment.S3ObjectKey,
-                Time        = attachment.Time,
-                CreatorId   = attachment.CreatorId,
+                Time = attachment.Time,
+                CreatorId = attachment.CreatorId,
                 DisplayName = attachment.DisplayName
             }).ToList();
     }
@@ -101,14 +103,14 @@ protected internal async Task<IList<UnityAttachmentDto>> GetAttachmentsInternalA
                     join person in people on attachment.UserId equals person.Id
                     select new UnityAttachmentDto()
                     {
-                        Id             = attachment.Id,
-                        FileName       = attachment.FileName,
-                        DisplayName    = attachment.DisplayName,
-                        S3ObjectKey    = attachment.S3ObjectKey,
-                        Time           = attachment.Time,
+                        Id = attachment.Id,
+                        FileName = attachment.FileName,
+                        DisplayName = attachment.DisplayName,
+                        S3ObjectKey = attachment.S3ObjectKey,
+                        Time = attachment.Time,
                         AttachmentType = attachment.AttachmentType,
-                        AttachedBy     = person.FullName,
-                        CreatorId      = person.Id
+                        AttachedBy = person.FullName,
+                        CreatorId = person.Id
                     };
 
         return query.ToList();
@@ -135,10 +137,10 @@ protected internal static async Task<AttachmentMetadataDto> GetMetadataInternalA
         var attachment = await repository.GetAsync(attachmentId) ?? throw new EntityNotFoundException();
         return new AttachmentMetadataDto
         {
-            Id             = attachment.Id,
-            FileName       = attachment.FileName,
-            DisplayName    = attachment.DisplayName,
-            CreatorId      = GetCreatorId(attachment),
+            Id = attachment.Id,
+            FileName = attachment.FileName,
+            DisplayName = attachment.DisplayName,
+            CreatorId = GetCreatorId(attachment),
             AttachmentType = attachment.AttachmentType
         };
     }
@@ -170,16 +172,15 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
     {
         var attachment = await repository.GetAsync(updateAttachment.Id) ?? throw new EntityNotFoundException();
 
-        // Properties to be updated
         attachment.DisplayName = updateAttachment.DisplayName;
 
         var updatedAttachment = await repository.UpdateAsync(attachment, autoSave: true) ?? throw new EntityNotFoundException();
         return new AttachmentMetadataDto
         {
-            Id             = updatedAttachment.Id,
-            FileName       = updatedAttachment.FileName,
-            DisplayName    = updatedAttachment.DisplayName,
-            CreatorId      = GetCreatorId(updatedAttachment),
+            Id = updatedAttachment.Id,
+            FileName = updatedAttachment.FileName,
+            DisplayName = updatedAttachment.DisplayName,
+            CreatorId = GetCreatorId(updatedAttachment),
             AttachmentType = attachmentType
         };
     }
@@ -189,26 +190,40 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
         return attachment.CreatorId;
     }
 
-    [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
             throw new UserFriendlyException("AI attachment summaries are not enabled.");
         }
 
-        return await attachmentAISummaryService.GenerateAndSaveAsync(attachmentId, promptVersion, capturePromptIo);
+        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroundJobArgs
+        {
+            AttachmentIds = [attachmentId],
+            TenantId = CurrentTenant.Id
+        });
+
+        return SummaryGenerationQueuedMessage;
     }
-    
-    [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false)
+
+    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
             throw new UserFriendlyException("AI attachment summaries are not enabled.");
         }
 
-        return await attachmentAISummaryService.GenerateAndSaveManyAsync(attachmentIds, promptVersion, capturePromptIo);
-    }
+        if (attachmentIds.Count == 0)
+        {
+            return [];
+        }
 
+        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroundJobArgs
+        {
+            AttachmentIds = attachmentIds,
+            TenantId = CurrentTenant.Id
+        });
+
+        return attachmentIds.Select(_ => SummaryGenerationQueuedMessage).ToList();
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
index ca557eabef..e14df8f391 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
@@ -2,16 +2,17 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.BackgroundJobs;
 using Unity.AI.Permissions;
-using Unity.GrantManager.AI;
 using Volo.Abp;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Features;
 
 namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault)]
 public class ApplicationAIAnalysisAppService(
-    IApplicationAIAnalysisService applicationAnalysisService,
+    IBackgroundJobManager backgroundJobManager,
     IFeatureChecker featureChecker)
     : GrantManagerAppService, IApplicationAIAnalysisAppService
 {
@@ -24,12 +25,20 @@ public async Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? pr
                 throw new UserFriendlyException("AI application analysis is not enabled.");
             }
 
-            return await applicationAnalysisService.RegenerateAndSaveAsync(applicationId, promptVersion, capturePromptIo);
+            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIAnalysisBackgroundJobArgs
+            {
+                ApplicationId = applicationId,
+                PromptVersion = promptVersion,
+                CapturePromptIo = capturePromptIo,
+                TenantId = CurrentTenant.Id
+            });
+
+            return "{}";
         }
         catch (Exception ex)
         {
-            Logger.LogError(ex, "Error regenerating AI analysis for application {ApplicationId}", applicationId);
-            throw new UserFriendlyException("Failed to regenerate AI analysis. Please try again.");
+            Logger.LogError(ex, "Error queueing AI analysis for application {ApplicationId}", applicationId);
+            throw new UserFriendlyException("Failed to queue AI analysis. Please try again.");
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
index eb66360084..817147ad54 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
@@ -3,20 +3,16 @@
 using System;
 using System.Threading.Tasks;
 using Unity.AI.Permissions;
-using Unity.GrantManager.AI;
-using Unity.GrantManager.Applications;
-using Unity.GrantManager.Intakes.Events;
+using Unity.GrantManager.AI.BackgroundJobs;
 using Volo.Abp;
-using Volo.Abp.EventBus.Local;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.Features;
 
 namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
 public class ApplicationAIScoringAppService(
-    IApplicationAIScoringService applicationScoresheetAnalysisService,
-    IApplicationRepository applicationRepository,
-    ILocalEventBus localEventBus,
+    IBackgroundJobManager backgroundJobManager,
     IFeatureChecker featureChecker)
     : GrantManagerAppService, IApplicationAIScoringAppService
 {
@@ -29,23 +25,20 @@ public async Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, s
                 throw new UserFriendlyException("AI scoring is not enabled.");
             }
 
-            var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(applicationId, promptVersion, capturePromptIo);
-            if (string.Equals(result, "{}", StringComparison.Ordinal))
+            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIScoresheetBackgroundJobArgs
             {
-                return result;
-            }
-
-            var application = await applicationRepository.GetAsync(applicationId);
-            await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
-            {
-                Application = application
+                ApplicationId = applicationId,
+                PromptVersion = promptVersion,
+                CapturePromptIo = capturePromptIo,
+                TenantId = CurrentTenant.Id
             });
-            return result;
+
+            return "{}";
         }
         catch (Exception ex)
         {
-            Logger.LogError(ex, "Error regenerating AI scoresheet answers for application {ApplicationId}", applicationId);
-            throw new UserFriendlyException("Failed to regenerate AI scoresheet answers. Please try again.");
+            Logger.LogError(ex, "Error queueing AI scoresheet generation for application {ApplicationId}", applicationId);
+            throw new UserFriendlyException("Failed to queue AI scoresheet generation. Please try again.");
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AiScoresheetAnswersGeneratedEvent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AiScoresheetAnswersGeneratedEvent.cs
index 2090524f79..e05fe7eec3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AiScoresheetAnswersGeneratedEvent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AiScoresheetAnswersGeneratedEvent.cs
@@ -1,8 +1,8 @@
-using Unity.GrantManager.Applications;
+using System;
 
 namespace Unity.GrantManager.Intakes.Events;
 
 public class AiScoresheetAnswersGeneratedEvent
 {
-    public Application? Application { get; set; }
+    public Guid ApplicationId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAiAssessmentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAiAssessmentHandler.cs
index a69723573f..c59f7055ca 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAiAssessmentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAiAssessmentHandler.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Threading.Tasks;
 using Unity.GrantManager.Assessments;
+using Unity.GrantManager.Applications;
 using Unity.GrantManager.Intakes.Events;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
@@ -11,14 +12,15 @@ namespace Unity.GrantManager.Intakes.Handlers;
 
 public class CreateAiAssessmentHandler(
     AssessmentManager assessmentManager,
+    IApplicationRepository applicationRepository,
     IFeatureChecker featureChecker,
     ILogger<CreateAiAssessmentHandler> logger) : ILocalEventHandler<AiScoresheetAnswersGeneratedEvent>, ITransientDependency
 {
     public async Task HandleEventAsync(AiScoresheetAnswersGeneratedEvent eventData)
     {
-        if (eventData?.Application == null)
+        if (eventData == null || eventData.ApplicationId == Guid.Empty)
         {
-            logger.LogWarning("Event data or application is null in CreateAiAssessmentHandler.");
+            logger.LogWarning("Event data or application ID is null in CreateAiAssessmentHandler.");
             return;
         }
 
@@ -29,12 +31,13 @@ public async Task HandleEventAsync(AiScoresheetAnswersGeneratedEvent eventData)
 
         try
         {
-            await assessmentManager.CreateAiAssessmentAsync(eventData.Application);
-            logger.LogInformation("Created AI assessment for application {ApplicationId}.", eventData.Application.Id);
+            var application = await applicationRepository.GetAsync(eventData.ApplicationId);
+            await assessmentManager.CreateAiAssessmentAsync(application);
+            logger.LogInformation("Created AI assessment for application {ApplicationId}.", eventData.ApplicationId);
         }
         catch (Exception ex)
         {
-            logger.LogError(ex, "Error creating AI assessment for application {ApplicationId}.", eventData.Application.Id);
+            logger.LogError(ex, "Error creating AI assessment for application {ApplicationId}.", eventData.ApplicationId);
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
index 8e43753564..476c81e028 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
@@ -1,913 +1,41 @@
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
-using Unity.GrantManager.AI;
-using Unity.GrantManager.Applications;
+using Unity.GrantManager.AI.BackgroundJobs;
 using Unity.GrantManager.Intakes.Events;
+using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
-using Volo.Abp.EventBus.Local;
-using Unity.Flex.Domain.Scoresheets;
-using System.Text.Json;
-using Volo.Abp.Features;
-using Newtonsoft.Json.Linq;
+using Volo.Abp.MultiTenancy;
 
-namespace Unity.GrantManager.Intakes.Handlers
+namespace Unity.GrantManager.Intakes.Handlers;
+
+public class GenerateAIContentHandler(
+    IBackgroundJobManager backgroundJobManager,
+    ICurrentTenant currentTenant,
+    ILogger<GenerateAIContentHandler> logger) : ILocalEventHandler<ApplicationProcessEvent>, ITransientDependency
 {
-    public class GenerateAIContentHandler : ILocalEventHandler<ApplicationProcessEvent>, ITransientDependency
+    public async Task HandleEventAsync(ApplicationProcessEvent eventData)
     {
-        private const string ArrayFieldType = "array";
-        private const string ObjectFieldType = "object";
-        private const string AttachmentSummariesFeatureName = "Unity.AI.AttachmentSummaries";
-        private const string ApplicationAnalysisFeatureName = "Unity.AI.ApplicationAnalysis";
-        private const string ScoringFeatureName = "Unity.AI.Scoring";
-        private readonly IAIService _aiService;
-        private readonly IAttachmentAISummaryService _attachmentAISummaryService;
-        private readonly IApplicationChefsFileAttachmentRepository _attachmentRepository;
-        private readonly IApplicationRepository _applicationRepository;
-        private readonly IApplicationFormSubmissionRepository _applicationFormSubmissionRepository;
-        private readonly ILogger<GenerateAIContentHandler> _logger;
-        private readonly IScoresheetRepository _scoresheetRepository;
-        private readonly IApplicationFormRepository _applicationFormRepository;
-        private readonly IApplicationFormVersionRepository _applicationFormVersionRepository;
-        private readonly IFeatureChecker _featureChecker;
-        public ILocalEventBus LocalEventBus { get; set; } = NullLocalEventBus.Instance;
-        private const string ComponentsKey = "components";
-        private static readonly HashSet<string> NonDataComponentTypes = new()
-        {
-            "button", "simplebuttonadvanced", "html", "htmlelement", "content", "simpleseparator"
-        };
-        private static readonly string[] AllowedAnalysisRootProperties =
-        {
-            AIJsonKeys.Rating,
-            AIJsonKeys.Errors,
-            AIJsonKeys.Warnings,
-            AIJsonKeys.Summaries,
-            AIJsonKeys.NextSteps,
-            AIJsonKeys.Recommendation
-        };
-        private static readonly string[] AllowedFindingProperties =
-        {
-            AIJsonKeys.Id,
-            AIJsonKeys.Hidden,
-            AIJsonKeys.Title,
-            AIJsonKeys.Detail
-        };
-        private static readonly string[] AllowedRecommendationProperties =
-        {
-            AIJsonKeys.Decision,
-            AIJsonKeys.Rationale
-        };
-        private static readonly string[] AllowedScoresheetAnswerProperties =
-        {
-            AIJsonKeys.Answer,
-            AIJsonKeys.Rationale,
-            AIJsonKeys.Confidence
-        };
-
-        private readonly JsonSerializerOptions _jsonOptionsIndented = new JsonSerializerOptions
-        {
-            WriteIndented = true
-        };
-
-        public GenerateAIContentHandler(
-            IAIService aiService,
-            IAttachmentAISummaryService attachmentAISummaryService,
-            IApplicationChefsFileAttachmentRepository attachmentRepository,
-            IApplicationRepository applicationRepository,
-            IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
-            ILogger<GenerateAIContentHandler> logger,
-            IScoresheetRepository scoresheetRepository,
-            IApplicationFormRepository applicationFormRepository,
-            IApplicationFormVersionRepository applicationFormVersionRepository,
-            IFeatureChecker featureChecker)
-        {
-            _aiService = aiService;
-            _attachmentAISummaryService = attachmentAISummaryService;
-            _attachmentRepository = attachmentRepository;
-            _applicationRepository = applicationRepository;
-            _applicationFormSubmissionRepository = applicationFormSubmissionRepository;
-            _logger = logger;
-            _scoresheetRepository = scoresheetRepository;
-            _applicationFormRepository = applicationFormRepository;
-            _applicationFormVersionRepository = applicationFormVersionRepository;
-            _featureChecker = featureChecker;
-        }
-
-        /// <summary>
-        /// Generate AI summaries for attachments when a new application is processed
-        /// </summary>
-        /// <param name="eventData"></param>
-        /// <returns></returns>
-        public async Task HandleEventAsync(ApplicationProcessEvent eventData)
-        {
-            if (eventData?.Application == null)
-            {
-                _logger.LogWarning("Event data or application is null in GenerateAIContentHandler.");
-                return;
-            }
-
-            // Check if either AI feature is enabled
-            var attachmentSummariesEnabled = await _featureChecker.IsEnabledAsync(AttachmentSummariesFeatureName);
-            var applicationAnalysisEnabled = await _featureChecker.IsEnabledAsync(ApplicationAnalysisFeatureName);
-            var scoringEnabled = await _featureChecker.IsEnabledAsync(ScoringFeatureName);
-
-            if (!attachmentSummariesEnabled && !applicationAnalysisEnabled && !scoringEnabled)
-            {
-                _logger.LogDebug("All AI features are disabled, skipping AI generation for application {ApplicationId}.", eventData.Application.Id);
-                return;
-            }
-
-            // Check if AI service is available
-            if (!await _aiService.IsAvailableAsync())
-            {
-                _logger.LogWarning("AI service is not available, skipping AI generation for application {ApplicationId}.", eventData.Application.Id);
-                return;
-            }
-
-            _logger.LogInformation("Generating AI content for application {ApplicationId}.", eventData.Application.Id);
-
-            try
-            {
-                // Get all CHEFS attachments for this application
-                var attachments = await _attachmentRepository.GetListAsync(a => a.ApplicationId == eventData.Application.Id);
-
-                // Generate attachment summaries if feature is enabled
-                if (attachmentSummariesEnabled)
-                {
-                    foreach (var attachment in attachments)
-                    {
-                        await ProcessAttachmentSummaryAsync(attachment, eventData.Application.Id);
-                    }
-                }
-
-                // Generate application analysis if feature is enabled
-                if (applicationAnalysisEnabled)
-                {
-                    await GenerateApplicationAnalysisAsync(eventData.Application, attachments);
-                }
-
-                // Generate AI scoresheet answers if feature is enabled
-                if (scoringEnabled)
-                {
-                    await GenerateScoresheetAnalysisAsync(eventData.Application, attachments);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating AI content for application {ApplicationId}", eventData.Application.Id);
-                // Don't throw - this should not break the main submission processing
-            }
-        }
-
-        private async Task ProcessAttachmentSummaryAsync(ApplicationChefsFileAttachment attachment, Guid applicationId)
-        {
-            try
-            {
-                if (!string.IsNullOrWhiteSpace(attachment.AISummary))
-                {
-                    _logger.LogDebug("Skipping AI summary for attachment {FileName} - already has summary", attachment.FileName);
-                    return;
-                }
-
-                _logger.LogDebug("Generating AI summary for attachment {FileName}", attachment.FileName);
-                await _attachmentAISummaryService.GenerateAndSaveAsync(attachment);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating AI summary for attachment {FileName} in application {ApplicationId}",
-                    attachment.FileName, applicationId);
-                // Continue processing other attachments even if one fails
-            }
-        }
-
-        private async Task GenerateApplicationAnalysisAsync(Application application, List<ApplicationChefsFileAttachment> attachments)
-        {
-            try
-            {
-                _logger.LogDebug("Starting application analysis for {ApplicationId}", application.Id);
-
-                // Load the application from repository to ensure proper change tracking
-                var trackedApplication = await _applicationRepository.GetAsync(application.Id);
-
-                // Skip if application already has analysis
-                if (!string.IsNullOrEmpty(trackedApplication.AIAnalysis))
-                {
-                    _logger.LogDebug("Skipping application analysis for {ApplicationId} - already has analysis", application.Id);
-                    return;
-                }
-
-                var analysisAttachments = BuildAnalysisAttachments(attachments);
-
-                // Get form submission content including rendered HTML
-                var formSubmission = await _applicationFormSubmissionRepository
-                    .GetByApplicationAsync(application.Id);
-
-                var formFieldSchema = BuildEmptyFormFieldSchema();
-
-                if (formSubmission?.ApplicationFormVersionId is Guid formVersionId)
-                {
-                    formFieldSchema = await ExtractFormFieldConfigurationSchemaAsync(formVersionId);
-                    _logger.LogDebug("Extracted form field schema for application {ApplicationId}",
-                        application.Id);
-                }
-                else
-                {
-                    _logger.LogWarning("Could not extract form field schema for application {ApplicationId} - ApplicationFormVersionId is null",
-                        application.Id);
-                }
-
-                var formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
-                var analysisData = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission, formSchema, _logger);
-                _logger.LogInformation("Generating analysis for application {ApplicationId}", application.Id);
-
-                _logger.LogDebug("Generating AI analysis for application {ApplicationId} with {AttachmentCount} attachment summaries",
-                    application.Id, analysisAttachments.Count);
-
-                var analysisRequest = new ApplicationAnalysisRequest
-                {
-                    Schema = formFieldSchema,
-                    Data = analysisData,
-                    Attachments = analysisAttachments
-                };
-
-                var analysis = await _aiService.GenerateApplicationAnalysisAsync(analysisRequest);
-                var analysisJson = JsonSerializer.Serialize(analysis, _jsonOptionsIndented);
-                if (!IsValidAnalysisPayload(analysisJson))
-                {
-                    _logger.LogWarning("Skipping invalid AI analysis payload for application {ApplicationId}.", application.Id);
-                    return;
-                }
-
-                // Update the tracked application with the analysis
-                trackedApplication.AIAnalysis = analysisJson;
-                await _applicationRepository.UpdateAsync(trackedApplication);
-
-                _logger.LogInformation("Successfully generated AI analysis for application {ApplicationId}", application.Id);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating application analysis for {ApplicationId}", application.Id);
-                // Don't throw - this should not break the main submission processing
-            }
-        }
-
-        private static List<AIAttachmentItem> BuildAnalysisAttachments(List<ApplicationChefsFileAttachment> attachments)
-        {
-            return attachments
-                .Where(a => !string.IsNullOrWhiteSpace(a.AISummary))
-                .Select(a => new AIAttachmentItem
-                {
-                    Name = string.IsNullOrWhiteSpace(a.FileName) ? "attachment" : a.FileName.Trim(),
-                    Summary = a.AISummary!.Trim()
-                })
-                .ToList();
-        }
-
-        private async Task GenerateScoresheetAnalysisAsync(Application application, List<ApplicationChefsFileAttachment> attachments)
-        {
-            try
-            {
-                _logger.LogDebug("Starting scoresheet analysis for {ApplicationId}", application.Id);
-
-                // Load the application from repository to ensure proper change tracking
-                var trackedApplication = await _applicationRepository.GetAsync(application.Id);
-
-                // Skip if application already has scoresheet analysis
-                if (!string.IsNullOrEmpty(trackedApplication.AIScoresheetAnswers))
-                {
-                    _logger.LogDebug("Skipping scoresheet analysis for {ApplicationId} - already has scoresheet answers", application.Id);
-                    return;
-                }
-
-                // Get the scoresheet for this application's form (using direct relationship like AssessmentManager does)
-                _logger.LogDebug("Getting ApplicationForm for application {ApplicationId} with ApplicationFormId {ApplicationFormId}",
-                    application.Id, application.ApplicationFormId);
-
-                var applicationForm = await _applicationFormRepository.GetAsync(application.ApplicationFormId);
-                if (applicationForm == null)
-                {
-                    _logger.LogDebug("ApplicationForm not found with ID {ApplicationFormId} for application {ApplicationId}",
-                        application.ApplicationFormId, application.Id);
-                    return;
-                }
-
-                _logger.LogDebug("Found ApplicationForm {ApplicationFormName} with ScoresheetId {ScoresheetId} for application {ApplicationId}",
-                    applicationForm.ApplicationFormName, applicationForm.ScoresheetId, application.Id);
-
-                if (applicationForm.ScoresheetId == null)
-                {
-                    _logger.LogDebug("No scoresheet found for application {ApplicationId} - ApplicationForm {ApplicationFormId} has null ScoresheetId",
-                        application.Id, application.ApplicationFormId);
-                    return;
-                }
-
-                var scoresheet = await _scoresheetRepository.GetWithChildrenAsync(applicationForm.ScoresheetId.Value);
-                if (scoresheet == null)
-                {
-                    _logger.LogDebug("Scoresheet not found for application {ApplicationId}", application.Id);
-                    return;
-                }
-
-                var allSectionResults = new Dictionary<string, object>();
-                var scoresheetAttachments = BuildScoresheetAttachments(attachments);
-                var formSubmission = await _applicationFormSubmissionRepository.GetByApplicationAsync(application.Id);
-                var formSchema = await GetFormSchemaAsync(formSubmission?.ApplicationFormVersionId);
-                var scoresheetData = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission, formSchema, _logger);
-                LogFormSubmissionPreview(formSubmission?.RenderedHTML);
-
-                foreach (var section in scoresheet.Sections.OrderBy(s => s.Order))
-                {
-                    var sectionSchema = BuildScoresheetSectionSchema(section.Fields);
-                    await ProcessScoresheetSectionAsync(
-                        section.Name,
-                        section.Fields.Count,
-                        sectionSchema,
-                        application.Id,
-                        scoresheetData,
-                        scoresheetAttachments,
-                        allSectionResults);
-                }
-
-                await SaveScoresheetResultsAsync(trackedApplication, allSectionResults);
-                await LocalEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
-                {
-                    Application = application
-                });
-
-                _logger.LogInformation("Successfully generated and saved AI scoresheet answers for application {ApplicationId}. Answers will be parsed when scoresheet instance is created.", application.Id);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating scoresheet analysis for {ApplicationId}", application.Id);
-                // Don't throw - this should not break the main submission processing
-            }
-        }
-
-        private static List<AIAttachmentItem> BuildScoresheetAttachments(List<ApplicationChefsFileAttachment> attachments)
-        {
-            return attachments
-                .Where(a => !string.IsNullOrEmpty(a.AISummary))
-                .Select(a => new AIAttachmentItem
-                {
-                    Name = string.IsNullOrWhiteSpace(a.FileName) ? "attachment" : a.FileName.Trim(),
-                    Summary = a.AISummary!.Trim()
-                })
-                .ToList();
-        }
-
-        private void LogFormSubmissionPreview(string? renderedFormHtml)
-        {
-            _logger.LogInformation("Form submission HTML length: {HtmlLength} characters", renderedFormHtml?.Length ?? 0);
-            if (renderedFormHtml?.Length > 100)
-            {
-                _logger.LogDebug("Form submission HTML is present and non-trivial.");
-            }
-            else
-            {
-                _logger.LogWarning("Form submission HTML is missing or very short.");
-            }
-        }
-
-        private async Task ProcessScoresheetSectionAsync(
-            string sectionName,
-            int questionCount,
-            JsonElement sectionSchema,
-            Guid applicationId,
-            JsonElement scoresheetData,
-            List<AIAttachmentItem> scoresheetAttachments,
-            Dictionary<string, object> allSectionResults)
+        if (eventData?.Application == null)
         {
-            try
-            {
-                _logger.LogDebug("Processing section {SectionName} for application {ApplicationId}",
-                    sectionName, applicationId);
-                var sectionAnswers = await _aiService.GenerateScoresheetSectionAsync(new ScoresheetSectionRequest
-                {
-                    Data = scoresheetData,
-                    Attachments = scoresheetAttachments,
-                    SectionName = sectionName,
-                    SectionSchema = sectionSchema
-                });
-
-                if (sectionAnswers.Answers.Count == 0)
-                {
-                    return;
-                }
-
-                var expectedQuestionIds = ExtractSectionQuestionIds(sectionSchema);
-                var returnedQuestionIds = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-
-                foreach (var answerEntry in sectionAnswers.Answers)
-                {
-                    returnedQuestionIds.Add(answerEntry.Key);
-                    allSectionResults[answerEntry.Key] = new Dictionary<string, object?>
-                    {
-                        [AIJsonKeys.Answer] = answerEntry.Value.Answer,
-                        [AIJsonKeys.Rationale] = answerEntry.Value.Rationale,
-                        [AIJsonKeys.Confidence] = answerEntry.Value.Confidence
-                    };
-                }
-
-                var missingQuestionIds = expectedQuestionIds.Except(returnedQuestionIds, StringComparer.OrdinalIgnoreCase).ToArray();
-                if (missingQuestionIds.Length > 0)
-                {
-                    _logger.LogWarning(
-                        "AI scoresheet response missing question answers for section {SectionName} in application {ApplicationId}. Expected: {ExpectedCount}, Returned: {ReturnedCount}, MissingIds: {MissingIds}.",
-                        sectionName,
-                        applicationId,
-                        expectedQuestionIds.Count,
-                        returnedQuestionIds.Count,
-                        string.Join(",", missingQuestionIds));
-                }
-                else
-                {
-                    _logger.LogDebug(
-                        "AI scoresheet response complete for section {SectionName} in application {ApplicationId}. Returned {ReturnedCount} answers.",
-                        sectionName,
-                        applicationId,
-                        returnedQuestionIds.Count);
-                }
-
-                _logger.LogDebug("Successfully processed section {SectionName} with {QuestionCount} questions",
-                    sectionName, questionCount);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error processing section {SectionName} for application {ApplicationId}",
-                    sectionName, applicationId);
-            }
+            logger.LogWarning("Event data or application is null in GenerateAIContentHandler.");
+            return;
         }
 
-        private static HashSet<string> ExtractSectionQuestionIds(JsonElement sectionSchema)
+        try
         {
-            var ids = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
-            if (sectionSchema.ValueKind != JsonValueKind.Array)
+            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIContentBackgroundJobArgs
             {
-                return ids;
-            }
+                ApplicationId = eventData.Application.Id,
+                TenantId = currentTenant.Id
+            });
 
-            foreach (var question in sectionSchema.EnumerateArray())
-            {
-                if (question.ValueKind == JsonValueKind.Object &&
-                    question.TryGetProperty("id", out var idProp) &&
-                    idProp.ValueKind == JsonValueKind.String)
-                {
-                    var id = idProp.GetString();
-                    if (!string.IsNullOrWhiteSpace(id))
-                    {
-                        ids.Add(id);
-                    }
-                }
-            }
-
-            return ids;
+            logger.LogInformation("Queued AI content generation for application {ApplicationId}.", eventData.Application.Id);
         }
-
-        private static JsonElement BuildScoresheetSectionSchema(IEnumerable<Unity.Flex.Domain.Scoresheets.Question> fields)
+        catch (Exception ex)
         {
-            var sectionQuestionsData = fields
-                .OrderBy(f => f.Order)
-                .Select(field =>
-                {
-                    var options = ExtractSelectListOptions(field);
-                    return new
-                    {
-                        id = field.Id.ToString(),
-                        question = field.Label,
-                        description = field.Description,
-                        type = field.Type.ToString(),
-                        options,
-                        allowed_answers = ExtractSelectListOptionNumbers(options)
-                    };
-                })
-                .ToList();
-
-            return JsonSerializer.SerializeToElement(sectionQuestionsData);
-        }
-
-        private async Task SaveScoresheetResultsAsync(Application trackedApplication, Dictionary<string, object> allSectionResults)
-        {
-            var combinedResults = JsonSerializer.Serialize(allSectionResults, _jsonOptionsIndented);
-            if (!IsValidScoresheetAnswersPayload(combinedResults))
-            {
-                _logger.LogWarning("Skipping invalid AI scoresheet payload for application {ApplicationId}.", trackedApplication.Id);
-                return;
-            }
-
-            trackedApplication.AIScoresheetAnswers = combinedResults;
-            await _applicationRepository.UpdateAsync(trackedApplication);
+            logger.LogError(ex, "Error queueing AI content generation for application {ApplicationId}.", eventData.Application.Id);
         }
-
-        private static object[]? ExtractSelectListOptions(Unity.Flex.Domain.Scoresheets.Question field)
-        {
-            if (field.Type != Unity.Flex.Scoresheets.Enums.QuestionType.SelectList || string.IsNullOrEmpty(field.Definition))
-                return null;
-
-            try
-            {
-                var definition = JsonSerializer.Deserialize<Unity.Flex.Worksheets.Definitions.QuestionSelectListDefinition>(field.Definition);
-                if (definition?.Options != null && definition.Options.Count > 0)
-                {
-                    return definition.Options
-                        .Select((option, index) =>
-                            (object)new
-                            {
-                                number = index + 1,
-                                value = option.Value
-                            })
-                        .ToArray();
-                }
-            }
-            catch (JsonException)
-            {
-                // If definition parsing fails, return null
-            }
-
-            return null;
-        }
-
-        private static string[]? ExtractSelectListOptionNumbers(object[]? options)
-        {
-            if (options == null || options.Length == 0)
-            {
-                return null;
-            }
-
-            return options
-                .Select((_, index) => (index + 1).ToString())
-                .ToArray();
-        }
-
-        /// <summary>
-        /// Extracts form field metadata keyed by field key for analysis schema prompts.
-        /// </summary>
-        private async Task<JsonElement> ExtractFormFieldConfigurationSchemaAsync(Guid formVersionId)
-        {
-            try
-            {
-                var formVersion = await _applicationFormVersionRepository.GetAsync(formVersionId);
-                if (formVersion == null || string.IsNullOrEmpty(formVersion.FormSchema))
-                {
-                    return BuildEmptyFormFieldSchema();
-                }
-
-                var schema = JObject.Parse(formVersion.FormSchema);
-                var components = schema[ComponentsKey] as JArray;
-
-                if (components == null || components.Count == 0)
-                {
-                    return BuildEmptyFormFieldSchema();
-                }
-
-                var fields = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-                ExtractFieldRequirements(components, fields, string.Empty);
-                return JsonSerializer.SerializeToElement(fields);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error extracting form field schema for form version {FormVersionId}", formVersionId);
-                return BuildEmptyFormFieldSchema();
-            }
-        }
-
-        private async Task<string?> GetFormSchemaAsync(Guid? formVersionId)
-        {
-            if (formVersionId == null)
-            {
-                return null;
-            }
-
-            try
-            {
-                var formVersion = await _applicationFormVersionRepository.GetAsync(formVersionId.Value);
-                return string.IsNullOrWhiteSpace(formVersion?.FormSchema) ? null : formVersion.FormSchema;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Unable to load form schema for prompt data generation for form version {FormVersionId}.", formVersionId);
-                return null;
-            }
-        }
-
-        private static JsonElement BuildEmptyFormFieldSchema()
-        {
-            return JsonSerializer.SerializeToElement(new Dictionary<string, string>());
-        }
-
-        /// <summary>
-        /// Recursively extracts form field metadata from form components
-        /// </summary>
-        private static void ExtractFieldRequirements(
-            JArray components,
-            Dictionary<string, string> fields,
-            string currentPath)
-        {
-            foreach (var component in components.OfType<JObject>())
-            {
-                var key = component["key"]?.ToString();
-                var label = component["label"]?.ToString();
-                var type = component["type"]?.ToString();
-
-                if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(type) || NonDataComponentTypes.Contains(type))
-                {
-                    ProcessNestedFieldRequirements(component, type, fields, currentPath);
-                    continue;
-                }
-
-                var displayName = !string.IsNullOrEmpty(label) ? $"{label} ({key})" : key;
-                var fullPath = string.IsNullOrEmpty(currentPath) ? displayName : $"{currentPath} > {displayName}";
-
-                if (component["input"]?.Value<bool>() == true)
-                {
-                    fields[key] = NormalizeFieldType(type, component);
-                }
-
-                ProcessNestedFieldRequirements(component, type, fields, fullPath);
-            }
-        }
-
-        /// <summary>
-        /// Processes nested components for different container types
-        /// </summary>
-        private static void ProcessNestedFieldRequirements(
-            JObject component,
-            string? type,
-            Dictionary<string, string> fields,
-            string currentPath)
-        {
-            switch (type)
-            {
-                case "panel":
-                case "simplepanel":
-                case "fieldset":
-                case "well":
-                case "container":
-                case "datagrid":
-                case "table":
-                    var nestedComponents = component[ComponentsKey] as JArray;
-                    if (nestedComponents != null)
-                    {
-                        ExtractFieldRequirements(nestedComponents, fields, currentPath);
-                    }
-                    break;
-
-                case "columns":
-                case "simplecols2":
-                case "simplecols3":
-                case "simplecols4":
-                    var columns = component["columns"] as JArray;
-                    if (columns != null)
-                    {
-                        foreach (var column in columns.OfType<JObject>())
-                        {
-                            var columnComponents = column[ComponentsKey] as JArray;
-                            if (columnComponents != null)
-                            {
-                                ExtractFieldRequirements(columnComponents, fields, currentPath);
-                            }
-                        }
-                    }
-                    break;
-
-                case "tabs":
-                case "simpletabs":
-                    var tabs = component[ComponentsKey] as JArray;
-                    if (tabs != null)
-                    {
-                        foreach (var tab in tabs.OfType<JObject>())
-                        {
-                            var tabComponents = tab[ComponentsKey] as JArray;
-                            if (tabComponents != null)
-                            {
-                                ExtractFieldRequirements(tabComponents, fields, currentPath);
-                            }
-                        }
-                    }
-                    break;
-            }
-        }
-
-        private static string NormalizeFieldType(string rawType, JObject component)
-        {
-            if (component["multiple"]?.Value<bool>() == true)
-            {
-                return ArrayFieldType;
-            }
-
-            return rawType.ToLowerInvariant() switch
-            {
-                "number" => "number",
-                "currency" => "number",
-                "checkbox" => "boolean",
-                "datetime" => "date",
-                "day" => "date",
-                "date" => "date",
-                "time" => "date",
-                "datagrid" => ArrayFieldType,
-                "editgrid" => ArrayFieldType,
-                "table" => ArrayFieldType,
-                "container" => ObjectFieldType,
-                "panel" => ObjectFieldType,
-                "fieldset" => ObjectFieldType,
-                "well" => ObjectFieldType,
-                _ => "string"
-            };
-        }
-
-        private static bool IsValidAnalysisPayload(string analysisJson)
-        {
-            if (string.IsNullOrWhiteSpace(analysisJson))
-            {
-                return false;
-            }
-
-            try
-            {
-                using var doc = JsonDocument.Parse(analysisJson);
-                var root = doc.RootElement;
-                if (root.ValueKind != JsonValueKind.Object)
-                {
-                    return false;
-                }
-
-                if (!root.TryGetProperty(AIJsonKeys.Rating, out var overallScore) ||
-                    overallScore.ValueKind != JsonValueKind.String)
-                {
-                    return false;
-                }
-
-                if (!root.TryGetProperty(AIJsonKeys.Errors, out var errors) ||
-                    !root.TryGetProperty(AIJsonKeys.Warnings, out var warnings) ||
-                    !root.TryGetProperty(AIJsonKeys.Summaries, out var summaries) ||
-                    !root.TryGetProperty(AIJsonKeys.NextSteps, out var nextSteps) ||
-                    !root.TryGetProperty(AIJsonKeys.Recommendation, out var recommendation))
-                {
-                    return false;
-                }
-
-                if (!HasOnlyAllowedProperties(root, AllowedAnalysisRootProperties))
-                {
-                    return false;
-                }
-
-                if (!IsValidFindingsArray(errors) ||
-                    !IsValidFindingsArray(warnings) ||
-                    !IsValidFindingsArray(summaries) ||
-                    !IsValidFindingsArray(nextSteps) ||
-                    !IsValidRecommendation(recommendation))
-                {
-                    return false;
-                }
-
-                return true;
-            }
-            catch (JsonException)
-            {
-                return false;
-            }
-        }
-
-        private static bool IsValidFindingsArray(JsonElement element)
-        {
-            if (element.ValueKind != JsonValueKind.Array)
-            {
-                return false;
-            }
-
-            foreach (var finding in element.EnumerateArray())
-            {
-                if (finding.ValueKind != JsonValueKind.Object)
-                {
-                    return false;
-                }
-
-                if (!finding.TryGetProperty(AIJsonKeys.Title, out var title) || title.ValueKind != JsonValueKind.String)
-                {
-                    return false;
-                }
-
-                if (!finding.TryGetProperty(AIJsonKeys.Detail, out var detail) || detail.ValueKind != JsonValueKind.String)
-                {
-                    return false;
-                }
-
-                if (!finding.TryGetProperty(AIJsonKeys.Hidden, out var hidden) ||
-                    (hidden.ValueKind != JsonValueKind.True && hidden.ValueKind != JsonValueKind.False))
-                {
-                    return false;
-                }
-
-                if (!HasOnlyAllowedProperties(finding, AllowedFindingProperties))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private static bool IsValidRecommendation(JsonElement element)
-        {
-            if (element.ValueKind != JsonValueKind.Object)
-            {
-                return false;
-            }
-
-            if (!element.TryGetProperty(AIJsonKeys.Decision, out var decision) || decision.ValueKind != JsonValueKind.String)
-            {
-                return false;
-            }
-
-            var decisionValue = decision.GetString();
-            if (!string.Equals(decisionValue, "PROCEED", StringComparison.Ordinal) &&
-                !string.Equals(decisionValue, "HOLD", StringComparison.Ordinal))
-            {
-                return false;
-            }
-
-            if (!element.TryGetProperty(AIJsonKeys.Rationale, out var rationale) || rationale.ValueKind != JsonValueKind.String)
-            {
-                return false;
-            }
-
-            return HasOnlyAllowedProperties(element, AllowedRecommendationProperties);
-        }
-
-        private static bool IsValidScoresheetAnswersPayload(string scoresheetJson)
-        {
-            if (string.IsNullOrWhiteSpace(scoresheetJson))
-            {
-                return false;
-            }
-
-            try
-            {
-                using var doc = JsonDocument.Parse(scoresheetJson);
-                if (doc.RootElement.ValueKind != JsonValueKind.Object)
-                {
-                    return false;
-                }
-
-                foreach (var question in doc.RootElement.EnumerateObject().Select(question => question.Value))
-                {
-                    if (question.ValueKind != JsonValueKind.Object)
-                    {
-                        return false;
-                    }
-
-                    if (!question.TryGetProperty(AIJsonKeys.Answer, out var answer))
-                    {
-                        return false;
-                    }
-
-                    var validAnswerType = answer.ValueKind is JsonValueKind.String or JsonValueKind.Number or JsonValueKind.True or JsonValueKind.False;
-                    if (!validAnswerType)
-                    {
-                        return false;
-                    }
-
-                    if (!question.TryGetProperty(AIJsonKeys.Rationale, out var rationale) || rationale.ValueKind != JsonValueKind.String)
-                    {
-                        return false;
-                    }
-
-                    if (!question.TryGetProperty(AIJsonKeys.Confidence, out var confidence) || !confidence.TryGetInt32(out var confidenceValue))
-                    {
-                        return false;
-                    }
-
-                    if (confidenceValue < 0 || confidenceValue > 100)
-                    {
-                        return false;
-                    }
-
-                    if (!HasOnlyAllowedProperties(question, AllowedScoresheetAnswerProperties))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            }
-            catch (JsonException)
-            {
-                return false;
-            }
-        }
-
-        private static bool HasOnlyAllowedProperties(JsonElement element, IReadOnlyCollection<string> allowedProperties)
-        {
-            if (element.ValueKind != JsonValueKind.Object)
-            {
-                return false;
-            }
-
-            var allowed = new HashSet<string>(allowedProperties, StringComparer.Ordinal);
-            return element.EnumerateObject().All(property => allowed.Contains(property.Name));
-        }
-
     }
 }

From 926dfa03d1561f31bc611915495cf911db716f65 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:33:27 -0700
Subject: [PATCH 06/38] AB#32012 restore attachment AI controls

---
 .../Attachments/AttachmentAppService.cs               | 11 +++++++++--
 .../Views/Shared/Components/ReviewList/ReviewList.js  |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 363009e22b..8292db25f8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using Unity.AI.Permissions;
 using Unity.GrantManager.AI;
 using Unity.GrantManager.AI.BackgroundJobs;
 using Unity.GrantManager.Applications;
@@ -190,7 +191,8 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
         return attachment.CreatorId;
     }
 
-    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId)
+    [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
+    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
@@ -200,13 +202,16 @@ public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId)
         await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroundJobArgs
         {
             AttachmentIds = [attachmentId],
+            PromptVersion = promptVersion,
+            CapturePromptIo = capturePromptIo,
             TenantId = CurrentTenant.Id
         });
 
         return SummaryGenerationQueuedMessage;
     }
 
-    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds)
+    [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
+    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
@@ -221,6 +226,8 @@ public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> a
         await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroundJobArgs
         {
             AttachmentIds = attachmentIds,
+            PromptVersion = promptVersion,
+            CapturePromptIo = capturePromptIo,
             TenantId = CurrentTenant.Id
         });
 
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 ca0fd31ce7..2535319b1d 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
@@ -30,7 +30,7 @@ const finalApplicationStates = [
 ];
 
 $(function () {
-    const nullPlaceholder = '—';
+    const nullPlaceholder = '-';
 
     let inputAction = function (requestData, dataTableSettings) {
         const applicationId = pageApplicationId

From d864f972a0d27e8fd5efe751dd0370252971ab7f Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 18 Mar 2026 13:37:31 -0700
Subject: [PATCH 07/38] AB#32012 clarify queued AI action messaging

---
 .../Pages/GrantApplications/ai-analysis.js                | 4 ++--
 .../Shared/Components/AssessmentScoresWidget/Default.js   | 4 ++--
 .../Components/ChefsAttachments/ChefsAttachments.js       | 8 ++++----
 .../Views/Shared/Components/ReviewList/ReviewList.cs      | 1 +
 .../Views/Shared/Components/ReviewList/ReviewList.js      | 4 ++--
 5 files changed, 11 insertions(+), 10 deletions(-)

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 4aa1eda967..93e6d79af6 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
@@ -406,13 +406,13 @@ globalThis.regenerateAIAnalysis = function(capturePromptIo = false, triggerButto
     }
 
     $button
-        .html('<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Generating...</span></span>')
+        .html('<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>')
         .prop('disabled', true);
 
     unity.grantManager.grantApplications.applicationAIAnalysis
         .generateAIAnalysis(applicationId, promptVersion, capturePromptIo)
         .then(function() {
-            abp.notify.success('AI analysis queued successfully. Refresh after processing completes.');
+            abp.notify.success('AI analysis queued. Check back shortly for results.');
         })
         .catch(function() {
             abp.message.error('Failed to queue AI analysis. Please try again.');
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 109b88e180..6c58a2128e 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
@@ -593,14 +593,14 @@ function regenerateAIScoresheetAnswers(capturePromptIo = false, triggerButton =
 
     $button
         .html(
-            '<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Generating...</span></span>'
+            '<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>'
         )
         .prop('disabled', true);
 
     unity.grantManager.grantApplications.applicationAIScoring
         .generateAIScoresheetAnswers(applicationId, promptVersion, capturePromptIo)
         .done(function () {
-            abp.notify.success('AI scoring queued successfully. Refresh after processing completes.');
+            abp.notify.success('AI scoring queued. Check back shortly for results.');
         })
         .fail(function () {
             abp.message.error(
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 56a7b7f7ef..eb8c27d8bb 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
@@ -11,7 +11,7 @@ $(function () {
     const dt = $('#ChefsAttachmentsTable');
     let chefsDataTable;
     let selectedAtttachments = [];
-    const nullPlaceholder = '—';
+    const nullPlaceholder = '-';
 
     let inputAction = function (requestData, dataTableSettings) {
         const urlParams = new URL(window.location.toLocaleString())
@@ -260,15 +260,15 @@ $(function () {
                 beforeSend: function () {
                     $activeButton
                         .html(
-                            '<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Generating...</span></span>'
+                            '<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>'
                         )
                         .prop('disabled', true);
                 },
                 success: function (summaries) {
                     abp.notify.success(
-                        'AI summaries queued successfully for ' +
+                        'AI summaries queued for ' +
                             summaries.length +
-                            ' attachment(s).'
+                            ' attachment(s). Check back shortly for results.'
                     );
 
                     resetAttachmentSelectionState();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs
index 48de3fe0e1..c8a24891e7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/ReviewList.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 using Unity.AI.Permissions;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.AspNetCore.Mvc;
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 2535319b1d..afea5aa7a7 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
@@ -466,12 +466,12 @@ function generateAiButtonAction(e, dt, button, config) {
 
     if (triggerButton?.length) {
         triggerButton.prop('disabled', true);
-        triggerButton.html('<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Generating...</span></span>');
+        triggerButton.html('<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Queueing...</span></span>');
     }
 
     unity.grantManager.grantApplications.applicationAIScoring.generateAIScoresheetAnswers(pageApplicationId, promptVersion, false)
         .done(function () {
-            abp.notify.success('AI scoring queued successfully. Refresh after processing completes.');
+            abp.notify.success('AI scoring queued. Check back shortly for results.');
         })
         .fail(function () {
             abp.message.error('Failed to queue AI scoring. Please try again.');

From c4cd544fe27268c469044c757d971754c75eefa9 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 10:07:59 -0700
Subject: [PATCH 08/38] AB#32012 remove AI prompt capture pipeline

---
 ...eApplicationAIAnalysisBackgroundJobArgs.cs |  1 -
 ...pplicationAIScoresheetBackgroundJobArgs.cs |  1 -
 ...ateAttachmentSummariesBackgroundJobArgs.cs |  1 -
 .../AI/Requests/ApplicationAnalysisRequest.cs |  8 +-
 .../AI/Requests/AttachmentSummaryRequest.cs   |  8 +-
 .../AI/Requests/ScoresheetSectionRequest.cs   |  8 +-
 .../AI/Responses/AIPromptCaptureResponse.cs   | 32 --------
 .../Attachments/IAttachmentAppService.cs      |  7 +-
 .../IApplicationAIAnalysisAppService.cs       |  3 +-
 .../IApplicationAIPromptCaptureAppService.cs  | 13 ---
 .../IApplicationAIScoringAppService.cs        |  3 +-
 ...erateApplicationAIAnalysisBackgroundJob.cs |  4 +-
 ...ateApplicationAIScoresheetBackgroundJob.cs |  4 +-
 ...enerateAttachmentSummariesBackgroundJob.cs |  4 +-
 .../AI/Capture/AIPromptCaptureStore.cs        | 50 ------------
 .../AI/Capture/IAIPromptCaptureStore.cs       | 10 ---
 .../ApplicationAIAnalysisService.cs           |  6 +-
 .../Operations/ApplicationAIScoringService.cs |  6 +-
 .../Operations/AttachmentAISummaryService.cs  | 15 ++--
 .../IApplicationAIAnalysisService.cs          |  3 +-
 .../IApplicationAIScoringService.cs           |  3 +-
 .../Operations/IAttachmentAISummaryService.cs |  7 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        | 34 +-------
 .../Attachments/AttachmentAppService.cs       |  7 +-
 .../ApplicationAIAnalysisAppService.cs        |  4 +-
 .../ApplicationAIPromptCaptureAppService.cs   | 81 -------------------
 .../ApplicationAIScoringAppService.cs         |  4 +-
 27 files changed, 55 insertions(+), 272 deletions(-)
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AIPromptCaptureResponse.cs
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIPromptCaptureAppService.cs
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/AIPromptCaptureStore.cs
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/IAIPromptCaptureStore.cs
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIPromptCaptureAppService.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
index 4b426e5209..c05f6ea8a1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
@@ -6,6 +6,5 @@ public class GenerateApplicationAIAnalysisBackgroundJobArgs
 {
     public Guid ApplicationId { get; set; }
     public string? PromptVersion { get; set; }
-    public bool CapturePromptIo { get; set; }
     public Guid? TenantId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
index ba0fc44314..a244055213 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
@@ -6,6 +6,5 @@ public class GenerateApplicationAIScoresheetBackgroundJobArgs
 {
     public Guid ApplicationId { get; set; }
     public string? PromptVersion { get; set; }
-    public bool CapturePromptIo { get; set; }
     public Guid? TenantId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
index c36637a7e0..85c11f6ff9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
@@ -7,6 +7,5 @@ public class GenerateAttachmentSummariesBackgroundJobArgs
 {
     public List<Guid> AttachmentIds { get; set; } = [];
     public string? PromptVersion { get; set; }
-    public bool CapturePromptIo { get; set; }
     public Guid? TenantId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
index 3d9aaf789f..7f4454407c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
@@ -17,11 +17,7 @@ public class ApplicationAnalysisRequest
 
         [JsonPropertyName("promptVersion")]
         public string? PromptVersion { get; set; }
-
-        [JsonPropertyName("capturePromptIo")]
-        public bool CapturePromptIo { get; set; }
-
-        [JsonPropertyName("captureContextId")]
-        public string? CaptureContextId { get; set; }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
index d3eb7fe217..9633b57ea1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
@@ -15,11 +15,7 @@ public class AttachmentSummaryRequest
 
         [JsonPropertyName("promptVersion")]
         public string? PromptVersion { get; set; }
-
-        [JsonPropertyName("capturePromptIo")]
-        public bool CapturePromptIo { get; set; }
-
-        [JsonPropertyName("captureContextId")]
-        public string? CaptureContextId { get; set; }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs
index 7f904ea77a..38d46ecac8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs
@@ -20,11 +20,7 @@ public class ScoresheetSectionRequest
 
         [JsonPropertyName("promptVersion")]
         public string? PromptVersion { get; set; }
-
-        [JsonPropertyName("capturePromptIo")]
-        public bool CapturePromptIo { get; set; }
-
-        [JsonPropertyName("captureContextId")]
-        public string? CaptureContextId { get; set; }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AIPromptCaptureResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AIPromptCaptureResponse.cs
deleted file mode 100644
index 5c60ea2ae0..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AIPromptCaptureResponse.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Text.Json.Serialization;
-
-namespace Unity.GrantManager.AI
-{
-    public class AIPromptCaptureResponse
-    {
-        [JsonPropertyName("contextId")]
-        public string ContextId { get; set; } = string.Empty;
-
-        [JsonPropertyName("promptType")]
-        public string PromptType { get; set; } = string.Empty;
-
-        [JsonPropertyName("promptVersion")]
-        public string PromptVersion { get; set; } = string.Empty;
-
-        [JsonPropertyName("captureLabel")]
-        public string CaptureLabel { get; set; } = string.Empty;
-
-        [JsonPropertyName("systemPrompt")]
-        public string SystemPrompt { get; set; } = string.Empty;
-
-        [JsonPropertyName("userPrompt")]
-        public string UserPrompt { get; set; } = string.Empty;
-
-        [JsonPropertyName("output")]
-        public string Output { get; set; } = string.Empty;
-
-        [JsonPropertyName("capturedAt")]
-        public DateTime CapturedAt { get; set; }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
index b6bb290746..b6850948a9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
@@ -13,6 +13,7 @@ public interface IAttachmentAppService : IApplicationService
     Task<IList<UnityAttachmentDto>> GetAttachmentsAsync(AttachmentParametersDto attachmentParametersDto);
     Task<AttachmentMetadataDto> GetAttachmentMetadataAsync(AttachmentType attachmentType, Guid attachmentId);
     Task<AttachmentMetadataDto> UpdateAttachmentMetadataAsync(UpdateAttachmentMetadataDto updateAttachment);
-    Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false);
-    Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false);
+    Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null);
+    Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null);
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs
index cfb21ea57c..22bd65e6ab 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs
@@ -6,6 +6,7 @@ namespace Unity.GrantManager.GrantApplications
 {
     public interface IApplicationAIAnalysisAppService : IApplicationService
     {
-        Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
+        Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null);
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIPromptCaptureAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIPromptCaptureAppService.cs
deleted file mode 100644
index c25d04ee9b..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIPromptCaptureAppService.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using System;
-using System.Threading.Tasks;
-using Unity.GrantManager.AI;
-using Volo.Abp.Application.Services;
-
-namespace Unity.GrantManager.GrantApplications
-{
-    public interface IApplicationAIPromptCaptureAppService : IApplicationService
-    {
-        Task<List<AIPromptCaptureResponse>> GetRecentAsync(Guid applicationId, string promptType, string? promptVersion = null);
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs
index e3f54c8f2e..d04c4312f3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs
@@ -6,6 +6,7 @@ namespace Unity.GrantManager.GrantApplications
 {
     public interface IApplicationAIScoringAppService : IApplicationService
     {
-        Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
+        Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null);
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
index 6ed1232261..9fa42e6e71 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
@@ -19,7 +19,7 @@ public override async Task ExecuteAsync(GenerateApplicationAIAnalysisBackgroundJ
             try
             {
                 logger.LogInformation("Executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
-                await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion, args.CapturePromptIo);
+                await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
             }
             catch (Exception ex)
             {
@@ -28,3 +28,5 @@ public override async Task ExecuteAsync(GenerateApplicationAIAnalysisBackgroundJ
         }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
index e8be57392e..d4546bc50d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
@@ -23,7 +23,7 @@ public override async Task ExecuteAsync(GenerateApplicationAIScoresheetBackgroun
             {
                 logger.LogInformation("Executing AI scoresheet background job for application {ApplicationId}.", args.ApplicationId);
 
-                var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion, args.CapturePromptIo);
+                var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
                 if (!string.Equals(result, "{}", StringComparison.Ordinal))
                 {
                     await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
@@ -39,3 +39,5 @@ await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
         }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs
index 42950e82b7..a073e3e399 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs
@@ -22,7 +22,7 @@ public override async Task ExecuteAsync(GenerateAttachmentSummariesBackgroundJob
                     "Executing AI attachment summary background job for {AttachmentCount} attachment(s).",
                     args.AttachmentIds.Count);
 
-                await attachmentAISummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion, args.CapturePromptIo);
+                await attachmentAISummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion);
             }
             catch (Exception ex)
             {
@@ -31,3 +31,5 @@ public override async Task ExecuteAsync(GenerateAttachmentSummariesBackgroundJob
         }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/AIPromptCaptureStore.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/AIPromptCaptureStore.cs
deleted file mode 100644
index ec69a9de20..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/AIPromptCaptureStore.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using Volo.Abp.DependencyInjection;
-
-namespace Unity.GrantManager.AI
-{
-    public class AIPromptCaptureStore : IAIPromptCaptureStore, ISingletonDependency
-    {
-        private const int MaxCapturesPerKey = 50;
-        private readonly ConcurrentDictionary<string, ConcurrentQueue<AIPromptCaptureResponse>> _captures = new(StringComparer.OrdinalIgnoreCase);
-
-        public void Save(AIPromptCaptureResponse capture)
-        {
-            var key = BuildKey(capture.ContextId, capture.PromptType, capture.PromptVersion);
-            var queue = _captures.GetOrAdd(key, _ => new ConcurrentQueue<AIPromptCaptureResponse>());
-            queue.Enqueue(capture);
-
-            while (queue.Count > MaxCapturesPerKey)
-            {
-                queue.TryDequeue(out _);
-            }
-        }
-
-        public IReadOnlyList<AIPromptCaptureResponse> GetRecent(string contextId, string promptType, string? promptVersion = null, int maxResults = 20)
-        {
-            if (!string.IsNullOrWhiteSpace(promptVersion))
-            {
-                var key = BuildKey(contextId, promptType, promptVersion);
-                return _captures.TryGetValue(key, out var captures)
-                    ? captures.OrderByDescending(item => item.CapturedAt).Take(maxResults).ToList()
-                    : Array.Empty<AIPromptCaptureResponse>();
-            }
-
-            return _captures.Values
-                .SelectMany(queue => queue)
-                .Where(item => string.Equals(item.ContextId, contextId, StringComparison.OrdinalIgnoreCase)
-                    && string.Equals(item.PromptType, promptType, StringComparison.OrdinalIgnoreCase))
-                .OrderByDescending(item => item.CapturedAt)
-                .Take(maxResults)
-                .ToList();
-        }
-
-        private static string BuildKey(string contextId, string promptType, string promptVersion)
-        {
-            return $"{contextId.Trim()}::{promptType.Trim()}::{promptVersion.Trim()}";
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/IAIPromptCaptureStore.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/IAIPromptCaptureStore.cs
deleted file mode 100644
index 7c2e5d301a..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Capture/IAIPromptCaptureStore.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-
-namespace Unity.GrantManager.AI
-{
-    public interface IAIPromptCaptureStore
-    {
-        void Save(AIPromptCaptureResponse capture);
-        IReadOnlyList<AIPromptCaptureResponse> GetRecent(string contextId, string promptType, string? promptVersion = null, int maxResults = 20);
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
index fc73aed9ae..e0d36508e3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
@@ -29,7 +29,7 @@ public class ApplicationAIAnalysisService(
             "applicantAgent"
         };
 
-        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
+        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null)
         {
             var application = await applicationRepository.GetAsync(applicationId);
             var formSubmission = await applicationFormSubmissionRepository.GetByApplicationAsync(applicationId);
@@ -57,8 +57,6 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
                 Data = PromptDataPayloadBuilder.BuildPromptDataPayload(application, formSubmission, formSchema, logger),
                 Attachments = attachmentSummaries,
                 PromptVersion = promptVersion,
-                CapturePromptIo = capturePromptIo,
-                CaptureContextId = applicationId.ToString()
             });
 
             var analysisJson = JsonSerializer.Serialize(analysis, _jsonOptionsIndented);
@@ -198,3 +196,5 @@ private static void ProcessNestedFieldRequirements(JObject component, string? ty
         }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
index 01c8c5516a..e3ce20c655 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
@@ -31,7 +31,7 @@ public class ApplicationAIScoringService(
             WriteIndented = true
         };
 
-        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
+        public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null)
         {
             var application = await applicationRepository.GetAsync(applicationId);
             var applicationForm = await applicationFormRepository.GetAsync(application.ApplicationFormId);
@@ -87,8 +87,6 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
                         SectionName = section.Name,
                         SectionSchema = JsonSerializer.SerializeToElement(sectionQuestionsData, _jsonOptions),
                         PromptVersion = promptVersion,
-                        CapturePromptIo = capturePromptIo,
-                        CaptureContextId = applicationId.ToString()
                     };
                     var sectionAnswers = await aiService.GenerateScoresheetSectionAsync(sectionRequest);
 
@@ -193,3 +191,5 @@ private static string ValidateScoresheetJson(string scoresheetAnswers)
         }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
index 2007dee084..6bc25278e1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
@@ -18,7 +18,7 @@ public class AttachmentAISummaryService(
     private const string DefaultContentType = "application/octet-stream";
     private const string SummaryGenerationFailedMessage = "AI summary generation failed.";
 
-    public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null)
     {
         var attachment = await applicationChefsFileAttachmentRepository.GetAsync(attachmentId);
         var fileName = string.IsNullOrWhiteSpace(attachment.FileName) ? "unknown" : attachment.FileName;
@@ -30,8 +30,6 @@ public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? prompt
             FileContent = fileContent,
             ContentType = contentType,
             PromptVersion = promptVersion,
-            CapturePromptIo = capturePromptIo,
-            CaptureContextId = attachment.ApplicationId.ToString()
         });
 
         attachment.AISummary = summaryResponse.Summary;
@@ -40,7 +38,7 @@ public async Task<string> GenerateAndSaveAsync(Guid attachmentId, string? prompt
         return summaryResponse.Summary;
     }
 
-    public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null)
     {
         var summaries = new List<string>();
 
@@ -48,7 +46,7 @@ public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmen
         {
             try
             {
-                summaries.Add(await GenerateAndSaveAsync(attachmentId, promptVersion, capturePromptIo));
+                summaries.Add(await GenerateAndSaveAsync(attachmentId, promptVersion));
             }
             catch (Exception ex)
             {
@@ -60,14 +58,14 @@ public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmen
         return summaries;
     }
 
-    public async Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null)
     {
         var attachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a =>
                 a.ApplicationId == applicationId && string.IsNullOrWhiteSpace(a.AISummary)))
             .Select(a => a.Id)
             .ToList();
 
-        return await GenerateAndSaveAsync(attachmentIds, promptVersion, capturePromptIo);
+        return await GenerateAndSaveAsync(attachmentIds, promptVersion);
     }
 
     private async Task<(byte[] Content, string ContentType)> GetAttachmentContentForSummaryAsync(ApplicationChefsFileAttachment attachment, string fileName)
@@ -104,3 +102,6 @@ public async Task<List<string>> GenerateMissingForApplicationAsync(Guid applicat
         }
     }
 }
+
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
index 382cee8120..f7e2a72ae3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
@@ -5,6 +5,7 @@ namespace Unity.GrantManager.AI
 {
     public interface IApplicationAIAnalysisService
     {
-        Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
+        Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null);
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
index 01b1241069..50e66d753c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
@@ -5,6 +5,7 @@ namespace Unity.GrantManager.AI
 {
     public interface IApplicationAIScoringService
     {
-        Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
+        Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null);
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs
index 021f9128c6..54e6f697fa 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs
@@ -6,7 +6,8 @@ namespace Unity.GrantManager.AI;
 
 public interface IAttachmentAISummaryService
 {
-    Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false);
-    Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false);
-    Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false);
+    Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null);
+    Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null);
+    Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = 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 3b934588e5..284bd39368 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
@@ -21,7 +21,6 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly IConfiguration _configuration;
         private readonly ILogger<OpenAIRuntimeService> _logger;
         private readonly ITextExtractionService _textExtractionService;
-        private readonly IAIPromptCaptureStore _promptIoCaptureStore;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
         private const string AttachmentSummaryPromptType = AIPromptTypes.AttachmentSummary;
         private const string ScoresheetSectionPromptType = AIPromptTypes.ScoresheetSection;
@@ -71,14 +70,12 @@ public OpenAIRuntimeService(
             HttpClient httpClient,
             IConfiguration configuration,
             ILogger<OpenAIRuntimeService> logger,
-            ITextExtractionService textExtractionService,
-            IAIPromptCaptureStore promptIoCaptureStore)
+            ITextExtractionService textExtractionService)
         {
             _httpClient = httpClient;
             _configuration = configuration;
             _logger = logger;
             _textExtractionService = textExtractionService;
-            _promptIoCaptureStore = promptIoCaptureStore;
         }
 
         public Task<bool> IsAvailableAsync()
@@ -109,7 +106,6 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
         {
             ArgumentNullException.ThrowIfNull(request);
             var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationAnalysisPromptType));
-            var capturePromptIo = request.CapturePromptIo;
             var data = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var schema = JsonSerializer.Serialize(request.Schema, JsonLogOptions);
 
@@ -138,7 +134,6 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 AIProviderPayloadValidator.IsValidApplicationAnalysisJson,
                 "application analysis");
             await LogPromptOutputAsync(ApplicationAnalysisPromptType, promptVersion, result.CaptureOutput);
-            SavePromptCapture(capturePromptIo, request.CaptureContextId, ApplicationAnalysisPromptType, promptVersion, "Application Analysis", systemPrompt, analysisContent, result.CaptureOutput);
 
             if (result.Outcome != AIOperationOutcome.Success)
             {
@@ -262,7 +257,6 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             var fileContent = request.FileContent ?? Array.Empty<byte>();
             var contentType = request.ContentType ?? "application/octet-stream";
             var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(AttachmentSummaryPromptType));
-            var capturePromptIo = request.CapturePromptIo;
 
             try
             {
@@ -299,7 +293,6 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
                     AIProviderPayloadValidator.IsValidAttachmentSummaryText,
                     "attachment summary");
                 await LogPromptOutputAsync(AttachmentSummaryPromptType, promptVersion, result.CaptureOutput);
-                SavePromptCapture(capturePromptIo, request.CaptureContextId, AttachmentSummaryPromptType, promptVersion, fileName, prompt, contentToAnalyze, result.CaptureOutput);
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
@@ -399,7 +392,6 @@ public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(Scor
         {
             ArgumentNullException.ThrowIfNull(request);
             var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ScoresheetSectionPromptType));
-            var capturePromptIo = request.CapturePromptIo;
             var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var sectionJson = JsonSerializer.Serialize(request.SectionSchema, JsonLogOptions);
 
@@ -465,7 +457,6 @@ public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(Scor
                     content => AIProviderPayloadValidator.IsValidScoresheetSectionJson(content, sectionJson),
                     $"scoresheet section {request.SectionName}");
                 await LogPromptOutputAsync(ScoresheetSectionPromptType, promptVersion, result.CaptureOutput);
-                SavePromptCapture(capturePromptIo, request.CaptureContextId, ScoresheetSectionPromptType, promptVersion, request.SectionName, systemPrompt, analysisContent, result.CaptureOutput);
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
@@ -1039,27 +1030,6 @@ private bool CanWritePromptFileLog()
         {
             return IsPromptFileLoggingEnabled;
         }
-
-        private void SavePromptCapture(bool capturePromptIo, string? contextId, string promptType, string promptVersion, string captureLabel, string? systemPrompt, string userPrompt, string rawOutput)
-        {
-            if (!capturePromptIo || string.IsNullOrWhiteSpace(contextId))
-            {
-                return;
-            }
-
-            _promptIoCaptureStore.Save(new AIPromptCaptureResponse
-            {
-                ContextId = contextId,
-                PromptType = promptType,
-                PromptVersion = promptVersion,
-                CaptureLabel = captureLabel?.Trim() ?? string.Empty,
-                SystemPrompt = systemPrompt?.Trim() ?? string.Empty,
-                UserPrompt = userPrompt?.Trim() ?? string.Empty,
-                Output = FormatPromptOutputForLog(rawOutput ?? string.Empty),
-                CapturedAt = DateTime.UtcNow
-            });
-        }
-
         private static string FormatPromptInputForLog(string? systemPrompt, string userPrompt)
         {
             var normalizedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt) ? string.Empty : systemPrompt.Trim();
@@ -1462,3 +1432,5 @@ private static string ExtractSummaryFromJson(string output)
 }
 
 
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 8292db25f8..188ad2a5b3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -192,7 +192,7 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
     }
 
     [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
@@ -203,7 +203,6 @@ await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroun
         {
             AttachmentIds = [attachmentId],
             PromptVersion = promptVersion,
-            CapturePromptIo = capturePromptIo,
             TenantId = CurrentTenant.Id
         });
 
@@ -211,7 +210,7 @@ await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroun
     }
 
     [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
@@ -227,10 +226,10 @@ await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroun
         {
             AttachmentIds = attachmentIds,
             PromptVersion = promptVersion,
-            CapturePromptIo = capturePromptIo,
             TenantId = CurrentTenant.Id
         });
 
         return attachmentIds.Select(_ => SummaryGenerationQueuedMessage).ToList();
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
index e14df8f391..57a4da2994 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
@@ -16,7 +16,7 @@ public class ApplicationAIAnalysisAppService(
     IFeatureChecker featureChecker)
     : GrantManagerAppService, IApplicationAIAnalysisAppService
 {
-    public async Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null)
     {
         try
         {
@@ -29,7 +29,6 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIAnalysisBackgro
             {
                 ApplicationId = applicationId,
                 PromptVersion = promptVersion,
-                CapturePromptIo = capturePromptIo,
                 TenantId = CurrentTenant.Id
             });
 
@@ -42,3 +41,4 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIAnalysisBackgro
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIPromptCaptureAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIPromptCaptureAppService.cs
deleted file mode 100644
index 14ededab94..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIPromptCaptureAppService.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Unity.AI.Permissions;
-using Unity.GrantManager.AI;
-using Volo.Abp;
-using Volo.Abp.Authorization;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Features;
-
-namespace Unity.GrantManager.GrantApplications
-{
-    public class ApplicationAIPromptCaptureAppService(
-        IAIPromptCaptureStore promptIoCaptureStore,
-        IWebHostEnvironment webHostEnvironment,
-        IFeatureChecker featureChecker,
-        IPermissionChecker permissionChecker)
-        : GrantManagerAppService, IApplicationAIPromptCaptureAppService
-    {
-        public async Task<List<AIPromptCaptureResponse>> GetRecentAsync(Guid applicationId, string promptType, string? promptVersion = null)
-        {
-            if (!string.Equals(webHostEnvironment.EnvironmentName, "Development", StringComparison.OrdinalIgnoreCase))
-            {
-                throw new UserFriendlyException("Prompt capture is only available in development.");
-            }
-
-            if (string.IsNullOrWhiteSpace(promptType))
-            {
-                return new List<AIPromptCaptureResponse>();
-            }
-
-            await EnsurePromptCapturePermissionAsync(promptType);
-            await EnsurePromptCaptureFeatureEnabledAsync(promptType);
-            var captures = promptIoCaptureStore.GetRecent(applicationId.ToString(), promptType, promptVersion);
-            return new List<AIPromptCaptureResponse>(captures);
-        }
-
-        private async Task EnsurePromptCapturePermissionAsync(string promptType)
-        {
-            var permissionName = promptType switch
-            {
-                AIPromptTypes.AttachmentSummary => AIPermissions.AttachmentSummary.AttachmentSummaryDefault,
-                AIPromptTypes.ApplicationAnalysis => AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault,
-                AIPromptTypes.ScoresheetSection => AIPermissions.ScoringAssistant.ScoringAssistantDefault,
-                _ => null
-            };
-
-            if (string.IsNullOrWhiteSpace(permissionName))
-            {
-                throw new UserFriendlyException("Unknown prompt type.");
-            }
-
-            if (!await permissionChecker.IsGrantedAsync(permissionName))
-            {
-                throw new AbpAuthorizationException("The user doesn't have permission to view prompt capture for this prompt type.");
-            }
-        }
-
-        private async Task EnsurePromptCaptureFeatureEnabledAsync(string promptType)
-        {
-            var featureName = promptType switch
-            {
-                AIPromptTypes.AttachmentSummary => "Unity.AI.AttachmentSummaries",
-                AIPromptTypes.ApplicationAnalysis => "Unity.AI.ApplicationAnalysis",
-                AIPromptTypes.ScoresheetSection => "Unity.AI.Scoring",
-                _ => null
-            };
-
-            if (string.IsNullOrWhiteSpace(featureName))
-            {
-                throw new UserFriendlyException("Unknown prompt type.");
-            }
-
-            if (!await featureChecker.IsEnabledAsync(featureName))
-            {
-                throw new UserFriendlyException("Prompt capture is not enabled for this prompt type.");
-            }
-        }
-    }
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
index 817147ad54..0ba530ceb2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
@@ -16,7 +16,7 @@ public class ApplicationAIScoringAppService(
     IFeatureChecker featureChecker)
     : GrantManagerAppService, IApplicationAIScoringAppService
 {
-    public async Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null, bool capturePromptIo = false)
+    public async Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null)
     {
         try
         {
@@ -29,7 +29,6 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIScoresheetBackg
             {
                 ApplicationId = applicationId,
                 PromptVersion = promptVersion,
-                CapturePromptIo = capturePromptIo,
                 TenantId = CurrentTenant.Id
             });
 
@@ -42,3 +41,4 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIScoresheetBackg
         }
     }
 }
+

From 2fa837651eaf43a6132ba282121996605c35339c Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 10:08:16 -0700
Subject: [PATCH 09/38] AB#32012 add AI content orchestration endpoint

---
 ...teApplicationAIContentBackgroundJobArgs.cs |  1 +
 .../IApplicationAIContentAppService.cs        | 11 ++++
 ...nerateApplicationAIContentBackgroundJob.cs |  9 ++--
 .../ApplicationAIContentAppService.cs         | 50 +++++++++++++++++++
 4 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIContentAppService.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIContentAppService.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
index 9138aa659b..dca9367c2d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
@@ -5,5 +5,6 @@ namespace Unity.GrantManager.AI.BackgroundJobs;
 public class GenerateApplicationAIContentBackgroundJobArgs
 {
     public Guid ApplicationId { get; set; }
+    public string? PromptVersion { get; set; }
     public Guid? TenantId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIContentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIContentAppService.cs
new file mode 100644
index 0000000000..1fd44c66f3
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIContentAppService.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.GrantApplications;
+
+public interface IApplicationAIContentAppService : IApplicationService
+{
+    Task<string> GenerateAIContentAsync(Guid applicationId, string? promptVersion = null);
+}
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
index cc2f300113..6e515f7a52 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
@@ -46,17 +46,17 @@ public override async Task ExecuteAsync(GenerateApplicationAIContentBackgroundJo
 
                 if (attachmentSummariesEnabled)
                 {
-                    await attachmentAISummaryService.GenerateMissingForApplicationAsync(args.ApplicationId);
+                    await attachmentAISummaryService.GenerateMissingForApplicationAsync(args.ApplicationId, args.PromptVersion);
                 }
 
                 if (applicationAnalysisEnabled)
                 {
-                    await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId);
+                    await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
                 }
 
                 if (scoringEnabled)
                 {
-                    var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId);
+                    var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
                     if (!string.Equals(result, "{}", StringComparison.Ordinal))
                     {
                         await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
@@ -73,3 +73,6 @@ await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
         }
     }
 }
+
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIContentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIContentAppService.cs
new file mode 100644
index 0000000000..b826a44423
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIContentAppService.cs
@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Permissions;
+using Unity.GrantManager.AI.BackgroundJobs;
+using Volo.Abp;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.Features;
+
+namespace Unity.GrantManager.GrantApplications;
+
+[Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
+[Authorize(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault)]
+[Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
+public class ApplicationAIContentAppService(
+    IBackgroundJobManager backgroundJobManager,
+    IFeatureChecker featureChecker)
+    : GrantManagerAppService, IApplicationAIContentAppService
+{
+    public async Task<string> GenerateAIContentAsync(Guid applicationId, string? promptVersion = null)
+    {
+        try
+        {
+            var attachmentSummariesEnabled = await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries");
+            var applicationAnalysisEnabled = await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis");
+            var scoringEnabled = await featureChecker.IsEnabledAsync("Unity.AI.Scoring");
+
+            if (!attachmentSummariesEnabled || !applicationAnalysisEnabled || !scoringEnabled)
+            {
+                throw new UserFriendlyException("AI generate all is not enabled.");
+            }
+
+            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIContentBackgroundJobArgs
+            {
+                ApplicationId = applicationId,
+                PromptVersion = promptVersion,
+                TenantId = CurrentTenant.Id
+            });
+
+            return "{}";
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex, "Error queueing full AI content pipeline for application {ApplicationId}", applicationId);
+            throw new UserFriendlyException("Failed to queue AI generate all. Please try again.");
+        }
+    }
+}
+

From d4b1877bac43bc21f53575a9511b215401279bb1 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 10:08:28 -0700
Subject: [PATCH 10/38] AB#32012 show persisted AI outputs in dev panel

---
 .../ApplicationChefsFileAttachmentDto.cs      |  19 +-
 .../GrantApplications/GrantApplicationDto.cs  |   1 +
 .../Pages/GrantApplications/Details.cshtml    |  55 ++-
 .../Pages/GrantApplications/Details.cshtml.cs |  29 +-
 .../Pages/GrantApplications/Details.css       |  26 +-
 .../Pages/GrantApplications/Details.js        | 409 +++++++++++++++---
 .../Pages/GrantApplications/ai-analysis.js    |  12 +-
 .../AssessmentScoresWidget/Default.cshtml     |   2 +
 .../AssessmentScoresWidget/Default.js         |  14 +-
 .../ChefsAttachments/ChefsAttachments.js      |  17 +-
 .../Components/ReviewList/ReviewList.js       |   2 +-
 11 files changed, 444 insertions(+), 142 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs
index 9e9c9c3b12..bb7379a79a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs
@@ -3,10 +3,15 @@
 
 namespace Unity.GrantManager.Attachments;
 
-public class ApplicationChefsFileAttachmentDto : EntityDto<Guid>
-{
-    public Guid ApplicationId { get; set; }
-    public string ChefsSubmissionId { get; set; } = string.Empty;
-    public string ChefsFileId { get; set; } = string.Empty;
-    public string? Name { get; set; }
-}
+public class ApplicationChefsFileAttachmentDto : EntityDto<Guid>
+{
+    public Guid ApplicationId { get; set; }
+    public string ChefsSubmissionId { get; set; } = string.Empty;
+    public string ChefsFileId { get; set; } = string.Empty;
+    public string? Name { get; set; }
+    public string? FileName { get; set; }
+    public string? DisplayName { get; set; }
+    public string? AISummary { get; set; }
+    public DateTime CreationTime { get; set; }
+    public DateTime? LastModificationTime { get; set; }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index f2906d1166..cdbd834baf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -85,4 +85,5 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public string? ApplicantElectoralDistrict { get; set; }
     public string? AIAnalysis { get; set; }
     public ApplicationAnalysisResponse? AIAnalysisData { get; set; }
+    public string? AIScoresheetAnswers { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
index 485c3f6dd9..7fc4863ea3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -1,4 +1,4 @@
-@page "{@Model.ApplicationFormSubmissionId?}"
+@page "{@Model.ApplicationFormSubmissionId?}"
 @* #pragma warning disable S1128 *@
 @using Microsoft.Extensions.Localization
 @using Unity.AI.Permissions
@@ -60,9 +60,10 @@
 <input type="hidden" id="DetailsViewApplicationId" value="@Model.ApplicationId" />
 <input type="hidden" id="ApplicationFormSubmissionId" value="@Model.ApplicationFormSubmissionId" />
 <input type="hidden" id="ChefsSubmissionId" value="@Model.ChefsSubmissionId" />
-<input type="hidden" id="ApplicationFormSubmissionData" value="@Model.ApplicationFormSubmissionData" />
-<input type="hidden" id="ApplicationFormSchema" value="@Model.ApplicationFormSchema" />
-<input type="hidden" id="ApplicationFormId" value="@Model.ApplicationFormId" />
+<input type="hidden" id="ApplicationFormSubmissionData" value="@Model.ApplicationFormSubmissionData" />
+<input type="hidden" id="ApplicationFormSchema" value="@Model.ApplicationFormSchema" />
+<input type="hidden" id="ApplicationScoresheetSchemaJson" value="@Model.ApplicationScoresheetSchemaJson" />
+<input type="hidden" id="ApplicationFormId" value="@Model.ApplicationFormId" />
 <input type="hidden" id="HasRenderedHTML" value="@Model.HasRenderedHTML.ToString()" />
 <input type="hidden" id="CurrentUserId" value="@Model.CurrentUserId" />
 <input type="hidden" id="CurrentUserName" value="@Model.CurrentUserName" />
@@ -490,6 +491,15 @@
                                             <option value="v0">v0</option>
                                         }
                                     </select>
+                                    @if (aiAttachmentSummariesEnabled && aiApplicationAnalysisEnabled && aiScoringEnabled)
+                                    {
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" id="generateAllAiDevToolsBtn">
+                                            <span class="ai-button-content">
+                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                                <span>Generate All</span>
+                                            </span>
+                                        </button>
+                                    }
                                 </div>
                             </div>
                         </div>
@@ -497,10 +507,10 @@
 
                             <div class="dev-prompt-section">
                                 <div class="dev-prompt-section-header">
-                                    <h6 class="fw-bold m-0">Attachment</h6>
+                                    <h6 class="fw-bold m-0">ATTACHMENT <span class="ai-dev-output-timestamp" id="attachmentAiOutputTimestamp"></span></h6>
                                     @if (aiAttachmentSummariesEnabled)
                                     {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="generateAIAttachmentSummaries(true, this)">
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="generateAIAttachmentSummaries(false, this)">
                                             <span class="ai-button-content">
                                                 <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
                                                 <span>Generate</span>
@@ -512,22 +522,22 @@
                                         <span class="text-muted small">Unavailable: feature or permission not enabled</span>
                                     }
                                 </div>
-                                <div id="attachmentPromptCaptureContainer" class="ai-prompt-capture-container">
-                                    <div class="ai-prompt-capture-actions">
-                                        <button type="button" class="btn btn-icon ai-prompt-capture-copy-btn" data-target="#attachmentPromptCaptureOutput" title="Copy" aria-label="Copy">
+                                <div class="ai-dev-output-container">
+                                    <div class="ai-dev-output-actions">
+                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#attachmentAiOutput" title="Copy" aria-label="Copy">
                                             <i class="fl fl-copy" aria-hidden="true"></i>
                                         </button>
                                     </div>
-                                    <textarea class="form-control form-control-sm ai-prompt-capture-output" id="attachmentPromptCaptureOutput" readonly spellcheck="false"></textarea>
+                                    <textarea class="form-control form-control-sm ai-dev-output" id="attachmentAiOutput" readonly spellcheck="false"></textarea>
                                 </div>
                             </div>
 
                             <div class="dev-prompt-section">
                                 <div class="dev-prompt-section-header">
-                                    <h6 class="fw-bold m-0">Analysis</h6>
+                                    <h6 class="fw-bold m-0">ANALYSIS <span class="ai-dev-output-timestamp" id="analysisAiOutputTimestamp"></span></h6>
                                     @if (aiApplicationAnalysisEnabled)
                                     {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIAnalysis(true, this)">
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIAnalysis(false, this)">
                                             <span class="ai-button-content">
                                                 <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
                                                 <span>Generate</span>
@@ -539,22 +549,22 @@
                                         <span class="text-muted small">Unavailable: feature or permission not enabled</span>
                                     }
                                 </div>
-                                <div id="aiAnalysisPromptCaptureContainer" class="ai-prompt-capture-container">
-                                    <div class="ai-prompt-capture-actions">
-                                        <button type="button" class="btn btn-icon ai-prompt-capture-copy-btn" data-target="#aiAnalysisPromptCaptureOutput" title="Copy" aria-label="Copy">
+                                <div class="ai-dev-output-container">
+                                    <div class="ai-dev-output-actions">
+                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#analysisAiOutput" title="Copy" aria-label="Copy">
                                             <i class="fl fl-copy" aria-hidden="true"></i>
                                         </button>
                                     </div>
-                                    <textarea class="form-control form-control-sm ai-prompt-capture-output" id="aiAnalysisPromptCaptureOutput" readonly spellcheck="false"></textarea>
+                                    <textarea class="form-control form-control-sm ai-dev-output" id="analysisAiOutput" readonly spellcheck="false"></textarea>
                                 </div>
                             </div>
 
                             <div class="dev-prompt-section">
                                 <div class="dev-prompt-section-header">
-                                    <h6 class="fw-bold m-0">Scoring</h6>
+                                    <h6 class="fw-bold m-0">SCORING <span class="ai-dev-output-timestamp" id="scoringAiOutputTimestamp"></span></h6>
                                     @if (aiScoringEnabled)
                                     {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIScoresheetAnswers(true, this)">
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIScoresheetAnswers(false, this)">
                                             <span class="ai-button-content">
                                                 <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
                                                 <span>Generate</span>
@@ -566,13 +576,13 @@
                                         <span class="text-muted small">Unavailable: feature or permission not enabled</span>
                                     }
                                 </div>
-                                <div id="aiScoringPromptCaptureContainer" class="ai-prompt-capture-container">
-                                    <div class="ai-prompt-capture-actions">
-                                        <button type="button" class="btn btn-icon ai-prompt-capture-copy-btn" data-target="#aiScoringPromptCaptureOutput" title="Copy" aria-label="Copy">
+                                <div class="ai-dev-output-container">
+                                    <div class="ai-dev-output-actions">
+                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#scoringAiOutput" title="Copy" aria-label="Copy">
                                             <i class="fl fl-copy" aria-hidden="true"></i>
                                         </button>
                                     </div>
-                                    <textarea class="form-control form-control-sm ai-prompt-capture-output" id="aiScoringPromptCaptureOutput" readonly spellcheck="false"></textarea>
+                                    <textarea class="form-control form-control-sm ai-dev-output" id="scoringAiOutput" readonly spellcheck="false"></textarea>
                                 </div>
                             </div>
                         </div>
@@ -583,3 +593,4 @@
         </abp-card>
     </div>
 </div>
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
index 0754eafe3a..f9e12eff2a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
@@ -6,7 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
+using Unity.Flex.Domain.Scoresheets;
+using Unity.Flex.Scoresheets;
 using Unity.Flex.WorksheetLinks;
 using Unity.Flex.Worksheets;
 using Unity.GrantManager.ApplicationForms;
@@ -28,6 +31,7 @@ public class DetailsModel : AbpPageModel
         private readonly GrantApplicationAppService _grantApplicationAppService;
         private readonly IWorksheetLinkAppService _worksheetLinkAppService;
         private readonly IApplicationFormVersionAppService _applicationFormVersionAppService;
+        private readonly IScoresheetRepository _scoresheetRepository;
         private readonly IFeatureChecker _featureChecker;
         protected readonly IZoneManagementAppService _zoneManagementAppService;
 
@@ -94,10 +98,14 @@ public class DetailsModel : AbpPageModel
         [BindProperty(SupportsGet = true)]
         public string DefaultPromptVersion { get; set; }
 
+        [BindProperty(SupportsGet = true)]
+        public string? ApplicationScoresheetSchemaJson { get; set; }
+
         public DetailsModel(
             GrantApplicationAppService grantApplicationAppService,
             IWorksheetLinkAppService worksheetLinkAppService,
             IApplicationFormVersionAppService applicationFormVersionAppService,
+            IScoresheetRepository scoresheetRepository,
             IFeatureChecker featureChecker,
             ICurrentUser currentUser,
             IConfiguration configuration,
@@ -108,6 +116,7 @@ public DetailsModel(
             _worksheetLinkAppService = worksheetLinkAppService;
             _featureChecker = featureChecker;
             _applicationFormVersionAppService = applicationFormVersionAppService;
+            _scoresheetRepository = scoresheetRepository;
             _zoneManagementAppService = zoneManagementAppService;
 
             CurrentUserId = currentUser.Id;
@@ -151,6 +160,7 @@ public async Task OnGetAsync()
             HasRenderedHTML = !string.IsNullOrEmpty(applicationFormSubmission.RenderedHTML);
             ApplicationForm? applicationForm = await _grantApplicationAppService.GetApplicationFormAsync(ApplicationFormId);
             ArgumentNullException.ThrowIfNull(applicationForm);
+            ApplicationScoresheetSchemaJson = await GetApplicationScoresheetSchemaJsonAsync(applicationForm);
             RenderFormIoToHtml = applicationForm.RenderFormIoToHtml;
             if (!string.IsNullOrEmpty(applicationFormSubmission.RenderedHTML) && RenderFormIoToHtml)
             {
@@ -166,7 +176,24 @@ public async Task<IActionResult> OnPostAsync()
         {
             await Task.CompletedTask;
             return Page();
-        }        
+        }
+
+        private async Task<string?> GetApplicationScoresheetSchemaJsonAsync(ApplicationForm applicationForm)
+        {
+            if (applicationForm.ScoresheetId == null || !await _featureChecker.IsEnabledAsync("Unity.Flex"))
+            {
+                return null;
+            }
+
+            var scoresheet = await _scoresheetRepository.GetWithChildrenAsync(applicationForm.ScoresheetId.Value);
+            if (scoresheet == null)
+            {
+                return null;
+            }
+
+            var scoresheetDto = ObjectMapper.Map<Unity.Flex.Domain.Scoresheets.Scoresheet, ScoresheetDto?>(scoresheet);
+            return scoresheetDto == null ? null : JsonSerializer.Serialize(scoresheetDto);
+        }
         
     }
 
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 8b16531fd1..20cfb5b527 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
@@ -72,21 +72,23 @@
     gap: 0.5rem;
 }
 
-.ai-prompt-capture-output {
-    min-height: 18rem;
-    max-height: 32rem;
+.ai-dev-output {
+    min-height: 10rem;
+    max-height: 24rem;
     overflow: auto;
     resize: vertical;
     white-space: pre;
     font-family: Consolas, "Courier New", monospace;
     line-height: 1.35;
+    padding-top: 0.75rem;
+    padding-right: 2.5rem;
 }
 
-.ai-prompt-capture-container {
+.ai-dev-output-container {
     position: relative;
 }
 
-.ai-prompt-capture-actions {
+.ai-dev-output-actions {
     position: absolute;
     top: 0.375rem;
     right: 0.5rem;
@@ -99,13 +101,18 @@
     border-radius: 999px;
 }
 
-.ai-prompt-capture-actions .btn-icon {
+.ai-dev-output-actions .btn-icon {
     width: 2rem;
     height: 2rem;
     padding: 0;
     color: #5c6b7a;
 }
 
+.ai-dev-output-timestamp {
+    font-weight: 400;
+    color: #5c6b7a;
+}
+
 .dev-prompt-section {
     margin-bottom: 1rem;
     padding-bottom: 1rem;
@@ -151,13 +158,6 @@
     gap: 0.75rem;
     flex-wrap: wrap;
 }
-
-.dev-prompt-section .ai-prompt-capture-output {
-    min-height: 4.5rem;
-    max-height: 16rem;
-    padding-top: 0.5rem;
-    padding-right: 2.5rem;
-}
 
 .left-card {
     border-right: 1px solid #dddddd;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index 8b3542b988..88dc2d9134 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -4,49 +4,356 @@
  */
 
 $(function () {
+    const excludedPromptDataKeys = new Set([
+        'simplefile',
+        'applicantAgent',
+        'submit',
+        'lateEntry',
+        'metadata',
+        'full_application_form_submission',
+        'files',
+        'file',
+        'attachments'
+    ]);
+
+    const nonDataComponentTypes = new Set([
+        'button',
+        'simplebuttonadvanced',
+        'html',
+        'htmlelement',
+        'content',
+        'simpleseparator'
+    ]);
+
     globalThis.getSelectedPromptVersion = function() {
         return $('#devPromptVersion').val() || null;
     };
 
-    function setPromptCaptureOutput(outputSelector, value) {
-        $(outputSelector).val(value);
+    function setDevAiOutput(selector, value) {
+        $(selector).val(value || '');
     }
 
-    globalThis.hideAIPromptCapture = function(containerSelector, outputSelector) {
-        setPromptCaptureOutput(outputSelector, '');
-    };
+    function setDevAiOutputTimestamp(selector, value) {
+        $(selector).text(value ? `(${value})` : '');
+    }
+
+    function formatJsonOrRaw(value) {
+        if (!value) {
+            return '';
+        }
+
+        if (typeof value !== 'string') {
+            return JSON.stringify(value, null, 2);
+        }
+
+        try {
+            return JSON.stringify(JSON.parse(value), null, 2);
+        } catch {
+            return value;
+        }
+    }
+
+    function formatSectionBody(title, value) {
+        if (!value) {
+            return '';
+        }
+
+        return `${title}:\n${value}`;
+    }
+
+    function formatOutputBody(title, sections) {
+        const content = sections.filter((section) => section).join('\n\n');
+        if (!content) {
+            return '';
+        }
+
+        const promptVersion = globalThis.getSelectedPromptVersion?.();
+        const header = promptVersion ? `${title} - ${promptVersion}` : title;
+        return `${header}\n\n${content}`;
+    }
+
+    function getScoresheetSchemaJson() {
+        return $('#ApplicationScoresheetSchemaJson').val() ||
+            $('#AssessmentScoresheetSchemaJson').val() ||
+            '';
+    }
+
+    function getPromptDataPayload() {
+        const submissionJson = $('#ApplicationFormSubmissionData').val();
+        if (!submissionJson) {
+            return '';
+        }
+
+        try {
+            const root = JSON.parse(submissionJson);
+            const submissionData = extractSubmissionDataObject(root);
+            if (!submissionData || typeof submissionData !== 'object' || Array.isArray(submissionData)) {
+                return '';
+            }
+
+            const filteredValues = { ...submissionData };
+            for (const key of excludedPromptDataKeys) {
+                delete filteredValues[key];
+            }
+
+            const allowedSchemaKeys = extractAllowedSchemaKeys($('#ApplicationFormSchema').val());
+            const payload = allowedSchemaKeys.size > 0
+                ? Object.fromEntries(
+                    Object.entries(filteredValues).filter(([key]) => allowedSchemaKeys.has(key))
+                )
+                : filteredValues;
+
+            return JSON.stringify(payload, null, 2);
+        } catch {
+            return '';
+        }
+    }
+
+    function extractSubmissionDataObject(root) {
+        if (!root || typeof root !== 'object' || Array.isArray(root)) {
+            return null;
+        }
+
+        if (root.data && typeof root.data === 'object' && !Array.isArray(root.data)) {
+            return root.data;
+        }
+
+        if (
+            root.submission &&
+            typeof root.submission === 'object' &&
+            !Array.isArray(root.submission) &&
+            root.submission.data &&
+            typeof root.submission.data === 'object' &&
+            !Array.isArray(root.submission.data)
+        ) {
+            return root.submission.data;
+        }
+
+        return root;
+    }
+
+    function extractAllowedSchemaKeys(formSchema) {
+        if (!formSchema) {
+            return new Set();
+        }
 
+        try {
+            const schema = JSON.parse(formSchema);
+            const keys = new Set();
+            extractSchemaKeys(schema.components, keys);
+            return keys;
+        } catch {
+            return new Set();
+        }
+    }
 
-    globalThis.renderAIPromptCapture = function(containerSelector, outputSelector, captures) {
-        if (!Array.isArray(captures) || captures.length === 0) {
-            globalThis.hideAIPromptCapture(containerSelector, outputSelector);
+    function extractSchemaKeys(components, keys) {
+        if (!Array.isArray(components)) {
             return;
         }
 
-        const formatted = captures
-            .map((capture) => formatAIPromptCaptureBlock(capture))
-            .join('\n\n----------------------------------------\n\n');
+        for (const component of components) {
+            if (!component || typeof component !== 'object') {
+                continue;
+            }
+
+            const key = component.key;
+            const type = component.type;
+            const isInput = component.input === true;
 
-        setPromptCaptureOutput(outputSelector, formatted);
-    };
+            if (
+                typeof key === 'string' &&
+                typeof type === 'string' &&
+                !nonDataComponentTypes.has(type.toLowerCase()) &&
+                isInput
+            ) {
+                keys.add(key);
+            }
+
+            if (Array.isArray(component.components)) {
+                extractSchemaKeys(component.components, keys);
+            }
+
+            if (Array.isArray(component.columns)) {
+                for (const column of component.columns) {
+                    if (column && Array.isArray(column.components)) {
+                        extractSchemaKeys(column.components, keys);
+                    }
+                }
+            }
+        }
+    }
 
-    globalThis.loadAIPromptCapture = function(applicationId, promptType, promptVersion, containerSelector, outputSelector) {
-        if (!applicationId || !promptType) {
-            globalThis.hideAIPromptCapture(containerSelector, outputSelector);
-            return Promise.resolve();
+    function formatTimestamp(value) {
+        if (!value) {
+            return '';
         }
 
-        return unity.grantManager.grantApplications.applicationAIPromptCapture
-            .getRecent(applicationId, promptType, promptVersion || null)
-            .then(function(captures) {
-                globalThis.renderAIPromptCapture(containerSelector, outputSelector, captures || []);
+        const timestamp = new Date(value);
+        if (Number.isNaN(timestamp.getTime())) {
+            return '';
+        }
+
+        return timestamp.toLocaleString();
+    }
+
+    function formatAttachmentAiOutput(attachments) {
+        const attachmentBody = formatAttachmentSummaryBody(attachments);
+        if (!attachmentBody) {
+            setDevAiOutputTimestamp('#attachmentAiOutputTimestamp', '');
+            return '';
+        }
+
+        const summarizedAttachments = attachments.filter(
+            (attachment) => attachment.aiSummary && attachment.aiSummary.trim() !== ''
+        );
+
+        const latestTimestamp = summarizedAttachments
+            .map((attachment) => attachment.lastModificationTime || attachment.creationTime || null)
+            .filter((timestamp) => !!timestamp)
+            .sort()
+            .at(-1);
+
+        setDevAiOutputTimestamp('#attachmentAiOutputTimestamp', formatTimestamp(latestTimestamp));
+        return attachmentBody;
+    }
+
+    function formatAttachmentSummaryBody(attachments) {
+        if (!Array.isArray(attachments) || attachments.length === 0) {
+            return '';
+        }
+
+        const summarizedAttachments = attachments.filter(
+            (attachment) => attachment.aiSummary && attachment.aiSummary.trim() !== ''
+        );
+
+        if (summarizedAttachments.length === 0) {
+            return '';
+        }
+
+        return summarizedAttachments.map(function(attachment) {
+            return [
+                `NAME: ${attachment.fileName || ''}`,
+                'SUMMARY:',
+                attachment.aiSummary || ''
+            ].join('\n');
+        }).join('\n\n----------------------------------------\n\n');
+    }
+
+    function loadAttachmentAiOutput(applicationId) {
+        if (!applicationId) {
+            setDevAiOutput('#attachmentAiOutput', '');
+            setDevAiOutputTimestamp('#attachmentAiOutputTimestamp', '');
+            return;
+        }
+
+        unity.grantManager.attachments.attachment
+            .getApplicationChefsFileAttachments(applicationId)
+            .done(function(attachments) {
+                setDevAiOutput('#attachmentAiOutput', formatAttachmentAiOutput(attachments));
+            })
+            .fail(function() {
+                setDevAiOutput('#attachmentAiOutput', '');
+            });
+    }
+
+    function loadApplicationAiOutputs() {
+        const applicationId = $('#DetailsViewApplicationId').val();
+
+        if (!applicationId) {
+            setDevAiOutput('#analysisAiOutput', '');
+            setDevAiOutput('#scoringAiOutput', '');
+            setDevAiOutput('#attachmentAiOutput', '');
+            setDevAiOutputTimestamp('#analysisAiOutputTimestamp', '');
+            setDevAiOutputTimestamp('#scoringAiOutputTimestamp', '');
+            setDevAiOutputTimestamp('#attachmentAiOutputTimestamp', '');
+            return;
+        }
+
+        $.when(
+            unity.grantManager.grantApplications.grantApplication.get(applicationId),
+            unity.grantManager.attachments.attachment.getApplicationChefsFileAttachments(applicationId)
+        )
+            .done(function(applicationResponse, attachmentsResponse) {
+                const application = Array.isArray(applicationResponse) ? applicationResponse[0] : applicationResponse;
+                const attachments = Array.isArray(attachmentsResponse) ? attachmentsResponse[0] : attachmentsResponse;
+                const updatedAt = application?.lastModificationTime || application?.creationTime || null;
+                const formattedUpdatedAt = formatTimestamp(updatedAt);
+                const attachmentSection = formatSectionBody('ATTACHMENTS', formatAttachmentSummaryBody(attachments));
+                setDevAiOutputTimestamp('#analysisAiOutputTimestamp', formattedUpdatedAt);
+                setDevAiOutputTimestamp('#scoringAiOutputTimestamp', formattedUpdatedAt);
+                setDevAiOutput(
+                    '#analysisAiOutput',
+                    formatOutputBody('ANALYSIS', [
+                        formatSectionBody('DATA', getPromptDataPayload()),
+                        attachmentSection,
+                        formatSectionBody(
+                            'OUTPUT',
+                            formatJsonOrRaw(application?.aiAnalysisData ?? application?.aiAnalysis ?? '')
+                        )
+                    ])
+                );
+                setDevAiOutput(
+                    '#scoringAiOutput',
+                    formatOutputBody('SCORING', [
+                        formatSectionBody('SCORESHEET', formatJsonOrRaw(getScoresheetSchemaJson())),
+                        formatSectionBody('DATA', getPromptDataPayload()),
+                        attachmentSection,
+                        formatSectionBody(
+                            'OUTPUT',
+                            formatJsonOrRaw(application?.aiScoresheetAnswers ?? application?.aIScoresheetAnswers ?? '')
+                        )
+                    ])
+                );
+                setDevAiOutput(
+                    '#attachmentAiOutput',
+                    formatOutputBody('ATTACHMENT', [formatAttachmentAiOutput(attachments)])
+                );
+            })
+            .fail(function() {
+                setDevAiOutput('#analysisAiOutput', '');
+                setDevAiOutput('#scoringAiOutput', '');
+                setDevAiOutput('#attachmentAiOutput', '');
+                setDevAiOutputTimestamp('#analysisAiOutputTimestamp', '');
+                setDevAiOutputTimestamp('#scoringAiOutputTimestamp', '');
+                setDevAiOutputTimestamp('#attachmentAiOutputTimestamp', '');
+            });
+    }
+
+    globalThis.refreshDevAiOutputs = loadApplicationAiOutputs;
+
+    globalThis.generateAllAIDevOutputs = function(triggerButton = null) {
+        const $button = triggerButton ? $(triggerButton) : $('#generateAllAiDevToolsBtn');
+        const existingHtml = $button.html();
+        const applicationId = $('#DetailsViewApplicationId').val();
+        const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
+
+        if (!applicationId || $button.prop('disabled')) {
+            return;
+        }
+
+        $button
+            .html('<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>')
+            .prop('disabled', true);
+
+        unity.grantManager.grantApplications.applicationAIContent
+            .generateAIContent(applicationId, promptVersion)
+            .done(function() {
+                abp.notify.success('AI generate all queued. Refresh later to see updated results.');
+            })
+            .fail(function() {
+                abp.message.error('Failed to queue AI generate all. Please try again.');
             })
-            .catch(function() {
-                globalThis.hideAIPromptCapture(containerSelector, outputSelector);
+            .always(function() {
+                $button.html(existingHtml).prop('disabled', false);
             });
     };
 
-    $(document).on('click', '.ai-prompt-capture-copy-btn', async function () {
+    $('#generateAllAiDevToolsBtn').on('click', function() {
+        globalThis.generateAllAIDevOutputs(this);
+    });
+
+    $(document).on('click', '.ai-dev-output-copy-btn', async function () {
         const targetSelector = $(this).data('target');
         const text = $(targetSelector).val();
 
@@ -56,7 +363,7 @@ $(function () {
 
         try {
             await navigator.clipboard.writeText(text);
-            abp.notify.success('Copied prompt capture.');
+            abp.notify.success('Copied AI output.');
         } catch {
             const output = $(targetSelector);
             output.trigger('focus');
@@ -92,6 +399,7 @@ $(function () {
         updateLinksCounters();
         renderSubmission();
         loadAIAnalysis();
+        loadApplicationAiOutputs();
         applyTabHeightOffset();
     }
 
@@ -374,23 +682,11 @@ $(function () {
     PubSub.subscribe('refresh_assessment_scores', (msg, data) => {
         assessmentScoresWidgetManager.refresh();
         updateSubtotal();
+        loadApplicationAiOutputs();
+    });
 
-        if (!data) {
-            return;
-        }
-
-        if (data.capturePromptIo && globalThis.loadAIPromptCapture) {
-            globalThis.loadAIPromptCapture(
-                data.applicationId,
-                'ScoresheetSection',
-                data.promptVersion || null,
-                '#aiScoringPromptCaptureContainer',
-                '#aiScoringPromptCaptureOutput'
-            );
-            return;
-        }
-
-        globalThis.hideAIPromptCapture?.('#aiScoringPromptCaptureContainer', '#aiScoringPromptCaptureOutput');
+    PubSub.subscribe('refresh_chefs_attachment_list', () => {
+        loadAttachmentAiOutput($('#DetailsViewApplicationId').val());
     });
 
     PubSub.subscribe('select_application_review', (msg, data) => {
@@ -884,36 +1180,6 @@ $(function () {
     globalThis.addEventListener('resize', windowResize);
 });
 
-function formatAIPromptCaptureBlock(capture) {
-    const output = capture.output || '';
-    const parts = [
-        `PROMPT TYPE: ${capture.promptType || ''}`,
-        `PROMPT VERSION: ${capture.promptVersion || ''}`
-    ];
-
-    if (capture.captureLabel) {
-        parts.push(`LABEL: ${capture.captureLabel}`);
-    }
-
-    if (capture.capturedAt) {
-        parts.push(`CAPTURED AT: ${capture.capturedAt}`);
-    }
-
-    parts.push(
-        '',
-        'SYSTEM PROMPT',
-        capture.systemPrompt || '',
-        '',
-        'USER PROMPT',
-        capture.userPrompt || '',
-        '',
-        'OUTPUT',
-        output
-    );
-
-    return parts.join('\n');
-}
-
 
 // Handle the card header click event
 function onCardHeaderClick(clickedHeader, cardHeaders) {
@@ -1377,3 +1643,4 @@ function clearCurrencyError(input) {
     input.attr('aria-invalid', 'false');
 }
 
+
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 93e6d79af6..5c39b850e6 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
@@ -391,7 +391,7 @@ function tryParseRawAnalysis(analysisJson) {
     }
 }
 
-globalThis.regenerateAIAnalysis = function(capturePromptIo = false, triggerButton = null) {
+globalThis.regenerateAIAnalysis = function(triggerButton = null) {
     const applicationId = $('#DetailsViewApplicationId').val();
     const $button = triggerButton ? $(triggerButton) : $('#regenerateAiAnalysis');
     const existingHtml = $button.html();
@@ -401,18 +401,14 @@ globalThis.regenerateAIAnalysis = function(capturePromptIo = false, triggerButto
         return;
     }
 
-    if (!capturePromptIo && globalThis.hideAIPromptCapture) {
-        globalThis.hideAIPromptCapture('#aiAnalysisPromptCaptureContainer', '#aiAnalysisPromptCaptureOutput');
-    }
-
     $button
         .html('<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>')
         .prop('disabled', true);
 
     unity.grantManager.grantApplications.applicationAIAnalysis
-        .generateAIAnalysis(applicationId, promptVersion, capturePromptIo)
+        .generateAIAnalysis(applicationId, promptVersion)
         .then(function() {
-            abp.notify.success('AI analysis queued. Check back shortly for results.');
+            abp.notify.success('AI analysis queued. Refresh later to see updated results.');
         })
         .catch(function() {
             abp.message.error('Failed to queue AI analysis. Please try again.');
@@ -462,3 +458,5 @@ $(function() {
         });
     }
 });
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
index 6fcb6be0be..d56e291998 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
@@ -7,6 +7,7 @@
 @using Unity.Flex.Scoresheets;
 @using Unity.Flex;
 @using Unity.Flex.Scoresheets.Enums;
+@using System.Text.Json;
 
 @model AssessmentScoresWidgetViewModel
 @{
@@ -16,6 +17,7 @@
 @if (Model.Scoresheet != null)
 {
     <abp-input type="hidden" id="AssessmentId" asp-for="@Model.AssessmentId" />
+    <input type="hidden" id="AssessmentScoresheetSchemaJson" value='@JsonSerializer.Serialize(Model.Scoresheet)' />
     <div class="container-fluid px-3" id="assessment-scoresheet">
         @if (Model.Scoresheet.Sections.Any())
         {
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 6c58a2128e..6ef49f20fb 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
@@ -1,4 +1,4 @@
-function saveScoresSection(formId, sectionId) {
+function saveScoresSection(formId, sectionId) {
     const assessmentId = $('#AssessmentId').val();
     const secSaveButton = document.getElementById(
         'scoresheet-section-save-' + sectionId
@@ -577,7 +577,7 @@ function collapseAllAccordions(divId) {
     });
 }
 
-function regenerateAIScoresheetAnswers(capturePromptIo = false, triggerButton = null) {
+function regenerateAIScoresheetAnswers(triggerButton = null) {
     const applicationId = $('#DetailsViewApplicationId').val();
     const $button = triggerButton ? $(triggerButton) : $('#regenerateAiScoresheetBtn');
     const existingHtml = $button.html();
@@ -587,10 +587,6 @@ function regenerateAIScoresheetAnswers(capturePromptIo = false, triggerButton =
         return;
     }
 
-    if (!capturePromptIo && globalThis.hideAIPromptCapture) {
-        globalThis.hideAIPromptCapture('#aiScoringPromptCaptureContainer', '#aiScoringPromptCaptureOutput');
-    }
-
     $button
         .html(
             '<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>'
@@ -598,9 +594,9 @@ function regenerateAIScoresheetAnswers(capturePromptIo = false, triggerButton =
         .prop('disabled', true);
 
     unity.grantManager.grantApplications.applicationAIScoring
-        .generateAIScoresheetAnswers(applicationId, promptVersion, capturePromptIo)
+        .generateAIScoresheetAnswers(applicationId, promptVersion)
         .done(function () {
-            abp.notify.success('AI scoring queued. Check back shortly for results.');
+            abp.notify.success('AI scoring queued. Refresh later to see updated results.');
         })
         .fail(function () {
             abp.message.error(
@@ -611,3 +607,5 @@ function regenerateAIScoresheetAnswers(capturePromptIo = false, triggerButton =
             $button.html(existingHtml).prop('disabled', false);
         });
 }
+
+
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 eb8c27d8bb..fdec44edae 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
@@ -1,8 +1,7 @@
 // Note: File depends on Unity.GrantManager.Web\Views\Shared\Components\_Shared\Attachments.js
 $(function () {
-    globalThis.generateAIAttachmentSummaries = function(capturePromptIo = false, triggerButton = null) {
+    globalThis.generateAIAttachmentSummaries = function(triggerButton = null) {
         $('#generateAiSummaries')
-            .data('capture-prompt-io', capturePromptIo)
             .data('trigger-button', triggerButton || null)
             .trigger('click');
     };
@@ -223,10 +222,8 @@ $(function () {
                 ? chefsDataTable.rows().data()
                 : chefsDataTable.rows({ selected: true }).data();
             const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
-            const capturePromptIo = $button.data('capture-prompt-io') === true;
             const applicationId = $('#DetailsViewApplicationId').val();
 
-            $button.removeData('capture-prompt-io');
             $button.removeData('trigger-button');
 
             if (rowsToProcess.length === 0) {
@@ -242,18 +239,12 @@ $(function () {
 
             const existingHTML = $activeButton.html();
 
-            if (!capturePromptIo && globalThis.hideAIPromptCapture) {
-                globalThis.hideAIPromptCapture('#attachmentPromptCaptureContainer', '#attachmentPromptCaptureOutput');
-            }
-
             // Call the backend API
             $.ajax({
                 url:
                     '/api/app/attachment/generate-aISummaries-attachments' +
                     '?promptVersion=' +
-                    encodeURIComponent(promptVersion || '') +
-                    '&capturePromptIo=' +
-                    encodeURIComponent(String(capturePromptIo)),
+                    encodeURIComponent(promptVersion || ''),
                 data: JSON.stringify(attachmentIds),
                 contentType: 'application/json',
                 type: 'POST',
@@ -268,7 +259,7 @@ $(function () {
                     abp.notify.success(
                         'AI summaries queued for ' +
                             summaries.length +
-                            ' attachment(s). Check back shortly for results.'
+                            ' attachment(s). Refresh later to see updated results.'
                     );
 
                     resetAttachmentSelectionState();
@@ -625,3 +616,5 @@ function showChefsAPIAccessError() {
     });
 }
 
+
+
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 afea5aa7a7..0b945b6435 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
@@ -471,7 +471,7 @@ function generateAiButtonAction(e, dt, button, config) {
 
     unity.grantManager.grantApplications.applicationAIScoring.generateAIScoresheetAnswers(pageApplicationId, promptVersion, false)
         .done(function () {
-            abp.notify.success('AI scoring queued. Check back shortly for results.');
+            abp.notify.success('AI scoring queued. Refresh later to see updated results.');
         })
         .fail(function () {
             abp.message.error('Failed to queue AI scoring. Please try again.');

From 0720d9d471ee51f621bf16a592cea1c319fe623f Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 11:53:39 -0700
Subject: [PATCH 11/38] AB#32012 rename AI operation files for standardized
 naming

---
 ...JobArgs.cs => GenerateApplicationAnalysisBackgroundJobArgs.cs} | 0
 ...dJobArgs.cs => GenerateApplicationScoringBackgroundJobArgs.cs} | 0
 ...ndJobArgs.cs => GenerateAttachmentSummaryBackgroundJobArgs.cs} | 0
 ...ntBackgroundJobArgs.cs => GenerateContentBackgroundJobArgs.cs} | 0
 .../{ScoresheetSectionAnswer.cs => ApplicationScoringAnswer.cs}   | 0
 .../{ScoresheetSectionRequest.cs => ApplicationScoringRequest.cs} | 0
 ...ScoresheetSectionResponse.cs => ApplicationScoringResponse.cs} | 0
 ...nAIAnalysisAppService.cs => IApplicationAnalysisAppService.cs} | 0
 ...ionAIContentAppService.cs => IApplicationContentAppService.cs} | 0
 ...ionAIScoringAppService.cs => IApplicationScoringAppService.cs} | 0
 ...ckgroundJob.cs => GenerateApplicationAnalysisBackgroundJob.cs} | 0
 ...ackgroundJob.cs => GenerateApplicationScoringBackgroundJob.cs} | 0
 ...BackgroundJob.cs => GenerateAttachmentSummaryBackgroundJob.cs} | 0
 ...nAIContentBackgroundJob.cs => GenerateContentBackgroundJob.cs} | 0
 ...licationAIAnalysisService.cs => ApplicationAnalysisService.cs} | 0
 ...pplicationAIScoringService.cs => ApplicationScoringService.cs} | 0
 ...{AttachmentAISummaryService.cs => AttachmentSummaryService.cs} | 0
 ...icationAIAnalysisService.cs => IApplicationAnalysisService.cs} | 0
 ...plicationAIScoringService.cs => IApplicationScoringService.cs} | 0
 ...AttachmentAISummaryService.cs => IAttachmentSummaryService.cs} | 0
 .../v0/{analysis.system.txt => application-analysis.system.txt}   | 0
 .../v0/{analysis.user.txt => application-analysis.user.txt}       | 0
 .../v0/{scoresheet.system.txt => application-scoring.system.txt}  | 0
 .../v0/{scoresheet.user.txt => application-scoring.user.txt}      | 0
 .../v0/{attachment.system.txt => attachment-summary.system.txt}   | 0
 .../v0/{attachment.user.txt => attachment-summary.user.txt}       | 0
 .../v1/{analysis.output.txt => application-analysis.output.txt}   | 0
 .../v1/{analysis.rubric.txt => application-analysis.rubric.txt}   | 0
 .../v1/{analysis.rules.txt => application-analysis.rules.txt}     | 0
 .../v1/{analysis.score.txt => application-analysis.score.txt}     | 0
 .../v1/{analysis.system.txt => application-analysis.system.txt}   | 0
 .../v1/{analysis.user.txt => application-analysis.user.txt}       | 0
 .../v1/{scoresheet.output.txt => application-scoring.output.txt}  | 0
 .../v1/{scoresheet.rules.txt => application-scoring.rules.txt}    | 0
 .../v1/{scoresheet.system.txt => application-scoring.system.txt}  | 0
 .../v1/{scoresheet.user.txt => application-scoring.user.txt}      | 0
 .../v1/{attachment.output.txt => attachment-summary.output.txt}   | 0
 .../v1/{attachment.rules.txt => attachment-summary.rules.txt}     | 0
 .../v1/{attachment.system.txt => attachment-summary.system.txt}   | 0
 .../v1/{attachment.user.txt => attachment-summary.user.txt}       | 0
 ...onAIAnalysisAppService.cs => ApplicationAnalysisAppService.cs} | 0
 ...tionAIContentAppService.cs => ApplicationContentAppService.cs} | 0
 ...tionAIScoringAppService.cs => ApplicationScoringAppService.cs} | 0
 ...ersGeneratedEvent.cs => AIApplicationScoringGeneratedEvent.cs} | 0
 ...{CreateAiAssessmentHandler.cs => CreateAIAssessmentHandler.cs} | 0
 45 files changed, 0 insertions(+), 0 deletions(-)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/{GenerateApplicationAIAnalysisBackgroundJobArgs.cs => GenerateApplicationAnalysisBackgroundJobArgs.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/{GenerateApplicationAIScoresheetBackgroundJobArgs.cs => GenerateApplicationScoringBackgroundJobArgs.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/{GenerateAttachmentSummariesBackgroundJobArgs.cs => GenerateAttachmentSummaryBackgroundJobArgs.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/{GenerateApplicationAIContentBackgroundJobArgs.cs => GenerateContentBackgroundJobArgs.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/{ScoresheetSectionAnswer.cs => ApplicationScoringAnswer.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/{ScoresheetSectionRequest.cs => ApplicationScoringRequest.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/{ScoresheetSectionResponse.cs => ApplicationScoringResponse.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/{IApplicationAIAnalysisAppService.cs => IApplicationAnalysisAppService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/{IApplicationAIContentAppService.cs => IApplicationContentAppService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/{IApplicationAIScoringAppService.cs => IApplicationScoringAppService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/{GenerateApplicationAIAnalysisBackgroundJob.cs => GenerateApplicationAnalysisBackgroundJob.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/{GenerateApplicationAIScoresheetBackgroundJob.cs => GenerateApplicationScoringBackgroundJob.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/{GenerateAttachmentSummariesBackgroundJob.cs => GenerateAttachmentSummaryBackgroundJob.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/{GenerateApplicationAIContentBackgroundJob.cs => GenerateContentBackgroundJob.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{ApplicationAIAnalysisService.cs => ApplicationAnalysisService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{ApplicationAIScoringService.cs => ApplicationScoringService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{AttachmentAISummaryService.cs => AttachmentSummaryService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{IApplicationAIAnalysisService.cs => IApplicationAnalysisService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{IApplicationAIScoringService.cs => IApplicationScoringService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/{IAttachmentAISummaryService.cs => IAttachmentSummaryService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/{analysis.system.txt => application-analysis.system.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/{analysis.user.txt => application-analysis.user.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/{scoresheet.system.txt => application-scoring.system.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/{scoresheet.user.txt => application-scoring.user.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/{attachment.system.txt => attachment-summary.system.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/{attachment.user.txt => attachment-summary.user.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{analysis.output.txt => application-analysis.output.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{analysis.rubric.txt => application-analysis.rubric.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{analysis.rules.txt => application-analysis.rules.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{analysis.score.txt => application-analysis.score.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{analysis.system.txt => application-analysis.system.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{analysis.user.txt => application-analysis.user.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{scoresheet.output.txt => application-scoring.output.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{scoresheet.rules.txt => application-scoring.rules.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{scoresheet.system.txt => application-scoring.system.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{scoresheet.user.txt => application-scoring.user.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{attachment.output.txt => attachment-summary.output.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{attachment.rules.txt => attachment-summary.rules.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{attachment.system.txt => attachment-summary.system.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/{attachment.user.txt => attachment-summary.user.txt} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/{ApplicationAIAnalysisAppService.cs => ApplicationAnalysisAppService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/{ApplicationAIContentAppService.cs => ApplicationContentAppService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/{ApplicationAIScoringAppService.cs => ApplicationScoringAppService.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/{AiScoresheetAnswersGeneratedEvent.cs => AIApplicationScoringGeneratedEvent.cs} (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/{CreateAiAssessmentHandler.cs => CreateAIAssessmentHandler.cs} (100%)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJobArgs.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJobArgs.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJobArgs.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateContentBackgroundJobArgs.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJobArgs.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateContentBackgroundJobArgs.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ScoresheetSectionAnswer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ScoresheetSectionAnswer.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ScoresheetSectionRequest.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ScoresheetSectionResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ScoresheetSectionResponse.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIAnalysisAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIContentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIContentAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAIScoringAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIAnalysisBackgroundJob.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIScoresheetBackgroundJob.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummariesBackgroundJob.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAIContentBackgroundJob.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAIScoringService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentAISummaryService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIAnalysisService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAIScoringService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentAISummaryService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-analysis.system.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.system.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-analysis.system.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-analysis.user.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/analysis.user.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-analysis.user.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-scoring.system.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.system.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-scoring.system.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-scoring.user.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/scoresheet.user.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/application-scoring.user.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment-summary.system.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.system.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment-summary.system.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment-summary.user.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment.user.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v0/attachment-summary.user.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.output.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.output.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.output.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.output.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rubric.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.rubric.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rubric.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.rubric.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.rules.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.score.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.score.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.score.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.score.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.system.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.system.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.user.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/analysis.user.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-analysis.user.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.output.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.output.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.output.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.output.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.rules.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.rules.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.rules.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.system.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.system.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.user.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/scoresheet.user.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/application-scoring.user.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.output.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.output.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.output.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.output.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.rules.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.rules.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.rules.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.rules.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.system.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.system.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.system.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.system.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.user.txt b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.user.txt
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment.user.txt
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/v1/attachment-summary.user.txt
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIAnalysisAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIContentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationContentAppService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIContentAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationContentAppService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAIScoringAppService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AiScoresheetAnswersGeneratedEvent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AIApplicationScoringGeneratedEvent.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AiScoresheetAnswersGeneratedEvent.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AIApplicationScoringGeneratedEvent.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAiAssessmentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAiAssessmentHandler.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs

From ff30f9be16fff0b30c1a51646caf7fec8c1be7ad Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 11:54:28 -0700
Subject: [PATCH 12/38] AB#32012 align AI backend naming with standardized
 operations

---
 ...ateApplicationAnalysisBackgroundJobArgs.cs |   2 +-
 ...rateApplicationScoringBackgroundJobArgs.cs |   2 +-
 ...erateAttachmentSummaryBackgroundJobArgs.cs |   2 +-
 .../GenerateContentBackgroundJobArgs.cs       |   2 +-
 .../AI/IAIService.cs                          |   3 +-
 .../AI/Models/ApplicationScoringAnswer.cs     |   3 +-
 .../AI/Requests/ApplicationScoringRequest.cs  |   3 +-
 .../Responses/ApplicationScoringResponse.cs   |   5 +-
 .../Attachments/IAttachmentAppService.cs      |   4 +-
 .../IApplicationAnalysisAppService.cs         |   4 +-
 .../IApplicationContentAppService.cs          |   5 +-
 .../IApplicationScoringAppService.cs          |   4 +-
 ...enerateApplicationAnalysisBackgroundJob.cs |  10 +-
 ...GenerateApplicationScoringBackgroundJob.cs |  18 ++-
 .../GenerateAttachmentSummaryBackgroundJob.cs |  12 +-
 .../GenerateContentBackgroundJob.cs           |  21 ++--
 .../Operations/ApplicationAnalysisService.cs  |   4 +-
 .../Operations/ApplicationScoringService.cs   |  21 ++--
 .../AI/Operations/AttachmentSummaryService.cs |   4 +-
 .../Operations/IApplicationAnalysisService.cs |   2 +-
 .../Operations/IApplicationScoringService.cs  |   2 +-
 .../Operations/IAttachmentSummaryService.cs   |   2 +-
 .../AI/Prompts/AIPromptTypes.cs               |   3 +-
 .../AI/Prompts/Versions/README.md             |  30 ++---
 .../AI/Runtime/AIProviderPayloadValidator.cs  |   3 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        | 119 +++++++++---------
 .../Attachments/AttachmentAppService.cs       |   8 +-
 .../ApplicationAnalysisAppService.cs          |   8 +-
 .../ApplicationContentAppService.cs           |   9 +-
 .../ApplicationScoringAppService.cs           |  12 +-
 .../AIApplicationScoringGeneratedEvent.cs     |   2 +-
 .../Handlers/CreateAIAssessmentHandler.cs     |   8 +-
 .../Handlers/GenerateAIContentHandler.cs      |   2 +-
 33 files changed, 168 insertions(+), 171 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
index c05f6ea8a1..7829f8028b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJobArgs.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateApplicationAIAnalysisBackgroundJobArgs
+public class GenerateApplicationAnalysisBackgroundJobArgs
 {
     public Guid ApplicationId { get; set; }
     public string? PromptVersion { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
index a244055213..234f8ec706 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJobArgs.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateApplicationAIScoresheetBackgroundJobArgs
+public class GenerateApplicationScoringBackgroundJobArgs
 {
     public Guid ApplicationId { get; set; }
     public string? PromptVersion { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
index 85c11f6ff9..7836e5abe3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJobArgs.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateAttachmentSummariesBackgroundJobArgs
+public class GenerateAttachmentSummaryBackgroundJobArgs
 {
     public List<Guid> AttachmentIds { get; set; } = [];
     public string? PromptVersion { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateContentBackgroundJobArgs.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateContentBackgroundJobArgs.cs
index dca9367c2d..d320bf8316 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateContentBackgroundJobArgs.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/BackgroundJobs/GenerateContentBackgroundJobArgs.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateApplicationAIContentBackgroundJobArgs
+public class GenerateContentBackgroundJobArgs
 {
     public Guid ApplicationId { get; set; }
     public string? PromptVersion { get; set; }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
index d14438a2d2..9711922f85 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
@@ -9,6 +9,7 @@ public interface IAIService
         Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequest request);
         Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request);
         Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request);
-        Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(ScoresheetSectionRequest request);
+        Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request);
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
index 0a76cbb0e0..68279c942f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ScoresheetSectionAnswer
+    public class ApplicationScoringAnswer
     {
         [JsonPropertyName(AIJsonKeys.Answer)]
         public JsonElement Answer { get; set; }
@@ -15,3 +15,4 @@ public class ScoresheetSectionAnswer
         public int Confidence { get; set; }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
index 38d46ecac8..c24645e3fa 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ScoresheetSectionRequest
+    public class ApplicationScoringRequest
     {
         [JsonPropertyName("data")]
         public JsonElement Data { get; set; }
@@ -24,3 +24,4 @@ public class ScoresheetSectionRequest
 }
 
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
index cf4569dd07..1aa72b9334 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
@@ -3,9 +3,10 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ScoresheetSectionResponse
+    public class ApplicationScoringResponse
     {
         [JsonPropertyName("answers")]
-        public Dictionary<string, ScoresheetSectionAnswer> Answers { get; set; } = new();
+        public Dictionary<string, ApplicationScoringAnswer> Answers { get; set; } = new();
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
index b6850948a9..ad0af4ab39 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
@@ -13,7 +13,7 @@ public interface IAttachmentAppService : IApplicationService
     Task<IList<UnityAttachmentDto>> GetAttachmentsAsync(AttachmentParametersDto attachmentParametersDto);
     Task<AttachmentMetadataDto> GetAttachmentMetadataAsync(AttachmentType attachmentType, Guid attachmentId);
     Task<AttachmentMetadataDto> UpdateAttachmentMetadataAsync(UpdateAttachmentMetadataDto updateAttachment);
-    Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null);
-    Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null);
+    Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null);
+    Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null);
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
index 22bd65e6ab..64efaa4e35 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
@@ -4,9 +4,9 @@
 
 namespace Unity.GrantManager.GrantApplications
 {
-    public interface IApplicationAIAnalysisAppService : IApplicationService
+    public interface IApplicationAnalysisAppService : IApplicationService
     {
-        Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null);
+        Task<string> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
     }
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationContentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
index 1fd44c66f3..c2d27129a6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
@@ -4,8 +4,7 @@
 
 namespace Unity.GrantManager.GrantApplications;
 
-public interface IApplicationAIContentAppService : IApplicationService
+public interface IApplicationContentAppService : IApplicationService
 {
-    Task<string> GenerateAIContentAsync(Guid applicationId, string? promptVersion = null);
+    Task<string> GenerateContentAsync(Guid applicationId, string? promptVersion = null);
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
index d04c4312f3..9c32814d22 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
@@ -4,9 +4,9 @@
 
 namespace Unity.GrantManager.GrantApplications
 {
-    public interface IApplicationAIScoringAppService : IApplicationService
+    public interface IApplicationScoringAppService : IApplicationService
     {
-        Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null);
+        Task<string> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
     }
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
index 9fa42e6e71..b5d5dbbf12 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
@@ -7,12 +7,12 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateApplicationAIAnalysisBackgroundJob(
-    IApplicationAIAnalysisService applicationAnalysisService,
+public class GenerateApplicationAnalysisBackgroundJob(
+    IApplicationAnalysisService applicationAnalysisService,
     ICurrentTenant currentTenant,
-    ILogger<GenerateApplicationAIAnalysisBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAIAnalysisBackgroundJobArgs>, ITransientDependency
+    ILogger<GenerateApplicationAnalysisBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAnalysisBackgroundJobArgs>, ITransientDependency
 {
-    public override async Task ExecuteAsync(GenerateApplicationAIAnalysisBackgroundJobArgs args)
+    public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJobArgs args)
     {
         using (currentTenant.Change(args.TenantId))
         {
@@ -28,5 +28,3 @@ public override async Task ExecuteAsync(GenerateApplicationAIAnalysisBackgroundJ
         }
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
index d4546bc50d..4e4780a941 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
@@ -9,24 +9,24 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateApplicationAIScoresheetBackgroundJob(
-    IApplicationAIScoringService applicationScoresheetAnalysisService,
+public class GenerateApplicationScoringBackgroundJob(
+    IApplicationScoringService applicationScoringService,
     ILocalEventBus localEventBus,
     ICurrentTenant currentTenant,
-    ILogger<GenerateApplicationAIScoresheetBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAIScoresheetBackgroundJobArgs>, ITransientDependency
+    ILogger<GenerateApplicationScoringBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationScoringBackgroundJobArgs>, ITransientDependency
 {
-    public override async Task ExecuteAsync(GenerateApplicationAIScoresheetBackgroundJobArgs args)
+    public override async Task ExecuteAsync(GenerateApplicationScoringBackgroundJobArgs args)
     {
         using (currentTenant.Change(args.TenantId))
         {
             try
             {
-                logger.LogInformation("Executing AI scoresheet background job for application {ApplicationId}.", args.ApplicationId);
+                logger.LogInformation("Executing AI application scoring background job for application {ApplicationId}.", args.ApplicationId);
 
-                var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
                 if (!string.Equals(result, "{}", StringComparison.Ordinal))
                 {
-                    await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
+                    await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
                     {
                         ApplicationId = args.ApplicationId
                     });
@@ -34,10 +34,8 @@ await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
             }
             catch (Exception ex)
             {
-                logger.LogError(ex, "Error executing AI scoresheet background job for application {ApplicationId}.", args.ApplicationId);
+                logger.LogError(ex, "Error executing AI application scoring background job for application {ApplicationId}.", args.ApplicationId);
             }
         }
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
index a073e3e399..ac60162e2e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
@@ -7,12 +7,12 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateAttachmentSummariesBackgroundJob(
-    IAttachmentAISummaryService attachmentAISummaryService,
+public class GenerateAttachmentSummaryBackgroundJob(
+    IAttachmentSummaryService attachmentSummaryService,
     ICurrentTenant currentTenant,
-    ILogger<GenerateAttachmentSummariesBackgroundJob> logger) : AsyncBackgroundJob<GenerateAttachmentSummariesBackgroundJobArgs>, ITransientDependency
+    ILogger<GenerateAttachmentSummaryBackgroundJob> logger) : AsyncBackgroundJob<GenerateAttachmentSummaryBackgroundJobArgs>, ITransientDependency
 {
-    public override async Task ExecuteAsync(GenerateAttachmentSummariesBackgroundJobArgs args)
+    public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobArgs args)
     {
         using (currentTenant.Change(args.TenantId))
         {
@@ -22,7 +22,7 @@ public override async Task ExecuteAsync(GenerateAttachmentSummariesBackgroundJob
                     "Executing AI attachment summary background job for {AttachmentCount} attachment(s).",
                     args.AttachmentIds.Count);
 
-                await attachmentAISummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion);
+                await attachmentSummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion);
             }
             catch (Exception ex)
             {
@@ -31,5 +31,3 @@ public override async Task ExecuteAsync(GenerateAttachmentSummariesBackgroundJob
         }
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
index 6e515f7a52..870ab21bc2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
@@ -10,17 +10,17 @@
 
 namespace Unity.GrantManager.AI.BackgroundJobs;
 
-public class GenerateApplicationAIContentBackgroundJob(
-    IAttachmentAISummaryService attachmentAISummaryService,
-    IApplicationAIAnalysisService applicationAnalysisService,
-    IApplicationAIScoringService applicationScoresheetAnalysisService,
+public class GenerateContentBackgroundJob(
+    IAttachmentSummaryService attachmentSummaryService,
+    IApplicationAnalysisService applicationAnalysisService,
+    IApplicationScoringService applicationScoringService,
     IAIService aiService,
     IFeatureChecker featureChecker,
     ILocalEventBus localEventBus,
     ICurrentTenant currentTenant,
-    ILogger<GenerateApplicationAIContentBackgroundJob> logger) : AsyncBackgroundJob<GenerateApplicationAIContentBackgroundJobArgs>, ITransientDependency
+    ILogger<GenerateContentBackgroundJob> logger) : AsyncBackgroundJob<GenerateContentBackgroundJobArgs>, ITransientDependency
 {
-    public override async Task ExecuteAsync(GenerateApplicationAIContentBackgroundJobArgs args)
+    public override async Task ExecuteAsync(GenerateContentBackgroundJobArgs args)
     {
         using (currentTenant.Change(args.TenantId))
         {
@@ -46,7 +46,7 @@ public override async Task ExecuteAsync(GenerateApplicationAIContentBackgroundJo
 
                 if (attachmentSummariesEnabled)
                 {
-                    await attachmentAISummaryService.GenerateMissingForApplicationAsync(args.ApplicationId, args.PromptVersion);
+                    await attachmentSummaryService.GenerateMissingForApplicationAsync(args.ApplicationId, args.PromptVersion);
                 }
 
                 if (applicationAnalysisEnabled)
@@ -56,10 +56,10 @@ public override async Task ExecuteAsync(GenerateApplicationAIContentBackgroundJo
 
                 if (scoringEnabled)
                 {
-                    var result = await applicationScoresheetAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                    var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
                     if (!string.Equals(result, "{}", StringComparison.Ordinal))
                     {
-                        await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
+                        await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
                         {
                             ApplicationId = args.ApplicationId
                         });
@@ -73,6 +73,3 @@ await localEventBus.PublishAsync(new AiScoresheetAnswersGeneratedEvent
         }
     }
 }
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
index e0d36508e3..074f319c4f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
@@ -10,13 +10,13 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ApplicationAIAnalysisService(
+    public class ApplicationAnalysisService(
         IApplicationRepository applicationRepository,
         IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
         IApplicationFormVersionRepository applicationFormVersionRepository,
         IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
         IAIService aiService,
-        ILogger<ApplicationAIAnalysisService> logger) : IApplicationAIAnalysisService, ITransientDependency
+        ILogger<ApplicationAnalysisService> logger) : IApplicationAnalysisService, ITransientDependency
     {
         private readonly JsonSerializerOptions _jsonOptionsIndented = new()
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
index e3ce20c655..1fc691d061 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
@@ -10,7 +10,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public class ApplicationAIScoringService(
+    public class ApplicationScoringService(
         IApplicationRepository applicationRepository,
         IApplicationFormRepository applicationFormRepository,
         IApplicationFormSubmissionRepository applicationFormSubmissionRepository,
@@ -18,7 +18,7 @@ public class ApplicationAIScoringService(
         IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
         IScoresheetRepository scoresheetRepository,
         IAIService aiService,
-        ILogger<ApplicationAIScoringService> logger) : IApplicationAIScoringService, ITransientDependency
+        ILogger<ApplicationScoringService> logger) : IApplicationScoringService, ITransientDependency
     {
         private readonly JsonSerializerOptions _jsonOptions = new()
         {
@@ -80,7 +80,7 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
                         });
                     }
 
-                    var sectionRequest = new ScoresheetSectionRequest
+                    var applicationScoringRequest = new ApplicationScoringRequest
                     {
                         Data = promptData,
                         Attachments = attachmentSummaries,
@@ -88,11 +88,11 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
                         SectionSchema = JsonSerializer.SerializeToElement(sectionQuestionsData, _jsonOptions),
                         PromptVersion = promptVersion,
                     };
-                    var sectionAnswers = await aiService.GenerateScoresheetSectionAsync(sectionRequest);
+                    var applicationScoringResponse = await aiService.GenerateApplicationScoringAsync(applicationScoringRequest);
 
-                    if (sectionAnswers.Answers.Count > 0)
+                    if (applicationScoringResponse.Answers.Count > 0)
                     {
-                        var sectionJson = JsonSerializer.Serialize(sectionAnswers.Answers, _jsonOptions);
+                        var sectionJson = JsonSerializer.Serialize(applicationScoringResponse.Answers, _jsonOptions);
                         using var sectionDoc = JsonDocument.Parse(sectionJson);
                         foreach (var property in sectionDoc.RootElement.EnumerateObject())
                         {
@@ -102,12 +102,12 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
                 }
                 catch (Exception ex)
                 {
-                    logger.LogError(ex, "Error processing AI scoresheet section {SectionName} for application {ApplicationId}", section.Name, applicationId);
+                    logger.LogError(ex, "Error processing AI application scoring section {SectionName} for application {ApplicationId}", section.Name, applicationId);
                 }
             }
 
             var combinedResults = JsonSerializer.Serialize(allSectionResults, _jsonOptionsIndented);
-            var validatedJson = ValidateScoresheetJson(combinedResults);
+            var validatedJson = ValidateApplicationScoringJson(combinedResults);
             application.AIScoresheetAnswers = validatedJson;
             await applicationRepository.UpdateAsync(application);
             return validatedJson;
@@ -127,12 +127,12 @@ public async Task<string> RegenerateAndSaveAsync(Guid applicationId, string? pro
             }
             catch (Exception ex)
             {
-                logger.LogWarning(ex, "Unable to load form schema for scoresheet prompt data generation for form version {FormVersionId}.", formVersionId);
+                logger.LogWarning(ex, "Unable to load form schema for application scoring prompt data generation for form version {FormVersionId}.", formVersionId);
                 return null;
             }
         }
 
-        private static string ValidateScoresheetJson(string scoresheetAnswers)
+        private static string ValidateApplicationScoringJson(string scoresheetAnswers)
         {
             try
             {
@@ -193,3 +193,4 @@ private static string ValidateScoresheetJson(string scoresheetAnswers)
 }
 
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
index 6bc25278e1..40822d8830 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
@@ -9,11 +9,11 @@
 
 namespace Unity.GrantManager.AI;
 
-public class AttachmentAISummaryService(
+public class AttachmentSummaryService(
     IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
     ISubmissionAppService submissionAppService,
     IAIService aiService,
-    ILogger<AttachmentAISummaryService> logger) : IAttachmentAISummaryService, ITransientDependency
+    ILogger<AttachmentSummaryService> logger) : IAttachmentSummaryService, ITransientDependency
 {
     private const string DefaultContentType = "application/octet-stream";
     private const string SummaryGenerationFailedMessage = "AI summary generation failed.";
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
index f7e2a72ae3..bdc7631fc7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public interface IApplicationAIAnalysisService
+    public interface IApplicationAnalysisService
     {
         Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null);
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
index 50e66d753c..65c1e488da 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.GrantManager.AI
 {
-    public interface IApplicationAIScoringService
+    public interface IApplicationScoringService
     {
         Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null);
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
index 54e6f697fa..e1bc39b369 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.GrantManager.AI;
 
-public interface IAttachmentAISummaryService
+public interface IAttachmentSummaryService
 {
     Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null);
     Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
index 41ce17e33e..69df343e76 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
@@ -4,5 +4,6 @@ public static class AIPromptTypes
 {
     public const string AttachmentSummary = "AttachmentSummary";
     public const string ApplicationAnalysis = "ApplicationAnalysis";
-    public const string ScoresheetSection = "ScoresheetSection";
+    public const string ApplicationScoring = "ApplicationScoring";
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
index fa8d0bf790..3cc30965e8 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/Versions/README.md
@@ -7,21 +7,21 @@ These files are the source of truth for runtime prompts.
 
 Current templates:
 
-- `analysis.system.txt`
-- `analysis.user.txt`
-- `analysis.rubric.txt` (optional, when `{{RUBRIC}}` is used)
-- `analysis.score.txt` (optional, when `{{SCORE}}` is used)
-- `analysis.output.txt` (optional, when `{{OUTPUT}}` is used)
-- `analysis.rules.txt` (optional, when `{{RULES}}` is used)
+- `application-analysis.system.txt`
+- `application-analysis.user.txt`
+- `application-analysis.rubric.txt` (optional, when `{{RUBRIC}}` is used)
+- `application-analysis.score.txt` (optional, when `{{SCORE}}` is used)
+- `application-analysis.output.txt` (optional, when `{{OUTPUT}}` is used)
+- `application-analysis.rules.txt` (optional, when `{{RULES}}` is used)
 - `common.*.txt` (optional shared fragments for `{{COMMON_*}}` placeholders)
-- `attachment.system.txt`
-- `attachment.user.txt`
-- `attachment.output.txt` (optional, when `{{OUTPUT}}` is used)
-- `attachment.rules.txt` (optional, when `{{RULES}}` is used)
-- `scoresheet.system.txt`
-- `scoresheet.user.txt`
-- `scoresheet.output.txt` (optional, when `{{OUTPUT}}` is used)
-- `scoresheet.rules.txt` (optional, when `{{RULES}}` is used)
+- `attachment-summary.system.txt`
+- `attachment-summary.user.txt`
+- `attachment-summary.output.txt` (optional, when `{{OUTPUT}}` is used)
+- `attachment-summary.rules.txt` (optional, when `{{RULES}}` is used)
+- `application-scoring.system.txt`
+- `application-scoring.user.txt`
+- `application-scoring.output.txt` (optional, when `{{OUTPUT}}` is used)
+- `application-scoring.rules.txt` (optional, when `{{RULES}}` is used)
 
 Placeholders:
 
@@ -50,6 +50,6 @@ Template loading is strict:
 - Missing required templates fail fast at runtime with a configuration error.
 - Fragment templates are required when the corresponding placeholder is present in the parent template.
 - Fragment resolution is automatic using `<base>.<placeholder-lower>.txt` from the same version folder.
-  - Example: `analysis.user.txt` with `{{RULES}}` resolves `analysis.rules.txt`.
+  - Example: `application-analysis.user.txt` with `{{RULES}}` resolves `application-analysis.rules.txt`.
 - `{{COMMON_*}}` placeholders resolve to `common.<suffix>.txt` where suffix is lower-cased and `_` becomes `.`.
   - Example: `{{COMMON_RULES}}` resolves `common.rules.txt`.
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
index a583a7f206..19f98cf55d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -30,7 +30,7 @@ public static bool IsValidApplicationAnalysisJson(string response)
                    && nextSteps.ValueKind == JsonValueKind.Array;
         }
 
-        public static bool IsValidScoresheetSectionJson(string response, string sectionJson)
+        public static bool IsValidApplicationScoringJson(string response, string sectionJson)
         {
             if (!TryParseRootObject(response, out var root))
             {
@@ -148,3 +148,4 @@ private static bool TryParseRootObject(string response, out JsonElement root)
 
     }
 }
+
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 284bd39368..c64ca52709 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
@@ -23,19 +23,19 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly ITextExtractionService _textExtractionService;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
         private const string AttachmentSummaryPromptType = AIPromptTypes.AttachmentSummary;
-        private const string ScoresheetSectionPromptType = AIPromptTypes.ScoresheetSection;
+        private const string ApplicationScoringPromptType = AIPromptTypes.ApplicationScoring;
         private const string PromptVersionV0 = "v0";
         private const string PromptVersionV1 = "v1";
         private static readonly string PromptTemplatesFolder = Path.Combine("AI", "Prompts", "Versions");
-        private const string AnalysisSystemTemplateName = "analysis.system";
-        private const string AnalysisUserTemplateName = "analysis.user";
-        private const string AttachmentSystemTemplateName = "attachment.system";
-        private const string AttachmentUserTemplateName = "attachment.user";
-        private const string ScoresheetSystemTemplateName = "scoresheet.system";
-        private const string ScoresheetUserTemplateName = "scoresheet.user";
-        private const string ServiceNotConfiguredMessage = "AI analysis not available - service not configured.";
-        private const string ServiceTemporarilyUnavailableMessage = "AI analysis failed - service temporarily unavailable.";
-        private const string SummaryFailedRetryMessage = "AI analysis failed - please try again later.";
+        private const string ApplicationAnalysisSystemTemplateName = "application-analysis.system";
+        private const string ApplicationAnalysisUserTemplateName = "application-analysis.user";
+        private const string AttachmentSummarySystemTemplateName = "attachment-summary.system";
+        private const string AttachmentSummaryUserTemplateName = "attachment-summary.user";
+        private const string ApplicationScoringSystemTemplateName = "application-scoring.system";
+        private const string ApplicationScoringUserTemplateName = "application-scoring.user";
+        private const string AIServiceNotConfiguredMessage = "AI service not available - service not configured.";
+        private const string AIServiceTemporarilyUnavailableMessage = "AI request failed - service temporarily unavailable.";
+        private const string AIRequestFailedRetryMessage = "AI request failed - please try again later.";
         private const int MaxAiAttempts = 3;
         private const string DefaultMaxTokensParameterName = "max_completion_tokens";
         private const string LegacyMaxTokensParameterName = "max_tokens";
@@ -43,11 +43,11 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private const int DefaultCompletionTokens = 150;
         private const int DefaultAttachmentSummaryCompletionTokens = 500;
         private const int DefaultApplicationAnalysisCompletionTokens = 2500;
-        private const int DefaultScoresheetSectionCompletionTokens = 5000;
+        private const int DefaultApplicationScoringCompletionTokens = 5000;
 
-        private int AttachmentSummaryCompletionTokens => ResolveCompletionTokens("AttachmentSummary", DefaultAttachmentSummaryCompletionTokens);
-        private int ApplicationAnalysisCompletionTokens => ResolveCompletionTokens("ApplicationAnalysis", DefaultApplicationAnalysisCompletionTokens);
-        private int ScoresheetSectionCompletionTokens => ResolveCompletionTokens("ScoresheetSection", DefaultScoresheetSectionCompletionTokens);
+        private int AttachmentSummaryCompletionTokens => ResolveCompletionTokens(AttachmentSummaryPromptType, DefaultAttachmentSummaryCompletionTokens);
+        private int ApplicationAnalysisCompletionTokens => ResolveCompletionTokens(ApplicationAnalysisPromptType, DefaultApplicationAnalysisCompletionTokens);
+        private int ApplicationScoringCompletionTokens => ResolveCompletionTokens(ApplicationScoringPromptType, DefaultApplicationScoringCompletionTokens);
         private readonly string MissingApiKeyMessage = "OpenAI API key is not configured";
 
         // Optional local debugging sink for prompt payload logs to a local file.
@@ -118,16 +118,16 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 .Cast<object>();
 
             var attachments = JsonSerializer.Serialize(attachmentsPayload, JsonLogOptions);
-            var systemPrompt = BuildAnalysisSystemPrompt(promptVersion);
-            var analysisContent = BuildAnalysisUserPrompt(
+            var systemPrompt = BuildApplicationAnalysisSystemPrompt(promptVersion);
+            var applicationAnalysisContent = BuildApplicationAnalysisUserPrompt(
                 promptVersion,
                 schema,
                 data,
                 attachments);
-            await LogPromptInputAsync(ApplicationAnalysisPromptType, promptVersion, systemPrompt, analysisContent);
+            await LogPromptInputAsync(ApplicationAnalysisPromptType, promptVersion, systemPrompt, applicationAnalysisContent);
             var result = await GenerateWithRetryAsync(
                 () => GenerateSummaryAsync(
-                    analysisContent,
+                    applicationAnalysisContent,
                     systemPrompt,
                     ApplicationAnalysisCompletionTokens,
                     operationName: ApplicationAnalysisPromptType),
@@ -261,7 +261,7 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             try
             {
                 var extractedText = await _textExtractionService.ExtractTextAsync(fileName, fileContent, contentType);
-                var prompt = BuildAttachmentSystemPrompt(promptVersion);
+                var prompt = BuildAttachmentSummarySystemPrompt(promptVersion);
 
                 var attachmentText = string.IsNullOrWhiteSpace(extractedText) ? null : extractedText;
                 if (attachmentText != null)
@@ -281,7 +281,7 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
                     text = attachmentText
                 };
                 var attachment = JsonSerializer.Serialize(attachmentPayload, JsonLogOptions);
-                var contentToAnalyze = BuildAttachmentUserPrompt(promptVersion, attachment);
+                var contentToAnalyze = BuildAttachmentSummaryUserPrompt(promptVersion, attachment);
 
                 await LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, prompt, contentToAnalyze);
                 var result = await GenerateWithRetryAsync(
@@ -388,20 +388,20 @@ private string AddIdsToAnalysisItems(string analysisJson)
             }
         }
 
-        public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(ScoresheetSectionRequest request)
+        public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request)
         {
             ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ScoresheetSectionPromptType));
+            var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationScoringPromptType));
             var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var sectionJson = JsonSerializer.Serialize(request.SectionSchema, JsonLogOptions);
 
             var attachmentSummaries = request.Attachments
                 .Select(a => $"{a.Name}: {a.Summary}")
                 .ToList();
-            if (string.IsNullOrEmpty(ResolveApiKey(ScoresheetSectionPromptType)))
+            if (string.IsNullOrEmpty(ResolveApiKey(ApplicationScoringPromptType)))
             {
                 _logger.LogWarning("{Message}", MissingApiKeyMessage);
-                return new ScoresheetSectionResponse();
+                return new ApplicationScoringResponse();
             }
 
             try
@@ -430,45 +430,45 @@ public async Task<ScoresheetSectionResponse> GenerateScoresheetSectionAsync(Scor
                     questions = sectionQuestionsPayload
                 };
                 var section = JsonSerializer.Serialize(sectionPayload, JsonLogOptions);
-                var response = BuildScoresheetSectionResponseTemplate(section);
+                var response = BuildApplicationScoringResponseTemplate(section);
                 if (response == "{}")
                 {
                     _logger.LogWarning(
-                        "Skipping AI scoresheet generation for section {SectionName} because response template could not be built from section schema.",
+                        "Skipping AI application scoring for section {SectionName} because response template could not be built from section schema.",
                         request.SectionName);
-                    return new ScoresheetSectionResponse();
+                    return new ApplicationScoringResponse();
                 }
 
-                var analysisContent = BuildScoresheetSectionUserPrompt(
+                var applicationScoringContent = BuildApplicationScoringUserPrompt(
                     promptVersion,
                     dataJson,
                     attachments,
                     section,
                     response);
-                var systemPrompt = BuildScoresheetSectionSystemPrompt(promptVersion);
+                var systemPrompt = BuildApplicationScoringSystemPrompt(promptVersion);
 
-                await LogPromptInputAsync(ScoresheetSectionPromptType, promptVersion, systemPrompt, analysisContent);
+                await LogPromptInputAsync(ApplicationScoringPromptType, promptVersion, systemPrompt, applicationScoringContent);
                 var result = await GenerateWithRetryAsync(
                     () => GenerateSummaryAsync(
-                        analysisContent,
+                        applicationScoringContent,
                         systemPrompt,
-                        ScoresheetSectionCompletionTokens,
-                        operationName: ScoresheetSectionPromptType),
-                    content => AIProviderPayloadValidator.IsValidScoresheetSectionJson(content, sectionJson),
-                    $"scoresheet section {request.SectionName}");
-                await LogPromptOutputAsync(ScoresheetSectionPromptType, promptVersion, result.CaptureOutput);
+                        ApplicationScoringCompletionTokens,
+                        operationName: ApplicationScoringPromptType),
+                    content => AIProviderPayloadValidator.IsValidApplicationScoringJson(content, sectionJson),
+                    $"application scoring section {request.SectionName}");
+                await LogPromptOutputAsync(ApplicationScoringPromptType, promptVersion, result.CaptureOutput);
 
                 if (result.Outcome != AIOperationOutcome.Success)
                 {
-                    return new ScoresheetSectionResponse();
+                    return new ApplicationScoringResponse();
                 }
 
-                return ParseScoresheetSectionResponse(result.Content);
+                return ParseApplicationScoringResponse(result.Content);
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error generating scoresheet section answers for section {SectionName}", request.SectionName);
-                return new ScoresheetSectionResponse();
+                _logger.LogError(ex, "Error generating application scoring answers for section {SectionName}", request.SectionName);
+                return new ApplicationScoringResponse();
             }
         }
 
@@ -531,9 +531,9 @@ private static string ResolveNarrativeContent(AIOperationResult result)
             return result.Outcome switch
             {
                 AIOperationOutcome.Success => result.Content,
-                AIOperationOutcome.PermanentFailure => ServiceNotConfiguredMessage,
-                AIOperationOutcome.TransientFailure => ServiceTemporarilyUnavailableMessage,
-                _ => SummaryFailedRetryMessage
+                AIOperationOutcome.PermanentFailure => AIServiceNotConfiguredMessage,
+                AIOperationOutcome.TransientFailure => AIServiceTemporarilyUnavailableMessage,
+                _ => AIRequestFailedRetryMessage
             };
         }
 
@@ -898,9 +898,9 @@ private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
             };
         }
 
-        private static ScoresheetSectionResponse ParseScoresheetSectionResponse(string raw)
+        private static ApplicationScoringResponse ParseApplicationScoringResponse(string raw)
         {
-            var response = new ScoresheetSectionResponse();
+            var response = new ApplicationScoringResponse();
             if (!TryParseJsonObjectFromResponse(raw, out var root))
             {
                 return response;
@@ -926,7 +926,7 @@ private static ScoresheetSectionResponse ParseScoresheetSectionResponse(string r
                     ? NormalizeConfidence(parsedConfidence)
                     : 0;
 
-                response.Answers[property.Name] = new ScoresheetSectionAnswer
+                response.Answers[property.Name] = new ApplicationScoringAnswer
                 {
                     Answer = answer,
                     Rationale = rationale,
@@ -944,7 +944,7 @@ private static int NormalizeConfidence(int confidence)
             return Math.Clamp(rounded, 0, 100);
         }
 
-        private static string BuildScoresheetSectionResponseTemplate(string sectionPayloadJson)
+        private static string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
         {
             try
             {
@@ -1184,12 +1184,12 @@ private static string ResolvePromptVersion(string? version)
             return PromptVersionV1;
         }
 
-        private static string BuildAnalysisSystemPrompt(string version)
+        private static string BuildApplicationAnalysisSystemPrompt(string version)
         {
-            return GetRequiredPromptTemplate(version, AnalysisSystemTemplateName);
+            return GetRequiredPromptTemplate(version, ApplicationAnalysisSystemTemplateName);
         }
 
-        private static string BuildAnalysisUserPrompt(
+        private static string BuildApplicationAnalysisUserPrompt(
             string version,
             string schema,
             string data,
@@ -1202,35 +1202,35 @@ private static string BuildAnalysisUserPrompt(
                 ["ATTACHMENTS"] = attachments
             };
 
-            return RenderPromptTemplate(version, AnalysisUserTemplateName, replacements);
+            return RenderPromptTemplate(version, ApplicationAnalysisUserTemplateName, replacements);
         }
 
-        private static string BuildAttachmentSystemPrompt(string version)
+        private static string BuildAttachmentSummarySystemPrompt(string version)
         {
-            return GetRequiredPromptTemplate(version, AttachmentSystemTemplateName);
+            return GetRequiredPromptTemplate(version, AttachmentSummarySystemTemplateName);
         }
 
-        private static string BuildAttachmentUserPrompt(string version, string attachment)
+        private static string BuildAttachmentSummaryUserPrompt(string version, string attachment)
         {
-            return RenderPromptTemplate(version, AttachmentUserTemplateName, new Dictionary<string, string>
+            return RenderPromptTemplate(version, AttachmentSummaryUserTemplateName, new Dictionary<string, string>
             {
                 ["ATTACHMENT"] = attachment
             });
         }
 
-        private static string BuildScoresheetSectionSystemPrompt(string version)
+        private static string BuildApplicationScoringSystemPrompt(string version)
         {
-            return GetRequiredPromptTemplate(version, ScoresheetSystemTemplateName);
+            return GetRequiredPromptTemplate(version, ApplicationScoringSystemTemplateName);
         }
 
-        private static string BuildScoresheetSectionUserPrompt(
+        private static string BuildApplicationScoringUserPrompt(
             string version,
             string data,
             string attachments,
             string section,
             string response)
         {
-            return RenderPromptTemplate(version, ScoresheetUserTemplateName, new Dictionary<string, string>
+            return RenderPromptTemplate(version, ApplicationScoringUserTemplateName, new Dictionary<string, string>
             {
                 ["DATA"] = data,
                 ["ATTACHMENTS"] = attachments,
@@ -1434,3 +1434,4 @@ private static string ExtractSummaryFromJson(string output)
 
 
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 188ad2a5b3..018eaeee93 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -192,14 +192,14 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
     }
 
     [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<string> GenerateAISummaryAttachmentAsync(Guid attachmentId, string? promptVersion = null)
+    public async Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
             throw new UserFriendlyException("AI attachment summaries are not enabled.");
         }
 
-        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroundJobArgs
+        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
         {
             AttachmentIds = [attachmentId],
             PromptVersion = promptVersion,
@@ -210,7 +210,7 @@ await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroun
     }
 
     [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> attachmentIds, string? promptVersion = null)
+    public async Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
@@ -222,7 +222,7 @@ public async Task<List<string>> GenerateAISummariesAttachmentsAsync(List<Guid> a
             return [];
         }
 
-        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummariesBackgroundJobArgs
+        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
         {
             AttachmentIds = attachmentIds,
             PromptVersion = promptVersion,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
index 57a4da2994..46dbc8eed2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
@@ -11,12 +11,12 @@
 namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault)]
-public class ApplicationAIAnalysisAppService(
+public class ApplicationAnalysisAppService(
     IBackgroundJobManager backgroundJobManager,
     IFeatureChecker featureChecker)
-    : GrantManagerAppService, IApplicationAIAnalysisAppService
+    : GrantManagerAppService, IApplicationAnalysisAppService
 {
-    public async Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<string> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
     {
         try
         {
@@ -25,7 +25,7 @@ public async Task<string> GenerateAIAnalysisAsync(Guid applicationId, string? pr
                 throw new UserFriendlyException("AI application analysis is not enabled.");
             }
 
-            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIAnalysisBackgroundJobArgs
+            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAnalysisBackgroundJobArgs
             {
                 ApplicationId = applicationId,
                 PromptVersion = promptVersion,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationContentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationContentAppService.cs
index b826a44423..7e70bad658 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationContentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationContentAppService.cs
@@ -13,12 +13,12 @@ namespace Unity.GrantManager.GrantApplications;
 [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
 [Authorize(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault)]
 [Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
-public class ApplicationAIContentAppService(
+public class ApplicationContentAppService(
     IBackgroundJobManager backgroundJobManager,
     IFeatureChecker featureChecker)
-    : GrantManagerAppService, IApplicationAIContentAppService
+    : GrantManagerAppService, IApplicationContentAppService
 {
-    public async Task<string> GenerateAIContentAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<string> GenerateContentAsync(Guid applicationId, string? promptVersion = null)
     {
         try
         {
@@ -31,7 +31,7 @@ public async Task<string> GenerateAIContentAsync(Guid applicationId, string? pro
                 throw new UserFriendlyException("AI generate all is not enabled.");
             }
 
-            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIContentBackgroundJobArgs
+            await backgroundJobManager.EnqueueAsync(new GenerateContentBackgroundJobArgs
             {
                 ApplicationId = applicationId,
                 PromptVersion = promptVersion,
@@ -47,4 +47,3 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIContentBackgrou
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
index 0ba530ceb2..d14a18443b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
@@ -11,12 +11,12 @@
 namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.ScoringAssistant.ScoringAssistantDefault)]
-public class ApplicationAIScoringAppService(
+public class ApplicationScoringAppService(
     IBackgroundJobManager backgroundJobManager,
     IFeatureChecker featureChecker)
-    : GrantManagerAppService, IApplicationAIScoringAppService
+    : GrantManagerAppService, IApplicationScoringAppService
 {
-    public async Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<string> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null)
     {
         try
         {
@@ -25,7 +25,7 @@ public async Task<string> GenerateAIScoresheetAnswersAsync(Guid applicationId, s
                 throw new UserFriendlyException("AI scoring is not enabled.");
             }
 
-            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIScoresheetBackgroundJobArgs
+            await backgroundJobManager.EnqueueAsync(new GenerateApplicationScoringBackgroundJobArgs
             {
                 ApplicationId = applicationId,
                 PromptVersion = promptVersion,
@@ -36,8 +36,8 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIScoresheetBackg
         }
         catch (Exception ex)
         {
-            Logger.LogError(ex, "Error queueing AI scoresheet generation for application {ApplicationId}", applicationId);
-            throw new UserFriendlyException("Failed to queue AI scoresheet generation. Please try again.");
+            Logger.LogError(ex, "Error queueing AI application scoring generation for application {ApplicationId}", applicationId);
+            throw new UserFriendlyException("Failed to queue AI application scoring generation. Please try again.");
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AIApplicationScoringGeneratedEvent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AIApplicationScoringGeneratedEvent.cs
index e05fe7eec3..b5dc7bdf72 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AIApplicationScoringGeneratedEvent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Events/AIApplicationScoringGeneratedEvent.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.GrantManager.Intakes.Events;
 
-public class AiScoresheetAnswersGeneratedEvent
+public class AIApplicationScoringGeneratedEvent
 {
     public Guid ApplicationId { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
index c59f7055ca..699f3f1a8e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
@@ -10,17 +10,17 @@
 
 namespace Unity.GrantManager.Intakes.Handlers;
 
-public class CreateAiAssessmentHandler(
+public class CreateAIAssessmentHandler(
     AssessmentManager assessmentManager,
     IApplicationRepository applicationRepository,
     IFeatureChecker featureChecker,
-    ILogger<CreateAiAssessmentHandler> logger) : ILocalEventHandler<AiScoresheetAnswersGeneratedEvent>, ITransientDependency
+    ILogger<CreateAIAssessmentHandler> logger) : ILocalEventHandler<AIApplicationScoringGeneratedEvent>, ITransientDependency
 {
-    public async Task HandleEventAsync(AiScoresheetAnswersGeneratedEvent eventData)
+    public async Task HandleEventAsync(AIApplicationScoringGeneratedEvent eventData)
     {
         if (eventData == null || eventData.ApplicationId == Guid.Empty)
         {
-            logger.LogWarning("Event data or application ID is null in CreateAiAssessmentHandler.");
+            logger.LogWarning("Event data or application ID is null in CreateAIAssessmentHandler.");
             return;
         }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
index 476c81e028..c4d882b043 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/GenerateAIContentHandler.cs
@@ -25,7 +25,7 @@ public async Task HandleEventAsync(ApplicationProcessEvent eventData)
 
         try
         {
-            await backgroundJobManager.EnqueueAsync(new GenerateApplicationAIContentBackgroundJobArgs
+            await backgroundJobManager.EnqueueAsync(new GenerateContentBackgroundJobArgs
             {
                 ApplicationId = eventData.Application.Id,
                 TenantId = currentTenant.Id

From 30a09b938e7cd9c010dd0c36bb9fbbb273e1c07c Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 11:55:06 -0700
Subject: [PATCH 13/38] AB#32012 align AI action naming across web surfaces

---
 .../Pages/GrantApplications/ai-analysis.js    |  12 +-
 .../AssessmentScoresWidget/Default.cshtml     |   2 +-
 .../AssessmentScoresWidget/Default.js         |   6 +-
 .../ChefsAttachments/ChefsAttachments.js      |   4 +-
 .../Components/ReviewList/ReviewList.js       | 510 +++++++++---------
 5 files changed, 267 insertions(+), 267 deletions(-)

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 5c39b850e6..eb2238bc44 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
@@ -391,9 +391,9 @@ function tryParseRawAnalysis(analysisJson) {
     }
 }
 
-globalThis.regenerateAIAnalysis = function(triggerButton = null) {
+globalThis.queueApplicationAnalysis = function(triggerButton = null) {
     const applicationId = $('#DetailsViewApplicationId').val();
-    const $button = triggerButton ? $(triggerButton) : $('#regenerateAiAnalysis');
+    const $button = triggerButton ? $(triggerButton) : $('#regenerateApplicationAnalysis');
     const existingHtml = $button.html();
     const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
 
@@ -405,8 +405,8 @@ globalThis.regenerateAIAnalysis = function(triggerButton = null) {
         .html('<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>')
         .prop('disabled', true);
 
-    unity.grantManager.grantApplications.applicationAIAnalysis
-        .generateAIAnalysis(applicationId, promptVersion)
+    unity.grantManager.grantApplications.applicationAnalysis
+        .generateApplicationAnalysis(applicationId, promptVersion)
         .then(function() {
             abp.notify.success('AI analysis queued. Refresh later to see updated results.');
         })
@@ -451,10 +451,10 @@ function loadAIAnalysis() {
 }
 
 $(function() {
-    const $regenerateButton = $('#regenerateAiAnalysis');
+    const $regenerateButton = $('#regenerateApplicationAnalysis');
     if ($regenerateButton.length > 0) {
         $regenerateButton.on('click', function() {
-            regenerateAIAnalysis();
+            queueApplicationAnalysis();
         });
     }
 });
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
index d56e291998..f630006bea 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/Default.cshtml
@@ -26,7 +26,7 @@
                 <div class="d-flex justify-content-end flex-wrap gap-2 scoresheet-top-btn-group">
                     @if (Model.IsAIScoringEnabled && Model.IsAiAssessment)
                     {
-                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="regenerateAiScoresheetBtn" onclick="regenerateAIScoresheetAnswers()">
+                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="regenerateAiScoresheetBtn" onclick="queueApplicationScoring()">
                             <span class="ai-button-content">
                                 <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
                                 <span>Generate</span>
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 6ef49f20fb..bd3e6c7507 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
@@ -577,7 +577,7 @@ function collapseAllAccordions(divId) {
     });
 }
 
-function regenerateAIScoresheetAnswers(triggerButton = null) {
+function queueApplicationScoring(triggerButton = null) {
     const applicationId = $('#DetailsViewApplicationId').val();
     const $button = triggerButton ? $(triggerButton) : $('#regenerateAiScoresheetBtn');
     const existingHtml = $button.html();
@@ -593,8 +593,8 @@ function regenerateAIScoresheetAnswers(triggerButton = null) {
         )
         .prop('disabled', true);
 
-    unity.grantManager.grantApplications.applicationAIScoring
-        .generateAIScoresheetAnswers(applicationId, promptVersion)
+    unity.grantManager.grantApplications.applicationScoring
+        .generateApplicationScoring(applicationId, promptVersion)
         .done(function () {
             abp.notify.success('AI scoring queued. Refresh later to see updated results.');
         })
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 fdec44edae..0f5ada34a2 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
@@ -1,6 +1,6 @@
 // Note: File depends on Unity.GrantManager.Web\Views\Shared\Components\_Shared\Attachments.js
 $(function () {
-    globalThis.generateAIAttachmentSummaries = function(triggerButton = null) {
+    globalThis.queueAttachmentSummary = function(triggerButton = null) {
         $('#generateAiSummaries')
             .data('trigger-button', triggerButton || null)
             .trigger('click');
@@ -242,7 +242,7 @@ $(function () {
             // Call the backend API
             $.ajax({
                 url:
-                    '/api/app/attachment/generate-aISummaries-attachments' +
+                    '/api/app/attachment/generate-attachment-summaries' +
                     '?promptVersion=' +
                     encodeURIComponent(promptVersion || ''),
                 data: JSON.stringify(attachmentIds),
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 0b945b6435..47421088e4 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
@@ -1,26 +1,26 @@
-const l = abp.localization.getResource('GrantManager');
-const pageApplicationId = decodeURIComponent(document.querySelector("#DetailsViewApplicationId").value);
-const isAiScoringEnabled =
-    document.querySelector("#ReviewListAIScoringEnabled")?.value === 'True'
-    || document.querySelector("#AIScoringFeatureEnabled")?.value === 'True';
-const canUseAiScoring = isAiScoringEnabled;
-
-const actionButtonConfigMap = {
-    Generate: { buttonType: 'generateAiButton', order: 1 },
-    Clone: { buttonType: 'cloneButton', order: 2 },
-    Create: { buttonType: 'createButton', order: 3 },
-    SendBack: { buttonType: 'unityWorkflow', order: 4 },
-    Complete: { buttonType: 'unityWorkflow', order: 5 },
-    _Fallback: { buttonType: 'unityWorkflow', order: 100 }
-}
-
-const actionButtonLabelMap = {
-    Generate: 'Generate',
-    Clone: 'Clone',
-    Create: 'Create',
-    SendBack: 'Send Back',
-    Complete: 'Complete'
-};
+const l = abp.localization.getResource('GrantManager');
+const pageApplicationId = decodeURIComponent(document.querySelector("#DetailsViewApplicationId").value);
+const isAiScoringEnabled =
+    document.querySelector("#ReviewListAIScoringEnabled")?.value === 'True'
+    || document.querySelector("#AIScoringFeatureEnabled")?.value === 'True';
+const canUseAiScoring = isAiScoringEnabled;
+
+const actionButtonConfigMap = {
+    Generate: { buttonType: 'generateAiButton', order: 1 },
+    Clone: { buttonType: 'cloneButton', order: 2 },
+    Create: { buttonType: 'createButton', order: 3 },
+    SendBack: { buttonType: 'unityWorkflow', order: 4 },
+    Complete: { buttonType: 'unityWorkflow', order: 5 },
+    _Fallback: { buttonType: 'unityWorkflow', order: 100 }
+}
+
+const actionButtonLabelMap = {
+    Generate: 'Generate',
+    Clone: 'Clone',
+    Create: 'Create',
+    SendBack: 'Send Back',
+    Complete: 'Complete'
+};
 
 const finalApplicationStates = [
     'GRANT_NOT_APPROVED',
@@ -30,7 +30,7 @@ const finalApplicationStates = [
 ];
 
 $(function () {
-    const nullPlaceholder = '-';
+    const nullPlaceholder = '-';
 
     let inputAction = function (requestData, dataTableSettings) {
         const applicationId = pageApplicationId
@@ -54,24 +54,24 @@ $(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',
-            enabled: false,
-            text: unityWorkflowButtonText,
-            action: unityWorkflowButtonAction
-        },
-        generateAiButton: {
-            extend: 'unityWorkflow',
-            text: generateAiButtonText,
-            action: generateAiButtonAction
-        },
-        createButton: {
-            extend: 'unityWorkflow',
-            init: createButtonInit,
+    $.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',
+            enabled: false,
+            text: unityWorkflowButtonText,
+            action: unityWorkflowButtonAction
+        },
+        generateAiButton: {
+            extend: 'unityWorkflow',
+            text: generateAiButtonText,
+            action: generateAiButtonAction
+        },
+        createButton: {
+            extend: 'unityWorkflow',
+            init: createButtonInit,
             action: createButtonAction
         },
         cloneButton: {
@@ -88,25 +88,25 @@ $(function () {
 
     const actionArray = getActionArray();
 
-    let assessmentButtonsGroup = {
-        name: 'assessmentActionButtons',
-        buttons: getButtonArray(actionArray)
-    };
-
-    let assessmentGenerateButtonGroup = {
-        name: 'assessmentGenerateButtonsGroup',
-        buttons: new Array(renderUnityWorkflowButton('Generate'))
-    };
-
-    let assessmentCreateButtonGroup = {
-        name: 'assessmentCreateButtonsGroup',
-        buttons: new Array(renderUnityWorkflowButton('Create'))
-    };
-
-    let assessmentCloneButtonGroup = {
-        name: 'assessmentCloneButtonsGroup',
-        buttons: new Array(renderUnityWorkflowButton('Clone'))
-    };
+    let assessmentButtonsGroup = {
+        name: 'assessmentActionButtons',
+        buttons: getButtonArray(actionArray)
+    };
+
+    let assessmentGenerateButtonGroup = {
+        name: 'assessmentGenerateButtonsGroup',
+        buttons: new Array(renderUnityWorkflowButton('Generate'))
+    };
+
+    let assessmentCreateButtonGroup = {
+        name: 'assessmentCreateButtonsGroup',
+        buttons: new Array(renderUnityWorkflowButton('Create'))
+    };
+
+    let assessmentCloneButtonGroup = {
+        name: 'assessmentCloneButtonsGroup',
+        buttons: new Array(renderUnityWorkflowButton('Clone'))
+    };
 
     const reviewListDiv = "ReviewListTable";
 
@@ -210,55 +210,55 @@ $(function () {
         })
     );
 
-    $('#' + reviewListDiv).on('xhr.dt', function (e, settings, json, xhr) {
-        if (!json.isUsingDefaultScoresheet) {
-            reviewListTable.column(7).visible(false);  // 'FinancialAnalysis' column
-            reviewListTable.column(8).visible(false);  // 'EconomicImpact' column
-            reviewListTable.column(9).visible(false);  // 'InclusiveGrowth' column
-            reviewListTable.column(10).visible(false); // 'CleanGrowth' column
-        } else {
-            reviewListTable.column(7).visible(true);
-            reviewListTable.column(8).visible(true);
-            reviewListTable.column(9).visible(true);
-            reviewListTable.column(10).visible(true);
-        }
-
-        updateAiActionButtonsVisibility(reviewListTable, json.data ?? []);
-    });
-
-    if (canUseAiScoring) {
-        GenerateAiAssessmentButton();
-    }
-
-    if (canUseAiScoring) {
-        CloneAssessmentButton();
-    }
-
-    if (abp.auth.isGranted('Unity.GrantManager.ApplicationManagement.Review.AssessmentReviewList.Create')) {
-        CreateAssessmentButton();
-    }
-
-    function GenerateAiAssessmentButton() {
-        let generateButtons = new $.fn.dataTable.Buttons(reviewListTable, assessmentGenerateButtonGroup);
-        generateButtons.container().appendTo("#AdjudicationTeamLeadActionBar");
-        reviewListTable.buttons('Generate:name').enable();
-    }
-
-    async function CreateAssessmentButton() {
-        let createButtons = new $.fn.dataTable.Buttons(reviewListTable, assessmentCreateButtonGroup);
-        createButtons.container().appendTo("#AdjudicationTeamLeadActionBar");
-        await updateCreateButtonState(reviewListTable);
-    }
-
-    function CloneAssessmentButton() {
-        let cloneButtons = new $.fn.dataTable.Buttons(reviewListTable, assessmentCloneButtonGroup);
-        cloneButtons.container().appendTo("#AdjudicationTeamLeadActionBar");
-        reviewListTable.buttons('Clone:name').disable();
-    }
-
-    reviewListTable.buttons(0, null).container().appendTo("#AdjudicationTeamLeadActionBar");
-    $("#AdjudicationTeamLeadActionBar .dt-buttons").contents().unwrap();
-    updateAiActionButtonsVisibility(reviewListTable);
+    $('#' + reviewListDiv).on('xhr.dt', function (e, settings, json, xhr) {
+        if (!json.isUsingDefaultScoresheet) {
+            reviewListTable.column(7).visible(false);  // 'FinancialAnalysis' column
+            reviewListTable.column(8).visible(false);  // 'EconomicImpact' column
+            reviewListTable.column(9).visible(false);  // 'InclusiveGrowth' column
+            reviewListTable.column(10).visible(false); // 'CleanGrowth' column
+        } else {
+            reviewListTable.column(7).visible(true);
+            reviewListTable.column(8).visible(true);
+            reviewListTable.column(9).visible(true);
+            reviewListTable.column(10).visible(true);
+        }
+
+        updateAiActionButtonsVisibility(reviewListTable, json.data ?? []);
+    });
+
+    if (canUseAiScoring) {
+        GenerateAiAssessmentButton();
+    }
+
+    if (canUseAiScoring) {
+        CloneAssessmentButton();
+    }
+
+    if (abp.auth.isGranted('Unity.GrantManager.ApplicationManagement.Review.AssessmentReviewList.Create')) {
+        CreateAssessmentButton();
+    }
+
+    function GenerateAiAssessmentButton() {
+        let generateButtons = new $.fn.dataTable.Buttons(reviewListTable, assessmentGenerateButtonGroup);
+        generateButtons.container().appendTo("#AdjudicationTeamLeadActionBar");
+        reviewListTable.buttons('Generate:name').enable();
+    }
+
+    async function CreateAssessmentButton() {
+        let createButtons = new $.fn.dataTable.Buttons(reviewListTable, assessmentCreateButtonGroup);
+        createButtons.container().appendTo("#AdjudicationTeamLeadActionBar");
+        await updateCreateButtonState(reviewListTable);
+    }
+
+    function CloneAssessmentButton() {
+        let cloneButtons = new $.fn.dataTable.Buttons(reviewListTable, assessmentCloneButtonGroup);
+        cloneButtons.container().appendTo("#AdjudicationTeamLeadActionBar");
+        reviewListTable.buttons('Clone:name').disable();
+    }
+
+    reviewListTable.buttons(0, null).container().appendTo("#AdjudicationTeamLeadActionBar");
+    $("#AdjudicationTeamLeadActionBar .dt-buttons").contents().unwrap();
+    updateAiActionButtonsVisibility(reviewListTable);
 
     reviewListTable.on('select', function (e, dt, type, indexes) {        
         handleRowSelection(e, dt, type, indexes, reviewListTable);
@@ -282,12 +282,12 @@ $(function () {
             $('#detailsTab a[href="#nav-review-and-assessment"]').tab('show');
         }
     );
-    PubSub.subscribe(
-        'application_status_changed',
-        async (msg, data) => {
-            await updateCreateButtonState(reviewListTable);
-        }
-    );
+    PubSub.subscribe(
+        'application_status_changed',
+        async (msg, data) => {
+            await updateCreateButtonState(reviewListTable);
+        }
+    );
 
     $('#nav-review-and-assessment-tab').one('click', function () {
         reviewListTable.columns.adjust();
@@ -345,24 +345,24 @@ function getButtonArray(actionArray) {
         .sort((a, b) => a.sortOrder - b.sortOrder);
 }
 
-function refreshActionButtons(dataTableContext, assessmentId, selectedData) {
-    dataTableContext.buttons(0, null).disable();
-    dataTableContext.buttons('Clone:name').disable();
-
-    if (assessmentId) {
-        if (!selectedData?.isAiAssessment) {
-            // Human assessment: enable workflow buttons based on permitted actions
-            unity.grantManager.assessments.assessment.getPermittedActions(assessmentId, {})
-                .then(function (actionListResult) {
-                    let enabledButtons = actionListResult.map((x) => x + ':name');
-                    dataTableContext.buttons(enabledButtons).enable();
-                });
-        }
-    }
-
-    updateCloneButtonState(dataTableContext);
-    updateCreateButtonState(dataTableContext);
-}
+function refreshActionButtons(dataTableContext, assessmentId, selectedData) {
+    dataTableContext.buttons(0, null).disable();
+    dataTableContext.buttons('Clone:name').disable();
+
+    if (assessmentId) {
+        if (!selectedData?.isAiAssessment) {
+            // Human assessment: enable workflow buttons based on permitted actions
+            unity.grantManager.assessments.assessment.getPermittedActions(assessmentId, {})
+                .then(function (actionListResult) {
+                    let enabledButtons = actionListResult.map((x) => x + ':name');
+                    dataTableContext.buttons(enabledButtons).enable();
+                });
+        }
+    }
+
+    updateCloneButtonState(dataTableContext);
+    updateCreateButtonState(dataTableContext);
+}
 
 function renderApproval(data) {
     if (data !== null) {
@@ -371,63 +371,63 @@ function renderApproval(data) {
         return nullPlaceholder;
     }
 }
-async function getActionButtonConfigMap() {
-    let applicationId = document.getElementById('DetailsViewApplicationId').value;
-    let applicationStatus = await unity.grantManager.grantApplications.grantApplication.getApplicationStatus(applicationId).then(data => {
-        return data;
-    });
-    return applicationStatus;
-}
-
-async function canCreateAssessment() {
-    const applicationStatus = await getActionButtonConfigMap();
-    return !finalApplicationStates.includes(applicationStatus.statusCode);
-}
-
-async function updateCreateButtonState(dataTableContext) {
-    if (!dataTableContext.button('Create:name').any()) {
-        return;
-    }
-
-    const [isPermittedByStatus, currentAssessmentId] = await Promise.all([
-        canCreateAssessment(),
-        unity.grantManager.assessments.assessment.getCurrentUserAssessmentId(pageApplicationId, {})
-    ]);
-
-    if (isPermittedByStatus && currentAssessmentId == null) {
-        dataTableContext.buttons('Create:name').enable();
-    } else {
-        dataTableContext.buttons('Create:name').disable();
-    }
-}
-
-async function updateCloneButtonState(dataTableContext) {
-    if (!dataTableContext.button('Clone:name').any()) {
-        return;
-    }
-
-    const hasAiAssessment = dataTableContext.rows().data().toArray().some(row => row?.isAiAssessment === true);
-    const currentAssessmentId = await unity.grantManager.assessments.assessment.getCurrentUserAssessmentId(pageApplicationId, {});
-
-    if (hasAiAssessment && currentAssessmentId == null) {
-        dataTableContext.buttons('Clone:name').enable();
-    } else {
-        dataTableContext.buttons('Clone:name').disable();
-    }
-}
-
-function updateAiActionButtonsVisibility(dataTableContext, rowsData) {
-    const rowData = rowsData ?? dataTableContext.rows().data().toArray();
-    const hasAiAssessment = rowData.some(row => row?.isAiAssessment === true);
-
-    if (dataTableContext.button('Generate:name').any()) {
-        $('#GenerateButton').toggle(!hasAiAssessment);
-    }
-
-    if (dataTableContext.button('Clone:name').any()) {
-        $('#CloneButton').toggle(hasAiAssessment);
-    }
-}
+async function getActionButtonConfigMap() {
+    let applicationId = document.getElementById('DetailsViewApplicationId').value;
+    let applicationStatus = await unity.grantManager.grantApplications.grantApplication.getApplicationStatus(applicationId).then(data => {
+        return data;
+    });
+    return applicationStatus;
+}
+
+async function canCreateAssessment() {
+    const applicationStatus = await getActionButtonConfigMap();
+    return !finalApplicationStates.includes(applicationStatus.statusCode);
+}
+
+async function updateCreateButtonState(dataTableContext) {
+    if (!dataTableContext.button('Create:name').any()) {
+        return;
+    }
+
+    const [isPermittedByStatus, currentAssessmentId] = await Promise.all([
+        canCreateAssessment(),
+        unity.grantManager.assessments.assessment.getCurrentUserAssessmentId(pageApplicationId, {})
+    ]);
+
+    if (isPermittedByStatus && currentAssessmentId == null) {
+        dataTableContext.buttons('Create:name').enable();
+    } else {
+        dataTableContext.buttons('Create:name').disable();
+    }
+}
+
+async function updateCloneButtonState(dataTableContext) {
+    if (!dataTableContext.button('Clone:name').any()) {
+        return;
+    }
+
+    const hasAiAssessment = dataTableContext.rows().data().toArray().some(row => row?.isAiAssessment === true);
+    const currentAssessmentId = await unity.grantManager.assessments.assessment.getCurrentUserAssessmentId(pageApplicationId, {});
+
+    if (hasAiAssessment && currentAssessmentId == null) {
+        dataTableContext.buttons('Clone:name').enable();
+    } else {
+        dataTableContext.buttons('Clone:name').disable();
+    }
+}
+
+function updateAiActionButtonsVisibility(dataTableContext, rowsData) {
+    const rowData = rowsData ?? dataTableContext.rows().data().toArray();
+    const hasAiAssessment = rowData.some(row => row?.isAiAssessment === true);
+
+    if (dataTableContext.button('Generate:name').any()) {
+        $('#GenerateButton').toggle(!hasAiAssessment);
+    }
+
+    if (dataTableContext.button('Clone:name').any()) {
+        $('#CloneButton').toggle(hasAiAssessment);
+    }
+}
 function renderUnityWorkflowButton(actionValue) {
     let buttonConfig = actionButtonConfigMap[actionValue] ?? actionButtonConfigMap['_Fallback']
 
@@ -440,51 +440,51 @@ function renderUnityWorkflowButton(actionValue) {
 }
 
 /* Cutom Unity Workflow Buttons */
-function unityWorkflowButtonText(dt, button, config) {
-    let buttonText = actionButtonLabelMap[config.name] ?? l(`Enum:AssessmentAction.${config.name}`);
-    return '<span>' + buttonText + '</span>';
-}
-
-function cloneButtonText(dt, button, config) {
-    return '<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>' + actionButtonLabelMap.Clone + '</span></span>';
-}
-
-function generateAiButtonText(dt, button, config) {
-    return '<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Generate</span></span>';
-}
-
-function unityWorkflowButtonAction(e, dt, button, config) {
-    let selectedRow = dt.rows({ selected: true }).data()[0];
-    if (typeof (selectedRow) === 'object') {
-        executeAssessmentAction(selectedRow.id, config.name);
-    }
-}
-
-function generateAiButtonAction(e, dt, button, config) {
-    const triggerButton = button?.node ? $(button.node) : null;
-    const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
-
-    if (triggerButton?.length) {
-        triggerButton.prop('disabled', true);
-        triggerButton.html('<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Queueing...</span></span>');
-    }
-
-    unity.grantManager.grantApplications.applicationAIScoring.generateAIScoresheetAnswers(pageApplicationId, promptVersion, false)
-        .done(function () {
-            abp.notify.success('AI scoring queued. Refresh later to see updated results.');
-        })
-        .fail(function () {
-            abp.message.error('Failed to queue AI scoring. Please try again.');
-        })
-        .always(function () {
-            if (triggerButton?.length) {
-                triggerButton.prop('disabled', false);
-                triggerButton.html(generateAiButtonText(null, null, null));
-            }
-        });
-}
-
-function executeAssessmentAction(assessmentId, triggerAction) {
+function unityWorkflowButtonText(dt, button, config) {
+    let buttonText = actionButtonLabelMap[config.name] ?? l(`Enum:AssessmentAction.${config.name}`);
+    return '<span>' + buttonText + '</span>';
+}
+
+function cloneButtonText(dt, button, config) {
+    return '<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>' + actionButtonLabelMap.Clone + '</span></span>';
+}
+
+function generateAiButtonText(dt, button, config) {
+    return '<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Generate</span></span>';
+}
+
+function unityWorkflowButtonAction(e, dt, button, config) {
+    let selectedRow = dt.rows({ selected: true }).data()[0];
+    if (typeof (selectedRow) === 'object') {
+        executeAssessmentAction(selectedRow.id, config.name);
+    }
+}
+
+function generateAiButtonAction(e, dt, button, config) {
+    const triggerButton = button?.node ? $(button.node) : null;
+    const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
+
+    if (triggerButton?.length) {
+        triggerButton.prop('disabled', true);
+        triggerButton.html('<span class="ai-button-content"><i class="unt-icon-sm fa-solid fa-wand-sparkles"></i><span>Queueing...</span></span>');
+    }
+
+    unity.grantManager.grantApplications.applicationScoring.generateApplicationScoring(pageApplicationId, promptVersion)
+        .done(function () {
+            abp.notify.success('AI scoring queued. Refresh later to see updated results.');
+        })
+        .fail(function () {
+            abp.message.error('Failed to queue AI scoring. Please try again.');
+        })
+        .always(function () {
+            if (triggerButton?.length) {
+                triggerButton.prop('disabled', false);
+                triggerButton.html(generateAiButtonText(null, null, null));
+            }
+        });
+}
+
+function executeAssessmentAction(assessmentId, triggerAction) {
     unity.grantManager.assessments.assessment.executeAssessmentAction(assessmentId, triggerAction, {})
         .then(function (result) {
             PubSub.publish('assessment_action_completed');
@@ -508,25 +508,25 @@ function createButtonInit(dt, button, config) {
         });
 }
 
-function cloneButtonAction(e, dt, button, config) {
-    const aiRowData = dt.rows().data().toArray().find(row => row?.isAiAssessment === true);
-
-    if (typeof (aiRowData) === 'object') {
-        unity.grantManager.assessments.assessment.cloneFromAi(aiRowData.id, {})
-            .done(function (data) {
-                dt.buttons('Create:name').disable();
-                dt.buttons('Clone:name').disable();
-                PubSub.publish('assessment_action_completed');
-                PubSub.publish('refresh_review_list', data.id);
-                PubSub.publish("application_status_changed");
-                PubSub.publish("refresh_detail_panel_summary");
-                abp.notify.success(
-                    l('ReviewerList:CloneAssessment'),
-                    "Completed Successfully"
-                );
-            });
-    }
-}
+function cloneButtonAction(e, dt, button, config) {
+    const aiRowData = dt.rows().data().toArray().find(row => row?.isAiAssessment === true);
+
+    if (typeof (aiRowData) === 'object') {
+        unity.grantManager.assessments.assessment.cloneFromAi(aiRowData.id, {})
+            .done(function (data) {
+                dt.buttons('Create:name').disable();
+                dt.buttons('Clone:name').disable();
+                PubSub.publish('assessment_action_completed');
+                PubSub.publish('refresh_review_list', data.id);
+                PubSub.publish("application_status_changed");
+                PubSub.publish("refresh_detail_panel_summary");
+                abp.notify.success(
+                    l('ReviewerList:CloneAssessment'),
+                    "Completed Successfully"
+                );
+            });
+    }
+}
 
 function createButtonAction(e, dt, button, config) {
     unity.grantManager.assessments.assessment.create({ "applicationId": pageApplicationId }, {})

From 36e7ca6fa6391af3653bb49bb0fe6372d059bb75 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 11:55:33 -0700
Subject: [PATCH 14/38] AB#32012 refine AI dev panel outputs

---
 .../Pages/GrantApplications/Details.cshtml    | 450 +++++++++---------
 .../Pages/GrantApplications/Details.cshtml.cs |   5 +-
 .../Pages/GrantApplications/Details.js        |  84 +++-
 3 files changed, 285 insertions(+), 254 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
index 7fc4863ea3..6b6bd30d93 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -26,18 +26,18 @@
 @inject ICurrentTenant CurrentTenant
 @inject ISettingProvider SettingProvider
 
-@{
-    PageLayout.Content.Title = L["Grants"].Value;
-    var notificationsFeatureEnabled = await FeatureChecker.IsEnabledAsync("Unity.Notifications");
-    var readEmailGranted = await PermissionChecker.IsGrantedAsync("Notifications.Email");
-    var aiAttachmentSummariesEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries")
-        && await PermissionChecker.IsGrantedAsync(AIPermissions.AttachmentSummary.AttachmentSummaryDefault);
-    var aiApplicationAnalysisEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis")
-        && await PermissionChecker.IsGrantedAsync(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault);
-    var aiScoringEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.Scoring")
-        && await PermissionChecker.IsGrantedAsync(AIPermissions.ScoringAssistant.ScoringAssistantDefault);
-    var flexFeatureEnabled = await FeatureChecker.IsEnabledAsync("Unity.Flex");
-}
+@{
+    PageLayout.Content.Title = L["Grants"].Value;
+    var notificationsFeatureEnabled = await FeatureChecker.IsEnabledAsync("Unity.Notifications");
+    var readEmailGranted = await PermissionChecker.IsGrantedAsync("Notifications.Email");
+    var aiAttachmentSummariesEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries")
+        && await PermissionChecker.IsGrantedAsync(AIPermissions.AttachmentSummary.AttachmentSummaryDefault);
+    var aiApplicationAnalysisEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis")
+        && await PermissionChecker.IsGrantedAsync(AIPermissions.ApplicationAnalysis.ApplicationAnalysisDefault);
+    var aiScoringEnabled = await FeatureChecker.IsEnabledAsync("Unity.AI.Scoring")
+        && await PermissionChecker.IsGrantedAsync(AIPermissions.ScoringAssistant.ScoringAssistantDefault);
+    var flexFeatureEnabled = await FeatureChecker.IsEnabledAsync("Unity.Flex");
+}
 @section styles
 {
     <abp-style src="/libs/formiojs/formio.form.css" />
@@ -60,19 +60,19 @@
 <input type="hidden" id="DetailsViewApplicationId" value="@Model.ApplicationId" />
 <input type="hidden" id="ApplicationFormSubmissionId" value="@Model.ApplicationFormSubmissionId" />
 <input type="hidden" id="ChefsSubmissionId" value="@Model.ChefsSubmissionId" />
-<input type="hidden" id="ApplicationFormSubmissionData" value="@Model.ApplicationFormSubmissionData" />
-<input type="hidden" id="ApplicationFormSchema" value="@Model.ApplicationFormSchema" />
-<input type="hidden" id="ApplicationScoresheetSchemaJson" value="@Model.ApplicationScoresheetSchemaJson" />
-<input type="hidden" id="ApplicationFormId" value="@Model.ApplicationFormId" />
+<input type="hidden" id="ApplicationFormSubmissionData" value="@Model.ApplicationFormSubmissionData" />
+<input type="hidden" id="ApplicationFormSchema" value="@Model.ApplicationFormSchema" />
+<input type="hidden" id="ApplicationScoresheetSchemaJson" value="@Model.ApplicationScoresheetSchemaJson" />
+<input type="hidden" id="ApplicationFormId" value="@Model.ApplicationFormId" />
 <input type="hidden" id="HasRenderedHTML" value="@Model.HasRenderedHTML.ToString()" />
 <input type="hidden" id="CurrentUserId" value="@Model.CurrentUserId" />
 <input type="hidden" id="CurrentUserName" value="@Model.CurrentUserName" />
 <input type="hidden" id="Extensions" value="@Model.Extensions" />
-<input type="hidden" id="MaxFileSize" value="@Model.MaxFileSize" />
-<input type="hidden" id="RenderFormIoToHtml" value="@Model.RenderFormIoToHtml.ToString()" />
-<input type="hidden" id="ApplicationFormVersionId" value="@Model.ApplicationFormVersionId" />
-<input type="hidden" id="AIAnalysisFeatureEnabled" value="@aiApplicationAnalysisEnabled" />
-<input type="hidden" id="AIScoringFeatureEnabled" value="@aiScoringEnabled.ToString()" />
+<input type="hidden" id="MaxFileSize" value="@Model.MaxFileSize" />
+<input type="hidden" id="RenderFormIoToHtml" value="@Model.RenderFormIoToHtml.ToString()" />
+<input type="hidden" id="ApplicationFormVersionId" value="@Model.ApplicationFormVersionId" />
+<input type="hidden" id="AIAnalysisFeatureEnabled" value="@aiApplicationAnalysisEnabled" />
+<input type="hidden" id="AIScoringFeatureEnabled" value="@aiScoringEnabled.ToString()" />
 
 @functions
 {
@@ -268,19 +268,19 @@
                 <li class="nav-item">
                     <button class="nav-link" id="history-tab" data-bs-toggle="tab" data-bs-target="#history" type="button" role="tab" aria-controls="history" aria-selected="false"><i class="fl fl-history" aria-hidden="true"></i> </button>
                 </li>
-            @if (aiApplicationAnalysisEnabled)
-            {                
-                <li class="nav-item">
-                    <button class="nav-link" id="ai-analysis-tab" data-bs-toggle="tab" data-bs-target="#ai-analysis" type="button" role="tab" aria-controls="ai-analysis" aria-selected="false"><span class="ai-analysis-tab-icon-wrap"><i class="fl fl-review-user" aria-hidden="true"></i><span class="ai-analysis-tab-indicator" id="ai_analysis_status" style="display:none;"></span></span></button>
-                </li>
-            }
-            @if (Model.IsDevPromptControlsEnabled)
-            {
-                <li class="nav-item ms-auto">
-                    <button class="nav-link" id="dev-tools-tab" data-bs-toggle="tab" data-bs-target="#dev-tools" type="button" role="tab" aria-controls="dev-tools" aria-selected="false">Dev</button>
-                </li>
-            }
-            </ul>
+            @if (aiApplicationAnalysisEnabled)
+            {                
+                <li class="nav-item">
+                    <button class="nav-link" id="ai-analysis-tab" data-bs-toggle="tab" data-bs-target="#ai-analysis" type="button" role="tab" aria-controls="ai-analysis" aria-selected="false"><span class="ai-analysis-tab-icon-wrap"><i class="fl fl-review-user" aria-hidden="true"></i><span class="ai-analysis-tab-indicator" id="ai_analysis_status" style="display:none;"></span></span></button>
+                </li>
+            }
+            @if (Model.IsDevPromptControlsEnabled)
+            {
+                <li class="nav-item ms-auto">
+                    <button class="nav-link" id="dev-tools-tab" data-bs-toggle="tab" data-bs-target="#dev-tools" type="button" role="tab" aria-controls="dev-tools" aria-selected="false">Dev</button>
+                </li>
+            }
+            </ul>
 
             <div class="tab-content details-scrollable" id="myTabContent">
 
@@ -313,9 +313,9 @@
                             @await Component.InvokeAsync("UserInfoWidget", new { displayName = "", badge = "", title = "" })
                         </div>
 
-                        <div id="assessmentScoresWidgetArea">
-                            @await Component.InvokeAsync("AssessmentScoresWidget", new { assessmentId = Model.AssessmentId, currentUserId = Model.CurrentUserId })
-                        </div>
+                        <div id="assessmentScoresWidgetArea">
+                            @await Component.InvokeAsync("AssessmentScoresWidget", new { assessmentId = Model.AssessmentId, currentUserId = Model.CurrentUserId })
+                        </div>
 
                         <h6 class="fw-bold px-3 pt-4 pb-2">Scoring Attachments</h6>
 
@@ -383,11 +383,11 @@
                 @*-------- Comments Tab Section END ---------*@
 
                 @*-------- Attachments Tab Section ---------*@
-                <div class="tab-pane fade" id="attachments" role="tabpanel" aria-labelledby="attachments-tab">
-                    @await Component.InvokeAsync("ApplicationAttachments")
-
-                    @await Component.InvokeAsync("ChefsAttachments")
-                </div>
+                <div class="tab-pane fade" id="attachments" role="tabpanel" aria-labelledby="attachments-tab">
+                    @await Component.InvokeAsync("ApplicationAttachments")
+
+                    @await Component.InvokeAsync("ChefsAttachments")
+                </div>
                 @*-------- Attachments Tab Section END ---------*@
 
                 @*-------- Links Tab Section ---------*@
@@ -407,190 +407,190 @@
                 </div>
                 @*-------- History Tab Section END ---------*@
 
-                @if (aiApplicationAnalysisEnabled)
-                { 
-                <div class="tab-pane fade" id="ai-analysis" role="tabpanel" aria-labelledby="ai-analysis-tab">
-                    <div class="d-flex justify-content-between align-items-center px-3 pt-4 pb-2">
-                        <h6 class="fw-bold m-0">AI Application Analysis</h6>
-                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="regenerateAiAnalysis">
-                            <span class="ai-button-content">
-                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                <span>Generate</span>
-                            </span>
-                        </button>
-                    </div>
-                    <div class="ai-analysis-container">
-                        @* Default message when no analysis data is available *@
-                        <div class="ai-analysis-no-data px-3 py-4" id="aiAnalysisNoData">
-                            <div class="text-center text-muted">
-                                <i class="fl fl-review-user fa-2x mb-3 opacity-50"></i>
-                                <h6 class="mb-2">No AI Analysis Available</h6>
-                                <p class="small mb-0">AI analysis results will appear here when available.</p>
-                            </div>
-                        </div>
-                        <div class="ai-analysis-sections px-3 pb-3" id="aiAnalysisSections">
-                            @* Analysis sections will be dynamically generated here *@
-                        </div>
-                    </div>
-
-                    @* Hidden HTML templates for AI analysis items *@
-                    <div class="d-none" id="aiAnalysisTemplates">
-                        <div class="ai-analysis-section" data-template="section">
-                            <div class="ai-analysis-section-header">
-                                <div class="ai-analysis-section-title-row">
-                                    <i class="ai-analysis-section-icon fl" data-element="icon"></i>
-                                    <span class="ai-analysis-section-title" data-element="title"></span>
-                                </div>
-                                <span data-element="status-chip" style="display:none;"></span>
-                                <button type="button" class="ai-analysis-section-toggle" data-element="hidden-toggle" style="display:none;"></button>
-                            </div>
-                            <div class="ai-analysis-section-body">
-                                <div data-element="items"></div>
-                            </div>
-                        </div>
-
-                        <div class="ai-analysis-detail-item" data-template="active-item">
-                            <div class="ai-analysis-detail-header">
-                                <div class="ai-analysis-detail-category" data-element="category"></div>
-                                <button type="button" class="ai-analysis-action-btn" data-element="hide-btn" title="Hide this item">
-                                    Hide
-                                </button>
-                            </div>
-                            <div class="ai-analysis-detail-message" data-element="message"></div>
-                        </div>
-
-                        <div class="ai-analysis-detail-item hidden-item" data-template="hidden-item">
-                            <div class="ai-analysis-detail-header">
-                                <div class="ai-analysis-detail-category" data-element="category"></div>
-                                <button type="button" class="ai-analysis-action-btn" data-element="show-btn" title="Show this item">
-                                    Show
-                                </button>
-                            </div>
-                            <div class="ai-analysis-detail-message" data-element="message"></div>
-                        </div>
-                    </div>
-                </div>
-                }
-                @*-------- AI Analysis Tab Section END ---------*@
-                @if (Model.IsDevPromptControlsEnabled)
-                {
-                    <div class="tab-pane fade" id="dev-tools" role="tabpanel" aria-labelledby="dev-tools-tab">
-                        <div class="dev-tools-header px-3 pt-4 pb-3">
-                            <h6 class="fw-bold m-0">AI Dev Tools</h6>
-                            <div class="dev-prompt-toolbar-row">
-                                <div class="dev-prompt-toolbar-inline">
-                                    <select id="devPromptVersion" class="form-select form-select-sm">
-                                        @if (Model.DefaultPromptVersion == "v0")
-                                        {
-                                            <option value="v0" selected>v0</option>
-                                            <option value="v1">v1</option>
-                                        }
-                                        else
-                                        {
-                                            <option value="v1" selected>v1</option>
-                                            <option value="v0">v0</option>
-                                        }
-                                    </select>
-                                    @if (aiAttachmentSummariesEnabled && aiApplicationAnalysisEnabled && aiScoringEnabled)
-                                    {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" id="generateAllAiDevToolsBtn">
-                                            <span class="ai-button-content">
-                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                                <span>Generate All</span>
-                                            </span>
-                                        </button>
-                                    }
-                                </div>
-                            </div>
-                        </div>
-                        <div class="px-3 pb-3">
-
-                            <div class="dev-prompt-section">
-                                <div class="dev-prompt-section-header">
-                                    <h6 class="fw-bold m-0">ATTACHMENT <span class="ai-dev-output-timestamp" id="attachmentAiOutputTimestamp"></span></h6>
-                                    @if (aiAttachmentSummariesEnabled)
-                                    {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="generateAIAttachmentSummaries(false, this)">
-                                            <span class="ai-button-content">
-                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                                <span>Generate</span>
-                                            </span>
-                                        </button>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
-                                    }
-                                </div>
-                                <div class="ai-dev-output-container">
-                                    <div class="ai-dev-output-actions">
-                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#attachmentAiOutput" title="Copy" aria-label="Copy">
-                                            <i class="fl fl-copy" aria-hidden="true"></i>
-                                        </button>
-                                    </div>
-                                    <textarea class="form-control form-control-sm ai-dev-output" id="attachmentAiOutput" readonly spellcheck="false"></textarea>
-                                </div>
-                            </div>
-
-                            <div class="dev-prompt-section">
-                                <div class="dev-prompt-section-header">
-                                    <h6 class="fw-bold m-0">ANALYSIS <span class="ai-dev-output-timestamp" id="analysisAiOutputTimestamp"></span></h6>
-                                    @if (aiApplicationAnalysisEnabled)
-                                    {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIAnalysis(false, this)">
-                                            <span class="ai-button-content">
-                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                                <span>Generate</span>
-                                            </span>
-                                        </button>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
-                                    }
-                                </div>
-                                <div class="ai-dev-output-container">
-                                    <div class="ai-dev-output-actions">
-                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#analysisAiOutput" title="Copy" aria-label="Copy">
-                                            <i class="fl fl-copy" aria-hidden="true"></i>
-                                        </button>
-                                    </div>
-                                    <textarea class="form-control form-control-sm ai-dev-output" id="analysisAiOutput" readonly spellcheck="false"></textarea>
-                                </div>
-                            </div>
-
-                            <div class="dev-prompt-section">
-                                <div class="dev-prompt-section-header">
-                                    <h6 class="fw-bold m-0">SCORING <span class="ai-dev-output-timestamp" id="scoringAiOutputTimestamp"></span></h6>
-                                    @if (aiScoringEnabled)
-                                    {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="regenerateAIScoresheetAnswers(false, this)">
-                                            <span class="ai-button-content">
-                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                                <span>Generate</span>
-                                            </span>
-                                        </button>
-                                    }
-                                    else
-                                    {
-                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
-                                    }
-                                </div>
-                                <div class="ai-dev-output-container">
-                                    <div class="ai-dev-output-actions">
-                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#scoringAiOutput" title="Copy" aria-label="Copy">
-                                            <i class="fl fl-copy" aria-hidden="true"></i>
-                                        </button>
-                                    </div>
-                                    <textarea class="form-control form-control-sm ai-dev-output" id="scoringAiOutput" readonly spellcheck="false"></textarea>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                }
-            </div>
+                @if (aiApplicationAnalysisEnabled)
+                { 
+                <div class="tab-pane fade" id="ai-analysis" role="tabpanel" aria-labelledby="ai-analysis-tab">
+                    <div class="d-flex justify-content-between align-items-center px-3 pt-4 pb-2">
+                        <h6 class="fw-bold m-0">AI Application Analysis</h6>
+                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="regenerateApplicationAnalysis">
+                            <span class="ai-button-content">
+                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                <span>Generate</span>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="ai-analysis-container">
+                        @* Default message when no analysis data is available *@
+                        <div class="ai-analysis-no-data px-3 py-4" id="aiAnalysisNoData">
+                            <div class="text-center text-muted">
+                                <i class="fl fl-review-user fa-2x mb-3 opacity-50"></i>
+                                <h6 class="mb-2">No AI Analysis Available</h6>
+                                <p class="small mb-0">AI analysis results will appear here when available.</p>
+                            </div>
+                        </div>
+                        <div class="ai-analysis-sections px-3 pb-3" id="aiAnalysisSections">
+                            @* Analysis sections will be dynamically generated here *@
+                        </div>
+                    </div>
+
+                    @* Hidden HTML templates for AI analysis items *@
+                    <div class="d-none" id="aiAnalysisTemplates">
+                        <div class="ai-analysis-section" data-template="section">
+                            <div class="ai-analysis-section-header">
+                                <div class="ai-analysis-section-title-row">
+                                    <i class="ai-analysis-section-icon fl" data-element="icon"></i>
+                                    <span class="ai-analysis-section-title" data-element="title"></span>
+                                </div>
+                                <span data-element="status-chip" style="display:none;"></span>
+                                <button type="button" class="ai-analysis-section-toggle" data-element="hidden-toggle" style="display:none;"></button>
+                            </div>
+                            <div class="ai-analysis-section-body">
+                                <div data-element="items"></div>
+                            </div>
+                        </div>
+
+                        <div class="ai-analysis-detail-item" data-template="active-item">
+                            <div class="ai-analysis-detail-header">
+                                <div class="ai-analysis-detail-category" data-element="category"></div>
+                                <button type="button" class="ai-analysis-action-btn" data-element="hide-btn" title="Hide this item">
+                                    Hide
+                                </button>
+                            </div>
+                            <div class="ai-analysis-detail-message" data-element="message"></div>
+                        </div>
+
+                        <div class="ai-analysis-detail-item hidden-item" data-template="hidden-item">
+                            <div class="ai-analysis-detail-header">
+                                <div class="ai-analysis-detail-category" data-element="category"></div>
+                                <button type="button" class="ai-analysis-action-btn" data-element="show-btn" title="Show this item">
+                                    Show
+                                </button>
+                            </div>
+                            <div class="ai-analysis-detail-message" data-element="message"></div>
+                        </div>
+                    </div>
+                </div>
+                }
+                @*-------- AI Analysis Tab Section END ---------*@
+                @if (Model.IsDevPromptControlsEnabled)
+                {
+                    <div class="tab-pane fade" id="dev-tools" role="tabpanel" aria-labelledby="dev-tools-tab">
+                        <div class="dev-tools-header px-3 pt-4 pb-3">
+                            <h6 class="fw-bold m-0">AI Dev Tools</h6>
+                            <div class="dev-prompt-toolbar-row">
+                                <div class="dev-prompt-toolbar-inline">
+                                    <select id="devPromptVersion" class="form-select form-select-sm">
+                                        @if (Model.DefaultPromptVersion == "v0")
+                                        {
+                                            <option value="v0" selected>v0</option>
+                                            <option value="v1">v1</option>
+                                        }
+                                        else
+                                        {
+                                            <option value="v1" selected>v1</option>
+                                            <option value="v0">v0</option>
+                                        }
+                                    </select>
+                                    @if (aiAttachmentSummariesEnabled && aiApplicationAnalysisEnabled && aiScoringEnabled)
+                                    {
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" id="generateAllAiDevToolsBtn">
+                                            <span class="ai-button-content">
+                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                                <span>Generate All</span>
+                                            </span>
+                                        </button>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                        <div class="px-3 pb-3">
+
+                            <div class="dev-prompt-section">
+                                <div class="dev-prompt-section-header">
+                                    <h6 class="fw-bold m-0">Attachment Summary <span class="ai-dev-output-timestamp" id="attachmentAiOutputTimestamp"></span></h6>
+                                    @if (aiAttachmentSummariesEnabled)
+                                    {
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="queueAttachmentSummary(this)">
+                                            <span class="ai-button-content">
+                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                                <span>Generate</span>
+                                            </span>
+                                        </button>
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
+                                    }
+                                </div>
+                                <div class="ai-dev-output-container">
+                                    <div class="ai-dev-output-actions">
+                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#attachmentAiOutput" title="Copy" aria-label="Copy">
+                                            <i class="fl fl-copy" aria-hidden="true"></i>
+                                        </button>
+                                    </div>
+                                    <textarea class="form-control form-control-sm ai-dev-output" id="attachmentAiOutput" readonly spellcheck="false"></textarea>
+                                </div>
+                            </div>
+
+                            <div class="dev-prompt-section">
+                                <div class="dev-prompt-section-header">
+                                    <h6 class="fw-bold m-0">Application Analysis <span class="ai-dev-output-timestamp" id="analysisAiOutputTimestamp"></span></h6>
+                                    @if (aiApplicationAnalysisEnabled)
+                                    {
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="queueApplicationAnalysis(this)">
+                                            <span class="ai-button-content">
+                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                                <span>Generate</span>
+                                            </span>
+                                        </button>
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
+                                    }
+                                </div>
+                                <div class="ai-dev-output-container">
+                                    <div class="ai-dev-output-actions">
+                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#analysisAiOutput" title="Copy" aria-label="Copy">
+                                            <i class="fl fl-copy" aria-hidden="true"></i>
+                                        </button>
+                                    </div>
+                                    <textarea class="form-control form-control-sm ai-dev-output" id="analysisAiOutput" readonly spellcheck="false"></textarea>
+                                </div>
+                            </div>
+
+                            <div class="dev-prompt-section">
+                                <div class="dev-prompt-section-header">
+                                    <h6 class="fw-bold m-0">Application Scoring <span class="ai-dev-output-timestamp" id="scoringAiOutputTimestamp"></span></h6>
+                                    @if (aiScoringEnabled)
+                                    {
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="queueApplicationScoring(this)">
+                                            <span class="ai-button-content">
+                                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
+                                                <span>Generate</span>
+                                            </span>
+                                        </button>
+                                    }
+                                    else
+                                    {
+                                        <span class="text-muted small">Unavailable: feature or permission not enabled</span>
+                                    }
+                                </div>
+                                <div class="ai-dev-output-container">
+                                    <div class="ai-dev-output-actions">
+                                        <button type="button" class="btn btn-icon ai-dev-output-copy-btn" data-target="#scoringAiOutput" title="Copy" aria-label="Copy">
+                                            <i class="fl fl-copy" aria-hidden="true"></i>
+                                        </button>
+                                    </div>
+                                    <textarea class="form-control form-control-sm ai-dev-output" id="scoringAiOutput" readonly spellcheck="false"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
 
         </abp-card>
     </div>
-</div>
+</div>
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
index f9e12eff2a..aaec1bb21e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml.cs
@@ -162,14 +162,11 @@ public async Task OnGetAsync()
             ArgumentNullException.ThrowIfNull(applicationForm);
             ApplicationScoresheetSchemaJson = await GetApplicationScoresheetSchemaJsonAsync(applicationForm);
             RenderFormIoToHtml = applicationForm.RenderFormIoToHtml;
+            ApplicationFormSubmissionData = applicationFormSubmission.Submission;
             if (!string.IsNullOrEmpty(applicationFormSubmission.RenderedHTML) && RenderFormIoToHtml)
             {
                 ApplicationFormSubmissionHtml = applicationFormSubmission.RenderedHTML;
             }
-            else
-            {
-                ApplicationFormSubmissionData = applicationFormSubmission.Submission;
-            }
         }
 
         public async Task<IActionResult> OnPostAsync()
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index 88dc2d9134..6634a1d659 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -72,6 +72,18 @@ $(function () {
         return `${header}\n\n${content}`;
     }
 
+    function unwrapWhenResult(result) {
+        if (
+            Array.isArray(result) &&
+            result.length === 3 &&
+            typeof result[1] === 'string'
+        ) {
+            return result[0];
+        }
+
+        return result;
+    }
+
     function getScoresheetSchemaJson() {
         return $('#ApplicationScoresheetSchemaJson').val() ||
             $('#AssessmentScoresheetSchemaJson').val() ||
@@ -197,6 +209,10 @@ $(function () {
         return timestamp.toLocaleString();
     }
 
+    function getAttachmentSummaryValue(attachment) {
+        return attachment?.aiSummary ?? attachment?.aISummary ?? '';
+    }
+
     function formatAttachmentAiOutput(attachments) {
         const attachmentBody = formatAttachmentSummaryBody(attachments);
         if (!attachmentBody) {
@@ -205,7 +221,10 @@ $(function () {
         }
 
         const summarizedAttachments = attachments.filter(
-            (attachment) => attachment.aiSummary && attachment.aiSummary.trim() !== ''
+            (attachment) => {
+                const summary = getAttachmentSummaryValue(attachment);
+                return summary && summary.trim() !== '';
+            }
         );
 
         const latestTimestamp = summarizedAttachments
@@ -224,7 +243,10 @@ $(function () {
         }
 
         const summarizedAttachments = attachments.filter(
-            (attachment) => attachment.aiSummary && attachment.aiSummary.trim() !== ''
+            (attachment) => {
+                const summary = getAttachmentSummaryValue(attachment);
+                return summary && summary.trim() !== '';
+            }
         );
 
         if (summarizedAttachments.length === 0) {
@@ -232,29 +254,41 @@ $(function () {
         }
 
         return summarizedAttachments.map(function(attachment) {
+            const summary = getAttachmentSummaryValue(attachment);
             return [
-                `NAME: ${attachment.fileName || ''}`,
+                'NAME:',
+                attachment.fileName || '',
+                '',
                 'SUMMARY:',
-                attachment.aiSummary || ''
+                summary
             ].join('\n');
         }).join('\n\n----------------------------------------\n\n');
     }
 
-    function loadAttachmentAiOutput(applicationId) {
-        if (!applicationId) {
-            setDevAiOutput('#attachmentAiOutput', '');
-            setDevAiOutputTimestamp('#attachmentAiOutputTimestamp', '');
-            return;
+    function formatAttachmentSummaryJson(attachments) {
+        if (!Array.isArray(attachments) || attachments.length === 0) {
+            return '';
         }
 
-        unity.grantManager.attachments.attachment
-            .getApplicationChefsFileAttachments(applicationId)
-            .done(function(attachments) {
-                setDevAiOutput('#attachmentAiOutput', formatAttachmentAiOutput(attachments));
+        const summarizedAttachments = attachments
+            .map((attachment) => {
+                const summary = getAttachmentSummaryValue(attachment);
+                if (!summary || summary.trim() === '') {
+                    return null;
+                }
+
+                return {
+                    name: attachment.fileName || '',
+                    summary
+                };
             })
-            .fail(function() {
-                setDevAiOutput('#attachmentAiOutput', '');
-            });
+            .filter((attachment) => attachment !== null);
+
+        if (summarizedAttachments.length === 0) {
+            return '';
+        }
+
+        return JSON.stringify(summarizedAttachments, null, 2);
     }
 
     function loadApplicationAiOutputs() {
@@ -275,16 +309,16 @@ $(function () {
             unity.grantManager.attachments.attachment.getApplicationChefsFileAttachments(applicationId)
         )
             .done(function(applicationResponse, attachmentsResponse) {
-                const application = Array.isArray(applicationResponse) ? applicationResponse[0] : applicationResponse;
-                const attachments = Array.isArray(attachmentsResponse) ? attachmentsResponse[0] : attachmentsResponse;
+                const application = unwrapWhenResult(applicationResponse);
+                const attachments = unwrapWhenResult(attachmentsResponse);
                 const updatedAt = application?.lastModificationTime || application?.creationTime || null;
                 const formattedUpdatedAt = formatTimestamp(updatedAt);
-                const attachmentSection = formatSectionBody('ATTACHMENTS', formatAttachmentSummaryBody(attachments));
+                const attachmentSection = formatSectionBody('ATTACHMENTS', formatAttachmentSummaryJson(attachments));
                 setDevAiOutputTimestamp('#analysisAiOutputTimestamp', formattedUpdatedAt);
                 setDevAiOutputTimestamp('#scoringAiOutputTimestamp', formattedUpdatedAt);
                 setDevAiOutput(
                     '#analysisAiOutput',
-                    formatOutputBody('ANALYSIS', [
+                    formatOutputBody('APPLICATION ANALYSIS', [
                         formatSectionBody('DATA', getPromptDataPayload()),
                         attachmentSection,
                         formatSectionBody(
@@ -295,7 +329,7 @@ $(function () {
                 );
                 setDevAiOutput(
                     '#scoringAiOutput',
-                    formatOutputBody('SCORING', [
+                    formatOutputBody('APPLICATION SCORING', [
                         formatSectionBody('SCORESHEET', formatJsonOrRaw(getScoresheetSchemaJson())),
                         formatSectionBody('DATA', getPromptDataPayload()),
                         attachmentSection,
@@ -307,7 +341,7 @@ $(function () {
                 );
                 setDevAiOutput(
                     '#attachmentAiOutput',
-                    formatOutputBody('ATTACHMENT', [formatAttachmentAiOutput(attachments)])
+                    formatOutputBody('ATTACHMENT SUMMARY', [formatAttachmentAiOutput(attachments)])
                 );
             })
             .fail(function() {
@@ -336,8 +370,8 @@ $(function () {
             .html('<span class="ai-button-content"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span><span>Queueing...</span></span>')
             .prop('disabled', true);
 
-        unity.grantManager.grantApplications.applicationAIContent
-            .generateAIContent(applicationId, promptVersion)
+        unity.grantManager.grantApplications.applicationContent
+            .generateContent(applicationId, promptVersion)
             .done(function() {
                 abp.notify.success('AI generate all queued. Refresh later to see updated results.');
             })
@@ -686,7 +720,7 @@ $(function () {
     });
 
     PubSub.subscribe('refresh_chefs_attachment_list', () => {
-        loadAttachmentAiOutput($('#DetailsViewApplicationId').val());
+        loadApplicationAiOutputs();
     });
 
     PubSub.subscribe('select_application_review', (msg, data) => {

From bd0f646de4ec5c0133becccd218a672265780e55 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 19 Mar 2026 12:11:03 -0700
Subject: [PATCH 15/38] AB#32012 fix AI orchestration follow-up issues

---
 .../AI/BackgroundJobs/GenerateContentBackgroundJob.cs     | 2 +-
 .../AI/Operations/AttachmentSummaryService.cs             | 5 ++---
 .../AI/Operations/IAttachmentSummaryService.cs            | 2 +-
 .../AI/Runtime/OpenAIRuntimeService.cs                    | 8 ++++----
 .../Intakes/Handlers/CreateAIAssessmentHandler.cs         | 4 ++++
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
index 870ab21bc2..3e0532ca2d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
@@ -46,7 +46,7 @@ public override async Task ExecuteAsync(GenerateContentBackgroundJobArgs args)
 
                 if (attachmentSummariesEnabled)
                 {
-                    await attachmentSummaryService.GenerateMissingForApplicationAsync(args.ApplicationId, args.PromptVersion);
+                    await attachmentSummaryService.GenerateForApplicationAsync(args.ApplicationId, args.PromptVersion);
                 }
 
                 if (applicationAnalysisEnabled)
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
index 40822d8830..7ef8fe1aac 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
@@ -58,10 +58,9 @@ public async Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmen
         return summaries;
     }
 
-    public async Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = null)
     {
-        var attachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a =>
-                a.ApplicationId == applicationId && string.IsNullOrWhiteSpace(a.AISummary)))
+        var attachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId))
             .Select(a => a.Id)
             .ToList();
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
index e1bc39b369..30c074a081 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
@@ -8,6 +8,6 @@ public interface IAttachmentSummaryService
 {
     Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null);
     Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null);
-    Task<List<string>> GenerateMissingForApplicationAsync(Guid applicationId, string? promptVersion = null);
+    Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = 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 c64ca52709..9d16448f5c 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
@@ -1096,22 +1096,22 @@ private static bool TryFormatProviderOutput(string output, out string formattedO
 
                     if (promptTokens.HasValue)
                     {
-                        lines.Add($"PROMPT TOKENS: {promptTokens.Value}");
+                        lines.Add($"PromptTokens: {promptTokens.Value}");
                     }
 
                     if (completionTokens.HasValue)
                     {
-                        lines.Add($"COMPLETION TOKENS: {completionTokens.Value}");
+                        lines.Add($"CompletionTokens: {completionTokens.Value}");
                     }
 
                     if (reasoningTokens.HasValue)
                     {
-                        lines.Add($"REASONING TOKENS: {reasoningTokens.Value}");
+                        lines.Add($"ReasoningTokens: {reasoningTokens.Value}");
                     }
                 }
 
                 var normalizedContent = FormatPromptOutputContent(content);
-                lines.Add("CONTENT:");
+                lines.Add("Output:");
                 lines.Add(normalizedContent);
                 formattedOutput = string.Join(Environment.NewLine, lines);
                 return true;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
index 699f3f1a8e..7926fe41c1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Intakes/Handlers/CreateAIAssessmentHandler.cs
@@ -7,6 +7,7 @@
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
 using Volo.Abp.Features;
+using Volo.Abp.Uow;
 
 namespace Unity.GrantManager.Intakes.Handlers;
 
@@ -14,6 +15,7 @@ public class CreateAIAssessmentHandler(
     AssessmentManager assessmentManager,
     IApplicationRepository applicationRepository,
     IFeatureChecker featureChecker,
+    IUnitOfWorkManager unitOfWorkManager,
     ILogger<CreateAIAssessmentHandler> logger) : ILocalEventHandler<AIApplicationScoringGeneratedEvent>, ITransientDependency
 {
     public async Task HandleEventAsync(AIApplicationScoringGeneratedEvent eventData)
@@ -31,8 +33,10 @@ public async Task HandleEventAsync(AIApplicationScoringGeneratedEvent eventData)
 
         try
         {
+            using var uow = unitOfWorkManager.Begin(requiresNew: true);
             var application = await applicationRepository.GetAsync(eventData.ApplicationId);
             await assessmentManager.CreateAiAssessmentAsync(application);
+            await uow.CompleteAsync();
             logger.LogInformation("Created AI assessment for application {ApplicationId}.", eventData.ApplicationId);
         }
         catch (Exception ex)

From f6695ca71c4e7128f5281958aae09689c4b1e24f Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 15:03:03 -0700
Subject: [PATCH 16/38] AB#32012 align AI app service and DTO naming

---
 .../ApplicationChefsFileAttachmentDto.cs      |  6 +-
 .../Attachments/IAttachmentAppService.cs      |  2 -
 .../IAttachmentSummaryAppService.cs           | 12 +++
 .../GrantApplications/GrantApplicationDto.cs  |  6 +-
 .../Attachments/AttachmentAppService.cs       | 96 +++++--------------
 .../AttachmentSummaryAppService.cs            | 63 ++++++++++++
 .../GrantApplicationAppService.cs             |  2 +-
 ...rantManagerApplicationAutoMapperProfile.cs |  9 +-
 .../Pages/GrantApplications/Details.js        | 20 ++--
 .../Pages/GrantApplications/ai-analysis.js    |  2 +-
 .../ChefsAttachments/ChefsAttachments.js      |  2 +-
 11 files changed, 122 insertions(+), 98 deletions(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentSummaryAppService.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs
index bb7379a79a..fd2555acec 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/ApplicationChefsFileAttachmentDto.cs
@@ -9,9 +9,7 @@ public class ApplicationChefsFileAttachmentDto : EntityDto<Guid>
     public string ChefsSubmissionId { get; set; } = string.Empty;
     public string ChefsFileId { get; set; } = string.Empty;
     public string? Name { get; set; }
-    public string? FileName { get; set; }
-    public string? DisplayName { get; set; }
     public string? AISummary { get; set; }
-    public DateTime CreationTime { get; set; }
-    public DateTime? LastModificationTime { get; set; }
+    public DateTime CreatedTime { get; set; }
+    public DateTime? UpdatedTime { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
index ad0af4ab39..26df633102 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
@@ -13,7 +13,5 @@ public interface IAttachmentAppService : IApplicationService
     Task<IList<UnityAttachmentDto>> GetAttachmentsAsync(AttachmentParametersDto attachmentParametersDto);
     Task<AttachmentMetadataDto> GetAttachmentMetadataAsync(AttachmentType attachmentType, Guid attachmentId);
     Task<AttachmentMetadataDto> UpdateAttachmentMetadataAsync(UpdateAttachmentMetadataDto updateAttachment);
-    Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null);
-    Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null);
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
new file mode 100644
index 0000000000..65589ed840
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.Attachments;
+
+public interface IAttachmentSummaryAppService : IApplicationService
+{
+    Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null);
+    Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index cdbd834baf..7b7f026b38 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -83,7 +83,7 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public PaymentInfoDto? PaymentInfo { get; set; }
     public string? UnityApplicationId { get; set; }
     public string? ApplicantElectoralDistrict { get; set; }
-    public string? AIAnalysis { get; set; }
-    public ApplicationAnalysisResponse? AIAnalysisData { get; set; }
-    public string? AIScoresheetAnswers { get; set; }
+    public string? ApplicationAnalysisJson { get; set; }
+    public ApplicationAnalysisResponse? ApplicationAnalysis { get; set; }
+    public string? ApplicationScoringJson { get; set; }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 018eaeee93..0770a3c09a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -1,22 +1,15 @@
 using Microsoft.AspNetCore.Authorization;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Unity.AI.Permissions;
-using Unity.GrantManager.AI;
-using Unity.GrantManager.AI.BackgroundJobs;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Identity;
 using Unity.GrantManager.Intakes;
-using Volo.Abp;
 using Volo.Abp.Application.Services;
-using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Features;
 
 namespace Unity.GrantManager.Attachments;
 
@@ -28,23 +21,19 @@ public class AttachmentAppService(
     IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
     IAssessmentAttachmentRepository assessmentAttachmentRepository,
     IIntakeFormSubmissionManager intakeFormSubmissionManager,
-    IPersonRepository personUserRepository,
-    IBackgroundJobManager backgroundJobManager,
-    IFeatureChecker featureChecker) : ApplicationService, IAttachmentAppService
+    IPersonRepository personUserRepository) : ApplicationService, IAttachmentAppService
 {
-    private const string SummaryGenerationQueuedMessage = "AI summary generation queued.";
-
     public async Task<IList<ApplicationAttachmentDto>> GetApplicationAsync(Guid applicationId)
     {
         return (await GetAttachmentsAsync(new AttachmentParametersDto(AttachmentType.APPLICATION, applicationId)))
             .Select(attachment => new ApplicationAttachmentDto
             {
-                AttachedBy = attachment.AttachedBy,
-                Id = attachment.Id,
-                FileName = attachment.FileName,
+                AttachedBy  = attachment.AttachedBy,
+                Id          = attachment.Id,
+                FileName    = attachment.FileName,
                 S3ObjectKey = attachment.S3ObjectKey,
-                Time = attachment.Time,
-                CreatorId = attachment.CreatorId,
+                Time        = attachment.Time,
+                CreatorId   = attachment.CreatorId,
                 DisplayName = attachment.DisplayName
             }).ToList();
     }
@@ -54,12 +43,12 @@ public async Task<IList<AssessmentAttachmentDto>> GetAssessmentAsync(Guid assess
         return (await GetAttachmentsAsync(new AttachmentParametersDto(AttachmentType.ASSESSMENT, assessmentId)))
             .Select(attachment => new AssessmentAttachmentDto
             {
-                AttachedBy = attachment.AttachedBy,
-                Id = attachment.Id,
-                FileName = attachment.FileName,
+                AttachedBy  = attachment.AttachedBy,
+                Id          = attachment.Id,
+                FileName    = attachment.FileName,
                 S3ObjectKey = attachment.S3ObjectKey,
-                Time = attachment.Time,
-                CreatorId = attachment.CreatorId,
+                Time        = attachment.Time,
+                CreatorId   = attachment.CreatorId,
                 DisplayName = attachment.DisplayName
             }).ToList();
     }
@@ -104,14 +93,14 @@ protected internal async Task<IList<UnityAttachmentDto>> GetAttachmentsInternalA
                     join person in people on attachment.UserId equals person.Id
                     select new UnityAttachmentDto()
                     {
-                        Id = attachment.Id,
-                        FileName = attachment.FileName,
+                        Id          = attachment.Id,
+                        FileName    = attachment.FileName,
                         DisplayName = attachment.DisplayName,
                         S3ObjectKey = attachment.S3ObjectKey,
-                        Time = attachment.Time,
+                        Time        = attachment.Time,
                         AttachmentType = attachment.AttachmentType,
-                        AttachedBy = person.FullName,
-                        CreatorId = person.Id
+                        AttachedBy  = person.FullName,
+                        CreatorId   = person.Id
                     };
 
         return query.ToList();
@@ -138,10 +127,10 @@ protected internal static async Task<AttachmentMetadataDto> GetMetadataInternalA
         var attachment = await repository.GetAsync(attachmentId) ?? throw new EntityNotFoundException();
         return new AttachmentMetadataDto
         {
-            Id = attachment.Id,
-            FileName = attachment.FileName,
+            Id          = attachment.Id,
+            FileName    = attachment.FileName,
             DisplayName = attachment.DisplayName,
-            CreatorId = GetCreatorId(attachment),
+            CreatorId   = GetCreatorId(attachment),
             AttachmentType = attachment.AttachmentType
         };
     }
@@ -178,10 +167,10 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
         var updatedAttachment = await repository.UpdateAsync(attachment, autoSave: true) ?? throw new EntityNotFoundException();
         return new AttachmentMetadataDto
         {
-            Id = updatedAttachment.Id,
-            FileName = updatedAttachment.FileName,
+            Id          = updatedAttachment.Id,
+            FileName    = updatedAttachment.FileName,
             DisplayName = updatedAttachment.DisplayName,
-            CreatorId = GetCreatorId(updatedAttachment),
+            CreatorId   = GetCreatorId(updatedAttachment),
             AttachmentType = attachmentType
         };
     }
@@ -190,46 +179,5 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
     {
         return attachment.CreatorId;
     }
-
-    [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null)
-    {
-        if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
-        {
-            throw new UserFriendlyException("AI attachment summaries are not enabled.");
-        }
-
-        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
-        {
-            AttachmentIds = [attachmentId],
-            PromptVersion = promptVersion,
-            TenantId = CurrentTenant.Id
-        });
-
-        return SummaryGenerationQueuedMessage;
-    }
-
-    [Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
-    public async Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null)
-    {
-        if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
-        {
-            throw new UserFriendlyException("AI attachment summaries are not enabled.");
-        }
-
-        if (attachmentIds.Count == 0)
-        {
-            return [];
-        }
-
-        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
-        {
-            AttachmentIds = attachmentIds,
-            PromptVersion = promptVersion,
-            TenantId = CurrentTenant.Id
-        });
-
-        return attachmentIds.Select(_ => SummaryGenerationQueuedMessage).ToList();
-    }
 }
 
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentSummaryAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentSummaryAppService.cs
new file mode 100644
index 0000000000..005ce5667f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentSummaryAppService.cs
@@ -0,0 +1,63 @@
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.AI.Permissions;
+using Unity.GrantManager.AI.BackgroundJobs;
+using Volo.Abp;
+using Volo.Abp.Application.Services;
+using Volo.Abp.BackgroundJobs;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Features;
+
+namespace Unity.GrantManager.Attachments;
+
+[Authorize(AIPermissions.AttachmentSummary.AttachmentSummaryDefault)]
+[Dependency(ReplaceServices = true)]
+[ExposeServices(typeof(AttachmentSummaryAppService), typeof(IAttachmentSummaryAppService))]
+public class AttachmentSummaryAppService(
+    IBackgroundJobManager backgroundJobManager,
+    IFeatureChecker featureChecker) : ApplicationService, IAttachmentSummaryAppService
+{
+    private const string SummaryGenerationQueuedMessage = "AI summary generation queued.";
+
+    public async Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null)
+    {
+        if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
+        {
+            throw new UserFriendlyException("AI attachment summaries are not enabled.");
+        }
+
+        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
+        {
+            AttachmentIds = [attachmentId],
+            PromptVersion = promptVersion,
+            TenantId = CurrentTenant.Id
+        });
+
+        return SummaryGenerationQueuedMessage;
+    }
+
+    public async Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null)
+    {
+        if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
+        {
+            throw new UserFriendlyException("AI attachment summaries are not enabled.");
+        }
+
+        if (attachmentIds.Count == 0)
+        {
+            return [];
+        }
+
+        await backgroundJobManager.EnqueueAsync(new GenerateAttachmentSummaryBackgroundJobArgs
+        {
+            AttachmentIds = attachmentIds,
+            PromptVersion = promptVersion,
+            TenantId = CurrentTenant.Id
+        });
+
+        return attachmentIds.Select(_ => SummaryGenerationQueuedMessage).ToList();
+    }
+}
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 ddfa482d1b..da37fb021a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -215,7 +215,7 @@ public async Task<GrantApplicationDto> GetAsync(Guid id)
             appDto.SectorSubSectorIndustryDesc = application.Applicant.SectorSubSectorIndustryDesc;
         }
 
-        appDto.AIAnalysisData = ParseAiAnalysisData(appDto.AIAnalysis);
+        appDto.ApplicationAnalysis = ParseAiAnalysisData(appDto.ApplicationAnalysisJson);
 
         return appDto;
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
index 947c587602..3a01d180af 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
@@ -33,7 +33,10 @@ public GrantManagerApplicationAutoMapperProfile()
         CreateMap<DynamicUrl, DynamicUrlDto>();
         CreateMap<DynamicUrl, CreateUpdateDynamicUrlDto>();
         
-        CreateMap<Application, GrantApplicationDto>();
+        CreateMap<Application, GrantApplicationDto>()
+            .ForMember(dest => dest.ApplicationAnalysisJson, opt => opt.MapFrom(src => src.AIAnalysis))
+            .ForMember(dest => dest.ApplicationScoringJson, opt => opt.MapFrom(src => src.AIScoresheetAnswers))
+            .ForMember(dest => dest.ApplicationAnalysis, opt => opt.Ignore());
         CreateMap<ApplicationAssignment, GrantApplicationAssigneeDto>();
         CreateMap<Person, GrantApplicationAssigneeDto>()
             .ForMember(d => d.AssigneeId, opt => opt.MapFrom(src => src.Id))
@@ -56,7 +59,9 @@ public GrantManagerApplicationAutoMapperProfile()
                 opts => opts.MapFrom(src => src.CreationTime));
         CreateMap<AssessmentWithAssessorQueryResultItem, AssessmentListItemDto>()
             .ForMember(d => d.SubTotal, opt => opt.Ignore());
-        CreateMap<ApplicationChefsFileAttachment, ApplicationChefsFileAttachmentDto>();
+        CreateMap<ApplicationChefsFileAttachment, ApplicationChefsFileAttachmentDto>()
+            .ForMember(dest => dest.CreatedTime, opt => opt.MapFrom(src => src.CreationTime))
+            .ForMember(dest => dest.UpdatedTime, opt => opt.MapFrom(src => src.LastModificationTime));
         CreateMap<ApplicationAttachment, ApplicationAttachmentDto>();
         CreateMap<Intakes.Intake, IntakeDto>();
         CreateMap<ApplicationForm, ApplicationFormDto>();
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index 6634a1d659..1e5cab4757 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -228,7 +228,7 @@ $(function () {
         );
 
         const latestTimestamp = summarizedAttachments
-            .map((attachment) => attachment.lastModificationTime || attachment.creationTime || null)
+            .map((attachment) => attachment.updatedTime || attachment.createdTime || null)
             .filter((timestamp) => !!timestamp)
             .sort()
             .at(-1);
@@ -257,7 +257,7 @@ $(function () {
             const summary = getAttachmentSummaryValue(attachment);
             return [
                 'NAME:',
-                attachment.fileName || '',
+                attachment.name || '',
                 '',
                 'SUMMARY:',
                 summary
@@ -278,7 +278,7 @@ $(function () {
                 }
 
                 return {
-                    name: attachment.fileName || '',
+                    name: attachment.name || '',
                     summary
                 };
             })
@@ -291,7 +291,7 @@ $(function () {
         return JSON.stringify(summarizedAttachments, null, 2);
     }
 
-    function loadApplicationAiOutputs() {
+    function loadDevAiOutputs() {
         const applicationId = $('#DetailsViewApplicationId').val();
 
         if (!applicationId) {
@@ -323,7 +323,7 @@ $(function () {
                         attachmentSection,
                         formatSectionBody(
                             'OUTPUT',
-                            formatJsonOrRaw(application?.aiAnalysisData ?? application?.aiAnalysis ?? '')
+                            formatJsonOrRaw(application?.applicationAnalysis ?? application?.applicationAnalysisJson ?? '')
                         )
                     ])
                 );
@@ -335,7 +335,7 @@ $(function () {
                         attachmentSection,
                         formatSectionBody(
                             'OUTPUT',
-                            formatJsonOrRaw(application?.aiScoresheetAnswers ?? application?.aIScoresheetAnswers ?? '')
+                            formatJsonOrRaw(application?.applicationScoringJson ?? '')
                         )
                     ])
                 );
@@ -354,7 +354,7 @@ $(function () {
             });
     }
 
-    globalThis.refreshDevAiOutputs = loadApplicationAiOutputs;
+    globalThis.refreshDevAiOutputs = loadDevAiOutputs;
 
     globalThis.generateAllAIDevOutputs = function(triggerButton = null) {
         const $button = triggerButton ? $(triggerButton) : $('#generateAllAiDevToolsBtn');
@@ -433,7 +433,7 @@ $(function () {
         updateLinksCounters();
         renderSubmission();
         loadAIAnalysis();
-        loadApplicationAiOutputs();
+        loadDevAiOutputs();
         applyTabHeightOffset();
     }
 
@@ -716,11 +716,11 @@ $(function () {
     PubSub.subscribe('refresh_assessment_scores', (msg, data) => {
         assessmentScoresWidgetManager.refresh();
         updateSubtotal();
-        loadApplicationAiOutputs();
+        loadDevAiOutputs();
     });
 
     PubSub.subscribe('refresh_chefs_attachment_list', () => {
-        loadApplicationAiOutputs();
+        loadDevAiOutputs();
     });
 
     PubSub.subscribe('select_application_review', (msg, data) => {
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 eb2238bc44..ba29852b79 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
@@ -431,7 +431,7 @@ function loadAIAnalysis() {
 
     unity.grantManager.grantApplications.grantApplication.get(applicationId)
         .done(function(application) {
-            const aiAnalysisData = application?.aiAnalysisData ?? tryParseRawAnalysis(application?.aiAnalysis);
+            const aiAnalysisData = application?.applicationAnalysis ?? tryParseRawAnalysis(application?.applicationAnalysisJson);
 
             if (aiAnalysisData) {
                 try {
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 0f5ada34a2..5ffae20c1c 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
@@ -242,7 +242,7 @@ $(function () {
             // Call the backend API
             $.ajax({
                 url:
-                    '/api/app/attachment/generate-attachment-summaries' +
+                    '/api/app/attachment-summary/generate-attachment-summaries' +
                     '?promptVersion=' +
                     encodeURIComponent(promptVersion || ''),
                 data: JSON.stringify(attachmentIds),

From 1d5f5d736cc9a021535ccc0ab43d28765cd6c131 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 15:19:30 -0700
Subject: [PATCH 17/38] AB#32012 align AI namespaces to folder structure

---
 .../AI/IAIService.cs                              |  3 +++
 .../AI/Models/AIAttachmentItem.cs                 |  3 ++-
 .../AI/Models/ApplicationAnalysisFinding.cs       |  3 ++-
 .../Models/ApplicationAnalysisRecommendation.cs   |  3 ++-
 .../AI/Models/ApplicationScoringAnswer.cs         |  3 ++-
 .../AI/Requests/AICompletionRequest.cs            |  3 ++-
 .../AI/Requests/ApplicationAnalysisRequest.cs     |  4 +++-
 .../AI/Requests/ApplicationScoringRequest.cs      |  4 +++-
 .../AI/Requests/AttachmentSummaryRequest.cs       |  3 ++-
 .../AI/Responses/AICompletionResponse.cs          |  3 ++-
 .../AI/Responses/ApplicationAnalysisResponse.cs   |  4 +++-
 .../AI/Responses/ApplicationScoringResponse.cs    |  4 +++-
 .../AI/Responses/AttachmentSummaryResponse.cs     |  3 ++-
 .../GrantApplications/GrantApplicationDto.cs      |  5 +++--
 .../GenerateApplicationAnalysisBackgroundJob.cs   |  2 ++
 .../GenerateApplicationScoringBackgroundJob.cs    |  2 ++
 .../GenerateAttachmentSummaryBackgroundJob.cs     |  2 ++
 .../GenerateContentBackgroundJob.cs               |  2 ++
 .../AI/Extraction/TextExtractionService.cs        |  3 ++-
 .../AI/Operations/ApplicationAnalysisService.cs   |  7 ++++++-
 .../AI/Operations/ApplicationScoringService.cs    |  7 ++++++-
 .../AI/Operations/AttachmentSummaryService.cs     |  5 ++++-
 .../AI/Operations/IApplicationAnalysisService.cs  |  3 ++-
 .../AI/Operations/IApplicationScoringService.cs   |  3 ++-
 .../AI/Operations/IAttachmentSummaryService.cs    |  3 ++-
 .../AI/Prompts/AIPromptTypes.cs                   |  3 ++-
 .../AI/Prompts/PromptDataPayloadBuilder.cs        |  3 ++-
 .../AI/Runtime/AIOperationResult.cs               |  3 ++-
 .../AI/Runtime/AIProviderPayloadValidator.cs      |  3 ++-
 .../AI/Runtime/AIProviderResponseMetadata.cs      |  3 ++-
 .../AI/Runtime/AIProviderResult.cs                |  3 ++-
 .../AI/Runtime/AIResponseJson.cs                  |  3 ++-
 .../AI/Runtime/OpenAIRuntimeService.cs            |  8 +++++++-
 .../GrantApplicationAppService.cs                 | 15 +++++++++------
 .../AssessmentScoresWidgetViewComponent.cs        |  5 +++--
 35 files changed, 99 insertions(+), 37 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
index 9711922f85..9878ecd0a9 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
@@ -1,4 +1,6 @@
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Requests;
+using Unity.GrantManager.AI.Responses;
 
 namespace Unity.GrantManager.AI
 {
@@ -13,3 +15,4 @@ public interface IAIService
     }
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs
index fc4b31e2a9..fb51eebc94 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Models
 {
     public class AIAttachmentItem
     {
@@ -11,3 +11,4 @@ public class AIAttachmentItem
         public string Summary { get; set; } = string.Empty;
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
index d441d29493..aad8d9d2fc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Models
 {
     public class ApplicationAnalysisFinding
     {
@@ -17,3 +17,4 @@ public class ApplicationAnalysisFinding
         public string? Detail { get; set; }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
index 1a70d1a5f4..a49b029c28 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Models
 {
     public class ApplicationAnalysisRecommendation
     {
@@ -11,3 +11,4 @@ public class ApplicationAnalysisRecommendation
         public string? Rationale { get; set; }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
index 68279c942f..ea6e8299d1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Models
 {
     public class ApplicationScoringAnswer
     {
@@ -16,3 +16,4 @@ public class ApplicationScoringAnswer
     }
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
index 74b8aa5494..0b9c045eec 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Requests
 {
     public class AICompletionRequest
     {
@@ -14,3 +14,4 @@ public class AICompletionRequest
         public double? Temperature { get; set; }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
index 7f4454407c..ce86050ab5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Unity.GrantManager.AI.Models;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Requests
 {
     public class ApplicationAnalysisRequest
     {
@@ -21,3 +22,4 @@ public class ApplicationAnalysisRequest
 }
 
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
index c24645e3fa..c8cb0bac16 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Unity.GrantManager.AI.Models;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Requests
 {
     public class ApplicationScoringRequest
     {
@@ -25,3 +26,4 @@ public class ApplicationScoringRequest
 
 
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
index 9633b57ea1..c5b91412bb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Requests
 {
     public class AttachmentSummaryRequest
     {
@@ -19,3 +19,4 @@ public class AttachmentSummaryRequest
 }
 
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs
index 316d2ef162..dec3f12939 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Responses
 {
     public class AICompletionResponse
     {
@@ -8,3 +8,4 @@ public class AICompletionResponse
         public string Content { get; set; } = string.Empty;
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
index 705b713c00..2357ada76d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using Unity.GrantManager.AI.Models;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Responses
 {
     public class ApplicationAnalysisResponse
     {
@@ -24,3 +25,4 @@ public class ApplicationAnalysisResponse
         public ApplicationAnalysisRecommendation? Recommendation { get; set; }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
index 1aa72b9334..ed350be0eb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using Unity.GrantManager.AI.Models;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Responses
 {
     public class ApplicationScoringResponse
     {
@@ -10,3 +11,4 @@ public class ApplicationScoringResponse
     }
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
index 4f30b8c44a..ecb1dc353c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Responses
 {
     public class AttachmentSummaryResponse
     {
@@ -8,3 +8,4 @@ public class AttachmentSummaryResponse
         public string Summary { get; set; } = string.Empty;
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index 7b7f026b38..16b60e6892 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -1,6 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
-using Unity.GrantManager.AI;
+using Unity.GrantManager.AI.Responses;
 using Unity.GrantManager.ApplicationForms;
 using Volo.Abp.Application.Dtos;
 
@@ -87,3 +87,4 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public ApplicationAnalysisResponse? ApplicationAnalysis { get; set; }
     public string? ApplicationScoringJson { get; set; }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
index b5d5dbbf12..e0529e0a00 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Operations;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
@@ -28,3 +29,4 @@ public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJob
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
index 4e4780a941..48a7b6f287 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Operations;
 using Unity.GrantManager.Intakes.Events;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
@@ -39,3 +40,4 @@ await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
index ac60162e2e..5beaee03bc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Operations;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
@@ -31,3 +32,4 @@ public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobAr
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
index 3e0532ca2d..36e570e976 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Operations;
 using Unity.GrantManager.Intakes.Events;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
@@ -73,3 +74,4 @@ await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
index c45eeb9d36..153dd266a0 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
@@ -13,7 +13,7 @@
 using UglyToad.PdfPig;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Extraction
 {
     public partial class TextExtractionService : ITextExtractionService, ITransientDependency
     {
@@ -747,3 +747,4 @@ private static string RemoveLeadingFileNameArtifact(string text, string fileName
         private static partial Regex MultipleNewlinesRegex();
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
index 074f319c4f..d0e5a2ea46 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
@@ -5,10 +5,13 @@
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Models;
+using Unity.GrantManager.AI.Prompts;
+using Unity.GrantManager.AI.Requests;
 using Unity.GrantManager.Applications;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Operations
 {
     public class ApplicationAnalysisService(
         IApplicationRepository applicationRepository,
@@ -198,3 +201,5 @@ private static void ProcessNestedFieldRequirements(JObject component, string? ty
 }
 
 
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
index 1fc691d061..450159de9d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
@@ -5,10 +5,13 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using Unity.Flex.Domain.Scoresheets;
+using Unity.GrantManager.AI.Models;
+using Unity.GrantManager.AI.Prompts;
+using Unity.GrantManager.AI.Requests;
 using Unity.GrantManager.Applications;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Operations
 {
     public class ApplicationScoringService(
         IApplicationRepository applicationRepository,
@@ -194,3 +197,5 @@ private static string ValidateApplicationScoringJson(string scoresheetAnswers)
 
 
 
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
index 7ef8fe1aac..6bc07dede7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
@@ -3,11 +3,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Requests;
 using Unity.GrantManager.Applications;
 using Unity.GrantManager.Intakes;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.AI;
+namespace Unity.GrantManager.AI.Operations;
 
 public class AttachmentSummaryService(
     IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
@@ -104,3 +105,5 @@ public async Task<List<string>> GenerateForApplicationAsync(Guid applicationId,
 
 
 
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
index bdc7631fc7..307e12d182 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Operations
 {
     public interface IApplicationAnalysisService
     {
@@ -9,3 +9,4 @@ public interface IApplicationAnalysisService
     }
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
index 65c1e488da..43d543b153 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Operations
 {
     public interface IApplicationScoringService
     {
@@ -9,3 +9,4 @@ public interface IApplicationScoringService
     }
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
index 30c074a081..f5489c57e6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Unity.GrantManager.AI;
+namespace Unity.GrantManager.AI.Operations;
 
 public interface IAttachmentSummaryService
 {
@@ -11,3 +11,4 @@ public interface IAttachmentSummaryService
     Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = null);
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
index 69df343e76..817c6efbea 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.AI;
+namespace Unity.GrantManager.AI.Prompts;
 
 public static class AIPromptTypes
 {
@@ -7,3 +7,4 @@ public static class AIPromptTypes
     public const string ApplicationScoring = "ApplicationScoring";
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
index ec60077961..ddc3bf7207 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
@@ -6,7 +6,7 @@
 using System.Text.Json;
 using Unity.GrantManager.Applications;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Prompts
 {
     internal static class PromptDataPayloadBuilder
     {
@@ -219,3 +219,4 @@ private static void ProcessNestedSchemaComponents(JObject component, HashSet<str
         }
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
index 01e817f776..d6d4675f0c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Runtime
 {
     internal enum AIOperationOutcome
     {
@@ -31,3 +31,4 @@ public static AIOperationResult InvalidOutput(AIProviderResult? response = null)
         public AIOperationResult WithOutcome(AIOperationOutcome outcome) => new(outcome, Response);
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
index 19f98cf55d..374b7b04b1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Runtime
 {
     internal static class AIProviderPayloadValidator
     {
@@ -149,3 +149,4 @@ private static bool TryParseRootObject(string response, out JsonElement root)
     }
 }
 
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
index 34e75b7d0e..a8dfd2ae9d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Runtime
 {
     internal sealed record AIProviderResponseMetadata(
         string? Model,
@@ -8,3 +8,4 @@ internal sealed record AIProviderResponseMetadata(
         int? TotalTokens,
         int? ReasoningTokens);
 }
+
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 c756da7b46..67595a8206 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
@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Runtime
 {
     internal sealed record AIProviderResult(
         string Content,
@@ -15,3 +15,4 @@ internal sealed record AIProviderResult(
         public string CaptureOutput => string.IsNullOrWhiteSpace(RawResponse) ? Content : RawResponse;
     }
 }
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
index 13c591f0f2..de2aedae76 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Runtime
 {
     internal static class AIResponseJson
     {
@@ -61,3 +61,4 @@ private static int FindFirstJsonTokenIndex(string value)
         }
     }
 }
+
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 9d16448f5c..e8bc612b15 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
@@ -10,9 +10,13 @@
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Models;
+using Unity.GrantManager.AI.Prompts;
+using Unity.GrantManager.AI.Requests;
+using Unity.GrantManager.AI.Responses;
 using Volo.Abp.DependencyInjection;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Runtime
 {
     [ExposeServices(typeof(IAIService))]
     public class OpenAIRuntimeService : IAIService, ITransientDependency
@@ -1435,3 +1439,5 @@ private static string ExtractSummaryFromJson(string output)
 
 
 
+
+
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 da37fb021a..0ea0b459d1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Authorization.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -17,7 +17,8 @@
 using Unity.GrantManager.Applicants;
 using Unity.GrantManager.ApplicationForms;
 using Unity.GrantManager.Applications;
-using Unity.GrantManager.AI;
+using Unity.GrantManager.AI.Models;
+using Unity.GrantManager.AI.Responses;
 using Unity.GrantManager.Events;
 using Unity.GrantManager.Flex;
 using Unity.GrantManager.Identity;
@@ -62,7 +63,7 @@ public class GrantApplicationAppService(
 
     public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplicationListInputDto input)
     {
-        // 1️ Fetch applications with filters + paging in DB
+        // 1. Fetch applications with filters + paging in DB
         var applications = await applicationRepository.WithFullDetailsAsync(
             input.SkipCount,
             input.MaxResultCount,
@@ -73,7 +74,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplica
 
         var applicationIds = applications.Select(a => a.Id).ToList();
 
-        // 2️ Fetch payment rollup batch if feature enabled
+        // 2. Fetch payment rollup batch if feature enabled
         bool paymentsFeatureEnabled = await FeatureChecker.IsEnabledAsync(PaymentConsts.UnityPaymentsFeature);
 
         Dictionary<Guid, ApplicationPaymentRollupDto> paymentRollupBatch = [];
@@ -83,7 +84,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplica
             paymentRollupBatch = await paymentRequestService.GetApplicationPaymentRollupBatchAsync(applicationIds);
         }
 
-        // 3️ Map applications to DTOs
+        // 3. Map applications to DTOs
         var appDtos = applications.Select(app =>
         {
             var appDto = ObjectMapper.Map<Application, GrantApplicationDto>(app);
@@ -119,7 +120,7 @@ public async Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplica
 
         }).ToList();
 
-        // 4️ Get total count using same filters
+        // 4. Get total count using same filters
         var totalCount = await applicationRepository.GetCountAsync(
             input.SubmittedFromDate,
             input.SubmittedToDate
@@ -1155,3 +1156,5 @@ private static void UpdateFindingHiddenState(IEnumerable<ApplicationAnalysisFind
         }
     }
 }
+
+
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
index 53b88bfd8d..3464b6bf35 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
 using Volo.Abp.AspNetCore.Mvc;
 using System.Collections.Generic;
@@ -14,7 +14,7 @@
 using Unity.Flex.Worksheets;
 using Unity.Flex;
 using Unity.Flex.Scoresheets.Enums;
-using Unity.GrantManager.AI;
+using Unity.GrantManager.AI.Responses;
 using Unity.GrantManager.Applications;
 using System.Text.Json;
 using Unity.AI.Permissions;
@@ -302,3 +302,4 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         }
     }
 }
+

From 4aea07ba198ac5d7955ffe8af5840e71091815bb Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 15:42:04 -0700
Subject: [PATCH 18/38] AB#32012 clean branch whitespace in AI changes

---
 .../AI/IAIService.cs                          |  2 --
 .../AI/Models/AIAttachmentItem.cs             |  1 -
 .../AI/Models/ApplicationAnalysisFinding.cs   |  1 -
 .../ApplicationAnalysisRecommendation.cs      |  1 -
 .../AI/Models/ApplicationScoringAnswer.cs     |  2 --
 .../AI/Requests/AICompletionRequest.cs        |  1 -
 .../AI/Requests/ApplicationAnalysisRequest.cs |  3 ---
 .../AI/Requests/ApplicationScoringRequest.cs  |  4 ----
 .../AI/Requests/AttachmentSummaryRequest.cs   |  3 ---
 .../AI/Responses/AICompletionResponse.cs      |  1 -
 .../Responses/ApplicationAnalysisResponse.cs  |  1 -
 .../Responses/ApplicationScoringResponse.cs   |  2 --
 .../AI/Responses/AttachmentSummaryResponse.cs |  1 -
 .../Attachments/IAttachmentAppService.cs      |  3 +--
 .../GrantApplications/GrantApplicationDto.cs  |  1 -
 .../IApplicationAnalysisAppService.cs         |  1 -
 .../IApplicationScoringAppService.cs          |  1 -
 ...enerateApplicationAnalysisBackgroundJob.cs |  1 -
 ...GenerateApplicationScoringBackgroundJob.cs |  1 -
 .../GenerateAttachmentSummaryBackgroundJob.cs |  1 -
 .../GenerateContentBackgroundJob.cs           |  1 -
 .../AI/Extraction/TextExtractionService.cs    |  1 -
 .../Operations/ApplicationAnalysisService.cs  |  4 ----
 .../Operations/ApplicationScoringService.cs   |  5 -----
 .../AI/Operations/AttachmentSummaryService.cs |  5 -----
 .../Operations/IApplicationAnalysisService.cs |  2 --
 .../Operations/IApplicationScoringService.cs  |  2 --
 .../Operations/IAttachmentSummaryService.cs   |  2 --
 .../AI/Prompts/AIPromptTypes.cs               |  2 --
 .../AI/Prompts/PromptDataPayloadBuilder.cs    |  1 -
 .../AI/Runtime/AIOperationResult.cs           |  1 -
 .../AI/Runtime/AIProviderPayloadValidator.cs  |  2 --
 .../AI/Runtime/AIProviderResponseMetadata.cs  |  1 -
 .../AI/Runtime/AIProviderResult.cs            |  1 -
 .../AI/Runtime/AIResponseJson.cs              |  1 -
 .../AI/Runtime/OpenAIRuntimeService.cs        |  7 -------
 .../Attachments/AttachmentAppService.cs       |  1 -
 .../ApplicationAnalysisAppService.cs          |  1 -
 .../ApplicationScoringAppService.cs           |  1 -
 .../GrantApplicationAppService.cs             |  2 --
 .../Pages/GrantApplications/Details.cshtml    |  7 +++----
 .../Pages/GrantApplications/Details.js        | 20 +++++++++----------
 .../Pages/GrantApplications/ai-analysis.js    |  2 --
 .../AssessmentScoresWidgetViewComponent.cs    |  1 -
 .../AssessmentScoresWidget/Default.js         |  2 --
 .../ChefsAttachments/ChefsAttachments.js      |  3 ---
 .../Components/ReviewList/ReviewList.js       |  7 +++----
 47 files changed, 16 insertions(+), 101 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
index 9878ecd0a9..d059187316 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/IAIService.cs
@@ -14,5 +14,3 @@ public interface IAIService
         Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request);
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs
index fb51eebc94..58c7c1c65e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIAttachmentItem.cs
@@ -11,4 +11,3 @@ public class AIAttachmentItem
         public string Summary { get; set; } = string.Empty;
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
index aad8d9d2fc..47baf9bca1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
@@ -17,4 +17,3 @@ public class ApplicationAnalysisFinding
         public string? Detail { get; set; }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
index a49b029c28..c84a3d4793 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
@@ -11,4 +11,3 @@ public class ApplicationAnalysisRecommendation
         public string? Rationale { get; set; }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
index ea6e8299d1..7796460557 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/ApplicationScoringAnswer.cs
@@ -15,5 +15,3 @@ public class ApplicationScoringAnswer
         public int Confidence { get; set; }
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
index 0b9c045eec..56dbc6fc4d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AICompletionRequest.cs
@@ -14,4 +14,3 @@ public class AICompletionRequest
         public double? Temperature { get; set; }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
index ce86050ab5..5366b29877 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationAnalysisRequest.cs
@@ -20,6 +20,3 @@ public class ApplicationAnalysisRequest
         public string? PromptVersion { get; set; }
     }
 }
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
index c8cb0bac16..241a46a977 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/ApplicationScoringRequest.cs
@@ -23,7 +23,3 @@ public class ApplicationScoringRequest
         public string? PromptVersion { get; set; }
     }
 }
-
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
index c5b91412bb..4f4d009e86 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Requests/AttachmentSummaryRequest.cs
@@ -17,6 +17,3 @@ public class AttachmentSummaryRequest
         public string? PromptVersion { get; set; }
     }
 }
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs
index dec3f12939..a146c7f86a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AICompletionResponse.cs
@@ -8,4 +8,3 @@ public class AICompletionResponse
         public string Content { get; set; } = string.Empty;
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
index 2357ada76d..fda17e43d6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
@@ -25,4 +25,3 @@ public class ApplicationAnalysisResponse
         public ApplicationAnalysisRecommendation? Recommendation { get; set; }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
index ed350be0eb..3a5ce46501 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/ApplicationScoringResponse.cs
@@ -10,5 +10,3 @@ public class ApplicationScoringResponse
         public Dictionary<string, ApplicationScoringAnswer> Answers { get; set; } = new();
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
index ecb1dc353c..ea6b785520 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
@@ -8,4 +8,3 @@ public class AttachmentSummaryResponse
         public string Summary { get; set; } = string.Empty;
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
index 26df633102..1b638f3bc3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/Attachments/IAttachmentAppService.cs
@@ -6,7 +6,7 @@
 namespace Unity.GrantManager.Attachments;
 
 public interface IAttachmentAppService : IApplicationService
-{        
+{
     Task<IList<ApplicationAttachmentDto>> GetApplicationAsync(Guid applicationId);
     Task<IList<AssessmentAttachmentDto>> GetAssessmentAsync(Guid assessmentId);
     Task ResyncSubmissionAttachmentsAsync(Guid applicationId);
@@ -14,4 +14,3 @@ public interface IAttachmentAppService : IApplicationService
     Task<AttachmentMetadataDto> GetAttachmentMetadataAsync(AttachmentType attachmentType, Guid attachmentId);
     Task<AttachmentMetadataDto> UpdateAttachmentMetadataAsync(UpdateAttachmentMetadataDto updateAttachment);
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index 16b60e6892..b9f6b3a025 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -87,4 +87,3 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public ApplicationAnalysisResponse? ApplicationAnalysis { get; set; }
     public string? ApplicationScoringJson { get; set; }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
index 64efaa4e35..493eb82c56 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
@@ -9,4 +9,3 @@ public interface IApplicationAnalysisAppService : IApplicationService
         Task<string> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
index 9c32814d22..dae0bc4fb7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
@@ -9,4 +9,3 @@ public interface IApplicationScoringAppService : IApplicationService
         Task<string> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
index e0529e0a00..98128ba26d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
@@ -29,4 +29,3 @@ public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJob
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
index 48a7b6f287..3825018018 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
@@ -40,4 +40,3 @@ await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
index 5beaee03bc..599a0a4673 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
@@ -32,4 +32,3 @@ public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobAr
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
index 36e570e976..7e85f9ec1d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
@@ -74,4 +74,3 @@ await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
index 153dd266a0..a29d4cad30 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Extraction/TextExtractionService.cs
@@ -747,4 +747,3 @@ private static string RemoveLeadingFileNameArtifact(string text, string fileName
         private static partial Regex MultipleNewlinesRegex();
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
index d0e5a2ea46..a06863fc8d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationAnalysisService.cs
@@ -199,7 +199,3 @@ private static void ProcessNestedFieldRequirements(JObject component, string? ty
         }
     }
 }
-
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
index 450159de9d..b73b76fe27 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/ApplicationScoringService.cs
@@ -194,8 +194,3 @@ private static string ValidateApplicationScoringJson(string scoresheetAnswers)
         }
     }
 }
-
-
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
index 6bc07dede7..eb8f84be83 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/AttachmentSummaryService.cs
@@ -102,8 +102,3 @@ public async Task<List<string>> GenerateForApplicationAsync(Guid applicationId,
         }
     }
 }
-
-
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
index 307e12d182..38eb57b046 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationAnalysisService.cs
@@ -8,5 +8,3 @@ public interface IApplicationAnalysisService
         Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null);
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
index 43d543b153..ff76afb866 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IApplicationScoringService.cs
@@ -8,5 +8,3 @@ public interface IApplicationScoringService
         Task<string> RegenerateAndSaveAsync(Guid applicationId, string? promptVersion = null);
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
index f5489c57e6..a4cdfd8f9f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Operations/IAttachmentSummaryService.cs
@@ -10,5 +10,3 @@ public interface IAttachmentSummaryService
     Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null);
     Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = null);
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
index 817c6efbea..47870da3f6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/AIPromptTypes.cs
@@ -6,5 +6,3 @@ public static class AIPromptTypes
     public const string ApplicationAnalysis = "ApplicationAnalysis";
     public const string ApplicationScoring = "ApplicationScoring";
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
index ddc3bf7207..c24166e354 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Prompts/PromptDataPayloadBuilder.cs
@@ -219,4 +219,3 @@ private static void ProcessNestedSchemaComponents(JObject component, HashSet<str
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
index d6d4675f0c..12518f53e7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIOperationResult.cs
@@ -31,4 +31,3 @@ public static AIOperationResult InvalidOutput(AIProviderResult? response = null)
         public AIOperationResult WithOutcome(AIOperationOutcome outcome) => new(outcome, Response);
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
index 374b7b04b1..905d645cb2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -148,5 +148,3 @@ private static bool TryParseRootObject(string response, out JsonElement root)
 
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
index a8dfd2ae9d..5aa97d54c6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderResponseMetadata.cs
@@ -8,4 +8,3 @@ internal sealed record AIProviderResponseMetadata(
         int? TotalTokens,
         int? ReasoningTokens);
 }
-
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 67595a8206..fc5105df82 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
@@ -15,4 +15,3 @@ internal sealed record AIProviderResult(
         public string CaptureOutput => string.IsNullOrWhiteSpace(RawResponse) ? Content : RawResponse;
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
index de2aedae76..ff586c7588 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIResponseJson.cs
@@ -61,4 +61,3 @@ private static int FindFirstJsonTokenIndex(string value)
         }
     }
 }
-
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 e8bc612b15..5cfc102b54 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
@@ -1434,10 +1434,3 @@ private static string ExtractSummaryFromJson(string output)
         }
     }
 }
-
-
-
-
-
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 0770a3c09a..9be2359aa2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -180,4 +180,3 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
         return attachment.CreatorId;
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
index 46dbc8eed2..39e0f3676b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationAnalysisAppService.cs
@@ -41,4 +41,3 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationAnalysisBackgroun
         }
     }
 }
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
index d14a18443b..b3a260430c 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/ApplicationScoringAppService.cs
@@ -41,4 +41,3 @@ await backgroundJobManager.EnqueueAsync(new GenerateApplicationScoringBackground
         }
     }
 }
-
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 0ea0b459d1..9a09b0e391 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -1156,5 +1156,3 @@ private static void UpdateFindingHiddenState(IEnumerable<ApplicationAnalysisFind
         }
     }
 }
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
index 6b6bd30d93..3fc4232c54 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml
@@ -269,7 +269,7 @@
                     <button class="nav-link" id="history-tab" data-bs-toggle="tab" data-bs-target="#history" type="button" role="tab" aria-controls="history" aria-selected="false"><i class="fl fl-history" aria-hidden="true"></i> </button>
                 </li>
             @if (aiApplicationAnalysisEnabled)
-            {                
+            {
                 <li class="nav-item">
                     <button class="nav-link" id="ai-analysis-tab" data-bs-toggle="tab" data-bs-target="#ai-analysis" type="button" role="tab" aria-controls="ai-analysis" aria-selected="false"><span class="ai-analysis-tab-icon-wrap"><i class="fl fl-review-user" aria-hidden="true"></i><span class="ai-analysis-tab-indicator" id="ai_analysis_status" style="display:none;"></span></span></button>
                 </li>
@@ -408,7 +408,7 @@
                 @*-------- History Tab Section END ---------*@
 
                 @if (aiApplicationAnalysisEnabled)
-                { 
+                {
                 <div class="tab-pane fade" id="ai-analysis" role="tabpanel" aria-labelledby="ai-analysis-tab">
                     <div class="d-flex justify-content-between align-items-center px-3 pt-4 pb-2">
                         <h6 class="fw-bold m-0">AI Application Analysis</h6>
@@ -564,7 +564,7 @@
                                     <h6 class="fw-bold m-0">Application Scoring <span class="ai-dev-output-timestamp" id="scoringAiOutputTimestamp"></span></h6>
                                     @if (aiScoringEnabled)
                                     {
-                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="queueApplicationScoring(this)">
+                                        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary btn-sm" onclick="queueApplicationScoring(this)">
                                             <span class="ai-button-content">
                                                 <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
                                                 <span>Generate</span>
@@ -593,4 +593,3 @@
         </abp-card>
     </div>
 </div>
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index 1e5cab4757..be776c5e98 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -540,7 +540,7 @@ $(function () {
                 submissionData = submissionJson.submission;
             }
 
-            Formio.icons = 'fontawesome';            
+            Formio.icons = 'fontawesome';
 
             // Create container inside shadow DOM
             const container = document.createElement('div');
@@ -636,7 +636,7 @@ $(function () {
         );
     }
 
-   
+
 
     $('#assessment_upload_btn').click(function () {
         $('#assessment_upload').trigger('click');
@@ -869,31 +869,31 @@ $(function () {
     function openScoreSheetDataInNewTab(assessmentScoresheet) {
         const newTab = globalThis.open('', '_blank');
         const doc = newTab.document;
-        
+
         doc.open();
         doc.close();
         doc.title = 'Print';
-        
+
         // Create and append stylesheets
         const stylesheets = [
             { href: '/libs/bootstrap-4/dist/css/bootstrap.min.css' },
             { href: '/Pages/GrantApplications/ScoresheetPrint.css' }
         ];
-        
+
         stylesheets.forEach(({ href }) => {
             const link = doc.createElement('link');
             link.rel = 'stylesheet';
             link.href = href;
             doc.head.appendChild(link);
         });
-        
+
         // Add jQuery script
         const jqueryScript = doc.createElement('script');
         jqueryScript.src = '/libs/jquery/jquery.js';
         doc.head.appendChild(jqueryScript);
-        
+
         doc.body.innerHTML = assessmentScoresheet;
-        
+
         // Load and execute print script
         newTab.onload = function () {
             const script = doc.createElement('script');
@@ -1027,7 +1027,7 @@ $(function () {
             tabCounters.files + tabCounters.chefs
         );
     });
-    
+
     PubSub.subscribe('update_ai_analysis_status', (msg, data) => {
         const $indicator = $('#ai_analysis_status');
         const status = data?.status;
@@ -1676,5 +1676,3 @@ function clearCurrencyError(input) {
     document.getElementById(errorSpan).textContent = '';
     input.attr('aria-invalid', 'false');
 }
-
-
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 ba29852b79..ac16ac53bf 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
@@ -458,5 +458,3 @@ $(function() {
         });
     }
 });
-
-
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
index 3464b6bf35..70ee9b43f6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
@@ -302,4 +302,3 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         }
     }
 }
-
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 bd3e6c7507..428d691d21 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
@@ -607,5 +607,3 @@ function queueApplicationScoring(triggerButton = null) {
             $button.html(existingHtml).prop('disabled', false);
         });
 }
-
-
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 5ffae20c1c..9b948ee563 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
@@ -615,6 +615,3 @@ function showChefsAPIAccessError() {
         },
     });
 }
-
-
-
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 47421088e4..c3b33892b0 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
@@ -81,7 +81,7 @@ $(function () {
         }
     });
 
-    $.fn.dataTable.Api.register('row().selectWithParams()', function (params) {        
+    $.fn.dataTable.Api.register('row().selectWithParams()', function (params) {
         this.params = params;
         return this.select();
     });
@@ -260,7 +260,7 @@ $(function () {
     $("#AdjudicationTeamLeadActionBar .dt-buttons").contents().unwrap();
     updateAiActionButtonsVisibility(reviewListTable);
 
-    reviewListTable.on('select', function (e, dt, type, indexes) {        
+    reviewListTable.on('select', function (e, dt, type, indexes) {
         handleRowSelection(e, dt, type, indexes, reviewListTable);
     });
 
@@ -299,7 +299,7 @@ function handleRowSelection(e, dt, type, indexes, reviewListTable) {
     if (type === 'row') {
         let selectedData = reviewListTable.row(indexes).data();
         document.getElementById("AssessmentId").value = selectedData.id;
-        if (refreshSidePanel) {            
+        if (refreshSidePanel) {
             PubSub.publish('select_application_review', selectedData);
             PubSub.publish('refresh_assessment_attachment_list', selectedData.id);
         }
@@ -539,4 +539,3 @@ function createButtonAction(e, dt, button, config) {
         });
     this.disable();
 }
-

From 0bf8e9bace46bb16e18175b501f4ccd061971ea5 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 16:00:42 -0700
Subject: [PATCH 19/38] AB#32012 restore attachment app service formatting

---
 .../Attachments/AttachmentAppService.cs       | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 9be2359aa2..28f7ad7c84 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -93,14 +93,14 @@ protected internal async Task<IList<UnityAttachmentDto>> GetAttachmentsInternalA
                     join person in people on attachment.UserId equals person.Id
                     select new UnityAttachmentDto()
                     {
-                        Id          = attachment.Id,
-                        FileName    = attachment.FileName,
-                        DisplayName = attachment.DisplayName,
-                        S3ObjectKey = attachment.S3ObjectKey,
-                        Time        = attachment.Time,
+                        Id             = attachment.Id,
+                        FileName       = attachment.FileName,
+                        DisplayName    = attachment.DisplayName,
+                        S3ObjectKey    = attachment.S3ObjectKey,
+                        Time           = attachment.Time,
                         AttachmentType = attachment.AttachmentType,
-                        AttachedBy  = person.FullName,
-                        CreatorId   = person.Id
+                        AttachedBy     = person.FullName,
+                        CreatorId      = person.Id
                     };
 
         return query.ToList();
@@ -127,10 +127,10 @@ protected internal static async Task<AttachmentMetadataDto> GetMetadataInternalA
         var attachment = await repository.GetAsync(attachmentId) ?? throw new EntityNotFoundException();
         return new AttachmentMetadataDto
         {
-            Id          = attachment.Id,
-            FileName    = attachment.FileName,
-            DisplayName = attachment.DisplayName,
-            CreatorId   = GetCreatorId(attachment),
+            Id             = attachment.Id,
+            FileName       = attachment.FileName,
+            DisplayName    = attachment.DisplayName,
+            CreatorId      = GetCreatorId(attachment),
             AttachmentType = attachment.AttachmentType
         };
     }
@@ -162,15 +162,16 @@ protected internal static async Task<AttachmentMetadataDto> UpdateMetadataIntern
     {
         var attachment = await repository.GetAsync(updateAttachment.Id) ?? throw new EntityNotFoundException();
 
+        // Properties to be updated
         attachment.DisplayName = updateAttachment.DisplayName;
 
         var updatedAttachment = await repository.UpdateAsync(attachment, autoSave: true) ?? throw new EntityNotFoundException();
         return new AttachmentMetadataDto
         {
-            Id          = updatedAttachment.Id,
-            FileName    = updatedAttachment.FileName,
-            DisplayName = updatedAttachment.DisplayName,
-            CreatorId   = GetCreatorId(updatedAttachment),
+            Id             = updatedAttachment.Id,
+            FileName       = updatedAttachment.FileName,
+            DisplayName    = updatedAttachment.DisplayName,
+            CreatorId      = GetCreatorId(updatedAttachment),
             AttachmentType = attachmentType
         };
     }

From 72fd3f783897d68a11943673a78bc0815f478f7d Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 16:09:49 -0700
Subject: [PATCH 20/38] AB#32012 improve AI background job failure handling

---
 ...enerateApplicationAnalysisBackgroundJob.cs |  1 +
 ...GenerateApplicationScoringBackgroundJob.cs |  1 +
 .../GenerateAttachmentSummaryBackgroundJob.cs |  1 +
 .../GenerateContentBackgroundJob.cs           | 42 ++++++++++++++++---
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
index 98128ba26d..f03b903065 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
@@ -25,6 +25,7 @@ public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJob
             catch (Exception ex)
             {
                 logger.LogError(ex, "Error executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
+                throw;
             }
         }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
index 3825018018..5378b6fea7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
@@ -36,6 +36,7 @@ await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
             catch (Exception ex)
             {
                 logger.LogError(ex, "Error executing AI application scoring background job for application {ApplicationId}.", args.ApplicationId);
+                throw;
             }
         }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
index 599a0a4673..810a1a5d48 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
@@ -28,6 +28,7 @@ public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobAr
             catch (Exception ex)
             {
                 logger.LogError(ex, "Error executing AI attachment summary background job.");
+                throw;
             }
         }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
index 7e85f9ec1d..48ef21a9af 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
@@ -50,26 +50,56 @@ public override async Task ExecuteAsync(GenerateContentBackgroundJobArgs args)
                     await attachmentSummaryService.GenerateForApplicationAsync(args.ApplicationId, args.PromptVersion);
                 }
 
+                Exception? analysisException = null;
+                Exception? scoringException = null;
+
                 if (applicationAnalysisEnabled)
                 {
-                    await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                    try
+                    {
+                        await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                    }
+                    catch (Exception ex)
+                    {
+                        analysisException = ex;
+                        logger.LogError(ex, "Error executing AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
+                    }
                 }
 
                 if (scoringEnabled)
                 {
-                    var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-                    if (!string.Equals(result, "{}", StringComparison.Ordinal))
+                    try
                     {
-                        await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
+                        var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                        if (!string.Equals(result, "{}", StringComparison.Ordinal))
                         {
-                            ApplicationId = args.ApplicationId
-                        });
+                            await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
+                            {
+                                ApplicationId = args.ApplicationId
+                            });
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        scoringException = ex;
+                        logger.LogError(ex, "Error executing AI application scoring stage for application {ApplicationId}.", args.ApplicationId);
                     }
                 }
+
+                if (scoringException != null)
+                {
+                    throw scoringException;
+                }
+
+                if (analysisException != null)
+                {
+                    throw analysisException;
+                }
             }
             catch (Exception ex)
             {
                 logger.LogError(ex, "Error executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
+                throw;
             }
         }
     }

From 6ac63e44e33b1c509c01ba9cb5511a40efe0585d Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 16:22:32 -0700
Subject: [PATCH 21/38] AB#32012 move AI contract files into concern folders

---
 .../AI/{ => Extraction}/ITextExtractionService.cs                 | 0
 .../AI/{ => Models}/AIJsonKeys.cs                                 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/{ => Extraction}/ITextExtractionService.cs (100%)
 rename applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/{ => Models}/AIJsonKeys.cs (100%)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/ITextExtractionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Extraction/ITextExtractionService.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/ITextExtractionService.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Extraction/ITextExtractionService.cs
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/AIJsonKeys.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIJsonKeys.cs
similarity index 100%
rename from applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/AIJsonKeys.cs
rename to applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIJsonKeys.cs

From fdd2ae08ecf79eacf529f2f21bb3fb4108532cbd Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 16:25:26 -0700
Subject: [PATCH 22/38] AB#32012 align moved AI contract namespaces and imports

---
 .../AI/Extraction/ITextExtractionService.cs                     | 2 +-
 .../AI/Models/AIJsonKeys.cs                                     | 2 +-
 .../AI/Responses/AttachmentSummaryResponse.cs                   | 1 +
 .../AI/Runtime/AIProviderPayloadValidator.cs                    | 1 +
 .../AI/Runtime/OpenAIRuntimeService.cs                          | 1 +
 .../Attachments/AttachmentAppService.cs                         | 1 +
 .../AssessmentScoresWidgetViewComponent.cs                      | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Extraction/ITextExtractionService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Extraction/ITextExtractionService.cs
index 22f34e292f..1e68280b99 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Extraction/ITextExtractionService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Extraction/ITextExtractionService.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Extraction
 {
     public interface ITextExtractionService
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIJsonKeys.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIJsonKeys.cs
index 60a5b52441..fb2230cba5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIJsonKeys.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Models/AIJsonKeys.cs
@@ -1,4 +1,4 @@
-namespace Unity.GrantManager.AI
+namespace Unity.GrantManager.AI.Models
 {
     public static class AIJsonKeys
     {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
index ea6b785520..170345cad1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/AI/Responses/AttachmentSummaryResponse.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+using Unity.GrantManager.AI.Models;
 
 namespace Unity.GrantManager.AI.Responses
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
index 905d645cb2..436f693d7f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+using Unity.GrantManager.AI.Models;
 
 namespace Unity.GrantManager.AI.Runtime
 {
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 5cfc102b54..7b745b6faf 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
@@ -10,6 +10,7 @@
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+using Unity.GrantManager.AI.Extraction;
 using Unity.GrantManager.AI.Models;
 using Unity.GrantManager.AI.Prompts;
 using Unity.GrantManager.AI.Requests;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
index 28f7ad7c84..3073e17437 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Attachments/AttachmentAppService.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
index 70ee9b43f6..6575155b7d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
@@ -14,6 +14,7 @@
 using Unity.Flex.Worksheets;
 using Unity.Flex;
 using Unity.Flex.Scoresheets.Enums;
+using Unity.GrantManager.AI.Models;
 using Unity.GrantManager.AI.Responses;
 using Unity.GrantManager.Applications;
 using System.Text.Json;

From 3094d8ee0e1d6b3e2a5a783634be68cfb332fb73 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 20 Mar 2026 18:29:46 -0700
Subject: [PATCH 23/38] AB#32012 restore working AI application DTO contract

---
 .../GrantApplications/GrantApplicationDto.cs           |  6 +++---
 .../GrantApplications/GrantApplicationAppService.cs    |  2 +-
 .../GrantManagerApplicationAutoMapperProfile.cs        |  5 +----
 .../Pages/GrantApplications/Details.js                 | 10 +++++-----
 .../Pages/GrantApplications/ai-analysis.js             |  2 +-
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
index b9f6b3a025..1dda8c6696 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/GrantApplicationDto.cs
@@ -83,7 +83,7 @@ public class GrantApplicationDto : AuditedEntityDto<Guid>
     public PaymentInfoDto? PaymentInfo { get; set; }
     public string? UnityApplicationId { get; set; }
     public string? ApplicantElectoralDistrict { get; set; }
-    public string? ApplicationAnalysisJson { get; set; }
-    public ApplicationAnalysisResponse? ApplicationAnalysis { get; set; }
-    public string? ApplicationScoringJson { get; set; }
+    public string? AIAnalysis { get; set; }
+    public ApplicationAnalysisResponse? AIAnalysisData { get; set; }
+    public string? AIScoresheetAnswers { 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 9a09b0e391..40df367ff3 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -216,7 +216,7 @@ public async Task<GrantApplicationDto> GetAsync(Guid id)
             appDto.SectorSubSectorIndustryDesc = application.Applicant.SectorSubSectorIndustryDesc;
         }
 
-        appDto.ApplicationAnalysis = ParseAiAnalysisData(appDto.ApplicationAnalysisJson);
+        appDto.AIAnalysisData = ParseAiAnalysisData(appDto.AIAnalysis);
 
         return appDto;
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
index 3a01d180af..2cfa84db89 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationAutoMapperProfile.cs
@@ -33,10 +33,7 @@ public GrantManagerApplicationAutoMapperProfile()
         CreateMap<DynamicUrl, DynamicUrlDto>();
         CreateMap<DynamicUrl, CreateUpdateDynamicUrlDto>();
         
-        CreateMap<Application, GrantApplicationDto>()
-            .ForMember(dest => dest.ApplicationAnalysisJson, opt => opt.MapFrom(src => src.AIAnalysis))
-            .ForMember(dest => dest.ApplicationScoringJson, opt => opt.MapFrom(src => src.AIScoresheetAnswers))
-            .ForMember(dest => dest.ApplicationAnalysis, opt => opt.Ignore());
+        CreateMap<Application, GrantApplicationDto>();
         CreateMap<ApplicationAssignment, GrantApplicationAssigneeDto>();
         CreateMap<Person, GrantApplicationAssigneeDto>()
             .ForMember(d => d.AssigneeId, opt => opt.MapFrom(src => src.Id))
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index be776c5e98..b4720643f1 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -228,7 +228,7 @@ $(function () {
         );
 
         const latestTimestamp = summarizedAttachments
-            .map((attachment) => attachment.updatedTime || attachment.createdTime || null)
+            .map((attachment) => attachment.lastModificationTime || attachment.creationTime || null)
             .filter((timestamp) => !!timestamp)
             .sort()
             .at(-1);
@@ -257,7 +257,7 @@ $(function () {
             const summary = getAttachmentSummaryValue(attachment);
             return [
                 'NAME:',
-                attachment.name || '',
+                attachment.fileName || '',
                 '',
                 'SUMMARY:',
                 summary
@@ -278,7 +278,7 @@ $(function () {
                 }
 
                 return {
-                    name: attachment.name || '',
+                    name: attachment.fileName || '',
                     summary
                 };
             })
@@ -323,7 +323,7 @@ $(function () {
                         attachmentSection,
                         formatSectionBody(
                             'OUTPUT',
-                            formatJsonOrRaw(application?.applicationAnalysis ?? application?.applicationAnalysisJson ?? '')
+                            formatJsonOrRaw(application?.aiAnalysisData ?? application?.aiAnalysis ?? '')
                         )
                     ])
                 );
@@ -335,7 +335,7 @@ $(function () {
                         attachmentSection,
                         formatSectionBody(
                             'OUTPUT',
-                            formatJsonOrRaw(application?.applicationScoringJson ?? '')
+                            formatJsonOrRaw(application?.aiScoresheetAnswers ?? application?.aIScoresheetAnswers ?? '')
                         )
                     ])
                 );
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 ac16ac53bf..b60f8d3942 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
@@ -431,7 +431,7 @@ function loadAIAnalysis() {
 
     unity.grantManager.grantApplications.grantApplication.get(applicationId)
         .done(function(application) {
-            const aiAnalysisData = application?.applicationAnalysis ?? tryParseRawAnalysis(application?.applicationAnalysisJson);
+            const aiAnalysisData = application?.aiAnalysisData ?? tryParseRawAnalysis(application?.aiAnalysis);
 
             if (aiAnalysisData) {
                 try {

From 3e2d4aaad92a09f7ff784e83f72ffb80e2f7cf6c Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Tue, 24 Mar 2026 16:19:16 -0700
Subject: [PATCH 24/38] AB#32012 clean AI review list UI and test follow-ups

---
 .../ChefsAttachments/ChefsAttachments.js      |  2 +-
 .../Components/ReviewList/ReviewList.js       |  6 +-
 .../Intakes/CreateAiAssessmentHandlerTests.cs | 62 +++++++++++--------
 3 files changed, 38 insertions(+), 32 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 9b948ee563..a3581c1741 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
@@ -10,7 +10,7 @@ $(function () {
     const dt = $('#ChefsAttachmentsTable');
     let chefsDataTable;
     let selectedAtttachments = [];
-    const nullPlaceholder = '-';
+    const nullPlaceholder = '—';
 
     let inputAction = function (requestData, dataTableSettings) {
         const urlParams = new URL(window.location.toLocaleString())
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 c3b33892b0..5d97ad08df 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
@@ -1,8 +1,6 @@
 const l = abp.localization.getResource('GrantManager');
 const pageApplicationId = decodeURIComponent(document.querySelector("#DetailsViewApplicationId").value);
-const isAiScoringEnabled =
-    document.querySelector("#ReviewListAIScoringEnabled")?.value === 'True'
-    || document.querySelector("#AIScoringFeatureEnabled")?.value === 'True';
+const isAiScoringEnabled = document.querySelector("#ReviewListAIScoringEnabled")?.value === 'True';
 const canUseAiScoring = isAiScoringEnabled;
 
 const actionButtonConfigMap = {
@@ -30,7 +28,7 @@ const finalApplicationStates = [
 ];
 
 $(function () {
-    const nullPlaceholder = '-';
+    const nullPlaceholder = '—';
 
     let inputAction = function (requestData, dataTableSettings) {
         const applicationId = pageApplicationId
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Intakes/CreateAiAssessmentHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Intakes/CreateAiAssessmentHandlerTests.cs
index 769b3d540e..b36396f087 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Intakes/CreateAiAssessmentHandlerTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Intakes/CreateAiAssessmentHandlerTests.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
 using Shouldly;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Unity.GrantManager.Applications;
@@ -18,34 +19,36 @@ namespace Unity.GrantManager.Intakes;
 public class CreateAiAssessmentHandlerTests : GrantManagerApplicationTestBase
 {
     private readonly AssessmentManager _assessmentManager;
-    private readonly IRepository<Assessment, System.Guid> _assessmentRepository;
-    private readonly IRepository<Application, System.Guid> _applicationRepository;
+    private readonly IRepository<Assessment, Guid> _assessmentRepository;
+    private readonly IApplicationRepository _applicationRepository;
     private readonly IUnitOfWorkManager _unitOfWorkManager;
 
     public CreateAiAssessmentHandlerTests(ITestOutputHelper outputHelper) : base(outputHelper)
     {
         _assessmentManager = GetRequiredService<AssessmentManager>();
-        _assessmentRepository = GetRequiredService<IRepository<Assessment, System.Guid>>();
-        _applicationRepository = GetRequiredService<IRepository<Application, System.Guid>>();
+        _assessmentRepository = GetRequiredService<IRepository<Assessment, Guid>>();
+        _applicationRepository = GetRequiredService<IApplicationRepository>();
         _unitOfWorkManager = GetRequiredService<IUnitOfWorkManager>();
     }
 
     [Fact]
     [Trait("Category", "Integration")]
-    public async Task HandleEventAsync_Should_Skip_When_Application_Is_Null()
+    public async Task HandleEventAsync_Should_Skip_When_Application_Id_Is_Empty()
     {
-        // Arrange
         var featureChecker = Substitute.For<IFeatureChecker>();
         featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
-        var handler = new CreateAiAssessmentHandler(_assessmentManager, featureChecker, NullLogger<CreateAiAssessmentHandler>.Instance);
+        var handler = new CreateAIAssessmentHandler(
+            _assessmentManager,
+            _applicationRepository,
+            featureChecker,
+            _unitOfWorkManager,
+            NullLogger<CreateAIAssessmentHandler>.Instance);
 
         using var uow = _unitOfWorkManager.Begin();
         var beforeCount = (await _assessmentRepository.GetQueryableAsync()).Count(a => a.IsAiAssessment);
 
-        // Act — null application should be handled gracefully
-        await handler.HandleEventAsync(new AiScoresheetAnswersGeneratedEvent { Application = null });
+        await handler.HandleEventAsync(new AIApplicationScoringGeneratedEvent { ApplicationId = Guid.Empty });
 
-        // Assert — no AI assessment created
         var afterCount = (await _assessmentRepository.GetQueryableAsync()).Count(a => a.IsAiAssessment);
         afterCount.ShouldBe(beforeCount);
     }
@@ -54,19 +57,21 @@ public async Task HandleEventAsync_Should_Skip_When_Application_Is_Null()
     [Trait("Category", "Integration")]
     public async Task HandleEventAsync_Should_Skip_When_Feature_Disabled()
     {
-        // Arrange — feature disabled
         var featureChecker = Substitute.For<IFeatureChecker>();
         featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(false);
-        var handler = new CreateAiAssessmentHandler(_assessmentManager, featureChecker, NullLogger<CreateAiAssessmentHandler>.Instance);
+        var handler = new CreateAIAssessmentHandler(
+            _assessmentManager,
+            _applicationRepository,
+            featureChecker,
+            _unitOfWorkManager,
+            NullLogger<CreateAIAssessmentHandler>.Instance);
 
         using var uow = _unitOfWorkManager.Begin();
         var application = (await _applicationRepository.GetListAsync())[0];
         var beforeCount = (await _assessmentRepository.GetQueryableAsync()).Count(a => a.IsAiAssessment);
 
-        // Act
-        await handler.HandleEventAsync(new AiScoresheetAnswersGeneratedEvent { Application = application });
+        await handler.HandleEventAsync(new AIApplicationScoringGeneratedEvent { ApplicationId = application.Id });
 
-        // Assert — no new AI assessment created
         var afterCount = (await _assessmentRepository.GetQueryableAsync()).Count(a => a.IsAiAssessment);
         afterCount.ShouldBe(beforeCount);
     }
@@ -75,19 +80,20 @@ public async Task HandleEventAsync_Should_Skip_When_Feature_Disabled()
     [Trait("Category", "Integration")]
     public async Task HandleEventAsync_Should_Create_AI_Assessment_When_Feature_Enabled()
     {
-        // Arrange — create a fresh application with no AI assessment
         var featureChecker = Substitute.For<IFeatureChecker>();
         featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
-        var handler = new CreateAiAssessmentHandler(_assessmentManager, featureChecker, NullLogger<CreateAiAssessmentHandler>.Instance);
+        var handler = new CreateAIAssessmentHandler(
+            _assessmentManager,
+            _applicationRepository,
+            featureChecker,
+            _unitOfWorkManager,
+            NullLogger<CreateAIAssessmentHandler>.Instance);
 
         using var uow = _unitOfWorkManager.Begin();
-        // Application2 has no AI assessment seeded — ideal for the happy path
         var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application2_Id);
 
-        // Act
-        await handler.HandleEventAsync(new AiScoresheetAnswersGeneratedEvent { Application = application });
+        await handler.HandleEventAsync(new AIApplicationScoringGeneratedEvent { ApplicationId = application.Id });
 
-        // Assert
         var aiAssessment = (await _assessmentRepository.GetQueryableAsync())
             .FirstOrDefault(a => a.ApplicationId == GrantManagerTestData.Application2_Id && a.IsAiAssessment);
         aiAssessment.ShouldNotBeNull();
@@ -97,21 +103,23 @@ public async Task HandleEventAsync_Should_Create_AI_Assessment_When_Feature_Enab
     [Trait("Category", "Integration")]
     public async Task HandleEventAsync_Should_Be_Idempotent()
     {
-        // Arrange — AiAssessment1_Id is already seeded for Application1_Id
         var featureChecker = Substitute.For<IFeatureChecker>();
         featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
-        var handler = new CreateAiAssessmentHandler(_assessmentManager, featureChecker, NullLogger<CreateAiAssessmentHandler>.Instance);
+        var handler = new CreateAIAssessmentHandler(
+            _assessmentManager,
+            _applicationRepository,
+            featureChecker,
+            _unitOfWorkManager,
+            NullLogger<CreateAIAssessmentHandler>.Instance);
 
         using var uow = _unitOfWorkManager.Begin();
         var application = await _applicationRepository.GetAsync(GrantManagerTestData.Application1_Id);
         var beforeCount = (await _assessmentRepository.GetQueryableAsync())
             .Count(a => a.ApplicationId == GrantManagerTestData.Application1_Id && a.IsAiAssessment);
 
-        // Act — call handler twice
-        await handler.HandleEventAsync(new AiScoresheetAnswersGeneratedEvent { Application = application });
-        await handler.HandleEventAsync(new AiScoresheetAnswersGeneratedEvent { Application = application });
+        await handler.HandleEventAsync(new AIApplicationScoringGeneratedEvent { ApplicationId = application.Id });
+        await handler.HandleEventAsync(new AIApplicationScoringGeneratedEvent { ApplicationId = application.Id });
 
-        // Assert — still only one AI assessment for this application
         var afterCount = (await _assessmentRepository.GetQueryableAsync())
             .Count(a => a.ApplicationId == GrantManagerTestData.Application1_Id && a.IsAiAssessment);
         afterCount.ShouldBe(beforeCount);

From ab11cff867aecfc119ecd5eacbd8afb440a7524e Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Tue, 24 Mar 2026 16:48:13 -0700
Subject: [PATCH 25/38] AB#32012 address AI sonar follow-ups and test feature
 toggles

---
 ...enerateApplicationAnalysisBackgroundJob.cs |  12 +-
 ...GenerateApplicationScoringBackgroundJob.cs |  22 +--
 .../GenerateAttachmentSummaryBackgroundJob.cs |  16 +-
 .../GenerateContentBackgroundJob.cs           | 102 +++++------
 .../Pages/GrantApplications/Details.js        | 173 +++++++++---------
 .../Pages/GrantApplications/ai-analysis.js    |   2 +-
 .../AssessmentScoresWidgetViewComponent.cs    |   1 -
 .../Assessments/AssessmentAppServiceTests.cs  |  39 ++--
 .../GrantManagerApplicationTestBase.cs        |  48 +++--
 9 files changed, 197 insertions(+), 218 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
index f03b903065..b4dfe07523 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
@@ -17,16 +17,8 @@ public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJob
     {
         using (currentTenant.Change(args.TenantId))
         {
-            try
-            {
-                logger.LogInformation("Executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
-                await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
-                throw;
-            }
+            logger.LogInformation("Executing AI application analysis background job for application {ApplicationId}.", args.ApplicationId);
+            await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
index 5378b6fea7..a445993a68 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationScoringBackgroundJob.cs
@@ -20,23 +20,15 @@ public override async Task ExecuteAsync(GenerateApplicationScoringBackgroundJobA
     {
         using (currentTenant.Change(args.TenantId))
         {
-            try
-            {
-                logger.LogInformation("Executing AI application scoring background job for application {ApplicationId}.", args.ApplicationId);
+            logger.LogInformation("Executing AI application scoring background job for application {ApplicationId}.", args.ApplicationId);
 
-                var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-                if (!string.Equals(result, "{}", StringComparison.Ordinal))
-                {
-                    await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
-                    {
-                        ApplicationId = args.ApplicationId
-                    });
-                }
-            }
-            catch (Exception ex)
+            var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+            if (!string.Equals(result, "{}", StringComparison.Ordinal))
             {
-                logger.LogError(ex, "Error executing AI application scoring background job for application {ApplicationId}.", args.ApplicationId);
-                throw;
+                await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
+                {
+                    ApplicationId = args.ApplicationId
+                });
             }
         }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
index 810a1a5d48..7ecdf09249 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
@@ -17,19 +17,11 @@ public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobAr
     {
         using (currentTenant.Change(args.TenantId))
         {
-            try
-            {
-                logger.LogInformation(
-                    "Executing AI attachment summary background job for {AttachmentCount} attachment(s).",
-                    args.AttachmentIds.Count);
+            logger.LogInformation(
+                "Executing AI attachment summary background job for {AttachmentCount} attachment(s).",
+                args.AttachmentIds.Count);
 
-                await attachmentSummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion);
-            }
-            catch (Exception ex)
-            {
-                logger.LogError(ex, "Error executing AI attachment summary background job.");
-                throw;
-            }
+            await attachmentSummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion);
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
index 48ef21a9af..7a3fe34a40 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateContentBackgroundJob.cs
@@ -25,81 +25,73 @@ public override async Task ExecuteAsync(GenerateContentBackgroundJobArgs args)
     {
         using (currentTenant.Change(args.TenantId))
         {
-            try
+            var attachmentSummariesEnabled = await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries");
+            var applicationAnalysisEnabled = await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis");
+            var scoringEnabled = await featureChecker.IsEnabledAsync("Unity.AI.Scoring");
+
+            if (!attachmentSummariesEnabled && !applicationAnalysisEnabled && !scoringEnabled)
             {
-                var attachmentSummariesEnabled = await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries");
-                var applicationAnalysisEnabled = await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis");
-                var scoringEnabled = await featureChecker.IsEnabledAsync("Unity.AI.Scoring");
+                logger.LogDebug("All AI features are disabled, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
+                return;
+            }
 
-                if (!attachmentSummariesEnabled && !applicationAnalysisEnabled && !scoringEnabled)
-                {
-                    logger.LogDebug("All AI features are disabled, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
-                    return;
-                }
+            if (!await aiService.IsAvailableAsync())
+            {
+                logger.LogWarning("AI service is not available, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
+                return;
+            }
 
-                if (!await aiService.IsAvailableAsync())
-                {
-                    logger.LogWarning("AI service is not available, skipping queued AI generation for application {ApplicationId}.", args.ApplicationId);
-                    return;
-                }
+            logger.LogInformation("Executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
+
+            if (attachmentSummariesEnabled)
+            {
+                await attachmentSummaryService.GenerateForApplicationAsync(args.ApplicationId, args.PromptVersion);
+            }
 
-                logger.LogInformation("Executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
+            Exception? analysisException = null;
+            Exception? scoringException = null;
 
-                if (attachmentSummariesEnabled)
+            if (applicationAnalysisEnabled)
+            {
+                try
                 {
-                    await attachmentSummaryService.GenerateForApplicationAsync(args.ApplicationId, args.PromptVersion);
+                    await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
                 }
-
-                Exception? analysisException = null;
-                Exception? scoringException = null;
-
-                if (applicationAnalysisEnabled)
+                catch (Exception ex)
                 {
-                    try
-                    {
-                        await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-                    }
-                    catch (Exception ex)
-                    {
-                        analysisException = ex;
-                        logger.LogError(ex, "Error executing AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
-                    }
+                    analysisException = ex;
+                    logger.LogError(ex, "Error executing AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
                 }
+            }
 
-                if (scoringEnabled)
+            if (scoringEnabled)
+            {
+                try
                 {
-                    try
+                    var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                    if (!string.Equals(result, "{}", StringComparison.Ordinal))
                     {
-                        var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-                        if (!string.Equals(result, "{}", StringComparison.Ordinal))
+                        await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
                         {
-                            await localEventBus.PublishAsync(new AIApplicationScoringGeneratedEvent
-                            {
-                                ApplicationId = args.ApplicationId
-                            });
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        scoringException = ex;
-                        logger.LogError(ex, "Error executing AI application scoring stage for application {ApplicationId}.", args.ApplicationId);
+                            ApplicationId = args.ApplicationId
+                        });
                     }
                 }
-
-                if (scoringException != null)
+                catch (Exception ex)
                 {
-                    throw scoringException;
+                    scoringException = ex;
+                    logger.LogError(ex, "Error executing AI application scoring stage for application {ApplicationId}.", args.ApplicationId);
                 }
+            }
 
-                if (analysisException != null)
-                {
-                    throw analysisException;
-                }
+            if (scoringException != null)
+            {
+                throw scoringException;
             }
-            catch (Exception ex)
+
+            if (analysisException != null)
             {
-                logger.LogError(ex, "Error executing queued AI content pipeline for application {ApplicationId}.", args.ApplicationId);
-                throw;
+                throw analysisException;
             }
         }
     }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index b4720643f1..ea96c8edfb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -2,6 +2,92 @@
  * Grant Application Details Page
  * Dependencies: ai-analysis.js - handles AI analysis rendering and management
  */
+function formatJsonOrRaw(value) {
+    if (!value) {
+        return '';
+    }
+
+    if (typeof value !== 'string') {
+        return JSON.stringify(value, null, 2);
+    }
+
+    try {
+        return JSON.stringify(JSON.parse(value), null, 2);
+    } catch {
+        return value;
+    }
+}
+
+function formatSectionBody(title, value) {
+    if (!value) {
+        return '';
+    }
+
+    return `${title}:\n${value}`;
+}
+
+function formatOutputBody(title, sections) {
+    const content = sections.filter(Boolean).join('\n\n');
+    if (!content) {
+        return '';
+    }
+
+    const promptVersion = globalThis.getSelectedPromptVersion?.();
+    const header = promptVersion ? `${title} - ${promptVersion}` : title;
+    return `${header}\n\n${content}`;
+}
+
+function unwrapWhenResult(result) {
+    if (
+        Array.isArray(result) &&
+        result.length === 3 &&
+        typeof result[1] === 'string'
+    ) {
+        return result[0];
+    }
+
+    return result;
+}
+
+function extractSubmissionDataObject(root) {
+    if (!root || typeof root !== 'object' || Array.isArray(root)) {
+        return null;
+    }
+
+    if (root.data && typeof root.data === 'object' && !Array.isArray(root.data)) {
+        return root.data;
+    }
+
+    if (
+        root.submission &&
+        typeof root.submission === 'object' &&
+        !Array.isArray(root.submission) &&
+        root.submission.data &&
+        typeof root.submission.data === 'object' &&
+        !Array.isArray(root.submission.data)
+    ) {
+        return root.submission.data;
+    }
+
+    return root;
+}
+
+function formatTimestamp(value) {
+    if (!value) {
+        return '';
+    }
+
+    const timestamp = new Date(value);
+    if (Number.isNaN(timestamp.getTime())) {
+        return '';
+    }
+
+    return timestamp.toLocaleString();
+}
+
+function getAttachmentSummaryValue(attachment) {
+    return attachment?.aiSummary ?? attachment?.aISummary ?? '';
+}
 
 $(function () {
     const excludedPromptDataKeys = new Set([
@@ -37,53 +123,6 @@ $(function () {
         $(selector).text(value ? `(${value})` : '');
     }
 
-    function formatJsonOrRaw(value) {
-        if (!value) {
-            return '';
-        }
-
-        if (typeof value !== 'string') {
-            return JSON.stringify(value, null, 2);
-        }
-
-        try {
-            return JSON.stringify(JSON.parse(value), null, 2);
-        } catch {
-            return value;
-        }
-    }
-
-    function formatSectionBody(title, value) {
-        if (!value) {
-            return '';
-        }
-
-        return `${title}:\n${value}`;
-    }
-
-    function formatOutputBody(title, sections) {
-        const content = sections.filter((section) => section).join('\n\n');
-        if (!content) {
-            return '';
-        }
-
-        const promptVersion = globalThis.getSelectedPromptVersion?.();
-        const header = promptVersion ? `${title} - ${promptVersion}` : title;
-        return `${header}\n\n${content}`;
-    }
-
-    function unwrapWhenResult(result) {
-        if (
-            Array.isArray(result) &&
-            result.length === 3 &&
-            typeof result[1] === 'string'
-        ) {
-            return result[0];
-        }
-
-        return result;
-    }
-
     function getScoresheetSchemaJson() {
         return $('#ApplicationScoresheetSchemaJson').val() ||
             $('#AssessmentScoresheetSchemaJson').val() ||
@@ -121,29 +160,6 @@ $(function () {
         }
     }
 
-    function extractSubmissionDataObject(root) {
-        if (!root || typeof root !== 'object' || Array.isArray(root)) {
-            return null;
-        }
-
-        if (root.data && typeof root.data === 'object' && !Array.isArray(root.data)) {
-            return root.data;
-        }
-
-        if (
-            root.submission &&
-            typeof root.submission === 'object' &&
-            !Array.isArray(root.submission) &&
-            root.submission.data &&
-            typeof root.submission.data === 'object' &&
-            !Array.isArray(root.submission.data)
-        ) {
-            return root.submission.data;
-        }
-
-        return root;
-    }
-
     function extractAllowedSchemaKeys(formSchema) {
         if (!formSchema) {
             return new Set();
@@ -196,23 +212,6 @@ $(function () {
         }
     }
 
-    function formatTimestamp(value) {
-        if (!value) {
-            return '';
-        }
-
-        const timestamp = new Date(value);
-        if (Number.isNaN(timestamp.getTime())) {
-            return '';
-        }
-
-        return timestamp.toLocaleString();
-    }
-
-    function getAttachmentSummaryValue(attachment) {
-        return attachment?.aiSummary ?? attachment?.aISummary ?? '';
-    }
-
     function formatAttachmentAiOutput(attachments) {
         const attachmentBody = formatAttachmentSummaryBody(attachments);
         if (!attachmentBody) {
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 b60f8d3942..dfd5d2abb1 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
@@ -79,7 +79,7 @@ function normalizeFindings(items, fallbackType) {
     };
 
     return (items || [])
-        .filter(item => item)
+        .filter(Boolean)
         .map((item, index) => ({
             ...item,
             id: item.id || `${fallbackType}-${index}`,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
index 6575155b7d..3b0f961d25 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/AssessmentScoresWidget/AssessmentScoresWidgetViewComponent.cs
@@ -15,7 +15,6 @@
 using Unity.Flex;
 using Unity.Flex.Scoresheets.Enums;
 using Unity.GrantManager.AI.Models;
-using Unity.GrantManager.AI.Responses;
 using Unity.GrantManager.Applications;
 using System.Text.Json;
 using Unity.AI.Permissions;
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/AssessmentAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/AssessmentAppServiceTests.cs
index a334c6d89c..59dcc1e6c5 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/AssessmentAppServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Assessments/AssessmentAppServiceTests.cs
@@ -174,12 +174,13 @@ await _assessmentAppService.ExecuteAssessmentAction(assessment.Id, AssessmentAct
 
         [Fact]
         [Trait("Category", "Integration")]
-        public async Task CloneFromAiAsync_Should_Throw_On_Non_AI_Assessment()
-        {
-            // Arrange
-            Login(GrantManagerTestData.User1_UserId);
-
-            using var uow = _unitOfWorkManager.Begin();
+        public async Task CloneFromAiAsync_Should_Throw_On_Non_AI_Assessment()
+        {
+            // Arrange
+            Login(GrantManagerTestData.User1_UserId);
+            SetFeatureEnabled("Unity.AI.Scoring", true);
+
+            using var uow = _unitOfWorkManager.Begin();
 
             // Act & Assert — Assessment1_Id is a human assessment, not AI
             await Assert.ThrowsAsync<BusinessException>(async () =>
@@ -188,12 +189,13 @@ await Assert.ThrowsAsync<BusinessException>(async () =>
 
         [Fact]
         [Trait("Category", "Integration")]
-        public async Task CloneFromAiAsync_Should_Create_Human_Assessment_From_AI_Assessment()
-        {
-            // Arrange — User2 has no existing human assessment on Application1
-            Login(GrantManagerTestData.User2_UserId);
-
-            using var uow = _unitOfWorkManager.Begin();
+        public async Task CloneFromAiAsync_Should_Create_Human_Assessment_From_AI_Assessment()
+        {
+            // Arrange — User2 has no existing human assessment on Application1
+            Login(GrantManagerTestData.User2_UserId);
+            SetFeatureEnabled("Unity.AI.Scoring", true);
+
+            using var uow = _unitOfWorkManager.Begin();
             var beforeCount = (await _assessmentRepository.GetQueryableAsync())
                 .Count(s => s.ApplicationId == GrantManagerTestData.Application1_Id && !s.IsAiAssessment);
 
@@ -210,12 +212,13 @@ public async Task CloneFromAiAsync_Should_Create_Human_Assessment_From_AI_Assess
 
         [Fact]
         [Trait("Category", "Integration")]
-        public async Task GetDisplayList_Should_Exclude_AI_Assessment_When_Feature_Disabled()
-        {
-            // Arrange — Unity.AI.Scoring feature is disabled by default in test environment
-            Login(GrantManagerTestData.User1_UserId);
-
-            using var uow = _unitOfWorkManager.Begin();
+        public async Task GetDisplayList_Should_Exclude_AI_Assessment_When_Feature_Disabled()
+        {
+            // Arrange — Unity.AI.Scoring feature is disabled by default in test environment
+            Login(GrantManagerTestData.User1_UserId);
+            SetFeatureEnabled("Unity.AI.Scoring", false);
+
+            using var uow = _unitOfWorkManager.Begin();
 
             // Act
             var result = await _assessmentAppService.GetDisplayList(GrantManagerTestData.Application1_Id);
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs
index 0baa9824f2..138320e81d 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestBase.cs
@@ -1,8 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
-using NSubstitute;
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.Users;
+using NSubstitute;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Features;
+using Volo.Abp.Users;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -10,9 +11,10 @@
 
 namespace Unity.GrantManager;
 
-public abstract class GrantManagerApplicationTestBase : GrantManagerTestBase<GrantManagerApplicationTestModule>, IAsyncLifetime
-{
-    protected ICurrentUser? _currentUser;
+public abstract class GrantManagerApplicationTestBase : GrantManagerTestBase<GrantManagerApplicationTestModule>, IAsyncLifetime
+{
+    protected ICurrentUser? _currentUser;
+    protected IFeatureChecker? _featureChecker;
 
     protected GrantManagerApplicationTestBase(ITestOutputHelper _)
     {        
@@ -28,15 +30,23 @@ public virtual async Task DisposeAsync()
         await Task.Delay(15);        
     }
 
-    protected override void AfterAddApplication(IServiceCollection services)
-    {
-        _currentUser = Substitute.For<ICurrentUser>();
-        services.AddSingleton(_currentUser);
-    }
-
-    protected void Login(Guid userId)
-    {
-        _currentUser?.Id.Returns(userId);
-        _currentUser?.IsAuthenticated.Returns(true);
-    }
-}
+    protected override void AfterAddApplication(IServiceCollection services)
+    {
+        _currentUser = Substitute.For<ICurrentUser>();
+        _featureChecker = Substitute.For<IFeatureChecker>();
+        _featureChecker.IsEnabledAsync(Arg.Any<string>()).Returns(false);
+        services.AddSingleton(_currentUser);
+        services.AddSingleton(_featureChecker);
+    }
+
+    protected void Login(Guid userId)
+    {
+        _currentUser?.Id.Returns(userId);
+        _currentUser?.IsAuthenticated.Returns(true);
+    }
+
+    protected void SetFeatureEnabled(string featureName, bool isEnabled)
+    {
+        _featureChecker?.IsEnabledAsync(featureName).Returns(isEnabled);
+    }
+}

From de79d7a2f0f1e09ca0e431b97f03cb302826d2a9 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Tue, 24 Mar 2026 16:51:54 -0700
Subject: [PATCH 26/38] AB#32012 remove unused chefs attachment variable

---
 .../Views/Shared/Components/ChefsAttachments/ChefsAttachments.js | 1 -
 1 file changed, 1 deletion(-)

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 a3581c1741..c22903496b 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
@@ -222,7 +222,6 @@ $(function () {
                 ? chefsDataTable.rows().data()
                 : chefsDataTable.rows({ selected: true }).data();
             const promptVersion = globalThis.getSelectedPromptVersion?.() || null;
-            const applicationId = $('#DetailsViewApplicationId').val();
 
             $button.removeData('trigger-button');
 

From 21b98453cb63733243fa1b6d3414a6cd6b1f3454 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Tue, 24 Mar 2026 16:54:51 -0700
Subject: [PATCH 27/38] AB#32012 update development AI config template

---
 .../appsettings.Development.json              | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json
index e7487ba79d..0cff0f219d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/appsettings.Development.json
@@ -149,23 +149,23 @@
       "ApplicationAnalysis": {
         "MaxCompletionTokens": 2500
       },
-      "ScoresheetSection": {
+      "ApplicationScoring": {
         "MaxCompletionTokens": 5000
       }
     },
     "OpenAI": {
       "ApiKey": "",
-      "Profiles": {
-        "Gpt4oMini": {
-          "ApiUrl": "",
-          "MaxTokensParameter": "max_tokens",
-          "Temperature": 0.3
-        },
-        "Gpt5Mini": {
-          "ApiUrl": "",
-          "MaxTokensParameter": "max_completion_tokens"
-        }
-      }
+      "Profiles": {
+        "Gpt4oMini": {
+          "ApiUrl": "",
+          "MaxTokensParameter": "max_tokens",
+          "Temperature": 0.3
+        },
+        "Gpt5Mini": {
+          "ApiUrl": "",
+          "MaxTokensParameter": "max_completion_tokens"
+        }
+      }
     },
     "Logging": {
       "EnablePromptFileLog": true

From 8d539f4fdf452a296af8074f23002651c56ff05f Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Wed, 25 Mar 2026 08:26:26 -0700
Subject: [PATCH 28/38] AB#31470 radio button fixes for reporting

---
 .../Configuration/FormMetadataService.cs      |   18 +-
 ...ixRadioButtonReportingViewType.Designer.cs | 4791 +++++++++++++++++
 ...4213544_FixRadioButtonReportingViewType.cs |   35 +
 .../Scripts/get_formversion_data.sql          |   18 +-
 .../Reporting/FormMetadataServiceTests.cs     |   32 +-
 5 files changed, 4859 insertions(+), 35 deletions(-)
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs
index 6233339a1a..ef8b73697a 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Reporting/Configuration/FormMetadataService.cs
@@ -36,7 +36,7 @@ public class FormMetadataService(IApplicationFormVersionRepository formVersionRe
         /// <remarks>
         /// This method performs several operations:
         /// 1. Recursively scans all form components including nested structures (panels, tabs, columns, tables)
-        /// 2. Expands value options for radio groups and checkboxes into individual entries
+        /// 2. Expands value options for checkbox groups into individual entries (radio groups are kept as single entries)
         /// 3. Filters out UI-only components (buttons, HTML content, containers)
         /// 4. Handles duplicate paths by prefixing them with (DKx) notation
         /// 5. Creates data-focused paths for easier data access patterns
@@ -149,8 +149,7 @@ private static void FilterOutTypes(List<FormComponentMetaDataItemDto> components
                 "editgrid",
                 "form",
                 "wizard",
-                "selectboxes",
-                "radio"
+                "selectboxes"
             };
 
             // Remove components with types that should be skipped
@@ -490,7 +489,7 @@ private static void ProcessTabsComponent(JObject component, List<FormComponentMe
         }
 
         /// <summary>
-        /// Processes expanded value options for components like radio groups and checkbox groups
+        /// Processes expanded value options for checkbox group components
         /// </summary>
         /// <param name="component">The component with values to expand</param>
         /// <param name="componentsList">The list to populate with found components</param>
@@ -529,8 +528,9 @@ private static void ProcessExpandedValueOptions(JObject component, List<FormComp
         }
 
         /// <summary>
-        /// Determines if value options should be expanded into individual entries
-        /// Radio groups and checkbox groups are expanded to create individual entries for each option
+        /// Determines if value options should be expanded into individual entries.
+        /// Checkbox groups are expanded to create individual entries for each option.
+        /// Radio groups are NOT expanded because they store a single selected value.
         /// </summary>
         /// <param name="type">Component type</param>
         /// <returns>True if options should be expanded</returns>
@@ -544,11 +544,7 @@ private static bool ShouldExpandValueOptions(string? type)
                 // Checkbox types
                 "simplecheckboxes",
                 "simplecheckboxadvanced",
-                "selectboxes",
-                // Radio types - expanded like checkboxes for reporting
-                "radio",
-                "simpleradios",
-                "simpleradioadvanced"
+                "selectboxes"
             };
 
             return expandTypes.Contains(type);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.Designer.cs
new file mode 100644
index 0000000000..1b8a66efd7
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.Designer.cs
@@ -0,0 +1,4791 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    [DbContext(typeof(GrantTenantDbContext))]
+    [Migration("20260324213544_FixRadioButtonReportingViewType")]
+    partial class FixRadioButtonReportingViewType
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("QuestionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ScoresheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("QuestionId");
+
+                    b.HasIndex("ScoresheetInstanceId");
+
+                    b.ToTable("Answers", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("Questions", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Scoresheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ScoresheetId");
+
+                    b.ToTable("ScoresheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("CustomFieldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetInstanceId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetInstanceId");
+
+                    b.ToTable("CustomFieldValues", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("CurrentValue")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetCorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("WorksheetCorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WorksheetInstances", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UiAnchor")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetLinks", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Definition")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("SectionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectionId");
+
+                    b.ToTable("CustomFields", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Version")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Worksheets", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<long>("Order")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorksheetId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorksheetId");
+
+                    b.ToTable("WorksheetSections", "Flex");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicantName")
+                        .IsRequired()
+                        .HasMaxLength(600)
+                        .HasColumnType("character varying(600)");
+
+                    b.Property<string>("ApproxNumberOfEmployees")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FiscalDay")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("FiscalMonth")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FundingHistoryComments")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IndigenousOrgInd")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDuplicated")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("IssueTrackingComments")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("MatchPercentage")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("NonRegOrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("NonRegisteredBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrgStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationSize")
+                        .HasColumnType("text");
+
+                    b.Property<string>("OrganizationType")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("RedStop")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Sector")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorSubSectorIndustryDesc")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateOnly?>("StartedOperatingDate")
+                        .HasColumnType("date");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSector")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UnityApplicantId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantName");
+
+                    b.ToTable("Applicants", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Postal")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Street2")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Unit")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicantAddresses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("BceidBusinessGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidBusinessName")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("BceidUserGuid")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BceidUserName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<int>("ContactOrder")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IdentityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IdentityProvider")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSubUser")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Phone2Extension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneExtension")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleForApplicant")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicantAgents", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AIAnalysis")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AIScoresheetAnswers")
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Acquisition")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicantElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationStatusId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<DateTime?>("AssessmentResultDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AssessmentResultStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("AssessmentStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Community")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("CommunityPopulation")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime?>("ContractExecutionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ContractNumber")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeclineRational")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime?>("DueDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("DueDiligenceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegion")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("FinalDecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Forestry")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ForestryFocus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LikelihoodOfFunding")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Notes")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("NotificationDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("OwnerId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Payload")
+                        .HasColumnType("jsonb");
+
+                    b.Property<double?>("PercentageTotalProjectBudget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("Place")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProjectEndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal?>("ProjectFundingTotal")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ProjectName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("ProjectStartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ProjectSummary")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ProposalDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<decimal>("RecommendedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ReferenceNo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrict")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RequestedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("RiskRanking")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityBusinessPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityCellPhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityFullName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SigningAuthorityTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("SubmissionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal>("TotalProjectBudget")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("TotalScore")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("UnityApplicationId")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.HasIndex("ApplicationStatusId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Applications", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssigneeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Duty")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssigneeId");
+
+                    b.ToTable("ApplicationAssignments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AISummary")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsFileId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsSubmissionId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationChefsFileAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContactEmail")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactFullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactMobilePhone")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactTitle")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ContactWorkPhone")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationContact", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApiKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ApplicationFormName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<DateTime?>("AttemptedConnectionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Category")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsCriteriaFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ConnectionHttpStatus")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("DefaultPaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int?>("ElectoralDistrictAddressType")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FormHierarchy")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("IntakeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsDirectApproval")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("ParentFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Payable")
+                        .HasColumnType("boolean");
+
+                    b.Property<decimal?>("PaymentApprovalThreshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("Prefix")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool>("PreventPayment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("RenderFormIoToHtml")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("ScoresheetId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("SuffixType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IntakeId");
+
+                    b.HasIndex("ParentFormId");
+
+                    b.ToTable("ApplicationForms", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicationFormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChefsSubmissionGuid")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("FormVersionId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RenderedHTML")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportData")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<string>("Submission")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormSubmissions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationFormId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AvailableChefsFields")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsApplicationFormGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChefsFormVersionGuid")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FormSchema")
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<bool>("Published")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ReportColumns")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportKeys")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReportViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubmissionHeaderMapping")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Version")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationFormId");
+
+                    b.ToTable("ApplicationFormVersion", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LinkType")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("text")
+                        .HasDefaultValue("Related");
+
+                    b.Property<Guid>("LinkedApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.ToTable("ApplicationLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("StatusCode")
+                        .IsRequired()
+                        .HasMaxLength(250)
+                        .HasColumnType("character varying(250)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StatusCode")
+                        .IsUnique();
+
+                    b.ToTable("ApplicationStatuses", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("ApplicationTags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.ToTable("AssessmentAttachments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("AuditDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("AuditNote")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AuditTrackingNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("AuditHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal?>("ApprovedAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FundingNotes")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("FundingYear")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("GrantCategory")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<decimal?>("ReconsiderationAmount")
+                        .HasColumnType("numeric");
+
+                    b.Property<bool?>("RenewedFunding")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("TotalGrantAmount")
+                        .HasColumnType("numeric");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("FundingHistories", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IssueDescription")
+                        .HasColumnType("text");
+
+                    b.Property<string>("IssueHeading")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("ResolutionNote")
+                        .HasColumnType("text");
+
+                    b.Property<bool?>("Resolved")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int?>("Year")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicantId");
+
+                    b.ToTable("IssueTrackings", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool?>("ApprovalRecommended")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid>("AssessorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int?>("CleanGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<int?>("EconomicImpact")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<int?>("FinancialAnalysis")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("InclusiveGrowth")
+                        .HasColumnType("integer");
+
+                    b.Property<bool>("IsAiAssessment")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsComplete")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("AssessorId");
+
+                    b.ToTable("Assessments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("ApplicationComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CommenterId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("PinDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssessmentId");
+
+                    b.HasIndex("CommenterId");
+
+                    b.ToTable("AssessmentComments", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HomePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MobilePhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Title")
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<string>("WorkPhoneExtension")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("WorkPhoneNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Contacts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("RelatedEntityId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("RelatedEntityType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Role")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RelatedEntityType", "RelatedEntityId");
+
+                    b.HasIndex("ContactId", "RelatedEntityType", "RelatedEntityId");
+
+                    b.ToTable("ContactLinks", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.GlobalTag.Tag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Tags", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Identity.Person", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Badge")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("OidcDisplayName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("OidcSub")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSub");
+
+                    b.ToTable("Persons", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Intakes.Intake", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<double>("Budget")
+                        .HasColumnType("double precision");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IntakeName")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("character varying(255)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Intakes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("EmailGroupUsers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("ApplicationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AssessmentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BCC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("CC")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesHttpStatusCode")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ChesMsgId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ChesResponse")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ChesStatus")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FromAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentRequestIds")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("RetryAttempts")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("SendOnDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime?>("SentDateTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Tag")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TemplateName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ToAddress")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailLogs", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("EmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FileName")
+                        .HasColumnType("text");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("S3ObjectKey")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<DateTime>("Time")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmailLogId");
+
+                    b.HasIndex("S3ObjectKey");
+
+                    b.ToTable("EmailLogAttachments", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.EmailTemplate", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BodyHTML")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("BodyText")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SendFrom")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EmailTemplates", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Subscriber", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroup", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SubscriptionGroups", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("GroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("SubscriberId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.HasIndex("SubscriberId");
+
+                    b.ToTable("SubscriptionGroupSubscribers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TemplateVariable", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MapTo")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TemplateVariables", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.Trigger", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("InternalName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Triggers", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SubscriptionGroupId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("TriggerId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SubscriptionGroupId");
+
+                    b.HasIndex("TemplateId");
+
+                    b.HasIndex("TriggerId");
+
+                    b.ToTable("TriggerSubscriptions", "Notifications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.AccountCodings.AccountCoding", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(35)
+                        .HasColumnType("character varying(35)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MinistryClient")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProjectNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Responsibility")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ServiceLine")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Stob")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AccountCodings", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentConfigurations.PaymentConfiguration", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DefaultAccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("PaymentIdPrefix")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentConfigurations", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("DecisionDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("DecisionUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.ToTable("ExpenseApprovals", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("AccountCodingId")
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("Amount")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("BatchName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("BatchNumber")
+                        .HasColumnType("numeric");
+
+                    b.Property<int?>("CasHttpStatusCode")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CasResponse")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("ContractNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FsbApNotified")
+                        .HasMaxLength(10)
+                        .HasColumnType("character varying(10)");
+
+                    b.Property<Guid?>("FsbNotificationEmailLogId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("FsbNotificationSentDate")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("InvoiceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("InvoiceStatus")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsRecon")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PayeeName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentDate")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PaymentStatus")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ReferenceNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RequesterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SiteId")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SubmissionConfirmationCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierNumber")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountCodingId");
+
+                    b.HasIndex("FsbNotificationEmailLogId");
+
+                    b.HasIndex("ReferenceNumber")
+                        .IsUnique();
+
+                    b.HasIndex("SiteId");
+
+                    b.ToTable("PaymentRequests", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("PaymentRequestId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PaymentRequestId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("PaymentTags", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentThresholds.PaymentThreshold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<decimal?>("Threshold")
+                        .HasColumnType("numeric");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PaymentThresholds", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AddressLine1")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine2")
+                        .HasColumnType("text");
+
+                    b.Property<string>("AddressLine3")
+                        .HasColumnType("text");
+
+                    b.Property<string>("BankAccount")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Country")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("EFTAdvicePref")
+                        .HasColumnType("text");
+
+                    b.Property<string>("EmailAddress")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCas")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<bool>("MarkDeletedInUse")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Number")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("PaymentGroup")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SiteProtected")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("SupplierId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SupplierId");
+
+                    b.ToTable("Sites", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("BusinessNumber")
+                        .HasColumnType("text");
+
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTime?>("LastUpdatedInCAS")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("MailingAddress")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Number")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PostalCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Province")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SIN")
+                        .HasColumnType("text");
+
+                    b.Property<string>("StandardIndustryClassification")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Subcategory")
+                        .HasColumnType("text");
+
+                    b.Property<string>("SupplierProtected")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Suppliers", "Payments");
+                });
+
+            modelBuilder.Entity("Unity.Reporting.Domain.Configuration.ReportColumnsMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("CorrelationId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("CorrelationProvider")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Mapping")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<int>("RoleStatus")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("ViewName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("ViewStatus")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ReportColumnsMaps", "Reporting");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Instances")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Answer", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Question", "Question")
+                        .WithMany("Answers")
+                        .HasForeignKey("QuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", null)
+                        .WithMany("Answers")
+                        .HasForeignKey("ScoresheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Question");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.ScoresheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Scoresheets.Scoresheet", "Scoresheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("ScoresheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Scoresheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.CustomFieldValue", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", null)
+                        .WithMany("Values")
+                        .HasForeignKey("WorksheetInstanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetLinks.WorksheetLink", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Links")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.CustomField", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.WorksheetSection", "Section")
+                        .WithMany("Fields")
+                        .HasForeignKey("SectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Section");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.HasOne("Unity.Flex.Domain.Worksheets.Worksheet", "Worksheet")
+                        .WithMany("Sections")
+                        .HasForeignKey("WorksheetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Worksheet");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAddress", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicantAddresses")
+                        .HasForeignKey("ApplicationId");
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicantAgent", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithOne("ApplicantAgent")
+                        .HasForeignKey("Unity.GrantManager.Applications.ApplicantAgent", "ApplicationId");
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", "Applicant")
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", "ApplicationForm")
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationStatus", "ApplicationStatus")
+                        .WithMany("Applications")
+                        .HasForeignKey("ApplicationStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.Navigation("Applicant");
+
+                    b.Navigation("ApplicationForm");
+
+                    b.Navigation("ApplicationStatus");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAssignment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationAssignments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", "Assignee")
+                        .WithMany()
+                        .HasForeignKey("AssigneeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Assignee");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationChefsFileAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationContact", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationForm", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Intakes.Intake", null)
+                        .WithMany()
+                        .HasForeignKey("IntakeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ParentFormId")
+                        .OnDelete(DeleteBehavior.NoAction);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormSubmission", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationFormVersion", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.ApplicationForm", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationFormId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany("ApplicationLinks")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationTags", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("ApplicationTags")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AssessmentAttachment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.AuditHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.FundingHistory", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.IssueTracking", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Applicant", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicantId");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Assessments.Assessment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", "Application")
+                        .WithMany("Assessments")
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("AssessorId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Application");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.ApplicationComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Applications.Application", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Comments.AssessmentComment", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Assessments.Assessment", null)
+                        .WithMany()
+                        .HasForeignKey("AssessmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.Identity.Person", null)
+                        .WithMany()
+                        .HasForeignKey("CommenterId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Contacts.ContactLink", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Contacts.Contact", null)
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.EmailGroups.EmailGroupUser", b =>
+                {
+                    b.HasOne("Unity.Notifications.EmailGroups.EmailGroup", null)
+                        .WithMany()
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Emails.EmailLogAttachment", b =>
+                {
+                    b.HasOne("Unity.Notifications.Emails.EmailLog", null)
+                        .WithMany()
+                        .HasForeignKey("EmailLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.SubscriptionGroupSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("GroupId");
+
+                    b.HasOne("Unity.Notifications.Templates.Subscriber", "Subscriber")
+                        .WithMany()
+                        .HasForeignKey("SubscriberId");
+
+                    b.Navigation("Subscriber");
+
+                    b.Navigation("SubscriptionGroup");
+                });
+
+            modelBuilder.Entity("Unity.Notifications.Templates.TriggerSubscription", b =>
+                {
+                    b.HasOne("Unity.Notifications.Templates.SubscriptionGroup", "SubscriptionGroup")
+                        .WithMany()
+                        .HasForeignKey("SubscriptionGroupId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.EmailTemplate", "EmailTemplate")
+                        .WithMany()
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.Notifications.Templates.Trigger", "Trigger")
+                        .WithMany()
+                        .HasForeignKey("TriggerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("EmailTemplate");
+
+                    b.Navigation("SubscriptionGroup");
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.ExpenseApproval", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", "PaymentRequest")
+                        .WithMany("ExpenseApprovals")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("PaymentRequest");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.AccountCodings.AccountCoding", "AccountCoding")
+                        .WithMany()
+                        .HasForeignKey("AccountCodingId")
+                        .OnDelete(DeleteBehavior.NoAction);
+
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Site", "Site")
+                        .WithMany()
+                        .HasForeignKey("SiteId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("AccountCoding");
+
+                    b.Navigation("Site");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentTags.PaymentTag", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.PaymentRequests.PaymentRequest", null)
+                        .WithMany("PaymentTags")
+                        .HasForeignKey("PaymentRequestId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Unity.GrantManager.GlobalTag.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.NoAction)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Site", b =>
+                {
+                    b.HasOne("Unity.Payments.Domain.Suppliers.Supplier", "Supplier")
+                        .WithMany("Sites")
+                        .HasForeignKey("SupplierId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Supplier");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.ScoresheetInstances.ScoresheetInstance", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Question", b =>
+                {
+                    b.Navigation("Answers");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.Scoresheet", b =>
+                {
+                    b.Navigation("Instances");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Scoresheets.ScoresheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.WorksheetInstances.WorksheetInstance", b =>
+                {
+                    b.Navigation("Values");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.Worksheet", b =>
+                {
+                    b.Navigation("Links");
+
+                    b.Navigation("Sections");
+                });
+
+            modelBuilder.Entity("Unity.Flex.Domain.Worksheets.WorksheetSection", b =>
+                {
+                    b.Navigation("Fields");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Applicant", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.Application", b =>
+                {
+                    b.Navigation("ApplicantAddresses");
+
+                    b.Navigation("ApplicantAgent");
+
+                    b.Navigation("ApplicationAssignments");
+
+                    b.Navigation("ApplicationLinks");
+
+                    b.Navigation("ApplicationTags");
+
+                    b.Navigation("Assessments");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applications.ApplicationStatus", b =>
+                {
+                    b.Navigation("Applications");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.PaymentRequests.PaymentRequest", b =>
+                {
+                    b.Navigation("ExpenseApprovals");
+
+                    b.Navigation("PaymentTags");
+                });
+
+            modelBuilder.Entity("Unity.Payments.Domain.Suppliers.Supplier", b =>
+                {
+                    b.Navigation("Sites");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.cs
new file mode 100644
index 0000000000..ce147213a2
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260324213544_FixRadioButtonReportingViewType.cs
@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+using System.IO;
+using System.Reflection;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.TenantMigrations
+{
+    /// <inheritdoc />
+    public partial class FixRadioButtonReportingViewType : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // Re-execute the get_formversion_data function to fix radio button type handling.
+            // Radio buttons now use TEXT instead of BOOLEAN, matching the CHEFS data model
+            // where radio values are strings (e.g., "email") not booleans.
+            var assembly = Assembly.GetExecutingAssembly();
+            var resourceName = "Unity.GrantManager.Scripts.get_formversion_data.sql";
+
+            using Stream stream = assembly.GetManifestResourceStream(resourceName)
+                ?? throw new InvalidOperationException($"Could not find embedded resource: {resourceName}");
+            using StreamReader reader = new(stream);
+            string sql = reader.ReadToEnd();
+            migrationBuilder.Sql(sql);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_formversion_data.sql b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_formversion_data.sql
index 9c2e1bd17f..93d8fa4965 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_formversion_data.sql
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Scripts/get_formversion_data.sql
@@ -122,7 +122,7 @@ BEGIN
                     column_list := column_list || format('NULL::NUMERIC AS %I', column_name);
                 WHEN 'currency' THEN
                     column_list := column_list || format('NULL::DECIMAL(18,2) AS %I', column_name);
-                WHEN 'option', 'checkbox', 'radio' THEN
+                WHEN 'option', 'checkbox' THEN
                     column_list := column_list || format('NULL::BOOLEAN AS %I', column_name);
                 ELSE
                     column_list := column_list || format('NULL::TEXT AS %I', column_name);
@@ -229,7 +229,7 @@ BEGIN
                             ELSE (%s%s)::TEXT
                         END)', '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path);
                         
-                    WHEN 'option', 'checkbox', 'radio' THEN
+                    WHEN 'option', 'checkbox' THEN
                         IF json_path LIKE '%->%' THEN
                             json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
                         ELSE
@@ -245,7 +245,7 @@ BEGIN
                             END
                             ELSE (%s%s)::TEXT
                         END)', '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path);
-                        
+
                     ELSE
                         -- Default to text
                         IF json_path LIKE '%->%' THEN
@@ -290,7 +290,7 @@ BEGIN
                             ELSE NULL
                         END)', '{}', json_path, '{}', json_path, '{}', json_path);
                         
-                    WHEN 'option', 'checkbox', 'radio' THEN
+                    WHEN 'option', 'checkbox' THEN
                         IF json_path LIKE '%->%' THEN
                             json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
                         ELSE
@@ -306,7 +306,7 @@ BEGIN
                                 END
                             ELSE NULL
                         END)', '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path);
-                        
+
                     ELSE
                         -- Default to text
                         IF json_path LIKE '%->%' THEN
@@ -350,7 +350,7 @@ BEGIN
                             format('NULL::DECIMAL\(18,2\) AS %I([^_A-Za-z0-9]|$)', column_name),
                             format('%s AS %I\1', replace(data_path, '{}', current_source_prefix), column_name)
                         );
-                    WHEN 'option', 'checkbox', 'radio' THEN
+                    WHEN 'option', 'checkbox' THEN
                         legacy_select_clause := regexp_replace(legacy_select_clause,
                             format('NULL::BOOLEAN AS %I([^_A-Za-z0-9]|$)', column_name),
                             format('%s AS %I\1', replace(data_path, '{}', legacy_source_prefix), column_name)
@@ -550,7 +550,7 @@ BEGIN
                                 format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name)
                             );
                             
-                        WHEN 'option', 'checkbox', 'radio' THEN
+                        WHEN 'option', 'checkbox' THEN
                             IF json_path LIKE '%->%' THEN
                                 json_path := regexp_replace(json_path, '->([^>]+)$', '->>\1');
                             ELSE
@@ -566,7 +566,7 @@ BEGIN
                                     END
                                 ELSE NULL
                             END)', '{}', json_path, '{}', json_path, '{}', json_path, '{}', json_path);
-                            
+
                             legacy_select_clause := replace(legacy_select_clause,
                                 format('NULL::BOOLEAN AS %I', column_name),
                                 format('%s AS %I', replace(data_path, '{}', legacy_source_prefix), column_name)
@@ -575,7 +575,7 @@ BEGIN
                                 format('NULL::BOOLEAN AS %I', column_name),
                                 format('%s AS %I', replace(data_path, '{}', current_source_prefix), column_name)
                             );
-                            
+
                         ELSE
                             -- Default to text
                             IF json_path LIKE '%->%' THEN
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Reporting/FormMetadataServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Reporting/FormMetadataServiceTests.cs
index ae4912025e..fa080806e8 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Reporting/FormMetadataServiceTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Reporting/FormMetadataServiceTests.cs
@@ -162,15 +162,16 @@ public async Task GetFormComponentMetaDataAsync_Should_Return_Metadata_For_Radio
 
             // Assert
             result.ShouldNotBeNull();
-            
-            // Radio component itself is filtered out, but options should be present
-            var radioOption = result.Components.FirstOrDefault(x => x.Key == "s01_RadioGroupComponent-option1");
-            radioOption.ShouldNotBeNull();
-            radioOption.Type.ShouldBe("option");
-            radioOption.Label.ShouldBe("Option 1");
-            radioOption.Path.ShouldBe("s01_RadioGroupComponent->option1");
-            radioOption.TypePath.ShouldBe("radio->option");
-            radioOption.DataPath.ShouldBe("s01_RadioGroupComponent->option1"); // "s01_RadioGroupComponent" is filtered out because it contains "Group"
+            result.Components.Count.ShouldBe(1);
+
+            // Radio group should appear as a single component (not expanded into individual options)
+            var radioGroup = result.Components.FirstOrDefault(x => x.Key == "s01_RadioGroupComponent");
+            radioGroup.ShouldNotBeNull();
+            radioGroup.Type.ShouldBe("radio");
+            radioGroup.Label.ShouldBe("Select One");
+            radioGroup.Path.ShouldBe("s01_RadioGroupComponent");
+            radioGroup.TypePath.ShouldBe("radio");
+            radioGroup.DataPath.ShouldBe("s01_RadioGroupComponent");
         }
 
         [Fact]
@@ -210,12 +211,13 @@ public async Task GetFormComponentMetaDataAsync_Should_Return_Metadata_For_All_R
 
             // Assert
             result.ShouldNotBeNull();
-            result.Components.Count.ShouldBe(3); // Only 3 options (radio group is filtered out)
-            
-            // Check that we have the expanded options
-            result.Components.ShouldContain(x => x.Key == "preferredContact-email" && x.Type == "option");
-            result.Components.ShouldContain(x => x.Key == "preferredContact-phone" && x.Type == "option");
-            result.Components.ShouldContain(x => x.Key == "preferredContact-mail" && x.Type == "option");
+            result.Components.Count.ShouldBe(1); // Single radio group entry (not expanded into individual options)
+
+            // Radio stores a single selected value, so only one component for the group
+            var radioGroup = result.Components.FirstOrDefault(x => x.Key == "preferredContact");
+            radioGroup.ShouldNotBeNull();
+            radioGroup.Type.ShouldBe("radio");
+            radioGroup.Label.ShouldBe("Preferred Contact Method");
         }
 
         [Fact]

From d6a5226a22c7d917069dbc5ebf3043766865d99b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 25 Mar 2026 08:41:21 -0700
Subject: [PATCH 29/38] AB#32012 clean remaining AI sonar helpers

---
 ...enerateApplicationAnalysisBackgroundJob.cs |   1 -
 .../GenerateAttachmentSummaryBackgroundJob.cs |   1 -
 .../Pages/GrantApplications/Details.js        | 108 +++++++++---------
 3 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
index b4dfe07523..e9bd6ee84b 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateApplicationAnalysisBackgroundJob.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using System;
 using System.Threading.Tasks;
 using Unity.GrantManager.AI.Operations;
 using Volo.Abp.BackgroundJobs;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
index 7ecdf09249..ed6a1ebd91 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/AI/BackgroundJobs/GenerateAttachmentSummaryBackgroundJob.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using System;
 using System.Threading.Tasks;
 using Unity.GrantManager.AI.Operations;
 using Volo.Abp.BackgroundJobs;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index ea96c8edfb..35066d5b01 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -89,6 +89,60 @@ function getAttachmentSummaryValue(attachment) {
     return attachment?.aiSummary ?? attachment?.aISummary ?? '';
 }
 
+function formatAttachmentSummaryBody(attachments) {
+    if (!Array.isArray(attachments) || attachments.length === 0) {
+        return '';
+    }
+
+    const summarizedAttachments = attachments.filter(
+        (attachment) => {
+            const summary = getAttachmentSummaryValue(attachment);
+            return summary && summary.trim() !== '';
+        }
+    );
+
+    if (summarizedAttachments.length === 0) {
+        return '';
+    }
+
+    return summarizedAttachments.map(function(attachment) {
+        const summary = getAttachmentSummaryValue(attachment);
+        return [
+            'NAME:',
+            attachment.fileName || '',
+            '',
+            'SUMMARY:',
+            summary
+        ].join('\n');
+    }).join('\n\n----------------------------------------\n\n');
+}
+
+function formatAttachmentSummaryJson(attachments) {
+    if (!Array.isArray(attachments) || attachments.length === 0) {
+        return '';
+    }
+
+    const summarizedAttachments = attachments
+        .map((attachment) => {
+            const summary = getAttachmentSummaryValue(attachment);
+            if (!summary || summary.trim() === '') {
+                return null;
+            }
+
+            return {
+                name: attachment.fileName || '',
+                summary
+            };
+        })
+        .filter((attachment) => attachment !== null);
+
+    if (summarizedAttachments.length === 0) {
+        return '';
+    }
+
+    return JSON.stringify(summarizedAttachments, null, 2);
+}
+
 $(function () {
     const excludedPromptDataKeys = new Set([
         'simplefile',
@@ -236,60 +290,6 @@ $(function () {
         return attachmentBody;
     }
 
-    function formatAttachmentSummaryBody(attachments) {
-        if (!Array.isArray(attachments) || attachments.length === 0) {
-            return '';
-        }
-
-        const summarizedAttachments = attachments.filter(
-            (attachment) => {
-                const summary = getAttachmentSummaryValue(attachment);
-                return summary && summary.trim() !== '';
-            }
-        );
-
-        if (summarizedAttachments.length === 0) {
-            return '';
-        }
-
-        return summarizedAttachments.map(function(attachment) {
-            const summary = getAttachmentSummaryValue(attachment);
-            return [
-                'NAME:',
-                attachment.fileName || '',
-                '',
-                'SUMMARY:',
-                summary
-            ].join('\n');
-        }).join('\n\n----------------------------------------\n\n');
-    }
-
-    function formatAttachmentSummaryJson(attachments) {
-        if (!Array.isArray(attachments) || attachments.length === 0) {
-            return '';
-        }
-
-        const summarizedAttachments = attachments
-            .map((attachment) => {
-                const summary = getAttachmentSummaryValue(attachment);
-                if (!summary || summary.trim() === '') {
-                    return null;
-                }
-
-                return {
-                    name: attachment.fileName || '',
-                    summary
-                };
-            })
-            .filter((attachment) => attachment !== null);
-
-        if (summarizedAttachments.length === 0) {
-            return '';
-        }
-
-        return JSON.stringify(summarizedAttachments, null, 2);
-    }
-
     function loadDevAiOutputs() {
         const applicationId = $('#DetailsViewApplicationId').val();
 

From 4379b2d557eceabfd2e3d999961e83fa1a43417d Mon Sep 17 00:00:00 2001
From: "Todosichuk, Daryl JEDI:EX" <Daryl.Todosichuk@gov.bc.ca>
Date: Wed, 25 Mar 2026 09:09:10 -0700
Subject: [PATCH 30/38] AB#32449 Remove secret like text from cypress README.md
 file

---
 applications/Unity.AutoUI/cypress/scripts/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.AutoUI/cypress/scripts/README.md b/applications/Unity.AutoUI/cypress/scripts/README.md
index 528f451a64..ce63c13c27 100644
--- a/applications/Unity.AutoUI/cypress/scripts/README.md
+++ b/applications/Unity.AutoUI/cypress/scripts/README.md
@@ -42,7 +42,7 @@ Add or update the token in `cypress.env.json`:
 
 ```json
 {
-  "CHEFS_AUTH_TOKEN": "Bearer eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9..."
+  "CHEFS_AUTH_TOKEN": "Bearer *..."
 }
 ```
 

From 3c2da53b0c778247d828df7991371913ec048d0e Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 25 Mar 2026 11:32:26 -0700
Subject: [PATCH 31/38] AB#32012 remove misleading AI dev output version label

---
 .../Unity.GrantManager.Web/Pages/GrantApplications/Details.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
index 35066d5b01..efac448661 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js
@@ -32,9 +32,7 @@ function formatOutputBody(title, sections) {
         return '';
     }
 
-    const promptVersion = globalThis.getSelectedPromptVersion?.();
-    const header = promptVersion ? `${title} - ${promptVersion}` : title;
-    return `${header}\n\n${content}`;
+    return `${title}\n\n${content}`;
 }
 
 function unwrapWhenResult(result) {

From b080f86c0dedc064cfd4980f7e759c2b4f3c9312 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 25 Mar 2026 13:55:44 -0700
Subject: [PATCH 32/38] AB#27730: Worksheet Deletion

---
 .../Permissions/FlexPermissions.cs            |  8 ++-
 .../Worksheets/IWorksheetAppService.cs        |  1 +
 .../Worksheets/WorksheetLinkedFormsDto.cs     | 11 ++++
 .../IWorksheetInstanceRepository.cs           |  1 +
 .../WorksheetInstanceRepository.cs            | 19 +++++--
 .../FlexPermissionDefinitionProvider.cs       | 13 +++++
 .../Worksheets/WorksheetAppService.cs         | 38 +++++++++++++-
 .../Localization/Flex/en.json                 |  4 +-
 .../Components/WorksheetWidget/Default.cshtml |  7 +++
 .../Components/WorksheetWidget/Worksheet.js   | 52 +++++++++++++++++++
 .../IWorksheetConfigurationAppService.cs      | 10 ++++
 .../WorksheetDeletionCheckDto.cs              |  9 ++++
 .../WorksheetConfigurationAppService.cs       | 46 ++++++++++++++++
 .../Permissions/PermissionGrantsDataSeeder.cs |  4 +-
 14 files changed, 214 insertions(+), 9 deletions(-)
 rename applications/Unity.GrantManager/modules/Unity.Flex/src/{Unity.Flex.Application => Unity.Flex.Application.Contracts}/Permissions/FlexPermissions.cs (54%)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/WorksheetLinkedFormsDto.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IWorksheetConfigurationAppService.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/WorksheetDeletionCheckDto.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/WorksheetConfigurationAppService.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissions.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Permissions/FlexPermissions.cs
similarity index 54%
rename from applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissions.cs
rename to applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Permissions/FlexPermissions.cs
index 606d213668..efb26fabfe 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Permissions/FlexPermissions.cs
@@ -1,4 +1,4 @@
-using Volo.Abp.Reflection;
+using Volo.Abp.Reflection;
 
 namespace Unity.Flex.Permissions;
 
@@ -6,6 +6,12 @@ public static class FlexPermissions
 {
     public const string GroupName = "Flex";
 
+    public static class Worksheets
+    {
+        public const string Default = GroupName + ".Worksheets";
+        public const string Delete  = GroupName + ".Worksheets.Delete";
+    }
+
     public static string[] GetAll()
     {
         return ReflectionHelper.GetPublicConstantsRecursively(typeof(FlexPermissions));
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/IWorksheetAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/IWorksheetAppService.cs
index e36f44c45a..13f1168010 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/IWorksheetAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/IWorksheetAppService.cs
@@ -17,6 +17,7 @@ public interface IWorksheetAppService : IApplicationService
         Task<WorksheetDto> CloneAsync(Guid id);
         Task<bool> PublishAsync(Guid id);
         Task DeleteAsync(Guid id);
+        Task<WorksheetLinkedFormsDto> GetLinkedFormsAsync(Guid worksheetId);
         Task ResequenceSectionsAsync(Guid id, uint oldIndex, uint newIndex);
         Task<bool> ExistsAsync(Guid worksheetId);
         Task<ExportWorksheetDto> ExportWorksheet(Guid worksheetId);
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/WorksheetLinkedFormsDto.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/WorksheetLinkedFormsDto.cs
new file mode 100644
index 0000000000..59be5e4b47
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application.Contracts/Worksheets/WorksheetLinkedFormsDto.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+
+namespace Unity.Flex.Worksheets
+{
+    public class WorksheetLinkedFormsDto
+    {
+        public List<Guid> FormVersionIdsWithInstances { get; set; } = [];
+        public List<Guid> LinkedFormVersionIds { get; set; } = [];
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs
index b60d3f98c7..4201df50ed 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Domain/WorksheetInstances/IWorksheetInstanceRepository.cs
@@ -11,5 +11,6 @@ public interface IWorksheetInstanceRepository : IBasicRepository<WorksheetInstan
         Task<List<WorksheetInstance>> GetByWorksheetCorrelationAsync(Guid worksheetId, string uiAnchor, Guid worksheetCorrelationId, string worksheetCorrelationProvider);
         Task<WorksheetInstance?> GetWithValuesAsync(Guid worksheetInstanceId);
         Task<bool> ExistsAsync(Guid worksheetId, Guid instanceCorrelationId, string instanceCorrelationProvider, Guid sheetCorrelationId, string sheetCorrelationProvider, string? uiAnchor);
+        Task<bool> AnyByWorksheetAndFormVersionAsync(Guid worksheetId, Guid formVersionId);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs
index ee92456a11..71edcca8b6 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/EntityFrameworkCore/Repositories/WorksheetInstanceRepository.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Unity.Flex.Domain.WorksheetInstances;
+using Unity.Modules.Shared.Correlation;
 using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 
@@ -50,11 +51,11 @@ public async Task<List<WorksheetInstance>> GetByWorksheetCorrelationAsync(Guid w
                 .FirstOrDefaultAsync(wi => wi.Id == worksheetInstanceId);
         }
 
-        public async Task<bool> ExistsAsync(Guid worksheetId, 
-            Guid instanceCorrelationId, 
-            string instanceCorrelationProvider, 
-            Guid sheetCorrelationId, 
-            string sheetCorrelationProvider, 
+        public async Task<bool> ExistsAsync(Guid worksheetId,
+            Guid instanceCorrelationId,
+            string instanceCorrelationProvider,
+            Guid sheetCorrelationId,
+            string sheetCorrelationProvider,
             string? uiAnchor)
         {
             var dbSet = await GetDbSetAsync();
@@ -67,5 +68,13 @@ public async Task<bool> ExistsAsync(Guid worksheetId,
                     && s.WorksheetCorrelationProvider == sheetCorrelationProvider
                     && s.UiAnchor == uiAnchor);
         }
+
+        public async Task<bool> AnyByWorksheetAndFormVersionAsync(Guid worksheetId, Guid formVersionId)
+        {
+            var dbSet = await GetDbSetAsync();
+            return await dbSet.AnyAsync(s => s.WorksheetId == worksheetId
+                && s.WorksheetCorrelationId == formVersionId
+                && s.WorksheetCorrelationProvider == CorrelationConsts.FormVersion);
+        }
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissionDefinitionProvider.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissionDefinitionProvider.cs
index 07d9f99706..f60eeac426 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissionDefinitionProvider.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Permissions/FlexPermissionDefinitionProvider.cs
@@ -9,6 +9,19 @@ public class FlexPermissionDefinitionProvider : PermissionDefinitionProvider
     public override void Define(IPermissionDefinitionContext context)
     {
         context.AddGroup(FlexPermissions.GroupName, L("Permission:Flex"));
+
+        var settingsMgmt = context.GetGroupOrNull("SettingManagement");
+        if (settingsMgmt != null)
+        {
+            var configureWorksheet = settingsMgmt.AddPermission(
+                FlexPermissions.Worksheets.Default,
+                L("Permission:Flex.Worksheets")
+            );
+            configureWorksheet.AddChild(
+                FlexPermissions.Worksheets.Delete,
+                L("Permission:Flex.Worksheets.Delete")
+            );
+        }
     }
 
     private static LocalizableString L(string name)
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs
index 47114d2e2e..45ee8efcb8 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs
@@ -7,8 +7,12 @@
 using Unity.Flex.Domain.Services;
 using Unity.Flex.Domain.Settings;
 using Unity.Flex.Domain.Utils;
+using Unity.Flex.Domain.WorksheetInstances;
+using Unity.Flex.Domain.WorksheetLinks;
 using Unity.Flex.Domain.Worksheets;
+using Unity.Flex.Permissions;
 using Unity.Flex.Reporting.FieldGenerators;
+using Unity.Modules.Shared.Correlation;
 using Unity.Modules.Shared.Features;
 using Volo.Abp;
 using Volo.Abp.Features;
@@ -19,7 +23,9 @@ namespace Unity.Flex.Worksheets
     public partial class WorksheetAppService(IWorksheetRepository worksheetRepository,
         WorksheetsManager worksheetsManager,
         IReportingFieldsGeneratorService<Worksheet> reportingFieldsGeneratorService,
-        IFeatureChecker featureChecker) : FlexAppService, IWorksheetAppService
+        IFeatureChecker featureChecker,
+        IWorksheetLinkRepository worksheetLinkRepository,
+        IWorksheetInstanceRepository worksheetInstanceRepository) : FlexAppService, IWorksheetAppService
     {
         public virtual async Task<WorksheetDto> GetAsync(Guid id)
         {
@@ -118,11 +124,41 @@ public virtual async Task<bool> PublishAsync(Guid id)
             return await Task.FromResult(true);
         }
 
+        [Authorize(FlexPermissions.Worksheets.Delete)]
         public virtual async Task DeleteAsync(Guid id)
         {
+            var linkedForms = await GetLinkedFormsAsync(id);
+
+            if (linkedForms.FormVersionIdsWithInstances.Count > 0)
+            {
+                throw new UserFriendlyException("This worksheet cannot be deleted because it has existing instances.");
+            }
+
+            if (linkedForms.LinkedFormVersionIds.Count > 0)
+            {
+                throw new UserFriendlyException("This worksheet cannot be deleted because it is still linked to one or more forms. Unlink it first.");
+            }
+
             await worksheetRepository.DeleteAsync(id);
         }
 
+        public virtual async Task<WorksheetLinkedFormsDto> GetLinkedFormsAsync(Guid worksheetId)
+        {
+            var links = await worksheetLinkRepository.GetListByWorksheetAsync(worksheetId, CorrelationConsts.FormVersion);
+            var result = new WorksheetLinkedFormsDto();
+
+            foreach (var link in links)
+            {
+                bool hasInstances = await worksheetInstanceRepository.AnyByWorksheetAndFormVersionAsync(worksheetId, link.CorrelationId);
+                if (hasInstances)
+                    result.FormVersionIdsWithInstances.Add(link.CorrelationId);
+                else
+                    result.LinkedFormVersionIds.Add(link.CorrelationId);
+            }
+
+            return result;
+        }
+
         public virtual async Task ResequenceSectionsAsync(Guid id, uint oldIndex, uint newIndex)
         {
             if (oldIndex == newIndex) return;
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json
index 9f34865060..c615f56148 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Shared/Localization/Flex/en.json
@@ -34,6 +34,8 @@
     "Worksheet:Configuration:AddColumnOptionText": "Add Column",
     "DataGrids:DynamicColumnsHeader": "Dynamic Columns",
     "DataGrids:CustomColumnsHeader": "Custom Columns",
-    "DataGrids:PredefinedColumn": "Predefined column"
+    "DataGrids:PredefinedColumn": "Predefined column",
+    "Permission:Flex.Worksheets": "Configure Worksheet",
+    "Permission:Flex.Worksheets.Delete": "Delete Worksheet"
   }
 }
\ No newline at end of file
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Default.cshtml
index 9a8fc69136..7455e7ae1e 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Default.cshtml
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Default.cshtml
@@ -1,5 +1,6 @@
 @using Microsoft.AspNetCore.Mvc.Localization
 @using Unity.Flex.Localization;
+@using Unity.Flex.Permissions;
 @using Unity.Flex.Web.Views.Shared.Components.Worksheets;
 @using Volo.Abp.Authorization.Permissions;
 
@@ -31,6 +32,12 @@
             <button data-worksheet-id="@worksheet.Id" data-worksheet-title="@worksheet.Title" data-worksheet-name="@worksheet.Name" class="btn btn-light export-worksheet-btn worksheet-btn" type="button">
                 <i class="fl fl-export"></i> <span>@L["Worksheet:Configuration:ExportWorksheetButtonText"].Value</span>
             </button>
+            @if (await PermissionChecker.IsGrantedAsync(FlexPermissions.Worksheets.Delete))
+            {
+                <button data-worksheet-id="@worksheet.Id" data-worksheet-title="@worksheet.Title" data-worksheet-name="@worksheet.Name" class="btn btn-light delete-worksheet-btn worksheet-btn" type="button">
+                    <i class="fl fl-delete"></i> <span>@L["Worksheet:Configuration:DeleteWorksheetButtonText"].Value</span>
+                </button>
+            }
         </div>
     </div>
 
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
index 0177fdd53a..8b4bf1ea84 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
@@ -79,6 +79,15 @@ $(function () {
             });
         }
 
+        let deleteWorksheetButtons = $(".delete-worksheet-btn");
+
+        if (deleteWorksheetButtons) {
+            deleteWorksheetButtons.on("click", function (event) {
+                let btn = event.currentTarget;
+                handleDeleteWorksheet(btn.dataset.worksheetId, btn.dataset.worksheetTitle, btn.dataset.worksheetName);
+            });
+        }
+
         setupTooltips();
     }
 
@@ -112,6 +121,49 @@ $(function () {
             });
     }
 
+    function handleDeleteWorksheet(worksheetId, worksheetTitle, worksheetName) {
+        unity.grantManager.settingManagement.worksheetConfiguration.getDeletionCheck(worksheetId)
+            .done(function (result) {
+                if (result.blockingFormNames && result.blockingFormNames.length > 0) {
+                    abp.message.error(
+                        'This worksheet cannot be deleted because it is already used by the following forms:\n' + result.blockingFormNames.join('\n'),
+                        'Delete Worksheet'
+                    );
+                } else if (result.linkedFormNames && result.linkedFormNames.length > 0) {
+                    abp.message.error(
+                        'Unlink the worksheet (' + worksheetTitle + ' \u2013 ' + worksheetName + ') from the following forms before deletion:\n' + result.linkedFormNames.join('\n'),
+                        'Delete Worksheet'
+                    );
+                } else {
+                    abp.message.confirm(
+                        'Are you sure you want to delete the worksheet "' + worksheetTitle + '"?',
+                        'Delete Worksheet',
+                        function (confirmed) {
+                            if (confirmed) {
+                                executeWorksheetDelete(worksheetId);
+                            }
+                        }
+                    );
+                }
+            })
+            .fail(function (e) {
+                abp.notify.error('Failed to check worksheet deletion status.');
+                console.warn('Worksheet deletion check failed:', e);
+            });
+    }
+
+    function executeWorksheetDelete(worksheetId) {
+        unity.flex.worksheets.worksheet.delete(worksheetId)
+            .done(function () {
+                PubSub.publish('refresh_worksheet_list', { worksheetId: worksheetId, action: 'Delete' });
+                abp.notify.success('Worksheet deleted successfully.', 'Delete Worksheet');
+            })
+            .fail(function (e) {
+                abp.notify.error('Failed to delete worksheet.');
+                console.warn('Worksheet deletion failed:', e);
+            });
+    }
+
     function openEditWorksheetModal(worksheetId) {
         editWorksheetModal.open({
             worksheetId: worksheetId,
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IWorksheetConfigurationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IWorksheetConfigurationAppService.cs
new file mode 100644
index 0000000000..05b0159aec
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/IWorksheetConfigurationAppService.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace Unity.GrantManager.SettingManagement;
+
+public interface IWorksheetConfigurationAppService : IApplicationService
+{
+    Task<WorksheetDeletionCheckDto> GetDeletionCheckAsync(Guid worksheetId);
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/WorksheetDeletionCheckDto.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/WorksheetDeletionCheckDto.cs
new file mode 100644
index 0000000000..0ff346c41b
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/SettingManagement/WorksheetDeletionCheckDto.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Unity.GrantManager.SettingManagement;
+
+public class WorksheetDeletionCheckDto
+{
+    public List<string> BlockingFormNames { get; set; } = [];
+    public List<string> LinkedFormNames { get; set; } = [];
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/WorksheetConfigurationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/WorksheetConfigurationAppService.cs
new file mode 100644
index 0000000000..eaf409470f
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/SettingManagement/WorksheetConfigurationAppService.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using Unity.Flex.Worksheets;
+using Unity.GrantManager.Applications;
+
+namespace Unity.GrantManager.SettingManagement;
+
+public class WorksheetConfigurationAppService(
+    IWorksheetAppService worksheetAppService,
+    IApplicationFormVersionRepository formVersionRepository,
+    IApplicationFormRepository formRepository
+) : GrantManagerAppService, IWorksheetConfigurationAppService
+{
+    public async Task<WorksheetDeletionCheckDto> GetDeletionCheckAsync(Guid worksheetId)
+    {
+        var linkedForms = await worksheetAppService.GetLinkedFormsAsync(worksheetId);
+        var result = new WorksheetDeletionCheckDto();
+
+        foreach (var formVersionId in linkedForms.FormVersionIdsWithInstances)
+        {
+            var formName = await ResolveFormNameAsync(formVersionId);
+            result.BlockingFormNames.Add(formName);
+        }
+
+        foreach (var formVersionId in linkedForms.LinkedFormVersionIds)
+        {
+            var formName = await ResolveFormNameAsync(formVersionId);
+            result.LinkedFormNames.Add(formName);
+        }
+
+        return result;
+    }
+
+    private async Task<string> ResolveFormNameAsync(Guid formVersionId)
+    {
+        var formVersion = await formVersionRepository.FindAsync(formVersionId);
+        if (formVersion == null) return formVersionId.ToString();
+
+        var form = await formRepository.FindAsync(formVersion.ApplicationFormId);
+        if (form == null) return formVersionId.ToString();
+
+        return formVersion.Version.HasValue
+            ? $"{form.ApplicationFormName} – v{formVersion.Version}"
+            : $"{form.ApplicationFormName}";
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
index a4e280e487..490d2bd65d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain/Permissions/PermissionGrantsDataSeeder.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Unity.Flex.Permissions;
 using Unity.GrantManager.Identity;
 using Unity.Modules.Shared;
 using Unity.Notifications.Permissions;
@@ -131,7 +132,8 @@ await _permissionDataSeeder.SeedAsync(RolePermissionValueProvider.ProviderName,
                     UnitySelector.Payment.Supplier.Update,
                     .. Notifications_CommonPermissions,
                     .. Dashboard_CommonPermissions,
-                    .. Tags_CommonPermissions
+                    .. Tags_CommonPermissions,
+                    FlexPermissions.Worksheets.Delete
             ], context.TenantId);
 
             // - Reviewer

From bb5efb1fcd344bd3aaa8bbba695ae7537dfdd21a Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Wed, 25 Mar 2026 13:58:12 -0700
Subject: [PATCH 33/38] feature/AB#32437-EditPrompts

---
 .../Prompts/AIPromptDto.cs                    |   14 +
 .../Prompts/AIPromptVersionDto.cs             |   20 +
 .../Prompts/CreateUpdateAIPromptDto.cs        |   22 +
 .../Prompts/CreateUpdateAIPromptVersionDto.cs |   47 +
 .../Prompts/IAIPromptAppService.cs            |   13 +
 .../Prompts/IAIPromptVersionAppService.cs     |   14 +
 .../AIApplicationAutoMapperProfile.cs         |    8 +-
 .../AIApplicationModule.cs                    |    2 +
 .../DataSeed/AIPromptDataSeeder.cs            |  602 ++++
 .../Unity.AI.Application/Domain/AIPrompt.cs   |   32 +
 .../Domain/AIPromptVersion.cs                 |   50 +
 .../AIDbContextModelCreatingExtensions.cs     |   46 +-
 .../Prompts/AIPromptAppService.cs             |   71 +
 .../Prompts/AIPromptVersionAppService.cs      |   84 +
 .../Localization/AI/en.json                   |   24 +-
 .../src/Unity.AI.Domain.Shared/PromptType.cs  |   10 +
 .../Unity.AI/src/Unity.AI.Web/AIWebModule.cs  |    7 +
 .../Unity.AI.Web/Menus/AIMenuContributor.cs   |   30 +
 .../src/Unity.AI.Web/Menus/AIMenus.cs         |    8 +
 .../Pages/Prompts/CreateModal.cshtml          |   23 +
 .../Pages/Prompts/CreateModal.cshtml.cs       |   30 +
 .../Pages/Prompts/EditModal.cshtml            |   37 +
 .../Pages/Prompts/EditModal.cshtml.cs         |   42 +
 .../Unity.AI.Web/Pages/Prompts/Index.cshtml   |  137 +
 .../Pages/Prompts/Index.cshtml.cs             |    8 +
 .../src/Unity.AI.Web/Pages/Prompts/Index.css  |  122 +
 .../src/Unity.AI.Web/Pages/Prompts/Index.js   |  380 +++
 .../Versions/CreateVersionModal.cshtml        |   23 +
 .../Versions/CreateVersionModal.cshtml.cs     |   35 +
 .../Prompts/Versions/EditVersionModal.cshtml  |   24 +
 .../Versions/EditVersionModal.cshtml.cs       |   50 +
 .../src/Unity.AI.Web/Unity.AI.Web.csproj      |    5 +
 .../AIPromptsWidgetViewComponent.cs           |   13 +
 .../Components/AIPromptsWidget/Default.cshtml |   18 +
 .../Unity.AI.Web/Views/_ViewImports.cshtml    |    4 +
 .../GrantManagerApplicationModule.cs          |    2 +
 .../Unity.GrantManager.Application.csproj     |    1 +
 .../GrantManagerDbMigratorModule.cs           |    6 +-
 .../Unity.GrantManager.DbMigrator.csproj      |    1 +
 .../GrantManagerDbContext.cs                  |  154 +-
 .../GrantTenantDbContext.cs                   |    1 -
 ...260324221338_AddAIPromptTables.Designer.cs | 3030 +++++++++++++++++
 .../20260324221338_AddAIPromptTables.cs       |   98 +
 .../GrantManagerDbContextModelSnapshot.cs     |  164 +-
 44 files changed, 5428 insertions(+), 84 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/PromptType.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenus.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.css
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/AIPromptsWidgetViewComponent.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/_ViewImports.cshtml
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.Designer.cs
 create mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs
new file mode 100644
index 0000000000..0bdff63a08
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptDto.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.AI.Prompts;
+
+public class AIPromptDto : AuditedEntityDto<Guid>
+{
+    public string Name { get; set; } = string.Empty;
+    public string? Description { get; set; }
+    public PromptType Type { get; set; }
+    public bool IsActive { get; set; }
+    public List<AIPromptVersionDto> Versions { get; set; } = new();
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs
new file mode 100644
index 0000000000..a9ed4e50a8
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/AIPromptVersionDto.cs
@@ -0,0 +1,20 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Unity.AI.Prompts;
+
+public class AIPromptVersionDto : AuditedEntityDto<Guid>
+{
+    public Guid PromptId { get; set; }
+    public int VersionNumber { get; set; }
+    public string SystemPrompt { get; set; } = string.Empty;
+    public string UserPromptTemplate { get; set; } = string.Empty;
+    public string? DeveloperNotes { get; set; }
+    public string? TargetModel { get; set; }
+    public string? TargetProvider { get; set; }
+    public double Temperature { get; set; }
+    public int? MaxTokens { get; set; }
+    public bool IsPublished { get; set; }
+    public bool IsDeprecated { get; set; }
+    public string? MetadataJson { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs
new file mode 100644
index 0000000000..6d361fd3ba
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptDto.cs
@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace Unity.AI.Prompts;
+
+public class CreateUpdateAIPromptDto
+{
+    [Required]
+    [MaxLength(200)]
+    [DisplayName("PromptName")]
+    public string Name { get; set; } = string.Empty;
+
+    [MaxLength(2000)]
+    [DisplayName("PromptDescription")]
+    public string? Description { get; set; }
+
+    [DisplayName("PromptType")]
+    public PromptType Type { get; set; }
+
+    [DisplayName("PromptIsActive")]
+    public bool IsActive { get; set; } = true;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs
new file mode 100644
index 0000000000..8e3414943f
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/CreateUpdateAIPromptVersionDto.cs
@@ -0,0 +1,47 @@
+using System;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace Unity.AI.Prompts;
+
+public class CreateUpdateAIPromptVersionDto
+{
+    public Guid PromptId { get; set; }
+
+    [DisplayName("VersionNumber")]
+    public int VersionNumber { get; set; }
+
+    [Required]
+    [DisplayName("SystemPrompt")]
+    public string SystemPrompt { get; set; } = string.Empty;
+
+    [Required]
+    [DisplayName("UserPromptTemplate")]
+    public string UserPromptTemplate { get; set; } = string.Empty;
+
+    [DisplayName("DeveloperNotes")]
+    public string? DeveloperNotes { get; set; }
+
+    [MaxLength(100)]
+    [DisplayName("TargetModel")]
+    public string? TargetModel { get; set; }
+
+    [MaxLength(100)]
+    [DisplayName("TargetProvider")]
+    public string? TargetProvider { get; set; }
+
+    [DisplayName("Temperature")]
+    public double Temperature { get; set; } = 0.2;
+
+    [DisplayName("MaxTokens")]
+    public int? MaxTokens { get; set; }
+
+    [DisplayName("IsPublished")]
+    public bool IsPublished { get; set; }
+
+    [DisplayName("IsDeprecated")]
+    public bool IsDeprecated { get; set; }
+
+    [DisplayName("MetadataJson")]
+    public string? MetadataJson { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs
new file mode 100644
index 0000000000..c259996db0
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptAppService.cs
@@ -0,0 +1,13 @@
+using System;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Unity.AI.Prompts;
+
+public interface IAIPromptAppService : ICrudAppService<
+    AIPromptDto,
+    Guid,
+    PagedAndSortedResultRequestDto,
+    CreateUpdateAIPromptDto>
+{
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs
new file mode 100644
index 0000000000..269029e5ec
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Prompts/IAIPromptVersionAppService.cs
@@ -0,0 +1,14 @@
+using System;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+
+namespace Unity.AI.Prompts;
+
+public interface IAIPromptVersionAppService : ICrudAppService<
+    AIPromptVersionDto,
+    Guid,
+    PagedAndSortedResultRequestDto,
+    CreateUpdateAIPromptVersionDto>
+{
+    System.Threading.Tasks.Task<ListResultDto<AIPromptVersionDto>> GetByPromptAsync(Guid promptId);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs
index 874ac789db..382fcee837 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationAutoMapperProfile.cs
@@ -1,4 +1,6 @@
 using AutoMapper;
+using Unity.AI.Domain;
+using Unity.AI.Prompts;
 
 namespace Unity.AI;
 
@@ -6,6 +8,10 @@ public class AIApplicationAutoMapperProfile : Profile
 {
     public AIApplicationAutoMapperProfile()
     {
-        // Define AutoMapper mappings here as entities and DTOs are introduced
+        CreateMap<AIPrompt, AIPromptDto>();
+        CreateMap<CreateUpdateAIPromptDto, AIPrompt>(MemberList.None);
+
+        CreateMap<AIPromptVersion, AIPromptVersionDto>();
+        CreateMap<CreateUpdateAIPromptVersionDto, AIPromptVersion>(MemberList.None);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs
index 60974f22b4..6c9b4cc5b6 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AIApplicationModule.cs
@@ -52,5 +52,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         {
             options.ConventionalControllers.Create(typeof(AIApplicationModule).Assembly);
         });
+
+        context.Services.AddAssemblyOf<AIApplicationModule>();
     }
 }
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
new file mode 100644
index 0000000000..b0ed0cb959
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/DataSeed/AIPromptDataSeeder.cs
@@ -0,0 +1,602 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.AI.DataSeed;
+
+/// <summary>
+/// Seeds the built-in AI prompts (analysis, attachment, scoresheet) into the host database.
+/// Each prompt is seeded with two versions — v0 (original single-file prompts) and v1 (modular
+/// prompts with separate rubric, score, output, and rules sections stored in MetadataJson).
+/// The seeder is idempotent: it checks by fixed GUID before inserting.
+/// </summary>
+public class AIPromptDataSeeder(
+    IRepository<AIPrompt, Guid> promptRepository,
+    IRepository<AIPromptVersion, Guid> versionRepository) : IDataSeedContributor, ITransientDependency
+{
+    // Fixed deterministic GUIDs — never change these; they ensure idempotent re-seeding
+    private static readonly Guid AnalysisPromptId   = new("4a100001-1000-4000-a000-000000000001");
+    private static readonly Guid AttachmentPromptId = new("4a100001-1000-4000-a000-000000000002");
+    private static readonly Guid ScoresheetPromptId = new("4a100001-1000-4000-a000-000000000003");
+
+    public async Task SeedAsync(DataSeedContext context)
+    {
+        if (context.TenantId != null) return; // host database only
+
+        await SeedAnalysisPromptAsync();
+        await SeedAttachmentPromptAsync();
+        await SeedScoresheetPromptAsync();
+    }
+
+    // ─── ANALYSIS ────────────────────────────────────────────────────────────
+
+    private async Task SeedAnalysisPromptAsync()
+    {
+        if (await promptRepository.AnyAsync(p => p.Id == AnalysisPromptId)) return;
+
+        await promptRepository.InsertAsync(new AIPrompt(AnalysisPromptId, "analysis", PromptType.Skill)
+        {
+            Description = "Grant application analysis and review",
+            IsActive = true
+        });
+
+        await versionRepository.InsertAsync(new AIPromptVersion(
+            Guid.CreateVersion7(), AnalysisPromptId, 0,
+            AnalysisSystemV0, AnalysisUserV0)
+        {
+            DeveloperNotes = "v0 — initial single-file analysis prompt",
+            IsPublished = true
+        });
+
+        await versionRepository.InsertAsync(new AIPromptVersion(
+            Guid.CreateVersion7(), AnalysisPromptId, 1,
+            AnalysisSystemV1, AnalysisUserV1)
+        {
+            DeveloperNotes = "v1 — modular prompt with separate rubric, score, output, and rules sections",
+            IsPublished = true,
+            MetadataJson = BuildSections(
+                rubric: AnalysisRubric,
+                score: AnalysisScore,
+                output: AnalysisOutput,
+                rules: AnalysisRules,
+                commonRules: CommonRules)
+        });
+    }
+
+    // ─── ATTACHMENT ───────────────────────────────────────────────────────────
+
+    private async Task SeedAttachmentPromptAsync()
+    {
+        if (await promptRepository.AnyAsync(p => p.Id == AttachmentPromptId)) return;
+
+        await promptRepository.InsertAsync(new AIPrompt(AttachmentPromptId, "attachment", PromptType.Skill)
+        {
+            Description = "Attachment summarization for grant review",
+            IsActive = true
+        });
+
+        await versionRepository.InsertAsync(new AIPromptVersion(
+            Guid.CreateVersion7(), AttachmentPromptId, 0,
+            AttachmentSystemV0, AttachmentUserV0)
+        {
+            DeveloperNotes = "v0 — initial single-file attachment prompt",
+            IsPublished = true
+        });
+
+        await versionRepository.InsertAsync(new AIPromptVersion(
+            Guid.CreateVersion7(), AttachmentPromptId, 1,
+            AttachmentSystemV1, AttachmentUserV1)
+        {
+            DeveloperNotes = "v1 — modular prompt with separate output and rules sections",
+            IsPublished = true,
+            MetadataJson = BuildSections(
+                output: AttachmentOutput,
+                rules: AttachmentRules,
+                commonRules: CommonRules)
+        });
+    }
+
+    // ─── SCORESHEET ───────────────────────────────────────────────────────────
+
+    private async Task SeedScoresheetPromptAsync()
+    {
+        if (await promptRepository.AnyAsync(p => p.Id == ScoresheetPromptId)) return;
+
+        await promptRepository.InsertAsync(new AIPrompt(ScoresheetPromptId, "scoresheet", PromptType.Skill)
+        {
+            Description = "Scoresheet section answering assistant",
+            IsActive = true
+        });
+
+        await versionRepository.InsertAsync(new AIPromptVersion(
+            Guid.CreateVersion7(), ScoresheetPromptId, 0,
+            ScoresheetSystemV0, ScoresheetUserV0)
+        {
+            DeveloperNotes = "v0 — initial single-file scoresheet prompt",
+            IsPublished = true
+        });
+
+        await versionRepository.InsertAsync(new AIPromptVersion(
+            Guid.CreateVersion7(), ScoresheetPromptId, 1,
+            ScoresheetSystemV1, ScoresheetUserV1)
+        {
+            DeveloperNotes = "v1 — modular prompt with separate output and rules sections",
+            IsPublished = true,
+            MetadataJson = BuildSections(
+                output: ScoresheetOutput,
+                rules: ScoresheetRules,
+                commonRules: CommonRules)
+        });
+    }
+
+    // ─── HELPERS ──────────────────────────────────────────────────────────────
+
+    private static string BuildSections(
+        string? rubric = null, string? score = null,
+        string? output = null, string? rules = null, string? commonRules = null)
+    {
+        var dict = new Dictionary<string, string>();
+        if (rubric != null)      dict["RUBRIC"]       = rubric;
+        if (score != null)       dict["SCORE"]        = score;
+        if (output != null)      dict["OUTPUT"]       = output;
+        if (rules != null)       dict["RULES"]        = rules;
+        if (commonRules != null) dict["COMMON_RULES"] = commonRules;
+        return JsonSerializer.Serialize(new { sections = dict });
+    }
+
+    // ═════════════════════════════════════════════════════════════════════════
+    // PROMPT CONTENT — mirrors AI/Prompts/Versions/ text files verbatim
+    // ═════════════════════════════════════════════════════════════════════════
+
+    // ── v0/analysis.system.txt ───────────────────────────────────────────────
+    private const string AnalysisSystemV0 = """
+        You are an expert grant application reviewer for the BC Government.
+
+        Conduct a thorough, comprehensive analysis across all rubric areas. Identify substantive issues, concerns, and opportunities for improvement.
+
+        Classify findings by their effect on the application's quality and fundability:
+        - ERRORS: important missing information, significant gaps, compliance issues, or major concerns affecting eligibility
+        - WARNINGS: areas needing clarification, moderate issues, or concerns that should be addressed
+        - SUMMARIES: concise reviewer-facing recommendations or follow-up considerations
+
+        Evaluate content quality, clarity, and appropriateness. Be thorough but fair and avoid nitpicking.
+
+        Respond only with valid JSON in the exact format requested.
+        """;
+
+    // ── v0/analysis.user.txt ─────────────────────────────────────────────────
+    private const string AnalysisUserV0 = """
+        APPLICATION CONTENT:
+        {{DATA}}
+
+        ATTACHMENT SUMMARIES:
+        {{ATTACHMENTS}}
+
+        FORM FIELD CONFIGURATION:
+        {{SCHEMA}}
+
+        MANDATORY FIELDS:
+        - Determine mandatory fields from FORM FIELD CONFIGURATION.
+        - Report missing mandatory fields as findings when they materially affect review quality.
+
+        OPTIONAL FIELDS (may be left blank):
+        - Determine optional fields from FORM FIELD CONFIGURATION.
+        - Do not flag optional fields when blank unless they materially weaken rubric evidence.
+
+        EVALUATION RUBRIC:
+        BC GOVERNMENT GRANT EVALUATION RUBRIC:
+
+        1. ELIGIBILITY REQUIREMENTS:
+           - Project must align with program objectives
+           - Applicant must be eligible entity type
+           - Budget must be reasonable and well-justified
+           - Project timeline must be realistic
+
+        2. COMPLETENESS CHECKS:
+           - All required fields completed
+           - Necessary supporting documents provided
+           - Budget breakdown detailed and accurate
+           - Project description clear and comprehensive
+
+        3. FINANCIAL REVIEW:
+           - Requested amount is within program limits
+           - Budget is reasonable for scope of work
+           - Matching funds or in-kind contributions identified
+           - Cost per outcome/beneficiary is reasonable
+
+        4. RISK ASSESSMENT:
+           - Applicant capacity to deliver project
+           - Technical feasibility of proposed work
+           - Environmental or regulatory compliance
+           - Potential for cost overruns or delays
+
+        5. QUALITY INDICATORS:
+           - Clear project objectives and outcomes
+           - Well-defined target audience/beneficiaries
+           - Appropriate project methodology
+           - Sustainability plan for long-term impact
+
+        EVALUATION CRITERIA:
+        - HIGH: Meets all requirements, well-prepared application, low risk
+        - MEDIUM: Meets most requirements, minor issues or missing elements
+        - LOW: Missing key requirements, significant concerns, high risk
+
+        Analyze this grant application comprehensively across all five rubric categories (Eligibility, Completeness, Financial Review, Risk Assessment, and Quality Indicators). Identify issues, concerns, and areas for improvement.
+
+        OUTPUT
+        {
+          "rating": "<HIGH|MEDIUM|LOW>",
+          "warnings": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "errors": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "summaries": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "nextSteps": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "recommendation": {
+            "decision": "<PROCEED|HOLD>",
+            "rationale": "<string>"
+          }
+        }
+
+        Important:
+        - Use only APPLICATION CONTENT, ATTACHMENT SUMMARIES, FORM FIELD CONFIGURATION, and EVALUATION RUBRIC as evidence.
+        - Use summaries for overall application quality/readiness synthesis.
+        - Use nextSteps for reviewer-facing follow-up actions or considerations before scoring or decision-making.
+        - recommendation.decision must be PROCEED or HOLD.
+        - recommendation.rationale must explain the high-level recommendation in 1-2 complete sentences using provided evidence.
+        - Use "title" and "detail" keys for all finding objects.
+        - Return valid plain JSON only in the exact OUTPUT shape.
+        """;
+
+    // ── v1/analysis.system.txt ───────────────────────────────────────────────
+    private const string AnalysisSystemV1 = """
+        ROLE
+        You are a careful grant review assistant for human reviewers. Do not fill gaps, assume compliance, or treat relevance as proof.
+
+        TASK
+        Using SCHEMA, DATA, ATTACHMENTS, RUBRIC, SCORE, OUTPUT, and RULES:
+        1. Review the application and 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.
+        """;
+
+    // ── v1/analysis.user.txt ─────────────────────────────────────────────────
+    private const string AnalysisUserV1 = """
+        SCHEMA
+        {{SCHEMA}}
+
+        DATA
+        {{DATA}}
+
+        ATTACHMENTS
+        {{ATTACHMENTS}}
+
+        RUBRIC
+        {{RUBRIC}}
+
+        SCORE
+        {{SCORE}}
+
+        OUTPUT
+        {{OUTPUT}}
+
+        RULES
+        {{RULES}}
+        {{COMMON_RULES}}
+        """;
+
+    // ── v1/analysis.rubric.txt ───────────────────────────────────────────────
+    private const string AnalysisRubric = """
+        ELIGIBILITY REQUIREMENTS: Project aligns with program objectives; Applicant is an eligible entity; Budget is reasonable and justified; Timeline is realistic.
+        COMPLETENESS CHECKS: Required information is present; Supporting materials are provided where applicable; Description is clear.
+        FINANCIAL REVIEW: Requested amount is within limits; Budget matches scope; Matching funds or contributions are identified.
+        RISK ASSESSMENT: Applicant capacity; Feasibility; Compliance considerations; Delivery risks.
+        QUALITY INDICATORS: Clear objectives; Defined beneficiaries; Appropriate approach; Long-term sustainability.
+        """;
+
+    // ── v1/analysis.score.txt ────────────────────────────────────────────────
+    private const string AnalysisScore = """
+        HIGH: Application demonstrates strong evidence across most rubric areas with few or no issues.
+        MEDIUM: Application has some gaps or weaknesses that require reviewer attention.
+        LOW: Application has significant gaps or risks across key rubric areas.
+        """;
+
+    // ── v1/analysis.output.txt ───────────────────────────────────────────────
+    private const string AnalysisOutput = """
+        {
+          "rating": "<HIGH|MEDIUM|LOW>",
+          "errors": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "warnings": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "summaries": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "nextSteps": [
+            {
+              "title": "<string>",
+              "detail": "<string>"
+            }
+          ],
+          "recommendation": {
+            "decision": "<PROCEED|HOLD>",
+            "rationale": "<string>"
+          }
+        }
+        """;
+
+    // ── v1/analysis.rules.txt ────────────────────────────────────────────────
+    private const string AnalysisRules = """
+        - Use only provided input sections as evidence.
+        - Do not invent fields, documents, requirements, or facts.
+        - Prefer, in order: direct evidence from DATA, specific supporting evidence from ATTACHMENTS, then broader context only when necessary.
+        - Treat missing or empty values as findings only when they weaken rubric evidence.
+        - Prefer material findings; avoid nitpicking.
+        - Do not restate basic application facts as findings unless they support a specific reviewer conclusion about readiness, feasibility, budget credibility, eligibility, or confidence in proceeding.
+        - Prefer direct evidence from DATA over derivative statements in ATTACHMENTS when both address the same point.
+        - If ATTACHMENTS evidence is used, cite the attachment by name in detail.
+        - Each detail must cite concrete evidence from DATA or ATTACHMENTS.
+        - Write reviewer-facing natural language. Do not refer to prompt section names, internal field keys, or schema labels such as DATA, ATTACHMENTS, ProjectSummary, CustomField1, or OrganizationType.
+        - Refer to evidence by its plain-language meaning, quoted text, or attachment name rather than internal key names.
+        - Only include warnings when the evidence shows a specific, concrete risk, inconsistency, or meaningful uncertainty; a stated risk label alone is not enough.
+        - Do not state that one amount exceeds, matches, or conflicts with another unless the comparison is directly supported by the provided values.
+        - Do not treat ordinary lack of detailed supporting explanation as a material gap unless the provided evidence creates real uncertainty about feasibility, eligibility, or budget credibility.
+        - Prefer neutral evidence descriptions over evaluative adjectives unless the evidence directly supports a strong conclusion.
+        - Do not describe capacity, feasibility, or justification as strong, detailed, or well-supported unless the evidence shows more than the existence of basic organizational, budget, or timeline information.
+        - Do not infer community support, established partnerships, or delivery capacity from a single partner reference, staff count, or basic organizational status alone.
+        - Do not describe a timeline as realistic or feasible based only on start and end dates unless additional evidence supports deliverability.
+        - Use 3-6 words for title.
+        - Summary titles should name the specific substantive reviewer conclusion, strength, or risk, not a generic evaluation label or abstract category.
+        - Each detail must be 1-2 complete sentences.
+        - Summaries and nextSteps must be concrete, distinct, reviewer-relevant, and specific to this application's evidence.
+        - Avoid generic praise, checklist language, and repeated conclusions across lists.
+        - Do not use a summary merely to say that supporting documents were provided; summarize the specific substantive evidence they add, or omit the finding.
+        - If no findings exist, return empty arrays.
+        - Rating must be HIGH, MEDIUM, or LOW.
+        - Use summaries for overall application quality/readiness synthesis.
+        - Use nextSteps for concrete reviewer-facing next actions based on the provided evidence.
+        - nextSteps may include proceeding with the normal review process when the application appears ready for that step.
+        - When evidence shows a meaningful gap, inconsistency, or uncertainty, use nextSteps for specific follow-up or verification actions.
+        - Return an empty array only when no concrete next action would help the reviewer.
+        - recommendation.decision must be PROCEED or HOLD.
+        - Use HOLD only when provided evidence shows a material eligibility, feasibility, budget, or readiness concern that would reasonably block scoring or decision-making.
+        - recommendation.rationale must explain the high-level recommendation in 1-2 complete sentences using provided evidence.
+        - recommendation.rationale should name the 1-3 strongest evidence-based reasons for the recommendation.
+        """;
+
+    // ── v0/attachment.system.txt ─────────────────────────────────────────────
+    private const string AttachmentSystemV0 = """
+        You are a professional grant analyst for the BC Government.
+
+        Please analyze this attachment and provide a concise reviewer-facing summary of its content, purpose, and key information.
+
+        OUTPUT
+        {
+          "summary": "<string>"
+        }
+
+        Use only ATTACHMENT as evidence. If ATTACHMENT.text is present, summarize actual content; otherwise provide a conservative file-level summary. Write 1-2 complete sentences and return valid plain JSON only in the exact OUTPUT shape.
+        """;
+
+    // ── v0/attachment.user.txt ───────────────────────────────────────────────
+    private const string AttachmentUserV0 = """
+        ATTACHMENT
+        {{ATTACHMENT}}
+        """;
+
+    // ── v1/attachment.system.txt ─────────────────────────────────────────────
+    private const string AttachmentSystemV1 = """
+        ROLE
+        You are a careful grant review assistant for human reviewers. Do not fill gaps, assume compliance, or treat relevance as proof.
+
+        TASK
+        Using ATTACHMENT, OUTPUT, and RULES:
+        1. Review the attachment to identify what it contains.
+        2. Summarize the attachment itself, not the overall project.
+        3. Return a concise reviewer-facing summary.
+        """;
+
+    // ── v1/attachment.user.txt ───────────────────────────────────────────────
+    private const string AttachmentUserV1 = """
+        ATTACHMENT
+        {{ATTACHMENT}}
+
+        OUTPUT
+        {{OUTPUT}}
+
+        RULES
+        {{RULES}}
+        {{COMMON_RULES}}
+        """;
+
+    // ── v1/attachment.output.txt ─────────────────────────────────────────────
+    private const string AttachmentOutput = """
+        {
+          "summary": "<string>"
+        }
+        """;
+
+    // ── v1/attachment.rules.txt ──────────────────────────────────────────────
+    private const string AttachmentRules = """
+        - Use only ATTACHMENT as evidence.
+        - Summarize actual content when ATTACHMENT.text is present; otherwise provide a conservative file-level summary.
+        - Describe the attachment itself rather than summarizing the overall project.
+        - Ensure the summary describes the attachment itself, not the overall project.
+        - If ATTACHMENT.text is primarily structured application, contact, organization, budget, or date fields, summarize it as a metadata-style attachment rather than rewriting it as a generic project summary.
+        - Begin with what the attachment contains or provides, not the file name or file type, unless that metadata is necessary to describe the evidence.
+        - Do not invent missing details.
+        - Do not calculate or restate totals, sums, or aggregates unless they are explicitly present in ATTACHMENT.text.
+        - Write reviewer-facing natural language. Do not refer to prompt section names, internal field keys, or schema labels such as ATTACHMENT or ATTACHMENT.text.
+        - Refer to evidence by its plain-language meaning, quoted text, or file name rather than internal key names.
+        - Write 1-2 complete sentences.
+        - Summary must be grounded in concrete ATTACHMENT evidence.
+        - Return exactly one object with only the key: summary.
+        """;
+
+    // ── v0/scoresheet.system.txt ─────────────────────────────────────────────
+    private const string ScoresheetSystemV0 = """
+        You are an expert grant application reviewer for the BC Government.
+        Analyze the provided application and answer only the questions in the specified scoresheet section.
+        Be thorough, objective, and fair. Base answers strictly on provided evidence.
+        Always provide evidence-grounded rationale and an honest confidence score.
+        Respond only with valid JSON in the exact format requested.
+        """;
+
+    // ── v0/scoresheet.user.txt ───────────────────────────────────────────────
+    private const string ScoresheetUserV0 = """
+        APPLICATION CONTENT:
+        {{DATA}}
+
+        ATTACHMENT SUMMARIES:
+        {{ATTACHMENTS}}
+
+        SCORESHEET SECTION:
+        {{SECTION}}
+
+        RESPONSE TEMPLATE:
+        {{RESPONSE}}
+
+        Please analyze this grant application and provide answers for each question in the specified section only.
+
+        For each question, provide:
+        1. The answer based on the application evidence
+        2. A brief rationale (1-2 complete sentences) citing concrete supporting evidence
+        3. A confidence score from 0-100 (integer) indicating certainty in the selected answer
+
+        OUTPUT
+        {
+          "<question_id>": {
+            "answer": "<string | number>",
+            "rationale": "<evidence-based rationale>",
+            "confidence": <integer 0-100 step 5>
+          }
+        }
+
+        Important:
+        - Use only APPLICATION CONTENT and ATTACHMENT SUMMARIES as evidence.
+        - Answer only the question IDs in the specified section.
+        - Every question must include answer, rationale, and confidence.
+        - Use RESPONSE TEMPLATE as the contract and fill every placeholder value.
+        - answer type must match the question type.
+        - For select list questions, return only the option number as a string, never label text.
+        - rationale must be 1-2 complete sentences grounded in evidence.
+        - confidence must be an integer from 0 to 100 in increments of 5.
+        - Return valid plain JSON only in the exact OUTPUT shape.
+        """;
+
+    // ── v1/scoresheet.system.txt ─────────────────────────────────────────────
+    private const string ScoresheetSystemV1 = """
+        ROLE
+        You are a careful grant review assistant for human reviewers. Do not fill gaps, assume compliance, or treat relevance as proof.
+
+        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.
+        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.
+        """;
+
+    // ── v1/scoresheet.user.txt ───────────────────────────────────────────────
+    private const string ScoresheetUserV1 = """
+        DATA
+        {{DATA}}
+
+        ATTACHMENTS
+        {{ATTACHMENTS}}
+
+        SECTION
+        {{SECTION}}
+
+        RESPONSE
+        {{RESPONSE}}
+
+        OUTPUT
+        {{OUTPUT}}
+
+        RULES
+        {{RULES}}
+        {{COMMON_RULES}}
+        """;
+
+    // ── v1/scoresheet.output.txt ─────────────────────────────────────────────
+    private const string ScoresheetOutput = """
+        {
+          "<question_id>": {
+            "answer": "<string | number>",
+            "rationale": "<evidence-based rationale>",
+            "confidence": <integer 0-100 step 5>
+          }
+        }
+        """;
+
+    // ── v1/scoresheet.rules.txt ──────────────────────────────────────────────
+    private const string ScoresheetRules = """
+        - Use only DATA and ATTACHMENTS as evidence.
+        - Do not invent missing application details.
+        - Ignore fields or details that are not relevant to the specific question being answered.
+        - Prefer, in order: direct evidence of the exact condition asked, closely related supporting evidence, then general context only when necessary.
+        - If evidence is insufficient, partial, indirect, missing, or non-specific, choose the most conservative valid answer and explain the uncertainty.
+        - Do not convert general project descriptions into evidence for a specific scored condition unless that condition is directly supported.
+        - Treat prefilled labels, ratings, rankings, or statuses as background context only unless the question explicitly asks for that same item.
+        - Do not treat related concepts as equivalent; answer the specific question asked, not a nearby concept.
+        - Do not infer unsupported claims about requirements, conditions, relationships, compliance elements, mitigations, supports, or outcomes.
+        - Answer a specific condition positively only when that exact condition is directly evidenced in DATA or ATTACHMENTS.
+        - For eligibility, completeness, ownership, location, or compliance questions, do not answer positively unless the exact condition is directly confirmed in the provided evidence.
+        - If the evidence shows only involvement, presence, relevance, or association, do not treat that alone as proof that a requirement or condition is satisfied.
+        - Return exactly one answer object per question ID in SECTION.questions.
+        - Do not omit any question IDs from SECTION.questions.
+        - Do not add keys that are not question IDs from SECTION.questions.
+        - Use the exact question IDs from RESPONSE and SECTION.questions without alteration; never rewrite, normalize, or regenerate a question ID.
+        - Use RESPONSE as the output contract and fill every placeholder value.
+        - Each answer object must include: "answer", "rationale", and "confidence".
+        - Never omit "answer", "rationale", or "confidence" for any question type.
+        - The "answer" value type must match question type: Number => numeric; YesNo/SelectList/Text/TextArea => string.
+        """;
+
+    // ── v1/common.rules.txt ──────────────────────────────────────────────────
+    private const string CommonRules = """
+        - Any narrative text response must be at least 12 words.
+        - Return values exactly as specified in OUTPUT.
+        - Do not return keys outside OUTPUT.
+        - Return valid JSON only.
+        - Return plain JSON only (no markdown).
+        """;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs
new file mode 100644
index 0000000000..8aeb74d3d2
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPrompt.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.AI.Domain;
+
+public class AIPrompt : AuditedAggregateRoot<Guid>, IMultiTenant
+{
+    public virtual Guid? TenantId { get; protected set; }
+
+    public string Name { get; set; } = default!;
+
+    public string? Description { get; set; }
+
+    public PromptType Type { get; set; }
+
+    public bool IsActive { get; set; } = true;
+
+    public ICollection<AIPromptVersion> Versions { get; set; } = new List<AIPromptVersion>();
+
+    protected AIPrompt() { }
+
+    public AIPrompt(Guid id, string name, PromptType type, Guid? tenantId = null)
+    {
+        Id = id;
+        Name = name;
+        Type = type;
+        TenantId = tenantId;
+        IsActive = true;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs
new file mode 100644
index 0000000000..440aec6e0c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Domain/AIPromptVersion.cs
@@ -0,0 +1,50 @@
+using System;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.MultiTenancy;
+
+namespace Unity.AI.Domain;
+
+public class AIPromptVersion : AuditedAggregateRoot<Guid>, IMultiTenant
+{
+    public virtual Guid? TenantId { get; protected set; }
+
+    public Guid PromptId { get; set; }
+    public AIPrompt? Prompt { get; set; }
+
+    public int VersionNumber { get; set; }
+
+    public string SystemPrompt { get; set; } = default!;
+    public string UserPromptTemplate { get; set; } = default!;
+    public string? DeveloperNotes { get; set; }
+
+    public string? TargetModel { get; set; }
+    public string? TargetProvider { get; set; }
+
+    public double Temperature { get; set; } = 0.2;
+    public int? MaxTokens { get; set; }
+
+    public bool IsPublished { get; set; }
+    public bool IsDeprecated { get; set; }
+
+    /// <summary>Optional JSON metadata for extensibility (stored as Postgres jsonb).</summary>
+    public string? MetadataJson { get; set; }
+
+    protected AIPromptVersion() { }
+
+    public AIPromptVersion(
+        Guid id,
+        Guid promptId,
+        int versionNumber,
+        string systemPrompt,
+        string userPromptTemplate,
+        Guid? tenantId = null)
+    {
+        Id = id;
+        PromptId = promptId;
+        VersionNumber = versionNumber;
+        SystemPrompt = systemPrompt;
+        UserPromptTemplate = userPromptTemplate;
+        TenantId = tenantId;
+        Temperature = 0.2;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs
index bfdb1bb031..94ccefb672 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/EntityFrameworkCore/AIDbContextModelCreatingExtensions.cs
@@ -1,5 +1,7 @@
 using Microsoft.EntityFrameworkCore;
+using Unity.AI.Domain;
 using Volo.Abp;
+using Volo.Abp.EntityFrameworkCore.Modeling;
 
 namespace Unity.AI.EntityFrameworkCore;
 
@@ -9,8 +11,48 @@ public static void ConfigureAI(this ModelBuilder modelBuilder)
     {
         Check.NotNull(modelBuilder, nameof(modelBuilder));
 
-        // Configure AI entities here as they are introduced.
-        // Example: modelBuilder add Entity To table and configurations
+        modelBuilder.Entity<AIPrompt>(b =>
+        {
+            b.ToTable(AIDbProperties.DbTablePrefix + "AIPrompts", AIDbProperties.DbSchema);
 
+            b.ConfigureByConvention();
+
+            b.Property(x => x.Name)
+                .IsRequired()
+                .HasMaxLength(200);
+
+            b.Property(x => x.Description)
+                .HasMaxLength(2000);
+
+            b.Property(x => x.Type)
+                .IsRequired();
+
+            b.HasMany(x => x.Versions)
+                .WithOne(x => x.Prompt)
+                .HasForeignKey(x => x.PromptId)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<AIPromptVersion>(b =>
+        {
+            b.ToTable(AIDbProperties.DbTablePrefix + "AIPromptVersions", AIDbProperties.DbSchema);
+
+            b.ConfigureByConvention();
+
+            b.Property(x => x.SystemPrompt).IsRequired().HasColumnType("text");
+            b.Property(x => x.UserPromptTemplate).IsRequired().HasColumnType("text");
+
+            b.Property(x => x.TargetModel)
+                .HasMaxLength(100);
+
+            b.Property(x => x.TargetProvider)
+                .HasMaxLength(100);
+
+            b.Property(x => x.MetadataJson)
+                .HasColumnType("jsonb");
+
+            b.HasIndex(x => new { x.PromptId, x.VersionNumber })
+                .IsUnique();
+        });
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs
new file mode 100644
index 0000000000..5167d1b136
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptAppService.cs
@@ -0,0 +1,71 @@
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.Modules.Shared.Permissions;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.AI.Prompts;
+
+[Authorize(IdentityConsts.ITOperationsPolicyName)]
+public class AIPromptAppService :
+    CrudAppService<
+        AIPrompt,
+        AIPromptDto,
+        Guid,
+        PagedAndSortedResultRequestDto,
+        CreateUpdateAIPromptDto>,
+    IAIPromptAppService
+{
+    public AIPromptAppService(IRepository<AIPrompt, Guid> repository)
+        : base(repository)
+    {
+        GetPolicyName = IdentityConsts.ITOperationsPolicyName;
+        GetListPolicyName = IdentityConsts.ITOperationsPolicyName;
+        CreatePolicyName = IdentityConsts.ITOperationsPolicyName;
+        UpdatePolicyName = IdentityConsts.ITOperationsPolicyName;
+        DeletePolicyName = IdentityConsts.ITOperationsPolicyName;
+    }
+
+    public override async Task<AIPromptDto> GetAsync(Guid id)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.GetAsync(id);
+        }
+    }
+
+    public override async Task<PagedResultDto<AIPromptDto>> GetListAsync(PagedAndSortedResultRequestDto input)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.GetListAsync(input);
+        }
+    }
+
+    public override async Task<AIPromptDto> CreateAsync(CreateUpdateAIPromptDto input)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.CreateAsync(input);
+        }
+    }
+
+    public override async Task<AIPromptDto> UpdateAsync(Guid id, CreateUpdateAIPromptDto input)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.UpdateAsync(id, input);
+        }
+    }
+
+    public override async Task DeleteAsync(Guid id)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            await base.DeleteAsync(id);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs
new file mode 100644
index 0000000000..a44218d410
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Prompts/AIPromptVersionAppService.cs
@@ -0,0 +1,84 @@
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.AI.Domain;
+using Unity.Modules.Shared.Permissions;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Repositories;
+
+namespace Unity.AI.Prompts;
+
+[Authorize(IdentityConsts.ITOperationsPolicyName)]
+public class AIPromptVersionAppService :
+    CrudAppService<
+        AIPromptVersion,
+        AIPromptVersionDto,
+        Guid,
+        PagedAndSortedResultRequestDto,
+        CreateUpdateAIPromptVersionDto>,
+    IAIPromptVersionAppService
+{
+    public AIPromptVersionAppService(IRepository<AIPromptVersion, Guid> repository)
+        : base(repository)
+    {
+        GetPolicyName = IdentityConsts.ITOperationsPolicyName;
+        GetListPolicyName = IdentityConsts.ITOperationsPolicyName;
+        CreatePolicyName = IdentityConsts.ITOperationsPolicyName;
+        UpdatePolicyName = IdentityConsts.ITOperationsPolicyName;
+        DeletePolicyName = IdentityConsts.ITOperationsPolicyName;
+    }
+
+    public async Task<ListResultDto<AIPromptVersionDto>> GetByPromptAsync(Guid promptId)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            var items = await Repository.GetListAsync(v => v.PromptId == promptId);
+            var sorted = items.OrderBy(v => v.VersionNumber).ToList();
+            return new ListResultDto<AIPromptVersionDto>(
+                ObjectMapper.Map<List<AIPromptVersion>, List<AIPromptVersionDto>>(sorted));
+        }
+    }
+
+    public override async Task<AIPromptVersionDto> GetAsync(Guid id)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.GetAsync(id);
+        }
+    }
+
+    public override async Task<PagedResultDto<AIPromptVersionDto>> GetListAsync(PagedAndSortedResultRequestDto input)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.GetListAsync(input);
+        }
+    }
+
+    public override async Task<AIPromptVersionDto> CreateAsync(CreateUpdateAIPromptVersionDto input)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.CreateAsync(input);
+        }
+    }
+
+    public override async Task<AIPromptVersionDto> UpdateAsync(Guid id, CreateUpdateAIPromptVersionDto input)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            return await base.UpdateAsync(id, input);
+        }
+    }
+
+    public override async Task DeleteAsync(Guid id)
+    {
+        using (CurrentTenant.Change(null))
+        {
+            await base.DeleteAsync(id);
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
index f660d259d3..b4244f5390 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/Localization/AI/en.json
@@ -5,6 +5,28 @@
     "Permission:AI.Reporting": "AI Reporting",
     "Permission:AI.ApplicationAnalysis": "AI Application Analysis",
     "Permission:AI.AttachmentSummary": "AI Attachment Summary",
-    "Permission:AI.ScoringAssistant": "AI Scoring Assistant"
+    "Permission:AI.ScoringAssistant": "AI Scoring Assistant",
+    "Permission:AI.Prompts": "AI Prompt Management",
+    "Permission:AI.Prompts.Create": "Create Prompts",
+    "Permission:AI.Prompts.Update": "Edit Prompts",
+    "Permission:AI.Prompts.Delete": "Delete Prompts",
+    "AIPrompts": "AI Prompts",
+    "AIPrompt": "AI Prompt",
+    "AIPromptVersion": "Prompt Version",
+    "AIPromptVersions": "Prompt Versions",
+    "PromptType": "Type",
+    "PromptName": "Name",
+    "PromptDescription": "Description",
+    "PromptIsActive": "Active",
+    "VersionNumber": "Version Number",
+    "SystemPrompt": "System Prompt",
+    "UserPromptTemplate": "User Prompt Template",
+    "DeveloperNotes": "Developer Notes",
+    "TargetModel": "Target Model",
+    "TargetProvider": "Target Provider",
+    "Temperature": "Temperature",
+    "MaxTokens": "Max Tokens",
+    "IsPublished": "Published",
+    "IsDeprecated": "Deprecated"
   }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/PromptType.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/PromptType.cs
new file mode 100644
index 0000000000..9b57dc1e75
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Domain.Shared/PromptType.cs
@@ -0,0 +1,10 @@
+namespace Unity.AI;
+
+/// <summary>Categorises what role an AI prompt plays in the system.</summary>
+public enum PromptType
+{
+    Orchestrator = 0,
+    Skill = 1,
+    Instruction = 2,
+    Agent = 3
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs
index e82f53daa7..cda63f400a 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/AIWebModule.cs
@@ -1,9 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using Unity.AI.Localization;
+using Unity.AI.Web.Menus;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
+using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;
 
 namespace Unity.AI.Web;
@@ -35,6 +37,11 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             options.FileSets.AddEmbedded<AIWebModule>();
         });
 
+        Configure<AbpNavigationOptions>(options =>
+        {
+            options.MenuContributors.Add(new AIMenuContributor());
+        });
+
         context.Services.AddAutoMapperObjectMapper<AIWebModule>();
         Configure<AbpAutoMapperOptions>(options =>
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
new file mode 100644
index 0000000000..453ad3549a
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenuContributor.cs
@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using Unity.Modules.Shared.Permissions;
+using Volo.Abp.UI.Navigation;
+
+namespace Unity.AI.Web.Menus;
+
+public class AIMenuContributor : IMenuContributor
+{
+    public async Task ConfigureMenuAsync(MenuConfigurationContext context)
+    {
+        if (context.Menu.Name == StandardMenus.Main)
+        {
+            await ConfigureMainMenuAsync(context);
+        }
+    }
+
+    private static Task ConfigureMainMenuAsync(MenuConfigurationContext context)
+    {
+        context.Menu.AddItem(new ApplicationMenuItem(
+            name: AIMenus.Prompts,
+            displayName: "AI Prompts",
+            url: "~/Prompts",
+            icon: "fl fl-ai-prompts",
+            order: 900,
+            requiredPermissionName: IdentityConsts.ITOperationsPermissionName
+        ));
+
+        return Task.CompletedTask;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenus.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenus.cs
new file mode 100644
index 0000000000..f93517efe0
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Menus/AIMenus.cs
@@ -0,0 +1,8 @@
+namespace Unity.AI.Web.Menus;
+
+public static class AIMenus
+{
+    private const string Prefix = "AI";
+
+    public const string Prompts = Prefix + ".Prompts";
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml
new file mode 100644
index 0000000000..ddbdeb5bae
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml
@@ -0,0 +1,23 @@
+@page
+@using Unity.AI.Localization
+@using Unity.AI.Web.Pages.Prompts
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model CreateModalModel
+@inject IStringLocalizer<AIResource> L
+@{
+    Layout = null;
+}
+
+<abp-dynamic-form abp-model="Prompt" asp-page="/Prompts/CreateModal">
+    <abp-modal>
+        <abp-modal-header title="@L["AIPrompt"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-form-content />
+        </abp-modal-body>
+        <abp-modal-footer>
+            <button class="btn btn-primary" data-busy-text="Saving..." type="submit">Save</button>
+            <button class="btn btn-secondary" data-bs-dismiss="modal" type="button">Cancel</button>
+        </abp-modal-footer>
+    </abp-modal>
+</abp-dynamic-form>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml.cs
new file mode 100644
index 0000000000..25a3b31c8b
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/CreateModal.cshtml.cs
@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Unity.AI.Prompts;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts;
+
+public class CreateModalModel : AbpPageModel
+{
+    [BindProperty]
+    public CreateUpdateAIPromptDto Prompt { get; set; } = new();
+
+    private readonly IAIPromptAppService _promptAppService;
+
+    public CreateModalModel(IAIPromptAppService promptAppService)
+    {
+        _promptAppService = promptAppService;
+    }
+
+    public void OnGet()
+    {
+        Prompt = new CreateUpdateAIPromptDto { IsActive = true };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await _promptAppService.CreateAsync(Prompt);
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml
new file mode 100644
index 0000000000..5ad9cff4a4
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml
@@ -0,0 +1,37 @@
+@page
+@using Unity.AI.Localization
+@using Unity.AI.Web.Pages.Prompts
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model EditModalModel
+@inject IStringLocalizer<AIResource> L
+@{
+    Layout = null;
+}
+
+<abp-dynamic-form abp-model="Prompt" asp-page="/Prompts/EditModal">
+    <abp-modal>
+        <abp-modal-header title="@L["AIPrompt"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-input asp-for="Id" />
+            <abp-form-content />
+        </abp-modal-body>
+        <abp-modal-footer>
+            <button class="btn btn-primary" data-busy-text="Saving..." type="submit">Save</button>
+            <button class="btn btn-secondary" data-bs-dismiss="modal" type="button">Cancel</button>
+        </abp-modal-footer>
+    </abp-modal>
+</abp-dynamic-form>
+
+<hr />
+
+<div class="container-fluid px-0">
+    <div class="d-flex justify-content-between align-items-center mb-2">
+        <h6>@L["AIPromptVersions"]</h6>
+        <button id="addVersionBtn" class="btn btn-sm btn-outline-primary" type="button"
+                data-prompt-id="@Model.Id">
+            + Add Version
+        </button>
+    </div>
+    <abp-table id="VersionsTable"></abp-table>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs
new file mode 100644
index 0000000000..1279b7a691
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/EditModal.cshtml.cs
@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Prompts;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts;
+
+public class EditModalModel : AbpPageModel
+{
+    [HiddenInput]
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
+
+    [BindProperty]
+    public CreateUpdateAIPromptDto Prompt { get; set; } = new();
+
+    private readonly IAIPromptAppService _promptAppService;
+
+    public EditModalModel(IAIPromptAppService promptAppService)
+    {
+        _promptAppService = promptAppService;
+    }
+
+    public async Task OnGetAsync()
+    {
+        var dto = await _promptAppService.GetAsync(Id);
+        Prompt = new CreateUpdateAIPromptDto
+        {
+            Name = dto.Name,
+            Description = dto.Description,
+            Type = dto.Type,
+            IsActive = dto.IsActive
+        };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await _promptAppService.UpdateAsync(Id, Prompt);
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
new file mode 100644
index 0000000000..0099f5cf0e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml
@@ -0,0 +1,137 @@
+@page
+@using Unity.AI.Localization
+@using Unity.AI.Web.Pages.Prompts
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
+@model IndexModel
+@inject IStringLocalizer<AIResource> L
+@inject IPageLayout PageLayout
+@{
+    PageLayout.Content.BreadCrumb.Add(L["AIPrompts"].Value);
+}
+@section styles {
+    <abp-style src="/Pages/Prompts/Index.css" />
+}
+@section scripts {
+    <abp-script src="/Pages/Prompts/Index.js" />
+}
+
+<div class="container-fluid px-0">
+    <div class="action-bar p-2 filter-search-action-bar">
+        <div class="unity-page-titlebar">
+            <h4>@L["AIPrompts"]</h4>
+        </div>
+        <div class="filter-search-action-bar_search-wrapper">
+            <input type="search" id="search-prompts" placeholder="Search" class="tbl-search">
+        </div>
+        <div id="dynamicButtonContainerId" class="dynamic-buttons-div button-gap-1"></div>
+    </div>
+
+    <div id="promptsSplitContainer" class="prompts-split-container px-3 pb-3">
+
+        <!-- Left pane: prompts table -->
+        <div id="promptsLeftPane" class="prompts-left-pane">
+            <div class="card h-100">
+                <div class="card-body p-2">
+                    <abp-table id="AIPromptsTable" striped-rows="false" class="nowrap"></abp-table>
+                </div>
+            </div>
+        </div>
+
+        <!-- Drag divider (shown when a row is selected) -->
+        <div id="promptsDivider" class="prompts-split-divider" title="Drag to resize"></div>
+
+        <!-- Right pane: version editor (hidden until a row is selected) -->
+        <div id="promptsRightPane" class="prompts-right-pane" style="display:none;">
+            <div class="card h-100 d-flex flex-column">
+
+                <div class="card-header version-editor-header py-2">
+                    <div class="d-flex align-items-center gap-2 flex-wrap">
+                        <strong id="versionEditorTitle" class="text-truncate me-1" style="max-width:160px;"></strong>
+                        <label class="mb-0 small text-muted">Version:</label>
+                        <select id="versionSelect" class="form-select form-select-sm version-select"></select>
+                        <button id="newVersionBtn" class="btn btn-sm btn-outline-primary">
+                            <i class="fa fa-plus"></i> New Version
+                        </button>
+                        <button id="saveVersionBtn" class="btn btn-sm btn-primary ms-auto">
+                            <span id="saveVersionBtnLabel">Save Version</span>
+                        </button>
+                    </div>
+                </div>
+
+                <div class="card-body version-editor-body overflow-auto">
+                    <form id="versionEditForm" autocomplete="off">
+                        <input type="hidden" id="versionId" />
+                        <input type="hidden" id="versionPromptId" />
+                        <input type="hidden" id="versionNumber" />
+
+                        <div class="row g-3">
+
+                            <div class="col-sm-6">
+                                <label for="versionTargetModel" class="form-label small fw-semibold mb-1">@L["TargetModel"]</label>
+                                <input type="text" id="versionTargetModel" class="form-control form-control-sm" maxlength="100" placeholder="e.g. gpt-4o" />
+                            </div>
+                            <div class="col-sm-6">
+                                <label for="versionTargetProvider" class="form-label small fw-semibold mb-1">@L["TargetProvider"]</label>
+                                <input type="text" id="versionTargetProvider" class="form-control form-control-sm" maxlength="100" placeholder="e.g. openai" />
+                            </div>
+
+                            <div class="col-6 col-sm-3">
+                                <label for="versionTemperature" class="form-label small fw-semibold mb-1">@L["Temperature"]</label>
+                                <input type="number" id="versionTemperature" class="form-control form-control-sm" step="0.05" min="0" max="2" placeholder="0.2" />
+                            </div>
+                            <div class="col-6 col-sm-3">
+                                <label for="versionMaxTokens" class="form-label small fw-semibold mb-1">@L["MaxTokens"]</label>
+                                <input type="number" id="versionMaxTokens" class="form-control form-control-sm" min="1" placeholder="unlimited" />
+                            </div>
+                            <div class="col-6 col-sm-3 d-flex align-items-end pb-1">
+                                <div class="form-check">
+                                    <input type="checkbox" id="versionIsPublished" class="form-check-input" />
+                                    <label class="form-check-label small" for="versionIsPublished">@L["IsPublished"]</label>
+                                </div>
+                            </div>
+                            <div class="col-6 col-sm-3 d-flex align-items-end pb-1">
+                                <div class="form-check">
+                                    <input type="checkbox" id="versionIsDeprecated" class="form-check-input" />
+                                    <label class="form-check-label small" for="versionIsDeprecated">@L["IsDeprecated"]</label>
+                                </div>
+                            </div>
+
+                            <div class="col-12">
+                                <label for="versionSystemPrompt" class="form-label small fw-semibold mb-1">@L["SystemPrompt"] <span class="text-danger">*</span></label>
+                                <textarea id="versionSystemPrompt" class="form-control version-textarea version-textarea--code" rows="7" spellcheck="false"></textarea>
+                                <div class="invalid-feedback">System Prompt is required.</div>
+                            </div>
+
+                            <div class="col-12">
+                                <label for="versionUserPromptTemplate" class="form-label small fw-semibold mb-1">@L["UserPromptTemplate"] <span class="text-danger">*</span></label>
+                                <textarea id="versionUserPromptTemplate" class="form-control version-textarea version-textarea--code" rows="7" spellcheck="false"></textarea>
+                                <div class="invalid-feedback">User Prompt Template is required.</div>
+                            </div>
+
+                            <div class="col-12">
+                                <label for="versionDeveloperNotes" class="form-label small fw-semibold mb-1">@L["DeveloperNotes"]</label>
+                                <textarea id="versionDeveloperNotes" class="form-control version-textarea" rows="3" spellcheck="false"></textarea>
+                            </div>
+
+                            <div class="col-12">
+                                <div class="d-flex align-items-center gap-2 mb-1">
+                                    <label for="versionMetadataJson" class="form-label small fw-semibold mb-0">Metadata JSON</label>
+                                    <span class="badge bg-secondary" style="font-size:0.6rem;">jsonb</span>
+                                    <button type="button" id="formatJsonBtn" class="btn btn-link btn-sm p-0 ms-1" title="Format JSON">
+                                        <i class="fa fa-indent"></i> Format
+                                    </button>
+                                    <span id="jsonValidationMsg" class="small text-danger ms-1" style="display:none;"></span>
+                                </div>
+                                <textarea id="versionMetadataJson" class="form-control version-textarea version-textarea--json" rows="10" spellcheck="false" placeholder='{"sections": {...}}'></textarea>
+                            </div>
+
+                        </div>
+                    </form>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml.cs
new file mode 100644
index 0000000000..e24584432f
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.cshtml.cs
@@ -0,0 +1,8 @@
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts;
+
+public class IndexModel : AbpPageModel
+{
+
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.css b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.css
new file mode 100644
index 0000000000..ffddbdf1e6
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.css
@@ -0,0 +1,122 @@
+/* ── Split-pane container ─────────────────────────────────────────────────── */
+.prompts-split-container {
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+    min-height: 400px;
+    gap: 0;
+    /* No fixed height — lets the DataTable footer and page footer remain visible */
+}
+
+/* ── Left pane ────────────────────────────────────────────────────────────── */
+.prompts-left-pane {
+    flex: 1 1 auto;
+    min-width: 0;
+    overflow: hidden;
+    transition: none;
+}
+
+/* ── Drag divider ─────────────────────────────────────────────────────────── */
+.prompts-split-divider {
+    display: none;
+    width: 7px;
+    flex-shrink: 0;
+    cursor: col-resize;
+    background: #dee2e6;
+    border-left: 1px solid #ced4da;
+    border-right: 1px solid #ced4da;
+    position: sticky;
+    top: 10px;
+    height: calc(100vh - 190px);
+    z-index: 10;
+    transition: background 0.15s;
+}
+
+.prompts-split-divider::after {
+    content: '⋮';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    color: #868e96;
+    font-size: 20px;
+    line-height: 1;
+    pointer-events: none;
+}
+
+.prompts-split-divider:hover,
+.prompts-split-divider.dragging {
+    background: #adb5bd;
+}
+
+.prompts-split-container.split-active .prompts-split-divider {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+/* ── Right pane ───────────────────────────────────────────────────────────── */
+.prompts-right-pane {
+    flex-shrink: 0;
+    width: 52%;
+    min-width: 300px;
+    max-width: 80%;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    /* Sticky so the editor stays visible as the left-pane table grows */
+    position: sticky;
+    top: 10px;
+    /* Explicit height (not max-height) so h-100 on the inner card resolves correctly */
+    height: calc(100vh - 190px);
+}
+
+/* ── Version editor header ────────────────────────────────────────────────── */
+.version-editor-header {
+    background: #f8f9fa;
+    flex-shrink: 0;
+}
+
+.version-select {
+    min-width: 160px;
+    max-width: 220px;
+}
+
+/* ── Version editor form body ─────────────────────────────────────────────── */
+.version-editor-body {
+    flex: 1 1 0;      /* 0 basis so flex shrinks below content natural size */
+    min-height: 0;    /* required for overflow-y:auto to work inside a flex column */
+    overflow-y: auto;
+}
+
+/* ── Resizable textareas ──────────────────────────────────────────────────── */
+.version-textarea {
+    resize: vertical;
+    min-height: 72px;
+    font-size: 0.82rem;
+    line-height: 1.5;
+}
+
+.version-textarea--code {
+    font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace;
+}
+
+.version-textarea--json {
+    font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace;
+    min-height: 120px;
+}
+
+/* ── Row selection ────────────────────────────────────────────────────────── */
+#AIPromptsTable tbody tr {
+    cursor: pointer;
+}
+
+#AIPromptsTable tbody tr.prompt-selected td {
+    background-color: #cfe2ff !important;
+}
+
+/* ── Drag ghost (prevent text selection while dragging) ───────────────────── */
+body.split-dragging {
+    cursor: col-resize !important;
+    user-select: none !important;
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js
new file mode 100644
index 0000000000..28062f58cf
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Index.js
@@ -0,0 +1,380 @@
+$(function () {
+    const l = abp.localization.getResource('AI');
+
+    // Prompt-level modals (create / edit prompt metadata only)
+    let createModal = new abp.ModalManager(abp.appPath + 'Prompts/CreateModal');
+    let editModal   = new abp.ModalManager(abp.appPath + 'Prompts/EditModal');
+
+    // ── State ────────────────────────────────────────────────────────────────
+    let currentVersionId  = null;
+    let isNewVersion      = false;
+    let cachedVersions    = [];   // versions for the currently-selected prompt
+
+    // ── Table columns ────────────────────────────────────────────────────────
+    const listColumns = [
+        {
+            title: l('PromptName'),
+            name: 'name',
+            data: 'name',
+            index: 0
+        },
+        {
+            title: l('PromptType'),
+            name: 'type',
+            data: 'type',
+            index: 1,
+            render: (data) => {
+                const types = ['Orchestrator', 'Skill', 'Instruction', 'Agent'];
+                return types[data] ?? data;
+            }
+        },
+        {
+            title: l('PromptDescription'),
+            name: 'description',
+            data: 'description',
+            index: 2,
+            defaultContent: ''
+        },
+        {
+            title: l('PromptIsActive'),
+            name: 'isActive',
+            data: 'isActive',
+            index: 3,
+            render: (data) => data
+                ? '<span class="badge bg-success">Active</span>'
+                : '<span class="badge bg-secondary">Inactive</span>'
+        },
+        {
+            title: l('Actions'),
+            data: 'id',
+            orderable: false,
+            className: 'text-center',
+            name: 'rowActions',
+            index: 4,
+            rowAction: {
+                items: [
+                    {
+                        text: 'Edit Prompt',
+                        action: (data) => editModal.open({ id: data.record.id })
+                    }
+                ]
+            }
+        }
+    ];
+
+    const responseCallback = (result) => ({
+        recordsTotal:    result.totalCount,
+        recordsFiltered: result.items.length,
+        data:            result.items
+    });
+
+    const actionButtons = [
+        {
+            text: '<i class="fa fa-plus"></i> New Prompt',
+            titleAttr: 'New Prompt',
+            id: 'CreatePromptButton',
+            className: 'btn btn-light rounded-1',
+            action: (e) => { e.preventDefault(); createModal.open(); }
+        }
+    ];
+
+    const defaultVisibleColumns = ['name', 'type', 'description', 'isActive', 'rowActions'];
+    const dt = $('#AIPromptsTable');
+
+    const dataTable = initializeDataTable({
+        dt,
+        defaultVisibleColumns,
+        listColumns,
+        maxRowsPerPage: 25,
+        defaultSortColumn: 0,
+        dataEndpoint: unity.aI.prompts.aIPrompt.getList,
+        data: {},
+        responseCallback,
+        actionButtons,
+        pagingEnabled: true,
+        reorderEnabled: false,
+        languageSetValues: {},
+        dataTableName: 'AIPromptsTable',
+        dynamicButtonContainerId: 'dynamicButtonContainerId',
+        useNullPlaceholder: true,
+        externalSearchId: 'search-prompts',
+        fixedHeaders: true
+    });
+
+    createModal.onResult(() => dataTable.ajax.reload());
+    editModal.onResult(()   => dataTable.ajax.reload());
+
+    // ── Row click → open version panel ──────────────────────────────────────
+    $('#AIPromptsTable').on('click', 'tbody tr', function (e) {
+        // Don't intercept action-column clicks
+        if ($(e.target).closest('.dropdown, .dropdown-menu, button, a').length) return;
+
+        const rowData = dataTable.row(this).data();
+        if (!rowData) return;
+
+        // Highlight selected row
+        $('#AIPromptsTable tbody tr').removeClass('prompt-selected');
+        $(this).addClass('prompt-selected');
+
+        openVersionPanel(rowData);
+    });
+
+    // ── Open / populate right panel ──────────────────────────────────────────
+    function openVersionPanel(promptData) {
+        $('#versionEditorTitle').text(promptData.name);
+        $('#versionPromptId').val(promptData.id);
+
+        // Activate split layout
+        $('#promptsSplitContainer').addClass('split-active');
+        $('#promptsRightPane').show();
+
+        loadVersions(promptData.id);
+    }
+
+    function loadVersions(promptId) {
+        unity.aI.prompts.aIPromptVersion.getByPrompt(promptId).then(function (result) {
+            cachedVersions = result.items || [];
+            const $select  = $('#versionSelect');
+            $select.empty();
+
+            if (cachedVersions.length === 0) {
+                $select.append('<option value="">— no versions —</option>');
+                clearVersionForm(0);
+                return;
+            }
+
+            // Sort ascending by versionNumber in place so [last] is always the max
+            cachedVersions.sort((a, b) => a.versionNumber - b.versionNumber);
+
+            cachedVersions.forEach(function (v) {
+                $select.append(`<option value="${v.id}">${v.versionNumber}</option>`);
+            });
+
+            // Select latest (highest versionNumber) by default
+            const latest = cachedVersions[cachedVersions.length - 1];
+            $select.val(latest.id);
+            populateVersionForm(latest);
+        });
+    }
+
+    // Version dropdown change
+    $('#versionSelect').on('change', function () {
+        const id = $(this).val();
+        if (!id) return;
+        const v = cachedVersions.find(x => x.id === id);
+        if (v) {
+            populateVersionForm(v);
+        } else {
+            // fallback: fetch from server
+            unity.aI.prompts.aIPromptVersion.get(id).then(populateVersionForm);
+        }
+    });
+
+    // ── Populate form from a version DTO ─────────────────────────────────────
+    function populateVersionForm(v) {
+        isNewVersion     = false;
+        currentVersionId = v.id;
+
+        $('#versionId').val(v.id);
+        $('#versionNumber').val(v.versionNumber);
+        $('#versionTargetModel').val(v.targetModel ?? '');
+        $('#versionTargetProvider').val(v.targetProvider ?? '');
+        $('#versionTemperature').val(v.temperature ?? 0.2);
+        $('#versionMaxTokens').val(v.maxTokens ?? '');
+        $('#versionIsPublished').prop('checked', v.isPublished ?? false);
+        $('#versionIsDeprecated').prop('checked', v.isDeprecated ?? false);
+        $('#versionSystemPrompt').val(v.systemPrompt ?? '').removeClass('is-invalid');
+        $('#versionUserPromptTemplate').val(v.userPromptTemplate ?? '').removeClass('is-invalid');
+        $('#versionDeveloperNotes').val(v.developerNotes ?? '');
+
+        // Pretty-print MetadataJson if valid
+        let meta = v.metadataJson ?? '';
+        if (meta) {
+            try { meta = JSON.stringify(JSON.parse(meta), null, 2); } catch (e) { console.warn('MetadataJson is not valid JSON; displaying raw value.', e); }
+        }
+        $('#versionMetadataJson').val(meta);
+
+        clearJsonError();
+        $('#saveVersionBtnLabel').text('Save Version');
+    }
+
+    // ── Clear form for a brand-new version ───────────────────────────────────
+    function clearVersionForm(nextVersionNumber) {
+        isNewVersion     = true;
+        currentVersionId = null;
+
+        $('#versionId').val('');
+        $('#versionTargetModel').val('');
+        $('#versionTargetProvider').val('');
+        $('#versionTemperature').val(0.2);
+        $('#versionMaxTokens').val('');
+        $('#versionIsPublished').prop('checked', false);
+        $('#versionIsDeprecated').prop('checked', false);
+        $('#versionSystemPrompt').val('');
+        $('#versionUserPromptTemplate').val('');
+        $('#versionDeveloperNotes').val('');
+        $('#versionMetadataJson').val('');
+
+        clearJsonError();
+        $('#saveVersionBtnLabel').text('Create Version');
+    }
+
+    // ── New version button ────────────────────────────────────────────────────
+    $('#newVersionBtn').on('click', function () {
+        const maxNum = cachedVersions.reduce((max, v) => Math.max(max, v.versionNumber), -1);
+        const next   = maxNum + 1;
+
+        // Add a placeholder option
+        $('#versionSelect option[data-new]').remove();
+        $('#versionSelect').prepend(
+            `<option value="" data-new="1" data-num="${next}" selected>${next} (new)</option>`
+        );
+
+        clearVersionForm(next);
+    });
+
+    // ── Save / create version ─────────────────────────────────────────────────
+    $('#saveVersionBtn').on('click', function () {
+        const promptId = $('#versionPromptId').val();
+        if (!promptId) return;
+
+        // Required-field validation
+        const systemPrompt       = $('#versionSystemPrompt').val().trim();
+        const userPromptTemplate = $('#versionUserPromptTemplate').val().trim();
+        let valid = true;
+        if (systemPrompt) {
+            $('#versionSystemPrompt').removeClass('is-invalid');
+        } else {
+            $('#versionSystemPrompt').addClass('is-invalid');
+            valid = false;
+        }
+        if (userPromptTemplate) {
+            $('#versionUserPromptTemplate').removeClass('is-invalid');
+        } else {
+            $('#versionUserPromptTemplate').addClass('is-invalid');
+            valid = false;
+        }
+        if (!valid) {
+            $('#versionSystemPrompt.is-invalid, #versionUserPromptTemplate.is-invalid')[0]?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+            return;
+        }
+
+        const metaRaw = $('#versionMetadataJson').val().trim();
+        if (metaRaw && !validateJson(metaRaw)) return;
+
+        const dto = {
+            promptId:            promptId,
+            versionNumber:       Number.parseInt($('#versionNumber').val()) || 0,
+            systemPrompt:        systemPrompt,
+            userPromptTemplate:  userPromptTemplate,
+            developerNotes:      $('#versionDeveloperNotes').val() || null,
+            targetModel:         $('#versionTargetModel').val() || null,
+            targetProvider:      $('#versionTargetProvider').val() || null,
+            temperature:         Number.parseFloat($('#versionTemperature').val()) || 0.2,
+            maxTokens:           $('#versionMaxTokens').val() ? Number.parseInt($('#versionMaxTokens').val()) : null,
+            isPublished:         $('#versionIsPublished').is(':checked'),
+            isDeprecated:        $('#versionIsDeprecated').is(':checked'),
+            metadataJson:        metaRaw || null
+        };
+
+        if (isNewVersion) {
+            const newOpt = $('#versionSelect option[data-new]');
+            dto.versionNumber = newOpt.length ? Number.parseInt(newOpt.data('num')) : 0;
+
+            unity.aI.prompts.aIPromptVersion.create(dto)
+                .then(function () {
+                    abp.notify.success('Version created');
+                    loadVersions(promptId);
+                })
+                .catch(function (err) {
+                    abp.notify.error(err?.message || 'Failed to create version');
+                });
+        } else {
+            unity.aI.prompts.aIPromptVersion.update(currentVersionId, dto)
+                .then(function () {
+                    abp.notify.success('Version saved');
+                    loadVersions(promptId);
+                })
+                .catch(function (err) {
+                    abp.notify.error(err?.message || 'Failed to save version');
+                });
+        }
+    });
+
+    // ── Format JSON button ────────────────────────────────────────────────────
+    $('#formatJsonBtn').on('click', function () {
+        const raw = $('#versionMetadataJson').val().trim();
+        if (raw && validateJson(raw)) {
+            $('#versionMetadataJson').val(JSON.stringify(JSON.parse(raw), null, 2));
+        }
+    });
+
+    // ── JSON validation helper ────────────────────────────────────────────────
+    function validateJson(str) {
+        try {
+            JSON.parse(str);
+            clearJsonError();
+            return true;
+        } catch (e) {
+            $('#jsonValidationMsg').text('Invalid JSON: ' + e.message).show();
+            $('#versionMetadataJson').addClass('is-invalid');
+            return false;
+        }
+    }
+
+    function clearJsonError() {
+        $('#jsonValidationMsg').hide().text('');
+        $('#versionMetadataJson').removeClass('is-invalid');
+    }
+
+    $('#versionMetadataJson').on('input', function () {
+        const raw = $(this).val().trim();
+        if (raw) validateJson(raw); else clearJsonError();
+    });
+
+    // ── Draggable divider ─────────────────────────────────────────────────────
+    const $divider   = $('#promptsDivider');
+    const $leftPane  = $('#promptsLeftPane');
+    const $rightPane = $('#promptsRightPane');
+    const $container = $('#promptsSplitContainer');
+
+    let isDragging     = false;
+    let dragStartX     = 0;
+    let dragStartLeft  = 0;
+
+    $divider.on('mousedown', function (e) {
+        isDragging    = true;
+        dragStartX    = e.clientX;
+        dragStartLeft = $leftPane.width();
+        $divider.addClass('dragging');
+        $('body').addClass('split-dragging');
+        e.preventDefault();
+    });
+
+    $(document).on('mousemove.splitDrag', function (e) {
+        if (!isDragging) return;
+
+        const totalWidth  = $container.width();
+        const dividerW    = $divider.outerWidth();
+        const delta       = e.clientX - dragStartX;
+        let   newLeft     = dragStartLeft + delta;
+        const minLeft     = totalWidth * 0.2;
+        const maxLeft     = totalWidth * 0.8 - dividerW;
+
+        newLeft = Math.max(minLeft, Math.min(maxLeft, newLeft));
+
+        const leftPct  = (newLeft / totalWidth * 100).toFixed(2);
+        const rightPct = ((totalWidth - newLeft - dividerW) / totalWidth * 100).toFixed(2);
+
+        $leftPane.css('flex', `0 0 ${leftPct}%`);
+        $rightPane.css({ 'flex': 'none', 'width': rightPct + '%' });
+    });
+
+    $(document).on('mouseup.splitDrag', function () {
+        if (isDragging) {
+            isDragging = false;
+            $divider.removeClass('dragging');
+            $('body').removeClass('split-dragging');
+        }
+    });
+});
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml
new file mode 100644
index 0000000000..38acee10e0
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml
@@ -0,0 +1,23 @@
+@page
+@using Unity.AI.Localization
+@using Unity.AI.Web.Pages.Prompts.Versions
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model CreateVersionModalModel
+@inject IStringLocalizer<AIResource> L
+@{
+    Layout = null;
+}
+
+<abp-dynamic-form abp-model="Version" asp-page="/Prompts/Versions/CreateVersionModal">
+    <abp-modal>
+        <abp-modal-header title="@L["AIPromptVersion"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-form-content />
+        </abp-modal-body>
+        <abp-modal-footer>
+            <button class="btn btn-primary" data-busy-text="Saving..." type="submit">Save</button>
+            <button class="btn btn-secondary" data-bs-dismiss="modal" type="button">Cancel</button>
+        </abp-modal-footer>
+    </abp-modal>
+</abp-dynamic-form>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs
new file mode 100644
index 0000000000..ba49f50d0a
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/CreateVersionModal.cshtml.cs
@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Prompts;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts.Versions;
+
+public class CreateVersionModalModel : AbpPageModel
+{
+    [BindProperty]
+    public CreateUpdateAIPromptVersionDto Version { get; set; } = new();
+
+    private readonly IAIPromptVersionAppService _versionAppService;
+
+    public CreateVersionModalModel(IAIPromptVersionAppService versionAppService)
+    {
+        _versionAppService = versionAppService;
+    }
+
+    public void OnGet(Guid promptId)
+    {
+        Version = new CreateUpdateAIPromptVersionDto
+        {
+            PromptId = promptId,
+            Temperature = 0.2
+        };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await _versionAppService.CreateAsync(Version);
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml
new file mode 100644
index 0000000000..2f1e96ea4f
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml
@@ -0,0 +1,24 @@
+@page
+@using Unity.AI.Localization
+@using Unity.AI.Web.Pages.Prompts.Versions
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+@model EditVersionModalModel
+@inject IStringLocalizer<AIResource> L
+@{
+    Layout = null;
+}
+
+<abp-dynamic-form abp-model="Version" asp-page="/Prompts/Versions/EditVersionModal">
+    <abp-modal>
+        <abp-modal-header title="@L["AIPromptVersion"].Value"></abp-modal-header>
+        <abp-modal-body>
+            <abp-input asp-for="Id" />
+            <abp-form-content />
+        </abp-modal-body>
+        <abp-modal-footer>
+            <button class="btn btn-primary" data-busy-text="Saving..." type="submit">Save</button>
+            <button class="btn btn-secondary" data-bs-dismiss="modal" type="button">Cancel</button>
+        </abp-modal-footer>
+    </abp-modal>
+</abp-dynamic-form>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs
new file mode 100644
index 0000000000..40390dd976
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Pages/Prompts/Versions/EditVersionModal.cshtml.cs
@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Prompts;
+using Volo.Abp.AspNetCore.Mvc.UI.RazorPages;
+
+namespace Unity.AI.Web.Pages.Prompts.Versions;
+
+public class EditVersionModalModel : AbpPageModel
+{
+    [HiddenInput]
+    [BindProperty(SupportsGet = true)]
+    public Guid Id { get; set; }
+
+    [BindProperty]
+    public CreateUpdateAIPromptVersionDto Version { get; set; } = new();
+
+    private readonly IAIPromptVersionAppService _versionAppService;
+
+    public EditVersionModalModel(IAIPromptVersionAppService versionAppService)
+    {
+        _versionAppService = versionAppService;
+    }
+
+    public async Task OnGetAsync()
+    {
+        var dto = await _versionAppService.GetAsync(Id);
+        Version = new CreateUpdateAIPromptVersionDto
+        {
+            PromptId = dto.PromptId,
+            VersionNumber = dto.VersionNumber,
+            SystemPrompt = dto.SystemPrompt,
+            UserPromptTemplate = dto.UserPromptTemplate,
+            DeveloperNotes = dto.DeveloperNotes,
+            TargetModel = dto.TargetModel,
+            TargetProvider = dto.TargetProvider,
+            Temperature = dto.Temperature,
+            MaxTokens = dto.MaxTokens,
+            IsPublished = dto.IsPublished,
+            IsDeprecated = dto.IsDeprecated,
+            MetadataJson = dto.MetadataJson
+        };
+    }
+
+    public async Task<IActionResult> OnPostAsync()
+    {
+        await _versionAppService.UpdateAsync(Id, Version);
+        return NoContent();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj
index 79de5268e6..9b6f9cb856 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Unity.AI.Web.csproj
@@ -8,6 +8,7 @@
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
     <RootNamespace>Unity.AI.Web</RootNamespace>
+    <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,6 +25,10 @@
     <EmbeddedResource Include="Pages\**\*.js" />
     <EmbeddedResource Include="Views\**\*.css" />
     <EmbeddedResource Include="Views\**\*.js" />
+    <Content Remove="Pages\**\*.css" />
+    <Content Remove="Pages\**\*.js" />
+    <Content Remove="Views\**\*.css" />
+    <Content Remove="Views\**\*.js" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/AIPromptsWidgetViewComponent.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/AIPromptsWidgetViewComponent.cs
new file mode 100644
index 0000000000..b397b8ea9a
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/AIPromptsWidgetViewComponent.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace Unity.AI.Web.Views.Shared.Components.AIPromptsWidget;
+
+[ViewComponent(Name = "AIPromptsWidget")]
+public class AIPromptsWidgetViewComponent : AbpViewComponent
+{
+    public IViewComponentResult Invoke()
+    {
+        return View();
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml
new file mode 100644
index 0000000000..cdad35bf5e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/Shared/Components/AIPromptsWidget/Default.cshtml
@@ -0,0 +1,18 @@
+@using Unity.AI.Localization
+@using Microsoft.Extensions.Localization
+@inject IStringLocalizer<AIResource> L
+
+<div class="container-fluid px-0">
+    <div class="action-bar p-2 filter-search-action-bar">
+        <div class="filter-search-action-bar_search-wrapper">
+            <input type="search" id="search-prompts" placeholder="@L["Common:Search"]" class="tbl-search">
+        </div>
+    </div>
+    <div class="p-3 pt-0">
+        <abp-card>
+            <abp-card-body>
+                <abp-table id="AIPromptsTable" striped-rows="false" class="nowrap"></abp-table>
+            </abp-card-body>
+        </abp-card>
+    </div>
+</div>
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/_ViewImports.cshtml b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/_ViewImports.cshtml
new file mode 100644
index 0000000000..231948b339
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Web/Views/_ViewImports.cshtml
@@ -0,0 +1,4 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
index 0204698482..033d04d512 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
@@ -31,6 +31,7 @@
 using Quartz;
 using Unity.Modules.Shared.MessageBrokers.RabbitMQ;
 using Volo.Abp.BackgroundJobs;
+using Unity.AI;
 using Unity.Reporting;
 using Volo.Abp.DistributedLocking;
 using Unity.GrantManager.Zones;
@@ -61,6 +62,7 @@ namespace Unity.GrantManager;
     typeof(PaymentsApplicationModule),
     typeof(FlexApplicationModule),
     typeof(ReportingApplicationModule),
+    typeof(AIApplicationModule),
     typeof(AbpDistributedLockingModule)
 )]
 public class GrantManagerApplicationModule : AbpModule
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj
index c728a8ec10..3ff76f7291 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/Unity.GrantManager.Application.csproj
@@ -13,6 +13,7 @@
     <EmbeddedResource Remove="Intake\**" />
     <None Remove="Intake\**" />
     <ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Application.Contracts\Unity.AI.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Application\Unity.AI.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Flex\src\Unity.Flex.Application\Unity.Flex.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Notifications\src\Unity.Notifications.Application\Unity.Notifications.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Payments\src\Unity.Payments.Application\Unity.Payments.Application.csproj" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs
index 860f059071..f3923a9200 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/GrantManagerDbMigratorModule.cs
@@ -1,4 +1,5 @@
-using Unity.GrantManager.EntityFrameworkCore;
+using Unity.AI;
+using Unity.GrantManager.EntityFrameworkCore;
 using Unity.Reporting;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
@@ -9,7 +10,8 @@ namespace Unity.GrantManager.DbMigrator;
     typeof(AbpAutofacModule),
     typeof(GrantManagerEntityFrameworkCoreModule),
     typeof(GrantManagerApplicationContractsModule),
-    typeof(ReportingApplicationModule) // Needed to seed Reporting data
+    typeof(ReportingApplicationModule), // Needed to seed Reporting data
+    typeof(AIApplicationModule)          // Needed to seed AI prompt data
     )]
 public class GrantManagerDbMigratorModule : AbpModule
 {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
index d722a319a3..7cfd0b2699 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.DbMigrator/Unity.GrantManager.DbMigrator.csproj
@@ -36,6 +36,7 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Autofac" Version="9.1.3" />
+    <ProjectReference Include="..\..\modules\Unity.AI\src\Unity.AI.Application\Unity.AI.Application.csproj" />
     <ProjectReference Include="..\..\modules\Unity.Reporting\src\Unity.Reporting.Application\Unity.Reporting.Application.csproj" />
     <ProjectReference Include="..\Unity.GrantManager.Application.Contracts\Unity.GrantManager.Application.Contracts.csproj" />
     <ProjectReference Include="..\Unity.GrantManager.EntityFrameworkCore\Unity.GrantManager.EntityFrameworkCore.csproj" />
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs
index 657adaa3fd..205592bfbd 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantManagerDbContext.cs
@@ -1,8 +1,10 @@
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using Unity.GrantManager.Applicants;
-using Unity.GrantManager.Locality;
-using Unity.GrantManager.Tokens;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using Unity.AI.Domain;
+using Unity.AI.EntityFrameworkCore;
+using Unity.GrantManager.Applicants;
+using Unity.GrantManager.Locality;
+using Unity.GrantManager.Tokens;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
 using Volo.Abp.Data;
@@ -32,9 +34,9 @@ public class GrantManagerDbContext :
     IIdentityDbContext,
     ITenantManagementDbContext
 {
-    /* Add DbSet properties for your Aggregate Roots / Entities here. */
-
-    public DbSet<ApplicantTenantMap> ApplicantTenantMaps { get; set; }
+    /* Add DbSet properties for your Aggregate Roots / Entities here. */
+
+    public DbSet<ApplicantTenantMap> ApplicantTenantMaps { get; set; }
     public DbSet<DynamicUrl> DynamicUrls { get; set; }
     public DbSet<CasClientCode> CasClientCodes { get; set; }
     public DbSet<Sector> Sectors { get; set; }
@@ -47,6 +49,9 @@ public class GrantManagerDbContext :
     public DbSet<InboxMessage> InboxMessages { get; set; }
     public DbSet<OutboxMessage> OutboxMessages { get; set; }
 
+    // Unity.AI entities
+    public DbSet<AIPrompt> AIPrompts { get; set; }
+    public DbSet<AIPromptVersion> AIPromptVersions { get; set; }
 
     #region Entities from the modules
 
@@ -98,6 +103,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         // Adds Quartz.NET PostgreSQL schema to EntityFrameworkCore
         modelBuilder.AddQuartz(builder => builder.UsePostgreSql("qrtz_", null));
 
+        // Unity.AI tables
+        modelBuilder.ConfigureAI();
+
         /* Configure your own tables/entities inside here */
         modelBuilder.Entity<CasClientCode>(b =>
         {
@@ -164,71 +172,71 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             b.ConfigureByConvention();
         });
-        modelBuilder.Entity<TenantToken>(b =>
-        {
-            b.ToTable(GrantManagerConsts.DbTablePrefix + "TenantTokens",
-                GrantManagerConsts.DbSchema);
-
-            b.ConfigureByConvention();
-        });
-
-        
-        modelBuilder.Entity<ApplicantTenantMap>(b =>
-        {
-            b.ToTable(GrantManagerConsts.DbTablePrefix + "ApplicantTenantMaps",
-                GrantManagerConsts.DbSchema);
-
-            b.ConfigureByConvention();
-
-            b.HasIndex(x => x.OidcSubUsername);
-            b.HasIndex(x => new { x.OidcSubUsername, x.TenantId }).IsUnique();
-        });
-
-        modelBuilder.Entity<InboxMessage>(b =>
-        {
-            b.ToTable(GrantManagerConsts.DbTablePrefix + "InboxMessages",
-                GrantManagerConsts.DbSchema);
-
-            b.ConfigureByConvention();
-
-            b.Property(x => x.Source).IsRequired().HasMaxLength(50);
-            b.Property(x => x.MessageId).IsRequired().HasMaxLength(64);
-            b.Property(x => x.CorrelationId).HasMaxLength(128);
-            b.Property(x => x.DataType).IsRequired().HasMaxLength(100);
-            b.Property(x => x.Payload).IsRequired().HasColumnType("jsonb");
-            b.Property(x => x.Details).HasMaxLength(2000);
-
-            b.Property(x => x.Status)
-                .IsRequired()
-                .HasConversion(new EnumToStringConverter<MessageStatus>());
-
-            b.HasIndex(x => x.MessageId).IsUnique();
-            b.HasIndex(x => new { x.Source, x.Status });
-        });
-
-        modelBuilder.Entity<OutboxMessage>(b =>
-        {
-            b.ToTable(GrantManagerConsts.DbTablePrefix + "OutboxMessages",
-                GrantManagerConsts.DbSchema);
-
-            b.ConfigureByConvention();
-
-            b.Property(x => x.Source).IsRequired().HasMaxLength(50);
-            b.Property(x => x.MessageId).IsRequired().HasMaxLength(64);
-            b.Property(x => x.OriginalMessageId).IsRequired().HasMaxLength(64);
-            b.Property(x => x.CorrelationId).HasMaxLength(128);
-            b.Property(x => x.DataType).IsRequired().HasMaxLength(100);
-            b.Property(x => x.AckStatus).IsRequired().HasMaxLength(20);
-            b.Property(x => x.Details).HasMaxLength(2000);
-
-            b.Property(x => x.Status)
-                .IsRequired()
-                .HasConversion(new EnumToStringConverter<MessageStatus>());
-
-            b.HasIndex(x => new { x.Source, x.Status });
-        });
-
-
+        modelBuilder.Entity<TenantToken>(b =>
+        {
+            b.ToTable(GrantManagerConsts.DbTablePrefix + "TenantTokens",
+                GrantManagerConsts.DbSchema);
+
+            b.ConfigureByConvention();
+        });
+
+        
+        modelBuilder.Entity<ApplicantTenantMap>(b =>
+        {
+            b.ToTable(GrantManagerConsts.DbTablePrefix + "ApplicantTenantMaps",
+                GrantManagerConsts.DbSchema);
+
+            b.ConfigureByConvention();
+
+            b.HasIndex(x => x.OidcSubUsername);
+            b.HasIndex(x => new { x.OidcSubUsername, x.TenantId }).IsUnique();
+        });
+
+        modelBuilder.Entity<InboxMessage>(b =>
+        {
+            b.ToTable(GrantManagerConsts.DbTablePrefix + "InboxMessages",
+                GrantManagerConsts.DbSchema);
+
+            b.ConfigureByConvention();
+
+            b.Property(x => x.Source).IsRequired().HasMaxLength(50);
+            b.Property(x => x.MessageId).IsRequired().HasMaxLength(64);
+            b.Property(x => x.CorrelationId).HasMaxLength(128);
+            b.Property(x => x.DataType).IsRequired().HasMaxLength(100);
+            b.Property(x => x.Payload).IsRequired().HasColumnType("jsonb");
+            b.Property(x => x.Details).HasMaxLength(2000);
+
+            b.Property(x => x.Status)
+                .IsRequired()
+                .HasConversion(new EnumToStringConverter<MessageStatus>());
+
+            b.HasIndex(x => x.MessageId).IsUnique();
+            b.HasIndex(x => new { x.Source, x.Status });
+        });
+
+        modelBuilder.Entity<OutboxMessage>(b =>
+        {
+            b.ToTable(GrantManagerConsts.DbTablePrefix + "OutboxMessages",
+                GrantManagerConsts.DbSchema);
+
+            b.ConfigureByConvention();
+
+            b.Property(x => x.Source).IsRequired().HasMaxLength(50);
+            b.Property(x => x.MessageId).IsRequired().HasMaxLength(64);
+            b.Property(x => x.OriginalMessageId).IsRequired().HasMaxLength(64);
+            b.Property(x => x.CorrelationId).HasMaxLength(128);
+            b.Property(x => x.DataType).IsRequired().HasMaxLength(100);
+            b.Property(x => x.AckStatus).IsRequired().HasMaxLength(20);
+            b.Property(x => x.Details).HasMaxLength(2000);
+
+            b.Property(x => x.Status)
+                .IsRequired()
+                .HasConversion(new EnumToStringConverter<MessageStatus>());
+
+            b.HasIndex(x => new { x.Source, x.Status });
+        });
+
+
         var allEntityTypes = modelBuilder.Model.GetEntityTypes();
         foreach (var type in allEntityTypes.Where(t => t.ClrType != typeof(ExtraPropertyDictionary)).Select(t => t.ClrType))
         {
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
index 31f7143595..9eaf23c95f 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
@@ -380,7 +380,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ConfigureFlex();
             modelBuilder.ConfigureNotifications();
             modelBuilder.ConfigureReporting();
-            modelBuilder.ConfigureAI();
         }
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.Designer.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.Designer.cs
new file mode 100644
index 0000000000..674858ab17
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.Designer.cs
@@ -0,0 +1,3030 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Unity.GrantManager.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    [DbContext(typeof(GrantManagerDbContext))]
+    [Migration("20260324221338_AddAIPromptTables")]
+    partial class AddAIPromptTables
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
+                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzBlobTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<byte[]>("BlobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("blob_data");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_blob_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCalendar", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("CalendarName")
+                        .HasColumnType("text")
+                        .HasColumnName("calendar_name");
+
+                    b.Property<byte[]>("Calendar")
+                        .IsRequired()
+                        .HasColumnType("bytea")
+                        .HasColumnName("calendar");
+
+                    b.HasKey("SchedulerName", "CalendarName");
+
+                    b.ToTable("qrtz_calendars", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCronTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("CronExpression")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("cron_expression");
+
+                    b.Property<string>("TimeZoneId")
+                        .HasColumnType("text")
+                        .HasColumnName("time_zone_id");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_cron_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzFiredTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("EntryId")
+                        .HasColumnType("text")
+                        .HasColumnName("entry_id");
+
+                    b.Property<long>("FiredTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("fired_time");
+
+                    b.Property<string>("InstanceName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("instance_name");
+
+                    b.Property<bool>("IsNonConcurrent")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_nonconcurrent");
+
+                    b.Property<string>("JobGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<int>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<bool?>("RequestsRecovery")
+                        .HasColumnType("bool")
+                        .HasColumnName("requests_recovery");
+
+                    b.Property<long>("ScheduledTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("sched_time");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("state");
+
+                    b.Property<string>("TriggerGroup")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("TriggerName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.HasKey("SchedulerName", "EntryId");
+
+                    b.HasIndex("InstanceName")
+                        .HasDatabaseName("idx_qrtz_ft_trig_inst_name");
+
+                    b.HasIndex("JobGroup")
+                        .HasDatabaseName("idx_qrtz_ft_job_group");
+
+                    b.HasIndex("JobName")
+                        .HasDatabaseName("idx_qrtz_ft_job_name");
+
+                    b.HasIndex("RequestsRecovery")
+                        .HasDatabaseName("idx_qrtz_ft_job_req_recovery");
+
+                    b.HasIndex("TriggerGroup")
+                        .HasDatabaseName("idx_qrtz_ft_trig_group");
+
+                    b.HasIndex("TriggerName")
+                        .HasDatabaseName("idx_qrtz_ft_trig_name");
+
+                    b.HasIndex("SchedulerName", "TriggerName", "TriggerGroup")
+                        .HasDatabaseName("idx_qrtz_ft_trig_nm_gp");
+
+                    b.ToTable("qrtz_fired_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("JobName")
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<string>("JobGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<bool>("IsDurable")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_durable");
+
+                    b.Property<bool>("IsNonConcurrent")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_nonconcurrent");
+
+                    b.Property<bool>("IsUpdateData")
+                        .HasColumnType("bool")
+                        .HasColumnName("is_update_data");
+
+                    b.Property<string>("JobClassName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_class_name");
+
+                    b.Property<byte[]>("JobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("job_data");
+
+                    b.Property<bool>("RequestsRecovery")
+                        .HasColumnType("bool")
+                        .HasColumnName("requests_recovery");
+
+                    b.HasKey("SchedulerName", "JobName", "JobGroup");
+
+                    b.HasIndex("RequestsRecovery")
+                        .HasDatabaseName("idx_qrtz_j_req_recovery");
+
+                    b.ToTable("qrtz_job_details", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzLock", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("LockName")
+                        .HasColumnType("text")
+                        .HasColumnName("lock_name");
+
+                    b.HasKey("SchedulerName", "LockName");
+
+                    b.ToTable("qrtz_locks", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzPausedTriggerGroup", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.HasKey("SchedulerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_paused_trigger_grps", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSchedulerState", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("InstanceName")
+                        .HasColumnType("text")
+                        .HasColumnName("instance_name");
+
+                    b.Property<long>("CheckInInterval")
+                        .HasColumnType("bigint")
+                        .HasColumnName("checkin_interval");
+
+                    b.Property<long>("LastCheckInTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("last_checkin_time");
+
+                    b.HasKey("SchedulerName", "InstanceName");
+
+                    b.ToTable("qrtz_scheduler_state", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimplePropertyTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<bool?>("BooleanProperty1")
+                        .HasColumnType("bool")
+                        .HasColumnName("bool_prop_1");
+
+                    b.Property<bool?>("BooleanProperty2")
+                        .HasColumnType("bool")
+                        .HasColumnName("bool_prop_2");
+
+                    b.Property<decimal?>("DecimalProperty1")
+                        .HasColumnType("numeric")
+                        .HasColumnName("dec_prop_1");
+
+                    b.Property<decimal?>("DecimalProperty2")
+                        .HasColumnType("numeric")
+                        .HasColumnName("dec_prop_2");
+
+                    b.Property<int?>("IntegerProperty1")
+                        .HasColumnType("integer")
+                        .HasColumnName("int_prop_1");
+
+                    b.Property<int?>("IntegerProperty2")
+                        .HasColumnType("integer")
+                        .HasColumnName("int_prop_2");
+
+                    b.Property<long?>("LongProperty1")
+                        .HasColumnType("bigint")
+                        .HasColumnName("long_prop_1");
+
+                    b.Property<long?>("LongProperty2")
+                        .HasColumnType("bigint")
+                        .HasColumnName("long_prop_2");
+
+                    b.Property<string>("StringProperty1")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_1");
+
+                    b.Property<string>("StringProperty2")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_2");
+
+                    b.Property<string>("StringProperty3")
+                        .HasColumnType("text")
+                        .HasColumnName("str_prop_3");
+
+                    b.Property<string>("TimeZoneId")
+                        .HasColumnType("text")
+                        .HasColumnName("time_zone_id");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_simprop_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimpleTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<long>("RepeatCount")
+                        .HasColumnType("bigint")
+                        .HasColumnName("repeat_count");
+
+                    b.Property<long>("RepeatInterval")
+                        .HasColumnType("bigint")
+                        .HasColumnName("repeat_interval");
+
+                    b.Property<long>("TimesTriggered")
+                        .HasColumnType("bigint")
+                        .HasColumnName("times_triggered");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.ToTable("qrtz_simple_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.Property<string>("SchedulerName")
+                        .HasColumnType("text")
+                        .HasColumnName("sched_name");
+
+                    b.Property<string>("TriggerName")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_name");
+
+                    b.Property<string>("TriggerGroup")
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_group");
+
+                    b.Property<string>("CalendarName")
+                        .HasColumnType("text")
+                        .HasColumnName("calendar_name");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("text")
+                        .HasColumnName("description");
+
+                    b.Property<long?>("EndTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("end_time");
+
+                    b.Property<byte[]>("JobData")
+                        .HasColumnType("bytea")
+                        .HasColumnName("job_data");
+
+                    b.Property<string>("JobGroup")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_group");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("job_name");
+
+                    b.Property<short?>("MisfireInstruction")
+                        .HasColumnType("smallint")
+                        .HasColumnName("misfire_instr");
+
+                    b.Property<long?>("NextFireTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("next_fire_time");
+
+                    b.Property<long?>("PreviousFireTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("prev_fire_time");
+
+                    b.Property<int?>("Priority")
+                        .HasColumnType("integer")
+                        .HasColumnName("priority");
+
+                    b.Property<long>("StartTime")
+                        .HasColumnType("bigint")
+                        .HasColumnName("start_time");
+
+                    b.Property<string>("TriggerState")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_state");
+
+                    b.Property<string>("TriggerType")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("trigger_type");
+
+                    b.HasKey("SchedulerName", "TriggerName", "TriggerGroup");
+
+                    b.HasIndex("NextFireTime")
+                        .HasDatabaseName("idx_qrtz_t_next_fire_time");
+
+                    b.HasIndex("TriggerState")
+                        .HasDatabaseName("idx_qrtz_t_state");
+
+                    b.HasIndex("NextFireTime", "TriggerState")
+                        .HasDatabaseName("idx_qrtz_t_nft_st");
+
+                    b.HasIndex("SchedulerName", "JobName", "JobGroup");
+
+                    b.ToTable("qrtz_triggers", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AIPrompts", "AI");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeveloperNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<int?>("MaxTokens")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MetadataJson")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("SystemPrompt")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TargetModel")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("TargetProvider")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<double>("Temperature")
+                        .HasColumnType("double precision");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserPromptTemplate")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("VersionNumber")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId", "VersionNumber")
+                        .IsUnique();
+
+                    b.ToTable("AIPromptVersions", "AI");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Applicants.ApplicantTenantMap", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime>("LastUpdated")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("OidcSubUsername")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("TenantName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OidcSubUsername");
+
+                    b.HasIndex("OidcSubUsername", "TenantId")
+                        .IsUnique();
+
+                    b.ToTable("ApplicantTenantMaps", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Integrations.CasClientCode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientCode")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.Property<string>("ClientId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("FinancialMinistry")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTimeOffset?>("LastUpdatedTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("MinistryPrefix")
+                        .IsRequired()
+                        .HasMaxLength(3)
+                        .HasColumnType("character varying(3)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CasClientCodes", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Integrations.DynamicUrl", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<string>("KeyName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DynamicUrls", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Community", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Communities", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.EconomicRegion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EconomicRegionCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("EconomicRegionName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EconomicRegions", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.ElectoralDistrict", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ElectoralDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ElectoralDistrictName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ElectoralDistricts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.RegionalDistrict", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("EconomicRegionCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("RegionalDistrictCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("RegionalDistrictName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("RegionalDistricts", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Sector", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("SectorCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SectorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Sectors", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid>("SectorId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("SubSectorCode")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("SubSectorName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SectorId");
+
+                    b.ToTable("SubSectors", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Messaging.InboxMessage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DataType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Details")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Payload")
+                        .IsRequired()
+                        .HasColumnType("jsonb");
+
+                    b.Property<DateTime?>("ProcessedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("ReceivedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MessageId")
+                        .IsUnique();
+
+                    b.HasIndex("Source", "Status");
+
+                    b.ToTable("InboxMessages", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Messaging.OutboxMessage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AckStatus")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DataType")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Details")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("OriginalMessageId")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime?>("PublishedAt")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Source")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Source", "Status");
+
+                    b.ToTable("OutboxMessages", (string)null);
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Tokens.TenantToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TenantTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)")
+                        .HasColumnName("ApplicationName");
+
+                    b.Property<string>("BrowserInfo")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("BrowserInfo");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ClientId");
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ClientIpAddress");
+
+                    b.Property<string>("ClientName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("ClientName");
+
+                    b.Property<string>("Comments")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Comments");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("CorrelationId");
+
+                    b.Property<string>("Exceptions")
+                        .HasColumnType("text");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnType("integer")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("HttpMethod")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("HttpMethod");
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnType("integer")
+                        .HasColumnName("HttpStatusCode");
+
+                    b.Property<Guid?>("ImpersonatorTenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("ImpersonatorTenantId");
+
+                    b.Property<string>("ImpersonatorTenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("ImpersonatorTenantName");
+
+                    b.Property<Guid?>("ImpersonatorUserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("ImpersonatorUserId");
+
+                    b.Property<string>("ImpersonatorUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("ImpersonatorUserName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("TenantName");
+
+                    b.Property<string>("Url")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Url");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("UserId");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "ExecutionTime");
+
+                    b.HasIndex("TenantId", "UserId", "ExecutionTime");
+
+                    b.ToTable("AuditLogs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<int>("ExecutionDuration")
+                        .HasColumnType("integer")
+                        .HasColumnName("ExecutionDuration");
+
+                    b.Property<DateTime>("ExecutionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("ExecutionTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("MethodName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("MethodName");
+
+                    b.Property<string>("Parameters")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)")
+                        .HasColumnName("Parameters");
+
+                    b.Property<string>("ServiceName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("ServiceName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
+
+                    b.ToTable("AuditLogActions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("AuditLogId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("AuditLogId");
+
+                    b.Property<DateTime>("ChangeTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("ChangeTime");
+
+                    b.Property<byte>("ChangeType")
+                        .HasColumnType("smallint")
+                        .HasColumnName("ChangeType");
+
+                    b.Property<string>("EntityId")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("EntityId");
+
+                    b.Property<Guid?>("EntityTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("EntityTypeFullName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("EntityTypeFullName");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AuditLogId");
+
+                    b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
+
+                    b.ToTable("EntityChanges", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("EntityChangeId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("NewValue")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("NewValue");
+
+                    b.Property<string>("OriginalValue")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)")
+                        .HasColumnName("OriginalValue");
+
+                    b.Property<string>("PropertyName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("PropertyName");
+
+                    b.Property<string>("PropertyTypeFullName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("PropertyTypeFullName");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EntityChangeId");
+
+                    b.ToTable("EntityPropertyChanges", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsAbandoned")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false);
+
+                    b.Property<string>("JobArgs")
+                        .IsRequired()
+                        .HasMaxLength(1048576)
+                        .HasColumnType("character varying(1048576)");
+
+                    b.Property<string>("JobName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime?>("LastTryTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<DateTime>("NextTryTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<byte>("Priority")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasDefaultValue((byte)15);
+
+                    b.Property<short>("TryCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("smallint")
+                        .HasDefaultValue((short)0);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IsAbandoned", "NextTryTime");
+
+                    b.ToTable("BackgroundJobs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("AllowedProviders")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsAvailableToHost")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ValueType")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Features", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("FeatureGroups", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("FeatureValues", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("Regex")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("RegexDescription")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("Required")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("ValueType")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ClaimTypes", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("SourceTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TargetTenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId")
+                        .IsUnique();
+
+                    b.ToTable("LinkUsers", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsDefault");
+
+                    b.Property<bool>("IsPublic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsPublic");
+
+                    b.Property<bool>("IsStatic")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsStatic");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("Roles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("RoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Action")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<string>("ApplicationName")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<string>("BrowserInfo")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ClientIpAddress")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<string>("CorrelationId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Identity")
+                        .HasMaxLength(96)
+                        .HasColumnType("character varying(96)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("TenantName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Action");
+
+                    b.HasIndex("TenantId", "ApplicationName");
+
+                    b.HasIndex("TenantId", "Identity");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("SecurityLogs", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClientId")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Device")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("DeviceInfo")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("IpAddresses")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<DateTime?>("LastAccessed")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<string>("SessionId")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<DateTime>("SignedIn")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Device");
+
+                    b.HasIndex("SessionId");
+
+                    b.HasIndex("TenantId", "UserId");
+
+                    b.ToTable("Sessions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("AccessFailedCount")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer")
+                        .HasDefaultValue(0)
+                        .HasColumnName("AccessFailedCount");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("Email");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("EmailConfirmed");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean")
+                        .HasColumnName("IsActive");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<bool>("IsExternal")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsExternal");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<DateTimeOffset?>("LastPasswordChangeTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("LockoutEnabled");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Name");
+
+                    b.Property<string>("NormalizedEmail")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("NormalizedEmail");
+
+                    b.Property<string>("NormalizedUserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("NormalizedUserName");
+
+                    b.Property<string>("OidcSub")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PasswordHash")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("PasswordHash");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasMaxLength(16)
+                        .HasColumnType("character varying(16)")
+                        .HasColumnName("PhoneNumber");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("PhoneNumberConfirmed");
+
+                    b.Property<string>("SecurityStamp")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("SecurityStamp");
+
+                    b.Property<bool>("ShouldChangePasswordOnNextLogin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Surname")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)")
+                        .HasColumnName("Surname");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("TwoFactorEnabled");
+
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)")
+                        .HasColumnName("UserName");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Email");
+
+                    b.HasIndex("NormalizedEmail");
+
+                    b.HasIndex("NormalizedUserName");
+
+                    b.HasIndex("UserName");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ClaimType")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("UserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("SourceUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("timestamp without time zone");
+
+                    b.Property<Guid>("TargetUserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserDelegations", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(196)
+                        .HasColumnType("character varying(196)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "LoginProvider");
+
+                    b.HasIndex("LoginProvider", "ProviderKey");
+
+                    b.ToTable("UserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("OrganizationUnitId", "UserId");
+
+                    b.HasIndex("UserId", "OrganizationUnitId");
+
+                    b.ToTable("UserOrganizationUnits", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId", "UserId");
+
+                    b.ToTable("UserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("UserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Code")
+                        .IsRequired()
+                        .HasMaxLength(95)
+                        .HasColumnType("character varying(95)")
+                        .HasColumnName("Code");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)")
+                        .HasColumnName("DisplayName");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code");
+
+                    b.HasIndex("ParentId");
+
+                    b.ToTable("OrganizationUnits", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.Property<Guid>("OrganizationUnitId")
+                        .HasColumnType("uuid");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("OrganizationUnitId", "RoleId");
+
+                    b.HasIndex("RoleId", "OrganizationUnitId");
+
+                    b.ToTable("OrganizationUnitRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("GroupName")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<byte>("MultiTenancySide")
+                        .HasColumnType("smallint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ParentName")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("StateCheckers")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupName");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Permissions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("PermissionGrants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("PermissionGroups", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("ProviderName")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name", "ProviderName", "ProviderKey")
+                        .IsUnique();
+
+                    b.ToTable("Settings", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("DefaultValue")
+                        .HasMaxLength(2048)
+                        .HasColumnType("character varying(2048)");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(512)
+                        .HasColumnType("character varying(512)");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEncrypted")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsInherited")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsVisibleToClients")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(128)
+                        .HasColumnType("character varying(128)");
+
+                    b.Property<string>("Providers")
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("SettingDefinitions", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<int>("EntityVersion")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("boolean")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("NormalizedName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.HasIndex("NormalizedName");
+
+                    b.ToTable("Tenants", (string)null);
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(64)
+                        .HasColumnType("character varying(64)");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(1024)
+                        .HasColumnType("character varying(1024)");
+
+                    b.HasKey("TenantId", "Name");
+
+                    b.ToTable("TenantConnectionStrings", (string)null);
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzBlobTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("BlobTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzCronTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("CronTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimplePropertyTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("SimplePropertyTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzSimpleTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", "Trigger")
+                        .WithMany("SimpleTriggers")
+                        .HasForeignKey("SchedulerName", "TriggerName", "TriggerGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Trigger");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.HasOne("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", "JobDetail")
+                        .WithMany("Triggers")
+                        .HasForeignKey("SchedulerName", "JobName", "JobGroup")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("JobDetail");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", b =>
+                {
+                    b.HasOne("Unity.AI.Domain.AIPrompt", "Prompt")
+                        .WithMany("Versions")
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Prompt");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", b =>
+                {
+                    b.HasOne("Unity.GrantManager.Locality.Sector", "Sector")
+                        .WithMany("SubSectors")
+                        .HasForeignKey("SectorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Sector");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("Actions")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.AuditLog", null)
+                        .WithMany("EntityChanges")
+                        .HasForeignKey("AuditLogId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
+                {
+                    b.HasOne("Volo.Abp.AuditLogging.EntityChange", null)
+                        .WithMany("PropertyChanges")
+                        .HasForeignKey("EntityChangeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Claims")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Logins")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("OrganizationUnits")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.IdentityUser", null)
+                        .WithMany("Tokens")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany()
+                        .HasForeignKey("ParentId");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
+                {
+                    b.HasOne("Volo.Abp.Identity.OrganizationUnit", null)
+                        .WithMany("Roles")
+                        .HasForeignKey("OrganizationUnitId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Volo.Abp.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
+                {
+                    b.HasOne("Volo.Abp.TenantManagement.Tenant", null)
+                        .WithMany("ConnectionStrings")
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzJobDetail", b =>
+                {
+                    b.Navigation("Triggers");
+                });
+
+            modelBuilder.Entity("AppAny.Quartz.EntityFrameworkCore.Migrations.QuartzTrigger", b =>
+                {
+                    b.Navigation("BlobTriggers");
+
+                    b.Navigation("CronTriggers");
+
+                    b.Navigation("SimplePropertyTriggers");
+
+                    b.Navigation("SimpleTriggers");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
+                {
+                    b.Navigation("Versions");
+                });
+
+            modelBuilder.Entity("Unity.GrantManager.Locality.Sector", b =>
+                {
+                    b.Navigation("SubSectors");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
+                {
+                    b.Navigation("Actions");
+
+                    b.Navigation("EntityChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
+                {
+                    b.Navigation("PropertyChanges");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
+                {
+                    b.Navigation("Claims");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
+                {
+                    b.Navigation("Claims");
+
+                    b.Navigation("Logins");
+
+                    b.Navigation("OrganizationUnits");
+
+                    b.Navigation("Roles");
+
+                    b.Navigation("Tokens");
+                });
+
+            modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
+                {
+                    b.Navigation("Roles");
+                });
+
+            modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
+                {
+                    b.Navigation("ConnectionStrings");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.cs
new file mode 100644
index 0000000000..e390d9dc19
--- /dev/null
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260324221338_AddAIPromptTables.cs
@@ -0,0 +1,98 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Unity.GrantManager.Migrations.HostMigrations
+{
+    /// <inheritdoc />
+    public partial class AddAIPromptTables : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.EnsureSchema(
+                name: "AI");
+
+            migrationBuilder.CreateTable(
+                name: "AIPrompts",
+                schema: "AI",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uuid", nullable: true),
+                    Name = table.Column<string>(type: "character varying(200)", maxLength: 200, nullable: false),
+                    Description = table.Column<string>(type: "character varying(2000)", maxLength: 2000, nullable: true),
+                    Type = table.Column<int>(type: "integer", nullable: false),
+                    IsActive = table.Column<bool>(type: "boolean", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "text", nullable: false),
+                    ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uuid", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AIPrompts", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AIPromptVersions",
+                schema: "AI",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uuid", nullable: false),
+                    TenantId = table.Column<Guid>(type: "uuid", nullable: true),
+                    PromptId = table.Column<Guid>(type: "uuid", nullable: false),
+                    VersionNumber = table.Column<int>(type: "integer", nullable: false),
+                    SystemPrompt = table.Column<string>(type: "text", nullable: false),
+                    UserPromptTemplate = table.Column<string>(type: "text", nullable: false),
+                    DeveloperNotes = table.Column<string>(type: "text", nullable: true),
+                    TargetModel = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
+                    TargetProvider = table.Column<string>(type: "character varying(100)", maxLength: 100, nullable: true),
+                    Temperature = table.Column<double>(type: "double precision", nullable: false),
+                    MaxTokens = table.Column<int>(type: "integer", nullable: true),
+                    IsPublished = table.Column<bool>(type: "boolean", nullable: false),
+                    IsDeprecated = table.Column<bool>(type: "boolean", nullable: false),
+                    MetadataJson = table.Column<string>(type: "jsonb", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "text", nullable: false),
+                    ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "timestamp without time zone", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uuid", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AIPromptVersions", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AIPromptVersions_AIPrompts_PromptId",
+                        column: x => x.PromptId,
+                        principalSchema: "AI",
+                        principalTable: "AIPrompts",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AIPromptVersions_PromptId_VersionNumber",
+                schema: "AI",
+                table: "AIPromptVersions",
+                columns: new[] { "PromptId", "VersionNumber" },
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AIPromptVersions",
+                schema: "AI");
+
+            migrationBuilder.DropTable(
+                name: "AIPrompts",
+                schema: "AI");
+        }
+    }
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs
index e3fd3ba2df..2faf68a4e6 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/GrantManagerDbContextModelSnapshot.cs
@@ -467,6 +467,148 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("qrtz_triggers", (string)null);
                 });
 
+            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(2000)
+                        .HasColumnType("character varying(2000)");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("character varying(200)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AIPrompts", "AI");
+                });
+
+            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("character varying(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("DeveloperNotes")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ExtraProperties")
+                        .IsRequired()
+                        .HasColumnType("text")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeprecated")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("IsPublished")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("timestamp without time zone")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<int?>("MaxTokens")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("MetadataJson")
+                        .HasColumnType("jsonb");
+
+                    b.Property<Guid>("PromptId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("SystemPrompt")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("TargetModel")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("TargetProvider")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<double>("Temperature")
+                        .HasColumnType("double precision");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("UserPromptTemplate")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<int>("VersionNumber")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PromptId", "VersionNumber")
+                        .IsUnique();
+
+                    b.ToTable("AIPromptVersions", "AI");
+                });
+
             modelBuilder.Entity("Unity.GrantManager.Applicants.ApplicantTenantMap", b =>
                 {
                     b.Property<Guid>("Id")
@@ -1023,8 +1165,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text");
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("TenantId");
+                        .HasColumnType("uuid");
 
                     b.HasKey("Id");
 
@@ -1118,8 +1259,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text");
 
                     b.Property<Guid?>("TenantId")
-                        .HasColumnType("uuid")
-                        .HasColumnName("TenantId");
+                        .HasColumnType("uuid");
 
                     b.HasKey("Id");
 
@@ -2670,6 +2810,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("JobDetail");
                 });
 
+            modelBuilder.Entity("Unity.AI.Domain.AIPromptVersion", b =>
+                {
+                    b.HasOne("Unity.AI.Domain.AIPrompt", "Prompt")
+                        .WithMany("Versions")
+                        .HasForeignKey("PromptId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Prompt");
+                });
+
             modelBuilder.Entity("Unity.GrantManager.Locality.SubSector", b =>
                 {
                     b.HasOne("Unity.GrantManager.Locality.Sector", "Sector")
@@ -2821,6 +2972,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Navigation("SimpleTriggers");
                 });
 
+            modelBuilder.Entity("Unity.AI.Domain.AIPrompt", b =>
+                {
+                    b.Navigation("Versions");
+                });
+
             modelBuilder.Entity("Unity.GrantManager.Locality.Sector", b =>
                 {
                     b.Navigation("SubSectors");

From 34822d9e464e08f8d25f79d7b745230a23500c94 Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 25 Mar 2026 14:16:26 -0700
Subject: [PATCH 34/38] AB#27730: Fix sonarqube issues

---
 .../Worksheets/WorksheetAppService.cs         |  8 +++----
 .../Components/WorksheetWidget/Worksheet.js   | 24 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs
index 45ee8efcb8..90b41405a2 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Application/Worksheets/WorksheetAppService.cs
@@ -147,13 +147,13 @@ public virtual async Task<WorksheetLinkedFormsDto> GetLinkedFormsAsync(Guid work
             var links = await worksheetLinkRepository.GetListByWorksheetAsync(worksheetId, CorrelationConsts.FormVersion);
             var result = new WorksheetLinkedFormsDto();
 
-            foreach (var link in links)
+            foreach (var correlationId in links.Select(link => link.CorrelationId))
             {
-                bool hasInstances = await worksheetInstanceRepository.AnyByWorksheetAndFormVersionAsync(worksheetId, link.CorrelationId);
+                bool hasInstances = await worksheetInstanceRepository.AnyByWorksheetAndFormVersionAsync(worksheetId, correlationId);
                 if (hasInstances)
-                    result.FormVersionIdsWithInstances.Add(link.CorrelationId);
+                    result.FormVersionIdsWithInstances.Add(correlationId);
                 else
-                    result.LinkedFormVersionIds.Add(link.CorrelationId);
+                    result.LinkedFormVersionIds.Add(correlationId);
             }
 
             return result;
diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
index 8b4bf1ea84..680c7249bb 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
@@ -152,18 +152,6 @@ $(function () {
             });
     }
 
-    function executeWorksheetDelete(worksheetId) {
-        unity.flex.worksheets.worksheet.delete(worksheetId)
-            .done(function () {
-                PubSub.publish('refresh_worksheet_list', { worksheetId: worksheetId, action: 'Delete' });
-                abp.notify.success('Worksheet deleted successfully.', 'Delete Worksheet');
-            })
-            .fail(function (e) {
-                abp.notify.error('Failed to delete worksheet.');
-                console.warn('Worksheet deletion failed:', e);
-            });
-    }
-
     function openEditWorksheetModal(worksheetId) {
         editWorksheetModal.open({
             worksheetId: worksheetId,
@@ -275,3 +263,15 @@ $(function () {
         }
     );
 });
+
+function executeWorksheetDelete(worksheetId) {
+    unity.flex.worksheets.worksheet.delete(worksheetId)
+        .done(function () {
+            PubSub.publish('refresh_worksheet_list', { worksheetId: worksheetId, action: 'Delete' });
+            abp.notify.success('Worksheet deleted successfully.', 'Delete Worksheet');
+        })
+        .fail(function (e) {
+            abp.notify.error('Failed to delete worksheet.');
+            console.warn('Worksheet deletion failed:', e);
+        });
+}

From 939edc07cf8ddd7ca865e324deebf761656288fb Mon Sep 17 00:00:00 2001
From: aurelio-aot <aurelio.pascual.jr@gmail.com>
Date: Wed, 25 Mar 2026 14:29:33 -0700
Subject: [PATCH 35/38] AB#27730: Fix sonarqube issue

---
 .../Components/WorksheetWidget/Worksheet.js   | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
index 680c7249bb..90f290ecbf 100644
--- a/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
+++ b/applications/Unity.GrantManager/modules/Unity.Flex/src/Unity.Flex.Web/Views/Shared/Components/WorksheetWidget/Worksheet.js
@@ -121,37 +121,6 @@ $(function () {
             });
     }
 
-    function handleDeleteWorksheet(worksheetId, worksheetTitle, worksheetName) {
-        unity.grantManager.settingManagement.worksheetConfiguration.getDeletionCheck(worksheetId)
-            .done(function (result) {
-                if (result.blockingFormNames && result.blockingFormNames.length > 0) {
-                    abp.message.error(
-                        'This worksheet cannot be deleted because it is already used by the following forms:\n' + result.blockingFormNames.join('\n'),
-                        'Delete Worksheet'
-                    );
-                } else if (result.linkedFormNames && result.linkedFormNames.length > 0) {
-                    abp.message.error(
-                        'Unlink the worksheet (' + worksheetTitle + ' \u2013 ' + worksheetName + ') from the following forms before deletion:\n' + result.linkedFormNames.join('\n'),
-                        'Delete Worksheet'
-                    );
-                } else {
-                    abp.message.confirm(
-                        'Are you sure you want to delete the worksheet "' + worksheetTitle + '"?',
-                        'Delete Worksheet',
-                        function (confirmed) {
-                            if (confirmed) {
-                                executeWorksheetDelete(worksheetId);
-                            }
-                        }
-                    );
-                }
-            })
-            .fail(function (e) {
-                abp.notify.error('Failed to check worksheet deletion status.');
-                console.warn('Worksheet deletion check failed:', e);
-            });
-    }
-
     function openEditWorksheetModal(worksheetId) {
         editWorksheetModal.open({
             worksheetId: worksheetId,
@@ -264,6 +233,37 @@ $(function () {
     );
 });
 
+function handleDeleteWorksheet(worksheetId, worksheetTitle, worksheetName) {
+    unity.grantManager.settingManagement.worksheetConfiguration.getDeletionCheck(worksheetId)
+        .done(function (result) {
+            if (result.blockingFormNames && result.blockingFormNames.length > 0) {
+                abp.message.error(
+                    'This worksheet cannot be deleted because it is already used by the following forms:\n' + result.blockingFormNames.join('\n'),
+                    'Delete Worksheet'
+                );
+            } else if (result.linkedFormNames && result.linkedFormNames.length > 0) {
+                abp.message.error(
+                    'Unlink the worksheet (' + worksheetTitle + ' \u2013 ' + worksheetName + ') from the following forms before deletion:\n' + result.linkedFormNames.join('\n'),
+                    'Delete Worksheet'
+                );
+            } else {
+                abp.message.confirm(
+                    'Are you sure you want to delete the worksheet "' + worksheetTitle + '"?',
+                    'Delete Worksheet',
+                    function (confirmed) {
+                        if (confirmed) {
+                            executeWorksheetDelete(worksheetId);
+                        }
+                    }
+                );
+            }
+        })
+        .fail(function (e) {
+            abp.notify.error('Failed to check worksheet deletion status.');
+            console.warn('Worksheet deletion check failed:', e);
+        });
+}
+
 function executeWorksheetDelete(worksheetId) {
     unity.flex.worksheets.worksheet.delete(worksheetId)
         .done(function () {

From f3f78c92e93ad74c31933d43039cfbae647973be Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Wed, 25 Mar 2026 15:09:09 -0700
Subject: [PATCH 36/38] feature/AB#32437-EditPrompts-Fixusing

---
 .../EntityFrameworkCore/GrantTenantDbContext.cs                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
index 9eaf23c95f..ee2bdd7ed2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/EntityFrameworkCore/GrantTenantDbContext.cs
@@ -14,7 +14,6 @@
 using Unity.Flex.EntityFrameworkCore;
 using Unity.Notifications.EntityFrameworkCore;
 using Unity.Reporting.EntityFrameworkCore;
-using Unity.AI.EntityFrameworkCore;
 using Unity.GrantManager.GlobalTag;
 using Unity.GrantManager.Contacts;
 

From 858b0348884e773dc52383d332e4821ff52a0b7b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 25 Mar 2026 15:16:36 -0700
Subject: [PATCH 37/38] AB#32012 fix review list AI scoring button gating

---
 .../Views/Shared/Components/ReviewList/Default.cshtml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml
index 781bbdaab6..e9695e4594 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ReviewList/Default.cshtml
@@ -1,6 +1,6 @@
 <abp-row class="p-2 pt-0">
     <abp-column size="_12" class="d-flex justify-content-between align-items-center pb-2 pt-2">
-        <input type="hidden" id="ReviewListAIScoringEnabled" value="@((bool?)ViewBag.IsAIScoringEnabled == true)" />
+        <input type="hidden" id="ReviewListAIScoringEnabled" value="@(((bool?)ViewBag.IsAIScoringEnabled == true) ? "True" : "False")" />
         <div id="AdjudicationTitleRegion" class="d-flex align-items-center justify-content-start">
             <h6 class="ps-1 fw-bold m-0">Assessments</h6>
         </div>

From 80e2f3950351be3cdadab13930a4d0b98c45d0e6 Mon Sep 17 00:00:00 2001
From: JamesPasta <james.pasta@gov.bc.ca>
Date: Wed, 25 Mar 2026 15:49:37 -0700
Subject: [PATCH 38/38] feature/AB#32437-EditPrompts-FixDBMigration

---
 .../DataSeed/AIPromptDataSeeder.cs                  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 b0ed0cb959..dc0edc9a78 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
@@ -6,6 +6,7 @@
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
 
 namespace Unity.AI.DataSeed;
 
@@ -17,7 +18,8 @@ namespace Unity.AI.DataSeed;
 /// </summary>
 public class AIPromptDataSeeder(
     IRepository<AIPrompt, Guid> promptRepository,
-    IRepository<AIPromptVersion, Guid> versionRepository) : IDataSeedContributor, ITransientDependency
+    IRepository<AIPromptVersion, Guid> versionRepository,
+    ICurrentTenant currentTenant) : IDataSeedContributor, ITransientDependency
 {
     // Fixed deterministic GUIDs — never change these; they ensure idempotent re-seeding
     private static readonly Guid AnalysisPromptId   = new("4a100001-1000-4000-a000-000000000001");
@@ -28,9 +30,12 @@ public async Task SeedAsync(DataSeedContext context)
     {
         if (context.TenantId != null) return; // host database only
 
-        await SeedAnalysisPromptAsync();
-        await SeedAttachmentPromptAsync();
-        await SeedScoresheetPromptAsync();
+        using (currentTenant.Change(null))
+        {
+            await SeedAnalysisPromptAsync();
+            await SeedAttachmentPromptAsync();
+            await SeedScoresheetPromptAsync();
+        }
     }
 
     // ─── ANALYSIS ────────────────────────────────────────────────────────────