From 3da6065d56edc5860fc90aea070582d28a0c737d Mon Sep 17 00:00:00 2001
From: Anish Sinha <anish@browserstack.com>
Date: Wed, 12 Aug 2026 16:30:53 +0530
Subject: [PATCH 1/2] fix(automate): name App Automate sessions per test
 instead of only at worker teardown (SDK-7270)

Since 9.27 the SDK self-bootstraps the platform binary, so BrowserstackCLI.isRunning()
is true on every run and service.ts skips the legacy per-test rename. Ownership moved to
automateModule, which records the per-test name in sessionMap but issues no PUT until
onAfterExecute -- reached only from service.ts's after() hook, i.e. once at worker teardown.

Every session's name therefore depended on a single event at the very end of the worker.
Suites that reload the session per test have already closed those sessions by then, and a
worker that never reaches after() (interrupted run, hard exit, crash) never fires
onAfterExecute at all -- leaving every session on its creation-time sessionName capability.

Name the session from onBeforeTest, while it is still the live session, via a new
flushSessionName() helper de-duped on SessionData.appliedName. onAfterExecute now calls the
same helper, becoming a final sweep that no-ops for sessions already named. Restores the
pre-9.27 per-test timing with no extra API calls in the steady state.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .../src/cli/modules/automateModule.ts         | 42 +++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/packages/browserstack-service/src/cli/modules/automateModule.ts b/packages/browserstack-service/src/cli/modules/automateModule.ts
index 1a0aa04..712b8b2 100644
--- a/packages/browserstack-service/src/cli/modules/automateModule.ts
+++ b/packages/browserstack-service/src/cli/modules/automateModule.ts
@@ -25,6 +25,7 @@ interface TestResult {
 
 interface SessionData {
     lastTestName: string
+    appliedName?: string // last name successfully PUT for this session, for de-duping
     testResults: Map<string, TestResult> // testName -> TestResult
 }
 
@@ -95,6 +96,42 @@ export default class AutomateModule extends BaseModule {
         }
 
         TestFramework.setState(instace, TestFrameworkConstants.KEY_AUTOMATE_SESSION_NAME, name)
+
+        // SDK-7270: name the session NOW, while it is still the live session, instead of
+        // relying solely on the onAfterExecute sweep at worker teardown. Sessions are closed
+        // as soon as the suite reloads them (`browser.reloadSession()` per test), and a worker
+        // that never reaches `after()` — interrupted run, hard exit, crash — never fires
+        // onAfterExecute at all, leaving every session on the creation-time `sessionName`
+        // capability. Restores the pre-9.27 behaviour, where the rename was issued per test.
+        await this.flushSessionName(sessionId)
+    }
+
+    /**
+     * PUT the session's current name if it has not already been applied.
+     * De-duped via `appliedName` so the onAfterExecute sweep does not re-send it.
+     */
+    private async flushSessionName(sessionId: string): Promise<void> {
+        const testContextOptions = this.config.testContextOptions as TestContextOptions
+        if (testContextOptions.skipSessionName) {
+            return
+        }
+
+        if (!sessionId) {
+            return
+        }
+
+        const sessionData = this.sessionMap.get(sessionId)
+        if (!sessionData || !sessionData.lastTestName || sessionData.appliedName === sessionData.lastTestName) {
+            return
+        }
+
+        const name = sessionData.lastTestName
+        await this.markSessionName(sessionId, name, {
+            user: this.config.userName as string,
+            key: this.config.accessKey as string
+        })
+        sessionData.appliedName = name
+        this.sessionMap.set(sessionId, sessionData)
     }
 
     async onAfterTest(args: Record<string, unknown>) {
@@ -180,9 +217,8 @@ export default class AutomateModule extends BaseModule {
                     }
                 }
 
-                if (!testContextOptions.skipSessionName) {
-                    await this.markSessionName(sessionId, sessionData.lastTestName, { user: userName, key: accessKey })
-                }
+                // Final sweep — a no-op for sessions already named per-test in onBeforeTest.
+                await this.flushSessionName(sessionId)
 
                 if (!testContextOptions.skipSessionStatus) {
                     await this.markSessionStatus(sessionId, sessionStatus, failureReason, { user: userName, key: accessKey })

From 0986e13b5d77be85dc6c5dd06ed0a761a33f6b01 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Aug 2026 11:02:19 +0000
Subject: [PATCH 2/2] chore(changeset): auto-generate from PR template (patch)

---
 .changeset/pr-131.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/pr-131.md

diff --git a/.changeset/pr-131.md b/.changeset/pr-131.md
new file mode 100644
index 0000000..b94fcf0
--- /dev/null
+++ b/.changeset/pr-131.md
@@ -0,0 +1,5 @@
+---
+"@wdio/browserstack-service": patch
+---
+
+- Fixed App Automate and Automate session names staying on the static `sessionName` capability instead of the test title, for suites that reload the session between tests or whose run ends before the WebdriverIO `after` hook.