diff --git a/.github/workflows/pr-check-selector-registry.yml b/.github/workflows/pr-check-selector-registry.yml
new file mode 100644
index 000000000..15085ce25
--- /dev/null
+++ b/.github/workflows/pr-check-selector-registry.yml
@@ -0,0 +1,79 @@
+name: Dev - Selector Registry Check
+
+# Static-analysis gate for the Cypress selector contract (applications/Unity.AutoUI/cypress/selectors/).
+# Unlike the Cypress e2e runner (cypress-e2e-runner.yml), this needs no OpenShift job,
+# no BC Gov network access, and no running app — it only parses source files with
+# node + git, so it runs directly on the GitHub-hosted runner.
+#
+# Two checks:
+#   1. cypress/selectors/registry.json must already reflect the current source
+#      (catches "changed a selector, forgot to regenerate/commit the registry").
+#   2. npm run selectors:diff must report no regressions against the baseline
+#      (catches "this branch broke a selector that worked on main"). Baseline
+#      defaults to main; override via workflow_dispatch's base_ref input.
+#
+# Never runs --fix/--apply here — auto-mutating a contributor's branch in CI is
+# out of scope; selectors:fix/selectors:apply remain a local/dev-workstation step.
+
+on:
+  pull_request:
+    branches:
+      - dev
+  workflow_dispatch:
+    inputs:
+      base_ref:
+        description: "Branch to diff selectors against (default: main)"
+        required: false
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  selector-registry-check:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: applications/Unity.AutoUI
+    env:
+      DIFF_BASE_REF: ${{ inputs.base_ref || 'main' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Ensure baseline ref is fetchable (selectors:diff baseline)
+        run: git fetch origin "$DIFF_BASE_REF" --depth=1
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          # NOTE: pick this to match whatever Node version the OpenShift
+          # Cypress job image uses (defined in the separate tenant-gitops-ce395f
+          # repo, not visible from here to confirm directly). 22 is a safe
+          # default that satisfies Cypress ^15.17.0's minimum (Node 20.19+ /
+          # 22.12+ / 24+, per package.json) — adjust if the real job image differs.
+          node-version: "22"
+          cache: "npm"
+          cache-dependency-path: applications/Unity.AutoUI/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Check selector registry is up to date
+        run: |
+          set -euo pipefail
+          BEFORE=$(git show "HEAD:applications/Unity.AutoUI/cypress/selectors/registry.json" | jq 'del(.generatedAt)')
+          npm run selectors:report
+          AFTER=$(jq 'del(.generatedAt)' cypress/selectors/registry.json)
+          if [ "$BEFORE" != "$AFTER" ]; then
+            echo "::error::cypress/selectors/registry.json is stale relative to the current source."
+            echo "::error::Run 'npm run selectors:report' in applications/Unity.AutoUI and commit the result."
+            diff <(echo "$BEFORE") <(echo "$AFTER") || true
+            exit 1
+          fi
+          echo "Registry is up to date."
+
+      - name: Check for selector regressions against baseline
+        run: npm run selectors:diff -- --base "origin/$DIFF_BASE_REF"
diff --git a/applications/Unity.AutoUI/cypress/selectors/registry.json b/applications/Unity.AutoUI/cypress/selectors/registry.json
index f2d6b4874..f931cfa4e 100644
--- a/applications/Unity.AutoUI/cypress/selectors/registry.json
+++ b/applications/Unity.AutoUI/cypress/selectors/registry.json
@@ -1,11 +1,11 @@
 {
   "schemaVersion": 2,
   "mode": "report-only",
-  "generatedAt": "2026-08-19T20:53:21.994Z",
+  "generatedAt": "2026-08-25T14:42:42.571Z",
   "summary": {
     "total": 360,
-    "matched": 146,
-    "missing": 42,
+    "matched": 147,
+    "missing": 41,
     "unverified": 81,
     "exempt": 91,
     "syntax": {
@@ -1776,7 +1776,9 @@
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806202244_AB33799_FixCheckboxGroupEmptyValues.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260807224046_AB33996_AddApplicantFiscalYearEndRestricted.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260813164219_AB33234_ApplicantPortalExternalLinks.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260817212058_AddNotificationReadStateAndSender.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260818211028_AB33234_ExternalLinksApplicantMessage.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260820184916_AB33327_MoveAIScoresheetAnswersToAISchema.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.cshtml",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Details.js",
@@ -1835,7 +1837,9 @@
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806202244_AB33799_FixCheckboxGroupEmptyValues.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260807224046_AB33996_AddApplicantFiscalYearEndRestricted.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260813164219_AB33234_ApplicantPortalExternalLinks.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260817212058_AddNotificationReadStateAndSender.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260818211028_AB33234_ExternalLinksApplicantMessage.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260820184916_AB33327_MoveAIScoresheetAnswersToAISchema.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/AssigneeSelection/AssigneeSelectionModal.cshtml"
       ]
@@ -2003,6 +2007,7 @@
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkEmailNotifications/SendEmailNotificationModal.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Template/Template.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.js",
@@ -2029,6 +2034,7 @@
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.cshtml",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkEmailNotifications/SendEmailNotificationModal.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/FormConfiguration/Notifications.cshtml",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/Template/Template.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/CustomFields/Default.js",
@@ -2320,14 +2326,14 @@
       "kind": "id",
       "syntaxKind": "css",
       "ownership": "application",
-      "status": "missing",
-      "missingTokens": [
-        "id:ContactInfo_Phone"
-      ],
+      "status": "matched",
+      "missingTokens": [],
       "usedBy": [
         "applications/Unity.AutoUI/cypress/e2e/chefsdata.cy.ts:136"
       ],
-      "applicationMatches": []
+      "applicationMatches": [
+        "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.cshtml"
+      ]
     },
     {
       "selector": "#ContactInfo_Phone2",
@@ -2445,6 +2451,8 @@
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.cshtml",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js",
@@ -2452,9 +2460,7 @@
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.js"
+        "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js"
       ]
     },
     {
@@ -2480,6 +2486,8 @@
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.cshtml",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js",
@@ -2487,9 +2495,7 @@
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.js"
+        "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js"
       ]
     },
     {
@@ -2513,6 +2519,8 @@
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.cshtml",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/Default.js",
@@ -2520,9 +2528,7 @@
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.js"
+        "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentInfo/Default.js"
       ]
     },
     {
@@ -2639,6 +2645,8 @@
         "applications/Unity.AutoUI/cypress/pages/ApplicationDetailsRightTabPage.ts:68"
       ],
       "applicationMatches": [
+        "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkEmailNotifications/SendEmailNotificationModal.cshtml",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/BulkEmailNotifications/SendEmailNotificationModal.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.cshtml",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/EmailsWidget/Default.js"
       ]
@@ -3163,7 +3171,9 @@
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806202244_AB33799_FixCheckboxGroupEmptyValues.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260807224046_AB33996_AddApplicantFiscalYearEndRestricted.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260813164219_AB33234_ApplicantPortalExternalLinks.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260817212058_AddNotificationReadStateAndSender.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260818211028_AB33234_ExternalLinksApplicantMessage.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260820184916_AB33327_MoveAIScoresheetAnswersToAISchema.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicantHistory/ReportsHistoryModalViewModel.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantHistory/Default.js",
@@ -3439,7 +3449,9 @@
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806202244_AB33799_FixCheckboxGroupEmptyValues.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260807224046_AB33996_AddApplicantFiscalYearEndRestricted.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260813164219_AB33234_ApplicantPortalExternalLinks.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260817212058_AddNotificationReadStateAndSender.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260818211028_AB33234_ExternalLinksApplicantMessage.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260820184916_AB33327_MoveAIScoresheetAnswersToAISchema.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/GrantApplications/Index.js",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantSubmissions/Default.js",
@@ -3550,17 +3562,17 @@
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Identity.Web/src/Pages/Identity/Users/PermissionUserMatrix.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.cshtml",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/UnityMessaging/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentConfigurations/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Views/Shared/Components/PaymentActionBar/Default.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.cshtml",
         "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/EndpointManagement/Endpoints/Index.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.js",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Reconciliation/Index.js",
-        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Tenants/Index.cshtml"
+        "applications/Unity.GrantManager/modules/Unity.TenantManagement/src/Unity.TenantManagement.Web/Pages/TenantManagement/Onboarding/Index.cshtml"
       ]
     },
     {
@@ -3765,7 +3777,9 @@
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260806202244_AB33799_FixCheckboxGroupEmptyValues.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260807224046_AB33996_AddApplicantFiscalYearEndRestricted.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260813164219_AB33234_ApplicantPortalExternalLinks.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260817212058_AddNotificationReadStateAndSender.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260818211028_AB33234_ExternalLinksApplicantMessage.Designer.cs",
+        "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/20260820184916_AB33327_MoveAIScoresheetAnswersToAISchema.Designer.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.EntityFrameworkCore/Migrations/TenantMigrations/GrantTenantDbContextModelSnapshot.cs",
         "applications/Unity.GrantManager/src/Unity.GrantManager.Web/Views/Shared/Components/ApplicantInfo/Default.js"
       ]
@@ -3868,7 +3882,12 @@
         "applications/Unity.AutoUI/cypress/support/commands.ts:23"
       ],
       "applicationMatches": [
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Controllers/UnityMessagingController.cs",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/UnityMessaging/Index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Realtime/NotificationHub.cs",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/InternalEmailGroups.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/wwwroot/js/notifications-realtime-client.js",
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs",
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js",
         "applications/Unity.GrantManager/modules/Unity.Reporting/test/Unity.Reporting.Application.Tests/Configuration/ColumnsMappingServiceTests.cs"
@@ -3934,7 +3953,12 @@
         "applications/Unity.AutoUI/cypress/support/auth.ts:44"
       ],
       "applicationMatches": [
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Controllers/UnityMessagingController.cs",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/UnityMessaging/Index.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Realtime/NotificationHub.cs",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Views/Settings/NotificationsSettingGroup/InternalEmailGroups.js",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/wwwroot/js/notifications-realtime-client.js",
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Application/Configuration/ReportMappingUtils.cs",
         "applications/Unity.GrantManager/modules/Unity.Reporting/src/Unity.Reporting.Web/Views/Shared/Components/ReportingConfiguration/Default.js",
         "applications/Unity.GrantManager/modules/Unity.Reporting/test/Unity.Reporting.Application.Tests/Configuration/ColumnsMappingServiceTests.cs"
@@ -5160,6 +5184,8 @@
         "applications/Unity.AutoUI/cypress/pages/ApplicationsListPage.ts:19"
       ],
       "applicationMatches": [
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.cshtml",
+        "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/NotificationLogs/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.cshtml",
         "applications/Unity.GrantManager/modules/Unity.Notifications/src/Unity.Notifications.Web/Pages/Notifications/Index.js",
         "applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Web/Pages/PaymentRequests/Index.js",
diff --git a/applications/Unity.AutoUI/scripts/selector-diff-report.mjs b/applications/Unity.AutoUI/scripts/selector-diff-report.mjs
index 141212552..a47b537fa 100644
--- a/applications/Unity.AutoUI/scripts/selector-diff-report.mjs
+++ b/applications/Unity.AutoUI/scripts/selector-diff-report.mjs
@@ -151,6 +151,12 @@ function main() {
   console.log(`  regressions: ${regressions.length}, new-and-already-broken: ${newlyBroken.length}`);
   console.log("");
 
+  // Non-zero exit is what lets CI gate on this script; local/interactive use
+  // (report, --fix, --apply) still prints the same detail either way.
+  if (regressions.length > 0 || newlyBroken.length > 0) {
+    process.exitCode = 1;
+  }
+
   if (regressions.length === 0 && newlyBroken.length === 0) {
     console.log("No selector regressions found relative to the baseline.");
     return;
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
index c60183318..e07599501 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Application/ApplicationForms/ApplicationFormVersionAppService.cs
@@ -81,7 +81,6 @@ private async Task EnsureAiOperationAccessAsync(string operationType, bool requi
         public override async Task<ApplicationFormVersionDto> CreateAsync(CreateUpdateApplicationFormVersionDto input) =>
             await base.CreateAsync(input);
 
-        [RemoteService(false)]
         [Authorize]
         public override async Task<ApplicationFormVersionDto> UpdateAsync(Guid id, CreateUpdateApplicationFormVersionDto input) =>
             await base.UpdateAsync(id, input);
diff --git a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
index 6910444e8..2d6bb0efb 100644
--- a/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
+++ b/applications/Unity.GrantManager/src/Unity.GrantManager.Web/Pages/ApplicationForms/Mapping.js
@@ -1540,16 +1540,10 @@ $(function () {
                 success: function (data) {
                     $('#existingMapping').val(data.submissionHeaderMapping);
                     existingMappingString = data.submissionHeaderMapping;
-                    abp.notify.success(
-                        data.responseText,
-                        'Mapping Saved Successfully'
-                    );
+                    abp.notify.success('Mapping Saved Successfully');
                 },
-                error: function (data) {
-                    abp.notify.error(
-                        data.responseText,
-                        'Mapping Not Saved Successful'
-                    );
+                error: function () {
+                    abp.notify.error('Mapping Not Saved Successful');
                 },
                 complete: function () {
                     UIElements.btnSave.prop('disabled', false);