@applitools/core 4.70.2 → 4.71.0

package/CHANGELOG.md

@@ -1,5 +1,54 @@
 # Changelog
 
+## [4.71.0](https://github.com/Applitools-Dev/sdk/compare/js/core@4.70.3...js/core@4.71.0) (2026-10-01)
+
+
+### Features
+
+* detect git cherry-picks and report them in StartSession | AD-16372 ([#4235](https://github.com/Applitools-Dev/sdk/issues/4235)) ([92db51e](https://github.com/Applitools-Dev/sdk/commit/92db51e3ea713ee7c59be334d8e11d2c312d1095))
+
+
+### Dependencies
+
+* @applitools/ufg-client bumped to 1.23.5
+  #### Bug Fixes
+
+  * add a deadline for reading a resource body | FLD-4198 ([#4247](https://github.com/Applitools-Dev/sdk/issues/4247)) ([a9faac2](https://github.com/Applitools-Dev/sdk/commit/a9faac2ade1b851e6a00f5bc4a3990f10a345541))
+* @applitools/nml-client bumped to 1.12.6
+
+* @applitools/core-base bumped to 1.40.0
+  #### Features
+
+  * detect git cherry-picks and report them in StartSession | AD-16372 ([#4235](https://github.com/Applitools-Dev/sdk/issues/4235)) ([92db51e](https://github.com/Applitools-Dev/sdk/commit/92db51e3ea713ee7c59be334d8e11d2c312d1095))
+* @applitools/ec-client bumped to 1.12.49
+
+
+## [4.70.3](https://github.com/Applitools-Dev/sdk/compare/js/core@4.70.2...js/core@4.70.3) (2026-09-27)
+
+
+### Dependencies
+
+* @applitools/driver bumped to 1.26.11
+  #### Bug Fixes
+
+  * fail executePoll when the target stops responding | AD-16554 ([#4227](https://github.com/Applitools-Dev/sdk/issues/4227)) ([39745d1](https://github.com/Applitools-Dev/sdk/commit/39745d117942122a364d0a598a48b205838a5ca6))
+* @applitools/dom-snapshot bumped to 4.18.4
+
+* @applitools/spec-driver-webdriver bumped to 1.6.11
+
+* @applitools/spec-driver-selenium bumped to 1.8.11
+
+* @applitools/spec-driver-playwright bumped to 1.9.11
+
+* @applitools/spec-driver-puppeteer bumped to 1.8.11
+
+* @applitools/screenshoter bumped to 3.12.33
+
+* @applitools/nml-client bumped to 1.12.5
+
+* @applitools/ec-client bumped to 1.12.48
+
+
 ## [4.70.2](https://github.com/Applitools-Dev/sdk/compare/js/core@4.70.1...js/core@4.70.2) (2026-09-17)
 
 

package/dist/open-eyes.js

@@ -226,7 +226,7 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
         }
     };
     async function handleBranchFallbackList(account, settings, logger) {
-        var _a, _b;
+        var _a, _b, _c;
         const scm = getScmSettings(account.scmSettings);
         const integrationActive = !settings.ignoreGitBranching && scm.lookupFallbackList;
         // Extract gitBranchName (the actual git branch name)
@@ -264,6 +264,18 @@ function makeOpenEyes({ type: defaultType = 'classic', clients, batch, removeDup
                 logger,
             });
             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.
+            if (((_c = outcome.list) === null || _c === void 0 ? void 0 : _c.length) && settings.latestCommitInfo) {
+                const cherryPicks = await (0, extract_git_info_1.extractCherryPicks)({
+                    headSha: settings.latestCommitInfo.sha,
+                    fallbackBranchNames: outcome.list.map(branch => branch.branchName),
+                    execOptions: { cwd },
+                    logger,
+                });
+                if (cherryPicks === null || cherryPicks === void 0 ? void 0 : cherryPicks.length)
+                    settings.cherryPicks = cherryPicks;
+            }
             if (outcome.status === 'precondition-failure') {
                 reportScmPreconditionFailure({
                     key: scmPreconditionKey(cwd, settings.gitBranchName),

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractBranchLookupFallbackList = exports.getBranchAncestryByLocalBranches = exports.getBranchAncestryByCommits = exports.isISODate = exports.extractBranchingTimestamp = exports.extractBuildIdFromCI = exports.extractCIBranchName = exports.extractGitRepo = exports.extractGitBranch = exports.extractLatestCommitInfo = exports.extractDefaultBranch = exports.gitEnvironmentFindings = exports.checkGitEnvironment = exports.resolveBranchToLocalRef = exports.getPrimaryRemoteName = exports.cacheKey = void 0;
+exports.extractCherryPicks = exports.extractBranchLookupFallbackList = exports.getBranchAncestryByLocalBranches = exports.getBranchAncestryByCommits = exports.isISODate = exports.extractBranchingTimestamp = exports.extractBuildIdFromCI = exports.extractCIBranchName = exports.extractGitRepo = exports.extractGitBranch = exports.extractLatestCommitInfo = exports.extractDefaultBranch = exports.gitEnvironmentFindings = exports.checkGitEnvironment = exports.resolveBranchToLocalRef = exports.getPrimaryRemoteName = exports.cacheKey = void 0;
 const utils = __importStar(require("@applitools/utils"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -1703,3 +1703,131 @@ exports.extractBranchLookupFallbackList = Object.assign(async function (options)
     withDiagnostics: (options) => computeBranchLookupFallbackList(options),
     clearCache: computeBranchLookupFallbackList.clearCache,
 });
+// The server considers at most 50 picks per session.
+const MAX_CHERRY_PICKS = 50;
+const CHERRY_PICK_GIT_CONCURRENCY = 10;
+// Written by `git cherry-pick -x`; a pick of a pick carries one line per hop, the original first.
+const CHERRY_PICK_LINE = /^\(cherry picked from commit ([0-9a-f]{7,64})\)$/m;
+function cherryPickLimit(name, defaultValue) {
+    const value = utils.general.getEnvValue(name, 'number');
+    return Number.isInteger(value) && value >= 0 ? value : defaultValue;
+}
+/** The full sha of `rev`, or `undefined` when it is not in the local history. Throws on a git error. */
+async function resolveCommit(git, rev) {
+    const result = await git(['rev-parse', '--verify', '--quiet', `${rev}^{commit}`]);
+    const found = classifyGitPredicate(result);
+    if (found === 'error')
+        throw new Error(`git rev-parse ${rev} failed`);
+    return found ? result.stdout.trim() : undefined;
+}
+async function resolveFallbackBranch(git, remoteName, name) {
+    for (const ref of [`${remoteName}/${name}`, name]) {
+        if (await resolveCommit(git, ref))
+            return { name, ref };
+    }
+    throw new Error(`fallback branch "${name}" does not resolve to a commit`);
+}
+function parsePickCandidate(record) {
+    var _a;
+    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;
+}
+async function collectPickCandidates(git, branches, headSha, logger) {
+    const maxCommits = cherryPickLimit('CHERRY_PICK_MAX_COMMITS', 1000);
+    const recordsPerBranch = await parallelWithLimit(branches, CHERRY_PICK_GIT_CONCURRENCY, async (branch) => {
+        const range = `${branch.ref}..${headSha}`;
+        // The pick time is when it landed on this branch: the committer date (a pick keeps the original author date).
+        const log = await git(['log', `--max-count=${maxCommits}`, '--format=%H%x1f%cI%x1f%B%x1e', range]);
+        if (log.code !== 0)
+            throw new Error(`git log ${range} failed: ${log.stderr.trim()}`);
+        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}`);
+        return records;
+    });
+    const candidates = new Map();
+    for (const records of recordsPerBranch) {
+        for (const record of records) {
+            const candidate = parsePickCandidate(record);
+            if (candidate && !candidates.has(candidate.pickedSha))
+                candidates.set(candidate.pickedSha, candidate);
+        }
+    }
+    return Array.from(candidates.values());
+}
+function newestCandidates(candidates, logger) {
+    if (candidates.length > MAX_CHERRY_PICKS) {
+        logger.log(`Cherry-pick detection checks only the newest ${MAX_CHERRY_PICKS} of ${candidates.length} picks`);
+    }
+    return [...candidates]
+        .sort((a, b) => epochOrOldest(b.pickedCommitTime) - epochOrOldest(a.pickedCommitTime))
+        .slice(0, MAX_CHERRY_PICKS);
+}
+/** The first fallback branch containing `sha` — the server resolves a sha on several branches the same way. */
+async function findContainingBranch(git, sha, branches) {
+    for (const branch of branches) {
+        const contains = classifyGitPredicate(await git(['merge-base', '--is-ancestor', sha, branch.ref]));
+        if (contains === 'error')
+            throw new Error(`git merge-base --is-ancestor ${sha} ${branch.ref} failed`);
+        if (contains)
+            return branch.name;
+    }
+    return undefined;
+}
+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`);
+        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`);
+        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}`);
+    return {
+        pickedSha: candidate.pickedSha,
+        pickedCommitTime: candidate.pickedCommitTime,
+        originalBranch,
+        originalSha,
+        originalCommitTime,
+    };
+}
+async function detectCherryPicks({ headSha, fallbackBranchNames, execOptions, logger = (0, logger_1.makeLogger)(), }) {
+    const timeout = cherryPickLimit('CHERRY_PICK_GIT_TIMEOUT', 10000);
+    const git = args => executeWithLog((0, shell_quote_1.quote)(['git', ...args]), { execOptions: { ...execOptions, timeout }, logger });
+    try {
+        const remoteName = await (0, exports.getPrimaryRemoteName)({ execOptions, logger });
+        const branches = await parallelWithLimit(fallbackBranchNames, CHERRY_PICK_GIT_CONCURRENCY, name => resolveFallbackBranch(git, remoteName, name));
+        const candidates = await collectPickCandidates(git, branches, headSha, logger);
+        const resolved = await parallelWithLimit(newestCandidates(candidates, logger), CHERRY_PICK_GIT_CONCURRENCY, candidate => resolvePick(git, candidate, branches, logger));
+        const picks = resolved.filter((pick) => Boolean(pick));
+        logger.log('Detected cherry-picks', JSON.stringify(picks));
+        return picks;
+    }
+    catch (err) {
+        // Any git error means nothing is sent: a partial list would look like "no more picks".
+        logger.log(`Cherry-pick detection skipped: ${err instanceof Error ? err.message : err}`);
+        return undefined;
+    }
+}
+/**
+ * `git cherry-pick -x` commits between `headSha` and the fork point with each fallback-list branch, resolved to
+ * the original commit and kept only when a fallback-list branch contains it. Newest first.
+ *
+ * @returns `[]` when there are no picks, `undefined` when detection could not run.
+ */
+exports.extractCherryPicks = utils.general.cachify(detectCherryPicks, args => {
+    var _a;
+    return ({
+        headSha: args[0].headSha,
+        fallbackBranchNames: args[0].fallbackBranchNames.join('\n'),
+        cwd: (_a = args[0].execOptions) === null || _a === void 0 ? void 0 : _a.cwd,
+    });
+});

package/package.json

@@ -1,15 +1,7 @@
 {
   "name": "@applitools/core",
-  "version": "4.70.2",
+  "version": "4.71.0",
   "homepage": "https://applitools.com",
-  "bugs": {
-    "url": "https://github.com/applitools/eyes.sdk.javascript1/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/applitools/eyes.sdk.javascript1.git",
-    "directory": "js/packages/core-base"
-  },
   "license": "SEE LICENSE IN LICENSE",
   "author": {
     "name": "Applitools Team",
@@ -63,19 +55,19 @@
     "test:ios-simulator": "MOCHA_ONLY_TAGS=ios-simulator MOCHA_GROUP=ios-simulator run --top-level mocha ./test/e2e/classic/webview.spec.ts --exit --require ./test/mocha-global-setup.js"
   },
   "dependencies": {
-    "@applitools/core-base": "1.39.1",
+    "@applitools/core-base": "1.40.0",
     "@applitools/dom-capture": "11.8.6",
-    "@applitools/dom-snapshot": "4.18.3",
-    "@applitools/driver": "1.26.10",
-    "@applitools/ec-client": "1.12.47",
+    "@applitools/dom-snapshot": "4.18.4",
+    "@applitools/driver": "1.26.11",
+    "@applitools/ec-client": "1.12.49",
     "@applitools/image": "1.3.3",
     "@applitools/logger": "2.3.1",
-    "@applitools/nml-client": "1.12.4",
+    "@applitools/nml-client": "1.12.6",
     "@applitools/req": "1.11.3",
-    "@applitools/screenshoter": "3.12.32",
+    "@applitools/screenshoter": "3.12.33",
     "@applitools/snippets": "2.9.7",
     "@applitools/socket": "1.3.17",
-    "@applitools/ufg-client": "1.23.4",
+    "@applitools/ufg-client": "1.23.5",
     "@applitools/utils": "1.15.2",
     "abort-controller": "3.0.0",
     "chalk": "4.1.2",
@@ -87,10 +79,10 @@
   },
   "devDependencies": {
     "@applitools/bongo": "^5.10.0",
-    "@applitools/spec-driver-playwright": "^1.9.10",
-    "@applitools/spec-driver-puppeteer": "^1.8.10",
-    "@applitools/spec-driver-selenium": "^1.8.10",
-    "@applitools/spec-driver-webdriver": "^1.6.10",
+    "@applitools/spec-driver-playwright": "^1.9.11",
+    "@applitools/spec-driver-puppeteer": "^1.8.11",
+    "@applitools/spec-driver-selenium": "^1.8.11",
+    "@applitools/spec-driver-webdriver": "^1.6.11",
     "@applitools/test-server": "^1.4.7",
     "@applitools/test-utils": "^1.5.17",
     "@applitools/tunnel-client": "^1.12.4",

package/types/utils/extract-git-info.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import type { ExecOptions } from 'child_process';
 import { type Logger } from '@applitools/logger';
+import type { CherryPick } from '@applitools/core-base';
 type Options = {
     execOptions?: ExecOptions;
     logger: Logger;
@@ -254,4 +255,23 @@ export declare const extractBranchLookupFallbackList: ((options: BranchLookupFal
     withDiagnostics: (options: BranchLookupFallbackListOptions) => Promise<BranchLookupOutcome>;
     clearCache: () => void;
 };
+type CherryPicksOptions = {
+    headSha: string;
+    fallbackBranchNames: string[];
+    execOptions?: ExecOptions;
+    logger?: Logger;
+};
+declare function detectCherryPicks({ headSha, fallbackBranchNames, execOptions, logger, }: CherryPicksOptions): Promise<CherryPick[] | undefined>;
+/**
+ * `git cherry-pick -x` commits between `headSha` and the fork point with each fallback-list branch, resolved to
+ * the original commit and kept only when a fallback-list branch contains it. Newest first.
+ *
+ * @returns `[]` when there are no picks, `undefined` when detection could not run.
+ */
+export declare const extractCherryPicks: typeof detectCherryPicks & {
+    getCachedValues(): Promise<CherryPick[] | undefined>[];
+    setCachedValue(key: any, value: Promise<CherryPick[] | undefined>): void;
+    clearCache(): void;
+    TTL?: number | undefined;
+};
 export {};