From 1eb049ddbb5a743a38a560eafe0410da1c5e4ec5 Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Tue, 17 Jun 2025 14:41:49 -0500
Subject: [PATCH 1/9] chore: (cy.prompt) add infrastructure to support a Get
 Code modal

---
 .../app/src/prompt/PromptGetCodeModal.vue     | 124 +++++++++++++++++
 packages/app/src/prompt/prompt-app-types.ts   |  22 +++
 .../app/src/runner/SpecRunnerOpenMode.vue     |   9 +-
 packages/app/src/runner/event-manager.ts      |  24 ++++
 packages/app/src/store/prompt-store.ts        |  32 +++++
 packages/app/src/studio/studio-app-types.ts   |  18 +--
 .../prompt/prompt-initialization-error.cy.ts  |   4 +-
 .../driver/src/cy/commands/prompt/index.ts    |  14 +-
 .../cy/commands/prompt/prompt-driver-types.ts |  29 +++-
 .../driver/types/internal-types-lite.d.ts     |   2 +-
 .../icons/technology-angle-brackets_x16.svg   |  10 ++
 packages/reporter/cypress.config.ts           |   2 +
 .../reporter/src/commands/command-model.ts    |   6 +
 packages/reporter/src/commands/command.cy.tsx |  54 ++++++++
 packages/reporter/src/commands/command.tsx    |   9 ++
 packages/reporter/src/lib/events.ts           |   4 +
 .../lib/cloud/cy-prompt/CyPromptManager.ts    |   6 +
 packages/server/lib/socket-base.ts            |  25 +++-
 .../cloud/cy-prompt/test-cy-prompt.ts         |   4 +
 .../cloud/cy-prompt/CyPromptManager_spec.ts   |  29 ++++
 packages/server/test/unit/socket_spec.js      |  45 +++++-
 .../src/cy-prompt/cy-prompt-server-types.ts   |  24 +++-
 .../types/src/studio/studio-server-types.ts   |   1 +
 scripts/gulp/gulpfile.ts                      |   3 +-
 scripts/gulp/tasks/gulpCloudDeliveredTypes.ts | 130 +++++++++++++++---
 25 files changed, 564 insertions(+), 66 deletions(-)
 create mode 100644 packages/app/src/prompt/PromptGetCodeModal.vue
 create mode 100644 packages/app/src/prompt/prompt-app-types.ts
 create mode 100644 packages/app/src/store/prompt-store.ts
 create mode 100644 packages/frontend-shared/src/assets/icons/technology-angle-brackets_x16.svg

diff --git a/packages/app/src/prompt/PromptGetCodeModal.vue b/packages/app/src/prompt/PromptGetCodeModal.vue
new file mode 100644
index 00000000000..7c53f561909
--- /dev/null
+++ b/packages/app/src/prompt/PromptGetCodeModal.vue
@@ -0,0 +1,124 @@
+<template>
+  <Dialog
+    :open="isOpen"
+    class="inset-0 z-10 fixed overflow-y-auto"
+    variant="bare"
+    :initial-focus="container"
+    @close="closeModal()"
+  >
+    <!-- TODO: we need to validate the styles here-->
+    <div class="flex min-h-screen items-center justify-center">
+      <DialogOverlay class="bg-gray-800 opacity-90 fixed sm:inset-0" />
+      <div ref="container" />
+    </div>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { Dialog, DialogOverlay } from '@headlessui/vue'
+import { init, loadRemote } from '@module-federation/runtime'
+import { ref, onMounted, onBeforeUnmount } from 'vue'
+import type { CyPromptAppDefaultShape, GetCodeModalContentsShape } from './prompt-app-types'
+import { usePromptStore } from '../store/prompt-store'
+
+interface CyPromptApp { default: CyPromptAppDefaultShape }
+
+// Mirrors the ReactDOM.Root type since incorporating those types
+// messes up vue typing elsewhere
+interface Root {
+  render: (element: JSX.Element) => void
+  unmount: () => void
+}
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+
+withDefaults(defineProps<{
+  isOpen: boolean
+}>(), {
+  isOpen: false,
+})
+
+const closeModal = () => {
+  emit('close')
+}
+
+const container = ref<HTMLDivElement | null>(null)
+const error = ref<string | null>(null)
+const ReactGetCodeModalContents = ref<GetCodeModalContentsShape | null>(null)
+const reactRoot = ref<Root | null>(null)
+const promptStore = usePromptStore()
+
+const maybeRenderReactComponent = () => {
+  if (!ReactGetCodeModalContents.value || !!error.value) {
+    return
+  }
+
+  const panel = window.UnifiedRunner.React.createElement(ReactGetCodeModalContents.value, {
+    Cypress,
+    testId: promptStore.currentGetCodeModalInfo?.testId,
+    logId: promptStore.currentGetCodeModalInfo?.logId,
+    onClose: () => {
+      closeModal()
+    },
+  })
+
+  if (!reactRoot.value) {
+    reactRoot.value = window.UnifiedRunner.ReactDOM.createRoot(container.value)
+  }
+
+  reactRoot.value?.render(panel)
+}
+
+const unmountReactComponent = () => {
+  if (!ReactGetCodeModalContents.value || !container.value) {
+    return
+  }
+
+  reactRoot.value?.unmount()
+}
+
+onMounted(maybeRenderReactComponent)
+onBeforeUnmount(unmountReactComponent)
+
+init({
+  remotes: [{
+    alias: 'cy-prompt',
+    type: 'module',
+    name: 'cy-prompt',
+    entryGlobalName: 'cy-prompt',
+    entry: '/__cypress-cy-prompt/app/cy-prompt.js',
+    shareScope: 'default',
+  }],
+  name: 'app',
+  shared: {
+    react: {
+      scope: 'default',
+      version: '18.3.1',
+      lib: () => window.UnifiedRunner.React,
+      shareConfig: {
+        singleton: true,
+        requiredVersion: '^18.3.1',
+      },
+    },
+  },
+})
+
+// We are not using any kind of loading state, because when we get
+// to this point, prompt should have already executed, which
+// means that the bundle has been downloaded
+loadRemote<CyPromptApp>('cy-prompt').then((module) => {
+  if (!module?.default) {
+    error.value = 'The panel was not loaded successfully'
+
+    return
+  }
+
+  ReactGetCodeModalContents.value = module.default.GetCodeModalContents
+  maybeRenderReactComponent()
+}).catch((e) => {
+  error.value = e.message
+})
+
+</script>
diff --git a/packages/app/src/prompt/prompt-app-types.ts b/packages/app/src/prompt/prompt-app-types.ts
new file mode 100644
index 00000000000..78a61a50e59
--- /dev/null
+++ b/packages/app/src/prompt/prompt-app-types.ts
@@ -0,0 +1,22 @@
+export interface CypressInternal extends Cypress.Cypress {
+  backendRequestHandler: (
+    backendRequestNamespace: string,
+    eventName: string,
+    ...args: any[]
+  ) => Promise<any>
+}
+
+export interface GetCodeModalContentsProps {
+  Cypress: CypressInternal
+  testId: string
+  logId: string
+  onClose: () => void
+}
+
+export type GetCodeModalContentsShape = (props: GetCodeModalContentsProps) => JSX.Element
+
+export interface CyPromptAppDefaultShape {
+  // Purposefully do not use React in this signature to avoid conflicts when this type gets
+  // transferred to the Cypress app
+  GetCodeModalContents: GetCodeModalContentsShape
+}
diff --git a/packages/app/src/runner/SpecRunnerOpenMode.vue b/packages/app/src/runner/SpecRunnerOpenMode.vue
index 89f720f7665..a5dfc452157 100644
--- a/packages/app/src/runner/SpecRunnerOpenMode.vue
+++ b/packages/app/src/runner/SpecRunnerOpenMode.vue
@@ -1,4 +1,9 @@
 <template>
+  <PromptGetCodeModal
+    v-if="promptStore.getCodeModalIsOpen"
+    :open="promptStore.getCodeModalIsOpen"
+    @close="promptStore.closeGetCodeModal"
+  />
   <StudioInstructionsModal
     v-if="studioStore.instructionModalIsOpen"
     :open="studioStore.instructionModalIsOpen"
@@ -146,6 +151,8 @@ import StudioSaveModal from './studio/StudioSaveModal.vue'
 import { useStudioStore } from '../store/studio-store'
 import StudioPanel from '../studio/StudioPanel.vue'
 import { useSubscription } from '../graphql'
+import PromptGetCodeModal from '../prompt/PromptGetCodeModal.vue'
+import { usePromptStore } from '../store/prompt-store'
 
 const {
   preferredMinimumPanelWidth,
@@ -236,7 +243,7 @@ const {
 } = useEventManager()
 
 const studioStore = useStudioStore()
-
+const promptStore = usePromptStore()
 const handleStudioPanelClose = () => {
   eventManager.emit('studio:cancel', undefined)
 }
diff --git a/packages/app/src/runner/event-manager.ts b/packages/app/src/runner/event-manager.ts
index eb5ca8342e2..d0e0758de56 100644
--- a/packages/app/src/runner/event-manager.ts
+++ b/packages/app/src/runner/event-manager.ts
@@ -17,6 +17,7 @@ import { addTelemetryListeners } from './events/telemetry'
 import { telemetry } from '@packages/telemetry/src/browser'
 import { addCaptureProtocolListeners } from './events/capture-protocol'
 import { getRunnerConfigFromWindow } from './get-runner-config-from-window'
+import { usePromptStore } from '../store/prompt-store'
 
 export type CypressInCypressMochaEvent = Array<Array<string | Record<string, any>>>
 
@@ -61,6 +62,7 @@ export class EventManager {
   ws: SocketShape
   specStore: ReturnType<typeof useSpecStore>
   studioStore: ReturnType<typeof useStudioStore>
+  promptStore: ReturnType<typeof usePromptStore>
 
   constructor (
     // import '@packages/driver'
@@ -75,6 +77,7 @@ export class EventManager {
     this.ws = ws
     this.specStore = useSpecStore()
     this.studioStore = useStudioStore()
+    this.promptStore = usePromptStore()
   }
 
   getCypress () {
@@ -418,6 +421,8 @@ export class EventManager {
       this._clearAllCookies()
       this._setUnload()
     })
+
+    this.addPromptListeners()
   }
 
   start (config) {
@@ -467,6 +472,12 @@ export class EventManager {
       Cypress.state('isProtocolEnabled', isDefaultProtocolEnabled)
     }
 
+    if (Cypress.config('experimentalPromptCommand')) {
+      await new Promise((resolve) => {
+        this.ws.emit('prompt:reset', resolve)
+      })
+    }
+
     this._addListeners()
   }
 
@@ -956,6 +967,10 @@ export class EventManager {
     this.localBus.off(event, listener)
   }
 
+  removeAllListeners (event: string) {
+    this.localBus.removeAllListeners(event)
+  }
+
   notifyRunningSpec (specFile) {
     this.ws.emit('spec:changed', specFile)
   }
@@ -1006,4 +1021,13 @@ export class EventManager {
   _testingOnlySetCypress (cypress: any) {
     Cypress = cypress
   }
+
+  private addPromptListeners () {
+    this.reporterBus.on('prompt:get-code', ({ testId, logId }) => {
+      this.promptStore.openGetCodeModal({
+        testId,
+        logId,
+      })
+    })
+  }
 }
diff --git a/packages/app/src/store/prompt-store.ts b/packages/app/src/store/prompt-store.ts
new file mode 100644
index 00000000000..2af97f6252f
--- /dev/null
+++ b/packages/app/src/store/prompt-store.ts
@@ -0,0 +1,32 @@
+import { defineStore } from 'pinia'
+
+// TODO: Share this
+interface GetCodeModalInfo {
+  testId: string
+  logId: string
+}
+
+interface PromptState {
+  getCodeModalIsOpen: boolean
+  currentGetCodeModalInfo: GetCodeModalInfo | null
+}
+
+export const usePromptStore = defineStore('prompt', {
+  state: (): PromptState => {
+    return {
+      getCodeModalIsOpen: false,
+      currentGetCodeModalInfo: null,
+    }
+  },
+  actions: {
+    openGetCodeModal (getCodeModalInfo: GetCodeModalInfo) {
+      this.getCodeModalIsOpen = true
+      this.currentGetCodeModalInfo = getCodeModalInfo
+    },
+
+    closeGetCodeModal () {
+      this.getCodeModalIsOpen = false
+      this.currentGetCodeModalInfo = null
+    },
+  },
+})
diff --git a/packages/app/src/studio/studio-app-types.ts b/packages/app/src/studio/studio-app-types.ts
index eeb859abe29..7a3fdbf49a0 100644
--- a/packages/app/src/studio/studio-app-types.ts
+++ b/packages/app/src/studio/studio-app-types.ts
@@ -1,10 +1,11 @@
+export type RecordingState = 'recording' | 'paused' | 'disabled'
+
 export interface StudioPanelProps {
   canAccessStudioAI: boolean
   onStudioPanelClose?: () => void
   studioSessionId?: string
   useRunnerStatus?: RunnerStatusShape
   useTestContentRetriever?: TestContentRetrieverShape
-  useStudioAIStream?: StudioAIStreamShape
   useCypress?: CypressShape
 }
 
@@ -53,6 +54,7 @@ export interface StudioAIStreamProps {
   runnerStatus: RunnerStatus
   testCode?: string
   isCreatingNewTest: boolean
+  Cypress: CypressInternal
 }
 
 export interface StudioAIStream {
@@ -72,17 +74,3 @@ export type TestContentRetrieverShape = (props: TestContentRetrieverProps) => {
   testBlock: TestBlock | null
   isCreatingNewTest: boolean
 }
-
-export interface Command {
-  selector?: string
-  name: string
-  message?: string | string[]
-  isAssertion?: boolean
-}
-
-export interface SaveDetails {
-  absoluteFile: string
-  runnableTitle: string
-  contents: string
-  testName?: string
-}
diff --git a/packages/driver/cypress/e2e/commands/prompt/prompt-initialization-error.cy.ts b/packages/driver/cypress/e2e/commands/prompt/prompt-initialization-error.cy.ts
index 31a4a0d22c1..da0b40f0dc4 100644
--- a/packages/driver/cypress/e2e/commands/prompt/prompt-initialization-error.cy.ts
+++ b/packages/driver/cypress/e2e/commands/prompt/prompt-initialization-error.cy.ts
@@ -7,7 +7,7 @@ describe('src/cy/commands/prompt', () => {
     error.name = 'ENOSPC'
 
     backendStub.callThrough()
-    backendStub.withArgs('wait:for:cy:prompt:ready').resolves({ success: false, error })
+    backendStub.withArgs('wait:for:prompt:ready').resolves({ success: false, error })
 
     cy.on('fail', (err) => {
       expect(err.message).to.include('Failed to download cy.prompt Cloud code')
@@ -31,7 +31,7 @@ describe('src/cy/commands/prompt', () => {
     error.name = 'ECONNREFUSED'
 
     backendStub.callThrough()
-    backendStub.withArgs('wait:for:cy:prompt:ready').resolves({ success: false, error })
+    backendStub.withArgs('wait:for:prompt:ready').resolves({ success: false, error })
 
     cy.on('fail', (err) => {
       expect(err.message).to.include('Timed out waiting for cy.prompt Cloud code:')
diff --git a/packages/driver/src/cy/commands/prompt/index.ts b/packages/driver/src/cy/commands/prompt/index.ts
index cdf0df62757..fbb2f20a8e7 100644
--- a/packages/driver/src/cy/commands/prompt/index.ts
+++ b/packages/driver/src/cy/commands/prompt/index.ts
@@ -2,6 +2,7 @@ import { init, loadRemote } from '@module-federation/runtime'
 import type { CypressInternal, CyPromptDriverDefaultShape } from './prompt-driver-types'
 import type Emitter from 'component-emitter'
 import $errUtils from '../../../cypress/error_utils'
+import $stackUtils from '../../../cypress/stack_utils'
 
 interface CyPromptDriver { default: CyPromptDriverDefaultShape }
 
@@ -16,7 +17,7 @@ declare global {
 let initializedModule: CyPromptDriverDefaultShape | null = null
 const initializeModule = async (Cypress: Cypress.Cypress): Promise<CyPromptDriverDefaultShape> => {
   // Wait for the cy prompt bundle to be downloaded and ready
-  const { success, error } = await Cypress.backend('wait:for:cy:prompt:ready')
+  const { success, error } = await Cypress.backend('wait:for:prompt:ready')
 
   if (error) {
     if (error.name === 'ENOSPC') {
@@ -83,6 +84,7 @@ const initializeCloudCyPrompt = async (Cypress: Cypress.Cypress, cy: Cypress.Cyp
         extendErrorMessages: $errUtils.extendErrorMessages,
         throwErrByPath: $errUtils.throwErrByPath,
       },
+      getSourceDetailsForFirstLine: $stackUtils.getSourceDetailsForFirstLine,
     })
   } catch (error) {
     return error
@@ -98,7 +100,9 @@ export default (Commands: Cypress.Cypress['Commands'], Cypress: Cypress.Cypress,
       initializeCloudCyPromptPromise = initializeCloudCyPrompt(Cypress, cy)
     }
 
-    const prompt = (message: string, options: object = {}) => {
+    const prompt = (steps: string | string[], commandOptions: object = {}) => {
+      const promptCmd = cy.state('current')
+
       if (Cypress.testingType === 'component') {
         $errUtils.throwErrByPath('prompt.promptTestingTypeError')
 
@@ -121,7 +125,11 @@ export default (Commands: Cypress.Cypress['Commands'], Cypress: Cypress.Cypress,
 
         const cyPrompt = bundleResult
 
-        return cyPrompt(message, options)
+        return cyPrompt({
+          steps,
+          commandOptions,
+          promptCmd,
+        })
       })
     }
 
diff --git a/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts b/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts
index 42316c81792..00af15da1e4 100644
--- a/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts
+++ b/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts
@@ -1,3 +1,7 @@
+// Note: This file is owned by the cloud delivered
+// cy prompt bundle. It is downloaded and copied here.
+// It should not be modified directly here.
+
 import type Emitter from 'component-emitter'
 
 interface InternalActions extends Cypress.Actions {
@@ -40,20 +44,33 @@ export interface CyPromptEventManager {
   ws: Emitter
 }
 
+export interface CyPromptErrorUtils {
+  extendErrorMessages: (errorMessages: any) => void
+  throwErrByPath: (errPath: any, options?: any) => never
+}
+
+export interface CyPromptStackLineDetail {
+  function: string
+  fileUrl: string
+  originalFile: string
+  relativeFile: string
+  absoluteFile: string
+  line: number
+  column: number
+}
+
 export interface CyPromptOptions {
   Cypress: CypressInternal
-  cy: Cypress.cy
+  cy: Cypress.cy & { state: (key: string) => any }
   // Note that the eventManager is present in same origin AUTs, but not cross origin
   // so we need to check for it's presence before using it
   eventManager?: CyPromptEventManager
-  errorUtils: {
-    extendErrorMessages: (errorMessages: any) => void
-    throwErrByPath: (err: any, path: string) => void
-  }
+  errorUtils: CyPromptErrorUtils
+  getSourceDetailsForFirstLine: (stack: string, projectRoot?: string) => CyPromptStackLineDetail | undefined
 }
 
 export interface CyPromptDriverDefaultShape {
   createCyPrompt: (
     options: CyPromptOptions
-  ) => (text: string, commandOptions?: object) => Promise<void>
+  ) => (args: { steps: string | string[], commandOptions?: object, promptCmd: any }) => Promise<void>
 }
diff --git a/packages/driver/types/internal-types-lite.d.ts b/packages/driver/types/internal-types-lite.d.ts
index fdc13e96cb7..14e3d7b952b 100644
--- a/packages/driver/types/internal-types-lite.d.ts
+++ b/packages/driver/types/internal-types-lite.d.ts
@@ -42,7 +42,7 @@ declare namespace Cypress {
     (task: 'protocol:test:before:after:run:async', attributes: any, options: any): Promise<void>
     (task: 'protocol:url:changed', input: any): Promise<void>
     (task: 'protocol:page:loading', input: any): Promise<void>
-    (task: 'wait:for:cy:prompt:ready'): Promise<{ success: boolean, error?: Error }>
+    (task: 'wait:for:prompt:ready'): Promise<{ success: boolean, error?: Error }>
   }
 
   interface Devices {
diff --git a/packages/frontend-shared/src/assets/icons/technology-angle-brackets_x16.svg b/packages/frontend-shared/src/assets/icons/technology-angle-brackets_x16.svg
new file mode 100644
index 00000000000..055be4155c2
--- /dev/null
+++ b/packages/frontend-shared/src/assets/icons/technology-angle-brackets_x16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path
+    d="M11 13L15 8L11 3M5 13L1 8L5 3"
+    stroke="currentColor"
+    stroke-width="2"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    class="icon-dark"
+  />
+</svg>
diff --git a/packages/reporter/cypress.config.ts b/packages/reporter/cypress.config.ts
index 1f983e2649f..9b1b9bcc0d8 100644
--- a/packages/reporter/cypress.config.ts
+++ b/packages/reporter/cypress.config.ts
@@ -4,6 +4,8 @@ import WP from '../../npm/webpack-preprocessor'
 
 export default defineConfig({
   projectId: 'ypt4pf',
+  // @ts-expect-error - experimental prompt command is not officially typed until released
+  experimentalPromptCommand: true,
   reporter: '../../node_modules/cypress-multi-reporters/index.js',
 
   reporterOptions: {
diff --git a/packages/reporter/src/commands/command-model.ts b/packages/reporter/src/commands/command-model.ts
index c56f5040800..e02d297f207 100644
--- a/packages/reporter/src/commands/command-model.ts
+++ b/packages/reporter/src/commands/command-model.ts
@@ -128,6 +128,12 @@ export default class Command extends Instrument {
     return this.err?.isRecovered
   }
 
+  get isCyPrompt () {
+    // @ts-expect-error - experimentalPromptCommand is not typed until we
+    // release the feature
+    return Cypress.config('experimentalPromptCommand') && !Cypress.config('isTextTerminal') && this.name === 'prompt'
+  }
+
   constructor (props: CommandProps) {
     super(props)
 
diff --git a/packages/reporter/src/commands/command.cy.tsx b/packages/reporter/src/commands/command.cy.tsx
index 0958fc74be0..edcdfc6b496 100644
--- a/packages/reporter/src/commands/command.cy.tsx
+++ b/packages/reporter/src/commands/command.cy.tsx
@@ -30,6 +30,7 @@ describe('commands', () => {
               })
             }
             scrollIntoView={() => {}}
+            aliasesWithDuplicates={[]}
           />
         </div>,
       )
@@ -98,6 +99,7 @@ describe('commands', () => {
                 })
               }
               scrollIntoView={() => {}}
+              aliasesWithDuplicates={[]}
             />
           ))}
         </div>,
@@ -106,4 +108,56 @@ describe('commands', () => {
       cy.percySnapshot()
     })
   })
+
+  describe('prompt', () => {
+    it('should render prompt get code button when state is passed', () => {
+      cy.mount(
+        <div>
+          <Command
+            model={
+              new CommandModel({
+                name: 'prompt',
+                state: 'passed',
+                numElements: 1,
+                hookId: '1',
+                id: 1,
+                testId: '1',
+              })
+            }
+            scrollIntoView={() => {}}
+            aliasesWithDuplicates={[]}
+          />
+        </div>,
+      )
+
+      cy.get('.command-prompt-get-code').should('be.visible').should('have.text', 'Get code')
+      cy.get('.command-prompt-get-code-indicator').should('be.visible')
+
+      cy.percySnapshot()
+    })
+
+    it('should not render prompt get code button when state is not passed', () => {
+      cy.mount(
+        <div>
+          <Command
+            model={
+              new CommandModel({
+                name: 'prompt',
+                state: 'pending',
+                numElements: 1,
+                hookId: '1',
+                id: 1,
+                testId: '1',
+              })
+            }
+            scrollIntoView={() => {}}
+            aliasesWithDuplicates={[]}
+          />
+        </div>,
+      )
+
+      cy.get('.command-prompt-get-code').should('not.exist')
+      cy.get('.command-prompt-get-code-indicator').should('not.exist')
+    })
+  })
 })
diff --git a/packages/reporter/src/commands/command.tsx b/packages/reporter/src/commands/command.tsx
index 83d813126a5..0c76f8d60b6 100644
--- a/packages/reporter/src/commands/command.tsx
+++ b/packages/reporter/src/commands/command.tsx
@@ -23,6 +23,7 @@ import ChevronIcon from '@packages/frontend-shared/src/assets/icons/chevron-down
 import HiddenIcon from '@packages/frontend-shared/src/assets/icons/general-eye-closed_x16.svg'
 import PinIcon from '@packages/frontend-shared/src/assets/icons/object-pin_x16.svg'
 import RunningIcon from '@packages/frontend-shared/src/assets/icons/status-running_x16.svg'
+import AngleBracketsIcon from '@packages/frontend-shared/src/assets/icons/technology-angle-brackets_x16.svg'
 
 const displayName = (model: CommandModel) => model.displayName || model.name
 const nameClassName = (name: string) => name.replace(/(\s+)/g, '-')
@@ -547,6 +548,14 @@ const Command: React.FC<CommandProps> = observer(({ model, aliasesWithDuplicates
               <CommandControls model={model} commandName={commandName} events={events} />
             </div>
           </FlashOnClick>
+          {model.isCyPrompt && model.state === 'passed' && (
+            <div className='command-prompt-get-code' onClick={() => {
+              events.emit('prompt:get-code', { testId: model.testId, logId: model.id })
+            }}>
+              <AngleBracketsIcon className='command-prompt-get-code-indicator' />
+              <span>Get code</span>
+            </div>
+          )}
         </div>
         <Progress model={model} />
         {model.hasChildren && model.isOpen && (
diff --git a/packages/reporter/src/lib/events.ts b/packages/reporter/src/lib/events.ts
index 1d25f9aca4b..78e1f7a3ea8 100644
--- a/packages/reporter/src/lib/events.ts
+++ b/packages/reporter/src/lib/events.ts
@@ -237,6 +237,10 @@ const events: Events = {
     localBus.on('studio:copy:to:clipboard', (cb) => {
       runner.emit('studio:copy:to:clipboard', cb)
     })
+
+    localBus.on('prompt:get-code', (args: { testId: string, logId: string }) => {
+      runner.emit('prompt:get-code', args)
+    })
   },
 
   emit (event, ...args) {
diff --git a/packages/server/lib/cloud/cy-prompt/CyPromptManager.ts b/packages/server/lib/cloud/cy-prompt/CyPromptManager.ts
index 3aedaf852c1..7b72d466f7a 100644
--- a/packages/server/lib/cloud/cy-prompt/CyPromptManager.ts
+++ b/packages/server/lib/cloud/cy-prompt/CyPromptManager.ts
@@ -57,6 +57,12 @@ export class CyPromptManager implements CyPromptManagerShape {
     }
   }
 
+  reset (testId?: string): void {
+    if (this._cyPromptServer) {
+      return this.invokeSync('reset', { isEssential: true }, testId)
+    }
+  }
+
   /**
    * Abstracts invoking a synchronous method on the CyPromptServer instance, so we can handle
    * errors in a uniform way
diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
index 55e6dfbad91..2411c98de33 100644
--- a/packages/server/lib/socket-base.ts
+++ b/packages/server/lib/socket-base.ts
@@ -453,6 +453,16 @@ export class SocketBase {
           }
         })
 
+        socket.on('prompt:reset', (cb) => {
+          getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt().then(async (cyPrompt) => {
+            if (cyPrompt.cyPromptManager && !runState) {
+              cyPrompt.cyPromptManager.reset()
+            }
+
+            cb()
+          })
+        })
+
         socket.on('backend:request', (eventName: string, ...args) => {
           const userAgent = socket.request?.headers['user-agent'] || getCtx().coreData.app.browserUserAgent
 
@@ -539,7 +549,7 @@ export class SocketBase {
                 })
               case 'close:extra:targets':
                 return options.closeExtraTargets()
-              case 'wait:for:cy:prompt:ready':
+              case 'wait:for:prompt:ready':
                 return getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt().then(async (cyPrompt) => {
                   if (cyPrompt.cyPromptManager) {
                     await options.onCyPromptReady(cyPrompt.cyPromptManager)
@@ -574,9 +584,18 @@ export class SocketBase {
             runState = undefined
 
             // if we have cached test state, then we need to reset
-            // the test state on the protocol manager
+            // the test state on the protocol manager and prompt manager
             if (s.currentId) {
-              this._protocolManager?.resetTest(s.currentId)
+              const testId = s.currentId
+
+              this._protocolManager?.resetTest(testId)
+              getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt().then(async (cyPrompt) => {
+                if (cyPrompt.cyPromptManager) {
+                  // reset the prompt manager for the current test to clear any
+                  // cached state when top changes for the current test
+                  cyPrompt.cyPromptManager.reset(testId)
+                }
+              })
             }
           }
 
diff --git a/packages/server/test/support/fixtures/cloud/cy-prompt/test-cy-prompt.ts b/packages/server/test/support/fixtures/cloud/cy-prompt/test-cy-prompt.ts
index 0eea3553260..121e5d83ca9 100644
--- a/packages/server/test/support/fixtures/cloud/cy-prompt/test-cy-prompt.ts
+++ b/packages/server/test/support/fixtures/cloud/cy-prompt/test-cy-prompt.ts
@@ -16,6 +16,10 @@ class CyPromptServer implements CyPromptServerShape {
   connectToBrowser (criClient: CyPromptCDPClient): void {
     // This is a test implementation that does nothing
   }
+
+  reset (testId?: string): void {
+    // This is a test implementation that does nothing
+  }
 }
 
 const cyPromptServerDefault: CyPromptServerDefaultShape = {
diff --git a/packages/server/test/unit/cloud/cy-prompt/CyPromptManager_spec.ts b/packages/server/test/unit/cloud/cy-prompt/CyPromptManager_spec.ts
index a4009743292..b56720b915a 100644
--- a/packages/server/test/unit/cloud/cy-prompt/CyPromptManager_spec.ts
+++ b/packages/server/test/unit/cloud/cy-prompt/CyPromptManager_spec.ts
@@ -31,6 +31,17 @@ describe('lib/cloud/cy-prompt', () => {
       cyPromptHash: 'abcdefg',
       projectSlug: '1234',
       cloudApi: {} as any,
+      getProjectOptions: () => {
+        return Promise.resolve({
+          user: {
+            id: '1234',
+            email: 'test@test.com',
+            name: 'test',
+          },
+          projectSlug: '1234',
+          record: false,
+        })
+      },
     })
 
     cyPrompt = (cyPromptManager as any)._cyPromptServer
@@ -104,4 +115,22 @@ describe('lib/cloud/cy-prompt', () => {
       expect(invokeSyncSpy).to.not.be.called
     })
   })
+
+  describe('reset', () => {
+    it('calls reset', () => {
+      sinon.stub(cyPrompt, 'reset')
+
+      cyPromptManager.reset()
+
+      expect(cyPrompt.reset).to.be.called
+    })
+
+    it('calls resert with an id', () => {
+      sinon.stub(cyPrompt, 'reset')
+
+      cyPromptManager.reset('r1')
+
+      expect(cyPrompt.reset).to.be.calledWith('r1')
+    })
+  })
 })
diff --git a/packages/server/test/unit/socket_spec.js b/packages/server/test/unit/socket_spec.js
index 7b3d2740635..2eb611b524c 100644
--- a/packages/server/test/unit/socket_spec.js
+++ b/packages/server/test/unit/socket_spec.js
@@ -52,6 +52,8 @@ describe('lib/socket', () => {
   })
 
   context('integration', () => {
+    let mockCyPrompt
+
     beforeEach(function (done) {
       // create a for realz socket.io connection
       // so we can test server emit / client emit events
@@ -89,15 +91,18 @@ describe('lib/socket', () => {
         }
 
         // Create a mock cy prompt object with handleBackendRequest method
-        const mockCyPrompt = {
+        mockCyPrompt = {
           addSocketListeners: sinon.stub(),
           status: 'INITIALIZED',
+          reset: sinon.stub(),
         }
 
         ctx.coreData.studioLifecycleManager = studioLifecycleManager
 
         const cyPromptLifecycleManager = {
-          getCyPrompt: sinon.stub().resolves(mockCyPrompt),
+          getCyPrompt: sinon.stub().resolves({
+            cyPromptManager: mockCyPrompt,
+          }),
           registerCyPromptReadyListener: sinon.stub().callsFake((callback) => {
             callback(mockCyPrompt)
 
@@ -548,7 +553,7 @@ describe('lib/socket', () => {
       })
     })
 
-    context('on(backend:request, wait:for:cy:prompt:ready)', () => {
+    context('on(backend:request, wait:for:prompt:ready)', () => {
       it('awaits cy prompt ready and returns true if cy prompt is ready', function (done) {
         const mockCyPrompt = {
           cyPromptManager: {
@@ -559,7 +564,7 @@ describe('lib/socket', () => {
 
         ctx.coreData.cyPromptLifecycleManager.getCyPrompt.resolves(mockCyPrompt)
 
-        return this.client.emit('backend:request', 'wait:for:cy:prompt:ready', (resp) => {
+        return this.client.emit('backend:request', 'wait:for:prompt:ready', (resp) => {
           expect(resp.response).to.deep.eq({ success: true })
 
           expect(this.options.onCyPromptReady).to.be.calledWith(mockCyPrompt.cyPromptManager)
@@ -578,7 +583,7 @@ describe('lib/socket', () => {
 
         ctx.coreData.cyPromptLifecycleManager.getCyPrompt.resolves(mockCyPrompt)
 
-        return this.client.emit('backend:request', 'wait:for:cy:prompt:ready', (resp) => {
+        return this.client.emit('backend:request', 'wait:for:prompt:ready', (resp) => {
           expect(resp.response).to.deep.eq({ success: false })
 
           return done()
@@ -593,7 +598,7 @@ describe('lib/socket', () => {
 
         ctx.coreData.cyPromptLifecycleManager.getCyPrompt.resolves(mockCyPrompt)
 
-        return this.client.emit('backend:request', 'wait:for:cy:prompt:ready', (resp) => {
+        return this.client.emit('backend:request', 'wait:for:prompt:ready', (resp) => {
           expect(resp.response).to.deep.eq({
             error: errors.cloneErr(mockCyPrompt.error),
           })
@@ -683,6 +688,34 @@ describe('lib/socket', () => {
       })
     })
 
+    context('on(prompt:reset)', () => {
+      it('calls reset', async function () {
+        await new Promise((resolve) => {
+          this.client.emit('prompt:reset', () => {
+            expect(mockCyPrompt.reset).to.be.called
+
+            resolve()
+          })
+        })
+      })
+
+      it('does not call reset if there is runState', async function () {
+        await new Promise((resolve) => {
+          this.client.emit('backend:request', 'preserve:run:state', {}, () => {
+            resolve()
+          })
+        })
+
+        await new Promise((resolve) => {
+          this.client.emit('prompt:reset', () => {
+            expect(mockCyPrompt.reset).not.to.be.called
+
+            resolve()
+          })
+        })
+      })
+    })
+
     context('studio.addSocketListeners', () => {
       it('calls addSocketListeners on studio when socket connects', function () {
         // Verify that registerStudioReadyListener was called
diff --git a/packages/types/src/cy-prompt/cy-prompt-server-types.ts b/packages/types/src/cy-prompt/cy-prompt-server-types.ts
index 2d882ec5361..e2aeb7d752e 100644
--- a/packages/types/src/cy-prompt/cy-prompt-server-types.ts
+++ b/packages/types/src/cy-prompt/cy-prompt-server-types.ts
@@ -1,3 +1,7 @@
+// Note: This file is owned by the cloud delivered
+// cy prompt bundle. It is downloaded and copied here.
+// It should not be modified directly here.
+
 /// <reference types="cypress" />
 
 import type ProtocolMapping from 'devtools-protocol/types/protocol-mapping.d'
@@ -7,7 +11,8 @@ import type { Socket } from 'socket.io'
 
 export type CyPromptCommands = ProtocolMapping.Commands
 
-export type CyPromptCommand<T extends keyof CyPromptCommands> = CyPromptCommands[T]
+export type CyPromptCommand<T extends keyof CyPromptCommands> =
+  CyPromptCommands[T]
 
 export type CyPromptEvents = ProtocolMapping.Events
 
@@ -39,16 +44,20 @@ export interface CyPromptAuthenticatedUserShape {
   authToken?: string
 }
 
+export interface CyPromptProjectOptions {
+  user?: CyPromptAuthenticatedUserShape
+  projectSlug?: string
+  record?: boolean
+  key?: string
+  isOpenMode?: boolean
+}
+
 export interface CyPromptServerOptions {
   cyPromptHash?: string
-  getProjectOptions: () => Promise<{
-    user?: CyPromptAuthenticatedUserShape
-    projectSlug?: string
-    record?: boolean
-    key?: string
-  }>
   cyPromptPath: string
+  projectSlug?: string
   cloudApi: CyPromptCloudApi
+  getProjectOptions: () => Promise<CyPromptProjectOptions>
 }
 
 export interface CyPromptCDPClient {
@@ -66,6 +75,7 @@ export interface CyPromptServerShape {
   initializeRoutes(router: Router): void
   addSocketListeners(socket: Socket): void
   connectToBrowser: (cdpClient: CyPromptCDPClient) => void
+  reset: (testId?: string) => void
 }
 
 export interface CyPromptServerDefaultShape {
diff --git a/packages/types/src/studio/studio-server-types.ts b/packages/types/src/studio/studio-server-types.ts
index 162caafcaa1..7c9826ce2f3 100644
--- a/packages/types/src/studio/studio-server-types.ts
+++ b/packages/types/src/studio/studio-server-types.ts
@@ -50,6 +50,7 @@ export interface StudioServerOptions {
   projectSlug?: string
   cloudApi: StudioCloudApi
   betterSqlite3Path: string
+  sessionId?: string
 }
 
 export interface StudioAIInitializeOptions {
diff --git a/scripts/gulp/gulpfile.ts b/scripts/gulp/gulpfile.ts
index ca8aef40309..60eed21768f 100644
--- a/scripts/gulp/gulpfile.ts
+++ b/scripts/gulp/gulpfile.ts
@@ -19,7 +19,7 @@ import { webpackReporter, webpackRunner } from './tasks/gulpWebpack'
 import { e2eTestScaffold, e2eTestScaffoldWatch } from './tasks/gulpE2ETestScaffold'
 import dedent from 'dedent'
 import { ensureCloudValidations, syncCloudValidations } from './tasks/gulpSyncValidations'
-import { downloadStudioTypes } from './tasks/gulpCloudDeliveredTypes'
+import { downloadStudioTypes, downloadPromptTypes } from './tasks/gulpCloudDeliveredTypes'
 
 if (process.env.CYPRESS_INTERNAL_VITE_DEV) {
   process.env.CYPRESS_INTERNAL_VITE_APP_PORT ??= '3333'
@@ -257,6 +257,7 @@ gulp.task(openCypressApp)
 gulp.task(openCypressLaunchpad)
 
 gulp.task(downloadStudioTypes)
+gulp.task(downloadPromptTypes)
 
 // If we want to run individually, for debugging/testing
 gulp.task('cyOpenLaunchpadOnly', cyOpenLaunchpad)
diff --git a/scripts/gulp/tasks/gulpCloudDeliveredTypes.ts b/scripts/gulp/tasks/gulpCloudDeliveredTypes.ts
index 8c466f5dac0..fd014a2b2f5 100644
--- a/scripts/gulp/tasks/gulpCloudDeliveredTypes.ts
+++ b/scripts/gulp/tasks/gulpCloudDeliveredTypes.ts
@@ -5,34 +5,122 @@ import fs from 'fs-extra'
 import { postStudioSession } from '@packages/server/lib/cloud/api/studio/post_studio_session'
 import os from 'os'
 import { ensureStudioBundle } from '@packages/server/lib/cloud/studio/ensure_studio_bundle'
+import { postCyPromptSession } from '@packages/server/lib/cloud/api/cy-prompt/post_cy_prompt_session'
+import { ensureCyPromptBundle } from '@packages/server/lib/cloud/cy-prompt/ensure_cy_prompt_bundle'
 
-export const downloadStudioTypes = async (): Promise<void> => {
-  if (!process.env.CYPRESS_LOCAL_STUDIO_PATH) {
-    const studioSession = await postStudioSession({ projectId: 'ypt4pf' })
-    // The studio hash is the last part of the studio URL, after the last slash and before the extension
-    const studioHash = studioSession.studioUrl.split('/').pop()?.split('.')[0]
-    const studioPath = path.join(os.tmpdir(), 'cypress', 'studio', studioHash)
+interface TypeFileMapping {
+  sourcePath: string
+  destinationPath: string
+}
 
-    await ensureStudioBundle({ studioUrl: studioSession.studioUrl, studioPath, projectId: 'ypt4pf' })
+interface BundleConfig {
+  name: string
+  envVar: string
+  sessionFunction: () => Promise<{ studioUrl?: string, cyPromptUrl?: string }>
+  ensureBundleFunction: (url: string, bundlePath: string) => Promise<void>
+  typeMappings: TypeFileMapping[]
+}
 
-    await fs.copyFile(
-      path.join(studioPath, 'app', 'types.ts'),
-      path.join(__dirname, '..', '..', '..', 'packages', 'app', 'src', 'studio', 'studio-app-types.ts'),
-    )
+const getBundlePath = (url: string, bundleName: string): string => {
+  const hash = url.split('/').pop()?.split('.')[0]
 
+  if (!hash) {
+    throw new Error(`Could not extract hash from URL: ${url}`)
+  }
+
+  return path.join(os.tmpdir(), 'cypress', bundleName, hash)
+}
+
+const copyTypeFiles = async (sourceBasePath: string, typeMappings: TypeFileMapping[]): Promise<void> => {
+  for (const mapping of typeMappings) {
     await fs.copyFile(
-      path.join(studioPath, 'server', 'types.ts'),
-      path.join(__dirname, '..', '..', '..', 'packages', 'types', 'src', 'studio', 'studio-server-types.ts'),
+      path.join(sourceBasePath, mapping.sourcePath),
+      mapping.destinationPath,
     )
+  }
+}
+
+const downloadBundleTypes = async (config: BundleConfig): Promise<void> => {
+  const { name, envVar, sessionFunction, ensureBundleFunction, typeMappings } = config
+
+  if (!process.env[envVar]) {
+    const session = await sessionFunction()
+    const url = session.studioUrl || session.cyPromptUrl
+
+    if (!url) {
+      throw new Error(`No URL returned from ${name} session`)
+    }
+
+    const bundlePath = getBundlePath(url, name)
+
+    await ensureBundleFunction(url, bundlePath)
+
+    await copyTypeFiles(bundlePath, typeMappings)
   } else {
-    await fs.copyFile(
-      path.join(process.env.CYPRESS_LOCAL_STUDIO_PATH!, 'app', 'types.ts'),
-      path.join(__dirname, '..', '..', '..', 'packages', 'app', 'src', 'studio', 'studio-app-types.ts'),
-    )
+    const localPath = process.env[envVar]
 
-    await fs.copyFile(
-      path.join(process.env.CYPRESS_LOCAL_STUDIO_PATH!, 'server', 'types.ts'),
-      path.join(__dirname, '..', '..', '..', 'packages', 'types', 'src', 'studio', 'studio-server-types.ts'),
-    )
+    if (!localPath) {
+      throw new Error(`Environment variable ${envVar} is not set`)
+    }
+
+    await copyTypeFiles(localPath, typeMappings)
+  }
+}
+
+const createTypeMappings = (baseDir: string): TypeFileMapping[] => {
+  return [
+    {
+      sourcePath: 'app/types.ts',
+      destinationPath: path.join(baseDir, 'packages', 'app', 'src', 'studio', 'studio-app-types.ts'),
+    },
+    {
+      sourcePath: 'server/types.ts',
+      destinationPath: path.join(baseDir, 'packages', 'types', 'src', 'studio', 'studio-server-types.ts'),
+    },
+  ]
+}
+
+const createPromptTypeMappings = (baseDir: string): TypeFileMapping[] => {
+  return [
+    {
+      sourcePath: 'app/types.ts',
+      destinationPath: path.join(baseDir, 'packages', 'app', 'src', 'prompt', 'prompt-app-types.ts'),
+    },
+    {
+      sourcePath: 'driver/types.ts',
+      destinationPath: path.join(baseDir, 'packages', 'driver', 'src', 'cy', 'commands', 'prompt', 'prompt-driver-types.ts'),
+    },
+    {
+      sourcePath: 'server/types.ts',
+      destinationPath: path.join(baseDir, 'packages', 'types', 'src', 'cy-prompt', 'cy-prompt-server-types.ts'),
+    },
+  ]
+}
+
+export const downloadStudioTypes = async (): Promise<void> => {
+  const baseDir = path.join(__dirname, '..', '..', '..')
+
+  const studioConfig: BundleConfig = {
+    name: 'studio',
+    envVar: 'CYPRESS_LOCAL_STUDIO_PATH',
+    sessionFunction: () => postStudioSession({ projectId: 'ypt4pf' }),
+    ensureBundleFunction: (url: string, bundlePath: string) => ensureStudioBundle({ studioUrl: url, studioPath: bundlePath, projectId: 'ypt4pf' }),
+    typeMappings: createTypeMappings(baseDir),
   }
+
+  await downloadBundleTypes(studioConfig)
+}
+
+export const downloadPromptTypes = async (): Promise<void> => {
+  const baseDir = path.join(__dirname, '..', '..', '..')
+
+  const promptConfig: BundleConfig = {
+    name: 'cy-prompt',
+    envVar: 'CYPRESS_LOCAL_CY_PROMPT_PATH',
+    sessionFunction: () => postCyPromptSession({ projectId: 'ypt4pf' }),
+    ensureBundleFunction: (url: string, bundlePath: string) => ensureCyPromptBundle({ cyPromptUrl: url, cyPromptPath: bundlePath, projectId: 'ypt4pf' }),
+    typeMappings: createPromptTypeMappings(baseDir),
+  }
+
+  await downloadBundleTypes(promptConfig)
 }

From 0fc20b68c0077d63926b24c3cd7d6607c9fb1425 Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Tue, 17 Jun 2025 15:30:17 -0500
Subject: [PATCH 2/9] fix tests

---
 packages/reporter/cypress.config.ts           |  2 -
 packages/reporter/src/commands/command.cy.tsx | 38 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/packages/reporter/cypress.config.ts b/packages/reporter/cypress.config.ts
index 9b1b9bcc0d8..1f983e2649f 100644
--- a/packages/reporter/cypress.config.ts
+++ b/packages/reporter/cypress.config.ts
@@ -4,8 +4,6 @@ import WP from '../../npm/webpack-preprocessor'
 
 export default defineConfig({
   projectId: 'ypt4pf',
-  // @ts-expect-error - experimental prompt command is not officially typed until released
-  experimentalPromptCommand: true,
   reporter: '../../node_modules/cypress-multi-reporters/index.js',
 
   reporterOptions: {
diff --git a/packages/reporter/src/commands/command.cy.tsx b/packages/reporter/src/commands/command.cy.tsx
index edcdfc6b496..1b841a8f7ad 100644
--- a/packages/reporter/src/commands/command.cy.tsx
+++ b/packages/reporter/src/commands/command.cy.tsx
@@ -110,7 +110,15 @@ describe('commands', () => {
   })
 
   describe('prompt', () => {
+    let config
+
+    beforeEach(() => {
+      config = cy.stub(Cypress, 'config').log(false).callThrough()
+    })
+
     it('should render prompt get code button when state is passed', () => {
+      config.withArgs('experimentalPromptCommand').returns(true)
+      config.withArgs('isTextTerminal').returns(false)
       cy.mount(
         <div>
           <Command
@@ -137,6 +145,8 @@ describe('commands', () => {
     })
 
     it('should not render prompt get code button when state is not passed', () => {
+      config.withArgs('experimentalPromptCommand').returns(true)
+      config.withArgs('isTextTerminal').returns(false)
       cy.mount(
         <div>
           <Command
@@ -159,5 +169,33 @@ describe('commands', () => {
       cy.get('.command-prompt-get-code').should('not.exist')
       cy.get('.command-prompt-get-code-indicator').should('not.exist')
     })
+
+    it('should not render prompt if experimentalPromptCommand is false', () => {
+      config.withArgs('experimentalPromptCommand').returns(false)
+      config.withArgs('isTextTerminal').returns(false)
+
+      cy.mount(
+        <div>
+          <Command model={new CommandModel({ name: 'prompt', state: 'passed', numElements: 1, hookId: '1', id: 1, testId: '1' })} scrollIntoView={() => {}} aliasesWithDuplicates={[]} />
+        </div>,
+      )
+
+      cy.get('.command-prompt-get-code').should('not.exist')
+      cy.get('.command-prompt-get-code-indicator').should('not.exist')
+    })
+
+    it('should not render prompt if isTextTerminal is true', () => {
+      config.withArgs('experimentalPromptCommand').returns(true)
+      config.withArgs('isTextTerminal').returns(true)
+
+      cy.mount(
+        <div>
+          <Command model={new CommandModel({ name: 'prompt', state: 'passed', numElements: 1, hookId: '1', id: 1, testId: '1' })} scrollIntoView={() => {}} aliasesWithDuplicates={[]} />
+        </div>,
+      )
+
+      cy.get('.command-prompt-get-code').should('not.exist')
+      cy.get('.command-prompt-get-code-indicator').should('not.exist')
+    })
   })
 })

From 85f1484443ecbb749d0cf0c34891b77f3970e723 Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Tue, 17 Jun 2025 19:36:07 -0500
Subject: [PATCH 3/9] fix code paths

---
 packages/server/lib/socket-base.ts | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
index 2411c98de33..f58c6ebee7d 100644
--- a/packages/server/lib/socket-base.ts
+++ b/packages/server/lib/socket-base.ts
@@ -453,14 +453,17 @@ export class SocketBase {
           }
         })
 
-        socket.on('prompt:reset', (cb) => {
-          getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt().then(async (cyPrompt) => {
-            if (cyPrompt.cyPromptManager && !runState) {
-              cyPrompt.cyPromptManager.reset()
-            }
+        socket.on('prompt:reset', async (cb) => {
+          const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
+
+          // If we have runState, then we shouldn't reset the rull prompt manager because
+          // we are just changing top. We will clear the prompt manager for a specific test
+          // later.
+          if (!runState) {
+            cyPrompt?.cyPromptManager?.reset()
+          }
 
-            cb()
-          })
+          cb()
         })
 
         socket.on('backend:request', (eventName: string, ...args) => {
@@ -573,7 +576,7 @@ export class SocketBase {
           })
         })
 
-        socket.on('get:cached:test:state', (cb: (runState: RunState | null, testState: CachedTestState) => void) => {
+        socket.on('get:cached:test:state', async (cb: (runState: RunState | null, testState: CachedTestState) => void) => {
           const s = runState
 
           const cachedTestState: CachedTestState = {
@@ -589,13 +592,11 @@ export class SocketBase {
               const testId = s.currentId
 
               this._protocolManager?.resetTest(testId)
-              getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt().then(async (cyPrompt) => {
-                if (cyPrompt.cyPromptManager) {
-                  // reset the prompt manager for the current test to clear any
-                  // cached state when top changes for the current test
-                  cyPrompt.cyPromptManager.reset(testId)
-                }
-              })
+              const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
+
+              // reset the prompt manager for the current test to clear any
+              // cached state when top changes for the current test
+              cyPrompt?.cyPromptManager?.reset(testId)
             }
           }
 

From 57e91e19228e448bff72f44d0e8409f33e6b5859 Mon Sep 17 00:00:00 2001
From: estrada9166 <estrada9166@gmail.com>
Date: Wed, 18 Jun 2025 14:42:03 -0500
Subject: [PATCH 4/9] Update eject button styles

---
 packages/reporter/src/commands/command.tsx   | 51 +++++++++++---------
 packages/reporter/src/commands/commands.scss | 35 ++++++++++++++
 2 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/packages/reporter/src/commands/command.tsx b/packages/reporter/src/commands/command.tsx
index 0c76f8d60b6..4ee7711d41d 100644
--- a/packages/reporter/src/commands/command.tsx
+++ b/packages/reporter/src/commands/command.tsx
@@ -526,36 +526,39 @@ const Command: React.FC<CommandProps> = observer(({ model, aliasesWithDuplicates
             shouldShowMessage={_shouldShowClickMessage}
             wrapperClassName={cs('command-pin-target', { 'command-group': !!groupId, 'command-group-no-children': !model.hasChildren && model.group })}
           >
-            <div
-              className={cs('command-wrapper-text', {
-                'command-wrapper-text-group': model.hasChildren && groupId,
-                'command-wrapper-text-group-parent': model.hasChildren && !groupId,
-              })}
-              onMouseEnter={() => _snapshot(true)}
-              onMouseLeave={() => _snapshot(false)}
-            >
-              {groupPlaceholder}
-
-              {model.hasChildren && groupId && (
-                <div className={cs('command-expander-column-group', { 'nested-group-expander': model.groupLevel })} onClick={(e) => {
+            <div className='command-wrapper-container'>
+              <div
+                className={cs('command-wrapper-text', {
+                  'command-wrapper-text-group': model.hasChildren && groupId,
+                  'command-wrapper-text-group-parent': model.hasChildren && !groupId,
+                })}
+                onMouseEnter={() => _snapshot(true)}
+                onMouseLeave={() => _snapshot(false)}
+              >
+                {groupPlaceholder}
+
+                {model.hasChildren && groupId && (
+                  <div className={cs('command-expander-column-group', { 'nested-group-expander': model.groupLevel })} onClick={(e) => {
+                    e.stopPropagation()
+                    model.toggleOpen()
+                  }}>
+                    <ChevronIcon className={cs('command-expander', { 'command-expander-is-open': model.hasChildren && !!model.isOpen })} />
+                  </div>
+                )}
+                <CommandDetails model={model} groupId={groupId} aliasesWithDuplicates={aliasesWithDuplicates} />
+                <CommandControls model={model} commandName={commandName} events={events} />
+              </div>
+              {model.isCyPrompt && model.state === 'passed' && (
+                <div className='command-prompt-get-code' onClick={(e) => {
                   e.stopPropagation()
-                  model.toggleOpen()
+                  events.emit('prompt:get-code', { testId: model.testId, logId: model.id })
                 }}>
-                  <ChevronIcon className={cs('command-expander', { 'command-expander-is-open': model.hasChildren && !!model.isOpen })} />
+                  <AngleBracketsIcon className='command-prompt-get-code-indicator' width={12} height={12} />
+                  <span>Get code</span>
                 </div>
               )}
-              <CommandDetails model={model} groupId={groupId} aliasesWithDuplicates={aliasesWithDuplicates} />
-              <CommandControls model={model} commandName={commandName} events={events} />
             </div>
           </FlashOnClick>
-          {model.isCyPrompt && model.state === 'passed' && (
-            <div className='command-prompt-get-code' onClick={() => {
-              events.emit('prompt:get-code', { testId: model.testId, logId: model.id })
-            }}>
-              <AngleBracketsIcon className='command-prompt-get-code-indicator' />
-              <span>Get code</span>
-            </div>
-          )}
         </div>
         <Progress model={model} />
         {model.hasChildren && model.isOpen && (
diff --git a/packages/reporter/src/commands/commands.scss b/packages/reporter/src/commands/commands.scss
index 290869c55e0..9172542b4f2 100644
--- a/packages/reporter/src/commands/commands.scss
+++ b/packages/reporter/src/commands/commands.scss
@@ -76,6 +76,16 @@
       .command-expander > path {
         stroke: $gray-700;
       }
+
+      .command-prompt-get-code {
+        background: $gray-900;
+        border: 1px solid $gray-700;
+        color: $gray-200;
+
+        svg {
+          color: $gray-200;
+        }
+      }
     }
 
     .command-wrapper-text {
@@ -105,6 +115,31 @@
         margin-left: 0;
       }
     }
+
+    .command-wrapper-container {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
+
+      .command-prompt-get-code {
+        min-width: 85px;
+        margin-top: 1px;
+        align-self: flex-start;
+        display: flex;
+        padding: 2px 4px;
+        gap: 4px;
+        align-items: center;
+        cursor: pointer;
+        border-radius: 4px;
+        border: 1px solid $gray-900;
+        color: $gray-300;
+      
+        svg {
+          color: $gray-500;
+        }       
+      }
+    }
   }
 
   .command-number-column {

From c0fee3e16b9a4f897ec294027e690cc029aa63e5 Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Tue, 17 Jun 2025 21:40:41 -0500
Subject: [PATCH 5/9] handle errors

---
 packages/server/lib/socket-base.ts | 31 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
index f58c6ebee7d..82e7f0a5e69 100644
--- a/packages/server/lib/socket-base.ts
+++ b/packages/server/lib/socket-base.ts
@@ -454,16 +454,18 @@ export class SocketBase {
         })
 
         socket.on('prompt:reset', async (cb) => {
-          const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
+          try {
+            const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
 
-          // If we have runState, then we shouldn't reset the rull prompt manager because
-          // we are just changing top. We will clear the prompt manager for a specific test
-          // later.
-          if (!runState) {
-            cyPrompt?.cyPromptManager?.reset()
+            // If we have runState, then we shouldn't reset the rull prompt manager because
+            // we are just changing top. We will clear the prompt manager for a specific test
+            // later.
+            if (!runState) {
+              cyPrompt?.cyPromptManager?.reset()
+            }
+          } finally {
+            cb()
           }
-
-          cb()
         })
 
         socket.on('backend:request', (eventName: string, ...args) => {
@@ -592,11 +594,16 @@ export class SocketBase {
               const testId = s.currentId
 
               this._protocolManager?.resetTest(testId)
-              const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
 
-              // reset the prompt manager for the current test to clear any
-              // cached state when top changes for the current test
-              cyPrompt?.cyPromptManager?.reset(testId)
+              try {
+                const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
+
+                // reset the prompt manager for the current test to clear any
+                // cached state when top changes for the current test
+                cyPrompt?.cyPromptManager?.reset(testId)
+              } catch (error) {
+                debug('error resetting prompt manager', error)
+              }
             }
           }
 

From 77ab9020bfde9ee67b98caa478e7b5e943bc7f8e Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Wed, 18 Jun 2025 22:12:43 -0500
Subject: [PATCH 6/9] update types

---
 packages/app/src/prompt/prompt-app-types.ts           |  8 +++++++-
 .../src/cy/commands/prompt/prompt-driver-types.ts     | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/app/src/prompt/prompt-app-types.ts b/packages/app/src/prompt/prompt-app-types.ts
index 78a61a50e59..09014fc44d9 100644
--- a/packages/app/src/prompt/prompt-app-types.ts
+++ b/packages/app/src/prompt/prompt-app-types.ts
@@ -1,3 +1,7 @@
+// Note: This file is owned by the cloud delivered
+// cy prompt bundle. It is downloaded and copied here.
+// It should not be modified directly here.
+
 export interface CypressInternal extends Cypress.Cypress {
   backendRequestHandler: (
     backendRequestNamespace: string,
@@ -13,7 +17,9 @@ export interface GetCodeModalContentsProps {
   onClose: () => void
 }
 
-export type GetCodeModalContentsShape = (props: GetCodeModalContentsProps) => JSX.Element
+export type GetCodeModalContentsShape = (
+  props: GetCodeModalContentsProps
+) => JSX.Element
 
 export interface CyPromptAppDefaultShape {
   // Purposefully do not use React in this signature to avoid conflicts when this type gets
diff --git a/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts b/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts
index 00af15da1e4..11673ffb510 100644
--- a/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts
+++ b/packages/driver/src/cy/commands/prompt/prompt-driver-types.ts
@@ -66,11 +66,18 @@ export interface CyPromptOptions {
   // so we need to check for it's presence before using it
   eventManager?: CyPromptEventManager
   errorUtils: CyPromptErrorUtils
-  getSourceDetailsForFirstLine: (stack: string, projectRoot?: string) => CyPromptStackLineDetail | undefined
+  getSourceDetailsForFirstLine: (
+    stack: string,
+    projectRoot?: string
+  ) => CyPromptStackLineDetail | undefined
 }
 
 export interface CyPromptDriverDefaultShape {
   createCyPrompt: (
     options: CyPromptOptions
-  ) => (args: { steps: string | string[], commandOptions?: object, promptCmd: any }) => Promise<void>
+  ) => (args: {
+    steps: string | string[]
+    commandOptions?: object
+    promptCmd: any
+  }) => Promise<void>
 }

From 62626a9cde0c8585ce5b47513c91ae0c16d08805 Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Wed, 18 Jun 2025 22:27:26 -0500
Subject: [PATCH 7/9] Update packages/server/lib/socket-base.ts

---
 packages/server/lib/socket-base.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
index 82e7f0a5e69..72c71dbb4e5 100644
--- a/packages/server/lib/socket-base.ts
+++ b/packages/server/lib/socket-base.ts
@@ -457,7 +457,7 @@ export class SocketBase {
           try {
             const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()
 
-            // If we have runState, then we shouldn't reset the rull prompt manager because
+            // If we have runState, then we shouldn't reset the full prompt manager because
             // we are just changing top. We will clear the prompt manager for a specific test
             // later.
             if (!runState) {

From a3e4ad601c6bc449b9906bf0bb384fb290c29d61 Mon Sep 17 00:00:00 2001
From: estrada9166 <estrada9166@gmail.com>
Date: Fri, 20 Jun 2025 16:06:01 -0500
Subject: [PATCH 8/9] Fix cy test

---
 packages/reporter/src/commands/commands.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/reporter/src/commands/commands.scss b/packages/reporter/src/commands/commands.scss
index 9172542b4f2..52593a6f125 100644
--- a/packages/reporter/src/commands/commands.scss
+++ b/packages/reporter/src/commands/commands.scss
@@ -91,6 +91,7 @@
     .command-wrapper-text {
       display: flex;
       flex-wrap: nowrap;
+      width: 100%;
     }
 
     .command-interceptions {

From 1e58c28e247d46177db9aba9bb07a5ac59e2920a Mon Sep 17 00:00:00 2001
From: Ryan Manuel <ryanm@cypress.io>
Date: Fri, 20 Jun 2025 16:25:49 -0500
Subject: [PATCH 9/9] update readme

---
 guides/cy-prompt-development.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/guides/cy-prompt-development.md b/guides/cy-prompt-development.md
index 390e2147506..1eebbb52be6 100644
--- a/guides/cy-prompt-development.md
+++ b/guides/cy-prompt-development.md
@@ -1,6 +1,6 @@
 # `cy.prompt` Development
 
-In production, the code used to facilitate the prompt command will be retrieved from the Cloud. While `cy.prompt` is still in its early stages it is hidden behind an environment variable: `CYPRESS_ENABLE_CY_PROMPT` but can also be run against local cloud Studio code via the environment variable: `CYPRESS_LOCAL_CY_PROMPT_PATH`.
+In production, the code used to facilitate the prompt command will be retrieved from the Cloud. While `cy.prompt` is still in its early stages it is hidden behind an environment variable: `CYPRESS_ENABLE_CY_PROMPT` but can also be run against local cloud prompt code via the environment variable: `CYPRESS_LOCAL_CY_PROMPT_PATH`.
 
 To run against locally developed `cy.prompt`:
 
@@ -30,6 +30,20 @@ To run against a deployed version of `cy.prompt`:
 - Set:
   - `CYPRESS_INTERNAL_ENV=<environment>` (e.g. `staging` or `production` if you want to hit those deployments of `cypress-services` or `development` if you want to hit a locally running version of `cypress-services`)
 
+## Types
+
+The prompt bundle provides the types for the `app`, `driver`, and `server` interfaces that are used within the Cypress code. To incorporate the types into the code base, run:
+
+```sh
+yarn gulp downloadPromptTypes
+```
+
+or to reference a local `cypress_services` repo:
+
+```sh
+CYPRESS_LOCAL_CY_PROMPT_PATH=<path-to-cypress-services/app/cy-prompt/dist/development-directory> yarn gulp downloadPromptTypes
+```
+
 ## Testing
 
 ### Unit/Component Testing