fix: ensure that current retry is maintained properly when tests fail prior to top changing (#32888)

* fix: ensure that current retry is maintained properly when tests fail prior to top changing

* add protocol work

* Update packages/driver/src/cypress/runner.ts

* Update packages/server/lib/socket-base.ts

* Add changelog entry for version 15.6.1

Added changelog entry for version 15.6.1 with a bugfix.

* Update packages/server/test/unit/socket_spec.js

Co-authored-by: Bill Glesias <[email protected]>

---------

Co-authored-by: Bill Glesias <[email protected]>

Author: ryanthemanuel

cli/CHANGELOG.md

@@ -3,6 +3,10 @@
 
 _Released 11/18/2025 (PENDING)_
 
+**Bugfixes:**
+
+- Fixed an issue where top changes on test retries could cause attempt numbers to show up more than one time in the reporter and cause attempts to be lost in Test Replay. Addressed in [#32888](https://github.com/cypress-io/cypress/pull/32888).
+
 **Misc:**
 
 - The keyboard shortcuts modal now displays the keyboard shortcut for saving Studio changes - `⌘` + `s` for Mac or `Ctrl` + `s` for Windows/Linux. Addressed [#32862](https://github.com/cypress-io/cypress/issues/32862). Addressed in [#32864](https://github.com/cypress-io/cypress/pull/32864).

packages/app/src/runner/event-manager.ts

@@ -554,7 +554,7 @@ export class EventManager {
             // if we have a currentId it means
             // we need to tell the Cypress to skip
             // ahead to that test
-            Cypress.runner.resumeAtTest(runState.currentId, runState.emissions)
+            Cypress.runner.resumeAtTest(runState.currentId, runState.currentRetry, runState.emissions)
           }
 
           return run()

packages/driver/src/cypress.ts

@@ -861,6 +861,7 @@ class $Cypress {
     const tests = this.runner.getTestsState(testId)
     let runState: RunState = {
       currentId: testId,
+      currentRetry: this.currentRetry,
       tests,
       startTime: this.runner.getStartTime(),
       emissions: this.runner.getEmissions(),

packages/driver/src/cypress/runner.ts

@@ -1980,7 +1980,7 @@ export default {
         return
       },
 
-      resumeAtTest (id, emissions: Emissions = {
+      resumeAtTest (id: string, currentRetry: number, emissions: Emissions = {
         started: {},
         ended: {},
       }) {
@@ -1993,6 +1993,9 @@ export default {
             test._ALREADY_RAN = true
             test.pending = true
           } else {
+            // set the current retry to the retry that we are resuming at
+            test._currentRetry = currentRetry ?? 0
+
             // bail so we can stop now
             return
           }

packages/server/lib/cloud/protocol.ts

@@ -259,8 +259,8 @@ export class ProtocolManager implements ProtocolManagerShape {
     this.invokeSync('pageLoading', { isEssential: false }, input)
   }
 
-  resetTest (testId: string): void {
-    this.invokeSync('resetTest', { isEssential: false }, testId)
+  resetTest (testId: string, currentRetry?: number): void {
+    this.invokeSync('resetTest', { isEssential: false }, testId, currentRetry)
   }
 
   responseEndedWithEmptyBody (options: ResponseEndedWithEmptyBodyOptions): void {

packages/server/lib/socket-base.ts

@@ -617,8 +617,9 @@ export class SocketBase {
             // the test state on the protocol manager and prompt manager
             if (s.currentId) {
               const testId = s.currentId
+              const currentRetry = s.currentRetry ?? undefined
 
-              this._protocolManager?.resetTest(testId)
+              this._protocolManager?.resetTest(testId, currentRetry)
 
               try {
                 const cyPrompt = await getCtx().coreData.cyPromptLifecycleManager?.getCyPrompt()

packages/server/test/unit/cloud/protocol_spec.ts

@@ -310,14 +310,27 @@ describe('lib/cloud/protocol', () => {
     expect(protocol.pageLoading).to.be.calledWith(input)
   })
 
-  it('should be able to reset the test', () => {
-    sinon.stub(protocol, 'resetTest')
+  describe('.resetTest', () => {
+    it('should be able to reset the test with no current retry', () => {
+      sinon.stub(protocol, 'resetTest')
 
-    const testId = 'r3'
+      const testId = 'r3'
 
-    protocolManager.resetTest(testId)
+      protocolManager.resetTest(testId)
 
-    expect(protocol.resetTest).to.be.calledWith(testId)
+      expect(protocol.resetTest).to.be.calledWith(testId)
+    })
+
+    it('should be able to reset the test with a current retry', () => {
+      sinon.stub(protocol, 'resetTest')
+
+      const testId = 'r3'
+      const currentRetry = 1
+
+      protocolManager.resetTest(testId, currentRetry)
+
+      expect(protocol.resetTest).to.be.calledWith(testId, currentRetry)
+    })
   })
 
   describe('.reset', () => {

packages/server/test/unit/socket_spec.js

@@ -783,6 +783,40 @@ describe('lib/socket', () => {
         })
       })
     })
+
+    describe('on(get:cached:test:state)', () => {
+      it('returns cached test state', async function () {
+        await new Promise((resolve) => {
+          this.client.emit('backend:request', 'preserve:run:state', {
+            currentId: 'test',
+            currentRetry: 0,
+          }, resolve)
+        })
+
+        const mockProtocolManager = {
+          resetTest: sinon.stub(),
+        }
+
+        this.socket['_protocolManager'] = mockProtocolManager
+
+        await new Promise((resolve) => {
+          this.client.emit('get:cached:test:state', (runState, testState) => {
+            expect(runState).to.deep.eq({
+              currentId: 'test',
+              currentRetry: 0,
+            })
+
+            expect(testState).to.deep.eq({
+              activeSessions: {},
+            })
+
+            expect(mockProtocolManager.resetTest).to.be.calledWith('test', 0)
+
+            resolve()
+          })
+        })
+      })
+    })
   })
 
   context('unit', () => {

packages/types/src/driver.ts

@@ -3,6 +3,7 @@ import type { ReporterRunState } from './reporter'
 interface MochaRunnerState {
   startTime?: number
   currentId?: string | null
+  currentRetry?: number | null
   emissions?: Emissions
   tests?: Record<string, Cypress.ObjectLike>
   passed?: number

packages/types/src/protocol.ts

@@ -30,7 +30,7 @@ export interface AppCaptureProtocolCommon {
   afterTest(test: Record<string, any>): Promise<void>
   afterSpec (): Promise<{ durations: AfterSpecDurations } | undefined>
   pageLoading (input: any): void
-  resetTest (testId: string): void
+  resetTest (testId: string, currentRetry?: number): void
   responseEndedWithEmptyBody: (options: ResponseEndedWithEmptyBodyOptions) => void
   responseStreamReceived (options: ResponseStreamOptions): Readable | undefined
   responseStreamTimedOut (options: ResponseStreamTimedOutOptions): void