@empiricalrun/playwright-utils 0.64.0 → 0.65.1

package/dist/reporter/uploader.js

@@ -8,15 +8,21 @@ exports.getUploader = getUploader;
 exports.createUploader = createUploader;
 const r2_uploader_1 = require("@empiricalrun/r2-uploader");
 const path_1 = __importDefault(require("path"));
+const api_worker_client_1 = require("../api-worker-client");
 const logger_1 = require("../logger");
+const presigned_upload_1 = require("./presigned-upload");
+const R2_REPORTS_BASE_URL = "https://reports-r2.empirical.run";
+const R2_REPORTS_BUCKET = "test-report";
 class Uploader {
     _baseUrl;
     _uploadBucket;
+    _runId;
     _destinationDir;
     _credentials;
     constructor(config) {
         this._baseUrl = config.baseUrl;
         this._uploadBucket = config.uploadBucket;
+        this._runId = config.runId;
         this._destinationDir = `${config.projectSlug}/${config.runId}`;
         this._credentials = config.credentials;
         logger_1.logger.debug(`[Uploader] Initialized with destination: ${this._destinationDir}, provider: ${this._credentials.provider}`);
@@ -61,8 +67,31 @@ class Uploader {
     get urlPrefix() {
         return `${this._baseUrl}/${this._destinationDir}`;
     }
+    _presignedTask(credentials, files) {
+        return async () => {
+            try {
+                return await (0, presigned_upload_1.uploadPresigned)({
+                    client: credentials.client,
+                    runId: this._runId,
+                    baseUrl: this._baseUrl,
+                    destinationDir: this._destinationDir,
+                    files,
+                });
+            }
+            catch (error) {
+                logger_1.logger.error("[Uploader] Error uploading files", error);
+                return {};
+            }
+        };
+    }
     async uploadFile(filePath, destinationPath, storageClass) {
         try {
+            if (this._credentials.provider === "r2-presigned") {
+                const result = await (0, r2_uploader_1.sendTaskToQueue)(this._presignedTask(this._credentials, [
+                    { filePath, reportPath: destinationPath },
+                ]));
+                return (result && result[filePath]) || null;
+            }
             const fullDestinationPath = path_1.default.join(this._destinationDir, destinationPath);
             const sourceDir = path_1.default.dirname(filePath);
             const uploadTask = (0, r2_uploader_1.createUploadTask)({
@@ -90,6 +119,10 @@ class Uploader {
         }
     }
     async uploadDirectory(sourceDir, destinationPrefix) {
+        if (this._credentials.provider === "r2-presigned") {
+            await (0, r2_uploader_1.sendTaskToQueue)(this._presignedTask(this._credentials, (0, presigned_upload_1.directoryUploadFiles)(sourceDir, destinationPrefix)));
+            return;
+        }
         const fullDestinationDir = path_1.default.join(this._destinationDir, destinationPrefix);
         const uploadTask = (0, r2_uploader_1.createUploadTask)({
             sourceDir,
@@ -145,6 +178,9 @@ function createUploader() {
         logger_1.logger.debug(`[Uploader] REPORT_STORAGE_BACKEND must be "s3" or "r2" (got ${backend ?? "unset"})`);
         return null;
     }
+    if (backend === "r2" && process.env.REPORT_UPLOAD_PRESIGNED === "true") {
+        return createPresignedUploader(process.env.PROJECT_NAME, process.env.TEST_RUN_GITHUB_ACTION_ID);
+    }
     const enableS3 = backend === "s3";
     const credentials = Uploader.getCredentialsFromEnv(enableS3);
     if (!credentials) {
@@ -168,12 +204,12 @@ function createUploader() {
     }
     else {
         const accountId = process.env.R2_ACCOUNT_ID;
-        const bucket = "test-report";
+        const bucket = R2_REPORTS_BUCKET;
         if (!accountId) {
             logger_1.logger.debug("[Uploader] R2_ACCOUNT_ID not configured");
             return null;
         }
-        baseUrl = `https://reports-r2.empirical.run`;
+        baseUrl = R2_REPORTS_BASE_URL;
         uploadBucket = bucket;
     }
     return new Uploader({
@@ -184,3 +220,16 @@ function createUploader() {
         credentials,
     });
 }
+function createPresignedUploader(projectSlug, runId) {
+    if (!process.env.EMPIRICALRUN_API_KEY) {
+        logger_1.logger.debug("[Uploader] EMPIRICALRUN_API_KEY is required for presigned uploads");
+        return null;
+    }
+    return new Uploader({
+        projectSlug,
+        runId,
+        baseUrl: R2_REPORTS_BASE_URL,
+        uploadBucket: R2_REPORTS_BUCKET,
+        credentials: { provider: "r2-presigned", client: new api_worker_client_1.ApiWorkerClient() },
+    });
+}

package/dist/reporter/util.d.ts

@@ -20,8 +20,8 @@ export declare function suitesAndProjectForTest(test: TestCase): {
 export declare function sendTestCaseUpdateToDashboard(params: TestCaseRunEndEventV2): Promise<void>;
 export declare function sendTestCaseBeginToDashboard(params: TestCaseRunBeginEvent): Promise<void>;
 export declare function safelySerialiseJSON(obj: any, keyFilter?: (key: string) => boolean): any;
-export declare function updateHtmlZipFileAttachmentPaths(jsonFilePath: string, htmlFilePath: string, repoPath: string): Promise<void>;
-export declare function buildTestAttachmentMapFromSummary(summaryJsonFilePath: string, repoPath: string, doNotNormalize?: boolean): TestAttachmentMap;
+export declare function updateHtmlZipFileAttachmentPaths(jsonFilePath: string, htmlFilePath: string, outputDirs: string[]): Promise<void>;
+export declare function buildTestAttachmentMapFromSummary(summaryJsonFilePath: string, outputDirs: string[], doNotNormalize?: boolean): TestAttachmentMap;
 export declare function checkFileExistsAsync(filePath: string): Promise<boolean>;
-export declare function updateSummaryJsonAttachmentPaths(filePath: string, repoPath: string, urlPrefix: string): Promise<PlaywrightJSONReport | undefined>;
+export declare function updateSummaryJsonAttachmentPaths(filePath: string, outputDirs: string[], urlPrefix: string): Promise<PlaywrightJSONReport | undefined>;
 //# sourceMappingURL=util.d.ts.map

package/dist/reporter/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/reporter/util.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,UAAU,IAAI,oBAAoB,EAElC,QAAQ,EACT,MAAM,2BAA2B,CAAC;AA0BnC,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAqB7D;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,UAQhC;AAED,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5E,OAAO,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CA6CD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ;IAmBlD,MAAM;IACN,WAAW;EAEd;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GACnC,GAAG,CAIL;AAED,wBAAsB,gCAAgC,CACpD,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,iBAkFjB;AAED,wBAAgB,iCAAiC,CAC/C,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,EAChB,cAAc,GAAE,OAAe,GAC9B,iBAAiB,CAgBnB;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO7E;AAED,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,6CA+BlB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/reporter/util.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,UAAU,IAAI,oBAAoB,EAElC,QAAQ,EACT,MAAM,2BAA2B,CAAC;AA2BnC,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAqB7D;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,UAQhC;AAED,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5E,OAAO,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC,CA6CD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ;IAmBlD,MAAM;IACN,WAAW;EAEd;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAsB,4BAA4B,CAChD,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,GACnC,GAAG,CAIL;AAED,wBAAsB,gCAAgC,CACpD,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAAE,iBAkFrB;AAED,wBAAgB,iCAAiC,CAC/C,mBAAmB,EAAE,MAAM,EAC3B,UAAU,EAAE,MAAM,EAAE,EACpB,cAAc,GAAE,OAAe,GAC9B,iBAAiB,CAkBnB;AAED,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO7E;AAED,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAAE,EACpB,SAAS,EAAE,MAAM,6CA8BlB"}

package/dist/reporter/util.js

@@ -22,6 +22,7 @@ const mime_1 = __importDefault(require("mime"));
 const path_1 = __importDefault(require("path"));
 const api_worker_client_1 = require("../api-worker-client");
 const logger_1 = require("../logger");
+const attachment_key_1 = require("./attachment-key");
 // Mirrors https://github.com/microsoft/playwright/blob/main/packages/playwright-core/src/tools/cli-client/program.ts#L440
 function calculateSha1(buffer) {
     const hash = crypto_1.default.createHash("sha1");
@@ -173,8 +174,8 @@ async function sendTestCaseBeginToDashboard(params) {
 function safelySerialiseJSON(obj, keyFilter) {
     return JSON.parse(JSON.stringify(obj, (key, value) => (keyFilter?.(key) ? undefined : value)));
 }
-async function updateHtmlZipFileAttachmentPaths(jsonFilePath, htmlFilePath, repoPath) {
-    const testAttachmentMap = buildTestAttachmentMapFromSummary(jsonFilePath, repoPath);
+async function updateHtmlZipFileAttachmentPaths(jsonFilePath, htmlFilePath, outputDirs) {
+    const testAttachmentMap = buildTestAttachmentMapFromSummary(jsonFilePath, outputDirs);
     let htmlFile;
     try {
         htmlFile = await fs_1.default.promises.readFile(htmlFilePath, "utf8");
@@ -232,7 +233,7 @@ async function updateHtmlZipFileAttachmentPaths(jsonFilePath, htmlFilePath, repo
     finally {
     }
 }
-function buildTestAttachmentMapFromSummary(summaryJsonFilePath, repoPath, doNotNormalize = false) {
+function buildTestAttachmentMapFromSummary(summaryJsonFilePath, outputDirs, doNotNormalize = false) {
     const summaryJson = JSON.parse(fs_1.default.readFileSync(summaryJsonFilePath, "utf8"));
     return (0, reporter_1.buildTestAttachmentMap)(summaryJson, {
         transformAttachment: doNotNormalize
@@ -241,8 +242,10 @@ function buildTestAttachmentMapFromSummary(summaryJsonFilePath, repoPath, doNotN
                 if (!attachment?.path) {
                     return attachment;
                 }
-                const relativePath = path_1.default.relative(repoPath, attachment.path);
-                return { ...attachment, path: path_1.default.join("data", relativePath) };
+                return {
+                    ...attachment,
+                    path: path_1.default.join("data", (0, attachment_key_1.attachmentKey)(attachment.path, outputDirs)),
+                };
             },
     });
 }
@@ -255,7 +258,7 @@ async function checkFileExistsAsync(filePath) {
         return false;
     }
 }
-async function updateSummaryJsonAttachmentPaths(filePath, repoPath, urlPrefix) {
+async function updateSummaryJsonAttachmentPaths(filePath, outputDirs, urlPrefix) {
     if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
         console.error("PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set");
         return;
@@ -266,8 +269,7 @@ async function updateSummaryJsonAttachmentPaths(filePath, repoPath, urlPrefix) {
             for (const result of test.results || []) {
                 for (const attachment of result.attachments || []) {
                     if (attachment?.path) {
-                        const relativePath = path_1.default.relative(repoPath, attachment.path);
-                        attachment.path = `${urlPrefix}/${relativePath}`;
+                        attachment.path = `${urlPrefix}/${(0, attachment_key_1.attachmentKey)(attachment.path, outputDirs)}`;
                     }
                 }
             }

package/dist/test/expect/visual.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visual.d.ts","sourceRoot":"","sources":["../../../src/test/expect/visual.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAY,MAAM,kBAAkB,CAAC;AAOhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAgE7C,wBAAsB,WAAW,CAC/B,MAAM,EAAE,IAAI,GAAG,OAAO,EACtB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,aAAa,CAAC,CAsFxB"}
+{"version":3,"file":"visual.d.ts","sourceRoot":"","sources":["../../../src/test/expect/visual.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAY,MAAM,kBAAkB,CAAC;AAOhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAsE7C,wBAAsB,WAAW,CAC/B,MAAM,EAAE,IAAI,GAAG,OAAO,EACtB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,aAAa,CAAC,CAsFxB"}

package/dist/test/expect/visual.js

@@ -4,13 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toLookRight = toLookRight;
-const vision_1 = require("@empiricalrun/llm/vision");
 const fs_1 = __importDefault(require("fs"));
 const openai_1 = __importDefault(require("openai"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const api_worker_client_1 = require("../../api-worker-client");
 const telemetry_1 = require("../../telemetry");
+function asImageDataUrl(image) {
+    return image.startsWith("data:image")
+        ? image
+        : `data:image/png;base64,${image}`;
+}
 function getCallerLine() {
     const stack = new Error().stack;
     if (!stack) {
@@ -91,7 +95,7 @@ async function toLookRight(target, pageDescription) {
                     {
                         type: "image_url",
                         image_url: {
-                            url: (0, vision_1.imageFormatForProvider)("anthropic", base64Image),
+                            url: asImageDataUrl(base64Image),
                         },
                     },
                 ],

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAIxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAW9C,wBAAgB,gBAAgB,IAAI,SAAS,CAI5C;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,WAKhE;AAED,qBAAa,mBAAmB;IAOlB,OAAO,CAAC,QAAQ,CAAC,IAAI;IANjC,OAAO,CAAC,iBAAiB,CAIhB;IAET,YAA6B,IAAI,EAAE,IAAI,EAAI;IAErC,WAAW,kBAIhB;IAEK,GAAG,CACP,aAAa,EAAE,GAAG,EAClB,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAUf;YAEa,OAAO;YAwDP,QAAQ;CAkCvB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAiC5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAIxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAU9C,wBAAgB,gBAAgB,IAAI,SAAS,CAI5C;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,WAKhE;AAED,qBAAa,mBAAmB;IAOlB,OAAO,CAAC,QAAQ,CAAC,IAAI;IANjC,OAAO,CAAC,iBAAiB,CAIhB;IAET,YAA6B,IAAI,EAAE,IAAI,EAAI;IAErC,WAAW,kBAIhB;IAEK,GAAG,CACP,aAAa,EAAE,GAAG,EAClB,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,IAAI,EACvC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAUf;YAEa,OAAO;YAwDP,QAAQ;CAgCvB;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAiC5B"}

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.js

@@ -91,11 +91,9 @@ class OverlayDismissAgent {
     }
     async runAgent(element, text, testFn) {
         const task = await (0, prompt_1.getTask)(this.page, element, text);
-        const trace = (0, utils_1.traceThis)(task, testFn);
         const result = await testFn.step(utils_1.DISMISSAL_AGENT_STEP, () => (0, cua_1.createTestUsingComputerUseAgent)({
             page: this.page,
             task,
-            trace,
             // We don't want to use page.pause approach here because
             // overlay dismissal can kick in during a browser agent tool call
             // and we need app to be able to use page.pause for agent actions.

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/utils.d.ts

@@ -8,5 +8,4 @@ export declare function dismissOverlayStepTitle(element: OverlayElement | undefi
 export declare function isProductFruitsOverlay(element: OverlayElement | undefined): boolean | undefined;
 export declare function textContent(pageRef: Page, element: OverlayElement | undefined): Promise<string | undefined>;
 export declare function annotateForReport(testFn: TestFn, description: string): void;
-export declare function traceThis(task: string, testFn: TestFn): import("@empiricalrun/llm").TraceClient | undefined;
 //# sourceMappingURL=utils.d.ts.map

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,sBASrE;AAED,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AACtD,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAElE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,UAO1E;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,uBAKzE;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,+BAgDpC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAMpE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,uDAiBrD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,sBASrE;AAED,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AACtD,eAAO,MAAM,oBAAoB,gCAAgC,CAAC;AAElE,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,UAO1E;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS,uBAKzE;AAED,wBAAsB,WAAW,CAC/B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,+BAgDpC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAMpE"}

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/utils.js

@@ -6,8 +6,6 @@ exports.dismissOverlayStepTitle = dismissOverlayStepTitle;
 exports.isProductFruitsOverlay = isProductFruitsOverlay;
 exports.textContent = textContent;
 exports.annotateForReport = annotateForReport;
-exports.traceThis = traceThis;
-const llm_1 = require("@empiricalrun/llm");
 function overlayDescription(element) {
     if (element) {
         const { interceptor, parent } = element;
@@ -85,21 +83,3 @@ function annotateForReport(testFn, description) {
         description,
     });
 }
-function traceThis(task, testFn) {
-    const metadata = {
-        projectName: process.env.PROJECT_NAME ?? "",
-        testRunId: process.env.TEST_RUN_GITHUB_ACTION_ID ?? "",
-        testCase: testFn.info().title,
-    };
-    const trace = (0, llm_1.createLangfuseTrace)({
-        name: "overlay_dismiss",
-        input: task,
-        tags: ["overlay_dismiss"],
-        metadata,
-    });
-    if (trace) {
-        const traceUrl = trace.getTraceUrl();
-        console.log(`Starting computer use agent: ${traceUrl}`);
-    }
-    return trace;
-}

package/dist/test/scripts/pw-locator-patch/vision/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/vision/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAIhD,wBAAgB,UAAU,CAAC,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QASzE"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/vision/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAiEhD,wBAAgB,UAAU,CAAC,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAMzE"}

package/dist/test/scripts/pw-locator-patch/vision/query.js

@@ -1,15 +1,67 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchQuery = patchQuery;
-const vision_1 = require("@empiricalrun/llm/vision");
+const openai_1 = __importDefault(require("openai"));
 const api_worker_client_1 = require("../../../../api-worker-client");
+const telemetry_1 = require("../../../../telemetry");
+const QUERY_MODEL = "gpt-4o-mini";
+const SYSTEM_PROMPT = `
+You are given an image and an instruction. Use the "explanation" to
+think it through, and then respond with the "answer".`;
+async function queryScreenshot(base64Image, instruction) {
+    const openai = new openai_1.default({ maxRetries: 5, ...(0, api_worker_client_1.llmProxyOpenAIConfig)() });
+    const completion = await openai.chat.completions.create({
+        model: QUERY_MODEL,
+        messages: [
+            { role: "system", content: SYSTEM_PROMPT },
+            {
+                role: "user",
+                content: [
+                    {
+                        type: "image_url",
+                        image_url: { url: `data:image/png;base64,${base64Image}` },
+                    },
+                    { type: "text", text: `Instruction: ${instruction}` },
+                ],
+            },
+        ],
+        temperature: 0.5,
+        response_format: {
+            type: "json_schema",
+            json_schema: {
+                name: "your_response",
+                strict: true,
+                schema: {
+                    type: "object",
+                    properties: {
+                        explanation: { type: "string" },
+                        answer: { type: "string" },
+                    },
+                    required: ["explanation", "answer"],
+                    additionalProperties: false,
+                },
+            },
+        },
+    });
+    await (0, telemetry_1.trackLLMResponseGenerated)({
+        modelName: QUERY_MODEL,
+        tokensInput: completion.usage?.prompt_tokens ?? 0,
+        tokensOutput: completion.usage?.completion_tokens ?? 0,
+        chatSessionSource: "vision_query",
+    });
+    const content = completion.choices[0]?.message?.content;
+    if (!content) {
+        throw new Error("Query failed: no response content from LLM.");
+    }
+    return JSON.parse(content).answer;
+}
 function patchQuery(LocatorClass) {
     LocatorClass.prototype.query = async function (instruction) {
         await this.waitFor({ state: "visible" });
         const screenshot = await this.screenshot();
-        const answer = await (0, vision_1.query)(screenshot.toString("base64"), instruction, {
-            clientConfig: (0, api_worker_client_1.llmProxyOpenAIConfig)(),
-        });
-        return answer;
+        return queryScreenshot(screenshot.toString("base64"), instruction);
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.64.0",
+  "version": "0.65.1",
   "engines": {
     "node": ">=22"
   },
@@ -45,7 +45,7 @@
     "playwright-core": "1.63.0",
     "serve-handler": "^6.1.6",
     "typescript": "7.0.2",
-    "@empiricalrun/shared-types": "0.22.0"
+    "@empiricalrun/shared-types": "0.23.2"
   },
   "dependencies": {
     "async-retry": "^1.3.3",
@@ -56,9 +56,8 @@
     "openapi-fetch": "0.14.1",
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "ts-morph": "^28.0.0",
-    "@empiricalrun/cua": "^0.5.4",
-    "@empiricalrun/llm": "^0.28.3",
-    "@empiricalrun/r2-uploader": "^0.11.4",
+    "@empiricalrun/cua": "^0.6.0",
+    "@empiricalrun/r2-uploader": "^0.11.5",
     "@empiricalrun/reporter": "^0.30.3"
   },
   "scripts": {