Merge branch 'develop' into feat/cy-prompt

ryanthemanuel · web-flow · commit 3d2930cab606 · 2025-10-03T11:42:57.000-05:00
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -1,12 +1,13 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
 ## 15.4.0
 
-_Released 10/07/2025 (PENDING)_
+_Released 10/7/2025 (PENDING)_
 
 **Features:**
 
-- `cy.prompt` is now a reserved Cypress command, currently gated behind a feature flag that requires an invite from Cypress. This means any custom commands named 'prompt' will no longer work. Stay tuned for updates on when this feature will become more widely available. Addressed in [#31752](https://github.com/cypress-io/cypress/pull/31752).
+- Cypress Studio is now available by default. You no longer have to set the `experimentalStudio` flag. Addresses [#30997](https://github.com/cypress-io/cypress/issues/30997). Addressed in [#32571](https://github.com/cypress-io/cypress/pull/32571).
 - Added the `--posix-exit-codes` flag for the `run` command. When this flag is passed, Cypress will exit with 1 if any tests fail, rather than the number of failed tests. Addresses [#32605](https://github.com/cypress-io/cypress/issues/32605) and [#24695](https://github.com/cypress-io/cypress/issues/24695). Addressed in [#32609](https://github.com/cypress-io/cypress/pull/32609).
+- `cy.prompt` is now a reserved Cypress command, currently gated behind a feature flag that requires an invite from Cypress. This means any custom commands named 'prompt' will no longer work. Stay tuned for updates on when this feature will become more widely available. Addressed in [#31752](https://github.com/cypress-io/cypress/pull/31752).
 
 **Bugfixes:**
 
diff --git a/guides/studio-development.md b/guides/studio-development.md
@@ -17,7 +17,7 @@ To run against locally developed Studio:
   - Run `yarn cypress:open`
   - Log In to the Cloud via the App
   - Ensure the project has been setup in the `Cypress (staging)` if in staging environment or `Cypress Internal Org` if in production environment and has a `projectId` that represents that. If developing against locally running `cypress-services`, ensure that the project has the feature `studio-ai` enabled for it.
-  - Open a project that has `experimentalStudio: true` set in the `e2e` config of the `cypress.config.js|ts` file.
+  - Open a project with `e2e` tests.
   - Click to 'Add Commands to Test' after hovering over a test command.
 
 Note: When using the `CYPRESS_LOCAL_STUDIO_PATH` environment variable or when running the Cypress app via the locally cloned repository, we bypass our error reporting and instead log errors to the browser or node console.
diff --git a/packages/app/cypress.config.ts b/packages/app/cypress.config.ts
@@ -31,7 +31,6 @@ export default defineConfig({
   },
   'e2e': {
     experimentalRunAllSpecs: true,
-    experimentalStudio: true,
     experimentalOriginDependencies: true,
     baseUrl: 'http://localhost:5555',
     supportFile: 'cypress/e2e/support/e2eSupport.ts',
diff --git a/packages/app/cypress/e2e/studio/studio.cy.ts b/packages/app/cypress/e2e/studio/studio.cy.ts
@@ -29,18 +29,6 @@ describe('Cypress Studio', () => {
     })
   }
 
-  it('does not show the studio button if experimentalStudio is not enabled', () => {
-    loadProjectAndRunSpec({ cliArgs: ['--config', 'experimentalStudio=false'] })
-
-    cy.findByTestId('studio-button').should('not.exist')
-  })
-
-  it('shows the studio button if experimentalStudio is enabled', () => {
-    loadProjectAndRunSpec({ cliArgs: ['--config', 'experimentalStudio=true'] })
-
-    cy.findByTestId('studio-button').should('be.visible')
-  })
-
   it('does not display the launch studio button when test is pending', () => {
     loadProjectAndRunSpec({ specName: 'skipped.cy.js' })
 
@@ -1042,7 +1030,7 @@ it('new-test', function() {
     cy.percySnapshot()
   })
 
-  it('hides selector playground and studio controls when experimentalStudio is enabled', () => {
+  it('hides selector playground and studio controls', () => {
     launchStudio()
 
     cy.findByTestId('studio-panel').should('be.visible')
@@ -1235,18 +1223,6 @@ describe('studio functionality', () => {
     cy.scaffoldProject('run-all-specs')
     cy.openProject('run-all-specs')
 
-    // Enable experimental studio by modifying the config
-    cy.withCtx(async (ctx) => {
-      const configPath = 'cypress.config.js'
-      const configContent = await ctx.actions.file.readFileInProject(configPath)
-      const updatedConfig = configContent.replace(
-        'experimentalRunAllSpecs: true,',
-        'experimentalRunAllSpecs: true,\n    experimentalStudio: true,',
-      )
-
-      await ctx.actions.file.writeFileInProject(configPath, updatedConfig)
-    })
-
     cy.startAppServer('e2e')
     cy.visitApp()
     cy.specsPageIsVisible()
diff --git a/packages/app/src/runner/SpecRunnerOpenMode.vue b/packages/app/src/runner/SpecRunnerOpenMode.vue
@@ -327,17 +327,13 @@ const studioBetaAvailable = computed(() => {
 })
 
 const shouldShowStudioButton = computed(() => {
-  // Find the experimentalStudio config field
-  const experimentalStudioConfig = props.gql.currentProject?.config?.find((item) => item.field === 'experimentalStudio')
-  const experimentalStudioEnabled = experimentalStudioConfig?.value === true
-
   // Check if we're running all specs by looking at the route query
   const isRunningAllSpecs = route.query.file === '__all'
 
   // Studio can only be enabled for e2e testing
   const isE2ETesting = props.gql.currentProject?.currentTestingType === 'e2e'
 
-  return !!cloudStudioRequested.value && !studioStore.isOpen && experimentalStudioEnabled && !isRunningAllSpecs && isE2ETesting
+  return !!cloudStudioRequested.value && !studioStore.isOpen && !isRunningAllSpecs && isE2ETesting
 })
 
 const shouldShowStudioPanel = computed(() => {
diff --git a/packages/app/src/runner/reporter.ts b/packages/app/src/runner/reporter.ts
@@ -1,7 +1,6 @@
 import { getMobxRunnerStore, MobxRunnerStore, useSpecStore } from '../store'
 import { getReporterElement } from './utils'
 import { getEventManager } from '.'
-import { getRunnerConfigFromWindow } from './get-runner-config-from-window'
 import type { EventManager } from './event-manager'
 import { useRunnerUiStore } from '../store/runner-ui-store'
 
@@ -43,8 +42,6 @@ function renderReporter (
   const runnerUiStore = useRunnerUiStore()
   const specsStore = useSpecStore()
 
-  const config = getRunnerConfigFromWindow()
-
   const reporter = window.UnifiedRunner.React.createElement(window.UnifiedRunner.Reporter, {
     runMode: 'single' as const,
     runner: eventManager.reporterBus,
@@ -53,7 +50,7 @@ function renderReporter (
     error: null,
     resetStatsOnSpecChange: true,
     // Studio can only be enabled for e2e testing
-    studioEnabled: window.__CYPRESS_TESTING_TYPE__ === 'e2e' && config.experimentalStudio,
+    studioEnabled: window.__CYPRESS_TESTING_TYPE__ === 'e2e',
     runnerStore: store,
     testFilter: specsStore.testFilter,
   })
diff --git a/packages/config/src/options.ts b/packages/config/src/options.ts
@@ -16,6 +16,7 @@ const BREAKING_OPTION_ERROR_KEY: Readonly<AllCypressErrorNames[]> = [
   'EXPERIMENTAL_SINGLE_TAB_RUN_MODE',
   'VIDEO_UPLOAD_ON_PASSES_REMOVED',
   'RENAMED_CONFIG_OPTION',
+  'EXPERIMENTAL_STUDIO_REMOVED',
 ] as const
 
 type ValidationOptions = {
@@ -246,12 +247,6 @@ const driverConfigOptions: Array<DriverConfigOption> = [
     validation: validate.isBoolean,
     isExperimental: true,
     requireRestartOnChange: 'server',
-  }, {
-    name: 'experimentalStudio',
-    defaultValue: false,
-    validation: validate.isBoolean,
-    isExperimental: true,
-    requireRestartOnChange: 'server',
   }, {
     name: 'experimentalWebKitSupport',
     defaultValue: false,
@@ -626,6 +621,11 @@ export const breakingOptions: Readonly<BreakingOption[]> = [
     errorKey: 'VIDEO_UPLOAD_ON_PASSES_REMOVED',
     isWarning: true,
   },
+  {
+    name: 'experimentalStudio',
+    errorKey: 'EXPERIMENTAL_STUDIO_REMOVED',
+    isWarning: true,
+  },
 ] as const
 
 export const breakingRootOptions: Array<BreakingOption> = [
@@ -719,11 +719,6 @@ export const testingTypeBreakingOptions: { e2e: Array<BreakingOption>, component
       errorKey: 'CONFIG_FILE_INVALID_TESTING_TYPE_CONFIG_COMPONENT',
       isWarning: false,
     },
-    {
-      name: 'experimentalStudio',
-      errorKey: 'EXPERIMENTAL_STUDIO_E2E_ONLY',
-      isWarning: false,
-    },
     {
       name: 'testIsolation',
       errorKey: 'CONFIG_FILE_INVALID_TESTING_TYPE_CONFIG_COMPONENT',
diff --git a/packages/config/test/__snapshots__/index.spec.ts.snap b/packages/config/test/__snapshots__/index.spec.ts.snap
@@ -6,6 +6,7 @@ exports[`config/src/index > .getBreakingKeys > returns list of breaking config k
   "experimentalSessionAndOrigin",
   "experimentalSkipDomainInjection",
   "videoUploadOnPasses",
+  "experimentalStudio",
 ]
 `;
 
@@ -45,7 +46,6 @@ exports[`config/src/index > .getDefaultValues > returns list of public config ke
   "experimentalRunAllSpecs": false,
   "experimentalSingleTabRunMode": false,
   "experimentalSourceRewriting": false,
-  "experimentalStudio": false,
   "experimentalWebKitSupport": false,
   "fileServerFolder": "",
   "fixturesFolder": "cypress/fixtures",
@@ -141,7 +141,6 @@ exports[`config/src/index > .getDefaultValues > returns list of public config ke
   "experimentalRunAllSpecs": false,
   "experimentalSingleTabRunMode": false,
   "experimentalSourceRewriting": false,
-  "experimentalStudio": false,
   "experimentalWebKitSupport": false,
   "fileServerFolder": "",
   "fixturesFolder": "cypress/fixtures",
@@ -226,7 +225,6 @@ exports[`config/src/index > .getPublicConfigKeys > returns list of public config
   "experimentalPromptCommand",
   "experimentalSourceRewriting",
   "experimentalSingleTabRunMode",
-  "experimentalStudio",
   "experimentalWebKitSupport",
   "fileServerFolder",
   "fixturesFolder",
diff --git a/packages/config/test/project/utils.spec.ts b/packages/config/test/project/utils.spec.ts
@@ -994,6 +994,20 @@ describe('config/src/project/utils', () => {
       })
     })
 
+    it('warns if experimentalStudio is passed', async function () {
+      await defaults('experimentalStudio', true, {
+        experimentalStudio: true,
+      })
+
+      expect(errors.warning).toBeCalledWith('EXPERIMENTAL_STUDIO_REMOVED', {
+        configFile: 'cypress.config.js',
+        name: 'experimentalStudio',
+        newName: undefined,
+        testingType: undefined,
+        value: undefined,
+      })
+    })
+
     describe('.resolved', () => {
       it('sets reporter and port to cli', async () => {
         const obj = {
@@ -1032,7 +1046,6 @@ describe('config/src/project/utils', () => {
           experimentalPromptCommand: { value: false, from: 'default' },
           experimentalRunAllSpecs: { value: false, from: 'default' },
           experimentalSingleTabRunMode: { value: false, from: 'default' },
-          experimentalStudio: { value: false, from: 'default' },
           experimentalSourceRewriting: { value: false, from: 'default' },
           experimentalWebKitSupport: { value: false, from: 'default' },
           fileServerFolder: { value: '', from: 'default' },
@@ -1149,7 +1162,6 @@ describe('config/src/project/utils', () => {
           experimentalPromptCommand: { value: false, from: 'default' },
           experimentalRunAllSpecs: { value: false, from: 'default' },
           experimentalSingleTabRunMode: { value: false, from: 'default' },
-          experimentalStudio: { value: false, from: 'default' },
           experimentalSourceRewriting: { value: false, from: 'default' },
           experimentalWebKitSupport: { value: false, from: 'default' },
           fileServerFolder: { value: '', from: 'default' },
diff --git a/packages/data-context/schemas/schema.graphql b/packages/data-context/schemas/schema.graphql
@@ -1183,7 +1183,7 @@ enum ErrorTypeEnum {
   EXPERIMENTAL_SESSION_AND_ORIGIN_REMOVED
   EXPERIMENTAL_SINGLE_TAB_RUN_MODE
   EXPERIMENTAL_SKIP_DOMAIN_INJECTION_REMOVED
-  EXPERIMENTAL_STUDIO_E2E_ONLY
+  EXPERIMENTAL_STUDIO_REMOVED
   EXTENSION_NOT_LOADED
   FIREFOX_COULD_NOT_CONNECT
   FIXTURE_NOT_FOUND
diff --git a/packages/driver/cypress.config.ts b/packages/driver/cypress.config.ts
@@ -4,7 +4,6 @@ import { devServer as cypressWebpackDevServer } from '@cypress/webpack-dev-serve
 
 export const baseConfig: Cypress.ConfigOptions = {
   projectId: 'ypt4pf',
-  experimentalStudio: true,
   experimentalMemoryManagement: true,
   experimentalWebKitSupport: true,
   hosts: {
diff --git a/packages/errors/src/errors.ts b/packages/errors/src/errors.ts
@@ -1190,11 +1190,13 @@ export const AllCypressErrors = {
 
         If you have feedback about the experiment, please join the discussion here: http://on.cypress.io/single-tab-run-mode`
   },
-  EXPERIMENTAL_STUDIO_E2E_ONLY: () => {
+  EXPERIMENTAL_STUDIO_REMOVED: () => {
     return errTemplate`\
-        The ${fmt.highlight(`experimentalStudio`)} experiment is currently only supported for End to End Testing.
-
-        If you have feedback about the experiment, please join the discussion here: http://on.cypress.io/studio-beta`
+        The ${fmt.highlight(`experimentalStudio`)} option was removed in ${fmt.cypressVersion(`15.4.0`)}.
+        
+        Cypress Studio is now available for all users.
+        
+        You can safely remove this option from your config.`
   },
   EXPERIMENTAL_RUN_ALL_SPECS_E2E_ONLY: () => {
     const code = errPartial`
diff --git a/packages/errors/test/__snapshots__/EXPERIMENTAL_STUDIO_REMOVED.ansi b/packages/errors/test/__snapshots__/EXPERIMENTAL_STUDIO_REMOVED.ansi
@@ -0,0 +1,5 @@
+[31mThe [33mexperimentalStudio[39m[31m option was removed in Cypress version 15.4.0.[39m
+[31m[39m
+[31mCypress Studio is now available for all users.[39m
+[31m[39m
+[31mYou can safely remove this option from your config.[39m
diff --git a/packages/errors/test/visualSnapshotErrors.spec.ts b/packages/errors/test/visualSnapshotErrors.spec.ts
@@ -1036,7 +1036,7 @@ describe('visual error templates', () => {
       }
     },
 
-    EXPERIMENTAL_STUDIO_E2E_ONLY: () => {
+    EXPERIMENTAL_STUDIO_REMOVED: () => {
       return {
         default: [],
       }
diff --git a/packages/frontend-shared/src/locales/en-US.json b/packages/frontend-shared/src/locales/en-US.json
@@ -609,10 +609,6 @@
         "name": "Source rewriting",
         "description": "Enables AST-based JS/HTML rewriting. This may fix issues caused by the existing regex-based JS/HTML replacement algorithm. See [#5273](https://github.com/cypress-io/cypress/issues/5273) for details."
       },
-      "experimentalStudio": {
-        "name": "Studio",
-        "description": "Generate and save commands directly to your test suite by interacting with your app as an end user would."
-      },
       "experimentalPromptCommand": {
         "name": "Prompt command",
         "description": "Enables support for `cy.prompt`, an AI-powered command that turns natural language steps into executable Cypress test code."
diff --git a/packages/launchpad/cypress/e2e/config-warning.cy.ts b/packages/launchpad/cypress/e2e/config-warning.cy.ts
@@ -90,40 +90,6 @@ describe('experimentalSingleTabRunMode', () => {
   })
 })
 
-describe('experimentalStudio', () => {
-  it('is not a valid config for component testing', () => {
-    cy.scaffoldProject('experimentalSingleTabRunMode')
-    cy.openProject('experimentalSingleTabRunMode', ['--config-file', 'cypress-invalid-studio-experiment.config.js'])
-
-    cy.visitLaunchpad()
-    cy.get('[data-cy-testingtype="component"]').click()
-    cy.findByTestId('error-header')
-    cy.contains('The experimentalStudio experiment is currently only supported for End to End Testing.')
-  })
-
-  it('is a valid config for e2e testing', { defaultCommandTimeout: THIRTY_SECONDS }, () => {
-    cy.scaffoldProject('e2e')
-    cy.openProject('e2e')
-    cy.withCtx(async (ctx) => {
-      await ctx.actions.file.writeFileInProject('cypress.config.js', `
-        const { defineConfig } = require('cypress')
-
-        module.exports = defineConfig({
-          experimentalStudio: true,
-          e2e: {
-            experimentalStudio: true
-          },
-        })
-      `)
-    })
-
-    cy.visitLaunchpad()
-    cy.get('[data-cy-testingtype="e2e"]').click()
-    cy.findByTestId('launchpad-Choose a browser')
-    cy.get('h1').contains('Choose a browser')
-  })
-})
-
 describe('experimentalRunAllSpecs', () => {
   it('is a valid config for e2e testing', { defaultCommandTimeout: THIRTY_SECONDS }, () => {
     cy.scaffoldProject('run-all-specs')
diff --git a/packages/reporter/cypress.config.ts b/packages/reporter/cypress.config.ts
@@ -16,7 +16,6 @@ export default defineConfig({
   },
 
   e2e: {
-    experimentalStudio: true,
     baseUrl: 'http://localhost:5006',
     setupNodeEvents (on, config) {
       const express = require('express')
diff --git a/packages/server/lib/experiments.ts b/packages/server/lib/experiments.ts
@@ -55,7 +55,6 @@ const _summaries: StringValues = {
   experimentalModifyObstructiveThirdPartyCode: 'Applies `modifyObstructiveCode` to third party `.html` and `.js`, removes subresource integrity, and modifies the user agent in Electron.',
   experimentalSourceRewriting: 'Enables AST-based JS/HTML rewriting. This may fix issues caused by the existing regex-based JS/HTML replacement algorithm.',
   experimentalSingleTabRunMode: 'Runs all component specs in a single tab, trading spec isolation for faster run mode execution.',
-  experimentalStudio: 'Generate and save commands directly to your test suite by interacting with your app as an end user would.',
   experimentalWebKitSupport: 'Adds support for testing in the WebKit browser engine used by Safari. See https://on.cypress.io/webkit-experiment for more information.',
   experimentalRunAllSpecs: 'Enables the "Run All Specs" UI feature, allowing the execution of multiple specs sequentially',
   experimentalOriginDependencies: 'Enables support for `Cypress.require()` for including dependencies within the `cy.origin()` callback.',
@@ -78,7 +77,6 @@ const _names: StringValues = {
   experimentalModifyObstructiveThirdPartyCode: 'Modify Obstructive Third Party Code',
   experimentalSingleTabRunMode: 'Single Tab Run Mode',
   experimentalSourceRewriting: 'Improved Source Rewriting',
-  experimentalStudio: 'Studio',
   experimentalWebKitSupport: 'WebKit Support',
   experimentalRunAllSpecs: 'Run All Specs',
   experimentalOriginDependencies: 'Origin Dependencies',
diff --git a/packages/server/lib/project-base.ts b/packages/server/lib/project-base.ts
@@ -180,7 +180,7 @@ export class ProjectBase extends EE {
       })
     }
 
-    if (!cfg.isTextTerminal && cfg.resolved.experimentalStudio?.value) {
+    if (!cfg.isTextTerminal && this.testingType === 'e2e') {
       const studioLifecycleManager = new StudioLifecycleManager()
 
       studioLifecycleManager.initializeStudioManager({
diff --git a/packages/server/test/unit/project_spec.js b/packages/server/test/unit/project_spec.js
diff --git a/system-tests/__snapshots__/results_spec.ts.js b/system-tests/__snapshots__/results_spec.ts.js
