@applitools/core 4.72.2 → 4.73.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.73.0](https://github.com/Applitools-Dev/sdk/compare/js/core@4.72.2...js/core@4.73.0) (2026-10-18)
+
+
+### Features
+
+* read latestCommitInfo from git when cherry-pick lookup is on, log detection details | FLD-5129 ([#4293](https://github.com/Applitools-Dev/sdk/issues/4293)) ([0ec5dc8](https://github.com/Applitools-Dev/sdk/commit/0ec5dc86b4d78417cd2eb50cbaaf57d851556880))
+
 ## [4.72.2](https://github.com/Applitools-Dev/sdk/compare/js/core@4.72.1...js/core@4.72.2) (2026-10-18)
 
 

package/dist/open-eyes.js

@@ -40,6 +40,7 @@ const core_base_1 = require("@applitools/core-base");
 const extract_git_info_1 = require("./utils/extract-git-info");
 const types_1 = require("./types");
 const reportedScmPreconditionFindings = new Map();
+const reportedCherryPickDetections = new Set();
 const scmPreconditionKey = (cwd, gitBranchName) => `${cwd} ${gitBranchName !== null && gitBranchName !== void 0 ? gitBranchName : ''}`;
 const findingsHash = (findings) => findings
     .map(finding => finding.code)
@@ -80,7 +81,10 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
         (_l = settings.parentBranchName) !== null && _l !== void 0 ? _l : (settings.parentBranchName = (_m = utils.general.getEnvValue('PARENT_BRANCH')) !== null && _m !== void 0 ? _m : utils.general.getEnvValue('PARENT_BRANCH_NAME'));
         (_o = settings.baselineBranchName) !== null && _o !== void 0 ? _o : (settings.baselineBranchName = (_p = utils.general.getEnvValue('BASELINE_BRANCH')) !== null && _p !== void 0 ? _p : utils.general.getEnvValue('BASELINE_BRANCH_NAME'));
         (_q = settings.gitBranchingTimestamp) !== null && _q !== void 0 ? _q : (settings.gitBranchingTimestamp = utils.general.getEnvValue('GIT_MERGE_BASE_TIMESTAMP'));
+        let latestCommitInfoSource = settings.latestCommitInfo ? 'settings' : undefined;
         (_r = settings.latestCommitInfo) !== null && _r !== void 0 ? _r : (settings.latestCommitInfo = getLatestCommitInfoFromEnvVars(logger));
+        if (settings.latestCommitInfo)
+            latestCommitInfoSource !== null && latestCommitInfoSource !== void 0 ? latestCommitInfoSource : (latestCommitInfoSource = 'env vars');
         (_s = settings.ufgServerUrl) !== null && _s !== void 0 ? _s : (settings.ufgServerUrl = utils.general.getEnvValue('UFG_SERVER_URL'));
         (_t = settings.ignoreBaseline) !== null && _t !== void 0 ? _t : (settings.ignoreBaseline = false);
         (_u = settings.compareWithParentBranch) !== null && _u !== void 0 ? _u : (settings.compareWithParentBranch = false);
@@ -90,6 +94,9 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
             logger.warn(`latestCommitInfo.timestamp is an invalid ISO date string: ${settings.latestCommitInfo.timestamp}`);
             settings.latestCommitInfo = undefined;
         }
+        if (settings.latestCommitInfo) {
+            logger.log(`Using latestCommitInfo from ${latestCommitInfoSource !== null && latestCommitInfoSource !== void 0 ? latestCommitInfoSource : 'git'}`, JSON.stringify(settings.latestCommitInfo));
+        }
         // Bare git refs from the scm integration. Kept out of `settings` because that pair is the
         // session's identity on the wire; these are only a `git merge-base` argument.
         let scmGitRefs;
@@ -134,7 +141,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
             }
         }
         const account = await core.getAccountInfo({ settings: eyesServerSettings, logger });
-        await handleBranchFallbackList(account, settings, logger);
+        await handleBranchFallbackList(account, settings, latestCommitInfoSource, logger);
         const componentConcurrency = account.serverConcurrency.componentConcurrency;
         settings.sessionConcurrency = handleConcurrency({
             userConcurrency: concurrency,
@@ -225,8 +232,9 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
             }
         }
     };
-    async function handleBranchFallbackList(account, settings, logger) {
-        var _a, _b, _c;
+    async function handleBranchFallbackList(account, settings, latestCommitInfoSource, logger) {
+        var _a, _b, _c, _d;
+        logger.log('SCM settings from the server', JSON.stringify(account.scmSettings));
         const scm = getScmSettings(account.scmSettings);
         const integrationActive = !settings.ignoreGitBranching && scm.lookupFallbackList;
         // Extract gitBranchName (the actual git branch name)
@@ -242,7 +250,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
             // logger.log(`Using branch name: ${settings.branchName}`)
         }
         else {
-            logger.log(`Skipping extraction of git branch name as ignoreGitBranching is set to true`);
+            logger.log(`Skipping extraction of git branch name: ignoreGitBranching=${settings.ignoreGitBranching}, fallback list enabled=${scm.lookupFallbackList}`);
         }
         // No branch name means the extractor never runs, so probe the env here instead.
         if (integrationActive && !settings.gitBranchName) {
@@ -266,7 +274,20 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
             settings.branchLookupFallbackList = outcome.list;
             // Walks from the same tip as latestCommitInfo (the PR head on pull_request events): the server compares the
             // pick positions with a cutoff taken from it.
+            let envLatestCommitSha;
             if (((_c = outcome.list) === null || _c === void 0 ? void 0 : _c.length) && settings.latestCommitInfo) {
+                // The env vars are often set once per CI pipeline and can point below the picks; git knows the real tip.
+                if (account.scmSettings.isCherryPickEnabled && latestCommitInfoSource === 'env vars') {
+                    const gitCommitInfo = await (0, extract_git_info_1.extractLatestCommitInfo)({ execOptions: { cwd }, logger });
+                    if (gitCommitInfo) {
+                        logger.log(`Cherry-pick lookup is enabled for this account, so APPLITOOLS_GIT_LATEST_COMMIT_SHA/TIMESTAMP (${settings.latestCommitInfo.sha}) are ignored and latestCommitInfo is read from git`, JSON.stringify(gitCommitInfo));
+                        envLatestCommitSha = settings.latestCommitInfo.sha;
+                        settings.latestCommitInfo = gitCommitInfo;
+                    }
+                    else {
+                        logger.log(`Cherry-pick lookup is enabled for this account, but git returned no commit, so latestCommitInfo stays on APPLITOOLS_GIT_LATEST_COMMIT_SHA (${settings.latestCommitInfo.sha})`);
+                    }
+                }
                 const cherryPicks = await (0, extract_git_info_1.extractCherryPicks)({
                     headSha: settings.latestCommitInfo.sha,
                     fallbackBranchNames: outcome.list.map(branch => branch.branchName),
@@ -275,6 +296,31 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
                 });
                 if (cherryPicks === null || cherryPicks === void 0 ? void 0 : cherryPicks.length)
                     settings.cherryPicks = cherryPicks;
+                if (account.scmSettings.isCherryPickEnabled) {
+                    reportCherryPickDetection({
+                        account,
+                        settings,
+                        event: {
+                            status: cherryPicks ? 'detected' : 'failed',
+                            latestCommitInfoSource: envLatestCommitSha ? 'git' : latestCommitInfoSource !== null && latestCommitInfoSource !== void 0 ? latestCommitInfoSource : 'git',
+                            latestCommitSha: settings.latestCommitInfo.sha,
+                            envLatestCommitSha,
+                            cherryPicks: cherryPicks === null || cherryPicks === void 0 ? void 0 : cherryPicks.map(({ pickedSha, originalSha, originalBranch }) => ({
+                                pickedSha,
+                                originalSha,
+                                originalBranch,
+                            })),
+                        },
+                        logger,
+                    });
+                }
+            }
+            else {
+                const reason = ((_d = outcome.list) === null || _d === void 0 ? void 0 : _d.length) ? 'no latestCommitInfo' : 'empty fallback list';
+                logger.log(`Cherry-pick detection did not run: ${reason}`);
+                if (account.scmSettings.isCherryPickEnabled) {
+                    reportCherryPickDetection({ account, settings, event: { status: 'skipped', reason }, logger });
+                }
             }
             if (outcome.status === 'precondition-failure') {
                 reportScmPreconditionFailure({
@@ -295,6 +341,27 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
         reportedScmPreconditionFindings.set(key, hash);
         emitScmPreconditionFailureEvent({ account, settings, findings, defaultBranch, logger });
     }
+    function reportCherryPickDetection({ account, settings, event, logger, }) {
+        var _a, _b;
+        const key = `${cwd} ${settings.gitBranchName} ${(_a = settings.latestCommitInfo) === null || _a === void 0 ? void 0 : _a.sha}`;
+        if (reportedCherryPickDetections.has(key))
+            return;
+        reportedCherryPickDetections.add(key);
+        void core.logEvent({
+            settings: {
+                ...account.eyesServer,
+                level: event.envLatestCommitSha ? 'Warn' : 'Notice',
+                event: {
+                    type: 'scmCherryPickDetection',
+                    gitBranchName: settings.gitBranchName,
+                    ...event,
+                    batchId: (_b = settings.batch) === null || _b === void 0 ? void 0 : _b.id,
+                    userTestId: settings.userTestId,
+                },
+            },
+            logger,
+        });
+    }
     function emitScmPreconditionFailureEvent({ account, settings, findings, defaultBranch, logger, }) {
         var _a;
         void core.logEvent({

package/dist/utils/extract-git-info.js

@@ -1732,7 +1732,7 @@ function parsePickCandidate(record) {
     const [pickedSha, pickedCommitTime, body = ''] = record.replace(/^\n/, '').split('\x1f');
     // Hand-edited lines are not validated; the first line is trusted.
     const originalSha = (_a = body.match(CHERRY_PICK_LINE)) === null || _a === void 0 ? void 0 : _a[1];
-    return originalSha ? { pickedSha, pickedCommitTime, originalSha } : undefined;
+    return originalSha ? { pickedSha, pickedCommitTime, originalSha, subject: body.split('\n')[0].trim() } : undefined;
 }
 async function collectPickCandidates(git, branches, headSha, logger) {
     const maxCommits = cherryPickLimit('CHERRY_PICK_MAX_COMMITS', 1000);
@@ -1745,6 +1745,7 @@ async function collectPickCandidates(git, branches, headSha, logger) {
         const records = log.stdout.split('\x1e').filter(record => record.trim());
         if (records.length === maxCommits)
             logger.log(`Cherry-pick detection read only the newest ${maxCommits} commits of ${range}`);
+        logger.log(`Cherry-pick detection read ${records.length} commits of ${range}`);
         return records;
     });
     const candidates = new Map();
@@ -1779,18 +1780,19 @@ async function findContainingBranch(git, sha, branches) {
 async function resolvePick(git, candidate, branches, logger) {
     const originalSha = await resolveCommit(git, candidate.originalSha);
     if (!originalSha) {
-        logger.log(`Cherry-pick ${candidate.pickedSha} dropped: original ${candidate.originalSha} is not in the local history`);
+        logger.log(`Cherry-pick ${candidate.pickedSha} "${candidate.subject}" dropped: original ${candidate.originalSha} is not in the local history`);
         return undefined;
     }
     const originalBranch = await findContainingBranch(git, originalSha, branches);
     if (!originalBranch) {
-        logger.log(`Cherry-pick ${candidate.pickedSha} dropped: original ${originalSha} is not on a fallback-list branch`);
+        logger.log(`Cherry-pick ${candidate.pickedSha} "${candidate.subject}" dropped: original ${originalSha} is not on a fallback-list branch`);
         return undefined;
     }
     const shown = await git(['show', '-s', '--format=%aI', originalSha]);
     const originalCommitTime = shown.stdout.trim();
     if (shown.code !== 0 || !isISODate(originalCommitTime))
         throw new Error(`no commit time for ${originalSha}`);
+    logger.log(`Cherry-pick ${candidate.pickedSha} "${candidate.subject}" is a pick of ${originalSha} on ${originalBranch}`);
     return {
         pickedSha: candidate.pickedSha,
         pickedCommitTime: candidate.pickedCommitTime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/core",
-  "version": "4.72.2",
+  "version": "4.73.0",
   "homepage": "https://applitools.com",
   "license": "SEE LICENSE IN LICENSE",
   "author": {