From c06aa01abf53c0fa04c19d385dc3cb908075b286 Mon Sep 17 00:00:00 2001
From: Marie Idleman <marie.idleman@posit.co>
Date: Wed, 11 Dec 2024 12:55:22 -0600
Subject: [PATCH] ci: add ability to run additional test tags against PRs
 (#5658)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### Intent
This PR enhances our test-based workflows by making them more modular,
composable, and dispatchable (is that a word?). In addition, we can now
specify additional tags with an ampersand (`&critical`, etc) anywhere in
PR text to run additional tests against a pull request.

### Changes

Modular Workflows
* Split core tests (e2e-linux, e2e-windows, unit-tests,
integration-tests) into standalone workflows.
   * Parent workflows can now combine these tests as needed.
* Added parameters/inputs to e2e workflows for tagging and filtering e2e
tests.
* Added bash script to handle combining Playwright tags to run a subset
of tests:
   * Enables AND logic for tags where needed.
   * Handles “base tags” like `@win` or `@web`

Dynamic Tag Parsing
* Allows tags (`&critical`, etc) in PR descriptions to be parsed and
included dynamically.
* Ensures at minimum that critical tests always run (even if not tagged)
* Added a bash script to handle parsing PR text to pass along to e2e
test runner

### QA Notes
* Ran the full test suite and confirmed it passed and reports were
available as expected.
* Once merged, I plan to manually verify each of the workflow dispatches
works as expected, but I did try to test this as much as I could
already.

### Screenshots

test-full-suite.yml dispatch
<img width="360" alt="full-suite"
src="https://github.com/user-attachments/assets/7bbc55d2-c0cb-4976-b3f5-afb45bd65c7c">

test-e2e-linux.yml dispatch
<img width="354" alt="linux"
src="https://github.com/user-attachments/assets/dff56e8b-9d9b-4cbb-bdd0-85fc059f7199">

test-e2e-windows.yml dispatch
<img width="351" alt="windows"
src="https://github.com/user-attachments/assets/c760f80b-3e6a-4d86-b3c4-282b400cd5f1">

test-e2e-release.yml dispatch
<img width="359" alt="latest-release"
src="https://github.com/user-attachments/assets/1b2f65e1-5fc6-4e7f-9626-9adf1b998c5e">
---
 .github/actions/e2e-report/action.yml         | 100 -------
 .github/actions/gen-report-dir/action.yml     |  27 ++
 .../actions/upload-report-to-s3/action.yml    |   5 +-
 .github/pull_request_template.md              |  10 +-
 .github/workflows/positron-full-test.yml      | 264 ------------------
 .../workflows/positron-merge-to-branch.yml    | 196 -------------
 .github/workflows/positron-pull-requests.yml  |  14 -
 .github/workflows/test-e2e-linux.yml          | 127 +++++++++
 ...se-run-ubuntu.yml => test-e2e-release.yml} |  48 ++--
 ...ndows-nightly.yml => test-e2e-windows.yml} | 108 ++++---
 .github/workflows/test-full-suite.yml         |  99 +++++++
 .github/workflows/test-integration.yml        |  62 ++++
 .github/workflows/test-merge.yml              |  42 +++
 .github/workflows/test-pull-request.yml       |  42 +++
 .github/workflows/test-unit.yml               |  57 ++++
 build/secrets/.secrets.baseline               |  43 ++-
 package.json                                  |   2 +-
 playwright.config.ts                          |   8 +
 scripts/pr-tags-parse.sh                      |  42 +++
 scripts/pr-tags-transform.sh                  |  64 +++++
 test/e2e/helpers/test-tags.ts                 |  10 +
 21 files changed, 710 insertions(+), 660 deletions(-)
 delete mode 100644 .github/actions/e2e-report/action.yml
 create mode 100644 .github/actions/gen-report-dir/action.yml
 delete mode 100644 .github/workflows/positron-full-test.yml
 delete mode 100644 .github/workflows/positron-merge-to-branch.yml
 delete mode 100644 .github/workflows/positron-pull-requests.yml
 create mode 100644 .github/workflows/test-e2e-linux.yml
 rename .github/workflows/{e2e-test-release-run-ubuntu.yml => test-e2e-release.yml} (75%)
 rename .github/workflows/{positron-windows-nightly.yml => test-e2e-windows.yml} (66%)
 create mode 100644 .github/workflows/test-full-suite.yml
 create mode 100644 .github/workflows/test-integration.yml
 create mode 100644 .github/workflows/test-merge.yml
 create mode 100644 .github/workflows/test-pull-request.yml
 create mode 100644 .github/workflows/test-unit.yml
 create mode 100644 scripts/pr-tags-parse.sh
 create mode 100644 scripts/pr-tags-transform.sh

diff --git a/.github/actions/e2e-report/action.yml b/.github/actions/e2e-report/action.yml
deleted file mode 100644
index 9100c55acf2..00000000000
--- a/.github/actions/e2e-report/action.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-name: "E2E Report"
-description: "Generate and upload E2E reports, and notify stakeholders"
-inputs:
-  aws-s3-bucket:
-    description: "AWS S3 bucket name"
-    required: true
-  aws-role:
-    description: "AWS role to assume"
-    required: true
-  junit-pattern:
-    description: "Pattern to match JUnit reports"
-    default: "junit-report-*"
-  blob-pattern:
-    description: "Pattern to match blob reports"
-    default: "blob-report-*"
-  testrail-api-key:
-    description: "TestRail API Key"
-    required: true
-  github-token:
-    description: "GitHub token for API calls"
-    required: true
-  testrail-project:
-    description: "TestRail project name"
-    default: "Positron"
-  testrail-title:
-    description: "Title for TestRail runs"
-    default: "E2E Test Run"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v4
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version-file: .nvmrc
-
-    - name: Install AWS CLI
-      shell: bash
-      run: |
-        apt-get update && apt-get install -y unzip python3-pip
-        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o /tmp/awscliv2.zip
-        unzip -q /tmp/awscliv2.zip -d /tmp
-        /tmp/aws/install -i $HOME/aws-cli -b $HOME/bin
-        rm -rf /tmp/aws /tmp/awscliv2.zip
-
-    - name: Add AWS CLI to PATH
-      shell: bash
-      run: echo "$HOME/bin" >> $GITHUB_PATH
-
-    - name: Verify AWS CLI installation
-      shell: bash
-      run: aws --version
-
-    - name: Download Blob Reports
-      uses: actions/download-artifact@v4
-      with:
-        path: all-blob-reports
-        pattern: ${{ inputs.blob-pattern }}
-        merge-multiple: true
-
-    - name: Merge Blobs into HTML Report
-      shell: bash
-      run: npx playwright merge-reports --reporter html ./all-blob-reports
-
-    - name: Upload Playwright Report to S3
-      uses: ./.github/actions/upload-report-to-s3
-      with:
-        role-to-assume: ${{ inputs.aws-role }}
-
-    - name: Send HTML Report URL to GitHub Summary
-      shell: bash
-      run: |
-        REPORT_URL="https://d38p2avprg8il3.cloudfront.net/${{ env.REPORT_DIR }}/index.html"
-        echo "Report URL: $REPORT_URL"
-        echo "📄 [Playwright Report]($REPORT_URL) <br>" > $GITHUB_STEP_SUMMARY
-
-    - name: Download JUnit Reports
-      uses: actions/download-artifact@v4
-      with:
-        path: all-junit-reports
-        pattern: ${{ inputs.junit-pattern }}
-        merge-multiple: true
-
-    - name: Merge JUnit Reports
-      shell: bash
-      run: npm install -g junit-report-merger && npx jrm junit.xml "all-junit-reports/*.xml"
-
-    - name: Install trcli
-      shell: bash
-      run: apt-get update && apt-get install -y python3-pip && pip3 install trcli
-
-    - name: Upload Test Results to TestRail
-      shell: bash
-      run: |
-        TESTRAIL_TITLE="$(date +'%Y-%m-%d') ${{ inputs.testrail-title }} - $GITHUB_REF_NAME"
-        echo "TESTRAIL_TITLE=$TESTRAIL_TITLE" >> $GITHUB_ENV
-        trcli --host "https://posit.testrail.io/" --project "${{ inputs.testrail-project }}" --username testrailautomation@posit.co --key "${{ inputs.testrail-api-key }}" parse_junit --file "./junit.xml" --case-matcher name --title "$TESTRAIL_TITLE" --close-run
diff --git a/.github/actions/gen-report-dir/action.yml b/.github/actions/gen-report-dir/action.yml
new file mode 100644
index 00000000000..d13157e20a3
--- /dev/null
+++ b/.github/actions/gen-report-dir/action.yml
@@ -0,0 +1,27 @@
+name: "Generate Report Directory & Send to GH Summary"
+description: "Generates a unique REPORT_DIR and appends the report URL to the GitHub Step summary"
+inputs:
+  bucket-url:
+    description: "Base URL of the S3 bucket or CDN for the report"
+    required: false
+    default: "https://d38p2avprg8il3.cloudfront.net"
+runs:
+  using: "composite"
+  steps:
+    - name: Generate REPORT_DIR
+      shell: bash
+      run: |
+        # Generate a unique REPORT_DIR
+        RANDOM_SUFFIX=$RANDOM
+        REPORT_DIR="playwright-report-${{ github.run_id }}-${RANDOM_SUFFIX}"
+
+        # Export REPORT_DIR for downstream steps
+        echo "REPORT_DIR=$REPORT_DIR" >> $GITHUB_ENV
+        echo "Generated REPORT_DIR: $REPORT_DIR"
+
+        # Generate the REPORT_URL
+        REPORT_URL="${{ inputs.bucket-url }}/$REPORT_DIR/index.html"
+        echo "Report URL: $REPORT_URL"
+
+        # Append REPORT_URL to the GitHub Step summary
+        echo "📄 [Playwright Report]($REPORT_URL) <br>" >> $GITHUB_STEP_SUMMARY
diff --git a/.github/actions/upload-report-to-s3/action.yml b/.github/actions/upload-report-to-s3/action.yml
index 0dec03de8bc..bc69ad75ed6 100644
--- a/.github/actions/upload-report-to-s3/action.yml
+++ b/.github/actions/upload-report-to-s3/action.yml
@@ -4,6 +4,9 @@ inputs:
   role-to-assume:
     description: "The AWS role to assume"
     required: true
+  report-dir:
+    description: "The path to the directory containing the Playwright report"
+    required: true
 
 runs:
   using: "composite"
@@ -19,4 +22,4 @@ runs:
       if: ${{ !cancelled() }}
       shell: bash
       run: |
-        aws s3 cp playwright-report/. s3://positron-test-reports/playwright-report-${{ github.run_id }} --recursive
+        aws s3 cp playwright-report/. s3://positron-test-reports/${{ inputs.report-dir }} --recursive
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 93d6686c507..e96e4357dd3 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -10,12 +10,16 @@ main branch by either pulling or rebasing.
 <!--
   Describe briefly what problem this pull request resolves, or what
   new feature it introduces. Include screenshots of any new or altered
-  UI. Link to any GitHub issues but avoid "magic" keywords that will 
-  automatically close the issue. If there are any details about your 
-  approach that are unintuitive or you want to draw attention to, please 
+  UI. Link to any GitHub issues but avoid "magic" keywords that will
+  automatically close the issue. If there are any details about your
+  approach that are unintuitive or you want to draw attention to, please
   describe them here.
 -->
 
+### Tests to Run
+<!-- See `test/e2e/helpers/test-tags.ts` for a complete list of available tags. -->
+`@:critical`
+
 ### QA Notes
 
 <!--
diff --git a/.github/workflows/positron-full-test.yml b/.github/workflows/positron-full-test.yml
deleted file mode 100644
index 61b90a8d937..00000000000
--- a/.github/workflows/positron-full-test.yml
+++ /dev/null
@@ -1,264 +0,0 @@
-name: "Test: Full Suite (Ubuntu)"
-
-# Run tests daily at 4am UTC (11p EST) on weekdays for now, or manually
-on:
-  schedule:
-    - cron: "0 4 * * 1-5"
-  workflow_dispatch:
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  unit-tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
-      - name: Setup Build and Compile
-        uses: ./.github/actions/setup-build-env
-
-      - name: Run Unit Tests (Electron)
-        id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Unit Tests (node.js)
-        id: nodejs-unit-tests
-        run: yarn test-node
-
-      - name: Run Unit Tests (Browser, Chromium)
-        id: browser-unit-tests
-        run: DISPLAY=:10 yarn test-browser-no-install --browser chromium
-
-  integration-tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
-      - name: Setup Build and Compile
-        uses: ./.github/actions/setup-build-env
-
-      - name: Install Positron License
-        uses: ./.github/actions/install-license
-        with:
-          github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
-          license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
-
-      - name: Setup R
-        uses: ./.github/actions/install-r
-        with:
-          version: "4.4.0"
-
-      - name: Compile Integration Tests
-        run: yarn --cwd test/integration/browser compile
-
-      - name: Run Integration Tests (Electron)
-        id: electron-integration-tests
-        run: DISPLAY=:10 ./scripts/test-integration.sh
-
-      - name: Run Integration Tests (Remote)
-        if: ${{ job.status != 'cancelled' && (success() || failure()) }}
-        id: electron-remote-integration-tests
-        run: DISPLAY=:10 ./scripts/test-remote-integration.sh
-
-      - name: Run Integration Tests (Browser, Chromium)
-        if: ${{ job.status != 'cancelled' && (success() || failure()) }}
-        id: browser-integration-tests
-        run: DISPLAY=:10 ./scripts/test-web-integration.sh --browser chromium
-
-      - name: Clean up license files
-        if: always()
-        run: cd .. && rm -rf positron-license
-
-  e2e-electron-tests:
-    runs-on: ubuntu-latest-8x
-    timeout-minutes: 60
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
-      _R_CHECK_CRAN_INCOMING_: false
-      _R_CHECK_SYSTEM_CLOCK_: false
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
-      - name: Setup Build and Compile
-        uses: ./.github/actions/setup-build-env
-
-      - name: Setup E2E Test Environment
-        uses: ./.github/actions/setup-test-env
-        with:
-          aws-role-to-assume: ${{ secrets.QA_AWS_RO_ROLE }}
-          aws-region: ${{ secrets.QA_AWS_REGION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run Tests (Electron)
-        env:
-          POSITRON_PY_VER_SEL: 3.10.12
-          POSITRON_R_VER_SEL: 4.4.0
-          CURRENTS_PROJECT_ID: ZOs5z2
-          CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}
-          CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
-          COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }} # only works on push events
-          PWTEST_BLOB_DO_NOT_REMOVE: 1
-          CURRENTS_TAG: "electron"
-        id: electron-tests
-        run: DISPLAY=:10 npx playwright test --project e2e-electron --workers 2
-
-      - name: Upload blob report
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: blob-report-electron
-          path: blob-report
-          retention-days: 14
-
-      - name: Upload junit report
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: junit-report-electron
-          path: test-results/junit.xml
-
-      - name: Upload logs
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs-electron
-          path: test-logs
-
-  e2e-browser-tests:
-    runs-on: ubuntu-latest-8x
-    timeout-minutes: 50
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
-      _R_CHECK_CRAN_INCOMING_: false
-      _R_CHECK_SYSTEM_CLOCK_: false
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
-      - name: Setup Build and Compile
-        uses: ./.github/actions/setup-build-env
-
-      - name: Install Positron License
-        uses: ./.github/actions/install-license
-        with:
-          github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
-          license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
-
-      - name: Setup E2E Test Environment
-        uses: ./.github/actions/setup-test-env
-        with:
-          aws-role-to-assume: ${{ secrets.QA_AWS_RO_ROLE }}
-          aws-region: ${{ secrets.QA_AWS_REGION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      # Preloading ensures the Node.js binary is fully built and ready before
-      # any parallel processes start, preventing runtime conflicts
-      - name: Preload Node.js Binary
-        run: yarn gulp node
-
-      - name: Run Tests (Browser)
-        env:
-          POSITRON_PY_VER_SEL: 3.10.12
-          POSITRON_R_VER_SEL: 4.4.0
-          CURRENTS_PROJECT_ID: ZOs5z2
-          CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}
-          CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
-          COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }}
-          PWTEST_BLOB_DO_NOT_REMOVE: 1
-          CURRENTS_TAG: "chromium"
-        id: browser-tests
-        run: DISPLAY=:10 npx playwright test --project e2e-browser --workers 2
-
-      - name: Upload blob report
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: blob-report-browser
-          path: blob-report
-          retention-days: 14
-
-      - name: Upload logs
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: logs-browser
-          path: test-logs
-
-      - name: Clean up license files
-        if: always()
-        run: cd .. && rm -rf positron-license
-
-  e2e-report:
-    if: always()
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.48.0-jammy
-    needs: [e2e-electron-tests, e2e-browser-tests, unit-tests, integration-tests]
-    env:
-      REPORT_DIR: playwright-report-${{ github.run_id }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Run E2E Report
-        uses: ./.github/actions/e2e-report
-        if: always()
-        with:
-          aws-s3-bucket: positron-test-reports
-          aws-role: ${{ secrets.AWS_TEST_REPORTS_ROLE }}
-          testrail-api-key: ${{ secrets.TESTRAIL_API_KEY }}
-          testrail-title: "E2E Electron Test Run"
-
-      - name: Send Slack Notification
-        uses: midleman/slack-workflow-status@master
-        if: always()
-        with:
-          repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
-          slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
-          notify_on: "failure"
diff --git a/.github/workflows/positron-merge-to-branch.yml b/.github/workflows/positron-merge-to-branch.yml
deleted file mode 100644
index c587edd0a38..00000000000
--- a/.github/workflows/positron-merge-to-branch.yml
+++ /dev/null
@@ -1,196 +0,0 @@
-name: "Test: Merge to branch"
-
-on:
-  push:
-    branches:
-      - main
-      - 'prerelease/**'
-  workflow_call:
-    inputs:
-      e2e_grep:
-        required: false
-        description: "Grep filter to apply to the e2e tests: @critical, @win, etc."
-        default: ""
-        type: string
-  workflow_dispatch:
-    inputs:
-      e2e_grep:
-        required: false
-        description: "Grep filter to apply to the e2e tests: @critical, @win, etc."
-        default: ""
-        type: string
-
-env:
-  E2E_GREP: ${{ inputs.e2e_grep || '' }}
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  e2e-electron:
-    timeout-minutes: 45
-    runs-on: ubuntu-latest-8x
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
-      _R_CHECK_CRAN_INCOMING_: false
-      _R_CHECK_SYSTEM_CLOCK_: false
-      AWS_S3_BUCKET: positron-test-reports
-      REPORT_DIR: playwright-report-${{ github.run_id }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
-      - name: Setup Build and Compile
-        uses: ./.github/actions/setup-build-env
-
-      - name: Setup E2E Test Environment
-        uses: ./.github/actions/setup-test-env
-        with:
-          aws-role-to-assume: ${{ secrets.QA_AWS_RO_ROLE }}
-          aws-region: ${{ secrets.QA_AWS_REGION }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Send HTML report URL to GitHub Summary
-        if: ${{ !cancelled() }}
-        run: |
-          REPORT_URL="https://d38p2avprg8il3.cloudfront.net/${{ env.REPORT_DIR }}/index.html"
-          echo "Report URL: $REPORT_URL"
-          echo "📄 [Playwright Report]($REPORT_URL) <br>" > $GITHUB_STEP_SUMMARY
-
-      - name: Run Playwright Tests (Electron)
-        env:
-          POSITRON_PY_VER_SEL: 3.10.12
-          POSITRON_R_VER_SEL: 4.4.0
-          CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}
-          CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
-          COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }}
-          PWTEST_BLOB_DO_NOT_REMOVE: 1
-          CURRENTS_TAG: "electron,${{ inputs.e2e_grep }}"
-        id: e2e-playwright-tests
-        run: DISPLAY=:10 npx playwright test --project e2e-electron --workers 2 --grep=${{ env.E2E_GREP }}
-
-      - name: Upload Playwright Report to S3
-        if: ${{ success() || failure() }}
-        uses: ./.github/actions/upload-report-to-s3
-        with:
-          role-to-assume: ${{ secrets.AWS_TEST_REPORTS_ROLE }}
-
-  unit-tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
-      _R_CHECK_CRAN_INCOMING_: false
-      _R_CHECK_SYSTEM_CLOCK_: false
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Cache node_modules, build, extensions, and remote
-        uses: ./.github/actions/cache-multi-paths
-
-      - name: Setup Build and Compile
-        uses: ./.github/actions/setup-build-env
-
-      - name: Install Positron License
-        uses: ./.github/actions/install-license
-        with:
-          github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
-          license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
-
-      # one unit test needs this: Can list tables and fields from R connections
-      - name: Setup R
-        uses: ./.github/actions/install-r
-        with:
-          version: "4.4.0"
-
-      - name: Run Unit Tests (Electron)
-        id: electron-unit-tests
-        run: DISPLAY=:10 ./scripts/test.sh
-
-      - name: Run Unit Tests (node.js)
-        id: nodejs-unit-tests
-        run: yarn test-node
-
-      - name: Run Unit Tests (Browser, Chromium)
-        id: browser-unit-tests
-        run: DISPLAY=:10 yarn test-browser-no-install --browser chromium
-
-  integration-tests:
-      runs-on: ubuntu-latest-4x
-      timeout-minutes: 30
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        POSITRON_BUILD_NUMBER: 0 # CI skips building releases
-        _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
-        _R_CHECK_CRAN_INCOMING_: false
-        _R_CHECK_SYSTEM_CLOCK_: false
-      steps:
-        - uses: actions/checkout@v4
-
-        - uses: actions/setup-node@v4
-          with:
-            node-version-file: .nvmrc
-
-        - name: Cache node_modules, build, extensions, and remote
-          uses: ./.github/actions/cache-multi-paths
-
-        - name: Setup Build and Compile
-          uses: ./.github/actions/setup-build-env
-
-        - name: Install Positron License
-          uses: ./.github/actions/install-license
-          with:
-            github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
-            license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
-
-        # one integration test needs this: Connections pane works for R
-        - name: Setup R
-          uses: ./.github/actions/install-r
-          with:
-            version: "4.4.0"
-
-        - name: Compile Integration Tests
-          run: yarn --cwd test/integration/browser compile
-
-        - name: Run Integration Tests (Electron)
-          id: electron-integration-tests
-          run: DISPLAY=:10 ./scripts/test-integration-pr.sh
-
-        - name: Run Integration Tests (Remote)
-          if: ${{ job.status != 'cancelled' && (success() || failure()) }}
-          id: electron-remote-integration-tests
-          run: DISPLAY=:10 ./scripts/test-remote-integration.sh
-
-        - name: Run Integration Tests (Browser, Chromium)
-          if: ${{ job.status != 'cancelled' && (success() || failure()) }}
-          id: browser-integration-tests
-          run: DISPLAY=:10 ./scripts/test-web-integration.sh --browser chromium
-
-  slack-notify:
-    if: ${{ failure() && inputs.e2e_grep == '' }}
-    needs: [unit-tests, integration-tests, e2e-electron]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Slack Notification
-        uses: midleman/slack-workflow-status@master
-        with:
-          repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
-          slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
-          notify_on: "failure"
-
-
diff --git a/.github/workflows/positron-pull-requests.yml b/.github/workflows/positron-pull-requests.yml
deleted file mode 100644
index ee4a57157f2..00000000000
--- a/.github/workflows/positron-pull-requests.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: "Test: Pull Request"
-
-on:
-  pull_request:
-    branches:
-      - main
-      - 'prerelease/**'
-
-jobs:
-  tests:
-    uses: ./.github/workflows/positron-merge-to-branch.yml
-    secrets: inherit
-    with:
-      e2e_grep: "@critical"
diff --git a/.github/workflows/test-e2e-linux.yml b/.github/workflows/test-e2e-linux.yml
new file mode 100644
index 00000000000..7590b33da10
--- /dev/null
+++ b/.github/workflows/test-e2e-linux.yml
@@ -0,0 +1,127 @@
+name: "Test: E2E (Linux)"
+
+on:
+  workflow_call:
+    inputs:
+      grep:
+        required: false
+        description: "Only run tests matching this regex. Supports tags (comma-separated), titles, filenames. Confirm pattern matching locally with: npx playwright test --grep=<regex>"
+        default: "@critical"
+        type: string
+      project:
+        required: false
+        description: "The name of the Playwright project to run tests for."
+        default: "e2e-electron"
+        type: string
+      repeat_each:
+        required: false
+        description: "Run each test N times, defaults to one."
+        default: 1
+        type: number
+      display_name:
+        required: false
+        description: "The name of the job as it will appear in the GitHub Actions UI."
+        default: "e2e-linux"
+        type: string
+      currents_tags:
+        required: false
+        description: "The tags to use for Currents recording."
+        default: "@linux"
+        type: string
+
+  workflow_dispatch:
+    inputs:
+      project:
+        required: false
+        description: "The name of the Playwright project to run tests for."
+        default: "e2e-electron"
+        type: choice
+        options:
+          - e2e-electron
+          - e2e-browser
+      grep:
+        required: false
+        description: "Run tests matching a regular expression. Supports tags, test titles, and filenames. Leave blank to run all tests. For project `e2e-browser`, tests tagged with @web are pre-filtered; additional tags, titles, or filenames can be specified to refine filtering."
+        default: "@critical"
+        type: string
+      repeat_each:
+        required: false
+        description: "Run each test N times, defaults to one."
+        default: 1
+        type: number
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  e2e-linux:
+    name: ${{ inputs.display_name || 'e2e-linux' }}
+    timeout-minutes: 45
+    runs-on: ubuntu-latest-8x
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
+      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
+      _R_CHECK_CRAN_INCOMING_: false
+      _R_CHECK_SYSTEM_CLOCK_: false
+      AWS_S3_BUCKET: positron-test-reports
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
+      - name: Transform to Playwright tags $PW_TAGS
+        run: bash scripts/pr-tags-transform.sh ${{ inputs.project}} "${{ inputs.grep }}"
+        shell: bash
+
+      - name: Cache node_modules, build, extensions, and remote
+        uses: ./.github/actions/cache-multi-paths
+
+      - name: Setup Build and Compile
+        uses: ./.github/actions/setup-build-env
+
+      - name: Install Positron License
+        uses: ./.github/actions/install-license
+        with:
+          github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
+          license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
+
+      - name: Setup E2E Test Environment
+        uses: ./.github/actions/setup-test-env
+        with:
+          aws-role-to-assume: ${{ secrets.QA_AWS_RO_ROLE }}
+          aws-region: ${{ secrets.QA_AWS_REGION }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Preloading ensures the Node.js binary is fully built and ready before
+      # any parallel processes start, preventing runtime conflicts
+      - name: Preload Node.js Binary
+        if: ${{ inputs.project == 'e2e-browser' }}
+        run: yarn gulp node
+
+      - name: Send Results to GH Summary
+        uses: ./.github/actions/gen-report-dir
+        if: ${{ !cancelled() }}
+
+      - name: Run Playwright Tests (Electron)
+        env:
+          POSITRON_PY_VER_SEL: 3.10.12
+          POSITRON_R_VER_SEL: 4.4.0
+          CURRENTS_RECORD_KEY: ${{ secrets.CURRENTS_RECORD_KEY }}
+          CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
+          COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }}
+          PWTEST_BLOB_DO_NOT_REMOVE: 1
+          CURRENTS_TAG: ${{ inputs.currents_tags || 'electron/linux' }}
+        run: |
+          DISPLAY=:10 npx playwright test --project ${{ inputs.project }} --workers 2 --grep "${{ env.PW_TAGS }}" --repeat-each ${{ inputs.repeat_each }}
+
+      - name: Upload Playwright Report to S3
+        if: ${{ success() || failure() }}
+        uses: ./.github/actions/upload-report-to-s3
+        with:
+          role-to-assume: ${{ secrets.AWS_TEST_REPORTS_ROLE }}
+          report-dir: ${{ env.REPORT_DIR }}
+
diff --git a/.github/workflows/e2e-test-release-run-ubuntu.yml b/.github/workflows/test-e2e-release.yml
similarity index 75%
rename from .github/workflows/e2e-test-release-run-ubuntu.yml
rename to .github/workflows/test-e2e-release.yml
index 6e827c2c79f..28ade97ce30 100644
--- a/.github/workflows/e2e-test-release-run-ubuntu.yml
+++ b/.github/workflows/test-e2e-release.yml
@@ -1,25 +1,28 @@
-name: "Latest Release: E2E Electron Tests"
+name: "Test: E2E (Latest Release)"
 
 on:
   workflow_dispatch:
     inputs:
-      e2e_grep:
+      grep:
         required: false
-        description: "Grep filter to apply to the e2e tests: @critical, @win, etc."
+        description: "Grep filter to apply to the e2e tests: @critical, @console, etc. Leave blank to run all tests."
         default: ""
         type: string
+      notify_on:
+        description: "Slack notification on:"
+        required: false
+        default: "failure"
+        type: choice
+        options:
+          - failure
+          - always
 
 permissions:
   id-token: write
   contents: read
 
-env:
-  E2E_GREP: ${{ inputs.e2e_grep || '' }}
-  REPORT_DIR: playwright-report-${{ github.run_id }}
-
 jobs:
-  linux:
-    name: e2e-electron-tests
+  e2e-electron:
     runs-on: ubuntu-latest-8x
     timeout-minutes: 45
     steps:
@@ -76,12 +79,13 @@ jobs:
           sudo update-rc.d xvfb defaults
           sudo service xvfb start
 
-      - name: Send HTML report URL to GitHub Summary
+      - name: Send Results to GH Summary
+        uses: ./.github/actions/gen-report-dir
         if: ${{ !cancelled() }}
-        run: |
-          REPORT_URL="https://d38p2avprg8il3.cloudfront.net/${{ env.REPORT_DIR }}/index.html"
-          echo "Report URL: $REPORT_URL"
-          echo "📄 [Playwright Report]($REPORT_URL) <br>" > $GITHUB_STEP_SUMMARY
+
+      - name: Transform to Playwright Tags $PW_TAGS
+        run: bash scripts/pr-tags-transform "e2e-electron" "${{ inputs.grep }}"
+        shell: bash
 
       - name: Run Tests (Electron)
         if: ${{ !cancelled() }}
@@ -92,15 +96,27 @@ jobs:
           CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
           COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }}
           PWTEST_BLOB_DO_NOT_REMOVE: 1
-          CURRENTS_TAG: "electron,release,${{ inputs.e2e_grep }}"
+          CURRENTS_TAG: "release,electron/linux"
         id: electron-e2e-tests
         run: |
           export DISPLAY=:10
-          BUILD=/usr/share/positron npx playwright test --project e2e-electron --workers 3 --grep=${{ env.E2E_GREP }}
+          BUILD=/usr/share/positron npx playwright test --project e2e-electron --workers 2 --grep=${{ env.PW_TAGS }}
 
       - name: Upload Playwright Report to S3
         if: ${{ !cancelled() }}
         uses: ./.github/actions/upload-report-to-s3
         with:
           role-to-assume: ${{ secrets.AWS_TEST_REPORTS_ROLE }}
+          report-dir: ${{ env.REPORT_DIR }}
 
+  slack-notify:
+    needs: [e2e-electron]
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Notify Slack
+        uses: midleman/slack-workflow-status@master
+        with:
+          repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
+          slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
+          notify_on: ${{ inputs.notify_on }}
diff --git a/.github/workflows/positron-windows-nightly.yml b/.github/workflows/test-e2e-windows.yml
similarity index 66%
rename from .github/workflows/positron-windows-nightly.yml
rename to .github/workflows/test-e2e-windows.yml
index ce94ae11dd4..b517cd4de03 100644
--- a/.github/workflows/positron-windows-nightly.yml
+++ b/.github/workflows/test-e2e-windows.yml
@@ -1,17 +1,48 @@
-name: "Test: E2E Tests (Windows)"
-
-# Run tests daily at 4am UTC (11p EST) on weekdays for now, or manually
+name: "Test: E2E (Windows)"
 on:
-  schedule:
-    - cron: "0 4 * * 1-5"
+  workflow_call:
+    inputs:
+      grep:
+        required: false
+        description: "Only run tests matching this regex. Supports tags (comma-separated), titles, filenames, etc. For windows, use this format: (?=.*@win)(?=.*@feature)"
+        default: "@win"
+        type: string
+      repeat_each:
+        required: false
+        description: "Run each test N times, defaults to one."
+        default: 1
+        type: number
+      display_name:
+        required: false
+        description: "The name of the job as it will appear in the GitHub Actions UI."
+        default: "e2e-windows"
+        type: string
+      currents_tags:
+        required: false
+        description: "The tags to use for Currents recording."
+        default: ""
+        type: string
+
   workflow_dispatch:
+    inputs:
+      grep:
+        required: false
+        description: "Tests tagged with @win are pre-filtered. Specify other tags, test titles, filenames, etc. to filter tests further."
+        default: "@win"
+        type: string
+      repeat_each:
+        required: false
+        description: "Run each test N times, defaults to one."
+        default: 1
+        type: number
 
 permissions:
   id-token: write
   contents: read
 
 jobs:
-  e2e-windows-tests:
+  e2e-windows:
+    name: ${{ inputs.display_name }}
     runs-on:
       labels: [windows-latest-8x]
     timeout-minutes: 80
@@ -104,6 +135,14 @@ jobs:
           role-to-assume: ${{ secrets.QA_AWS_RO_ROLE }}
           aws-region: ${{ secrets.QA_AWS_REGION }}
 
+      - name: Transform to Playwright tags $PW_TAGS
+        run: bash scripts/pr-tags-transform.sh "e2e-windows" "${{ inputs.grep }}"
+        shell: bash
+
+      - name: Send Results to GH Summary
+        uses: ./.github/actions/gen-report-dir
+        if: ${{ !cancelled() }}
+
       - name: Run Tests on Windows (Electron)
         env:
           POSITRON_PY_VER_SEL: 3.10.10
@@ -113,56 +152,13 @@ jobs:
           CURRENTS_CI_BUILD_ID: ${{ github.run_id }}-${{ github.run_attempt }}
           COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }} # only works on push events
           PWTEST_BLOB_DO_NOT_REMOVE: 1
-          CURRENTS_TAG: "electron,@win"
+          CURRENTS_TAG: ${{ inputs.currents_tags || 'electron/win'}}
         if: ${{ !cancelled() }}
-        id: e2e-win-electron-tests
-        run: npx playwright test --project e2e-electron --grep "@win" --workers 2
+        run: npx playwright test --project "e2e-windows" --grep "${{ env.PW_TAGS }}" --workers 2 --repeat-each ${{ inputs.repeat_each }}
 
-      - name: Upload blob report
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: blob-report-electron
-          path: blob-report
-          retention-days: 14
-
-      - name: Upload junit report
-        if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: junit-report-electron
-          path: test-results/junit.xml
-
-  e2e-report:
-    if: always()
-    runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/playwright:v1.48.0-jammy
-    needs: e2e-windows-tests
-    env:
-      REPORT_DIR: playwright-report-${{ github.run_id }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: .nvmrc
-
-      - name: Run E2E Report
-        uses: ./.github/actions/e2e-report
-        if: always()
-        with:
-          aws-s3-bucket: positron-test-reports
-          aws-role: ${{ secrets.AWS_TEST_REPORTS_ROLE }}
-          testrail-api-key: ${{ secrets.TESTRAIL_API_KEY }}
-          testrail-title: "E2E Electron Test Run"
-
-      - name: Send Slack Notification
-        uses: midleman/slack-workflow-status@master
-        if: always()
+      - name: Upload Playwright Report to S3
+        if: ${{ success() || failure() }}
+        uses: ./.github/actions/upload-report-to-s3
         with:
-          repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
-          slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
-          notify_on: "failure"
+          role-to-assume: ${{ secrets.AWS_TEST_REPORTS_ROLE }}
+          report-dir: ${{ env.REPORT_DIR }}
diff --git a/.github/workflows/test-full-suite.yml b/.github/workflows/test-full-suite.yml
new file mode 100644
index 00000000000..42d37548159
--- /dev/null
+++ b/.github/workflows/test-full-suite.yml
@@ -0,0 +1,99 @@
+name: "Test: Full Suite"
+
+on:
+  schedule:
+    - cron: "0 4 * * 1-5" # Run at 4 AM UTC on weekdays
+
+  workflow_dispatch:
+      inputs:
+        run_e2e_linux:
+          description: "E2E Tests / Electron (Linux)"
+          required: false
+          default: true
+          type: boolean
+        run_e2e_windows:
+          description: "E2E Tests / Electron (Windows)"
+          required: false
+          default: true
+          type: boolean
+        run_e2e_browser:
+          description: "E2E Tests / Chromium (Linux)"
+          required: false
+          default: true
+          type: boolean
+        run_unit_tests:
+          description: "Unit Tests"
+          required: false
+          default: true
+          type: boolean
+        run_integration_tests:
+          description: "Integration Tests"
+          required: false
+          default: true
+          type: boolean
+        notify_on:
+            description: "Slack notification on:"
+            required: false
+            default: "failure"
+            type: choice
+            options:
+              - failure
+              - always
+
+jobs:
+  e2e-electron:
+    name: e2e
+    if: ${{ inputs.run_e2e_linux }}
+    uses: ./.github/workflows/test-e2e-linux.yml
+    with:
+      grep: ""
+      project: "e2e-electron"
+      display_name: "electron (linux)"
+      currents_tags: ${{ github.event_name == 'schedule' && 'nightly,electron/linux' || 'electron/linux' }}
+    secrets: inherit
+
+  e2e-windows:
+    name: e2e
+    if: ${{ inputs.run_e2e_windows }}
+    uses: ./.github/workflows/test-e2e-windows.yml
+    with:
+      grep: ""
+      display_name: "electron (win)"
+      currents_tags: ${{ github.event_name == 'schedule' && 'nightly,electron/win' || 'electron/win' }}
+    secrets: inherit
+
+  e2e-browser:
+    name: e2e
+    if: ${{ inputs.run_e2e_browser }}
+    uses: ./.github/workflows/test-e2e-linux.yml
+    with:
+      grep: ""
+      project: "e2e-browser"
+      display_name: "browser (linux)"
+      currents_tags: ${{ github.event_name == 'schedule' && 'nightly,browser/linux' || 'browser/linux' }}
+    secrets: inherit
+
+  unit-tests:
+    name: test
+    if: ${{ inputs.run_unit_tests }}
+    uses: ./.github/workflows/test-unit.yml
+    secrets: inherit
+
+  integration-tests:
+    name: test
+    if: ${{ inputs.run_integration_tests }}
+    uses: ./.github/workflows/test-integration.yml
+    secrets: inherit
+
+  slack-notify:
+    needs: [e2e-electron, e2e-windows, e2e-browser, unit-tests, integration-tests]
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Notify Slack
+        uses: midleman/slack-workflow-status@master
+        with:
+          repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
+          slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
+          notify_on: ${{ inputs.notify_on }}
+
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
new file mode 100644
index 00000000000..cc9b866aa35
--- /dev/null
+++ b/.github/workflows/test-integration.yml
@@ -0,0 +1,62 @@
+name: "Test: Integration"
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  integration-tests:
+    name: integration
+    runs-on: ubuntu-latest-4x
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
+      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
+      _R_CHECK_CRAN_INCOMING_: false
+      _R_CHECK_SYSTEM_CLOCK_: false
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
+      - name: Cache node_modules, build, extensions, and remote
+        uses: ./.github/actions/cache-multi-paths
+
+      - name: Setup Build and Compile
+        uses: ./.github/actions/setup-build-env
+
+      - name: Install Positron License
+        uses: ./.github/actions/install-license
+        with:
+          github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
+          license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
+
+      # one integration test needs this: Connections pane works for R
+      - name: Setup R
+        uses: ./.github/actions/install-r
+        with:
+            version: "4.4.0"
+
+      - name: Compile Integration Tests
+        run: yarn --cwd test/integration/browser compile
+
+      - name: Run Integration Tests (Electron)
+        id: electron-integration-tests
+        run: DISPLAY=:10 ./scripts/test-integration-pr.sh
+
+      - name: Run Integration Tests (Remote)
+        if: ${{ job.status != 'cancelled' && (success() || failure()) }}
+        id: electron-remote-integration-tests
+        run: DISPLAY=:10 ./scripts/test-remote-integration.sh
+
+      - name: Run Integration Tests (Browser, Chromium)
+        if: ${{ job.status != 'cancelled' && (success() || failure()) }}
+        id: browser-integration-tests
+        run: DISPLAY=:10 ./scripts/test-web-integration.sh --browser chromium
diff --git a/.github/workflows/test-merge.yml b/.github/workflows/test-merge.yml
new file mode 100644
index 00000000000..aac61e068b4
--- /dev/null
+++ b/.github/workflows/test-merge.yml
@@ -0,0 +1,42 @@
+name: "Test: Merge to branch"
+
+on:
+  push:
+    branches:
+      - main
+      - 'prerelease/**'
+
+jobs:
+  e2e-electron:
+    name: e2e
+    uses: ./.github/workflows/test-e2e-linux.yml
+    with:
+      grep: ""
+      project: "e2e-electron"
+      display_name: "electron (linux)"
+      currents_tags: "merge,electron/linux"
+    secrets: inherit
+
+  unit-tests:
+    name: test
+    uses: ./.github/workflows/test-unit.yml
+    secrets: inherit
+
+  integration-tests:
+    name: test
+    uses: ./.github/workflows/test-integration.yml
+    secrets: inherit
+
+  slack-notify:
+    if: failure()
+    needs: [unit-tests, integration-tests, e2e-electron]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Slack Notification
+        uses: midleman/slack-workflow-status@master
+        with:
+          repo_token: ${{ secrets.POSITRON_GITHUB_PAT }}
+          slack_webhook_url: ${{ secrets.SLACK_TEST_RESULTS_WEBHOOK_URL }}
+          notify_on: "failure"
+
+
diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml
new file mode 100644
index 00000000000..4c4226d9530
--- /dev/null
+++ b/.github/workflows/test-pull-request.yml
@@ -0,0 +1,42 @@
+name: "Test: PR"
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+      - 'prerelease/**'
+
+jobs:
+  pr-tags:
+    runs-on: ubuntu-latest
+    outputs:
+      tags: ${{ steps.pr-tags.outputs.tags }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Parse Tags from PR Body
+        id: pr-tags
+        run: bash scripts/pr-tags-parse.sh "${{ github.event_path }}"
+
+  e2e-electron:
+    name: e2e
+    uses: ./.github/workflows/test-e2e-linux.yml
+    needs: pr-tags
+    with:
+      grep: ${{ needs.pr-tags.outputs.tags }}
+      display_name: "electron (linux)"
+      currents_tags: "pull-request,electron/linux,${{ needs.pr-tags.outputs.tags }}"
+    secrets: inherit
+
+  unit-tests:
+    name: test
+    uses: ./.github/workflows/test-unit.yml
+    secrets: inherit
+
+  integration-tests:
+    name: test
+    uses: ./.github/workflows/test-integration.yml
+    secrets: inherit
+
+
+
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
new file mode 100644
index 00000000000..0810de85333
--- /dev/null
+++ b/.github/workflows/test-unit.yml
@@ -0,0 +1,57 @@
+name: "Test: Unit"
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  unit-tests:
+    name: unit
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      POSITRON_BUILD_NUMBER: 0 # CI skips building releases
+      _R_CHECK_FUTURE_FILE_TIMESTAMPS_: false # this check can be flaky in the R pkg tests
+      _R_CHECK_CRAN_INCOMING_: false
+      _R_CHECK_SYSTEM_CLOCK_: false
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+
+      - name: Cache node_modules, build, extensions, and remote
+        uses: ./.github/actions/cache-multi-paths
+
+      - name: Setup Build and Compile
+        uses: ./.github/actions/setup-build-env
+
+      - name: Install Positron License
+        uses: ./.github/actions/install-license
+        with:
+          github-token: ${{ secrets.POSITRON_GITHUB_PAT }}
+          license-key: ${{ secrets.POSITRON_DEV_LICENSE }}
+
+      # one unit test needs this: Can list tables and fields from R connections
+      - name: Setup R
+        uses: ./.github/actions/install-r
+        with:
+          version: "4.4.0"
+
+      - name: Run Unit Tests (Electron)
+        id: electron-unit-tests
+        run: DISPLAY=:10 ./scripts/test.sh
+
+      - name: Run Unit Tests (node.js)
+        id: nodejs-unit-tests
+        run: yarn test-node
+
+      - name: Run Unit Tests (Browser, Chromium)
+        id: browser-unit-tests
+        run: DISPLAY=:10 yarn test-browser-no-install --browser chromium
diff --git a/build/secrets/.secrets.baseline b/build/secrets/.secrets.baseline
index 75ffc29a385..79e1b3af552 100644
--- a/build/secrets/.secrets.baseline
+++ b/build/secrets/.secrets.baseline
@@ -133,14 +133,31 @@
     }
   ],
   "results": {
-    ".github/workflows/positron-pull-requests.yml": [
+    ".github/workflows/test-full-suite.yml": [
       {
         "type": "Secret Keyword",
-        "filename": ".github/workflows/positron-pull-requests.yml",
+        "filename": ".github/workflows/test-full-suite.yml",
         "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
         "is_verified": false,
-        "line_number": 12,
-        "is_secret": false
+        "line_number": 53
+      }
+    ],
+    ".github/workflows/test-merge.yml": [
+      {
+        "type": "Secret Keyword",
+        "filename": ".github/workflows/test-merge.yml",
+        "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
+        "is_verified": false,
+        "line_number": 18
+      }
+    ],
+    ".github/workflows/test-pull-request.yml": [
+      {
+        "type": "Secret Keyword",
+        "filename": ".github/workflows/test-pull-request.yml",
+        "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
+        "is_verified": false,
+        "line_number": 29
       }
     ],
     "build/azure-pipelines/alpine/product-build-alpine.yml": [
@@ -577,10 +594,9 @@
       {
         "type": "Hex High Entropy String",
         "filename": "product.json",
-        "hashed_secret": "0570cc883d4d190824469556cde84c3f48169c94",
+        "hashed_secret": "aa5db2e10c46111cbb98fa5d5bf0f7a51937dbfe",
         "is_verified": false,
-        "line_number": 229,
-        "is_secret": false
+        "line_number": 229
       }
     ],
     "scripts/playground-server.ts": [
@@ -1855,10 +1871,19 @@
         "filename": "src/vs/workbench/services/environment/browser/environmentService.ts",
         "hashed_secret": "3a8f125da17a2c187d430daf0045e0fdfa707bdd",
         "is_verified": false,
-        "line_number": 273,
+        "line_number": 276,
         "is_secret": false
       }
     ],
+    "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts": [
+      {
+        "type": "IBM Cloud IAM Key",
+        "filename": "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts",
+        "hashed_secret": "0d43d6e259826e4ecbda1644424b26de54faa665",
+        "is_verified": false,
+        "line_number": 97
+      }
+    ],
     "src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html": [
       {
         "type": "Base64 High Entropy String",
@@ -1908,5 +1933,5 @@
       }
     ]
   },
-  "generated_at": "2024-11-18T21:27:12Z"
+  "generated_at": "2024-12-10T16:17:08Z"
 }
diff --git a/package.json b/package.json
index 77906a741c8..95096e35dc2 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "e2e": "yarn e2e-electron",
     "e2e-electron": "npx playwright test --project e2e-electron",
     "e2e-browser": "npx playwright test --project e2e-browser",
-    "e2e-pr": "npx playwright test --project e2e-electron --grep @pr",
+    "e2e-pr": "npx playwright test --project e2e-electron --grep @critical",
     "e2e-win": "npx playwright test --project e2e-electron --grep @win",
     "e2e-failed": "npx playwright test --last-failed",
     "e2e-ui": "npx playwright test --ui",
diff --git a/playwright.config.ts b/playwright.config.ts
index 9c94a6c0472..daa956fd934 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -78,5 +78,13 @@ export default defineConfig<CustomTestOptions>({
 			},
 			grep: /@web/
 		},
+		{
+			name: 'e2e-windows',
+			use: {
+				web: false,
+				artifactDir: 'e2e-windows',
+			},
+			grep: /@win/
+		},
 	],
 });
diff --git a/scripts/pr-tags-parse.sh b/scripts/pr-tags-parse.sh
new file mode 100644
index 00000000000..574f78bf30e
--- /dev/null
+++ b/scripts/pr-tags-parse.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# Usage:
+# bash parse-pr-tags.sh "<GITHUB_EVENT_PATH>"
+# Example:
+# bash parse-pr-tags.sh "/path/to/event.json"
+
+# Input: Path to the GitHub event JSON file
+GITHUB_EVENT_PATH="$1"
+
+# Extract the PR body from the event JSON
+echo "Extracting PR body..."
+PR_BODY=$(jq -r '.pull_request.body' "$GITHUB_EVENT_PATH" | tr '\n' ' ' | sed 's/"/\\"/g')
+
+echo "Parsing tags from PR body..."
+
+# Check if @:all is present in the PR body
+if echo "$PR_BODY" | grep -q "@:all"; then
+  echo "Found @:all tag in PR body. Setting tags to run all tests."
+  TAGS="" # Set to an empty string to indicate all tests should run
+else
+  # Parse tags starting with '@:' and convert to '@'
+  TAGS=$(echo "$PR_BODY" | grep -o "@:[a-zA-Z0-9_-]*" | sed 's/@://g' | sed 's/^/@/' | tr '\n' ',' | sed 's/,$//')
+
+  # Always add @critical if not already included
+  if [[ ! "$TAGS" =~ "@critical" ]]; then
+    if [[ -n "$TAGS" ]]; then
+      TAGS="@critical,$TAGS"
+    else
+      TAGS="@critical"
+    fi
+  fi
+fi
+
+# Output the tags
+echo "Extracted Tags: $TAGS"
+
+# Save tags to GITHUB_OUTPUT for use in GitHub Actions
+if [[ -n "$GITHUB_OUTPUT" ]]; then
+  echo "tags=$TAGS" >> "$GITHUB_OUTPUT"
+else
+  echo "Warning: GITHUB_OUTPUT is not set. Tags will not be available to the workflow."
+fi
diff --git a/scripts/pr-tags-transform.sh b/scripts/pr-tags-transform.sh
new file mode 100644
index 00000000000..aed42403a58
--- /dev/null
+++ b/scripts/pr-tags-transform.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# Usage:
+# bash scripts/playwright-tags.sh <project> <tags>
+# Example:
+# bash scripts/playwright-tags.sh "e2e-browser" "@feat1,@feat2"
+
+# Input parameters
+PROJECT="$1"  # The PROJECT (e.g., e2e-electron, e2e-browser, e2e-windows)
+TAGS="$2"     # Comma-separated tags (e.g., "@feat1,@feat2")
+
+# Debug initial inputs
+echo "Input:"
+echo "  * Project: '$PROJECT'"
+echo "  * Tags: '$TAGS'"
+
+# Initialize regex or output
+OUTPUT=""
+
+# Filter and preprocess tags based on project
+if [[ "$PROJECT" == "e2e-windows" ]]; then
+  # Remove @win from the tags
+  TAGS=$(echo "$TAGS" | tr ',' '\n' | grep -v "@win" | sort -u | tr '\n' ',' | sed 's/,$//')
+elif [[ "$PROJECT" == "e2e-browser" ]]; then
+  # Remove @web from the tags
+  TAGS=$(echo "$TAGS" | tr ',' '\n' | grep -v "@web" | sort -u | tr '\n' ',' | sed 's/,$//')
+else
+  # Deduplicate for other projects
+  TAGS=$(echo "$TAGS" | tr ',' '\n' | sort -u | tr '\n' ',' | sed 's/,$//')
+fi
+
+# Determine prefix based on PROJECT
+case "$PROJECT" in
+  "e2e-browser")
+    OUTPUT="(?=.*@web)"  # Base tag for browser
+    ;;
+  "e2e-windows")
+    OUTPUT="(?=.*@win)"  # Base tag for windows
+    ;;
+  "e2e-electron")
+    OUTPUT="" # No prefix for linux
+    ;;
+  *)
+    echo "Unknown PROJECT: $PROJECT"
+    exit 1
+    ;;
+esac
+
+# Append OR logic for additional tags
+if [[ -n "$TAGS" ]]; then
+  # Convert comma-separated tags into OR regex format
+  TAGS_REGEX=$(echo "$TAGS" | tr ',' '|' | sed 's/^/(?=.*(/;s/$/))/' | sed 's/|)/)/') # Create OR condition
+  OUTPUT="$OUTPUT$TAGS_REGEX"
+else
+  # Ensure OUTPUT remains explicitly an empty string if TAGS is empty
+  OUTPUT="${OUTPUT:-}"
+fi
+
+# Output the final string
+echo "Output:"
+echo "  * '${OUTPUT}'"  # Show quotes for clarity
+
+# Save to GITHUB_ENV
+echo "PW_TAGS=${OUTPUT}" >> $GITHUB_ENV
+
diff --git a/test/e2e/helpers/test-tags.ts b/test/e2e/helpers/test-tags.ts
index f941096eb67..2757f1b377b 100644
--- a/test/e2e/helpers/test-tags.ts
+++ b/test/e2e/helpers/test-tags.ts
@@ -3,6 +3,16 @@
  *  Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/**
+ * Use the tags listed below to selectively run e2e tests against your PR.
+ *
+ * - To run all e2e tests, include `@:all` in your PR description.
+ * - Avoid using `@:web` and `@:win` tags, as these are reserved for web and Windows platform-specific tests,
+ *   which are not currently configured to run in PR workflows.
+ *
+ * Each tag corresponds to a specific feature, functionality, or area of the application. Use them
+ * thoughtfully to ensure your tests align with the intended scope.
+ */
 export enum TestTags {
 	APPS = '@apps',
 	CONNECTIONS = '@connections',