@invarn/cibuild 2.3.7 → 2.4.0

package/dist/src/yaml/steps/ui-fidelity-preview-android.test.js

@@ -36,10 +36,11 @@ const FAKE_GRADLEW = [
 // Fake `swift`: only the script-interpreter branch the shared trim stage uses
 // (`swift <Trim.swift> <in> <out> <aligned> <ref>`). Writes trimmed + aligned
 // PNGs and emits a fixed TRIMDIMS line.
-const FAKE_SWIFT = [
+// Fake `ci` covering the shared trim stage's `ci fidelity-trim` invocation.
+const FAKE_CI = [
     '#!/bin/bash',
     'case "$1" in',
-    '  *.swift)',
+    '  fidelity-trim)',
     '    in_png="$2"; out_png="$3"; aligned_png="$4"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out_png\"",
     '    printf \'trimmed:%s\' "$(basename "$in_png")" >> "$out_png"',
@@ -56,7 +57,7 @@ function fakeToolchain() {
     const bin = tempDir('ui-fidelity-android-fakebin-');
     for (const [name, body] of [
         ['java', FAKE_JAVA],
-        ['swift', FAKE_SWIFT],
+        ['ci', FAKE_CI],
     ]) {
         const p = join(bin, name);
         writeFileSync(p, body + '\n');

package/dist/src/yaml/steps/ui-fidelity-preview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-fidelity-preview.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-preview.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA4BH,+EAA+E;AAC/E,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChD,iEAAiE;IACjE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,6DAA6D;IAC7D,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAC/C;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,yEAAyE;IACzE,aAAa,EAAE,QAAQ,CAAC;IACxB,oEAAoE;IACpE,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACrD,wDAAwD;IACxD,OAAO,EAAE,6BAA6B,EAAE,CAAC;IACzC,mEAAmE;IACnE,YAAY,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,EAAE,EAAE,OAAO,CAAC;CACb;AAED,kEAAkE;AAClE,2EAA2E;AAC3E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChD,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,UAAU,CAAC,EAAE,2BAA2B,GAAG,IAAI,CAAC;CACjD;AAuBD;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,gBAAgB,EACrB,YAAY,EAAE,MAAM,GACnB,6BAA6B,CAgB/B;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,uBAAuB,CA8HzB"}
+{"version":3,"file":"ui-fidelity-preview.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-preview.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA6BH,+EAA+E;AAC/E,MAAM,WAAW,uBAAuB;IACtC,wEAAwE;IACxE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChD,iEAAiE;IACjE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,6DAA6D;IAC7D,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,UAAU,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAC/C;;;;OAIG;IACH,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,uBAAuB;IACtC,yEAAyE;IACzE,aAAa,EAAE,QAAQ,CAAC;IACxB,oEAAoE;IACpE,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACrD,wDAAwD;IACxD,OAAO,EAAE,6BAA6B,EAAE,CAAC;IACzC,mEAAmE;IACnE,YAAY,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,EAAE,EAAE,OAAO,CAAC;CACb;AAED,kEAAkE;AAClE,2EAA2E;AAC3E,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAChD,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,UAAU,CAAC,EAAE,2BAA2B,GAAG,IAAI,CAAC;CACjD;AAuBD;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,gBAAgB,EACrB,YAAY,EAAE,MAAM,GACnB,6BAA6B,CAgB/B;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,uBAAuB,CAqIzB"}

package/dist/src/yaml/steps/ui-fidelity-preview.js

@@ -21,6 +21,7 @@ import { tmpdir } from 'node:os';
 import { basename, join, resolve } from 'node:path';
 import { DEFAULT_RENDER_SIZE, DEFAULT_SCALE, generateRenderScript, parseRenderSize, parseScale, } from './ui-fidelity-render.js';
 import { evaluateAspectRatio, formatAspectRatioWarning, } from './fidelity-aspect-guard.js';
+import { resolveCliJsPath } from './render-post-processor.js';
 function runTar(args, pathPrepend) {
     const env = pathPrepend
         ? { ...process.env, PATH: pathPrepend + ':' + (process.env.PATH ?? '') }
@@ -143,6 +144,14 @@ export function renderUiFidelityPreview(options) {
     if (options.toolchainPath) {
         env.PATH = options.toolchainPath + ':' + (process.env.PATH ?? '');
     }
+    // Hand the script this installation's CLI entrypoint so its trim stage can
+    // spawn `fidelity-trim` without a ci on PATH (library callers like the
+    // Invarn CLI). Never override an explicitly-set entrypoint.
+    if (!env.CIBUILD_CLI_JS) {
+        const cliJs = resolveCliJsPath();
+        if (cliJs !== null)
+            env.CIBUILD_CLI_JS = cliJs;
+    }
     const run = spawnSync('node', ['-e', script], {
         cwd: workDir,
         env,

package/dist/src/yaml/steps/ui-fidelity-preview.test.js

@@ -52,8 +52,16 @@ const FAKE_SWIFT = [
     '    out="${pos[1]}"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out\"; printf 'fake-render' >> \"$out\"",
     '    exit 0 ;;',
-    '  *.swift)',
-    '    out_png="$2"; aligned_png="$3"',
+    '  *) exit 0 ;;',
+    'esac',
+].join('\n');
+const FAKE_XCRUN = ['#!/bin/bash', 'exit 0'].join('\n');
+// Fake `ci` covering the shared trim stage's `ci fidelity-trim` invocation.
+const FAKE_CI = [
+    '#!/bin/bash',
+    'case "$1" in',
+    '  fidelity-trim)',
+    '    out_png="$3"; aligned_png="$4"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out_png\"; printf 'trimmed' >> \"$out_png\"",
     '    if [ -n "$aligned_png" ]; then printf \'\\x89PNG\\r\\n\\x1a\\n\' > "$aligned_png"; printf \'aligned\' >> "$aligned_png"; fi',
     '    echo "TRIMDIMS 320 640 160 320 400 800"',
@@ -61,7 +69,6 @@ const FAKE_SWIFT = [
     '  *) exit 0 ;;',
     'esac',
 ].join('\n');
-const FAKE_XCRUN = ['#!/bin/bash', 'exit 0'].join('\n');
 function fakeToolchain() {
     const bin = tempDir('ui-fidelity-fakebin-');
     const swiftPath = join(bin, 'swift');
@@ -70,6 +77,9 @@ function fakeToolchain() {
     const xcrunPath = join(bin, 'xcrun');
     writeFileSync(xcrunPath, FAKE_XCRUN + '\n');
     chmodSync(xcrunPath, 0o755);
+    const ciPath = join(bin, 'ci');
+    writeFileSync(ciPath, FAKE_CI + '\n');
+    chmodSync(ciPath, 0o755);
     return bin;
 }
 function writeReference() {

package/dist/src/yaml/steps/ui-fidelity-render-android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-fidelity-render-android.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-render-android.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAMpE,sDAAsD;AACtD,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,yBAAyB,CAAC;AAE1D,iDAAiD;AACjD,eAAO,MAAM,eAAe,6BAA8B,CAAC;AAC3D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAAwB,CAAC;AAE9D,mDAAmD;AACnD,eAAO,MAAM,iBAAiB,6BAA8B,CAAC;AAC7D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,eAA0B,CAAC;AAElE,gFAAgF;AAChF,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AAEzD,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,8EAA8E;AAC9E,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAkiCD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAqBrF;AAED;;;GAGG;AACH,qBAAa,mCAAoC,SAAQ,gBAAgB;IACvE,yBAAyB,CACvB,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAepB,OAAO,CACX,MAAM,EAAE,6BAA6B,EACrC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CA0EpB"}
+{"version":3,"file":"ui-fidelity-render-android.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-render-android.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAMpE,sDAAsD;AACtD,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,yBAAyB,CAAC;AAE1D,iDAAiD;AACjD,eAAO,MAAM,eAAe,6BAA8B,CAAC;AAC3D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAAwB,CAAC;AAE9D,mDAAmD;AACnD,eAAO,MAAM,iBAAiB,6BAA8B,CAAC;AAC7D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,eAA0B,CAAC;AAElE,gFAAgF;AAChF,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AAEzD,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,8EAA8E;AAC9E,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAuhCD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAqBrF;AAED;;;GAGG;AACH,qBAAa,mCAAoC,SAAQ,gBAAgB;IACvE,yBAAyB,CACvB,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAapB,OAAO,CACX,MAAM,EAAE,6BAA6B,EACrC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CA0EpB"}

package/dist/src/yaml/steps/ui-fidelity-render-android.js

@@ -500,20 +500,9 @@ function cleanupShippedProject() {
 
 // ---- render stage ----
 //
-// runSwift drives the shared CoreGraphics trim/align helper in script-
-// interpreter mode (the same helper iOS uses); it is available because the
-// render runs on the macOS runner fleet regardless of the JVM render engine.
-
-function runSwift(args) {
-  var result = cp.spawnSync('swift', args, { encoding: 'utf-8', maxBuffer: 16 * 1024 * 1024 });
-  if (result.stdout) process.stdout.write(result.stdout);
-  if (result.stderr) process.stderr.write(result.stderr);
-  if (result.error) {
-    result.status = result.status == null ? 127 : result.status;
-    result.stderr = (result.stderr || '') + String(result.error.message || result.error);
-  }
-  return result;
-}
+// Trim/align runs through the shared trim stage's runTrimHelper (the pure-JS
+// helper inside the ci binary — the same bytes iOS uses), so this step has no
+// platform-toolchain dependency and runs on macOS and Linux workers alike.
 
 // Runs the project's Roborazzi record task once, from the project root, so
 // Gradle resolves the task in whichever module declares it. Prefers the shipped
@@ -692,7 +681,7 @@ function renderScreens(renderable, projectRoot) {
         entry.source_digest = __fidSourceDigest(packageFiles, referenceBytes);
       }
       log('rendered ' + entry.screen + ' -> ' + relative);
-      trimRenderedImage(entry, outputPath, workDir);
+      trimRenderedImage(entry, outputPath);
       // Signal A: the render emits a per-node layout dump into a roborazzi
       // output dir (named "<Screen>.layout.json" or "...render<Screen>.layout.json").
       // Locate it the same way as the PNG and derive structural facts; absent or
@@ -1160,8 +1149,10 @@ export function generateAndroidRenderScript(config) {
  */
 export class UiFidelityRenderAndroidStepExecutor extends BaseStepExecutor {
     getValidationRequirements(_inputs, _env, _config) {
+        // No platform-toolchain requirement: trim/align is pure JS inside the ci
+        // binary (fidelity-linux 06), so the step validates on macOS and Linux
+        // runners alike.
         return [
-            this.requireCommand('swift', 'Swift toolchain used to run the CoreGraphics trim/align helper', 'Install Xcode (or the Swift toolchain) on the runner'),
             this.requireCommand('tar', 'Archive tool used to extract the shipped Gradle project', 'Install tar on the runner'),
         ];
     }

package/dist/src/yaml/steps/ui-fidelity-render-android.test.js

@@ -57,14 +57,14 @@ const FAKE_GRADLEW_LINES = [
     'done',
     'exit 0',
 ];
-// Fake `swift`, providing only the script-interpreter branch the shared trim
-// stage uses: `swift <Trim.swift> <in> <out> <aligned> <ref>`. Overwrites
-// <out> with a "trimmed:<in basename>" PNG, writes an "aligned:<in basename>"
-// PNG, and emits a fixed TRIMDIMS line. FAKE_TRIM_FAIL exercises warn-and-continue.
-const FAKE_SWIFT_LINES = [
+// Fake `ci`, providing only the branch the shared trim stage uses:
+// `ci fidelity-trim <in> <out> <aligned> <ref>`. Overwrites <out> with a
+// "trimmed:<in basename>" PNG, writes an "aligned:<in basename>" PNG, and
+// emits a fixed TRIMDIMS line. FAKE_TRIM_FAIL exercises warn-and-continue.
+const FAKE_CI_LINES = [
     '#!/bin/bash',
     'case "$1" in',
-    '  *.swift)',
+    '  fidelity-trim)',
     '    if [ -n "$FAKE_TRIM_FAIL" ]; then echo "trim: simulated failure" >&2; exit 1; fi',
     '    in_png="$2"; out_png="$3"; aligned_png="$4"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out_png\"",
@@ -84,9 +84,9 @@ function makeProject(params) {
     mkdirSync(join(dir, '.ci', 'inputs'), { recursive: true });
     const binDir = join(dir, 'bin');
     mkdirSync(binDir, { recursive: true });
-    const swiftPath = join(binDir, 'swift');
-    writeFileSync(swiftPath, FAKE_SWIFT_LINES.join('\n') + '\n');
-    chmodSync(swiftPath, 0o755);
+    const ciPath = join(binDir, 'ci');
+    writeFileSync(ciPath, FAKE_CI_LINES.join('\n') + '\n');
+    chmodSync(ciPath, 0o755);
     if (params !== undefined) {
         writeFileSync(join(dir, '.ci', 'inputs', 'params.json'), typeof params === 'string' ? params : JSON.stringify(params));
     }

package/dist/src/yaml/steps/ui-fidelity-render.js

@@ -1250,7 +1250,7 @@ function buildPackageSourceMain() {
     // crop each rendered PNG to its content bounding box right after it renders.
     main = replaceOnce(main, 'function renderWithHarness(renderable, packagePath) {', RENDER_SCRIPT_TRIM_STAGE + '\nfunction renderWithHarness(renderable, packagePath) {');
     main = replaceOnce(main, "      log('rendered ' + entry.screen + ' -> ' + relative);", "      log('rendered ' + entry.screen + ' -> ' + relative);\n" +
-        '      trimRenderedImage(entry, outputPath, harnessDir);');
+        '      trimRenderedImage(entry, outputPath);');
     // Per-screen result entries gain the trimmed-render fields: the aligned
     // (reference-sized) image and the rendered/logical/reference dimensions.
     // They stay null until a screen renders and is trimmed.

package/dist/src/yaml/steps/ui-fidelity-render.test.js

@@ -111,15 +111,24 @@ const FAKE_SWIFT_LINES = [
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out\"",
     '    printf \'fake-render:%s\' "$screen" >> "$out"',
     '    exit 0 ;;',
-    '  *.swift)',
-    // Script-interpreter mode (swift <Trim.swift> <in> <out> <aligned> <ref>):
-    // stands in for the CoreGraphics trim helper. Overwrites <out> with a PNG
-    // marked "trimmed:<in basename>" and writes an "aligned:<in basename>" PNG so
-    // tests can prove both outputs. Emits a fixed TRIMDIMS line (rendered
-    // 320x640, reference 160x320, source 400x800). FAKE_TRIM_FAIL exercises
-    // warn-and-continue.
+    '  *)',
+    '    exit 0 ;;',
+    'esac',
+];
+/**
+ * PATH-shimmed fake `ci`, providing only the branch the shared trim stage
+ * uses: `ci fidelity-trim <in> <out> <aligned> <ref>`. Overwrites <out> with a
+ * PNG marked "trimmed:<in basename>" and writes an "aligned:<in basename>" PNG
+ * so tests can prove both outputs. Emits a fixed TRIMDIMS line (rendered
+ * 320x640, reference 160x320, source 400x800). FAKE_TRIM_FAIL exercises
+ * warn-and-continue.
+ */
+const FAKE_CI_LINES = [
+    '#!/bin/bash',
+    'case "$1" in',
+    '  fidelity-trim)',
     '    if [ -n "$FAKE_TRIM_FAIL" ]; then echo "trim: simulated failure" >&2; exit 1; fi',
-    '    in_png="$1"; out_png="$2"; aligned_png="$3"',
+    '    in_png="$2"; out_png="$3"; aligned_png="$4"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out_png\"",
     '    printf \'trimmed:%s\' "$(basename "$in_png")" >> "$out_png"',
     '    if [ -n "$aligned_png" ]; then',
@@ -128,8 +137,7 @@ const FAKE_SWIFT_LINES = [
     '    fi',
     '    echo "TRIMDIMS 320 640 160 320 400 800"',
     '    exit 0 ;;',
-    '  *)',
-    '    exit 0 ;;',
+    '  *) exit 0 ;;',
     'esac',
 ];
 /**
@@ -186,6 +194,9 @@ function makeProject(params) {
     const xcrunPath = join(binDir, 'xcrun');
     writeFileSync(xcrunPath, FAKE_XCRUN_LINES.join('\n') + '\n');
     chmodSync(xcrunPath, 0o755);
+    const ciPath = join(binDir, 'ci');
+    writeFileSync(ciPath, FAKE_CI_LINES.join('\n') + '\n');
+    chmodSync(ciPath, 0o755);
     if (params !== undefined) {
         writeFileSync(join(dir, '.ci', 'inputs', 'params.json'), typeof params === 'string' ? params : JSON.stringify(params));
     }
@@ -1016,20 +1027,14 @@ describe('render output trimming (package_source variants)', () => {
     function readArtifact(project, relative) {
         return readFileSync(artifact(project, relative), 'utf-8');
     }
-    test('trims the rendered PNG in place via the Swift helper', async () => {
+    test('trims the rendered PNG in place via the ci fidelity-trim helper', async () => {
         const project = makeProject({ screens: { HomeView: 'home.png' } });
         writeReference(project, 'home.png');
         const script = await buildScript(project, { package_source: 'repo' });
-        const logPath = join(project.dir, 'swift-invocations.log');
-        const run = runScript(project, script, { FAKE_SWIFT_LOG: logPath });
+        const run = runScript(project, script);
         expect(run.status).toBe(0);
-        // The helper is invoked in script mode with the rendered PNG as in and out
-        // (in-place overwrite), after the render run.
-        const invocations = readFileSync(logPath, 'utf-8').trim().split('\n');
-        const trimCall = invocations.find((c) => c.includes('Trim.swift'));
-        expect(trimCall).toBeTruthy();
-        expect(trimCall).toContain('ui-fidelity/rendered/HomeView.png');
-        // The rendered file now holds the trim helper's output, not the raw render.
+        // The rendered file now holds the trim helper's output, not the raw render
+        // (the fake ci overwrites in place, proving the in/out in-place contract).
         expect(isPng(artifact(project, 'ui-fidelity/rendered/HomeView.png'))).toBe(true);
         expect(readArtifact(project, 'ui-fidelity/rendered/HomeView.png')).toContain('trimmed:HomeView.png');
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "2.3.7",
+  "version": "2.4.0",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",
@@ -55,12 +55,14 @@
   "homepage": "https://github.com/invarnhq/cibuild",
   "dependencies": {
     "js-yaml": "^4.1.0",
+    "pngjs": "7.0.0",
     "prompts": "^2.4.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.10.1",
+    "@types/pngjs": "6.0.5",
     "@types/prompts": "^2.4.9",
     "@yao-pkg/pkg": "^6.14.1",
     "esbuild": "^0.27.3",