Merge branch 'develop' into alejandro/chore/hide-fetch-requests

Author: estrada9166

.circleci/src/pipeline/@pipeline.yml

@@ -118,7 +118,7 @@ commands:
           name: Set environment variable to determine whether or not to persist artifacts
           command: |
             echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
-            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "feat/cy-prompt" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/fix/rename-exclude-from-ai" ]]; then
                 export SHOULD_PERSIST_ARTIFACTS=true
             fi' >> "$BASH_ENV"
   # You must run `setup_should_persist_artifacts` command and be using bash before running this command

.circleci/src/pipeline/workflows/@main.yml

@@ -5,7 +5,7 @@ linux-x64:
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'feat/cy-prompt', << pipeline.git.branch >> ]
+      - equal: [ 'ryanm/fix/rename-exclude-from-ai', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>

cli/types/cypress.d.ts

@@ -59,7 +59,7 @@ declare namespace Cypress {
     [key: string]: any
   }
   interface PromptOptions {
-    excludeFromAI?: Record<string, string>
+    placeholders?: Record<string, string>
   }
   interface Auth {
     username: string

packages/server/lib/cloud/api/cy-prompt/get_cy_prompt_bundle.ts

@@ -26,7 +26,6 @@ export const getCyPromptBundle = async ({ cyPromptUrl, projectId, bundlePath }:
           'x-route-version': '1',
           'x-cypress-signature': PUBLIC_KEY_VERSION,
           ...(projectId ? { 'x-cypress-project-slug': projectId } : {}),
-          'x-cypress-cy-prompt-mount-version': '1',
           'x-os-name': os.platform(),
           'x-cypress-version': pkg.version,
         },

packages/server/lib/cloud/api/cy-prompt/post_cy_prompt_session.ts

@@ -21,7 +21,7 @@ export const postCyPromptSession = async ({ projectId }: PostCyPromptSessionOpti
         'x-os-name': os.platform(),
         'x-cypress-version': pkg.version,
       },
-      body: JSON.stringify({ projectSlug: projectId, cyPromptMountVersion: 1 }),
+      body: JSON.stringify({ projectSlug: projectId, cyPromptMountVersion: 2 }),
     })
   }, {
     maxAttempts: 3,

packages/server/test/unit/cloud/api/cy-prompt/get_cy_prompt_bundle_spec.ts

@@ -75,7 +75,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },
@@ -121,7 +120,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },
@@ -152,7 +150,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },
@@ -177,7 +174,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },
@@ -220,7 +216,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },
@@ -255,7 +250,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },
@@ -288,7 +282,6 @@ describe('getCyPromptBundle', () => {
         'x-route-version': '1',
         'x-cypress-signature': '1',
         'x-cypress-project-slug': '12345',
-        'x-cypress-cy-prompt-mount-version': '1',
         'x-os-name': 'linux',
         'x-cypress-version': '1.2.3',
       },

packages/server/test/unit/cloud/api/cy-prompt/post_cy_prompt_session_spec.ts

@@ -41,7 +41,7 @@ describe('postCyPromptSession', () => {
           'x-os-name': os.platform(),
           'x-cypress-version': pkg.version,
         },
-        body: JSON.stringify({ projectSlug: '12345', cyPromptMountVersion: 1 }),
+        body: JSON.stringify({ projectSlug: '12345', cyPromptMountVersion: 2 }),
       },
     )
   })