@allurereport/core 3.18.0 → 3.19.1

package/dist/store/store.js

@@ -9,16 +9,17 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _DefaultAllureStore_instances, _DefaultAllureStore_testResults, _DefaultAllureStore_environmentDisplayNames, _DefaultAllureStore_environmentNameToId, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_resolutionsConfig, _DefaultAllureStore_resolutionIssues, _DefaultAllureStore_testResultIdsByResolutionIssueId, _DefaultAllureStore_resolutionIssueIdByTestResultId, _DefaultAllureStore_fixtures, _DefaultAllureStore_defaultLabels, _DefaultAllureStore_environment, _DefaultAllureStore_environmentsConfig, _DefaultAllureStore_reportVariables, _DefaultAllureStore_realtimeDispatcher, _DefaultAllureStore_realtimeSubscriber, _DefaultAllureStore_allowedEnvironmentIds, _DefaultAllureStore_retrySubstore, _DefaultAllureStore_testResultIdsByEnvironmentId, _DefaultAllureStore_cachedEnvironmentEntries, _DefaultAllureStore_globalAttachmentIds, _DefaultAllureStore_globalAttachmentIdsByEnv, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalErrorsByEnv, _DefaultAllureStore_processGlobalAttachmentIds, _DefaultAllureStore_processGlobalAttachmentIdsByEnv, _DefaultAllureStore_processGlobalErrors, _DefaultAllureStore_processGlobalErrorsByEnv, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_checkResultsById, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_metrics, _DefaultAllureStore_performance, _DefaultAllureStore_historyPoints, _DefaultAllureStore_environments, _DefaultAllureStore_mergeEnvironmentIdentity, _DefaultAllureStore_environmentIdForLookup, _DefaultAllureStore_addEnvironments, _DefaultAllureStore_environmentIdByName, _DefaultAllureStore_setTestResultEnvironmentId, _DefaultAllureStore_assertAllowedEnvironmentId, _DefaultAllureStore_assertAllowedStoredEnvironment, _DefaultAllureStore_environmentIdByTestResult, _DefaultAllureStore_assignRetryHash, _DefaultAllureStore_classifyResolution, _DefaultAllureStore_associateResolutionIssue, _DefaultAllureStore_removeResolutionIssueAssociation, _DefaultAllureStore_rebuildRetrySubstore, _DefaultAllureStore_resolveGlobalEnvironmentIdentity, _DefaultAllureStore_globalAttachmentId, _DefaultAllureStore_processGlobalAttachmentId, _DefaultAllureStore_indexGlobalError, _DefaultAllureStore_addGlobalError, _DefaultAllureStore_indexGlobalAttachment, _DefaultAllureStore_addGlobalAttachment, _DefaultAllureStore_resetProcessGlobals, _DefaultAllureStore_restoreAttachmentContent, _DefaultAllureStore_relinkRestoredAttachmentSteps, _DefaultAllureStore_retriesByTr, _DefaultAllureStore_historyByTr;
+var _DefaultAllureStore_instances, _DefaultAllureStore_testResults, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_detectFlaky, _DefaultAllureStore_resolutionsConfig, _DefaultAllureStore_resolutionIssues, _DefaultAllureStore_testResultIdsByResolutionIssueId, _DefaultAllureStore_resolutionIssueIdByTestResultId, _DefaultAllureStore_fixtures, _DefaultAllureStore_defaultLabels, _DefaultAllureStore_environment, _DefaultAllureStore_environmentsConfig, _DefaultAllureStore_reportVariables, _DefaultAllureStore_realtimeDispatcher, _DefaultAllureStore_realtimeSubscriber, _DefaultAllureStore_allowedEnvironmentIds, _DefaultAllureStore_retrySubstore, _DefaultAllureStore_testResultIdsByEnvironmentId, _DefaultAllureStore_globalAttachmentIds, _DefaultAllureStore_globalAttachmentIdsByEnv, _DefaultAllureStore_globalErrors, _DefaultAllureStore_globalErrorsByEnv, _DefaultAllureStore_processGlobalAttachmentIds, _DefaultAllureStore_processGlobalAttachmentIdsByEnv, _DefaultAllureStore_processGlobalErrors, _DefaultAllureStore_processGlobalErrorsByEnv, _DefaultAllureStore_globalExitCode, _DefaultAllureStore_checkResultsById, _DefaultAllureStore_qualityGateResults, _DefaultAllureStore_metrics, _DefaultAllureStore_performance, _DefaultAllureStore_historyPoints, _DefaultAllureStore_historyLookup, _DefaultAllureStore_environments, _DefaultAllureStore_mergeEnvironmentIdentity, _DefaultAllureStore_environmentIdForLookup, _DefaultAllureStore_environmentIdByName, _DefaultAllureStore_addEnvironments, _DefaultAllureStore_setTestResultEnvironmentId, _DefaultAllureStore_assertAllowedEnvironmentId, _DefaultAllureStore_assertAllowedStoredEnvironment, _DefaultAllureStore_environmentIdByTestResult, _DefaultAllureStore_assignIdentityHashes, _DefaultAllureStore_classifyResolution, _DefaultAllureStore_associateResolutionIssue, _DefaultAllureStore_removeResolutionIssueAssociation, _DefaultAllureStore_rebuildRetrySubstore, _DefaultAllureStore_rebuildIdentityIndexes, _DefaultAllureStore_rebuildEnvironmentIndexes, _DefaultAllureStore_resolveGlobalEnvironmentIdentity, _DefaultAllureStore_globalAttachmentId, _DefaultAllureStore_processGlobalAttachmentId, _DefaultAllureStore_indexGlobalError, _DefaultAllureStore_addGlobalError, _DefaultAllureStore_indexGlobalAttachment, _DefaultAllureStore_addGlobalAttachment, _DefaultAllureStore_resetProcessGlobals, _DefaultAllureStore_getHistoryLookup, _DefaultAllureStore_historyFor, _DefaultAllureStore_applyHistoryFlags, _DefaultAllureStore_restoreAttachmentContent, _DefaultAllureStore_relinkRestoredAttachmentSteps, _DefaultAllureStore_retriesByTr, _DefaultAllureStore_historyByTr;
 import { extname } from "node:path";
-import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, compareBy, createDictionary, getHistoryIdCandidates, getWorstStatus, normalizeHistoryDataPoint, ordinal, reverse, resolveMetricSamples, selectHistoryTestResults, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
+import { DEFAULT_ENVIRONMENT, DEFAULT_ENVIRONMENT_IDENTITY, calculateEnvironmentHash, calculateParametersHash, calculateRetryHash, calculateTestCaseHash, compareBy, createDictionary, fallbackTestCaseIdLabelName, getWorstStatus, createHistoryTestResultLookup, normalizeHistoryDataPoint, ordinal, reverse, resolveMetricSamples, validateEnvironmentId, validateEnvironmentName, } from "@allurereport/core-api";
 import { md5, } from "@allurereport/plugin-api";
 import { getResolutionByRules, isIgnoredFailure } from "../resolutions.js";
 import { environmentIdentityById, normalizeEnvironmentDescriptorMap, resolveEnvironmentIdentity, resolveStoredEnvironmentIdentity, validateAllowedEnvironmentId, } from "../utils/environment.js";
-import { isFlaky } from "../utils/flaky.js";
+import { createFlakyDetector } from "../utils/flaky.js";
 import { getStatusTransition } from "../utils/new.js";
+import { measurePerfAggregateSync, PERF_METRIC_NAMES } from "../utils/perf.js";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
-import { calculateParametersHash, calculateRetryHash, RetrySubstore } from "./retrySubstore.js";
+import { RetrySubstore } from "./retrySubstore.js";
 const index = (indexMap, key, ...items) => {
     if (key) {
         if (!indexMap.has(key)) {
@@ -57,13 +58,12 @@ export class DefaultAllureStore {
     constructor(params) {
         _DefaultAllureStore_instances.add(this);
         _DefaultAllureStore_testResults.set(this, void 0);
-        _DefaultAllureStore_environmentDisplayNames.set(this, void 0);
-        _DefaultAllureStore_environmentNameToId.set(this, void 0);
         _DefaultAllureStore_attachments.set(this, void 0);
         _DefaultAllureStore_attachmentContents.set(this, void 0);
         _DefaultAllureStore_testCases.set(this, void 0);
         _DefaultAllureStore_metadata.set(this, void 0);
         _DefaultAllureStore_history.set(this, void 0);
+        _DefaultAllureStore_detectFlaky.set(this, void 0);
         _DefaultAllureStore_resolutionsConfig.set(this, void 0);
         _DefaultAllureStore_resolutionIssues.set(this, new Map());
         _DefaultAllureStore_testResultIdsByResolutionIssueId.set(this, new Map());
@@ -78,10 +78,9 @@ export class DefaultAllureStore {
         _DefaultAllureStore_allowedEnvironmentIds.set(this, void 0);
         _DefaultAllureStore_retrySubstore.set(this, void 0);
         _DefaultAllureStore_testResultIdsByEnvironmentId.set(this, new Map());
-        _DefaultAllureStore_cachedEnvironmentEntries.set(this, []);
         this.indexTestResultByTestCase = new Map();
         this.indexTestResultByEnvironmentId = new Map();
-        this.indexTestResultByHistoryId = new Map();
+        this.indexTestResultByRetryHash = new Map();
         this.indexAttachmentByTestResult = new Map();
         this.indexAttachmentByFixture = new Map();
         this.indexFixturesByTestResult = new Map();
@@ -99,8 +98,9 @@ export class DefaultAllureStore {
         _DefaultAllureStore_metrics.set(this, []);
         _DefaultAllureStore_performance.set(this, {});
         _DefaultAllureStore_historyPoints.set(this, []);
+        _DefaultAllureStore_historyLookup.set(this, void 0);
         _DefaultAllureStore_environments.set(this, []);
-        const { history, resolutionsConfig, realtimeDispatcher, realtimeSubscriber, defaultLabels = {}, environment, allowedEnvironments, environmentsConfig = {}, reportVariables = {}, performance = {}, } = params ?? {};
+        const { history, flakyDetection, resolutionsConfig, realtimeDispatcher, realtimeSubscriber, defaultLabels = {}, environment, allowedEnvironments, environmentsConfig = {}, reportVariables = {}, performance = {}, } = params ?? {};
         const errors = [];
         const { normalized: normalizedEnvironmentsConfig, identities, errors: configErrors, } = normalizeEnvironmentDescriptorMap(environmentsConfig, "environmentsConfig");
         errors.push(...configErrors);
@@ -117,14 +117,13 @@ export class DefaultAllureStore {
             environments.push(resolvedEnvironment);
         }
         __classPrivateFieldSet(this, _DefaultAllureStore_testResults, new Map(), "f");
-        __classPrivateFieldSet(this, _DefaultAllureStore_environmentDisplayNames, new Map(), "f");
-        __classPrivateFieldSet(this, _DefaultAllureStore_environmentNameToId, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_attachments, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_attachmentContents, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_testCases, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_metadata, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_fixtures, new Map(), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_history, history, "f");
+        __classPrivateFieldSet(this, _DefaultAllureStore_detectFlaky, createFlakyDetector(flakyDetection), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_resolutionsConfig, resolutionsConfig, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_performance, performance, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_realtimeDispatcher, realtimeDispatcher, "f");
@@ -135,7 +134,6 @@ export class DefaultAllureStore {
         __classPrivateFieldSet(this, _DefaultAllureStore_reportVariables, reportVariables, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_allowedEnvironmentIds, new Set(allowedEnvironments ?? []), "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_retrySubstore, new RetrySubstore(), "f");
-        __classPrivateFieldSet(this, _DefaultAllureStore_cachedEnvironmentEntries, Object.entries(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")), "f");
         __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, environments);
         __classPrivateFieldGet(this, _DefaultAllureStore_realtimeSubscriber, "f")?.onQualityGateResults((results) => {
             __classPrivateFieldGet(this, _DefaultAllureStore_qualityGateResults, "f").push(...results);
@@ -215,12 +213,22 @@ export class DefaultAllureStore {
         if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
             return [];
         }
+        __classPrivateFieldSet(this, _DefaultAllureStore_historyLookup, undefined, "f");
         __classPrivateFieldSet(this, _DefaultAllureStore_historyPoints, ((await __classPrivateFieldGet(this, _DefaultAllureStore_history, "f").readHistory()) ?? [])
             .filter((historyPoint) => typeof historyPoint === "object" && historyPoint !== null)
             .map(normalizeHistoryDataPoint), "f");
         __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").sort(compareBy("timestamp", reverse(ordinal())));
         return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f");
     }
+    updateHistoryFlags(testResults = __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values()) {
+        if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
+            return;
+        }
+        const lookup = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_getHistoryLookup).call(this);
+        for (const result of testResults) {
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_applyHistoryFlags).call(this, result, __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_historyFor).call(this, result, lookup));
+        }
+    }
     async appendHistory(history) {
         if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
             return;
@@ -341,53 +349,71 @@ export class DefaultAllureStore {
     }
     async visitTestResult(raw, context) {
         const attachmentLinks = [];
-        const testResult = testResultRawToState({
+        const testResult = measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultConvert, () => testResultRawToState({
             testCases: __classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f"),
             attachments: __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f"),
             visitAttachmentLink: (link) => attachmentLinks.push(link),
-        }, raw, context);
-        const defaultLabelsNames = Object.keys(__classPrivateFieldGet(this, _DefaultAllureStore_defaultLabels, "f"));
-        if (defaultLabelsNames.length) {
-            defaultLabelsNames.forEach((labelName) => {
-                if (!testResult.labels.find((label) => label.name === labelName)) {
-                    const defaultLabelValue = __classPrivateFieldGet(this, _DefaultAllureStore_defaultLabels, "f")[labelName];
-                    [].concat(defaultLabelValue).forEach((labelValue) => {
-                        testResult.labels.push({
-                            name: labelName,
-                            value: labelValue,
+        }, raw, context));
+        measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultDefaultLabels, () => {
+            const defaultLabelsNames = Object.keys(__classPrivateFieldGet(this, _DefaultAllureStore_defaultLabels, "f"));
+            if (defaultLabelsNames.length) {
+                defaultLabelsNames.forEach((labelName) => {
+                    if (!testResult.labels.find((label) => label.name === labelName)) {
+                        const defaultLabelValue = __classPrivateFieldGet(this, _DefaultAllureStore_defaultLabels, "f")[labelName];
+                        [].concat(defaultLabelValue).forEach((labelValue) => {
+                            testResult.labels.push({
+                                name: labelName,
+                                value: labelValue,
+                            });
                         });
-                    });
-                }
+                    }
+                });
+            }
+        });
+        const environmentIdentity = measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultEnvironment, () => {
+            const environmentMatcherLabels = testResult.labels.filter(({ name }) => name !== "ALLURE_ID" && name !== fallbackTestCaseIdLabelName);
+            const environmentMatch = __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f")
+                ? undefined
+                : Object.entries(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f")).find(([, { matcher }]) => matcher({ labels: environmentMatcherLabels }));
+            const namedEnvironmentIdentity = __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f") ??
+                (environmentMatch
+                    ? {
+                        id: environmentMatch[0],
+                        name: environmentMatch[1].name ?? environmentMatch[0],
+                    }
+                    : undefined);
+            const identity = namedEnvironmentIdentity ?? DEFAULT_ENVIRONMENT_IDENTITY;
+            testResult.environment = identity.id;
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, [identity]);
+            return identity;
+        });
+        measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultRetry, () => {
+            testResult.environmentHash = calculateEnvironmentHash(environmentIdentity.id);
+            testResult.retryHash = calculateRetryHash({
+                testCaseHash: testResult.testCaseHash,
+                parametersHash: testResult.parametersHash,
+                environmentHash: testResult.environmentHash,
+            });
+        });
+        if (__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
+            measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultHistory, () => {
+                const lookup = createHistoryTestResultLookup([testResult]);
+                __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_applyHistoryFlags).call(this, testResult, __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_historyFor).call(this, testResult, lookup));
             });
         }
-        const environmentIdentity = __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f") ??
-            (() => {
-                const match = __classPrivateFieldGet(this, _DefaultAllureStore_cachedEnvironmentEntries, "f").find(([, { matcher }]) => matcher({ labels: testResult.labels }));
-                if (!match) {
-                    return DEFAULT_ENVIRONMENT_IDENTITY;
-                }
-                const [id, descriptor] = match;
-                return { id, name: descriptor.name ?? id };
-            })();
-        testResult.environment = environmentIdentity.name;
-        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, [environmentIdentity]);
-        const parametersHash = typeof raw.parametersHash === "string" && raw.parametersHash.length > 0
-            ? raw.parametersHash
-            : calculateParametersHash(testResult.parameters);
-        testResult.retryHash = calculateRetryHash(testResult.testCase?.id, parametersHash, environmentIdentity.id);
-        const trHistory = __classPrivateFieldGet(this, _DefaultAllureStore_history, "f") ? await this.historyByTr(testResult) : undefined;
-        if (trHistory !== undefined) {
-            testResult.transition = getStatusTransition(testResult, trHistory);
-            testResult.flaky = isFlaky(testResult, trHistory);
-        }
-        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_classifyResolution).call(this, testResult);
-        __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
-        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, environmentIdentity.id);
-        __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").recordIngestOrder(testResult.id);
-        __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").upsert(testResult);
-        index(this.indexTestResultByTestCase, testResult.testCase?.id, testResult);
-        index(this.indexTestResultByHistoryId, testResult.historyId, testResult);
-        index(this.indexAttachmentByTestResult, testResult.id, ...attachmentLinks);
+        measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultResolution, () => {
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_classifyResolution).call(this, testResult);
+        });
+        measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitTestResultIndexes, () => {
+            __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
+            __classPrivateFieldSet(this, _DefaultAllureStore_historyLookup, undefined, "f");
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, environmentIdentity.id);
+            __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").recordIngestOrder(testResult.id);
+            __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").upsert(testResult);
+            index(this.indexTestResultByTestCase, testResult.testCase?.id, testResult);
+            index(this.indexTestResultByRetryHash, testResult.retryHash, testResult);
+            index(this.indexAttachmentByTestResult, testResult.id, ...attachmentLinks);
+        });
         __classPrivateFieldGet(this, _DefaultAllureStore_realtimeDispatcher, "f")?.sendTestResult(testResult.id);
     }
     async visitTestFixtureResult(result, context) {
@@ -404,28 +430,31 @@ export class DefaultAllureStore {
         __classPrivateFieldGet(this, _DefaultAllureStore_realtimeDispatcher, "f")?.sendTestFixtureResult(testFixtureResult.id);
     }
     async visitAttachmentFile(resultFile) {
-        const originalFileName = resultFile.getOriginalFileName();
-        const id = md5(originalFileName);
-        __classPrivateFieldGet(this, _DefaultAllureStore_attachmentContents, "f").set(id, resultFile);
-        const maybeLink = __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").get(id);
-        if (maybeLink) {
-            const link = maybeLink;
-            link.missed = false;
-            link.ext = link.ext === undefined || link.ext === "" ? resultFile.getExtension() : link.ext;
-            link.contentType = link.contentType ?? resultFile.getContentType();
-            link.contentLength = resultFile.getContentLength();
-        }
-        else {
-            __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").set(id, {
-                used: false,
-                missed: false,
-                id,
-                originalFileName,
-                ext: resultFile.getExtension(),
-                contentType: resultFile.getContentType(),
-                contentLength: resultFile.getContentLength(),
-            });
-        }
+        const { id, originalFileName } = measurePerfAggregateSync(PERF_METRIC_NAMES.storeVisitAttachmentFileMetadata, () => {
+            const originalFileName = resultFile.getOriginalFileName();
+            const id = md5(originalFileName);
+            __classPrivateFieldGet(this, _DefaultAllureStore_attachmentContents, "f").set(id, resultFile);
+            const maybeLink = __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").get(id);
+            if (maybeLink) {
+                const link = maybeLink;
+                link.missed = false;
+                link.ext = link.ext === undefined || link.ext === "" ? resultFile.getExtension() : link.ext;
+                link.contentType = link.contentType ?? resultFile.getContentType();
+                link.contentLength = resultFile.getContentLength();
+            }
+            else {
+                __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").set(id, {
+                    used: false,
+                    missed: false,
+                    id,
+                    originalFileName,
+                    ext: resultFile.getExtension(),
+                    contentType: resultFile.getContentType(),
+                    contentLength: resultFile.getContentLength(),
+                });
+            }
+            return { id, originalFileName };
+        });
         for (const globalAttachmentId of [...__classPrivateFieldGet(this, _DefaultAllureStore_globalAttachmentIds, "f"), ...__classPrivateFieldGet(this, _DefaultAllureStore_processGlobalAttachmentIds, "f")]) {
             const globalAttachment = __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").get(globalAttachmentId);
             if (!globalAttachment || globalAttachment.originalFileName !== originalFileName) {
@@ -536,14 +565,7 @@ export class DefaultAllureStore {
         return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").reduce((result, dp) => {
             const filteredTestResults = [];
             for (const tr of Object.values(dp.testResults ?? {})) {
-                const storedEnvironmentKey = typeof tr.environment === "string" ? tr.environment : undefined;
-                const trEnvId = (storedEnvironmentKey ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, storedEnvironmentKey) : undefined) ??
-                    resolveStoredEnvironmentIdentity({
-                        environment: tr.environment,
-                        labels: tr.labels ?? [],
-                    }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
-                        forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
-                    })?.id;
+                const trEnvId = tr.environment ?? DEFAULT_ENVIRONMENT;
                 if (trEnvId === normalizedEnvironmentId) {
                     filteredTestResults.push(tr);
                 }
@@ -554,7 +576,7 @@ export class DefaultAllureStore {
                 testResults: hasNoEnvironmentTestResults
                     ? {}
                     : filteredTestResults.reduce((acc, tr) => {
-                        acc[tr.historyId] = tr;
+                        acc[tr.retryHash] = tr;
                         return acc;
                     }, {}),
                 knownTestCaseIds: hasNoEnvironmentTestResults ? [] : filteredTestResults.map((tr) => tr.id),
@@ -589,7 +611,7 @@ export class DefaultAllureStore {
         if (allHistoryDps.length === 0) {
             return Array.from(__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values());
         }
-        const historicalIds = new Set(allHistoryDps.flatMap((dp) => Object.keys(dp.testResults ?? {})));
+        const lookup = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_getHistoryLookup).call(this);
         const newTrs = [];
         for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
             if (tr.isRetry) {
@@ -598,8 +620,7 @@ export class DefaultAllureStore {
             if (typeof filter === "function" && !filter(tr)) {
                 continue;
             }
-            const historyIdCandidates = getHistoryIdCandidates(tr);
-            if (historyIdCandidates.length === 0 || historyIdCandidates.every((historyId) => !historicalIds.has(historyId))) {
+            if (!allHistoryDps.some((point) => lookup(point, tr))) {
                 newTrs.push(tr);
             }
         }
@@ -793,26 +814,29 @@ export class DefaultAllureStore {
         return options.includeRetries ? [...trs] : trs.filter((tr) => !tr.isRetry);
     }
     async allTestEnvGroups() {
-        const trByTestCaseId = {};
+        const trByEnvironmentNeutralRetryHash = {};
         for (const [, tr] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
-            const testCaseId = tr?.testCase?.id;
-            if (!testCaseId) {
+            const environmentNeutralRetryHash = calculateRetryHash({
+                testCaseHash: tr?.testCaseHash,
+                parametersHash: tr?.parametersHash,
+            });
+            if (!environmentNeutralRetryHash) {
                 continue;
             }
-            if (trByTestCaseId[testCaseId]) {
-                trByTestCaseId[testCaseId].push(tr);
+            if (trByEnvironmentNeutralRetryHash[environmentNeutralRetryHash]) {
+                trByEnvironmentNeutralRetryHash[environmentNeutralRetryHash].push(tr);
             }
             else {
-                trByTestCaseId[testCaseId] = [tr];
+                trByEnvironmentNeutralRetryHash[environmentNeutralRetryHash] = [tr];
             }
         }
-        return Object.entries(trByTestCaseId).reduce((acc, [testCaseId, trs]) => {
+        return Object.entries(trByEnvironmentNeutralRetryHash).reduce((acc, [environmentNeutralRetryHash, trs]) => {
             if (trs.length === 0) {
                 return acc;
             }
             const { fullName, name } = trs[0];
             const envGroup = {
-                id: testCaseId,
+                id: environmentNeutralRetryHash,
                 fullName,
                 name,
                 status: getWorstStatus(trs.map(({ status }) => status)) ?? "passed",
@@ -867,11 +891,12 @@ export class DefaultAllureStore {
             fixtures: mapToObject(__classPrivateFieldGet(this, _DefaultAllureStore_fixtures, "f")),
             environments: __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f"),
             reportVariables: __classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f"),
+            metadata: mapToObject(__classPrivateFieldGet(this, _DefaultAllureStore_metadata, "f")),
             globalAttachmentIds: [...__classPrivateFieldGet(this, _DefaultAllureStore_globalAttachmentIds, "f"), ...__classPrivateFieldGet(this, _DefaultAllureStore_processGlobalAttachmentIds, "f")],
             globalErrors: [...__classPrivateFieldGet(this, _DefaultAllureStore_globalErrors, "f"), ...__classPrivateFieldGet(this, _DefaultAllureStore_processGlobalErrors, "f")],
             checkResults: mapToObject(__classPrivateFieldGet(this, _DefaultAllureStore_checkResultsById, "f")),
             indexAttachmentByTestResult: {},
-            indexTestResultByHistoryId: {},
+            indexTestResultByRetryHash: {},
             indexTestResultByTestCase: {},
             indexTestResultByResolutionIssue: {},
             indexAttachmentByFixture: {},
@@ -887,8 +912,8 @@ export class DefaultAllureStore {
         this.indexAttachmentByTestResult.forEach((links, trId) => {
             storeDump.indexAttachmentByTestResult[trId] = links.map((l) => l.id);
         });
-        this.indexTestResultByHistoryId.forEach((trs, historyId) => {
-            storeDump.indexTestResultByHistoryId[historyId] = trs.map((tr) => tr.id);
+        this.indexTestResultByRetryHash.forEach((trs, retryHash) => {
+            storeDump.indexTestResultByRetryHash[retryHash] = trs.map((tr) => tr.id);
         });
         this.indexTestResultByTestCase.forEach((trs, tcId) => {
             storeDump.indexTestResultByTestCase[tcId] = trs.map((tr) => tr.id);
@@ -902,22 +927,15 @@ export class DefaultAllureStore {
         return storeDump;
     }
     async restoreState(stateDump, attachmentsContents = {}) {
-        const { testResults, attachments, testCases, fixtures, reportVariables, environments, globalAttachmentIds = [], globalErrors = [], checkResults, indexAttachmentByTestResult = {}, indexTestResultByHistoryId = {}, indexTestResultByTestCase = {}, indexTestResultByResolutionIssue = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, resolutionIssues = {}, qualityGateResults = [], metrics = [], testResultIdsIngestOrder = [], } = stateDump;
-        const storedEnvironmentAliases = environments.flatMap((environmentValue) => {
-            if (typeof environmentValue === "string") {
-                return [{ id: environmentValue, name: environmentValue }];
-            }
-            const idValidation = validateEnvironmentId(environmentValue.id);
-            if (!idValidation.valid) {
-                return [];
-            }
-            return [
-                {
-                    id: idValidation.normalized,
-                    name: environmentValue.name ?? idValidation.normalized,
-                },
-            ];
-        });
+        __classPrivateFieldSet(this, _DefaultAllureStore_historyLookup, undefined, "f");
+        const { testResults, attachments, testCases, fixtures, reportVariables, metadata = {}, environments, globalAttachmentIds = [], globalErrors = [], checkResults, indexAttachmentByTestResult = {}, indexAttachmentByFixture = {}, indexFixturesByTestResult = {}, qualityGateResults = [], metrics = [], testResultIdsIngestOrder = [], } = stateDump;
+        __classPrivateFieldGet(this, _DefaultAllureStore_resolutionIssues, "f").clear();
+        __classPrivateFieldGet(this, _DefaultAllureStore_testResultIdsByResolutionIssueId, "f").clear();
+        __classPrivateFieldGet(this, _DefaultAllureStore_resolutionIssueIdByTestResultId, "f").clear();
+        for (const testResult of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values()) {
+            delete testResult.resolution;
+            delete testResult.resolutionComment;
+        }
         const normalizedEnvironments = environments
             .map((environmentValue) => {
             if (typeof environmentValue === "string") {
@@ -945,41 +963,54 @@ export class DefaultAllureStore {
                 fallbackToMatch: false,
             });
         });
-        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, [...storedEnvironmentAliases, ...normalizedEnvironments]);
-        const envNameToId = new Map();
-        for (const { id, name } of __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f")) {
-            envNameToId.set(name, id);
-            envNameToId.set(id, id);
-        }
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_addEnvironments).call(this, normalizedEnvironments);
+        Object.values(testCases).forEach((testCase) => {
+            const testCaseHash = calculateTestCaseHash(testCase.externalId, testCase.fullName);
+            if (!testCaseHash) {
+                return;
+            }
+            const existingTestCase = __classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f").get(testCaseHash);
+            if (!existingTestCase) {
+                __classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f").set(testCaseHash, {
+                    ...testCase,
+                    id: testCaseHash,
+                    allureId: testCase.allureId?.trim() || undefined,
+                });
+            }
+            else if (!existingTestCase.allureId?.trim()) {
+                existingTestCase.allureId = testCase.allureId?.trim() || undefined;
+            }
+        });
         Object.values(testResults).forEach((testResult) => {
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_removeResolutionIssueAssociation).call(this, testResult.id);
+            delete testResult.resolution;
+            delete testResult.resolutionComment;
             __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
-            const storedEnvKey = typeof testResult.environment === "string" ? testResult.environment : undefined;
-            const envId = (storedEnvKey ? envNameToId.get(storedEnvKey) : undefined) ?? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult);
+            const envId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult);
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assertAllowedEnvironmentId).call(this, envId, `restored testResults[${JSON.stringify(testResult.id)}]`);
-            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, envId);
-            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assignRetryHash).call(this, testResult, { environmentId: envId });
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assignIdentityHashes).call(this, testResult, { environmentId: envId });
+            if (!testResult.testCaseHash) {
+                testResult.testCase = undefined;
+            }
+            else if (testResult.testCase) {
+                const restoredTestCase = __classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f").get(testResult.testCaseHash);
+                if (restoredTestCase) {
+                    if (!restoredTestCase.allureId?.trim()) {
+                        restoredTestCase.allureId = testResult.testCase.allureId?.trim() || undefined;
+                    }
+                    testResult.testCase = restoredTestCase;
+                }
+                else {
+                    testResult.testCase.id = testResult.testCaseHash;
+                    testResult.testCase.allureId = testResult.testCase.allureId?.trim() || undefined;
+                    __classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f").set(testResult.testCaseHash, testResult.testCase);
+                }
+            }
         });
         __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").restoreIngestOrder(testResultIdsIngestOrder, (id) => __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").has(id));
-        this.indexTestResultByEnvironmentId.forEach((trs, envId) => {
-            __classPrivateFieldGet(this, _DefaultAllureStore_testResultIdsByEnvironmentId, "f").set(envId, new Set(trs.map((tr) => tr.id)));
-        });
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_checkResultsById, "f"), checkResults);
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f"), attachments);
-        updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_testCases, "f"), testCases);
         updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_fixtures, "f"), fixtures);
-        updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_resolutionIssues, "f"), resolutionIssues);
-        Object.entries(indexTestResultByResolutionIssue).forEach(([resolutionIssueId, testResultIds]) => {
-            const resolutionIssue = __classPrivateFieldGet(this, _DefaultAllureStore_resolutionIssues, "f").get(resolutionIssueId);
-            if (!resolutionIssue) {
-                return;
-            }
-            testResultIds.forEach((testResultId) => {
-                if (__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").has(testResultId)) {
-                    __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_associateResolutionIssue).call(this, resolutionIssue, testResultId);
-                }
-            });
-        });
         Object.entries(attachmentsContents).forEach(([id, content]) => {
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_restoreAttachmentContent).call(this, id, content);
         });
@@ -1008,6 +1039,7 @@ export class DefaultAllureStore {
             __classPrivateFieldGet(this, _DefaultAllureStore_globalErrors, "f").push(__classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_indexGlobalError).call(this, error));
         });
         Object.assign(__classPrivateFieldGet(this, _DefaultAllureStore_reportVariables, "f"), reportVariables);
+        updateMapWithRecord(__classPrivateFieldGet(this, _DefaultAllureStore_metadata, "f"), metadata);
         Object.entries(indexAttachmentByTestResult).forEach(([trId, links]) => {
             const attachmentsLinks = links.map((id) => __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").get(id)).filter(Boolean);
             if (attachmentsLinks.length === 0) {
@@ -1020,30 +1052,6 @@ export class DefaultAllureStore {
             }
             existingLinks.push(...attachmentsLinks);
         });
-        Object.entries(indexTestResultByHistoryId).forEach(([historyId, trIds]) => {
-            const trs = trIds.map((id) => __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(id)).filter(Boolean);
-            if (trs.length === 0) {
-                return;
-            }
-            const existingTrs = this.indexTestResultByHistoryId.get(historyId);
-            if (!existingTrs) {
-                this.indexTestResultByHistoryId.set(historyId, trs);
-                return;
-            }
-            existingTrs.push(...trs);
-        });
-        Object.entries(indexTestResultByTestCase).forEach(([tcId, trIds]) => {
-            const trs = trIds.map((id) => __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").get(id)).filter(Boolean);
-            if (trs.length === 0) {
-                return;
-            }
-            const existingTrs = this.indexTestResultByTestCase.get(tcId);
-            if (!existingTrs) {
-                this.indexTestResultByTestCase.set(tcId, trs);
-                return;
-            }
-            existingTrs.push(...trs);
-        });
         Object.entries(indexAttachmentByFixture).forEach(([fxId, attachmentIds]) => {
             const attachmentsLinks = attachmentIds.map((id) => __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").get(id)).filter(Boolean);
             if (attachmentsLinks.length === 0) {
@@ -1068,6 +1076,8 @@ export class DefaultAllureStore {
             }
             existingFixtures.push(...fxs);
         });
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_rebuildIdentityIndexes).call(this);
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_rebuildEnvironmentIndexes).call(this);
         __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_rebuildRetrySubstore).call(this);
         for (const testResult of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values()) {
             __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_classifyResolution).call(this, testResult);
@@ -1084,7 +1094,7 @@ export class DefaultAllureStore {
         __classPrivateFieldGet(this, _DefaultAllureStore_metrics, "f").push(...metrics);
     }
 }
-_DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environmentDisplayNames = new WeakMap(), _DefaultAllureStore_environmentNameToId = new WeakMap(), _DefaultAllureStore_attachments = new WeakMap(), _DefaultAllureStore_attachmentContents = new WeakMap(), _DefaultAllureStore_testCases = new WeakMap(), _DefaultAllureStore_metadata = new WeakMap(), _DefaultAllureStore_history = new WeakMap(), _DefaultAllureStore_resolutionsConfig = new WeakMap(), _DefaultAllureStore_resolutionIssues = new WeakMap(), _DefaultAllureStore_testResultIdsByResolutionIssueId = new WeakMap(), _DefaultAllureStore_resolutionIssueIdByTestResultId = new WeakMap(), _DefaultAllureStore_fixtures = new WeakMap(), _DefaultAllureStore_defaultLabels = new WeakMap(), _DefaultAllureStore_environment = new WeakMap(), _DefaultAllureStore_environmentsConfig = new WeakMap(), _DefaultAllureStore_reportVariables = new WeakMap(), _DefaultAllureStore_realtimeDispatcher = new WeakMap(), _DefaultAllureStore_realtimeSubscriber = new WeakMap(), _DefaultAllureStore_allowedEnvironmentIds = new WeakMap(), _DefaultAllureStore_retrySubstore = new WeakMap(), _DefaultAllureStore_testResultIdsByEnvironmentId = new WeakMap(), _DefaultAllureStore_cachedEnvironmentEntries = new WeakMap(), _DefaultAllureStore_globalAttachmentIds = new WeakMap(), _DefaultAllureStore_globalAttachmentIdsByEnv = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalErrorsByEnv = new WeakMap(), _DefaultAllureStore_processGlobalAttachmentIds = new WeakMap(), _DefaultAllureStore_processGlobalAttachmentIdsByEnv = new WeakMap(), _DefaultAllureStore_processGlobalErrors = new WeakMap(), _DefaultAllureStore_processGlobalErrorsByEnv = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_checkResultsById = new WeakMap(), _DefaultAllureStore_qualityGateResults = new WeakMap(), _DefaultAllureStore_metrics = new WeakMap(), _DefaultAllureStore_performance = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_mergeEnvironmentIdentity = function _DefaultAllureStore_mergeEnvironmentIdentity(existingEnvironment, incomingEnvironment) {
+_DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_attachments = new WeakMap(), _DefaultAllureStore_attachmentContents = new WeakMap(), _DefaultAllureStore_testCases = new WeakMap(), _DefaultAllureStore_metadata = new WeakMap(), _DefaultAllureStore_history = new WeakMap(), _DefaultAllureStore_detectFlaky = new WeakMap(), _DefaultAllureStore_resolutionsConfig = new WeakMap(), _DefaultAllureStore_resolutionIssues = new WeakMap(), _DefaultAllureStore_testResultIdsByResolutionIssueId = new WeakMap(), _DefaultAllureStore_resolutionIssueIdByTestResultId = new WeakMap(), _DefaultAllureStore_fixtures = new WeakMap(), _DefaultAllureStore_defaultLabels = new WeakMap(), _DefaultAllureStore_environment = new WeakMap(), _DefaultAllureStore_environmentsConfig = new WeakMap(), _DefaultAllureStore_reportVariables = new WeakMap(), _DefaultAllureStore_realtimeDispatcher = new WeakMap(), _DefaultAllureStore_realtimeSubscriber = new WeakMap(), _DefaultAllureStore_allowedEnvironmentIds = new WeakMap(), _DefaultAllureStore_retrySubstore = new WeakMap(), _DefaultAllureStore_testResultIdsByEnvironmentId = new WeakMap(), _DefaultAllureStore_globalAttachmentIds = new WeakMap(), _DefaultAllureStore_globalAttachmentIdsByEnv = new WeakMap(), _DefaultAllureStore_globalErrors = new WeakMap(), _DefaultAllureStore_globalErrorsByEnv = new WeakMap(), _DefaultAllureStore_processGlobalAttachmentIds = new WeakMap(), _DefaultAllureStore_processGlobalAttachmentIdsByEnv = new WeakMap(), _DefaultAllureStore_processGlobalErrors = new WeakMap(), _DefaultAllureStore_processGlobalErrorsByEnv = new WeakMap(), _DefaultAllureStore_globalExitCode = new WeakMap(), _DefaultAllureStore_checkResultsById = new WeakMap(), _DefaultAllureStore_qualityGateResults = new WeakMap(), _DefaultAllureStore_metrics = new WeakMap(), _DefaultAllureStore_performance = new WeakMap(), _DefaultAllureStore_historyPoints = new WeakMap(), _DefaultAllureStore_historyLookup = new WeakMap(), _DefaultAllureStore_environments = new WeakMap(), _DefaultAllureStore_instances = new WeakSet(), _DefaultAllureStore_mergeEnvironmentIdentity = function _DefaultAllureStore_mergeEnvironmentIdentity(existingEnvironment, incomingEnvironment) {
     const configuredEnvironment = environmentIdentityById(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), incomingEnvironment.id);
     if (configuredEnvironment) {
         return configuredEnvironment;
@@ -1110,12 +1120,12 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
         name: incomingEnvironment.id,
     };
 }, _DefaultAllureStore_environmentIdForLookup = function _DefaultAllureStore_environmentIdForLookup(environmentKey) {
-    const aliasedEnvironmentId = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, environmentKey);
-    if (aliasedEnvironmentId) {
-        return aliasedEnvironmentId;
-    }
     const environmentIdValidation = validateEnvironmentId(environmentKey);
     return environmentIdValidation.valid ? environmentIdValidation.normalized : undefined;
+}, _DefaultAllureStore_environmentIdByName = function _DefaultAllureStore_environmentIdByName(environmentName) {
+    return (__classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").find(({ id }) => id === environmentName)?.id ??
+        __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").find(({ name }) => name === environmentName)?.id ??
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdForLookup).call(this, environmentName));
 }, _DefaultAllureStore_addEnvironments = function _DefaultAllureStore_addEnvironments(envs) {
     if (__classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").length === 0) {
         __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").push(DEFAULT_ENVIRONMENT_IDENTITY);
@@ -1125,19 +1135,6 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
         nextById.set(environment.id, __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_mergeEnvironmentIdentity).call(this, nextById.get(environment.id), environment));
     });
     __classPrivateFieldSet(this, _DefaultAllureStore_environments, Array.from(nextById.values()), "f");
-    __classPrivateFieldGet(this, _DefaultAllureStore_environmentNameToId, "f").clear();
-    __classPrivateFieldGet(this, _DefaultAllureStore_environments, "f").forEach(({ id, name }) => {
-        __classPrivateFieldGet(this, _DefaultAllureStore_environmentNameToId, "f").set(name, id);
-    });
-    envs.forEach(({ id, name }) => {
-        __classPrivateFieldGet(this, _DefaultAllureStore_environmentDisplayNames, "f").set(name, id);
-    });
-}, _DefaultAllureStore_environmentIdByName = function _DefaultAllureStore_environmentIdByName(environmentName) {
-    const canonicalId = __classPrivateFieldGet(this, _DefaultAllureStore_environmentNameToId, "f").get(environmentName);
-    if (canonicalId) {
-        return canonicalId;
-    }
-    return __classPrivateFieldGet(this, _DefaultAllureStore_environmentDisplayNames, "f").get(environmentName);
 }, _DefaultAllureStore_setTestResultEnvironmentId = function _DefaultAllureStore_setTestResultEnvironmentId(testResult, environmentId) {
     if (!environmentId) {
         return;
@@ -1174,18 +1171,21 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     }
     __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assertAllowedEnvironmentId).call(this, environmentKey, sourcePath);
 }, _DefaultAllureStore_environmentIdByTestResult = function _DefaultAllureStore_environmentIdByTestResult(testResult) {
-    const storedEnvironmentKey = typeof testResult.environment === "string" ? testResult.environment : undefined;
-    return ((storedEnvironmentKey ? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByName).call(this, storedEnvironmentKey) : undefined) ??
-        resolveStoredEnvironmentIdentity({
-            environment: testResult.environment,
-            labels: testResult.labels,
-        }, __classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), {
-            forcedEnvironment: __classPrivateFieldGet(this, _DefaultAllureStore_environment, "f"),
-        })?.id);
-}, _DefaultAllureStore_assignRetryHash = function _DefaultAllureStore_assignRetryHash(testResult, options) {
+    const environment = typeof testResult.environment === "string" ? testResult.environment : undefined;
+    const validation = environment === undefined ? undefined : validateEnvironmentId(environment);
+    return validation?.valid ? validation.normalized : undefined;
+}, _DefaultAllureStore_assignIdentityHashes = function _DefaultAllureStore_assignIdentityHashes(testResult, options) {
     const environmentId = options?.environmentId ?? __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult);
-    const parametersHash = options?.parametersHash ?? calculateParametersHash(testResult.parameters);
-    testResult.retryHash = calculateRetryHash(testResult.testCase?.id, parametersHash, environmentId);
+    const testCaseHash = calculateTestCaseHash(testResult.testCase?.externalId, testResult.fullName);
+    const parametersHash = calculateParametersHash(testResult.parameters);
+    const environmentHash = calculateEnvironmentHash(environmentId && environmentId !== DEFAULT_ENVIRONMENT ? environmentId : undefined);
+    testResult.testCaseHash = testCaseHash;
+    testResult.parametersHash = parametersHash;
+    testResult.environmentHash = environmentHash;
+    testResult.retryHash = calculateRetryHash({ testCaseHash, parametersHash, environmentHash });
+    if (testResult.testCase && testCaseHash) {
+        testResult.testCase.id = testCaseHash;
+    }
 }, _DefaultAllureStore_classifyResolution = function _DefaultAllureStore_classifyResolution(testResult) {
     const rule = getResolutionByRules(testResult, __classPrivateFieldGet(this, _DefaultAllureStore_resolutionsConfig, "f"));
     if (!rule?.resolution) {
@@ -1221,10 +1221,23 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").reset();
     for (const [, testResult] of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f")) {
         if (!testResult.retryHash) {
-            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assignRetryHash).call(this, testResult);
+            __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_assignIdentityHashes).call(this, testResult);
         }
         __classPrivateFieldGet(this, _DefaultAllureStore_retrySubstore, "f").upsert(testResult);
     }
+}, _DefaultAllureStore_rebuildIdentityIndexes = function _DefaultAllureStore_rebuildIdentityIndexes() {
+    this.indexTestResultByTestCase.clear();
+    this.indexTestResultByRetryHash.clear();
+    for (const testResult of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values()) {
+        index(this.indexTestResultByTestCase, testResult.testCase?.id, testResult);
+        index(this.indexTestResultByRetryHash, testResult.retryHash, testResult);
+    }
+}, _DefaultAllureStore_rebuildEnvironmentIndexes = function _DefaultAllureStore_rebuildEnvironmentIndexes() {
+    __classPrivateFieldGet(this, _DefaultAllureStore_testResultIdsByEnvironmentId, "f").clear();
+    this.indexTestResultByEnvironmentId.clear();
+    for (const testResult of __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values()) {
+        __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_setTestResultEnvironmentId).call(this, testResult, __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_environmentIdByTestResult).call(this, testResult));
+    }
 }, _DefaultAllureStore_resolveGlobalEnvironmentIdentity = function _DefaultAllureStore_resolveGlobalEnvironmentIdentity(environment) {
     if (environment !== undefined) {
         const resolvedEnvironment = resolveStoredEnvironmentIdentity({
@@ -1278,6 +1291,16 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     __classPrivateFieldGet(this, _DefaultAllureStore_processGlobalAttachmentIdsByEnv, "f").clear();
     __classPrivateFieldGet(this, _DefaultAllureStore_processGlobalErrors, "f").length = 0;
     __classPrivateFieldGet(this, _DefaultAllureStore_processGlobalErrorsByEnv, "f").clear();
+}, _DefaultAllureStore_getHistoryLookup = function _DefaultAllureStore_getHistoryLookup() {
+    return (__classPrivateFieldSet(this, _DefaultAllureStore_historyLookup, __classPrivateFieldGet(this, _DefaultAllureStore_historyLookup, "f") ?? createHistoryTestResultLookup(__classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").values()), "f"));
+}, _DefaultAllureStore_historyFor = function _DefaultAllureStore_historyFor(result, lookup) {
+    return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").flatMap((point) => {
+        const historicalResult = lookup(point, result);
+        return historicalResult ? [historicalResult] : [];
+    });
+}, _DefaultAllureStore_applyHistoryFlags = function _DefaultAllureStore_applyHistoryFlags(result, history) {
+    result.flaky = result.sourceMetadata?.reportedFlaky === true || __classPrivateFieldGet(this, _DefaultAllureStore_detectFlaky, "f").call(this, result, history);
+    result.transition = getStatusTransition(result, history);
 }, _DefaultAllureStore_restoreAttachmentContent = function _DefaultAllureStore_restoreAttachmentContent(id, content) {
     const attachment = __classPrivateFieldGet(this, _DefaultAllureStore_attachments, "f").get(id);
     __classPrivateFieldGet(this, _DefaultAllureStore_attachmentContents, "f").set(id, content);
@@ -1306,9 +1329,12 @@ _DefaultAllureStore_testResults = new WeakMap(), _DefaultAllureStore_environment
     if (!__classPrivateFieldGet(this, _DefaultAllureStore_history, "f")) {
         return undefined;
     }
-    const historyIdCandidates = getHistoryIdCandidates(tr);
-    if (historyIdCandidates.length === 0) {
+    if (!tr.retryHash) {
         return [];
     }
-    return selectHistoryTestResults(__classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f"), historyIdCandidates);
+    const lookup = __classPrivateFieldGet(this, _DefaultAllureStore_instances, "m", _DefaultAllureStore_getHistoryLookup).call(this);
+    return __classPrivateFieldGet(this, _DefaultAllureStore_historyPoints, "f").flatMap((point) => {
+        const historical = lookup(point, tr);
+        return historical ? [historical] : [];
+    });
 };