@invarn/cibuild 2.4.2 → 2.4.3

package/dist/src/yaml/steps/render-post-processor.d.ts

@@ -52,12 +52,6 @@ export interface TrimDims {
 export interface TrimHelperInvocation {
     cmd: string;
     args: string[];
-    /** Child environment override. Set only for the pkg self-exec, where the
-     *  node-invoke sentinel (PKG_EXECPATH) must be stripped so the re-executed ci
-     *  binary runs its baked cli entrypoint (dispatching `fidelity-trim`) instead
-     *  of re-entering Node-emulation and treating it as a script path. Absent for
-     *  the other homes, which spawn with the inherited environment unchanged. */
-    env?: Record<string, string>;
 }
 /**
  * The platform-neutral helpers embedded in the trim-stage script.

package/dist/src/yaml/steps/render-post-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-post-processor.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/render-post-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAMH;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,wBAAwB,EAAE,MA6HtC,CAAC;AAEF,iFAAiF;AACjF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5C,iFAAiF;AACjF,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,YAAY,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,yDAAyD;AACzD,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;IACf;;;;iFAI6E;IAC7E,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAChC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;IAC3D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1F;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,sBAAsB,CASzB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAqBhD"}
+{"version":3,"file":"render-post-processor.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/render-post-processor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAMH;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAiItC,CAAC;AAEF,iFAAiF;AACjF,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE5C,iFAAiF;AACjF,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,SAAS,EAAE,YAAY,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,yDAAyD;AACzD,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAChC,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC;IAC3D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1F;AAED;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,CAAC,EAAE;IACpD,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,sBAAsB,CASzB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAqBhD"}

package/dist/src/yaml/steps/render-post-processor.js

@@ -76,10 +76,15 @@ function parseTrimDims(stdout) {
 // generated script. Three homes, in order:
 //  1. CIBUILD_CLI_JS -- an explicit JS entrypoint (preview harnesses, tests),
 //     run under the same node executing this script.
-//  2. The pkg-built ci binary re-executing itself -- the production runner
-//     path, where this script runs under the pkg bootstrap and
-//     process.execPath IS the ci binary.
-//  3. A ci on PATH (brew/npm installs).
+//  2. process.execPath re-executing the pkg binary. NOTE: gated on process.pkg,
+//     which is NOT set under pkg Node-emulation (pkg's bootstrap defines it only
+//     AFTER its node-invoke early return), so on the runner this branch does not
+//     fire -- the generated script runs as 'node the-script' in Node-emulation.
+//  3. A ci on PATH (brew/npm installs) -- the ACTUAL production runner path,
+//     precisely because process.pkg is undefined under Node-emulation.
+// Whichever home resolves, runTrimHelper strips PKG_EXECPATH from the child env
+// so the spawned pkg binary dispatches the subcommand instead of re-entering
+// Node-emulation. See runTrimHelper.
 function trimHelperInvocation(args) {
   if (process.env.CIBUILD_CLI_JS) {
     return {
@@ -88,22 +93,7 @@ function trimHelperInvocation(args) {
     };
   }
   if (process.pkg) {
-    // The runner spawns this script as 'node <script>', which the pkg binary
-    // intercepts and runs in Node-emulation mode -- so process.env carries
-    // pkg's node-invoke sentinel (PKG_EXECPATH). Re-execing process.execPath
-    // with it still set makes the child ci binary ALSO enter Node-emulation and
-    // treat 'fidelity-trim' as a main-module script path (Cannot find module
-    // '<cwd>/fidelity-trim'), never reaching the subcommand dispatch -- so the
-    // trim silently fails and untrimmed renders ship. Strip PKG_EXECPATH from
-    // the child env so the re-exec runs the baked cli entrypoint, which routes
-    // 'fidelity-trim' to the in-binary helper (with bundled pngjs).
-    var invocation = { cmd: process.execPath, args: ['fidelity-trim'].concat(args) };
-    if (process.env.PKG_EXECPATH !== undefined) {
-      var appEnv = Object.assign({}, process.env);
-      delete appEnv.PKG_EXECPATH;
-      invocation.env = appEnv;
-    }
-    return invocation;
+    return { cmd: process.execPath, args: ['fidelity-trim'].concat(args) };
   }
   return { cmd: 'ci', args: ['fidelity-trim'].concat(args) };
 }
@@ -112,9 +102,23 @@ function trimHelperInvocation(args) {
 // stdout line, and exit codes are the retired CoreGraphics helper's contract).
 function runTrimHelper(args) {
   var invocation = trimHelperInvocation(args);
-  var options = { encoding: 'utf-8', maxBuffer: 16 * 1024 * 1024 };
-  if (invocation.env !== undefined) options.env = invocation.env;
-  var result = cp.spawnSync(invocation.cmd, invocation.args, options);
+  // This script runs under the pkg binary in Node-emulation mode (the runner
+  // spawns it as 'node <script>'), so process.env carries pkg's node-invoke
+  // sentinel PKG_EXECPATH. Every home above spawns the pkg binary (process.execPath
+  // or a 'ci' resolved on PATH); a child that inherits PKG_EXECPATH re-enters
+  // Node-emulation and treats 'fidelity-trim' as a main-module script path
+  // ("Cannot find module '<cwd>/fidelity-trim'") instead of dispatching the
+  // subcommand -- so the trim silently no-ops and untrimmed renders ship. Strip
+  // PKG_EXECPATH from the child env so the binary runs its baked cli entrypoint
+  // (verified: 'env -u PKG_EXECPATH ci fidelity-trim' dispatches; inheriting
+  // PKG_INVOKE_NODEJS reproduces the crash).
+  var childEnv = Object.assign({}, process.env);
+  delete childEnv.PKG_EXECPATH;
+  var result = cp.spawnSync(invocation.cmd, invocation.args, {
+    encoding: 'utf-8',
+    maxBuffer: 16 * 1024 * 1024,
+    env: childEnv,
+  });
   if (result.stdout) process.stdout.write(result.stdout);
   if (result.stderr) process.stderr.write(result.stderr);
   if (result.error) {

package/dist/src/yaml/steps/render-post-processor.test.js

@@ -97,31 +97,21 @@ describe('trim stage — helper invocation resolution', () => {
             args: ['fidelity-trim', 'in.png', 'out.png'],
         });
     });
-    // The production runner spawns the render step as `node <script>`, which the
-    // pkg-built ci binary intercepts and runs in Node-emulation mode — so the
-    // running script's process.env carries pkg's node-invoke sentinel
-    // (PKG_EXECPATH). If the trim re-exec inherits it, the child ci binary ALSO
-    // enters Node-emulation and treats 'fidelity-trim' as a main-module script
-    // path ("Cannot find module '<cwd>/fidelity-trim'") instead of dispatching
-    // the subcommand — the exact failure observed in production, which silently
-    // ships untrimmed renders. The re-exec must clear PKG_EXECPATH so the binary
-    // runs its baked cli entrypoint.
-    test('under pkg node-emulation the re-exec clears PKG_EXECPATH so the binary runs its app entrypoint', () => {
-        const { trimHelperInvocation } = internalsWith({
-            env: { PKG_EXECPATH: 'PKG_INVOKE_NODEJS', PATH: '/usr/bin:/bin' },
-            pkg: {},
-            execPath: '/opt/homebrew/bin/ci',
-        });
-        const invocation = trimHelperInvocation(['in.png', 'out.png']);
-        expect(invocation.cmd).toBe('/opt/homebrew/bin/ci');
-        expect(invocation.args).toEqual(['fidelity-trim', 'in.png', 'out.png']);
-        // A child env is supplied with the node-invoke sentinel removed, but the
-        // rest of the environment (PATH, etc.) preserved.
-        expect(invocation.env).toBeDefined();
-        expect(invocation.env?.PKG_EXECPATH).toBeUndefined();
-        expect(invocation.env?.PATH).toBe('/usr/bin:/bin');
-    });
-    test('runTrimHelper spawns the pkg re-exec with a PKG_EXECPATH-cleared env', () => {
+    // Production path + the load-bearing fix. The runner spawns the render step as
+    // `node <script>`, which the pkg-built ci binary runs in Node-emulation mode.
+    // In that mode pkg's bootstrap returns BEFORE it defines process.pkg, so
+    // process.pkg is UNDEFINED here and the resolution above lands on `ci` on PATH
+    // (NOT the process.pkg self-exec branch). The script's env still carries pkg's
+    // node-invoke sentinel (PKG_EXECPATH=PKG_INVOKE_NODEJS); whichever home is
+    // spawned is the pkg binary, and a child that inherits PKG_EXECPATH re-enters
+    // Node-emulation and treats 'fidelity-trim' as a main-module script path
+    // ("Cannot find module '<cwd>/fidelity-trim'") instead of dispatching the
+    // subcommand — the exact production failure, which silently ships untrimmed
+    // renders. runTrimHelper must strip PKG_EXECPATH from the child env
+    // regardless of which home resolved, so the binary runs its baked cli
+    // entrypoint. (Verified out-of-band: `env -u PKG_EXECPATH ci fidelity-trim`
+    // dispatches; inheriting PKG_INVOKE_NODEJS reproduces the crash.)
+    test('runTrimHelper strips PKG_EXECPATH from the child env so the ci re-exec dispatches', () => {
         const calls = [];
         const fakeCp = {
             spawnSync: (...args) => {
@@ -132,9 +122,9 @@ describe('trim stage — helper invocation resolution', () => {
         const { runTrimHelper } = getPostProcessorInternals({
             cp: fakeCp,
             processRef: {
-                env: { PKG_EXECPATH: 'PKG_INVOKE_NODEJS', FOO: 'bar' },
-                pkg: {},
-                execPath: '/opt/homebrew/bin/ci',
+                // Node-emulation shape: the sentinel is set but process.pkg is NOT.
+                env: { PKG_EXECPATH: 'PKG_INVOKE_NODEJS', PATH: '/usr/bin:/bin', FOO: 'bar' },
+                execPath: '/usr/local/bin/node',
                 stdout: { write: () => true },
                 stderr: { write: () => true },
             },
@@ -142,9 +132,12 @@ describe('trim stage — helper invocation resolution', () => {
         runTrimHelper(['in.png', 'out.png']);
         expect(calls).toHaveLength(1);
         const [cmd, , options] = calls[0];
-        expect(cmd).toBe('/opt/homebrew/bin/ci');
+        // process.pkg undefined → resolves to `ci` on PATH (the real runner path).
+        expect(cmd).toBe('ci');
+        // The child env must have the node-invoke sentinel removed, the rest kept.
         expect(options.env).toBeDefined();
         expect(options.env?.PKG_EXECPATH).toBeUndefined();
+        expect(options.env?.PATH).toBe('/usr/bin:/bin');
         expect(options.env?.FOO).toBe('bar');
     });
     test('runTrimHelper reports a spawn error as status 127 with the message appended', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",