@haibun/web-playwright 3.1.1 → 3.3.0

package/build/BrowserFactory.d.ts

@@ -1,7 +1,7 @@
 import { Browser, BrowserContext, Page, BrowserType, BrowserContextOptions } from 'playwright';
 import { PlaywrightEvents } from './PlaywrightEvents.js';
 import { TWorld } from '@haibun/core/lib/defs.js';
-import { TTagValue, TTag } from '@haibun/core/lib/ttag.js';
+import { TTag } from '@haibun/core/lib/ttag.js';
 export declare const BROWSERS: {
     [name: string]: BrowserType;
 };
@@ -38,7 +38,7 @@ export declare class BrowserFactory {
         [name: string]: Page | undefined;
     };
     contextStats: {
-        [sequence: string]: {
+        [featureNum: string]: {
             start: number;
             end?: number;
             duration?: number;
@@ -51,23 +51,23 @@ export declare class BrowserFactory {
     private constructor();
     static getBrowserFactory(world: TWorld, tagConfig: TTaggedBrowserFactoryOptions, tag?: string): BrowserFactory;
     getBrowser(type: string, tag?: string): Promise<Browser>;
-    getExistingBrowserContextWithTag({ sequence }: {
-        sequence: TTagValue;
+    getExistingBrowserContextWithTag({ featureNum }: {
+        featureNum: number;
     }): BrowserContext;
-    closeContext({ sequence }: {
-        sequence: TTagValue;
+    closeContext({ featureNum }: {
+        featureNum: number;
     }): Promise<void>;
     private captureVideoStart;
     static closeBrowsers(): Promise<void>;
     close(): Promise<void>;
-    hasPage({ sequence }: {
-        sequence: TTagValue;
+    hasPage({ featureNum }: {
+        featureNum: number;
     }, tab?: number): boolean;
-    registerPopup({ sequence }: {
-        sequence: TTagValue;
+    registerPopup({ featureNum }: {
+        featureNum: number;
     }, tab: number, popup: Page): void;
     getBrowserContextPage(tag: TTag, tab: number): Promise<Page>;
     private pageKey;
-    private getBrowserContextWithSequence;
+    private getBrowserContextWithFeatureNum;
 }
 //# sourceMappingURL=BrowserFactory.d.ts.map

package/build/BrowserFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserFactory.d.ts","sourceRoot":"","sources":["../src/BrowserFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BrowserFactory.d.ts","sourceRoot":"","sources":["../src/BrowserFactory.ts"],"names":[],"mappings":"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"}

package/build/BrowserFactory.js

@@ -1,7 +1,6 @@
 import { chromium, firefox, webkit, devices } from 'playwright';
-import { EExecutionMessageType } from '@haibun/core/lib/interfaces/logger.js';
 import { PlaywrightEvents } from './PlaywrightEvents.js';
-import { Timer } from '@haibun/core/lib/Timer.js';
+import { Timer } from '@haibun/core/schema/protocol.js';
 export const BROWSERS = {
     firefox,
     chromium,
@@ -33,42 +32,37 @@ export class BrowserFactory {
             return browser;
         }
     }
-    getExistingBrowserContextWithTag({ sequence }) {
-        if (this.browserContexts[sequence]) {
-            return this.browserContexts[sequence];
+    getExistingBrowserContextWithTag({ featureNum }) {
+        if (this.browserContexts[featureNum]) {
+            return this.browserContexts[featureNum];
         }
     }
-    async closeContext({ sequence }) {
-        this.world.logger.debug(`closed browser context ${sequence}`);
-        if (this.browserContexts[sequence] !== undefined) {
-            const p = this.pages[sequence];
+    async closeContext({ featureNum }) {
+        this.world.eventLogger.debug(`closed browser context ${featureNum}`);
+        if (this.browserContexts[featureNum] !== undefined) {
+            const p = this.pages[featureNum];
             if (p) {
                 try {
                     await p.close();
                 }
                 catch (error) {
-                    this.world.logger.error(`Error closing page: ${error}`);
+                    this.world.eventLogger.error(`Error closing page: ${error}`);
                 }
             }
         }
-        await this.browserContexts[sequence]?.close();
-        this.captureVideoStart(sequence);
-        this.tracers[sequence]?.close();
-        delete this.pages[sequence];
-        delete this.browserContexts[sequence];
+        await this.browserContexts[featureNum]?.close();
+        this.captureVideoStart(featureNum);
+        this.tracers[featureNum]?.close();
+        delete this.pages[featureNum];
+        delete this.browserContexts[featureNum];
     }
-    captureVideoStart(sequence) {
-        this.contextStats[sequence].end = Timer.since();
-        this.contextStats[sequence].duration = this.contextStats[sequence].end - this.contextStats[sequence].start;
-        const vs = {
-            incident: EExecutionMessageType.ACTION,
-            artifacts: [{
-                    start: Timer.since() - this.contextStats[sequence].duration,
-                    artifactType: 'video/start'
-                }],
-            tag: this.world.tag
-        };
-        this.world.logger.debug(`video start`, vs);
+    captureVideoStart(featureNum) {
+        if (!this.contextStats[featureNum]) {
+            return;
+        }
+        this.contextStats[featureNum].end = Timer.since();
+        this.contextStats[featureNum].duration = this.contextStats[featureNum].end - this.contextStats[featureNum].start;
+        this.world.eventLogger.debug(`video stats for ${featureNum}: duration ${this.contextStats[featureNum].duration}`);
     }
     static async closeBrowsers() {
         for (const b in BrowserFactory.browsers) {
@@ -79,34 +73,34 @@ export class BrowserFactory {
     async close() {
         await BrowserFactory.closeBrowsers();
     }
-    hasPage({ sequence }, tab) {
-        return !!this.pages[this.pageKey(sequence, tab)];
+    hasPage({ featureNum }, tab) {
+        return !!this.pages[this.pageKey(featureNum, tab)];
     }
-    registerPopup({ sequence }, tab, popup) {
-        const tt = this.pageKey(sequence, tab);
+    registerPopup({ featureNum }, tab, popup) {
+        const tt = this.pageKey(featureNum, tab);
         this.pages[tt] = popup;
     }
     async getBrowserContextPage(tag, tab) {
-        const { sequence } = tag;
-        const pageKey = this.pageKey(sequence, tab);
+        const { featureNum } = tag;
+        const pageKey = this.pageKey(featureNum, tab);
         let page = this.pages[pageKey];
         if (page) {
             // await page.bringToFront();
             return page;
         }
-        this.world.logger.debug(`creating new page for ${sequence}`);
-        const context = await this.getBrowserContextWithSequence(sequence);
+        this.world.eventLogger.debug(`creating new page for ${featureNum}`);
+        const context = await this.getBrowserContextWithFeatureNum(featureNum);
         page = await context.newPage();
         const tracer = await (new PlaywrightEvents(this.world, page, tag)).init();
         this.pages[pageKey] = page;
-        this.tracers[sequence] = tracer;
+        this.tracers[featureNum] = tracer;
         return page;
     }
-    pageKey(sequence, tab) {
-        return `${sequence}-${tab}`;
+    pageKey(featureNum, tab) {
+        return `${featureNum}-${tab}`;
     }
-    async getBrowserContextWithSequence(sequence, tag = DEFAULT_CONFIG_TAG) {
-        if (!this.browserContexts[sequence]) {
+    async getBrowserContextWithFeatureNum(featureNum, tag = DEFAULT_CONFIG_TAG) {
+        if (!this.browserContexts[featureNum]) {
             let browserContext;
             const config = BrowserFactory.configs[tag];
             const deviceContext = config.device
@@ -119,21 +113,21 @@ export class BrowserFactory {
                 };
             const launchConfig = { ...deviceContext, ...config.options, ...config.launchOptions };
             if (config.persistentDirectory) {
-                this.world.logger.debug(`creating new persistent context ${sequence} ${config.type}, ${config.persistentDirectory} with ${JSON.stringify(BrowserFactory.configs)}`);
+                this.world.eventLogger.debug(`creating new persistent context ${featureNum} ${config.type}, ${config.persistentDirectory} with ${JSON.stringify(BrowserFactory.configs)}`);
                 browserContext = await BrowserFactory.configs[tag].browserType.launchPersistentContext(config.persistentDirectory, launchConfig);
             }
             else {
-                this.world.logger.debug(`creating new context ${sequence} ${config.type}`);
+                this.world.eventLogger.debug(`creating new context ${featureNum} ${config.type}`);
                 const browser = await this.getBrowser(config.type);
                 browserContext = await browser.newContext(launchConfig);
             }
-            this.browserContexts[sequence] = browserContext;
-            this.contextStats[sequence] = { start: Timer.since() };
+            this.browserContexts[featureNum] = browserContext;
+            this.contextStats[featureNum] = { start: Timer.since() };
             if (BrowserFactory.configs.defaultTimeout) {
-                this.browserContexts[sequence].setDefaultTimeout(config.defaultTimeout);
+                this.browserContexts[featureNum].setDefaultTimeout(config.defaultTimeout);
             }
         }
-        return this.browserContexts[sequence];
+        return this.browserContexts[featureNum];
     }
 }
 //# sourceMappingURL=BrowserFactory.js.map

package/build/BrowserFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"BrowserFactory.js","sourceRoot":"","sources":["../src/BrowserFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BrowserFactory.js","sourceRoot":"","sources":["../src/BrowserFactory.ts"],"names":[],"mappings":"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"}

package/build/PlaywrightEvents.d.ts

@@ -1,5 +1,4 @@
 import { Page } from 'playwright';
-import { TArtifactHTTPTrace } from '@haibun/core/lib/interfaces/logger.js';
 import { TTag } from '@haibun/core/lib/ttag.js';
 import { TWorld } from '@haibun/core/lib/defs.js';
 type TEtc = {
@@ -14,6 +13,7 @@ export declare class PlaywrightEvents {
     private page;
     private tag;
     navigateCount: number;
+    private pendingRequests;
     constructor(world: TWorld, page: Page, tag: TTag);
     init(): Promise<this>;
     private logRequest;
@@ -21,7 +21,7 @@ export declare class PlaywrightEvents {
     private logResponse;
     private framenavigated;
     close(): void;
-    log(label: string, httpEvent: TArtifactHTTPTrace['httpEvent'], maybeFrameURL: string, targetURL: string, etc: TEtc): void;
+    log(label: string, httpEvent: 'request' | 'response' | 'route', maybeFrameURL: string, targetURL: string, etc: TEtc): void;
 }
 export {};
 //# sourceMappingURL=PlaywrightEvents.d.ts.map

package/build/PlaywrightEvents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlaywrightEvents.d.ts","sourceRoot":"","sources":["../src/PlaywrightEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA4B,MAAM,YAAY,CAAC;AAE5D,OAAO,EAAE,kBAAkB,EAA6D,MAAM,uCAAuC,CAAC;AAEtI,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAU,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAI1D,KAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,qBAAa,gBAAgB;IAEhB,OAAO,CAAC,KAAK;IAAU,OAAO,CAAC,IAAI;IAAQ,OAAO,CAAC,GAAG;IADlE,aAAa,SAAK;gBACE,KAAK,EAAE,MAAM,EAAU,IAAI,EAAE,IAAI,EAAU,GAAG,EAAE,IAAI;IAElE,IAAI;IASV,OAAO,CAAC,UAAU;YAYJ,YAAY;IAM1B,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,cAAc;IAef,KAAK,IAAI,IAAI;IAKpB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,CAAC,WAAW,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI;CAwBlH"}
+{"version":3,"file":"PlaywrightEvents.d.ts","sourceRoot":"","sources":["../src/PlaywrightEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA4B,MAAM,YAAY,CAAC;AAG5D,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAKlD,KAAK,IAAI,GAAG;IACX,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAGD,qBAAa,gBAAgB;IAIhB,OAAO,CAAC,KAAK;IAAU,OAAO,CAAC,IAAI;IAAQ,OAAO,CAAC,GAAG;IAHlE,aAAa,SAAK;IAClB,OAAO,CAAC,eAAe,CAA8B;gBAEjC,KAAK,EAAE,MAAM,EAAU,IAAI,EAAE,IAAI,EAAU,GAAG,EAAE,IAAI;IAGlE,IAAI;IASV,OAAO,CAAC,UAAU;YAaJ,YAAY;IAM1B,OAAO,CAAC,WAAW;IA2BnB,OAAO,CAAC,cAAc;IAmBf,KAAK,IAAI,IAAI;IAKpB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU,GAAG,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI;CA0BnH"}

package/build/PlaywrightEvents.js

@@ -1,20 +1,20 @@
-import { EExecutionMessageType } from '@haibun/core/lib/interfaces/logger.js'; // Updated imports
-import { shortenURI } from '@haibun/core/lib/util/index.js';
-import { Origin } from '@haibun/core/lib/defs.js';
+import { HttpTraceArtifact } from '@haibun/core/schema/protocol.js';
+import { Origin } from '@haibun/core/schema/protocol.js';
 import { DOMAIN_STRING } from '@haibun/core/lib/domain-types.js';
-import { VISITED_PAGES } from './web-playwright.js';
+import { trackHttpHost, trackHttpRequest } from '@haibun/core/lib/http-observations.js';
 export class PlaywrightEvents {
     world;
     page;
     tag;
     navigateCount = 0;
+    pendingRequests = new Map();
     constructor(world, page, tag) {
         this.world = world;
         this.page = page;
         this.tag = tag;
     }
     async init() {
-        this.world.logger.debug(`setPage ${JSON.stringify(this.tag)}`);
+        this.world.eventLogger.debug(`setPage ${JSON.stringify(this.tag)}`);
         this.page.on('request', this.logRequest.bind(this));
         // biome-disable-next-line @typescript-eslint/no-floating-promises
         await this.page.route('**/*', this.routeRequest.bind(this));
@@ -23,13 +23,14 @@ export class PlaywrightEvents {
         return this;
     }
     logRequest(request, type = 'request') {
+        this.pendingRequests.set(request, Date.now());
         const frameURL = request.frame().url();
         const etc = {
             method: request.method(),
             headers: request.headers(),
             postData: request.postData(),
         };
-        this.log(`${type} ${etc.method}`, type, frameURL, request.url(), etc);
+        void this.log(`${type} ${etc.method}`, type, frameURL, request.url(), etc);
         return;
     }
     async routeRequest(route, request) {
@@ -38,13 +39,26 @@ export class PlaywrightEvents {
         await route.continue();
     }
     logResponse(response) {
-        const frameURL = response.request().frame().url();
+        const request = response.request();
+        const startTime = this.pendingRequests.get(request);
+        const duration = startTime ? Date.now() - startTime : 0;
+        if (startTime) {
+            this.pendingRequests.delete(request);
+        }
+        const frameURL = request.frame().url();
         const etc = {
             status: response.status(),
             statusText: response.statusText(),
             headers: response.headers()
         };
-        this.log(`response ${etc.status}`, 'response', frameURL, response.url(), etc);
+        void this.log(`response ${etc.status}`, 'response', frameURL, response.url(), etc);
+        // Track request using shared helper
+        trackHttpRequest(this.world, {
+            url: response.url(),
+            status: response.status(),
+            time: duration,
+            method: request.method()
+        });
         return;
     }
     framenavigated(frame) {
@@ -53,9 +67,13 @@ export class PlaywrightEvents {
             const provenance = { in: 'PlaywrightEvents.framenavigated', seq: [], when: 'framenavigated' };
             this.world.shared.setForStepper('WebPlaywright', { term: 'currentURI', value: url, domain: DOMAIN_STRING, origin: Origin.var }, provenance);
             this.world.shared.setForStepper('WebPlaywright', { term: 'navigateCount', value: this.navigateCount, domain: DOMAIN_STRING, origin: Origin.var }, provenance);
-            // Add to Visited pages domain for verification with 'every url in Visited pages is ...'
-            const visitedKey = `visited/${this.navigateCount}`;
-            this.world.shared.setForStepper('WebPlaywright', { term: visitedKey, value: url, domain: VISITED_PAGES, origin: Origin.var }, provenance);
+            // Store visited pages in observations for 'every url observed in visited pages is ...'
+            if (!this.world.runtime.observations) {
+                this.world.runtime.observations = new Map();
+            }
+            const visitedPages = this.world.runtime.observations.get('visitedPages') || [];
+            visitedPages.push(url);
+            this.world.runtime.observations.set('visitedPages', visitedPages);
             this.navigateCount++;
         }
     }
@@ -74,19 +92,19 @@ export class PlaywrightEvents {
             requestingURL,
             ...etc
         };
-        const requestingBase = requestingPage.replace(/\/[^/]*$/, '');
-        const targetWithoutRequestingBase = targetURL.replace(requestingBase, '');
-        const artifact = {
+        // Track HTTP hosts using shared helper
+        trackHttpHost(this.world, targetURL);
+        // Emit HTTP trace artifact
+        const artifact = HttpTraceArtifact.parse({
+            id: `http-trace-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+            timestamp: Date.now(),
+            kind: 'artifact',
+            artifactType: 'http-trace',
+            level: 'debug',
             httpEvent,
-            trace: logData,
-            artifactType: 'json/http/trace'
-        };
-        const mc = {
-            incident: EExecutionMessageType.TRACE,
-            artifacts: [artifact],
-            tag: this.tag
-        };
-        this.world.logger.debug(`playwright ${label} ${shortenURI(logData.requestingURL)} ➔ ${targetWithoutRequestingBase}`, mc);
+            trace: logData
+        });
+        this.world.eventLogger.emit(artifact);
     }
 }
 //# sourceMappingURL=PlaywrightEvents.js.map

package/build/PlaywrightEvents.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlaywrightEvents.js","sourceRoot":"","sources":["../src/PlaywrightEvents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PlaywrightEvents.js","sourceRoot":"","sources":["../src/PlaywrightEvents.ts"],"names":[],"mappings":"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"}

package/build/cycles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cycles.d.ts","sourceRoot":"","sources":["../src/cycles.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAA+E,MAAM,0BAA0B,CAAC;AAGvI,OAAO,EAAE,aAAa,EAAoB,MAAM,qBAAqB,CAAC;AAGtE,eAAO,MAAM,MAAM,GAAI,IAAI,aAAa,KAAG,cAkDzC,CAAC"}
+{"version":3,"file":"cycles.d.ts","sourceRoot":"","sources":["../src/cycles.ts"],"names":[],"mappings":"AAGA,OAAO,EAAsB,cAAc,EAA4F,MAAM,0BAA0B,CAAC;AAKxK,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AA6CpD,eAAO,MAAM,MAAM,GAAI,IAAI,aAAa,KAAG,cAsCzC,CAAC"}

package/build/cycles.js

@@ -1,34 +1,71 @@
 import { rmSync } from 'fs';
-import { resolve } from 'path/posix';
-import { EExecutionMessageType } from '@haibun/core/lib/interfaces/logger.js';
+import { relative, resolve } from 'path';
+import { VideoArtifact } from '@haibun/core/schema/protocol.js';
 import { EMediaTypes } from '@haibun/domain-storage/media-types.js';
-import { EMonitoringTypes } from './web-playwright.js';
 import { WebPlaywrightDomains } from './domains.js';
+// HTTP trace observation sources
+const httpTraceSources = [
+    {
+        name: 'http-trace hosts',
+        observe: (world) => {
+            const httpHosts = world.runtime.observations?.get('httpHosts');
+            if (!httpHosts)
+                return { items: [], metrics: {} };
+            const items = [...httpHosts.keys()];
+            const metrics = {};
+            for (const [host, count] of httpHosts.entries()) {
+                metrics[host] = { count };
+            }
+            return { items, metrics };
+        }
+    },
+    {
+        name: 'http-trace',
+        observe: (world) => {
+            const requests = world.runtime.observations?.get('httpRequests');
+            if (!requests)
+                return { items: [], metrics: {} };
+            const items = [...requests.keys()];
+            const metrics = {};
+            for (const [id, data] of requests.entries()) {
+                metrics[id] = data;
+            }
+            return { items, metrics };
+        }
+    },
+    {
+        name: 'visited pages',
+        observe: (world) => {
+            const visitedPages = world.runtime.observations?.get('visitedPages');
+            if (!visitedPages)
+                return { items: [], metrics: {} };
+            const metrics = {};
+            for (let i = 0; i < visitedPages.length; i++) {
+                metrics[visitedPages[i]] = { index: i };
+            }
+            return { items: visitedPages, metrics };
+        }
+    }
+];
 export const cycles = (wp) => ({
-    getDomains: () => WebPlaywrightDomains,
+    getConcerns: () => ({ domains: WebPlaywrightDomains, sources: httpTraceSources }),
     // biome-disable-next-line @typescript-eslint/no-unused-vars
     async onFailure({ failedStep }) {
         if (wp.bf?.hasPage(wp.getWorld().tag, wp.tab)) {
-            await wp.captureFailureScreenshot(EExecutionMessageType.ON_FAILURE, failedStep);
+            await wp.captureFailureScreenshot('failure', failedStep);
         }
     },
     async startExecution(resolvedFeatures) {
-        if (wp.monitor) {
-            await wp.createMonitor();
-            await wp.monitorHandler.createMonitorPage(wp);
-        }
         if (wp.twin) {
             await wp.createTwin();
         }
-        await writeFeaturesArtifact(wp, 'features', resolvedFeatures);
     },
     async startFeature({ resolvedFeature, index }) {
         wp.tab = 0;
-        if (wp.monitor === EMonitoringTypes.MONITOR_EACH) {
-            await wp.callClosers(); // first tab
-            await wp.monitorHandler.createMonitorPage(wp);
-            await wp.monitorHandler.updateWorld(wp.getWorld());
-        }
+        wp.resetVideoStartEmitted(); // Reset for new feature's video recording
+        // Reset API state to prevent header leakage between features
+        wp.extraHTTPHeaders = {};
+        wp.apiUserAgent = undefined;
         if (wp.twinPage) {
             wp.twinPage.updateWorld(wp.getWorld());
         }
@@ -42,42 +79,51 @@ export const cycles = (wp) => ({
         if (wp.twin) {
             await wp.twinPage.writePage();
         }
-        if (wp.monitor === EMonitoringTypes.MONITOR_EACH) {
-            await wp.callClosers();
-            await wp.monitorHandler.writeMonitor();
-        }
     },
     async endExecution() {
-        if (wp.monitor === EMonitoringTypes.MONITOR_ALL) {
-            await wp.callClosers();
-            await wp.monitorHandler.writeMonitor();
-        }
+        // empty
     },
 });
 async function writeFeaturesArtifact(wp, type, resolvedFeatures) {
-    const loc = await wp.getCaptureDir('json');
-    const mediaType = EMediaTypes.json;
-    // FIXME shouldn't be fs dependant
-    const path = resolve(wp.storage.fromLocation(mediaType, loc, `${type}.json`));
-    await wp.storage.writeFile(path, JSON.stringify(resolvedFeatures, null, 2), mediaType);
+    const filename = `${type}.json`;
+    const contents = JSON.stringify(resolvedFeatures, null, 2);
+    await wp.storage.saveArtifact(filename, contents, EMediaTypes.json, 'json');
 }
 async function closeAfterFeature(wp) {
     for (const file of wp.downloaded) {
-        wp.getWorld().logger.debug(`removing ${JSON.stringify(file)}`);
+        wp.getWorld().eventLogger.debug(`removing ${JSON.stringify(file)}`);
         rmSync(file);
         wp.downloaded = [];
     }
     if (wp.hasFactory) {
         if (wp.captureVideo) {
             const page = await wp.getPage();
-            const path = await wp.storage.getRelativePath(await page.video().path());
-            const artifact = { artifactType: 'video', path };
-            const context = {
-                incident: EExecutionMessageType.FEATURE_END,
-                artifacts: [artifact],
-                tag: wp.getWorld().tag
+            const videoPath = await page.video().path();
+            const world = wp.getWorld();
+            // Compute path relative to feature capture dir for serialized HTML
+            const basePath = wp.storage.getArtifactBasePath();
+            const featureRelPath = relative(resolve(basePath), videoPath);
+            // For artifact, use feature-relative path (strip featn-N prefix)
+            // const match = featureRelPath.match(/^featn-\d+(?:-.*)?\/(.*)$/);
+            // const path = match ? './' + match[1] : './' + featureRelPath;
+            // Emit video artifact event (with isTimeLined for timeline sync)
+            // VideoStartArtifact is emitted in getPage() when recording starts
+            const featureStep = {
+                seqPath: [world.tag.featureNum, 0, 0],
+                source: { path: world.runtime.feature || 'feature' },
+                in: 'feature video',
+                action: {},
             };
-            wp.getWorld().logger.log('feature video', context);
+            const videoEvent = VideoArtifact.parse({
+                id: `feat-${world.tag.featureNum}.video`,
+                timestamp: Date.now(),
+                kind: 'artifact',
+                artifactType: 'video',
+                path: featureRelPath, // Use base-relative for live, transformed for serialized
+                mimetype: 'video/webm',
+                isTimeLined: true,
+            });
+            world.eventLogger.artifact(featureStep, videoEvent);
         }
         // close the context, which closes any pages
         if (wp.hasFactory) {

package/build/cycles.js.map

@@ -1 +1 @@
-{"version":3,"file":"cycles.js","sourceRoot":"","sources":["../src/cycles.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cycles.js","sourceRoot":"","sources":["../src/cycles.ts"],"names":[],"mappings":"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"}