Dev

.github/workflows/manual-trigger.yml

@@ -18,7 +18,7 @@ on:
         type: string
 env:
   TARGET_ENV: ${{ inputs.name }}
-  GH_TOKEN: ${{secrets.GH_API_TOKEN}}
+  GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
   OC_CLUSTER: ${{ vars.OPENSHIFT_CLUSTER }}
   OC_REGISTRY: ${{ vars.OPENSHIFT_REGISTRY }}
   OC_AUTH_TOKEN: ${{ secrets.OPENSHIFT_TOKEN }}
@@ -89,6 +89,8 @@ jobs:
     permissions:
       actions: write
       contents: read
+    env:
+      GH_TOKEN: ${{ secrets.GH_API_TOKEN }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@v6

.github/workflows/sonarsource-scan.yml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           java-version: 17
-          distribution: 'zulu'
+          distribution: 'temurin'
 
       - uses: actions/checkout@v6
         with:

applications/Unity.AutoUI/cypress/e2e/library/chefs.cy.ts

@@ -1,8 +1,17 @@
-describe('Chefs Login and Logout', () => {
+describe("Chefs Login and Logout", () => {
+  it("Verify that Chefs is online.", () => {
+    cy.getChefsDetail("chefsBaseURL").then((baseURL) => {
+      cy.visit(baseURL);
 
-  it('Verify that Chefs is online.', () => {
-    cy.chefsLogin();
-	cy.contains("My Forms").should('exist').click();
-    cy.chefsLogout();
-  })
-})
+      cy.contains("button, a, [role='button']", /log\s*in|login/i)
+        .should("exist")
+        .click({ force: true });
+
+      cy.location("pathname").should("include", "/app/login");
+      cy.contains("button, a, [role='button']", /IDIR/i).should("exist");
+      cy.contains("button, a, [role='button']", /BC Services Card/i).should(
+        "exist",
+      );
+    });
+  });
+});

applications/Unity.AutoUI/cypress/support/commands.ts

@@ -143,15 +143,39 @@ Cypress.Commands.add("getChefsDetail", (key: string) => {
 Cypress.Commands.add("chefsLogin", () => {
   cy.getChefsDetail("chefsBaseURL").then((baseURL) => {
     cy.visit(baseURL); // Visit the URL fetched from chefs.json
-    cy.get("#app > div > main > header > header > div > div.d-print-none")
-      .should("exist")
-      .click(); // click the login button
+    cy.get("body").then(($body) => {
+      // Prefer resilient text-based selectors over brittle full DOM paths.
+      if ($body.find("button:contains('LOGIN'), a:contains('LOGIN')").length) {
+        cy.contains("button, a", /^LOGIN$/i)
+          .first()
+          .click({ force: true });
+      } else if (
+        $body.find(
+          "#app > div > main > header > header > div > div.d-print-none",
+        ).length
+      ) {
+        cy.get("#app > div > main > header > header > div > div.d-print-none")
+          .should("exist")
+          .click({ force: true });
+      }
+    });
     cy.wait(1000);
-    cy.get(
-      "#app > div > main > div.v-container.v-locale--is-ltr.text-center.main > div > div:nth-child(2) > div > button",
-    )
-      .should("exist")
-      .click(); // click the idir buttton
+    cy.get("body").then(($body) => {
+      // Some pages show an IDIR choice button before the credential form.
+      if ($body.find("button:contains('IDIR'), a:contains('IDIR')").length) {
+        cy.contains("button, a", /IDIR/i).first().click({ force: true });
+      } else if (
+        $body.find(
+          "#app > div > main > div.v-container.v-locale--is-ltr.text-center.main > div > div:nth-child(2) > div > button",
+        ).length
+      ) {
+        cy.get(
+          "#app > div > main > div.v-container.v-locale--is-ltr.text-center.main > div > div:nth-child(2) > div > button",
+        )
+          .should("exist")
+          .click({ force: true });
+      }
+    });
     cy.wait(1000);
     cy.get("body").then(($body) => {
       // Check if you're already logged in.
@@ -246,11 +270,14 @@ function fetchGrantApplications(): Cypress.Chainable<GrantApplication[]> {
       .then((response) => {
         if (response.status !== 200) {
           throw new Error(
-            `API request failed with status ${response.status}: ${JSON.stringify(response.body)}`
+            `API request failed with status ${response.status}: ${JSON.stringify(response.body)}`,
           );
         }
         const data = response.body as GrantApplicationResponse;
-        Cypress.log({ name: "fetch", message: `📋 Fetched ${data.items?.length || 0} applications` });
+        Cypress.log({
+          name: "fetch",
+          message: `📋 Fetched ${data.items?.length || 0} applications`,
+        });
         return data.items || [];
       });
   });
@@ -262,89 +289,92 @@ Cypress.Commands.add(
     return fetchGrantApplications().then((allApplications) => {
       let applications = allApplications;
 
-          Cypress.log({ name: "fetch", message: `📋 Fetched ${applications.length} applications from API` });
-
-          // Filter by category if specified (e.g., 'Data Seeder')
-          if (options.categoryFilter) {
-            applications = applications.filter((app) =>
-              app.category === options.categoryFilter
-            );
-            Cypress.log({
-              name: "filter",
-              message: `📋 Filtered to ${applications.length} applications with category: ${options.categoryFilter}`,
-            });
-          }
-
-          // Filter by status if specified (e.g., 'Submitted', 'Under Assessment', 'Approved')
-          if (options.statusFilter && options.statusFilter.length > 0) {
-            applications = applications.filter((app) =>
-              options.statusFilter!.includes(app.status)
-            );
-            Cypress.log({
-              name: "filter",
-              message: `📋 Filtered to ${applications.length} applications with status: ${options.statusFilter.join(", ")}`,
-            });
-          }
-
-          // Filter by max age if specified
-          if (options.maxAge) {
-            const cutoffDate = new Date();
-            cutoffDate.setDate(cutoffDate.getDate() - options.maxAge);
-            applications = applications.filter((app) => {
-              const submissionDate = new Date(app.submissionDate);
-              return submissionDate >= cutoffDate;
-            });
-            Cypress.log({
-              name: "filter",
-              message: `📋 Filtered to ${applications.length} applications within ${options.maxAge} days`,
-            });
-          }
-
-          if (applications.length === 0) {
-            throw new Error(
-              "No applications found matching the specified criteria"
-            );
-          }
-
-          // Sort applications (default: by submissionDate descending for latest first)
-          const sortBy = options.sortBy || 'submissionDate';
-          const sortOrder = options.sortOrder || 'desc';
-          applications.sort((a, b) => {
-            let aVal: number | string;
-            let bVal: number | string;
-
-            if (sortBy === 'submissionDate') {
-              aVal = new Date(a.submissionDate).getTime();
-              bVal = new Date(b.submissionDate).getTime();
-            } else {
-              aVal = a[sortBy] as number;
-              bVal = b[sortBy] as number;
-            }
-
-            if (sortOrder === 'desc') {
-              return bVal > aVal ? 1 : bVal < aVal ? -1 : 0;
-            } else {
-              return aVal > bVal ? 1 : aVal < bVal ? -1 : 0;
-            }
-          });
-
-          // Get the submission at the specified index (default: 0 = first/latest)
-          const index = options.index || 0;
-          if (index >= applications.length) {
-            throw new Error(
-              `Index ${index} out of range. Only ${applications.length} applications available.`
-            );
-          }
-
-          const selectedApp = applications[index];
-          Cypress.log({
-            name: "selected",
-            message: `✅ Selected submission: ${selectedApp.referenceNo} (Status: ${selectedApp.status}, Category: ${selectedApp.category})`,
-          });
-
-          return selectedApp.referenceNo;
+      Cypress.log({
+        name: "fetch",
+        message: `📋 Fetched ${applications.length} applications from API`,
+      });
+
+      // Filter by category if specified (e.g., 'Data Seeder')
+      if (options.categoryFilter) {
+        applications = applications.filter(
+          (app) => app.category === options.categoryFilter,
+        );
+        Cypress.log({
+          name: "filter",
+          message: `📋 Filtered to ${applications.length} applications with category: ${options.categoryFilter}`,
+        });
+      }
+
+      // Filter by status if specified (e.g., 'Submitted', 'Under Assessment', 'Approved')
+      if (options.statusFilter && options.statusFilter.length > 0) {
+        applications = applications.filter((app) =>
+          options.statusFilter!.includes(app.status),
+        );
+        Cypress.log({
+          name: "filter",
+          message: `📋 Filtered to ${applications.length} applications with status: ${options.statusFilter.join(", ")}`,
+        });
+      }
+
+      // Filter by max age if specified
+      if (options.maxAge) {
+        const cutoffDate = new Date();
+        cutoffDate.setDate(cutoffDate.getDate() - options.maxAge);
+        applications = applications.filter((app) => {
+          const submissionDate = new Date(app.submissionDate);
+          return submissionDate >= cutoffDate;
         });
-  }
+        Cypress.log({
+          name: "filter",
+          message: `📋 Filtered to ${applications.length} applications within ${options.maxAge} days`,
+        });
+      }
+
+      if (applications.length === 0) {
+        throw new Error(
+          "No applications found matching the specified criteria",
+        );
+      }
+
+      // Sort applications (default: by submissionDate descending for latest first)
+      const sortBy = options.sortBy || "submissionDate";
+      const sortOrder = options.sortOrder || "desc";
+      applications.sort((a, b) => {
+        let aVal: number | string;
+        let bVal: number | string;
+
+        if (sortBy === "submissionDate") {
+          aVal = new Date(a.submissionDate).getTime();
+          bVal = new Date(b.submissionDate).getTime();
+        } else {
+          aVal = a[sortBy] as number;
+          bVal = b[sortBy] as number;
+        }
+
+        if (sortOrder === "desc") {
+          return bVal > aVal ? 1 : bVal < aVal ? -1 : 0;
+        } else {
+          return aVal > bVal ? 1 : aVal < bVal ? -1 : 0;
+        }
+      });
+
+      // Get the submission at the specified index (default: 0 = first/latest)
+      const index = options.index || 0;
+      if (index >= applications.length) {
+        throw new Error(
+          `Index ${index} out of range. Only ${applications.length} applications available.`,
+        );
+      }
+
+      const selectedApp = applications[index];
+      Cypress.log({
+        name: "selected",
+        message: `✅ Selected submission: ${selectedApp.referenceNo} (Status: ${selectedApp.status}, Category: ${selectedApp.category})`,
+      });
+
+      return selectedApp.referenceNo;
+    });
+  },
 );
 
 /**

applications/Unity.GrantManager/common.props

@@ -16,4 +16,10 @@
     <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- Add direct reference to the patched Scriban to ensure all projects importing common.props
+         use the safe version (pins transitive consumers that do not specify a version). -->
+    <PackageReference Include="Scriban" Version="7.2.0" />
+  </ItemGroup>
+
 </Project>

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Attachments/IAttachmentSummaryAppService.cs

@@ -7,7 +7,5 @@ namespace Unity.GrantManager.Attachments;
 
 public interface IAttachmentSummaryAppService : IApplicationService
 {
-    Task<AttachmentSummaryResultDto> GenerateAttachmentSummaryAsync(Guid attachmentId, string? promptVersion = null);
-    Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesAsync(List<Guid> attachmentIds, string? promptVersion = null);
     Task<List<AttachmentSummaryResultDto>> GenerateAttachmentSummariesForPipelineAsync(List<Guid> attachmentIds, string? promptVersion = null);
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/Automation/IApplicationAIGenerationQueue.cs

@@ -1,11 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace Unity.AI.Automation;
 
 public interface IApplicationAIGenerationQueue
 {
-    Task QueueAttachmentSummaryAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
+    Task QueueAttachmentSummaryAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null, List<Guid>? attachmentIds = null);
     Task QueueApplicationAnalysisAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
     Task QueueApplicationScoringAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);
     Task QueueAllAIStagesAsync(Guid applicationId, Guid? tenantId, string? promptVersion = null);

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/RateLimit/AIRateLimitStateDto.cs

@@ -3,4 +3,5 @@ namespace Unity.AI.RateLimit;
 public class AIRateLimitStateDto
 {
     public int RetryAfterSeconds { get; set; }
+    public bool IsGenerating { get; set; }
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/RateLimit/IAIGenerationActivityProvider.cs

@@ -0,0 +1,8 @@
+using System.Threading.Tasks;
+
+namespace Unity.AI.RateLimit;
+
+public interface IAIGenerationActivityProvider
+{
+    Task<bool> HasActiveGenerationAsync();
+}

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application.Contracts/RateLimit/IAIRateLimiter.cs

@@ -22,8 +22,8 @@ public interface IAIRateLimiter
     Task StampAsync(Guid? userId);
 
     /// <summary>
-    /// Returns the remaining cooldown for the current user. RetryAfterSeconds is 0 when
-    /// the user can generate immediately.
+    /// Returns the current user's shared AI generation state. RetryAfterSeconds is 0 when
+    /// the user can generate immediately, unless a generation is still active.
     /// </summary>
     Task<AIRateLimitStateDto> GetStateAsync();
 }

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/AttachmentSummaryService.cs

@@ -97,13 +97,30 @@ private async Task<string> GenerateOrFallbackAsync(
         }
     }
 
-    public async Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = null, CancellationToken cancellationToken = default)
+    public async Task<List<string>> GenerateForApplicationAsync(
+        Guid applicationId,
+        string? promptVersion = null,
+        IReadOnlyCollection<Guid>? attachmentIds = null,
+        CancellationToken cancellationToken = default)
     {
-        var attachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId))
+        var applicationAttachmentIds = (await applicationChefsFileAttachmentRepository.GetListAsync(a => a.ApplicationId == applicationId))
             .Select(a => a.Id)
             .ToList();
 
-        return await GenerateAndSaveAsync(attachmentIds, promptVersion, cancellationToken);
+        if (attachmentIds is not { Count: > 0 })
+        {
+            return await GenerateAndSaveAsync(applicationAttachmentIds, promptVersion, cancellationToken);
+        }
+
+        var applicationAttachmentIdSet = applicationAttachmentIds.ToHashSet();
+        var selectedIds = attachmentIds.Distinct().ToList();
+
+        if (selectedIds.Any(id => !applicationAttachmentIdSet.Contains(id)))
+        {
+            throw new InvalidOperationException("One or more selected attachments do not belong to the application.");
+        }
+
+        return await GenerateAndSaveAsync(selectedIds, promptVersion, cancellationToken);
     }
 
     private async Task<ChefsFileAttachmentStream> OpenAttachmentStreamAsync(

applications/Unity.GrantManager/modules/Unity.AI/src/Unity.AI.Application/AI/Operations/IAttachmentSummaryService.cs

@@ -9,5 +9,5 @@ public interface IAttachmentSummaryService
 {
     Task<string> GenerateAndSaveAsync(Guid attachmentId, string? promptVersion = null, CancellationToken cancellationToken = default);
     Task<List<string>> GenerateAndSaveAsync(IEnumerable<Guid> attachmentIds, string? promptVersion = null, CancellationToken cancellationToken = default);
-    Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = null, CancellationToken cancellationToken = default);
+    Task<List<string>> GenerateForApplicationAsync(Guid applicationId, string? promptVersion = null, IReadOnlyCollection<Guid>? attachmentIds = null, CancellationToken cancellationToken = default);
 }