Merge branch 'develop' into ryanm/fix/rename-exclude-from-ai

Author: ryanthemanuel

packages/server/lib/project-base.ts

@@ -497,6 +497,9 @@ export class ProjectBase extends EE {
 
           const studio = await this.ctx.coreData.studioLifecycleManager?.getStudio()
 
+          // Update the session id in the studio manager
+          studio?.updateSessionId(cloudStudioSessionId)
+
           if (this.spec && studio?.protocolManager) {
             telemetryManager.mark(INITIALIZATION_MARK_NAMES.CAN_ACCESS_STUDIO_AI_START)
             const canAccessStudioAI = await studio?.canAccessStudioAI(this.browser) ?? false

packages/server/test/unit/project_spec.js

@@ -813,6 +813,7 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
         const mockBeforeSpec = sinon.stub()
         const mockAccessStudioAI = sinon.stub().resolves(true)
         const mockCaptureStudioEvent = sinon.stub().resolves()
+        const mockUpdateSessionId = sinon.stub()
 
         this.project.spec = {}
 
@@ -832,6 +833,8 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
           dbPath: 'test-db-path',
         }
 
+        studioManager.updateSessionId = mockUpdateSessionId
+
         const studioLifecycleManager = new StudioLifecycleManager()
 
         this.project.ctx.coreData.studioLifecycleManager = studioLifecycleManager
@@ -878,6 +881,8 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
           name: 'chrome',
         })
 
+        expect(mockUpdateSessionId.getCall(0).args[0]).to.be.a.uuid()
+
         expect(browsers.connectProtocolToBrowser).to.be.calledWith({
           browser: this.project.browser,
           foundBrowsers: this.project.options.browsers,
@@ -905,6 +910,7 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
         const mockBeforeSpec = sinon.stub()
         const mockAccessStudioAI = sinon.stub().resolves(true)
         const mockCaptureStudioEvent = sinon.stub().resolves()
+        const mockUpdateSessionId = sinon.stub()
 
         this.project.spec = {}
 
@@ -924,6 +930,8 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
           dbPath: 'test-db-path',
         }
 
+        studioManager.updateSessionId = mockUpdateSessionId
+
         const studioLifecycleManager = new StudioLifecycleManager()
 
         this.project.ctx.coreData.studioLifecycleManager = studioLifecycleManager
@@ -962,6 +970,7 @@ This option will not have an effect in Some-other-name. Tests that rely on web s
         const { cloudStudioSessionId } = await studioInitPromise
 
         expect(cloudStudioSessionId).to.equal('existing-session-id')
+        expect(mockUpdateSessionId).to.be.calledOnceWith('existing-session-id')
       })
 
       it('calls resetBrowserState during onStudioInit when AI is enabled', async function () {