@ddwang/magnitude-core 0.3.1-ddwang.8 → 0.3.1-ddwang.9

package/dist/actions/webActions.js

@@ -149,7 +149,7 @@ export const switchTabAction = createAction({
 });
 export const newTabAction = createAction({
     name: 'browser:tab:new',
-    description: "Open and switch to a new tab",
+    description: "Open and switch to a new blank tab. Use browser:nav to navigate it to a URL.",
     schema: z.object({}),
     resolver: async ({ agent }) => {
         const webConnector = agent.require(BrowserConnector);

package/dist/index.cjs

@@ -5506,6 +5506,7 @@ class TabManager {
   activePage;
   options;
   pollInterval;
+  lastExplicitSwitch = 0;
   events;
   constructor(context, options = {}) {
     this.context = context;
@@ -5651,7 +5652,7 @@ class TabManager {
         } catch (e) {
         }
       }
-      if (mostRecentPage && mostRecentPage !== this.activePage && mostRecentTime > Date.now() - 1e3) {
+      if (mostRecentPage && mostRecentPage !== this.activePage && mostRecentTime > this.lastExplicitSwitch && mostRecentTime > Date.now() - 1e3) {
         logger.trace(`Activity detected on ${mostRecentPage.url()}, switching...`);
         this.setActivePage(mostRecentPage);
       }
@@ -5678,6 +5679,8 @@ class TabManager {
     const page = pages[index];
     logger.debug(`Switching to tab ${index} (${page.url()})`);
     await page.bringToFront();
+    checkOperation();
+    this.lastExplicitSwitch = Date.now();
     this.setActivePage(page);
   }
   getActivePage() {
@@ -6563,8 +6566,8 @@ class WebHarness {
   }
   async newTab() {
     checkOperation();
-    await this.context.newPage();
-    await this.navigate("https://google.com");
+    const page = await this.context.newPage();
+    await this.switchTab({ index: this.context.pages().indexOf(page) });
   }
   async navigate(url) {
     checkOperation();
@@ -6779,7 +6782,7 @@ const switchTabAction = createAction({
 });
 const newTabAction = createAction({
   name: "browser:tab:new",
-  description: "Open and switch to a new tab",
+  description: "Open and switch to a new blank tab. Use browser:nav to navigate it to a URL.",
   schema: z.z.object({}),
   resolver: async ({ agent }) => {
     const webConnector = agent.require(BrowserConnector);

package/dist/index.mjs

@@ -5483,6 +5483,7 @@ class TabManager {
   activePage;
   options;
   pollInterval;
+  lastExplicitSwitch = 0;
   events;
   constructor(context, options = {}) {
     this.context = context;
@@ -5628,7 +5629,7 @@ class TabManager {
         } catch (e) {
         }
       }
-      if (mostRecentPage && mostRecentPage !== this.activePage && mostRecentTime > Date.now() - 1e3) {
+      if (mostRecentPage && mostRecentPage !== this.activePage && mostRecentTime > this.lastExplicitSwitch && mostRecentTime > Date.now() - 1e3) {
         logger.trace(`Activity detected on ${mostRecentPage.url()}, switching...`);
         this.setActivePage(mostRecentPage);
       }
@@ -5655,6 +5656,8 @@ class TabManager {
     const page = pages[index];
     logger.debug(`Switching to tab ${index} (${page.url()})`);
     await page.bringToFront();
+    checkOperation();
+    this.lastExplicitSwitch = Date.now();
     this.setActivePage(page);
   }
   getActivePage() {
@@ -6540,8 +6543,8 @@ class WebHarness {
   }
   async newTab() {
     checkOperation();
-    await this.context.newPage();
-    await this.navigate("https://google.com");
+    const page = await this.context.newPage();
+    await this.switchTab({ index: this.context.pages().indexOf(page) });
   }
   async navigate(url) {
     checkOperation();
@@ -6756,7 +6759,7 @@ const switchTabAction = createAction({
 });
 const newTabAction = createAction({
   name: "browser:tab:new",
-  description: "Open and switch to a new tab",
+  description: "Open and switch to a new blank tab. Use browser:nav to navigate it to a URL.",
   schema: z.object({}),
   resolver: async ({ agent }) => {
     const webConnector = agent.require(BrowserConnector);

package/dist/web/harness.js

@@ -387,9 +387,8 @@ export class WebHarness {
     }
     async newTab() {
         checkOperation();
-        await this.context.newPage();
-        // Reasonable default and less confusing than white about:blank page
-        await this.navigate("https://google.com");
+        const page = await this.context.newPage();
+        await this.switchTab({ index: this.context.pages().indexOf(page) });
     }
     async navigate(url) {
         checkOperation();

package/dist/web/tabs.d.ts

@@ -18,6 +18,7 @@ export declare class TabManager {
     private activePage;
     private options;
     private pollInterval?;
+    private lastExplicitSwitch;
     readonly events: EventEmitter<TabEvents>;
     constructor(context: BrowserContext, options?: TabManagerOptions);
     initialize(): Promise<void>;

package/dist/web/tabs.js

@@ -2,11 +2,13 @@
 import logger from "@/logger";
 import EventEmitter from "eventemitter3";
 import { retryOnErrorIsSuccess } from "@/common";
+import { checkOperation } from "@/common/operation";
 export class TabManager {
     context;
     activePage;
     options;
     pollInterval;
+    lastExplicitSwitch = 0;
     events;
     constructor(context, options = {}) {
         this.context = context;
@@ -193,6 +195,7 @@ export class TabManager {
             // Switch to the most recently active page if it's different and activity is recent
             if (mostRecentPage &&
                 mostRecentPage !== this.activePage &&
+                mostRecentTime > this.lastExplicitSwitch &&
                 mostRecentTime > Date.now() - 1000) { // Activity within last second
                 logger.trace(`Activity detected on ${mostRecentPage.url()}, switching...`);
                 this.setActivePage(mostRecentPage);
@@ -223,6 +226,9 @@ export class TabManager {
         const page = pages[index];
         logger.debug(`Switching to tab ${index} (${page.url()})`);
         await page.bringToFront();
+        checkOperation();
+        // Activity sampled before this switch must not undo the explicit selection.
+        this.lastExplicitSwitch = Date.now();
         this.setActivePage(page);
     }
     getActivePage() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddwang/magnitude-core",
-  "version": "0.3.1-ddwang.8",
+  "version": "0.3.1-ddwang.9",
   "description": "Magnitude e2e testing agent",
   "publishConfig": {
     "access": "public"