From 3a07dc9b2442281703e33aac4189f1097a6596ea Mon Sep 17 00:00:00 2001
From: Velang <Velang.Rao@gov.bc.ca>
Date: Thu, 9 Apr 2026 06:32:22 -0700
Subject: [PATCH 01/45] enhancing the paymentflow

---
 .../cypress/regression/ApprovalFlow.cy.ts     | 350 ++++++++++++++++--
 .../cypress/utilities/PageFactory.ts          |  41 +-
 .../Unity.AutoUI/cypress/utilities/index.ts   |   3 +
 3 files changed, 360 insertions(+), 34 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
index 5b480b2aab..fd9091b320 100644
--- a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
+++ b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
@@ -15,11 +15,13 @@
  * - Post-approval status and date validation on the Payments table
  */
 
-import { ApplicationsListPage } from "../pages/ApplicationsListPage";
-import { ApplicationDetailsPage } from "../pages/ApplicationDetailsPage";
-import { ReviewAssessmentPage } from "../pages/ReviewAssessmentPage";
-import { ApplicationDetailsRightTabPage } from "../pages/ApplicationDetailsRightTabPage";
-import { NavigationPage } from "../pages/NavigationPage";
+import {
+  ApplicationDetailsPageInstance,
+  ApplicationDetailsRightTabPageInstance,
+  ApplicationsListPageInstance,
+  NavigationPageInstance,
+  ReviewAssessmentPageInstance,
+} from "../utilities/PageFactory";
 import { loginIfNeeded } from "../support/auth";
 
 const isProd =
@@ -35,6 +37,7 @@ const TEST_CONFIG = {
   submissionId: null as string | null,
   grantProgram: "Default Grants Program",
   approvedAmount: "5000",
+  assignOwner: "Unity User1",
   supplierNumber: Cypress.env("environment") === "TEST" ? "2002712" : "2009366",
   paymentGroup: "Cheque" as const,
   testComment: "Test comment from automated regression test",
@@ -48,13 +51,29 @@ const TEST_CONFIG = {
   },
 };
 
+const STATUS_ACTIONS = {
+  menuButton: "button.dropdown-toggle[data-bs-toggle='dropdown']",
+  startReview: "#Application_StartReviewButton",
+  completeReview: "#Application_CompleteReviewButton",
+  startAssessment: "#Application_StartAssessmentButton",
+  completeAssessment: "#Application_CompleteAssessmentButton",
+  approve: "#Application_ApproveButton",
+};
+
+const ADJUDICATION_ACTIONS = {
+  completeAssessment: "#AdjudicationTeamLeadActionBar #CompleteButton",
+};
+
+const BREADCRUMB_STATUS_SELECTOR =
+  ".application-details-breadcrumb .application-status";
+
 (isProd ? describe.skip : describe)("Approval Flow Regression Test", () => {
   // Page object instances reused across all tests
-  const listPage = new ApplicationsListPage();
-  const detailsPage = new ApplicationDetailsPage();
-  const reviewPage = new ReviewAssessmentPage();
-  const rightTabPage = new ApplicationDetailsRightTabPage();
-  const navPage = new NavigationPage();
+  const listPage = ApplicationsListPageInstance();
+  const detailsPage = ApplicationDetailsPageInstance();
+  const reviewPage = ReviewAssessmentPageInstance();
+  const rightTabPage = ApplicationDetailsRightTabPageInstance();
+  const navPage = NavigationPageInstance();
 
   // Resolved after "Fetch submission ID from API" — shared across all subsequent tests
   let submissionId: string;
@@ -73,6 +92,218 @@ const TEST_CONFIG = {
     cy.contains("tr", submissionId, { timeout: 20000 }).should("exist");
   }
 
+  function openStatusActionsMenu(): void {
+    cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .should("be.visible")
+      .click({ force: true });
+    cy.get("ul.dropdown-menu", { timeout: 20000 }).should("be.visible");
+  }
+
+  function clickStatusAction(actionSelector: string): void {
+    openStatusActionsMenu();
+    cy.get(actionSelector, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .should("be.visible")
+      .and("not.be.disabled")
+      .click({ force: true });
+  }
+
+  function clickStatusActionIfEnabled(
+    actionSelector: string,
+    actionName: string,
+  ): void {
+    openStatusActionsMenu();
+    cy.get(actionSelector, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .should("be.visible")
+      .then(($button) => {
+        if ($button.is(":disabled")) {
+          cy.log(`${actionName} is disabled; likely already progressed`);
+          return;
+        }
+
+        cy.wrap($button).click({ force: true });
+        confirmStatusActionIfNeeded();
+      });
+  }
+
+  function confirmStatusActionIfNeeded(): void {
+    // Short grace period so whichever confirmation dialog appears has time to mount.
+    cy.wait(300);
+    cy.get("body").then(($body) => {
+      if ($body.find(".swal2-popup .swal2-confirm").length > 0) {
+        cy.get(".swal2-popup .swal2-confirm", { timeout: 20000 })
+          .should("be.visible")
+          .click({ force: true });
+        return;
+      }
+
+      if (
+        $body.find(".modal.show .modal-content:contains('Confirm Action')")
+          .length > 0
+      ) {
+        cy.get(".modal.show", { timeout: 20000 })
+          .should("be.visible")
+          .within(() => {
+            cy.contains("button", /^Confirm$/i, { timeout: 20000 })
+              .should("be.visible")
+              .click({ force: true });
+          });
+      }
+    });
+  }
+
+  function dismissBlockingModalIfPresent(): void {
+    cy.get("body").then(($body) => {
+      if ($body.find(".swal2-container .swal2-confirm").length > 0) {
+        cy.get(".swal2-container .swal2-confirm", { timeout: 20000 })
+          .should("be.visible")
+          .click({ force: true });
+      }
+    });
+  }
+
+  function selectFirstAvailableOptionByLabel(labelText: string): void {
+    cy.get("body").then(($body) => {
+      if ($body.find(`label:contains('${labelText}'):visible`).length === 0) {
+        cy.log(`Label not found (skip): ${labelText}`);
+        return;
+      }
+
+      cy.contains("label", labelText, { timeout: 10000 })
+        .first()
+        .then(($label) => {
+          const fieldId = ($label.attr("for") || "").trim();
+          if (!fieldId) {
+            cy.log(`No 'for' attribute on label (skip): ${labelText}`);
+            return;
+          }
+
+          const selector = `#${fieldId}`;
+          if ($body.find(selector).length === 0) {
+            cy.log(`Field not found by id (skip): ${selector}`);
+            return;
+          }
+
+          cy.get(selector, { timeout: 10000 }).then(($select) => {
+            const options = $select.find("option").toArray();
+            const candidate = options.find((opt) => {
+              const value = (opt.getAttribute("value") || "").trim();
+              const text = (opt.textContent || "").trim().toLowerCase();
+              return value !== "" && text !== "please choose...";
+            });
+
+            const value = candidate?.getAttribute("value");
+            if (value) {
+              cy.wrap($select).select(value, { force: true });
+            }
+          });
+        });
+    });
+  }
+
+  function populateReviewFieldsRequiredForCompleteReview(): void {
+    detailsPage.goToReviewAssessmentTab();
+
+    // The tab can render asynchronously; ensure form fields are ready before typing.
+    cy.get("#formio, #ApprovalView_ApprovedAmount", { timeout: 30000 }).should(
+      "exist",
+    );
+
+    cy.get("body").then(($body) => {
+      if ($body.find("#ApprovalView_ApprovedAmount").length > 0) {
+        reviewPage.enterApprovedAmount(TEST_CONFIG.approvedAmount);
+      } else {
+        cy.log("Approved amount field not present yet; skipping amount entry");
+      }
+
+      if ($body.find("#ApprovalView_FinalDecisionDate").length > 0) {
+        reviewPage.setDecisionDateToToday();
+      } else {
+        cy.log("Decision date field not present yet; skipping date entry");
+      }
+    });
+
+    selectFirstAvailableOptionByLabel("Likelihood of Funding");
+    selectFirstAvailableOptionByLabel("Due Diligence Status");
+    selectFirstAvailableOptionByLabel("Assessment Result");
+    reviewPage.clickSave();
+  }
+
+  function assignSubmissionFromList(ownerName: string): void {
+    dismissBlockingModalIfPresent();
+
+    listPage
+      .selectQuickDateRange("alltime")
+      .waitForTableRefresh()
+      .searchForSubmission(submissionId)
+      .selectRowByText(submissionId);
+
+    cy.get("#assignApplication", { timeout: 20000 })
+      .should("exist")
+      .and("not.have.class", "action-bar-btn-unavailable")
+      .and("be.visible")
+      .click({ force: true });
+
+    cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
+      "be.visible",
+    );
+
+    cy.get("#AssigneeId", { timeout: 20000 })
+      .should("be.visible")
+      .select(ownerName);
+
+    cy.get("#user-tags-input", { timeout: 20000 })
+      .should("be.visible")
+      .clear()
+      .type(ownerName, { delay: 0 });
+
+    cy.get("body").then(($body) => {
+      if (
+        $body.find(".tags-suggestion-container .tags-suggestion-element")
+          .length > 0
+      ) {
+        cy.get(".tags-suggestion-container .tags-suggestion-element", {
+          timeout: 10000,
+        })
+          .contains(ownerName)
+          .click({ force: true });
+      } else {
+        cy.get("#user-tags-input").type("{enter}");
+      }
+    });
+
+    cy.contains(".modal-footer button", "Save", { timeout: 20000 })
+      .should("be.visible")
+      .and("not.be.disabled")
+      .click({ force: true });
+
+    cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
+      "not.exist",
+    );
+  }
+
+  function clickAdjudicationActionIfEnabled(actionSelector: string): void {
+    cy.get("body").then(($body) => {
+      if ($body.find(actionSelector).length > 0) {
+        cy.get(actionSelector, { timeout: 20000 }).then(($button) => {
+          if (!$button.is(":disabled")) {
+            cy.wrap($button).click({ force: true });
+            confirmStatusActionIfNeeded();
+          } else {
+            cy.log(`Action is disabled: ${actionSelector}`);
+          }
+        });
+      } else {
+        cy.log(`Action not present: ${actionSelector}`);
+      }
+    });
+  }
+
   /** Select the submissionId row and open the Approve Payments modal. */
   function selectRowAndOpenApproveModal(): void {
     cy.contains("tr", submissionId, { timeout: 20000 })
@@ -168,54 +399,88 @@ const TEST_CONFIG = {
       .searchForSubmission(submissionId);
   });
 
+  it("Assign submission on application list", () => {
+    assignSubmissionFromList(TEST_CONFIG.assignOwner);
+  });
+
   it("Select submission and open details", () => {
-    listPage.selectRowByText(submissionId).clickOpenButton();
+    dismissBlockingModalIfPresent();
+
+    cy.location("pathname", { timeout: 20000 }).then((pathname) => {
+      if (pathname.includes("/GrantApplications/Details")) {
+        cy.log("Already on details page after assignment");
+      } else {
+        listPage
+          .selectQuickDateRange("alltime")
+          .waitForTableRefresh()
+          .searchForSubmission(submissionId)
+          .selectRowByText(submissionId)
+          .clickOpenButton();
+      }
+    });
+
+    cy.get(BREADCRUMB_STATUS_SELECTOR, { timeout: 20000 })
+      .should("be.visible")
+      .invoke("text")
+      .then((statusText) => {
+        const normalized = statusText.trim().toLowerCase();
+        expect(
+          ["submitted", "assigned"],
+          "Expected initial status to be Submitted or Assigned",
+        ).to.include(normalized);
+      });
   });
 
   // ============ Review & Assessment ============
 
-  it("Navigate to Review and Assessment tab", () => {
-    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
+  it("Start review from Status Actions", () => {
+    clickStatusActionIfEnabled(STATUS_ACTIONS.startReview, "Start Review");
   });
 
-  it("Enter approval details and save", () => {
-    reviewPage
-      .verifyFormioLoaded()
-      .enterApprovedAmount(TEST_CONFIG.approvedAmount)
-      .setDecisionDateToToday()
-      .clickSave();
+  it("Complete review from Status Actions", () => {
+    populateReviewFieldsRequiredForCompleteReview();
+    clickStatusActionIfEnabled(
+      STATUS_ACTIONS.completeReview,
+      "Complete Review",
+    );
   });
 
-  it("Create and complete assessment", () => {
+  it("Start assessment from Status Actions", () => {
+    clickStatusActionIfEnabled(
+      STATUS_ACTIONS.startAssessment,
+      "Start Assessment",
+    );
+  });
+
+  it("Navigate to Review and Assessment tab", () => {
+    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
+  });
+
+  it("Create assessment", () => {
     cy.wait(2000); // Allow assessment section to fully load
     reviewPage.scrollToAssessmentList();
 
     cy.get("body").then(($body) => {
       if ($body.find("#CreateButton").length > 0) {
         cy.get("#CreateButton").click({ force: true });
-        cy.wait(1000);
+        // Give the new assessment row time to render before subsequent actions.
+        cy.wait(1000); // Needed because row creation animation can delay DOM readiness.
       } else {
         cy.log("Create Assessment button not found - may already be created");
       }
     });
+  });
 
-    cy.get("body").then(($body) => {
-      if ($body.find("#CompleteButton").length > 0) {
-        cy.get("#CompleteButton").click({ force: true });
-        cy.wait(1000);
-      } else {
-        cy.log(
-          "Complete Assessment button not found - may already be completed",
-        );
-      }
-    });
+  it("Complete assessment from adjudication action bar", () => {
+    clickAdjudicationActionIfEnabled(ADJUDICATION_ACTIONS.completeAssessment);
   });
 
   // ============ Payment Info ============
 
   it("Configure payment info", () => {
     cy.reload(); // Reload to get fresh data and avoid concurrency issues
-    cy.wait(2000);
+    // Wait briefly for async payment tab dependencies to stabilize after reload.
+    cy.wait(2000); // Prevents save attempts before payment controls are initialized.
     detailsPage
       .goToPaymentInfoTab()
       .enterSupplierNumber(TEST_CONFIG.supplierNumber)
@@ -269,12 +534,31 @@ const TEST_CONFIG = {
     });
   });
 
+  it("Enter approval details and save", () => {
+    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
+    reviewPage
+      .verifyFormioLoaded()
+      .enterApprovedAmount(TEST_CONFIG.approvedAmount)
+      .setDecisionDateToToday()
+      .clickSave();
+  });
+
   // ============ Application Approval ============
 
   it("Test approval workflow (confirm)", () => {
     cy.reload(); // Refresh to ensure all changes are reflected before approval
     detailsPage.dismissErrorModalIfPresent();
-    detailsPage.clickApprove().waitForConfirmModal().clickConfirm();
+    clickStatusAction(STATUS_ACTIONS.completeAssessment);
+    confirmStatusActionIfNeeded();
+
+    cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .should("be.visible")
+      .and("not.contain.text", "Processing...");
+
+    clickStatusAction(STATUS_ACTIONS.approve);
+    detailsPage.waitForConfirmModal().clickConfirm();
   });
 
   // ============ Post-Approval Verification ============
diff --git a/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts b/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts
index 404764e56a..f9be869c3d 100644
--- a/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts
+++ b/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts
@@ -6,6 +6,9 @@ import { LoginPage } from "../pages/LoginPage";
 import { NavigationPage } from "../pages/NavigationPage";
 import { DashboardPage } from "../pages/DashboardPage";
 import { ApplicationDetailsPage } from "../pages/ApplicationDetailsPage";
+import { ApplicationsListPage } from "../pages/ApplicationsListPage";
+import { ReviewAssessmentPage } from "../pages/ReviewAssessmentPage";
+import { ApplicationDetailsRightTabPage } from "../pages/ApplicationDetailsRightTabPage";
 import {
   ApplicationsPage,
   RolesPage,
@@ -52,7 +55,37 @@ export class PageFactory {
   static getApplicationDetailsPage(): ApplicationDetailsPage {
     return this.getInstance(
       "ApplicationDetailsPage",
-      () => new ApplicationDetailsPage()
+      () => new ApplicationDetailsPage(),
+    );
+  }
+
+  /**
+   * Get or create ApplicationsListPage instance
+   */
+  static getApplicationsListPage(): ApplicationsListPage {
+    return this.getInstance(
+      "ApplicationsListPage",
+      () => new ApplicationsListPage(),
+    );
+  }
+
+  /**
+   * Get or create ReviewAssessmentPage instance
+   */
+  static getReviewAssessmentPage(): ReviewAssessmentPage {
+    return this.getInstance(
+      "ReviewAssessmentPage",
+      () => new ReviewAssessmentPage(),
+    );
+  }
+
+  /**
+   * Get or create ApplicationDetailsRightTabPage instance
+   */
+  static getApplicationDetailsRightTabPage(): ApplicationDetailsRightTabPage {
+    return this.getInstance(
+      "ApplicationDetailsRightTabPage",
+      () => new ApplicationDetailsRightTabPage(),
     );
   }
 
@@ -125,6 +158,12 @@ export const DashboardPageInstance = () => PageFactory.getDashboardPage();
 export const ApplicationsPageInstance = () => PageFactory.getApplicationsPage();
 export const ApplicationDetailsPageInstance = () =>
   PageFactory.getApplicationDetailsPage();
+export const ApplicationsListPageInstance = () =>
+  PageFactory.getApplicationsListPage();
+export const ReviewAssessmentPageInstance = () =>
+  PageFactory.getReviewAssessmentPage();
+export const ApplicationDetailsRightTabPageInstance = () =>
+  PageFactory.getApplicationDetailsRightTabPage();
 export const RolesPageInstance = () => PageFactory.getRolesPage();
 export const UsersPageInstance = () => PageFactory.getUsersPage();
 export const IntakesPageInstance = () => PageFactory.getIntakesPage();
diff --git a/applications/Unity.AutoUI/cypress/utilities/index.ts b/applications/Unity.AutoUI/cypress/utilities/index.ts
index 9b53890069..7b897bd9da 100644
--- a/applications/Unity.AutoUI/cypress/utilities/index.ts
+++ b/applications/Unity.AutoUI/cypress/utilities/index.ts
@@ -26,6 +26,9 @@ export {
   DashboardPageInstance,
   ApplicationsPageInstance,
   ApplicationDetailsPageInstance,
+  ApplicationsListPageInstance,
+  ReviewAssessmentPageInstance,
+  ApplicationDetailsRightTabPageInstance,
   RolesPageInstance,
   UsersPageInstance,
   IntakesPageInstance,

From 38dc06966a96b8160bb57dad922943cdd5321c56 Mon Sep 17 00:00:00 2001
From: Velang <Velang.Rao@gov.bc.ca>
Date: Wed, 15 Apr 2026 08:56:48 -0700
Subject: [PATCH 02/45] fixing the tests

---
 .../Unity.AutoUI/cypress/e2e/basicEmail.cy.ts |  58 ++++---
 .../cypress/pages/ApplicationsListPage.ts     | 159 +++++++++++-------
 2 files changed, 131 insertions(+), 86 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
index 6ae85878e2..19e1ec620a 100644
--- a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
@@ -6,6 +6,7 @@ describe("Send an email", () => {
   const TEST_EMAIL_BCC = Cypress.env("TEST_EMAIL_BCC") as string;
   const TEMPLATE_NAME = "Test Case 1";
   const STANDARD_TIMEOUT = 20000;
+  const LONG_TIMEOUT = 60000;
 
   // Only suppress the noisy ResizeObserver error that Unity throws in TEST.
   // Everything else should still fail the test.
@@ -41,9 +42,9 @@ describe("Send an email", () => {
     cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($body) => {
       // Already authenticated
       if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-        cy.contains("VIEW APPLICATIONS", { timeout: STANDARD_TIMEOUT }).click({
-          force: true,
-        });
+        cy.contains("VIEW APPLICATIONS", { timeout: STANDARD_TIMEOUT })
+          .should("be.visible")
+          .click();
         return;
       }
 
@@ -51,14 +52,15 @@ describe("Send an email", () => {
       if ($body.find('button:contains("LOGIN")').length > 0) {
         cy.contains("LOGIN", { timeout: STANDARD_TIMEOUT })
           .should("exist")
-          .click({ force: true });
+          .should("be.visible")
+          .click();
 
         cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($loginBody) => {
           // IDIR chooser may or may not appear
           if ($loginBody.find(':contains("IDIR")').length > 0) {
-            cy.contains("IDIR", { timeout: STANDARD_TIMEOUT }).click({
-              force: true,
-            });
+            cy.contains("IDIR", { timeout: STANDARD_TIMEOUT })
+              .should("be.visible")
+              .click();
           }
 
           cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($authBody) => {
@@ -70,9 +72,9 @@ describe("Send an email", () => {
               cy.get("#password", { timeout: STANDARD_TIMEOUT }).type(
                 Cypress.env("test1password"),
               );
-              cy.contains("Continue", { timeout: STANDARD_TIMEOUT }).click({
-                force: true,
-              });
+              cy.contains("Continue", { timeout: STANDARD_TIMEOUT })
+                .should("be.visible")
+                .click();
             } else {
               cy.log("Already authenticated");
             }
@@ -158,14 +160,14 @@ describe("Send an email", () => {
           .scrollIntoView()
           .should("be.visible")
           .within(() => {
-            cy.contains("td", subject, { timeout: STANDARD_TIMEOUT })
+            cy.contains("td", subject, { timeout: LONG_TIMEOUT })
               .should("exist")
               .click();
           });
         return;
       }
 
-      cy.contains("td", subject, { timeout: STANDARD_TIMEOUT })
+      cy.contains("td", subject, { timeout: LONG_TIMEOUT })
         .should("exist")
         .click();
     });
@@ -226,7 +228,8 @@ describe("Send an email", () => {
 
       cy.get("#btn-confirm-send", { timeout: STANDARD_TIMEOUT })
         .should("exist")
-        .click({ force: true });
+        .should("be.visible")
+        .click();
     });
   }
 
@@ -368,21 +371,27 @@ describe("Send an email", () => {
   it("Save the email", () => {
     cy.get("#btn-save", { timeout: STANDARD_TIMEOUT })
       .should("exist")
-      .should("be.visible")
-      .click();
+      .should("not.be.disabled")
+      .then(($btn) => {
+        ($btn[0] as HTMLButtonElement).click();
+      });
 
-    cy.get("#btn-new-email", { timeout: STANDARD_TIMEOUT }).should(
-      "be.visible",
-    );
+    cy.get("#btn-new-email", { timeout: LONG_TIMEOUT }).should("exist");
   });
 
   it("Select saved email from Email History", () => {
     openSavedEmailFromHistoryBySubject(TEST_EMAIL_SUBJECT);
 
-    cy.get("#EmailTo", { timeout: STANDARD_TIMEOUT }).should("be.visible");
-    cy.get("#EmailCC").should("be.visible");
-    cy.get("#EmailBCC").should("be.visible");
-    cy.get("#EmailSubject").should("be.visible");
+    cy.get("#EmailTo", { timeout: STANDARD_TIMEOUT })
+      .should("exist")
+      .invoke("val")
+      .should("not.be.empty");
+    cy.get("#EmailCC").should("exist");
+    cy.get("#EmailBCC").should("exist");
+    cy.get("#EmailSubject")
+      .should("exist")
+      .invoke("val")
+      .should("contain", TEST_EMAIL_SUBJECT);
 
     cy.get("#btn-send", { timeout: STANDARD_TIMEOUT }).should("exist");
     cy.get("#btn-save", { timeout: STANDARD_TIMEOUT }).should("exist");
@@ -391,9 +400,10 @@ describe("Send an email", () => {
   it("Send the email", () => {
     cy.get("#btn-send", { timeout: STANDARD_TIMEOUT })
       .should("exist")
-      .should("be.visible")
       .should("not.be.disabled")
-      .click();
+      .then(($btn) => {
+        ($btn[0] as HTMLButtonElement).click();
+      });
   });
 
   it("Confirm send email in dialog", () => {
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index 108d6b0cfe..8992ec96df 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -37,7 +37,8 @@ export class ApplicationsListPage extends ApplicationsPage {
   private readonly extendedActionBar = {
     customButtons: "#app_custom_buttons",
     dynamicButtonContainer: "#dynamicButtonContainerId",
-    exportButton: "#dynamicButtonContainerId .dt-buttons button span",
+    exportButton:
+      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
     saveViewButton: "button.grp-savedStates",
   };
 
@@ -94,7 +95,7 @@ export class ApplicationsListPage extends ApplicationsPage {
       | "last3months"
       | "last6months"
       | "alltime"
-      | "custom"
+      | "custom",
   ): this {
     cy.get(this.dateFilters.quickDateRange, { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
@@ -127,10 +128,11 @@ export class ApplicationsListPage extends ApplicationsPage {
       | "last3months"
       | "last6months"
       | "alltime"
-      | "custom"
+      | "custom",
   ): this {
-    cy.get(this.dateFilters.quickDateRange, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.dateFilters.quickDateRange, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -139,12 +141,16 @@ export class ApplicationsListPage extends ApplicationsPage {
    * @deprecated Use selectQuickDateRange() instead. This method is for custom date ranges only.
    */
   setSubmittedFromDate(date: string): this {
-    cy.get(this.dateFilters.submittedFromDate, { timeout: this.STANDARD_TIMEOUT })
-      .click({ force: true })
-      .clear({ force: true })
-      .type(date, { force: true })
-      .trigger("change", { force: true })
-      .blur({ force: true })
+    cy.get(this.dateFilters.submittedFromDate, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
+      .scrollIntoView()
+      .should("be.visible")
+      .click()
+      .clear()
+      .type(date)
+      .trigger("change")
+      .blur()
       .should("have.value", date);
     return this;
   }
@@ -154,11 +160,13 @@ export class ApplicationsListPage extends ApplicationsPage {
    */
   setSubmittedToDate(date: string): this {
     cy.get(this.dateFilters.submittedToDate, { timeout: this.STANDARD_TIMEOUT })
-      .click({ force: true })
-      .clear({ force: true })
-      .type(date, { force: true })
-      .trigger("change", { force: true })
-      .blur({ force: true })
+      .scrollIntoView()
+      .should("be.visible")
+      .click()
+      .clear()
+      .type(date)
+      .trigger("change")
+      .blur()
       .should("have.value", date);
     return this;
   }
@@ -172,7 +180,7 @@ export class ApplicationsListPage extends ApplicationsPage {
         cy.wrap($s)
           .should("have.attr", "style")
           .and("contain", "display: none");
-      }
+      },
     );
     return this;
   }
@@ -205,7 +213,8 @@ export class ApplicationsListPage extends ApplicationsPage {
   selectRowByText(text: string): this {
     cy.contains("tr", text, { timeout: this.STANDARD_TIMEOUT })
       .find(".checkbox-select")
-      .click({ force: true });
+      .should("be.visible")
+      .click();
     return this;
   }
 
@@ -215,7 +224,8 @@ export class ApplicationsListPage extends ApplicationsPage {
   clickOpenButton(): this {
     cy.get("#externalLink", { timeout: this.STANDARD_TIMEOUT })
       .should("exist")
-      .click({ force: true });
+      .should("be.visible")
+      .click();
     return this;
   }
 
@@ -225,10 +235,9 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Verify table has rows (using scroll body selector)
    */
   verifyTableHasData(): this {
-    cy.get(this.scrollTable.tableRows, { timeout: this.STANDARD_TIMEOUT }).should(
-      "have.length.greaterThan",
-      1
-    );
+    cy.get(this.scrollTable.tableRows, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.length.greaterThan", 1);
     return this;
   }
 
@@ -241,7 +250,9 @@ export class ApplicationsListPage extends ApplicationsPage {
       .find("td")
       .not(":has(a)")
       .first()
-      .click({ force: true, ctrlKey: withCtrl });
+      .scrollIntoView()
+      .should("be.visible")
+      .click({ ctrlKey: withCtrl });
     return this;
   }
 
@@ -274,7 +285,9 @@ export class ApplicationsListPage extends ApplicationsPage {
       .then(($els: JQuery<HTMLElement>) => {
         const titles: string[] = Cypress.$($els)
           .toArray()
-          .map((el: HTMLElement) => (el.textContent || "").replace(/\s+/g, " ").trim())
+          .map((el: HTMLElement) =>
+            (el.textContent || "").replace(/\s+/g, " ").trim(),
+          )
           .filter((t: string) => t.length > 0);
         return titles;
       });
@@ -287,10 +300,9 @@ export class ApplicationsListPage extends ApplicationsPage {
     this.getVisibleHeaderTitles().then((titles: string[]) => {
       const titlesLower = titles.map((t: string) => t.toLowerCase());
       expected.forEach((e: string) => {
-        expect(
-          titlesLower,
-          `visible headers should include "${e}"`
-        ).to.include(e.toLowerCase());
+        expect(titlesLower, `visible headers should include "${e}"`).to.include(
+          e.toLowerCase(),
+        );
       });
     });
     return this;
@@ -302,7 +314,9 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Scroll to and verify action bar exists
    */
   verifyActionBarExists(): this {
-    cy.get(this.extendedActionBar.customButtons, { timeout: this.STANDARD_TIMEOUT })
+    cy.get(this.extendedActionBar.customButtons, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("exist")
       .scrollIntoView();
     return this;
@@ -315,7 +329,7 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.get("#applicationPaymentRequest", { timeout: this.BUTTON_TIMEOUT })
       .should("be.visible")
       .and("not.be.disabled")
-      .click({ force: true });
+      .click();
     return this;
   }
 
@@ -325,7 +339,10 @@ export class ApplicationsListPage extends ApplicationsPage {
   verifyExportButtonVisible(): this {
     cy.contains(this.extendedActionBar.exportButton, "Export", {
       timeout: this.STANDARD_TIMEOUT,
-    }).should("be.visible");
+      matchCase: false,
+    })
+      .scrollIntoView()
+      .should("be.visible");
     return this;
   }
 
@@ -336,7 +353,7 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.contains(
       "#dynamicButtonContainerId button.grp-savedStates",
       "Save View",
-      { timeout: this.STANDARD_TIMEOUT }
+      { timeout: this.STANDARD_TIMEOUT },
     ).should("be.visible");
     return this;
   }
@@ -346,10 +363,12 @@ export class ApplicationsListPage extends ApplicationsPage {
    */
   verifyColumnsButtonVisible(): this {
     cy.contains(
-      "#dynamicButtonContainerId .dt-buttons button span",
+      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
       "Columns",
-      { timeout: this.STANDARD_TIMEOUT }
-    ).should("be.visible");
+      { timeout: this.STANDARD_TIMEOUT, matchCase: false },
+    )
+      .scrollIntoView()
+      .should("be.visible");
     return this;
   }
 
@@ -393,9 +412,11 @@ export class ApplicationsListPage extends ApplicationsPage {
 
     // Try Cancel button if available (check existence first to avoid timeout)
     cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      const $cancelBtn = $body.find(this.paymentModal.cancelButton).filter(
-        (_: number, el: HTMLElement) => (el.textContent || "").includes("Cancel")
-      );
+      const $cancelBtn = $body
+        .find(this.paymentModal.cancelButton)
+        .filter((_: number, el: HTMLElement) =>
+          (el.textContent || "").includes("Cancel"),
+        );
       if ($cancelBtn.length > 0) {
         cy.wrap($cancelBtn.first()).scrollIntoView().click({ force: true });
       } else {
@@ -441,11 +462,11 @@ export class ApplicationsListPage extends ApplicationsPage {
       ($m: JQuery<HTMLElement>) => {
         const isHidden = !$m.is(":visible") || !$m.hasClass("show");
         expect(isHidden, "payment-modal hidden or not shown").to.eq(true);
-      }
-    );
-    cy.get(this.paymentModal.backdrop, { timeout: this.STANDARD_TIMEOUT }).should(
-      "not.exist"
+      },
     );
+    cy.get(this.paymentModal.backdrop, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
     return this;
   }
 
@@ -475,14 +496,13 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.contains(this.saveView.resetOption, "Reset to Default View", {
       timeout: this.STANDARD_TIMEOUT,
     })
-      .should("exist")
-      .click({ force: true });
+      .should("be.visible")
+      .click();
 
     // Wait for table to rebuild
-    cy.get(this.scrollTable.columnTitles, { timeout: this.STANDARD_TIMEOUT }).should(
-      "have.length.gt",
-      5
-    );
+    cy.get(this.scrollTable.columnTitles, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.length.gt", 5);
     return this;
   }
 
@@ -490,15 +510,19 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Open the Columns menu
    */
   openColumnsMenu(): this {
-    cy.contains("span", "Columns", { timeout: this.STANDARD_TIMEOUT })
+    cy.contains(
+      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
+      "Columns",
+      { timeout: this.STANDARD_TIMEOUT, matchCase: false },
+    )
+      .scrollIntoView()
       .should("be.visible")
       .click();
 
     // Wait for dropdown to be fully populated
-    cy.get(this.columnsMenu.dropdownItem, { timeout: this.STANDARD_TIMEOUT }).should(
-      "have.length.gt",
-      50
-    );
+    cy.get(this.columnsMenu.dropdownItem, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.length.gt", 50);
     return this;
   }
 
@@ -510,9 +534,16 @@ export class ApplicationsListPage extends ApplicationsPage {
       timeout: this.STANDARD_TIMEOUT,
       matchCase: false,
     })
-      .should("exist")
       .scrollIntoView()
-      .click({ force: true });
+      .should("exist")
+      .then(($item) => {
+        if (Cypress.dom.isVisible($item)) {
+          cy.wrap($item).click();
+        } else {
+          // Some dropdown items are clipped by overflow containers; native click still triggers menu toggle reliably.
+          ($item[0] as HTMLElement).click();
+        }
+      });
     return this;
   }
 
@@ -530,7 +561,9 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Close the Columns menu
    */
   closeColumnsMenu(): this {
-    cy.get(this.columnsMenu.buttonBackground, { timeout: this.STANDARD_TIMEOUT })
+    cy.get(this.columnsMenu.buttonBackground, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("exist")
       .click({ force: true });
 
@@ -567,7 +600,7 @@ export class ApplicationsListPage extends ApplicationsPage {
 
         if (switchLink.length === 0) {
           cy.log(
-            'Skipping tenant switch: "Switch Grant Programs" not present for this user/session'
+            'Skipping tenant switch: "Switch Grant Programs" not present for this user/session',
           );
           cy.get("body").click(0, 0);
           return;
@@ -577,10 +610,12 @@ export class ApplicationsListPage extends ApplicationsPage {
 
         cy.url({ timeout: this.STANDARD_TIMEOUT }).should(
           "include",
-          "/GrantPrograms"
+          "/GrantPrograms",
         );
 
-        cy.get(this.grantProgram.searchInput, { timeout: this.STANDARD_TIMEOUT })
+        cy.get(this.grantProgram.searchInput, {
+          timeout: this.STANDARD_TIMEOUT,
+        })
           .should("be.visible")
           .clear()
           .type(programName);
@@ -596,9 +631,9 @@ export class ApplicationsListPage extends ApplicationsPage {
         cy.location("pathname", { timeout: this.STANDARD_TIMEOUT }).should(
           (p: string) => {
             expect(
-              p.indexOf("/GrantApplications") >= 0 || p.indexOf("/auth/") >= 0
+              p.indexOf("/GrantApplications") >= 0 || p.indexOf("/auth/") >= 0,
             ).to.eq(true);
-          }
+          },
         );
       });
     });

From 4ef217767bd5587ab486fd0ba40541b7742e3201 Mon Sep 17 00:00:00 2001
From: Velang <Velang.Rao@gov.bc.ca>
Date: Wed, 15 Apr 2026 10:25:57 -0700
Subject: [PATCH 03/45] tests OS agonistic

---
 .../cypress/pages/ApplicationsListPage.ts     | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index 8992ec96df..ad81918229 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -245,14 +245,29 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Select a row by index (clicks on a non-link cell)
    */
   selectRowByIndex(rowIndex: number, withCtrl = false): this {
-    cy.get(this.scrollTable.tableRows, { timeout: this.STANDARD_TIMEOUT })
-      .eq(rowIndex)
-      .find("td")
-      .not(":has(a)")
-      .first()
-      .scrollIntoView()
-      .should("be.visible")
-      .click({ ctrlKey: withCtrl });
+    const getTargetCell = () =>
+      cy
+        .get(this.scrollTable.tableRows, { timeout: this.STANDARD_TIMEOUT })
+        .eq(rowIndex)
+        .find("td")
+        .not(":has(a)")
+        .first();
+
+    cy.get(this.scrollTable.tableRows, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.length.greaterThan", rowIndex);
+
+    getTargetCell().should("exist");
+
+    // Break the chain and re-query right before click to avoid stale element errors
+    // when the datatable re-renders asynchronously.
+    getTargetCell().then(($cell) => {
+      if (Cypress.dom.isAttached($cell) && Cypress.dom.isVisible($cell)) {
+        cy.wrap($cell).scrollIntoView().click({ ctrlKey: withCtrl });
+      } else {
+        getTargetCell().click({ ctrlKey: withCtrl, force: true });
+      }
+    });
     return this;
   }
 

From 6f8a41bbfcf6219f033c3d1a0ab89257a33822a5 Mon Sep 17 00:00:00 2001
From: Velang <Velang.Rao@gov.bc.ca>
Date: Wed, 15 Apr 2026 15:40:55 -0700
Subject: [PATCH 04/45] making test more robust

---
 .../cypress/pages/ApplicationDetailsPage.ts   |  75 ++++++---
 .../cypress/pages/ApplicationsListPage.ts     | 122 +++++++++-----
 .../cypress/pages/ReviewAssessmentPage.ts     | 156 ++++++++++++------
 .../cypress/regression/ApprovalFlow.cy.ts     |  50 ++++--
 4 files changed, 285 insertions(+), 118 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
index 550c95ff22..30ff95248d 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
@@ -110,11 +110,19 @@ export class ApplicationDetailsPage extends BasePage {
     super();
   }
 
+  private activateTab(tabSelector: string): void {
+    cy.get(tabSelector, { timeout: 20000 })
+      .scrollIntoView()
+      .should("be.visible")
+      .click({ force: true })
+      .should("have.class", "active");
+  }
+
   /**
    * Navigate to Submission tab
    */
   goToSubmissionTab(): this {
-    this.clickElement(this.tabs.submission);
+    this.activateTab(this.tabs.submission);
     return this;
   }
 
@@ -123,7 +131,7 @@ export class ApplicationDetailsPage extends BasePage {
    */
   goToReviewAssessmentTab(): this {
     this.dismissErrorModalIfPresent();
-    this.clickElement(this.tabs.reviewAssessment);
+    this.activateTab(this.tabs.reviewAssessment);
     return this;
   }
 
@@ -131,7 +139,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Project Info tab
    */
   goToProjectInfoTab(): this {
-    this.clickElement(this.tabs.projectInfo);
+    this.activateTab(this.tabs.projectInfo);
     return this;
   }
 
@@ -139,7 +147,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Applicant Info tab
    */
   goToApplicantInfoTab(): this {
-    this.clickElement(this.tabs.applicantInfo);
+    this.activateTab(this.tabs.applicantInfo);
     return this;
   }
 
@@ -147,7 +155,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Funding Agreement tab
    */
   goToFundingAgreementTab(): this {
-    this.clickElement(this.tabs.fundingAgreement);
+    this.activateTab(this.tabs.fundingAgreement);
     return this;
   }
 
@@ -155,7 +163,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Payment Info tab
    */
   goToPaymentInfoTab(): this {
-    this.clickElement(this.tabs.paymentInfo);
+    this.activateTab(this.tabs.paymentInfo);
     return this;
   }
 
@@ -434,15 +442,13 @@ export class ApplicationDetailsPage extends BasePage {
    * Open the Status Actions dropdown
    */
   openStatusActionsDropdown(): void {
-    cy.get(this.statusActions.dropdownMenu).then(($menu) => {
-      if (!$menu.is(":visible")) {
-        cy.get(this.statusActions.dropdownToggle, { timeout: 20000 })
-          .should("exist")
-          .scrollIntoView()
-          .click({ force: true });
-      }
-    });
-    cy.get(this.statusActions.dropdownMenu, { timeout: 10000 }).should(
+    this.dismissErrorModalIfPresent();
+    cy.get(this.statusActions.dropdownToggle, { timeout: 20000 })
+      .scrollIntoView()
+      .should("be.visible")
+      .and("not.contain.text", "Processing...")
+      .click({ force: true });
+    cy.get(this.statusActions.dropdownMenu, { timeout: 20000 }).should(
       "be.visible",
     );
   }
@@ -565,7 +571,18 @@ export class ApplicationDetailsPage extends BasePage {
    * Wait for confirm action modal to appear (SweetAlert2)
    */
   waitForConfirmModal(): this {
-    cy.get(this.confirmModal.modal, { timeout: 20000 }).should("be.visible");
+    cy.get("body").then(($body) => {
+      if ($body.find(this.confirmModal.modal).length > 0) {
+        cy.get(this.confirmModal.modal, { timeout: 20000 }).should(
+          "be.visible",
+        );
+        return;
+      }
+
+      cy.contains(".modal.show .modal-content", "Confirm Action", {
+        timeout: 20000,
+      }).should("be.visible");
+    });
     return this;
   }
 
@@ -573,10 +590,26 @@ export class ApplicationDetailsPage extends BasePage {
    * Click Confirm button in the modal (SweetAlert2)
    */
   clickConfirm(): this {
-    cy.get(this.confirmModal.modal, { timeout: 20000 })
-      .find(this.confirmModal.confirmButton)
-      .should("be.visible")
-      .click({ force: true });
+    cy.get("body").then(($body) => {
+      if ($body.find(this.confirmModal.modal).length > 0) {
+        cy.get(this.confirmModal.modal, { timeout: 20000 })
+          .find(this.confirmModal.confirmButton)
+          .should("be.visible")
+          .click({ force: true });
+        cy.get(this.confirmModal.modal, { timeout: 20000 }).should("not.exist");
+        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+        return;
+      }
+
+      cy.get(".modal.show", { timeout: 20000 })
+        .contains("button", /^Confirm$/i, { timeout: 20000 })
+        .should("be.visible")
+        .click({ force: true });
+      cy.contains(".modal.show .modal-content", "Confirm Action", {
+        timeout: 20000,
+      }).should("not.exist");
+      cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
+    });
     return this;
   }
 
@@ -603,7 +636,7 @@ export class ApplicationDetailsPage extends BasePage {
           .find(".swal2-confirm")
           .first()
           .click({ force: true });
-        cy.wait(500);
+        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
       }
     });
     return this;
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index ad81918229..81fc241dd3 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -63,6 +63,11 @@ export class ApplicationsListPage extends ApplicationsPage {
     cancelButton: "#payment-modal .modal-footer button",
   };
 
+  private readonly blockingUi = {
+    bootstrapModal: ".modal.show",
+    swalContainer: ".swal2-container",
+  };
+
   // Grant program selectors
   private readonly grantProgram = {
     userInitials: ".unity-user-initials",
@@ -97,8 +102,11 @@ export class ApplicationsListPage extends ApplicationsPage {
       | "alltime"
       | "custom",
   ): this {
+    this.waitForNoBlockingOverlay();
     cy.get(this.dateFilters.quickDateRange, { timeout: this.STANDARD_TIMEOUT })
+      .scrollIntoView()
       .should("be.visible")
+      .and("not.be.disabled")
       .select(range);
     return this;
   }
@@ -211,7 +219,9 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Select a row by matching text content
    */
   selectRowByText(text: string): this {
+    this.waitForNoBlockingOverlay();
     cy.contains("tr", text, { timeout: this.STANDARD_TIMEOUT })
+      .scrollIntoView()
       .find(".checkbox-select")
       .should("be.visible")
       .click();
@@ -341,6 +351,7 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Click the Payment button (extended with visibility checks)
    */
   clickPaymentButtonWithWait(): this {
+    this.waitForNoBlockingOverlay();
     cy.get("#applicationPaymentRequest", { timeout: this.BUTTON_TIMEOUT })
       .should("be.visible")
       .and("not.be.disabled")
@@ -408,6 +419,27 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.get(this.paymentModal.modal, { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
       .and("have.class", "show");
+    cy.get(this.paymentModal.backdrop, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("exist");
+    return this;
+  }
+
+  /**
+   * Wait for blocking modal overlays to clear before interacting with list controls.
+   */
+  waitForNoBlockingOverlay(): this {
+    cy.get(this.blockingUi.swalContainer, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
+
+    cy.get(this.blockingUi.bootstrapModal, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
+
+    cy.get(this.paymentModal.backdrop, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
     return this;
   }
 
@@ -415,58 +447,71 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Close payment modal using multiple strategies
    */
   closePaymentModal(): this {
-    // Attempt ESC key
-    cy.get("body").type("{esc}", { force: true });
-
-    // Click backdrop if present (check existence first to avoid timeout)
     cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if ($body.find(this.paymentModal.backdrop).length > 0) {
-        cy.get(this.paymentModal.backdrop).click("topLeft", { force: true });
+      if ($body.find(`${this.paymentModal.modal}.show`).length === 0) {
+        return;
       }
-    });
 
-    // Try Cancel button if available (check existence first to avoid timeout)
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
       const $cancelBtn = $body
         .find(this.paymentModal.cancelButton)
         .filter((_: number, el: HTMLElement) =>
           (el.textContent || "").includes("Cancel"),
         );
+
       if ($cancelBtn.length > 0) {
         cy.wrap($cancelBtn.first()).scrollIntoView().click({ force: true });
-      } else {
-        cy.log("Cancel button not present, proceeding to hard-close fallback");
       }
     });
 
-    // Hard close fallback using jQuery
-    cy.window().then((win: Cypress.AUTWindow) => {
-      try {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const windowWithModal = win as any;
-        if (typeof windowWithModal.closePaymentModal === "function") {
-          windowWithModal.closePaymentModal();
-        }
-      } catch {
-        /* ignore */
+    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+      if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
+        cy.get("body").type("{esc}", { force: true });
       }
+    });
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const $ = (win as any).jQuery || (win as any).$;
-      if ($) {
-        try {
-          $("#payment-modal")
-            .removeClass("show")
-            .attr("aria-hidden", "true")
-            .css("display", "none");
-          $(".modal-backdrop").remove();
-          $("body").removeClass("modal-open").css("overflow", "");
-        } catch {
-          /* ignore */
-        }
+    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+      if (
+        $body.find(`${this.paymentModal.modal}.show`).length > 0 &&
+        $body.find(this.paymentModal.backdrop).length > 0
+      ) {
+        cy.get(this.paymentModal.backdrop).first().click("topLeft", {
+          force: true,
+        });
       }
     });
-    return this;
+
+    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+      if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
+        cy.window().then((win: Cypress.AUTWindow) => {
+          try {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const windowWithModal = win as any;
+            if (typeof windowWithModal.closePaymentModal === "function") {
+              windowWithModal.closePaymentModal();
+            }
+          } catch {
+            /* ignore */
+          }
+
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const $ = (win as any).jQuery || (win as any).$;
+          if ($) {
+            try {
+              $(this.paymentModal.modal)
+                .removeClass("show")
+                .attr("aria-hidden", "true")
+                .css("display", "none");
+              $(this.paymentModal.backdrop).remove();
+              $("body").removeClass("modal-open").css("overflow", "");
+            } catch {
+              /* ignore */
+            }
+          }
+        });
+      }
+    });
+
+    return this.verifyPaymentModalClosed();
   }
 
   /**
@@ -479,14 +524,17 @@ export class ApplicationsListPage extends ApplicationsPage {
         expect(isHidden, "payment-modal hidden or not shown").to.eq(true);
       },
     );
+
     cy.get(this.paymentModal.backdrop, {
       timeout: this.STANDARD_TIMEOUT,
     }).should("not.exist");
+
+    cy.get(this.blockingUi.bootstrapModal, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
     return this;
   }
 
-  // ============ Columns Menu Methods ============
-
   /**
    * Close any open dropdowns or modals
    */
diff --git a/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts b/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts
index b5f2636ef9..07add7298b 100644
--- a/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts
@@ -78,13 +78,13 @@ export class ReviewAssessmentPage extends BasePage {
 
   // Assessment selectors
   private readonly assessment = {
-    approvedAmount: '#ApprovalView_ApprovedAmount',
-    decisionDate: '#ApprovalView_FinalDecisionDate',
+    approvedAmount: "#ApprovalView_ApprovedAmount",
+    decisionDate: "#ApprovalView_FinalDecisionDate",
     saveButton: 'button:contains("Save")',
     // Assessment List view buttons
-    createAssessmentButton: '#CreateButton',
-    completeAssessmentButton: '#CompleteButton',
-    assessmentMainView: '#assessmentMainView',
+    createAssessmentButton: "#CreateButton",
+    completeAssessmentButton: "#CompleteButton",
+    assessmentMainView: "#assessmentMainView",
   };
 
   constructor() {
@@ -104,7 +104,7 @@ export class ReviewAssessmentPage extends BasePage {
       | "projectInfo"
       | "projectTimelines"
       | "projectBudget"
-      | "attestation"
+      | "attestation",
   ): this {
     cy.contains("h4.card-title", this.getSectionTitle(sectionName), {
       timeout: this.STANDARD_TIMEOUT,
@@ -141,7 +141,7 @@ export class ReviewAssessmentPage extends BasePage {
       | "projectInfo"
       | "projectTimelines"
       | "projectBudget"
-      | "attestation"
+      | "attestation",
   ): this {
     cy.contains("h4.card-title", this.getSectionTitle(sectionName), {
       timeout: this.STANDARD_TIMEOUT,
@@ -156,7 +156,9 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getApplicantName(): Cypress.Chainable<string> {
     return cy
-      .get(this.organizationInfo.applicantName, { timeout: this.STANDARD_TIMEOUT })
+      .get(this.organizationInfo.applicantName, {
+        timeout: this.STANDARD_TIMEOUT,
+      })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -165,8 +167,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify applicant name
    */
   verifyApplicantName(expectedValue: string): this {
-    cy.get(this.organizationInfo.applicantName, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.organizationInfo.applicantName, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -175,7 +178,9 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getRegisteredBusinessName(): Cypress.Chainable<string> {
     return cy
-      .get(this.organizationInfo.registeredBusinessName, { timeout: this.STANDARD_TIMEOUT })
+      .get(this.organizationInfo.registeredBusinessName, {
+        timeout: this.STANDARD_TIMEOUT,
+      })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -184,8 +189,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify registered business name
    */
   verifyRegisteredBusinessName(expectedValue: string): this {
-    cy.get(this.organizationInfo.registeredBusinessName, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.organizationInfo.registeredBusinessName, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -194,7 +200,9 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getRegisteredBusinessNumber(): Cypress.Chainable<string> {
     return cy
-      .get(this.organizationInfo.registeredBusinessNumber, { timeout: this.STANDARD_TIMEOUT })
+      .get(this.organizationInfo.registeredBusinessNumber, {
+        timeout: this.STANDARD_TIMEOUT,
+      })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -203,8 +211,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify registered business number
    */
   verifyRegisteredBusinessNumber(expectedValue: string): this {
-    cy.get(this.organizationInfo.registeredBusinessNumber, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.organizationInfo.registeredBusinessNumber, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -214,8 +223,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact name
    */
   verifyContactName(expectedValue: string): this {
-    cy.get(this.contactInfo.contactName, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactName, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -223,8 +233,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact title
    */
   verifyContactTitle(expectedValue: string): this {
-    cy.get(this.contactInfo.contactTitle, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactTitle, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -232,8 +243,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact email
    */
   verifyContactEmail(expectedValue: string): this {
-    cy.get(this.contactInfo.contactEmail, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactEmail, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -241,8 +253,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact phone primary
    */
   verifyContactPhonePrimary(expectedValue: string): this {
-    cy.get(this.contactInfo.contactPhonePrimary, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactPhonePrimary, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -250,8 +263,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact phone secondary
    */
   verifyContactPhoneSecondary(expectedValue: string): this {
-    cy.get(this.contactInfo.contactPhoneSecondary, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactPhoneSecondary, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -261,8 +275,10 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify mailing address city
    */
   verifyMailingCity(expectedValue: string): this {
-    cy.get(this.mailingAddress.city, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.mailingAddress.city, { timeout: this.STANDARD_TIMEOUT }).should(
+      "have.value",
+      expectedValue,
+    );
     return this;
   }
 
@@ -270,8 +286,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify mailing address street 1
    */
   verifyMailingStreet1(expectedValue: string): this {
-    cy.get(this.mailingAddress.street1, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.mailingAddress.street1, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -279,8 +296,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify mailing address postal code
    */
   verifyMailingPostalCode(expectedValue: string): this {
-    cy.get(this.mailingAddress.postalCode, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(this.mailingAddress.postalCode, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -290,7 +308,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Expand Organization Info panel
    */
   expandOrganizationInfoPanel(): this {
-    cy.contains(".card-header", "Organization Info", { timeout: this.STANDARD_TIMEOUT })
+    cy.contains(".card-header", "Organization Info", {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -300,7 +320,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Expand Contact Info panel
    */
   expandContactInfoPanel(): this {
-    cy.contains(".card-header", "Contact Info", { timeout: this.STANDARD_TIMEOUT })
+    cy.contains(".card-header", "Contact Info", {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -310,7 +332,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Expand Mailing Address panel
    */
   expandMailingAddressPanel(): this {
-    cy.contains(".card-header", "Mailing Address", { timeout: this.STANDARD_TIMEOUT })
+    cy.contains(".card-header", "Mailing Address", {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -336,8 +360,19 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify formio container is loaded
    */
   verifyFormioLoaded(): this {
-    cy.get(this.containers.formioContainer, { timeout: this.STANDARD_TIMEOUT })
-      .should("exist");
+    cy.get("body", { timeout: this.STANDARD_TIMEOUT }).should(($body) => {
+      const formioVisible =
+        $body.find(`${this.containers.formioContainer}:visible`).length > 0;
+      const approvalVisible =
+        $body.find(`${this.assessment.approvedAmount}:visible`).length > 0;
+      const assessmentListVisible =
+        $body.find(`${this.assessment.assessmentMainView}:visible`).length > 0;
+
+      expect(
+        formioVisible || approvalVisible || assessmentListVisible,
+        "expected review and assessment content to be visible",
+      ).to.eq(true);
+    });
     return this;
   }
 
@@ -346,7 +381,9 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getFieldValue(fieldName: string): Cypress.Chainable<string> {
     return cy
-      .get(`input[name="data[${fieldName}]"]`, { timeout: this.STANDARD_TIMEOUT })
+      .get(`input[name="data[${fieldName}]"]`, {
+        timeout: this.STANDARD_TIMEOUT,
+      })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -355,8 +392,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify field value by name attribute
    */
   verifyFieldValue(fieldName: string, expectedValue: string): this {
-    cy.get(`input[name="data[${fieldName}]"]`, { timeout: this.STANDARD_TIMEOUT })
-      .should("have.value", expectedValue);
+    cy.get(`input[name="data[${fieldName}]"]`, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("have.value", expectedValue);
     return this;
   }
 
@@ -364,7 +402,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify select field has expected text (for Choices.js dropdowns)
    */
   verifySelectFieldText(fieldName: string, expectedText: string): this {
-    cy.get(`select[name="data[${fieldName}]"]`, { timeout: this.STANDARD_TIMEOUT })
+    cy.get(`select[name="data[${fieldName}]"]`, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .parent()
       .find(".choices__item--selectable")
       .should("contain.text", expectedText);
@@ -378,8 +418,11 @@ export class ReviewAssessmentPage extends BasePage {
    */
   enterApprovedAmount(amount: string): this {
     cy.get(this.assessment.approvedAmount, { timeout: this.STANDARD_TIMEOUT })
-      .clear()
-      .type(amount);
+      .scrollIntoView({ block: "center" })
+      .should("exist")
+      .and("not.be.disabled")
+      .clear({ force: true })
+      .type(amount, { force: true });
     return this;
   }
 
@@ -393,8 +436,11 @@ export class ReviewAssessmentPage extends BasePage {
     const dd = String(now.getDate()).padStart(2, "0");
     const today = `${yyyy}-${mm}-${dd}`;
     cy.get(this.assessment.decisionDate, { timeout: this.STANDARD_TIMEOUT })
-      .clear()
-      .type(today);
+      .scrollIntoView({ block: "center" })
+      .should("exist")
+      .and("not.be.disabled")
+      .clear({ force: true })
+      .type(today, { force: true });
     return this;
   }
 
@@ -403,8 +449,11 @@ export class ReviewAssessmentPage extends BasePage {
    */
   setDecisionDate(date: string): this {
     cy.get(this.assessment.decisionDate, { timeout: this.STANDARD_TIMEOUT })
-      .clear()
-      .type(date);
+      .scrollIntoView({ block: "center" })
+      .should("exist")
+      .and("not.be.disabled")
+      .clear({ force: true })
+      .type(date, { force: true });
     return this;
   }
 
@@ -422,7 +471,10 @@ export class ReviewAssessmentPage extends BasePage {
    * Scroll to Assessment List section
    */
   scrollToAssessmentList(): this {
-    cy.get(this.assessment.assessmentMainView, { timeout: this.STANDARD_TIMEOUT })
+    cy.get(this.assessment.assessmentMainView, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
+      .should("be.visible")
       .scrollIntoView();
     return this;
   }
@@ -431,7 +483,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Click Create Assessment button in Assessment List view
    */
   clickCreateAssessment(): this {
-    cy.get(this.assessment.createAssessmentButton, { timeout: this.STANDARD_TIMEOUT })
+    cy.get(this.assessment.createAssessmentButton, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -441,7 +495,9 @@ export class ReviewAssessmentPage extends BasePage {
    * Click Complete Assessment button in Assessment List view
    */
   clickCompleteAssessment(): this {
-    cy.get(this.assessment.completeAssessmentButton, { timeout: this.STANDARD_TIMEOUT })
+    cy.get(this.assessment.completeAssessmentButton, {
+      timeout: this.STANDARD_TIMEOUT,
+    })
       .should("not.be.disabled")
       .click({ force: true });
     return this;
diff --git a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
index fd9091b320..95e70320cf 100644
--- a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
+++ b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
@@ -52,7 +52,8 @@ const TEST_CONFIG = {
 };
 
 const STATUS_ACTIONS = {
-  menuButton: "button.dropdown-toggle[data-bs-toggle='dropdown']",
+  menuButton: "#ApplicationActionDropdown .dropdown-toggle",
+  menu: "#ApplicationActionDropdown .dropdown-menu",
   startReview: "#Application_StartReviewButton",
   completeReview: "#Application_CompleteReviewButton",
   startAssessment: "#Application_StartAssessmentButton",
@@ -82,6 +83,7 @@ const BREADCRUMB_STATUS_SELECTOR =
 
   /** Navigate to the Payments tab and filter the table by submissionId. */
   function navigateToPaymentsAndSearch(): void {
+    listPage.waitForNoBlockingOverlay();
     cy.reload();
     navPage.goToPayments();
     cy.location("pathname", { timeout: 20000 }).should("include", "Payment");
@@ -92,13 +94,23 @@ const BREADCRUMB_STATUS_SELECTOR =
     cy.contains("tr", submissionId, { timeout: 20000 }).should("exist");
   }
 
+  function waitForBlockingUiToClear(): void {
+    cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+    cy.get(".modal.show", { timeout: 20000 }).should("not.exist");
+    cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
+  }
+
   function openStatusActionsMenu(): void {
+    waitForBlockingUiToClear();
+    detailsPage.dismissErrorModalIfPresent();
     cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
       .filter(":visible")
       .first()
+      .scrollIntoView()
       .should("be.visible")
+      .and("not.contain.text", "Processing...")
       .click({ force: true });
-    cy.get("ul.dropdown-menu", { timeout: 20000 }).should("be.visible");
+    cy.get(STATUS_ACTIONS.menu, { timeout: 20000 }).should("be.visible");
   }
 
   function clickStatusAction(actionSelector: string): void {
@@ -132,13 +144,13 @@ const BREADCRUMB_STATUS_SELECTOR =
   }
 
   function confirmStatusActionIfNeeded(): void {
-    // Short grace period so whichever confirmation dialog appears has time to mount.
-    cy.wait(300);
+    cy.wait(500);
     cy.get("body").then(($body) => {
       if ($body.find(".swal2-popup .swal2-confirm").length > 0) {
         cy.get(".swal2-popup .swal2-confirm", { timeout: 20000 })
           .should("be.visible")
           .click({ force: true });
+        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
         return;
       }
 
@@ -153,6 +165,10 @@ const BREADCRUMB_STATUS_SELECTOR =
               .should("be.visible")
               .click({ force: true });
           });
+        cy.contains(".modal.show .modal-content", "Confirm Action", {
+          timeout: 20000,
+        }).should("not.exist");
+        cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
       }
     });
   }
@@ -163,6 +179,12 @@ const BREADCRUMB_STATUS_SELECTOR =
         cy.get(".swal2-container .swal2-confirm", { timeout: 20000 })
           .should("be.visible")
           .click({ force: true });
+        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+      }
+
+      if ($body.find(".modal.show").length > 0) {
+        cy.get(".modal.show", { timeout: 20000 }).should("not.exist");
+        cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
       }
     });
   }
@@ -209,10 +231,10 @@ const BREADCRUMB_STATUS_SELECTOR =
   function populateReviewFieldsRequiredForCompleteReview(): void {
     detailsPage.goToReviewAssessmentTab();
 
-    // The tab can render asynchronously; ensure form fields are ready before typing.
-    cy.get("#formio, #ApprovalView_ApprovedAmount", { timeout: 30000 }).should(
-      "exist",
-    );
+    reviewPage.verifyFormioLoaded();
+    cy.get("#ApprovalView_ApprovedAmount", { timeout: 30000 })
+      .should("be.visible")
+      .and("not.be.disabled");
 
     cy.get("body").then(($body) => {
       if ($body.find("#ApprovalView_ApprovedAmount").length > 0) {
@@ -238,6 +260,7 @@ const BREADCRUMB_STATUS_SELECTOR =
     dismissBlockingModalIfPresent();
 
     listPage
+      .waitForNoBlockingOverlay()
       .selectQuickDateRange("alltime")
       .waitForTableRefresh()
       .searchForSubmission(submissionId)
@@ -285,6 +308,7 @@ const BREADCRUMB_STATUS_SELECTOR =
     cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
       "not.exist",
     );
+    listPage.waitForNoBlockingOverlay();
   }
 
   function clickAdjudicationActionIfEnabled(actionSelector: string): void {
@@ -306,7 +330,9 @@ const BREADCRUMB_STATUS_SELECTOR =
 
   /** Select the submissionId row and open the Approve Payments modal. */
   function selectRowAndOpenApproveModal(): void {
+    waitForBlockingUiToClear();
     cy.contains("tr", submissionId, { timeout: 20000 })
+      .scrollIntoView()
       .find(".checkbox-select")
       .click({ force: true });
     cy.contains("button", "Approve", { timeout: 20000 })
@@ -405,6 +431,7 @@ const BREADCRUMB_STATUS_SELECTOR =
 
   it("Select submission and open details", () => {
     dismissBlockingModalIfPresent();
+    listPage.waitForNoBlockingOverlay();
 
     cy.location("pathname", { timeout: 20000 }).then((pathname) => {
       if (pathname.includes("/GrantApplications/Details")) {
@@ -584,7 +611,10 @@ const BREADCRUMB_STATUS_SELECTOR =
   // ============ Payment Request ============
 
   it("Select approved application and submit payment request", () => {
-    listPage.selectRowByText(submissionId).clickPaymentButtonWithWait();
+    listPage
+      .waitForNoBlockingOverlay()
+      .selectRowByText(submissionId)
+      .clickPaymentButtonWithWait();
     listPage.waitForPaymentModalVisible();
 
     // Description field has a max length of 40 chars
@@ -601,7 +631,7 @@ const BREADCRUMB_STATUS_SELECTOR =
       .and("not.be.disabled")
       .click();
 
-    cy.get("#payment-modal", { timeout: 20000 }).should("not.be.visible");
+    listPage.verifyPaymentModalClosed();
     cy.log(`✅ Payment request submitted: ${paymentDescription}`);
   });
 

From bb37a59f1b8d98892576416c0e14436ded6887ce Mon Sep 17 00:00:00 2001
From: Stephan McColm <Stephan.McColm@gov.bc.ca>
Date: Thu, 16 Apr 2026 11:55:40 -0700
Subject: [PATCH 05/45] AB#32508 Fix detached row click in ApplicationsListPage
 during async table redraw

---
 .../cypress/pages/ApplicationsListPage.ts     | 1391 +++++++++--------
 1 file changed, 709 insertions(+), 682 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index 81fc241dd3..e53b037ad0 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -11,695 +11,722 @@ import { ApplicationsPage } from "./ListPages";
  * - Table horizontal scrolling and column visibility
  */
 export class ApplicationsListPage extends ApplicationsPage {
-  private readonly STANDARD_TIMEOUT = 20000;
-  private readonly BUTTON_TIMEOUT = 60000;
-
-  // Date filter selectors
-  private readonly dateFilters = {
-    quickDateRange: "select#quickDateRange",
-    submittedFromDate: "input#submittedFromDate",
-    submittedToDate: "input#submittedToDate",
-    spinner: 'div.spinner-grow[role="status"]',
-  };
-
-  // Quick date range option values
-  private readonly quickDateRangeOptions = {
-    today: "today",
-    last7Days: "last7days",
-    last30Days: "last30days",
-    last3Months: "last3months",
-    last6Months: "last6months",
-    allTime: "alltime",
-    custom: "custom",
-  };
-
-  // Extended action bar selectors (beyond ApplicationsPage)
-  private readonly extendedActionBar = {
-    customButtons: "#app_custom_buttons",
-    dynamicButtonContainer: "#dynamicButtonContainerId",
-    exportButton:
-      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
-    saveViewButton: "button.grp-savedStates",
-  };
-
-  // Table scrolling selectors
-  private readonly scrollTable = {
-    scrollBody: ".dt-scroll-body",
-    tableRows: ".dt-scroll-body tbody tr",
-    scrollHead: ".dt-scroll-head",
-    columnTitles: ".dt-scroll-head span.dt-column-title",
-  };
-
-  // Columns menu selectors
-  private readonly columnsMenu = {
-    dropdownItem: "a.dropdown-item",
-    buttonBackground: "div.dt-button-background",
-  };
-
-  // Payment modal selectors
-  private readonly paymentModal = {
-    modal: "#payment-modal",
-    backdrop: ".modal-backdrop",
-    cancelButton: "#payment-modal .modal-footer button",
-  };
-
-  private readonly blockingUi = {
-    bootstrapModal: ".modal.show",
-    swalContainer: ".swal2-container",
-  };
-
-  // Grant program selectors
-  private readonly grantProgram = {
-    userInitials: ".unity-user-initials",
-    userDropdown: "#user-dropdown a.dropdown-item",
-    searchInput: "#search-grant-programs",
-    programsTableRow: "#UserGrantProgramsTable tbody tr",
-  };
-
-  // Save view selectors
-  private readonly saveView = {
-    button: "button.grp-savedStates",
-    resetOption: "a.dropdown-item",
-  };
-
-  constructor() {
-    super();
-  }
-
-  // ============ Date Filter Methods ============
-
-  /**
-   * Select a quick date range from the dropdown
-   * @param range - One of: "today", "last7days", "last30days", "last3months", "last6months", "alltime", "custom"
-   */
-  selectQuickDateRange(
-    range:
-      | "today"
-      | "last7days"
-      | "last30days"
-      | "last3months"
-      | "last6months"
-      | "alltime"
-      | "custom",
-  ): this {
-    this.waitForNoBlockingOverlay();
-    cy.get(this.dateFilters.quickDateRange, { timeout: this.STANDARD_TIMEOUT })
-      .scrollIntoView()
-      .should("be.visible")
-      .and("not.be.disabled")
-      .select(range);
-    return this;
-  }
-
-  /**
-   * Select "Last 6 months" from quick date range (default)
-   */
-  selectLast6Months(): this {
-    return this.selectQuickDateRange("last6months");
-  }
-
-  /**
-   * Select "All time" from quick date range
-   */
-  selectAllTime(): this {
-    return this.selectQuickDateRange("alltime");
-  }
-
-  /**
-   * Verify the quick date range dropdown has expected value
-   */
-  verifyQuickDateRangeValue(
-    expectedValue:
-      | "today"
-      | "last7days"
-      | "last30days"
-      | "last3months"
-      | "last6months"
-      | "alltime"
-      | "custom",
-  ): this {
-    cy.get(this.dateFilters.quickDateRange, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
-    return this;
-  }
-
-  /**
-   * Set the Submitted From Date filter (for custom date range)
-   * @deprecated Use selectQuickDateRange() instead. This method is for custom date ranges only.
-   */
-  setSubmittedFromDate(date: string): this {
-    cy.get(this.dateFilters.submittedFromDate, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
-      .scrollIntoView()
-      .should("be.visible")
-      .click()
-      .clear()
-      .type(date)
-      .trigger("change")
-      .blur()
-      .should("have.value", date);
-    return this;
-  }
-
-  /**
-   * Set the Submitted To Date filter
-   */
-  setSubmittedToDate(date: string): this {
-    cy.get(this.dateFilters.submittedToDate, { timeout: this.STANDARD_TIMEOUT })
-      .scrollIntoView()
-      .should("be.visible")
-      .click()
-      .clear()
-      .type(date)
-      .trigger("change")
-      .blur()
-      .should("have.value", date);
-    return this;
-  }
-
-  /**
-   * Wait for table refresh (spinner to be hidden)
-   */
-  waitForTableRefresh(): this {
-    cy.get(this.dateFilters.spinner, { timeout: this.STANDARD_TIMEOUT }).then(
-      ($s: JQuery<HTMLElement>) => {
-        cy.wrap($s)
-          .should("have.attr", "style")
-          .and("contain", "display: none");
-      },
-    );
-    return this;
-  }
-
-  /**
-   * Get today's date in ISO local format (YYYY-MM-DD)
-   */
-  getTodayIsoLocal(): string {
-    const d = new Date();
-    const pad2 = (n: number) => String(n).padStart(2, "0");
-    return `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`;
-  }
-
-  // ============ Search Methods ============
-
-  /**
-   * Search for a submission by ID
-   */
-  searchForSubmission(submissionId: string): this {
-    cy.get("#search", { timeout: this.STANDARD_TIMEOUT })
-      .clear()
-      .type(submissionId);
-    this.waitForTableRefresh();
-    return this;
-  }
-
-  /**
-   * Select a row by matching text content
-   */
-  selectRowByText(text: string): this {
-    this.waitForNoBlockingOverlay();
-    cy.contains("tr", text, { timeout: this.STANDARD_TIMEOUT })
-      .scrollIntoView()
-      .find(".checkbox-select")
-      .should("be.visible")
-      .click();
-    return this;
-  }
-
-  /**
-   * Click the OPEN button (external link)
-   */
-  clickOpenButton(): this {
-    cy.get("#externalLink", { timeout: this.STANDARD_TIMEOUT })
-      .should("exist")
-      .should("be.visible")
-      .click();
-    return this;
-  }
-
-  // ============ Extended Table Methods ============
-
-  /**
-   * Verify table has rows (using scroll body selector)
-   */
-  verifyTableHasData(): this {
-    cy.get(this.scrollTable.tableRows, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.length.greaterThan", 1);
-    return this;
-  }
-
-  /**
-   * Select a row by index (clicks on a non-link cell)
-   */
-  selectRowByIndex(rowIndex: number, withCtrl = false): this {
-    const getTargetCell = () =>
-      cy
-        .get(this.scrollTable.tableRows, { timeout: this.STANDARD_TIMEOUT })
-        .eq(rowIndex)
-        .find("td")
-        .not(":has(a)")
-        .first();
-
-    cy.get(this.scrollTable.tableRows, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.length.greaterThan", rowIndex);
-
-    getTargetCell().should("exist");
-
-    // Break the chain and re-query right before click to avoid stale element errors
-    // when the datatable re-renders asynchronously.
-    getTargetCell().then(($cell) => {
-      if (Cypress.dom.isAttached($cell) && Cypress.dom.isVisible($cell)) {
-        cy.wrap($cell).scrollIntoView().click({ ctrlKey: withCtrl });
-      } else {
-        getTargetCell().click({ ctrlKey: withCtrl, force: true });
-      }
-    });
-    return this;
-  }
-
-  /**
-   * Select multiple rows by indices
-   */
-  selectMultipleRows(indices: number[]): this {
-    indices.forEach((index, i) => {
-      this.selectRowByIndex(index, i > 0);
-    });
-    return this;
-  }
-
-  /**
-   * Scroll table horizontally to a specific position
-   */
-  scrollTableHorizontally(x: number): this {
-    cy.get(this.scrollTable.scrollBody, { timeout: this.STANDARD_TIMEOUT })
-      .should("exist")
-      .scrollTo(x, 0, { duration: 0, ensureScrollable: false });
-    return this;
-  }
-
-  /**
-   * Get visible header titles from the table
-   */
-  getVisibleHeaderTitles(): Cypress.Chainable<string[]> {
-    return cy
-      .get(this.scrollTable.columnTitles, { timeout: this.STANDARD_TIMEOUT })
-      .then(($els: JQuery<HTMLElement>) => {
-        const titles: string[] = Cypress.$($els)
-          .toArray()
-          .map((el: HTMLElement) =>
-            (el.textContent || "").replace(/\s+/g, " ").trim(),
-          )
-          .filter((t: string) => t.length > 0);
-        return titles;
-      });
-  }
-
-  /**
-   * Assert that visible headers include expected columns (case-insensitive)
-   */
-  assertVisibleHeadersInclude(expected: string[]): this {
-    this.getVisibleHeaderTitles().then((titles: string[]) => {
-      const titlesLower = titles.map((t: string) => t.toLowerCase());
-      expected.forEach((e: string) => {
-        expect(titlesLower, `visible headers should include "${e}"`).to.include(
-          e.toLowerCase(),
-        );
-      });
-    });
-    return this;
-  }
-
-  // ============ Extended Action Bar Methods ============
-
-  /**
-   * Scroll to and verify action bar exists
-   */
-  verifyActionBarExists(): this {
-    cy.get(this.extendedActionBar.customButtons, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
-      .should("exist")
-      .scrollIntoView();
-    return this;
-  }
-
-  /**
-   * Click the Payment button (extended with visibility checks)
-   */
-  clickPaymentButtonWithWait(): this {
-    this.waitForNoBlockingOverlay();
-    cy.get("#applicationPaymentRequest", { timeout: this.BUTTON_TIMEOUT })
-      .should("be.visible")
-      .and("not.be.disabled")
-      .click();
-    return this;
-  }
-
-  /**
-   * Verify Export button is visible
-   */
-  verifyExportButtonVisible(): this {
-    cy.contains(this.extendedActionBar.exportButton, "Export", {
-      timeout: this.STANDARD_TIMEOUT,
-      matchCase: false,
-    })
-      .scrollIntoView()
-      .should("be.visible");
-    return this;
-  }
-
-  /**
-   * Verify Save View button is visible
-   */
-  verifySaveViewButtonVisible(): this {
-    cy.contains(
-      "#dynamicButtonContainerId button.grp-savedStates",
-      "Save View",
-      { timeout: this.STANDARD_TIMEOUT },
-    ).should("be.visible");
-    return this;
-  }
-
-  /**
-   * Verify Columns button is visible
-   */
-  verifyColumnsButtonVisible(): this {
-    cy.contains(
-      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
-      "Columns",
-      { timeout: this.STANDARD_TIMEOUT, matchCase: false },
-    )
-      .scrollIntoView()
-      .should("be.visible");
-    return this;
-  }
-
-  /**
-   * Verify dynamic button container exists
-   */
-  verifyDynamicButtonContainerExists(): this {
-    cy.get(this.extendedActionBar.dynamicButtonContainer, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
-      .should("exist")
-      .scrollIntoView();
-    return this;
-  }
-
-  // ============ Payment Modal Methods ============
-
-  /**
-   * Wait for payment modal to be visible
-   */
-  waitForPaymentModalVisible(): this {
-    cy.get(this.paymentModal.modal, { timeout: this.STANDARD_TIMEOUT })
-      .should("be.visible")
-      .and("have.class", "show");
-    cy.get(this.paymentModal.backdrop, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("exist");
-    return this;
-  }
-
-  /**
-   * Wait for blocking modal overlays to clear before interacting with list controls.
-   */
-  waitForNoBlockingOverlay(): this {
-    cy.get(this.blockingUi.swalContainer, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-
-    cy.get(this.blockingUi.bootstrapModal, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-
-    cy.get(this.paymentModal.backdrop, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-    return this;
-  }
-
-  /**
-   * Close payment modal using multiple strategies
-   */
-  closePaymentModal(): this {
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if ($body.find(`${this.paymentModal.modal}.show`).length === 0) {
-        return;
-      }
-
-      const $cancelBtn = $body
-        .find(this.paymentModal.cancelButton)
-        .filter((_: number, el: HTMLElement) =>
-          (el.textContent || "").includes("Cancel"),
+    private readonly STANDARD_TIMEOUT = 20000;
+    private readonly BUTTON_TIMEOUT = 60000;
+
+    // Date filter selectors
+    private readonly dateFilters = {
+        quickDateRange: "select#quickDateRange",
+        submittedFromDate: "input#submittedFromDate",
+        submittedToDate: "input#submittedToDate",
+        spinner: 'div.spinner-grow[role="status"]',
+    };
+
+    // Quick date range option values
+    private readonly quickDateRangeOptions = {
+        today: "today",
+        last7Days: "last7days",
+        last30Days: "last30days",
+        last3Months: "last3months",
+        last6Months: "last6months",
+        allTime: "alltime",
+        custom: "custom",
+    };
+
+    // Extended action bar selectors (beyond ApplicationsPage)
+    private readonly extendedActionBar = {
+        customButtons: "#app_custom_buttons",
+        dynamicButtonContainer: "#dynamicButtonContainerId",
+        exportButton:
+            "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
+        saveViewButton: "button.grp-savedStates",
+    };
+
+    // Table scrolling selectors
+    private readonly scrollTable = {
+        scrollBody: ".dt-scroll-body",
+        tableRows: ".dt-scroll-body tbody tr",
+        scrollHead: ".dt-scroll-head",
+        columnTitles: ".dt-scroll-head span.dt-column-title",
+    };
+
+    // Columns menu selectors
+    private readonly columnsMenu = {
+        dropdownItem: "a.dropdown-item",
+        buttonBackground: "div.dt-button-background",
+    };
+
+    // Payment modal selectors
+    private readonly paymentModal = {
+        modal: "#payment-modal",
+        backdrop: ".modal-backdrop",
+        cancelButton: "#payment-modal .modal-footer button",
+    };
+
+    private readonly blockingUi = {
+        bootstrapModal: ".modal.show",
+        swalContainer: ".swal2-container",
+    };
+
+    // Grant program selectors
+    private readonly grantProgram = {
+        userInitials: ".unity-user-initials",
+        userDropdown: "#user-dropdown a.dropdown-item",
+        searchInput: "#search-grant-programs",
+        programsTableRow: "#UserGrantProgramsTable tbody tr",
+    };
+
+    // Save view selectors
+    private readonly saveView = {
+        button: "button.grp-savedStates",
+        resetOption: "a.dropdown-item",
+    };
+
+    constructor() {
+        super();
+    }
+
+    // ============ Date Filter Methods ============
+
+    /**
+     * Select a quick date range from the dropdown
+     * @param range - One of: "today", "last7days", "last30days", "last3months", "last6months", "alltime", "custom"
+     */
+    selectQuickDateRange(
+        range:
+            | "today"
+            | "last7days"
+            | "last30days"
+            | "last3months"
+            | "last6months"
+            | "alltime"
+            | "custom",
+    ): this {
+        this.waitForNoBlockingOverlay();
+        cy.get(this.dateFilters.quickDateRange, { timeout: this.STANDARD_TIMEOUT })
+            .scrollIntoView()
+            .should("be.visible")
+            .and("not.be.disabled")
+            .select(range);
+        return this;
+    }
+
+    /**
+     * Select "Last 6 months" from quick date range (default)
+     */
+    selectLast6Months(): this {
+        return this.selectQuickDateRange("last6months");
+    }
+
+    /**
+     * Select "All time" from quick date range
+     */
+    selectAllTime(): this {
+        return this.selectQuickDateRange("alltime");
+    }
+
+    /**
+     * Verify the quick date range dropdown has expected value
+     */
+    verifyQuickDateRangeValue(
+        expectedValue:
+            | "today"
+            | "last7days"
+            | "last30days"
+            | "last3months"
+            | "last6months"
+            | "alltime"
+            | "custom",
+    ): this {
+        cy.get(this.dateFilters.quickDateRange, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("have.value", expectedValue);
+        return this;
+    }
+
+    /**
+     * Set the Submitted From Date filter (for custom date range)
+     * @deprecated Use selectQuickDateRange() instead. This method is for custom date ranges only.
+     */
+    setSubmittedFromDate(date: string): this {
+        cy.get(this.dateFilters.submittedFromDate, {
+            timeout: this.STANDARD_TIMEOUT,
+        })
+            .scrollIntoView()
+            .should("be.visible")
+            .click()
+            .clear()
+            .type(date)
+            .trigger("change")
+            .blur()
+            .should("have.value", date);
+        return this;
+    }
+
+    /**
+     * Set the Submitted To Date filter
+     */
+    setSubmittedToDate(date: string): this {
+        cy.get(this.dateFilters.submittedToDate, { timeout: this.STANDARD_TIMEOUT })
+            .scrollIntoView()
+            .should("be.visible")
+            .click()
+            .clear()
+            .type(date)
+            .trigger("change")
+            .blur()
+            .should("have.value", date);
+        return this;
+    }
+
+    /**
+     * Wait for table refresh (spinner to be hidden)
+     */
+    waitForTableRefresh(): this {
+        cy.get(this.dateFilters.spinner, { timeout: this.STANDARD_TIMEOUT }).then(
+            ($s: JQuery<HTMLElement>) => {
+                cy.wrap($s)
+                    .should("have.attr", "style")
+                    .and("contain", "display: none");
+            },
         );
+        return this;
+    }
+
+    /**
+     * Get today's date in ISO local format (YYYY-MM-DD)
+     */
+    getTodayIsoLocal(): string {
+        const d = new Date();
+        const pad2 = (n: number) => String(n).padStart(2, "0");
+        return `${d.getFullYear()}-${pad2(d.getMonth() + 1)}-${pad2(d.getDate())}`;
+    }
+
+    // ============ Search Methods ============
+
+    /**
+     * Search for a submission by ID
+     */
+    searchForSubmission(submissionId: string): this {
+        cy.get("#search", { timeout: this.STANDARD_TIMEOUT })
+            .clear()
+            .type(submissionId);
+        this.waitForTableRefresh();
+        return this;
+    }
+
+    /**
+     * Select a row by matching text content
+     */
+    selectRowByText(text: string): this {
+        this.waitForNoBlockingOverlay();
+        cy.contains("tr", text, { timeout: this.STANDARD_TIMEOUT })
+            .scrollIntoView()
+            .find(".checkbox-select")
+            .should("be.visible")
+            .click();
+        return this;
+    }
+
+    /**
+     * Click the OPEN button (external link)
+     */
+    clickOpenButton(): this {
+        cy.get("#externalLink", { timeout: this.STANDARD_TIMEOUT })
+            .should("exist")
+            .should("be.visible")
+            .click();
+        return this;
+    }
+
+    // ============ Extended Table Methods ============
+
+    /**
+     * Verify table has rows (using scroll body selector)
+     */
+    verifyTableHasData(): this {
+        cy.get(this.scrollTable.tableRows, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("have.length.greaterThan", 1);
+        return this;
+    }
+
+    /**
+     * Dispatch a native mouse click sequence against the current target cell.
+     * This avoids Cypress holding a stale DOM reference while DataTables redraws.
+     */
+    private clickRowCellNative(rowIndex: number, withCtrl = false): this {
+        this.waitForNoBlockingOverlay();
+
+        cy.window({ log: false }).then((win: Cypress.AUTWindow) => {
+            cy.get(this.scrollTable.tableRows, {
+                timeout: this.STANDARD_TIMEOUT,
+            })
+                .should("have.length.greaterThan", rowIndex)
+                .eq(rowIndex)
+                .should("exist")
+                .then(($row: JQuery<HTMLElement>) => {
+                    const $cell = $row.find("td").not(":has(a)").first();
+
+                    expect(
+                        $cell.length,
+                        `row ${rowIndex} should contain at least one non-link cell`,
+                    ).to.be.greaterThan(0);
+
+                    const cell = $cell[0] as HTMLElement;
+
+                    cell.scrollIntoView({
+                        block: "center",
+                        inline: "nearest",
+                    });
+
+                    const eventInit: MouseEventInit = {
+                        bubbles: true,
+                        cancelable: true,
+                        view: win,
+                        ctrlKey: withCtrl,
+                        metaKey: withCtrl,
+                        button: 0,
+                        buttons: 1,
+                    };
+
+                    cell.dispatchEvent(new win.MouseEvent("mouseover", eventInit));
+                    cell.dispatchEvent(new win.MouseEvent("mousemove", eventInit));
+                    cell.dispatchEvent(new win.MouseEvent("mousedown", eventInit));
+                    cell.dispatchEvent(new win.MouseEvent("mouseup", eventInit));
+                    cell.dispatchEvent(new win.MouseEvent("click", eventInit));
+                });
+        });
+
+        return this;
+    }
+
+    /**
+     * Select a row by index (clicks on a non-link cell)
+     */
+    selectRowByIndex(rowIndex: number, withCtrl = false): this {
+        return this.clickRowCellNative(rowIndex, withCtrl);
+    }
+
+    /**
+     * Select multiple rows by indices
+     */
+    selectMultipleRows(indices: number[]): this {
+        indices.forEach((index, i) => {
+            this.selectRowByIndex(index, i > 0);
+        });
+        return this;
+    }
+
+    /**
+     * Scroll table horizontally to a specific position
+     */
+    scrollTableHorizontally(x: number): this {
+        cy.get(this.scrollTable.scrollBody, { timeout: this.STANDARD_TIMEOUT })
+            .should("exist")
+            .scrollTo(x, 0, { duration: 0, ensureScrollable: false });
+        return this;
+    }
+
+    /**
+     * Get visible header titles from the table
+     */
+    getVisibleHeaderTitles(): Cypress.Chainable<string[]> {
+        return cy
+            .get(this.scrollTable.columnTitles, { timeout: this.STANDARD_TIMEOUT })
+            .then(($els: JQuery<HTMLElement>) => {
+                const titles: string[] = Cypress.$($els)
+                    .toArray()
+                    .map((el: HTMLElement) =>
+                        (el.textContent || "").replace(/\s+/g, " ").trim(),
+                    )
+                    .filter((t: string) => t.length > 0);
+                return titles;
+            });
+    }
+
+    /**
+     * Assert that visible headers include expected columns (case-insensitive)
+     */
+    assertVisibleHeadersInclude(expected: string[]): this {
+        this.getVisibleHeaderTitles().then((titles: string[]) => {
+            const titlesLower = titles.map((t: string) => t.toLowerCase());
+            expected.forEach((e: string) => {
+                expect(titlesLower, `visible headers should include "${e}"`).to.include(
+                    e.toLowerCase(),
+                );
+            });
+        });
+        return this;
+    }
+
+    // ============ Extended Action Bar Methods ============
+
+    /**
+     * Scroll to and verify action bar exists
+     */
+    verifyActionBarExists(): this {
+        cy.get(this.extendedActionBar.customButtons, {
+            timeout: this.STANDARD_TIMEOUT,
+        })
+            .should("exist")
+            .scrollIntoView();
+        return this;
+    }
+
+    /**
+     * Click the Payment button (extended with visibility checks)
+     */
+    clickPaymentButtonWithWait(): this {
+        this.waitForNoBlockingOverlay();
+        cy.get("#applicationPaymentRequest", { timeout: this.BUTTON_TIMEOUT })
+            .should("be.visible")
+            .and("not.be.disabled")
+            .click();
+        return this;
+    }
+
+    /**
+     * Verify Export button is visible
+     */
+    verifyExportButtonVisible(): this {
+        cy.contains(this.extendedActionBar.exportButton, "Export", {
+            timeout: this.STANDARD_TIMEOUT,
+            matchCase: false,
+        })
+            .scrollIntoView()
+            .should("be.visible");
+        return this;
+    }
+
+    /**
+     * Verify Save View button is visible
+     */
+    verifySaveViewButtonVisible(): this {
+        cy.contains(
+            "#dynamicButtonContainerId button.grp-savedStates",
+            "Save View",
+            { timeout: this.STANDARD_TIMEOUT },
+        ).should("be.visible");
+        return this;
+    }
+
+    /**
+     * Verify Columns button is visible
+     */
+    verifyColumnsButtonVisible(): this {
+        cy.contains(
+            "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
+            "Columns",
+            { timeout: this.STANDARD_TIMEOUT, matchCase: false },
+        )
+            .scrollIntoView()
+            .should("be.visible");
+        return this;
+    }
+
+    /**
+     * Verify dynamic button container exists
+     */
+    verifyDynamicButtonContainerExists(): this {
+        cy.get(this.extendedActionBar.dynamicButtonContainer, {
+            timeout: this.STANDARD_TIMEOUT,
+        })
+            .should("exist")
+            .scrollIntoView();
+        return this;
+    }
+
+    // ============ Payment Modal Methods ============
+
+    /**
+     * Wait for payment modal to be visible
+     */
+    waitForPaymentModalVisible(): this {
+        cy.get(this.paymentModal.modal, { timeout: this.STANDARD_TIMEOUT })
+            .should("be.visible")
+            .and("have.class", "show");
+        cy.get(this.paymentModal.backdrop, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("exist");
+        return this;
+    }
+
+    /**
+     * Wait for blocking modal overlays to clear before interacting with list controls.
+     */
+    waitForNoBlockingOverlay(): this {
+        cy.get(this.blockingUi.swalContainer, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("not.exist");
+
+        cy.get(this.blockingUi.bootstrapModal, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("not.exist");
+
+        cy.get(this.paymentModal.backdrop, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("not.exist");
+        return this;
+    }
+
+    /**
+     * Close payment modal using multiple strategies
+     */
+    closePaymentModal(): this {
+        cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+            if ($body.find(`${this.paymentModal.modal}.show`).length === 0) {
+                return;
+            }
+
+            const $cancelBtn = $body
+                .find(this.paymentModal.cancelButton)
+                .filter((_: number, el: HTMLElement) =>
+                    (el.textContent || "").includes("Cancel"),
+                );
+
+            if ($cancelBtn.length > 0) {
+                cy.wrap($cancelBtn.first()).scrollIntoView().click({ force: true });
+            }
+        });
 
-      if ($cancelBtn.length > 0) {
-        cy.wrap($cancelBtn.first()).scrollIntoView().click({ force: true });
-      }
-    });
-
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
-        cy.get("body").type("{esc}", { force: true });
-      }
-    });
-
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if (
-        $body.find(`${this.paymentModal.modal}.show`).length > 0 &&
-        $body.find(this.paymentModal.backdrop).length > 0
-      ) {
-        cy.get(this.paymentModal.backdrop).first().click("topLeft", {
-          force: true,
+        cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+            if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
+                cy.get("body").type("{esc}", { force: true });
+            }
         });
-      }
-    });
-
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
-        cy.window().then((win: Cypress.AUTWindow) => {
-          try {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const windowWithModal = win as any;
-            if (typeof windowWithModal.closePaymentModal === "function") {
-              windowWithModal.closePaymentModal();
+
+        cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+            if (
+                $body.find(`${this.paymentModal.modal}.show`).length > 0 &&
+                $body.find(this.paymentModal.backdrop).length > 0
+            ) {
+                cy.get(this.paymentModal.backdrop).first().click("topLeft", {
+                    force: true,
+                });
             }
-          } catch {
-            /* ignore */
-          }
-
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          const $ = (win as any).jQuery || (win as any).$;
-          if ($) {
-            try {
-              $(this.paymentModal.modal)
-                .removeClass("show")
-                .attr("aria-hidden", "true")
-                .css("display", "none");
-              $(this.paymentModal.backdrop).remove();
-              $("body").removeClass("modal-open").css("overflow", "");
-            } catch {
-              /* ignore */
+        });
+
+        cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+            if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
+                cy.window().then((win: Cypress.AUTWindow) => {
+                    try {
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        const windowWithModal = win as any;
+                        if (typeof windowWithModal.closePaymentModal === "function") {
+                            windowWithModal.closePaymentModal();
+                        }
+                    } catch {
+                        /* ignore */
+                    }
+
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const $ = (win as any).jQuery || (win as any).$;
+                    if ($) {
+                        try {
+                            $(this.paymentModal.modal)
+                                .removeClass("show")
+                                .attr("aria-hidden", "true")
+                                .css("display", "none");
+                            $(this.paymentModal.backdrop).remove();
+                            $("body").removeClass("modal-open").css("overflow", "");
+                        } catch {
+                            /* ignore */
+                        }
+                    }
+                });
             }
-          }
         });
-      }
-    });
-
-    return this.verifyPaymentModalClosed();
-  }
-
-  /**
-   * Verify payment modal is closed
-   */
-  verifyPaymentModalClosed(): this {
-    cy.get(this.paymentModal.modal, { timeout: this.STANDARD_TIMEOUT }).should(
-      ($m: JQuery<HTMLElement>) => {
-        const isHidden = !$m.is(":visible") || !$m.hasClass("show");
-        expect(isHidden, "payment-modal hidden or not shown").to.eq(true);
-      },
-    );
-
-    cy.get(this.paymentModal.backdrop, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-
-    cy.get(this.blockingUi.bootstrapModal, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-    return this;
-  }
-
-  /**
-   * Close any open dropdowns or modals
-   */
-  closeOpenDropdowns(): this {
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if ($body.find(this.columnsMenu.buttonBackground).length > 0) {
-        cy.get(this.columnsMenu.buttonBackground).click({ force: true });
-      }
-    });
-    return this;
-  }
-
-  /**
-   * Open Save View dropdown and reset to default
-   */
-  resetToDefaultView(): this {
-    cy.get(this.saveView.button, { timeout: this.STANDARD_TIMEOUT })
-      .should("be.visible")
-      .and("contain.text", "Save View")
-      .click();
-
-    cy.contains(this.saveView.resetOption, "Reset to Default View", {
-      timeout: this.STANDARD_TIMEOUT,
-    })
-      .should("be.visible")
-      .click();
-
-    // Wait for table to rebuild
-    cy.get(this.scrollTable.columnTitles, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.length.gt", 5);
-    return this;
-  }
-
-  /**
-   * Open the Columns menu
-   */
-  openColumnsMenu(): this {
-    cy.contains(
-      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
-      "Columns",
-      { timeout: this.STANDARD_TIMEOUT, matchCase: false },
-    )
-      .scrollIntoView()
-      .should("be.visible")
-      .click();
-
-    // Wait for dropdown to be fully populated
-    cy.get(this.columnsMenu.dropdownItem, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.length.gt", 50);
-    return this;
-  }
-
-  /**
-   * Click a column item in the Columns menu (case-insensitive)
-   */
-  clickColumnsItem(label: string): this {
-    cy.contains(this.columnsMenu.dropdownItem, label, {
-      timeout: this.STANDARD_TIMEOUT,
-      matchCase: false,
-    })
-      .scrollIntoView()
-      .should("exist")
-      .then(($item) => {
-        if (Cypress.dom.isVisible($item)) {
-          cy.wrap($item).click();
-        } else {
-          // Some dropdown items are clipped by overflow containers; native click still triggers menu toggle reliably.
-          ($item[0] as HTMLElement).click();
-        }
-      });
-    return this;
-  }
-
-  /**
-   * Toggle multiple columns (click each one)
-   */
-  toggleColumns(columns: string[]): this {
-    columns.forEach((column) => {
-      this.clickColumnsItem(column);
-    });
-    return this;
-  }
-
-  /**
-   * Close the Columns menu
-   */
-  closeColumnsMenu(): this {
-    cy.get(this.columnsMenu.buttonBackground, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
-      .should("exist")
-      .click({ force: true });
-
-    cy.get(this.columnsMenu.buttonBackground, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-    return this;
-  }
-
-  // ============ Grant Program Methods ============
-
-  /**
-   * Switch to a specific grant program if available
-   * Note: Consider using NavigationPage.switchToTenantIfAvailable() for consistency
-   */
-  switchToGrantProgram(programName: string): this {
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      const hasUserInitials =
-        $body.find(this.grantProgram.userInitials).length > 0;
-
-      if (!hasUserInitials) {
-        cy.log("Skipping tenant switch: no user initials menu found");
-        return;
-      }
-
-      cy.get(this.grantProgram.userInitials).click();
-
-      cy.get("body").then(($body2: JQuery<HTMLBodyElement>) => {
-        const switchLink = $body2
-          .find(this.grantProgram.userDropdown)
-          .filter((_: number, el: HTMLElement) => {
-            return (el.textContent || "").trim() === "Switch Grant Programs";
-          });
-
-        if (switchLink.length === 0) {
-          cy.log(
-            'Skipping tenant switch: "Switch Grant Programs" not present for this user/session',
-          );
-          cy.get("body").click(0, 0);
-          return;
-        }
-
-        cy.wrap(switchLink.first()).click();
-
-        cy.url({ timeout: this.STANDARD_TIMEOUT }).should(
-          "include",
-          "/GrantPrograms",
+
+        return this.verifyPaymentModalClosed();
+    }
+
+    /**
+     * Verify payment modal is closed
+     */
+    verifyPaymentModalClosed(): this {
+        cy.get(this.paymentModal.modal, { timeout: this.STANDARD_TIMEOUT }).should(
+            ($m: JQuery<HTMLElement>) => {
+                const isHidden = !$m.is(":visible") || !$m.hasClass("show");
+                expect(isHidden, "payment-modal hidden or not shown").to.eq(true);
+            },
         );
 
-        cy.get(this.grantProgram.searchInput, {
-          timeout: this.STANDARD_TIMEOUT,
+        cy.get(this.paymentModal.backdrop, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("not.exist");
+
+        cy.get(this.blockingUi.bootstrapModal, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("not.exist");
+        return this;
+    }
+
+    /**
+     * Close any open dropdowns or modals
+     */
+    closeOpenDropdowns(): this {
+        cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+            if ($body.find(this.columnsMenu.buttonBackground).length > 0) {
+                cy.get(this.columnsMenu.buttonBackground).click({ force: true });
+            }
+        });
+        return this;
+    }
+
+    /**
+     * Open Save View dropdown and reset to default
+     */
+    resetToDefaultView(): this {
+        cy.get(this.saveView.button, { timeout: this.STANDARD_TIMEOUT })
+            .should("be.visible")
+            .and("contain.text", "Save View")
+            .click();
+
+        cy.contains(this.saveView.resetOption, "Reset to Default View", {
+            timeout: this.STANDARD_TIMEOUT,
         })
-          .should("be.visible")
-          .clear()
-          .type(programName);
-
-        cy.contains(this.grantProgram.programsTableRow, programName, {
-          timeout: this.STANDARD_TIMEOUT,
+            .should("be.visible")
+            .click();
+
+        // Wait for table to rebuild
+        cy.get(this.scrollTable.columnTitles, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("have.length.gt", 5);
+        return this;
+    }
+
+    /**
+     * Open the Columns menu
+     */
+    openColumnsMenu(): this {
+        cy.contains(
+            "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
+            "Columns",
+            { timeout: this.STANDARD_TIMEOUT, matchCase: false },
+        )
+            .scrollIntoView()
+            .should("be.visible")
+            .click();
+
+        // Wait for dropdown to be fully populated
+        cy.get(this.columnsMenu.dropdownItem, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("have.length.gt", 50);
+        return this;
+    }
+
+    /**
+     * Click a column item in the Columns menu (case-insensitive)
+     */
+    clickColumnsItem(label: string): this {
+        cy.contains(this.columnsMenu.dropdownItem, label, {
+            timeout: this.STANDARD_TIMEOUT,
+            matchCase: false,
         })
-          .should("exist")
-          .within(() => {
-            cy.contains("button", "Select").should("be.enabled").click();
-          });
-
-        cy.location("pathname", { timeout: this.STANDARD_TIMEOUT }).should(
-          (p: string) => {
-            expect(
-              p.indexOf("/GrantApplications") >= 0 || p.indexOf("/auth/") >= 0,
-            ).to.eq(true);
-          },
-        );
-      });
-    });
-    return this;
-  }
-}
+            .scrollIntoView()
+            .should("exist")
+            .then(($item) => {
+                if (Cypress.dom.isVisible($item)) {
+                    cy.wrap($item).click();
+                } else {
+                    // Some dropdown items are clipped by overflow containers; native click still triggers menu toggle reliably.
+                    ($item[0] as HTMLElement).click();
+                }
+            });
+        return this;
+    }
+
+    /**
+     * Toggle multiple columns (click each one)
+     */
+    toggleColumns(columns: string[]): this {
+        columns.forEach((column) => {
+            this.clickColumnsItem(column);
+        });
+        return this;
+    }
+
+    /**
+     * Close the Columns menu
+     */
+    closeColumnsMenu(): this {
+        cy.get(this.columnsMenu.buttonBackground, {
+            timeout: this.STANDARD_TIMEOUT,
+        })
+            .should("exist")
+            .click({ force: true });
+
+        cy.get(this.columnsMenu.buttonBackground, {
+            timeout: this.STANDARD_TIMEOUT,
+        }).should("not.exist");
+        return this;
+    }
+
+    // ============ Grant Program Methods ============
+
+    /**
+     * Switch to a specific grant program if available
+     * Note: Consider using NavigationPage.switchToTenantIfAvailable() for consistency
+     */
+    switchToGrantProgram(programName: string): this {
+        cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+            const hasUserInitials =
+                $body.find(this.grantProgram.userInitials).length > 0;
+
+            if (!hasUserInitials) {
+                cy.log("Skipping tenant switch: no user initials menu found");
+                return;
+            }
+
+            cy.get(this.grantProgram.userInitials).click();
+
+            cy.get("body").then(($body2: JQuery<HTMLBodyElement>) => {
+                const switchLink = $body2
+                    .find(this.grantProgram.userDropdown)
+                    .filter((_: number, el: HTMLElement) => {
+                        return (el.textContent || "").trim() === "Switch Grant Programs";
+                    });
+
+                if (switchLink.length === 0) {
+                    cy.log(
+                        'Skipping tenant switch: "Switch Grant Programs" not present for this user/session',
+                    );
+                    cy.get("body").click(0, 0);
+                    return;
+                }
+
+                cy.wrap(switchLink.first()).click();
+
+                cy.url({ timeout: this.STANDARD_TIMEOUT }).should(
+                    "include",
+                    "/GrantPrograms",
+                );
+
+                cy.get(this.grantProgram.searchInput, {
+                    timeout: this.STANDARD_TIMEOUT,
+                })
+                    .should("be.visible")
+                    .clear()
+                    .type(programName);
+
+                cy.contains(this.grantProgram.programsTableRow, programName, {
+                    timeout: this.STANDARD_TIMEOUT,
+                })
+                    .should("exist")
+                    .within(() => {
+                        cy.contains("button", "Select").should("be.enabled").click();
+                    });
+
+                cy.location("pathname", { timeout: this.STANDARD_TIMEOUT }).should(
+                    (p: string) => {
+                        expect(
+                            p.indexOf("/GrantApplications") >= 0 || p.indexOf("/auth/") >= 0,
+                        ).to.eq(true);
+                    },
+                );
+            });
+        });
+        return this;
+    }
+}
\ No newline at end of file

From 53e7cddfc78d5b0ab6ef9faa7938813710555f5c Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 16 Apr 2026 16:48:57 -0700
Subject: [PATCH 06/45] AB#32583 refine chefs toolbar layout

---
 .../Localization/GrantManager/en.json         |  18 ++-
 .../ChefsAttachments/ChefsAttachments.css     | 114 ++++++------------
 .../ChefsAttachments/Default.cshtml           |  18 +--
 3 files changed, 58 insertions(+), 92 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json
index fe3e30cd2c..a8f134376e 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Domain.Shared/Localization/GrantManager/en.json
@@ -102,10 +102,20 @@
     "ReviewerList:Subtotal": "Subtotal",
     "ReviewerList:CloneAssessment": "Clone Assessment",
 
-    "AssessmentResultAttachments:Id": "#",
-    "AssessmentResultAttachments:DocumentName": "Document Name",
-    "AssessmentResultAttachments:UploadedDate": "Date",
-    "AssessmentResultAttachments:AttachedBy": "Attached by",
+    "AssessmentResultAttachments:Id": "#",
+    "AssessmentResultAttachments:DocumentName": "Document Name",
+    "AssessmentResultAttachments:UploadedDate": "Date",
+    "AssessmentResultAttachments:AttachedBy": "Attached by",
+    "ChefsAttachments:Title": "Submission Attachments",
+    "ChefsAttachments:Filter": "Filter",
+    "ChefsAttachments:Download": "Download",
+    "ChefsAttachments:GenerateSummaries": "Generate AI Summaries",
+    "ChefsAttachments:GenerateSummary": "Generate Summary",
+    "ChefsAttachments:HideAISummaries": "Hide AI Summaries",
+    "ChefsAttachments:ShowAISummaries": "Show AI Summaries",
+    "ChefsAttachments:HideSummaries": "Hide Summaries",
+    "ChefsAttachments:ShowSummaries": "Show Summaries",
+    "ChefsAttachments:NoSummariesAvailable": "No summaries available",
 
     "Enum:AssessmentState.IN_PROGRESS": "In Progress",
     "Enum:AssessmentState.IN_REVIEW": "Under Review by Team Lead",
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.css
index a1595e980c..6a9a913c3d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.css
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/ChefsAttachments.css
@@ -8,7 +8,9 @@
     display: flex;
     flex-direction: row;
     justify-content: space-between;
-    align-items: flex-end;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    gap: 8px 8px;
     margin-bottom: 8px;
 }
 
@@ -18,11 +20,39 @@
 }
 
 .submission-title {
-    display: inline-block;
+    display: flex;
+    align-items: center;
+    height: 36px;
+    padding-top: 0;
 }
 
 .submission-button-section {
     display: flex;
+    flex: 1 1 0;
+    margin-left: auto;
+    flex-wrap: wrap;
+    align-items: center;
+    align-content: center;
+    justify-content: flex-end;
+    gap: 6px;
+    min-width: 0;
+}
+
+.submission-button-section .btn {
+    flex: 0 0 auto;
+    height: 36px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    line-height: 1;
+    white-space: nowrap;
+}
+
+.submission-button-section .button-content {
+    display: inline-flex;
+    align-items: center;
+    gap: 0.5rem;
+    white-space: nowrap;
 }
 
 #ChefsAttachmentsTable_paginate {
@@ -33,58 +63,26 @@
 /* AI Summary Row Styles */
 .ai-summary-row {
     border-left: 4px solid var(--bc-colors-blue-primary);
-    margin: -8px -10px 5px;
     background: #faf9f8;
     padding: 10px 15px;
-    opacity: 0;
-    transition: opacity 0.5s ease-in-out;
-}
-
-.ai-summary-row.fade-in {
-    opacity: 1;
-    animation: fadeIn 0.5s ease-in forwards;
 }
 
-.ai-summary-row.fade-out {
-    opacity: 0;
-    animation: fadeOut 0.5s ease-out forwards;
+#ChefsAttachmentsTable td.ai-summary-cell {
+    padding: 0 !important;
 }
 
-@keyframes fadeIn {
-    from {
-        opacity: 0;
-        transform: translateY(-10px);
-    }
-    to {
-        opacity: 1;
-        transform: translateY(0);
-    }
-}
-
-@keyframes fadeOut {
-    from {
-        opacity: 1;
-        transform: translateY(0);
-    }
-    to {
-        opacity: 0;
-        transform: translateY(-10px);
-    }
-}
-
-.ai-summary-content {
-    font-size: 14px;
-    line-height: 1.6;
+#ChefsAttachmentsTable .ai-summary-content {
     color: #292929;
+    padding: 8px 12px;
 }
 
-.ai-summary-content strong {
+#ChefsAttachmentsTable .ai-summary-content strong {
     color: var(--bc-colors-blue-primary);
     font-weight: 600;
     font-size: 13px;
 }
 
-.ai-summary-content p {
+#ChefsAttachmentsTable .ai-summary-content p {
     margin-bottom: 0;
     color: #495057;
     white-space: pre-wrap;
@@ -94,39 +92,3 @@
 #ChefsAttachmentsTable tr.shown {
     background-color: rgba(13, 110, 253, 0.05);
 }
-
-/* Disabled state for AI summary toggle button */
-#toggleAllAISummaries:disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-    pointer-events: none;
-}
-
-#toggleAllAISummaries:disabled i {
-    opacity: 0.5;
-}
-
-/* Fix double scrollbar issue when AI summaries are expanded */
-#ChefsAttachmentsTable_wrapper .dt-scroll-body {
-    max-height: none !important;
-    overflow-y: visible !important;
-}
-
-/* Ensure table wrapper uses full width */
-#ChefsAttachmentsTable_wrapper {
-    width: 100%;
-}
-
-/* Ensure scroll container properly sizes */
-#ChefsAttachmentsTable_wrapper .dt-scroll {
-    overflow-x: auto;
-}
-
-#ChefsAttachmentsTable_wrapper .dt-scroll-head .dt-scroll-headInner,
-#ChefsAttachmentsTable_wrapper .dt-scroll-head .dt-scroll-headInner table {
-    width: 100% !important;
-}
-
-#ChefsAttachmentsTable_wrapper .dt-scroll-body table {
-    width: 100% !important;
-}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/Default.cshtml b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/Default.cshtml
index 5b5a3f3698..39651c6cb0 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/Default.cshtml
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ChefsAttachments/Default.cshtml
@@ -1,43 +1,37 @@
-@using Microsoft.Extensions.Localization
+@using Microsoft.Extensions.Localization
 @using Unity.GrantManager.Localization
 
 @inject IStringLocalizer<GrantManagerResource> L
 <div class="attachments__title-button-split">
     <div class="submission-title">
-        <h6 class="fw-bold px-3 pt-4 pb-2 m-0">Submission Attachments</h6>
+        <h6 class="fw-bold px-3 m-0">Submission Attachments</h6>
     </div>
     <div class="submission-button-section me-3">
         @if (ViewBag.IsAIAttachmentSummariesEnabled)
         {
-            <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="generateAiSummaries" title="Generate AI Summaries">
+            <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="generateAiSummaries" title="Generate AI Summaries">
                 <span class="ai-button-content">
                     <i class="unt-icon-sm fa-solid fa-wand-magic-sparkles"></i>
                     <span>Generate Summary</span>
                 </span>
             </button>
-            <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="toggleAllAISummaries" title="Toggle AI Summaries">
+            <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="toggleAllAISummaries" title="Toggle AI Summaries">
                 <span class="ai-button-content">
                     <i class="unt-icon-sm fa-solid fa-chevron-down"></i>
                     <span class="toggle-ai-summaries-label">Show Summaries</span>
                 </span>
             </button>
         }
-        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="btn-toggle-filter-submissions" title="Filter">
+        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="btn-toggle-filter-submissions" title="Filter">
             <span>Filter</span>
         </button>
-        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="downloadAll">
+        <button type="button" class="btn unt-btn-outline-primary btn-outline-primary" id="downloadSelected">
             <span class="ai-button-content">
                 <i class="unt-icon-sm fl fl-download"></i>
                 <span>Download All</span>
             </span>
         </button>
         <button type="button" class="btn unt-btn-outline-primary btn-outline-primary me-2" id="resyncSubmissionAttachments" abp-tooltip="@L["ApplicationList:ResyncSubmissionAttachmentsButton"].Value"><i class="unt-icon-sm fl fl-synch"></i></button>
-        @* <abp-button id="resyncSubmissionAttachments"
-                        icon-type="Other"
-                        size="Large"
-                        icon="fl fl-synch"
-                        abp-tooltip="@L["ApplicationList:ResyncSubmissionAttachmentsButton"].Value"
-                        button-type="Light" /> *@
     </div>
 </div>
 <div class="px-3">

From 414ef567c234c4f13aa4d7c419bb8e6e924f8838 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 16 Apr 2026 17:04:10 -0700
Subject: [PATCH 07/45] AB#32583 rerun branch automation


From 960191b870d2b0b58f8334fd1a44c2c3c3a2c8e8 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 11:07:34 -0700
Subject: [PATCH 08/45] AB#30833 Update application analysis quick review UI

---
 .../AI/Models/AIJsonKeys.cs                   |   6 +-
 .../ApplicationAnalysisRecommendation.cs      |  13 --
 .../Responses/ApplicationAnalysisResponse.cs  |  11 +-
 .../Versions/v0/application-analysis.user.txt |  15 +-
 .../v1/application-analysis.output.txt        |  10 +-
 .../v1/application-analysis.rules.txt         |  14 +-
 .../AI/Runtime/AIProviderPayloadValidator.cs  |   8 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        |  43 +---
 .../DataSeed/AIPromptDataSeeder.cs            |  39 ++--
 .../IGrantApplicationAppService.cs            |   4 +-
 .../GrantApplicationAppService.cs             |  34 +--
 .../Pages/GrantApplications/Details.cshtml    | 108 ++++-----
 .../Pages/GrantApplications/Details.js        |  14 --
 .../Pages/GrantApplications/ai-analysis.js    | 208 +++++++-----------
 14 files changed, 193 insertions(+), 334 deletions(-)
 delete mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs
index 501de0c856..8b5de11fe5 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs
@@ -2,14 +2,12 @@ namespace Unity.AI.Models
 {
     public static class AIJsonKeys
     {
-        public const string Rating = "rating";
         public const string Errors = "errors";
         public const string Warnings = "warnings";
         public const string Summaries = "summaries";
-        public const string NextSteps = "nextSteps";
-        public const string Hidden = "hidden";
-        public const string Recommendation = "recommendation";
+        public const string Recommendations = "recommendations";
         public const string Decision = "decision";
+        public const string Hidden = "hidden";
 
         public const string Id = "id";
         public const string Title = "title";
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
deleted file mode 100644
index 6b082f5295..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisRecommendation.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace Unity.AI.Models
-{
-    public class ApplicationAnalysisRecommendation
-    {
-        [JsonPropertyName(AIJsonKeys.Decision)]
-        public string? Decision { get; set; }
-
-        [JsonPropertyName(AIJsonKeys.Rationale)]
-        public string? Rationale { get; set; }
-    }
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
index 12f3532f4e..68231cd763 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Responses/ApplicationAnalysisResponse.cs
@@ -6,8 +6,8 @@ namespace Unity.AI.Responses
 {
     public class ApplicationAnalysisResponse
     {
-        [JsonPropertyName(AIJsonKeys.Rating)]
-        public string? Rating { get; set; }
+        [JsonPropertyName(AIJsonKeys.Decision)]
+        public string? Decision { get; set; }
 
         [JsonPropertyName(AIJsonKeys.Errors)]
         public List<ApplicationAnalysisFinding> Errors { get; set; } = new();
@@ -18,10 +18,7 @@ public class ApplicationAnalysisResponse
         [JsonPropertyName(AIJsonKeys.Summaries)]
         public List<ApplicationAnalysisFinding> Summaries { get; set; } = new();
 
-        [JsonPropertyName(AIJsonKeys.NextSteps)]
-        public List<ApplicationAnalysisFinding> NextSteps { get; set; } = new();
-
-        [JsonPropertyName(AIJsonKeys.Recommendation)]
-        public ApplicationAnalysisRecommendation? Recommendation { get; set; }
+        [JsonPropertyName(AIJsonKeys.Recommendations)]
+        public List<ApplicationAnalysisFinding> Recommendations { get; set; } = new();
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/application-analysis.user.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/application-analysis.user.txt
index 67a6fde997..8d7c84c90e 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/application-analysis.user.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v0/application-analysis.user.txt
@@ -57,7 +57,7 @@ Analyze this grant application comprehensively across all five rubric categories
 
 OUTPUT
 {
-  "rating": "<HIGH|MEDIUM|LOW>",
+  "decision": "<PROCEED|HOLD>",
   "warnings": [
     {
       "title": "<string>",
@@ -76,23 +76,18 @@ OUTPUT
       "detail": "<string>"
     }
   ],
-  "nextSteps": [
+  "recommendations": [
     {
       "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.
+- decision must be PROCEED or HOLD.
 - 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 recommendations for reviewer-facing follow-up actions or considerations before scoring or decision-making.
 - Use "title" and "detail" keys for all finding objects.
 - Return valid plain JSON only in the exact OUTPUT shape.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.output.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.output.txt
index a80671676b..44093f50be 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.output.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.output.txt
@@ -1,5 +1,5 @@
 {
-  "rating": "<HIGH|MEDIUM|LOW>",
+  "decision": "<PROCEED|HOLD>",
   "errors": [
     {
       "title": "<string>",
@@ -18,14 +18,10 @@
       "detail": "<string>"
     }
   ],
-  "nextSteps": [
+  "recommendations": [
     {
       "title": "<string>",
       "detail": "<string>"
     }
-  ],
-  "recommendation": {
-    "decision": "<PROCEED|HOLD>",
-    "rationale": "<string>"
-  }
+  ]
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
index a250310372..5840d215c8 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Prompts/Versions/v1/application-analysis.rules.txt
@@ -19,17 +19,13 @@
 - 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.
+- Summaries and recommendations 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.
+- Decision must be PROCEED or HOLD.
 - 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.
+- Use recommendations for concrete reviewer-facing next actions based on the provided evidence.
+- Recommendations 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 recommendations 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.
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs
index d317618f32..f34cb95092 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderPayloadValidator.cs
@@ -19,16 +19,16 @@ public static bool IsValidApplicationAnalysisJson(string response)
                 return false;
             }
 
-            return root.TryGetProperty(AIJsonKeys.Rating, out var rating)
-                   && rating.ValueKind == JsonValueKind.String
+            return root.TryGetProperty(AIJsonKeys.Decision, out var decision)
+                   && decision.ValueKind == JsonValueKind.String
                    && root.TryGetProperty(AIJsonKeys.Errors, out var errors)
                    && errors.ValueKind == JsonValueKind.Array
                    && root.TryGetProperty(AIJsonKeys.Warnings, out var warnings)
                    && warnings.ValueKind == JsonValueKind.Array
                    && root.TryGetProperty(AIJsonKeys.Summaries, out var summaries)
                    && summaries.ValueKind == JsonValueKind.Array
-                   && root.TryGetProperty(AIJsonKeys.NextSteps, out var nextSteps)
-                   && nextSteps.ValueKind == JsonValueKind.Array;
+                   && root.TryGetProperty(AIJsonKeys.Recommendations, out var recommendations)
+                   && recommendations.ValueKind == JsonValueKind.Array;
         }
 
         public static bool IsValidApplicationScoringJson(string response, string sectionJson)
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index 22137b9193..c206582081 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -362,7 +362,7 @@ private string AddIdsToAnalysisItems(string analysisJson)
                         if (outputPropertyName == AIJsonKeys.Errors ||
                             outputPropertyName == AIJsonKeys.Warnings ||
                             outputPropertyName == AIJsonKeys.Summaries ||
-                            outputPropertyName == AIJsonKeys.NextSteps)
+                            outputPropertyName == AIJsonKeys.Recommendations)
                         {
                             writer.WritePropertyName(outputPropertyName);
                             writer.WriteStartArray();
@@ -874,9 +874,9 @@ private static ApplicationAnalysisResponse ParseApplicationAnalysisResponse(stri
                 return response;
             }
 
-            if (TryGetStringProperty(root, AIJsonKeys.Rating, out var rating))
+            if (TryGetStringProperty(root, AIJsonKeys.Decision, out var decision))
             {
-                response.Rating = rating;
+                response.Decision = decision?.Trim().ToUpperInvariant();
             }
 
             if (root.TryGetProperty("errors", out var errors) && errors.ValueKind == JsonValueKind.Array)
@@ -894,14 +894,9 @@ private static ApplicationAnalysisResponse ParseApplicationAnalysisResponse(stri
                 response.Summaries = ParseFindings(summaries);
             }
 
-            if (root.TryGetProperty(AIJsonKeys.NextSteps, out var nextSteps) && nextSteps.ValueKind == JsonValueKind.Array)
+            if (root.TryGetProperty(AIJsonKeys.Recommendations, out var recommendations) && recommendations.ValueKind == JsonValueKind.Array)
             {
-                response.NextSteps = ParseFindings(nextSteps);
-            }
-
-            if (root.TryGetProperty(AIJsonKeys.Recommendation, out var recommendation) && recommendation.ValueKind == JsonValueKind.Object)
-            {
-                response.Recommendation = ParseRecommendation(recommendation);
+                response.Recommendations = ParseFindings(recommendations);
             }
 
             return response;
@@ -959,34 +954,6 @@ private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
             return findings;
         }
 
-        private static ApplicationAnalysisRecommendation? ParseRecommendation(JsonElement recommendation)
-        {
-            string? decision = null;
-            if (recommendation.TryGetProperty(AIJsonKeys.Decision, out var decisionProp) &&
-                decisionProp.ValueKind == JsonValueKind.String)
-            {
-                decision = decisionProp.GetString();
-            }
-
-            string? rationale = null;
-            if (recommendation.TryGetProperty(AIJsonKeys.Rationale, out var rationaleProp) &&
-                rationaleProp.ValueKind == JsonValueKind.String)
-            {
-                rationale = rationaleProp.GetString();
-            }
-
-            if (string.IsNullOrWhiteSpace(decision) && string.IsNullOrWhiteSpace(rationale))
-            {
-                return null;
-            }
-
-            return new ApplicationAnalysisRecommendation
-            {
-                Decision = decision,
-                Rationale = rationale
-            };
-        }
-
         private static ApplicationScoringResponse ParseApplicationScoringResponse(
             string raw,
             IReadOnlyDictionary<string, string>? questionIdAliasMap = null)
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 05f5a784eb..58859a5e83 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
@@ -235,7 +235,7 @@ OPTIONAL FIELDS (may be left blank):
 
         OUTPUT
         {
-          "rating": "<HIGH|MEDIUM|LOW>",
+          "decision": "<PROCEED|HOLD>",
           "warnings": [
             {
               "title": "<string>",
@@ -254,24 +254,19 @@ OPTIONAL FIELDS (may be left blank):
               "detail": "<string>"
             }
           ],
-          "nextSteps": [
+          "recommendations": [
             {
               "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.
+        - decision must be PROCEED or HOLD.
         - 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 recommendations for reviewer-facing follow-up actions or considerations before scoring or decision-making.
         - Use "title" and "detail" keys for all finding objects.
         - Return valid plain JSON only in the exact OUTPUT shape.
         """;
@@ -333,7 +328,7 @@ 4. Return only the strongest evidence-backed reviewer conclusions.
     // ── v1/analysis.output.txt ───────────────────────────────────────────────
     private const string AnalysisOutput = """
         {
-          "rating": "<HIGH|MEDIUM|LOW>",
+          "decision": "<PROCEED|HOLD>",
           "errors": [
             {
               "title": "<string>",
@@ -352,16 +347,12 @@ 4. Return only the strongest evidence-backed reviewer conclusions.
               "detail": "<string>"
             }
           ],
-          "nextSteps": [
+          "recommendations": [
             {
               "title": "<string>",
               "detail": "<string>"
             }
-          ],
-          "recommendation": {
-            "decision": "<PROCEED|HOLD>",
-            "rationale": "<string>"
-          }
+          ]
         }
         """;
 
@@ -388,20 +379,16 @@ 4. Return only the strongest evidence-backed reviewer conclusions.
         - 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.
+        - Summaries and recommendations 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.
+        - Decision must be PROCEED or HOLD.
         - 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.
+        - Use recommendations for concrete reviewer-facing next actions based on the provided evidence.
+        - Recommendations 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 recommendations 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 ─────────────────────────────────────────────
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs
index 2491deb1c9..953a10a65d 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application.Contracts/GrantApplications/IGrantApplicationAppService.cs
@@ -19,8 +19,8 @@ public interface IGrantApplicationAppService
     Task<GrantApplicationDto> GetAsync(Guid id);
     Task<GrantApplicationDto> TriggerAction(Guid applicationId, GrantApplicationAction triggerAction);
     Task<Guid?> GetAccountCodingIdFromFormIdAsync(Guid formId);
-    Task<string> HideAIAnalysisItemAsync(Guid applicationId, string itemId);
-    Task<string> ShowAIAnalysisItemAsync(Guid applicationId, string itemId);
+    Task<string> DismissAIAnalysisItemAsync(Guid applicationId, string itemId);
+    Task<string> RestoreAIAnalysisItemAsync(Guid applicationId, string itemId);
     Task<PagedResultDto<GrantApplicationDto>> GetListAsync(GrantApplicationListInputDto input);
     Task<bool> IsApplicantRedStopAsync(Guid applicationId);
 }
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 89761862d0..9e66d05039 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -1072,15 +1072,15 @@ private static Dictionary<string, object> ExtractCustomFieldsForWorksheet(dynami
         return result;
     }
 
-    public async Task<string> HideAIAnalysisItemAsync(Guid applicationId, string itemId)
-    {
-        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: true);
-    }
-
-    public async Task<string> ShowAIAnalysisItemAsync(Guid applicationId, string itemId)
-    {
-        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: false);
-    }
+    public async Task<string> DismissAIAnalysisItemAsync(Guid applicationId, string itemId)
+    {
+        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: true);
+    }
+
+    public async Task<string> RestoreAIAnalysisItemAsync(Guid applicationId, string itemId)
+    {
+        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: false);
+    }
 
     private async Task<string> UpdateAIAnalysisItemVisibilityStateAsync(Guid applicationId, string itemId, bool isHidden)
     {
@@ -1105,10 +1105,10 @@ private async Task<string> UpdateAIAnalysisItemVisibilityStateAsync(Guid applica
         }
         catch (Exception ex)
         {
-            var action = isHidden ? "hiding" : "showing";
-            var userMessage = isHidden
-                ? "Failed to hide the AI item. Please try again."
-                : "Failed to show the AI item. Please try again.";
+            var action = isHidden ? "dismissing" : "restoring";
+            var userMessage = isHidden
+                ? "Failed to dismiss the AI item. Please try again."
+                : "Failed to restore the AI item. Please try again.";
 
             Logger.LogError(ex, "Error {Action} AI analysis item {ItemId} for application {ApplicationId}", action, itemId, applicationId);
             throw new UserFriendlyException(userMessage);
@@ -1130,10 +1130,10 @@ private static string SetAnalysisItemHiddenState(string analysisJson, string ite
                 return analysisJson;
             }
 
-            UpdateFindingHiddenState(analysis.Errors, itemId, isHidden);
-            UpdateFindingHiddenState(analysis.Warnings, itemId, isHidden);
-            UpdateFindingHiddenState(analysis.Summaries, itemId, isHidden);
-            UpdateFindingHiddenState(analysis.NextSteps, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.Errors, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.Warnings, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.Summaries, itemId, isHidden);
+            UpdateFindingHiddenState(analysis.Recommendations, itemId, isHidden);
 
             return System.Text.Json.JsonSerializer.Serialize(analysis, AiAnalysisWriteOptions);
         }
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 30ea386fc6..c73d194f71 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
@@ -265,15 +265,15 @@
                 <li class="nav-item">
                     <button class="nav-link" id="links-tab" data-bs-toggle="tab" data-bs-target="#links" type="button" role="tab" aria-controls="links" aria-selected="false"><i class="fl fl-link" aria-hidden="true"></i> (<span id="application_links_count">0</span>)</button>
                 </li>
-                <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>
-            }
+                <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" title="Application Analysis"><i class="fa fa-wand-sparkles" aria-hidden="true"></i></button>
+                </li>
+            }
             @if (Model.IsDevPromptControlsEnabled)
             {
                 <li class="nav-item ms-auto">
@@ -410,15 +410,15 @@
                 </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="regenerateApplicationAnalysis">
-                            <span class="ai-button-content">
-                                <i class="unt-icon-sm fa-solid fa-wand-sparkles"></i>
-                                <span>Generate</span>
+                @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">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>
@@ -438,39 +438,45 @@
 
                     @* 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 class="ai-analysis-section" data-template="section">
+                            <div class="ai-analysis-section-header">
+                                <div class="ai-analysis-section-title-row">
+                                    <span class="ai-analysis-section-title" data-element="title"></span>
+                                </div>
+                                <div class="ai-analysis-section-actions">
+                                    <span data-element="status-chip" style="display:none;"></span>
+                                    <button type="button" class="ai-analysis-collapse-toggle" data-element="collapse-toggle" aria-expanded="true" title="Collapse section">
+                                        <i class="fa fa-chevron-down" aria-hidden="true"></i>
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="ai-analysis-section-body">
+                                <div data-element="items"></div>
+                                <div class="ai-analysis-section-footer">
+                                    <button type="button" class="ai-analysis-section-toggle" data-element="hidden-toggle" style="display:none;"></button>
+                                </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="dismiss-btn" title="Dismiss this item">
+                                    Dismiss
+                                </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="restore-btn" title="Restore this item">
+                                    Restore
+                                </button>
+                            </div>
+                            <div class="ai-analysis-detail-message" data-element="message"></div>
+                        </div>
                     </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 28a257b992..41ecd22540 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
@@ -1030,20 +1030,6 @@ $(function () {
         );
     });
 
-    PubSub.subscribe('update_ai_analysis_status', (msg, data) => {
-        const $indicator = $('#ai_analysis_status');
-        const status = data?.status;
-
-        $indicator.removeClass('proceed hold');
-
-        if (status === 'proceed' || status === 'hold') {
-            $indicator.addClass(status).show();
-            return;
-        }
-
-        $indicator.hide();
-    });
-
     PubSub.subscribe('update_application_emails_count', (msg, data) => {
         if (data.itemCount || data.itemCount === 0) {
             tabCounters.emails = data.itemCount;
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 dfd5d2abb1..f0853287bc 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
@@ -3,11 +3,11 @@
  * Renders a stable sectioned view for AI-generated analysis results.
  */
 
-const hiddenSectionVisibility = {
+const dismissedSectionVisibility = {
     error: false,
     warning: false,
     summary: false,
-    nextStep: false
+    recommendation: false
 };
 
 function bindTemplateAction($element, actionData) {
@@ -20,16 +20,11 @@ function bindTemplateValue($item, key, value) {
         return;
     }
 
-    if (key === 'hide-btn' || key === 'show-btn') {
+    if (key === 'dismiss-btn' || key === 'restore-btn') {
         bindTemplateAction($element, value);
         return;
     }
 
-    if (key === 'icon') {
-        $element.addClass(value);
-        return;
-    }
-
     $element.text(value);
 }
 
@@ -59,15 +54,15 @@ function getFindingDetailText(item) {
     }
 }
 
-function updateAnalysisTabStatus(recommendation) {
-    let status = '';
-    if (recommendation) {
-        status = recommendation.decision === 'PROCEED' ? 'proceed' : 'hold';
+function normalizeDecision(decision) {
+    if (typeof decision !== 'string') {
+        return '';
     }
 
-    PubSub.publish('update_ai_analysis_status', {
-        status: status
-    });
+    const normalized = decision.trim().toUpperCase();
+    return normalized === 'PROCEED' || normalized === 'HOLD'
+        ? normalized
+        : '';
 }
 
 function normalizeFindings(items, fallbackType) {
@@ -75,7 +70,7 @@ function normalizeFindings(items, fallbackType) {
         error: 'Error',
         warning: 'Warning',
         summary: 'Summary',
-        nextStep: 'Next step'
+        recommendation: 'Recommendation'
     };
 
     return (items || [])
@@ -89,31 +84,9 @@ function normalizeFindings(items, fallbackType) {
         }));
 }
 
-function normalizeRecommendation(recommendation) {
-    if (!recommendation || typeof recommendation !== 'object') {
-        return null;
-    }
-
-    const decision = typeof recommendation.decision === 'string'
-        ? recommendation.decision.trim().toUpperCase()
-        : '';
-    const rationale = typeof recommendation.rationale === 'string'
-        ? recommendation.rationale.trim()
-        : '';
-
-    if (decision !== 'PROCEED' && decision !== 'HOLD') {
-        return null;
-    }
-
-    return {
-        decision: decision,
-        rationale: rationale
-    };
-}
-
 function createFindingItem(item, type, hidden) {
     const templateName = hidden ? 'hidden-item' : 'active-item';
-    const actionKey = hidden ? 'show-btn' : 'hide-btn';
+    const actionKey = hidden ? 'restore-btn' : 'dismiss-btn';
     return createItemFromTemplate(templateName, {
         category: item.title,
         message: getFindingDetailText(item),
@@ -123,7 +96,6 @@ function createFindingItem(item, type, hidden) {
 
 function renderSection(section) {
     const $section = createItemFromTemplate('section', {
-        icon: section.icon,
         title: section.title
     });
 
@@ -135,16 +107,39 @@ function renderSection(section) {
     const $items = $section.find('[data-element="items"]');
     const $status = $section.find('[data-element="status-chip"]');
     const $toggle = $section.find('[data-element="hidden-toggle"]');
+    const $collapseToggle = $section.find('[data-element="collapse-toggle"]');
     const hiddenCount = section.hiddenItems.length;
-    const isHiddenVisible = hiddenSectionVisibility[section.itemType] === true;
+    const isDismissedVisible = dismissedSectionVisibility[section.itemType] === true;
 
-    if (section.headerOnlyText) {
-        $section.addClass('header-only');
+    if (section.decision) {
         $status
             .addClass('ai-analysis-status-chip')
-            .text(section.headerOnlyText)
+            .addClass(section.decision.toLowerCase())
+            .text(section.decision === 'PROCEED' ? 'Proceed' : 'Hold')
             .show();
+    }
+
+    $collapseToggle
+        .off('click')
+        .on('click', function() {
+            const isCollapsed = $section.toggleClass('collapsed').hasClass('collapsed');
+            $(this)
+                .attr('aria-expanded', (!isCollapsed).toString())
+                .attr('title', isCollapsed ? 'Expand section' : 'Collapse section');
+        });
+
+    if (section.headerOnlyText) {
+        $section.addClass('header-only');
+        if (section.decision) {
+            $status.show();
+        } else {
+            $status
+                .addClass('ai-analysis-status-chip')
+                .text(section.headerOnlyText)
+                .show();
+        }
         $toggle.hide();
+        $collapseToggle.hide();
         return $section;
     }
 
@@ -152,7 +147,7 @@ function renderSection(section) {
         section.allItems.forEach(item => {
             const isHidden = item.hidden === true;
             const $item = createFindingItem(item, section.itemType, isHidden);
-            if (isHidden && !isHiddenVisible) {
+            if (isHidden && !isDismissedVisible) {
                 $item.hide();
             }
 
@@ -163,26 +158,26 @@ function renderSection(section) {
     if (hiddenCount > 0) {
         $toggle
             .css('visibility', 'visible')
-            .text(isHiddenVisible
-                ? 'Hide hidden items'
-                : 'Show hidden items')
+            .text(isDismissedVisible
+                ? 'Hide dismissed items'
+                : 'Show dismissed items')
             .prop('disabled', false)
             .show()
             .off('click')
             .on('click', function() {
-                const shouldShow = hiddenSectionVisibility[section.itemType] !== true;
-                hiddenSectionVisibility[section.itemType] = shouldShow;
+                const shouldShow = dismissedSectionVisibility[section.itemType] !== true;
+                dismissedSectionVisibility[section.itemType] = shouldShow;
                 $items.find('.hidden-item').toggle(shouldShow);
                 $toggle.text(
                     shouldShow
-                        ? 'Hide hidden items'
-                        : 'Show hidden items'
+                        ? 'Hide dismissed items'
+                        : 'Show dismissed items'
                 );
             });
     } else {
-        hiddenSectionVisibility[section.itemType] = false;
+        dismissedSectionVisibility[section.itemType] = false;
         $toggle
-            .text('Show hidden items')
+            .text('Show dismissed items')
             .css('visibility', 'hidden')
             .prop('disabled', true)
             .show();
@@ -191,32 +186,6 @@ function renderSection(section) {
     return $section;
 }
 
-function renderRecommendationSection(recommendation) {
-    if (!recommendation) {
-        return null;
-    }
-
-    const shouldProceed = recommendation.decision === 'PROCEED';
-    const $section = createItemFromTemplate('section', {
-        icon: 'fl-info-circle',
-        title: 'Recommendation'
-    });
-
-    $section.addClass('recommendation compact');
-    $section.find('[data-element="status-chip"]')
-        .addClass('ai-analysis-status-badge')
-        .addClass(shouldProceed ? 'proceed' : 'hold')
-        .text(shouldProceed ? 'Proceed' : 'Hold')
-        .show();
-    $section.find('[data-element="hidden-toggle"]').remove();
-    $section.find('[data-element="items"]').append(
-        $('<div class="ai-analysis-recommendation-rationale"></div>')
-            .text(recommendation.rationale || 'No rationale provided.')
-    );
-
-    return $section;
-}
-
 function splitFindingsByVisibility(items) {
     return {
         activeItems: items.filter(item => item.hidden !== true),
@@ -225,42 +194,38 @@ function splitFindingsByVisibility(items) {
 }
 
 function buildAnalysisSections(analysisData) {
-    const recommendation = normalizeRecommendation(analysisData.recommendation);
+    const decision = normalizeDecision(analysisData.decision);
     const errors = normalizeFindings(analysisData.errors, 'error');
     const warnings = normalizeFindings(analysisData.warnings, 'warning');
-    const summaries = normalizeFindings(analysisData.summaries || analysisData.recommendations, 'summary');
-    const nextSteps = normalizeFindings(analysisData.nextSteps, 'nextStep');
+    const summaries = normalizeFindings(analysisData.summaries, 'summary');
+    const recommendations = normalizeFindings(analysisData.recommendations, 'recommendation');
     const errorGroups = splitFindingsByVisibility(errors);
     const warningGroups = splitFindingsByVisibility(warnings);
     const summaryGroups = splitFindingsByVisibility(summaries);
-    const nextStepGroups = splitFindingsByVisibility(nextSteps);
+    const recommendationGroups = splitFindingsByVisibility(recommendations);
 
     return {
-        recommendation,
         sections: [
             {
                 title: 'Errors',
-                icon: 'fl-times-circle',
                 sectionClass: 'error',
                 itemType: 'error',
-                headerOnlyText: errorGroups.activeItems.length === 0 && errorGroups.hiddenItems.length === 0 ? 'No errors' : null,
+                headerOnlyText: errorGroups.activeItems.length === 0 && errorGroups.hiddenItems.length === 0 ? '0 errors' : null,
                 activeItems: errorGroups.activeItems,
                 allItems: errors,
                 hiddenItems: errorGroups.hiddenItems
             },
             {
                 title: 'Warnings',
-                icon: 'fl-exclamation-triangle',
                 sectionClass: 'warning',
                 itemType: 'warning',
-                headerOnlyText: warningGroups.activeItems.length === 0 && warningGroups.hiddenItems.length === 0 ? 'No warnings' : null,
+                headerOnlyText: warningGroups.activeItems.length === 0 && warningGroups.hiddenItems.length === 0 ? '0 warnings' : null,
                 activeItems: warningGroups.activeItems,
                 allItems: warnings,
                 hiddenItems: warningGroups.hiddenItems
             },
             {
                 title: 'Summary',
-                icon: 'fl-info-circle',
                 sectionClass: 'summary',
                 itemType: 'summary',
                 headerOnlyText: summaryGroups.activeItems.length === 0 && summaryGroups.hiddenItems.length === 0 ? 'No summary' : null,
@@ -269,100 +234,79 @@ function buildAnalysisSections(analysisData) {
                 hiddenItems: summaryGroups.hiddenItems
             },
             {
-                title: 'Next Steps',
-                icon: 'fl-check-square',
-                sectionClass: 'next-steps',
-                itemType: 'nextStep',
-                headerOnlyText: nextStepGroups.activeItems.length === 0 && nextStepGroups.hiddenItems.length === 0 ? 'No next steps' : null,
-                activeItems: nextStepGroups.activeItems,
-                allItems: nextSteps,
-                hiddenItems: nextStepGroups.hiddenItems
+                title: 'Recommendations',
+                sectionClass: 'recommendations',
+                itemType: 'recommendation',
+                decision: decision,
+                headerOnlyText: recommendationGroups.activeItems.length === 0 && recommendationGroups.hiddenItems.length === 0 ? 'No recommendations' : null,
+                activeItems: recommendationGroups.activeItems,
+                allItems: recommendations,
+                hiddenItems: recommendationGroups.hiddenItems
             }
         ]
     };
 }
 
-function hasAnyAnalysisContent(recommendation, sections) {
-    if (recommendation) {
-        return true;
-    }
-
-    return sections.some(section => section.allItems.length > 0);
-}
-
 function bindAnalysisItemActions($sections) {
     $sections.off('click');
-    $sections.on('click', '[data-element="hide-btn"]', function(e) {
+    $sections.on('click', '[data-element="dismiss-btn"]', function(e) {
         e.preventDefault();
         const itemId = $(this).data('id');
-        hideAnalysisItem(itemId);
+        dismissAnalysisItem(itemId);
     });
 
-    $sections.on('click', '[data-element="show-btn"]', function(e) {
+    $sections.on('click', '[data-element="restore-btn"]', function(e) {
         e.preventDefault();
         const itemId = $(this).data('id');
-        showAnalysisItem(itemId);
+        restoreAnalysisItem(itemId);
     });
 }
 
 function renderRealAIAnalysis(analysisData) {
-    const { recommendation, sections } = buildAnalysisSections(analysisData);
+    const { sections } = buildAnalysisSections(analysisData);
     const $sections = $('#aiAnalysisSections');
     $sections.empty();
-    const $recommendationSection = renderRecommendationSection(recommendation);
-    const hasRecommendation = $recommendationSection !== null;
-    if ($recommendationSection) {
-        $sections.append($recommendationSection);
-    }
 
     sections.forEach(section => {
         $sections.append(renderSection(section));
     });
 
-    updateAnalysisTabStatus(recommendation);
-
     const $noDataMessage = $('#aiAnalysisNoData');
-    if (!hasRecommendation && !hasAnyAnalysisContent(recommendation, sections)) {
-        $noDataMessage.show();
-        $sections.hide();
-    } else {
-        $noDataMessage.hide();
-        $sections.show();
-    }
+    $noDataMessage.hide();
+    $sections.show();
 
     bindAnalysisItemActions($sections);
 }
 
-globalThis.hideAnalysisItem = function(itemId) {
+globalThis.dismissAnalysisItem = function(itemId) {
     const applicationId = $('#DetailsViewApplicationId').val();
 
     unity.grantManager.grantApplications.grantApplication
-        .hideAIAnalysisItem(applicationId, itemId)
+        .dismissAIAnalysisItem(applicationId, itemId)
         .then(function() {
             loadAIAnalysis();
         })
         .catch(function() {
-            abp.message.error('Failed to hide the item. Please try again.');
+            abp.message.error('Failed to dismiss the item. Please try again.');
         });
 }
 
-globalThis.showAnalysisItem = function(itemId) {
+globalThis.restoreAnalysisItem = function(itemId) {
     const applicationId = $('#DetailsViewApplicationId').val();
 
     unity.grantManager.grantApplications.grantApplication
-        .showAIAnalysisItem(applicationId, itemId)
+        .restoreAIAnalysisItem(applicationId, itemId)
         .then(function() {
             loadAIAnalysis();
         })
         .catch(function() {
-            abp.message.error('Failed to show the item. Please try again.');
+            abp.message.error('Failed to restore the item. Please try again.');
         });
 }
 
 function resetAnalysisView() {
     $('#aiAnalysisSections').empty().hide();
     $('#aiAnalysisNoData').show();
-    updateAnalysisTabStatus(null);
 }
 
 function tryParseRawAnalysis(analysisJson) {

From d29e0ddfeaffb12bf67dd17348132bd57057b51b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 11:17:07 -0700
Subject: [PATCH 09/45] AB#30833 Align application analysis chevrons with page
 collapse pattern

---
 .../Pages/GrantApplications/ai-analysis.js                    | 4 ++++
 1 file changed, 4 insertions(+)

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 f0853287bc..07335f2c96 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
@@ -123,9 +123,13 @@ function renderSection(section) {
         .off('click')
         .on('click', function() {
             const isCollapsed = $section.toggleClass('collapsed').hasClass('collapsed');
+            const $icon = $(this).find('i');
             $(this)
                 .attr('aria-expanded', (!isCollapsed).toString())
                 .attr('title', isCollapsed ? 'Expand section' : 'Collapse section');
+            $icon
+                .toggleClass('fa-chevron-down', !isCollapsed)
+                .toggleClass('fa-chevron-up', isCollapsed);
         });
 
     if (section.headerOnlyText) {

From 644320c917cad3a118c8b0211835aface35d06d0 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 11:24:09 -0700
Subject: [PATCH 10/45] AB#30833 Adjust application analysis header controls

---
 .../Pages/GrantApplications/Details.cshtml                  | 6 ++----
 1 file changed, 2 insertions(+), 4 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 c73d194f71..ac5ab98b62 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
@@ -442,9 +442,10 @@
                             <div class="ai-analysis-section-header">
                                 <div class="ai-analysis-section-title-row">
                                     <span class="ai-analysis-section-title" data-element="title"></span>
+                                    <span data-element="status-chip" style="display:none;"></span>
                                 </div>
                                 <div class="ai-analysis-section-actions">
-                                    <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>
                                     <button type="button" class="ai-analysis-collapse-toggle" data-element="collapse-toggle" aria-expanded="true" title="Collapse section">
                                         <i class="fa fa-chevron-down" aria-hidden="true"></i>
                                     </button>
@@ -452,9 +453,6 @@
                             </div>
                             <div class="ai-analysis-section-body">
                                 <div data-element="items"></div>
-                                <div class="ai-analysis-section-footer">
-                                    <button type="button" class="ai-analysis-section-toggle" data-element="hidden-toggle" style="display:none;"></button>
-                                </div>
                             </div>
                         </div>
 

From 4415dbf23109e3df210cf6dbd3ad863ec08156dc Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 11:30:29 -0700
Subject: [PATCH 11/45] AB#30833 Fix application analysis dismissed item
 separators

---
 .../Pages/GrantApplications/Details.css          | 16 +++++++++++-----
 .../Pages/GrantApplications/ai-analysis.js       | 11 +++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.css
index bce040a95a..e84bcf7900 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
@@ -626,11 +626,17 @@ form label.error {
     border-bottom: 1px solid #e9ecef;
 }
 
-.ai-analysis-detail-item:last-child {
-    margin-bottom: 0;
-    padding-bottom: 0;
-    border-bottom: none;
-}
+.ai-analysis-detail-item:last-child {
+    margin-bottom: 0;
+    padding-bottom: 0;
+    border-bottom: none;
+}
+
+.ai-analysis-detail-item.last-visible {
+    margin-bottom: 0;
+    padding-bottom: 0;
+    border-bottom: none;
+}
 
 .ai-analysis-detail-category {
     font-weight: 700;
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 07335f2c96..08664d3754 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
@@ -94,6 +94,14 @@ function createFindingItem(item, type, hidden) {
     });
 }
 
+function updateVisibleItemLayout($items) {
+    const $allItems = $items.children('.ai-analysis-detail-item');
+    const $visibleItems = $allItems.filter(':visible');
+
+    $allItems.removeClass('last-visible');
+    $visibleItems.last().addClass('last-visible');
+}
+
 function renderSection(section) {
     const $section = createItemFromTemplate('section', {
         title: section.title
@@ -157,6 +165,8 @@ function renderSection(section) {
 
             $items.append($item);
         });
+
+        updateVisibleItemLayout($items);
     }
 
     if (hiddenCount > 0) {
@@ -172,6 +182,7 @@ function renderSection(section) {
                 const shouldShow = dismissedSectionVisibility[section.itemType] !== true;
                 dismissedSectionVisibility[section.itemType] = shouldShow;
                 $items.find('.hidden-item').toggle(shouldShow);
+                updateVisibleItemLayout($items);
                 $toggle.text(
                     shouldShow
                         ? 'Hide dismissed items'

From 1c4b67215035405d2b793e265df882af9f1a1786 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 11:34:55 -0700
Subject: [PATCH 12/45] AB#30833 Fix application analysis visible item spacing

---
 .../Pages/GrantApplications/ai-analysis.js                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 08664d3754..098720363d 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
@@ -96,7 +96,9 @@ function createFindingItem(item, type, hidden) {
 
 function updateVisibleItemLayout($items) {
     const $allItems = $items.children('.ai-analysis-detail-item');
-    const $visibleItems = $allItems.filter(':visible');
+    const $visibleItems = $allItems.filter(function() {
+        return this.style.display !== 'none';
+    });
 
     $allItems.removeClass('last-visible');
     $visibleItems.last().addClass('last-visible');

From df9a2e7ef91bfeeb8f1023e6143efbcc2dc40ea9 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 15:03:28 -0700
Subject: [PATCH 13/45] AB#30833 Hide empty application analysis error and
 warning sections

---
 .../Pages/GrantApplications/ai-analysis.js                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 098720363d..d4d32a95f0 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
@@ -227,7 +227,6 @@ function buildAnalysisSections(analysisData) {
                 title: 'Errors',
                 sectionClass: 'error',
                 itemType: 'error',
-                headerOnlyText: errorGroups.activeItems.length === 0 && errorGroups.hiddenItems.length === 0 ? '0 errors' : null,
                 activeItems: errorGroups.activeItems,
                 allItems: errors,
                 hiddenItems: errorGroups.hiddenItems
@@ -236,7 +235,6 @@ function buildAnalysisSections(analysisData) {
                 title: 'Warnings',
                 sectionClass: 'warning',
                 itemType: 'warning',
-                headerOnlyText: warningGroups.activeItems.length === 0 && warningGroups.hiddenItems.length === 0 ? '0 warnings' : null,
                 activeItems: warningGroups.activeItems,
                 allItems: warnings,
                 hiddenItems: warningGroups.hiddenItems
@@ -285,6 +283,10 @@ function renderRealAIAnalysis(analysisData) {
     $sections.empty();
 
     sections.forEach(section => {
+        if ((section.itemType === 'error' || section.itemType === 'warning') && section.allItems.length === 0) {
+            return;
+        }
+
         $sections.append(renderSection(section));
     });
 

From a176ef3d1453bc85e3036cf13c8995485d948e5e Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 15:06:21 -0700
Subject: [PATCH 14/45] AB#30833 Simplify application analysis section
 rendering

---
 .../GrantApplicationAppService.cs             | 122 +++++++-------
 .../Pages/GrantApplications/ai-analysis.js    | 157 ++++++++++--------
 2 files changed, 151 insertions(+), 128 deletions(-)

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 9e66d05039..4b1ed130b5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -1074,20 +1074,20 @@ private static Dictionary<string, object> ExtractCustomFieldsForWorksheet(dynami
 
     public async Task<string> DismissAIAnalysisItemAsync(Guid applicationId, string itemId)
     {
-        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: true);
+        return await UpdateAIAnalysisItemDismissedStateAsync(applicationId, itemId, isDismissed: true);
     }
 
     public async Task<string> RestoreAIAnalysisItemAsync(Guid applicationId, string itemId)
     {
-        return await UpdateAIAnalysisItemVisibilityStateAsync(applicationId, itemId, isHidden: false);
+        return await UpdateAIAnalysisItemDismissedStateAsync(applicationId, itemId, isDismissed: false);
     }
-
-    private async Task<string> UpdateAIAnalysisItemVisibilityStateAsync(Guid applicationId, string itemId, bool isHidden)
-    {
-        if (string.IsNullOrWhiteSpace(itemId))
-        {
-            throw new UserFriendlyException("AI analysis item id is required.");
-        }
+
+    private async Task<string> UpdateAIAnalysisItemDismissedStateAsync(Guid applicationId, string itemId, bool isDismissed)
+    {
+        if (string.IsNullOrWhiteSpace(itemId))
+        {
+            throw new UserFriendlyException("AI analysis item id is required.");
+        }
 
         var application = await applicationRepository.GetAsync(applicationId);
 
@@ -1095,67 +1095,67 @@ private async Task<string> UpdateAIAnalysisItemVisibilityStateAsync(Guid applica
         {
             throw new UserFriendlyException("No AI analysis available for this application.");
         }
-
-        try
-        {
-            var updatedAnalysis = SetAnalysisItemHiddenState(application.AIAnalysis, itemId, isHidden);
-            application.AIAnalysis = updatedAnalysis;
-            await applicationRepository.UpdateAsync(application);
-            return updatedAnalysis;
-        }
-        catch (Exception ex)
-        {
-            var action = isHidden ? "dismissing" : "restoring";
-            var userMessage = isHidden
+
+        try
+        {
+            var updatedAnalysis = SetAnalysisItemDismissedState(application.AIAnalysis, itemId, isDismissed);
+            application.AIAnalysis = updatedAnalysis;
+            await applicationRepository.UpdateAsync(application);
+            return updatedAnalysis;
+        }
+        catch (Exception ex)
+        {
+            var action = isDismissed ? "dismissing" : "restoring";
+            var userMessage = isDismissed
                 ? "Failed to dismiss the AI item. Please try again."
                 : "Failed to restore the AI item. Please try again.";
 
             Logger.LogError(ex, "Error {Action} AI analysis item {ItemId} for application {ApplicationId}", action, itemId, applicationId);
             throw new UserFriendlyException(userMessage);
-        }
-    }
-
-    private static string SetAnalysisItemHiddenState(string analysisJson, string itemId, bool isHidden)
-    {
-        if (string.IsNullOrWhiteSpace(analysisJson))
-        {
-            return analysisJson;
-        }
+        }
+    }
+
+    private static string SetAnalysisItemDismissedState(string analysisJson, string itemId, bool isDismissed)
+    {
+        if (string.IsNullOrWhiteSpace(analysisJson))
+        {
+            return analysisJson;
+        }
 
         try
         {
             var analysis = System.Text.Json.JsonSerializer.Deserialize<ApplicationAnalysisResponse>(analysisJson, AiAnalysisReadOptions);
-            if (analysis == null)
-            {
-                return analysisJson;
-            }
-
-            UpdateFindingHiddenState(analysis.Errors, itemId, isHidden);
-            UpdateFindingHiddenState(analysis.Warnings, itemId, isHidden);
-            UpdateFindingHiddenState(analysis.Summaries, itemId, isHidden);
-            UpdateFindingHiddenState(analysis.Recommendations, itemId, isHidden);
-
-            return System.Text.Json.JsonSerializer.Serialize(analysis, AiAnalysisWriteOptions);
-        }
-        catch (System.Text.Json.JsonException)
-        {
-            return analysisJson;
-        }
-    }
-
-    private static void UpdateFindingHiddenState(IEnumerable<ApplicationAnalysisFinding> findings, string itemId, bool isHidden)
-    {
-        foreach (var finding in findings)
-        {
-            if (!string.Equals(finding.Id, itemId, StringComparison.Ordinal))
-            {
-                continue;
-            }
-
-            finding.Hidden = isHidden;
-            return;
-        }
-    }
+            if (analysis == null)
+            {
+                return analysisJson;
+            }
+
+            UpdateFindingDismissedState(analysis.Errors, itemId, isDismissed);
+            UpdateFindingDismissedState(analysis.Warnings, itemId, isDismissed);
+            UpdateFindingDismissedState(analysis.Summaries, itemId, isDismissed);
+            UpdateFindingDismissedState(analysis.Recommendations, itemId, isDismissed);
+
+            return System.Text.Json.JsonSerializer.Serialize(analysis, AiAnalysisWriteOptions);
+        }
+        catch (System.Text.Json.JsonException)
+        {
+            return analysisJson;
+        }
+    }
+
+    private static void UpdateFindingDismissedState(IEnumerable<ApplicationAnalysisFinding> findings, string itemId, bool isDismissed)
+    {
+        foreach (var finding in findings)
+        {
+            if (!string.Equals(finding.Id, itemId, StringComparison.Ordinal))
+            {
+                continue;
+            }
+
+            finding.Hidden = isDismissed;
+            return;
+        }
+    }
 
     private static ApplicationAnalysisResponse? ParseAiAnalysisData(string? analysisJson)
     {
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 d4d32a95f0..0d50e54c3e 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
@@ -104,102 +104,125 @@ function updateVisibleItemLayout($items) {
     $visibleItems.last().addClass('last-visible');
 }
 
-function renderSection(section) {
-    const $section = createItemFromTemplate('section', {
-        title: section.title
-    });
-
-    $section.addClass(section.sectionClass);
-    if (section.activeItems.length === 0) {
-        $section.addClass('compact');
+function configureSectionDecision($status, decision) {
+    if (!decision) {
+        return;
     }
 
-    const $items = $section.find('[data-element="items"]');
-    const $status = $section.find('[data-element="status-chip"]');
-    const $toggle = $section.find('[data-element="hidden-toggle"]');
-    const $collapseToggle = $section.find('[data-element="collapse-toggle"]');
-    const hiddenCount = section.hiddenItems.length;
-    const isDismissedVisible = dismissedSectionVisibility[section.itemType] === true;
-
-    if (section.decision) {
-        $status
-            .addClass('ai-analysis-status-chip')
-            .addClass(section.decision.toLowerCase())
-            .text(section.decision === 'PROCEED' ? 'Proceed' : 'Hold')
-            .show();
-    }
+    $status
+        .addClass('ai-analysis-status-chip')
+        .addClass(decision.toLowerCase())
+        .text(decision === 'PROCEED' ? 'Proceed' : 'Hold')
+        .show();
+}
 
+function configureCollapseToggle($section, $collapseToggle) {
     $collapseToggle
         .off('click')
         .on('click', function() {
             const isCollapsed = $section.toggleClass('collapsed').hasClass('collapsed');
             const $icon = $(this).find('i');
+
             $(this)
                 .attr('aria-expanded', (!isCollapsed).toString())
                 .attr('title', isCollapsed ? 'Expand section' : 'Collapse section');
+
             $icon
                 .toggleClass('fa-chevron-down', !isCollapsed)
                 .toggleClass('fa-chevron-up', isCollapsed);
         });
+}
 
-    if (section.headerOnlyText) {
-        $section.addClass('header-only');
-        if (section.decision) {
-            $status.show();
-        } else {
-            $status
-                .addClass('ai-analysis-status-chip')
-                .text(section.headerOnlyText)
-                .show();
-        }
-        $toggle.hide();
-        $collapseToggle.hide();
-        return $section;
-    }
+function renderHeaderOnlySection($section, $status, $toggle, $collapseToggle, section) {
+    $section.addClass('header-only');
 
-    if (section.activeItems.length > 0 || hiddenCount > 0) {
-        section.allItems.forEach(item => {
-            const isHidden = item.hidden === true;
-            const $item = createFindingItem(item, section.itemType, isHidden);
-            if (isHidden && !isDismissedVisible) {
-                $item.hide();
-            }
+    if (section.decision) {
+        $status.show();
+    } else {
+        $status
+            .addClass('ai-analysis-status-chip')
+            .text(section.headerOnlyText)
+            .show();
+    }
 
-            $items.append($item);
-        });
+    $toggle.hide();
+    $collapseToggle.hide();
+    return $section;
+}
 
-        updateVisibleItemLayout($items);
+function appendSectionItems($items, section, isDismissedVisible) {
+    if (section.activeItems.length === 0 && section.hiddenItems.length === 0) {
+        return;
     }
 
-    if (hiddenCount > 0) {
-        $toggle
-            .css('visibility', 'visible')
-            .text(isDismissedVisible
-                ? 'Hide dismissed items'
-                : 'Show dismissed items')
-            .prop('disabled', false)
-            .show()
-            .off('click')
-            .on('click', function() {
-                const shouldShow = dismissedSectionVisibility[section.itemType] !== true;
-                dismissedSectionVisibility[section.itemType] = shouldShow;
-                $items.find('.hidden-item').toggle(shouldShow);
-                updateVisibleItemLayout($items);
-                $toggle.text(
-                    shouldShow
-                        ? 'Hide dismissed items'
-                        : 'Show dismissed items'
-                );
-            });
-    } else {
+    section.allItems.forEach(item => {
+        const isHidden = item.hidden === true;
+        const $item = createFindingItem(item, section.itemType, isHidden);
+
+        if (isHidden && !isDismissedVisible) {
+            $item.hide();
+        }
+
+        $items.append($item);
+    });
+
+    updateVisibleItemLayout($items);
+}
+
+function configureDismissedItemsToggle($items, $toggle, section, isDismissedVisible) {
+    const hiddenCount = section.hiddenItems.length;
+
+    if (hiddenCount === 0) {
         dismissedSectionVisibility[section.itemType] = false;
         $toggle
             .text('Show dismissed items')
             .css('visibility', 'hidden')
             .prop('disabled', true)
             .show();
+        return;
+    }
+
+    $toggle
+        .css('visibility', 'visible')
+        .text(isDismissedVisible ? 'Hide dismissed items' : 'Show dismissed items')
+        .prop('disabled', false)
+        .show()
+        .off('click')
+        .on('click', function() {
+            const shouldShow = dismissedSectionVisibility[section.itemType] !== true;
+            dismissedSectionVisibility[section.itemType] = shouldShow;
+            $items.find('.hidden-item').toggle(shouldShow);
+            updateVisibleItemLayout($items);
+            $toggle.text(shouldShow ? 'Hide dismissed items' : 'Show dismissed items');
+        });
+}
+
+function renderSection(section) {
+    const $section = createItemFromTemplate('section', {
+        title: section.title
+    });
+
+    $section.addClass(section.sectionClass);
+    if (section.activeItems.length === 0) {
+        $section.addClass('compact');
     }
 
+    const $items = $section.find('[data-element="items"]');
+    const $status = $section.find('[data-element="status-chip"]');
+    const $toggle = $section.find('[data-element="hidden-toggle"]');
+    const $collapseToggle = $section.find('[data-element="collapse-toggle"]');
+    const isDismissedVisible = dismissedSectionVisibility[section.itemType] === true;
+
+    configureSectionDecision($status, section.decision);
+    configureCollapseToggle($section, $collapseToggle);
+
+    if (section.headerOnlyText) {
+        return renderHeaderOnlySection($section, $status, $toggle, $collapseToggle, section);
+    }
+
+    appendSectionItems($items, section, isDismissedVisible);
+    configureDismissedItemsToggle($items, $toggle, section, isDismissedVisible);
+
     return $section;
 }
 

From f4eb752199750afb474da78e645b3f400b84c649 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 15:11:58 -0700
Subject: [PATCH 15/45] AB#30833 Align application analysis dismissed naming
 and labels

---
 .../AI/Models/AIJsonKeys.cs                   |  2 +-
 .../AI/Models/ApplicationAnalysisFinding.cs   |  4 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        | 12 ++--
 .../GrantApplicationAppService.cs             |  2 +-
 .../Pages/GrantApplications/Details.cshtml    | 45 ++++++++----
 .../Pages/GrantApplications/ai-analysis.js    | 68 +++++++++++++++----
 6 files changed, 94 insertions(+), 39 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs
index 8b5de11fe5..6e83686ff0 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/AIJsonKeys.cs
@@ -7,7 +7,7 @@ public static class AIJsonKeys
         public const string Summaries = "summaries";
         public const string Recommendations = "recommendations";
         public const string Decision = "decision";
-        public const string Hidden = "hidden";
+        public const string Dismissed = "dismissed";
 
         public const string Id = "id";
         public const string Title = "title";
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
index 181168009e..f386f45d1f 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/AI/Models/ApplicationAnalysisFinding.cs
@@ -7,8 +7,8 @@ public class ApplicationAnalysisFinding
         [JsonPropertyName(AIJsonKeys.Id)]
         public string? Id { get; set; }
 
-        [JsonPropertyName(AIJsonKeys.Hidden)]
-        public bool Hidden { get; set; }
+        [JsonPropertyName(AIJsonKeys.Dismissed)]
+        public bool Dismissed { get; set; }
 
         [JsonPropertyName(AIJsonKeys.Title)]
         public string? Title { get; set; }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index c206582081..1a81024e9c 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -373,12 +373,12 @@ private string AddIdsToAnalysisItems(string analysisJson)
 
                                 // Add unique ID first
                                 writer.WriteString("id", Guid.NewGuid().ToString());
-                                writer.WriteBoolean(AIJsonKeys.Hidden, false);
+                                writer.WriteBoolean(AIJsonKeys.Dismissed, false);
 
                                 // Copy existing properties
                                 foreach (var itemProperty in item.EnumerateObject())
                                 {
-                                    if (itemProperty.NameEquals(AIJsonKeys.Id) || itemProperty.NameEquals(AIJsonKeys.Hidden))
+                                    if (itemProperty.NameEquals(AIJsonKeys.Id) || itemProperty.NameEquals(AIJsonKeys.Dismissed))
                                     {
                                         continue;
                                     }
@@ -927,9 +927,9 @@ private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
                 var id = item.TryGetProperty(AIJsonKeys.Id, out var idProp) && idProp.ValueKind == JsonValueKind.String
                     ? idProp.GetString()
                     : null;
-                var hidden = item.TryGetProperty(AIJsonKeys.Hidden, out var hiddenProp) &&
-                    (hiddenProp.ValueKind == JsonValueKind.True || hiddenProp.ValueKind == JsonValueKind.False) &&
-                    hiddenProp.GetBoolean();
+                var dismissed = item.TryGetProperty(AIJsonKeys.Dismissed, out var dismissedProp) &&
+                    (dismissedProp.ValueKind == JsonValueKind.True || dismissedProp.ValueKind == JsonValueKind.False) &&
+                    dismissedProp.GetBoolean();
                 string? title = null;
                 if (item.TryGetProperty(AIJsonKeys.Title, out var titleProp) && titleProp.ValueKind == JsonValueKind.String)
                 {
@@ -945,7 +945,7 @@ private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
                 findings.Add(new ApplicationAnalysisFinding
                 {
                     Id = id,
-                    Hidden = hidden,
+                    Dismissed = dismissed,
                     Title = title,
                     Detail = detail
                 });
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 4b1ed130b5..b05dfa0bbf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/GrantApplicationAppService.cs
@@ -1152,7 +1152,7 @@ private static void UpdateFindingDismissedState(IEnumerable<ApplicationAnalysisF
                 continue;
             }
 
-            finding.Hidden = isDismissed;
+            finding.Dismissed = isDismissed;
             return;
         }
     }
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 ac5ab98b62..7a22c505da 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
@@ -425,15 +425,32 @@
                     <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 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="d-none" id="aiAnalysisLabels"
+                         data-errors="Errors"
+                         data-warnings="Warnings"
+                         data-summary="Summary"
+                         data-recommendations="Recommendations"
+                         data-proceed="Proceed"
+                         data-hold="Hold"
+                         data-no-summary="No summary"
+                         data-no-recommendations="No recommendations"
+                         data-show-dismissed="Show dismissed items"
+                         data-hide-dismissed="Hide dismissed items"
+                         data-dismiss="Dismiss"
+                         data-restore="Restore"
+                         data-dismiss-title="Dismiss this item"
+                         data-restore-title="Restore this item"
+                         data-collapse-title="Collapse section"
+                         data-expand-title="Expand section"></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 *@
@@ -446,7 +463,7 @@
                                 </div>
                                 <div class="ai-analysis-section-actions">
                                     <button type="button" class="ai-analysis-section-toggle" data-element="hidden-toggle" style="display:none;"></button>
-                                    <button type="button" class="ai-analysis-collapse-toggle" data-element="collapse-toggle" aria-expanded="true" title="Collapse section">
+                                    <button type="button" class="ai-analysis-collapse-toggle" data-element="collapse-toggle" aria-expanded="true">
                                         <i class="fa fa-chevron-down" aria-hidden="true"></i>
                                     </button>
                                 </div>
@@ -459,8 +476,8 @@
                         <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="dismiss-btn" title="Dismiss this item">
-                                    Dismiss
+                                <button type="button" class="ai-analysis-action-btn" data-element="dismiss-btn">
+                                    <span data-element="dismiss-text"></span>
                                 </button>
                             </div>
                             <div class="ai-analysis-detail-message" data-element="message"></div>
@@ -469,8 +486,8 @@
                         <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="restore-btn" title="Restore this item">
-                                    Restore
+                                <button type="button" class="ai-analysis-action-btn" data-element="restore-btn">
+                                    <span data-element="restore-text"></span>
                                 </button>
                             </div>
                             <div class="ai-analysis-detail-message" data-element="message"></div>
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 0d50e54c3e..273fe7a8c3 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
@@ -10,6 +10,29 @@ const dismissedSectionVisibility = {
     recommendation: false
 };
 
+function getAnalysisLabels() {
+    const labels = document.getElementById('aiAnalysisLabels')?.dataset ?? {};
+
+    return {
+        errors: labels.errors || 'Errors',
+        warnings: labels.warnings || 'Warnings',
+        summary: labels.summary || 'Summary',
+        recommendations: labels.recommendations || 'Recommendations',
+        proceed: labels.proceed || 'Proceed',
+        hold: labels.hold || 'Hold',
+        noSummary: labels.noSummary || 'No summary',
+        noRecommendations: labels.noRecommendations || 'No recommendations',
+        showDismissed: labels.showDismissed || 'Show dismissed items',
+        hideDismissed: labels.hideDismissed || 'Hide dismissed items',
+        dismiss: labels.dismiss || 'Dismiss',
+        restore: labels.restore || 'Restore',
+        dismissTitle: labels.dismissTitle || 'Dismiss this item',
+        restoreTitle: labels.restoreTitle || 'Restore this item',
+        collapseTitle: labels.collapseTitle || 'Collapse section',
+        expandTitle: labels.expandTitle || 'Expand section'
+    };
+}
+
 function bindTemplateAction($element, actionData) {
     $element.attr('data-id', actionData.id).attr('data-type', actionData.type);
 }
@@ -78,20 +101,31 @@ function normalizeFindings(items, fallbackType) {
         .map((item, index) => ({
             ...item,
             id: item.id || `${fallbackType}-${index}`,
-            hidden: item.hidden === true,
+            dismissed: item.dismissed === true,
             title: item.title || item.category || fallbackTitles[fallbackType] || 'Item',
             detail: item.detail || item.message || ''
         }));
 }
 
 function createFindingItem(item, type, hidden) {
+    const labels = getAnalysisLabels();
     const templateName = hidden ? 'hidden-item' : 'active-item';
     const actionKey = hidden ? 'restore-btn' : 'dismiss-btn';
-    return createItemFromTemplate(templateName, {
+    const $item = createItemFromTemplate(templateName, {
         category: item.title,
         message: getFindingDetailText(item),
         [actionKey]: { id: item.id, type: type }
     });
+
+    if (hidden) {
+        $item.find('[data-element="restore-text"]').text(labels.restore);
+        $item.find('[data-element="restore-btn"]').attr('title', labels.restoreTitle);
+    } else {
+        $item.find('[data-element="dismiss-text"]').text(labels.dismiss);
+        $item.find('[data-element="dismiss-btn"]').attr('title', labels.dismissTitle);
+    }
+
+    return $item;
 }
 
 function updateVisibleItemLayout($items) {
@@ -105,6 +139,7 @@ function updateVisibleItemLayout($items) {
 }
 
 function configureSectionDecision($status, decision) {
+    const labels = getAnalysisLabels();
     if (!decision) {
         return;
     }
@@ -112,11 +147,12 @@ function configureSectionDecision($status, decision) {
     $status
         .addClass('ai-analysis-status-chip')
         .addClass(decision.toLowerCase())
-        .text(decision === 'PROCEED' ? 'Proceed' : 'Hold')
+        .text(decision === 'PROCEED' ? labels.proceed : labels.hold)
         .show();
 }
 
 function configureCollapseToggle($section, $collapseToggle) {
+    const labels = getAnalysisLabels();
     $collapseToggle
         .off('click')
         .on('click', function() {
@@ -125,7 +161,7 @@ function configureCollapseToggle($section, $collapseToggle) {
 
             $(this)
                 .attr('aria-expanded', (!isCollapsed).toString())
-                .attr('title', isCollapsed ? 'Expand section' : 'Collapse section');
+                .attr('title', isCollapsed ? labels.expandTitle : labels.collapseTitle);
 
             $icon
                 .toggleClass('fa-chevron-down', !isCollapsed)
@@ -170,12 +206,13 @@ function appendSectionItems($items, section, isDismissedVisible) {
 }
 
 function configureDismissedItemsToggle($items, $toggle, section, isDismissedVisible) {
+    const labels = getAnalysisLabels();
     const hiddenCount = section.hiddenItems.length;
 
     if (hiddenCount === 0) {
         dismissedSectionVisibility[section.itemType] = false;
         $toggle
-            .text('Show dismissed items')
+            .text(labels.showDismissed)
             .css('visibility', 'hidden')
             .prop('disabled', true)
             .show();
@@ -184,7 +221,7 @@ function configureDismissedItemsToggle($items, $toggle, section, isDismissedVisi
 
     $toggle
         .css('visibility', 'visible')
-        .text(isDismissedVisible ? 'Hide dismissed items' : 'Show dismissed items')
+        .text(isDismissedVisible ? labels.hideDismissed : labels.showDismissed)
         .prop('disabled', false)
         .show()
         .off('click')
@@ -193,7 +230,7 @@ function configureDismissedItemsToggle($items, $toggle, section, isDismissedVisi
             dismissedSectionVisibility[section.itemType] = shouldShow;
             $items.find('.hidden-item').toggle(shouldShow);
             updateVisibleItemLayout($items);
-            $toggle.text(shouldShow ? 'Hide dismissed items' : 'Show dismissed items');
+            $toggle.text(shouldShow ? labels.hideDismissed : labels.showDismissed);
         });
 }
 
@@ -228,12 +265,13 @@ function renderSection(section) {
 
 function splitFindingsByVisibility(items) {
     return {
-        activeItems: items.filter(item => item.hidden !== true),
-        hiddenItems: items.filter(item => item.hidden === true)
+        activeItems: items.filter(item => item.dismissed !== true),
+        hiddenItems: items.filter(item => item.dismissed === true)
     };
 }
 
 function buildAnalysisSections(analysisData) {
+    const labels = getAnalysisLabels();
     const decision = normalizeDecision(analysisData.decision);
     const errors = normalizeFindings(analysisData.errors, 'error');
     const warnings = normalizeFindings(analysisData.warnings, 'warning');
@@ -247,7 +285,7 @@ function buildAnalysisSections(analysisData) {
     return {
         sections: [
             {
-                title: 'Errors',
+                title: labels.errors,
                 sectionClass: 'error',
                 itemType: 'error',
                 activeItems: errorGroups.activeItems,
@@ -255,7 +293,7 @@ function buildAnalysisSections(analysisData) {
                 hiddenItems: errorGroups.hiddenItems
             },
             {
-                title: 'Warnings',
+                title: labels.warnings,
                 sectionClass: 'warning',
                 itemType: 'warning',
                 activeItems: warningGroups.activeItems,
@@ -263,20 +301,20 @@ function buildAnalysisSections(analysisData) {
                 hiddenItems: warningGroups.hiddenItems
             },
             {
-                title: 'Summary',
+                title: labels.summary,
                 sectionClass: 'summary',
                 itemType: 'summary',
-                headerOnlyText: summaryGroups.activeItems.length === 0 && summaryGroups.hiddenItems.length === 0 ? 'No summary' : null,
+                headerOnlyText: summaryGroups.activeItems.length === 0 && summaryGroups.hiddenItems.length === 0 ? labels.noSummary : null,
                 activeItems: summaryGroups.activeItems,
                 allItems: summaries,
                 hiddenItems: summaryGroups.hiddenItems
             },
             {
-                title: 'Recommendations',
+                title: labels.recommendations,
                 sectionClass: 'recommendations',
                 itemType: 'recommendation',
                 decision: decision,
-                headerOnlyText: recommendationGroups.activeItems.length === 0 && recommendationGroups.hiddenItems.length === 0 ? 'No recommendations' : null,
+                headerOnlyText: recommendationGroups.activeItems.length === 0 && recommendationGroups.hiddenItems.length === 0 ? labels.noRecommendations : null,
                 activeItems: recommendationGroups.activeItems,
                 allItems: recommendations,
                 hiddenItems: recommendationGroups.hiddenItems

From 6368b315cbef88356f11268bc420534fdfb4313f Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 15:15:44 -0700
Subject: [PATCH 16/45] AB#30833 Hide empty application analysis sections

---
 .../Pages/GrantApplications/Details.cshtml    |  2 --
 .../Pages/GrantApplications/ai-analysis.js    | 36 ++++++-------------
 2 files changed, 10 insertions(+), 28 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 7a22c505da..2d974dfe3a 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
@@ -438,8 +438,6 @@
                          data-recommendations="Recommendations"
                          data-proceed="Proceed"
                          data-hold="Hold"
-                         data-no-summary="No summary"
-                         data-no-recommendations="No recommendations"
                          data-show-dismissed="Show dismissed items"
                          data-hide-dismissed="Hide dismissed items"
                          data-dismiss="Dismiss"
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 273fe7a8c3..ef9a0cc8a8 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
@@ -20,8 +20,6 @@ function getAnalysisLabels() {
         recommendations: labels.recommendations || 'Recommendations',
         proceed: labels.proceed || 'Proceed',
         hold: labels.hold || 'Hold',
-        noSummary: labels.noSummary || 'No summary',
-        noRecommendations: labels.noRecommendations || 'No recommendations',
         showDismissed: labels.showDismissed || 'Show dismissed items',
         hideDismissed: labels.hideDismissed || 'Hide dismissed items',
         dismiss: labels.dismiss || 'Dismiss',
@@ -169,21 +167,8 @@ function configureCollapseToggle($section, $collapseToggle) {
         });
 }
 
-function renderHeaderOnlySection($section, $status, $toggle, $collapseToggle, section) {
-    $section.addClass('header-only');
-
-    if (section.decision) {
-        $status.show();
-    } else {
-        $status
-            .addClass('ai-analysis-status-chip')
-            .text(section.headerOnlyText)
-            .show();
-    }
-
-    $toggle.hide();
-    $collapseToggle.hide();
-    return $section;
+function shouldRenderSection(section) {
+    return section.allItems.length > 0;
 }
 
 function appendSectionItems($items, section, isDismissedVisible) {
@@ -253,10 +238,6 @@ function renderSection(section) {
     configureSectionDecision($status, section.decision);
     configureCollapseToggle($section, $collapseToggle);
 
-    if (section.headerOnlyText) {
-        return renderHeaderOnlySection($section, $status, $toggle, $collapseToggle, section);
-    }
-
     appendSectionItems($items, section, isDismissedVisible);
     configureDismissedItemsToggle($items, $toggle, section, isDismissedVisible);
 
@@ -304,7 +285,6 @@ function buildAnalysisSections(analysisData) {
                 title: labels.summary,
                 sectionClass: 'summary',
                 itemType: 'summary',
-                headerOnlyText: summaryGroups.activeItems.length === 0 && summaryGroups.hiddenItems.length === 0 ? labels.noSummary : null,
                 activeItems: summaryGroups.activeItems,
                 allItems: summaries,
                 hiddenItems: summaryGroups.hiddenItems
@@ -314,7 +294,6 @@ function buildAnalysisSections(analysisData) {
                 sectionClass: 'recommendations',
                 itemType: 'recommendation',
                 decision: decision,
-                headerOnlyText: recommendationGroups.activeItems.length === 0 && recommendationGroups.hiddenItems.length === 0 ? labels.noRecommendations : null,
                 activeItems: recommendationGroups.activeItems,
                 allItems: recommendations,
                 hiddenItems: recommendationGroups.hiddenItems
@@ -344,7 +323,7 @@ function renderRealAIAnalysis(analysisData) {
     $sections.empty();
 
     sections.forEach(section => {
-        if ((section.itemType === 'error' || section.itemType === 'warning') && section.allItems.length === 0) {
+        if (!shouldRenderSection(section)) {
             return;
         }
 
@@ -352,8 +331,13 @@ function renderRealAIAnalysis(analysisData) {
     });
 
     const $noDataMessage = $('#aiAnalysisNoData');
-    $noDataMessage.hide();
-    $sections.show();
+    if ($sections.children().length === 0) {
+        $noDataMessage.show();
+        $sections.hide();
+    } else {
+        $noDataMessage.hide();
+        $sections.show();
+    }
 
     bindAnalysisItemActions($sections);
 }

From 2e29e5ed4f84f4ede3e2c3d55419e3f5a48d5e73 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 9 Apr 2026 15:20:59 -0700
Subject: [PATCH 17/45] AB#30833 Align application analysis summary labels with
 contract

---
 .../Pages/GrantApplications/Details.cshtml                    | 2 +-
 .../Pages/GrantApplications/ai-analysis.js                    | 4 ++--
 2 files changed, 3 insertions(+), 3 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 2d974dfe3a..f8ffa79efa 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
@@ -434,7 +434,7 @@
                     <div class="d-none" id="aiAnalysisLabels"
                          data-errors="Errors"
                          data-warnings="Warnings"
-                         data-summary="Summary"
+                         data-summaries="Summaries"
                          data-recommendations="Recommendations"
                          data-proceed="Proceed"
                          data-hold="Hold"
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 ef9a0cc8a8..814e3a2724 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
@@ -16,7 +16,7 @@ function getAnalysisLabels() {
     return {
         errors: labels.errors || 'Errors',
         warnings: labels.warnings || 'Warnings',
-        summary: labels.summary || 'Summary',
+        summaries: labels.summaries || 'Summaries',
         recommendations: labels.recommendations || 'Recommendations',
         proceed: labels.proceed || 'Proceed',
         hold: labels.hold || 'Hold',
@@ -282,7 +282,7 @@ function buildAnalysisSections(analysisData) {
                 hiddenItems: warningGroups.hiddenItems
             },
             {
-                title: labels.summary,
+                title: labels.summaries,
                 sectionClass: 'summary',
                 itemType: 'summary',
                 activeItems: summaryGroups.activeItems,

From c23f997b3bbbb8cb7c51ebab48f4ec3086a57398 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 10 Apr 2026 10:34:30 -0700
Subject: [PATCH 18/45] AB#30833 refine AI analysis status display

---
 .../Pages/GrantApplications/Details.cshtml    |  7 +++-
 .../Pages/GrantApplications/ai-analysis.js    | 37 +++++++++++++++----
 2 files changed, 36 insertions(+), 8 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 f8ffa79efa..ad3a138684 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
@@ -414,7 +414,10 @@
                 {
                 <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">Application Analysis</h6>
+                        <div class="d-flex align-items-center gap-2">
+                            <h6 class="fw-bold m-0">Application Analysis</h6>
+                            <span id="aiAnalysisDecisionChip" class="ai-analysis-status-chip" style="display:none;"></span>
+                        </div>
                         <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>
@@ -438,6 +441,8 @@
                          data-recommendations="Recommendations"
                          data-proceed="Proceed"
                          data-hold="Hold"
+                         data-no-errors="No errors"
+                         data-no-warnings="No warnings"
                          data-show-dismissed="Show dismissed items"
                          data-hide-dismissed="Hide dismissed items"
                          data-dismiss="Dismiss"
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 814e3a2724..bbd88459a5 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
@@ -20,6 +20,8 @@ function getAnalysisLabels() {
         recommendations: labels.recommendations || 'Recommendations',
         proceed: labels.proceed || 'Proceed',
         hold: labels.hold || 'Hold',
+        noErrors: labels.noErrors || 'No errors',
+        noWarnings: labels.noWarnings || 'No warnings',
         showDismissed: labels.showDismissed || 'Show dismissed items',
         hideDismissed: labels.hideDismissed || 'Hide dismissed items',
         dismiss: labels.dismiss || 'Dismiss',
@@ -137,13 +139,28 @@ function updateVisibleItemLayout($items) {
 }
 
 function configureSectionDecision($status, decision) {
-    const labels = getAnalysisLabels();
     if (!decision) {
         return;
     }
 
     $status
         .addClass('ai-analysis-status-chip')
+        .text(decision)
+        .show();
+}
+
+function configureDecisionChip(decision) {
+    const labels = getAnalysisLabels();
+    const $decisionChip = $('#aiAnalysisDecisionChip');
+
+    $decisionChip.removeClass('proceed hold');
+
+    if (!decision) {
+        $decisionChip.hide().text('');
+        return;
+    }
+
+    $decisionChip
         .addClass(decision.toLowerCase())
         .text(decision === 'PROCEED' ? labels.proceed : labels.hold)
         .show();
@@ -168,7 +185,7 @@ function configureCollapseToggle($section, $collapseToggle) {
 }
 
 function shouldRenderSection(section) {
-    return section.allItems.length > 0;
+    return true;
 }
 
 function appendSectionItems($items, section, isDismissedVisible) {
@@ -177,7 +194,7 @@ function appendSectionItems($items, section, isDismissedVisible) {
     }
 
     section.allItems.forEach(item => {
-        const isHidden = item.hidden === true;
+        const isHidden = item.dismissed === true;
         const $item = createFindingItem(item, section.itemType, isHidden);
 
         if (isHidden && !isDismissedVisible) {
@@ -235,7 +252,7 @@ function renderSection(section) {
     const $collapseToggle = $section.find('[data-element="collapse-toggle"]');
     const isDismissedVisible = dismissedSectionVisibility[section.itemType] === true;
 
-    configureSectionDecision($status, section.decision);
+    configureSectionDecision($status, section.countLabel);
     configureCollapseToggle($section, $collapseToggle);
 
     appendSectionItems($items, section, isDismissedVisible);
@@ -269,6 +286,7 @@ function buildAnalysisSections(analysisData) {
                 title: labels.errors,
                 sectionClass: 'error',
                 itemType: 'error',
+                countLabel: errors.length.toString(),
                 activeItems: errorGroups.activeItems,
                 allItems: errors,
                 hiddenItems: errorGroups.hiddenItems
@@ -277,6 +295,7 @@ function buildAnalysisSections(analysisData) {
                 title: labels.warnings,
                 sectionClass: 'warning',
                 itemType: 'warning',
+                countLabel: warnings.length.toString(),
                 activeItems: warningGroups.activeItems,
                 allItems: warnings,
                 hiddenItems: warningGroups.hiddenItems
@@ -285,6 +304,7 @@ function buildAnalysisSections(analysisData) {
                 title: labels.summaries,
                 sectionClass: 'summary',
                 itemType: 'summary',
+                countLabel: summaries.length.toString(),
                 activeItems: summaryGroups.activeItems,
                 allItems: summaries,
                 hiddenItems: summaryGroups.hiddenItems
@@ -293,12 +313,13 @@ function buildAnalysisSections(analysisData) {
                 title: labels.recommendations,
                 sectionClass: 'recommendations',
                 itemType: 'recommendation',
-                decision: decision,
+                countLabel: recommendations.length.toString(),
                 activeItems: recommendationGroups.activeItems,
                 allItems: recommendations,
                 hiddenItems: recommendationGroups.hiddenItems
             }
-        ]
+        ],
+        decision
     };
 }
 
@@ -318,9 +339,10 @@ function bindAnalysisItemActions($sections) {
 }
 
 function renderRealAIAnalysis(analysisData) {
-    const { sections } = buildAnalysisSections(analysisData);
+    const { sections, decision } = buildAnalysisSections(analysisData);
     const $sections = $('#aiAnalysisSections');
     $sections.empty();
+    configureDecisionChip(decision);
 
     sections.forEach(section => {
         if (!shouldRenderSection(section)) {
@@ -369,6 +391,7 @@ globalThis.restoreAnalysisItem = function(itemId) {
 }
 
 function resetAnalysisView() {
+    configureDecisionChip('');
     $('#aiAnalysisSections').empty().hide();
     $('#aiAnalysisNoData').show();
 }

From 70f3b4fb2bd8887284d0c4cafaa52c16ecf8a4af Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 10 Apr 2026 16:48:43 -0700
Subject: [PATCH 19/45] AB#30833 refine AI analysis section rendering

---
 .../Pages/GrantApplications/Details.cshtml    |  5 +-
 .../Pages/GrantApplications/ai-analysis.js    | 63 +++++++++----------
 2 files changed, 31 insertions(+), 37 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 ad3a138684..1a433dab1a 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
@@ -414,10 +414,7 @@
                 {
                 <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">
-                        <div class="d-flex align-items-center gap-2">
-                            <h6 class="fw-bold m-0">Application Analysis</h6>
-                            <span id="aiAnalysisDecisionChip" class="ai-analysis-status-chip" style="display:none;"></span>
-                        </div>
+                        <h6 class="fw-bold m-0">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>
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 bbd88459a5..1d04161c97 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
@@ -138,31 +138,21 @@ function updateVisibleItemLayout($items) {
     $visibleItems.last().addClass('last-visible');
 }
 
-function configureSectionDecision($status, decision) {
-    if (!decision) {
+function configureSectionStatus($status, text, statusClass) {
+    if (!text) {
         return;
     }
 
     $status
-        .addClass('ai-analysis-status-chip')
-        .text(decision)
-        .show();
-}
-
-function configureDecisionChip(decision) {
-    const labels = getAnalysisLabels();
-    const $decisionChip = $('#aiAnalysisDecisionChip');
-
-    $decisionChip.removeClass('proceed hold');
+        .removeClass('proceed hold')
+        .addClass('ai-analysis-status-chip');
 
-    if (!decision) {
-        $decisionChip.hide().text('');
-        return;
+    if (statusClass) {
+        $status.addClass(statusClass);
     }
 
-    $decisionChip
-        .addClass(decision.toLowerCase())
-        .text(decision === 'PROCEED' ? labels.proceed : labels.hold)
+    $status
+        .text(text)
         .show();
 }
 
@@ -185,7 +175,7 @@ function configureCollapseToggle($section, $collapseToggle) {
 }
 
 function shouldRenderSection(section) {
-    return true;
+    return section.alwaysVisible === true || section.allItems.length > 0;
 }
 
 function appendSectionItems($items, section, isDismissedVisible) {
@@ -240,11 +230,12 @@ function renderSection(section) {
     const $section = createItemFromTemplate('section', {
         title: section.title
     });
+    const hasItems = section.allItems.length > 0;
 
-    $section.addClass(section.sectionClass);
-    if (section.activeItems.length === 0) {
-        $section.addClass('compact');
-    }
+    $section
+        .addClass(section.sectionClass)
+        .toggleClass('compact', section.activeItems.length === 0)
+        .toggleClass('header-only', !hasItems);
 
     const $items = $section.find('[data-element="items"]');
     const $status = $section.find('[data-element="status-chip"]');
@@ -252,8 +243,9 @@ function renderSection(section) {
     const $collapseToggle = $section.find('[data-element="collapse-toggle"]');
     const isDismissedVisible = dismissedSectionVisibility[section.itemType] === true;
 
-    configureSectionDecision($status, section.countLabel);
+    configureSectionStatus($status, section.statusText, section.statusClass);
     configureCollapseToggle($section, $collapseToggle);
+    $collapseToggle.toggle(hasItems);
 
     appendSectionItems($items, section, isDismissedVisible);
     configureDismissedItemsToggle($items, $toggle, section, isDismissedVisible);
@@ -280,13 +272,21 @@ function buildAnalysisSections(analysisData) {
     const summaryGroups = splitFindingsByVisibility(summaries);
     const recommendationGroups = splitFindingsByVisibility(recommendations);
 
+    const recommendationDecision = decision
+        ? {
+            statusText: decision === 'PROCEED' ? labels.proceed : labels.hold,
+            statusClass: decision.toLowerCase()
+        }
+        : {};
+
     return {
         sections: [
             {
                 title: labels.errors,
                 sectionClass: 'error',
                 itemType: 'error',
-                countLabel: errors.length.toString(),
+                statusText: errors.length.toString(),
+                alwaysVisible: true,
                 activeItems: errorGroups.activeItems,
                 allItems: errors,
                 hiddenItems: errorGroups.hiddenItems
@@ -295,7 +295,8 @@ function buildAnalysisSections(analysisData) {
                 title: labels.warnings,
                 sectionClass: 'warning',
                 itemType: 'warning',
-                countLabel: warnings.length.toString(),
+                statusText: warnings.length.toString(),
+                alwaysVisible: true,
                 activeItems: warningGroups.activeItems,
                 allItems: warnings,
                 hiddenItems: warningGroups.hiddenItems
@@ -304,7 +305,6 @@ function buildAnalysisSections(analysisData) {
                 title: labels.summaries,
                 sectionClass: 'summary',
                 itemType: 'summary',
-                countLabel: summaries.length.toString(),
                 activeItems: summaryGroups.activeItems,
                 allItems: summaries,
                 hiddenItems: summaryGroups.hiddenItems
@@ -313,13 +313,12 @@ function buildAnalysisSections(analysisData) {
                 title: labels.recommendations,
                 sectionClass: 'recommendations',
                 itemType: 'recommendation',
-                countLabel: recommendations.length.toString(),
+                ...recommendationDecision,
                 activeItems: recommendationGroups.activeItems,
                 allItems: recommendations,
                 hiddenItems: recommendationGroups.hiddenItems
             }
-        ],
-        decision
+        ]
     };
 }
 
@@ -339,10 +338,9 @@ function bindAnalysisItemActions($sections) {
 }
 
 function renderRealAIAnalysis(analysisData) {
-    const { sections, decision } = buildAnalysisSections(analysisData);
+    const { sections } = buildAnalysisSections(analysisData);
     const $sections = $('#aiAnalysisSections');
     $sections.empty();
-    configureDecisionChip(decision);
 
     sections.forEach(section => {
         if (!shouldRenderSection(section)) {
@@ -391,7 +389,6 @@ globalThis.restoreAnalysisItem = function(itemId) {
 }
 
 function resetAnalysisView() {
-    configureDecisionChip('');
     $('#aiAnalysisSections').empty().hide();
     $('#aiAnalysisNoData').show();
 }

From b27643d4a36855db83f4a963ba2e4ac4d7e899a5 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 10 Apr 2026 16:54:25 -0700
Subject: [PATCH 20/45] AB#30833 align AI analysis badges and recommendation
 label

---
 .../Pages/GrantApplications/Details.cshtml      |  1 +
 .../Pages/GrantApplications/ai-analysis.js      | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 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 1a433dab1a..61b769c32a 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
@@ -435,6 +435,7 @@
                          data-errors="Errors"
                          data-warnings="Warnings"
                          data-summaries="Summaries"
+                         data-recommendation="Recommendation"
                          data-recommendations="Recommendations"
                          data-proceed="Proceed"
                          data-hold="Hold"
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 1d04161c97..a979baae4f 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
@@ -17,7 +17,7 @@ function getAnalysisLabels() {
         errors: labels.errors || 'Errors',
         warnings: labels.warnings || 'Warnings',
         summaries: labels.summaries || 'Summaries',
-        recommendations: labels.recommendations || 'Recommendations',
+        recommendation: labels.recommendation || labels.recommendations || 'Recommendation',
         proceed: labels.proceed || 'Proceed',
         hold: labels.hold || 'Hold',
         noErrors: labels.noErrors || 'No errors',
@@ -138,6 +138,10 @@ function updateVisibleItemLayout($items) {
     $visibleItems.last().addClass('last-visible');
 }
 
+function formatCountStatus(count) {
+    return `(${count})`;
+}
+
 function configureSectionStatus($status, text, statusClass) {
     if (!text) {
         return;
@@ -272,7 +276,7 @@ function buildAnalysisSections(analysisData) {
     const summaryGroups = splitFindingsByVisibility(summaries);
     const recommendationGroups = splitFindingsByVisibility(recommendations);
 
-    const recommendationDecision = decision
+    const recommendationStatus = decision
         ? {
             statusText: decision === 'PROCEED' ? labels.proceed : labels.hold,
             statusClass: decision.toLowerCase()
@@ -285,7 +289,7 @@ function buildAnalysisSections(analysisData) {
                 title: labels.errors,
                 sectionClass: 'error',
                 itemType: 'error',
-                statusText: errors.length.toString(),
+                statusText: formatCountStatus(errors.length),
                 alwaysVisible: true,
                 activeItems: errorGroups.activeItems,
                 allItems: errors,
@@ -295,7 +299,7 @@ function buildAnalysisSections(analysisData) {
                 title: labels.warnings,
                 sectionClass: 'warning',
                 itemType: 'warning',
-                statusText: warnings.length.toString(),
+                statusText: formatCountStatus(warnings.length),
                 alwaysVisible: true,
                 activeItems: warningGroups.activeItems,
                 allItems: warnings,
@@ -305,15 +309,16 @@ function buildAnalysisSections(analysisData) {
                 title: labels.summaries,
                 sectionClass: 'summary',
                 itemType: 'summary',
+                statusText: formatCountStatus(summaries.length),
                 activeItems: summaryGroups.activeItems,
                 allItems: summaries,
                 hiddenItems: summaryGroups.hiddenItems
             },
             {
-                title: labels.recommendations,
+                title: labels.recommendation,
                 sectionClass: 'recommendations',
                 itemType: 'recommendation',
-                ...recommendationDecision,
+                ...recommendationStatus,
                 activeItems: recommendationGroups.activeItems,
                 allItems: recommendations,
                 hiddenItems: recommendationGroups.hiddenItems

From 4199acb1c0d53c2fba5f6abc8e9fc136ba5256ff Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 10 Apr 2026 17:31:02 -0700
Subject: [PATCH 21/45] AB#30833 simplify AI analysis section layout

---
 .../Pages/GrantApplications/ai-analysis.js    | 88 ++++++++-----------
 1 file changed, 37 insertions(+), 51 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 a979baae4f..ed8ff76896 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
@@ -138,8 +138,8 @@ function updateVisibleItemLayout($items) {
     $visibleItems.last().addClass('last-visible');
 }
 
-function formatCountStatus(count) {
-    return `(${count})`;
+function formatSectionTitle(title, count) {
+    return `${title} (${count})`;
 }
 
 function configureSectionStatus($status, text, statusClass) {
@@ -178,8 +178,17 @@ function configureCollapseToggle($section, $collapseToggle) {
         });
 }
 
-function shouldRenderSection(section) {
-    return section.alwaysVisible === true || section.allItems.length > 0;
+function createAnalysisSection(config) {
+    const groups = splitFindingsByVisibility(config.items);
+    const hasItems = config.items.length > 0;
+
+    return {
+        ...config,
+        activeItems: groups.activeItems,
+        allItems: config.items,
+        hiddenItems: groups.hiddenItems,
+        hasItems
+    };
 }
 
 function appendSectionItems($items, section, isDismissedVisible) {
@@ -234,12 +243,11 @@ function renderSection(section) {
     const $section = createItemFromTemplate('section', {
         title: section.title
     });
-    const hasItems = section.allItems.length > 0;
 
     $section
         .addClass(section.sectionClass)
         .toggleClass('compact', section.activeItems.length === 0)
-        .toggleClass('header-only', !hasItems);
+        .toggleClass('header-only', !section.hasItems);
 
     const $items = $section.find('[data-element="items"]');
     const $status = $section.find('[data-element="status-chip"]');
@@ -249,7 +257,7 @@ function renderSection(section) {
 
     configureSectionStatus($status, section.statusText, section.statusClass);
     configureCollapseToggle($section, $collapseToggle);
-    $collapseToggle.toggle(hasItems);
+    $collapseToggle.toggle(section.hasItems);
 
     appendSectionItems($items, section, isDismissedVisible);
     configureDismissedItemsToggle($items, $toggle, section, isDismissedVisible);
@@ -271,58 +279,40 @@ function buildAnalysisSections(analysisData) {
     const warnings = normalizeFindings(analysisData.warnings, 'warning');
     const summaries = normalizeFindings(analysisData.summaries, 'summary');
     const recommendations = normalizeFindings(analysisData.recommendations, 'recommendation');
-    const errorGroups = splitFindingsByVisibility(errors);
-    const warningGroups = splitFindingsByVisibility(warnings);
-    const summaryGroups = splitFindingsByVisibility(summaries);
-    const recommendationGroups = splitFindingsByVisibility(recommendations);
-
-    const recommendationStatus = decision
-        ? {
-            statusText: decision === 'PROCEED' ? labels.proceed : labels.hold,
-            statusClass: decision.toLowerCase()
-        }
-        : {};
+    const recommendationStatusText = decision === 'PROCEED'
+        ? labels.proceed
+        : decision === 'HOLD'
+            ? labels.hold
+            : '';
 
     return {
         sections: [
-            {
-                title: labels.errors,
+            createAnalysisSection({
+                title: formatSectionTitle(labels.errors, errors.length),
                 sectionClass: 'error',
                 itemType: 'error',
-                statusText: formatCountStatus(errors.length),
-                alwaysVisible: true,
-                activeItems: errorGroups.activeItems,
-                allItems: errors,
-                hiddenItems: errorGroups.hiddenItems
-            },
-            {
-                title: labels.warnings,
+                items: errors
+            }),
+            createAnalysisSection({
+                title: formatSectionTitle(labels.warnings, warnings.length),
                 sectionClass: 'warning',
                 itemType: 'warning',
-                statusText: formatCountStatus(warnings.length),
-                alwaysVisible: true,
-                activeItems: warningGroups.activeItems,
-                allItems: warnings,
-                hiddenItems: warningGroups.hiddenItems
-            },
-            {
-                title: labels.summaries,
+                items: warnings
+            }),
+            createAnalysisSection({
+                title: formatSectionTitle(labels.summaries, summaries.length),
                 sectionClass: 'summary',
                 itemType: 'summary',
-                statusText: formatCountStatus(summaries.length),
-                activeItems: summaryGroups.activeItems,
-                allItems: summaries,
-                hiddenItems: summaryGroups.hiddenItems
-            },
-            {
+                items: summaries
+            }),
+            createAnalysisSection({
                 title: labels.recommendation,
                 sectionClass: 'recommendations',
                 itemType: 'recommendation',
-                ...recommendationStatus,
-                activeItems: recommendationGroups.activeItems,
-                allItems: recommendations,
-                hiddenItems: recommendationGroups.hiddenItems
-            }
+                statusText: recommendationStatusText,
+                statusClass: decision ? decision.toLowerCase() : '',
+                items: recommendations
+            })
         ]
     };
 }
@@ -348,10 +338,6 @@ function renderRealAIAnalysis(analysisData) {
     $sections.empty();
 
     sections.forEach(section => {
-        if (!shouldRenderSection(section)) {
-            return;
-        }
-
         $sections.append(renderSection(section));
     });
 

From b6809437c11cd7a14c67fe542fd93a927cc94e7b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 16 Apr 2026 17:21:48 -0700
Subject: [PATCH 22/45] AB#30833 refine AI analysis naming

---
 .../Pages/GrantApplications/Details.cshtml                  | 2 +-
 .../Pages/GrantApplications/Details.css                     | 6 +++---
 .../Pages/GrantApplications/ai-analysis.js                  | 4 ++--
 3 files changed, 6 insertions(+), 6 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 61b769c32a..f364808bfe 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
@@ -484,7 +484,7 @@
                             <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-item dismissed-item" data-template="dismissed-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="restore-btn">
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 e84bcf7900..432d8b744f 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
@@ -663,9 +663,9 @@ form label.error {
     margin-bottom: 6px;
 }
 
-.ai-analysis-detail-item.hidden-item {
-    opacity: 0.6;
-}
+.ai-analysis-detail-item.dismissed-item {
+    opacity: 0.6;
+}
 
 .ai-analysis-section-toggle {
     display: inline-flex;
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 ed8ff76896..56c23afb0e 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
@@ -109,7 +109,7 @@ function normalizeFindings(items, fallbackType) {
 
 function createFindingItem(item, type, hidden) {
     const labels = getAnalysisLabels();
-    const templateName = hidden ? 'hidden-item' : 'active-item';
+    const templateName = hidden ? 'dismissed-item' : 'active-item';
     const actionKey = hidden ? 'restore-btn' : 'dismiss-btn';
     const $item = createItemFromTemplate(templateName, {
         category: item.title,
@@ -233,7 +233,7 @@ function configureDismissedItemsToggle($items, $toggle, section, isDismissedVisi
         .on('click', function() {
             const shouldShow = dismissedSectionVisibility[section.itemType] !== true;
             dismissedSectionVisibility[section.itemType] = shouldShow;
-            $items.find('.hidden-item').toggle(shouldShow);
+            $items.find('.dismissed-item').toggle(shouldShow);
             updateVisibleItemLayout($items);
             $toggle.text(shouldShow ? labels.hideDismissed : labels.showDismissed);
         });

From 4246e3b561778686ef71c8f93d524ff857f21d09 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Thu, 16 Apr 2026 17:45:20 -0700
Subject: [PATCH 23/45] AB#30833 fix AI migration and analysis polish

---
 .../20260413232525_RenameAIPermissions.cs     | 29 +++++--
 .../Pages/GrantApplications/Details.css       | 86 ++++++++++++++-----
 .../Pages/GrantApplications/ai-analysis.js    |  2 +-
 3 files changed, 88 insertions(+), 29 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260413232525_RenameAIPermissions.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260413232525_RenameAIPermissions.cs
index 4b24b08a98..cdbadef3db 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260413232525_RenameAIPermissions.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/HostMigrations/20260413232525_RenameAIPermissions.cs
@@ -10,17 +10,34 @@ public partial class RenameAIPermissions : Migration
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql($"UPDATE public.\"PermissionGrants\" SET \"Name\" = 'AI.Analysis.ViewApplicationAnalysis' WHERE \"Name\" = 'AI.ApplicationAnalysis';");
-            migrationBuilder.Sql($"UPDATE public.\"PermissionGrants\" SET \"Name\" = 'AI.Analysis.ViewAttachmentSummary' WHERE \"Name\" = 'AI.AttachmentSummary';");
-            migrationBuilder.Sql($"UPDATE public.\"PermissionGrants\" SET \"Name\" = 'AI.Analysis.ViewScoringResult' WHERE \"Name\" = 'AI.ScoringAssistant';");
+            RenamePermissionGrant(migrationBuilder, "AI.ApplicationAnalysis", "AI.Analysis.ViewApplicationAnalysis");
+            RenamePermissionGrant(migrationBuilder, "AI.AttachmentSummary", "AI.Analysis.ViewAttachmentSummary");
+            RenamePermissionGrant(migrationBuilder, "AI.ScoringAssistant", "AI.Analysis.ViewScoringResult");
         }
 
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.Sql($"UPDATE public.\"PermissionGrants\" SET \"Name\" = 'AI.ApplicationAnalysis' WHERE \"Name\" = 'AI.Analysis.ViewApplicationAnalysis';");
-            migrationBuilder.Sql($"UPDATE public.\"PermissionGrants\" SET \"Name\" = 'AI.AttachmentSummary' WHERE \"Name\" = 'AI.Analysis.ViewAttachmentSummary';");
-            migrationBuilder.Sql($"UPDATE public.\"PermissionGrants\" SET \"Name\" = 'AI.ScoringAssistant' WHERE \"Name\" = 'AI.Analysis.ViewScoringResult';");
+            RenamePermissionGrant(migrationBuilder, "AI.Analysis.ViewApplicationAnalysis", "AI.ApplicationAnalysis");
+            RenamePermissionGrant(migrationBuilder, "AI.Analysis.ViewAttachmentSummary", "AI.AttachmentSummary");
+            RenamePermissionGrant(migrationBuilder, "AI.Analysis.ViewScoringResult", "AI.ScoringAssistant");
+        }
+
+        private static void RenamePermissionGrant(MigrationBuilder migrationBuilder, string fromName, string toName)
+        {
+            migrationBuilder.Sql($@"
+DELETE FROM public.""PermissionGrants"" target
+USING public.""PermissionGrants"" source
+WHERE target.""Name"" = '{toName}'
+  AND source.""Name"" = '{fromName}'
+  AND target.""TenantId"" IS NOT DISTINCT FROM source.""TenantId""
+  AND target.""ProviderName"" IS NOT DISTINCT FROM source.""ProviderName""
+  AND target.""ProviderKey"" IS NOT DISTINCT FROM source.""ProviderKey"";
+
+UPDATE public.""PermissionGrants""
+SET ""Name"" = '{toName}'
+WHERE ""Name"" = '{fromName}';
+");
         }
     }
 }
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 432d8b744f..2721db382e 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
@@ -616,15 +616,19 @@ form label.error {
     padding-bottom: 10px;
 }
 
-.ai-analysis-section.header-only .ai-analysis-section-body {
-    display: none;
-}
-
-.ai-analysis-detail-item {
-    margin-bottom: 16px;
-    padding-bottom: 16px;
-    border-bottom: 1px solid #e9ecef;
-}
+.ai-analysis-section.header-only .ai-analysis-section-body {
+    display: none;
+}
+
+.ai-analysis-section.collapsed .ai-analysis-section-body {
+    display: none;
+}
+
+.ai-analysis-detail-item {
+    margin-bottom: 16px;
+    padding-bottom: 16px;
+    border-bottom: 1px solid #e9ecef;
+}
 
 .ai-analysis-detail-item:last-child {
     margin-bottom: 0;
@@ -688,24 +692,62 @@ form label.error {
     opacity: 1;
 }
 
-.ai-analysis-section-toggle:hover {
-    color: #1f2937;
-    background-color: #f9fafb;
-    border-color: #9ca3af;
-}
-
-.ai-analysis-status-chip {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
+.ai-analysis-section-toggle:hover {
+    color: #1f2937;
+    background-color: #f9fafb;
+    border-color: #9ca3af;
+}
+
+.ai-analysis-collapse-toggle {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 2rem;
+    height: 2rem;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    box-shadow: none;
+    color: #4b5563;
+    border-radius: 999px;
+    transition: color 0.2s, background-color 0.2s, border-color 0.2s, transform 0.2s;
+}
+
+.ai-analysis-collapse-toggle:hover {
+    color: #1f2937;
+    background-color: #eef2f6;
+}
+
+.ai-analysis-collapse-toggle:focus,
+.ai-analysis-collapse-toggle:focus-visible {
+    outline: none;
+    box-shadow: none;
+}
+
+.ai-analysis-status-chip {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
     padding: 4px 10px;
     font-size: 12px;
     font-weight: 700;
     color: #5c6b7a;
     background-color: #eef2f6;
-    border: 1px solid #dce3ec;
-    border-radius: 999px;
-}
+    border: 1px solid #dce3ec;
+    border-radius: 999px;
+}
+
+.ai-analysis-status-chip.proceed {
+    color: #0f5132;
+    background-color: #d1e7dd;
+    border-color: #badbcc;
+}
+
+.ai-analysis-status-chip.hold {
+    color: #842029;
+    background-color: #f8d7da;
+    border-color: #f5c2c7;
+}
 
 #ai-analysis-tab {
     display: inline-flex;
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 56c23afb0e..3eb4c5f7ce 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
@@ -307,7 +307,7 @@ function buildAnalysisSections(analysisData) {
             }),
             createAnalysisSection({
                 title: labels.recommendation,
-                sectionClass: 'recommendations',
+                sectionClass: 'recommendation',
                 itemType: 'recommendation',
                 statusText: recommendationStatusText,
                 statusClass: decision ? decision.toLowerCase() : '',

From a5e55bdf8cf58c1601839c8d9a9f0c2a2f709abd Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 08:07:50 -0700
Subject: [PATCH 24/45] AB#30833 simplify recommendation status text

---
 .../Pages/GrantApplications/ai-analysis.js            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 3eb4c5f7ce..254595cbdd 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
@@ -279,11 +279,12 @@ function buildAnalysisSections(analysisData) {
     const warnings = normalizeFindings(analysisData.warnings, 'warning');
     const summaries = normalizeFindings(analysisData.summaries, 'summary');
     const recommendations = normalizeFindings(analysisData.recommendations, 'recommendation');
-    const recommendationStatusText = decision === 'PROCEED'
-        ? labels.proceed
-        : decision === 'HOLD'
-            ? labels.hold
-            : '';
+    let recommendationStatusText = '';
+    if (decision === 'PROCEED') {
+        recommendationStatusText = labels.proceed;
+    } else if (decision === 'HOLD') {
+        recommendationStatusText = labels.hold;
+    }
 
     return {
         sections: [

From 1f9bd88464769e1730e7bf58e6364c256138fd12 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Fri, 17 Apr 2026 11:04:59 -0700
Subject: [PATCH 25/45] AB#32700 fix role updates for contact handler

---
 .../Handlers/ContactCreateHandler.cs          | 25 +------
 .../Handlers/ContactEditHandler.cs            | 74 ++++++++++---------
 2 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactCreateHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactCreateHandler.cs
index 769e4b1135..8a8368ef26 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactCreateHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactCreateHandler.cs
@@ -26,7 +26,7 @@ public virtual async Task<string> HandleAsync(PluginDataPayload payload)
         var contactId = Guid.Parse(payload.ContactId ?? throw new ArgumentException("contactId is required"));
         var profileId = Guid.Parse(payload.ProfileId ?? throw new ArgumentException("profileId is required"));
         var innerData = payload.Data?.ToObject<ContactCreateData>()
-                        ?? throw new ArgumentException("Contact data is required");        
+                        ?? throw new ArgumentException("Contact data is required");
 
         // Idempotency: if the contact already exists, treat as success
         var existing = await contactRepository.FindAsync(contactId);
@@ -83,28 +83,5 @@ public virtual async Task<string> HandleAsync(PluginDataPayload payload)
 
         logger.LogInformation("Contact {ContactId} created successfully", contactId);
         return "Contact created successfully";
-    }   
-
-    /// <summary>
-    /// Normalizes a raw OIDC subject by stripping the IDP suffix (after @) and uppercasing.
-    /// This matches the format stored in ApplicationFormSubmission.OidcSub.
-    /// </summary>
-    internal static string? NormalizeOidcSub(string? subject)
-    {
-        if (string.IsNullOrWhiteSpace(subject))
-        {
-            return null;
-        }
-
-        var atIndex = subject.IndexOf('@');
-
-        if (atIndex == 0)
-        {
-            return null;
-        }
-
-        return atIndex > 0
-            ? subject[..atIndex].ToUpperInvariant()
-            : subject.ToUpperInvariant();
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs
index 856821d7f7..b243968df4 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -24,7 +25,7 @@ public virtual async Task<string> HandleAsync(PluginDataPayload payload)
     {
         var contactId = Guid.Parse(payload.ContactId ?? throw new ArgumentException("contactId is required"));
         var innerData = payload.Data?.ToObject<ContactEditData>()
-                        ?? throw new ArgumentException("Contact data is required");        
+                        ?? throw new ArgumentException("Contact data is required");
 
         if (innerData.ApplicantId == Guid.Empty)
         {
@@ -33,50 +34,55 @@ public virtual async Task<string> HandleAsync(PluginDataPayload payload)
 
         logger.LogInformation("Editing contact {ContactId} for profile {ProfileId}", contactId, payload.ProfileId);
 
+        await UpdateContactAsync(contactId, innerData);
+        await SyncContactLinkAsync(contactId, innerData);
+
+        logger.LogInformation("Contact {ContactId} updated successfully", contactId);
+        return "Contact updated successfully";
+    }
+
+    private async Task UpdateContactAsync(Guid contactId, ContactEditData data)
+    {
         var contact = await contactRepository.GetAsync(contactId);
 
-        contact.Name = innerData.Name;
-        contact.Email = innerData.Email;
-        contact.Title = innerData.Title;
-        contact.HomePhoneNumber = innerData.HomePhoneNumber;
-        contact.MobilePhoneNumber = innerData.MobilePhoneNumber;
-        contact.WorkPhoneNumber = innerData.WorkPhoneNumber;
-        contact.WorkPhoneExtension = innerData.WorkPhoneExtension;
+        contact.Name = data.Name;
+        contact.Email = data.Email;
+        contact.Title = data.Title;
+        contact.HomePhoneNumber = data.HomePhoneNumber;
+        contact.MobilePhoneNumber = data.MobilePhoneNumber;
+        contact.WorkPhoneNumber = data.WorkPhoneNumber;
+        contact.WorkPhoneExtension = data.WorkPhoneExtension;
 
-        // Sync contact-link primary flags to match the incoming value
+        await contactRepository.UpdateAsync(contact);
+    }
+
+    private async Task SyncContactLinkAsync(Guid contactId, ContactEditData data)
+    {
         var contactLinks = await contactLinkRepository.GetListAsync(
             cl => cl.RelatedEntityType == ApplicantEntityType
-                  && cl.RelatedEntityId == innerData.ApplicantId
+                  && cl.RelatedEntityId == data.ApplicantId
                   && cl.IsActive);
 
-        if (innerData.IsPrimary)
+        if (data.IsPrimary)
         {
-            foreach (var stale in contactLinks.Where(cl => cl.IsPrimary && cl.ContactId != contactId))
-            {
-                stale.IsPrimary = false;
-                await contactLinkRepository.UpdateAsync(stale);
-            }
-
-            var newPrimary = contactLinks.FirstOrDefault(cl => cl.ContactId == contactId && !cl.IsPrimary);
-            if (newPrimary != null)
-            {
-                newPrimary.IsPrimary = true;
-                await contactLinkRepository.UpdateAsync(newPrimary);
-            }
+            await DemoteOtherPrimaryLinksAsync(contactLinks, contactId);
         }
-        else
+
+        var targetLink = contactLinks.FirstOrDefault(cl => cl.ContactId == contactId);
+        if (targetLink != null)
         {
-            var demoted = contactLinks.FirstOrDefault(cl => cl.ContactId == contactId && cl.IsPrimary);
-            if (demoted != null)
-            {
-                demoted.IsPrimary = false;
-                await contactLinkRepository.UpdateAsync(demoted);
-            }
+            targetLink.IsPrimary = data.IsPrimary;
+            targetLink.Role = data.Role;
+            await contactLinkRepository.UpdateAsync(targetLink);
         }
+    }
 
-        await contactRepository.UpdateAsync(contact);
-
-        logger.LogInformation("Contact {ContactId} updated successfully", contactId);
-        return "Contact updated successfully";
+    private async Task DemoteOtherPrimaryLinksAsync(List<ContactLink> contactLinks, Guid contactId)
+    {
+        foreach (var stale in contactLinks.Where(cl => cl.IsPrimary && cl.ContactId != contactId))
+        {
+            stale.IsPrimary = false;
+            await contactLinkRepository.UpdateAsync(stale);
+        }
     }
 }

From c5247ce88ebeb46453ad81813c36784bf2b2903c Mon Sep 17 00:00:00 2001
From: James Pasta <129337673+JamesPasta@users.noreply.github.com>
Date: Fri, 17 Apr 2026 11:13:05 -0700
Subject: [PATCH 26/45] Revert "Feature/ab#32508 enhance payment flows cypress
 tests"

---
 .../Unity.AutoUI/cypress/e2e/basicEmail.cy.ts |  58 ++-
 .../cypress/pages/ApplicationDetailsPage.ts   |  75 +---
 .../cypress/pages/ApplicationsListPage.ts     |  24 --
 .../cypress/pages/ReviewAssessmentPage.ts     | 156 +++----
 .../cypress/regression/ApprovalFlow.cy.ts     | 384 ++----------------
 .../cypress/utilities/PageFactory.ts          |  41 +-
 .../Unity.AutoUI/cypress/utilities/index.ts   |   3 -
 7 files changed, 131 insertions(+), 610 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
index 19e1ec620a..6ae85878e2 100644
--- a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
@@ -6,7 +6,6 @@ describe("Send an email", () => {
   const TEST_EMAIL_BCC = Cypress.env("TEST_EMAIL_BCC") as string;
   const TEMPLATE_NAME = "Test Case 1";
   const STANDARD_TIMEOUT = 20000;
-  const LONG_TIMEOUT = 60000;
 
   // Only suppress the noisy ResizeObserver error that Unity throws in TEST.
   // Everything else should still fail the test.
@@ -42,9 +41,9 @@ describe("Send an email", () => {
     cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($body) => {
       // Already authenticated
       if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-        cy.contains("VIEW APPLICATIONS", { timeout: STANDARD_TIMEOUT })
-          .should("be.visible")
-          .click();
+        cy.contains("VIEW APPLICATIONS", { timeout: STANDARD_TIMEOUT }).click({
+          force: true,
+        });
         return;
       }
 
@@ -52,15 +51,14 @@ describe("Send an email", () => {
       if ($body.find('button:contains("LOGIN")').length > 0) {
         cy.contains("LOGIN", { timeout: STANDARD_TIMEOUT })
           .should("exist")
-          .should("be.visible")
-          .click();
+          .click({ force: true });
 
         cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($loginBody) => {
           // IDIR chooser may or may not appear
           if ($loginBody.find(':contains("IDIR")').length > 0) {
-            cy.contains("IDIR", { timeout: STANDARD_TIMEOUT })
-              .should("be.visible")
-              .click();
+            cy.contains("IDIR", { timeout: STANDARD_TIMEOUT }).click({
+              force: true,
+            });
           }
 
           cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($authBody) => {
@@ -72,9 +70,9 @@ describe("Send an email", () => {
               cy.get("#password", { timeout: STANDARD_TIMEOUT }).type(
                 Cypress.env("test1password"),
               );
-              cy.contains("Continue", { timeout: STANDARD_TIMEOUT })
-                .should("be.visible")
-                .click();
+              cy.contains("Continue", { timeout: STANDARD_TIMEOUT }).click({
+                force: true,
+              });
             } else {
               cy.log("Already authenticated");
             }
@@ -160,14 +158,14 @@ describe("Send an email", () => {
           .scrollIntoView()
           .should("be.visible")
           .within(() => {
-            cy.contains("td", subject, { timeout: LONG_TIMEOUT })
+            cy.contains("td", subject, { timeout: STANDARD_TIMEOUT })
               .should("exist")
               .click();
           });
         return;
       }
 
-      cy.contains("td", subject, { timeout: LONG_TIMEOUT })
+      cy.contains("td", subject, { timeout: STANDARD_TIMEOUT })
         .should("exist")
         .click();
     });
@@ -228,8 +226,7 @@ describe("Send an email", () => {
 
       cy.get("#btn-confirm-send", { timeout: STANDARD_TIMEOUT })
         .should("exist")
-        .should("be.visible")
-        .click();
+        .click({ force: true });
     });
   }
 
@@ -371,27 +368,21 @@ describe("Send an email", () => {
   it("Save the email", () => {
     cy.get("#btn-save", { timeout: STANDARD_TIMEOUT })
       .should("exist")
-      .should("not.be.disabled")
-      .then(($btn) => {
-        ($btn[0] as HTMLButtonElement).click();
-      });
+      .should("be.visible")
+      .click();
 
-    cy.get("#btn-new-email", { timeout: LONG_TIMEOUT }).should("exist");
+    cy.get("#btn-new-email", { timeout: STANDARD_TIMEOUT }).should(
+      "be.visible",
+    );
   });
 
   it("Select saved email from Email History", () => {
     openSavedEmailFromHistoryBySubject(TEST_EMAIL_SUBJECT);
 
-    cy.get("#EmailTo", { timeout: STANDARD_TIMEOUT })
-      .should("exist")
-      .invoke("val")
-      .should("not.be.empty");
-    cy.get("#EmailCC").should("exist");
-    cy.get("#EmailBCC").should("exist");
-    cy.get("#EmailSubject")
-      .should("exist")
-      .invoke("val")
-      .should("contain", TEST_EMAIL_SUBJECT);
+    cy.get("#EmailTo", { timeout: STANDARD_TIMEOUT }).should("be.visible");
+    cy.get("#EmailCC").should("be.visible");
+    cy.get("#EmailBCC").should("be.visible");
+    cy.get("#EmailSubject").should("be.visible");
 
     cy.get("#btn-send", { timeout: STANDARD_TIMEOUT }).should("exist");
     cy.get("#btn-save", { timeout: STANDARD_TIMEOUT }).should("exist");
@@ -400,10 +391,9 @@ describe("Send an email", () => {
   it("Send the email", () => {
     cy.get("#btn-send", { timeout: STANDARD_TIMEOUT })
       .should("exist")
+      .should("be.visible")
       .should("not.be.disabled")
-      .then(($btn) => {
-        ($btn[0] as HTMLButtonElement).click();
-      });
+      .click();
   });
 
   it("Confirm send email in dialog", () => {
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
index 30ff95248d..550c95ff22 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
@@ -110,19 +110,11 @@ export class ApplicationDetailsPage extends BasePage {
     super();
   }
 
-  private activateTab(tabSelector: string): void {
-    cy.get(tabSelector, { timeout: 20000 })
-      .scrollIntoView()
-      .should("be.visible")
-      .click({ force: true })
-      .should("have.class", "active");
-  }
-
   /**
    * Navigate to Submission tab
    */
   goToSubmissionTab(): this {
-    this.activateTab(this.tabs.submission);
+    this.clickElement(this.tabs.submission);
     return this;
   }
 
@@ -131,7 +123,7 @@ export class ApplicationDetailsPage extends BasePage {
    */
   goToReviewAssessmentTab(): this {
     this.dismissErrorModalIfPresent();
-    this.activateTab(this.tabs.reviewAssessment);
+    this.clickElement(this.tabs.reviewAssessment);
     return this;
   }
 
@@ -139,7 +131,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Project Info tab
    */
   goToProjectInfoTab(): this {
-    this.activateTab(this.tabs.projectInfo);
+    this.clickElement(this.tabs.projectInfo);
     return this;
   }
 
@@ -147,7 +139,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Applicant Info tab
    */
   goToApplicantInfoTab(): this {
-    this.activateTab(this.tabs.applicantInfo);
+    this.clickElement(this.tabs.applicantInfo);
     return this;
   }
 
@@ -155,7 +147,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Funding Agreement tab
    */
   goToFundingAgreementTab(): this {
-    this.activateTab(this.tabs.fundingAgreement);
+    this.clickElement(this.tabs.fundingAgreement);
     return this;
   }
 
@@ -163,7 +155,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Payment Info tab
    */
   goToPaymentInfoTab(): this {
-    this.activateTab(this.tabs.paymentInfo);
+    this.clickElement(this.tabs.paymentInfo);
     return this;
   }
 
@@ -442,13 +434,15 @@ export class ApplicationDetailsPage extends BasePage {
    * Open the Status Actions dropdown
    */
   openStatusActionsDropdown(): void {
-    this.dismissErrorModalIfPresent();
-    cy.get(this.statusActions.dropdownToggle, { timeout: 20000 })
-      .scrollIntoView()
-      .should("be.visible")
-      .and("not.contain.text", "Processing...")
-      .click({ force: true });
-    cy.get(this.statusActions.dropdownMenu, { timeout: 20000 }).should(
+    cy.get(this.statusActions.dropdownMenu).then(($menu) => {
+      if (!$menu.is(":visible")) {
+        cy.get(this.statusActions.dropdownToggle, { timeout: 20000 })
+          .should("exist")
+          .scrollIntoView()
+          .click({ force: true });
+      }
+    });
+    cy.get(this.statusActions.dropdownMenu, { timeout: 10000 }).should(
       "be.visible",
     );
   }
@@ -571,18 +565,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Wait for confirm action modal to appear (SweetAlert2)
    */
   waitForConfirmModal(): this {
-    cy.get("body").then(($body) => {
-      if ($body.find(this.confirmModal.modal).length > 0) {
-        cy.get(this.confirmModal.modal, { timeout: 20000 }).should(
-          "be.visible",
-        );
-        return;
-      }
-
-      cy.contains(".modal.show .modal-content", "Confirm Action", {
-        timeout: 20000,
-      }).should("be.visible");
-    });
+    cy.get(this.confirmModal.modal, { timeout: 20000 }).should("be.visible");
     return this;
   }
 
@@ -590,26 +573,10 @@ export class ApplicationDetailsPage extends BasePage {
    * Click Confirm button in the modal (SweetAlert2)
    */
   clickConfirm(): this {
-    cy.get("body").then(($body) => {
-      if ($body.find(this.confirmModal.modal).length > 0) {
-        cy.get(this.confirmModal.modal, { timeout: 20000 })
-          .find(this.confirmModal.confirmButton)
-          .should("be.visible")
-          .click({ force: true });
-        cy.get(this.confirmModal.modal, { timeout: 20000 }).should("not.exist");
-        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
-        return;
-      }
-
-      cy.get(".modal.show", { timeout: 20000 })
-        .contains("button", /^Confirm$/i, { timeout: 20000 })
-        .should("be.visible")
-        .click({ force: true });
-      cy.contains(".modal.show .modal-content", "Confirm Action", {
-        timeout: 20000,
-      }).should("not.exist");
-      cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
-    });
+    cy.get(this.confirmModal.modal, { timeout: 20000 })
+      .find(this.confirmModal.confirmButton)
+      .should("be.visible")
+      .click({ force: true });
     return this;
   }
 
@@ -636,7 +603,7 @@ export class ApplicationDetailsPage extends BasePage {
           .find(".swal2-confirm")
           .first()
           .click({ force: true });
-        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+        cy.wait(500);
       }
     });
     return this;
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index d07835ea27..2128650c00 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -64,11 +64,6 @@ export class ApplicationsListPage extends ApplicationsPage {
     cancelButton: "#payment-modal .modal-footer button",
   };
 
-  private readonly blockingUi = {
-    bootstrapModal: ".modal.show",
-    swalContainer: ".swal2-container",
-  };
-
   // Grant program selectors
   private readonly grantProgram = {
     userInitials: ".unity-user-initials",
@@ -390,25 +385,6 @@ export class ApplicationsListPage extends ApplicationsPage {
     return this;
   }
 
-  /**
-   * Wait for blocking modal overlays to clear before interacting with list controls.
-   */
-  waitForNoBlockingOverlay(): this {
-    cy.get(this.blockingUi.swalContainer, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-
-    cy.get(this.blockingUi.bootstrapModal, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-
-    cy.get(this.paymentModal.backdrop, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("not.exist");
-
-    return this;
-  }
-
   /**
    * Close payment modal using multiple strategies
    */
diff --git a/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts b/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts
index 07add7298b..b5f2636ef9 100644
--- a/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ReviewAssessmentPage.ts
@@ -78,13 +78,13 @@ export class ReviewAssessmentPage extends BasePage {
 
   // Assessment selectors
   private readonly assessment = {
-    approvedAmount: "#ApprovalView_ApprovedAmount",
-    decisionDate: "#ApprovalView_FinalDecisionDate",
+    approvedAmount: '#ApprovalView_ApprovedAmount',
+    decisionDate: '#ApprovalView_FinalDecisionDate',
     saveButton: 'button:contains("Save")',
     // Assessment List view buttons
-    createAssessmentButton: "#CreateButton",
-    completeAssessmentButton: "#CompleteButton",
-    assessmentMainView: "#assessmentMainView",
+    createAssessmentButton: '#CreateButton',
+    completeAssessmentButton: '#CompleteButton',
+    assessmentMainView: '#assessmentMainView',
   };
 
   constructor() {
@@ -104,7 +104,7 @@ export class ReviewAssessmentPage extends BasePage {
       | "projectInfo"
       | "projectTimelines"
       | "projectBudget"
-      | "attestation",
+      | "attestation"
   ): this {
     cy.contains("h4.card-title", this.getSectionTitle(sectionName), {
       timeout: this.STANDARD_TIMEOUT,
@@ -141,7 +141,7 @@ export class ReviewAssessmentPage extends BasePage {
       | "projectInfo"
       | "projectTimelines"
       | "projectBudget"
-      | "attestation",
+      | "attestation"
   ): this {
     cy.contains("h4.card-title", this.getSectionTitle(sectionName), {
       timeout: this.STANDARD_TIMEOUT,
@@ -156,9 +156,7 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getApplicantName(): Cypress.Chainable<string> {
     return cy
-      .get(this.organizationInfo.applicantName, {
-        timeout: this.STANDARD_TIMEOUT,
-      })
+      .get(this.organizationInfo.applicantName, { timeout: this.STANDARD_TIMEOUT })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -167,9 +165,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify applicant name
    */
   verifyApplicantName(expectedValue: string): this {
-    cy.get(this.organizationInfo.applicantName, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.organizationInfo.applicantName, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -178,9 +175,7 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getRegisteredBusinessName(): Cypress.Chainable<string> {
     return cy
-      .get(this.organizationInfo.registeredBusinessName, {
-        timeout: this.STANDARD_TIMEOUT,
-      })
+      .get(this.organizationInfo.registeredBusinessName, { timeout: this.STANDARD_TIMEOUT })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -189,9 +184,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify registered business name
    */
   verifyRegisteredBusinessName(expectedValue: string): this {
-    cy.get(this.organizationInfo.registeredBusinessName, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.organizationInfo.registeredBusinessName, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -200,9 +194,7 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getRegisteredBusinessNumber(): Cypress.Chainable<string> {
     return cy
-      .get(this.organizationInfo.registeredBusinessNumber, {
-        timeout: this.STANDARD_TIMEOUT,
-      })
+      .get(this.organizationInfo.registeredBusinessNumber, { timeout: this.STANDARD_TIMEOUT })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -211,9 +203,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify registered business number
    */
   verifyRegisteredBusinessNumber(expectedValue: string): this {
-    cy.get(this.organizationInfo.registeredBusinessNumber, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.organizationInfo.registeredBusinessNumber, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -223,9 +214,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact name
    */
   verifyContactName(expectedValue: string): this {
-    cy.get(this.contactInfo.contactName, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactName, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -233,9 +223,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact title
    */
   verifyContactTitle(expectedValue: string): this {
-    cy.get(this.contactInfo.contactTitle, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactTitle, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -243,9 +232,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact email
    */
   verifyContactEmail(expectedValue: string): this {
-    cy.get(this.contactInfo.contactEmail, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactEmail, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -253,9 +241,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact phone primary
    */
   verifyContactPhonePrimary(expectedValue: string): this {
-    cy.get(this.contactInfo.contactPhonePrimary, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactPhonePrimary, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -263,9 +250,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify contact phone secondary
    */
   verifyContactPhoneSecondary(expectedValue: string): this {
-    cy.get(this.contactInfo.contactPhoneSecondary, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.contactInfo.contactPhoneSecondary, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -275,10 +261,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify mailing address city
    */
   verifyMailingCity(expectedValue: string): this {
-    cy.get(this.mailingAddress.city, { timeout: this.STANDARD_TIMEOUT }).should(
-      "have.value",
-      expectedValue,
-    );
+    cy.get(this.mailingAddress.city, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -286,9 +270,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify mailing address street 1
    */
   verifyMailingStreet1(expectedValue: string): this {
-    cy.get(this.mailingAddress.street1, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.mailingAddress.street1, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -296,9 +279,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify mailing address postal code
    */
   verifyMailingPostalCode(expectedValue: string): this {
-    cy.get(this.mailingAddress.postalCode, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(this.mailingAddress.postalCode, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -308,9 +290,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Expand Organization Info panel
    */
   expandOrganizationInfoPanel(): this {
-    cy.contains(".card-header", "Organization Info", {
-      timeout: this.STANDARD_TIMEOUT,
-    })
+    cy.contains(".card-header", "Organization Info", { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -320,9 +300,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Expand Contact Info panel
    */
   expandContactInfoPanel(): this {
-    cy.contains(".card-header", "Contact Info", {
-      timeout: this.STANDARD_TIMEOUT,
-    })
+    cy.contains(".card-header", "Contact Info", { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -332,9 +310,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Expand Mailing Address panel
    */
   expandMailingAddressPanel(): this {
-    cy.contains(".card-header", "Mailing Address", {
-      timeout: this.STANDARD_TIMEOUT,
-    })
+    cy.contains(".card-header", "Mailing Address", { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -360,19 +336,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify formio container is loaded
    */
   verifyFormioLoaded(): this {
-    cy.get("body", { timeout: this.STANDARD_TIMEOUT }).should(($body) => {
-      const formioVisible =
-        $body.find(`${this.containers.formioContainer}:visible`).length > 0;
-      const approvalVisible =
-        $body.find(`${this.assessment.approvedAmount}:visible`).length > 0;
-      const assessmentListVisible =
-        $body.find(`${this.assessment.assessmentMainView}:visible`).length > 0;
-
-      expect(
-        formioVisible || approvalVisible || assessmentListVisible,
-        "expected review and assessment content to be visible",
-      ).to.eq(true);
-    });
+    cy.get(this.containers.formioContainer, { timeout: this.STANDARD_TIMEOUT })
+      .should("exist");
     return this;
   }
 
@@ -381,9 +346,7 @@ export class ReviewAssessmentPage extends BasePage {
    */
   getFieldValue(fieldName: string): Cypress.Chainable<string> {
     return cy
-      .get(`input[name="data[${fieldName}]"]`, {
-        timeout: this.STANDARD_TIMEOUT,
-      })
+      .get(`input[name="data[${fieldName}]"]`, { timeout: this.STANDARD_TIMEOUT })
       .invoke("val")
       .then((val) => String(val));
   }
@@ -392,9 +355,8 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify field value by name attribute
    */
   verifyFieldValue(fieldName: string, expectedValue: string): this {
-    cy.get(`input[name="data[${fieldName}]"]`, {
-      timeout: this.STANDARD_TIMEOUT,
-    }).should("have.value", expectedValue);
+    cy.get(`input[name="data[${fieldName}]"]`, { timeout: this.STANDARD_TIMEOUT })
+      .should("have.value", expectedValue);
     return this;
   }
 
@@ -402,9 +364,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Verify select field has expected text (for Choices.js dropdowns)
    */
   verifySelectFieldText(fieldName: string, expectedText: string): this {
-    cy.get(`select[name="data[${fieldName}]"]`, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
+    cy.get(`select[name="data[${fieldName}]"]`, { timeout: this.STANDARD_TIMEOUT })
       .parent()
       .find(".choices__item--selectable")
       .should("contain.text", expectedText);
@@ -418,11 +378,8 @@ export class ReviewAssessmentPage extends BasePage {
    */
   enterApprovedAmount(amount: string): this {
     cy.get(this.assessment.approvedAmount, { timeout: this.STANDARD_TIMEOUT })
-      .scrollIntoView({ block: "center" })
-      .should("exist")
-      .and("not.be.disabled")
-      .clear({ force: true })
-      .type(amount, { force: true });
+      .clear()
+      .type(amount);
     return this;
   }
 
@@ -436,11 +393,8 @@ export class ReviewAssessmentPage extends BasePage {
     const dd = String(now.getDate()).padStart(2, "0");
     const today = `${yyyy}-${mm}-${dd}`;
     cy.get(this.assessment.decisionDate, { timeout: this.STANDARD_TIMEOUT })
-      .scrollIntoView({ block: "center" })
-      .should("exist")
-      .and("not.be.disabled")
-      .clear({ force: true })
-      .type(today, { force: true });
+      .clear()
+      .type(today);
     return this;
   }
 
@@ -449,11 +403,8 @@ export class ReviewAssessmentPage extends BasePage {
    */
   setDecisionDate(date: string): this {
     cy.get(this.assessment.decisionDate, { timeout: this.STANDARD_TIMEOUT })
-      .scrollIntoView({ block: "center" })
-      .should("exist")
-      .and("not.be.disabled")
-      .clear({ force: true })
-      .type(date, { force: true });
+      .clear()
+      .type(date);
     return this;
   }
 
@@ -471,10 +422,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Scroll to Assessment List section
    */
   scrollToAssessmentList(): this {
-    cy.get(this.assessment.assessmentMainView, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
-      .should("be.visible")
+    cy.get(this.assessment.assessmentMainView, { timeout: this.STANDARD_TIMEOUT })
       .scrollIntoView();
     return this;
   }
@@ -483,9 +431,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Click Create Assessment button in Assessment List view
    */
   clickCreateAssessment(): this {
-    cy.get(this.assessment.createAssessmentButton, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
+    cy.get(this.assessment.createAssessmentButton, { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
       .click({ force: true });
     return this;
@@ -495,9 +441,7 @@ export class ReviewAssessmentPage extends BasePage {
    * Click Complete Assessment button in Assessment List view
    */
   clickCompleteAssessment(): this {
-    cy.get(this.assessment.completeAssessmentButton, {
-      timeout: this.STANDARD_TIMEOUT,
-    })
+    cy.get(this.assessment.completeAssessmentButton, { timeout: this.STANDARD_TIMEOUT })
       .should("not.be.disabled")
       .click({ force: true });
     return this;
diff --git a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
index 95e70320cf..5b480b2aab 100644
--- a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
+++ b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
@@ -15,13 +15,11 @@
  * - Post-approval status and date validation on the Payments table
  */
 
-import {
-  ApplicationDetailsPageInstance,
-  ApplicationDetailsRightTabPageInstance,
-  ApplicationsListPageInstance,
-  NavigationPageInstance,
-  ReviewAssessmentPageInstance,
-} from "../utilities/PageFactory";
+import { ApplicationsListPage } from "../pages/ApplicationsListPage";
+import { ApplicationDetailsPage } from "../pages/ApplicationDetailsPage";
+import { ReviewAssessmentPage } from "../pages/ReviewAssessmentPage";
+import { ApplicationDetailsRightTabPage } from "../pages/ApplicationDetailsRightTabPage";
+import { NavigationPage } from "../pages/NavigationPage";
 import { loginIfNeeded } from "../support/auth";
 
 const isProd =
@@ -37,7 +35,6 @@ const TEST_CONFIG = {
   submissionId: null as string | null,
   grantProgram: "Default Grants Program",
   approvedAmount: "5000",
-  assignOwner: "Unity User1",
   supplierNumber: Cypress.env("environment") === "TEST" ? "2002712" : "2009366",
   paymentGroup: "Cheque" as const,
   testComment: "Test comment from automated regression test",
@@ -51,30 +48,13 @@ const TEST_CONFIG = {
   },
 };
 
-const STATUS_ACTIONS = {
-  menuButton: "#ApplicationActionDropdown .dropdown-toggle",
-  menu: "#ApplicationActionDropdown .dropdown-menu",
-  startReview: "#Application_StartReviewButton",
-  completeReview: "#Application_CompleteReviewButton",
-  startAssessment: "#Application_StartAssessmentButton",
-  completeAssessment: "#Application_CompleteAssessmentButton",
-  approve: "#Application_ApproveButton",
-};
-
-const ADJUDICATION_ACTIONS = {
-  completeAssessment: "#AdjudicationTeamLeadActionBar #CompleteButton",
-};
-
-const BREADCRUMB_STATUS_SELECTOR =
-  ".application-details-breadcrumb .application-status";
-
 (isProd ? describe.skip : describe)("Approval Flow Regression Test", () => {
   // Page object instances reused across all tests
-  const listPage = ApplicationsListPageInstance();
-  const detailsPage = ApplicationDetailsPageInstance();
-  const reviewPage = ReviewAssessmentPageInstance();
-  const rightTabPage = ApplicationDetailsRightTabPageInstance();
-  const navPage = NavigationPageInstance();
+  const listPage = new ApplicationsListPage();
+  const detailsPage = new ApplicationDetailsPage();
+  const reviewPage = new ReviewAssessmentPage();
+  const rightTabPage = new ApplicationDetailsRightTabPage();
+  const navPage = new NavigationPage();
 
   // Resolved after "Fetch submission ID from API" — shared across all subsequent tests
   let submissionId: string;
@@ -83,7 +63,6 @@ const BREADCRUMB_STATUS_SELECTOR =
 
   /** Navigate to the Payments tab and filter the table by submissionId. */
   function navigateToPaymentsAndSearch(): void {
-    listPage.waitForNoBlockingOverlay();
     cy.reload();
     navPage.goToPayments();
     cy.location("pathname", { timeout: 20000 }).should("include", "Payment");
@@ -94,245 +73,9 @@ const BREADCRUMB_STATUS_SELECTOR =
     cy.contains("tr", submissionId, { timeout: 20000 }).should("exist");
   }
 
-  function waitForBlockingUiToClear(): void {
-    cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
-    cy.get(".modal.show", { timeout: 20000 }).should("not.exist");
-    cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
-  }
-
-  function openStatusActionsMenu(): void {
-    waitForBlockingUiToClear();
-    detailsPage.dismissErrorModalIfPresent();
-    cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
-      .filter(":visible")
-      .first()
-      .scrollIntoView()
-      .should("be.visible")
-      .and("not.contain.text", "Processing...")
-      .click({ force: true });
-    cy.get(STATUS_ACTIONS.menu, { timeout: 20000 }).should("be.visible");
-  }
-
-  function clickStatusAction(actionSelector: string): void {
-    openStatusActionsMenu();
-    cy.get(actionSelector, { timeout: 20000 })
-      .filter(":visible")
-      .first()
-      .should("be.visible")
-      .and("not.be.disabled")
-      .click({ force: true });
-  }
-
-  function clickStatusActionIfEnabled(
-    actionSelector: string,
-    actionName: string,
-  ): void {
-    openStatusActionsMenu();
-    cy.get(actionSelector, { timeout: 20000 })
-      .filter(":visible")
-      .first()
-      .should("be.visible")
-      .then(($button) => {
-        if ($button.is(":disabled")) {
-          cy.log(`${actionName} is disabled; likely already progressed`);
-          return;
-        }
-
-        cy.wrap($button).click({ force: true });
-        confirmStatusActionIfNeeded();
-      });
-  }
-
-  function confirmStatusActionIfNeeded(): void {
-    cy.wait(500);
-    cy.get("body").then(($body) => {
-      if ($body.find(".swal2-popup .swal2-confirm").length > 0) {
-        cy.get(".swal2-popup .swal2-confirm", { timeout: 20000 })
-          .should("be.visible")
-          .click({ force: true });
-        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
-        return;
-      }
-
-      if (
-        $body.find(".modal.show .modal-content:contains('Confirm Action')")
-          .length > 0
-      ) {
-        cy.get(".modal.show", { timeout: 20000 })
-          .should("be.visible")
-          .within(() => {
-            cy.contains("button", /^Confirm$/i, { timeout: 20000 })
-              .should("be.visible")
-              .click({ force: true });
-          });
-        cy.contains(".modal.show .modal-content", "Confirm Action", {
-          timeout: 20000,
-        }).should("not.exist");
-        cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
-      }
-    });
-  }
-
-  function dismissBlockingModalIfPresent(): void {
-    cy.get("body").then(($body) => {
-      if ($body.find(".swal2-container .swal2-confirm").length > 0) {
-        cy.get(".swal2-container .swal2-confirm", { timeout: 20000 })
-          .should("be.visible")
-          .click({ force: true });
-        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
-      }
-
-      if ($body.find(".modal.show").length > 0) {
-        cy.get(".modal.show", { timeout: 20000 }).should("not.exist");
-        cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
-      }
-    });
-  }
-
-  function selectFirstAvailableOptionByLabel(labelText: string): void {
-    cy.get("body").then(($body) => {
-      if ($body.find(`label:contains('${labelText}'):visible`).length === 0) {
-        cy.log(`Label not found (skip): ${labelText}`);
-        return;
-      }
-
-      cy.contains("label", labelText, { timeout: 10000 })
-        .first()
-        .then(($label) => {
-          const fieldId = ($label.attr("for") || "").trim();
-          if (!fieldId) {
-            cy.log(`No 'for' attribute on label (skip): ${labelText}`);
-            return;
-          }
-
-          const selector = `#${fieldId}`;
-          if ($body.find(selector).length === 0) {
-            cy.log(`Field not found by id (skip): ${selector}`);
-            return;
-          }
-
-          cy.get(selector, { timeout: 10000 }).then(($select) => {
-            const options = $select.find("option").toArray();
-            const candidate = options.find((opt) => {
-              const value = (opt.getAttribute("value") || "").trim();
-              const text = (opt.textContent || "").trim().toLowerCase();
-              return value !== "" && text !== "please choose...";
-            });
-
-            const value = candidate?.getAttribute("value");
-            if (value) {
-              cy.wrap($select).select(value, { force: true });
-            }
-          });
-        });
-    });
-  }
-
-  function populateReviewFieldsRequiredForCompleteReview(): void {
-    detailsPage.goToReviewAssessmentTab();
-
-    reviewPage.verifyFormioLoaded();
-    cy.get("#ApprovalView_ApprovedAmount", { timeout: 30000 })
-      .should("be.visible")
-      .and("not.be.disabled");
-
-    cy.get("body").then(($body) => {
-      if ($body.find("#ApprovalView_ApprovedAmount").length > 0) {
-        reviewPage.enterApprovedAmount(TEST_CONFIG.approvedAmount);
-      } else {
-        cy.log("Approved amount field not present yet; skipping amount entry");
-      }
-
-      if ($body.find("#ApprovalView_FinalDecisionDate").length > 0) {
-        reviewPage.setDecisionDateToToday();
-      } else {
-        cy.log("Decision date field not present yet; skipping date entry");
-      }
-    });
-
-    selectFirstAvailableOptionByLabel("Likelihood of Funding");
-    selectFirstAvailableOptionByLabel("Due Diligence Status");
-    selectFirstAvailableOptionByLabel("Assessment Result");
-    reviewPage.clickSave();
-  }
-
-  function assignSubmissionFromList(ownerName: string): void {
-    dismissBlockingModalIfPresent();
-
-    listPage
-      .waitForNoBlockingOverlay()
-      .selectQuickDateRange("alltime")
-      .waitForTableRefresh()
-      .searchForSubmission(submissionId)
-      .selectRowByText(submissionId);
-
-    cy.get("#assignApplication", { timeout: 20000 })
-      .should("exist")
-      .and("not.have.class", "action-bar-btn-unavailable")
-      .and("be.visible")
-      .click({ force: true });
-
-    cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
-      "be.visible",
-    );
-
-    cy.get("#AssigneeId", { timeout: 20000 })
-      .should("be.visible")
-      .select(ownerName);
-
-    cy.get("#user-tags-input", { timeout: 20000 })
-      .should("be.visible")
-      .clear()
-      .type(ownerName, { delay: 0 });
-
-    cy.get("body").then(($body) => {
-      if (
-        $body.find(".tags-suggestion-container .tags-suggestion-element")
-          .length > 0
-      ) {
-        cy.get(".tags-suggestion-container .tags-suggestion-element", {
-          timeout: 10000,
-        })
-          .contains(ownerName)
-          .click({ force: true });
-      } else {
-        cy.get("#user-tags-input").type("{enter}");
-      }
-    });
-
-    cy.contains(".modal-footer button", "Save", { timeout: 20000 })
-      .should("be.visible")
-      .and("not.be.disabled")
-      .click({ force: true });
-
-    cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
-      "not.exist",
-    );
-    listPage.waitForNoBlockingOverlay();
-  }
-
-  function clickAdjudicationActionIfEnabled(actionSelector: string): void {
-    cy.get("body").then(($body) => {
-      if ($body.find(actionSelector).length > 0) {
-        cy.get(actionSelector, { timeout: 20000 }).then(($button) => {
-          if (!$button.is(":disabled")) {
-            cy.wrap($button).click({ force: true });
-            confirmStatusActionIfNeeded();
-          } else {
-            cy.log(`Action is disabled: ${actionSelector}`);
-          }
-        });
-      } else {
-        cy.log(`Action not present: ${actionSelector}`);
-      }
-    });
-  }
-
   /** Select the submissionId row and open the Approve Payments modal. */
   function selectRowAndOpenApproveModal(): void {
-    waitForBlockingUiToClear();
     cy.contains("tr", submissionId, { timeout: 20000 })
-      .scrollIntoView()
       .find(".checkbox-select")
       .click({ force: true });
     cy.contains("button", "Approve", { timeout: 20000 })
@@ -425,89 +168,54 @@ const BREADCRUMB_STATUS_SELECTOR =
       .searchForSubmission(submissionId);
   });
 
-  it("Assign submission on application list", () => {
-    assignSubmissionFromList(TEST_CONFIG.assignOwner);
-  });
-
   it("Select submission and open details", () => {
-    dismissBlockingModalIfPresent();
-    listPage.waitForNoBlockingOverlay();
-
-    cy.location("pathname", { timeout: 20000 }).then((pathname) => {
-      if (pathname.includes("/GrantApplications/Details")) {
-        cy.log("Already on details page after assignment");
-      } else {
-        listPage
-          .selectQuickDateRange("alltime")
-          .waitForTableRefresh()
-          .searchForSubmission(submissionId)
-          .selectRowByText(submissionId)
-          .clickOpenButton();
-      }
-    });
-
-    cy.get(BREADCRUMB_STATUS_SELECTOR, { timeout: 20000 })
-      .should("be.visible")
-      .invoke("text")
-      .then((statusText) => {
-        const normalized = statusText.trim().toLowerCase();
-        expect(
-          ["submitted", "assigned"],
-          "Expected initial status to be Submitted or Assigned",
-        ).to.include(normalized);
-      });
+    listPage.selectRowByText(submissionId).clickOpenButton();
   });
 
   // ============ Review & Assessment ============
 
-  it("Start review from Status Actions", () => {
-    clickStatusActionIfEnabled(STATUS_ACTIONS.startReview, "Start Review");
-  });
-
-  it("Complete review from Status Actions", () => {
-    populateReviewFieldsRequiredForCompleteReview();
-    clickStatusActionIfEnabled(
-      STATUS_ACTIONS.completeReview,
-      "Complete Review",
-    );
-  });
-
-  it("Start assessment from Status Actions", () => {
-    clickStatusActionIfEnabled(
-      STATUS_ACTIONS.startAssessment,
-      "Start Assessment",
-    );
-  });
-
   it("Navigate to Review and Assessment tab", () => {
     detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
   });
 
-  it("Create assessment", () => {
+  it("Enter approval details and save", () => {
+    reviewPage
+      .verifyFormioLoaded()
+      .enterApprovedAmount(TEST_CONFIG.approvedAmount)
+      .setDecisionDateToToday()
+      .clickSave();
+  });
+
+  it("Create and complete assessment", () => {
     cy.wait(2000); // Allow assessment section to fully load
     reviewPage.scrollToAssessmentList();
 
     cy.get("body").then(($body) => {
       if ($body.find("#CreateButton").length > 0) {
         cy.get("#CreateButton").click({ force: true });
-        // Give the new assessment row time to render before subsequent actions.
-        cy.wait(1000); // Needed because row creation animation can delay DOM readiness.
+        cy.wait(1000);
       } else {
         cy.log("Create Assessment button not found - may already be created");
       }
     });
-  });
 
-  it("Complete assessment from adjudication action bar", () => {
-    clickAdjudicationActionIfEnabled(ADJUDICATION_ACTIONS.completeAssessment);
+    cy.get("body").then(($body) => {
+      if ($body.find("#CompleteButton").length > 0) {
+        cy.get("#CompleteButton").click({ force: true });
+        cy.wait(1000);
+      } else {
+        cy.log(
+          "Complete Assessment button not found - may already be completed",
+        );
+      }
+    });
   });
 
   // ============ Payment Info ============
 
   it("Configure payment info", () => {
     cy.reload(); // Reload to get fresh data and avoid concurrency issues
-    // Wait briefly for async payment tab dependencies to stabilize after reload.
-    cy.wait(2000); // Prevents save attempts before payment controls are initialized.
+    cy.wait(2000);
     detailsPage
       .goToPaymentInfoTab()
       .enterSupplierNumber(TEST_CONFIG.supplierNumber)
@@ -561,31 +269,12 @@ const BREADCRUMB_STATUS_SELECTOR =
     });
   });
 
-  it("Enter approval details and save", () => {
-    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
-    reviewPage
-      .verifyFormioLoaded()
-      .enterApprovedAmount(TEST_CONFIG.approvedAmount)
-      .setDecisionDateToToday()
-      .clickSave();
-  });
-
   // ============ Application Approval ============
 
   it("Test approval workflow (confirm)", () => {
     cy.reload(); // Refresh to ensure all changes are reflected before approval
     detailsPage.dismissErrorModalIfPresent();
-    clickStatusAction(STATUS_ACTIONS.completeAssessment);
-    confirmStatusActionIfNeeded();
-
-    cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
-      .filter(":visible")
-      .first()
-      .should("be.visible")
-      .and("not.contain.text", "Processing...");
-
-    clickStatusAction(STATUS_ACTIONS.approve);
-    detailsPage.waitForConfirmModal().clickConfirm();
+    detailsPage.clickApprove().waitForConfirmModal().clickConfirm();
   });
 
   // ============ Post-Approval Verification ============
@@ -611,10 +300,7 @@ const BREADCRUMB_STATUS_SELECTOR =
   // ============ Payment Request ============
 
   it("Select approved application and submit payment request", () => {
-    listPage
-      .waitForNoBlockingOverlay()
-      .selectRowByText(submissionId)
-      .clickPaymentButtonWithWait();
+    listPage.selectRowByText(submissionId).clickPaymentButtonWithWait();
     listPage.waitForPaymentModalVisible();
 
     // Description field has a max length of 40 chars
@@ -631,7 +317,7 @@ const BREADCRUMB_STATUS_SELECTOR =
       .and("not.be.disabled")
       .click();
 
-    listPage.verifyPaymentModalClosed();
+    cy.get("#payment-modal", { timeout: 20000 }).should("not.be.visible");
     cy.log(`✅ Payment request submitted: ${paymentDescription}`);
   });
 
diff --git a/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts b/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts
index f9be869c3d..404764e56a 100644
--- a/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts
+++ b/applications/Unity.AutoUI/cypress/utilities/PageFactory.ts
@@ -6,9 +6,6 @@ import { LoginPage } from "../pages/LoginPage";
 import { NavigationPage } from "../pages/NavigationPage";
 import { DashboardPage } from "../pages/DashboardPage";
 import { ApplicationDetailsPage } from "../pages/ApplicationDetailsPage";
-import { ApplicationsListPage } from "../pages/ApplicationsListPage";
-import { ReviewAssessmentPage } from "../pages/ReviewAssessmentPage";
-import { ApplicationDetailsRightTabPage } from "../pages/ApplicationDetailsRightTabPage";
 import {
   ApplicationsPage,
   RolesPage,
@@ -55,37 +52,7 @@ export class PageFactory {
   static getApplicationDetailsPage(): ApplicationDetailsPage {
     return this.getInstance(
       "ApplicationDetailsPage",
-      () => new ApplicationDetailsPage(),
-    );
-  }
-
-  /**
-   * Get or create ApplicationsListPage instance
-   */
-  static getApplicationsListPage(): ApplicationsListPage {
-    return this.getInstance(
-      "ApplicationsListPage",
-      () => new ApplicationsListPage(),
-    );
-  }
-
-  /**
-   * Get or create ReviewAssessmentPage instance
-   */
-  static getReviewAssessmentPage(): ReviewAssessmentPage {
-    return this.getInstance(
-      "ReviewAssessmentPage",
-      () => new ReviewAssessmentPage(),
-    );
-  }
-
-  /**
-   * Get or create ApplicationDetailsRightTabPage instance
-   */
-  static getApplicationDetailsRightTabPage(): ApplicationDetailsRightTabPage {
-    return this.getInstance(
-      "ApplicationDetailsRightTabPage",
-      () => new ApplicationDetailsRightTabPage(),
+      () => new ApplicationDetailsPage()
     );
   }
 
@@ -158,12 +125,6 @@ export const DashboardPageInstance = () => PageFactory.getDashboardPage();
 export const ApplicationsPageInstance = () => PageFactory.getApplicationsPage();
 export const ApplicationDetailsPageInstance = () =>
   PageFactory.getApplicationDetailsPage();
-export const ApplicationsListPageInstance = () =>
-  PageFactory.getApplicationsListPage();
-export const ReviewAssessmentPageInstance = () =>
-  PageFactory.getReviewAssessmentPage();
-export const ApplicationDetailsRightTabPageInstance = () =>
-  PageFactory.getApplicationDetailsRightTabPage();
 export const RolesPageInstance = () => PageFactory.getRolesPage();
 export const UsersPageInstance = () => PageFactory.getUsersPage();
 export const IntakesPageInstance = () => PageFactory.getIntakesPage();
diff --git a/applications/Unity.AutoUI/cypress/utilities/index.ts b/applications/Unity.AutoUI/cypress/utilities/index.ts
index 7b897bd9da..9b53890069 100644
--- a/applications/Unity.AutoUI/cypress/utilities/index.ts
+++ b/applications/Unity.AutoUI/cypress/utilities/index.ts
@@ -26,9 +26,6 @@ export {
   DashboardPageInstance,
   ApplicationsPageInstance,
   ApplicationDetailsPageInstance,
-  ApplicationsListPageInstance,
-  ReviewAssessmentPageInstance,
-  ApplicationDetailsRightTabPageInstance,
   RolesPageInstance,
   UsersPageInstance,
   IntakesPageInstance,

From ad76e01402794a626d6c8da62f1a2c807df38c99 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 15 Apr 2026 15:54:21 -0700
Subject: [PATCH 27/45] AB#32299 split OpenAI service responsibilities

---
 .../AI/Runtime/IOpenAIPromptRenderer.cs       |  24 +
 .../AI/Runtime/IOpenAIResponseParser.cs       |  10 +
 .../AI/Runtime/IOpenAITransportService.cs     |  16 +
 .../AI/Runtime/OpenAIPromptRenderer.cs        | 378 +++++++++
 .../AI/Runtime/OpenAIResponseParser.cs        | 285 +++++++
 .../AI/Runtime/OpenAIRuntimeService.cs        | 735 +-----------------
 .../AI/Runtime/OpenAITransportService.cs      | 372 +++++++++
 7 files changed, 1112 insertions(+), 708 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
new file mode 100644
index 0000000000..94b96a6031
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Unity.AI.Runtime;
+
+internal interface IOpenAIPromptRenderer
+{
+    string ResolvePromptVersion(string? version);
+
+    string BuildApplicationAnalysisSystemPrompt(string version);
+
+    string BuildApplicationAnalysisUserPrompt(string version, string schema, string data, string attachments);
+
+    string BuildAttachmentSummarySystemPrompt(string version);
+
+    string BuildAttachmentSummaryUserPrompt(string version, string attachment);
+
+    string BuildApplicationScoringSystemPrompt(string version);
+
+    string BuildApplicationScoringUserPrompt(string version, string data, string attachments, string section, string response);
+
+    string BuildApplicationScoringResponseTemplate(string sectionPayloadJson);
+
+    string BuildAliasedApplicationScoringSection(string? sectionName, string sectionJson, out IReadOnlyDictionary<string, string> questionIdAliasMap);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
new file mode 100644
index 0000000000..5367dc7e28
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Unity.AI.Responses;
+
+namespace Unity.AI.Runtime;
+
+internal interface IOpenAIResponseParser
+{
+    ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw);
+    ApplicationScoringResponse ParseApplicationScoringResponse(string raw, IReadOnlyDictionary<string, string>? questionIdAliasMap = null);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
new file mode 100644
index 0000000000..28827dad22
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Unity.AI.Models;
+
+namespace Unity.AI.Runtime;
+
+internal interface IOpenAITransportService
+{
+    Task<AIOperationResult> GenerateSummaryAsync(
+        string content,
+        string? systemPrompt,
+        int maxTokens = 150,
+        double? temperature = null,
+        string? operationName = null,
+        string? promptVersion = null,
+        string? fileName = null);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
new file mode 100644
index 0000000000..f6eb8ed223
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
@@ -0,0 +1,378 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Concurrent;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+internal class OpenAIPromptRenderer : IOpenAIPromptRenderer, ITransientDependency
+{
+    private const string PromptVersionV0 = "v0";
+    private const string PromptVersionV1 = "v1";
+    private static readonly string PromptTemplatesFolder = Path.Combine("AI", "Prompts", "Versions");
+    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 static readonly Dictionary<string, string> PromptProfiles =
+        new(StringComparer.OrdinalIgnoreCase)
+        {
+            [PromptVersionV0] = PromptVersionV0,
+            [PromptVersionV1] = PromptVersionV1
+        };
+    private static readonly ConcurrentDictionary<string, string> PromptTemplateCache = new(StringComparer.OrdinalIgnoreCase);
+    private static readonly JsonSerializerOptions JsonLogOptions = new() { WriteIndented = true };
+
+    public string BuildApplicationAnalysisSystemPrompt(string version)
+    {
+        return GetRequiredPromptTemplate(version, ApplicationAnalysisSystemTemplateName);
+    }
+
+    public string BuildApplicationAnalysisUserPrompt(string version, string schema, string data, string attachments)
+    {
+        var replacements = new Dictionary<string, string>
+        {
+            ["SCHEMA"] = schema,
+            ["DATA"] = data,
+            ["ATTACHMENTS"] = attachments
+        };
+
+        return RenderPromptTemplate(version, ApplicationAnalysisUserTemplateName, replacements);
+    }
+
+    public string BuildAttachmentSummarySystemPrompt(string version)
+    {
+        return GetRequiredPromptTemplate(version, AttachmentSummarySystemTemplateName);
+    }
+
+    public string BuildAttachmentSummaryUserPrompt(string version, string attachment)
+    {
+        return RenderPromptTemplate(version, AttachmentSummaryUserTemplateName, new Dictionary<string, string>
+        {
+            ["ATTACHMENT"] = attachment
+        });
+    }
+
+    public string BuildApplicationScoringSystemPrompt(string version)
+    {
+        return GetRequiredPromptTemplate(version, ApplicationScoringSystemTemplateName);
+    }
+
+    public string BuildApplicationScoringUserPrompt(string version, string data, string attachments, string section, string response)
+    {
+        return RenderPromptTemplate(version, ApplicationScoringUserTemplateName, new Dictionary<string, string>
+        {
+            ["DATA"] = data,
+            ["ATTACHMENTS"] = attachments,
+            ["SECTION"] = section,
+            ["RESPONSE"] = response
+        });
+    }
+
+    public string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
+    {
+        try
+        {
+            using var doc = JsonDocument.Parse(sectionPayloadJson);
+            if (!doc.RootElement.TryGetProperty("questions", out var questions) || questions.ValueKind != JsonValueKind.Array)
+            {
+                return "{}";
+            }
+
+            var template = new Dictionary<string, object>();
+            foreach (var question in questions.EnumerateArray())
+            {
+                if (!question.TryGetProperty("id", out var idProp) || idProp.ValueKind != JsonValueKind.String)
+                {
+                    continue;
+                }
+
+                var questionId = idProp.GetString();
+                if (string.IsNullOrWhiteSpace(questionId))
+                {
+                    continue;
+                }
+
+                template[questionId] = new
+                {
+                    answer = string.Empty,
+                    rationale = string.Empty,
+                    confidence = 0
+                };
+            }
+
+            if (template.Count == 0)
+            {
+                return "{}";
+            }
+
+            return JsonSerializer.Serialize(template, JsonLogOptions);
+        }
+        catch (JsonException)
+        {
+            return "{}";
+        }
+    }
+
+    public string BuildAliasedApplicationScoringSection(string? sectionName, string sectionJson, out IReadOnlyDictionary<string, string> questionIdAliasMap)
+    {
+        questionIdAliasMap = new Dictionary<string, string>(StringComparer.Ordinal);
+
+        if (string.IsNullOrWhiteSpace(sectionJson))
+        {
+            return JsonSerializer.Serialize(new { name = sectionName, questions = sectionJson }, JsonLogOptions);
+        }
+
+        try
+        {
+            using var sectionDoc = JsonDocument.Parse(sectionJson);
+            if (sectionDoc.RootElement.ValueKind != JsonValueKind.Array)
+            {
+                return JsonSerializer.Serialize(new { name = sectionName, questions = sectionDoc.RootElement.Clone() }, JsonLogOptions);
+            }
+
+            var aliasedQuestions = new List<Dictionary<string, object?>>();
+            var aliasMap = new Dictionary<string, string>(StringComparer.Ordinal);
+            var index = 1;
+
+            foreach (var question in sectionDoc.RootElement.EnumerateArray())
+            {
+                if (question.ValueKind != JsonValueKind.Object)
+                {
+                    continue;
+                }
+
+                var aliasedQuestion = new Dictionary<string, object?>(StringComparer.Ordinal);
+                string? questionAlias = null;
+
+                foreach (var property in question.EnumerateObject())
+                {
+                    if (property.NameEquals("id") && property.Value.ValueKind == JsonValueKind.String)
+                    {
+                        var originalQuestionId = property.Value.GetString();
+                        if (!string.IsNullOrWhiteSpace(originalQuestionId))
+                        {
+                            questionAlias = $"q{index++}";
+                            aliasMap[questionAlias] = originalQuestionId;
+                            aliasedQuestion[property.Name] = questionAlias;
+                            continue;
+                        }
+                    }
+
+                    aliasedQuestion[property.Name] = property.Value.Clone();
+                }
+
+                if (!string.IsNullOrWhiteSpace(questionAlias))
+                {
+                    aliasedQuestions.Add(aliasedQuestion);
+                }
+            }
+
+            questionIdAliasMap = aliasMap;
+            return JsonSerializer.Serialize(new { name = sectionName, questions = aliasedQuestions }, JsonLogOptions);
+        }
+        catch (JsonException)
+        {
+            return JsonSerializer.Serialize(new { name = sectionName, questions = sectionJson }, JsonLogOptions);
+        }
+    }
+
+    public string ResolvePromptVersion(string? version)
+    {
+        if (!string.IsNullOrWhiteSpace(version) &&
+            PromptProfiles.TryGetValue(version.Trim(), out var selectedVersion))
+        {
+            return selectedVersion;
+        }
+
+        return PromptVersionV1;
+    }
+
+    private static bool TryGetPromptTemplate(string version, string templateName, out string template)
+    {
+        template = string.Empty;
+        var cacheKey = $"{version}/{templateName}";
+        if (PromptTemplateCache.TryGetValue(cacheKey, out var cachedTemplate))
+        {
+            template = cachedTemplate;
+            return true;
+        }
+
+        var path = Path.Combine(AppContext.BaseDirectory, PromptTemplatesFolder, version, $"{templateName}.txt");
+        if (!File.Exists(path))
+        {
+            return false;
+        }
+
+        var loaded = PromptTemplateCache.GetOrAdd(cacheKey, _ => File.ReadAllText(path));
+        if (string.IsNullOrWhiteSpace(loaded))
+        {
+            return false;
+        }
+
+        template = loaded;
+        return true;
+    }
+
+    private static string GetRequiredPromptTemplate(string version, string templateName)
+    {
+        if (TryGetPromptTemplate(version, templateName, out var template))
+        {
+            return template;
+        }
+
+        throw new InvalidOperationException(
+            $"Missing required prompt template '{templateName}.txt' for prompt version '{version}'.");
+    }
+
+    private static string RenderPromptTemplate(
+        string version,
+        string templateName,
+        IReadOnlyDictionary<string, string> runtimeReplacements)
+    {
+        return RenderPromptTemplateInternal(
+            version,
+            templateName,
+            runtimeReplacements,
+            new HashSet<string>(StringComparer.OrdinalIgnoreCase));
+    }
+
+    private static string RenderPromptTemplateInternal(
+        string version,
+        string templateName,
+        IReadOnlyDictionary<string, string> runtimeReplacements,
+        ISet<string> resolutionStack)
+    {
+        if (!resolutionStack.Add(templateName))
+        {
+            throw new InvalidOperationException(
+                $"Detected cyclic prompt fragment reference while resolving '{templateName}.txt' for prompt version '{version}'.");
+        }
+
+        var template = GetRequiredPromptTemplate(version, templateName);
+        var replacements = new Dictionary<string, string>(runtimeReplacements, StringComparer.Ordinal);
+        var baseTemplateName = GetTemplateBaseName(templateName);
+
+        foreach (var placeholder in GetTemplatePlaceholders(template))
+        {
+            if (replacements.ContainsKey(placeholder))
+            {
+                continue;
+            }
+
+            var fragmentTemplateName = ResolveFragmentTemplateName(version, baseTemplateName, placeholder);
+            if (!string.IsNullOrWhiteSpace(fragmentTemplateName))
+            {
+                replacements[placeholder] = RenderPromptTemplateInternal(
+                    version,
+                    fragmentTemplateName,
+                    new Dictionary<string, string>(StringComparer.Ordinal),
+                    resolutionStack).TrimEnd();
+            }
+        }
+
+        var rendered = template;
+        foreach (var replacement in replacements)
+        {
+            rendered = rendered.Replace($"{{{{{replacement.Key}}}}}", replacement.Value ?? string.Empty, StringComparison.Ordinal);
+        }
+
+        var unresolved = GetTemplatePlaceholders(rendered);
+        if (unresolved.Count > 0)
+        {
+            throw new InvalidOperationException(
+                $"Unresolved prompt placeholders in '{templateName}.txt' for prompt version '{version}': {string.Join(", ", unresolved.OrderBy(item => item))}");
+        }
+
+        resolutionStack.Remove(templateName);
+        return rendered;
+    }
+
+    private static string? ResolveFragmentTemplateName(string version, string baseTemplateName, string placeholderName)
+    {
+        var normalizedPlaceholder = placeholderName.ToLowerInvariant();
+        var baseScopedCandidate = $"{baseTemplateName}.{normalizedPlaceholder}";
+        if (TryGetPromptTemplate(version, baseScopedCandidate, out _))
+        {
+            return baseScopedCandidate;
+        }
+
+        if (string.Equals(placeholderName, "RESPONSE", StringComparison.Ordinal))
+        {
+            var outputCandidate = $"{baseTemplateName}.output";
+            if (TryGetPromptTemplate(version, outputCandidate, out _))
+            {
+                return outputCandidate;
+            }
+        }
+
+        if (TryResolveCommonTemplateName(placeholderName, out var commonTemplateName) &&
+            TryGetPromptTemplate(version, commonTemplateName, out _))
+        {
+            return commonTemplateName;
+        }
+
+        return null;
+    }
+
+    private static bool TryResolveCommonTemplateName(string placeholderName, out string commonTemplateName)
+    {
+        commonTemplateName = string.Empty;
+        if (!placeholderName.StartsWith("COMMON_", StringComparison.Ordinal))
+        {
+            return false;
+        }
+
+        var suffix = placeholderName.Substring("COMMON_".Length).ToLowerInvariant();
+        suffix = suffix.Replace('_', '.');
+        commonTemplateName = $"common.{suffix}";
+        return true;
+    }
+
+    private static string GetTemplateBaseName(string templateName)
+    {
+        var separatorIndex = templateName.IndexOf('.', StringComparison.Ordinal);
+        if (separatorIndex <= 0)
+        {
+            return templateName;
+        }
+
+        return templateName.Substring(0, separatorIndex);
+    }
+
+    private static HashSet<string> GetTemplatePlaceholders(string template)
+    {
+        var placeholders = new HashSet<string>(StringComparer.Ordinal);
+        var searchIndex = 0;
+
+        while (searchIndex < template.Length)
+        {
+            var start = template.IndexOf("{{", searchIndex, StringComparison.Ordinal);
+            if (start < 0)
+            {
+                break;
+            }
+
+            var end = template.IndexOf("}}", start + 2, StringComparison.Ordinal);
+            if (end < 0)
+            {
+                break;
+            }
+
+            var placeholder = template.Substring(start + 2, end - start - 2).Trim();
+            if (!string.IsNullOrWhiteSpace(placeholder))
+            {
+                placeholders.Add(placeholder);
+            }
+
+            searchIndex = end + 2;
+        }
+
+        return placeholders;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
new file mode 100644
index 0000000000..ea36c4af2c
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
@@ -0,0 +1,285 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using Unity.AI.Models;
+using Unity.AI.Responses;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+internal class OpenAIResponseParser : IOpenAIResponseParser, ITransientDependency
+{
+    public ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
+    {
+        var response = new ApplicationAnalysisResponse();
+        if (!TryParseJsonObjectFromResponse(AddIdsToAnalysisItems(raw), out var root))
+        {
+            return response;
+        }
+
+        if (TryGetStringProperty(root, AIJsonKeys.Rating, out var rating))
+        {
+            response.Rating = rating;
+        }
+
+        if (TryGetStringProperty(root, AIJsonKeys.Comments, out var comments))
+        {
+            response.Comments = comments;
+        }
+
+        if (TryGetArrayProperty(root, AIJsonKeys.Finding, out var findingsArray))
+        {
+            response.Findings = ParseFindings(findingsArray).ToList();
+        }
+
+        if (TryGetObjectProperty(root, AIJsonKeys.Recommendation, out var recommendation))
+        {
+            response.Recommendation = ParseRecommendation(recommendation);
+        }
+
+        return response;
+    }
+
+    private static string AddIdsToAnalysisItems(string analysisJson)
+    {
+        try
+        {
+            using var jsonDoc = JsonDocument.Parse(analysisJson);
+            using var memoryStream = new System.IO.MemoryStream();
+            using (var writer = new Utf8JsonWriter(memoryStream, new JsonWriterOptions { Indented = true }))
+            {
+                writer.WriteStartObject();
+
+                foreach (var property in jsonDoc.RootElement.EnumerateObject())
+                {
+                    var outputPropertyName = property.Name;
+
+                    if (outputPropertyName == AIJsonKeys.Errors ||
+                        outputPropertyName == AIJsonKeys.Warnings ||
+                        outputPropertyName == AIJsonKeys.Summaries ||
+                        outputPropertyName == AIJsonKeys.NextSteps)
+                    {
+                        writer.WritePropertyName(outputPropertyName);
+                        writer.WriteStartArray();
+
+                        foreach (var item in property.Value.EnumerateArray())
+                        {
+                            writer.WriteStartObject();
+
+                            foreach (var itemProperty in item.EnumerateObject())
+                            {
+                                itemProperty.WriteTo(writer);
+                            }
+
+                            if (!item.TryGetProperty(AIJsonKeys.Id, out var idProp) ||
+                                idProp.ValueKind != JsonValueKind.String ||
+                                string.IsNullOrWhiteSpace(idProp.GetString()))
+                            {
+                                writer.WriteString(AIJsonKeys.Id, Guid.NewGuid().ToString());
+                            }
+
+                            writer.WriteEndObject();
+                        }
+
+                        writer.WriteEndArray();
+                        continue;
+                    }
+
+                    property.WriteTo(writer);
+                }
+
+                writer.WriteEndObject();
+                writer.Flush();
+            }
+
+            return Encoding.UTF8.GetString(memoryStream.ToArray());
+        }
+        catch
+        {
+            return analysisJson;
+        }
+    }
+
+    public ApplicationScoringResponse ParseApplicationScoringResponse(string raw, IReadOnlyDictionary<string, string>? questionIdAliasMap = null)
+    {
+        var response = new ApplicationScoringResponse();
+        if (!TryParseJsonObjectFromResponse(raw, out var root))
+        {
+            return response;
+        }
+
+        foreach (var property in root.EnumerateObject())
+        {
+            if (property.Value.ValueKind != JsonValueKind.Object)
+            {
+                continue;
+            }
+
+            var answer = property.Value.TryGetProperty("answer", out var answerProp)
+                ? answerProp.Clone()
+                : default;
+            var rationale = property.Value.TryGetProperty("rationale", out var rationaleProp) &&
+                            rationaleProp.ValueKind == JsonValueKind.String
+                ? rationaleProp.GetString() ?? string.Empty
+                : string.Empty;
+            var confidence = property.Value.TryGetProperty("confidence", out var confidenceProp) &&
+                             confidenceProp.ValueKind == JsonValueKind.Number &&
+                             confidenceProp.TryGetInt32(out var parsedConfidence)
+                ? NormalizeConfidence(parsedConfidence)
+                : 0;
+
+            var questionId = questionIdAliasMap != null &&
+                             questionIdAliasMap.TryGetValue(property.Name, out var originalQuestionId)
+                ? originalQuestionId
+                : property.Name;
+
+            response.Answers[questionId] = new ApplicationScoringAnswer
+            {
+                Answer = answer,
+                Rationale = rationale,
+                Confidence = confidence
+            };
+        }
+
+        return response;
+    }
+
+    private static IEnumerable<ApplicationAnalysisFinding> ParseFindings(JsonElement findingsArray)
+    {
+        foreach (var item in findingsArray.EnumerateArray())
+        {
+            if (item.ValueKind != JsonValueKind.Object)
+            {
+                continue;
+            }
+
+            var id = Guid.NewGuid().ToString();
+            if (item.TryGetProperty(AIJsonKeys.Id, out var idProp) && idProp.ValueKind == JsonValueKind.String)
+            {
+                id = idProp.GetString() ?? id;
+            }
+
+            var hidden = item.TryGetProperty(AIJsonKeys.Hidden, out var hiddenProp) &&
+                (hiddenProp.ValueKind == JsonValueKind.True || hiddenProp.ValueKind == JsonValueKind.False) &&
+                hiddenProp.GetBoolean();
+            string? title = null;
+            if (item.TryGetProperty(AIJsonKeys.Title, out var titleProp) && titleProp.ValueKind == JsonValueKind.String)
+            {
+                title = titleProp.GetString();
+            }
+
+            string? detail = null;
+            if (item.TryGetProperty(AIJsonKeys.Detail, out var detailProp) && detailProp.ValueKind == JsonValueKind.String)
+            {
+                detail = detailProp.GetString();
+            }
+
+            yield return new ApplicationAnalysisFinding
+            {
+                Id = id,
+                Hidden = hidden,
+                Title = title,
+                Detail = detail
+            };
+        }
+    }
+
+    private static ApplicationAnalysisRecommendation? ParseRecommendation(JsonElement recommendation)
+    {
+        string? decision = null;
+        if (recommendation.TryGetProperty(AIJsonKeys.Decision, out var decisionProp) &&
+            decisionProp.ValueKind == JsonValueKind.String)
+        {
+            decision = decisionProp.GetString();
+        }
+
+        string? rationale = null;
+        if (recommendation.TryGetProperty(AIJsonKeys.Rationale, out var rationaleProp) &&
+            rationaleProp.ValueKind == JsonValueKind.String)
+        {
+            rationale = rationaleProp.GetString();
+        }
+
+        if (string.IsNullOrWhiteSpace(decision) && string.IsNullOrWhiteSpace(rationale))
+        {
+            return null;
+        }
+
+        return new ApplicationAnalysisRecommendation
+        {
+            Decision = decision,
+            Rationale = rationale
+        };
+    }
+
+    private static bool TryParseJsonObjectFromResponse(string response, out JsonElement objectElement)
+    {
+        objectElement = default;
+        var cleaned = AIResponseJson.CleanJsonResponse(response);
+        if (string.IsNullOrWhiteSpace(cleaned))
+        {
+            return false;
+        }
+
+        try
+        {
+            using var doc = JsonDocument.Parse(cleaned);
+            if (doc.RootElement.ValueKind != JsonValueKind.Object)
+            {
+                return false;
+            }
+
+            objectElement = doc.RootElement.Clone();
+            return true;
+        }
+        catch (JsonException)
+        {
+            return false;
+        }
+    }
+
+    private static bool TryGetStringProperty(JsonElement element, string propertyName, out string value)
+    {
+        value = string.Empty;
+        if (!element.TryGetProperty(propertyName, out var prop) || prop.ValueKind != JsonValueKind.String)
+        {
+            return false;
+        }
+
+        value = prop.GetString() ?? string.Empty;
+        return true;
+    }
+
+    private static bool TryGetArrayProperty(JsonElement element, string propertyName, out JsonElement value)
+    {
+        value = default;
+        if (!element.TryGetProperty(propertyName, out var prop) || prop.ValueKind != JsonValueKind.Array)
+        {
+            return false;
+        }
+
+        value = prop.Clone();
+        return true;
+    }
+
+    private static bool TryGetObjectProperty(JsonElement element, string propertyName, out JsonElement value)
+    {
+        value = default;
+        if (!element.TryGetProperty(propertyName, out var prop) || prop.ValueKind != JsonValueKind.Object)
+        {
+            return false;
+        }
+
+        value = prop.Clone();
+        return true;
+    }
+
+    private static int NormalizeConfidence(int confidence)
+    {
+        var clamped = Math.Clamp(confidence, 0, 100);
+        var rounded = (int)Math.Round(clamped / 5.0, MidpointRounding.AwayFromZero) * 5;
+        return Math.Clamp(rounded, 0, 100);
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index 1a81024e9c..74f2cd50c3 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -28,6 +28,9 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly IConfiguration _configuration;
         private readonly ILogger<OpenAIRuntimeService> _logger;
         private readonly ITextExtractionService _textExtractionService;
+        private readonly IOpenAITransportService _openAITransportService;
+        private readonly IOpenAIResponseParser _openAIResponseParser;
+        private readonly IOpenAIPromptRenderer _openAIPromptRenderer;
         private readonly ICurrentTenant _currentTenant;
         private readonly IHostEnvironment _hostEnvironment;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
@@ -82,6 +85,9 @@ public OpenAIRuntimeService(
             IConfiguration configuration,
             ILogger<OpenAIRuntimeService> logger,
             ITextExtractionService textExtractionService,
+            IOpenAITransportService openAITransportService,
+            IOpenAIResponseParser openAIResponseParser,
+            IOpenAIPromptRenderer openAIPromptRenderer,
             ICurrentTenant currentTenant,
             IHostEnvironment hostEnvironment)
         {
@@ -89,6 +95,9 @@ public OpenAIRuntimeService(
             _configuration = configuration;
             _logger = logger;
             _textExtractionService = textExtractionService;
+            _openAITransportService = openAITransportService;
+            _openAIResponseParser = openAIResponseParser;
+            _openAIPromptRenderer = openAIPromptRenderer;
             _currentTenant = currentTenant;
             _hostEnvironment = hostEnvironment;
         }
@@ -107,7 +116,7 @@ public Task<bool> IsAvailableAsync()
         public async Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequest request)
         {
             var result = await GenerateWithRetryAsync(
-                () => GenerateSummaryAsync(
+                () => _openAITransportService.GenerateSummaryAsync(
                 request?.UserPrompt ?? string.Empty,
                 null,
                 request?.MaxTokens ?? DefaultCompletionTokens,
@@ -120,7 +129,7 @@ public async Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequ
         public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request)
         {
             ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationAnalysisPromptType));
+            var promptVersion = _openAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationAnalysisPromptType));
             var data = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var schema = JsonSerializer.Serialize(request.Schema, JsonLogOptions);
 
@@ -133,15 +142,15 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 .Cast<object>();
 
             var attachments = JsonSerializer.Serialize(attachmentsPayload, JsonLogOptions);
-            var systemPrompt = BuildApplicationAnalysisSystemPrompt(promptVersion);
-            var applicationAnalysisContent = BuildApplicationAnalysisUserPrompt(
+            var systemPrompt = _openAIPromptRenderer.BuildApplicationAnalysisSystemPrompt(promptVersion);
+            var applicationAnalysisContent = _openAIPromptRenderer.BuildApplicationAnalysisUserPrompt(
                 promptVersion,
                 schema,
                 data,
                 attachments);
             await LogPromptInputAsync(ApplicationAnalysisPromptType, promptVersion, systemPrompt, applicationAnalysisContent);
             var result = await GenerateWithRetryAsync(
-                () => GenerateSummaryAsync(
+                () => _openAITransportService.GenerateSummaryAsync(
                     applicationAnalysisContent,
                     systemPrompt,
                     ApplicationAnalysisCompletionTokens,
@@ -156,124 +165,7 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 return new ApplicationAnalysisResponse();
             }
 
-            return ParseApplicationAnalysisResponse(AddIdsToAnalysisItems(result.Content));
-        }
-
-        private async Task<AIOperationResult> GenerateSummaryAsync(
-            string content,
-            string? systemPrompt,
-            int maxTokens = 150,
-            double? temperature = null,
-            string? operationName = null,
-            string? promptVersion = null,
-            string? fileName = null)
-        {
-            var providerName = ResolveProviderName(operationName);
-            if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
-            {
-                _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 AIProviderResult(MissingApiKeyMessage));
-            }
-
-            _logger.LogDebug("Calling OpenAI chat completions. PromptLength: {PromptLength}, MaxTokens: {MaxTokens}", content?.Length ?? 0, maxTokens);
-
-            try
-            {
-                var resolvedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt)
-                    ? "You are a professional grant analyst for the BC Government."
-                    : systemPrompt;
-                var userPrompt = content ?? string.Empty;
-
-                var requestBody = new
-                {
-                    messages = new[]
-                    {
-                       new { role = "system", content = resolvedSystemPrompt },
-                       new { role = "user", content = userPrompt }
-                   }
-                };
-
-                var requestPayload = new Dictionary<string, object?>
-                {
-                    ["messages"] = requestBody.messages,
-                    [ResolveMaxTokensParameterNameForOperation(operationName)] = maxTokens
-                };
-
-                var resolvedTemperature = temperature ?? ResolveConfiguredTemperature(operationName);
-                if (resolvedTemperature.HasValue)
-                {
-                    requestPayload["temperature"] = resolvedTemperature.Value;
-                }
-
-                var json = JsonSerializer.Serialize(requestPayload);
-                var httpContent = new StringContent(json, Encoding.UTF8, "application/json");
-
-                _httpClient.DefaultRequestHeaders.Clear();
-                _httpClient.DefaultRequestHeaders.Add("Authorization", apiKey);
-
-                var response = await _httpClient.PostAsync(ResolveApiUrl(operationName), httpContent);
-                var responseContent = await response.Content.ReadAsStringAsync();
-                var metadata = TryExtractProviderMetadata(responseContent);
-                var providerResponse = BuildProviderResponseFromMetadata(
-                    string.Empty,
-                    responseContent,
-                    metadata,
-                    (int)response.StatusCode);
-
-                _logger.LogDebug(
-                    "OpenAI chat completions response received. StatusCode: {StatusCode}, ResponseLength: {ResponseLength}",
-                    response.StatusCode,
-                    responseContent?.Length ?? 0);
-                LogProviderMetadata(operationName, promptVersion, fileName, providerResponse, response.IsSuccessStatusCode);
-
-                if (!response.IsSuccessStatusCode)
-                {
-                    _logger.LogError("OpenAI API request failed: {StatusCode} - {Content}", response.StatusCode, responseContent);
-                    return MapFailureOutcome(response.StatusCode, providerResponse);
-                }
-
-                if (string.IsNullOrWhiteSpace(responseContent))
-                {
-                    return AIOperationResult.InvalidOutput(providerResponse);
-                }
-
-                try
-                {
-                    using var jsonDoc = JsonDocument.Parse(responseContent);
-                    var choices = jsonDoc.RootElement.GetProperty("choices");
-                    if (choices.GetArrayLength() > 0)
-                    {
-                        var message = choices[0].GetProperty("message");
-                        var modelOutput = message.GetProperty("content").GetString();
-                        return string.IsNullOrWhiteSpace(modelOutput)
-                            ? AIOperationResult.InvalidOutput(providerResponse)
-                            : AIOperationResult.Success(BuildProviderResponseFromMetadata(
-                                modelOutput,
-                                responseContent,
-                                metadata,
-                                (int)response.StatusCode));
-                    }
-
-                    return AIOperationResult.InvalidOutput(providerResponse);
-                }
-                catch (Exception ex) when (ex is JsonException || ex is KeyNotFoundException || ex is InvalidOperationException)
-                {
-                    _logger.LogWarning(ex, "AI response payload had an invalid output shape");
-                    return AIOperationResult.InvalidOutput(providerResponse);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error generating AI summary");
-                return AIOperationResult.TransientFailure(new AIProviderResult(ex.Message));
-            }
+            return _openAIResponseParser.ParseApplicationAnalysisResponse(result.Content);
         }
 
         public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request)
@@ -282,12 +174,12 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             var fileName = request.FileName ?? string.Empty;
             var fileContent = request.FileContent ?? Array.Empty<byte>();
             var contentType = request.ContentType ?? "application/octet-stream";
-            var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(AttachmentSummaryPromptType));
+            var promptVersion = _openAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(AttachmentSummaryPromptType));
 
             try
             {
                 var extractedText = await _textExtractionService.ExtractTextAsync(fileName, fileContent, contentType);
-                var prompt = BuildAttachmentSummarySystemPrompt(promptVersion);
+                var prompt = _openAIPromptRenderer.BuildAttachmentSummarySystemPrompt(promptVersion);
 
                 var attachmentText = string.IsNullOrWhiteSpace(extractedText) ? null : extractedText;
                 if (attachmentText != null)
@@ -307,11 +199,11 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
                     text = attachmentText
                 };
                 var attachment = JsonSerializer.Serialize(attachmentPayload, JsonLogOptions);
-                var contentToAnalyze = BuildAttachmentSummaryUserPrompt(promptVersion, attachment);
+                var contentToAnalyze = _openAIPromptRenderer.BuildAttachmentSummaryUserPrompt(promptVersion, attachment);
 
                 await LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, prompt, contentToAnalyze);
-                var result = await GenerateWithRetryAsync(
-                () => GenerateSummaryAsync(
+            var result = await GenerateWithRetryAsync(
+                () => _openAITransportService.GenerateSummaryAsync(
                     contentToAnalyze,
                     prompt,
                     AttachmentSummaryCompletionTokens,
@@ -345,81 +237,10 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             }
         }
 
-        private string AddIdsToAnalysisItems(string analysisJson)
-        {
-            try
-            {
-                using var jsonDoc = JsonDocument.Parse(analysisJson);
-                using var memoryStream = new System.IO.MemoryStream();
-                using (var writer = new Utf8JsonWriter(memoryStream, new JsonWriterOptions { Indented = true }))
-                {
-                    writer.WriteStartObject();
-
-                    foreach (var property in jsonDoc.RootElement.EnumerateObject())
-                    {
-                        var outputPropertyName = property.Name;
-
-                        if (outputPropertyName == AIJsonKeys.Errors ||
-                            outputPropertyName == AIJsonKeys.Warnings ||
-                            outputPropertyName == AIJsonKeys.Summaries ||
-                            outputPropertyName == AIJsonKeys.Recommendations)
-                        {
-                            writer.WritePropertyName(outputPropertyName);
-                            writer.WriteStartArray();
-
-                            foreach (var item in property.Value.EnumerateArray())
-                            {
-                                writer.WriteStartObject();
-
-                                // Add unique ID first
-                                writer.WriteString("id", Guid.NewGuid().ToString());
-                                writer.WriteBoolean(AIJsonKeys.Dismissed, false);
-
-                                // Copy existing properties
-                                foreach (var itemProperty in item.EnumerateObject())
-                                {
-                                    if (itemProperty.NameEquals(AIJsonKeys.Id) || itemProperty.NameEquals(AIJsonKeys.Dismissed))
-                                    {
-                                        continue;
-                                    }
-
-                                    itemProperty.WriteTo(writer);
-                                }
-
-                                writer.WriteEndObject();
-                            }
-
-                            writer.WriteEndArray();
-                        }
-                        else
-                        {
-                            if (outputPropertyName != property.Name)
-                            {
-                                writer.WritePropertyName(outputPropertyName);
-                                property.Value.WriteTo(writer);
-                                continue;
-                            }
-
-                            property.WriteTo(writer);
-                        }
-                    }
-
-                    writer.WriteEndObject();
-                }
-
-                return Encoding.UTF8.GetString(memoryStream.ToArray());
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error adding IDs to analysis items, returning original JSON");
-                return analysisJson; // Return original if processing fails
-            }
-        }
-
         public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request)
         {
             ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationScoringPromptType));
+            var promptVersion = _openAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationScoringPromptType));
             var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var sectionJson = JsonSerializer.Serialize(request.SectionSchema, JsonLogOptions);
 
@@ -438,8 +259,8 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     ? string.Join("\n- ", attachmentSummaries.Select((summary, index) => $"Attachment {index + 1}: {summary}"))
                     : "No attachments provided.";
 
-                var section = BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
-                var response = BuildApplicationScoringResponseTemplate(section);
+                var section = _openAIPromptRenderer.BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
+                var response = _openAIPromptRenderer.BuildApplicationScoringResponseTemplate(section);
                 if (response == "{}")
                 {
                     _logger.LogWarning(
@@ -448,17 +269,17 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     return new ApplicationScoringResponse();
                 }
 
-                var applicationScoringContent = BuildApplicationScoringUserPrompt(
+                var applicationScoringContent = _openAIPromptRenderer.BuildApplicationScoringUserPrompt(
                     promptVersion,
                     dataJson,
                     attachments,
                     section,
                     response);
-                var systemPrompt = BuildApplicationScoringSystemPrompt(promptVersion);
+                var systemPrompt = _openAIPromptRenderer.BuildApplicationScoringSystemPrompt(promptVersion);
 
                 await LogPromptInputAsync(ApplicationScoringPromptType, promptVersion, systemPrompt, applicationScoringContent);
                 var result = await GenerateWithRetryAsync(
-                () => GenerateSummaryAsync(
+                () => _openAITransportService.GenerateSummaryAsync(
                     applicationScoringContent,
                     systemPrompt,
                     ApplicationScoringCompletionTokens,
@@ -473,7 +294,7 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     return new ApplicationScoringResponse();
                 }
 
-                return ParseApplicationScoringResponse(result.Content, questionIdAliasMap);
+                return _openAIResponseParser.ParseApplicationScoringResponse(result.Content, questionIdAliasMap);
             }
             catch (Exception ex)
             {
@@ -865,259 +686,6 @@ private static string CombineEndpointAndPath(string endpoint, string profilePath
             return trimmedEndpoint + trimmedPath;
         }
 
-        private static ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
-        {
-            var response = new ApplicationAnalysisResponse();
-
-            if (!TryParseJsonObjectFromResponse(raw, out var root))
-            {
-                return response;
-            }
-
-            if (TryGetStringProperty(root, AIJsonKeys.Decision, out var decision))
-            {
-                response.Decision = decision?.Trim().ToUpperInvariant();
-            }
-
-            if (root.TryGetProperty("errors", out var errors) && errors.ValueKind == JsonValueKind.Array)
-            {
-                response.Errors = ParseFindings(errors);
-            }
-
-            if (root.TryGetProperty("warnings", out var warnings) && warnings.ValueKind == JsonValueKind.Array)
-            {
-                response.Warnings = ParseFindings(warnings);
-            }
-
-            if (root.TryGetProperty(AIJsonKeys.Summaries, out var summaries) && summaries.ValueKind == JsonValueKind.Array)
-            {
-                response.Summaries = ParseFindings(summaries);
-            }
-
-            if (root.TryGetProperty(AIJsonKeys.Recommendations, out var recommendations) && recommendations.ValueKind == JsonValueKind.Array)
-            {
-                response.Recommendations = ParseFindings(recommendations);
-            }
-
-            return response;
-        }
-
-        private static bool TryGetStringProperty(JsonElement root, string propertyName, out string? value)
-        {
-            value = null;
-            if (!root.TryGetProperty(propertyName, out var property) || property.ValueKind != JsonValueKind.String)
-            {
-                return false;
-            }
-
-            value = property.GetString();
-            return !string.IsNullOrWhiteSpace(value);
-        }
-
-        private static List<ApplicationAnalysisFinding> ParseFindings(JsonElement array)
-        {
-            var findings = new List<ApplicationAnalysisFinding>();
-            foreach (var item in array.EnumerateArray())
-            {
-                if (item.ValueKind != JsonValueKind.Object)
-                {
-                    continue;
-                }
-
-                var id = item.TryGetProperty(AIJsonKeys.Id, out var idProp) && idProp.ValueKind == JsonValueKind.String
-                    ? idProp.GetString()
-                    : null;
-                var dismissed = item.TryGetProperty(AIJsonKeys.Dismissed, out var dismissedProp) &&
-                    (dismissedProp.ValueKind == JsonValueKind.True || dismissedProp.ValueKind == JsonValueKind.False) &&
-                    dismissedProp.GetBoolean();
-                string? title = null;
-                if (item.TryGetProperty(AIJsonKeys.Title, out var titleProp) && titleProp.ValueKind == JsonValueKind.String)
-                {
-                    title = titleProp.GetString();
-                }
-
-                string? detail = null;
-                if (item.TryGetProperty(AIJsonKeys.Detail, out var detailProp) && detailProp.ValueKind == JsonValueKind.String)
-                {
-                    detail = detailProp.GetString();
-                }
-
-                findings.Add(new ApplicationAnalysisFinding
-                {
-                    Id = id,
-                    Dismissed = dismissed,
-                    Title = title,
-                    Detail = detail
-                });
-            }
-
-            return findings;
-        }
-
-        private static ApplicationScoringResponse ParseApplicationScoringResponse(
-            string raw,
-            IReadOnlyDictionary<string, string>? questionIdAliasMap = null)
-        {
-            var response = new ApplicationScoringResponse();
-            if (!TryParseJsonObjectFromResponse(raw, out var root))
-            {
-                return response;
-            }
-
-            foreach (var property in root.EnumerateObject())
-            {
-                if (property.Value.ValueKind != JsonValueKind.Object)
-                {
-                    continue;
-                }
-
-                var answer = property.Value.TryGetProperty("answer", out var answerProp)
-                    ? answerProp.Clone()
-                    : default;
-                var rationale = property.Value.TryGetProperty("rationale", out var rationaleProp) &&
-                                rationaleProp.ValueKind == JsonValueKind.String
-                    ? rationaleProp.GetString() ?? string.Empty
-                    : string.Empty;
-                var confidence = property.Value.TryGetProperty("confidence", out var confidenceProp) &&
-                                 confidenceProp.ValueKind == JsonValueKind.Number &&
-                                 confidenceProp.TryGetInt32(out var parsedConfidence)
-                    ? NormalizeConfidence(parsedConfidence)
-                    : 0;
-
-                var questionId = questionIdAliasMap != null &&
-                                 questionIdAliasMap.TryGetValue(property.Name, out var originalQuestionId)
-                    ? originalQuestionId
-                    : property.Name;
-
-                response.Answers[questionId] = new ApplicationScoringAnswer
-                {
-                    Answer = answer,
-                    Rationale = rationale,
-                    Confidence = confidence
-                };
-            }
-
-            return response;
-        }
-
-        private static int NormalizeConfidence(int confidence)
-        {
-            var clamped = Math.Clamp(confidence, 0, 100);
-            var rounded = (int)Math.Round(clamped / 5.0, MidpointRounding.AwayFromZero) * 5;
-            return Math.Clamp(rounded, 0, 100);
-        }
-
-        private static string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
-        {
-            try
-            {
-                using var doc = JsonDocument.Parse(sectionPayloadJson);
-                if (!doc.RootElement.TryGetProperty("questions", out var questions) || questions.ValueKind != JsonValueKind.Array)
-                {
-                    return "{}";
-                }
-
-                var template = new Dictionary<string, object>();
-                foreach (var question in questions.EnumerateArray())
-                {
-                    if (!question.TryGetProperty("id", out var idProp) || idProp.ValueKind != JsonValueKind.String)
-                    {
-                        continue;
-                    }
-
-                    var questionId = idProp.GetString();
-                    if (string.IsNullOrWhiteSpace(questionId))
-                    {
-                        continue;
-                    }
-
-                    template[questionId] = new
-                    {
-                        answer = string.Empty,
-                        rationale = string.Empty,
-                        confidence = 0
-                    };
-                }
-
-                if (template.Count == 0)
-                {
-                    return "{}";
-                }
-
-                return JsonSerializer.Serialize(template, JsonLogOptions);
-            }
-            catch (JsonException)
-            {
-                return "{}";
-            }
-        }
-
-        private static string BuildAliasedApplicationScoringSection(
-            string? sectionName,
-            string sectionJson,
-            out IReadOnlyDictionary<string, string> questionIdAliasMap)
-        {
-            questionIdAliasMap = new Dictionary<string, string>(StringComparer.Ordinal);
-
-            if (string.IsNullOrWhiteSpace(sectionJson))
-            {
-                return JsonSerializer.Serialize(new { name = sectionName, questions = sectionJson }, JsonLogOptions);
-            }
-
-            try
-            {
-                using var sectionDoc = JsonDocument.Parse(sectionJson);
-                if (sectionDoc.RootElement.ValueKind != JsonValueKind.Array)
-                {
-                    return JsonSerializer.Serialize(new { name = sectionName, questions = sectionDoc.RootElement.Clone() }, JsonLogOptions);
-                }
-
-                var aliasedQuestions = new List<Dictionary<string, object?>>();
-                var aliasMap = new Dictionary<string, string>(StringComparer.Ordinal);
-                var index = 1;
-
-                foreach (var question in sectionDoc.RootElement.EnumerateArray())
-                {
-                    if (question.ValueKind != JsonValueKind.Object)
-                    {
-                        continue;
-                    }
-
-                    var aliasedQuestion = new Dictionary<string, object?>(StringComparer.Ordinal);
-                    string? questionAlias = null;
-
-                    foreach (var property in question.EnumerateObject())
-                    {
-                        if (property.NameEquals("id") && property.Value.ValueKind == JsonValueKind.String)
-                        {
-                            var originalQuestionId = property.Value.GetString();
-                            if (!string.IsNullOrWhiteSpace(originalQuestionId))
-                            {
-                                questionAlias = $"q{index++}";
-                                aliasMap[questionAlias] = originalQuestionId;
-                                aliasedQuestion[property.Name] = questionAlias;
-                                continue;
-                            }
-                        }
-
-                        aliasedQuestion[property.Name] = property.Value.Clone();
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(questionAlias))
-                    {
-                        aliasedQuestions.Add(aliasedQuestion);
-                    }
-                }
-
-                questionIdAliasMap = aliasMap;
-                return JsonSerializer.Serialize(new { name = sectionName, questions = aliasedQuestions }, JsonLogOptions);
-            }
-            catch (JsonException)
-            {
-                return JsonSerializer.Serialize(new { name = sectionName, questions = sectionJson }, JsonLogOptions);
-            }
-        }
-
         private async Task LogPromptInputAsync(string promptType, string promptVersion, string? systemPrompt, string userPrompt)
         {
             var formattedInput = FormatPromptInputForLog(systemPrompt, userPrompt);
@@ -1302,255 +870,6 @@ private static bool TryParseJsonObjectFromResponse(string response, out JsonElem
             }
         }
 
-        private static string ResolvePromptVersion(string? version)
-        {
-            if (!string.IsNullOrWhiteSpace(version) &&
-                PromptProfiles.TryGetValue(version.Trim(), out var selectedVersion))
-            {
-                return selectedVersion;
-            }
-
-            return PromptVersionV1;
-        }
-
-        private static string BuildApplicationAnalysisSystemPrompt(string version)
-        {
-            return GetRequiredPromptTemplate(version, ApplicationAnalysisSystemTemplateName);
-        }
-
-        private static string BuildApplicationAnalysisUserPrompt(
-            string version,
-            string schema,
-            string data,
-            string attachments)
-        {
-            var replacements = new Dictionary<string, string>
-            {
-                ["SCHEMA"] = schema,
-                ["DATA"] = data,
-                ["ATTACHMENTS"] = attachments
-            };
-
-            return RenderPromptTemplate(version, ApplicationAnalysisUserTemplateName, replacements);
-        }
-
-        private static string BuildAttachmentSummarySystemPrompt(string version)
-        {
-            return GetRequiredPromptTemplate(version, AttachmentSummarySystemTemplateName);
-        }
-
-        private static string BuildAttachmentSummaryUserPrompt(string version, string attachment)
-        {
-            return RenderPromptTemplate(version, AttachmentSummaryUserTemplateName, new Dictionary<string, string>
-            {
-                ["ATTACHMENT"] = attachment
-            });
-        }
-
-        private static string BuildApplicationScoringSystemPrompt(string version)
-        {
-            return GetRequiredPromptTemplate(version, ApplicationScoringSystemTemplateName);
-        }
-
-        private static string BuildApplicationScoringUserPrompt(
-            string version,
-            string data,
-            string attachments,
-            string section,
-            string response)
-        {
-            return RenderPromptTemplate(version, ApplicationScoringUserTemplateName, new Dictionary<string, string>
-            {
-                ["DATA"] = data,
-                ["ATTACHMENTS"] = attachments,
-                ["SECTION"] = section,
-                ["RESPONSE"] = response
-            });
-        }
-
-        private static bool TryGetPromptTemplate(string version, string templateName, out string template)
-        {
-            template = string.Empty;
-            var cacheKey = $"{version}/{templateName}";
-            if (PromptTemplateCache.TryGetValue(cacheKey, out var cachedTemplate))
-            {
-                template = cachedTemplate;
-                return true;
-            }
-
-            var path = Path.Combine(AppContext.BaseDirectory, PromptTemplatesFolder, version, $"{templateName}.txt");
-            if (!File.Exists(path))
-            {
-                return false;
-            }
-
-            var loaded = PromptTemplateCache.GetOrAdd(cacheKey, _ => File.ReadAllText(path));
-            if (string.IsNullOrWhiteSpace(loaded))
-            {
-                return false;
-            }
-
-            template = loaded;
-            return true;
-        }
-
-        private static string GetRequiredPromptTemplate(string version, string templateName)
-        {
-            if (TryGetPromptTemplate(version, templateName, out var template))
-            {
-                return template;
-            }
-
-            throw new InvalidOperationException(
-                $"Missing required prompt template '{templateName}.txt' for prompt version '{version}'.");
-        }
-
-        private static string RenderPromptTemplate(
-            string version,
-            string templateName,
-            IReadOnlyDictionary<string, string> runtimeReplacements)
-        {
-            return RenderPromptTemplateInternal(
-                version,
-                templateName,
-                runtimeReplacements,
-                new HashSet<string>(StringComparer.OrdinalIgnoreCase));
-        }
-
-        private static string RenderPromptTemplateInternal(
-            string version,
-            string templateName,
-            IReadOnlyDictionary<string, string> runtimeReplacements,
-            ISet<string> resolutionStack)
-        {
-            if (!resolutionStack.Add(templateName))
-            {
-                throw new InvalidOperationException(
-                    $"Detected cyclic prompt fragment reference while resolving '{templateName}.txt' for prompt version '{version}'.");
-            }
-
-            var template = GetRequiredPromptTemplate(version, templateName);
-            var replacements = new Dictionary<string, string>(runtimeReplacements, StringComparer.Ordinal);
-            var baseTemplateName = GetTemplateBaseName(templateName);
-
-            foreach (var placeholder in GetTemplatePlaceholders(template))
-            {
-                if (replacements.ContainsKey(placeholder))
-                {
-                    continue;
-                }
-
-                var fragmentTemplateName = ResolveFragmentTemplateName(version, baseTemplateName, placeholder);
-                if (!string.IsNullOrWhiteSpace(fragmentTemplateName))
-                {
-                    replacements[placeholder] = RenderPromptTemplateInternal(
-                        version,
-                        fragmentTemplateName,
-                        new Dictionary<string, string>(StringComparer.Ordinal),
-                        resolutionStack).TrimEnd();
-                }
-            }
-
-            var rendered = template;
-            foreach (var replacement in replacements)
-            {
-                rendered = rendered.Replace($"{{{{{replacement.Key}}}}}", replacement.Value ?? string.Empty, StringComparison.Ordinal);
-            }
-
-            var unresolved = GetTemplatePlaceholders(rendered);
-            if (unresolved.Count > 0)
-            {
-                throw new InvalidOperationException(
-                    $"Unresolved prompt placeholders in '{templateName}.txt' for prompt version '{version}': {string.Join(", ", unresolved.OrderBy(item => item))}");
-            }
-
-            resolutionStack.Remove(templateName);
-            return rendered;
-        }
-
-        private static string? ResolveFragmentTemplateName(string version, string baseTemplateName, string placeholderName)
-        {
-            var normalizedPlaceholder = placeholderName.ToLowerInvariant();
-            var baseScopedCandidate = $"{baseTemplateName}.{normalizedPlaceholder}";
-            if (TryGetPromptTemplate(version, baseScopedCandidate, out _))
-            {
-                return baseScopedCandidate;
-            }
-
-            if (string.Equals(placeholderName, "RESPONSE", StringComparison.Ordinal))
-            {
-                var outputCandidate = $"{baseTemplateName}.output";
-                if (TryGetPromptTemplate(version, outputCandidate, out _))
-                {
-                    return outputCandidate;
-                }
-            }
-
-            if (TryResolveCommonTemplateName(placeholderName, out var commonTemplateName) &&
-                TryGetPromptTemplate(version, commonTemplateName, out _))
-            {
-                return commonTemplateName;
-            }
-
-            return null;
-        }
-
-        private static bool TryResolveCommonTemplateName(string placeholderName, out string commonTemplateName)
-        {
-            commonTemplateName = string.Empty;
-            if (!placeholderName.StartsWith("COMMON_", StringComparison.Ordinal))
-            {
-                return false;
-            }
-
-            var suffix = placeholderName.Substring("COMMON_".Length).ToLowerInvariant();
-            suffix = suffix.Replace('_', '.');
-            commonTemplateName = $"common.{suffix}";
-            return true;
-        }
-
-        private static string GetTemplateBaseName(string templateName)
-        {
-            var separatorIndex = templateName.IndexOf('.', StringComparison.Ordinal);
-            if (separatorIndex <= 0)
-            {
-                return templateName;
-            }
-
-            return templateName.Substring(0, separatorIndex);
-        }
-
-        private static HashSet<string> GetTemplatePlaceholders(string template)
-        {
-            var placeholders = new HashSet<string>(StringComparer.Ordinal);
-            var searchIndex = 0;
-
-            while (searchIndex < template.Length)
-            {
-                var start = template.IndexOf("{{", searchIndex, StringComparison.Ordinal);
-                if (start < 0)
-                {
-                    break;
-                }
-
-                var end = template.IndexOf("}}", start + 2, StringComparison.Ordinal);
-                if (end < 0)
-                {
-                    break;
-                }
-
-                var placeholder = template.Substring(start + 2, end - start - 2).Trim();
-                if (!string.IsNullOrWhiteSpace(placeholder))
-                {
-                    placeholders.Add(placeholder);
-                }
-
-                searchIndex = end + 2;
-            }
-
-            return placeholders;
-        }
-
         private static string ExtractSummaryFromJson(string output)
         {
             if (!TryParseJsonObjectFromResponse(output, out var jsonObject))
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
new file mode 100644
index 0000000000..aa0236311b
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
@@ -0,0 +1,372 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Unity.AI.Models;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+internal class OpenAITransportService(
+    HttpClient httpClient,
+    IConfiguration configuration,
+    ILogger<OpenAITransportService> logger) : IOpenAITransportService, ITransientDependency
+{
+    private const string DefaultMaxTokensParameterName = "max_completion_tokens";
+    private const string LegacyMaxTokensParameterName = "max_tokens";
+    private const string DefaultProviderName = "OpenAI";
+    private const string OpenAiApiKeyEnvironmentVariableName = "AZURE_OPENAI_API_KEY";
+    private const string OpenAiEndpointEnvironmentVariableName = "AZURE_OPENAI_ENDPOINT";
+
+    private readonly HttpClient _httpClient = httpClient;
+    private readonly IConfiguration _configuration = configuration;
+    private readonly ILogger<OpenAITransportService> _logger = logger;
+
+    public async Task<AIOperationResult> GenerateSummaryAsync(
+        string content,
+        string? systemPrompt,
+        int maxTokens = 150,
+        double? temperature = null,
+        string? operationName = null,
+        string? promptVersion = null,
+        string? fileName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
+        {
+            _logger.LogWarning("Provider {ProviderName} is not supported by OpenAI transport.", providerName);
+            return AIOperationResult.PermanentFailure(new AIProviderResult($"Unsupported provider: {providerName}"));
+        }
+
+        var apiKey = ResolveApiKey(operationName);
+        if (string.IsNullOrEmpty(apiKey))
+        {
+            _logger.LogWarning("Error: OpenAI API key is not configured");
+            return AIOperationResult.PermanentFailure(new AIProviderResult("OpenAI API key is not configured"));
+        }
+
+        try
+        {
+            var resolvedSystemPrompt = string.IsNullOrWhiteSpace(systemPrompt)
+                ? "You are a professional grant analyst for the BC Government."
+                : systemPrompt;
+
+            var requestPayload = new Dictionary<string, object?>
+            {
+                ["messages"] = new[]
+                {
+                    new { role = "system", content = resolvedSystemPrompt },
+                    new { role = "user", content = content ?? string.Empty }
+                },
+                [ResolveMaxTokensParameterNameForOperation(operationName)] = maxTokens
+            };
+
+            var resolvedTemperature = temperature ?? ResolveConfiguredTemperature(operationName);
+            if (resolvedTemperature.HasValue)
+            {
+                requestPayload["temperature"] = resolvedTemperature.Value;
+            }
+
+            var json = JsonSerializer.Serialize(requestPayload);
+            var httpContent = new StringContent(json, Encoding.UTF8, "application/json");
+
+            _httpClient.DefaultRequestHeaders.Clear();
+            _httpClient.DefaultRequestHeaders.Add("Authorization", apiKey);
+
+            var response = await _httpClient.PostAsync(ResolveApiUrl(operationName), httpContent);
+            var responseContent = await response.Content.ReadAsStringAsync();
+            var metadata = TryExtractProviderMetadata(responseContent);
+            var providerResponse = BuildProviderResponseFromMetadata(
+                string.Empty,
+                responseContent,
+                metadata,
+                (int)response.StatusCode);
+
+            if (!response.IsSuccessStatusCode)
+            {
+                _logger.LogError("OpenAI API request failed: {StatusCode} - {Content}", response.StatusCode, responseContent);
+                return MapFailureOutcome(response.StatusCode, providerResponse);
+            }
+
+            if (string.IsNullOrWhiteSpace(responseContent))
+            {
+                return AIOperationResult.InvalidOutput(providerResponse);
+            }
+
+            try
+            {
+                using var jsonDoc = JsonDocument.Parse(responseContent);
+                var choices = jsonDoc.RootElement.GetProperty("choices");
+                if (choices.GetArrayLength() > 0)
+                {
+                    var message = choices[0].GetProperty("message");
+                    var modelOutput = message.GetProperty("content").GetString();
+                    return string.IsNullOrWhiteSpace(modelOutput)
+                        ? AIOperationResult.InvalidOutput(providerResponse)
+                        : AIOperationResult.Success(BuildProviderResponseFromMetadata(
+                            modelOutput,
+                            responseContent,
+                            metadata,
+                            (int)response.StatusCode));
+                }
+
+                return AIOperationResult.InvalidOutput(providerResponse);
+            }
+            catch (Exception ex) when (ex is JsonException || ex is KeyNotFoundException || ex is InvalidOperationException)
+            {
+                _logger.LogWarning(ex, "AI response payload had an invalid output shape");
+                return AIOperationResult.InvalidOutput(providerResponse);
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error generating AI summary");
+            return AIOperationResult.TransientFailure(new AIProviderResult(ex.Message));
+        }
+    }
+
+    private string ResolveApiKey(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        if (string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
+        {
+            var injectedApiKey = _configuration[OpenAiApiKeyEnvironmentVariableName];
+            if (!string.IsNullOrWhiteSpace(injectedApiKey))
+            {
+                return injectedApiKey;
+            }
+        }
+
+        return _configuration[$"Azure:{providerName}:ApiKey"] ?? string.Empty;
+    }
+
+    private string ResolveProviderName(string? operationName = null)
+    {
+        if (!string.IsNullOrWhiteSpace(operationName))
+        {
+            var configuredProvider = _configuration[$"Azure:Operations:{operationName}:Provider"];
+            if (!string.IsNullOrWhiteSpace(configuredProvider))
+            {
+                return configuredProvider.Trim();
+            }
+        }
+
+        var defaultProvider = _configuration["Azure:Operations:Defaults:Provider"];
+        return string.IsNullOrWhiteSpace(defaultProvider) ? DefaultProviderName : defaultProvider.Trim();
+    }
+
+    private string ResolveMaxTokensParameterNameForOperation(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        var profileName = ResolveProfileName(operationName);
+        var profileParameterName = ResolveProfileSetting(providerName, profileName, "MaxTokensParameter");
+        return ResolveMaxTokensParameterName(profileParameterName);
+    }
+
+    private double? ResolveConfiguredTemperature(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        var profileName = ResolveProfileName(operationName);
+        var profileTemperature = ResolveProfileSetting(providerName, profileName, "Temperature");
+        if (profileTemperature != null
+            && double.TryParse(profileTemperature, NumberStyles.Float, CultureInfo.InvariantCulture, out var parsedTemperature))
+        {
+            return parsedTemperature;
+        }
+
+        return null;
+    }
+
+    private string ResolveApiUrl(string? operationName)
+    {
+        var providerName = ResolveProviderName(operationName);
+        var profileName = ResolveProfileName(operationName);
+        var profileApiUrl = ResolveProfileSetting(providerName, profileName, "ApiUrl");
+        var injectedEndpoint = ResolveInjectedEndpoint(providerName);
+        var legacyOpenAiApiUrl = _configuration["Azure:OpenAI:ApiUrl"];
+
+        if (!string.IsNullOrWhiteSpace(injectedEndpoint) && !string.IsNullOrWhiteSpace(profileApiUrl))
+        {
+            return CombineEndpointAndPath(injectedEndpoint, profileApiUrl);
+        }
+
+        if (!string.IsNullOrWhiteSpace(profileApiUrl))
+        {
+            return profileApiUrl;
+        }
+
+        if (!string.IsNullOrWhiteSpace(legacyOpenAiApiUrl))
+        {
+            return legacyOpenAiApiUrl;
+        }
+
+        throw new InvalidOperationException($"AI API URL is not configured for provider '{providerName}'.");
+    }
+
+    private string? ResolveInjectedEndpoint(string providerName)
+    {
+        if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
+        {
+            return _configuration[$"Azure:{providerName}:Endpoint"];
+        }
+
+        var injectedEndpoint = _configuration[OpenAiEndpointEnvironmentVariableName];
+        if (!string.IsNullOrWhiteSpace(injectedEndpoint))
+        {
+            return injectedEndpoint;
+        }
+
+        return _configuration["Azure:OpenAI:Endpoint"];
+    }
+
+    private string? ResolveProfileName(string? operationName)
+    {
+        if (!string.IsNullOrWhiteSpace(operationName))
+        {
+            var operationProfile = _configuration[$"Azure:Operations:{operationName}:Profile"];
+            if (!string.IsNullOrWhiteSpace(operationProfile))
+            {
+                return operationProfile.Trim();
+            }
+        }
+
+        var defaultProfile = _configuration["Azure:Operations:Defaults:Profile"];
+        return string.IsNullOrWhiteSpace(defaultProfile) ? null : defaultProfile.Trim();
+    }
+
+    private string? ResolveProfileSetting(string providerName, string? profileName, string settingName)
+    {
+        if (string.IsNullOrWhiteSpace(profileName))
+        {
+            return null;
+        }
+
+        var profileSetting = _configuration[$"Azure:{providerName}:Profiles:{profileName}:{settingName}"];
+        return string.IsNullOrWhiteSpace(profileSetting) ? null : profileSetting;
+    }
+
+    private static string ResolveMaxTokensParameterName(string? configuredParameterName)
+    {
+        if (string.Equals(configuredParameterName, LegacyMaxTokensParameterName, StringComparison.Ordinal))
+        {
+            return LegacyMaxTokensParameterName;
+        }
+
+        return DefaultMaxTokensParameterName;
+    }
+
+    private static string CombineEndpointAndPath(string endpoint, string profilePath)
+    {
+        const char UrlPathSeparator = '/';
+
+        if (Uri.TryCreate(profilePath, UriKind.Absolute, out var absoluteUri))
+        {
+            return absoluteUri.ToString();
+        }
+
+        var trimmedEndpoint = endpoint.Trim().TrimEnd(UrlPathSeparator);
+        var trimmedPath = profilePath.Trim();
+        if (!trimmedPath.StartsWith(UrlPathSeparator))
+        {
+            trimmedPath = string.Concat(UrlPathSeparator, trimmedPath);
+        }
+
+        return trimmedEndpoint + trimmedPath;
+    }
+
+    private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AIProviderResult response)
+    {
+        var statusCodeValue = (int)statusCode;
+        if (statusCode == HttpStatusCode.RequestTimeout || statusCode == (HttpStatusCode)429 || statusCodeValue >= 500)
+        {
+            return AIOperationResult.TransientFailure(response);
+        }
+
+        return AIOperationResult.PermanentFailure(response);
+    }
+
+    private static AIProviderResult BuildProviderResponseFromMetadata(
+        string content,
+        string? rawResponse,
+        AIProviderResponseMetadata? metadata,
+        int? httpStatusCode = null)
+    {
+        return new AIProviderResult(
+            content,
+            rawResponse ?? string.Empty,
+            metadata?.Model,
+            metadata?.FinishReason,
+            httpStatusCode,
+            metadata?.PromptTokens,
+            metadata?.CompletionTokens,
+            metadata?.TotalTokens,
+            metadata?.ReasoningTokens);
+    }
+
+    private static AIProviderResponseMetadata? TryExtractProviderMetadata(string? responseContent)
+    {
+        if (string.IsNullOrWhiteSpace(responseContent))
+        {
+            return null;
+        }
+
+        try
+        {
+            using var jsonDoc = JsonDocument.Parse(responseContent);
+            var root = jsonDoc.RootElement;
+            var model = root.TryGetProperty("model", out var modelProp) && modelProp.ValueKind == JsonValueKind.String
+                ? modelProp.GetString()
+                : null;
+
+            string? finishReason = null;
+            if (root.TryGetProperty("choices", out var choices)
+                && choices.ValueKind == JsonValueKind.Array
+                && choices.GetArrayLength() > 0)
+            {
+                var firstChoice = choices[0];
+                if (firstChoice.TryGetProperty("finish_reason", out var finishReasonProp) && finishReasonProp.ValueKind == JsonValueKind.String)
+                {
+                    finishReason = finishReasonProp.GetString();
+                }
+            }
+
+            int? promptTokens = null;
+            int? completionTokens = null;
+            int? totalTokens = null;
+            int? reasoningTokens = null;
+            if (root.TryGetProperty("usage", out var usage) && usage.ValueKind == JsonValueKind.Object)
+            {
+                promptTokens = TryGetInt32(usage, "prompt_tokens");
+                completionTokens = TryGetInt32(usage, "completion_tokens");
+                totalTokens = TryGetInt32(usage, "total_tokens");
+
+                if (usage.TryGetProperty("completion_tokens_details", out var completionTokenDetails)
+                    && completionTokenDetails.ValueKind == JsonValueKind.Object)
+                {
+                    reasoningTokens = TryGetInt32(completionTokenDetails, "reasoning_tokens");
+                }
+            }
+
+            return new AIProviderResponseMetadata(model, finishReason, promptTokens, completionTokens, totalTokens, reasoningTokens);
+        }
+        catch (JsonException)
+        {
+            return null;
+        }
+    }
+
+    private static int? TryGetInt32(JsonElement element, string propertyName)
+    {
+        return element.TryGetProperty(propertyName, out var prop)
+            && prop.ValueKind == JsonValueKind.Number
+            && prop.TryGetInt32(out var value)
+            ? value
+            : null;
+    }
+}

From f34669766d091af369da77c5f3fdbd154cf907c2 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 15 Apr 2026 16:03:30 -0700
Subject: [PATCH 28/45] AB#32299 fix openai runtime accessibility and parsing

---
 .../AI/Runtime/AIOperationResult.cs            |  4 ++--
 .../AI/Runtime/AIProviderResponseMetadata.cs   |  2 +-
 .../AI/Runtime/AIProviderResult.cs             |  2 +-
 .../AI/Runtime/IOpenAIPromptRenderer.cs        |  2 +-
 .../AI/Runtime/IOpenAIResponseParser.cs        |  2 +-
 .../AI/Runtime/IOpenAITransportService.cs      |  2 +-
 .../AI/Runtime/OpenAIResponseParser.cs         | 18 ++++++++++++++----
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs
index fa3753de30..d0c2a2ceec 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIOperationResult.cs
@@ -1,6 +1,6 @@
 namespace Unity.AI.Runtime
 {
-    internal enum AIOperationOutcome
+    public enum AIOperationOutcome
     {
         Success,
         TransientFailure,
@@ -8,7 +8,7 @@ internal enum AIOperationOutcome
         InvalidOutput
     }
 
-    internal sealed record AIOperationResult(
+    public sealed record AIOperationResult(
         AIOperationOutcome Outcome,
         AIProviderResult Response)
     {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResponseMetadata.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResponseMetadata.cs
index 6974af22b3..8144c43e4e 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResponseMetadata.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResponseMetadata.cs
@@ -1,6 +1,6 @@
 namespace Unity.AI.Runtime
 {
-    internal sealed record AIProviderResponseMetadata(
+    public sealed record AIProviderResponseMetadata(
         string? Model,
         string? FinishReason,
         int? PromptTokens,
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResult.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResult.cs
index 6d9254b781..f36b165279 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResult.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/AIProviderResult.cs
@@ -1,6 +1,6 @@
 namespace Unity.AI.Runtime
 {
-    internal sealed record AIProviderResult(
+    public sealed record AIProviderResult(
         string Content,
         string RawResponse = "",
         string? Model = null,
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
index 94b96a6031..d2449ed465 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.AI.Runtime;
 
-internal interface IOpenAIPromptRenderer
+public interface IOpenAIPromptRenderer
 {
     string ResolvePromptVersion(string? version);
 
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
index 5367dc7e28..9b457e0917 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.AI.Runtime;
 
-internal interface IOpenAIResponseParser
+public interface IOpenAIResponseParser
 {
     ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw);
     ApplicationScoringResponse ParseApplicationScoringResponse(string raw, IReadOnlyDictionary<string, string>? questionIdAliasMap = null);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
index 28827dad22..193880b1de 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.AI.Runtime;
 
-internal interface IOpenAITransportService
+public interface IOpenAITransportService
 {
     Task<AIOperationResult> GenerateSummaryAsync(
         string content,
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
index ea36c4af2c..60905f6125 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
@@ -24,14 +24,24 @@ public ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
             response.Rating = rating;
         }
 
-        if (TryGetStringProperty(root, AIJsonKeys.Comments, out var comments))
+        if (TryGetArrayProperty(root, AIJsonKeys.Errors, out var errorsArray))
         {
-            response.Comments = comments;
+            response.Errors = ParseFindings(errorsArray).ToList();
         }
 
-        if (TryGetArrayProperty(root, AIJsonKeys.Finding, out var findingsArray))
+        if (TryGetArrayProperty(root, AIJsonKeys.Warnings, out var warningsArray))
         {
-            response.Findings = ParseFindings(findingsArray).ToList();
+            response.Warnings = ParseFindings(warningsArray).ToList();
+        }
+
+        if (TryGetArrayProperty(root, AIJsonKeys.Summaries, out var summariesArray))
+        {
+            response.Summaries = ParseFindings(summariesArray).ToList();
+        }
+
+        if (TryGetArrayProperty(root, AIJsonKeys.NextSteps, out var nextStepsArray))
+        {
+            response.NextSteps = ParseFindings(nextStepsArray).ToList();
         }
 
         if (TryGetObjectProperty(root, AIJsonKeys.Recommendation, out var recommendation))

From 61d867b8c93c5d3ead5573a5218ef43c6c20f85b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 09:09:28 -0700
Subject: [PATCH 29/45] AB#32299 split OpenAI service responsibilities

---
 .../Runtime/IOpenAIConfigurationResolver.cs   |  16 ++
 .../AI/Runtime/OpenAIConfigurationResolver.cs | 178 +++++++++++++++++
 .../AI/Runtime/OpenAIRuntimeService.cs        | 179 +----------------
 .../AI/Runtime/OpenAITransportService.cs      | 180 ++----------------
 4 files changed, 215 insertions(+), 338 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs
new file mode 100644
index 0000000000..930f17a9c7
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs
@@ -0,0 +1,16 @@
+namespace Unity.AI.Runtime;
+
+public interface IOpenAIConfigurationResolver
+{
+    string ResolveProviderName(string? operationName = null);
+
+    string ResolveApiKey(string? operationName = null);
+
+    string ResolveMaxTokensParameterNameForOperation(string? operationName = null);
+
+    double? ResolveConfiguredTemperature(string? operationName = null);
+
+    int ResolveCompletionTokens(string operationName, int defaultValue);
+
+    string ResolveApiUrl(string? operationName = null);
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
new file mode 100644
index 0000000000..d0b9a3476e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
@@ -0,0 +1,178 @@
+using Microsoft.Extensions.Configuration;
+using System;
+using System.Globalization;
+using Volo.Abp.DependencyInjection;
+
+namespace Unity.AI.Runtime;
+
+internal class OpenAIConfigurationResolver(IConfiguration configuration) : IOpenAIConfigurationResolver, ITransientDependency
+{
+    private const string DefaultMaxTokensParameterName = "max_completion_tokens";
+    private const string LegacyMaxTokensParameterName = "max_tokens";
+    private const string DefaultProviderName = "OpenAI";
+    private const string OpenAiApiKeyEnvironmentVariableName = "AZURE_OPENAI_API_KEY";
+    private const string OpenAiEndpointEnvironmentVariableName = "AZURE_OPENAI_ENDPOINT";
+
+    private readonly IConfiguration _configuration = configuration;
+
+    public string ResolveProviderName(string? operationName = null)
+    {
+        if (!string.IsNullOrWhiteSpace(operationName))
+        {
+            var configuredProvider = _configuration[$"Azure:Operations:{operationName}:Provider"];
+            if (!string.IsNullOrWhiteSpace(configuredProvider))
+            {
+                return configuredProvider.Trim();
+            }
+        }
+
+        var defaultProvider = _configuration["Azure:Operations:Defaults:Provider"];
+        return string.IsNullOrWhiteSpace(defaultProvider) ? DefaultProviderName : defaultProvider.Trim();
+    }
+
+    public string ResolveApiKey(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        if (string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
+        {
+            var injectedApiKey = _configuration[OpenAiApiKeyEnvironmentVariableName];
+            if (!string.IsNullOrWhiteSpace(injectedApiKey))
+            {
+                return injectedApiKey;
+            }
+        }
+
+        return _configuration[$"Azure:{providerName}:ApiKey"] ?? string.Empty;
+    }
+
+    public string ResolveMaxTokensParameterNameForOperation(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        var profileName = ResolveProfileName(operationName);
+        var profileParameterName = ResolveProfileSetting(providerName, profileName, "MaxTokensParameter");
+        return ResolveMaxTokensParameterName(profileParameterName);
+    }
+
+    public double? ResolveConfiguredTemperature(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        var profileName = ResolveProfileName(operationName);
+        var profileTemperature = ResolveProfileSetting(providerName, profileName, "Temperature");
+        if (profileTemperature != null
+            && double.TryParse(profileTemperature, NumberStyles.Float, CultureInfo.InvariantCulture, out var parsedTemperature))
+        {
+            return parsedTemperature;
+        }
+
+        return null;
+    }
+
+    public int ResolveCompletionTokens(string operationName, int defaultValue)
+    {
+        var configuredValue = _configuration.GetValue<int?>($"Azure:Operations:{operationName}:MaxCompletionTokens");
+        if (configuredValue is > 0)
+        {
+            return configuredValue.Value;
+        }
+
+        var defaultConfiguredValue = _configuration.GetValue<int?>("Azure:Operations:Defaults:MaxCompletionTokens");
+        return defaultConfiguredValue is > 0 ? defaultConfiguredValue.Value : defaultValue;
+    }
+
+    public string ResolveApiUrl(string? operationName = null)
+    {
+        var providerName = ResolveProviderName(operationName);
+        var profileName = ResolveProfileName(operationName);
+        var profileApiUrl = ResolveProfileSetting(providerName, profileName, "ApiUrl");
+        var injectedEndpoint = ResolveInjectedEndpoint(providerName);
+        var legacyOpenAiApiUrl = _configuration["Azure:OpenAI:ApiUrl"];
+
+        if (!string.IsNullOrWhiteSpace(injectedEndpoint) && !string.IsNullOrWhiteSpace(profileApiUrl))
+        {
+            return CombineEndpointAndPath(injectedEndpoint, profileApiUrl);
+        }
+
+        if (!string.IsNullOrWhiteSpace(profileApiUrl))
+        {
+            return profileApiUrl;
+        }
+
+        if (!string.IsNullOrWhiteSpace(legacyOpenAiApiUrl))
+        {
+            return legacyOpenAiApiUrl;
+        }
+
+        throw new InvalidOperationException($"AI API URL is not configured for provider '{providerName}'.");
+    }
+
+    private static string ResolveMaxTokensParameterName(string? configuredParameterName)
+    {
+        if (string.Equals(configuredParameterName, LegacyMaxTokensParameterName, StringComparison.Ordinal))
+        {
+            return LegacyMaxTokensParameterName;
+        }
+
+        return DefaultMaxTokensParameterName;
+    }
+
+    private string? ResolveInjectedEndpoint(string providerName)
+    {
+        if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
+        {
+            return _configuration[$"Azure:{providerName}:Endpoint"];
+        }
+
+        var injectedEndpoint = _configuration[OpenAiEndpointEnvironmentVariableName];
+        if (!string.IsNullOrWhiteSpace(injectedEndpoint))
+        {
+            return injectedEndpoint;
+        }
+
+        return _configuration["Azure:OpenAI:Endpoint"];
+    }
+
+    private string? ResolveProfileName(string? operationName)
+    {
+        if (!string.IsNullOrWhiteSpace(operationName))
+        {
+            var operationProfile = _configuration[$"Azure:Operations:{operationName}:Profile"];
+            if (!string.IsNullOrWhiteSpace(operationProfile))
+            {
+                return operationProfile.Trim();
+            }
+        }
+
+        var defaultProfile = _configuration["Azure:Operations:Defaults:Profile"];
+        return string.IsNullOrWhiteSpace(defaultProfile) ? null : defaultProfile.Trim();
+    }
+
+    private string? ResolveProfileSetting(string providerName, string? profileName, string settingName)
+    {
+        if (string.IsNullOrWhiteSpace(profileName))
+        {
+            return null;
+        }
+
+        var profileSetting = _configuration[$"Azure:{providerName}:Profiles:{profileName}:{settingName}"];
+        return string.IsNullOrWhiteSpace(profileSetting) ? null : profileSetting;
+    }
+
+    private static string CombineEndpointAndPath(string endpoint, string profilePath)
+    {
+        const char UrlPathSeparator = '/';
+
+        if (Uri.TryCreate(profilePath, UriKind.Absolute, out var absoluteUri))
+        {
+            return absoluteUri.ToString();
+        }
+
+        var trimmedEndpoint = endpoint.Trim().TrimEnd(UrlPathSeparator);
+        var trimmedPath = profilePath.Trim();
+        if (!trimmedPath.StartsWith(UrlPathSeparator))
+        {
+            trimmedPath = string.Concat(UrlPathSeparator, trimmedPath);
+        }
+
+        return trimmedEndpoint + trimmedPath;
+    }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index 74f2cd50c3..93ff719448 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -31,6 +31,7 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly IOpenAITransportService _openAITransportService;
         private readonly IOpenAIResponseParser _openAIResponseParser;
         private readonly IOpenAIPromptRenderer _openAIPromptRenderer;
+        private readonly IOpenAIConfigurationResolver _openAIConfigurationResolver;
         private readonly ICurrentTenant _currentTenant;
         private readonly IHostEnvironment _hostEnvironment;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
@@ -49,19 +50,14 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         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";
-        private const string DefaultProviderName = "OpenAI";
-        private const string OpenAiApiKeyEnvironmentVariableName = "AZURE_OPENAI_API_KEY";
-        private const string OpenAiEndpointEnvironmentVariableName = "AZURE_OPENAI_ENDPOINT";
         private const int DefaultCompletionTokens = 2000;
         private const int DefaultAttachmentSummaryCompletionTokens = 2000;
         private const int DefaultApplicationAnalysisCompletionTokens = 4000;
         private const int DefaultApplicationScoringCompletionTokens = 8000;
 
-        private int AttachmentSummaryCompletionTokens => ResolveCompletionTokens(AttachmentSummaryPromptType, DefaultAttachmentSummaryCompletionTokens);
-        private int ApplicationAnalysisCompletionTokens => ResolveCompletionTokens(ApplicationAnalysisPromptType, DefaultApplicationAnalysisCompletionTokens);
-        private int ApplicationScoringCompletionTokens => ResolveCompletionTokens(ApplicationScoringPromptType, DefaultApplicationScoringCompletionTokens);
+        private int AttachmentSummaryCompletionTokens => _openAIConfigurationResolver.ResolveCompletionTokens(AttachmentSummaryPromptType, DefaultAttachmentSummaryCompletionTokens);
+        private int ApplicationAnalysisCompletionTokens => _openAIConfigurationResolver.ResolveCompletionTokens(ApplicationAnalysisPromptType, DefaultApplicationAnalysisCompletionTokens);
+        private int ApplicationScoringCompletionTokens => _openAIConfigurationResolver.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.
@@ -88,6 +84,7 @@ public OpenAIRuntimeService(
             IOpenAITransportService openAITransportService,
             IOpenAIResponseParser openAIResponseParser,
             IOpenAIPromptRenderer openAIPromptRenderer,
+            IOpenAIConfigurationResolver openAIConfigurationResolver,
             ICurrentTenant currentTenant,
             IHostEnvironment hostEnvironment)
         {
@@ -98,13 +95,14 @@ public OpenAIRuntimeService(
             _openAITransportService = openAITransportService;
             _openAIResponseParser = openAIResponseParser;
             _openAIPromptRenderer = openAIPromptRenderer;
+            _openAIConfigurationResolver = openAIConfigurationResolver;
             _currentTenant = currentTenant;
             _hostEnvironment = hostEnvironment;
         }
 
         public Task<bool> IsAvailableAsync()
         {
-            if (string.IsNullOrEmpty(ResolveApiKey()))
+            if (string.IsNullOrEmpty(_openAIConfigurationResolver.ResolveApiKey()))
             {
                 _logger.LogWarning("Error: {Message}", MissingApiKeyMessage);
                 return Task.FromResult(false);
@@ -247,7 +245,7 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
             var attachmentSummaries = request.Attachments
                 .Select(a => $"{a.Name}: {a.Summary}")
                 .ToList();
-            if (string.IsNullOrEmpty(ResolveApiKey(ApplicationScoringPromptType)))
+            if (string.IsNullOrEmpty(_openAIConfigurationResolver.ResolveApiKey(ApplicationScoringPromptType)))
             {
                 _logger.LogWarning("{Message}", MissingApiKeyMessage);
                 return new ApplicationScoringResponse();
@@ -508,28 +506,6 @@ private void LogProviderMetadata(
                 : null;
         }
 
-        private static string ResolveMaxTokensParameterName(string? configuredParameterName)
-        {
-            if (string.Equals(configuredParameterName, LegacyMaxTokensParameterName, StringComparison.Ordinal))
-            {
-                return LegacyMaxTokensParameterName;
-            }
-
-            return DefaultMaxTokensParameterName;
-        }
-
-        private int ResolveCompletionTokens(string operationName, int defaultValue)
-        {
-            var configuredValue = _configuration.GetValue<int?>($"Azure:Operations:{operationName}:MaxCompletionTokens");
-            if (configuredValue is > 0)
-            {
-                return configuredValue.Value;
-            }
-
-            var defaultConfiguredValue = _configuration.GetValue<int?>("Azure:Operations:Defaults:MaxCompletionTokens");
-            return defaultConfiguredValue is > 0 ? defaultConfiguredValue.Value : defaultValue;
-        }
-
         private string? ResolvePromptVersionSetting(string operationName)
         {
             var operationPromptVersion = _configuration[$"Azure:Operations:{operationName}:PromptVersion"];
@@ -547,145 +523,6 @@ private int ResolveCompletionTokens(string operationName, int defaultValue)
             return _configuration["Azure:OpenAI:PromptVersion"];
         }
 
-        private string ResolveProviderName(string? operationName = null)
-        {
-            if (!string.IsNullOrWhiteSpace(operationName))
-            {
-                var configuredProvider = _configuration[$"Azure:Operations:{operationName}:Provider"];
-                if (!string.IsNullOrWhiteSpace(configuredProvider))
-                {
-                    return configuredProvider.Trim();
-                }
-            }
-
-            var defaultProvider = _configuration["Azure:Operations:Defaults:Provider"];
-            return string.IsNullOrWhiteSpace(defaultProvider) ? DefaultProviderName : defaultProvider.Trim();
-        }
-
-        private string? ResolveApiKey(string? operationName = null)
-        {
-            var providerName = ResolveProviderName(operationName);
-            if (string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
-            {
-                var injectedApiKey = _configuration[OpenAiApiKeyEnvironmentVariableName];
-                if (!string.IsNullOrWhiteSpace(injectedApiKey))
-                {
-                    return injectedApiKey;
-                }
-            }
-
-            return _configuration[$"Azure:{providerName}:ApiKey"];
-        }
-
-        private string ResolveMaxTokensParameterNameForOperation(string? operationName = null)
-        {
-            var providerName = ResolveProviderName(operationName);
-            var profileName = ResolveProfileName(operationName);
-            var profileParameterName = ResolveProfileSetting(providerName, profileName, "MaxTokensParameter");
-            return ResolveMaxTokensParameterName(profileParameterName);
-        }
-
-        private double? ResolveConfiguredTemperature(string? operationName = null)
-        {
-            var providerName = ResolveProviderName(operationName);
-            var profileName = ResolveProfileName(operationName);
-            var profileTemperature = ResolveProfileSetting(providerName, profileName, "Temperature");
-            if (profileTemperature != null
-                && double.TryParse(profileTemperature, System.Globalization.NumberStyles.Float, System.Globalization.CultureInfo.InvariantCulture, out var parsedTemperature))
-            {
-                return parsedTemperature;
-            }
-
-            return null;
-        }
-
-        private string ResolveApiUrl(string? operationName)
-        {
-            var providerName = ResolveProviderName(operationName);
-            var profileName = ResolveProfileName(operationName);
-            var profileApiUrl = ResolveProfileSetting(providerName, profileName, "ApiUrl");
-            var injectedEndpoint = ResolveInjectedEndpoint(providerName);
-            var legacyOpenAiApiUrl = _configuration["Azure:OpenAI:ApiUrl"];
-
-            if (!string.IsNullOrWhiteSpace(injectedEndpoint) && !string.IsNullOrWhiteSpace(profileApiUrl))
-            {
-                return CombineEndpointAndPath(injectedEndpoint, profileApiUrl);
-            }
-
-            if (!string.IsNullOrWhiteSpace(profileApiUrl))
-            {
-                return profileApiUrl;
-            }
-
-            if (!string.IsNullOrWhiteSpace(legacyOpenAiApiUrl))
-            {
-                return legacyOpenAiApiUrl;
-            }
-
-            throw new InvalidOperationException($"AI API URL is not configured for provider '{providerName}'.");
-        }
-
-        private string? ResolveInjectedEndpoint(string providerName)
-        {
-            if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
-            {
-                return _configuration[$"Azure:{providerName}:Endpoint"];
-            }
-
-            var injectedEndpoint = _configuration[OpenAiEndpointEnvironmentVariableName];
-            if (!string.IsNullOrWhiteSpace(injectedEndpoint))
-            {
-                return injectedEndpoint;
-            }
-
-            return _configuration["Azure:OpenAI:Endpoint"];
-        }
-
-        private string? ResolveProfileName(string? operationName)
-        {
-            if (!string.IsNullOrWhiteSpace(operationName))
-            {
-                var operationProfile = _configuration[$"Azure:Operations:{operationName}:Profile"];
-                if (!string.IsNullOrWhiteSpace(operationProfile))
-                {
-                    return operationProfile.Trim();
-                }
-            }
-
-            var defaultProfile = _configuration["Azure:Operations:Defaults:Profile"];
-            return string.IsNullOrWhiteSpace(defaultProfile) ? null : defaultProfile.Trim();
-        }
-
-        private string? ResolveProfileSetting(string providerName, string? profileName, string settingName)
-        {
-            if (string.IsNullOrWhiteSpace(profileName))
-            {
-                return null;
-            }
-
-            var profileSetting = _configuration[$"Azure:{providerName}:Profiles:{profileName}:{settingName}"];
-            return string.IsNullOrWhiteSpace(profileSetting) ? null : profileSetting;
-        }
-
-        private static string CombineEndpointAndPath(string endpoint, string profilePath)
-        {
-            const char UrlPathSeparator = '/';
-
-            if (Uri.TryCreate(profilePath, UriKind.Absolute, out var absoluteUri))
-            {
-                return absoluteUri.ToString();
-            }
-
-            var trimmedEndpoint = endpoint.Trim().TrimEnd(UrlPathSeparator);
-            var trimmedPath = profilePath.Trim();
-            if (!trimmedPath.StartsWith(UrlPathSeparator))
-            {
-                trimmedPath = string.Concat(UrlPathSeparator, trimmedPath);
-            }
-
-            return trimmedEndpoint + trimmedPath;
-        }
-
         private async Task LogPromptInputAsync(string promptType, string promptVersion, string? systemPrompt, string userPrompt)
         {
             var formattedInput = FormatPromptInputForLog(systemPrompt, userPrompt);
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
index aa0236311b..f1bac232db 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
@@ -1,8 +1,6 @@
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Net;
 using System.Net.Http;
 using System.Text;
@@ -15,17 +13,11 @@ namespace Unity.AI.Runtime;
 
 internal class OpenAITransportService(
     HttpClient httpClient,
-    IConfiguration configuration,
+    IOpenAIConfigurationResolver configurationResolver,
     ILogger<OpenAITransportService> logger) : IOpenAITransportService, ITransientDependency
 {
-    private const string DefaultMaxTokensParameterName = "max_completion_tokens";
-    private const string LegacyMaxTokensParameterName = "max_tokens";
-    private const string DefaultProviderName = "OpenAI";
-    private const string OpenAiApiKeyEnvironmentVariableName = "AZURE_OPENAI_API_KEY";
-    private const string OpenAiEndpointEnvironmentVariableName = "AZURE_OPENAI_ENDPOINT";
-
     private readonly HttpClient _httpClient = httpClient;
-    private readonly IConfiguration _configuration = configuration;
+    private readonly IOpenAIConfigurationResolver _configurationResolver = configurationResolver;
     private readonly ILogger<OpenAITransportService> _logger = logger;
 
     public async Task<AIOperationResult> GenerateSummaryAsync(
@@ -37,14 +29,14 @@ public async Task<AIOperationResult> GenerateSummaryAsync(
         string? promptVersion = null,
         string? fileName = null)
     {
-        var providerName = ResolveProviderName(operationName);
-        if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
+        var providerName = _configurationResolver.ResolveProviderName(operationName);
+        if (!string.Equals(providerName, "OpenAI", StringComparison.Ordinal))
         {
             _logger.LogWarning("Provider {ProviderName} is not supported by OpenAI transport.", providerName);
             return AIOperationResult.PermanentFailure(new AIProviderResult($"Unsupported provider: {providerName}"));
         }
 
-        var apiKey = ResolveApiKey(operationName);
+        var apiKey = _configurationResolver.ResolveApiKey(operationName);
         if (string.IsNullOrEmpty(apiKey))
         {
             _logger.LogWarning("Error: OpenAI API key is not configured");
@@ -64,10 +56,10 @@ public async Task<AIOperationResult> GenerateSummaryAsync(
                     new { role = "system", content = resolvedSystemPrompt },
                     new { role = "user", content = content ?? string.Empty }
                 },
-                [ResolveMaxTokensParameterNameForOperation(operationName)] = maxTokens
+                [_configurationResolver.ResolveMaxTokensParameterNameForOperation(operationName)] = maxTokens
             };
 
-            var resolvedTemperature = temperature ?? ResolveConfiguredTemperature(operationName);
+            var resolvedTemperature = temperature ?? _configurationResolver.ResolveConfiguredTemperature(operationName);
             if (resolvedTemperature.HasValue)
             {
                 requestPayload["temperature"] = resolvedTemperature.Value;
@@ -76,10 +68,13 @@ public async Task<AIOperationResult> GenerateSummaryAsync(
             var json = JsonSerializer.Serialize(requestPayload);
             var httpContent = new StringContent(json, Encoding.UTF8, "application/json");
 
-            _httpClient.DefaultRequestHeaders.Clear();
-            _httpClient.DefaultRequestHeaders.Add("Authorization", apiKey);
+            using var request = new HttpRequestMessage(HttpMethod.Post, _configurationResolver.ResolveApiUrl(operationName))
+            {
+                Content = httpContent
+            };
+            request.Headers.TryAddWithoutValidation("Authorization", apiKey);
 
-            var response = await _httpClient.PostAsync(ResolveApiUrl(operationName), httpContent);
+            var response = await _httpClient.SendAsync(request);
             var responseContent = await response.Content.ReadAsStringAsync();
             var metadata = TryExtractProviderMetadata(responseContent);
             var providerResponse = BuildProviderResponseFromMetadata(
@@ -131,155 +126,6 @@ public async Task<AIOperationResult> GenerateSummaryAsync(
         }
     }
 
-    private string ResolveApiKey(string? operationName = null)
-    {
-        var providerName = ResolveProviderName(operationName);
-        if (string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
-        {
-            var injectedApiKey = _configuration[OpenAiApiKeyEnvironmentVariableName];
-            if (!string.IsNullOrWhiteSpace(injectedApiKey))
-            {
-                return injectedApiKey;
-            }
-        }
-
-        return _configuration[$"Azure:{providerName}:ApiKey"] ?? string.Empty;
-    }
-
-    private string ResolveProviderName(string? operationName = null)
-    {
-        if (!string.IsNullOrWhiteSpace(operationName))
-        {
-            var configuredProvider = _configuration[$"Azure:Operations:{operationName}:Provider"];
-            if (!string.IsNullOrWhiteSpace(configuredProvider))
-            {
-                return configuredProvider.Trim();
-            }
-        }
-
-        var defaultProvider = _configuration["Azure:Operations:Defaults:Provider"];
-        return string.IsNullOrWhiteSpace(defaultProvider) ? DefaultProviderName : defaultProvider.Trim();
-    }
-
-    private string ResolveMaxTokensParameterNameForOperation(string? operationName = null)
-    {
-        var providerName = ResolveProviderName(operationName);
-        var profileName = ResolveProfileName(operationName);
-        var profileParameterName = ResolveProfileSetting(providerName, profileName, "MaxTokensParameter");
-        return ResolveMaxTokensParameterName(profileParameterName);
-    }
-
-    private double? ResolveConfiguredTemperature(string? operationName = null)
-    {
-        var providerName = ResolveProviderName(operationName);
-        var profileName = ResolveProfileName(operationName);
-        var profileTemperature = ResolveProfileSetting(providerName, profileName, "Temperature");
-        if (profileTemperature != null
-            && double.TryParse(profileTemperature, NumberStyles.Float, CultureInfo.InvariantCulture, out var parsedTemperature))
-        {
-            return parsedTemperature;
-        }
-
-        return null;
-    }
-
-    private string ResolveApiUrl(string? operationName)
-    {
-        var providerName = ResolveProviderName(operationName);
-        var profileName = ResolveProfileName(operationName);
-        var profileApiUrl = ResolveProfileSetting(providerName, profileName, "ApiUrl");
-        var injectedEndpoint = ResolveInjectedEndpoint(providerName);
-        var legacyOpenAiApiUrl = _configuration["Azure:OpenAI:ApiUrl"];
-
-        if (!string.IsNullOrWhiteSpace(injectedEndpoint) && !string.IsNullOrWhiteSpace(profileApiUrl))
-        {
-            return CombineEndpointAndPath(injectedEndpoint, profileApiUrl);
-        }
-
-        if (!string.IsNullOrWhiteSpace(profileApiUrl))
-        {
-            return profileApiUrl;
-        }
-
-        if (!string.IsNullOrWhiteSpace(legacyOpenAiApiUrl))
-        {
-            return legacyOpenAiApiUrl;
-        }
-
-        throw new InvalidOperationException($"AI API URL is not configured for provider '{providerName}'.");
-    }
-
-    private string? ResolveInjectedEndpoint(string providerName)
-    {
-        if (!string.Equals(providerName, DefaultProviderName, StringComparison.Ordinal))
-        {
-            return _configuration[$"Azure:{providerName}:Endpoint"];
-        }
-
-        var injectedEndpoint = _configuration[OpenAiEndpointEnvironmentVariableName];
-        if (!string.IsNullOrWhiteSpace(injectedEndpoint))
-        {
-            return injectedEndpoint;
-        }
-
-        return _configuration["Azure:OpenAI:Endpoint"];
-    }
-
-    private string? ResolveProfileName(string? operationName)
-    {
-        if (!string.IsNullOrWhiteSpace(operationName))
-        {
-            var operationProfile = _configuration[$"Azure:Operations:{operationName}:Profile"];
-            if (!string.IsNullOrWhiteSpace(operationProfile))
-            {
-                return operationProfile.Trim();
-            }
-        }
-
-        var defaultProfile = _configuration["Azure:Operations:Defaults:Profile"];
-        return string.IsNullOrWhiteSpace(defaultProfile) ? null : defaultProfile.Trim();
-    }
-
-    private string? ResolveProfileSetting(string providerName, string? profileName, string settingName)
-    {
-        if (string.IsNullOrWhiteSpace(profileName))
-        {
-            return null;
-        }
-
-        var profileSetting = _configuration[$"Azure:{providerName}:Profiles:{profileName}:{settingName}"];
-        return string.IsNullOrWhiteSpace(profileSetting) ? null : profileSetting;
-    }
-
-    private static string ResolveMaxTokensParameterName(string? configuredParameterName)
-    {
-        if (string.Equals(configuredParameterName, LegacyMaxTokensParameterName, StringComparison.Ordinal))
-        {
-            return LegacyMaxTokensParameterName;
-        }
-
-        return DefaultMaxTokensParameterName;
-    }
-
-    private static string CombineEndpointAndPath(string endpoint, string profilePath)
-    {
-        const char UrlPathSeparator = '/';
-
-        if (Uri.TryCreate(profilePath, UriKind.Absolute, out var absoluteUri))
-        {
-            return absoluteUri.ToString();
-        }
-
-        var trimmedEndpoint = endpoint.Trim().TrimEnd(UrlPathSeparator);
-        var trimmedPath = profilePath.Trim();
-        if (!trimmedPath.StartsWith(UrlPathSeparator))
-        {
-            trimmedPath = string.Concat(UrlPathSeparator, trimmedPath);
-        }
-
-        return trimmedEndpoint + trimmedPath;
-    }
-
     private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AIProviderResult response)
     {
         var statusCodeValue = (int)statusCode;

From e284e123f93156b0b12e0aaf7d29388e10a94c17 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 09:30:42 -0700
Subject: [PATCH 30/45] AB#32299 simplify OpenAI runtime split

---
 .../Runtime/IOpenAIConfigurationResolver.cs   | 16 -------------
 .../AI/Runtime/IOpenAIPromptRenderer.cs       | 24 -------------------
 .../AI/Runtime/IOpenAIResponseParser.cs       | 10 --------
 .../AI/Runtime/IOpenAITransportService.cs     | 16 -------------
 .../AI/Runtime/OpenAIConfigurationResolver.cs |  2 +-
 .../AI/Runtime/OpenAIPromptRenderer.cs        |  2 +-
 .../AI/Runtime/OpenAIResponseParser.cs        |  2 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        | 18 +++++++-------
 .../AI/Runtime/OpenAITransportService.cs      |  8 +++----
 9 files changed, 15 insertions(+), 83 deletions(-)
 delete mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs
 delete mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
 delete mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
 delete mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs
deleted file mode 100644
index 930f17a9c7..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIConfigurationResolver.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-namespace Unity.AI.Runtime;
-
-public interface IOpenAIConfigurationResolver
-{
-    string ResolveProviderName(string? operationName = null);
-
-    string ResolveApiKey(string? operationName = null);
-
-    string ResolveMaxTokensParameterNameForOperation(string? operationName = null);
-
-    double? ResolveConfiguredTemperature(string? operationName = null);
-
-    int ResolveCompletionTokens(string operationName, int defaultValue);
-
-    string ResolveApiUrl(string? operationName = null);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
deleted file mode 100644
index d2449ed465..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIPromptRenderer.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-
-namespace Unity.AI.Runtime;
-
-public interface IOpenAIPromptRenderer
-{
-    string ResolvePromptVersion(string? version);
-
-    string BuildApplicationAnalysisSystemPrompt(string version);
-
-    string BuildApplicationAnalysisUserPrompt(string version, string schema, string data, string attachments);
-
-    string BuildAttachmentSummarySystemPrompt(string version);
-
-    string BuildAttachmentSummaryUserPrompt(string version, string attachment);
-
-    string BuildApplicationScoringSystemPrompt(string version);
-
-    string BuildApplicationScoringUserPrompt(string version, string data, string attachments, string section, string response);
-
-    string BuildApplicationScoringResponseTemplate(string sectionPayloadJson);
-
-    string BuildAliasedApplicationScoringSection(string? sectionName, string sectionJson, out IReadOnlyDictionary<string, string> questionIdAliasMap);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
deleted file mode 100644
index 9b457e0917..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAIResponseParser.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Collections.Generic;
-using Unity.AI.Responses;
-
-namespace Unity.AI.Runtime;
-
-public interface IOpenAIResponseParser
-{
-    ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw);
-    ApplicationScoringResponse ParseApplicationScoringResponse(string raw, IReadOnlyDictionary<string, string>? questionIdAliasMap = null);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
deleted file mode 100644
index 193880b1de..0000000000
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/IOpenAITransportService.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Threading.Tasks;
-using Unity.AI.Models;
-
-namespace Unity.AI.Runtime;
-
-public interface IOpenAITransportService
-{
-    Task<AIOperationResult> GenerateSummaryAsync(
-        string content,
-        string? systemPrompt,
-        int maxTokens = 150,
-        double? temperature = null,
-        string? operationName = null,
-        string? promptVersion = null,
-        string? fileName = null);
-}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
index d0b9a3476e..7d999907aa 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIConfigurationResolver.cs
@@ -5,7 +5,7 @@
 
 namespace Unity.AI.Runtime;
 
-internal class OpenAIConfigurationResolver(IConfiguration configuration) : IOpenAIConfigurationResolver, ITransientDependency
+public class OpenAIConfigurationResolver(IConfiguration configuration) : ITransientDependency
 {
     private const string DefaultMaxTokensParameterName = "max_completion_tokens";
     private const string LegacyMaxTokensParameterName = "max_tokens";
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
index f6eb8ed223..a917d59982 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.AI.Runtime;
 
-internal class OpenAIPromptRenderer : IOpenAIPromptRenderer, ITransientDependency
+public class OpenAIPromptRenderer : ITransientDependency
 {
     private const string PromptVersionV0 = "v0";
     private const string PromptVersionV1 = "v1";
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
index 60905f6125..6f86438dbb 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
@@ -9,7 +9,7 @@
 
 namespace Unity.AI.Runtime;
 
-internal class OpenAIResponseParser : IOpenAIResponseParser, ITransientDependency
+public class OpenAIResponseParser : ITransientDependency
 {
     public ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
     {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index 93ff719448..e4c69cd14f 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -24,14 +24,13 @@ namespace Unity.AI.Runtime
     [ExposeServices(typeof(IAIService))]
     public class OpenAIRuntimeService : IAIService, ITransientDependency
     {
-        private readonly HttpClient _httpClient;
         private readonly IConfiguration _configuration;
         private readonly ILogger<OpenAIRuntimeService> _logger;
         private readonly ITextExtractionService _textExtractionService;
-        private readonly IOpenAITransportService _openAITransportService;
-        private readonly IOpenAIResponseParser _openAIResponseParser;
-        private readonly IOpenAIPromptRenderer _openAIPromptRenderer;
-        private readonly IOpenAIConfigurationResolver _openAIConfigurationResolver;
+        private readonly OpenAITransportService _openAITransportService;
+        private readonly OpenAIResponseParser _openAIResponseParser;
+        private readonly OpenAIPromptRenderer _openAIPromptRenderer;
+        private readonly OpenAIConfigurationResolver _openAIConfigurationResolver;
         private readonly ICurrentTenant _currentTenant;
         private readonly IHostEnvironment _hostEnvironment;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
@@ -81,14 +80,13 @@ public OpenAIRuntimeService(
             IConfiguration configuration,
             ILogger<OpenAIRuntimeService> logger,
             ITextExtractionService textExtractionService,
-            IOpenAITransportService openAITransportService,
-            IOpenAIResponseParser openAIResponseParser,
-            IOpenAIPromptRenderer openAIPromptRenderer,
-            IOpenAIConfigurationResolver openAIConfigurationResolver,
+            OpenAITransportService openAITransportService,
+            OpenAIResponseParser openAIResponseParser,
+            OpenAIPromptRenderer openAIPromptRenderer,
+            OpenAIConfigurationResolver openAIConfigurationResolver,
             ICurrentTenant currentTenant,
             IHostEnvironment hostEnvironment)
         {
-            _httpClient = httpClient;
             _configuration = configuration;
             _logger = logger;
             _textExtractionService = textExtractionService;
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
index f1bac232db..cc9a914e75 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
@@ -11,13 +11,13 @@
 
 namespace Unity.AI.Runtime;
 
-internal class OpenAITransportService(
+public class OpenAITransportService(
     HttpClient httpClient,
-    IOpenAIConfigurationResolver configurationResolver,
-    ILogger<OpenAITransportService> logger) : IOpenAITransportService, ITransientDependency
+    OpenAIConfigurationResolver configurationResolver,
+    ILogger<OpenAITransportService> logger) : ITransientDependency
 {
     private readonly HttpClient _httpClient = httpClient;
-    private readonly IOpenAIConfigurationResolver _configurationResolver = configurationResolver;
+    private readonly OpenAIConfigurationResolver _configurationResolver = configurationResolver;
     private readonly ILogger<OpenAITransportService> _logger = logger;
 
     public async Task<AIOperationResult> GenerateSummaryAsync(

From b9f787358eaba58693dab2747a3f4a4e65a5c33b Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 11:42:05 -0700
Subject: [PATCH 31/45] AB#32299 align response parser with dev contract

---
 .../AI/Runtime/OpenAIResponseParser.cs        | 64 +++----------------
 1 file changed, 10 insertions(+), 54 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
index 6f86438dbb..57d99bf060 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
@@ -19,9 +19,9 @@ public ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
             return response;
         }
 
-        if (TryGetStringProperty(root, AIJsonKeys.Rating, out var rating))
+        if (TryGetStringProperty(root, AIJsonKeys.Decision, out var decision))
         {
-            response.Rating = rating;
+            response.Decision = decision.Trim().ToUpperInvariant();
         }
 
         if (TryGetArrayProperty(root, AIJsonKeys.Errors, out var errorsArray))
@@ -39,14 +39,9 @@ public ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
             response.Summaries = ParseFindings(summariesArray).ToList();
         }
 
-        if (TryGetArrayProperty(root, AIJsonKeys.NextSteps, out var nextStepsArray))
+        if (TryGetArrayProperty(root, AIJsonKeys.Recommendations, out var recommendationsArray))
         {
-            response.NextSteps = ParseFindings(nextStepsArray).ToList();
-        }
-
-        if (TryGetObjectProperty(root, AIJsonKeys.Recommendation, out var recommendation))
-        {
-            response.Recommendation = ParseRecommendation(recommendation);
+            response.Recommendations = ParseFindings(recommendationsArray).ToList();
         }
 
         return response;
@@ -69,7 +64,7 @@ private static string AddIdsToAnalysisItems(string analysisJson)
                     if (outputPropertyName == AIJsonKeys.Errors ||
                         outputPropertyName == AIJsonKeys.Warnings ||
                         outputPropertyName == AIJsonKeys.Summaries ||
-                        outputPropertyName == AIJsonKeys.NextSteps)
+                        outputPropertyName == AIJsonKeys.Recommendations)
                     {
                         writer.WritePropertyName(outputPropertyName);
                         writer.WriteStartArray();
@@ -171,9 +166,10 @@ private static IEnumerable<ApplicationAnalysisFinding> ParseFindings(JsonElement
                 id = idProp.GetString() ?? id;
             }
 
-            var hidden = item.TryGetProperty(AIJsonKeys.Hidden, out var hiddenProp) &&
-                (hiddenProp.ValueKind == JsonValueKind.True || hiddenProp.ValueKind == JsonValueKind.False) &&
-                hiddenProp.GetBoolean();
+            var dismissed = item.TryGetProperty(AIJsonKeys.Dismissed, out var dismissedProp) &&
+                (dismissedProp.ValueKind == JsonValueKind.True || dismissedProp.ValueKind == JsonValueKind.False) &&
+                dismissedProp.GetBoolean();
+
             string? title = null;
             if (item.TryGetProperty(AIJsonKeys.Title, out var titleProp) && titleProp.ValueKind == JsonValueKind.String)
             {
@@ -189,41 +185,13 @@ private static IEnumerable<ApplicationAnalysisFinding> ParseFindings(JsonElement
             yield return new ApplicationAnalysisFinding
             {
                 Id = id,
-                Hidden = hidden,
+                Dismissed = dismissed,
                 Title = title,
                 Detail = detail
             };
         }
     }
 
-    private static ApplicationAnalysisRecommendation? ParseRecommendation(JsonElement recommendation)
-    {
-        string? decision = null;
-        if (recommendation.TryGetProperty(AIJsonKeys.Decision, out var decisionProp) &&
-            decisionProp.ValueKind == JsonValueKind.String)
-        {
-            decision = decisionProp.GetString();
-        }
-
-        string? rationale = null;
-        if (recommendation.TryGetProperty(AIJsonKeys.Rationale, out var rationaleProp) &&
-            rationaleProp.ValueKind == JsonValueKind.String)
-        {
-            rationale = rationaleProp.GetString();
-        }
-
-        if (string.IsNullOrWhiteSpace(decision) && string.IsNullOrWhiteSpace(rationale))
-        {
-            return null;
-        }
-
-        return new ApplicationAnalysisRecommendation
-        {
-            Decision = decision,
-            Rationale = rationale
-        };
-    }
-
     private static bool TryParseJsonObjectFromResponse(string response, out JsonElement objectElement)
     {
         objectElement = default;
@@ -274,18 +242,6 @@ private static bool TryGetArrayProperty(JsonElement element, string propertyName
         return true;
     }
 
-    private static bool TryGetObjectProperty(JsonElement element, string propertyName, out JsonElement value)
-    {
-        value = default;
-        if (!element.TryGetProperty(propertyName, out var prop) || prop.ValueKind != JsonValueKind.Object)
-        {
-            return false;
-        }
-
-        value = prop.Clone();
-        return true;
-    }
-
     private static int NormalizeConfidence(int confidence)
     {
         var clamped = Math.Clamp(confidence, 0, 100);

From c776c6c6fdf8edca4f4c09eed627b48317ca581f Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 15 Apr 2026 11:33:53 -0700
Subject: [PATCH 32/45] AB#32301 decouple AI runtime boundary

---
 .../Attachments/AttachmentSummaryResultDto.cs |  6 ++
 .../IAttachmentSummaryAppService.cs           |  4 +-
 .../ApplicationAnalysisResultDto.cs           |  6 ++
 .../ApplicationContentResultDto.cs            |  6 ++
 .../ApplicationScoringResultDto.cs            |  6 ++
 .../IApplicationAnalysisAppService.cs         |  2 +-
 .../IApplicationContentAppService.cs          |  2 +-
 .../IApplicationScoringAppService.cs          |  2 +-
 .../AttachmentSummaryAppService.cs            | 27 ++++----
 .../ApplicationAnalysisAppService.cs          | 25 +++----
 .../ApplicationContentAppService.cs           |  7 +-
 .../ApplicationScoringAppService.cs           | 27 +++-----
 .../GenerateApplicationAnalysisJob.cs         | 12 ++--
 .../GenerateApplicationScoringJob.cs          | 10 +--
 .../GenerateAttachmentSummaryJob.cs           |  9 +--
 .../RunApplicationAIPipelineJob.cs            | 69 ++++++++++---------
 .../GrantManagerApplicationModule.cs          |  2 -
 .../Unity.GrantManager.Application.csproj     |  1 -
 .../GrantManagerHttpApiClientModule.cs        |  8 ++-
 19 files changed, 127 insertions(+), 104 deletions(-)
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/AttachmentSummaryResultDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationAnalysisResultDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationContentResultDto.cs
 create mode 100644 applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationScoringResultDto.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/AttachmentSummaryResultDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/AttachmentSummaryResultDto.cs
new file mode 100644
index 0000000000..b7100305b0
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/AttachmentSummaryResultDto.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.Attachments;
+
+public class AttachmentSummaryResultDto
+{
+    public bool Completed { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
index 65589ed840..b9eb70ae3a 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs
@@ -7,6 +7,6 @@ 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);
+    Task<AttachmentSummaryResultDto> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null);
+    Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationAnalysisResultDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationAnalysisResultDto.cs
new file mode 100644
index 0000000000..19c829756e
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationAnalysisResultDto.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.GrantApplications;
+
+public class ApplicationAnalysisResultDto
+{
+    public bool Completed { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationContentResultDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationContentResultDto.cs
new file mode 100644
index 0000000000..0349127194
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationContentResultDto.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.GrantApplications;
+
+public class ApplicationContentResultDto
+{
+    public bool Completed { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationScoringResultDto.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationScoringResultDto.cs
new file mode 100644
index 0000000000..b4e4e86214
--- /dev/null
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/ApplicationScoringResultDto.cs
@@ -0,0 +1,6 @@
+namespace Unity.GrantManager.GrantApplications;
+
+public class ApplicationScoringResultDto
+{
+    public bool Completed { get; set; }
+}
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
index 493eb82c56..21bf7c7867 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationAnalysisAppService.cs
@@ -6,6 +6,6 @@ namespace Unity.GrantManager.GrantApplications
 {
     public interface IApplicationAnalysisAppService : IApplicationService
     {
-        Task<string> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
+        Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
index c2d27129a6..1ce45e8a99 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationContentAppService.cs
@@ -6,5 +6,5 @@ namespace Unity.GrantManager.GrantApplications;
 
 public interface IApplicationContentAppService : IApplicationService
 {
-    Task<string> GenerateContentAsync(Guid applicationId, string? promptVersion = null);
+    Task<ApplicationContentResultDto> GenerateContentAsync(Guid applicationId, string? promptVersion = null);
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
index dae0bc4fb7..c9a7fbab08 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/GrantApplications/IApplicationScoringAppService.cs
@@ -6,6 +6,6 @@ namespace Unity.GrantManager.GrantApplications
 {
     public interface IApplicationScoringAppService : IApplicationService
     {
-        Task<string> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
+        Task<ApplicationScoringResultDto> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null);
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs
index 681d7e55da..511669df41 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/Attachments/AttachmentSummaryAppService.cs
@@ -1,10 +1,8 @@
 using Microsoft.AspNetCore.Authorization;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Unity.AI;
-using Unity.AI.Automation;
+using Unity.AI.Operations;
 using Unity.AI.Permissions;
 using Volo.Abp;
 using Volo.Abp.DependencyInjection;
@@ -13,27 +11,23 @@
 namespace Unity.GrantManager.Attachments;
 
 [Authorize(AIPermissions.Analysis.ViewAttachmentSummary)]
-[Dependency(ReplaceServices = true)]
 [ExposeServices(typeof(AttachmentSummaryAppService), typeof(IAttachmentSummaryAppService))]
 public class AttachmentSummaryAppService(
-    IApplicationAIGenerationQueue aiGenerationQueue,
+    IAttachmentSummaryService attachmentSummaryService,
     IFeatureChecker featureChecker) : AIAppService, IAttachmentSummaryAppService
 {
-    private const string SummaryGenerationQueuedMessage = "AI summary generation queued.";
-
-    public async Task<string> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null)
+    public async Task<AttachmentSummaryResultDto> GenerateAttachmentSummaryAsync(System.Guid attachmentId, string? promptVersion = null)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
             throw new UserFriendlyException("AI attachment summaries are not enabled.");
         }
 
-        await aiGenerationQueue.QueueAttachmentSummariesAsync([attachmentId], CurrentTenant.Id, promptVersion);
-
-        return SummaryGenerationQueuedMessage;
+        await attachmentSummaryService.GenerateAndSaveAsync(attachmentId, promptVersion);
+        return new AttachmentSummaryResultDto { Completed = true };
     }
 
-    public async Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null)
+    public async Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesAsync(List<System.Guid> attachmentIds, string? promptVersion = null)
     {
         if (!await featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries"))
         {
@@ -45,8 +39,13 @@ public async Task<List<string>> GenerateAttachmentSummariesAsync(List<Guid> atta
             return [];
         }
 
-        await aiGenerationQueue.QueueAttachmentSummariesAsync(attachmentIds, CurrentTenant.Id, promptVersion);
+        var results = new List<AttachmentSummaryResultDto>();
+        foreach (var attachmentId in attachmentIds)
+        {
+            await attachmentSummaryService.GenerateAndSaveAsync(attachmentId, promptVersion);
+            results.Add(new AttachmentSummaryResultDto { Completed = true });
+        }
 
-        return attachmentIds.Select(_ => SummaryGenerationQueuedMessage).ToList();
+        return results;
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
index 483a30c8df..d793fd28ef 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
@@ -3,8 +3,8 @@
 using System;
 using System.Threading.Tasks;
 using Unity.AI;
+using Unity.AI.Operations;
 using Unity.AI.Permissions;
-using Unity.AI.Automation;
 using Volo.Abp;
 using Volo.Abp.Features;
 
@@ -12,27 +12,18 @@ namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.Analysis.ViewApplicationAnalysis)]
 public class ApplicationAnalysisAppService(
-    IApplicationAIGenerationQueue aiGenerationQueue,
+    IApplicationAnalysisService applicationAnalysisService,
     IFeatureChecker featureChecker)
     : AIAppService, IApplicationAnalysisAppService
 {
-    public async Task<string> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<ApplicationAnalysisResultDto> GenerateApplicationAnalysisAsync(Guid applicationId, string? promptVersion = null)
     {
-        try
+        if (!await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis"))
         {
-            if (!await featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis"))
-            {
-                throw new UserFriendlyException("AI application analysis is not enabled.");
-            }
-
-            await aiGenerationQueue.QueueApplicationAnalysisAsync(applicationId, CurrentTenant.Id, promptVersion);
-
-            return "{}";
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex, "Error queueing AI analysis for application {ApplicationId}", applicationId);
-            throw new UserFriendlyException("Failed to queue AI analysis. Please try again.");
+            throw new UserFriendlyException("AI application analysis is not enabled.");
         }
+
+        await applicationAnalysisService.RegenerateAndSaveAsync(applicationId, promptVersion);
+        return new ApplicationAnalysisResultDto { Completed = true };
     }
 }
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
index d19f82767d..cde8adca99 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
@@ -18,7 +18,7 @@ public class ApplicationContentAppService(
     IFeatureChecker featureChecker)
     : AIAppService, IApplicationContentAppService
 {
-    public async Task<string> GenerateContentAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<ApplicationContentResultDto> GenerateContentAsync(Guid applicationId, string? promptVersion = null)
     {
         try
         {
@@ -33,7 +33,10 @@ public async Task<string> GenerateContentAsync(Guid applicationId, string? promp
 
             await aiGenerationQueue.QueueApplicationPipelineAsync(applicationId, CurrentTenant.Id, promptVersion);
 
-            return "{}";
+            return new ApplicationContentResultDto
+            {
+                Completed = true
+            };
         }
         catch (Exception ex)
         {
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs
index d42a95f206..811295d4dd 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationScoringAppService.cs
@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
 using Unity.AI;
-using Unity.AI.Automation;
+using Unity.AI.Operations;
 using Unity.AI.Permissions;
 using Volo.Abp;
 using Volo.Abp.Features;
@@ -12,27 +11,21 @@ namespace Unity.GrantManager.GrantApplications;
 
 [Authorize(AIPermissions.Analysis.ViewScoringResult)]
 public class ApplicationScoringAppService(
-    IApplicationAIGenerationQueue aiGenerationQueue,
+    IApplicationScoringService applicationScoringService,
     IFeatureChecker featureChecker)
     : AIAppService, IApplicationScoringAppService
 {
-    public async Task<string> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null)
+    public async Task<ApplicationScoringResultDto> GenerateApplicationScoringAsync(Guid applicationId, string? promptVersion = null)
     {
-        try
+        if (!await featureChecker.IsEnabledAsync("Unity.AI.Scoring"))
         {
-            if (!await featureChecker.IsEnabledAsync("Unity.AI.Scoring"))
-            {
-                throw new UserFriendlyException("AI scoring is not enabled.");
-            }
-
-            await aiGenerationQueue.QueueApplicationScoringAsync(applicationId, CurrentTenant.Id, promptVersion);
-
-            return "{}";
+            throw new UserFriendlyException("AI scoring is not enabled.");
         }
-        catch (Exception ex)
+
+        await applicationScoringService.RegenerateAndSaveAsync(applicationId, promptVersion);
+        return new ApplicationScoringResultDto
         {
-            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.");
-        }
+            Completed = true
+        };
     }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs
index 703093123a..c3d3448687 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationAnalysisJob.cs
@@ -1,12 +1,12 @@
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
-using Unity.AI.Operations;
+using Unity.GrantManager.GrantApplications;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
 namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 public class GenerateApplicationAnalysisJob(
-    IApplicationAnalysisService applicationAnalysisService,
+    IApplicationAnalysisAppService applicationAnalysisService,
     ICurrentTenant currentTenant,
     ILogger<GenerateApplicationAnalysisJob> logger) : AsyncBackgroundJob<GenerateApplicationAnalysisBackgroundJobArgs>, ITransientDependency
 {
@@ -15,7 +15,11 @@ public override async Task ExecuteAsync(GenerateApplicationAnalysisBackgroundJob
         using (currentTenant.Change(args.TenantId))
         {
             logger.LogInformation("Executing AI application analysis job for application {ApplicationId}.", args.ApplicationId);
-            await applicationAnalysisService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+            var result = await applicationAnalysisService.GenerateApplicationAnalysisAsync(args.ApplicationId, args.PromptVersion);
+            if (result.Completed)
+            {
+                logger.LogInformation("Completed AI application analysis job for application {ApplicationId}.", args.ApplicationId);
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
index e57e157ac0..c0a4bf06f2 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
-using Unity.AI.Operations;
+using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.GrantApplications.Automation.Events;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
@@ -9,7 +9,7 @@
 using Volo.Abp.MultiTenancy;
 namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 public class GenerateApplicationScoringJob(
-    IApplicationScoringService applicationScoringService,
+    IApplicationScoringAppService applicationScoringService,
     ILocalEventBus localEventBus,
     ICurrentTenant currentTenant,
     ILogger<GenerateApplicationScoringJob> logger) : AsyncBackgroundJob<GenerateApplicationScoringBackgroundJobArgs>, ITransientDependency
@@ -19,8 +19,8 @@ public override async Task ExecuteAsync(GenerateApplicationScoringBackgroundJobA
         using (currentTenant.Change(args.TenantId))
         {
             logger.LogInformation("Executing AI application scoring job for application {ApplicationId}.", args.ApplicationId);
-            var result = await applicationScoringService.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-            if (!string.Equals(result, "{}", StringComparison.Ordinal))
+            var result = await applicationScoringService.GenerateApplicationScoringAsync(args.ApplicationId, args.PromptVersion);
+            if (result.Completed)
             {
                 await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
                 {
@@ -29,4 +29,4 @@ await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs
index 21a9a7450a..c47c667005 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateAttachmentSummaryJob.cs
@@ -1,12 +1,12 @@
 using Microsoft.Extensions.Logging;
 using System.Threading.Tasks;
-using Unity.AI.Operations;
+using Unity.GrantManager.Attachments;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
 namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
 public class GenerateAttachmentSummaryJob(
-    IAttachmentSummaryService attachmentSummaryService,
+    IAttachmentSummaryAppService attachmentSummaryService,
     ICurrentTenant currentTenant,
     ILogger<GenerateAttachmentSummaryJob> logger) : AsyncBackgroundJob<GenerateAttachmentSummaryBackgroundJobArgs>, ITransientDependency
 {
@@ -17,7 +17,8 @@ public override async Task ExecuteAsync(GenerateAttachmentSummaryBackgroundJobAr
             logger.LogInformation(
                 "Executing AI attachment summary job for {AttachmentCount} attachment(s).",
                 args.AttachmentIds.Count);
-            await attachmentSummaryService.GenerateAndSaveAsync(args.AttachmentIds, args.PromptVersion);
+            var results = await attachmentSummaryService.GenerateAttachmentSummariesAsync(args.AttachmentIds, args.PromptVersion);
+            logger.LogInformation("Completed AI attachment summaries for {CompletedCount} attachment(s).", results.Count);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs
index 86cae4be34..9c06a650f5 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/RunApplicationAIPipelineJob.cs
@@ -1,71 +1,67 @@
 using Microsoft.Extensions.Logging;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
-using Unity.AI.Settings;
+using Unity.GrantManager.Applications;
+using Unity.GrantManager.Attachments;
+using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.GrantApplications.Automation.Events;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Features;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.Settings;
+
 namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
+
 public class RunApplicationAIPipelineJob(
-    AIOperationServices aiOperationServices,
-    ApplicationFormServices applicationFormServices,
+    IApplicationChefsFileAttachmentRepository applicationChefsFileAttachmentRepository,
+    IAttachmentSummaryAppService attachmentSummaryAppService,
+    IApplicationAnalysisAppService applicationAnalysisAppService,
+    IApplicationScoringAppService applicationScoringAppService,
     IFeatureChecker featureChecker,
     ILocalEventBus localEventBus,
     ICurrentTenant currentTenant,
-    ISettingProvider settingProvider,
     ILogger<RunApplicationAIPipelineJob> logger) : AsyncBackgroundJob<RunApplicationAIPipelineJobArgs>, ITransientDependency
 {
     public override async Task ExecuteAsync(RunApplicationAIPipelineJobArgs args)
     {
         using (currentTenant.Change(args.TenantId))
         {
-            var automaticGenerationEnabled = await settingProvider.GetAsync<bool>(
-                AISettings.AutomaticGenerationEnabled, defaultValue: false);
-
-            if (!automaticGenerationEnabled)
-            {
-                logger.LogDebug("Automatic AI generation is disabled at tenant level, skipping intake pipeline for application {ApplicationId}.", args.ApplicationId);
-                return;
-            }
-
-            var application = await applicationFormServices.Application.GetAsync(args.ApplicationId);
-            var applicationForm = await applicationFormServices.ApplicationForm.GetAsync(application.ApplicationFormId);
-
-            if (!applicationForm.AutomaticallyGenerateAIAnalysis)
-            {
-                logger.LogDebug("Automatic AI analysis is disabled at form level for application {ApplicationId}, skipping intake pipeline.", args.ApplicationId);
-                return;
-            }
-
             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 aiOperationServices.AI.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 aiOperationServices.AttachmentSummary.GenerateForApplicationAsync(args.ApplicationId, args.PromptVersion);
+                var attachmentResults = await attachmentSummaryAppService.GenerateAttachmentSummariesAsync(
+                    await GetAttachmentIdsAsync(args.ApplicationId),
+                    args.PromptVersion);
+
+                logger.LogInformation("Completed AI attachment summaries for application {ApplicationId} with {AttachmentCount} result(s).", args.ApplicationId, attachmentResults.Count);
             }
+
             Exception? analysisException = null;
             Exception? scoringException = null;
+
             if (applicationAnalysisEnabled)
             {
                 try
                 {
-                    await aiOperationServices.ApplicationAnalysis.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
+                    var analysisResult = await applicationAnalysisAppService.GenerateApplicationAnalysisAsync(args.ApplicationId, args.PromptVersion);
+                    if (analysisResult.Completed)
+                    {
+                        logger.LogInformation("Completed AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
+                    }
                 }
                 catch (Exception ex)
                 {
@@ -73,12 +69,13 @@ public override async Task ExecuteAsync(RunApplicationAIPipelineJobArgs args)
                     logger.LogError(ex, "Error executing AI application analysis stage for application {ApplicationId}.", args.ApplicationId);
                 }
             }
+
             if (scoringEnabled)
             {
                 try
                 {
-                    var result = await aiOperationServices.ApplicationScoring.RegenerateAndSaveAsync(args.ApplicationId, args.PromptVersion);
-                    if (!string.Equals(result, "{}", StringComparison.Ordinal))
+                    var result = await applicationScoringAppService.GenerateApplicationScoringAsync(args.ApplicationId, args.PromptVersion);
+                    if (result.Completed)
                     {
                         await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
                         {
@@ -92,14 +89,22 @@ await localEventBus.PublishAsync(new ApplicationAIScoringGeneratedEvent
                     logger.LogError(ex, "Error executing AI application scoring stage for application {ApplicationId}.", args.ApplicationId);
                 }
             }
+
             if (scoringException != null)
             {
                 throw scoringException;
             }
+
             if (analysisException != null)
             {
                 throw analysisException;
             }
         }
     }
+
+    private async Task<List<Guid>> GetAttachmentIdsAsync(Guid applicationId)
+    {
+        var attachments = await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId);
+        return attachments.Select(a => a.Id).ToList();
+    }
 }
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
index dae27b6bc8..4b4c771027 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
@@ -31,7 +31,6 @@
 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;
@@ -62,7 +61,6 @@ 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 dcd0c31780..c1849fff5b 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,7 +13,6 @@
     <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.HttpApi.Client/GrantManagerHttpApiClientModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi.Client/GrantManagerHttpApiClientModule.cs
index ac9bbde1e2..5ecae6c8bf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi.Client/GrantManagerHttpApiClientModule.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.HttpApi.Client/GrantManagerHttpApiClientModule.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Unity.AI;
 using Volo.Abp.FeatureManagement;
 using Volo.Abp.Identity;
 using Volo.Abp.Modularity;
@@ -19,7 +20,8 @@ namespace Unity.GrantManager;
     typeof(UnityTenantManagementHttpApiClientModule),
     typeof(AbpFeatureManagementHttpApiClientModule),
     typeof(AbpSettingManagementHttpApiClientModule),
-    typeof(NotificationsHttpApiClientModule)
+    typeof(NotificationsHttpApiClientModule),
+    typeof(AIApplicationContractsModule)
 )]
 public class GrantManagerHttpApiClientModule : AbpModule
 {
@@ -31,6 +33,10 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             typeof(GrantManagerApplicationContractsModule).Assembly,
             RemoteServiceName
         );
+        context.Services.AddHttpClientProxies(
+            typeof(AIApplicationContractsModule).Assembly,
+            AIRemoteServiceConsts.RemoteServiceName
+        );
 
         // Register Geocoder API client
         context.Services.AddHttpClient<IGeocoderApiService>(client =>

From b1c845707461f9ed9ead878ef481e20c45e33c11 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Wed, 15 Apr 2026 11:34:02 -0700
Subject: [PATCH 33/45] AB#32301 add AI boundary tests

---
 .../Automation/AiContractBoundaryTests.cs     |  18 +++
 .../ApplicationAnalysisAppServiceTests.cs     |  31 ++++
 .../AttachmentSummaryAppServiceTests.cs       |  50 +++++++
 .../RunApplicationAIPipelineJobTests.cs       | 137 ++++++------------
 .../GrantManagerApplicationTestModule.cs      |   1 +
 ...nity.GrantManager.Application.Tests.csproj |   1 +
 6 files changed, 149 insertions(+), 89 deletions(-)
 create mode 100644 applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs
 create mode 100644 applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationAnalysisAppServiceTests.cs
 create mode 100644 applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AttachmentSummaryAppServiceTests.cs

diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs
new file mode 100644
index 0000000000..64ec13bda6
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs
@@ -0,0 +1,18 @@
+using Shouldly;
+using Unity.GrantManager.GrantApplications;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class AiContractBoundaryTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public void IApplicationScoringAppService_Should_Be_Resolvable_From_Remote_Contract_Boundary()
+    {
+        var service = GetRequiredService<IApplicationScoringAppService>();
+
+        service.ShouldNotBeNull();
+        service.GetType().Name.ShouldContain("Proxy");
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationAnalysisAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationAnalysisAppServiceTests.cs
new file mode 100644
index 0000000000..46c07f08ef
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationAnalysisAppServiceTests.cs
@@ -0,0 +1,31 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Threading.Tasks;
+using Unity.AI.Operations;
+using Unity.GrantManager.GrantApplications;
+using Volo.Abp.Features;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class ApplicationAnalysisAppServiceTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public async Task GenerateApplicationAnalysisAsync_Should_Return_Completed_Result()
+    {
+        var featureChecker = Substitute.For<IFeatureChecker>();
+        featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(true);
+
+        var analysisService = Substitute.For<IApplicationAnalysisService>();
+        analysisService.RegenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>()).Returns("analysis");
+
+        var service = new ApplicationAnalysisAppService(analysisService, featureChecker);
+
+        var result = await service.GenerateApplicationAnalysisAsync(Guid.NewGuid());
+
+        result.ShouldNotBeNull();
+        result.Completed.ShouldBeTrue();
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AttachmentSummaryAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AttachmentSummaryAppServiceTests.cs
new file mode 100644
index 0000000000..759a31cd54
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AttachmentSummaryAppServiceTests.cs
@@ -0,0 +1,50 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Unity.GrantManager.Attachments;
+using Unity.AI.Operations;
+using Volo.Abp.Features;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class AttachmentSummaryAppServiceTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public async Task GenerateAttachmentSummaryAsync_Should_Return_Completed_Result()
+    {
+        var featureChecker = Substitute.For<IFeatureChecker>();
+        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(true);
+
+        var summaryService = Substitute.For<IAttachmentSummaryService>();
+        summaryService.GenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>()).Returns("summary");
+
+        var service = new AttachmentSummaryAppService(summaryService, featureChecker);
+
+        var result = await service.GenerateAttachmentSummaryAsync(Guid.NewGuid());
+
+        result.ShouldNotBeNull();
+        result.Completed.ShouldBeTrue();
+    }
+
+    [Fact]
+    public async Task GenerateAttachmentSummariesAsync_Should_Return_Completed_Results()
+    {
+        var featureChecker = Substitute.For<IFeatureChecker>();
+        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(true);
+
+        var summaryService = Substitute.For<IAttachmentSummaryService>();
+        summaryService.GenerateAndSaveAsync(Arg.Any<IEnumerable<Guid>>(), Arg.Any<string?>())
+            .Returns(Task.FromResult(new List<string> { "summary" }));
+
+        var service = new AttachmentSummaryAppService(summaryService, featureChecker);
+
+        var result = await service.GenerateAttachmentSummariesAsync(new List<Guid> { Guid.NewGuid() });
+
+        result.ShouldHaveSingleItem();
+        result[0].Completed.ShouldBeTrue();
+    }
+}
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
index ed2eb392ce..b0ebe7315b 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
@@ -1,149 +1,108 @@
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
 using System;
-using System.Runtime.CompilerServices;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using Unity.AI;
-using Unity.AI.Operations;
-using Unity.AI.Settings;
-using Unity.GrantManager.Applications;
+using Unity.GrantManager.Attachments;
+using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
+using Unity.GrantManager.GrantApplications.Automation.Events;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Features;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.Settings;
 using Xunit;
 using Xunit.Abstractions;
+
 namespace Unity.GrantManager.GrantApplications.Automation;
+
 public class RunApplicationAIPipelineJobTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
 {
     private static RunApplicationAIPipelineJob BuildJob(
         IFeatureChecker featureChecker,
-        IApplicationScoringService? scoringService = null,
-        IAIService? aiService = null,
-        ISettingProvider? settingProvider = null,
-        bool formAutomaticAIEnabled = true)
+        IApplicationScoringAppService? scoringService = null)
     {
-        var ai = aiService ?? Substitute.For<IAIService>();
-        ai.IsAvailableAsync().Returns(true);
-
-        var settings = settingProvider ?? Substitute.For<ISettingProvider>();
-        if (settingProvider == null)
-        {
-            settings.GetOrNullAsync(AISettings.AutomaticGenerationEnabled).Returns("true");
-        }
-
-        var aiServices = new AIOperationServices(
-            Substitute.For<IAttachmentSummaryService>(),
-            Substitute.For<IApplicationAnalysisService>(),
-            scoringService ?? Substitute.For<IApplicationScoringService>(),
-            ai);
-
-        var formId = Guid.NewGuid();
-
-        var application = (Application)RuntimeHelpers.GetUninitializedObject(typeof(Application));
-        application.ApplicationFormId = formId;
-
-        var applicationForm = (ApplicationForm)RuntimeHelpers.GetUninitializedObject(typeof(ApplicationForm));
-        applicationForm.AutomaticallyGenerateAIAnalysis = formAutomaticAIEnabled;
-
-        var applicationRepository = Substitute.For<IApplicationRepository>();
-        applicationRepository.GetAsync(Arg.Any<Guid>(), Arg.Any<bool>()).Returns(application);
+        var attachmentService = Substitute.For<IAttachmentSummaryAppService>();
+        attachmentService.GenerateAttachmentSummariesAsync(Arg.Any<List<Guid>>(), Arg.Any<string?>())
+            .Returns(Task.FromResult(new List<AttachmentSummaryResultDto>()));
 
-        var applicationFormRepository = Substitute.For<IApplicationFormRepository>();
-        applicationFormRepository.GetAsync(Arg.Any<Guid>(), Arg.Any<bool>()).Returns(applicationForm);
-
-        var applicationFormServices = new ApplicationFormServices(applicationRepository, applicationFormRepository);
+        var analysisService = Substitute.For<IApplicationAnalysisAppService>();
+        analysisService.GenerateApplicationAnalysisAsync(Arg.Any<Guid>(), Arg.Any<string?>())
+            .Returns(Task.FromResult(new ApplicationAnalysisResultDto { Completed = true }));
 
         return new RunApplicationAIPipelineJob(
-            aiServices,
-            applicationFormServices,
+            Substitute.For<IApplicationChefsFileAttachmentRepository>(),
+            attachmentService,
+            analysisService,
+            scoringService ?? Substitute.For<IApplicationScoringAppService>(),
             featureChecker,
             Substitute.For<ILocalEventBus>(),
             Substitute.For<ICurrentTenant>(),
-            settings,
             NullLogger<RunApplicationAIPipelineJob>.Instance);
     }
+
     [Fact]
     public async Task ExecuteAsync_Should_Skip_Scoring_When_Feature_Disabled()
     {
-        // Arrange - scoring feature OFF
         var featureChecker = Substitute.For<IFeatureChecker>();
         featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(false);
         featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(false);
         featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(false);
-        var scoringService = Substitute.For<IApplicationScoringService>();
-        var job = BuildJob(featureChecker, scoringService);
-        // Act
-        await job.ExecuteAsync(new RunApplicationAIPipelineJobArgs { ApplicationId = Guid.NewGuid() });
-        // Assert - scoring service never called
-        await scoringService.DidNotReceive().RegenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>());
-    }
 
-    [Fact]
-    public async Task Should_Skip_Pipeline_When_AutomaticGenerationEnabled_Is_False()
-    {
-        // Arrange - automatic generation OFF at tenant level
-        var settings = Substitute.For<ISettingProvider>();
-        settings.GetOrNullAsync(AISettings.AutomaticGenerationEnabled).Returns("false");
+        var scoringService = Substitute.For<IApplicationScoringAppService>();
+        scoringService.GenerateApplicationScoringAsync(Arg.Any<Guid>(), Arg.Any<string?>())
+            .Returns(Task.FromResult(new ApplicationScoringResultDto { Completed = true }));
 
-        var featureChecker = Substitute.For<IFeatureChecker>();
-        featureChecker.IsEnabledAsync(Arg.Any<string>()).Returns(true);
-
-        var scoringService = Substitute.For<IApplicationScoringService>();
-        var job = BuildJob(featureChecker, scoringService, settingProvider: settings);
+        var job = BuildJob(featureChecker, scoringService);
 
-        // Act
         await job.ExecuteAsync(new RunApplicationAIPipelineJobArgs { ApplicationId = Guid.NewGuid() });
 
-        // Assert - pipeline never reaches any AI service
-        await scoringService.DidNotReceive().RegenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>());
-        await featureChecker.DidNotReceive().IsEnabledAsync(Arg.Any<string>());
+        await scoringService.DidNotReceive().GenerateApplicationScoringAsync(Arg.Any<Guid>(), Arg.Any<string?>());
     }
 
     [Fact]
-    public async Task Should_Run_Pipeline_When_AutomaticGenerationEnabled_Is_True()
+    public async Task ExecuteAsync_Should_Run_Scoring_When_Feature_Enabled()
     {
-        // Arrange - automatic generation ON, all features enabled
-        var settings = Substitute.For<ISettingProvider>();
-        settings.GetOrNullAsync(AISettings.AutomaticGenerationEnabled).Returns("true");
-
         var featureChecker = Substitute.For<IFeatureChecker>();
         featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
         featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(false);
         featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(false);
 
-        var scoringService = Substitute.For<IApplicationScoringService>();
-        scoringService.RegenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>()).Returns("{}");
+        var scoringService = Substitute.For<IApplicationScoringAppService>();
+        scoringService.GenerateApplicationScoringAsync(Arg.Any<Guid>(), Arg.Any<string?>())
+            .Returns(Task.FromResult(new ApplicationScoringResultDto { Completed = true }));
 
-        var job = BuildJob(featureChecker, scoringService, settingProvider: settings);
+        var job = BuildJob(featureChecker, scoringService);
 
-        // Act
         await job.ExecuteAsync(new RunApplicationAIPipelineJobArgs { ApplicationId = Guid.NewGuid() });
 
-        // Assert - pipeline reached the scoring service
-        await scoringService.Received(1).RegenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>());
+        await scoringService.Received(1).GenerateApplicationScoringAsync(Arg.Any<Guid>(), Arg.Any<string?>());
     }
 
     [Fact]
-    public async Task Should_NotRunAIPipeline_When_FormAutomaticAIDisabled()
+    public async Task ExecuteAsync_Should_Publish_Scoring_Event_When_Scoring_Completes()
     {
-        // Arrange - tenant ON, but form-level automatic AI OFF
-        var settings = Substitute.For<ISettingProvider>();
-        settings.GetOrNullAsync(AISettings.AutomaticGenerationEnabled).Returns("true");
-
         var featureChecker = Substitute.For<IFeatureChecker>();
-        featureChecker.IsEnabledAsync(Arg.Any<string>()).Returns(true);
+        featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
+        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(false);
+        featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(false);
 
-        var scoringService = Substitute.For<IApplicationScoringService>();
-        var job = BuildJob(featureChecker, scoringService, settingProvider: settings, formAutomaticAIEnabled: false);
+        var scoringService = Substitute.For<IApplicationScoringAppService>();
+        scoringService.GenerateApplicationScoringAsync(Arg.Any<Guid>(), Arg.Any<string?>())
+            .Returns(Task.FromResult(new ApplicationScoringResultDto { Completed = true }));
+
+        var eventBus = Substitute.For<ILocalEventBus>();
+        var job = new RunApplicationAIPipelineJob(
+            Substitute.For<IApplicationChefsFileAttachmentRepository>(),
+            Substitute.For<IAttachmentSummaryAppService>(),
+            Substitute.For<IApplicationAnalysisAppService>(),
+            scoringService,
+            featureChecker,
+            eventBus,
+            Substitute.For<ICurrentTenant>(),
+            NullLogger<RunApplicationAIPipelineJob>.Instance);
 
-        // Act
         await job.ExecuteAsync(new RunApplicationAIPipelineJobArgs { ApplicationId = Guid.NewGuid() });
 
-        // Assert - pipeline never reaches any AI service
-        await scoringService.DidNotReceive().RegenerateAndSaveAsync(Arg.Any<Guid>(), Arg.Any<string?>());
-        await featureChecker.DidNotReceive().IsEnabledAsync(Arg.Any<string>());
+        await eventBus.Received(1).PublishAsync(Arg.Is<ApplicationAIScoringGeneratedEvent>(e => e.ApplicationId != Guid.Empty));
     }
-
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs
index 0dd12013ca..d806dac37e 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs
@@ -4,6 +4,7 @@ namespace Unity.GrantManager;
 
 [DependsOn(
     typeof(GrantManagerApplicationModule),
+    typeof(GrantManagerHttpApiClientModule),
     typeof(GrantManagerDomainTestModule)
     )]
 public class GrantManagerApplicationTestModule : AbpModule
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj
index f533ffd413..9a1c755d16 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Unity.GrantManager.Application\Unity.GrantManager.Application.csproj" />
+    <ProjectReference Include="..\..\src\Unity.GrantManager.HttpApi.Client\Unity.GrantManager.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\src\Unity.GrantManager.HttpApi\Unity.GrantManager.HttpApi.csproj" />
     <ProjectReference Include="..\Unity.GrantManager.Domain.Tests\Unity.GrantManager.Domain.Tests.csproj" />
   </ItemGroup>

From 636b67627b46dcaf49cfbdc8ac4adc0976bd93b6 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 10:12:11 -0700
Subject: [PATCH 34/45] AB#32301 simplify content orchestration

---
 .../ApplicationContentAppService.cs           | 35 +++++++----------
 .../Automation/AiContractBoundaryTests.cs     | 28 ++++++++++++++
 .../ApplicationContentAppServiceTests.cs      | 38 +++++++++++++++++++
 3 files changed, 80 insertions(+), 21 deletions(-)
 create mode 100644 applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
index cde8adca99..cea61ecee7 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationContentAppService.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
 using Unity.AI;
@@ -7,6 +6,7 @@
 using Unity.AI.Permissions;
 using Volo.Abp;
 using Volo.Abp.Features;
+using Volo.Abp.MultiTenancy;
 
 namespace Unity.GrantManager.GrantApplications;
 
@@ -15,33 +15,26 @@ namespace Unity.GrantManager.GrantApplications;
 [Authorize(AIPermissions.Analysis.ViewScoringResult)]
 public class ApplicationContentAppService(
     IApplicationAIGenerationQueue aiGenerationQueue,
-    IFeatureChecker featureChecker)
+    IFeatureChecker featureChecker,
+    ICurrentTenant currentTenant)
     : AIAppService, IApplicationContentAppService
 {
     public async Task<ApplicationContentResultDto> GenerateContentAsync(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");
+        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.");
-            }
+        if (!attachmentSummariesEnabled || !applicationAnalysisEnabled || !scoringEnabled)
+        {
+            throw new UserFriendlyException("AI generate all is not enabled.");
+        }
 
-            await aiGenerationQueue.QueueApplicationPipelineAsync(applicationId, CurrentTenant.Id, promptVersion);
+        await aiGenerationQueue.QueueApplicationPipelineAsync(applicationId, currentTenant.Id, promptVersion);
 
-            return new ApplicationContentResultDto
-            {
-                Completed = true
-            };
-        }
-        catch (Exception ex)
+        return new ApplicationContentResultDto
         {
-            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.");
-        }
+            Completed = true
+        };
     }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs
index 64ec13bda6..4ab85251d5 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/AiContractBoundaryTests.cs
@@ -1,4 +1,5 @@
 using Shouldly;
+using Unity.GrantManager.Attachments;
 using Unity.GrantManager.GrantApplications;
 using Xunit;
 using Xunit.Abstractions;
@@ -15,4 +16,31 @@ public void IApplicationScoringAppService_Should_Be_Resolvable_From_Remote_Contr
         service.ShouldNotBeNull();
         service.GetType().Name.ShouldContain("Proxy");
     }
+
+    [Fact]
+    public void IApplicationAnalysisAppService_Should_Be_Resolvable_From_Remote_Contract_Boundary()
+    {
+        var service = GetRequiredService<IApplicationAnalysisAppService>();
+
+        service.ShouldNotBeNull();
+        service.GetType().Name.ShouldContain("Proxy");
+    }
+
+    [Fact]
+    public void IApplicationContentAppService_Should_Be_Resolvable_From_Remote_Contract_Boundary()
+    {
+        var service = GetRequiredService<IApplicationContentAppService>();
+
+        service.ShouldNotBeNull();
+        service.GetType().Name.ShouldContain("Proxy");
+    }
+
+    [Fact]
+    public void IAttachmentSummaryAppService_Should_Be_Resolvable_From_Remote_Contract_Boundary()
+    {
+        var service = GetRequiredService<IAttachmentSummaryAppService>();
+
+        service.ShouldNotBeNull();
+        service.GetType().Name.ShouldContain("Proxy");
+    }
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs
new file mode 100644
index 0000000000..f8e76b15f7
--- /dev/null
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/ApplicationContentAppServiceTests.cs
@@ -0,0 +1,38 @@
+using NSubstitute;
+using Shouldly;
+using System;
+using System.Threading.Tasks;
+using Unity.GrantManager.GrantApplications;
+using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
+using Unity.AI.Automation;
+using Volo.Abp.Features;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Unity.GrantManager.GrantApplications.Automation;
+
+public class ApplicationContentAppServiceTests(ITestOutputHelper outputHelper) : GrantManagerApplicationTestBase(outputHelper)
+{
+    [Fact]
+    public async Task GenerateContentAsync_Should_Return_Completed_Result()
+    {
+        var featureChecker = Substitute.For<IFeatureChecker>();
+        featureChecker.IsEnabledAsync("Unity.AI.AttachmentSummaries").Returns(true);
+        featureChecker.IsEnabledAsync("Unity.AI.ApplicationAnalysis").Returns(true);
+        featureChecker.IsEnabledAsync("Unity.AI.Scoring").Returns(true);
+
+        var queue = Substitute.For<IApplicationAIGenerationQueue>();
+        queue.QueueApplicationPipelineAsync(Arg.Any<Guid>(), Arg.Any<Guid?>(), Arg.Any<string?>())
+            .Returns(Task.CompletedTask);
+        var currentTenant = Substitute.For<Volo.Abp.MultiTenancy.ICurrentTenant>();
+        currentTenant.Id.Returns(Guid.NewGuid());
+
+        var service = new ApplicationContentAppService(queue, featureChecker, currentTenant);
+
+        var result = await service.GenerateContentAsync(Guid.NewGuid());
+
+        result.ShouldNotBeNull();
+        result.Completed.ShouldBeTrue();
+        await queue.Received(1).QueueApplicationPipelineAsync(Arg.Any<Guid>(), Arg.Any<Guid?>(), Arg.Any<string?>());
+    }
+}

From 46841c174a9d260c330156ea661c811baaed14b8 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 10:35:41 -0700
Subject: [PATCH 35/45] AB#32301 remove stale pipeline helpers

---
 .../BackgroundJobs/AIOperationServices.cs       | 17 -----------------
 .../BackgroundJobs/ApplicationFormServices.cs   | 13 -------------
 .../RunApplicationAIPipelineJobTests.cs         |  1 +
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIOperationServices.cs
 delete mode 100644 applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/ApplicationFormServices.cs

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIOperationServices.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIOperationServices.cs
deleted file mode 100644
index 2446f07e8e..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/AIOperationServices.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Unity.AI;
-using Unity.AI.Operations;
-using Volo.Abp.DependencyInjection;
-
-namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
-
-/// <summary>
-/// Aggregates the four AI operation services used by <see cref="RunApplicationAIPipelineJob"/>.
-/// Introduced to keep the constructor within SonarQube's 7-parameter limit (S107)
-/// while preserving explicit, testable constructor injection for each dependency.
-/// Implements <see cref="ITransientDependency"/> so ABP's DI scanning registers it in the container.
-/// </summary>
-public record AIOperationServices(
-    IAttachmentSummaryService AttachmentSummary,
-    IApplicationAnalysisService ApplicationAnalysis,
-    IApplicationScoringService ApplicationScoring,
-    IAIService AI) : ITransientDependency;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/ApplicationFormServices.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/ApplicationFormServices.cs
deleted file mode 100644
index 0876669358..0000000000
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/ApplicationFormServices.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Unity.GrantManager.Applications;
-using Volo.Abp.DependencyInjection;
-
-namespace Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;
-
-/// <summary>
-/// Aggregates the application and form repositories used by <see cref="RunApplicationAIPipelineJob"/>.
-/// Introduced to keep the constructor within SonarQube's 7-parameter limit (S107).
-/// Implements <see cref="ITransientDependency"/> so ABP's DI scanning registers it in the container.
-/// </summary>
-public record ApplicationFormServices(
-    IApplicationRepository Application,
-    IApplicationFormRepository ApplicationForm) : ITransientDependency;
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
index b0ebe7315b..047d2a807d 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantApplications/Automation/RunApplicationAIPipelineJobTests.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Unity.GrantManager.Applications;
 using Unity.GrantManager.Attachments;
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.GrantApplications.Automation.BackgroundJobs;

From 791c16b84f69e183b77422492f2d460f3a13e35e Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 12:15:44 -0700
Subject: [PATCH 36/45] AB#32301 restore AI module registration

---
 .../AI/Runtime/OpenAIRuntimeService.cs            | 15 +++++++++------
 .../GrantManagerApplicationModule.cs              |  2 ++
 .../Unity.GrantManager.Application.csproj         |  1 +
 .../GrantManagerApplicationTestModule.cs          |  1 -
 .../Unity.GrantManager.Application.Tests.csproj   |  1 -
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index e4c69cd14f..46272489d1 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Concurrent;
@@ -32,7 +31,6 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly OpenAIPromptRenderer _openAIPromptRenderer;
         private readonly OpenAIConfigurationResolver _openAIConfigurationResolver;
         private readonly ICurrentTenant _currentTenant;
-        private readonly IHostEnvironment _hostEnvironment;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
         private const string AttachmentSummaryPromptType = AIPromptTypes.AttachmentSummary;
         private const string ApplicationScoringPromptType = AIPromptTypes.ApplicationScoring;
@@ -84,8 +82,7 @@ public OpenAIRuntimeService(
             OpenAIResponseParser openAIResponseParser,
             OpenAIPromptRenderer openAIPromptRenderer,
             OpenAIConfigurationResolver openAIConfigurationResolver,
-            ICurrentTenant currentTenant,
-            IHostEnvironment hostEnvironment)
+            ICurrentTenant currentTenant)
         {
             _configuration = configuration;
             _logger = logger;
@@ -95,7 +92,6 @@ public OpenAIRuntimeService(
             _openAIPromptRenderer = openAIPromptRenderer;
             _openAIConfigurationResolver = openAIConfigurationResolver;
             _currentTenant = currentTenant;
-            _hostEnvironment = hostEnvironment;
         }
 
         public Task<bool> IsAvailableAsync()
@@ -474,7 +470,7 @@ private void LogProviderMetadata(
                     response.PromptTokens,
                     response.CompletionTokens,
                     response.TotalTokens,
-                    _hostEnvironment.EnvironmentName,
+                    ResolveEnvironmentName(),
                     _currentTenant.Id,
                     success ? "success" : "failed",
                     promptVersion,
@@ -504,6 +500,13 @@ private void LogProviderMetadata(
                 : null;
         }
 
+        private static string ResolveEnvironmentName()
+        {
+            return Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")
+                ?? Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT")
+                ?? "Unknown";
+        }
+
         private string? ResolvePromptVersionSetting(string operationName)
         {
             var operationPromptVersion = _configuration[$"Azure:Operations:{operationName}:PromptVersion"];
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantManagerApplicationModule.cs
index 4b4c771027..dae27b6bc8 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 c1849fff5b..dcd0c31780 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/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs
index d806dac37e..0dd12013ca 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantManagerApplicationTestModule.cs
@@ -4,7 +4,6 @@ namespace Unity.GrantManager;
 
 [DependsOn(
     typeof(GrantManagerApplicationModule),
-    typeof(GrantManagerHttpApiClientModule),
     typeof(GrantManagerDomainTestModule)
     )]
 public class GrantManagerApplicationTestModule : AbpModule
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj
index 9a1c755d16..f533ffd413 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/Unity.GrantManager.Application.Tests.csproj
@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Unity.GrantManager.Application\Unity.GrantManager.Application.csproj" />
-    <ProjectReference Include="..\..\src\Unity.GrantManager.HttpApi.Client\Unity.GrantManager.HttpApi.Client.csproj" />
     <ProjectReference Include="..\..\src\Unity.GrantManager.HttpApi\Unity.GrantManager.HttpApi.csproj" />
     <ProjectReference Include="..\Unity.GrantManager.Domain.Tests\Unity.GrantManager.Domain.Tests.csproj" />
   </ItemGroup>

From ac4f8a80e20639499cc46722a454be2d92222ac9 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Fri, 17 Apr 2026 12:37:37 -0700
Subject: [PATCH 37/45] AB#32700 copilot feedback and fix tests

---
 .../Handlers/ContactEditHandler.cs            | 21 ++++-
 .../GrantsPortal/ContactCreateHandlerTests.cs | 19 ----
 .../GrantsPortal/ContactEditHandlerTests.cs   | 86 +++++++++++++++++++
 3 files changed, 104 insertions(+), 22 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs
index b243968df4..2aa38756bc 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantsPortal/Handlers/ContactEditHandler.cs
@@ -71,9 +71,24 @@ private async Task SyncContactLinkAsync(Guid contactId, ContactEditData data)
         var targetLink = contactLinks.FirstOrDefault(cl => cl.ContactId == contactId);
         if (targetLink != null)
         {
-            targetLink.IsPrimary = data.IsPrimary;
-            targetLink.Role = data.Role;
-            await contactLinkRepository.UpdateAsync(targetLink);
+            var hasChanges = false;
+
+            if (targetLink.IsPrimary != data.IsPrimary)
+            {
+                targetLink.IsPrimary = data.IsPrimary;
+                hasChanges = true;
+            }
+
+            if (data.Role is not null && targetLink.Role != data.Role)
+            {
+                targetLink.Role = data.Role;
+                hasChanges = true;
+            }
+
+            if (hasChanges)
+            {
+                await contactLinkRepository.UpdateAsync(targetLink);
+            }
         }
     }
 
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactCreateHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactCreateHandlerTests.cs
index 852816cc56..6298cbf8d8 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactCreateHandlerTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactCreateHandlerTests.cs
@@ -277,23 +277,4 @@ public async Task HandleAsync_WhenDataMissing_ShouldThrow()
     }
 
     #endregion
-
-    #region NormalizeOidcSub
-
-    [Theory]
-    [InlineData("testuser@idir", "TESTUSER")]
-    [InlineData("abc@bceidbusiness", "ABC")]
-    [InlineData("ALREADY", "ALREADY")]
-    [InlineData("mixedCase", "MIXEDCASE")]
-    [InlineData("user@", "USER")]
-    [InlineData(null, null)]
-    [InlineData("", null)]
-    [InlineData("  ", null)]
-    [InlineData("@idir", null)]
-    public void NormalizeOidcSub_ShouldStripIdpSuffixAndUppercase(string? input, string? expected)
-    {
-        ContactCreateHandler.NormalizeOidcSub(input).ShouldBe(expected);
-    }
-
-    #endregion
 }
diff --git a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactEditHandlerTests.cs b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactEditHandlerTests.cs
index 30ed4ee018..2dea80087c 100644
--- a/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactEditHandlerTests.cs
+++ b/applications/Unity.GrantManager/test/Unity.GrantManager.Application.Tests/GrantsPortal/ContactEditHandlerTests.cs
@@ -313,5 +313,91 @@ await _contactLinkRepository.Received(2)
             .UpdateAsync(Arg.Any<ContactLink>(), Arg.Any<bool>(), Arg.Any<CancellationToken>());
     }
 
+    [Fact]
+    public async Task HandleAsync_WhenRoleIsNull_ShouldPreserveExistingRole()
+    {
+        // Arrange
+        var contactId = Guid.NewGuid();
+        var applicantId = Guid.NewGuid();
+
+        _contactRepository.GetAsync(contactId, Arg.Any<bool>(), Arg.Any<CancellationToken>())
+            .Returns(WithId(new Contact { Name = "Old" }, contactId));
+
+        var link = WithId(new ContactLink
+        {
+            ContactId = contactId,
+            RelatedEntityId = applicantId,
+            RelatedEntityType = "Applicant",
+            IsPrimary = false,
+            IsActive = true,
+            Role = "Existing Role"
+        }, Guid.NewGuid());
+
+        _contactLinkRepository
+            .GetListAsync(Arg.Any<Expression<Func<ContactLink, bool>>>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
+            .Returns(new List<ContactLink> { link });
+
+        _contactLinkRepository.UpdateAsync(Arg.Any<ContactLink>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
+            .Returns(ci => ci.ArgAt<ContactLink>(0));
+
+        var payload = CreatePayload(contactId: contactId, data: JObject.FromObject(new
+        {
+            name = "Updated",
+            email = "updated@example.com",
+            isPrimary = false,
+            applicantId
+            // role intentionally omitted
+        }));
+
+        // Act
+        await _handler.HandleAsync(payload);
+
+        // Assert
+        link.Role.ShouldBe("Existing Role");
+    }
+
+    [Fact]
+    public async Task HandleAsync_WhenRoleIsProvided_ShouldUpdateRole()
+    {
+        // Arrange
+        var contactId = Guid.NewGuid();
+        var applicantId = Guid.NewGuid();
+
+        _contactRepository.GetAsync(contactId, Arg.Any<bool>(), Arg.Any<CancellationToken>())
+            .Returns(WithId(new Contact { Name = "Old" }, contactId));
+
+        var link = WithId(new ContactLink
+        {
+            ContactId = contactId,
+            RelatedEntityId = applicantId,
+            RelatedEntityType = "Applicant",
+            IsPrimary = false,
+            IsActive = true,
+            Role = "Old Role"
+        }, Guid.NewGuid());
+
+        _contactLinkRepository
+            .GetListAsync(Arg.Any<Expression<Func<ContactLink, bool>>>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
+            .Returns(new List<ContactLink> { link });
+
+        _contactLinkRepository.UpdateAsync(Arg.Any<ContactLink>(), Arg.Any<bool>(), Arg.Any<CancellationToken>())
+            .Returns(ci => ci.ArgAt<ContactLink>(0));
+
+        var payload = CreatePayload(contactId: contactId, data: JObject.FromObject(new
+        {
+            name = "Updated",
+            email = "updated@example.com",
+            isPrimary = false,
+            role = "New Role",
+            applicantId
+        }));
+
+        // Act
+        await _handler.HandleAsync(payload);
+
+        // Assert
+        link.Role.ShouldBe("New Role");
+    }
+
     #endregion
 }

From ea3ea120f7e57f69dd78289e409390609705014f Mon Sep 17 00:00:00 2001
From: Velang <Velang.Rao@gov.bc.ca>
Date: Fri, 17 Apr 2026 13:26:48 -0700
Subject: [PATCH 38/45] initial commit

---
 .../Unity.AutoUI/cypress/e2e/basicEmail.cy.ts | 127 +----
 .../Unity.AutoUI/cypress/e2e/chefsdata.cy.ts  |  45 +-
 .../Unity.AutoUI/cypress/e2e/lists.cy.ts      | 123 +----
 .../Unity.AutoUI/cypress/e2e/login.cy.ts      |  54 +-
 .../Unity.AutoUI/cypress/e2e/navigation.cy.ts |  67 +--
 .../cypress/pages/ApplicationDetailsPage.ts   |  49 +-
 .../cypress/pages/ApplicationsListPage.ts     |  24 +
 .../Unity.AutoUI/cypress/pages/LoginPage.ts   |  36 +-
 .../cypress/pages/NavigationPage.ts           |   8 +
 .../cypress/regression/ApprovalFlow.cy.ts     | 460 +++++++++++++++++-
 10 files changed, 584 insertions(+), 409 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
index 6ae85878e2..4eff6302d0 100644
--- a/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/basicEmail.cy.ts
@@ -1,4 +1,5 @@
 // cypress/e2e/basicEmail.cy.ts
+import { LoginPageInstance, NavigationPageInstance } from "../utilities";
 
 describe("Send an email", () => {
   const TEST_EMAIL_TO = Cypress.env("TEST_EMAIL_TO") as string;
@@ -32,123 +33,8 @@ describe("Send an email", () => {
     String(now.getSeconds()).padStart(2, "0");
 
   const TEST_EMAIL_SUBJECT = `Smoke Test Email ${timestamp}`;
-
-  function ensureLoggedInToGrantApplications() {
-    // Headless runs specs sequentially in the same browser process.
-    // Do not assume logged-out or logged-in. Detect UI state like chefsdata.cy.ts does.
-    cy.visit(Cypress.env("webapp.url"));
-
-    cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($body) => {
-      // Already authenticated
-      if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-        cy.contains("VIEW APPLICATIONS", { timeout: STANDARD_TIMEOUT }).click({
-          force: true,
-        });
-        return;
-      }
-
-      // Not authenticated
-      if ($body.find('button:contains("LOGIN")').length > 0) {
-        cy.contains("LOGIN", { timeout: STANDARD_TIMEOUT })
-          .should("exist")
-          .click({ force: true });
-
-        cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($loginBody) => {
-          // IDIR chooser may or may not appear
-          if ($loginBody.find(':contains("IDIR")').length > 0) {
-            cy.contains("IDIR", { timeout: STANDARD_TIMEOUT }).click({
-              force: true,
-            });
-          }
-
-          cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($authBody) => {
-            // Only type creds if the login form is actually present
-            if ($authBody.find("#user").length > 0) {
-              cy.get("#user", { timeout: STANDARD_TIMEOUT }).type(
-                Cypress.env("test1username"),
-              );
-              cy.get("#password", { timeout: STANDARD_TIMEOUT }).type(
-                Cypress.env("test1password"),
-              );
-              cy.contains("Continue", { timeout: STANDARD_TIMEOUT }).click({
-                force: true,
-              });
-            } else {
-              cy.log("Already authenticated");
-            }
-          });
-        });
-
-        return;
-      }
-
-      throw new Error("Unable to determine authentication state");
-    });
-
-    cy.location("pathname", { timeout: 30000 }).should(
-      "include",
-      "/GrantApplications",
-    );
-  }
-
-  function switchToDefaultGrantsProgramIfAvailable() {
-    cy.get("body").then(($body) => {
-      const hasUserInitials = $body.find(".unity-user-initials").length > 0;
-
-      if (!hasUserInitials) {
-        cy.log("Skipping tenant: no user initials menu found");
-        return;
-      }
-
-      cy.get(".unity-user-initials").click();
-
-      cy.get("body").then(($body2) => {
-        const switchLink = $body2
-          .find("#user-dropdown a.dropdown-item")
-          .filter((_, el) => {
-            return (el.textContent || "").trim() === "Switch Grant Programs";
-          });
-
-        if (switchLink.length === 0) {
-          cy.log(
-            'Skipping tenant: "Switch Grant Programs" not present for this user/session',
-          );
-          cy.get("body").click(0, 0);
-          return;
-        }
-
-        cy.wrap(switchLink.first()).click();
-
-        cy.url({ timeout: STANDARD_TIMEOUT }).should(
-          "include",
-          "/GrantPrograms",
-        );
-
-        cy.get("#search-grant-programs", { timeout: STANDARD_TIMEOUT })
-          .should("be.visible")
-          .clear()
-          .type("Default Grants Program");
-
-        cy.get("#UserGrantProgramsTable", { timeout: STANDARD_TIMEOUT })
-          .should("be.visible")
-          .within(() => {
-            cy.contains("tbody tr", "Default Grants Program", {
-              timeout: STANDARD_TIMEOUT,
-            })
-              .should("exist")
-              .within(() => {
-                cy.contains("button", "Select").should("be.enabled").click();
-              });
-          });
-
-        cy.location("pathname", { timeout: STANDARD_TIMEOUT }).should((p) => {
-          expect(
-            p.indexOf("/GrantApplications") >= 0 || p.indexOf("/auth/") >= 0,
-          ).to.eq(true);
-        });
-      });
-    });
-  }
+  const loginPage = LoginPageInstance();
+  const navPage = NavigationPageInstance();
 
   function openSavedEmailFromHistoryBySubject(subject: string) {
     cy.get("body", { timeout: STANDARD_TIMEOUT }).then(($body) => {
@@ -231,11 +117,12 @@ describe("Send an email", () => {
   }
 
   it("Login", () => {
-    ensureLoggedInToGrantApplications();
+    loginPage.login();
+    loginPage.verifyOnGrantApplications();
   });
 
   it("Switch to Default Grants Program if available", () => {
-    switchToDefaultGrantsProgramIfAvailable();
+    navPage.switchToDefaultGrantsProgramIfAvailable();
   });
 
   it("Handle IDIR if required", () => {
@@ -368,6 +255,7 @@ describe("Send an email", () => {
   it("Save the email", () => {
     cy.get("#btn-save", { timeout: STANDARD_TIMEOUT })
       .should("exist")
+      .scrollIntoView()
       .should("be.visible")
       .click();
 
@@ -391,6 +279,7 @@ describe("Send an email", () => {
   it("Send the email", () => {
     cy.get("#btn-send", { timeout: STANDARD_TIMEOUT })
       .should("exist")
+      .scrollIntoView()
       .should("be.visible")
       .should("not.be.disabled")
       .click();
diff --git a/applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts b/applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts
index 05fe3e5a54..76f4d4154f 100644
--- a/applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts
@@ -1,9 +1,12 @@
 /// <reference types="cypress" />
 
 // cypress/e2e/chefsdata.cy.ts
+import { LoginPageInstance, NavigationPageInstance } from "../utilities";
 
 describe('Unity Login and check data from CHEFS', () => {
     const STANDARD_TIMEOUT = 20000
+    const loginPage = LoginPageInstance()
+    const navPage = NavigationPageInstance()
 
     // TEST renders the Submission tab inside an open shadow root (Form.io).
     // Enabling this makes cy.get / cy.contains pierce shadow DOM consistently across envs.
@@ -12,42 +15,12 @@ describe('Unity Login and check data from CHEFS', () => {
     })
 
     it('Verify Login', () => {
-        // 1.) Always start from the base URL
-        cy.visit(Cypress.env('webapp.url'))
-
-        // 2.) Decide auth path based on visible UI
-        cy.get('body', { timeout: STANDARD_TIMEOUT }).then(($body) => {
-            // Already authenticated
-            if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-                cy.contains('VIEW APPLICATIONS', { timeout: STANDARD_TIMEOUT }).click({ force: true })
-                return
-            }
-
-            // Not authenticated
-            if ($body.find('button:contains("LOGIN")').length > 0) {
-                cy.contains('LOGIN', { timeout: STANDARD_TIMEOUT }).should('exist').click({ force: true })
-                cy.contains('IDIR', { timeout: STANDARD_TIMEOUT }).should('exist').click({ force: true })
-
-                cy.get('body', { timeout: STANDARD_TIMEOUT }).then(($loginBody) => {
-                    // Perform IDIR login only if prompted
-                    if ($loginBody.find('#user').length > 0) {
-                        cy.get('#user', { timeout: STANDARD_TIMEOUT }).type(Cypress.env('test1username'))
-                        cy.get('#password', { timeout: STANDARD_TIMEOUT }).type(Cypress.env('test1password'))
-                        cy.contains('Continue', { timeout: STANDARD_TIMEOUT }).should('exist').click({ force: true })
-                    } else {
-                        cy.log('Already logged in')
-                    }
-                })
-
-                return
-            }
-
-            // Fail loudly if neither state is detectable
-            throw new Error('Unable to determine authentication state')
-        })
+        loginPage.login()
+        loginPage.verifyOnGrantApplications()
+    })
 
-        // 3.) Post-condition check
-        cy.url({ timeout: STANDARD_TIMEOUT }).should('include', '/GrantApplications')
+    it('Switch to Default Grants Program if available', () => {
+        navPage.switchToDefaultGrantsProgramIfAvailable()
     })
 
     // Verify that the details panel populates with mapped data
@@ -228,6 +201,6 @@ describe('Unity Login and check data from CHEFS', () => {
     })
 
     it('Verify Logout', () => {
-        cy.logout()
+        loginPage.quickLogout()
     })
 })
diff --git a/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts b/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
index 1654cf556f..4ef0eda373 100644
--- a/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/lists.cy.ts
@@ -1,56 +1,13 @@
-describe('Grant Manager Login and List Navigation', () => {
-
-    function switchToDefaultGrantsProgramIfAvailable() {
-        cy.get('body').then(($body) => {
-            const hasUserInitials = $body.find('.unity-user-initials').length > 0
-
-            if (!hasUserInitials) {
-                cy.log('Skipping tenant switch: no user initials menu found')
-                return
-            }
-
-            cy.get('.unity-user-initials').click()
-
-            cy.get('body').then(($body2) => {
-                const switchLink = $body2.find('#user-dropdown a.dropdown-item').filter((_, el) => {
-                    return (el.textContent || '').trim() === 'Switch Grant Programs'
-                })
+import {
+    ApplicationsPageInstance,
+    LoginPageInstance,
+    NavigationPageInstance,
+} from '../utilities'
 
-                if (switchLink.length === 0) {
-                    cy.log('Skipping tenant switch: "Switch Grant Programs" not present')
-                    cy.get('body').click(0, 0)
-                    return
-                }
-
-                cy.wrap(switchLink.first()).click()
-                cy.url({ timeout: 20000 }).should('include', '/GrantPrograms')
-
-                cy.get('#search-grant-programs', { timeout: 20000 })
-                    .should('be.visible')
-                    .clear()
-                    .type('Default Grants Program')
-
-                cy.get('#UserGrantProgramsTable', { timeout: 20000 })
-                    .should('be.visible')
-                    .within(() => {
-                        cy.contains('tbody tr', 'Default Grants Program', { timeout: 20000 })
-                            .should('exist')
-                            .within(() => {
-                                cy.contains('button', 'Select')
-                                    .should('be.enabled')
-                                    .click()
-                            })
-                    })
-
-                cy.location('pathname', { timeout: 20000 }).should((p) => {
-                    expect(
-                        p.indexOf('/GrantApplications') >= 0 ||
-                        p.indexOf('/auth/') >= 0
-                    ).to.eq(true)
-                })
-            })
-        })
-    }
+describe('Grant Manager Login and List Navigation', () => {
+    const loginPage = LoginPageInstance()
+    const navPage = NavigationPageInstance()
+    const appsPage = ApplicationsPageInstance()
 
     function setDashboardIntakeToTestIfAvailable() {
         const btnSel = 'button[data-id="dashboardIntakeId"]'
@@ -91,46 +48,12 @@ describe('Grant Manager Login and List Navigation', () => {
     }
 
     it('Verify Login', () => {
-
-        cy.visit(Cypress.env('webapp.url'))
-
-        cy.get('body').then(($body) => {
-
-            if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-                cy.contains('VIEW APPLICATIONS').click()
-                return
-            }
-
-            if ($body.find('button:contains("LOGIN")').length > 0) {
-                cy.contains('LOGIN').click()
-
-                cy.get('body').then(($loginBody) => {
-                    if ($loginBody.find(':contains("IDIR")').length > 0) {
-                        cy.contains('IDIR').click()
-                    }
-
-                    cy.get('body').then(($authBody) => {
-                        if ($authBody.find('#user').length > 0) {
-                            cy.get('#user').type(Cypress.env('test1username'))
-                            cy.get('#password').type(Cypress.env('test1password'))
-                            cy.contains('Continue').click()
-                        } else {
-                            cy.log('Already authenticated')
-                        }
-                    })
-                })
-
-                return
-            }
-
-            throw new Error('Unable to determine authentication state')
-        })
-
-        cy.location('pathname', { timeout: 30000 }).should('include', '/GrantApplications')
+        loginPage.login()
+        loginPage.verifyOnGrantApplications()
     })
 
     it('Switch to Default Grants Program if available', () => {
-        switchToDefaultGrantsProgramIfAvailable()
+        navPage.switchToDefaultGrantsProgramIfAvailable()
     })
 
     it('Handle IDIR if required', () => {
@@ -145,26 +68,24 @@ describe('Grant Manager Login and List Navigation', () => {
 
     it('Verify Applications, Roles, Users, Intakes, Forms, Dashboard lists are populated', () => {
 
-        cy.get('.unity-user-initials').should('exist').click()
-        cy.get('#user-dropdown .btn-dropdown span')
-            .should('contain', 'Default Grants Program')
+        navPage.verifyCurrentTenant('Default Grants Program')
 
-        cy.contains('Applications').click()
-        cy.get('tbody tr').should('have.length.at.least', 1)
+        navPage.goToApplications()
+        appsPage.verifyListHasData()
 
-        cy.contains('Roles').click()
+        navPage.goToRoles()
         cy.get('tbody tr').should('have.length.at.least', 1)
 
-        cy.contains('Users').click()
+        navPage.goToUsers()
         cy.get('tbody tr').should('have.length.at.least', 1)
 
-        cy.contains('Intakes').click()
+        navPage.goToIntakes()
         cy.get('tbody tr').should('have.length.at.least', 1)
 
-        cy.contains('Forms').click()
+        navPage.goToForms()
         cy.get('tbody tr').should('have.length.at.least', 1)
 
-        cy.contains('Dashboard').click()
+        navPage.goToDashboard()
         cy.location('pathname', { timeout: 30000 }).should('include', '/Dashboard')
         setDashboardIntakeToTestIfAvailable()
 
@@ -178,6 +99,6 @@ describe('Grant Manager Login and List Navigation', () => {
     })
 
     it('Verify Logout', () => {
-        cy.logout()
+        loginPage.quickLogout()
     })
-})
\ No newline at end of file
+})
diff --git a/applications/Unity.AutoUI/cypress/e2e/login.cy.ts b/applications/Unity.AutoUI/cypress/e2e/login.cy.ts
index 274e68ffaf..3735041179 100644
--- a/applications/Unity.AutoUI/cypress/e2e/login.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/login.cy.ts
@@ -1,55 +1,17 @@
+import { LoginPageInstance, NavigationPageInstance } from "../utilities";
+
 describe('Grant Manager Login and Logout', () => {
+    const loginPage = LoginPageInstance()
+    const navPage = NavigationPageInstance()
 
     it('Verify Default Grant Program tenant is selected.', () => {
-
-        // Always start from the base URL
-        cy.visit(Cypress.env('webapp.url'))
-
-        // Determine authentication state from UI
-        cy.get('body').then(($body) => {
-
-            // Already authenticated
-            if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-                cy.contains('VIEW APPLICATIONS').click()
-                return
-            }
-
-            // Not authenticated
-            if ($body.find('button:contains("LOGIN")').length > 0) {
-                cy.contains('LOGIN').click()
-
-                cy.get('body').then(($loginBody) => {
-
-                    // IDIR chooser may or may not appear
-                    if ($loginBody.find(':contains("IDIR")').length > 0) {
-                        cy.contains('IDIR').click()
-                    }
-
-                    cy.get('body').then(($authBody) => {
-                        if ($authBody.find('#user').length > 0) {
-                            cy.get('#user').type(Cypress.env('test1username'))
-                            cy.get('#password').type(Cypress.env('test1password'))
-                            cy.contains('Continue').click()
-                        }
-                    })
-                })
-
-                return
-            }
-
-            throw new Error('Unable to determine authentication state')
-        })
-
-        // Verify we landed in the authenticated app
-        cy.location('pathname', { timeout: 30000 })
-            .should('include', '/GrantApplications')
+        loginPage.login()
+        loginPage.verifyOnGrantApplications()
 
         // Verify Default Grant Program tenant is selected
-        cy.get('.unity-user-initials').should('exist').click()
-        cy.get('#user-dropdown .btn-dropdown span')
-            .should('contain', 'Default Grants Program')
+        navPage.verifyCurrentTenant('Default Grants Program')
 
         // Logout (terminal action)
-        cy.logout()
+        loginPage.quickLogout()
     })
 })
diff --git a/applications/Unity.AutoUI/cypress/e2e/navigation.cy.ts b/applications/Unity.AutoUI/cypress/e2e/navigation.cy.ts
index 0cb046669f..6bcf9a65df 100644
--- a/applications/Unity.AutoUI/cypress/e2e/navigation.cy.ts
+++ b/applications/Unity.AutoUI/cypress/e2e/navigation.cy.ts
@@ -1,83 +1,48 @@
+import { LoginPageInstance, NavigationPageInstance } from "../utilities";
+
 describe('Grant Manager Login and Top Navigation', () => {
+    const loginPage = LoginPageInstance()
+    const navPage = NavigationPageInstance()
 
     it('Verify Login', () => {
-
-        // Always start from the base URL
-        cy.visit(Cypress.env('webapp.url'))
-
-        cy.get('body').then(($body) => {
-
-            // Already authenticated
-            if ($body.find('button:contains("VIEW APPLICATIONS")').length > 0) {
-                cy.contains('VIEW APPLICATIONS').click()
-                return
-            }
-
-            // Not authenticated
-            if ($body.find('button:contains("LOGIN")').length > 0) {
-                cy.contains('LOGIN').click()
-
-                cy.get('body').then(($loginBody) => {
-
-                    // IDIR chooser may or may not appear
-                    if ($loginBody.find(':contains("IDIR")').length > 0) {
-                        cy.contains('IDIR').click()
-                    }
-
-                    cy.get('body').then(($authBody) => {
-                        if ($authBody.find('#user').length > 0) {
-                            cy.get('#user').type(Cypress.env('test1username'))
-                            cy.get('#password').type(Cypress.env('test1password'))
-                            cy.contains('Continue').click()
-                        }
-                    })
-                })
-
-                return
-            }
-
-            throw new Error('Unable to determine authentication state')
-        })
-
-        cy.location('pathname', { timeout: 30000 })
-            .should('include', '/GrantApplications')
+        loginPage.login()
+        loginPage.verifyOnGrantApplications()
     })
 
     it('Verify navigation options in the top banner', () => {
 
         // 3.) Verify Default Grant Program tenant is selected.
-        cy.get('.unity-user-initials').should('exist').click()
-        cy.get('#user-dropdown .btn-dropdown span')
-            .should('contain', 'Default Grants Program')
+        navPage.verifyCurrentTenant('Default Grants Program')
 
         // 4.) Ensure all expected headings are present.
+        navPage.verifyAllNavItemsExist()
 
         // 5.) Applications
-        cy.contains('Applications').should('exist').click()
+        navPage.goToApplications()
 
         // 6.) Roles
-        cy.contains('Roles').should('exist').click()
+        navPage.goToRoles()
 
         // 7.) Users
-        cy.contains('Users').should('exist').click()
+        navPage.goToUsers()
 
         // 8.) Intakes
-        cy.contains('Intakes').should('exist').click()
+        navPage.goToIntakes()
 
         // 9.) Forms
-        cy.contains('Forms').should('exist').click()
+        navPage.goToForms()
 
         // 10.) Dashboard
-        cy.contains('Dashboard').should('exist').click()
+        navPage.goToDashboard()
 
         // 11.) Payments
-        cy.contains('Payments').should('exist').click()
+        navPage.goToPayments()
 
         // Return to top
         cy.visit(Cypress.env('webapp.url'))
     })
 
     it('Verify Logout', () => {
-        cy.logout()
+        loginPage.quickLogout()
     })
 })
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
index 550c95ff22..0cefa4fa12 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
@@ -110,11 +110,19 @@ export class ApplicationDetailsPage extends BasePage {
     super();
   }
 
+  private activateTab(tabSelector: string): void {
+    cy.get(tabSelector, { timeout: 20000 })
+      .scrollIntoView()
+      .should("be.visible")
+      .click({ force: true })
+      .should("have.class", "active");
+  }
+
   /**
    * Navigate to Submission tab
    */
   goToSubmissionTab(): this {
-    this.clickElement(this.tabs.submission);
+    this.activateTab(this.tabs.submission);
     return this;
   }
 
@@ -123,7 +131,7 @@ export class ApplicationDetailsPage extends BasePage {
    */
   goToReviewAssessmentTab(): this {
     this.dismissErrorModalIfPresent();
-    this.clickElement(this.tabs.reviewAssessment);
+    this.activateTab(this.tabs.reviewAssessment);
     return this;
   }
 
@@ -131,7 +139,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Project Info tab
    */
   goToProjectInfoTab(): this {
-    this.clickElement(this.tabs.projectInfo);
+    this.activateTab(this.tabs.projectInfo);
     return this;
   }
 
@@ -139,7 +147,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Applicant Info tab
    */
   goToApplicantInfoTab(): this {
-    this.clickElement(this.tabs.applicantInfo);
+    this.activateTab(this.tabs.applicantInfo);
     return this;
   }
 
@@ -147,7 +155,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Funding Agreement tab
    */
   goToFundingAgreementTab(): this {
-    this.clickElement(this.tabs.fundingAgreement);
+    this.activateTab(this.tabs.fundingAgreement);
     return this;
   }
 
@@ -155,7 +163,7 @@ export class ApplicationDetailsPage extends BasePage {
    * Navigate to Payment Info tab
    */
   goToPaymentInfoTab(): this {
-    this.clickElement(this.tabs.paymentInfo);
+    this.activateTab(this.tabs.paymentInfo);
     return this;
   }
 
@@ -597,12 +605,31 @@ export class ApplicationDetailsPage extends BasePage {
    */
   dismissErrorModalIfPresent(): this {
     cy.get("body").then(($body) => {
-      // Only dismiss if it is specifically an error modal (swal2-error icon)
-      if ($body.find(".swal2-container .swal2-icon.swal2-error").length > 0) {
+      const hasSwalError =
+        $body.find(".swal2-container .swal2-icon.swal2-error").length > 0;
+      const hasTokenErrorText =
+        $body.text().includes("GetAuthTokenAsync") ||
+        $body.text().includes("Error retrieving Token");
+
+      if (hasSwalError || hasTokenErrorText) {
+        if ($body.find(".swal2-container .swal2-confirm").length > 0) {
+          cy.get(".swal2-container")
+            .find(".swal2-confirm")
+            .first()
+            .click({ force: true });
+        } else if ($body.find(".modal.show button").length > 0) {
+          cy.get(".modal.show")
+            .contains("button", /^ok$/i)
+            .click({ force: true });
+        }
+
+        cy.wait(500);
+      }
+
+      if ($body.find(".modal.show .btn-close").length > 0) {
+        cy.get(".modal.show .btn-close").first().click({ force: true });
         cy.get(".swal2-container")
-          .find(".swal2-confirm")
-          .first()
-          .click({ force: true });
+          .should("not.exist");
         cy.wait(500);
       }
     });
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index 2128650c00..d07835ea27 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -64,6 +64,11 @@ export class ApplicationsListPage extends ApplicationsPage {
     cancelButton: "#payment-modal .modal-footer button",
   };
 
+  private readonly blockingUi = {
+    bootstrapModal: ".modal.show",
+    swalContainer: ".swal2-container",
+  };
+
   // Grant program selectors
   private readonly grantProgram = {
     userInitials: ".unity-user-initials",
@@ -385,6 +390,25 @@ export class ApplicationsListPage extends ApplicationsPage {
     return this;
   }
 
+  /**
+   * Wait for blocking modal overlays to clear before interacting with list controls.
+   */
+  waitForNoBlockingOverlay(): this {
+    cy.get(this.blockingUi.swalContainer, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
+
+    cy.get(this.blockingUi.bootstrapModal, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
+
+    cy.get(this.paymentModal.backdrop, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
+
+    return this;
+  }
+
   /**
    * Close payment modal using multiple strategies
    */
diff --git a/applications/Unity.AutoUI/cypress/pages/LoginPage.ts b/applications/Unity.AutoUI/cypress/pages/LoginPage.ts
index 71a836e1d8..ea146d5c07 100644
--- a/applications/Unity.AutoUI/cypress/pages/LoginPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/LoginPage.ts
@@ -1,4 +1,5 @@
 import { BasePage } from "./BasePage";
+import { loginIfNeeded } from "../support/auth";
 
 /**
  * LoginPage - Page Object for Login/Authentication functionality
@@ -24,27 +25,24 @@ export class LoginPage extends BasePage {
    * Perform login with credentials
    */
   login(username?: string, password?: string): void {
-    this.visit();
-    this.clickByText(this.selectors.loginButton);
-    this.wait(1000);
-    this.clickByText(this.selectors.idirButton);
-    this.wait(1000);
-
-    // Check if already logged in
-    cy.get("body").then(($body) => {
-      if ($body.find(this.selectors.usernameField).length) {
-        const user = username || Cypress.env("test1username");
-        const pass = password || Cypress.env("test1password");
-
-        this.typeText(this.selectors.usernameField, user);
-        this.typeText(this.selectors.passwordField, pass);
-        this.clickByText(this.selectors.continueButton);
-      } else {
-        cy.log("Already logged in");
-      }
+    loginIfNeeded({
+      username,
+      password,
+      timeout: 30000,
+      baseUrl: Cypress.env("webapp.url"),
     });
   }
 
+  /**
+   * Verify we are on the authenticated applications page
+   */
+  verifyOnGrantApplications(): void {
+    cy.location("pathname", { timeout: 30000 }).should(
+      "include",
+      "/GrantApplications",
+    );
+  }
+
   /**
    * Perform logout
    */
@@ -81,7 +79,7 @@ export class LoginPage extends BasePage {
    * Quick login using custom command (backward compatibility)
    */
   quickLogin(): void {
-    cy.login();
+    this.login();
   }
 
   /**
diff --git a/applications/Unity.AutoUI/cypress/pages/NavigationPage.ts b/applications/Unity.AutoUI/cypress/pages/NavigationPage.ts
index 84da532ae6..1ea703ba93 100644
--- a/applications/Unity.AutoUI/cypress/pages/NavigationPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/NavigationPage.ts
@@ -31,6 +31,7 @@ export class NavigationPage extends BasePage {
    * Verify current tenant name
    */
   verifyCurrentTenant(tenantName: string): void {
+    this.clickUserMenu();
     cy.get(this.tenantDropdown).should("contain", tenantName);
   }
 
@@ -101,6 +102,13 @@ export class NavigationPage extends BasePage {
     });
   }
 
+  /**
+   * Switch to the default grant program if available for the current session
+   */
+  switchToDefaultGrantsProgramIfAvailable(): void {
+    this.switchToTenantIfAvailable("Default Grants Program");
+  }
+
   /**
    * Navigate to Applications page
    */
diff --git a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
index 5b480b2aab..67e9a4e6cf 100644
--- a/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
+++ b/applications/Unity.AutoUI/cypress/regression/ApprovalFlow.cy.ts
@@ -35,6 +35,7 @@ const TEST_CONFIG = {
   submissionId: null as string | null,
   grantProgram: "Default Grants Program",
   approvedAmount: "5000",
+  assignOwner: "Unity User1",
   supplierNumber: Cypress.env("environment") === "TEST" ? "2002712" : "2009366",
   paymentGroup: "Cheque" as const,
   testComment: "Test comment from automated regression test",
@@ -48,6 +49,24 @@ const TEST_CONFIG = {
   },
 };
 
+const STATUS_ACTIONS = {
+  menuButton: "#ApplicationActionDropdown .dropdown-toggle",
+  menu: "#ApplicationActionDropdown .dropdown-menu",
+  startReview: "#Application_StartReviewButton",
+  completeReview: "#Application_CompleteReviewButton",
+  startAssessment: "#Application_StartAssessmentButton",
+  completeAssessment: "#Application_CompleteAssessmentButton",
+  approve: "#Application_ApproveButton",
+};
+
+const ADJUDICATION_ACTIONS = {
+  completeAssessment: "#AdjudicationTeamLeadActionBar #CompleteButton",
+};
+
+const BREADCRUMB_STATUS_SELECTOR =
+  ".application-details-breadcrumb .application-status";
+const APPLICATIONS_PATH = "GrantApplications";
+
 (isProd ? describe.skip : describe)("Approval Flow Regression Test", () => {
   // Page object instances reused across all tests
   const listPage = new ApplicationsListPage();
@@ -63,6 +82,7 @@ const TEST_CONFIG = {
 
   /** Navigate to the Payments tab and filter the table by submissionId. */
   function navigateToPaymentsAndSearch(): void {
+    listPage.waitForNoBlockingOverlay();
     cy.reload();
     navPage.goToPayments();
     cy.location("pathname", { timeout: 20000 }).should("include", "Payment");
@@ -73,9 +93,338 @@ const TEST_CONFIG = {
     cy.contains("tr", submissionId, { timeout: 20000 }).should("exist");
   }
 
+  function navigateToApplicationsList(): void {
+    cy.location("pathname", { timeout: 20000 }).then((pathname) => {
+      if (!pathname.includes(`/${APPLICATIONS_PATH}`)) {
+        cy.visit(`${Cypress.env("webapp.url")}${APPLICATIONS_PATH}`);
+      }
+    });
+    listPage.waitForNoBlockingOverlay();
+  }
+
+  /**
+   * Seeded submissions can take time to appear in the Grant Applications list.
+   * Poll the list with a refresh until the row becomes searchable.
+   */
+  function waitForSubmissionToAppearInList(
+    attempt = 1,
+    maxAttempts = 8,
+  ): Cypress.Chainable<void> {
+    navigateToApplicationsList();
+    dismissBlockingModalIfPresent();
+
+    listPage
+      .selectQuickDateRange("alltime")
+      .waitForTableRefresh()
+      .searchForSubmission(submissionId);
+
+    return cy.get("body").then(($body) => {
+      const hasRow = $body.find(`tr:contains("${submissionId}")`).length > 0;
+
+      if (hasRow) {
+        cy.log(
+          `Submission ${submissionId} found in applications list on attempt ${attempt}`,
+        );
+        return;
+      }
+
+      if (attempt >= maxAttempts) {
+        throw new Error(
+          `Submission ${submissionId} was not visible in the applications list after ${maxAttempts} attempts`,
+        );
+      }
+
+      cy.log(
+        `Submission ${submissionId} not visible yet. Refreshing applications list (attempt ${attempt} of ${maxAttempts})`,
+      );
+      cy.wait(5000);
+      cy.reload();
+      return waitForSubmissionToAppearInList(attempt + 1, maxAttempts);
+    });
+  }
+
+  function ensureSiteInfoReady(
+    attempt = 1,
+    maxAttempts = 4,
+  ): Cypress.Chainable<void> {
+    detailsPage.dismissErrorModalIfPresent();
+    detailsPage.goToPaymentInfoTab();
+    cy.wait(1000);
+
+    return cy.get("body").then(($body) => {
+      const hasTokenError =
+        $body.text().includes("GetAuthTokenAsync") ||
+        $body.text().includes("Error retrieving Token");
+      const rows = $body.find("#SiteInfoTable tbody tr");
+      const firstRowText = rows.first().text().replace(/\s+/g, " ").trim();
+      const hasData =
+        rows.length > 0 && !/no data available/i.test(firstRowText);
+
+      if (!hasTokenError && hasData) {
+        cy.log(`Site info ready on attempt ${attempt}`);
+        return;
+      }
+
+      if (attempt >= maxAttempts) {
+        throw new Error(
+          `Site info was not ready after ${maxAttempts} attempts`,
+        );
+      }
+
+      cy.log(
+        `Site info not ready yet. Re-activating payment info content (attempt ${attempt} of ${maxAttempts})`,
+      );
+      detailsPage.dismissErrorModalIfPresent();
+      detailsPage.goToFundingAgreementTab();
+      cy.wait(1000);
+      detailsPage.goToPaymentInfoTab();
+      cy.wait(3000);
+      return ensureSiteInfoReady(attempt + 1, maxAttempts);
+    });
+  }
+
+  function waitForBlockingUiToClear(): void {
+    cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+    cy.get(".modal.show", { timeout: 20000 }).should("not.exist");
+    cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
+  }
+
+  function openStatusActionsMenu(): void {
+    waitForBlockingUiToClear();
+    detailsPage.dismissErrorModalIfPresent();
+    cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .scrollIntoView()
+      .should("be.visible")
+      .and("not.contain.text", "Processing...")
+      .click({ force: true });
+    cy.get(STATUS_ACTIONS.menu, { timeout: 20000 }).should("be.visible");
+  }
+
+  function clickStatusAction(actionSelector: string): void {
+    openStatusActionsMenu();
+    cy.get(actionSelector, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .should("be.visible")
+      .and("not.be.disabled")
+      .click({ force: true });
+  }
+
+  function clickStatusActionIfEnabled(
+    actionSelector: string,
+    actionName: string,
+  ): void {
+    openStatusActionsMenu();
+    cy.get("body").then(($body) => {
+      const $action = $body.find(actionSelector).filter(":visible");
+      if ($action.length === 0) {
+        cy.log(`${actionName} not present in dropdown; likely already progressed`);
+        cy.get("body").click(0, 0); // close menu
+        return;
+      }
+      if ($action.is(":disabled")) {
+        cy.log(`${actionName} is disabled; likely already progressed`);
+        cy.get("body").click(0, 0); // close menu
+        return;
+      }
+      cy.wrap($action.first()).click({ force: true });
+      confirmStatusActionIfNeeded();
+    });
+  }
+
+  function confirmStatusActionIfNeeded(): void {
+    cy.wait(500);
+    cy.get("body").then(($body) => {
+      if ($body.find(".swal2-popup .swal2-confirm").length > 0) {
+        cy.get(".swal2-popup .swal2-confirm", { timeout: 20000 })
+          .should("be.visible")
+          .click({ force: true });
+        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+        return;
+      }
+
+      if (
+        $body.find(".modal.show .modal-content:contains('Confirm Action')")
+          .length > 0
+      ) {
+        cy.get(".modal.show", { timeout: 20000 })
+          .should("be.visible")
+          .within(() => {
+            cy.contains("button", /^Confirm$/i, { timeout: 20000 })
+              .should("be.visible")
+              .click({ force: true });
+          });
+        cy.contains(".modal.show .modal-content", "Confirm Action", {
+          timeout: 20000,
+        }).should("not.exist");
+        cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
+      }
+    });
+  }
+
+  function dismissBlockingModalIfPresent(): void {
+    cy.get("body").then(($body) => {
+      if ($body.find(".swal2-container .swal2-confirm").length > 0) {
+        cy.get(".swal2-container .swal2-confirm", { timeout: 20000 })
+          .should("be.visible")
+          .click({ force: true });
+        cy.get(".swal2-container", { timeout: 20000 }).should("not.exist");
+      }
+
+      if ($body.find(".modal.show").length > 0) {
+        cy.get(".modal.show", { timeout: 20000 }).should("not.exist");
+        cy.get(".modal-backdrop", { timeout: 20000 }).should("not.exist");
+      }
+    });
+  }
+
+  function selectFirstAvailableOptionByLabel(labelText: string): void {
+    cy.get("body").then(($body) => {
+      if ($body.find(`label:contains('${labelText}'):visible`).length === 0) {
+        cy.log(`Label not found (skip): ${labelText}`);
+        return;
+      }
+
+      cy.contains("label", labelText, { timeout: 10000 })
+        .first()
+        .then(($label) => {
+          const fieldId = ($label.attr("for") || "").trim();
+          if (!fieldId) {
+            cy.log(`No 'for' attribute on label (skip): ${labelText}`);
+            return;
+          }
+
+          const selector = `#${fieldId}`;
+          if ($body.find(selector).length === 0) {
+            cy.log(`Field not found by id (skip): ${selector}`);
+            return;
+          }
+
+          cy.get(selector, { timeout: 10000 }).then(($select) => {
+            const options = $select.find("option").toArray();
+            const candidate = options.find((opt) => {
+              const value = (opt.getAttribute("value") || "").trim();
+              const text = (opt.textContent || "").trim().toLowerCase();
+              return value !== "" && text !== "please choose...";
+            });
+
+            const value = candidate?.getAttribute("value");
+            if (value) {
+              cy.wrap($select).select(value, { force: true });
+            }
+          });
+        });
+    });
+  }
+
+  function populateReviewFieldsRequiredForCompleteReview(): void {
+    detailsPage.goToReviewAssessmentTab();
+
+    reviewPage.verifyFormioLoaded();
+    cy.get("#ApprovalView_ApprovedAmount", { timeout: 30000 })
+      .should("be.visible")
+      .and("not.be.disabled");
+
+    cy.get("body").then(($body) => {
+      if ($body.find("#ApprovalView_ApprovedAmount").length > 0) {
+        reviewPage.enterApprovedAmount(TEST_CONFIG.approvedAmount);
+      } else {
+        cy.log("Approved amount field not present yet; skipping amount entry");
+      }
+
+      if ($body.find("#ApprovalView_FinalDecisionDate").length > 0) {
+        reviewPage.setDecisionDateToToday();
+      } else {
+        cy.log("Decision date field not present yet; skipping date entry");
+      }
+    });
+
+    selectFirstAvailableOptionByLabel("Likelihood of Funding");
+    selectFirstAvailableOptionByLabel("Due Diligence Status");
+    selectFirstAvailableOptionByLabel("Assessment Result");
+    reviewPage.clickSave();
+  }
+
+  function assignSubmissionFromList(ownerName: string): void {
+    dismissBlockingModalIfPresent();
+    waitForSubmissionToAppearInList();
+
+    listPage
+      .waitForNoBlockingOverlay()
+      .selectQuickDateRange("alltime")
+      .waitForTableRefresh()
+      .searchForSubmission(submissionId)
+      .selectRowByText(submissionId);
+
+    cy.get("#assignApplication", { timeout: 20000 })
+      .should("exist")
+      .and("not.have.class", "action-bar-btn-unavailable")
+      .and("be.visible")
+      .click({ force: true });
+
+    cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
+      "be.visible",
+    );
+
+    cy.get("#AssigneeId", { timeout: 20000 })
+      .should("be.visible")
+      .select(ownerName);
+
+    cy.get("#user-tags-input", { timeout: 20000 })
+      .should("be.visible")
+      .clear()
+      .type(ownerName, { delay: 0 });
+
+    cy.get("body").then(($body) => {
+      if (
+        $body.find(".tags-suggestion-container .tags-suggestion-element")
+          .length > 0
+      ) {
+        cy.get(".tags-suggestion-container .tags-suggestion-element", {
+          timeout: 10000,
+        })
+          .contains(ownerName)
+          .click({ force: true });
+      } else {
+        cy.get("#user-tags-input").type("{enter}");
+      }
+    });
+
+    cy.contains(".modal-footer button", "Save", { timeout: 20000 })
+      .should("be.visible")
+      .and("not.be.disabled")
+      .click({ force: true });
+
+    cy.contains(".modal-title", "Assessment Users", { timeout: 20000 }).should(
+      "not.exist",
+    );
+    listPage.waitForNoBlockingOverlay();
+  }
+
+  function clickAdjudicationActionIfEnabled(actionSelector: string): void {
+    cy.get("body").then(($body) => {
+      if ($body.find(actionSelector).length > 0) {
+        cy.get(actionSelector, { timeout: 20000 }).then(($button) => {
+          if (!$button.is(":disabled")) {
+            cy.wrap($button).click({ force: true });
+            confirmStatusActionIfNeeded();
+          } else {
+            cy.log(`Action is disabled: ${actionSelector}`);
+          }
+        });
+      } else {
+        cy.log(`Action not present: ${actionSelector}`);
+      }
+    });
+  }
+
   /** Select the submissionId row and open the Approve Payments modal. */
   function selectRowAndOpenApproveModal(): void {
+    waitForBlockingUiToClear();
     cy.contains("tr", submissionId, { timeout: 20000 })
+      .scrollIntoView()
       .find(".checkbox-select")
       .click({ force: true });
     cy.contains("button", "Approve", { timeout: 20000 })
@@ -168,54 +517,90 @@ const TEST_CONFIG = {
       .searchForSubmission(submissionId);
   });
 
+  it("Assign submission on application list", () => {
+    assignSubmissionFromList(TEST_CONFIG.assignOwner);
+  });
+
   it("Select submission and open details", () => {
-    listPage.selectRowByText(submissionId).clickOpenButton();
+    dismissBlockingModalIfPresent();
+    waitForSubmissionToAppearInList();
+    listPage.waitForNoBlockingOverlay();
+
+    cy.location("pathname", { timeout: 20000 }).then((pathname) => {
+      if (pathname.includes("/GrantApplications/Details")) {
+        cy.log("Already on details page after assignment");
+      } else {
+        listPage
+          .selectQuickDateRange("alltime")
+          .waitForTableRefresh()
+          .searchForSubmission(submissionId)
+          .selectRowByText(submissionId)
+          .clickOpenButton();
+      }
+    });
+
+    cy.get(BREADCRUMB_STATUS_SELECTOR, { timeout: 20000 })
+      .should("be.visible")
+      .invoke("text")
+      .then((statusText) => {
+        const normalized = statusText.trim().toLowerCase();
+        expect(
+          ["submitted", "assigned"],
+          "Expected initial status to be Submitted or Assigned",
+        ).to.include(normalized);
+      });
   });
 
   // ============ Review & Assessment ============
 
-  it("Navigate to Review and Assessment tab", () => {
-    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
+  it("Start review from Status Actions", () => {
+    clickStatusActionIfEnabled(STATUS_ACTIONS.startReview, "Start Review");
   });
 
-  it("Enter approval details and save", () => {
-    reviewPage
-      .verifyFormioLoaded()
-      .enterApprovedAmount(TEST_CONFIG.approvedAmount)
-      .setDecisionDateToToday()
-      .clickSave();
+  it("Complete review from Status Actions", () => {
+    populateReviewFieldsRequiredForCompleteReview();
+    clickStatusActionIfEnabled(
+      STATUS_ACTIONS.completeReview,
+      "Complete Review",
+    );
+  });
+
+  it("Start assessment from Status Actions", () => {
+    clickStatusActionIfEnabled(
+      STATUS_ACTIONS.startAssessment,
+      "Start Assessment",
+    );
+  });
+
+  it("Navigate to Review and Assessment tab", () => {
+    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
   });
 
-  it("Create and complete assessment", () => {
+  it("Create assessment", () => {
     cy.wait(2000); // Allow assessment section to fully load
     reviewPage.scrollToAssessmentList();
 
     cy.get("body").then(($body) => {
       if ($body.find("#CreateButton").length > 0) {
         cy.get("#CreateButton").click({ force: true });
-        cy.wait(1000);
+        // Give the new assessment row time to render before subsequent actions.
+        cy.wait(1000); // Needed because row creation animation can delay DOM readiness.
       } else {
         cy.log("Create Assessment button not found - may already be created");
       }
     });
+  });
 
-    cy.get("body").then(($body) => {
-      if ($body.find("#CompleteButton").length > 0) {
-        cy.get("#CompleteButton").click({ force: true });
-        cy.wait(1000);
-      } else {
-        cy.log(
-          "Complete Assessment button not found - may already be completed",
-        );
-      }
-    });
+  it("Complete assessment from adjudication action bar", () => {
+    clickAdjudicationActionIfEnabled(ADJUDICATION_ACTIONS.completeAssessment);
   });
 
   // ============ Payment Info ============
 
   it("Configure payment info", () => {
     cy.reload(); // Reload to get fresh data and avoid concurrency issues
-    cy.wait(2000);
+    // Wait briefly for async payment tab dependencies to stabilize after reload.
+    cy.wait(2000); // Prevents save attempts before payment controls are initialized.
     detailsPage
       .goToPaymentInfoTab()
       .enterSupplierNumber(TEST_CONFIG.supplierNumber)
@@ -224,6 +609,7 @@ const TEST_CONFIG = {
   });
 
   it("Validate and edit site info", () => {
+    ensureSiteInfoReady();
     detailsPage
       .verifySiteInfoTablePopulated()
       .verifySiteInfoTableHasData()
@@ -269,18 +655,37 @@ const TEST_CONFIG = {
     });
   });
 
+  it("Enter approval details and save", () => {
+    detailsPage.goToReviewAssessmentTab().verifyActiveTab("reviewAssessment");
+    reviewPage
+      .verifyFormioLoaded()
+      .enterApprovedAmount(TEST_CONFIG.approvedAmount)
+      .setDecisionDateToToday()
+      .clickSave();
+  });
+
   // ============ Application Approval ============
 
   it("Test approval workflow (confirm)", () => {
     cy.reload(); // Refresh to ensure all changes are reflected before approval
     detailsPage.dismissErrorModalIfPresent();
-    detailsPage.clickApprove().waitForConfirmModal().clickConfirm();
+    clickStatusAction(STATUS_ACTIONS.completeAssessment);
+    confirmStatusActionIfNeeded();
+
+    cy.get(STATUS_ACTIONS.menuButton, { timeout: 20000 })
+      .filter(":visible")
+      .first()
+      .should("be.visible")
+      .and("not.contain.text", "Processing...");
+
+    clickStatusAction(STATUS_ACTIONS.approve);
+    detailsPage.waitForConfirmModal().clickConfirm();
   });
 
   // ============ Post-Approval Verification ============
 
   it("Navigate back to applications list", () => {
-    cy.visit(`${Cypress.env("webapp.url")}GrantApplications`);
+    cy.visit(`${Cypress.env("webapp.url")}${APPLICATIONS_PATH}`);
     listPage.switchToGrantProgram(TEST_CONFIG.grantProgram);
   });
 
@@ -300,7 +705,10 @@ const TEST_CONFIG = {
   // ============ Payment Request ============
 
   it("Select approved application and submit payment request", () => {
-    listPage.selectRowByText(submissionId).clickPaymentButtonWithWait();
+    listPage
+      .waitForNoBlockingOverlay()
+      .selectRowByText(submissionId)
+      .clickPaymentButtonWithWait();
     listPage.waitForPaymentModalVisible();
 
     // Description field has a max length of 40 chars
@@ -317,7 +725,7 @@ const TEST_CONFIG = {
       .and("not.be.disabled")
       .click();
 
-    cy.get("#payment-modal", { timeout: 20000 }).should("not.be.visible");
+    listPage.verifyPaymentModalClosed();
     cy.log(`✅ Payment request submitted: ${paymentDescription}`);
   });
 

From e4768234ba013dc6380093a016417dde0dda6dc1 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Fri, 17 Apr 2026 14:04:46 -0700
Subject: [PATCH 39/45] AB#32700 fix address edit flag for profile

---
 .../AddressInfoDataProvider.cs                | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs
index 8139d4b390..fc120680bf 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs
@@ -18,7 +18,8 @@ namespace Unity.GrantManager.ApplicantProfile
     /// Addresses are resolved via both the ApplicationId and ApplicantId
     /// relationships, with duplicates removed. Addresses linked via
     /// ApplicationId are always read-only. Addresses linked via ApplicantId
-    /// are editable only when that set resolves to a single ApplicantId.
+    /// are editable only when they have no ApplicationId and the subject's
+    /// form submissions resolve to a single ApplicantId.
     /// </summary>
     [ExposeServices(typeof(IApplicantProfileDataProvider))]
     public class AddressInfoDataProvider(
@@ -56,7 +57,14 @@ public async Task<ApplicantProfileDataDto> GetDataAsync(ApplicantProfileInfoRequ
                     from submission in matchingSubmissions
                     join address in addressesQuery on submission.ApplicationId equals address.ApplicationId
                     join application in applicationsQuery on address.ApplicationId equals application.Id
-                    select new { address, address.CreationTime, application.ReferenceNo, IsFromApplicantPath = false, address.ApplicantId };
+                    select new 
+                    { 
+                        address, 
+                        address.CreationTime, 
+                        application.ReferenceNo, 
+                        IsFromApplicantPath = false, 
+                        address.ApplicantId 
+                    };
 
                 // Addresses linked via ApplicantId — conditionally editable
                 var byApplicantId =
@@ -64,8 +72,15 @@ from submission in matchingSubmissions
                     join address in addressesQuery on submission.ApplicantId equals address.ApplicantId
                     join application in applicationsQuery on address.ApplicationId equals application.Id into apps
                     from application in apps.DefaultIfEmpty()
-                    select new { address, address.CreationTime, ReferenceNo = application != null ? application.ReferenceNo : null, IsFromApplicantPath = true, address.ApplicantId };
-
+                    select new 
+                    { 
+                        address, 
+                        address.CreationTime, 
+                        ReferenceNo = application != null ? application.ReferenceNo : null, 
+                        IsFromApplicantPath = true, 
+                        address.ApplicantId 
+                    };
+                
                 var results = await byApplicationId
                     .Concat(byApplicantId)
                     .ToListAsync();
@@ -76,13 +91,13 @@ from application in apps.DefaultIfEmpty()
                     .Select(g => g.OrderBy(r => r.IsFromApplicantPath).First())
                     .ToList();
 
-                // Addresses from the ApplicantId path are editable only when
-                // that path resolves to a single ApplicantId
-                var applicantPathEditable = results
-                    .Where(r => r.IsFromApplicantPath && r.ApplicantId != null)
+                var distinctApplicantIds = deduplicated
+                    .Where(r => r.ApplicantId != null)
                     .Select(r => r.ApplicantId)
                     .Distinct()
-                    .Count() <= 1;
+                    .ToList();
+
+                var distinctApplicants = distinctApplicantIds.Count > 1;               
 
                 var addressDtos = deduplicated.Select(r => new AddressInfoItemDto
                 {
@@ -96,7 +111,7 @@ from application in apps.DefaultIfEmpty()
                     PostalCode = r.address.Postal ?? string.Empty,
                     Country = r.address.Country ?? string.Empty,
                     IsPrimary = r.address.HasProperty(AddressExtraPropertyNames.IsPrimary) && r.address.GetProperty<bool>(AddressExtraPropertyNames.IsPrimary),
-                    IsEditable = r.IsFromApplicantPath && applicantPathEditable,
+                    IsEditable = r.IsFromApplicantPath && !distinctApplicants,
                     ReferenceNo = r.ReferenceNo
                 }).ToList();
 

From 99a3984623117f029c65e6507deb6674a287f93a Mon Sep 17 00:00:00 2001
From: Velang <Velang.Rao@gov.bc.ca>
Date: Fri, 17 Apr 2026 14:13:52 -0700
Subject: [PATCH 40/45] CR comments

---
 .../cypress/pages/ApplicationDetailsPage.ts   |   3 +-
 .../cypress/pages/ApplicationsListPage.ts     | 227 ++++++++++++------
 2 files changed, 157 insertions(+), 73 deletions(-)

diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
index 0cefa4fa12..14e171027c 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationDetailsPage.ts
@@ -628,8 +628,7 @@ export class ApplicationDetailsPage extends BasePage {
 
       if ($body.find(".modal.show .btn-close").length > 0) {
         cy.get(".modal.show .btn-close").first().click({ force: true });
-        cy.get(".swal2-container")
-          .should("not.exist");
+        cy.get(".swal2-container").should("not.exist");
         cy.wait(500);
       }
     });
diff --git a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
index d07835ea27..52c129791a 100644
--- a/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
+++ b/applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts
@@ -37,9 +37,8 @@ export class ApplicationsListPage extends ApplicationsPage {
   private readonly extendedActionBar = {
     customButtons: "#app_custom_buttons",
     dynamicButtonContainer: "#dynamicButtonContainerId",
-    // Export can be rendered as button/span or anchor depending on DataTables build.
     exportButton:
-      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons a, #dynamicButtonContainerId .dt-buttons span",
+      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
     saveViewButton: "button.grp-savedStates",
   };
 
@@ -103,8 +102,11 @@ export class ApplicationsListPage extends ApplicationsPage {
       | "alltime"
       | "custom",
   ): this {
+    this.waitForNoBlockingOverlay();
     cy.get(this.dateFilters.quickDateRange, { timeout: this.STANDARD_TIMEOUT })
+      .scrollIntoView()
       .should("be.visible")
+      .and("not.be.disabled")
       .select(range);
     return this;
   }
@@ -150,11 +152,13 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.get(this.dateFilters.submittedFromDate, {
       timeout: this.STANDARD_TIMEOUT,
     })
-      .click({ force: true })
-      .clear({ force: true })
-      .type(date, { force: true })
-      .trigger("change", { force: true })
-      .blur({ force: true })
+      .scrollIntoView()
+      .should("be.visible")
+      .click()
+      .clear()
+      .type(date)
+      .trigger("change")
+      .blur()
       .should("have.value", date);
     return this;
   }
@@ -164,11 +168,13 @@ export class ApplicationsListPage extends ApplicationsPage {
    */
   setSubmittedToDate(date: string): this {
     cy.get(this.dateFilters.submittedToDate, { timeout: this.STANDARD_TIMEOUT })
-      .click({ force: true })
-      .clear({ force: true })
-      .type(date, { force: true })
-      .trigger("change", { force: true })
-      .blur({ force: true })
+      .scrollIntoView()
+      .should("be.visible")
+      .click()
+      .clear()
+      .type(date)
+      .trigger("change")
+      .blur()
       .should("have.value", date);
     return this;
   }
@@ -213,9 +219,12 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Select a row by matching text content
    */
   selectRowByText(text: string): this {
+    this.waitForNoBlockingOverlay();
     cy.contains("tr", text, { timeout: this.STANDARD_TIMEOUT })
+      .scrollIntoView()
       .find(".checkbox-select")
-      .click({ force: true });
+      .should("be.visible")
+      .click();
     return this;
   }
 
@@ -225,7 +234,8 @@ export class ApplicationsListPage extends ApplicationsPage {
   clickOpenButton(): this {
     cy.get("#externalLink", { timeout: this.STANDARD_TIMEOUT })
       .should("exist")
-      .click({ force: true });
+      .should("be.visible")
+      .click();
     return this;
   }
 
@@ -241,17 +251,61 @@ export class ApplicationsListPage extends ApplicationsPage {
     return this;
   }
 
+  /**
+   * Dispatch a native mouse click sequence against the current target cell.
+   * This avoids Cypress holding a stale DOM reference while DataTables redraws.
+   */
+  private clickRowCellNative(rowIndex: number, withCtrl = false): this {
+    this.waitForNoBlockingOverlay();
+
+    cy.window({ log: false }).then((win: Cypress.AUTWindow) => {
+      cy.get(this.scrollTable.tableRows, {
+        timeout: this.STANDARD_TIMEOUT,
+      })
+        .should("have.length.greaterThan", rowIndex)
+        .eq(rowIndex)
+        .should("exist")
+        .then(($row: JQuery<HTMLElement>) => {
+          const $cell = $row.find("td").not(":has(a)").first();
+
+          expect(
+            $cell.length,
+            `row ${rowIndex} should contain at least one non-link cell`,
+          ).to.be.greaterThan(0);
+
+          const cell = $cell[0] as HTMLElement;
+
+          cell.scrollIntoView({
+            block: "center",
+            inline: "nearest",
+          });
+
+          const eventInit: MouseEventInit = {
+            bubbles: true,
+            cancelable: true,
+            view: win,
+            ctrlKey: withCtrl,
+            metaKey: withCtrl,
+            button: 0,
+            buttons: 1,
+          };
+
+          cell.dispatchEvent(new win.MouseEvent("mouseover", eventInit));
+          cell.dispatchEvent(new win.MouseEvent("mousemove", eventInit));
+          cell.dispatchEvent(new win.MouseEvent("mousedown", eventInit));
+          cell.dispatchEvent(new win.MouseEvent("mouseup", eventInit));
+          cell.dispatchEvent(new win.MouseEvent("click", eventInit));
+        });
+    });
+
+    return this;
+  }
+
   /**
    * Select a row by index (clicks on a non-link cell)
    */
   selectRowByIndex(rowIndex: number, withCtrl = false): this {
-    cy.get(this.scrollTable.tableRows, { timeout: this.STANDARD_TIMEOUT })
-      .eq(rowIndex)
-      .find("td")
-      .not(":has(a)")
-      .first()
-      .click({ force: true, ctrlKey: withCtrl });
-    return this;
+    return this.clickRowCellNative(rowIndex, withCtrl);
   }
 
   /**
@@ -324,10 +378,11 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Click the Payment button (extended with visibility checks)
    */
   clickPaymentButtonWithWait(): this {
+    this.waitForNoBlockingOverlay();
     cy.get("#applicationPaymentRequest", { timeout: this.BUTTON_TIMEOUT })
       .should("be.visible")
       .and("not.be.disabled")
-      .click({ force: true });
+      .click();
     return this;
   }
 
@@ -338,7 +393,9 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.contains(this.extendedActionBar.exportButton, "Export", {
       timeout: this.STANDARD_TIMEOUT,
       matchCase: false,
-    }).should("be.visible");
+    })
+      .scrollIntoView()
+      .should("be.visible");
     return this;
   }
 
@@ -359,10 +416,12 @@ export class ApplicationsListPage extends ApplicationsPage {
    */
   verifyColumnsButtonVisible(): this {
     cy.contains(
-      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons a, #dynamicButtonContainerId .dt-buttons span",
+      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
       "Columns",
-      { timeout: this.STANDARD_TIMEOUT },
-    ).should("be.visible");
+      { timeout: this.STANDARD_TIMEOUT, matchCase: false },
+    )
+      .scrollIntoView()
+      .should("be.visible");
     return this;
   }
 
@@ -387,6 +446,9 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.get(this.paymentModal.modal, { timeout: this.STANDARD_TIMEOUT })
       .should("be.visible")
       .and("have.class", "show");
+    cy.get(this.paymentModal.backdrop, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("exist");
     return this;
   }
 
@@ -405,7 +467,6 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.get(this.paymentModal.backdrop, {
       timeout: this.STANDARD_TIMEOUT,
     }).should("not.exist");
-
     return this;
   }
 
@@ -413,58 +474,71 @@ export class ApplicationsListPage extends ApplicationsPage {
    * Close payment modal using multiple strategies
    */
   closePaymentModal(): this {
-    // Attempt ESC key
-    cy.get("body").type("{esc}", { force: true });
-
-    // Click backdrop if present (check existence first to avoid timeout)
     cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
-      if ($body.find(this.paymentModal.backdrop).length > 0) {
-        cy.get(this.paymentModal.backdrop).click("topLeft", { force: true });
+      if ($body.find(`${this.paymentModal.modal}.show`).length === 0) {
+        return;
       }
-    });
 
-    // Try Cancel button if available (check existence first to avoid timeout)
-    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
       const $cancelBtn = $body
         .find(this.paymentModal.cancelButton)
         .filter((_: number, el: HTMLElement) =>
           (el.textContent || "").includes("Cancel"),
         );
+
       if ($cancelBtn.length > 0) {
         cy.wrap($cancelBtn.first()).scrollIntoView().click({ force: true });
-      } else {
-        cy.log("Cancel button not present, proceeding to hard-close fallback");
       }
     });
 
-    // Hard close fallback using jQuery
-    cy.window().then((win: Cypress.AUTWindow) => {
-      try {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const windowWithModal = win as any;
-        if (typeof windowWithModal.closePaymentModal === "function") {
-          windowWithModal.closePaymentModal();
-        }
-      } catch {
-        /* ignore */
+    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+      if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
+        cy.get("body").type("{esc}", { force: true });
       }
+    });
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const $ = (win as any).jQuery || (win as any).$;
-      if ($) {
-        try {
-          $("#payment-modal")
-            .removeClass("show")
-            .attr("aria-hidden", "true")
-            .css("display", "none");
-          $(".modal-backdrop").remove();
-          $("body").removeClass("modal-open").css("overflow", "");
-        } catch {
-          /* ignore */
-        }
+    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+      if (
+        $body.find(`${this.paymentModal.modal}.show`).length > 0 &&
+        $body.find(this.paymentModal.backdrop).length > 0
+      ) {
+        cy.get(this.paymentModal.backdrop).first().click("topLeft", {
+          force: true,
+        });
       }
     });
-    return this;
+
+    cy.get("body").then(($body: JQuery<HTMLBodyElement>) => {
+      if ($body.find(`${this.paymentModal.modal}.show`).length > 0) {
+        cy.window().then((win: Cypress.AUTWindow) => {
+          try {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const windowWithModal = win as any;
+            if (typeof windowWithModal.closePaymentModal === "function") {
+              windowWithModal.closePaymentModal();
+            }
+          } catch {
+            /* ignore */
+          }
+
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          const $ = (win as any).jQuery || (win as any).$;
+          if ($) {
+            try {
+              $(this.paymentModal.modal)
+                .removeClass("show")
+                .attr("aria-hidden", "true")
+                .css("display", "none");
+              $(this.paymentModal.backdrop).remove();
+              $("body").removeClass("modal-open").css("overflow", "");
+            } catch {
+              /* ignore */
+            }
+          }
+        });
+      }
+    });
+
+    return this.verifyPaymentModalClosed();
   }
 
   /**
@@ -477,14 +551,17 @@ export class ApplicationsListPage extends ApplicationsPage {
         expect(isHidden, "payment-modal hidden or not shown").to.eq(true);
       },
     );
+
     cy.get(this.paymentModal.backdrop, {
       timeout: this.STANDARD_TIMEOUT,
     }).should("not.exist");
+
+    cy.get(this.blockingUi.bootstrapModal, {
+      timeout: this.STANDARD_TIMEOUT,
+    }).should("not.exist");
     return this;
   }
 
-  // ============ Columns Menu Methods ============
-
   /**
    * Close any open dropdowns or modals
    */
@@ -509,8 +586,8 @@ export class ApplicationsListPage extends ApplicationsPage {
     cy.contains(this.saveView.resetOption, "Reset to Default View", {
       timeout: this.STANDARD_TIMEOUT,
     })
-      .should("exist")
-      .click({ force: true });
+      .should("be.visible")
+      .click();
 
     // Wait for table to rebuild
     cy.get(this.scrollTable.columnTitles, {
@@ -524,10 +601,11 @@ export class ApplicationsListPage extends ApplicationsPage {
    */
   openColumnsMenu(): this {
     cy.contains(
-      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons a, #dynamicButtonContainerId .dt-buttons span",
-      /^Columns$/i,
-      { timeout: this.STANDARD_TIMEOUT },
+      "#dynamicButtonContainerId .dt-buttons button, #dynamicButtonContainerId .dt-buttons button span",
+      "Columns",
+      { timeout: this.STANDARD_TIMEOUT, matchCase: false },
     )
+      .scrollIntoView()
       .should("be.visible")
       .click();
 
@@ -546,9 +624,16 @@ export class ApplicationsListPage extends ApplicationsPage {
       timeout: this.STANDARD_TIMEOUT,
       matchCase: false,
     })
-      .should("exist")
       .scrollIntoView()
-      .click({ force: true });
+      .should("exist")
+      .then(($item) => {
+        if (Cypress.dom.isVisible($item)) {
+          cy.wrap($item).click();
+        } else {
+          // Some dropdown items are clipped by overflow containers; native click still triggers menu toggle reliably.
+          ($item[0] as HTMLElement).click();
+        }
+      });
     return this;
   }
 

From 45fb2733a2cfd5b48ad018b24cfc2481ffb21229 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 14:50:38 -0700
Subject: [PATCH 41/45] AB#32299 simplify OpenAI runtime helpers

---
 .../AI/Runtime/OpenAIPromptRenderer.cs        |  18 +--
 .../AI/Runtime/OpenAIResponseParser.cs        |   4 +-
 .../AI/Runtime/OpenAIRuntimeService.cs        | 132 ++----------------
 .../AI/Runtime/OpenAITransportService.cs      |   1 -
 .../ApplicationAnalysisAppService.cs          |   1 -
 .../GenerateApplicationScoringJob.cs          |   1 -
 6 files changed, 24 insertions(+), 133 deletions(-)

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
index a917d59982..a56d56f6af 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIPromptRenderer.cs
@@ -28,12 +28,12 @@ public class OpenAIPromptRenderer : ITransientDependency
     private static readonly ConcurrentDictionary<string, string> PromptTemplateCache = new(StringComparer.OrdinalIgnoreCase);
     private static readonly JsonSerializerOptions JsonLogOptions = new() { WriteIndented = true };
 
-    public string BuildApplicationAnalysisSystemPrompt(string version)
+    public static string BuildApplicationAnalysisSystemPrompt(string version)
     {
         return GetRequiredPromptTemplate(version, ApplicationAnalysisSystemTemplateName);
     }
 
-    public string BuildApplicationAnalysisUserPrompt(string version, string schema, string data, string attachments)
+    public static string BuildApplicationAnalysisUserPrompt(string version, string schema, string data, string attachments)
     {
         var replacements = new Dictionary<string, string>
         {
@@ -45,12 +45,12 @@ public string BuildApplicationAnalysisUserPrompt(string version, string schema,
         return RenderPromptTemplate(version, ApplicationAnalysisUserTemplateName, replacements);
     }
 
-    public string BuildAttachmentSummarySystemPrompt(string version)
+    public static string BuildAttachmentSummarySystemPrompt(string version)
     {
         return GetRequiredPromptTemplate(version, AttachmentSummarySystemTemplateName);
     }
 
-    public string BuildAttachmentSummaryUserPrompt(string version, string attachment)
+    public static string BuildAttachmentSummaryUserPrompt(string version, string attachment)
     {
         return RenderPromptTemplate(version, AttachmentSummaryUserTemplateName, new Dictionary<string, string>
         {
@@ -58,12 +58,12 @@ public string BuildAttachmentSummaryUserPrompt(string version, string attachment
         });
     }
 
-    public string BuildApplicationScoringSystemPrompt(string version)
+    public static string BuildApplicationScoringSystemPrompt(string version)
     {
         return GetRequiredPromptTemplate(version, ApplicationScoringSystemTemplateName);
     }
 
-    public string BuildApplicationScoringUserPrompt(string version, string data, string attachments, string section, string response)
+    public static string BuildApplicationScoringUserPrompt(string version, string data, string attachments, string section, string response)
     {
         return RenderPromptTemplate(version, ApplicationScoringUserTemplateName, new Dictionary<string, string>
         {
@@ -74,7 +74,7 @@ public string BuildApplicationScoringUserPrompt(string version, string data, str
         });
     }
 
-    public string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
+    public static string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
     {
         try
         {
@@ -119,7 +119,7 @@ public string BuildApplicationScoringResponseTemplate(string sectionPayloadJson)
         }
     }
 
-    public string BuildAliasedApplicationScoringSection(string? sectionName, string sectionJson, out IReadOnlyDictionary<string, string> questionIdAliasMap)
+    public static string BuildAliasedApplicationScoringSection(string? sectionName, string sectionJson, out IReadOnlyDictionary<string, string> questionIdAliasMap)
     {
         questionIdAliasMap = new Dictionary<string, string>(StringComparer.Ordinal);
 
@@ -182,7 +182,7 @@ public string BuildAliasedApplicationScoringSection(string? sectionName, string
         }
     }
 
-    public string ResolvePromptVersion(string? version)
+    public static string ResolvePromptVersion(string? version)
     {
         if (!string.IsNullOrWhiteSpace(version) &&
             PromptProfiles.TryGetValue(version.Trim(), out var selectedVersion))
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
index 57d99bf060..1abacf8dda 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIResponseParser.cs
@@ -11,7 +11,7 @@ namespace Unity.AI.Runtime;
 
 public class OpenAIResponseParser : ITransientDependency
 {
-    public ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
+    public static ApplicationAnalysisResponse ParseApplicationAnalysisResponse(string raw)
     {
         var response = new ApplicationAnalysisResponse();
         if (!TryParseJsonObjectFromResponse(AddIdsToAnalysisItems(raw), out var root))
@@ -107,7 +107,7 @@ private static string AddIdsToAnalysisItems(string analysisJson)
         }
     }
 
-    public ApplicationScoringResponse ParseApplicationScoringResponse(string raw, IReadOnlyDictionary<string, string>? questionIdAliasMap = null)
+    public static ApplicationScoringResponse ParseApplicationScoringResponse(string raw, IReadOnlyDictionary<string, string>? questionIdAliasMap = null)
     {
         var response = new ApplicationScoringResponse();
         if (!TryParseJsonObjectFromResponse(raw, out var root))
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index 46272489d1..f3b68aaa32 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -1,13 +1,10 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Unity.AI.Extraction;
@@ -27,22 +24,11 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly ILogger<OpenAIRuntimeService> _logger;
         private readonly ITextExtractionService _textExtractionService;
         private readonly OpenAITransportService _openAITransportService;
-        private readonly OpenAIResponseParser _openAIResponseParser;
-        private readonly OpenAIPromptRenderer _openAIPromptRenderer;
         private readonly OpenAIConfigurationResolver _openAIConfigurationResolver;
         private readonly ICurrentTenant _currentTenant;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
         private const string AttachmentSummaryPromptType = AIPromptTypes.AttachmentSummary;
         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 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.";
@@ -65,22 +51,11 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
 
         private static readonly JsonSerializerOptions JsonLogOptions = new() { WriteIndented = true };
 
-        private static readonly Dictionary<string, string> PromptProfiles =
-            new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
-            {
-                [PromptVersionV0] = PromptVersionV0,
-                [PromptVersionV1] = PromptVersionV1
-            };
-        private static readonly ConcurrentDictionary<string, string> PromptTemplateCache = new(StringComparer.OrdinalIgnoreCase);
-
         public OpenAIRuntimeService(
-            HttpClient httpClient,
             IConfiguration configuration,
             ILogger<OpenAIRuntimeService> logger,
             ITextExtractionService textExtractionService,
             OpenAITransportService openAITransportService,
-            OpenAIResponseParser openAIResponseParser,
-            OpenAIPromptRenderer openAIPromptRenderer,
             OpenAIConfigurationResolver openAIConfigurationResolver,
             ICurrentTenant currentTenant)
         {
@@ -88,8 +63,6 @@ public OpenAIRuntimeService(
             _logger = logger;
             _textExtractionService = textExtractionService;
             _openAITransportService = openAITransportService;
-            _openAIResponseParser = openAIResponseParser;
-            _openAIPromptRenderer = openAIPromptRenderer;
             _openAIConfigurationResolver = openAIConfigurationResolver;
             _currentTenant = currentTenant;
         }
@@ -121,7 +94,7 @@ public async Task<AICompletionResponse> GenerateCompletionAsync(AICompletionRequ
         public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(ApplicationAnalysisRequest request)
         {
             ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = _openAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationAnalysisPromptType));
+            var promptVersion = OpenAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationAnalysisPromptType));
             var data = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var schema = JsonSerializer.Serialize(request.Schema, JsonLogOptions);
 
@@ -134,8 +107,8 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 .Cast<object>();
 
             var attachments = JsonSerializer.Serialize(attachmentsPayload, JsonLogOptions);
-            var systemPrompt = _openAIPromptRenderer.BuildApplicationAnalysisSystemPrompt(promptVersion);
-            var applicationAnalysisContent = _openAIPromptRenderer.BuildApplicationAnalysisUserPrompt(
+            var systemPrompt = OpenAIPromptRenderer.BuildApplicationAnalysisSystemPrompt(promptVersion);
+            var applicationAnalysisContent = OpenAIPromptRenderer.BuildApplicationAnalysisUserPrompt(
                 promptVersion,
                 schema,
                 data,
@@ -157,7 +130,7 @@ public async Task<ApplicationAnalysisResponse> GenerateApplicationAnalysisAsync(
                 return new ApplicationAnalysisResponse();
             }
 
-            return _openAIResponseParser.ParseApplicationAnalysisResponse(result.Content);
+            return OpenAIResponseParser.ParseApplicationAnalysisResponse(result.Content);
         }
 
         public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(AttachmentSummaryRequest request)
@@ -166,12 +139,12 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
             var fileName = request.FileName ?? string.Empty;
             var fileContent = request.FileContent ?? Array.Empty<byte>();
             var contentType = request.ContentType ?? "application/octet-stream";
-            var promptVersion = _openAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(AttachmentSummaryPromptType));
+            var promptVersion = OpenAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(AttachmentSummaryPromptType));
 
             try
             {
                 var extractedText = await _textExtractionService.ExtractTextAsync(fileName, fileContent, contentType);
-                var prompt = _openAIPromptRenderer.BuildAttachmentSummarySystemPrompt(promptVersion);
+                var prompt = OpenAIPromptRenderer.BuildAttachmentSummarySystemPrompt(promptVersion);
 
                 var attachmentText = string.IsNullOrWhiteSpace(extractedText) ? null : extractedText;
                 if (attachmentText != null)
@@ -191,7 +164,7 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
                     text = attachmentText
                 };
                 var attachment = JsonSerializer.Serialize(attachmentPayload, JsonLogOptions);
-                var contentToAnalyze = _openAIPromptRenderer.BuildAttachmentSummaryUserPrompt(promptVersion, attachment);
+                var contentToAnalyze = OpenAIPromptRenderer.BuildAttachmentSummaryUserPrompt(promptVersion, attachment);
 
                 await LogPromptInputAsync(AttachmentSummaryPromptType, promptVersion, prompt, contentToAnalyze);
             var result = await GenerateWithRetryAsync(
@@ -232,7 +205,7 @@ public async Task<AttachmentSummaryResponse> GenerateAttachmentSummaryAsync(Atta
         public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(ApplicationScoringRequest request)
         {
             ArgumentNullException.ThrowIfNull(request);
-            var promptVersion = _openAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationScoringPromptType));
+            var promptVersion = OpenAIPromptRenderer.ResolvePromptVersion(request.PromptVersion ?? ResolvePromptVersionSetting(ApplicationScoringPromptType));
             var dataJson = JsonSerializer.Serialize(request.Data, JsonLogOptions);
             var sectionJson = JsonSerializer.Serialize(request.SectionSchema, JsonLogOptions);
 
@@ -251,8 +224,8 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     ? string.Join("\n- ", attachmentSummaries.Select((summary, index) => $"Attachment {index + 1}: {summary}"))
                     : "No attachments provided.";
 
-                var section = _openAIPromptRenderer.BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
-                var response = _openAIPromptRenderer.BuildApplicationScoringResponseTemplate(section);
+                var section = OpenAIPromptRenderer.BuildAliasedApplicationScoringSection(request.SectionName, sectionJson, out var questionIdAliasMap);
+                var response = OpenAIPromptRenderer.BuildApplicationScoringResponseTemplate(section);
                 if (response == "{}")
                 {
                     _logger.LogWarning(
@@ -261,13 +234,13 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     return new ApplicationScoringResponse();
                 }
 
-                var applicationScoringContent = _openAIPromptRenderer.BuildApplicationScoringUserPrompt(
+                var applicationScoringContent = OpenAIPromptRenderer.BuildApplicationScoringUserPrompt(
                     promptVersion,
                     dataJson,
                     attachments,
                     section,
                     response);
-                var systemPrompt = _openAIPromptRenderer.BuildApplicationScoringSystemPrompt(promptVersion);
+                var systemPrompt = OpenAIPromptRenderer.BuildApplicationScoringSystemPrompt(promptVersion);
 
                 await LogPromptInputAsync(ApplicationScoringPromptType, promptVersion, systemPrompt, applicationScoringContent);
                 var result = await GenerateWithRetryAsync(
@@ -286,7 +259,7 @@ public async Task<ApplicationScoringResponse> GenerateApplicationScoringAsync(Ap
                     return new ApplicationScoringResponse();
                 }
 
-                return _openAIResponseParser.ParseApplicationScoringResponse(result.Content, questionIdAliasMap);
+                return OpenAIResponseParser.ParseApplicationScoringResponse(result.Content, questionIdAliasMap);
             }
             catch (Exception ex)
             {
@@ -360,38 +333,6 @@ private static string ResolveNarrativeContent(AIOperationResult result)
             };
         }
 
-        private static AIOperationResult MapFailureOutcome(HttpStatusCode statusCode, AIProviderResult response)
-        {
-            var statusCodeValue = (int)statusCode;
-
-            if (statusCode == HttpStatusCode.RequestTimeout
-                || statusCode == (HttpStatusCode)429
-                || statusCodeValue >= 500)
-            {
-                return AIOperationResult.TransientFailure(response);
-            }
-
-            return AIOperationResult.PermanentFailure(response);
-        }
-
-        private static AIProviderResult BuildProviderResponseFromMetadata(
-            string content,
-            string? rawResponse,
-            AIProviderResponseMetadata? metadata,
-            int? httpStatusCode = null)
-        {
-            return new AIProviderResult(
-                content,
-                rawResponse ?? string.Empty,
-                metadata?.Model,
-                metadata?.FinishReason,
-                httpStatusCode,
-                metadata?.PromptTokens,
-                metadata?.CompletionTokens,
-                metadata?.TotalTokens,
-                metadata?.ReasoningTokens);
-        }
-
         private static AIProviderResponseMetadata? TryExtractProviderMetadata(string? responseContent)
         {
             if (string.IsNullOrWhiteSpace(responseContent))
@@ -444,53 +385,6 @@ private static AIProviderResult BuildProviderResponseFromMetadata(
             }
         }
 
-        private void LogProviderMetadata(
-            string? operationName,
-            string? promptVersion,
-            string? fileName,
-            AIProviderResult response,
-            bool success)
-        {
-            if (string.IsNullOrWhiteSpace(response.Model)
-                && string.IsNullOrWhiteSpace(response.FinishReason)
-                && response.HttpStatusCode == null
-                && response.PromptTokens == null
-                && response.CompletionTokens == null
-                && response.TotalTokens == null
-                && response.ReasoningTokens == null)
-            {
-                return;
-            }
-
-            if (response.PromptTokens != null || response.CompletionTokens != null || response.TotalTokens != null)
-            {
-                _logger.LogInformation(
-                    "AI token usage. OperationName={OperationName}, InputTokens={InputTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, Environment={Environment}, TenantId={TenantId}, Status={Status}, PromptVersion={PromptVersion}, Model={Model}, HttpStatusCode={HttpStatusCode}, FileName={FileName}",
-                    operationName ?? "completion",
-                    response.PromptTokens,
-                    response.CompletionTokens,
-                    response.TotalTokens,
-                    ResolveEnvironmentName(),
-                    _currentTenant.Id,
-                    success ? "success" : "failed",
-                    promptVersion,
-                    response.Model,
-                    response.HttpStatusCode,
-                    fileName);
-            }
-
-            _logger.LogDebug(
-                "AI provider response metadata for {OperationName}: Model={Model}, FinishReason={FinishReason}, HttpStatusCode={HttpStatusCode}, PromptTokens={PromptTokens}, CompletionTokens={CompletionTokens}, TotalTokens={TotalTokens}, ReasoningTokens={ReasoningTokens}",
-                operationName ?? "completion",
-                response.Model,
-                response.FinishReason,
-                response.HttpStatusCode,
-                response.PromptTokens,
-                response.CompletionTokens,
-                response.TotalTokens,
-                response.ReasoningTokens);
-        }
-
         private static int? TryGetInt32(JsonElement element, string propertyName)
         {
             return element.TryGetProperty(propertyName, out var property)
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
index cc9a914e75..374d0755e8 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAITransportService.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Unity.AI.Models;
 using Volo.Abp.DependencyInjection;
 
 namespace Unity.AI.Runtime;
diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
index d793fd28ef..84a88ff8ed 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/GrantApplications/ApplicationAnalysisAppService.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Threading.Tasks;
 using Unity.AI;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
index c0a4bf06f2..61d87d63a7 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/GrantApplications/Automation/BackgroundJobs/GenerateApplicationScoringJob.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using System;
 using System.Threading.Tasks;
 using Unity.GrantManager.GrantApplications;
 using Unity.GrantManager.GrantApplications.Automation.Events;

From 80b9b63301e59cb5d1f01360a09d4d7538b78417 Mon Sep 17 00:00:00 2001
From: Andre Goncalves <andre.goncalves@aot-technologies.com>
Date: Fri, 17 Apr 2026 14:52:51 -0700
Subject: [PATCH 42/45] AB#32700 actual fix this time

---
 .../ApplicantProfile/AddressInfoDataProvider.cs        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs
index fc120680bf..adae496d40 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicantProfile/AddressInfoDataProvider.cs
@@ -91,13 +91,13 @@ from application in apps.DefaultIfEmpty()
                     .Select(g => g.OrderBy(r => r.IsFromApplicantPath).First())
                     .ToList();
 
-                var distinctApplicantIds = deduplicated
-                    .Where(r => r.ApplicantId != null)
-                    .Select(r => r.ApplicantId)
+                // Determine editability from submissions, not addresses
+                var distinctApplicantIds = await matchingSubmissions
+                    .Select(s => s.ApplicantId)
                     .Distinct()
-                    .ToList();
+                    .ToListAsync();
 
-                var distinctApplicants = distinctApplicantIds.Count > 1;               
+                var distinctApplicants = distinctApplicantIds.Count > 1;
 
                 var addressDtos = deduplicated.Select(r => new AddressInfoItemDto
                 {

From 4e577a5ea9a24b30604ce44d3532d3b29caa8ba8 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 14:53:56 -0700
Subject: [PATCH 43/45] AB#32299 rerun automation


From 7ff4ed6cca975b21f451ef0a99e3eb669a35d1a1 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 15:17:07 -0700
Subject: [PATCH 44/45] AB#32299 clean up OpenAI runtime helpers

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

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index f3b68aaa32..75ddce2787 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Unity.AI.Extraction;
@@ -25,7 +24,6 @@ public class OpenAIRuntimeService : IAIService, ITransientDependency
         private readonly ITextExtractionService _textExtractionService;
         private readonly OpenAITransportService _openAITransportService;
         private readonly OpenAIConfigurationResolver _openAIConfigurationResolver;
-        private readonly ICurrentTenant _currentTenant;
         private const string ApplicationAnalysisPromptType = AIPromptTypes.ApplicationAnalysis;
         private const string AttachmentSummaryPromptType = AIPromptTypes.AttachmentSummary;
         private const string ApplicationScoringPromptType = AIPromptTypes.ApplicationScoring;
@@ -56,15 +54,13 @@ public OpenAIRuntimeService(
             ILogger<OpenAIRuntimeService> logger,
             ITextExtractionService textExtractionService,
             OpenAITransportService openAITransportService,
-            OpenAIConfigurationResolver openAIConfigurationResolver,
-            ICurrentTenant currentTenant)
+            OpenAIConfigurationResolver openAIConfigurationResolver)
         {
             _configuration = configuration;
             _logger = logger;
             _textExtractionService = textExtractionService;
             _openAITransportService = openAITransportService;
             _openAIConfigurationResolver = openAIConfigurationResolver;
-            _currentTenant = currentTenant;
         }
 
         public Task<bool> IsAvailableAsync()
@@ -333,58 +329,6 @@ private static string ResolveNarrativeContent(AIOperationResult result)
             };
         }
 
-        private static AIProviderResponseMetadata? TryExtractProviderMetadata(string? responseContent)
-        {
-            if (string.IsNullOrWhiteSpace(responseContent))
-            {
-                return null;
-            }
-
-            try
-            {
-                using var jsonDoc = JsonDocument.Parse(responseContent);
-                var root = jsonDoc.RootElement;
-                var model = root.TryGetProperty("model", out var modelProp) && modelProp.ValueKind == JsonValueKind.String
-                    ? modelProp.GetString()
-                    : null;
-
-                string? finishReason = null;
-                if (root.TryGetProperty("choices", out var choices)
-                    && choices.ValueKind == JsonValueKind.Array
-                    && choices.GetArrayLength() > 0)
-                {
-                    var firstChoice = choices[0];
-                    if (firstChoice.TryGetProperty("finish_reason", out var finishReasonProp) && finishReasonProp.ValueKind == JsonValueKind.String)
-                    {
-                        finishReason = finishReasonProp.GetString();
-                    }
-                }
-
-                int? promptTokens = null;
-                int? completionTokens = null;
-                int? totalTokens = null;
-                int? reasoningTokens = null;
-                if (root.TryGetProperty("usage", out var usage) && usage.ValueKind == JsonValueKind.Object)
-                {
-                    promptTokens = TryGetInt32(usage, "prompt_tokens");
-                    completionTokens = TryGetInt32(usage, "completion_tokens");
-                    totalTokens = TryGetInt32(usage, "total_tokens");
-
-                    if (usage.TryGetProperty("completion_tokens_details", out var completionTokenDetails)
-                        && completionTokenDetails.ValueKind == JsonValueKind.Object)
-                    {
-                        reasoningTokens = TryGetInt32(completionTokenDetails, "reasoning_tokens");
-                    }
-                }
-
-                return new AIProviderResponseMetadata(model, finishReason, promptTokens, completionTokens, totalTokens, reasoningTokens);
-            }
-            catch (JsonException)
-            {
-                return null;
-            }
-        }
-
         private static int? TryGetInt32(JsonElement element, string propertyName)
         {
             return element.TryGetProperty(propertyName, out var property)
@@ -394,13 +338,6 @@ private static string ResolveNarrativeContent(AIOperationResult result)
                 : null;
         }
 
-        private static string ResolveEnvironmentName()
-        {
-            return Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")
-                ?? Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT")
-                ?? "Unknown";
-        }
-
         private string? ResolvePromptVersionSetting(string operationName)
         {
             var operationPromptVersion = _configuration[$"Azure:Operations:{operationName}:PromptVersion"];

From 7d46b5132027c317cdf7046b45acdf0e3885a474 Mon Sep 17 00:00:00 2001
From: Jacob Smith <jacob.smith@gov.bc.ca>
Date: Fri, 17 Apr 2026 15:39:58 -0700
Subject: [PATCH 45/45] AB#32299 remove unused OpenAI runtime import

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

diff --git a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
index 75ddce2787..d9886d1f97 100644
--- a/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
+++ b/applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Runtime/OpenAIRuntimeService.cs
@@ -12,7 +12,6 @@
 using Unity.AI.Requests;
 using Unity.AI.Responses;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.MultiTenancy;
 
 namespace Unity.AI.Runtime
 {