@swmansion/argent 0.14.1-next.1 → 0.14.1-next.3

package/dist/tool-server.cjs

@@ -110500,6 +110500,11 @@ var ScreencastManager = class {
   fps;
   activeCount = 0;
   currentOpts = null;
+  // The in-flight Page.startScreencast promise for the first subscriber, shared
+  // so concurrent joiners await the SAME start instead of assuming a live
+  // session (and stranding themselves on a frame-less stream if it fails). Null
+  // when no start is in flight (idle, or a live session already running).
+  startInFlight = null;
   lastFrame = null;
   cdpListenerInstalled = false;
   /**
@@ -110513,20 +110518,41 @@ var ScreencastManager = class {
   }
   async start(opts = {}) {
     this.installCdpListenerOnce();
-    this.activeCount += 1;
-    if (this.activeCount === 1) {
+    let acquired = false;
+    if (this.startInFlight) {
+      await this.startInFlight;
+      if (this.activeCount > 0) {
+        if (this.optsDiffer(opts, this.currentOpts)) this.warnOptsIgnored();
+        this.activeCount += 1;
+        acquired = true;
+      }
+    } else if (this.activeCount === 0) {
       this.currentOpts = opts;
-      await this.cdp.send("Page.startScreencast", this.toCdpStartArgs(opts));
-    } else if (this.optsDiffer(opts, this.currentOpts)) {
-      process.stderr.write(
-        `[chromium-screencast] additional caller requested screencast opts that differ from the active session; ignoring (first writer wins).
-`
-      );
+      const inFlight = this.cdp.send("Page.startScreencast", this.toCdpStartArgs(opts)).then(() => void 0);
+      this.startInFlight = inFlight;
+      try {
+        await inFlight;
+      } catch (err) {
+        if (this.startInFlight === inFlight) {
+          this.startInFlight = null;
+          this.currentOpts = null;
+        }
+        throw err;
+      }
+      if (this.startInFlight === inFlight) {
+        this.startInFlight = null;
+        this.activeCount += 1;
+        acquired = true;
+      }
+    } else {
+      if (this.optsDiffer(opts, this.currentOpts)) this.warnOptsIgnored();
+      this.activeCount += 1;
+      acquired = true;
     }
     let stopped = false;
     const session = {
       stop: async () => {
-        if (stopped) return;
+        if (stopped || !acquired) return;
         stopped = true;
         this.activeCount = Math.max(0, this.activeCount - 1);
         if (this.activeCount === 0) {
@@ -110542,9 +110568,16 @@ var ScreencastManager = class {
   async forceStop() {
     this.activeCount = 0;
     this.currentOpts = null;
+    this.startInFlight = null;
     await this.cdp.send("Page.stopScreencast").catch(() => {
     });
   }
+  warnOptsIgnored() {
+    process.stderr.write(
+      `[chromium-screencast] additional caller requested screencast opts that differ from the active session; ignoring (first writer wins).
+`
+    );
+  }
   installCdpListenerOnce() {
     if (this.cdpListenerInstalled) return;
     this.cdpListenerInstalled = true;
@@ -139258,14 +139291,30 @@ async function analyzeScreenshotTextChanges(options) {
     };
   }
   return analyzeTextRegions({
-    baselineRegions: baselineOcr.blocks,
-    currentRegions: currentOcr.blocks,
+    baselineRegions: rescaleTextRegions(baselineOcr.blocks, options.baselineRegionScale),
+    currentRegions: rescaleTextRegions(currentOcr.blocks, options.currentRegionScale),
     baselineImage: options.baselineImage,
     currentImage: options.currentImage,
     ignoreTopPixels: options.ignoreTopPixels,
     textChangeMinConfidence: options.textChangeMinConfidence
   });
 }
+function rescaleTextRegions(regions, scale) {
+  if (!scale || scale.x === 1 && scale.y === 1) return regions;
+  return regions.map((region) => ({
+    ...region,
+    bounds: scaleBounds(region.bounds, scale),
+    words: region.words?.map((word) => ({ ...word, bounds: scaleBounds(word.bounds, scale) }))
+  }));
+}
+function scaleBounds(bounds, scale) {
+  return {
+    x: bounds.x * scale.x,
+    y: bounds.y * scale.y,
+    width: bounds.width * scale.x,
+    height: bounds.height * scale.y
+  };
+}
 function analyzeTextRegions(params) {
   const textChangeMinConfidence = params.textChangeMinConfidence ?? DEFAULT_TEXT_CHANGE_MIN_CONFIDENCE;
   validateTextChangeMinConfidence(textChangeMinConfidence);
@@ -139950,9 +139999,11 @@ async function diffPngFiles(options) {
     baselinePath: options.baselinePath,
     currentPath: options.currentPath,
     hasPixelDiff: pixelDiff.differentPixels > 0,
-    baselineImage: decodedBaseline,
-    currentImage: decodedCurrent,
-    ignoreTopPixels: ignoredTopRowsFor(decodedBaseline.height, settings.ignoreTopNormalizedY),
+    baselineImage: baseline,
+    currentImage: current,
+    baselineRegionScale: regionScaleBetween(decodedBaseline, baseline),
+    currentRegionScale: regionScaleBetween(decodedCurrent, current),
+    ignoreTopPixels: ignoredTopRowsFor(baseline.height, settings.ignoreTopNormalizedY),
     textChangeMinConfidence: DEFAULT_TEXT_CHANGE_MIN_CONFIDENCE
   });
   return summarizeResult({
@@ -140020,6 +140071,12 @@ function markChangedPixels(params) {
 function ignoredTopRowsFor(height, ignoreTopNormalizedY) {
   return Math.min(height, Math.ceil(height * ignoreTopNormalizedY));
 }
+function regionScaleBetween(from2, to) {
+  return {
+    x: from2.width === 0 ? 1 : to.width / from2.width,
+    y: from2.height === 0 ? 1 : to.height / from2.height
+  };
+}
 function getChangedRegions(params) {
   const rawRegions = traceChangeRegions({
     mask: params.mask,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.14.1-next.1",
+  "version": "0.14.1-next.3",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",
   "repository": {