chore: resolve merge conflicts for PR #24159

.easignore

@@ -0,0 +1,57 @@
+# EAS Build ignore file for monorepo
+# Only upload the companion app folder
+
+# ===========================================
+# IGNORE EVERYTHING AT ROOT LEVEL
+# ===========================================
+/*
+
+# ===========================================
+# EXCEPT THE COMPANION APP
+# ===========================================
+!companion
+
+# ===========================================
+# BUT IGNORE THESE INSIDE COMPANION
+# ===========================================
+
+# Native folders - EAS generates these during builds (~2.1 GB)
+companion/ios
+companion/android
+
+# Dependencies - EAS installs these during builds (~1.6 GB)
+companion/node_modules
+
+# Expo build cache
+companion/.expo
+companion/dist
+companion/web-build
+
+# Metro
+companion/.metro-health-check*
+
+# WXT Chrome Extension outputs (not needed for mobile builds)
+companion/.output
+companion/.wxt
+companion/dev
+
+# Kotlin cache
+companion/.kotlin
+
+# Build artifacts
+companion/*.jks
+companion/*.p8
+companion/*.p12
+companion/*.key
+companion/*.mobileprovision
+
+# Debug logs
+companion/*.log
+
+# TypeScript build info
+companion/*.tsbuildinfo
+
+# Environment files
+companion/.env
+companion/.env.*
+!companion/.env.example

.env.example

@@ -94,7 +94,7 @@ CRON_ENABLE_APP_SYNC=false
 
 # Application Key for symmetric encryption and decryption
 # must be 32 bytes for AES256 encryption algorithm
-# You can use: `openssl rand -base64 32` to generate one
+# You can use: `openssl rand -base64 24` to generate a 32-character key
 CALENDSO_ENCRYPTION_KEY=
 
 # Intercom Config
@@ -261,6 +261,9 @@ EMAIL_SERVER_PORT=1025
 ## @see https://support.google.com/accounts/answer/185833
 # EMAIL_SERVER_PASSWORD='<gmail_app_password>'
 
+# queue or cancel payment reminder email/flow
+AWAITING_PAYMENT_EMAIL_DELAY_MINUTES=
+
 # Used for E2E for email testing
 # Set it to "1" if you need to email checks in E2E tests locally
 # Make sure to run mailhog container manually or with `yarn dx`
@@ -431,14 +434,7 @@ BLACKLISTED_GUEST_EMAILS=
 NEXT_PUBLIC_VAPID_PUBLIC_KEY=
 VAPID_PRIVATE_KEY=
 
-# Mintlify chat api
-# Power AI chat in for docs
-MINTLIFY_CHAT_API_KEY=
-NEXT_PUBLIC_ENABLE_MINTLIFY_CHAT=
-NEXT_PUBLIC_CHAT_API_URL=
-NEXT_PUBLIC_DOCS_URL=
-
-# Custom privacy policy / terms URLs (for self-hosters: change to your privacy policy / terms URLs)
+# Custom privacy policy/ terms URLs (for self-hosters: change to your privacy policy / terms URLs)
 NEXT_PUBLIC_WEBSITE_PRIVACY_POLICY_URL=
 NEXT_PUBLIC_WEBSITE_TERMS_URL=
 
@@ -509,4 +505,14 @@ SEED_PLATFORM_OAUTH_CLIENT_SECRET=
 ENABLE_ASYNC_TASKER="false" # set to "true" to enable
 TRIGGER_SECRET_KEY=
 TRIGGER_API_URL=https://api.trigger.dev
-TRIGGER_DEV_PROJECT_REF=
+TRIGGER_DEV_PROJECT_REF=
+
+GOOGLE_ADS_ENABLED=1      # To enable Google Ads tracking (gclid)
+LINKEDIN_ADS_ENABLED=1    # To enable LinkedIn Ads tracking (li_fat_id)
+
+# - BACKBLAZE B2 (Compliance Documents) *************************************************************************
+# Used for storing and serving compliance documents (SOC 2, ISO 27001, pentest reports)
+B2_APPLICATION_KEY_ID=
+B2_APPLICATION_KEY=
+B2_BUCKET_ID=
+B2_BUCKET_NAME=

.github/CODEOWNERS

@@ -1,13 +1,15 @@
+.github/actions/**/* @calcom/Foundation
+.github/workflows/**/* @calcom/Foundation
 /**/package.json @calcom/Foundation
-/apps/api/**/* @calcom/API
+/apps/api/**/* @calcom/Foundation
 /apps/web/**/layout.tsx @calcom/Consumer @calcom/Foundation
 /apps/web/lib/csp.ts @calcom/Foundation
 /apps/web/lib/buildNonce.ts @calcom/Foundation
 /apps/web/lib/daily-webhook/**/* @calcom/Foundation
 /apps/web/lib/core/**/* @calcom/Foundation
 /apps/web/lib/booking.ts @calcom/Foundation
 /apps/web/lib/handleOrgRedirect.ts @calcom/Foundation
-/apps/web/middleware.ts @calcom/Foundation
+/apps/web/proxy.ts @calcom/Foundation
 /deploy/**/* @calcom/Foundation
 /packages/app-store/applecalendar/**/* @calcom/Foundation
 /packages/app-store/caldavcalendar/**/* @calcom/Foundation
@@ -28,7 +30,7 @@
 /packages/features/bookings/lib/getLuckyUser.ts @calcom/Foundation
 /packages/features/schedules/lib/slots.ts @calcom/Foundation
 /packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer
-/packages/platform/**/* @calcom/Platform @calcom/Foundation
+/packages/platform/**/* @calcom/Consumer @calcom/Foundation
 /packages/prisma/**/* @calcom/Foundation
 /packages/trpc/server/routers/viewer/bookings/confirm.handler.ts @calcom/Foundation
 /packages/trpc/server/routers/viewer/bookings/get.handler.ts @calcom/Foundation

.github/actions/cache-build-key/action.yml

@@ -0,0 +1,23 @@
+name: Generate cache-build key
+description: "Generate the cache key for production build caching"
+inputs:
+  branch_key:
+    required: true
+    description: "Branch key for cache scoping (e.g., github.head_ref for PRs)"
+outputs:
+  key:
+    description: "The generated cache key"
+    value: ${{ steps.generate-key.outputs.key }}
+runs:
+  using: "composite"
+  steps:
+    - name: Generate cache key
+      id: generate-key
+      shell: bash
+      env:
+        CACHE_NAME: prod-build
+        BRANCH_KEY: ${{ inputs.branch_key }}
+        LOCKFILE_HASH: ${{ hashFiles('yarn.lock') }}
+        SOURCE_HASH: ${{ hashFiles('apps/**/**.[jt]s', 'apps/**/**.[jt]sx', 'apps/**/*.json', 'apps/**/*.css', 'packages/**/**.[jt]s', 'packages/**/**.[jt]sx', 'packages/prisma/schema.prisma', 'packages/prisma/migrations/**/*.sql', '!**/node_modules/**', '!packages/prisma/generated/**', '!packages/prisma/client/**', '!packages/prisma/zod/**', '!packages/kysely/**') }}
+      run: |
+        echo "key=${CACHE_NAME}-${BRANCH_KEY}-${LOCKFILE_HASH}-${SOURCE_HASH}" >> $GITHUB_OUTPUT

.github/actions/cache-build/action.yml

@@ -1,33 +1,23 @@
 name: Cache production build binaries
 description: "Cache or restore if necessary"
-inputs:
-  node_version:
-    required: false
-    default: v18.x
 runs:
   using: "composite"
   steps:
+    - name: Generate cache key
+      id: cache-key
+      uses: ./.github/actions/cache-build-key
+      with:
+        branch_key: ${{ github.head_ref || github.ref_name }}
     - name: Cache production build
-      uses: buildjet/cache@v4
+      uses: actions/cache@v4
       id: cache-build
-      env:
-        # WARN: Don't touch this cache key. Currently github.sha refers to the latest commit in main
-        # and not the branch that's attempting to merge to main, which causes CI errors when merged
-        # to main.
-        # TODO: Fix this problem if intending to modify this cache key.
-        cache-name: prod-build
-        key-1: ${{ inputs.node_version }}-${{ hashFiles('yarn.lock') }}
-        key-2: ${{ hashFiles('apps/**/**.[jt]s', 'apps/**/**.[jt]sx', 'packages/**/**.[jt]s', 'packages/**/**.[jt]sx', '!**/node_modules') }}
-        key-3: ${{ github.event.pull_request.number || github.ref }}
-        key-4: ${{ github.sha }}
-        key-5: ${{ github.event.pull_request.head.sha }}
       with:
         path: |
           ${{ github.workspace }}/apps/web/.next
           ${{ github.workspace }}/apps/web/public/embed
           **/.turbo/**
           **/dist/**
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}-${{ env.key-5 }}
+        key: ${{ steps.cache-key.outputs.key }}
     - run: |
         export NODE_OPTIONS="--max_old_space_size=8192"
         yarn build

.github/actions/cache-checkout/action.yml

@@ -0,0 +1,32 @@
+name: Cache Git Checkout
+description: "Cache or restore git checkout to speed up CI workflows"
+runs:
+  using: "composite"
+  steps:
+    - name: Cache git checkout
+      uses: actions/cache@v4
+      id: cache-checkout
+      with:
+        path: |
+          .
+          !.git
+          !node_modules
+          !**/node_modules
+          !apps/web/public/app-store
+        key: git-checkout-${{ github.head_ref || github.ref_name }}-${{ github.event.pull_request.head.sha || github.sha }}
+    - name: Checkout PR code (on cache miss)
+      if: steps.cache-checkout.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha || github.sha }}
+        fetch-depth: 2
+        sparse-checkout-cone-mode: false
+        sparse-checkout: |
+          /*
+          !/example-apps/
+          !**/*.mp4
+          !/docs/images/
+          !packages/app-store/*/static/*.png
+          !packages/app-store/*/static/*.jpg
+          !packages/app-store/*/static/*.jpeg
+          !packages/app-store/*/static/*.gif

.github/actions/cache-db-key/action.yml

@@ -0,0 +1,23 @@
+name: Generate cache-db key
+description: "Generate the cache key for database caching"
+inputs:
+  path:
+    required: false
+    default: "backups/backup.sql"
+    description: "Path to the backup file"
+outputs:
+  key:
+    description: "The generated cache key"
+    value: ${{ steps.generate-key.outputs.key }}
+runs:
+  using: "composite"
+  steps:
+    - name: Generate cache key
+      id: generate-key
+      shell: bash
+      env:
+        CACHE_NAME: cache-db
+        PATH_KEY: ${{ inputs.path }}
+        PRISMA_HASH: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
+      run: |
+        echo "key=${CACHE_NAME}-${PATH_KEY}-${PRISMA_HASH}" >> $GITHUB_OUTPUT

.github/actions/cache-db/action.yml

@@ -10,22 +10,23 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Generate cache key
+      id: cache-key
+      uses: ./.github/actions/cache-db-key
+      with:
+        path: ${{ inputs.path }}
     - name: Cache database
       id: cache-db
-      uses: buildjet/cache@v4
+      uses: actions/cache@v4
       env:
-        cache-name: cache-db
-        key-1: ${{ hashFiles('packages/prisma/schema.prisma', 'packages/prisma/migrations/**/**.sql', 'packages/prisma/*.ts') }}
-        key-2: ${{ github.event.pull_request.number || github.ref }}
-        key-3: ${{ github.event.pull_request.head.sha }}
         DATABASE_URL: ${{ inputs.DATABASE_URL }}
         DATABASE_DIRECT_URL: ${{ inputs.DATABASE_URL }}
         E2E_TEST_CALCOM_QA_EMAIL: ${{ inputs.E2E_TEST_CALCOM_QA_EMAIL }}
         E2E_TEST_CALCOM_QA_PASSWORD: ${{ inputs.E2E_TEST_CALCOM_QA_PASSWORD }}
         E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS: ${{ inputs.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }}
       with:
         path: ${{ inputs.path }}
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}
+        key: ${{ steps.cache-key.outputs.key }}
     - run: yarn db-seed
       if: steps.cache-db.outputs.cache-hit != 'true'
       shell: bash

.github/actions/docker-build-and-test/action.yml

@@ -34,6 +34,10 @@ inputs:
     description: "Whether to push the built image"
     required: false
     default: "false"
+  use-as-latest:
+    description: "Publish as latest"
+    required: false
+    default: "false"
 
 runs:
   using: "composite"
@@ -61,7 +65,7 @@ runs:
           docker.io/calcom/cal.com
           ghcr.io/calcom/cal.com
         flavor: |
-          latest=${{ !github.event.release.prerelease }}
+          latest=${{ !github.event.release.prerelease && inputs.use-as-latest == 'true' }}
           suffix=${{ inputs.platform-suffix }}
 
     - name: Copy env
@@ -87,7 +91,7 @@ runs:
         docker compose logs database
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: useblacksmith/setup-docker-builder@v1
       with:
         driver-opts: |
           network=container:database
@@ -96,7 +100,7 @@ runs:
 
     - name: Build image
       id: docker_build
-      uses: docker/build-push-action@v6
+      uses: useblacksmith/build-push-action@v2
       with:
         context: ./
         file: ./Dockerfile
@@ -155,7 +159,7 @@ runs:
 
     - name: Push image
       id: docker_push
-      uses: docker/build-push-action@v6
+      uses: useblacksmith/build-push-action@v2
       if: ${{ inputs.push-image == 'true' && !github.event.release.prerelease }}
       with:
         context: ./