processity · raghurankawat · May 20, 2026 · May 20, 2026 · May 20, 2026 · May 20, 2026
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -235,6 +235,15 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check Salesforce package version created
+        if: github.event_name == 'pull_request'
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.sha }}
+        run: node scripts/check-package-version-created.js
 
       - name: Resolve package version
         id: package-version

diff --git a/.github/workflows/deploy-uat.yml b/.github/workflows/deploy-uat.yml
@@ -0,0 +1,201 @@
+name: Deploy to UAT
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: Optional Docker image tag. Defaults to the selected commit SHA.
+        required: false
+        type: string
+      run_smoke_tests:
+        description: Run /healthz and /readyz checks after deployment.
+        required: true
+        default: true
+        type: boolean
+
+permissions:
+  contents: read
+
+concurrency:
+  group: uat-deployment
+  cancel-in-progress: true
+
+env:
+  AZURE_SUBSCRIPTION_ID: e6890ad9-401e-4696-bee4-c50fe72aa287
+  RESOURCE_GROUP: docgen-uat-rg
+  APP_NAME: docgen-uat
+  ACR_NAME: docgenuat
+  IMAGE_REPOSITORY: docgen-api
+
+jobs:
+  deploy:
+    name: Build and Update UAT
+    runs-on: ubuntu-latest
+    environment: uat
+    outputs:
+      app_url: ${{ steps.get-url.outputs.app_url }}
+      image_uri: ${{ steps.image.outputs.image_uri }}
+      image_tag: ${{ steps.image.outputs.image_tag }}
+      previous_revision: ${{ steps.current.outputs.previous_revision }}
+      new_revision: ${{ steps.wait-revision.outputs.new_revision }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+
+      - name: Azure Login
+        uses: azure/login@v1
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Set Azure Subscription
+        run: az account set --subscription "$AZURE_SUBSCRIPTION_ID"
+
+      - name: Resolve image
+        id: image
+        run: |
+          IMAGE_TAG="${{ inputs.image_tag }}"
+          if [ -z "$IMAGE_TAG" ]; then
+            IMAGE_TAG="${GITHUB_SHA}"
+          fi
+
+          IMAGE_URI="${ACR_NAME}.azurecr.io/${IMAGE_REPOSITORY}:${IMAGE_TAG}"
+          echo "image_tag=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
+          echo "image_uri=${IMAGE_URI}" >> "$GITHUB_OUTPUT"
+          echo "Using image: ${IMAGE_URI}"
+
+      - name: Validate UAT resources
+        run: |
+          az group show --name "$RESOURCE_GROUP" --output none
+          az acr show --name "$ACR_NAME" --resource-group "$RESOURCE_GROUP" --output none
+          az containerapp show --name "$APP_NAME" --resource-group "$RESOURCE_GROUP" --output none
+          echo "UAT resources found: ${RESOURCE_GROUP}/${APP_NAME}, ACR ${ACR_NAME}"
+
+      - name: Login to UAT ACR
+        run: az acr login --name "$ACR_NAME"
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ steps.image.outputs.image_uri }}
+            ${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_REPOSITORY }}:uat-latest
+          cache-from: type=registry,ref=${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_REPOSITORY }}:buildcache
+          cache-to: type=registry,ref=${{ env.ACR_NAME }}.azurecr.io/${{ env.IMAGE_REPOSITORY }}:buildcache,mode=max
+          build-args: |
+            NODE_ENV=production
+
+      - name: Get current active revision
+        id: current
+        run: |
+          CURRENT_REVISION=$(az containerapp revision list \
+            --name "$APP_NAME" \
+            --resource-group "$RESOURCE_GROUP" \
+            --query "[?properties.active==\`true\`].name | [0]" \
+            -o tsv)
+
+          echo "previous_revision=${CURRENT_REVISION}" >> "$GITHUB_OUTPUT"
+          echo "Current active revision: ${CURRENT_REVISION}"
+
+      - name: Update UAT Container App
+        run: |
+          az containerapp update \
+            --name "$APP_NAME" \
+            --resource-group "$RESOURCE_GROUP" \
+            --image "${{ steps.image.outputs.image_uri }}" \
+            --output none
+
+      - name: Wait for new revision
+        id: wait-revision
+        run: |
+          echo "Waiting for UAT revision to become healthy..."
+
+          MAX_ATTEMPTS=30
+          SLEEP_SECONDS=10
+          ATTEMPT=0
+
+          while [ "$ATTEMPT" -lt "$MAX_ATTEMPTS" ]; do
+            REVISION_JSON=$(az containerapp revision list \
+              --name "$APP_NAME" \
+              --resource-group "$RESOURCE_GROUP" \
+              --query "[?properties.active==\`true\`] | [0].{name:name,provisioningState:properties.provisioningState,healthState:properties.healthState,runningState:properties.runningState}" \
+              -o json)
+
+            REVISION_NAME=$(echo "$REVISION_JSON" | jq -r '.name // empty')
+            PROVISIONING_STATE=$(echo "$REVISION_JSON" | jq -r '.provisioningState // empty')
+            HEALTH_STATE=$(echo "$REVISION_JSON" | jq -r '.healthState // empty')
+            RUNNING_STATE=$(echo "$REVISION_JSON" | jq -r '.runningState // empty')
+
+            echo "Attempt $((ATTEMPT + 1))/${MAX_ATTEMPTS}: ${REVISION_NAME} provisioning=${PROVISIONING_STATE} health=${HEALTH_STATE} running=${RUNNING_STATE}"
+
+            if [ "$PROVISIONING_STATE" = "Provisioned" ] && [ "$HEALTH_STATE" = "Healthy" ]; then
+              echo "new_revision=${REVISION_NAME}" >> "$GITHUB_OUTPUT"
+              echo "UAT revision is healthy: ${REVISION_NAME}"
+              exit 0
+            fi
+
+            ATTEMPT=$((ATTEMPT + 1))
+            sleep "$SLEEP_SECONDS"
+          done
+
+          echo "Timed out waiting for UAT revision to become healthy"
+          exit 1
+
+      - name: Get UAT URL
+        id: get-url
+        run: |
+          APP_FQDN=$(az containerapp show \
+            --name "$APP_NAME" \
+            --resource-group "$RESOURCE_GROUP" \
+            --query properties.configuration.ingress.fqdn \
+            -o tsv)
+
+          APP_URL="https://${APP_FQDN}"
+          echo "app_url=${APP_URL}" >> "$GITHUB_OUTPUT"
+          echo "UAT URL: ${APP_URL}"
+
+  smoke-tests:
+    name: UAT Smoke Tests
+    runs-on: ubuntu-latest
+    needs: deploy
+    if: ${{ inputs.run_smoke_tests }}
+    environment: uat
+
+    steps:
+      - name: Test /healthz
+        run: |
+          APP_URL="${{ needs.deploy.outputs.app_url }}"
+          HTTP_CODE=$(curl -s -o /tmp/healthz.json -w "%{http_code}" "${APP_URL}/healthz")
+          cat /tmp/healthz.json
+
+          if [ "$HTTP_CODE" != "200" ]; then
+            echo "Health check failed with status ${HTTP_CODE}"
+            exit 1
+          fi
+
+      - name: Test /readyz
+        run: |
+          APP_URL="${{ needs.deploy.outputs.app_url }}"
+          HTTP_CODE=$(curl -s -o /tmp/readyz.json -w "%{http_code}" "${APP_URL}/readyz")
+          cat /tmp/readyz.json
+
+          if [ "$HTTP_CODE" != "200" ]; then
+            echo "Readiness check failed with status ${HTTP_CODE}"
+            exit 1
+          fi
+
+          jq -e '.ready == true' /tmp/readyz.json
+
+      - name: Summary
+        run: |
+          echo "UAT deployment succeeded"
+          echo "URL: ${{ needs.deploy.outputs.app_url }}"
+          echo "Image: ${{ needs.deploy.outputs.image_uri }}"
+          echo "Revision: ${{ needs.deploy.outputs.new_revision }}"
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -13,7 +13,7 @@ jobs:
   e2e-tests:
     name: Setup Org, Deploy Backend, and Run E2E Tests
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 120
     environment: ci
 
     steps:
@@ -326,6 +326,16 @@ jobs:
           cat /tmp/readyz-response.json 2>/dev/null || echo "No response captured"
           exit 1
 
+      - name: Configure CI Named Credential URL
+        run: |
+          ./scripts/configure-named-credential.sh "${{ steps.create-org.outputs.org_alias }}" "${BACKEND_URL}"
+
+      - name: Verify Salesforce Named Credential callout
+        run: |
+          sf apex run \
+            --file scripts/TestNamedCredentialCallout.apex \
+            --target-org ${{ steps.create-org.outputs.org_alias }}
+
       - name: Run Playwright E2E tests
         run: npm run test:e2e
         env:

diff --git a/e2e/fixtures/salesforce.fixture.ts b/e2e/fixtures/salesforce.fixture.ts
@@ -203,11 +203,6 @@ async function enableApexDebugLogging(): Promise<void> {
       `SELECT Id, ExpirationDate FROM TraceFlag WHERE TracedEntityId = '${userId}' AND LogType = 'USER_DEBUG'`
     );
 
-    // Calculate expiration (2 hours from now)
-    const expirationDate = new Date();
-    expirationDate.setHours(expirationDate.getHours() + 2);
-    const expirationDateStr = expirationDate.toISOString().replace('T', ' ').replace('.000Z', '');
-
     if (existingTraceFlags.length > 0) {
       console.log('Debug logging already enabled for user');
       // Could update expiration if needed
@@ -266,32 +261,6 @@ Then check logs at: Setup > Debug Logs
   }
 }
 
-/**
- * Activate the test flexipage as org default for Account
- * This makes the docgenButton component visible on Account record pages
- */
-async function activateTestFlexipage(): Promise<void> {
-  try {
-    // Query for the flexipage
-    const flexipageQuery = `SELECT Id, DeveloperName FROM FlexiPage WHERE DeveloperName = 'Account_Docgen_Test' LIMIT 1`;
-    const flexipages = await querySalesforce(flexipageQuery);
-
-    if (flexipages.length === 0) {
-      console.log('⚠️  Warning: Test flexipage not found, tests may fail');
-      return;
-    }
-
-    const flexipageId = flexipages[0].Id;
-    console.log(`✓ Found test flexipage: ${flexipageId}`);
-
-    // Note: FlexiPage activation requires UI metadata API which is complex
-    // For now, we'll document that tests need manual activation or use a different approach
-    // Alternative: Use Lightning App Builder API or setup script with metadata deployment
-  } catch (error) {
-    console.log('⚠️  Could not activate flexipage:', error);
-  }
-}
-
 /**
  * Authenticate to Salesforce by setting session cookies
  */

diff --git a/e2e/playwright.config.ts b/e2e/playwright.config.ts
@@ -1,4 +1,13 @@
-import { defineConfig, devices } from '@playwright/test';
+import { defineConfig, devices, type ReporterDescription } from '@playwright/test';
+
+const reporter: ReporterDescription[] = [
+  ['html', { outputFolder: './playwright-report' }],
+  ['list'],
+];
+
+if (process.env.CI) {
+  reporter.push(['github']);
+}
 
 /**
  * Playwright configuration for Salesforce E2E tests
@@ -23,11 +32,7 @@ export default defineConfig({
   retries: process.env.CI ? 1 : 0,
 
   /* Reporter to use */
-  reporter: [
-    ['html', { outputFolder: './playwright-report' }],
-    ['list'],
-    ...(process.env.CI ? [['github' as const]] : []),
-  ],
+  reporter,
 
   /* Shared settings for all the projects below */
   use: {

diff --git a/e2e/tests/worker-poller.spec.ts b/e2e/tests/worker-poller.spec.ts
@@ -375,6 +375,22 @@ test.describe('Worker and Poller E2E Tests', () => {
     await workerHelper.waitForQueueProcessing(documentIds, 'SUCCEEDED', 120000);
 
     // Wait for stats to update (processBatch must complete after Promise.allSettled)
+    // In CI, Azure Container Apps can route each stats request to a different replica,
+    // so per-replica in-memory counters are not deterministic there.
+    if (isCI) {
+      const finalStats = await workerHelper.getWorkerStats();
+      console.log('\nFinal worker stats:', finalStats);
+
+      expect(typeof finalStats.isRunning).toBe('boolean');
+      expect(finalStats.totalProcessed).toBeGreaterThanOrEqual(0);
+      expect(finalStats.totalSucceeded).toBeGreaterThanOrEqual(0);
+      expect(finalStats.totalFailed).toBeGreaterThanOrEqual(0);
+      expect(finalStats.totalRetries).toBeGreaterThanOrEqual(0);
+
+      console.log('\n✅ Test completed successfully');
+      return;
+    }
+
     console.log('\nWaiting for worker stats to update...');
     let finalStats = await workerHelper.getWorkerStats();
     const maxStatsWait = 20000; // 20 seconds
@@ -407,15 +423,9 @@ test.describe('Worker and Poller E2E Tests', () => {
     console.log(`  Succeeded: ${actualSucceeded}`);
     console.log(`  Failed: ${finalStats.totalFailed - initialStats.totalFailed}`);
 
-    if (isCI) {
-      // Stats are per-replica in CI and may come from different replicas
-      expect(finalStats.totalProcessed).toBeGreaterThanOrEqual(0);
-      expect(finalStats.totalSucceeded).toBeGreaterThanOrEqual(0);
-    } else {
-      // Stats should reflect all processed documents
-      expect(actualProcessed).toBeGreaterThanOrEqual(expectedIncrease);
-      expect(actualSucceeded).toBeGreaterThanOrEqual(expectedIncrease);
-    }
+    // Stats should reflect all processed documents in single-replica/local runs.
+    expect(actualProcessed).toBeGreaterThanOrEqual(expectedIncrease);
+    expect(actualSucceeded).toBeGreaterThanOrEqual(expectedIncrease);
 
     // Verify worker is running
     expect(finalStats.isRunning).toBe(true);

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "baseUrl": ".",
-    "rootDir": ".",
+    "rootDir": "..",
     "noEmit": true,
     "paths": {
       "@fixtures/*": ["./fixtures/*"],

diff --git a/e2e/utils/batch-helper.ts b/e2e/utils/batch-helper.ts
@@ -22,7 +22,8 @@ export interface BatchJobInfo {
 }
 
 export interface BatchEnqueueConfig {
-  templateId: string;
+  templateId?: string;
+  compositeDocId?: string;
   recordIds: string[];
   outputFormat: 'PDF' | 'DOCX';
   parentField?: string; // e.g., 'Account__c', 'Contact__c', 'Lead__c'
@@ -80,6 +81,10 @@ Id jobId = Database.executeBatch(batch, ${batchSize});
 System.debug('Batch Job ID: ' + jobId);
       `.trim();
     } else {
+      if (!config.templateId) {
+        throw new Error('templateId is required for single-template batch enqueue');
+      }
+
       // Single-template batch (original behavior)
       apexCode = `
 // Create batch instance with configuration

diff --git a/e2e/utils/worker-helper.ts b/e2e/utils/worker-helper.ts
@@ -38,7 +38,7 @@ export class WorkerHelper {
   constructor(
     private page: Page,
     private orgHelper: ScratchOrgHelper,
-    private backendUrl: string
+    _backendUrl: string
   ) {}
 
   /**