Merge branch 'develop' into new-chrome-flags-prefs

Author: jennifer-shehane

cli/CHANGELOG.md

@@ -14,6 +14,7 @@ _Released 10/20/2025 (PENDING)_
 - Fixed an issue where grouped command text jumps up and down when expanding and collapsing in the command log. Addressed in [#32757](https://github.com/cypress-io/cypress/pull/32757).
 - Fixed an issue where command snapshots were not correctly displayed in Studio. Addressed in [#32808](https://github.com/cypress-io/cypress/pull/32808).
 - Fixed an issue with grouped console prop items having a hard to read blue color in the console log and duplicate `:` characters being displayed. Addressed in [#32776](https://github.com/cypress-io/cypress/pull/32776).
+- Added more context to the error message shown when `cy.prompt()` fails to download. Addressed in [#32822](https://github.com/cypress-io/cypress/pull/32822).
 
 **Misc:**
 

packages/reporter/package.json

@@ -19,7 +19,7 @@
     "@cypress-design/css": "1.2.0",
     "@cypress-design/react-button": "^1.11.0",
     "@cypress-design/react-icon": "^1.31.0",
-    "@cypress/react-tooltip": "0.5.3",
+    "@cypress/react-tooltip": "0.5.4",
     "@fontsource/mulish": "4.3.0",
     "@fontsource/open-sans": "4.3.0",
     "@fortawesome/fontawesome-free": "6.0.0",

packages/server/lib/append_electron_switches.ts

@@ -0,0 +1,57 @@
+import os from 'os'
+import debugModule from 'debug'
+import { DEFAULT_ELECTRON_FLAGS } from './util/chromium_flags'
+
+const debug = debugModule('cypress:server:append_electron_switches')
+
+export const appendElectronSwitches = (app: Electron.App) => {
+  // NOTE: errors are printed in development mode only
+  try {
+    // when running inside the electron process, we need to append the default switches immediately
+    // before the electron browser is launched. Otherwise, there may be some odd behavior.
+    debug('appending default switches for electron: %o', DEFAULT_ELECTRON_FLAGS)
+    DEFAULT_ELECTRON_FLAGS.forEach(({ name, value }) => {
+      value ? app.commandLine.appendSwitch(name, value) : app.commandLine.appendSwitch(name)
+    })
+
+    if (os.platform() === 'linux') {
+      app.disableHardwareAcceleration()
+    }
+
+    if (process.env.ELECTRON_EXTRA_LAUNCH_ARGS) {
+      // regex will be used to convert ELECTRON_EXTRA_LAUNCH_ARGS into an array, for example
+      // input: 'foo --ipsum=0 --bar=--baz=quux --lorem="--ipsum=dolor --sit=amet"'
+      // output: ['foo', '--ipsum=0', '--bar=--baz=quux', '--lorem="--ipsum=dolor --sit=amet"']
+      const regex = /(?:[^\s"']+|"[^"]*"|'[^']*')+/g
+      const electronLaunchArguments = process.env.ELECTRON_EXTRA_LAUNCH_ARGS.match(regex) || []
+
+      electronLaunchArguments.forEach((arg) => {
+        // arg can be just key --disable-http-cache
+        // or key value --remote-debugging-port=8315
+        // or key value with another value --foo=--bar=4196
+        // or key value with another multiple value --foo='--bar=4196 --baz=quux'
+        const [key, ...value] = arg.split('=')
+
+        // because this is an environment variable, everything is a string
+        // thus we don't have to worry about casting
+        // --foo=false for example will be "--foo", "false"
+        if (value.length) {
+          let joinedValues = value.join('=')
+
+          // check if the arg is wrapped in " or ' (unicode)
+          const isWrappedInQuotes = !!['\u0022', '\u0027'].find(((charAsUnicode) => joinedValues.startsWith(charAsUnicode) && joinedValues.endsWith(charAsUnicode)))
+
+          if (isWrappedInQuotes) {
+            joinedValues = joinedValues.slice(1, -1)
+          }
+
+          app.commandLine.appendSwitch(key, joinedValues)
+        } else {
+          app.commandLine.appendSwitch(key)
+        }
+      })
+    }
+  } catch (e) {
+    debug('environment error %s', e.message)
+  }
+}

packages/server/lib/cloud/cy-prompt/CyPromptLifecycleManager.ts

@@ -88,6 +88,8 @@ export class CyPromptLifecycleManager {
       const cloudUrl = ctx.cloud.getCloudUrl(cloudEnv)
       const cloudHeaders = await ctx.cloud.additionalHeaders()
 
+      const lastError = error instanceof AggregateError ? error.errors[error.errors.length - 1] : error
+
       reportCyPromptError({
         cloudApi: {
           cloudUrl,
@@ -99,15 +101,15 @@ export class CyPromptLifecycleManager {
         additionalHeaders: cloudHeaders,
         cyPromptHash: this.cyPromptHash,
         projectSlug: (await ctx.project.getConfig()).projectId || undefined,
-        error,
+        error: lastError,
         cyPromptMethod: 'initializeCyPromptManager',
         cyPromptMethodArgs: [],
       })
 
       // Clean up any registered listeners
       this.listeners = []
 
-      return { error }
+      return { error: lastError }
     })
 
     this.cyPromptManagerPromise = cyPromptManagerPromise

packages/server/lib/cypress.ts

@@ -1,5 +1,3 @@
-require('./environment')
-
 // we are not requiring everything up front
 // to optimize how quickly electron boots while
 // in dev or linux production. the reasoning is

packages/server/lib/environment.js

@@ -0,0 +1,29 @@
+import pkg from '@packages/root'
+import Bluebird from 'bluebird'
+
+export const configureLongStackTraces = (env: string | undefined) => {
+  // never cut off stack traces
+  Error.stackTraceLimit = Infinity
+
+  Bluebird.config({
+    // uses cancellation for automation timeouts
+    cancellation: true,
+    // enable long stack traces in dev
+    longStackTraces: env === 'development',
+  })
+}
+
+export const calculateCypressInternalEnv = () => {
+  // instead of setting NODE_ENV we will
+  // use our own separate CYPRESS_INTERNAL_ENV so
+  // as not to conflict with CI providers
+
+  // use env from package first
+  // or development as default
+  if (!process.env['CYPRESS_INTERNAL_ENV']) {
+    // @ts-expect-error
+    return pkg.env !== null && pkg.env !== undefined ? pkg.env : 'development'
+  }
+
+  return process.env['CYPRESS_INTERNAL_ENV']
+}

packages/server/lib/environment.ts

@@ -3,12 +3,25 @@ const { telemetry, OTLPTraceExporterCloud } = require('@packages/telemetry')
 const { apiRoutes } = require('./lib/cloud/routes')
 const encryption = require('./lib/cloud/encryption')
 
+const { calculateCypressInternalEnv, configureLongStackTraces } = require('./lib/environment')
+
+process.env['CYPRESS_INTERNAL_ENV'] = calculateCypressInternalEnv()
+configureLongStackTraces(process.env['CYPRESS_INTERNAL_ENV'])
+process.env['CYPRESS'] = 'true'
+
 // are we in the main node process or the electron process?
 const isRunningElectron = electronApp.isRunning()
 
 const pkg = require('@packages/root')
 
 if (isRunningElectron) {
+  // if we are in the electron process, we need to patch the electron switches before Cypress launches the app
+  // @see https://www.electronjs.org/docs/latest/api/environment-variables#electron_run_as_node
+  const { app } = require('electron')
+  const { appendElectronSwitches } = require('./lib/append_electron_switches')
+
+  appendElectronSwitches(app)
+
   // To pass unencrypted telemetry data to an independent open telemetry endpoint,
   // disable the encryption header, update the url, and add any other required headers.
   // For example:

packages/server/start-cypress.js

@@ -1,8 +1,9 @@
 /* eslint-disable no-console */
-require('../lib/environment')
-
 const { enable, mockElectron } = require('./mockery_helper')
 
+const { configureLongStackTraces } = require('../lib/environment')
+
+configureLongStackTraces()
 const chai = require('chai')
 
 chai.use(require('chai-subset'))