@invarn/cibuild 2.4.1 → 2.4.2

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

@@ -52,6 +52,12 @@ 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,MA+GtC,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"}
+{"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"}

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

@@ -88,7 +88,22 @@ function trimHelperInvocation(args) {
     };
   }
   if (process.pkg) {
-    return { cmd: process.execPath, args: ['fidelity-trim'].concat(args) };
+    // 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: 'ci', args: ['fidelity-trim'].concat(args) };
 }
@@ -97,10 +112,9 @@ function trimHelperInvocation(args) {
 // stdout line, and exit codes are the retired CoreGraphics helper's contract).
 function runTrimHelper(args) {
   var invocation = trimHelperInvocation(args);
-  var result = cp.spawnSync(invocation.cmd, invocation.args, {
-    encoding: 'utf-8',
-    maxBuffer: 16 * 1024 * 1024,
-  });
+  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);
   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,6 +97,56 @@ 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', () => {
+        const calls = [];
+        const fakeCp = {
+            spawnSync: (...args) => {
+                calls.push(args);
+                return { status: 0, stdout: 'TRIMDIMS 10 10 0 0 10 10\n', stderr: '' };
+            },
+        };
+        const { runTrimHelper } = getPostProcessorInternals({
+            cp: fakeCp,
+            processRef: {
+                env: { PKG_EXECPATH: 'PKG_INVOKE_NODEJS', FOO: 'bar' },
+                pkg: {},
+                execPath: '/opt/homebrew/bin/ci',
+                stdout: { write: () => true },
+                stderr: { write: () => true },
+            },
+        });
+        runTrimHelper(['in.png', 'out.png']);
+        expect(calls).toHaveLength(1);
+        const [cmd, , options] = calls[0];
+        expect(cmd).toBe('/opt/homebrew/bin/ci');
+        expect(options.env).toBeDefined();
+        expect(options.env?.PKG_EXECPATH).toBeUndefined();
+        expect(options.env?.FOO).toBe('bar');
+    });
     test('runTrimHelper reports a spawn error as status 127 with the message appended', () => {
         const calls = [];
         const fakeCp = {

package/package.json

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