fix: Aliases properly retry commands from inside custom commands (#23663)

Author: Blue F

packages/driver/cypress/e2e/commands/aliasing.cy.js

@@ -101,6 +101,15 @@ describe('src/cy/commands/aliasing', () => {
           expect(this.input).to.eq(obj)
         })
       })
+
+      it('retries previous commands invoked inside custom commands', () => {
+        Cypress.Commands.add('get2', (selector) => cy.get(selector))
+
+        cy.get2('body').children('div').as('divs')
+        cy.visit('/fixtures/dom.html')
+
+        cy.get('@divs')
+      })
     })
 
     context('#assign', () => {

packages/driver/src/cypress/cy.ts

@@ -1230,11 +1230,13 @@ export class $Cy extends EventEmitter2 implements ITimeouts, IStability, IAssert
     }
 
     // A workaround to ensure that when looking back, aliases don't extend beyond the current
-    // chainer. This whole area (`replayCommandsFrom` for aliases) will be replaced with subject chains as
-    // part of the detached DOM work.
+    // chainer and commands invoked inside of it. This whole area (`replayCommandsFrom` for aliases)
+    // will be replaced with subject chains as part of the detached DOM work.
+    const chainerId = command.get('chainerId')
     const prev = command.get('prev')
+    const prevChainer = prev.get('chainerId')
 
-    if (prev.get('chainerId') !== command.get('chainerId')) {
+    if (prevChainer !== chainerId && cy.state('subjectLinks')[prevChainer] !== chainerId) {
       return memo
     }