@qoretechnologies/qlip 0.1.3-beta.20260622084321 → 0.1.3-beta.20260707080241

package/dist/upload/autodetect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autodetect.d.ts","sourceRoot":"","sources":["../../src/upload/autodetect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAoBH,eAAO,MAAM,gBAAgB,QAAO,MAAM,GAAG,SAW5C,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAO,MAAM,GAAG,SAI5C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QAAO,MAAM,GAAG,SAGhD,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,wBAAwB,QAAO,MAAM,GAAG,SAcpD,CAAC;AA0BF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,QAAO,MAAM,EAAE,GAAG,SAgBvD,CAAC"}
+{"version":3,"file":"autodetect.d.ts","sourceRoot":"","sources":["../../src/upload/autodetect.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAqBH,eAAO,MAAM,gBAAgB,QAAO,MAAM,GAAG,SAW5C,CAAC;AAkCF,eAAO,MAAM,gBAAgB,QAAO,MAAM,GAAG,SAS5C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,QAAO,MAAM,GAAG,SAGhD,CAAC;AAEF;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,wBAAwB,QAAO,MAAM,GAAG,SAcpD,CAAC;AA0BF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,QAAO,MAAM,EAAE,GAAG,SAgBvD,CAAC"}

package/dist/upload/autodetect.js

@@ -14,6 +14,7 @@
  * `qlip-server/design/UPLOAD.md`.
  */
 import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
 /** Server-side cap on the ancestry list (`qlip-server/design/UPLOAD.md`). */
 const MAX_ANCESTOR_COMMITS = 100;
 const gitCommand = (args) => {
@@ -43,7 +44,44 @@ export const autodetectBranch = () => {
     // Detached HEAD reports "HEAD" which isn't useful as a branch name.
     return branch === 'HEAD' ? undefined : branch;
 };
+/**
+ * The PR head SHA from the GitHub Actions event payload, on
+ * `pull_request` / `pull_request_target` events only.
+ *
+ * Why this exists: on those events `GITHUB_SHA` is the EPHEMERAL merge
+ * commit GitHub synthesizes (`refs/pull/N/merge`), which exists in NO
+ * branch's history. qlip-server resolves baselines by walking git
+ * ancestry (`builds.commit IN <rev-list HEAD>`), so a build whose
+ * recorded commit is a merge SHA can never be found as an ancestor of a
+ * later build — the ancestry tier silently never matches PR-built
+ * baselines. The real branch head SHA (`pull_request.head.sha`) is the
+ * commit that actually produced the screenshots and the one that DOES
+ * appear in later ancestry. See qlip-server/design/UPLOAD.md §6.
+ */
+const pullRequestHeadSha = () => {
+    const eventName = process.env['GITHUB_EVENT_NAME'];
+    if (eventName !== 'pull_request' && eventName !== 'pull_request_target') {
+        return undefined;
+    }
+    const eventPath = process.env['GITHUB_EVENT_PATH'];
+    if (!eventPath || eventPath.length === 0)
+        return undefined;
+    try {
+        const payload = JSON.parse(readFileSync(eventPath, 'utf-8'));
+        const sha = payload.pull_request?.head?.sha;
+        return sha && sha.length > 0 ? sha : undefined;
+    }
+    catch {
+        return undefined;
+    }
+};
 export const autodetectCommit = () => {
+    // Prefer the PR head SHA over GITHUB_SHA: on pull_request events the
+    // latter is the ephemeral merge commit, useless for the server's
+    // ancestry-based baseline resolution (see pullRequestHeadSha).
+    const headSha = pullRequestHeadSha();
+    if (headSha)
+        return headSha;
     const sha = process.env['GITHUB_SHA'];
     if (sha && sha.length > 0)
         return sha;

package/dist-cjs/upload/autodetect.js

@@ -17,6 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.autodetectAncestorCommits = exports.autodetectPullRequestUrl = exports.autodetectBaseBranch = exports.autodetectCommit = exports.autodetectBranch = void 0;
 const node_child_process_1 = require("node:child_process");
+const node_fs_1 = require("node:fs");
 /** Server-side cap on the ancestry list (`qlip-server/design/UPLOAD.md`). */
 const MAX_ANCESTOR_COMMITS = 100;
 const gitCommand = (args) => {
@@ -47,7 +48,44 @@ const autodetectBranch = () => {
     return branch === 'HEAD' ? undefined : branch;
 };
 exports.autodetectBranch = autodetectBranch;
+/**
+ * The PR head SHA from the GitHub Actions event payload, on
+ * `pull_request` / `pull_request_target` events only.
+ *
+ * Why this exists: on those events `GITHUB_SHA` is the EPHEMERAL merge
+ * commit GitHub synthesizes (`refs/pull/N/merge`), which exists in NO
+ * branch's history. qlip-server resolves baselines by walking git
+ * ancestry (`builds.commit IN <rev-list HEAD>`), so a build whose
+ * recorded commit is a merge SHA can never be found as an ancestor of a
+ * later build — the ancestry tier silently never matches PR-built
+ * baselines. The real branch head SHA (`pull_request.head.sha`) is the
+ * commit that actually produced the screenshots and the one that DOES
+ * appear in later ancestry. See qlip-server/design/UPLOAD.md §6.
+ */
+const pullRequestHeadSha = () => {
+    const eventName = process.env['GITHUB_EVENT_NAME'];
+    if (eventName !== 'pull_request' && eventName !== 'pull_request_target') {
+        return undefined;
+    }
+    const eventPath = process.env['GITHUB_EVENT_PATH'];
+    if (!eventPath || eventPath.length === 0)
+        return undefined;
+    try {
+        const payload = JSON.parse((0, node_fs_1.readFileSync)(eventPath, 'utf-8'));
+        const sha = payload.pull_request?.head?.sha;
+        return sha && sha.length > 0 ? sha : undefined;
+    }
+    catch {
+        return undefined;
+    }
+};
 const autodetectCommit = () => {
+    // Prefer the PR head SHA over GITHUB_SHA: on pull_request events the
+    // latter is the ephemeral merge commit, useless for the server's
+    // ancestry-based baseline resolution (see pullRequestHeadSha).
+    const headSha = pullRequestHeadSha();
+    if (headSha)
+        return headSha;
     const sha = process.env['GITHUB_SHA'];
     if (sha && sha.length > 0)
         return sha;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qoretechnologies/qlip",
-  "version": "0.1.3-beta.20260622084321",
+  "version": "0.1.3-beta.20260707080241",
   "description": "Storybook screenshot capture for the Vitest addon",
   "type": "module",
   "main": "./dist/index.js",