chore: v4.4.3 (#16321)

* fix: error message when email exists

* chore: change postion of error

---------

Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

.env.example

@@ -15,10 +15,14 @@
 # - You can not repackage or sell the codebase
 # - Acquire a commercial license to remove these terms by visiting: cal.com/sales
 #
-# To enable enterprise-only features, as an admin, go to /auth/setup to select your license and follow
-# instructions. This environment variable is deprecated although still supported for backward compatibility.
-# @see https://console.cal.com
+
+# To enable enterprise-only features please add your envrionment variable to the .env file then make your way to /auth/setup to select your license and follow instructions. 
 CALCOM_LICENSE_KEY=
+# Signature token for the Cal.com License API (used for self-hosted integrations)
+# We will give you a token when we provide you with a license key this ensure you and only you can communicate with the Cal.com License API for your license key
+CAL_SIGNATURE_TOKEN=
+# The route to the Cal.com License API
+CALCOM_PRIVATE_API_ROUTE="https://goblin.cal.com"
 # ***********************************************************************************************************
 
 # - DATABASE ************************************************************************************************
@@ -180,6 +184,7 @@ API_KEY_PREFIX=cal_
 # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/
 # Configures the global From: header whilst sending emails.
 EMAIL_FROM='notifications@yourselfhostedcal.com'
+EMAIL_FROM_NAME='Cal.com'
 
 # Configure SMTP settings (@see https://nodemailer.com/smtp/).
 # Configuration to receive emails locally (mailhog)
@@ -254,6 +259,8 @@ NEXT_PUBLIC_AVAILABILITY_SCHEDULE_INTERVAL=
 # This variable should only be set to 1 or true if you are in a non-prod environment and you want to
 # use organizations
 ORGANIZATIONS_ENABLED=
+NEXT_PUBLIC_ORGANIZATIONS_MIN_SELF_SERVE_SEATS=30
+NEXT_PUBLIC_ORGANIZATIONS_SELF_SERVE_PRICE=3700 # $37.00 per seat
 
 # This variable should only be set to 1 or true if you want to autolink external provider sing-ups with
 # existing organizations based on email domain address
@@ -359,3 +366,6 @@ UNKEY_ROOT_KEY=
 # Used for Cal.ai Enterprise Voice AI Agents
 # https://retellai.com
 RETELL_AI_KEY=
+
+# Used to disallow emails as being added as guests on bookings
+BLACKLISTED_GUEST_EMAILS=

.eslintignore

@@ -1,4 +1,6 @@
 node_modules
+apps/api/v2/dist
+packages/platform/**/dist/*
 **/**/node_modules
 **/**/.next
 **/**/public

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,39 +0,0 @@
----
-name: Bug report
-about: Report any issues with the platform
-title: ""
-labels: bug
-assignees: ""
----
-
-Found a bug? Please fill out the sections below. 👍
-
-### Issue Summary
-
-A summary of the issue. This needs to be a clear detailed-rich summary.
-
-### Steps to Reproduce
-
-1. (for example) Went to ...
-2. Clicked on...
-3. ...
-
-Any other relevant information. For example, why do you consider this a bug and what did you expect to happen instead?
-
-### Actual Results
-
-- What's happening right now that is different from what is expected
-
-### Expected Results
-
-- This is an ideal result that the system should get after the tests are performed
-
-### Technical details
-
-- Browser version, screen recording, console logs, network requests: You can make a recording with [Bird Eats Bug](https://birdeatsbug.com/).
-- Node.js version
-- Anything else that you think could be an issue.
-
-### Evidence
-
-- How was this tested? This is quite mandatory in terms of bugs. Providing evidence of your testing with screenshots or/and videos is an amazing way to prove the bug and a troubleshooting chance to find the solution.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,81 @@
+name: Bug report
+description: "Please make sure you have checked for any duplicate issues."
+title: "(bug)"
+labels: ["🐛 bug"]
+assignees: []
+body:
+- type: textarea
+  id: issue-summary
+  attributes:
+    label: Issue Summary
+    description: A summary of the issue. This needs to be a clear detailed-rich summary.
+  validations:
+    required: true
+- type: textarea
+  id: steps-to-reproduce
+  attributes:
+    label: Steps to Reproduce
+    value: |
+      1. (for example) Went to ...
+      2. Clicked on...
+      3. ...
+  validations:
+    required: true
+- type: textarea
+  id: expected-behavior
+  attributes:
+    label: Expected behavior
+    description: A clear and concise description of what you expected to happen.
+  validations:
+    required: true
+- type: textarea
+  id: other-information
+  attributes:
+    label: Other information
+  validations:
+    required: false
+- type: textarea
+  id: screenshots
+  attributes:
+    label: Screenshots
+    description: If applicable, add screenshots to help explain your problem.
+  validations:
+    required: false
+- type: checkboxes
+  id: environment
+  attributes:
+    label: Environment
+    options:
+      - label: app.cal.com
+      - label: Self-hosted Cal
+- type: textarea
+  id: desktop-version
+  attributes:
+    label: Desktop (please complete the following information)
+    description: | 
+      examples: 
+      - **OS**: [e.g. iOS]
+      - **Browser**: [e.g. chrome, safari]
+      - **Version**: [e.g. 22]
+    value: |
+      - OS:
+      - Node:
+      - npm: 
+    render: markdown
+  validations:
+    required: true
+- type: markdown
+  id: nodejs-version
+  attributes:
+    value: | 
+      #### Node.JS version
+      
+      [e.g. v18.15.0] 
+- type: markdown
+  id: anything-else
+  attributes:
+    value: |
+      #### Anything else?
+      
+      - Screen recording, console logs, network requests: You can make a recording with [Loom](https://www.loom.com).
+      - Anything else that you think could be an issue?

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Questions
-    url: https://go.cal.com/discord
-    about: Ask a general question about the project on our discord community
+    url: https://github.com/calcom/cal.com/discussions
+    about: Need help selfhosting or ask a general question about the project? Open a discussion

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest a feature or idea
 title: ""
-labels: feature
+labels: ["✨ feature", "🚨 needs approval"]
 assignees: ""
 ---
 
@@ -53,3 +53,4 @@ assignees: ""
 - If this issue has a `🚨 needs approval` label, don't start coding yet. Wait until a core member approves feature request by removing this label, then you can start coding.
   - For clarity: Non-core member issues automatically get the `🚨 needs approval` label.
   - Your feature ideas are invaluable to us! However, they undergo review to ensure alignment with the product's direction.
+  - Follow Best Practices lined out in our [Contributor Docs](https://github.com/calcom/cal.com/blob/main/CONTRIBUTING.md)

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,9 +11,9 @@
 
 ## Mandatory Tasks (DO NOT REMOVE)
 
-- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected)
-- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com)
-- [ ] I have added or modified automated tests that prove my fix is effective or that my feature works (PRs might be rejected if logical changes are not properly tested)
+- [ ] I have self-reviewed the code (A decent size PR without self-review might be rejected).
+- [ ] I have added a Docs issue [here](https://github.com/calcom/docs/issues/new) if this PR makes changes that would require a [documentation change](https://docs.cal.com/docs). If N/A, write N/A here and check the checkbox.
+- [ ] I confirm automated tests are in place that prove my fix is effective or that my feature works.
 
 ## How should this be tested?
 

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

@@ -20,13 +20,14 @@ runs:
         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 }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}-${{ env.key-5 }}
     - run: |
         export NODE_OPTIONS="--max_old_space_size=8192"
         yarn build

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

@@ -17,6 +17,7 @@ runs:
         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 }}
@@ -24,7 +25,7 @@ runs:
         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 }}
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}
     - run: echo ${{ env.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }} && yarn db-seed
       if: steps.cache-db.outputs.cache-hit != 'true'
       shell: bash

.github/actions/yarn-install/action.yml

@@ -37,8 +37,6 @@ runs:
       with:
         path: ${{ steps.yarn-config.outputs.CACHE_FOLDER }}
         key: yarn-download-cache-${{ hashFiles('yarn.lock') }}
-        restore-keys: |
-          yarn-download-cache-
 
     # Invalidated on yarn.lock changes
     - name: Restore node_modules

.github/actions/yarn-playwright-install/action.yml

@@ -3,6 +3,10 @@ description: "Install playwright, cache and restore if necessary"
 runs:
   using: "composite"
   steps:
+    - name: Get installed Playwright version
+      shell: bash
+      id: playwright-version
+      run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').devDependencies['@playwright/test'])")" >> $GITHUB_ENV
     - name: Cache playwright binaries
       id: playwright-cache
       uses: buildjet/cache@v4
@@ -11,9 +15,7 @@ runs:
           ~/Library/Caches/ms-playwright
           ~/.cache/ms-playwright
           ${{ github.workspace }}/node_modules/playwright
-        key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cache-playwright-
+        key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
     - name: Yarn playwright install
       shell: bash
-      if: steps.playwright-cache.outputs.cache-hit != 'true'
-      run: yarn playwright install
+      run: yarn playwright install --with-deps

.github/workflows/all-checks.yml

@@ -0,0 +1,84 @@
+name: All checks
+
+on:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  type-check:
+    name: Type check
+    uses: ./.github/workflows/check-types.yml
+    secrets: inherit
+
+  lint:
+    name: Linters
+    uses: ./.github/workflows/lint.yml
+    secrets: inherit
+
+  unit-test:
+    name: Tests
+    uses: ./.github/workflows/unit-tests.yml
+    secrets: inherit
+
+  build-api-v1:
+    name: Production builds
+    uses: ./.github/workflows/api-v1-production-build.yml
+    secrets: inherit
+
+  build-api-v2:
+    name: Production builds
+    uses: ./.github/workflows/api-v2-production-build.yml
+    secrets: inherit
+
+  build-atoms:
+    name: Production builds
+    uses: ./.github/workflows/atoms-production-build.yml
+    secrets: inherit
+
+  build:
+    name: Production builds
+    uses: ./.github/workflows/production-build-without-database.yml
+    secrets: inherit
+
+  integration-test:
+    name: Tests
+    needs: [lint, build, build-api-v1, build-api-v2]
+    uses: ./.github/workflows/integration-tests.yml
+    secrets: inherit
+
+  e2e:
+    name: Tests
+    needs: [lint, build, build-api-v1, build-api-v2]
+    uses: ./.github/workflows/e2e.yml
+    secrets: inherit
+
+  e2e-app-store:
+    name: Tests
+    needs: [lint, build, build-api-v1, build-api-v2]
+    uses: ./.github/workflows/e2e-app-store.yml
+    secrets: inherit
+
+  e2e-embed:
+    name: Tests
+    needs: [lint, build, build-api-v1, build-api-v2]
+    uses: ./.github/workflows/e2e-embed.yml
+    secrets: inherit
+
+  e2e-embed-react:
+    name: Tests
+    needs: [lint, build, build-api-v1, build-api-v2]
+    uses: ./.github/workflows/e2e-embed-react.yml
+    secrets: inherit
+
+  required:
+    needs: [lint, type-check, unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    if: always()
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    steps:
+      - name: fail if conditional jobs failed
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')
+        run: exit 1

.github/workflows/api-v1-production-build.yml

@@ -3,6 +3,9 @@ name: Production Builds
 on:
   workflow_call:
 
+permissions:
+  contents: read
+
 env:
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
   CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
@@ -65,7 +68,7 @@ jobs:
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/cache-db
       - name: Cache API v1 production build
-        uses: buildjet/cache@v3
+        uses: buildjet/cache@v4
         id: cache-api-v1-build
         env:
           cache-name: api-v1-build

.github/workflows/api-v2-production-build.yml

@@ -10,6 +10,8 @@ env:
 jobs:
   build:
     name: Build API v2
+    permissions:
+      contents: read
     runs-on: buildjet-4vcpu-ubuntu-2204
     timeout-minutes: 30
     services:
@@ -34,7 +36,7 @@ jobs:
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
       - name: Cache API v2 production build
-        uses: buildjet/cache@v3
+        uses: buildjet/cache@v4
         id: cache-api-v2-build
         env:
           cache-name: api-v2-build

.github/workflows/atoms-production-build.yml

@@ -0,0 +1,40 @@
+name: Atoms production Build
+
+on:
+  workflow_call:
+
+jobs:
+  build:
+    name: Build atoms
+    permissions:
+      contents: read
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - name: Cache atoms production build
+        uses: buildjet/cache@v4
+        id: cache-atoms-build
+        env:
+          cache-name: atoms-build
+          key-1: ${{ hashFiles('yarn.lock') }}
+          key-2: ${{ hashFiles('packages/platform/atoms/**.[jt]s', 'packages/platform/atoms/**.[jt]sx', '!**/node_modules') }}
+          key-3: ${{ github.event.pull_request.number || github.ref }}
+          # Ensures production-build.yml will always be fresh
+          key-4: ${{ github.sha }}
+        with:
+          path: |
+            **/dist/**
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.key-1 }}-${{ env.key-2 }}-${{ env.key-3 }}-${{ env.key-4 }}
+      - run: |
+          export NODE_OPTIONS="--max_old_space_size=8192"
+          if [ ${{ steps.cache-atoms-build.outputs.cache-hit }} == 'true' ]; then
+            echo "Cache hit for atoms build. Skipping build."
+          else
+            rm -rf packages/platform/atoms/node_modules
+            yarn install
+            yarn workspace @calcom/atoms run build
+          fi
+        shell: bash

.github/workflows/check-types.yml

@@ -3,6 +3,8 @@ on:
   workflow_call:
 env:
   NODE_OPTIONS: --max-old-space-size=4096
+permissions:
+  contents: read
 jobs:
   check-types:
     runs-on: buildjet-4vcpu-ubuntu-2204

.github/workflows/cleanup.yml

@@ -0,0 +1,58 @@
+name: Delete
+
+on:
+  delete:
+    branches-ignore: [main, gh-pages]
+
+# ensures that currently running Playwright workflow of deleted branch gets cancelled
+concurrency:
+  group: ${{ github.event.ref }}
+  cancel-in-progress: true
+
+jobs:
+  delete_reports:
+    name: Delete Reports
+    runs-on: ubuntu-latest
+    env:
+      # Contains all reports for deleted branch
+      BRANCH_REPORTS_DIR: reports/${{ github.event.ref }}
+    steps:
+      - name: Checkout GitHub Pages Branch
+        uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+      - name: Set Git User
+        # see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Check for workflow reports
+        run: |
+          if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
+            echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
+          else
+            echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
+          fi
+      - name: Delete reports from repo for branch
+        if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
+        timeout-minutes: 3
+        run: |
+          cd $BRANCH_REPORTS_DIR/..
+
+          rm -rf ${{ github.event.ref }}
+          git add .
+          git commit -m "workflow: remove all reports for branch ${{ github.event.ref }}"
+
+          while true; do
+            git pull --rebase
+            if [ $? -ne 0 ]; then
+              echo "Failed to rebase. Please review manually."
+              exit 1
+            fi
+
+            git push
+            if [ $? -eq 0 ]; then
+              echo "Successfully pushed HTML reports to repo."
+              exit 0
+            fi
+          done

.github/workflows/e2e-api-v2.yml

@@ -0,0 +1,79 @@
+name: E2E
+on:
+  workflow_call:
+env:
+  ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
+  API_KEY_PREFIX: ${{ secrets.CI_API_KEY_PREFIX }}
+  API_PORT: ${{ vars.CI_API_V2_PORT }}
+  CALCOM_LICENSE_KEY: ${{ secrets.CI_CALCOM_LICENSE_KEY }}
+  DAILY_API_KEY: ${{ secrets.CI_DAILY_API_KEY }}
+  DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_READ_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_WRITE_URL: ${{ secrets.CI_DATABASE_URL }}
+  DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
+  GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
+  IS_E2E: true
+  NEXTAUTH_SECRET: ${{ secrets.CI_NEXTAUTH_SECRET }}
+  NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
+  NODE_OPTIONS: --max-old-space-size=4096
+  REDIS_URL: "redis://localhost:6379"
+  STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+  STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+  STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
+  STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
+jobs:
+  e2e:
+    timeout-minutes: 20
+    name: E2E API v2
+    runs-on: buildjet-8vcpu-ubuntu-2204
+    services:
+      postgres:
+        image: postgres:13
+        credentials:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: calendso
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+      redis:
+        image: redis:latest
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install
+      - uses: ./.github/actions/cache-db
+      - name: Run Tests
+        working-directory: apps/api/v2
+        run: |
+          yarn test:e2e
+          EXIT_CODE=$?
+          echo "yarn test:e2e command exit code: $EXIT_CODE"
+          exit $EXIT_CODE
+      - name: Upload Test Results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-api-v2
+          path: test-results

.github/workflows/e2e-app-store.yml

@@ -1,6 +1,9 @@
 name: E2E App Store Tests
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
@@ -41,7 +44,7 @@ env:
 jobs:
   e2e-app-store:
     timeout-minutes: 20
-    name: E2E App Store (${{ matrix.shard }}/${{ strategy.job-total }})
+    name: E2E App Store
     runs-on: buildjet-4vcpu-ubuntu-2204
     services:
       postgres:
@@ -70,9 +73,6 @@ jobs:
           - 1025:1025
     strategy:
       fail-fast: false
-      matrix:
-        ## There aren't many tests for AppStore. So, just start with 2 shards. Increase if needed.
-        shard: [1, 2]
 
     steps:
       - uses: docker/login-action@v3
@@ -93,10 +93,10 @@ jobs:
           E2E_TEST_CALCOM_GCAL_KEYS: ${{ secrets.E2E_TEST_CALCOM_GCAL_KEYS }}
       - uses: ./.github/actions/cache-build
       - name: Run Tests
-        run: yarn e2e:app-store --shard=${{ matrix.shard }}/${{ strategy.job-total }}
+        run: yarn e2e:app-store
       - name: Upload Test Results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: app-store-results-${{ matrix.shard }}_${{ strategy.job-total }}
-          path: test-results
+          name: blob-report-app-store
+          path: blob-report

.github/workflows/e2e-embed-react.yml

@@ -1,6 +1,9 @@
 name: E2E Embed React tests and booking flow (for non-embed as well)
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
@@ -41,7 +44,7 @@ env:
 jobs:
   e2e-embed:
     timeout-minutes: 20
-    name: E2E Embed React (${{ matrix.shard }}/${{ strategy.job-total }})
+    name: E2E Embed React
     runs-on: buildjet-4vcpu-ubuntu-2204
     services:
       postgres:
@@ -62,9 +65,6 @@ jobs:
           - 5432:5432
     strategy:
       fail-fast: false
-      matrix:
-        ## There aren't many tests for embed-react. So, just start with 2 shards. Increase if needed.
-        shard: [1, 2]
 
     steps:
       - uses: docker/login-action@v3
@@ -79,11 +79,11 @@ jobs:
       - uses: ./.github/actions/cache-build
       - name: Run Tests
         run: |
-          yarn e2e:embed-react --shard=${{ matrix.shard }}/${{ strategy.job-total }}
+          yarn e2e:embed-react
           yarn workspace @calcom/embed-react packaged:tests
       - name: Upload Test Results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: embed-react-results-${{ matrix.shard }}_${{ strategy.job-total }}
-          path: test-results
+          name: blob-report-embed-react
+          path: blob-report

.github/workflows/e2e-embed.yml

@@ -1,6 +1,9 @@
 name: E2E Embed Core tests and booking flow (for non-embed as well)
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
@@ -41,7 +44,7 @@ env:
 jobs:
   e2e-embed:
     timeout-minutes: 20
-    name: E2E Embed Core (${{ matrix.shard }}/${{ strategy.job-total }})
+    name: E2E Embed Core
     runs-on: buildjet-4vcpu-ubuntu-2204
     services:
       postgres:
@@ -70,9 +73,6 @@ jobs:
           - 1025:1025
     strategy:
       fail-fast: false
-      matrix:
-        ## There aren't many tests for embed-core. So, just start with 2 shards. Increase if needed.
-        shard: [1, 2]
 
     steps:
       - uses: docker/login-action@v3
@@ -86,10 +86,10 @@ jobs:
       - uses: ./.github/actions/cache-db
       - uses: ./.github/actions/cache-build
       - name: Run Tests
-        run: yarn e2e:embed --shard=${{ matrix.shard }}/${{ strategy.job-total }}
+        run: yarn e2e:embed
       - name: Upload Test Results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: embed-core-results-${{ matrix.shard }}_${{ strategy.job-total }}
-          path: test-results
+          name: blob-report-embed-core
+          path: blob-report

.github/workflows/e2e.yml

@@ -1,6 +1,9 @@
 name: E2E
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
@@ -42,7 +45,7 @@ jobs:
   e2e:
     timeout-minutes: 20
     name: E2E (${{ matrix.shard }}/${{ strategy.job-total }})
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: buildjet-8vcpu-ubuntu-2204
     services:
       postgres:
         image: postgres:13
@@ -71,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7]
+        shard: [1, 2, 3, 4]
     steps:
       - uses: docker/login-action@v3
         with:
@@ -86,8 +89,9 @@ jobs:
       - name: Run Tests
         run: yarn e2e --shard=${{ matrix.shard }}/${{ strategy.job-total }}
       - name: Upload Test Results
-        if: ${{ always() }}
         uses: actions/upload-artifact@v4
+        if: always()
         with:
-          name: test-results-${{ matrix.shard }}_${{ strategy.job-total }}
-          path: test-results
+          name: blob-report-${{ matrix.shard }}
+          path: blob-report
+          retention-days: 30

.github/workflows/integration-tests.yml

@@ -1,6 +1,8 @@
 name: Integration
 on:
   workflow_call:
+permissions:
+  contents: read
 env:
   NODE_OPTIONS: --max-old-space-size=4096
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
@@ -75,15 +77,16 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/cache-db
       - name: Run Tests
         run: yarn test -- --integrationTestsOnly
-      - name: Upload Test Results
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-results
-          path: test-results
+      # TODO: Generate test results so we can upload them
+      # - name: Upload Test Results
+      #   if: ${{ always() }}
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: test-results
+      #     path: test-results

.github/workflows/lint.yml

@@ -1,6 +1,9 @@
 name: Lint
 on:
   workflow_call:
+permissions:
+  actions: write
+  contents: read
 jobs:
   lint:
     runs-on: buildjet-4vcpu-ubuntu-2204
@@ -16,13 +19,6 @@ jobs:
       - name: Merge lint reports
         run: jq -s '[.[]]|flatten' lint-results/*.json &> lint-results/eslint_report.json
 
-      - name: Annotate Code Linting Results
-        uses: ataylorme/eslint-annotate-action@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          report-json: "lint-results/eslint_report.json"
-          only-pr-files: false
-
       - name: Upload ESLint report
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

.github/workflows/merge-reports.yml

@@ -0,0 +1,25 @@
+# https://playwright.dev/docs/test-sharding#merging-reports-from-multiple-shards
+on:
+  workflow_call:
+jobs:
+  merge-reports:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/dangerous-git-checkout
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install
+      - name: Download blob reports from GitHub Actions Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-blob-reports
+          pattern: blob-report-*
+          merge-multiple: true
+      - name: Merge into HTML Report
+        run: yarn playwright merge-reports --reporter html ./all-blob-reports
+      - name: Upload HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
+          path: playwright-report
+          retention-days: 14

.github/workflows/nextjs-bundle-analysis-annotation.yml

@@ -0,0 +1,81 @@
+name: "Next.js Bundle Analysis Annotation"
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  actions: read
+  contents: read
+  pull-requests: write
+
+jobs:
+  annotate:
+    if: always()
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/cache-build
+      - name: Download base branch bundle stats
+        uses: dawidd6/action-download-artifact@v2
+        if: success()
+        with:
+          workflow: nextjs-bundle-analysis.yml
+          branch: ${{ github.event.pull_request.base.ref }}
+          path: apps/web/.next/analyze/base
+
+      # And here's the second place - this runs after we have both the current and
+      # base branch bundle stats, and will compare them to determine what changed.
+      # There are two configurable arguments that come from package.json:
+      #
+      # - budget: optional, set a budget (bytes) against which size changes are measured
+      #           it's set to 350kb here by default, as informed by the following piece:
+      #           https://infrequently.org/2021/03/the-performance-inequality-gap/
+      #
+      # - red-status-percentage: sets the percent size increase where you get a red
+      #                          status indicator, defaults to 20%
+      #
+      # Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
+      # entry in your package.json file.
+
+      - name: Compare with base branch bundle
+        if: success()
+        run: |
+          cd apps/web
+          ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
+
+      - name: Get comment body
+        id: get-comment-body
+        if: success() && github.event.number
+        run: |
+          cd apps/web
+          body=$(cat .next/analyze/__bundle_analysis_comment.txt)
+          body="${body//'%'/'%25'}"
+          body="${body//$'\n'/'%0A'}"
+          body="${body//$'\r'/'%0D'}"
+          echo ::set-output name=body::$body
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        if: success() && github.event.number
+        id: fc
+        with:
+          issue-number: ${{ github.event.number }}
+          body-includes: "<!-- __NEXTJS_BUNDLE_@calcom/web -->"
+
+      - name: Create Comment
+        uses: peter-evans/create-or-update-comment@v3
+        if: success() && github.event.number && steps.fc.outputs.comment-id == 0
+        with:
+          issue-number: ${{ github.event.number }}
+          body: ${{ steps.get-comment-body.outputs.body }}
+
+      - name: Update Comment
+        uses: peter-evans/create-or-update-comment@v3
+        if: success() && github.event.number && steps.fc.outputs.comment-id != 0
+        with:
+          issue-number: ${{ github.event.number }}
+          body: ${{ steps.get-comment-body.outputs.body }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace

.github/workflows/nextjs-bundle-analysis.yml

@@ -7,6 +7,10 @@ on:
     branches:
       - main
 
+permissions:
+  actions: write
+  contents: read
+
 env:
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
   CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
@@ -45,13 +49,7 @@ env:
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
 
 jobs:
-  build:
-    name: Production builds
-    if: ${{ github.event_name == 'push' }}
-    uses: ./.github/workflows/production-build-without-database.yml
-    secrets: inherit
   analyze:
-    needs: build
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
@@ -69,65 +67,3 @@ jobs:
         with:
           name: bundle
           path: apps/web/.next/analyze/__bundle_analysis.json
-
-      - name: Download base branch bundle stats
-        uses: dawidd6/action-download-artifact@v2
-        if: success()
-        with:
-          workflow: nextjs-bundle-analysis.yml
-          branch: ${{ github.event.pull_request.base.ref }}
-          path: apps/web/.next/analyze/base
-
-      # And here's the second place - this runs after we have both the current and
-      # base branch bundle stats, and will compare them to determine what changed.
-      # There are two configurable arguments that come from package.json:
-      #
-      # - budget: optional, set a budget (bytes) against which size changes are measured
-      #           it's set to 350kb here by default, as informed by the following piece:
-      #           https://infrequently.org/2021/03/the-performance-inequality-gap/
-      #
-      # - red-status-percentage: sets the percent size increase where you get a red
-      #                          status indicator, defaults to 20%
-      #
-      # Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
-      # entry in your package.json file.
-      - name: Compare with base branch bundle
-        if: success()
-        run: |
-          cd apps/web
-          ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
-
-      - name: Get comment body
-        id: get-comment-body
-        if: success() && github.event.number
-        run: |
-          cd apps/web
-          body=$(cat .next/analyze/__bundle_analysis_comment.txt)
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'%0A'}"
-          body="${body//$'\r'/'%0D'}"
-          echo ::set-output name=body::$body
-
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        if: success() && github.event.number
-        id: fc
-        with:
-          issue-number: ${{ github.event.number }}
-          body-includes: "<!-- __NEXTJS_BUNDLE_@calcom/web -->"
-
-      - name: Create Comment
-        uses: peter-evans/create-or-update-comment@v3
-        if: success() && github.event.number && steps.fc.outputs.comment-id == 0
-        with:
-          issue-number: ${{ github.event.number }}
-          body: ${{ steps.get-comment-body.outputs.body }}
-
-      - name: Update Comment
-        uses: peter-evans/create-or-update-comment@v3
-        if: success() && github.event.number && steps.fc.outputs.comment-id != 0
-        with:
-          issue-number: ${{ github.event.number }}
-          body: ${{ steps.get-comment-body.outputs.body }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          edit-mode: replace

.github/workflows/pr-review.yml

@@ -0,0 +1,28 @@
+name: PR Reviewed
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  label-pr:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Label PR as ready for E2E
+        if: github.event.review.state == 'approved'
+        uses: actions/github-script@v4
+        with:
+          script: |
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: process.env.labels.split(', '),
+            })
+        env:
+          github_token: ${{ secrets.READY_FOR_E2E_PAT }}
+          labels: 'ready-for-e2e'

.github/workflows/pr.yml

@@ -2,11 +2,16 @@ name: PR Update
 
 on:
   pull_request_target:
+    types: [opened, synchronize, reopened, labeled]
     branches:
       - main
-  merge_group:
+      - gh-actions-test-branch
   workflow_dispatch:
 
+permissions:
+  actions: write
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -19,6 +24,7 @@ jobs:
       pull-requests: read
     outputs:
       has-files-requiring-all-checks: ${{ steps.filter.outputs.has-files-requiring-all-checks }}
+      commit-sha: ${{ steps.get_sha.outputs.commit-sha }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
@@ -28,92 +34,202 @@ jobs:
           filters: |
             has-files-requiring-all-checks:
               - "!(**.md|.github/CODEOWNERS)"
+      - name: Get Latest Commit SHA
+        id: get_sha
+        run: |
+          echo "commit-sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+  check-label:
+    needs: [changes]
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    name: Check for E2E label
+    permissions:
+      pull-requests: read
+    outputs:
+      run-e2e: ${{ steps.check-if-pr-has-label.outputs.run-e2e == 'true' && (github.event.action != 'labeled' || (github.event.action == 'labeled' && github.event.label.name == 'ready-for-e2e')) }}
+    steps:
+      - name: Check if PR exists with ready-for-e2e label for this SHA
+        id: check-if-pr-has-label
+        uses: actions/github-script@v7
+        with:
+          script: |
+            let labels = [];
+
+            if (context.payload.pull_request) {
+              labels = context.payload.pull_request.labels;
+            } else {
+              try {
+                const sha = '${{ needs.changes.outputs.commit-sha }}';
+                console.log('sha', sha);
+                const { data: prs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  commit_sha: sha
+                });
+
+                if (prs.length === 0) {
+                  core.setOutput('run-e2e', false);
+                  console.log(`No pull requests found for commit SHA ${sha}`);
+                  return;
+                }
+
+                const pr = prs[0];
+                console.log(`PR number: ${pr.number}`);
+                console.log(`PR title: ${pr.title}`);
+                console.log(`PR state: ${pr.state}`);
+                console.log(`PR URL: ${pr.html_url}`);
+
+                labels = pr.labels;
+              }
+              catch (e) {
+                core.setOutput('run-e2e', false);
+                console.log(e);
+              }
+            }
+
+            const labelFound = labels.map(l => l.name).includes('ready-for-e2e');
+            console.log('Found the label?', labelFound);
+            core.setOutput('run-e2e', labelFound);
+
+  deps:
+    name: Install dependencies
+    needs: [changes, check-label]
+    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/yarn-install.yml
+
   type-check:
     name: Type check
-    needs: [changes]
+    needs: [changes, check-label, deps]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/check-types.yml
     secrets: inherit
 
-  unit-test:
-    name: Tests
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
-    uses: ./.github/workflows/unit-tests.yml
-    secrets: inherit
-
   lint:
     name: Linters
-    needs: [changes]
+    needs: [changes, check-label, deps]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/lint.yml
     secrets: inherit
 
+  unit-test:
+    name: Tests
+    needs: [changes, check-label, deps]
+    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/unit-tests.yml
+    secrets: inherit
+
   build-api-v1:
     name: Production builds
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, deps]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/api-v1-production-build.yml
     secrets: inherit
 
   build-api-v2:
     name: Production builds
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, deps]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/api-v2-production-build.yml
     secrets: inherit
+  
+  build-atoms:
+    name: Production builds
+    needs: [changes, check-label, deps]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/atoms-production-build.yml
+    secrets: inherit
 
   build:
     name: Production builds
-    needs: [changes]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, deps]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/production-build-without-database.yml
     secrets: inherit
 
   integration-test:
     name: Tests
-    needs: [changes, lint, build, build-api-v1, build-api-v2]
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
     if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/integration-tests.yml
     secrets: inherit
 
   e2e:
     name: Tests
-    needs: [changes, lint, build, build-api-v1, build-api-v2]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e.yml
     secrets: inherit
 
+  e2e-api-v2:
+    name: Tests
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    uses: ./.github/workflows/e2e-api-v2.yml
+    secrets: inherit
+
   e2e-app-store:
     name: Tests
-    needs: [changes, lint, build, build-api-v1, build-api-v2]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e-app-store.yml
     secrets: inherit
 
   e2e-embed:
     name: Tests
-    needs: [changes, lint, build, build-api-v1, build-api-v2]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e-embed.yml
     secrets: inherit
 
   e2e-embed-react:
     name: Tests
-    needs: [changes, lint, build, build-api-v1, build-api-v2]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, build, build-api-v1, build-api-v2]
+    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
     uses: ./.github/workflows/e2e-embed-react.yml
     secrets: inherit
 
   analyze:
     name: Analyze Build
-    needs: [changes, build]
-    if: ${{ needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [build]
     uses: ./.github/workflows/nextjs-bundle-analysis.yml
     secrets: inherit
 
+  merge-reports:
+    name: Merge reports
+    if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    needs: [changes, check-label, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    uses: ./.github/workflows/merge-reports.yml
+    secrets: inherit
+
+  publish-report:
+    name: Publish HTML report
+    if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+    needs: [changes, check-label, merge-reports]
+    uses: ./.github/workflows/publish-report.yml
+    secrets: inherit
+
   required:
-    needs: [changes, lint, type-check, unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
+    needs:
+      [
+        changes,
+        lint,
+        type-check,
+        unit-test,
+        integration-test,
+        check-label,
+        build,
+        build-api-v1,
+        build-api-v2,
+        e2e,
+        e2e-api-v2,
+        e2e-embed,
+        e2e-embed-react,
+        e2e-app-store,
+      ]
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:

.github/workflows/pre-release.yml

@@ -1,77 +0,0 @@
-name: Pre-release checks
-
-on:
-  workflow_dispatch:
-
-jobs:
-  changes:
-    name: Detect changes
-    runs-on: buildjet-4vcpu-ubuntu-2204
-    permissions:
-      pull-requests: read
-    outputs:
-      app-store: ${{ steps.filter.outputs.app-store }}
-      embed: ${{ steps.filter.outputs.embed }}
-      embed-react: ${{ steps.filter.outputs.embed-react }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/dangerous-git-checkout
-      - uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            app-store:
-              - 'apps/web/**'
-              - 'packages/app-store/**'
-              - 'playwright.config.ts'
-            embed:
-              - 'apps/web/**'
-              - 'packages/embeds/**'
-              - 'playwright.config.ts'
-            embed-react:
-              - 'apps/web/**'
-              - 'packages/embeds/**'
-              - 'playwright.config.ts'
-
-  lint:
-    name: Linters
-    uses: ./.github/workflows/lint.yml
-    secrets: inherit
-
-  build:
-    name: Production builds
-    uses: ./.github/workflows/production-build-without-database.yml
-    secrets: inherit
-
-  e2e:
-    name: E2E tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e.yml
-    secrets: inherit
-
-  e2e-app-store:
-    name: E2E App Store tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e-app-store.yml
-    secrets: inherit
-
-  e2e-embed:
-    name: E2E embeds tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e-embed.yml
-    secrets: inherit
-
-  e2e-embed-react:
-    name: E2E React embeds tests
-    needs: [changes, lint, build]
-    uses: ./.github/workflows/e2e-embed-react.yml
-    secrets: inherit
-
-  required:
-    needs: [changes, lint, build, e2e, e2e-app-store, e2e-embed, e2e-embed-react]
-    if: always()
-    runs-on: buildjet-2vcpu-ubuntu-2204
-    steps:
-      - name: fail if conditional jobs failed
-        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled')
-        run: exit 1

.github/workflows/production-build-without-database.yml

@@ -2,6 +2,9 @@ name: Production Builds
 on:
   workflow_call:
 
+permissions:
+  contents: read
+
 env:
   ALLOWED_HOSTNAMES: ${{ vars.CI_ALLOWED_HOSTNAMES }}
   CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}

.github/workflows/publish-report.yml

@@ -0,0 +1,96 @@
+on:
+  workflow_call:
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+jobs:
+  publish-report:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      # Unique URL path for each workflow run attempt
+      HTML_REPORT_URL_PATH: reports/${{ github.head_ref }}/${{ github.run_id }}/${{ github.run_attempt }}
+      BRANCH_REPORTS_DIR: reports/${{ github.head_ref }}
+    steps:
+      - name: Checkout GitHub Pages Branch
+        uses: actions/checkout@v4
+        with:
+          ref: gh-pages
+      - name: Set Git User
+        # see: https://github.com/actions/checkout/issues/13#issuecomment-724415212
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+      - name: Check for workflow reports
+        run: |
+          if [ -z "$(ls -A $BRANCH_REPORTS_DIR)" ]; then
+            echo "BRANCH_REPORTS_EXIST="false"" >> $GITHUB_ENV
+          else
+            echo "BRANCH_REPORTS_EXIST="true"" >> $GITHUB_ENV
+          fi
+      - name: Cleanup old HTML reports
+        if: ${{ env.BRANCH_REPORTS_EXIST == 'true' }}
+        timeout-minutes: 3
+        run: |
+          rm -rf $BRANCH_REPORTS_DIR
+          git add .
+          git commit -m "workflow: remove all reports for branch ${{ github.head_ref }}"
+      - name: Download zipped HTML report
+        uses: actions/download-artifact@v4
+        with:
+          name: html-report--attempt-${{ github.run_number }}-${{ github.run_attempt }}
+          path: ${{ env.HTML_REPORT_URL_PATH }}
+      - name: Push HTML Report
+        timeout-minutes: 3
+        # commit report, then try push-rebase-loop until it's able to merge the HTML report to the gh-pages branch
+        # this is necessary when this job running at least twice at the same time (e.g. through two pushes at the same time)
+        run: |
+          git add .
+          git commit -m "workflow: add HTML report for run-id ${{ github.run_id }} (attempt:  ${{ github.run_attempt }})"
+
+          while true; do
+            git pull --rebase
+            if [ $? -ne 0 ]; then
+              echo "Failed to rebase. Please review manually."
+              exit 1
+            fi
+
+            git push
+            if [ $? -eq 0 ]; then
+              echo "Successfully pushed HTML report to repo."
+              exit 0
+            fi
+          done
+      - name: Output Report URL as Workflow Annotation
+        id: url
+        run: |
+          FULL_HTML_REPORT_URL=https://calcom.github.io/cal.com/$HTML_REPORT_URL_PATH
+          echo "::notice title=📋 Published Playwright Test Report::$FULL_HTML_REPORT_URL"
+          echo "link=$FULL_HTML_REPORT_URL" >> $GITHUB_OUTPUT
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: <!-- GENERATED-E2E-RESULTS -->
+      - name: Create comment
+        if: steps.fc.outputs.comment-id == ''
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            <!-- GENERATED-E2E-RESULTS -->
+            ## E2E results are ready!
+            - [Workflow #${{ github.run_number }}.${{ github.run_attempt }} latest results](${{ steps.url.outputs.link }})
+      - name: Update comment
+        if: steps.fc.outputs.comment-id != ''
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace
+          body: |
+            <!-- GENERATED-E2E-RESULTS -->
+            ## E2E results are ready!
+            - [Workflow #${{ github.run_number }}.${{ github.run_attempt }} latest results](${{ steps.url.outputs.link }})

.github/workflows/semantic-pull-requests.yml

@@ -37,12 +37,3 @@ jobs:
             ```
             ${{ steps.lint_pr_title.outputs.error_message }}
             ```
-
-      # Delete a previous comment when the issue has been resolved
-      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@v2
-        with:
-          header: pr-title-lint-error
-          message: |
-            Thank you for following the naming conventions! 🙏 Feel free to join our [discord](https://go.cal.com/discord) and post your PR link.           
-

.github/workflows/unit-tests.yml

@@ -1,9 +1,8 @@
 name: Unit
 on:
   workflow_call:
-  workflow_run:
-    workflows: [Crowdin Action]
-    types: [completed]
+permissions:
+  contents: read
 jobs:
   test:
     name: Unit
@@ -13,7 +12,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
-      # Should be an 8GB machine as per https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
       - run: yarn test
       # We could add different timezones here that we need to run our tests in
       - run: TZ=America/Los_Angeles yarn test -- --timeZoneDependentTestsOnly
+      - name: Run API v2 tests
+        working-directory: apps/api/v2
+        run: |
+          export NODE_OPTIONS="--max_old_space_size=8192"
+          yarn test

.github/workflows/yarn-install.yml

@@ -3,6 +3,9 @@ name: Yarn install
 on:
   workflow_call:
 
+permissions:
+  contents: read
+
 jobs:
   setup:
     name: Yarn install & cache
@@ -12,3 +15,4 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
+      - uses: ./.github/actions/yarn-playwright-install

CONTRIBUTING.md

@@ -74,7 +74,7 @@ branch are tagged into a release monthly.
 
 To develop locally:
 
-1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your
+1. [Fork](https://github.com/calcom/cal.com/fork/) this repository to your
    own GitHub account and then
    [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:
@@ -99,7 +99,7 @@ To develop locally:
 
    - Duplicate `.env.example` to `.env`.
    - Use `openssl rand -base64 32` to generate a key and add it under `NEXTAUTH_SECRET` in the `.env` file.
-   - Use `openssl rand -base64 24` to generate a key and add it under `CALENDSO_ENCRYPTION_KEY` in the `.env` file.
+   - Use `openssl rand -base64 32` to generate a key and add it under `CALENDSO_ENCRYPTION_KEY` in the `.env` file.
 
 6. Setup Node
    If your Node version does not meet the project's requirements as instructed by the docs, "nvm" (Node Version Manager) allows using Node at the version required by the project:

apps/ai/.env.example

@@ -1,21 +0,0 @@
-BACKEND_URL=http://localhost:3002/api
-# BACKEND_URL=https://api.cal.com/v1
-FRONTEND_URL=http://localhost:3000
-# FRONTEND_URL=https://cal.com
-
-APP_ID=cal-ai
-APP_URL=http://localhost:3000/apps/cal-ai
-
-# This is for the onboard route. Which domain should we send emails from?
-SENDER_DOMAIN=cal.ai
-
-# Used to verify requests from sendgrid. You can generate a new one with: `openssl rand -hex 32`
-PARSE_KEY=
-
-OPENAI_API_KEY=
-
-# Optionally trace completions at https://smith.langchain.com
-# LANGCHAIN_TRACING_V2=true
-# LANGCHAIN_ENDPOINT=
-# LANGCHAIN_API_KEY=
-# LANGCHAIN_PROJECT=

apps/ai/README.md

@@ -1,68 +0,0 @@
-# Cal.ai
-
-Welcome to [Cal.ai](https://cal.ai)!
-
-This app lets you chat with your calendar via email:
-
-- Turn informal emails into bookings eg. forward "wanna meet tmrw at 2pm?"
-- List and rearrange your bookings eg. "clear my afternoon"
-- Answer basic questions about your busiest times eg. "how does my Tuesday look?"
-
-The core logic is contained in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts). Here, a [LangChain Agent Executor](https://docs.langchain.com/docs/components/agents/agent-executor) is tasked with following your instructions. Given your last-known timezone, working hours, and busy times, it attempts to CRUD your bookings.
-
-_The AI agent can only choose from a set of tools, without ever seeing your API key._
-
-Emails are cleaned and routed in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts) using [MailParser](https://nodemailer.com/extras/mailparser/).
-
-Incoming emails are routed by email address. Addresses are verified by [DKIM record](https://support.google.com/a/answer/174124?hl=en), making them hard to spoof.
-
-## Recognition
-
-<a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-cal&#0045;ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=419860&theme=light&period=daily" alt="Cal&#0046;ai - World&#0039;s&#0032;first&#0032;open&#0032;source&#0032;AI&#0032;scheduling&#0032;assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cal&#0045;ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=419860&theme=light" alt="Cal&#0046;ai - World&#0039;s&#0032;first&#0032;open&#0032;source&#0032;AI&#0032;scheduling&#0032;assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
-## Getting Started
-
-### Development
-
-If you haven't yet, please run the [root setup](/README.md) steps.
-
-Before running the app, please see [env.mjs](./src/env.mjs) for all required environment variables. Run `cp .env.example .env` in this folder to get started. You'll need:
-
-- An [OpenAI API key](https://platform.openai.com/account/api-keys) with access to GPT-4
-- A [SendGrid API key](https://app.sendgrid.com/settings/api_keys)
-- A default sender email (for example, `me@dev.example.com`)
-- The Cal.ai app's ID and URL (see [add.ts](/packages/app-store/cal-ai/api/index.ts))
-- A unique value for `PARSE_KEY` with `openssl rand -hex 32`
-
-To stand up the API and AI apps simultaneously, simply run `yarn dev:ai`.
-
-### Agent Architecture
-
-The scheduling agent in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts) calls an LLM (in this case, GPT-4) in a loop to accomplish a multi-step task. We use an [OpenAI Functions agent](https://js.langchain.com/docs/modules/agents/agent_types/openai_functions_agent), which is fine-tuned to output text suited for passing to tools.
-
-Tools (eg. [`createBooking`](/apps/ai/src/tools/createBooking.ts)) are simply JavaScript methods wrapped by Zod schemas, telling the agent what format to output.
-
-Here is the full architecture:
-
-![Cal.ai architecture](/apps/ai/src/public/architecture.png)
-
-### Email Router
-
-To expose the AI app, you can use either [Tunnelmole](https://github.com/robbie-cahill/tunnelmole-client), an open source tunnelling tool; or [nGrok](https://ngrok.com/), a popular closed source tunnelling tool. 
-
-For Tunnelmole, run `tmole 3005` (or the AI app's port number) in a new terminal. Please replace `3005` with the port number if it is different. In the output, you'll see two URLs, one http and a https (we recommend using the https url for privacy and security). To install Tunnelmole, use `curl -O https://install.tunnelmole.com/8dPBw/install && sudo bash install`. (On Windows, download [tmole.exe](https://tunnelmole.com/downloads/tmole.exe))
-
-For nGrok, run `ngrok http 3005` (or the AI app's port number) in a new terminal. You may need to install nGrok first.
-
-To forward incoming emails to the serverless function at `/agent`, we use [SendGrid's Inbound Parse](https://docs.sendgrid.com/for-developers/parsing-email/setting-up-the-inbound-parse-webhook).
-
-1.  Ensure you have a [SendGrid account](https://signup.sendgrid.com/)
-2.  Ensure you have an authenticated domain. Go to Settings > Sender Authentication > Authenticate. For DNS host, select `I'm not sure`. Click Next and add your domain, eg. `example.com`. Choose Manual Setup. You'll be given three CNAME records to add to your DNS settings, eg. in [Vercel Domains](https://vercel.com/dashboard/domains). After adding those records, click Verify. To troubleshoot, see the [full instructions](https://docs.sendgrid.com/ui/account-and-settings/how-to-set-up-domain-authentication).
-3.  Authorize your domain for email with MX records: one with name `[your domain].com` and value `mx.sendgrid.net.`, and another with name `bounces.[your domain].com` and value `feedback-smtp.us-east-1.amazonses.com`. Set the priority to `10` if prompted.
-4.  Go to Settings > [Inbound Parse](https://app.sendgrid.com/settings/parse) > Add Host & URL. Choose your authenticated domain.
-5.  In the Destination URL field, use the Tunnelmole or ngrok URL from above along with the path, `/api/receive`, and one param, `parseKey`, which lives in [this app's .env](/apps/ai/.env.example) under `PARSE_KEY`. The full URL should look like `https://abc.tunnelmole.net/api/receive?parseKey=ABC-123` or `https://abc.ngrok.io/api/receive?parseKey=ABC-123`.
-6.  Activate "POST the raw, full MIME message".
-7.  Send an email to `[anyUsername]@example.com`. You should see a ping on the Tunnelmole or ngrok listener and server.
-8.  Adjust the logic in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts), save to hot-reload, and send another email to test the behaviour.
-
-Please feel free to improve any part of this architecture!

apps/ai/next-env.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.

apps/ai/next.config.js

@@ -1,24 +0,0 @@
-const withBundleAnalyzer = require("@next/bundle-analyzer");
-
-const plugins = [];
-plugins.push(withBundleAnalyzer({ enabled: process.env.ANALYZE === "true" }));
-
-/** @type {import("next").NextConfig} */
-const nextConfig = {
-  async redirects() {
-    return [
-      {
-        source: "/",
-        destination: "https://cal.com/ai",
-        permanent: true,
-      },
-    ];
-  },
-  i18n: {
-    defaultLocale: "en",
-    locales: ["en"],
-  },
-  reactStrictMode: true,
-};
-
-module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);

apps/ai/package.json

@@ -1,28 +0,0 @@
-{
-  "name": "@calcom/ai",
-  "version": "1.2.1",
-  "private": true,
-  "author": "Cal.com Inc.",
-  "dependencies": {
-    "@calcom/prisma": "*",
-    "@langchain/core": "^0.1.26",
-    "@langchain/openai": "^0.0.14",
-    "@t3-oss/env-nextjs": "^0.6.1",
-    "langchain": "^0.1.17",
-    "mailparser": "^3.6.5",
-    "next": "^13.5.4",
-    "supports-color": "8.1.1",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@types/mailparser": "^3.4.0"
-  },
-  "scripts": {
-    "build": "next build",
-    "dev": "next dev -p 3005",
-    "format": "npx prettier . --write",
-    "lint": "eslint . --ext .ts,.js,.tsx,.jsx",
-    "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
-    "start": "next start"
-  }
-}

apps/ai/src/app/api/agent/route.ts

@@ -1,55 +0,0 @@
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-
-import agent from "../../../utils/agent";
-import sendEmail from "../../../utils/sendEmail";
-import { verifyParseKey } from "../../../utils/verifyParseKey";
-
-// Allow agent loop to run for up to 5 minutes
-export const maxDuration = 300;
-
-/**
- * Launches a LangChain agent to process an incoming email,
- * then sends the response to the user.
- */
-export const POST = async (request: NextRequest) => {
-  const verified = verifyParseKey(request.url);
-
-  if (!verified) {
-    return new NextResponse("Unauthorized", { status: 401 });
-  }
-
-  const json = await request.json();
-
-  const { apiKey, userId, message, subject, user, users, replyTo: agentEmail } = json;
-
-  if ((!message && !subject) || !user) {
-    return new NextResponse("Missing fields", { status: 400 });
-  }
-
-  try {
-    const response = await agent(`${subject}\n\n${message}`, { ...user }, users, apiKey, userId, agentEmail);
-
-    // Send response to user
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: response.replace(/(?:\r\n|\r|\n)/g, "\n"),
-      to: user.email,
-      from: agentEmail,
-    });
-
-    return new NextResponse("ok");
-  } catch (error) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! We're experiencing high demand and can't currently process your request. Please try again later.",
-      to: user.email,
-      from: agentEmail,
-    });
-
-    return new NextResponse(
-      (error as Error).message || "Something went wrong. Please try again or reach out for help.",
-      { status: 500 }
-    );
-  }
-};

apps/ai/src/app/api/onboard/route.ts

@@ -1,44 +0,0 @@
-import type { NextRequest } from "next/server";
-
-import prisma from "@calcom/prisma";
-
-import { env } from "../../../env.mjs";
-import sendEmail from "../../../utils/sendEmail";
-
-export const POST = async (request: NextRequest) => {
-  const { userId } = await request.json();
-
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-      name: true,
-      username: true,
-    },
-    where: {
-      id: userId,
-    },
-  });
-
-  if (!user) {
-    return new Response("User not found", { status: 404 });
-  }
-
-  await sendEmail({
-    subject: "Welcome to Cal AI",
-    to: user.email,
-    from: `${user.username}@${env.SENDER_DOMAIN}`,
-    text: `Hi ${
-      user.name || `@${user.username}`
-    },\n\nI'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.\n\nHere are some things you can ask me:\n\n- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)\n- "What meetings do I have today?" (I'll show you your schedule)\n- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)\n\nI'm still learning, so if you have any feedback, please tweet it to @calcom!\n\nRemember, you can always reach me here, at ${
-      user.username
-    }@${
-      env.SENDER_DOMAIN
-    }.\n\nLooking forward to working together (:\n\n- Cal AI, Your personal booking assistant`,
-    html: `Hi ${
-      user.name || `@${user.username}`
-    },<br><br>I'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.<br><br>Here are some things you can ask me:<br><br>- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)<br>- "What meetings do I have today?" (I'll show you your schedule)<br>- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)<br><br>I'm still learning, so if you have any feedback, please send it to <a href="https://twitter.com/calcom">@calcom</a> on X!<br><br>Remember, you can always reach me here, at ${
-      user.username
-    }@${env.SENDER_DOMAIN}.<br><br>Looking forward to working together (:<br><br>- Cal AI`,
-  });
-  return new Response("OK", { status: 200 });
-};

apps/ai/src/app/api/receive/route.ts

@@ -1,186 +0,0 @@
-import type { ParsedMail, Source } from "mailparser";
-import { simpleParser } from "mailparser";
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-
-import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
-import prisma from "@calcom/prisma";
-
-import { env } from "../../../env.mjs";
-import { fetchAvailability } from "../../../tools/getAvailability";
-import { fetchEventTypes } from "../../../tools/getEventTypes";
-import { extractUsers } from "../../../utils/extractUsers";
-import getHostFromHeaders from "../../../utils/host";
-import now from "../../../utils/now";
-import sendEmail from "../../../utils/sendEmail";
-import { verifyParseKey } from "../../../utils/verifyParseKey";
-
-// Allow receive loop to run for up to 30 seconds
-// Why so long? the rate determining API call (getAvailability, getEventTypes) can take up to 15 seconds at peak times so we give it a little extra time to complete.
-export const maxDuration = 30;
-
-/**
- * Verifies email signature and app authorization,
- * then hands off to booking agent.
- */
-export const POST = async (request: NextRequest) => {
-  const verified = verifyParseKey(request.url);
-
-  if (!verified) {
-    return new NextResponse("Unauthorized", { status: 401 });
-  }
-
-  const formData = await request.formData();
-  const body = Object.fromEntries(formData);
-  const envelope = JSON.parse(body.envelope as string);
-
-  const aiEmail = envelope.to[0];
-  const subject = body.subject || "";
-
-  try {
-    await checkRateLimitAndThrowError({
-      identifier: `ai:email:${envelope.from}`,
-      rateLimitingType: "ai",
-    });
-  } catch (error) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! You've reached your daily limit. Please try again tomorrow.",
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("Exceeded rate limit", { status: 200 }); // Don't return 429 to avoid triggering retry logic in SendGrid
-  }
-
-  // Parse email from mixed MIME type
-  const parsed: ParsedMail = await simpleParser(body.email as Source);
-
-  if (!parsed.text && !parsed.subject) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! It looks like you forgot to include a message. Please try again.",
-      to: envelope.from,
-      from: aiEmail,
-    });
-    return new NextResponse("Email missing text and subject", { status: 400 });
-  }
-
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-      id: true,
-      username: true,
-      timeZone: true,
-      credentials: {
-        select: {
-          appId: true,
-          key: true,
-        },
-      },
-    },
-    where: { email: envelope.from },
-  });
-
-  // body.dkim looks like {@domain-com.22222222.gappssmtp.com : pass}
-  const signature = (body.dkim as string).includes(" : pass");
-
-  // User is not a cal.com user or is using an unverified email.
-  if (!signature || !user) {
-    await sendEmail({
-      html: `Thanks for your interest in Cal.ai! To get started, Make sure you have a <a href="https://cal.com/signup" target="_blank">cal.com</a> account with this email address and then install Cal.ai here: <a href="https://go.cal.com/ai" target="_blank">go.cal.com/ai</a>.`,
-      subject: `Re: ${subject}`,
-      text: `Thanks for your interest in Cal.ai! To get started, Make sure you have a cal.com account with this email address. You can sign up for an account at: https://cal.com/signup`,
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("ok");
-  }
-
-  const credential = user.credentials.find((c) => c.appId === env.APP_ID)?.key;
-
-  // User has not installed the app from the app store. Direct them to install it.
-  if (!(credential as { apiKey: string })?.apiKey) {
-    const url = env.APP_URL;
-
-    await sendEmail({
-      html: `Thanks for using Cal.ai! To get started, the app must be installed. <a href=${url} target="_blank">Click this link</a> to install it.`,
-      subject: `Re: ${subject}`,
-      text: `Thanks for using Cal.ai! To get started, the app must be installed. Click this link to install the Cal.ai app: ${url}`,
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("ok");
-  }
-
-  const { apiKey } = credential as { apiKey: string };
-
-  // Pre-fetch data relevant to most bookings.
-  const [eventTypes, availability, users] = await Promise.all([
-    fetchEventTypes({
-      apiKey,
-    }),
-    fetchAvailability({
-      apiKey,
-      userId: user.id,
-      dateFrom: now(user.timeZone),
-      dateTo: now(user.timeZone),
-    }),
-    extractUsers(`${parsed.text} ${parsed.subject}`),
-  ]);
-
-  if ("error" in availability) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Sorry, there was an error fetching your availability. Please try again.",
-      to: user.email,
-      from: aiEmail,
-    });
-    console.error(availability.error);
-    return new NextResponse("Error fetching availability. Please try again.", { status: 400 });
-  }
-
-  if ("error" in eventTypes) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Sorry, there was an error fetching your event types. Please try again.",
-      to: user.email,
-      from: aiEmail,
-    });
-    console.error(eventTypes.error);
-    return new NextResponse("Error fetching event types. Please try again.", { status: 400 });
-  }
-
-  const { workingHours } = availability;
-
-  const appHost = getHostFromHeaders(request.headers);
-
-  // Hand off to long-running agent endpoint to handle the email. (don't await)
-  fetch(`${appHost}/api/agent?parseKey=${env.PARSE_KEY}`, {
-    body: JSON.stringify({
-      apiKey,
-      userId: user.id,
-      message: parsed.text || "",
-      subject: parsed.subject || "",
-      replyTo: aiEmail,
-      user: {
-        email: user.email,
-        eventTypes,
-        username: user.username,
-        timeZone: user.timeZone,
-        workingHours,
-      },
-      users,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-  });
-
-  await new Promise((r) => setTimeout(r, 1000));
-
-  return new NextResponse("ok");
-};

apps/ai/src/env.mjs

@@ -1,47 +0,0 @@
-import { createEnv } from "@t3-oss/env-nextjs";
-import { z } from "zod";
-
-export const env = createEnv({
-  /**
-   * Specify your client-side environment variables schema here. This way you can ensure the app
-   * isn't built with invalid env vars. To expose them to the client, prefix them with
-   * `NEXT_PUBLIC_`.
-   */
-  client: {
-    // NEXT_PUBLIC_CLIENTVAR: z.string().min(1),
-  },
-
-  /**
-   * You can't destruct `process.env` as a regular object in the Next.js edge runtimes (e.g.
-   * middlewares) or client-side so we need to destruct manually.
-   */
-  runtimeEnv: {
-    BACKEND_URL: process.env.BACKEND_URL,
-    FRONTEND_URL: process.env.FRONTEND_URL,
-    APP_ID: process.env.APP_ID,
-    APP_URL: process.env.APP_URL,
-    SENDER_DOMAIN: process.env.SENDER_DOMAIN,
-    PARSE_KEY: process.env.PARSE_KEY,
-    NODE_ENV: process.env.NODE_ENV,
-    OPENAI_API_KEY: process.env.OPENAI_API_KEY,
-    SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
-    DATABASE_URL: process.env.DATABASE_URL,
-  },
-
-  /**
-   * Specify your server-side environment variables schema here. This way you can ensure the app
-   * isn't built with invalid env vars.
-   */
-  server: {
-    BACKEND_URL: z.string().url(),
-    FRONTEND_URL: z.string().url(),
-    APP_ID: z.string().min(1),
-    APP_URL: z.string().url(),
-    SENDER_DOMAIN: z.string().min(1),
-    PARSE_KEY: z.string().min(1),
-    NODE_ENV: z.enum(["development", "test", "production"]),
-    OPENAI_API_KEY: z.string().min(1),
-    SENDGRID_API_KEY: z.string().min(1),
-    DATABASE_URL: z.string().url(),
-  },
-});

apps/ai/src/tools/createBooking.ts

@@ -1,121 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import type { UserList } from "~/src/types/user";
-
-import { env } from "../env.mjs";
-
-/**
- * Creates a booking for a user by event type, times, and timezone.
- */
-const createBooking = async ({
-  apiKey,
-  userId,
-  users,
-  eventTypeId,
-  start,
-  end,
-  timeZone,
-  language,
-  invite,
-}: {
-  apiKey: string;
-  userId: number;
-  users: UserList;
-  eventTypeId: number;
-  start: string;
-  end: string;
-  timeZone: string;
-  language: string;
-  invite: number;
-  title?: string;
-  status?: string;
-}): Promise<string | Error | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
-
-  const user = users.find((u) => u.id === invite);
-
-  if (!user) {
-    return { error: `User with id ${invite} not found to invite` };
-  }
-
-  const responses = {
-    id: invite.toString(),
-    name: user.username,
-    email: user.email,
-  };
-
-  const response = await fetch(url, {
-    body: JSON.stringify({
-      end,
-      eventTypeId,
-      language,
-      metadata: {},
-      responses,
-      start,
-      timeZone,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-  });
-
-  // Let GPT handle this. This will happen when wrong event type id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return {
-      error: data.message,
-    };
-  }
-
-  return "Booking created";
-};
-
-const createBookingTool = (apiKey: string, userId: number, users: UserList) => {
-  return new DynamicStructuredTool({
-    description: "Creates a booking on the primary user's calendar.",
-    func: async ({ eventTypeId, start, end, timeZone, language, invite, title, status }) => {
-      return JSON.stringify(
-        await createBooking({
-          apiKey,
-          userId,
-          users,
-          end,
-          eventTypeId,
-          language,
-          invite,
-          start,
-          status,
-          timeZone,
-          title,
-        })
-      );
-    },
-    name: "createBooking",
-    schema: z.object({
-      end: z
-        .string()
-        .describe("This should correspond to the event type's length, unless otherwise specified."),
-      eventTypeId: z.number(),
-      language: z.string(),
-      invite: z.number().describe("External user id to invite."),
-      start: z.string(),
-      status: z.string().optional().describe("ACCEPTED, PENDING, CANCELLED or REJECTED"),
-      timeZone: z.string(),
-      title: z.string().optional(),
-    }),
-  });
-};
-
-export default createBookingTool;

apps/ai/src/tools/deleteBooking.ts

@@ -1,66 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-
-/**
- * Cancels a booking for a user by ID with reason.
- */
-const cancelBooking = async ({
-  apiKey,
-  id,
-  reason,
-}: {
-  apiKey: string;
-  id: string;
-  reason: string;
-}): Promise<string | { error: string }> => {
-  const params = {
-    apiKey,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings/${id}/cancel?${urlParams.toString()}`;
-
-  const response = await fetch(url, {
-    body: JSON.stringify({ reason }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "DELETE",
-  });
-
-  // Let GPT handle this. This will happen when wrong booking id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return "Booking cancelled";
-};
-
-const cancelBookingTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Cancel a booking",
-    func: async ({ id, reason }) => {
-      return JSON.stringify(
-        await cancelBooking({
-          apiKey,
-          id,
-          reason,
-        })
-      );
-    },
-    name: "cancelBooking",
-    schema: z.object({
-      id: z.string(),
-      reason: z.string(),
-    }),
-  });
-};
-
-export default cancelBookingTool;

apps/ai/src/tools/getAvailability.ts

@@ -1,77 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { Availability } from "../types/availability";
-
-/**
- * Fetches availability for a user by date range and event type.
- */
-export const fetchAvailability = async ({
-  apiKey,
-  userId,
-  dateFrom,
-  dateTo,
-}: {
-  apiKey: string;
-  userId: number;
-  dateFrom: string;
-  dateTo: string;
-}): Promise<Partial<Availability> | { error: string }> => {
-  const params: { [k: string]: string } = {
-    apiKey,
-    userId: userId.toString(),
-    dateFrom,
-    dateTo,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/availability?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return {
-    busy: data.busy,
-    dateRanges: data.dateRanges,
-    timeZone: data.timeZone,
-    workingHours: data.workingHours,
-  };
-};
-
-const getAvailabilityTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Get availability of users within range.",
-    func: async ({ userIds, dateFrom, dateTo }) => {
-      return JSON.stringify(
-        await Promise.all(
-          userIds.map(
-            async (userId) =>
-              await fetchAvailability({
-                userId: userId,
-                apiKey,
-                dateFrom,
-                dateTo,
-              })
-          )
-        )
-      );
-    },
-    name: "getAvailability",
-    schema: z.object({
-      userIds: z.array(z.number()).describe("The users to fetch availability for."),
-      dateFrom: z.string(),
-      dateTo: z.string(),
-    }),
-  });
-};
-
-export default getAvailabilityTool;

apps/ai/src/tools/getBookings.ts

@@ -1,75 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { Booking } from "../types/booking";
-import { BOOKING_STATUS } from "../types/booking";
-
-/**
- * Fetches bookings for a user by date range.
- */
-const fetchBookings = async ({
-  apiKey,
-  userId,
-  from,
-  to,
-}: {
-  apiKey: string;
-  userId: number;
-  from: string;
-  to: string;
-}): Promise<Booking[] | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-    dateFrom: from,
-    dateTo: to,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  const bookings: Booking[] = data.bookings
-    .filter((booking: Booking) => {
-      const notCancelled = booking.status !== BOOKING_STATUS.CANCELLED;
-
-      return notCancelled;
-    })
-    .map(({ endTime, eventTypeId, id, startTime, status, title }: Booking) => ({
-      endTime,
-      eventTypeId,
-      id,
-      startTime,
-      status,
-      title,
-    }));
-
-  return bookings;
-};
-
-const getBookingsTool = (apiKey: string, userId: number) => {
-  return new DynamicStructuredTool({
-    description: "Get bookings for the primary user between two dates.",
-    func: async ({ from, to }) => {
-      return JSON.stringify(await fetchBookings({ apiKey, userId, from, to }));
-    },
-    name: "getBookings",
-    schema: z.object({
-      from: z.string().describe("ISO 8601 datetime string"),
-      to: z.string().describe("ISO 8601 datetime string"),
-    }),
-  });
-};
-
-export default getBookingsTool;

apps/ai/src/tools/getEventTypes.ts

@@ -1,59 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { EventType } from "../types/eventType";
-
-/**
- * Fetches event types by user ID.
- */
-export const fetchEventTypes = async ({ apiKey, userId }: { apiKey: string; userId?: number }) => {
-  const params: Record<string, string> = {
-    apiKey,
-  };
-
-  if (userId) {
-    params["userId"] = userId.toString();
-  }
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/event-types?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return data.event_types.map((eventType: EventType) => ({
-    id: eventType.id,
-    slug: eventType.slug,
-    length: eventType.length,
-    title: eventType.title,
-  }));
-};
-
-const getEventTypesTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Get a user's event type IDs. Usually necessary to book a meeting.",
-    func: async ({ userId }) => {
-      return JSON.stringify(
-        await fetchEventTypes({
-          apiKey,
-          userId,
-        })
-      );
-    },
-    name: "getEventTypes",
-    schema: z.object({
-      userId: z.number().optional().describe("The user ID. Defaults to the primary user's ID."),
-    }),
-  });
-};
-
-export default getEventTypesTool;

apps/ai/src/tools/sendBookingEmail.ts

@@ -1,124 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "~/src/env.mjs";
-import type { User, UserList } from "~/src/types/user";
-import sendEmail from "~/src/utils/sendEmail";
-
-export const sendBookingEmail = async ({
-  user,
-  agentEmail,
-  subject,
-  to,
-  message,
-  eventTypeSlug,
-  slots,
-  date,
-}: {
-  apiKey: string;
-  user: User;
-  users: UserList;
-  agentEmail: string;
-  subject: string;
-  to: string;
-  message: string;
-  eventTypeSlug: string;
-  slots?: {
-    time: string;
-    text: string;
-  }[];
-  date: {
-    date: string;
-    text: string;
-  };
-}) => {
-  // const url = `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date}`;
-  const timeUrls = slots?.map(({ time, text }) => {
-    return {
-      url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?slot=${time}`,
-      text,
-    };
-  });
-
-  const dateUrl = {
-    url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date.date}`,
-    text: date.text,
-  };
-
-  await sendEmail({
-    subject,
-    to,
-    cc: user.email,
-    from: agentEmail,
-    text: message
-      .split("[[[Slots]]]")
-      .join(timeUrls?.map(({ url, text }) => `${text}: ${url}`).join("\n"))
-      .split("[[[Link]]]")
-      .join(`${dateUrl.text}: ${dateUrl.url}`),
-    html: message
-      .split("\n")
-      .join("<br>")
-      .split("[[[Slots]]]")
-      .join(timeUrls?.map(({ url, text }) => `<a href="${url}">${text}</a>`).join("<br>"))
-      .split("[[[Link]]]")
-      .join(`<a href="${dateUrl.url}">${dateUrl.text}</a>`),
-  });
-
-  return "Booking link sent";
-};
-
-const sendBookingEmailTool = (apiKey: string, user: User, users: UserList, agentEmail: string) => {
-  return new DynamicStructuredTool({
-    description:
-      "Send a booking link via email. Useful for scheduling with non cal users. Be confident, suggesting a good date/time with a fallback to a link to select a date/time.",
-    func: async ({ message, subject, to, eventTypeSlug, slots, date }) => {
-      return JSON.stringify(
-        await sendBookingEmail({
-          apiKey,
-          user,
-          users,
-          agentEmail,
-          subject,
-          to,
-          message,
-          eventTypeSlug,
-          slots,
-          date,
-        })
-      );
-    },
-    name: "sendBookingEmail",
-
-    schema: z.object({
-      message: z
-        .string()
-        .describe(
-          "A polite and professional email with an intro and signature at the end. Specify you are the AI booking assistant of the primary user. Use [[[Slots]]] and a fallback [[[Link]]] to inject good times and 'see all times' into messages"
-        ),
-      subject: z.string(),
-      to: z
-        .string()
-        .describe("email address to send the booking link to. Primary user is automatically CC'd"),
-      eventTypeSlug: z.string().describe("the slug of the event type to book"),
-      slots: z
-        .array(
-          z.object({
-            time: z.string().describe("YYYY-MM-DDTHH:mm in UTC"),
-            text: z.string().describe("minimum readable label. Ex. 4pm."),
-          })
-        )
-        .optional()
-        .describe("Time slots the external user can click"),
-      date: z
-        .object({
-          date: z.string().describe("YYYY-MM-DD"),
-          text: z.string().describe('"See all times" or similar'),
-        })
-        .describe(
-          "A booking link that allows the external user to select a date / time. Should be a fallback to time slots"
-        ),
-    }),
-  });
-};
-
-export default sendBookingEmailTool;

apps/ai/src/tools/updateBooking.ts

@@ -1,85 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-
-/**
- * Edits a booking for a user by booking ID with new times, title, description, or status.
- */
-const editBooking = async ({
-  apiKey,
-  userId,
-  id,
-  startTime, // In the docs it says start, but it's startTime: https://cal.com/docs/enterprise-features/api/api-reference/bookings#edit-an-existing-booking.
-  endTime, // Same here: it says end but it's endTime.
-  title,
-  description,
-  status,
-}: {
-  apiKey: string;
-  userId: number;
-  id: string;
-  startTime?: string;
-  endTime?: string;
-  title?: string;
-  description?: string;
-  status?: string;
-}): Promise<string | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-  };
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings/${id}?${urlParams.toString()}`;
-
-  const response = await fetch(url, {
-    body: JSON.stringify({ description, endTime, startTime, status, title }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "PATCH",
-  });
-
-  // Let GPT handle this. This will happen when wrong booking id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return "Booking edited";
-};
-
-const editBookingTool = (apiKey: string, userId: number) => {
-  return new DynamicStructuredTool({
-    description: "Edit a booking",
-    func: async ({ description, endTime, id, startTime, status, title }) => {
-      return JSON.stringify(
-        await editBooking({
-          apiKey,
-          userId,
-          description,
-          endTime,
-          id,
-          startTime,
-          status,
-          title,
-        })
-      );
-    },
-    name: "editBooking",
-    schema: z.object({
-      description: z.string().optional(),
-      endTime: z.string().optional(),
-      id: z.string(),
-      startTime: z.string().optional(),
-      status: z.string().optional(),
-      title: z.string().optional(),
-    }),
-  });
-};
-
-export default editBookingTool;

apps/ai/src/types/availability.ts

@@ -1,25 +0,0 @@
-export type Availability = {
-  busy: {
-    start: string;
-    end: string;
-    title?: string;
-  }[];
-  timeZone: string;
-  dateRanges: {
-    start: string;
-    end: string;
-  }[];
-  workingHours: {
-    days: number[];
-    startTime: number;
-    endTime: number;
-    userId: number;
-  }[];
-  dateOverrides: {
-    date: string;
-    startTime: number;
-    endTime: number;
-    userId: number;
-  };
-  currentSeats: number;
-};

apps/ai/src/types/booking.ts

@@ -1,23 +0,0 @@
-export enum BOOKING_STATUS {
-  ACCEPTED = "ACCEPTED",
-  PENDING = "PENDING",
-  CANCELLED = "CANCELLED",
-  REJECTED = "REJECTED",
-}
-
-export type Booking = {
-  id: number;
-  userId: number;
-  description: string | null;
-  eventTypeId: number;
-  uid: string;
-  title: string;
-  startTime: string;
-  endTime: string;
-  attendees: { email: string; name: string; timeZone: string; locale: string }[] | null;
-  user: { email: string; name: string; timeZone: string; locale: string }[] | null;
-  payment: { id: number; success: boolean; paymentOption: string }[];
-  metadata: object | null;
-  status: BOOKING_STATUS;
-  responses: { email: string; name: string; location: string } | null;
-};

apps/ai/src/types/eventType.ts

@@ -1,13 +0,0 @@
-export type EventType = {
-  id: number;
-  title: string;
-  length: number;
-  metadata: object;
-  slug: string;
-  hosts: {
-    userId: number;
-    isFixed: boolean;
-  }[];
-  hidden: boolean;
-  // ...
-};

apps/ai/src/types/user.ts

@@ -1,18 +0,0 @@
-import type { EventType } from "./eventType";
-import type { WorkingHours } from "./workingHours";
-
-export type User = {
-  id: number;
-  email: string;
-  username: string;
-  timeZone: string;
-  eventTypes: EventType[];
-  workingHours: WorkingHours[];
-};
-
-export type UserList = {
-  id?: number;
-  email?: string;
-  username?: string;
-  type: "fromUsername" | "fromEmail";
-}[];

apps/ai/src/types/workingHours.ts

@@ -1,5 +0,0 @@
-export type WorkingHours = {
-  days: number[];
-  startTime: number;
-  endTime: number;
-};

apps/ai/src/utils/agent.ts

@@ -1,122 +0,0 @@
-import { ChatPromptTemplate } from "@langchain/core/prompts";
-import { ChatOpenAI } from "@langchain/openai";
-import { AgentExecutor, createOpenAIFunctionsAgent } from "langchain/agents";
-
-import { env } from "../env.mjs";
-import createBookingIfAvailable from "../tools/createBooking";
-import deleteBooking from "../tools/deleteBooking";
-import getAvailability from "../tools/getAvailability";
-import getBookings from "../tools/getBookings";
-import sendBookingEmail from "../tools/sendBookingEmail";
-import updateBooking from "../tools/updateBooking";
-import type { EventType } from "../types/eventType";
-import type { User, UserList } from "../types/user";
-import type { WorkingHours } from "../types/workingHours";
-import now from "./now";
-
-const gptModel = "gpt-4-0125-preview";
-
-/**
- * Core of the Cal.ai booking agent: a LangChain Agent Executor.
- * Uses a toolchain to book meetings, list available slots, etc.
- * Uses OpenAI functions to better enforce JSON-parsable output from the LLM.
- */
-const agent = async (
-  input: string,
-  user: User,
-  users: UserList,
-  apiKey: string,
-  userId: number,
-  agentEmail: string
-) => {
-  const tools = [
-    // getEventTypes(apiKey),
-    getAvailability(apiKey),
-    getBookings(apiKey, userId),
-    createBookingIfAvailable(apiKey, userId, users),
-    updateBooking(apiKey, userId),
-    deleteBooking(apiKey),
-    sendBookingEmail(apiKey, user, users, agentEmail),
-  ];
-
-  const model = new ChatOpenAI({
-    modelName: gptModel,
-    openAIApiKey: env.OPENAI_API_KEY,
-    temperature: 0,
-  });
-
-  /**
-   * Initialize the agent executor with arguments.
-   */
-  const prompt =
-    ChatPromptTemplate.fromTemplate(`You are Cal.ai - a bleeding edge scheduling assistant that interfaces via email.
-  Make sure your final answers are definitive, complete and well formatted.
-  Sometimes, tools return errors. In this case, try to handle the error intelligently or ask the user for more information.
-  Tools will always handle times in UTC, but times sent to users should be formatted per that user's timezone.
-  In responses to users, always summarize necessary context and open the door to follow ups. For example "I have booked your chat with @username for 3pm on Wednesday, December 20th, 2023 EST. Please let me know if you need to reschedule."
-  If you can't find a referenced user, ask the user for their email or @username. Make sure to specify that usernames require the @username format. Users don't know other users' userIds.
-  
-  The primary user's id is: ${userId}
-  The primary user's username is: ${user.username}
-  The current time in the primary user's timezone is: ${now(user.timeZone, {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-    hour: "numeric",
-    minute: "numeric",
-  })}
-  The primary user's time zone is: ${user.timeZone}
-  The primary user's event types are: ${user.eventTypes
-    .map((e: EventType) => `ID: ${e.id}, Slug: ${e.slug}, Title: ${e.title}, Length: ${e.length};`)
-    .join("\n")}
-  The primary user's working hours are: ${user.workingHours
-    .map(
-      (w: WorkingHours) =>
-        `Days: ${w.days.join(", ")}, Start Time (minutes in UTC): ${
-          w.startTime
-        }, End Time (minutes in UTC): ${w.endTime};`
-    )
-    .join("\n")}
-  ${
-    users.length
-      ? `The email references the following @usernames and emails: ${users
-          .map(
-            (u) =>
-              `${
-                (u.id ? `, id: ${u.id}` : "id: (non user)") +
-                (u.username
-                  ? u.type === "fromUsername"
-                    ? `, username: @${u.username}`
-                    : ", username: REDACTED"
-                  : ", (no username)") +
-                (u.email
-                  ? u.type === "fromEmail"
-                    ? `, email: ${u.email}`
-                    : ", email: REDACTED"
-                  : ", (no email)")
-              };`
-          )
-          .join("\n")}`
-      : ""
-  }`);
-  const agent = await createOpenAIFunctionsAgent({
-    llm: model,
-    prompt,
-    tools,
-  });
-
-  const executor = new AgentExecutor({
-    agent,
-    tools,
-    returnIntermediateSteps: env.NODE_ENV === "development",
-    verbose: env.NODE_ENV === "development",
-  });
-
-  const result = await executor.invoke({ input });
-  const { output } = result;
-
-  return output;
-};
-
-export default agent;

apps/ai/src/utils/context.ts

@@ -1 +0,0 @@
-export const context = { apiKey: "", userId: "" };

apps/ai/src/utils/extractUsers.ts

@@ -1,85 +0,0 @@
-import prisma from "@calcom/prisma";
-
-import type { UserList } from "../types/user";
-
-/*
- * Extracts usernames (@Example) and emails (hi@example.com) from a string
- */
-export const extractUsers = async (text: string) => {
-  const usernames = text
-    .match(/(?<![a-zA-Z0-9_.])@[a-zA-Z0-9_]+/g)
-    ?.map((username) => username.slice(1).toLowerCase());
-  const emails = text
-    .match(/[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+/g)
-    ?.map((email) => email.toLowerCase());
-
-  const dbUsersFromUsernames = usernames
-    ? await prisma.user.findMany({
-        select: {
-          id: true,
-          username: true,
-          email: true,
-        },
-        where: {
-          username: {
-            in: usernames,
-          },
-        },
-      })
-    : [];
-
-  const usersFromUsernames = usernames
-    ? usernames.map((username) => {
-        const user = dbUsersFromUsernames.find((u) => u.username === username);
-        return user
-          ? {
-              username,
-              id: user.id,
-              email: user.email,
-              type: "fromUsername",
-            }
-          : {
-              username,
-              id: null,
-              email: null,
-              type: "fromUsername",
-            };
-      })
-    : [];
-
-  const dbUsersFromEmails = emails
-    ? await prisma.user.findMany({
-        select: {
-          id: true,
-          email: true,
-          username: true,
-        },
-        where: {
-          email: {
-            in: emails,
-          },
-        },
-      })
-    : [];
-
-  const usersFromEmails = emails
-    ? emails.map((email) => {
-        const user = dbUsersFromEmails.find((u) => u.email === email);
-        return user
-          ? {
-              email,
-              id: user.id,
-              username: user.username,
-              type: "fromEmail",
-            }
-          : {
-              email,
-              id: null,
-              username: null,
-              type: "fromEmail",
-            };
-      })
-    : [];
-
-  return [...usersFromUsernames, ...usersFromEmails] as UserList;
-};

apps/ai/src/utils/host.ts

@@ -1,7 +0,0 @@
-import type { NextRequest } from "next/server";
-
-const getHostFromHeaders = (headers: NextRequest["headers"]): string => {
-  return `https://${headers.get("host")}`;
-};
-
-export default getHostFromHeaders;

apps/ai/src/utils/now.ts

@@ -1,6 +0,0 @@
-export default function now(timeZone: string, options: Intl.DateTimeFormatOptions = {}) {
-  return new Date().toLocaleString("en-US", {
-    timeZone,
-    ...options,
-  });
-}

apps/ai/src/utils/sendEmail.ts

@@ -1,43 +0,0 @@
-import mail from "@sendgrid/mail";
-
-const sendgridAPIKey = process.env.SENDGRID_API_KEY as string;
-
-/**
- * Simply send an email by address, subject, and body.
- */
-const send = async ({
-  subject,
-  to,
-  cc,
-  from,
-  text,
-  html,
-}: {
-  subject: string;
-  to: string | string[];
-  cc?: string | string[];
-  from: string;
-  text: string;
-  html?: string;
-}): Promise<boolean> => {
-  mail.setApiKey(sendgridAPIKey);
-
-  const msg = {
-    to,
-    cc,
-    from: {
-      email: from,
-      name: "Cal.ai",
-    },
-    text,
-    html,
-    subject,
-  };
-
-  const res = await mail.send(msg);
-  const success = !!res;
-
-  return success;
-};
-
-export default send;

apps/ai/src/utils/verifyParseKey.ts

@@ -1,13 +0,0 @@
-import type { NextRequest } from "next/server";
-
-import { env } from "../env.mjs";
-
-/**
- * Verifies that the request contains the correct parse key.
- * env.PARSE_KEY must be configured as a query param in the sendgrid inbound parse settings.
- */
-export const verifyParseKey = (url: NextRequest["url"]) => {
-  const verified = new URL(url).searchParams.get("parseKey") === env.PARSE_KEY;
-
-  return verified;
-};

apps/ai/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "extends": "@calcom/tsconfig/nextjs.json",
-  "compilerOptions": {
-    "strict": true,
-    "jsx": "preserve",
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["*"]
-    },
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ]
-  },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts",
-    "../../packages/types/window.d.ts"
-  ],
-  "exclude": ["node_modules"]
-}

apps/api/v1/instrumentation.ts

@@ -0,0 +1,15 @@
+import * as Sentry from "@sentry/nextjs";
+
+export function register() {
+  if (process.env.NEXT_RUNTIME === "nodejs") {
+    Sentry.init({
+      dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
+    });
+  }
+
+  if (process.env.NEXT_RUNTIME === "edge") {
+    Sentry.init({
+      dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
+    });
+  }
+}

apps/api/v1/lib/helpers/rateLimitApiKey.test.ts

@@ -0,0 +1,90 @@
+import type { Request, Response } from "express";
+import type { NextApiResponse, NextApiRequest } from "next";
+import { createMocks } from "node-mocks-http";
+import { describe, it, expect, vi } from "vitest";
+
+import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
+
+import { rateLimitApiKey } from "~/lib/helpers/rateLimitApiKey";
+
+type CustomNextApiRequest = NextApiRequest & Request;
+type CustomNextApiResponse = NextApiResponse & Response;
+
+vi.mock("@calcom/lib/checkRateLimitAndThrowError", () => ({
+  checkRateLimitAndThrowError: vi.fn(),
+}));
+
+describe("rateLimitApiKey middleware", () => {
+  it("should return 401 if no apiKey is provided", async () => {
+    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "GET",
+      query: {},
+    });
+
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(res._getStatusCode()).toBe(401);
+    expect(res._getJSONData()).toEqual({ message: "No apiKey provided" });
+  });
+
+  it("should call checkRateLimitAndThrowError with correct parameters", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    (checkRateLimitAndThrowError as any).mockResolvedValueOnce({
+      limit: 100,
+      remaining: 99,
+      reset: Date.now(),
+    });
+
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(checkRateLimitAndThrowError).toHaveBeenCalledWith({
+      identifier: "test-key",
+      rateLimitingType: "api",
+      onRateLimiterResponse: expect.any(Function),
+    });
+  });
+
+  it("should set rate limit headers correctly", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    const rateLimiterResponse = {
+      limit: 100,
+      remaining: 99,
+      reset: Date.now(),
+    };
+
+    (checkRateLimitAndThrowError as any).mockImplementationOnce(({ onRateLimiterResponse }) => {
+      onRateLimiterResponse(rateLimiterResponse);
+    });
+
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(res.getHeader("X-RateLimit-Limit")).toBe(rateLimiterResponse.limit);
+    expect(res.getHeader("X-RateLimit-Remaining")).toBe(rateLimiterResponse.remaining);
+    expect(res.getHeader("X-RateLimit-Reset")).toBe(rateLimiterResponse.reset);
+  });
+
+  it("should return 429 if rate limit is exceeded", async () => {
+    const { req, res } = createMocks({
+      method: "GET",
+      query: { apiKey: "test-key" },
+    });
+
+    (checkRateLimitAndThrowError as any).mockRejectedValue(new Error("Rate limit exceeded"));
+
+    // @ts-expect-error weird typing between middleware and createMocks
+    await rateLimitApiKey(req, res, vi.fn() as any);
+
+    expect(res._getStatusCode()).toBe(429);
+    expect(res._getJSONData()).toEqual({ message: "Rate limit exceeded" });
+  });
+});

apps/api/v1/lib/helpers/rateLimitApiKey.ts

@@ -6,15 +6,19 @@ export const rateLimitApiKey: NextMiddleware = async (req, res, next) => {
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
 
   // TODO: Add a way to add trusted api keys
-  await checkRateLimitAndThrowError({
-    identifier: req.query.apiKey as string,
-    rateLimitingType: "api",
-    onRateLimiterResponse: (response) => {
-      res.setHeader("X-RateLimit-Limit", response.limit);
-      res.setHeader("X-RateLimit-Remaining", response.remaining);
-      res.setHeader("X-RateLimit-Reset", response.reset);
-    },
-  });
+  try {
+    await checkRateLimitAndThrowError({
+      identifier: req.query.apiKey as string,
+      rateLimitingType: "api",
+      onRateLimiterResponse: (response) => {
+        res.setHeader("X-RateLimit-Limit", response.limit);
+        res.setHeader("X-RateLimit-Remaining", response.remaining);
+        res.setHeader("X-RateLimit-Reset", response.reset);
+      },
+    });
+  } catch (error) {
+    res.status(429).json({ message: "Rate limit exceeded" });
+  }
 
   await next();
 };

apps/api/v1/lib/helpers/verifyApiKey.ts

@@ -1,7 +1,7 @@
 import type { NextMiddleware } from "next-api-middleware";
 
+import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService";
 import { hashAPIKey } from "@calcom/features/ee/api-keys/lib/apiKeys";
-import checkLicense from "@calcom/features/ee/common/server/checkLicense";
 import { IS_PRODUCTION } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 
@@ -18,9 +18,12 @@ export const dateNotInPast = function (date: Date) {
 
 // This verifies the apiKey and sets the user if it is valid.
 export const verifyApiKey: NextMiddleware = async (req, res, next) => {
-  const hasValidLicense = await checkLicense(prisma);
-  if (!hasValidLicense && IS_PRODUCTION)
+  const licenseKeyService = await LicenseKeySingleton.getInstance();
+  const hasValidLicense = await licenseKeyService.checkLicense();
+
+  if (!hasValidLicense && IS_PRODUCTION) {
     return res.status(401).json({ error: "Invalid or missing CALCOM_LICENSE_KEY environment variable" });
+  }
   // Check if the apiKey query param is provided.
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
   // remove the prefix from the user provided api_key. If no env set default to "cal_"

apps/api/v1/lib/utils/isAdmin.ts

@@ -19,6 +19,9 @@ export const isAdminGuard = async (req: NextApiRequest) => {
       accepted: true,
       team: {
         isOrganization: true,
+        organizationSettings: {
+          isAdminAPIEnabled: true,
+        },
       },
       OR: [{ role: MembershipRole.OWNER }, { role: MembershipRole.ADMIN }],
     },

apps/api/v1/lib/validations/booking.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 
-import { _BookingModel as Booking, _AttendeeModel, _UserModel, _PaymentModel } from "@calcom/prisma/zod";
+import { _AttendeeModel, _BookingModel as Booking, _PaymentModel, _UserModel } from "@calcom/prisma/zod";
 import { extendedBookingCreateBody, iso8601 } from "@calcom/prisma/zod-utils";
 
 import { schemaQueryUserId } from "./shared/queryUserId";
@@ -21,8 +21,13 @@ export const schemaBookingCreateBodyParams = extendedBookingCreateBody.merge(sch
 export const schemaBookingGetParams = z.object({
   dateFrom: iso8601.optional(),
   dateTo: iso8601.optional(),
+  order: z.enum(["asc", "desc"]).default("asc"),
+  sortBy: z.enum(["createdAt", "updatedAt"]).optional(),
+  status: z.enum(["upcoming"]).optional(),
 });
 
+export type Status = z.infer<typeof schemaBookingGetParams>["status"];
+
 const schemaBookingEditParams = z
   .object({
     title: z.string().optional(),
@@ -55,7 +60,7 @@ export const schemaBookingReadPublic = Booking.extend({
       timeZone: true,
       locale: true,
     })
-    .optional(),
+    .nullish(),
   payment: z
     .array(
       _PaymentModel.pick({

apps/api/v1/lib/validations/payment.ts

@@ -1,5 +1,12 @@
 import { _PaymentModel as Payment } from "@calcom/prisma/zod";
 
-// FIXME: Payment seems a delicate endpoint, do we need to remove anything here?
-export const schemaPaymentBodyParams = Payment.omit({ id: true });
-export const schemaPaymentPublic = Payment.omit({ externalId: true });
+export const schemaPaymentPublic = Payment.pick({
+  id: true,
+  amount: true,
+  success: true,
+  refunded: true,
+  fee: true,
+  paymentOption: true,
+  currency: true,
+  bookingId: true,
+});

apps/api/v1/lib/validations/shared/queryIdTransformParseInt.ts

@@ -14,3 +14,7 @@ export const withValidQueryIdTransformParseInt = withValidation({
   type: "Zod",
   mode: "query",
 });
+
+export const getTranscriptFromRecordingId = schemaQueryIdParseInt.extend({
+  recordingId: z.string(),
+});

apps/api/v1/lib/validations/team.ts

@@ -9,6 +9,7 @@ export const schemaTeamBaseBodyParams = Team.omit({ id: true, createdAt: true })
   isOrganization: true,
   isPlatform: true,
   smsLockState: true,
+  smsLockReviewedByAdmin: true,
 });
 
 const schemaTeamRequiredParams = z.object({

apps/api/v1/next.config.js

@@ -2,7 +2,12 @@ const { withAxiom } = require("next-axiom");
 const { withSentryConfig } = require("@sentry/nextjs");
 
 const plugins = [withAxiom];
+
+/** @type {import("next").NextConfig} */
 const nextConfig = {
+  experimental: {
+    instrumentationHook: true,
+  },
   transpilePackages: [
     "@calcom/app-store",
     "@calcom/core",
@@ -87,12 +92,12 @@ const nextConfig = {
 };
 
 if (!!process.env.NEXT_PUBLIC_SENTRY_DSN) {
-  nextConfig["sentry"] = {
-    autoInstrumentServerFunctions: true,
-    hideSourceMaps: true,
-  };
-
-  plugins.push(withSentryConfig);
+  plugins.push((nextConfig) =>
+    withSentryConfig(nextConfig, {
+      autoInstrumentServerFunctions: true,
+      hideSourceMaps: true,
+    })
+  );
 }
 
 module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);

apps/api/v1/package.json

@@ -30,7 +30,7 @@
     "@calcom/lib": "*",
     "@calcom/prisma": "*",
     "@calcom/trpc": "*",
-    "@sentry/nextjs": "^7.73.0",
+    "@sentry/nextjs": "^8.8.0",
     "bcryptjs": "^2.4.3",
     "memory-cache": "^0.2.0",
     "next": "^13.5.4",

apps/api/v1/pages/api/availabilities/[id]/_delete.ts

@@ -27,7 +27,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       201:
  *         description: OK, availability removed successfully

apps/api/v1/pages/api/availabilities/[id]/_get.ts

@@ -28,7 +28,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       200:
  *         description: OK

apps/api/v1/pages/api/availabilities/[id]/_patch.ts

@@ -63,7 +63,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       201:
  *         description: OK, availability edited successfully

apps/api/v1/pages/api/availabilities/_post.ts

@@ -62,7 +62,7 @@ import {
  *     tags:
  *     - availabilities
  *     externalDocs:
- *        url: https://docs.cal.com/availability
+ *        url: https://docs.cal.com/docs/core-features/availability
  *     responses:
  *       201:
  *         description: OK, availability created

apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/_get.ts

@@ -0,0 +1,94 @@
+import type { NextApiRequest } from "next";
+
+import {
+  getTranscriptsAccessLinkFromRecordingId,
+  checkIfRoomNameMatchesInRecording,
+} from "@calcom/core/videoClient";
+import { HttpError } from "@calcom/lib/http-error";
+import { defaultResponder } from "@calcom/lib/server";
+import prisma from "@calcom/prisma";
+import type { PartialReference } from "@calcom/types/EventManager";
+
+import { getTranscriptFromRecordingId } from "~/lib/validations/shared/queryIdTransformParseInt";
+
+/**
+ * @swagger
+ * /bookings/{id}/transcripts/{recordingId}:
+ *   get:
+ *     summary: Find all Cal video transcripts of that recording
+ *     operationId: getTranscriptsByRecordingId
+ *     parameters:
+ *       - in: path
+ *         name: id
+ *         schema:
+ *           type: integer
+ *         required: true
+ *         description: ID of the booking for which transcripts need to be fetched.
+ *       - in: path
+ *         name: recordingId
+ *         schema:
+ *           type: string
+ *         required: true
+ *         description: ID of the recording(daily.co recording id) for which transcripts need to be fetched.
+ *       - in: query
+ *         name: apiKey
+ *         required: true
+ *         schema:
+ *           type: string
+ *         description: Your API key
+ *     tags:
+ *     - bookings
+ *     responses:
+ *       200:
+ *         description: OK
+ *         content:
+ *           application/json:
+ *       401:
+ *         description: Authorization information is missing or invalid.
+ *       404:
+ *         description: Booking was not found
+ */
+
+export async function getHandler(req: NextApiRequest) {
+  const { query } = req;
+  const { id, recordingId } = getTranscriptFromRecordingId.parse(query);
+
+  await checkIfRecordingBelongsToBooking(id, recordingId);
+
+  const transcriptsAccessLinks = await getTranscriptsAccessLinkFromRecordingId(recordingId);
+
+  return transcriptsAccessLinks;
+}
+
+const checkIfRecordingBelongsToBooking = async (bookingId: number, recordingId: string) => {
+  const booking = await prisma.booking.findUnique({
+    where: { id: bookingId },
+    include: { references: true },
+  });
+
+  if (!booking)
+    throw new HttpError({
+      statusCode: 404,
+      message: `No Booking found with booking id ${bookingId}`,
+    });
+
+  const roomName =
+    booking?.references?.find((reference: PartialReference) => reference.type === "daily_video")?.meetingId ??
+    undefined;
+
+  if (!roomName)
+    throw new HttpError({
+      statusCode: 404,
+      message: `No Booking Reference with Daily Video found with booking id ${bookingId}`,
+    });
+
+  const canUserAccessRecordingId = await checkIfRoomNameMatchesInRecording(roomName, recordingId);
+  if (!canUserAccessRecordingId) {
+    throw new HttpError({
+      statusCode: 403,
+      message: `This Recording Id ${recordingId} does not belong to booking ${bookingId}`,
+    });
+  }
+};
+
+export default defaultResponder(getHandler);

apps/api/v1/pages/api/bookings/[id]/transcripts/[recordingId]/index.ts

@@ -0,0 +1,16 @@
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import { defaultHandler, defaultResponder } from "@calcom/lib/server";
+
+import { withMiddleware } from "~/lib/helpers/withMiddleware";
+
+import authMiddleware from "../../_auth-middleware";
+
+export default withMiddleware()(
+  defaultResponder(async (req: NextApiRequest, res: NextApiResponse) => {
+    await authMiddleware(req);
+    return defaultHandler({
+      GET: import("./_get"),
+    })(req, res);
+  })
+);

apps/api/v1/pages/api/bookings/_get.ts

@@ -51,6 +51,37 @@ import { schemaQuerySingleOrMultipleUserIds } from "~/lib/validations/shared/que
  *                type: string
  *                format: email
  *              example: [john.doe@example.com, jane.doe@example.com]
+ *        - in: query
+ *          name: order
+ *          required: false
+ *          schema:
+ *          type: string
+ *          enum: [asc, desc]
+ *       - in: query
+ *         name: sortBy
+ *         required: false
+ *         schema:
+ *          type: string
+ *          enum: [createdAt, updatedAt]
+ *       - in: query
+ *         name: status
+ *         required: false
+ *         schema:
+ *          type: string
+ *          enum: [upcoming]
+ *          description: Filter bookings by status, it will overwrite dateFrom and dateTo filters
+ *       - in: query
+ *         name: dateFrom
+ *         required: false
+ *         schema:
+ *          type: string
+ *          description: ISO 8601 date string to filter bookings by start time
+ *       - in: query
+ *         name: dateTo
+ *         required: false
+ *         schema:
+ *          type: string
+ *          description: ISO 8601 date string to filter bookings by end time
  *     operationId: listBookings
  *     tags:
  *     - bookings
@@ -118,6 +149,7 @@ type GetAdminArgsType = {
   requestedUserIds: number[];
   userId: number;
 };
+
 /**
  * Constructs the WHERE clause for Prisma booking findMany operation.
  *
@@ -136,7 +168,9 @@ function buildWhereClause(
 ) {
   const filterByAttendeeEmails = attendeeEmails.length > 0;
   const userFilter = userIds.length > 0 ? { userId: { in: userIds } } : !!userId ? { userId } : {};
+
   let whereClause = {};
+
   if (filterByAttendeeEmails) {
     whereClause = {
       AND: [
@@ -165,9 +199,7 @@ function buildWhereClause(
     };
   }
 
-  return {
-    ...whereClause,
-  };
+  return whereClause;
 }
 
 export async function handler(req: NextApiRequest) {
@@ -177,11 +209,13 @@ export async function handler(req: NextApiRequest) {
     isOrganizationOwnerOrAdmin,
     pagination: { take, skip },
   } = req;
-  const { dateFrom, dateTo } = schemaBookingGetParams.parse(req.query);
+  const { dateFrom, dateTo, order, sortBy, status } = schemaBookingGetParams.parse(req.query);
 
   const args: Prisma.BookingFindManyArgs = {};
-  args.take = take;
-  args.skip = skip;
+  if (req.query.take && req.query.page) {
+    args.take = take;
+    args.skip = skip;
+  }
   args.include = {
     attendees: true,
     user: true,
@@ -249,6 +283,31 @@ export async function handler(req: NextApiRequest) {
     };
   }
 
+  if (sortBy === "updatedAt") {
+    args.orderBy = {
+      updatedAt: order,
+    };
+  }
+
+  if (sortBy === "createdAt") {
+    args.orderBy = {
+      createdAt: order,
+    };
+  }
+
+  if (status) {
+    switch (status) {
+      case "upcoming":
+        args.where = {
+          ...args.where,
+          startTime: { gte: new Date().toISOString() },
+        };
+        break;
+      default:
+        throw new HttpError({ message: "Invalid status", statusCode: 400 });
+    }
+  }
+
   const data = await prisma.booking.findMany(args);
   return { bookings: data.map((booking) => schemaBookingReadPublic.parse(booking)) };
 }

apps/api/v1/pages/api/bookings/_post.ts

@@ -2,6 +2,8 @@ import type { NextApiRequest } from "next";
 
 import getBookingDataSchemaForApi from "@calcom/features/bookings/lib/getBookingDataSchemaForApi";
 import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
+import { ErrorCode } from "@calcom/lib/errorCodes";
+import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
 
 import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
@@ -45,6 +47,10 @@ import { getAccessibleUsers } from "~/lib/utils/retrieveScopedAccessibleUsers";
  *                 type: string
  *                 format: date-time
  *                 description: 'End time of the Event'
+ *               rescheduleUid:
+ *                 type: string
+ *                 format: UID
+ *                 description: 'Uid of the booking to reschedule'
  *               responses:
  *                 type: object
  *                 required:
@@ -218,7 +224,16 @@ async function handler(req: NextApiRequest) {
     req.userId = requestedUserId || userId;
   }
 
-  return await handleNewBooking(req, getBookingDataSchemaForApi);
+  try {
+    return await handleNewBooking(req, getBookingDataSchemaForApi);
+  } catch (error: unknown) {
+    const knownError = error as Error;
+    if (knownError?.message === ErrorCode.NoAvailableUsersFound) {
+      throw new HttpError({ statusCode: 400, message: knownError.message });
+    }
+
+    throw error;
+  }
 }
 
 export default defaultResponder(handler);

apps/api/v1/pages/api/docs.ts

@@ -11,8 +11,8 @@ const swaggerHandler = withSwagger({
       { url: "https://api.cal.com/v1" },
     ],
     externalDocs: {
-      url: "https://docs.cal.com",
-      description: "Find more info at our main docs: https://docs.cal.com/",
+      url: "https://docs.cal.com/docs",
+      description: "Find more info at our main docs: https://docs.cal.com/docs/",
     },
     info: {
       title: `${pjson.name}: ${pjson.description}`,

apps/api/v1/pages/api/event-types/[id]/_delete.ts

@@ -28,7 +28,7 @@ import { schemaQueryIdParseInt } from "~/lib/validations/shared/queryIdTransform
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       201:
  *         description: OK, eventType removed successfully

apps/api/v1/pages/api/event-types/[id]/_get.ts

@@ -34,7 +34,7 @@ import getCalLink from "../_utils/getCalLink";
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       200:
  *         description: OK

apps/api/v1/pages/api/event-types/[id]/_patch.ts

@@ -194,7 +194,7 @@ import checkTeamEventEditPermission from "../_utils/checkTeamEventEditPermission
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       201:
  *         description: OK, eventType edited successfully

apps/api/v1/pages/api/event-types/_get.ts

@@ -33,7 +33,7 @@ import getCalLink from "./_utils/getCalLink";
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       200:
  *         description: OK

apps/api/v1/pages/api/event-types/_post.ts

@@ -255,7 +255,7 @@ import ensureOnlyMembersAsHosts from "./_utils/ensureOnlyMembersAsHosts";
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       201:
  *         description: OK, event type created
@@ -278,8 +278,8 @@ async function postHandler(req: NextApiRequest) {
 
   let data: Prisma.EventTypeCreateArgs["data"] = {
     ...parsedBody,
-    userId,
-    users: { connect: { id: userId } },
+    userId: !!parsedBody.teamId ? null : userId,
+    users: !!parsedBody.teamId ? undefined : { connect: { id: userId } },
     bookingLimits: bookingLimits === null ? Prisma.DbNull : bookingLimits,
     durationLimits: durationLimits === null ? Prisma.DbNull : durationLimits,
   };
@@ -291,7 +291,7 @@ async function postHandler(req: NextApiRequest) {
     await checkUserMembership(req);
   }
 
-  if (isSystemWideAdmin && parsedBody.userId) {
+  if (isSystemWideAdmin && parsedBody.userId && !parsedBody.teamId) {
     data = { ...parsedBody, users: { connect: { id: parsedBody.userId } } };
   }
 

apps/api/v1/pages/api/invites/_post.ts

@@ -43,7 +43,6 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
       language: data.language,
       teamId: data.teamId,
       usernameOrEmail: data.usernameOrEmail,
-      isOrg: data.isOrg,
     });
 
     return { success: true, message: `${data.usernameOrEmail} has been invited.` };

apps/api/v1/pages/api/me/_get.ts

@@ -7,7 +7,12 @@ import { schemaUserReadPublic } from "~/lib/validations/user";
 
 async function handler({ userId }: NextApiRequest) {
   const data = await prisma.user.findUniqueOrThrow({ where: { id: userId } });
-  return { user: schemaUserReadPublic.parse(data) };
+  return {
+    user: schemaUserReadPublic.parse({
+      ...data,
+      avatar: data.avatarUrl,
+    }),
+  };
 }
 
 export default defaultResponder(handler);

apps/api/v1/pages/api/teams/[teamId]/_patch.ts

@@ -125,6 +125,7 @@ export async function patchHandler(req: NextApiRequest) {
     metadata: NonNullable<typeof data.metadata> | undefined;
   } = {
     ...data,
+    smsLockReviewedByAdmin: false,
     metadata: data.metadata === null ? {} : data.metadata || undefined,
   };
   const team = await prisma.team.update({ where: { id: teamId }, data: cloneData });

apps/api/v1/pages/api/teams/[teamId]/event-types/_get.ts

@@ -32,7 +32,7 @@ const querySchema = z.object({
  *     tags:
  *     - event-types
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/event-types
+ *        url: https://docs.cal.com/docs/core-features/event-types
  *     responses:
  *       200:
  *         description: OK

apps/api/v1/pages/api/teams/_post.ts

@@ -69,6 +69,9 @@ import { schemaTeamCreateBodyParams, schemaTeamReadPublic } from "~/lib/validati
  *                ownerId:
  *                  type: number
  *                  description: ID of the team owner - only admins can set this.
+ *                parentId:
+ *                  type: number
+ *                  description: ID of the parent organization.
  *     tags:
  *     - teams
  *     responses:
@@ -99,7 +102,7 @@ async function postHandler(req: NextApiRequest) {
     if (alreadyExist) throw new HttpError({ statusCode: 409, message: "Team slug already exists" });
   }
 
-  // Check if parentId is related to this user
+  // Check if parentId is related to this user and is an organization
   if (data.parentId) {
     const parentTeam = await prisma.team.findFirst({
       where: { id: data.parentId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
@@ -107,7 +110,13 @@ async function postHandler(req: NextApiRequest) {
     if (!parentTeam)
       throw new HttpError({
         statusCode: 401,
-        message: "Unauthorized: Invalid parent id. You can only use parent id of your own teams.",
+        message: "Unauthorized: Invalid parent id. You can only use parent id if you are org owner or admin.",
+      });
+
+    if (parentTeam.parentId)
+      throw new HttpError({
+        statusCode: 400,
+        message: "parentId must be of an organization, not a team.",
       });
   }
 
@@ -116,10 +125,11 @@ async function postHandler(req: NextApiRequest) {
     metadata: NonNullable<typeof data.metadata> | undefined;
   } = {
     ...data,
+    smsLockReviewedByAdmin: false,
     metadata: data.metadata === null ? {} : data.metadata || undefined,
   };
 
-  if (!IS_TEAM_BILLING_ENABLED) {
+  if (!IS_TEAM_BILLING_ENABLED || data.parentId) {
     const team = await prisma.team.create({
       data: {
         ...cloneData,
@@ -135,7 +145,7 @@ async function postHandler(req: NextApiRequest) {
     return {
       team: schemaTeamReadPublic.parse(team),
       owner: schemaMembershipPublic.parse(team.members[0]),
-      message: `Team created successfully. We also made user with ID=${ownerId} the owner of this team.`,
+      message: `Team created successfully. We also made user with ID=${effectiveUserId} the owner of this team.`,
     };
   }
 

apps/api/v1/pages/api/users/[userId]/_get.ts

@@ -45,7 +45,10 @@ export async function getHandler(req: NextApiRequest) {
   if (!isSystemWideAdmin && query.userId !== req.userId)
     throw new HttpError({ statusCode: 403, message: "Forbidden" });
   const data = await prisma.user.findUnique({ where: { id: query.userId } });
-  const user = schemaUserReadPublic.parse(data);
+  const user = schemaUserReadPublic.parse({
+    ...data,
+    avatar: data?.avatarUrl,
+  });
   return { user };
 }
 

apps/api/v1/pages/api/users/[userId]/_patch.ts

@@ -2,7 +2,9 @@ import type { NextApiRequest } from "next";
 
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server";
+import { uploadAvatar } from "@calcom/lib/server/avatar";
 import prisma from "@calcom/prisma";
+import type { Prisma } from "@calcom/prisma/client";
 
 import { schemaQueryUserId } from "~/lib/validations/shared/queryUserId";
 import { schemaUserEditBodyParams, schemaUserReadPublic } from "~/lib/validations/user";
@@ -101,7 +103,8 @@ export async function patchHandler(req: NextApiRequest) {
   if (!isSystemWideAdmin && query.userId !== req.userId)
     throw new HttpError({ statusCode: 403, message: "Forbidden" });
 
-  const body = await schemaUserEditBodyParams.parseAsync(req.body);
+  const { avatar, ...body }: { avatar?: string | undefined } & Prisma.UserUpdateInput =
+    await schemaUserEditBodyParams.parseAsync(req.body);
   // disable role or branding changes unless admin.
   if (!isSystemWideAdmin) {
     if (body.role) body.role = undefined;
@@ -119,6 +122,14 @@ export async function patchHandler(req: NextApiRequest) {
       message: "Bad request: Invalid default schedule id",
     });
   }
+
+  if (avatar) {
+    body.avatarUrl = await uploadAvatar({
+      userId: query.userId,
+      avatar: await (await import("@calcom/lib/server/resizeBase64Image")).resizeBase64Image(avatar),
+    });
+  }
+
   const data = await prisma.user.update({
     where: { id: query.userId },
     data: body,

apps/api/v1/pages/api/webhooks/[id]/_delete.ts

@@ -27,7 +27,7 @@ import { schemaQueryIdAsString } from "~/lib/validations/shared/queryIdString";
  *     tags:
  *     - webhooks
  *     externalDocs:
- *        url: https://docs.cal.com/core-features/webhooks
+ *        url: https://docs.cal.com/docs/core-features/webhooks
  *     responses:
  *       201:
  *         description: OK, hook removed successfully