From e4ef68b68a7a34e4ca0bcfe802a90623a48b241d Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Mon, 23 Mar 2026 16:12:23 -0400
Subject: [PATCH 01/64] Propagate isJS to inline frames during symbolication.

---
 src/profile-logic/symbolication.ts        |  4 +-
 src/test/fixtures/example-symbol-table.ts | 42 ++++++++++++++++++
 src/test/store/symbolication.test.ts      | 52 ++++++++++++++++++++---
 3 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/src/profile-logic/symbolication.ts b/src/profile-logic/symbolication.ts
index 3186fb7b3a..cdc01ac0d2 100644
--- a/src/profile-logic/symbolication.ts
+++ b/src/profile-logic/symbolication.ts
@@ -789,8 +789,8 @@ function _partiallyApplySymbolicationStep(
         if (funcIndex === undefined) {
           // Need a new func.
           funcIndex = funcTable.length;
-          funcTable.isJS[funcIndex] = false;
-          funcTable.relevantForJS[funcIndex] = false;
+          funcTable.isJS[funcIndex] = funcTable.isJS[oldFunc];
+          funcTable.relevantForJS[funcIndex] = funcTable.relevantForJS[oldFunc];
           funcTable.resource[funcIndex] = resourceIndex;
           funcTable.source[funcIndex] = null;
           funcTable.lineNumber[funcIndex] = null;
diff --git a/src/test/fixtures/example-symbol-table.ts b/src/test/fixtures/example-symbol-table.ts
index 509aa8d79b..40af714732 100644
--- a/src/test/fixtures/example-symbol-table.ts
+++ b/src/test/fixtures/example-symbol-table.ts
@@ -280,3 +280,45 @@ export const partialSymbolTable: ExampleSymbolTable = {
 
 export const completeSymbolTableAsTuple = completeSymbolTable.asTuple;
 export const partialSymbolTableAsTuple = partialSymbolTable.asTuple;
+
+// A symbol table for a JIT dump file (e.g. jit-52344.dump), simulating JS
+// functions symbolicated from samply + jitdump. The outer function
+// "renderButton.js" has an inlined call to "useState.js" at address 0x000a.
+const jitDumpSyms = [
+  {
+    address: 0,
+    name: 'renderButton.js',
+    file: 'Button.tsx',
+    lineRanges: [
+      {
+        startAddress: 0x0,
+        line: 42,
+      },
+      {
+        startAddress: 0x8,
+        line: 45,
+        inlinedCall: {
+          name: 'useState.js',
+          file: 'react.js',
+          lineRanges: [
+            {
+              startAddress: 0x8,
+              line: 100,
+            },
+          ],
+        },
+      },
+    ],
+  },
+  {
+    address: 0x2000,
+    name: 'runJobs.js',
+    file: 'scheduler.js',
+  },
+];
+
+export const jitDumpSymbolTable: ExampleSymbolTable = {
+  symbols: jitDumpSyms,
+  asTuple: _makeSymbolTableAsTuple(jitDumpSyms),
+  getAddressResult: _makeGetAddressResultFunction(jitDumpSyms),
+};
diff --git a/src/test/store/symbolication.test.ts b/src/test/store/symbolication.test.ts
index 372bdd5980..40c47f71ed 100644
--- a/src/test/store/symbolication.test.ts
+++ b/src/test/store/symbolication.test.ts
@@ -7,6 +7,7 @@ import { getProfileFromTextSamples } from '../fixtures/profiles/processed-profil
 import {
   completeSymbolTable,
   partialSymbolTable,
+  jitDumpSymbolTable,
 } from '../fixtures/example-symbol-table';
 import type { ExampleSymbolTable } from '../fixtures/example-symbol-table';
 import type { MarkerPayload } from 'firefox-profiler/types';
@@ -29,6 +30,7 @@ import { doSymbolicateProfile } from '../../actions/receive-profile';
 import {
   changeSelectedCallNode,
   changeExpandedCallNodes,
+  changeImplementationFilter,
 } from '../../actions/profile-view';
 import { formatTree, formatStack } from '../fixtures/utils';
 import { assertSetContainsOnly } from '../fixtures/custom-assertions';
@@ -44,18 +46,17 @@ import { SymbolsNotFoundError } from '../../profile-logic/errors';
  */
 describe('doSymbolicateProfile', function () {
   // Initialize a store, an unsymbolicated profile, and helper functions.
-  function init() {
+  function init(profile = _createUnsymbolicatedProfile()) {
     // The rejection in `requestSymbolsFromServer` outputs an error log, let's
     // silence it here. The fact that we call it is tested in
     // symbol-store.test.js.
     jest.spyOn(console, 'log').mockImplementation(() => {});
 
-    const profile = _createUnsymbolicatedProfile();
     const store = storeWithProfile(profile);
 
-    let symbolTable = completeSymbolTable;
+    let firefoxSymbolTable = completeSymbolTable;
     function switchSymbolTable(otherSymbolTable: ExampleSymbolTable) {
-      symbolTable = otherSymbolTable;
+      firefoxSymbolTable = otherSymbolTable;
     }
     let symbolicationProviderMode: 'from-server' | 'from-browser' =
       'from-browser';
@@ -67,12 +68,19 @@ describe('doSymbolicateProfile', function () {
       requestSymbolsFromServer: async (requests: LibSymbolicationRequest[]) =>
         requests.map<LibSymbolicationResponse>((request) => {
           const { lib, addresses } = request;
-          if (lib.debugName !== 'firefox.pdb') {
+
+          const symbolTables: Partial<Record<string, ExampleSymbolTable>> = {
+            'firefox.pdb': firefoxSymbolTable,
+            'jit-52344.dump': jitDumpSymbolTable,
+          };
+
+          const symbolTable = symbolTables[lib.debugName];
+          if (symbolTable === undefined) {
             return {
               type: 'ERROR' as const,
               request,
               error: new SymbolsNotFoundError(
-                'Should only have lib called firefox.pdb',
+                `Lib name ${lib.debugName} is not in the list of known names: ${Object.keys(symbolTables).join(', ')}`,
                 lib
               ),
             };
@@ -123,7 +131,7 @@ describe('doSymbolicateProfile', function () {
         }
         return readSymbolsFromSymbolTable(
           addresses,
-          symbolTable.asTuple,
+          firefoxSymbolTable.asTuple,
           (s: string) => s
         );
       },
@@ -478,6 +486,28 @@ describe('doSymbolicateProfile', function () {
     ]);
   });
 
+  it('inline frames for JS functions appear in the JS-only call tree after symbolication', async () => {
+    const {
+      store: { dispatch, getState },
+      profile,
+      symbolStore,
+      switchSymbolProviderMode,
+    } = init(_createUnsymbolicatedJitProfile());
+
+    switchSymbolProviderMode('from-server');
+
+    await doSymbolicateProfile(dispatch, profile, symbolStore);
+
+    // Check that the `useState.js` node shows up in the JS-only call tree.
+    // This function is an inline frame from the jitdump symbol info.
+    dispatch(changeImplementationFilter('js'));
+    expect(formatTree(getCallTree(getState()))).toEqual([
+      '- renderButton.js (total: 1, self: —)',
+      '  - useState.js (total: 1, self: 1)',
+      '- runJobs.js (total: 1, self: 1)',
+    ]);
+  });
+
   it('can re-symbolicate a partially-symbolicated profile even if it needs to add funcs to the funcTable', async () => {
     const {
       store: { dispatch, getState },
@@ -623,3 +653,11 @@ function _createUnsymbolicatedProfile() {
 
   return profile;
 }
+
+function _createUnsymbolicatedJitProfile() {
+  // See jitDumpSyms (in example-symbol-table.ts) for the corresponding symbols.
+  const { profile } = getProfileFromTextSamples(`
+    renderButton.js[lib:jit-52344.dump][address:a]  runJobs.js[lib:jit-52344.dump][address:2000]
+  `);
+  return profile;
+}

From d199335143a53b38555f67daea3b48fbcd7012fb Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Tue, 24 Mar 2026 15:16:00 -0400
Subject: [PATCH 02/64] Use createStackTableBySkippingDiscarded in focusSelf.

Fixes #5915.

Before this fix, we were keeping the filtered-out stacks in the stack table.
Now we create a stack table which has those stacks removed.
A smaller stack table makes all the follow-on work faster.

Before: https://share.firefox.dev/4bXlszU
After: https://share.firefox.dev/4bJCQb6
---
 src/profile-logic/transforms.ts | 51 +++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/profile-logic/transforms.ts b/src/profile-logic/transforms.ts
index 604b7f1179..c2220a331e 100644
--- a/src/profile-logic/transforms.ts
+++ b/src/profile-logic/transforms.ts
@@ -12,6 +12,8 @@ import {
   updateThreadStacksByGeneratingNewStackColumns,
   getMapStackUpdater,
   getOriginAnnotationForFunc,
+  createStackTableBySkippingDiscarded,
+  applyTransformOutputToThread,
 } from './profile-data';
 import { timeCode } from '../utils/time-code';
 import { assertExhaustiveCheck, convertToTransformType } from '../utils/types';
@@ -54,6 +56,7 @@ import {
   translateFuncIndex,
   translateResourceIndex,
 } from './index-translation';
+import { checkBit, makeBitSet, setBit } from 'firefox-profiler/utils/bitset';
 
 /**
  * This file contains the functions and logic for working with and applying transforms
@@ -1443,40 +1446,52 @@ export function focusSelf(
 
     const funcMatchesImplementation = FUNC_MATCHES[implementation];
 
-    const shouldKeepStack = new Uint8Array(stackTable.length);
+    const shouldKeepStack = makeBitSet(stackTable.length);
 
-    const newPrefixCol = stackTable.prefix.slice();
+    const newPrefixCol = new Array<IndexIntoStackTable | null>();
+    const oldStackToNewStack = new Int32Array(stackTable.length);
 
     for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
       const frameIndex = stackTable.frame[stackIndex];
       const funcIndex = frameTable.func[frameIndex];
 
       if (funcIndex === funcIndexToFocus) {
-        shouldKeepStack[stackIndex] = 1;
-        newPrefixCol[stackIndex] = null;
+        setBit(shouldKeepStack, stackIndex);
+        const newStackIndex = newPrefixCol.length;
+        newPrefixCol[newStackIndex] = null;
+        oldStackToNewStack[stackIndex] = newStackIndex;
       } else {
-        const prefix = newPrefixCol[stackIndex];
+        const oldPrefix = stackTable.prefix[stackIndex];
         if (
-          prefix !== null &&
-          shouldKeepStack[prefix] === 1 &&
+          oldPrefix !== null &&
+          checkBit(shouldKeepStack, oldPrefix) &&
           !funcMatchesImplementation(thread, funcIndex)
         ) {
-          shouldKeepStack[stackIndex] = 1;
+          setBit(shouldKeepStack, stackIndex);
+          const newPrefix = oldStackToNewStack[oldPrefix];
+          const newStackIndex = newPrefixCol.length;
+          newPrefixCol[newStackIndex] = newPrefix;
+          oldStackToNewStack[stackIndex] = newStackIndex;
         }
       }
     }
 
-    const newStackTable = {
-      ...stackTable,
-      prefix: newPrefixCol,
-    };
+    const newStackTable = createStackTableBySkippingDiscarded(
+      stackTable,
+      newPrefixCol,
+      shouldKeepStack
+    );
 
-    return updateThreadStacks(thread, newStackTable, (oldStack) => {
-      if (oldStack === null || shouldKeepStack[oldStack] === 0) {
-        return null;
-      }
-      return oldStack;
-    });
+    return applyTransformOutputToThread(
+      {
+        newStackTable,
+        effectOnThreadData: {
+          dropIfOldStackIsNot: shouldKeepStack,
+          oldStackToNewStack,
+        },
+      },
+      thread
+    );
   });
 }
 

From f933ed3b4fe40fa674a73f2854174abc09951fdc Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Fri, 6 Mar 2026 19:52:35 -0500
Subject: [PATCH 03/64] Always render the CPU-usage-aware activity graph when
 CPU information is available.

The UI for switching the activity graph type isn't visible
by default and nobody has complained about its absence.

This simplifies the code.

The timelineType values 'category' and 'cpu-category' are now equivalent.
---
 .../shared/thread/ActivityGraph.tsx           | 12 +--------
 .../shared/thread/ActivityGraphCanvas.tsx     |  3 ---
 .../shared/thread/ActivityGraphFills.tsx      | 27 +++++--------------
 src/components/shared/thread/SampleGraph.tsx  | 16 +++--------
 src/components/timeline/TrackThread.tsx       |  8 ------
 src/profile-logic/profile-data.ts             |  5 ++--
 src/types/actions.ts                          |  3 +++
 7 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/src/components/shared/thread/ActivityGraph.tsx b/src/components/shared/thread/ActivityGraph.tsx
index 60dcefc65b..5310970e54 100644
--- a/src/components/shared/thread/ActivityGraph.tsx
+++ b/src/components/shared/thread/ActivityGraph.tsx
@@ -23,7 +23,6 @@ import type {
   IndexIntoSamplesTable,
   Milliseconds,
   CssPixels,
-  TimelineType,
 } from 'firefox-profiler/types';
 import type {
   ActivityFillGraphQuerier,
@@ -49,9 +48,7 @@ export type Props = {
     a: IndexIntoSamplesTable,
     b: IndexIntoSamplesTable
   ) => number;
-  readonly enableCPUUsage: boolean;
   readonly implementationFilter: ImplementationFilter;
-  readonly timelineType: TimelineType;
   readonly zeroAt: Milliseconds;
   readonly profileTimelineUnit: string;
 } & SizeProps;
@@ -136,11 +133,9 @@ class ThreadActivityGraphImpl extends React.PureComponent<Props, State> {
       sampleIndexOffset,
       sampleSelectedStates,
       treeOrderSampleComparator,
-      enableCPUUsage,
       implementationFilter,
       width,
       height,
-      timelineType,
       zeroAt,
       profileTimelineUnit,
     } = this.props;
@@ -168,7 +163,6 @@ class ThreadActivityGraphImpl extends React.PureComponent<Props, State> {
           categories={categories}
           passFillsQuerier={this._setFillsQuerier}
           onClick={this._onClick}
-          enableCPUUsage={enableCPUUsage}
           width={width}
           height={height}
         />
@@ -176,11 +170,7 @@ class ThreadActivityGraphImpl extends React.PureComponent<Props, State> {
           <Tooltip mouseX={mouseX} mouseY={mouseY}>
             <SampleTooltipContents
               sampleIndex={hoveredPixelState.sample}
-              cpuRatioInTimeRange={
-                timelineType === 'cpu-category'
-                  ? hoveredPixelState.cpuRatioInTimeRange
-                  : null
-              }
+              cpuRatioInTimeRange={hoveredPixelState.cpuRatioInTimeRange}
               rangeFilteredThread={rangeFilteredThread}
               categories={categories}
               implementationFilter={implementationFilter}
diff --git a/src/components/shared/thread/ActivityGraphCanvas.tsx b/src/components/shared/thread/ActivityGraphCanvas.tsx
index 640482ce8e..36356a762b 100644
--- a/src/components/shared/thread/ActivityGraphCanvas.tsx
+++ b/src/components/shared/thread/ActivityGraphCanvas.tsx
@@ -37,7 +37,6 @@ type CanvasProps = {
   readonly categories: CategoryList;
   readonly passFillsQuerier: (param: ActivityFillGraphQuerier) => void;
   readonly onClick: (param: React.MouseEvent<HTMLCanvasElement>) => void;
-  readonly enableCPUUsage: boolean;
 } & SizeProps;
 
 export class ActivityGraphCanvas extends React.PureComponent<CanvasProps> {
@@ -132,7 +131,6 @@ export class ActivityGraphCanvas extends React.PureComponent<CanvasProps> {
       sampleIndexOffset,
       sampleSelectedStates,
       treeOrderSampleComparator,
-      enableCPUUsage,
       width,
       height,
     } = this.props;
@@ -153,7 +151,6 @@ export class ActivityGraphCanvas extends React.PureComponent<CanvasProps> {
       rangeEnd,
       sampleIndexOffset,
       sampleSelectedStates,
-      enableCPUUsage,
       xPixelsPerMs: canvasPixelWidth / (rangeEnd - rangeStart),
       treeOrderSampleComparator,
       categoryDrawStyles: this._getCategoryDrawStyles(ctx!),
diff --git a/src/components/shared/thread/ActivityGraphFills.tsx b/src/components/shared/thread/ActivityGraphFills.tsx
index 9a4f88df79..0b01e803dd 100644
--- a/src/components/shared/thread/ActivityGraphFills.tsx
+++ b/src/components/shared/thread/ActivityGraphFills.tsx
@@ -36,7 +36,6 @@ type RenderedComponentSettings = {
   readonly rangeEnd: Milliseconds;
   readonly sampleIndexOffset: number;
   readonly xPixelsPerMs: number;
-  readonly enableCPUUsage: boolean;
   readonly treeOrderSampleComparator:
     | ((a: IndexIntoSamplesTable, b: IndexIntoSamplesTable) => number)
     | null;
@@ -215,7 +214,6 @@ export class ActivityGraphFillComputer {
       fullThread,
       rangeFilteredThread: { samples },
       interval,
-      enableCPUUsage,
       sampleIndexOffset,
       rangeStart,
       sampleSelectedStates,
@@ -243,12 +241,8 @@ export class ActivityGraphFillComputer {
       const nextSampleTime = samples.time[i + 1];
       const category = samples.category[i];
 
-      let beforeSampleCpuPercent = 100;
-      let afterSampleCpuPercent = 100;
-      if (enableCPUUsage) {
-        beforeSampleCpuPercent = threadCPUPercent[i];
-        afterSampleCpuPercent = threadCPUPercent[i + 1];
-      }
+      const beforeSampleCpuPercent = threadCPUPercent[i];
+      const afterSampleCpuPercent = threadCPUPercent[i + 1];
 
       const percentageBuffers = this.mutablePercentageBuffers[category];
       const selectedState = sampleSelectedStates[i];
@@ -273,12 +267,8 @@ export class ActivityGraphFillComputer {
     const lastIdx = samples.length - 1;
     const lastSampleCategory = samples.category[lastIdx];
 
-    let beforeSampleCpuPercent = 100;
-    let afterSampleCpuPercent = 100;
-    if (enableCPUUsage) {
-      beforeSampleCpuPercent = threadCPUPercent[lastIdx];
-      afterSampleCpuPercent = threadCPUPercent[lastIdx + 1]; // guaranteed to exist
-    }
+    const beforeSampleCpuPercent = threadCPUPercent[lastIdx];
+    const afterSampleCpuPercent = threadCPUPercent[lastIdx + 1]; // guaranteed to exist
 
     const nextSampleTime = sampleTime + interval;
     const percentageBuffers = this.mutablePercentageBuffers[lastSampleCategory];
@@ -596,7 +586,6 @@ export class ActivityFillGraphQuerier {
   ): number {
     const {
       rangeFilteredThread: { samples },
-      enableCPUUsage,
       interval,
       sampleIndexOffset,
       fullThread,
@@ -617,13 +606,9 @@ export class ActivityFillGraphQuerier {
         ? fullThread.samples.time[fullThreadSample + 1]
         : sampleTime + interval;
 
-    let beforeSampleCpuPercent = 100;
-    let afterSampleCpuPercent = 100;
     const { threadCPUPercent } = samples;
-    if (enableCPUUsage) {
-      beforeSampleCpuPercent = threadCPUPercent[sample];
-      afterSampleCpuPercent = threadCPUPercent[sample + 1]; // guaranteed to exist
-    }
+    const beforeSampleCpuPercent = threadCPUPercent[sample];
+    const afterSampleCpuPercent = threadCPUPercent[sample + 1]; // guaranteed to exist
 
     const kernelRangeStartTime = rangeStart + kernelPos / xPixelsPerMs;
 
diff --git a/src/components/shared/thread/SampleGraph.tsx b/src/components/shared/thread/SampleGraph.tsx
index a478a75285..7790794440 100644
--- a/src/components/shared/thread/SampleGraph.tsx
+++ b/src/components/shared/thread/SampleGraph.tsx
@@ -25,17 +25,14 @@ import type {
   IndexIntoSamplesTable,
   Milliseconds,
   CssPixels,
-  TimelineType,
   ImplementationFilter,
 } from 'firefox-profiler/types';
 import { SelectedState } from 'firefox-profiler/types';
 import type { SizeProps } from 'firefox-profiler/components/shared/WithSize';
-import type { CpuRatioInTimeRange } from './ActivityGraphFills';
 import { lightDark } from 'firefox-profiler/utils/dark-mode';
 
 export type HoveredPixelState = {
   readonly sample: IndexIntoSamplesTable | null;
-  readonly cpuRatioInTimeRange: CpuRatioInTimeRange | null;
 };
 
 type Props = {
@@ -51,7 +48,6 @@ type Props = {
     sampleIndex: IndexIntoSamplesTable | null
   ) => void;
   readonly trackName: string;
-  readonly timelineType: TimelineType;
   readonly implementationFilter: ImplementationFilter;
   readonly zeroAt: Milliseconds;
   readonly profileTimelineUnit: string;
@@ -252,7 +248,7 @@ class ThreadSampleGraphCanvas extends React.PureComponent<CanvasProps> {
 }
 
 export class ThreadSampleGraphImpl extends PureComponent<Props, State> {
-  override state = {
+  override state: State = {
     hoveredPixelState: null,
     mouseX: 0,
     mouseY: 0,
@@ -333,7 +329,6 @@ export class ThreadSampleGraphImpl extends PureComponent<Props, State> {
 
     return {
       sample: sampleIndex,
-      cpuRatioInTimeRange: null,
     };
   }
 
@@ -341,7 +336,6 @@ export class ThreadSampleGraphImpl extends PureComponent<Props, State> {
     const {
       className,
       trackName,
-      timelineType,
       categories,
       implementationFilter,
       thread,
@@ -379,12 +373,8 @@ export class ThreadSampleGraphImpl extends PureComponent<Props, State> {
         {hoveredPixelState === null ? null : (
           <Tooltip mouseX={mouseX} mouseY={mouseY}>
             <SampleTooltipContents
-              sampleIndex={(hoveredPixelState as HoveredPixelState).sample}
-              cpuRatioInTimeRange={
-                timelineType === 'cpu-category'
-                  ? (hoveredPixelState as HoveredPixelState).cpuRatioInTimeRange
-                  : null
-              }
+              sampleIndex={hoveredPixelState.sample}
+              cpuRatioInTimeRange={null}
               rangeFilteredThread={thread}
               categories={categories}
               implementationFilter={implementationFilter}
diff --git a/src/components/timeline/TrackThread.tsx b/src/components/timeline/TrackThread.tsx
index afbbfcdda5..292fd77c9c 100644
--- a/src/components/timeline/TrackThread.tsx
+++ b/src/components/timeline/TrackThread.tsx
@@ -87,7 +87,6 @@ type StateProps = {
     b: IndexIntoSamplesTable
   ) => number;
   readonly selectedThreadIndexes: Set<ThreadIndex>;
-  readonly enableCPUUsage: boolean;
   readonly isExperimentalCPUGraphsEnabled: boolean;
   readonly implementationFilter: ImplementationFilter;
   readonly callTreeVisible: boolean;
@@ -186,7 +185,6 @@ class TimelineTrackThreadImpl extends PureComponent<Props> {
       treeOrderSampleComparator,
       trackType,
       trackName,
-      enableCPUUsage,
       isExperimentalCPUGraphsEnabled,
       implementationFilter,
       zeroAt,
@@ -257,9 +255,7 @@ class TimelineTrackThreadImpl extends PureComponent<Props> {
               categories={categories}
               sampleSelectedStates={sampleSelectedStates}
               treeOrderSampleComparator={treeOrderSampleComparator}
-              enableCPUUsage={enableCPUUsage}
               implementationFilter={implementationFilter}
-              timelineType={timelineType}
               zeroAt={zeroAt}
               profileTimelineUnit={profileTimelineUnit}
             />
@@ -274,7 +270,6 @@ class TimelineTrackThreadImpl extends PureComponent<Props> {
                 sampleSelectedStates={sampleSelectedStates}
                 categories={categories}
                 onSampleClick={this._onSampleClick}
-                timelineType={timelineType}
                 implementationFilter={implementationFilter}
                 zeroAt={zeroAt}
                 profileTimelineUnit={profileTimelineUnit}
@@ -335,8 +330,6 @@ export const TimelineTrackThread = explicitConnect<
     const committedRange = getCommittedRange(state);
     const fullThread = selectors.getThread(state);
     const timelineType = getTimelineType(state);
-    const enableCPUUsage =
-      timelineType === 'cpu-category' && fullThread.samples.hasCPUDeltas;
 
     return {
       fullThread,
@@ -361,7 +354,6 @@ export const TimelineTrackThread = explicitConnect<
       treeOrderSampleComparator:
         selectors.getTreeOrderComparatorInFilteredThread(state),
       selectedThreadIndexes,
-      enableCPUUsage,
       isExperimentalCPUGraphsEnabled: getIsExperimentalCPUGraphsEnabled(state),
       implementationFilter: getImplementationFilter(state),
       callTreeVisible: selectors.getUsefulTabs(state).includes('calltree'),
diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index 49a521c9f1..1c36781522 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -4305,10 +4305,9 @@ export function getNativeSymbolInfo(
 /**
  * Determines the timeline type by looking at the profile data.
  *
- * There are three options:
  * 'cpu-category': If a profile has both category and cpu usage information.
- * 'category': If a profile has category information but not the cpu usage.
- * 'stack': If a profile doesn't have category or cpu usage information.
+ * 'category':     If a profile has category information but not cpu usage.
+ * 'stack':        If a profile doesn't have category information.
  */
 export function determineTimelineType(profile: Profile): TimelineType {
   if (!profile.meta.categories) {
diff --git a/src/types/actions.ts b/src/types/actions.ts
index b3dccd0f99..40b9656a64 100644
--- a/src/types/actions.ts
+++ b/src/types/actions.ts
@@ -85,6 +85,9 @@ export type DataSource =
   // this browser, and allows deleting / unpublishing those profiles.
   | 'uploaded-recordings';
 
+// Controls which graph is shown in thread tracks.
+// 'cpu-category', 'category': Show the category activity graph.
+// 'stack':                    Shows the stack graph, for profiles without category information.
 export type TimelineType = 'stack' | 'category' | 'cpu-category';
 export type PreviewSelection = {
   readonly isModifying: boolean;

From 7aad3282f49e90b4cc78dd42cc78cd9ea1266fe4 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Sat, 28 Mar 2026 12:22:30 -0400
Subject: [PATCH 04/64] Remove timelineType 'category' since it's now
 equivalent to 'cpu-category'.

---
 src/app-logic/url-handling.ts                       | 12 ++++--------
 src/components/timeline/TrackThread.tsx             |  3 +--
 src/profile-logic/profile-data.ts                   | 13 +------------
 src/test/store/profile-view.test.ts                 |  6 ++++--
 .../unit/__snapshots__/window-console.test.ts.snap  |  2 +-
 src/test/url-handling.test.ts                       | 11 ++++++++---
 src/types/actions.ts                                |  6 +++---
 src/utils/window-console.ts                         | 10 +++-------
 8 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/src/app-logic/url-handling.ts b/src/app-logic/url-handling.ts
index f2b1196339..eecd06a2be 100644
--- a/src/app-logic/url-handling.ts
+++ b/src/app-logic/url-handling.ts
@@ -309,7 +309,7 @@ export function getQueryStringFromUrlState(urlState: UrlState): string {
         : urlState.profileSpecific.implementation,
     timelineType:
       // The default is the cpu-category view, so only add it to the URL if it's
-      // the stack or category view.
+      // the stack view.
       urlState.profileSpecific.timelineType === 'cpu-category'
         ? undefined
         : urlState.profileSpecific.timelineType,
@@ -1445,14 +1445,10 @@ function getVersion4JSCallNodePathFromStackIndex(
 function validateTimelineType(
   timelineType: string | null | undefined
 ): TimelineType {
-  const VALID_TIMELINE_TYPES: Record<TimelineType, true> = {
-    stack: true,
-    category: true,
-    'cpu-category': true,
-  };
-  if (timelineType && timelineType in VALID_TIMELINE_TYPES) {
-    return timelineType as TimelineType;
+  if (timelineType === 'stack') {
+    return 'stack';
   }
+  // 'category' is an old value that is treated as 'cpu-category'.
   return 'cpu-category';
 }
 
diff --git a/src/components/timeline/TrackThread.tsx b/src/components/timeline/TrackThread.tsx
index 292fd77c9c..b0ee5338a6 100644
--- a/src/components/timeline/TrackThread.tsx
+++ b/src/components/timeline/TrackThread.tsx
@@ -239,8 +239,7 @@ class TimelineTrackThreadImpl extends PureComponent<Props> {
           />
         ) : null}
 
-        {(timelineType === 'category' || timelineType === 'cpu-category') &&
-        !filteredThread.isJsTracer ? (
+        {timelineType !== 'stack' && !filteredThread.isJsTracer ? (
           <>
             <ThreadActivityGraph
               className="threadActivityGraph"
diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index 1c36781522..645d8a9cc8 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -4305,8 +4305,7 @@ export function getNativeSymbolInfo(
 /**
  * Determines the timeline type by looking at the profile data.
  *
- * 'cpu-category': If a profile has both category and cpu usage information.
- * 'category':     If a profile has category information but not cpu usage.
+ * 'cpu-category': If a profile has category information.
  * 'stack':        If a profile doesn't have category information.
  */
 export function determineTimelineType(profile: Profile): TimelineType {
@@ -4317,16 +4316,6 @@ export function determineTimelineType(profile: Profile): TimelineType {
     return 'stack';
   }
 
-  if (
-    !profile.meta.sampleUnits ||
-    !profile.threads.some((thread) => thread.samples.threadCPUDelta)
-  ) {
-    // Have category information but doesn't have the CPU usage information.
-    // Use 'category'.
-    return 'category';
-  }
-
-  // Have both category and CPU usage information. Use 'cpu-category'.
   return 'cpu-category';
 }
 
diff --git a/src/test/store/profile-view.test.ts b/src/test/store/profile-view.test.ts
index 8d530c8758..c78779dcf3 100644
--- a/src/test/store/profile-view.test.ts
+++ b/src/test/store/profile-view.test.ts
@@ -3869,12 +3869,14 @@ describe('timeline type', function () {
     );
   });
 
-  it('should use the category view when cpu is not provided', () => {
+  it('should use the cpu-category view even if no cpu is provided', () => {
     const { profile } = getProfileFromTextSamples('A');
 
     // Load the store after mutating the profile.
     const { getState } = storeWithProfile(profile);
-    expect(UrlStateSelectors.getTimelineType(getState())).toEqual('category');
+    expect(UrlStateSelectors.getTimelineType(getState())).toEqual(
+      'cpu-category'
+    );
   });
 
   it('should use the stack height view when category and cpu is not provided', () => {
diff --git a/src/test/unit/__snapshots__/window-console.test.ts.snap b/src/test/unit/__snapshots__/window-console.test.ts.snap
index d55758c4da..2bb9d98cf7 100644
--- a/src/test/unit/__snapshots__/window-console.test.ts.snap
+++ b/src/test/unit/__snapshots__/window-console.test.ts.snap
@@ -35,7 +35,7 @@ Array [
 %cwindow.actions%c - All the actions that can be dispatched to change the state.
 %cwindow.experimental%c - The object that holds flags of all the experimental features.
 %cwindow.togglePseudoLocalization%c - Enable pseudo localizations by passing \\"accented\\" or \\"bidi\\" to this function, or disable using no parameters.
-%cwindow.toggleTimelineType%c - Toggle timeline graph type by passing \\"cpu-category\\", \\"category\\", or \\"stack\\".
+%cwindow.toggleTimelineType%c - Toggle timeline graph type by passing \\"cpu-category\\" or \\"stack\\".
 %cwindow.toggleDarkMode%c - Cycle through theme preferences: system, light, dark.
 %cwindow.retrieveRawProfileDataFromBrowser%c - Retrieve the profile attached to the current tab and returns it. Use \\"await\\" to call it, and use saveToDisk to save it.
 %cwindow.extractGeckoLogs%c - Retrieve recorded logs in the current range, using the MOZ_LOG format. Use with \\"copy\\" or \\"saveToDisk\\".
diff --git a/src/test/url-handling.test.ts b/src/test/url-handling.test.ts
index ad61c235cb..88ff994ee0 100644
--- a/src/test/url-handling.test.ts
+++ b/src/test/url-handling.test.ts
@@ -1234,14 +1234,19 @@ describe('url upgrading', function () {
       expect(query.timelineType).toBeFalsy();
     });
 
-    it('add an explicit category from the url', function () {
+    it('maps the implicit category type to cpu-category', function () {
+      // In v6, the default timeline type was 'category'. The v7 upgrader adds
+      // an explicit 'category' to the URL, which is then parsed as 'cpu-category'
+      // since the two are now equivalent.
       const { getState } = _getStoreWithURL({
         pathname: '/public/e71ce9584da34298627fb66ac7f2f245ba5edbf5/calltree/',
         search: '',
         v: 6,
       });
 
-      expect(urlStateSelectors.getTimelineType(getState())).toBe('category');
+      expect(urlStateSelectors.getTimelineType(getState())).toBe(
+        'cpu-category'
+      );
 
       const newUrl = new URL(
         urlFromState(urlStateSelectors.getUrlState(getState())),
@@ -1250,7 +1255,7 @@ describe('url upgrading', function () {
       const query = queryString.parse(newUrl.search.substr(1), {
         arrayFormat: 'bracket',
       });
-      expect(query.timelineType).toBe('category');
+      expect(query.timelineType).toBeFalsy();
     });
 
     it('keeps stack category the same', function () {
diff --git a/src/types/actions.ts b/src/types/actions.ts
index 40b9656a64..6f11b70e73 100644
--- a/src/types/actions.ts
+++ b/src/types/actions.ts
@@ -86,9 +86,9 @@ export type DataSource =
   | 'uploaded-recordings';
 
 // Controls which graph is shown in thread tracks.
-// 'cpu-category', 'category': Show the category activity graph.
-// 'stack':                    Shows the stack graph, for profiles without category information.
-export type TimelineType = 'stack' | 'category' | 'cpu-category';
+// 'cpu-category': Shows the category activity graph.
+// 'stack':        Shows the stack graph, for profiles without category information.
+export type TimelineType = 'stack' | 'cpu-category';
 export type PreviewSelection = {
   readonly isModifying: boolean;
   readonly selectionStart: number;
diff --git a/src/utils/window-console.ts b/src/utils/window-console.ts
index 0beb4651fd..97803f23d1 100644
--- a/src/utils/window-console.ts
+++ b/src/utils/window-console.ts
@@ -180,14 +180,10 @@ export function addDataToWindowObject(
   };
 
   target.toggleTimelineType = function (timelineType?: string) {
-    if (
-      timelineType !== 'cpu-category' &&
-      timelineType !== 'category' &&
-      timelineType !== 'stack'
-    ) {
+    if (timelineType !== 'cpu-category' && timelineType !== 'stack') {
       console.log(stripIndent`
         ❗ The timeline type "${timelineType}" is unknown.
-        💡 Valid types are: "cpu-category", "category", or "stack".
+        💡 Valid types are: "cpu-category" or "stack".
         Please try again 😊
       `);
       return;
@@ -421,7 +417,7 @@ export function logFriendlyPreamble() {
       %cwindow.actions%c - All the actions that can be dispatched to change the state.
       %cwindow.experimental%c - The object that holds flags of all the experimental features.
       %cwindow.togglePseudoLocalization%c - Enable pseudo localizations by passing "accented" or "bidi" to this function, or disable using no parameters.
-      %cwindow.toggleTimelineType%c - Toggle timeline graph type by passing "cpu-category", "category", or "stack".
+      %cwindow.toggleTimelineType%c - Toggle timeline graph type by passing "cpu-category" or "stack".
       %cwindow.toggleDarkMode%c - Cycle through theme preferences: system, light, dark.
       %cwindow.retrieveRawProfileDataFromBrowser%c - Retrieve the profile attached to the current tab and returns it. Use "await" to call it, and use saveToDisk to save it.
       %cwindow.extractGeckoLogs%c - Retrieve recorded logs in the current range, using the MOZ_LOG format. Use with "copy" or "saveToDisk".

From d975ed2673c47430ca571bc732aa9bc28ca08aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Thu, 2 Apr 2026 11:53:00 +0200
Subject: [PATCH 05/64] Add Adel to the automatic dependency reviews (#5930)

---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 51e2f8ea6c..d51d70b842 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,5 +4,5 @@
 /locales/en-US/**/*.ftl @firefox-devtools/performance-l10n
 
 # Automatically request reviews for the dependency updates
-/package.json @canova
-/yarn.lock @canova
+/package.json @canova @fatadel
+/yarn.lock @canova @fatadel

From 634b4b918f038e2cdc8ecd539f740d37c74f5f24 Mon Sep 17 00:00:00 2001
From: fatadel <afatkhutdinov@mozilla.com>
Date: Thu, 2 Apr 2026 12:03:21 +0200
Subject: [PATCH 06/64] Fix arrow panel appearing behind marker tooltips
 (#5926)

  Tooltips are rendered via portal into #root-overlay, which is a sibling
  of #root. Two stacking contexts were trapping the arrow panel inside
  #root, preventing it from competing with tooltips:

  - #root had z-index: 0, creating a stacking context (it's a flex item)
  - .dragAndDropArea had isolation: isolate

  Remove both so the arrow panel's z-index: 5 reaches the body stacking
  context. Add z-index: 4 to tooltips so they remain above regular content
  but below arrow panels and context menus (z-index: 5).
---
 res/css/global.css                 | 2 +-
 src/components/app/DragAndDrop.css | 1 -
 src/components/app/Root.css        | 1 -
 src/components/tooltip/Tooltip.css | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/res/css/global.css b/res/css/global.css
index 9c47eb63df..5353f161f0 100644
--- a/res/css/global.css
+++ b/res/css/global.css
@@ -8,7 +8,7 @@
    * ===================== */
   --z-tab-selected: 1;
   --z-warning: 4;
-  --z-root: 0;
+  --z-tooltip: 4;
   --z-bottom-box: 1;
   --z-serviceworker-notice: 4;
   --z-arrow-panel: 5;
diff --git a/src/components/app/DragAndDrop.css b/src/components/app/DragAndDrop.css
index 01a44cb61b..1d77eef8f0 100644
--- a/src/components/app/DragAndDrop.css
+++ b/src/components/app/DragAndDrop.css
@@ -5,7 +5,6 @@
 .dragAndDropArea {
   display: inherit;
   width: 100%;
-  isolation: isolate;
 }
 
 .dragAndDropOverlayWrapper {
diff --git a/src/components/app/Root.css b/src/components/app/Root.css
index f19f764684..c9519c981e 100644
--- a/src/components/app/Root.css
+++ b/src/components/app/Root.css
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #root {
-  z-index: var(--z-root);
   display: flex;
   min-width: 0; /* This allows Flexible Layout to shrink this further than its min-content */
   flex: 1;
diff --git a/src/components/tooltip/Tooltip.css b/src/components/tooltip/Tooltip.css
index 230085ffc2..1ec269b652 100644
--- a/src/components/tooltip/Tooltip.css
+++ b/src/components/tooltip/Tooltip.css
@@ -9,6 +9,7 @@
   --internal-label-foreground-color: var(--grey-60);
 
   position: fixed;
+  z-index: var(--z-tooltip);
   display: inline-block;
   overflow: hidden;
   max-width: 600px;

From 307de87c964168485ecc0f67b5f00c24e827cc0a Mon Sep 17 00:00:00 2001
From: fatadel <afatkhutdinov@mozilla.com>
Date: Thu, 2 Apr 2026 12:06:55 +0200
Subject: [PATCH 07/64] Upgrade Node.js from v22 to v24 (#5923)

  Node 24 is the current LTS.
  Snapshot changes are due to undici v7 (bundled with Node 24)
  removing internal symbols from web spec objects like Response.
---
 .devcontainer/devcontainer.json               |   4 +-
 .../actions/setup-node-and-install/action.yml |   2 +-
 .github/workflows/l10n-sync.yml               |   2 +-
 .nvmrc                                        |   2 +-
 package.json                                  |   4 +-
 .../receive-profile.test.ts.snap              | 252 +-----------------
 6 files changed, 10 insertions(+), 256 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5257f37474..afc7cc4009 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,9 @@
 {
   "name": "Firefox Profiler",
-  "image": "mcr.microsoft.com/devcontainers/javascript-node:22",
+  "image": "mcr.microsoft.com/devcontainers/javascript-node:24",
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "22"
+      "version": "24"
     }
   },
   "forwardPorts": [4242],
diff --git a/.github/actions/setup-node-and-install/action.yml b/.github/actions/setup-node-and-install/action.yml
index 85a3a8ea8e..ca5192e5d4 100644
--- a/.github/actions/setup-node-and-install/action.yml
+++ b/.github/actions/setup-node-and-install/action.yml
@@ -6,7 +6,7 @@ runs:
     - name: Setup Node.js
       uses: actions/setup-node@v6
       with:
-        node-version: '22.14'
+        node-version: '24.14'
         cache: 'yarn'
 
     - name: Install dependencies
diff --git a/.github/workflows/l10n-sync.yml b/.github/workflows/l10n-sync.yml
index b38183aea0..f59a296eae 100644
--- a/.github/workflows/l10n-sync.yml
+++ b/.github/workflows/l10n-sync.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '22.14'
+          node-version: '24.14'
           cache: 'yarn'
 
       - name: Configure git
diff --git a/.nvmrc b/.nvmrc
index 744ca17ec0..fd655f8a35 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.14
+24.14
diff --git a/package.json b/package.json
index 7d417a3186..66225e7dbf 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "private": true,
   "engines": {
-    "node": ">= 22 < 23"
+    "node": ">= 24 < 25"
   },
   "devEngines": {
     "runtime": {
       "name": "node",
-      "version": ">= 22 < 23"
+      "version": ">= 24 < 25"
     }
   },
   "browser": {
diff --git a/src/test/store/__snapshots__/receive-profile.test.ts.snap b/src/test/store/__snapshots__/receive-profile.test.ts.snap
index ac9c30b543..04b089ee95 100644
--- a/src/test/store/__snapshots__/receive-profile.test.ts.snap
+++ b/src/test/store/__snapshots__/receive-profile.test.ts.snap
@@ -13,89 +13,7 @@ Array [
   ],
   Array [
     "Fetch response:",
-    Response {
-      Symbol(state): Object {
-        "aborted": false,
-        "body": Object {
-          "length": 7,
-          "source": Uint8Array [],
-          "stream": ReadableStream {
-            Symbol(kType): "ReadableStream",
-            Symbol(kState): Object {
-              "controller": ReadableByteStreamController {
-                Symbol(kType): "ReadableByteStreamController",
-                Symbol(kState): Object {
-                  "autoAllocateChunkSize": undefined,
-                  "byobRequest": null,
-                  "cancelAlgorithm": undefined,
-                  "closeRequested": false,
-                  "highWaterMark": 0,
-                  "pendingPullIntos": Array [],
-                  "pullAgain": false,
-                  "pullAlgorithm": undefined,
-                  "pulling": false,
-                  "queue": Array [],
-                  "queueTotalSize": 0,
-                  "started": true,
-                  "stream": [Circular],
-                },
-              },
-              "disturbed": true,
-              "reader": ReadableStreamDefaultReader {
-                Symbol(kType): "ReadableStreamDefaultReader",
-                Symbol(kState): Object {
-                  "close": Object {
-                    "promise": Promise {},
-                    "reject": [Function],
-                    "resolve": [Function],
-                  },
-                  "readRequests": Array [],
-                  "stream": [Circular],
-                },
-              },
-              "state": "closed",
-              "storedError": undefined,
-              "transfer": Object {
-                "port1": undefined,
-                "port2": undefined,
-                "promise": undefined,
-                "writable": undefined,
-              },
-            },
-            Symbol(nodejs.webstream.isClosedPromise): Object {
-              "promise": Promise {},
-              "reject": [Function],
-              "resolve": [Function],
-            },
-            Symbol(nodejs.webstream.controllerErrorFunction): [Function],
-          },
-        },
-        "cacheState": "",
-        "headersList": HeadersList {
-          "cookies": null,
-          Symbol(headers map): Map {
-            "content-length" => Object {
-              "name": "content-length",
-              "value": "7",
-            },
-            "content-type" => Object {
-              "name": "content-type",
-              "value": "application/json",
-            },
-          },
-          Symbol(headers map sorted): null,
-        },
-        "rangeRequested": false,
-        "requestIncludesCredentials": false,
-        "status": 200,
-        "statusText": "OK",
-        "timingAllowPassed": false,
-        "timingInfo": null,
-        "type": "default",
-        "urlList": Array [],
-      },
-      Symbol(headers): Headers {},
-    },
+    Response {},
   ],
 ]
 `;
@@ -113,89 +31,7 @@ Array [
   ],
   Array [
     "Fetch response:",
-    Response {
-      Symbol(state): Object {
-        "aborted": false,
-        "body": Object {
-          "length": 7,
-          "source": Uint8Array [],
-          "stream": ReadableStream {
-            Symbol(kType): "ReadableStream",
-            Symbol(kState): Object {
-              "controller": ReadableByteStreamController {
-                Symbol(kType): "ReadableByteStreamController",
-                Symbol(kState): Object {
-                  "autoAllocateChunkSize": undefined,
-                  "byobRequest": null,
-                  "cancelAlgorithm": undefined,
-                  "closeRequested": false,
-                  "highWaterMark": 0,
-                  "pendingPullIntos": Array [],
-                  "pullAgain": false,
-                  "pullAlgorithm": undefined,
-                  "pulling": false,
-                  "queue": Array [],
-                  "queueTotalSize": 0,
-                  "started": true,
-                  "stream": [Circular],
-                },
-              },
-              "disturbed": true,
-              "reader": ReadableStreamDefaultReader {
-                Symbol(kType): "ReadableStreamDefaultReader",
-                Symbol(kState): Object {
-                  "close": Object {
-                    "promise": Promise {},
-                    "reject": [Function],
-                    "resolve": [Function],
-                  },
-                  "readRequests": Array [],
-                  "stream": [Circular],
-                },
-              },
-              "state": "closed",
-              "storedError": undefined,
-              "transfer": Object {
-                "port1": undefined,
-                "port2": undefined,
-                "promise": undefined,
-                "writable": undefined,
-              },
-            },
-            Symbol(nodejs.webstream.isClosedPromise): Object {
-              "promise": Promise {},
-              "reject": [Function],
-              "resolve": [Function],
-            },
-            Symbol(nodejs.webstream.controllerErrorFunction): [Function],
-          },
-        },
-        "cacheState": "",
-        "headersList": HeadersList {
-          "cookies": null,
-          Symbol(headers map): Map {
-            "content-length" => Object {
-              "name": "content-length",
-              "value": "7",
-            },
-            "content-type" => Object {
-              "name": "content-type",
-              "value": "undefined",
-            },
-          },
-          Symbol(headers map sorted): null,
-        },
-        "rangeRequested": false,
-        "requestIncludesCredentials": false,
-        "status": 200,
-        "statusText": "OK",
-        "timingAllowPassed": false,
-        "timingInfo": null,
-        "type": "default",
-        "urlList": Array [],
-      },
-      Symbol(headers): Headers {},
-    },
+    Response {},
   ],
 ]
 `;
@@ -213,89 +49,7 @@ Array [
   ],
   Array [
     "Fetch response:",
-    Response {
-      Symbol(state): Object {
-        "aborted": false,
-        "body": Object {
-          "length": 4,
-          "source": Uint8Array [],
-          "stream": ReadableStream {
-            Symbol(kType): "ReadableStream",
-            Symbol(kState): Object {
-              "controller": ReadableByteStreamController {
-                Symbol(kType): "ReadableByteStreamController",
-                Symbol(kState): Object {
-                  "autoAllocateChunkSize": undefined,
-                  "byobRequest": null,
-                  "cancelAlgorithm": undefined,
-                  "closeRequested": false,
-                  "highWaterMark": 0,
-                  "pendingPullIntos": Array [],
-                  "pullAgain": false,
-                  "pullAlgorithm": undefined,
-                  "pulling": false,
-                  "queue": Array [],
-                  "queueTotalSize": 0,
-                  "started": true,
-                  "stream": [Circular],
-                },
-              },
-              "disturbed": true,
-              "reader": ReadableStreamDefaultReader {
-                Symbol(kType): "ReadableStreamDefaultReader",
-                Symbol(kState): Object {
-                  "close": Object {
-                    "promise": Promise {},
-                    "reject": [Function],
-                    "resolve": [Function],
-                  },
-                  "readRequests": Array [],
-                  "stream": [Circular],
-                },
-              },
-              "state": "closed",
-              "storedError": undefined,
-              "transfer": Object {
-                "port1": undefined,
-                "port2": undefined,
-                "promise": undefined,
-                "writable": undefined,
-              },
-            },
-            Symbol(nodejs.webstream.isClosedPromise): Object {
-              "promise": Promise {},
-              "reject": [Function],
-              "resolve": [Function],
-            },
-            Symbol(nodejs.webstream.controllerErrorFunction): [Function],
-          },
-        },
-        "cacheState": "",
-        "headersList": HeadersList {
-          "cookies": null,
-          Symbol(headers map): Map {
-            "content-length" => Object {
-              "name": "content-length",
-              "value": "4",
-            },
-            "content-type" => Object {
-              "name": "content-type",
-              "value": "application/zip",
-            },
-          },
-          Symbol(headers map sorted): null,
-        },
-        "rangeRequested": false,
-        "requestIncludesCredentials": false,
-        "status": 200,
-        "statusText": "OK",
-        "timingAllowPassed": false,
-        "timingInfo": null,
-        "type": "default",
-        "urlList": Array [],
-      },
-      Symbol(headers): Headers {},
-    },
+    Response {},
   ],
 ]
 `;

From 938af543d9c8db3079c446208f0b5092e7e7d6c5 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Sun, 29 Mar 2026 11:23:25 -0400
Subject: [PATCH 08/64] Use createStackTableBySkippingDiscarded in
 focusSubtree, focusFunction, and focusCategory.

---
 src/profile-logic/transforms.ts | 172 ++++++++++----------------------
 1 file changed, 51 insertions(+), 121 deletions(-)

diff --git a/src/profile-logic/transforms.ts b/src/profile-logic/transforms.ts
index c2220a331e..edd23a51f0 100644
--- a/src/profile-logic/transforms.ts
+++ b/src/profile-logic/transforms.ts
@@ -1257,29 +1257,18 @@ export function focusSubtree(
     const prefixDepth = callNodePath.length;
     const stackMatches = new Int32Array(stackTable.length);
     const funcMatchesImplementation = FUNC_MATCHES[implementation];
-    const oldStackToNewStack: Map<
-      IndexIntoStackTable | null,
-      IndexIntoStackTable | null
-    > = new Map();
-    // A root stack's prefix will be null. Maintain that relationship from old to new
-    // stacks by mapping from null to null.
-    oldStackToNewStack.set(null, null);
-    const newFrameCol = [];
-    const newPrefixCol = [];
-    const newCategoryCol = [];
-    const newSubcategoryCol = [];
-    let newLength = 0;
+    const oldStackToNewStack = new Int32Array(stackTable.length).fill(-1);
+    const newPrefixCol: Array<IndexIntoStackTable | null> = [];
+    const keepStack = makeBitSet(stackTable.length);
     for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
       const prefix = stackTable.prefix[stackIndex];
       const prefixMatchesUpTo = prefix !== null ? stackMatches[prefix] : 0;
       let stackMatchesUpTo = -1;
       if (prefixMatchesUpTo !== -1) {
-        const frame = stackTable.frame[stackIndex];
-        const category = stackTable.category[stackIndex];
-        const subcategory = stackTable.subcategory[stackIndex];
         if (prefixMatchesUpTo === prefixDepth) {
           stackMatchesUpTo = prefixDepth;
         } else {
+          const frame = stackTable.frame[stackIndex];
           const funcIndex = frameTable.func[frame];
           if (funcIndex === callNodePath[prefixMatchesUpTo]) {
             stackMatchesUpTo = prefixMatchesUpTo + 1;
@@ -1288,41 +1277,25 @@ export function focusSubtree(
           }
         }
         if (stackMatchesUpTo === prefixDepth) {
-          const newStackIndex = newLength++;
-          const newStackPrefix = oldStackToNewStack.get(prefix);
-          newPrefixCol[newStackIndex] = newStackPrefix ?? null;
-          newFrameCol[newStackIndex] = frame;
-          newCategoryCol[newStackIndex] = category;
-          newSubcategoryCol[newStackIndex] = subcategory;
-          oldStackToNewStack.set(stackIndex, newStackIndex);
+          const prefixNewStack =
+            prefix === null ? -1 : oldStackToNewStack[prefix];
+          oldStackToNewStack[stackIndex] = newPrefixCol.length;
+          newPrefixCol.push(prefixNewStack === -1 ? null : prefixNewStack);
+          setBit(keepStack, stackIndex);
         }
       }
       stackMatches[stackIndex] = stackMatchesUpTo;
     }
 
-    const newStackTable = {
-      frame: newFrameCol,
-      prefix: newPrefixCol,
-      category: new Uint8Array(newCategoryCol),
-      subcategory:
-        stackTable.subcategory instanceof Uint8Array
-          ? new Uint8Array(newSubcategoryCol)
-          : new Uint16Array(newSubcategoryCol),
-      length: newLength,
-    };
-
-    return updateThreadStacks(thread, newStackTable, (oldStack) => {
-      if (oldStack === null || stackMatches[oldStack] !== prefixDepth) {
-        return null;
-      }
-      const newStack = oldStackToNewStack.get(oldStack);
-      if (newStack === undefined) {
-        throw new Error(
-          'Converting from the old stack to a new stack cannot be undefined'
-        );
-      }
-      return newStack;
-    });
+    const newStackTable = createStackTableBySkippingDiscarded(
+      stackTable,
+      newPrefixCol,
+      keepStack
+    );
+    return applyTransformOutputToThread(
+      { newStackTable, effectOnThreadData: { oldStackToNewStack } },
+      thread
+    );
   });
 }
 
@@ -1386,53 +1359,32 @@ export function focusFunction(
 ): Thread {
   return timeCode('focusFunction', () => {
     const { stackTable, frameTable } = thread;
-    // A map oldStack -> newStack+1, implemented as a Uint32Array for performance.
-    // If newStack+1 is zero it means "null", i.e. this stack was filtered out.
-    // Typed arrays are initialized to zero, which we interpret as null.
-    const oldStackToNewStackPlusOne = new Uint32Array(stackTable.length);
-
-    const newFrameCol = [];
-    const newPrefixCol = [];
-    const newCategoryCol = [];
-    const newSubcategoryCol = [];
-    let newLength = 0;
+    const oldStackToNewStack = new Int32Array(stackTable.length).fill(-1);
+    const newPrefixCol: Array<IndexIntoStackTable | null> = [];
+    const keepStack = makeBitSet(stackTable.length);
 
     for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
       const prefix = stackTable.prefix[stackIndex];
       const frameIndex = stackTable.frame[stackIndex];
       const funcIndex = frameTable.func[frameIndex];
 
-      const newPrefixPlusOne =
-        prefix === null ? 0 : oldStackToNewStackPlusOne[prefix];
-      const newPrefix = newPrefixPlusOne === 0 ? null : newPrefixPlusOne - 1;
-      if (newPrefix !== null || funcIndex === funcIndexToFocus) {
-        const newStackIndex = newLength++;
-        newPrefixCol[newStackIndex] = newPrefix;
-        newFrameCol[newStackIndex] = frameIndex;
-        newCategoryCol[newStackIndex] = stackTable.category[stackIndex];
-        newSubcategoryCol[newStackIndex] = stackTable.subcategory[stackIndex];
-        oldStackToNewStackPlusOne[stackIndex] = newStackIndex + 1;
+      const prefixNewStack = prefix === null ? -1 : oldStackToNewStack[prefix];
+      if (prefixNewStack !== -1 || funcIndex === funcIndexToFocus) {
+        oldStackToNewStack[stackIndex] = newPrefixCol.length;
+        newPrefixCol.push(prefixNewStack === -1 ? null : prefixNewStack);
+        setBit(keepStack, stackIndex);
       }
     }
 
-    const newStackTable = {
-      frame: newFrameCol,
-      prefix: newPrefixCol,
-      category: new Uint8Array(newCategoryCol),
-      subcategory:
-        stackTable.subcategory instanceof Uint8Array
-          ? new Uint8Array(newSubcategoryCol)
-          : new Uint16Array(newSubcategoryCol),
-      length: newLength,
-    };
-
-    return updateThreadStacks(thread, newStackTable, (oldStack) => {
-      if (oldStack === null) {
-        return null;
-      }
-      const newStackPlusOne = oldStackToNewStackPlusOne[oldStack];
-      return newStackPlusOne === 0 ? null : newStackPlusOne - 1;
-    });
+    const newStackTable = createStackTableBySkippingDiscarded(
+      stackTable,
+      newPrefixCol,
+      keepStack
+    );
+    return applyTransformOutputToThread(
+      { newStackTable, effectOnThreadData: { oldStackToNewStack } },
+      thread
+    );
   });
 }
 
@@ -1498,56 +1450,34 @@ export function focusSelf(
 export function focusCategory(thread: Thread, category: IndexIntoCategoryList) {
   return timeCode('focusCategory', () => {
     const { stackTable } = thread;
-    const oldStackToNewStack: Map<
-      IndexIntoStackTable | null,
-      IndexIntoStackTable | null
-    > = new Map();
-    oldStackToNewStack.set(null, null);
-
-    const newFrameCol = [];
-    const newPrefixCol = [];
-    const newCategoryCol = [];
-    const newSubcategoryCol = [];
-    let newLength = 0;
+    const oldStackToNewStack = new Int32Array(stackTable.length).fill(-1);
+    const newPrefixCol: Array<IndexIntoStackTable | null> = [];
+    const keepStack = makeBitSet(stackTable.length);
 
     // fill the new stack table with the kept frames
     for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
       const prefix = stackTable.prefix[stackIndex];
-      const newPrefix = oldStackToNewStack.get(prefix);
-      if (newPrefix === undefined) {
-        throw new Error('The prefix should not map to an undefined value');
-      }
+      const prefixNewStack = prefix === null ? -1 : oldStackToNewStack[prefix];
 
       if (stackTable.category[stackIndex] !== category) {
-        oldStackToNewStack.set(stackIndex, newPrefix);
+        oldStackToNewStack[stackIndex] = prefixNewStack;
         continue;
       }
 
-      const newStackIndex = newLength++;
-      newPrefixCol[newStackIndex] = newPrefix;
-      newFrameCol[newStackIndex] = stackTable.frame[stackIndex];
-      newCategoryCol[newStackIndex] = stackTable.category[stackIndex];
-      newSubcategoryCol[newStackIndex] = stackTable.subcategory[stackIndex];
-      oldStackToNewStack.set(stackIndex, newStackIndex);
+      oldStackToNewStack[stackIndex] = newPrefixCol.length;
+      newPrefixCol.push(prefixNewStack === -1 ? null : prefixNewStack);
+      setBit(keepStack, stackIndex);
     }
 
-    const newStackTable = {
-      frame: newFrameCol,
-      prefix: newPrefixCol,
-      category: new Uint8Array(newCategoryCol),
-      subcategory:
-        stackTable.subcategory instanceof Uint8Array
-          ? new Uint8Array(newSubcategoryCol)
-          : new Uint16Array(newSubcategoryCol),
-      length: newLength,
-    };
-
-    const updated = updateThreadStacks(
-      thread,
-      newStackTable,
-      getMapStackUpdater(oldStackToNewStack)
+    const newStackTable = createStackTableBySkippingDiscarded(
+      stackTable,
+      newPrefixCol,
+      keepStack
+    );
+    return applyTransformOutputToThread(
+      { newStackTable, effectOnThreadData: { oldStackToNewStack } },
+      thread
     );
-    return updated;
   });
 }
 

From bc322140c7cdc3fa6b83cf7d454697ffcf8f9cde Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Thu, 2 Apr 2026 09:47:14 -0400
Subject: [PATCH 09/64] Change mergeCallNode to only create a new prefix
 column, like mergeFunction.

---
 src/profile-logic/transforms.ts | 133 +++++++++++++-------------------
 1 file changed, 54 insertions(+), 79 deletions(-)

diff --git a/src/profile-logic/transforms.ts b/src/profile-logic/transforms.ts
index edd23a51f0..05ba86b2bc 100644
--- a/src/profile-logic/transforms.ts
+++ b/src/profile-logic/transforms.ts
@@ -10,7 +10,6 @@ import {
   toValidImplementationFilter,
   updateThreadStacks,
   updateThreadStacksByGeneratingNewStackColumns,
-  getMapStackUpdater,
   getOriginAnnotationForFunc,
   createStackTableBySkippingDiscarded,
   applyTransformOutputToThread,
@@ -759,102 +758,78 @@ export function mergeCallNode(
 ): Thread {
   return timeCode('mergeCallNode', () => {
     const { stackTable, frameTable } = thread;
-    // Depth here is 0 indexed.
-    const depthAtCallNodePathLeaf = callNodePath.length - 1;
-    const oldStackToNewStack: Map<
+
+    // Maps merged stacks to their effective parent (the stack that samples pointing
+    // to the merged stack should be attributed to). Only contains entries for merged
+    // stacks; the vast majority of stacks are not merged and map to themselves.
+    const mergedStackToEffectiveParent = new Map<
       IndexIntoStackTable | null,
       IndexIntoStackTable | null
-    > = new Map();
-    // A root stack's prefix will be null. Maintain that relationship from old to new
-    // stacks by mapping from null to null.
-    oldStackToNewStack.set(null, null);
-    const newFrameCol = [];
-    const newPrefixCol = [];
-    const newCategoryCol = [];
-    const newSubcategoryCol = [];
-    let newLength = 0;
-    // Provide two arrays to efficiently cache values for the algorithm. This probably
-    // could be refactored to use only one array here.
-    const stackDepths = [];
-    const stackMatches = [];
+    >();
+    const newPrefixCol = new Array<IndexIntoStackTable | null>(
+      stackTable.length
+    );
+
     const funcMatchesImplementation = FUNC_MATCHES[implementation];
+
+    const callNodePathLength = callNodePath.length;
+    // A map to keep track of whether a stack matches (part of) the call node path.
+    // If undefined: no match
+    // Otherwise: length of the partial match, including this stack
+    // All values are < callNodePathLength.
+    const partialMatchLengthAtStack = new Map<
+      IndexIntoStackTable | null,
+      number
+    >();
+    partialMatchLengthAtStack.set(null, 0);
     for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
       const prefix = stackTable.prefix[stackIndex];
+
+      // If our prefix got merged away, remap it to its parent.
+      const parentOfPrefix = mergedStackToEffectiveParent.get(prefix);
+      const effectivePrefix =
+        parentOfPrefix !== undefined ? parentOfPrefix : prefix;
+      newPrefixCol[stackIndex] = effectivePrefix;
+
+      const prefixPartialMatchLength = partialMatchLengthAtStack.get(prefix);
+      if (prefixPartialMatchLength === undefined) {
+        // No match, nothing else to do here
+        continue;
+      }
+
+      // Now we know that this stack's prefix was a (partial) match for our CallNodePath.
       const frameIndex = stackTable.frame[stackIndex];
-      const category = stackTable.category[stackIndex];
-      const subcategory = stackTable.subcategory[stackIndex];
       const funcIndex = frameTable.func[frameIndex];
 
-      const doesPrefixMatch = prefix === null ? true : stackMatches[prefix];
-      const prefixDepth: number = prefix === null ? -1 : stackDepths[prefix];
-      const currentFuncOnPath = callNodePath[prefixDepth + 1];
-
-      let doMerge = false;
-      let stackDepth: number = prefixDepth;
-      let doesMatchCallNodePath;
-      if (doesPrefixMatch && stackDepth < depthAtCallNodePathLeaf) {
-        // This stack's prefixes were in our CallNodePath.
-        if (currentFuncOnPath === funcIndex) {
-          // This stack's function matches too!
-          doesMatchCallNodePath = true;
-          if (stackDepth + 1 === depthAtCallNodePathLeaf) {
-            // Holy cow, we found a match for our merge operation and can merge this stack.
-            doMerge = true;
-          } else {
-            // Since we found a match, increase the stack depth. This should match
-            // the depth of the implementation filtered stacks.
-            stackDepth++;
-          }
-        } else if (!funcMatchesImplementation(thread, funcIndex)) {
-          // This stack's function does not match the CallNodePath, however it's not part
-          // of the CallNodePath's implementation filter. Go ahead and keep it.
-          doesMatchCallNodePath = true;
+      if (funcIndex === callNodePath[prefixPartialMatchLength]) {
+        // This stack's function matches too!
+        const matchLength = prefixPartialMatchLength + 1;
+        if (matchLength === callNodePathLength) {
+          // The entire path matched and we found a node that needs to be merged away.
+          mergedStackToEffectiveParent.set(stackIndex, effectivePrefix);
         } else {
-          // While all of the predecessors matched, this stack's function does not :(
-          doesMatchCallNodePath = false;
+          // Not reached the end yet, store the partial match length.
+          partialMatchLengthAtStack.set(stackIndex, matchLength);
         }
+      } else if (!funcMatchesImplementation(thread, funcIndex)) {
+        // This stack's function does not match the CallNodePath, however it's not part
+        // of the CallNodePath's implementation filter. Inherit the parent's partial
+        // match length
+        partialMatchLengthAtStack.set(stackIndex, prefixPartialMatchLength);
       } else {
-        // This stack is not part of a matching branch of the tree.
-        doesMatchCallNodePath = false;
-      }
-      stackMatches[stackIndex] = doesMatchCallNodePath;
-      stackDepths[stackIndex] = stackDepth;
-
-      // Map the oldStackToNewStack, and only push on the stacks that aren't merged.
-      if (doMerge) {
-        const newStackPrefix = oldStackToNewStack.get(prefix);
-        oldStackToNewStack.set(
-          stackIndex,
-          newStackPrefix === undefined ? null : newStackPrefix
-        );
-      } else {
-        const newStackIndex = newLength++;
-        const newStackPrefix = oldStackToNewStack.get(prefix);
-        newPrefixCol[newStackIndex] =
-          newStackPrefix === undefined ? null : newStackPrefix;
-        newFrameCol[newStackIndex] = frameIndex;
-        newCategoryCol[newStackIndex] = category;
-        newSubcategoryCol[newStackIndex] = subcategory;
-        oldStackToNewStack.set(stackIndex, newStackIndex);
+        // While all of the predecessors matched, this stack's function does not :(
       }
     }
 
     const newStackTable = {
-      frame: newFrameCol,
+      ...stackTable,
       prefix: newPrefixCol,
-      category: new Uint8Array(newCategoryCol),
-      subcategory:
-        stackTable.subcategory instanceof Uint8Array
-          ? new Uint8Array(newSubcategoryCol)
-          : new Uint16Array(newSubcategoryCol),
-      length: newLength,
     };
 
-    return updateThreadStacks(
-      thread,
-      newStackTable,
-      getMapStackUpdater(oldStackToNewStack)
-    );
+    return updateThreadStacks(thread, newStackTable, (oldStack) => {
+      const effectiveParent = mergedStackToEffectiveParent.get(oldStack);
+      return effectiveParent !== undefined ? effectiveParent : oldStack;
+    });
   });
 }
 

From 1244dfcbc4cfc1fcd1fbbe8349c45b319d27dafd Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Fri, 20 Mar 2026 15:25:24 -0400
Subject: [PATCH 10/64] Update the hovered item when panning any viewport
 canvas.

Fixes #3807.
---
 src/components/shared/chart/Canvas.tsx | 41 +++++++++++++-------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/components/shared/chart/Canvas.tsx b/src/components/shared/chart/Canvas.tsx
index b2dc0380e7..4f12710e52 100644
--- a/src/components/shared/chart/Canvas.tsx
+++ b/src/components/shared/chart/Canvas.tsx
@@ -85,10 +85,9 @@ export class ChartCanvas<Item> extends React.Component<
   State<Item>
 > {
   _devicePixelRatio: number = 1;
-  // The current mouse position. Needs to be stored for tooltip
-  // hit-test if props update.
-  _offsetX: CssPixels = 0;
-  _offsetY: CssPixels = 0;
+  // The current mouse position inside the canvas, or null if the mouse
+  // is outside. Needs to be stored for tooltip hit-test if props update.
+  _mousePosition: { x: CssPixels; y: CssPixels } | null = null;
   // The position of the most recent mouse down event. Needed for
   // comparison with the current mouse position in order to
   // distinguish between clicks and drags.
@@ -267,8 +266,9 @@ export class ChartCanvas<Item> extends React.Component<
       this.props.onMouseMove(event);
     }
 
-    this._offsetX = event.nativeEvent.offsetX;
-    this._offsetY = event.nativeEvent.offsetY;
+    const offsetX = event.nativeEvent.offsetX;
+    const offsetY = event.nativeEvent.offsetY;
+    this._mousePosition = { x: offsetX, y: offsetY };
     // event.buttons is a bitfield representing which buttons are pressed at the
     // time of the mousemove event. The first bit is for the left click.
     // This operation checks if the left button is clicked, but this will also
@@ -281,15 +281,15 @@ export class ChartCanvas<Item> extends React.Component<
     if (
       !this._mouseMovedWhileClicked &&
       hasLeftClick &&
-      (Math.abs(this._offsetX - this._mouseDownOffsetX) >
+      (Math.abs(offsetX - this._mouseDownOffsetX) >
         MOUSE_CLICK_MAX_MOVEMENT_DELTA ||
-        Math.abs(this._offsetY - this._mouseDownOffsetY) >
+        Math.abs(offsetY - this._mouseDownOffsetY) >
           MOUSE_CLICK_MAX_MOVEMENT_DELTA)
     ) {
       this._mouseMovedWhileClicked = true;
     }
 
-    const maybeHoveredItem = this.props.hitTest(this._offsetX, this._offsetY);
+    const maybeHoveredItem = this.props.hitTest(offsetX, offsetY);
     if (maybeHoveredItem !== null) {
       if (this.state.selectedItem === null) {
         // Update both the hovered item and the pageX and pageY values. The
@@ -323,6 +323,7 @@ export class ChartCanvas<Item> extends React.Component<
   };
 
   _onMouseOut = () => {
+    this._mousePosition = null;
     if (
       this.state.hoveredItem !== null &&
       // This persistTooltips property is part of the web console API. It helps
@@ -390,18 +391,16 @@ export class ChartCanvas<Item> extends React.Component<
   };
 
   override UNSAFE_componentWillReceiveProps() {
-    // It is possible that the data backing the chart has been
-    // changed, for instance after symbolication. Clear the
-    // hoveredItem if the mouse no longer hovers over it.
-    const { hoveredItem } = this.state;
-    if (
-      hoveredItem !== null &&
-      !hoveredItemsAreEqual(
-        this.props.hitTest(this._offsetX, this._offsetY),
-        hoveredItem
-      )
-    ) {
-      this.setState({ hoveredItem: null });
+    // Update the hovered item if the rendered data has changed or if
+    // the chart has been scrolled so that a new element is under the
+    // mouse cursor.
+    if (!this._mousePosition) {
+      return;
+    }
+    const { x, y } = this._mousePosition;
+    const newHoveredItem = this.props.hitTest(x, y);
+    if (!hoveredItemsAreEqual(newHoveredItem, this.state.hoveredItem)) {
+      this.setState({ hoveredItem: newHoveredItem });
     }
   }
 

From 3682333ca384dfedcb6bb2475af7f2bea236fc97 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Mon, 6 Apr 2026 15:10:40 +0000
Subject: [PATCH 11/64] Pontoon/Firefox Profiler: Update Portuguese (Brazil)
 (pt-BR)

Co-authored-by: Marcelo Ghelman <marcelo.ghelman@gmail.com> (pt-BR)
---
 locales/pt-BR/app.ftl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/locales/pt-BR/app.ftl b/locales/pt-BR/app.ftl
index 10e9ff686a..cb0ad49bad 100644
--- a/locales/pt-BR/app.ftl
+++ b/locales/pt-BR/app.ftl
@@ -284,6 +284,13 @@ Home--enable-button-unavailable =
 # This message can be seen on https://main--perf-html.netlify.app/ .
 Home--web-channel-unavailable = Esta instância do profiler não conseguiu se conectar ao WebChannel. Isso geralmente significa que está sendo executado em um host diferente daquele especificado na preferência <code>devtools.performance.recording.ui-base-url</code>. Se você quiser capturar novos profiles com esta instância e dar a ela controle programático do botão de menu do profiler, pode ir em <code>about: config</code> e alterar a preferência.
 Home--record-instructions = Para iniciar a gravação de um profile, clique no botão de gravação de profile ou use os atalhos de teclado. O ícone fica azul quando um profile está sendo gravado. Use <kbd>Capturar</kbd> para carregar os dados no profiler.firefox.com.
+Home--instructions-content2 =
+    A gravação de profiles de desempenho requer o <a>{ -firefox-brand-name } de computador</a>.
+    No entanto, profiles existentes podem ser vistos em qualquer navegador moderno.
+Home--fenix-instructions-directly = É possível criar profiles do { -firefox-android-brand-name } diretamente neste dispositivo. Para mais informações, consulte <a>Como criar profiles do { -firefox-android-brand-name } diretamente no dispositivo</a>.
+Home--fenix-instructions-remotely =
+    Você também pode criar profiles do { -firefox-android-brand-name } remotamente a partir do { -firefox-brand-name } de computador. Para mais informações, consulte esta documentação:
+    <a>Como criar profiles do { -firefox-android-brand-name } remotamente</a>.
 Home--record-instructions-start-stop = Interrompa e inicie a gravação de profiles
 Home--record-instructions-capture-load = Capture e carregue um profile
 Home--profiler-motto = Capture um profile de desempenho. Analise. Compartilhe. Torne a web mais rápida.

From a3dc3e63defee97bfee70453a137fda9dd535503 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Apr 2026 11:59:02 +0200
Subject: [PATCH 12/64] Bump lodash from 4.17.23 to 4.18.1 (#5933)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.23...4.18.1)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.18.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bd6dc08b88..2d0e125d2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7323,9 +7323,9 @@ lodash.truncate@^4.4.2:
   integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
-  integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 log-symbols@^4.1.0:
   version "4.1.0"

From 99f4176a580f8fde0f44afb4afcdac494a4bdab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Tue, 7 Apr 2026 12:24:51 +0200
Subject: [PATCH 13/64] Fallback to javascript highlighting in the source view
 as a backup (#5936)

---
 src/components/shared/SourceView-codemirror.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/shared/SourceView-codemirror.ts b/src/components/shared/SourceView-codemirror.ts
index 5365efbe54..6ddf2823b0 100644
--- a/src/components/shared/SourceView-codemirror.ts
+++ b/src/components/shared/SourceView-codemirror.ts
@@ -77,7 +77,11 @@ function _languageExtForPath(
   ) {
     return cpp();
   }
-  return [];
+
+  // Fallback to JavaScript highlighting. Inline scripts share the page URL, so
+  // their path won't have a .js extension. This may be incorrect for
+  // unknown/unsupported file types, but is the best guess for the common case.
+  return javascript();
 }
 
 // Adjustments to make a CodeMirror editor work as a non-editable code viewer.

From a94ccca63c9ccfd1b6433e810949e64e5b5f0f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Tue, 7 Apr 2026 12:39:54 +0200
Subject: [PATCH 14/64] Properly type the return value of _languageExtForPath
 (#5937)

---
 src/components/shared/SourceView-codemirror.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/shared/SourceView-codemirror.ts b/src/components/shared/SourceView-codemirror.ts
index 6ddf2823b0..ea61ab2357 100644
--- a/src/components/shared/SourceView-codemirror.ts
+++ b/src/components/shared/SourceView-codemirror.ts
@@ -20,7 +20,7 @@
  */
 import { EditorView, lineNumbers } from '@codemirror/view';
 import { EditorState, Compartment } from '@codemirror/state';
-import { syntaxHighlighting } from '@codemirror/language';
+import { type LanguageSupport, syntaxHighlighting } from '@codemirror/language';
 import { classHighlighter } from '@lezer/highlight';
 import { cpp } from '@codemirror/lang-cpp';
 import { rust } from '@codemirror/lang-rust';
@@ -46,9 +46,7 @@ const highlightedLineConf = new Compartment();
 const lineNumbersConf = new Compartment();
 
 // Detect the right language based on the file extension.
-function _languageExtForPath(
-  path: string | null
-): any /* LanguageSupport | [] */ {
+function _languageExtForPath(path: string | null): LanguageSupport | [] {
   if (path === null) {
     return [];
   }

From 64becd049a6443681ab2e5ac537fcfb7d25060c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Tue, 7 Apr 2026 14:32:25 +0200
Subject: [PATCH 15/64] Update typescript eslint dependencies (#5938)

`yarn lint-js` was showing a warning, saying that the version of
typescript wasn't supported. This was due to the fact that
`@typescript-eslint` didn't officially support TS 6. This is now
resolved in the new versions.
---
 package.json |   6 +-
 yarn.lock    | 183 ++++++++++++++++++++++++++-------------------------
 2 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/package.json b/package.json
index 66225e7dbf..43354850f9 100644
--- a/package.json
+++ b/package.json
@@ -134,8 +134,8 @@
     "@types/react-transition-group": "^4.4.5",
     "@types/redux-logger": "^3.0.6",
     "@types/tgwf__co2": "^0.14.2",
-    "@typescript-eslint/eslint-plugin": "^8.56.0",
-    "@typescript-eslint/parser": "^8.56.0",
+    "@typescript-eslint/eslint-plugin": "^8.58.0",
+    "@typescript-eslint/parser": "^8.58.0",
     "alex": "^11.0.1",
     "babel-jest": "^30.2.0",
     "babel-plugin-module-resolver": "^5.0.2",
@@ -177,7 +177,7 @@
     "stylelint-config-idiomatic-order": "^10.0.0",
     "stylelint-config-standard": "^40.0.0",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.56.0",
+    "typescript-eslint": "^8.58.0",
     "workbox-cli": "^7.4.0",
     "yargs": "^18.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 2d0e125d2b..dd43ea0c55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2489,38 +2489,29 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.56.0", "@typescript-eslint/eslint-plugin@^8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.0.tgz#5aec3db807a6b8437ea5d5ebf7bd16b4119aba8d"
-  integrity sha512-lRyPDLzNCuae71A3t9NEINBiTn7swyOhvUj3MyUOxb8x6g6vPEFoOU+ZRmGMusNC3X3YMhqMIX7i8ShqhT74Pw==
+"@typescript-eslint/eslint-plugin@8.58.0", "@typescript-eslint/eslint-plugin@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.0.tgz#ad40e492f1931f46da1bd888e52b9e56df9063aa"
+  integrity sha512-RLkVSiNuUP1C2ROIWfqX+YcUfLaSnxGE/8M+Y57lopVwg9VTYYfhuz15Yf1IzCKgZj6/rIbYTmJCUSqr76r0Wg==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.56.0"
-    "@typescript-eslint/type-utils" "8.56.0"
-    "@typescript-eslint/utils" "8.56.0"
-    "@typescript-eslint/visitor-keys" "8.56.0"
+    "@typescript-eslint/scope-manager" "8.58.0"
+    "@typescript-eslint/type-utils" "8.58.0"
+    "@typescript-eslint/utils" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
-    ts-api-utils "^2.4.0"
-
-"@typescript-eslint/parser@8.56.0", "@typescript-eslint/parser@^8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.56.0.tgz#8ecff1678b8b1a742d29c446ccf5eeea7f971d72"
-  integrity sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "8.56.0"
-    "@typescript-eslint/types" "8.56.0"
-    "@typescript-eslint/typescript-estree" "8.56.0"
-    "@typescript-eslint/visitor-keys" "8.56.0"
-    debug "^4.4.3"
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/project-service@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.56.0.tgz#bb8562fecd8f7922e676fc6a1189c20dd7991d73"
-  integrity sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==
+"@typescript-eslint/parser@8.58.0", "@typescript-eslint/parser@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.0.tgz#da04ece1967b6c2fe8f10c3473dabf3825795ef7"
+  integrity sha512-rLoGZIf9afaRBYsPUMtvkDWykwXwUPL60HebR4JgTI8mxfFe2cQTu3AGitANp4b9B2QlVru6WzjgB2IzJKiCSA==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.56.0"
-    "@typescript-eslint/types" "^8.56.0"
+    "@typescript-eslint/scope-manager" "8.58.0"
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/typescript-estree" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
     debug "^4.4.3"
 
 "@typescript-eslint/project-service@8.56.1":
@@ -2532,13 +2523,14 @@
     "@typescript-eslint/types" "^8.56.1"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.56.0.tgz#604030a4c6433df3728effdd441d47f45a86edb4"
-  integrity sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==
+"@typescript-eslint/project-service@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.0.tgz#66ceda0aabf7427aec3e2713fa43eb278dead2aa"
+  integrity sha512-8Q/wBPWLQP1j16NxoPNIKpDZFMaxl7yWIoqXWYeWO+Bbd2mjgvoF0dxP2jKZg5+x49rgKdf7Ck473M8PC3V9lg==
   dependencies:
-    "@typescript-eslint/types" "8.56.0"
-    "@typescript-eslint/visitor-keys" "8.56.0"
+    "@typescript-eslint/tsconfig-utils" "^8.58.0"
+    "@typescript-eslint/types" "^8.58.0"
+    debug "^4.4.3"
 
 "@typescript-eslint/scope-manager@8.56.1", "@typescript-eslint/scope-manager@^8.56.0":
   version "8.56.1"
@@ -2548,51 +2540,44 @@
     "@typescript-eslint/types" "8.56.1"
     "@typescript-eslint/visitor-keys" "8.56.1"
 
-"@typescript-eslint/tsconfig-utils@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.0.tgz#2538ce83cbc376e685487960cbb24b65fe2abc4e"
-  integrity sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==
+"@typescript-eslint/scope-manager@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.0.tgz#e304142775e49a1b7ac3c8bf2536714447c72cab"
+  integrity sha512-W1Lur1oF50FxSnNdGp3Vs6P+yBRSmZiw4IIjEeYxd8UQJwhUF0gDgDD/W/Tgmh73mxgEU3qX0Bzdl/NGuSPEpQ==
+  dependencies:
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
 
-"@typescript-eslint/tsconfig-utils@8.56.1", "@typescript-eslint/tsconfig-utils@^8.56.0", "@typescript-eslint/tsconfig-utils@^8.56.1":
+"@typescript-eslint/tsconfig-utils@8.56.1", "@typescript-eslint/tsconfig-utils@^8.56.1":
   version "8.56.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz#1afa830b0fada5865ddcabdc993b790114a879b7"
   integrity sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==
 
-"@typescript-eslint/type-utils@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.56.0.tgz#72b4edc1fc73988998f1632b3ec99c2a66eaac6e"
-  integrity sha512-qX2L3HWOU2nuDs6GzglBeuFXviDODreS58tLY/BALPC7iu3Fa+J7EOTwnX9PdNBxUI7Uh0ntP0YWGnxCkXzmfA==
+"@typescript-eslint/tsconfig-utils@8.58.0", "@typescript-eslint/tsconfig-utils@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.0.tgz#c5a8edb21f31e0fdee565724e1b984171c559482"
+  integrity sha512-doNSZEVJsWEu4htiVC+PR6NpM+pa+a4ClH9INRWOWCUzMst/VA9c4gXq92F8GUD1rwhNvRLkgjfYtFXegXQF7A==
+
+"@typescript-eslint/type-utils@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.0.tgz#ce0e72cd967ffbbe8de322db6089bd4374be352f"
+  integrity sha512-aGsCQImkDIqMyx1u4PrVlbi/krmDsQUs4zAcCV6M7yPcPev+RqVlndsJy9kJ8TLihW9TZ0kbDAzctpLn5o+lOg==
   dependencies:
-    "@typescript-eslint/types" "8.56.0"
-    "@typescript-eslint/typescript-estree" "8.56.0"
-    "@typescript-eslint/utils" "8.56.0"
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/typescript-estree" "8.58.0"
+    "@typescript-eslint/utils" "8.58.0"
     debug "^4.4.3"
-    ts-api-utils "^2.4.0"
-
-"@typescript-eslint/types@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.56.0.tgz#a2444011b9a98ca13d70411d2cbfed5443b3526a"
-  integrity sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==
+    ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.56.1", "@typescript-eslint/types@^8.56.0", "@typescript-eslint/types@^8.56.1":
+"@typescript-eslint/types@8.56.1", "@typescript-eslint/types@^8.56.1":
   version "8.56.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.56.1.tgz#975e5942bf54895291337c91b9191f6eb0632ab9"
   integrity sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==
 
-"@typescript-eslint/typescript-estree@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.0.tgz#fadbc74c14c5bac947db04980ff58bb178701c2e"
-  integrity sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==
-  dependencies:
-    "@typescript-eslint/project-service" "8.56.0"
-    "@typescript-eslint/tsconfig-utils" "8.56.0"
-    "@typescript-eslint/types" "8.56.0"
-    "@typescript-eslint/visitor-keys" "8.56.0"
-    debug "^4.4.3"
-    minimatch "^9.0.5"
-    semver "^7.7.3"
-    tinyglobby "^0.2.15"
-    ts-api-utils "^2.4.0"
+"@typescript-eslint/types@8.58.0", "@typescript-eslint/types@^8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.0.tgz#e94ae7abdc1c6530e71183c1007b61fa93112a5a"
+  integrity sha512-O9CjxypDT89fbHxRfETNoAnHj/i6IpRK0CvbVN3qibxlLdo5p5hcLmUuCCrHMpxiWSwKyI8mCP7qRNYuOJ0Uww==
 
 "@typescript-eslint/typescript-estree@8.56.1":
   version "8.56.1"
@@ -2609,15 +2594,30 @@
     tinyglobby "^0.2.15"
     ts-api-utils "^2.4.0"
 
-"@typescript-eslint/utils@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.56.0.tgz#063ce6f702ec603de1b83ee795ed5e877d6f7841"
-  integrity sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==
+"@typescript-eslint/typescript-estree@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.0.tgz#ed233faa8e2f2a2e1357c3e7d553d6465a0ee59a"
+  integrity sha512-7vv5UWbHqew/dvs+D3e1RvLv1v2eeZ9txRHPnEEBUgSNLx5ghdzjHa0sgLWYVKssH+lYmV0JaWdoubo0ncGYLA==
+  dependencies:
+    "@typescript-eslint/project-service" "8.58.0"
+    "@typescript-eslint/tsconfig-utils" "8.58.0"
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/visitor-keys" "8.58.0"
+    debug "^4.4.3"
+    minimatch "^10.2.2"
+    semver "^7.7.3"
+    tinyglobby "^0.2.15"
+    ts-api-utils "^2.5.0"
+
+"@typescript-eslint/utils@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.0.tgz#21a74a7963b0d288b719a4121c7dd555adaab3c3"
+  integrity sha512-RfeSqcFeHMHlAWzt4TBjWOAtoW9lnsAGiP3GbaX9uVgTYYrMbVnGONEfUCiSss+xMHFl+eHZiipmA8WkQ7FuNA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.56.0"
-    "@typescript-eslint/types" "8.56.0"
-    "@typescript-eslint/typescript-estree" "8.56.0"
+    "@typescript-eslint/scope-manager" "8.58.0"
+    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/typescript-estree" "8.58.0"
 
 "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
   version "8.56.1"
@@ -2629,14 +2629,6 @@
     "@typescript-eslint/types" "8.56.1"
     "@typescript-eslint/typescript-estree" "8.56.1"
 
-"@typescript-eslint/visitor-keys@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.0.tgz#7d6592ab001827d3ce052155edf7ecad19688d7d"
-  integrity sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==
-  dependencies:
-    "@typescript-eslint/types" "8.56.0"
-    eslint-visitor-keys "^5.0.0"
-
 "@typescript-eslint/visitor-keys@8.56.1":
   version "8.56.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz#50e03475c33a42d123dc99e63acf1841c0231f87"
@@ -2645,6 +2637,14 @@
     "@typescript-eslint/types" "8.56.1"
     eslint-visitor-keys "^5.0.0"
 
+"@typescript-eslint/visitor-keys@8.58.0":
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.0.tgz#2abd55a4be70fd55967aceaba4330b9ba9f45189"
+  integrity sha512-XJ9UD9+bbDo4a4epraTwG3TsNPeiB9aShrUneAVXy8q4LuwowN+qu89/6ByLMINqvIMeI9H9hOHQtg/ijrYXzQ==
+  dependencies:
+    "@typescript-eslint/types" "8.58.0"
+    eslint-visitor-keys "^5.0.0"
+
 "@ungap/structured-clone@^1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
@@ -8286,7 +8286,7 @@ minimatch@^8.0.2:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.4, minimatch@^9.0.5:
+minimatch@^9.0.4:
   version "9.0.5"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
   integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
@@ -10928,6 +10928,11 @@ ts-api-utils@^2.4.0:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.4.0.tgz#2690579f96d2790253bdcf1ca35d569ad78f9ad8"
   integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==
 
+ts-api-utils@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz#4acd4a155e22734990a5ed1fe9e97f113bcb37c1"
+  integrity sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==
+
 tsconfig-paths@^3.15.0:
   version "3.15.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
@@ -11080,15 +11085,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.56.0:
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.56.0.tgz#f4686ccaaf2fb86daf0133820da40ca5961a2236"
-  integrity sha512-c7toRLrotJ9oixgdW7liukZpsnq5CZ7PuKztubGYlNppuTqhIoWfhgHo/7EU0v06gS2l/x0i2NEFK1qMIf0rIg==
+typescript-eslint@^8.58.0:
+  version "8.58.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.0.tgz#5758b1b68ae7ec05d756b98c63a1f6953a01172b"
+  integrity sha512-e2TQzKfaI85fO+F3QywtX+tCTsu/D3WW5LVU6nz8hTFKFZ8yBJ6mSYRpXqdR3mFjPWmO0eWsTa5f+UpAOe/FMA==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.56.0"
-    "@typescript-eslint/parser" "8.56.0"
-    "@typescript-eslint/typescript-estree" "8.56.0"
-    "@typescript-eslint/utils" "8.56.0"
+    "@typescript-eslint/eslint-plugin" "8.58.0"
+    "@typescript-eslint/parser" "8.58.0"
+    "@typescript-eslint/typescript-estree" "8.58.0"
+    "@typescript-eslint/utils" "8.58.0"
 
 typescript@^6.0.2:
   version "6.0.2"

From b41e166a1d6cfc797002ee25f71fa1b7fdc62e7b Mon Sep 17 00:00:00 2001
From: Paul Adenot <paul@paul.cx>
Date: Tue, 7 Apr 2026 19:24:38 +0200
Subject: [PATCH 16/64] Fix extractGeckoLogs for structured Log marker format
 (bug 2022540) (#5927)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug 2022540 switched Log markers from {module, name} fields to structured
{level, message} fields, with the module name stored as the marker name.
The old format used a single module string that could include the log level
prefix (e.g. D/cubeb); the new format uses an integer level field.

Profiles use one format exclusively, never a mix. We detect which by
checking the first Log marker found in each thread.

Co-authored-by: Nazım Can Altınova <canaltinova@gmail.com>
---
 src/test/unit/window-console.test.ts | 50 ++++++++++++++++++++++++++++
 src/types/markers.ts                 | 16 ++++++---
 src/utils/window-console.ts          | 48 +++++++++++++++-----------
 3 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/src/test/unit/window-console.test.ts b/src/test/unit/window-console.test.ts
index 82c939f7c3..8dbd8a0a3f 100644
--- a/src/test/unit/window-console.test.ts
+++ b/src/test/unit/window-console.test.ts
@@ -112,6 +112,56 @@ describe('console-accessible values on the window object', function () {
     `);
   });
 
+  it('can extract gecko logs in new structured format', function () {
+    const profile = getProfileWithMarkers([
+      [
+        'nsHttp',
+        170,
+        null,
+        {
+          type: 'Log',
+          level: 1,
+          message:
+            'ParentChannelListener::ParentChannelListener [this=7fb5e19b98d0]',
+        },
+      ],
+      [
+        'nsJarProtocol',
+        190,
+        null,
+        {
+          type: 'Log',
+          level: 2,
+          message: 'nsJARChannel::nsJARChannel [this=0x87f1ec80]\n',
+        },
+      ],
+      ['cubeb', 200, null, { type: 'Log', level: 3, message: 'cubeb_init' }],
+      [
+        'AudioStream',
+        210,
+        null,
+        { type: 'Log', level: 4, message: 'AudioStream init\n' },
+      ],
+      [
+        'VideoSink',
+        220,
+        null,
+        { type: 'Log', level: 5, message: 'VideoSink::VideoSink' },
+      ],
+    ]);
+    const store = storeWithProfile(profile);
+    const target: MixedObject = {};
+    addDataToWindowObject(store.getState, store.dispatch, target);
+    const result = (target as any).extractGeckoLogs();
+    expect(result).toBe(stripIndent`
+      1970-01-01 00:00:00.170000000 UTC - [Unknown Process 0: Empty]: E/nsHttp ParentChannelListener::ParentChannelListener [this=7fb5e19b98d0]
+      1970-01-01 00:00:00.190000000 UTC - [Unknown Process 0: Empty]: W/nsJarProtocol nsJARChannel::nsJARChannel [this=0x87f1ec80]
+      1970-01-01 00:00:00.200000000 UTC - [Unknown Process 0: Empty]: I/cubeb cubeb_init
+      1970-01-01 00:00:00.210000000 UTC - [Unknown Process 0: Empty]: D/AudioStream AudioStream init
+      1970-01-01 00:00:00.220000000 UTC - [Unknown Process 0: Empty]: V/VideoSink VideoSink::VideoSink
+    `);
+  });
+
   describe('totalMarkerDuration', function () {
     function setup(): ExtraPropertiesOnWindowForConsole {
       jest.spyOn(console, 'log').mockImplementation(() => {});
diff --git a/src/types/markers.ts b/src/types/markers.ts
index 7c2d63d4a8..8f5f5e5005 100644
--- a/src/types/markers.ts
+++ b/src/types/markers.ts
@@ -634,11 +634,17 @@ export type ChromeEventPayload = {
  * Gecko includes rich log information. This marker payload is used to mirror that
  * log information in the profile.
  */
-export type LogMarkerPayload = {
-  type: 'Log';
-  name: string;
-  module: string;
-};
+export type LogMarkerPayload =
+  | {
+      type: 'Log';
+      name: string;
+      module: string;
+    }
+  | {
+      type: 'Log';
+      level: number;
+      message: string;
+    };
 
 export type DOMEventMarkerPayload = {
   type: 'DOMEvent';
diff --git a/src/utils/window-console.ts b/src/utils/window-console.ts
index 6752289527..96bb9c74b3 100644
--- a/src/utils/window-console.ts
+++ b/src/utils/window-console.ts
@@ -9,6 +9,7 @@ import type {
   Profile,
   Thread,
   Marker,
+  LogMarkerPayload,
 } from 'firefox-profiler/types';
 import { selectorsForConsole } from 'firefox-profiler/selectors';
 import actions from 'firefox-profiler/actions';
@@ -297,36 +298,45 @@ export function addDataToWindowObject(
     const range =
       selectorsForConsole.profile.getPreviewSelectionRange(getState());
 
+    const LOG_LEVEL_LETTER: Record<number, string> = {
+      1: 'E',
+      2: 'W',
+      3: 'I',
+      4: 'D',
+      5: 'V',
+    };
+
     for (const thread of profile.threads) {
       const { markers } = thread;
+
       for (let i = 0; i < markers.length; i++) {
         const startTime = markers.startTime[i];
-        // Note that Log markers are instant markers, so they only have a start time.
         if (
           startTime !== null &&
-          markers.data[i] &&
           markers.data[i]?.type === 'Log' &&
           startTime >= range.start &&
           startTime <= range.end
         ) {
-          const data = markers.data[i];
-          const markerStartTime = markers.startTime[i];
-          if (
-            data &&
-            markerStartTime !== null &&
-            (data as any).module &&
-            (data as any).name
-          ) {
-            const strTimestamp = d2s(profile.meta.startTime + markerStartTime);
-            const processName = thread.processName ?? 'Unknown Process';
-
-            // The log module may contain the log level for profiles captured after bug 1995503.
-            // If the log module does not contain /, we fake it to D/module
-            const logModule = (data as any).module;
-            const prefix = logModule.includes('/') ? '' : 'D/';
-            const statement = `${strTimestamp} - [${processName} ${thread.pid}: ${thread.name}]: ${prefix}${logModule} ${(data as any).name.trim()}`;
-            logs.push(statement);
+          const data = markers.data[i] as LogMarkerPayload;
+          const strTimestamp = d2s(profile.meta.startTime + startTime);
+          const processName = thread.processName ?? 'Unknown Process';
+
+          let statement;
+          if ('message' in data) {
+            if (!data.message) {
+              continue;
+            }
+            const moduleName = profile.shared.stringArray[markers.name[i]];
+            const levelLetter = LOG_LEVEL_LETTER[data.level] ?? 'D';
+            statement = `${strTimestamp} - [${processName} ${thread.pid}: ${thread.name}]: ${levelLetter}/${moduleName} ${data.message.trim()}`;
+          } else {
+            if (!data.name) {
+              continue;
+            }
+            const prefix = data.module.includes('/') ? '' : 'D/';
+            statement = `${strTimestamp} - [${processName} ${thread.pid}: ${thread.name}]: ${prefix}${data.module} ${data.name.trim()}`;
           }
+          logs.push(statement);
         }
       }
     }

From 4ebd3d5ffff790c59f77dddf53a6f4fed3829aa0 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Wed, 8 Apr 2026 10:50:36 +0000
Subject: [PATCH 17/64] Pontoon/Firefox Profiler: Update Russian (ru)

Co-authored-by: berry <igory.ygr200@gmail.com> (ru)
Co-authored-by: Valery Ledovskoy <valery@ledovskoy.com> (ru)
---
 locales/ru/app.ftl | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/locales/ru/app.ftl b/locales/ru/app.ftl
index c89f90da4d..2e1833b7c1 100644
--- a/locales/ru/app.ftl
+++ b/locales/ru/app.ftl
@@ -146,7 +146,7 @@ CallNodeContextMenu--expand-all = Развернуть всё
 # See: https://searchfox.org/
 CallNodeContextMenu--searchfox = Найти название функции на Searchfox
 CallNodeContextMenu--copy-function-name = Скопировать имя функции
-CallNodeContextMenu--copy-script-url = Скопировать URL сценария
+CallNodeContextMenu--copy-script-url = Копировать URL скрипта
 CallNodeContextMenu--copy-stack = Скопировать стек
 CallNodeContextMenu--show-the-function-in-devtools = Показать функцию в DevTools
 
@@ -154,11 +154,7 @@ CallNodeContextMenu--show-the-function-in-devtools = Показать функц
 ## This is the component for Call Tree panel.
 
 CallTree--tracing-ms-total = Время работы (мс)
-    .title =
-        «Общее» время выполнения включает в себя сводку всего времени, в течение которого наблюдалось нахождение этой
-        функции в стеке. Это включает в себя время, когда
-        функция фактически была запущена, и время, проведенное в вызывающих из
-        этой функции.
+    .title = «Общее» время выполнения включает в себя сводку всего времени, в течение которого наблюдалось нахождение этой функции в стеке. Это включает в себя время, когда функция фактически была запущена, и время, проведённое в вызывающих из этой функции.
 CallTree--tracing-ms-self = Собственное (мс)
     .title =
         «Собственное» время включает в себя только то время, когда функция была
@@ -166,11 +162,7 @@ CallTree--tracing-ms-self = Собственное (мс)
         то время работы «других» функций не учитывается. «Собственное» время полезно
         для понимания того, на что на самом деле было потрачено время в программе.
 CallTree--samples-total = Общее (семплы)
-    .title =
-        «Общее» количество семплов включает в себя сводку по каждому семплу, в котором
-        было обнаружено наличие этой функции в стеке. Оно включает в себя время, когда
-        функция фактически была запущена, и время, проведенное в вызывающих из этой
-        функции.
+    .title = «Общее» количество семплов включает в себя сводку по каждому семплу, в котором было обнаружено наличие этой функции в стеке. Оно включает в себя время, когда функция фактически была запущена, и время, проведённое в вызывающих из этой функции.
 CallTree--samples-self = Собственные
     .title =
         Количество «собственных» семплов включает только те семплы, в которых функция была
@@ -396,7 +388,7 @@ IdleSearchField--search-input =
 ## JSTracer is an experimental feature and it's currently disabled. See Bug 1565788.
 
 JsTracerSettings--show-only-self-time = Показывать только собственное время
-    .title = Показывать только время, проведенное в узле вызова, игнорируя его дочерние элементы.
+    .title = Показывать только время, проведённое в узле вызова, игнорируя его дочерние элементы.
 
 ## ListOfPublishedProfiles
 ## This is the component that displays all the profiles the user has uploaded.

From 790f326c82b0cfd8e12027edc2745f16688afb0f Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Wed, 8 Apr 2026 14:50:36 +0000
Subject: [PATCH 18/64] Pontoon/Firefox Profiler: Update Chinese (China)
 (zh-CN)

Co-authored-by: Olvcpr423 <oliverchan86@outlook.com> (zh-CN)
---
 locales/zh-CN/app.ftl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/zh-CN/app.ftl b/locales/zh-CN/app.ftl
index 8efb28dbc9..b32c9f2e33 100644
--- a/locales/zh-CN/app.ftl
+++ b/locales/zh-CN/app.ftl
@@ -112,16 +112,16 @@ CallNodeContextMenu--show-the-function-in-devtools = 在开发者工具中显示
 
 CallTree--tracing-ms-total = 总运行时间（ms）
     .title = 此函数在栈上被观察到出现的“总计”时长汇总。包含函数实际运行的时长，以及此函数中所调用的时长。
-CallTree--tracing-ms-self = Self（ms）
-    .title = “Self”时间只包含函数在栈底结束时的时间。若此函数是通过其他函数调用的，则不包含“该函数”的时间。“self”时间适合用于了解程序中实际用了多长时间在哪些函数上。
+CallTree--tracing-ms-self = 自身（ms）
+    .title = “自身”时间只包含函数在栈底结束时的时间。若此函数是通过其他函数调用的，则不包含“该函数”的时间。“自身”时间适合用于了解程序中实际用了多长时间在哪些函数上。
 CallTree--samples-total = 总计（样本数）
     .title = 此函数在栈上被观察到出现的“总计”次数汇总。包含实际运行的的次数，以及此函数中所调用的次数。
-CallTree--samples-self = Self
-    .title = “Self”样本数只包含函数在栈底结束时的次数。若此函数是通过其他函数调用的，则不包含“该函数”的次数。“self”次数适合用于了解程序中实际用了多长时间在哪些函数上。
+CallTree--samples-self = 自身
+    .title = “自身”样本数只包含函数在栈底结束时的次数。若此函数是通过其他函数调用的，则不包含“该函数”的次数。“自身”次数适合用于了解程序中实际用了多长时间在哪些函数上。
 CallTree--bytes-total = 总大小（字节）
     .title = 此函数在栈上被观察到分配或释放的“总计”字节汇总。包含函数实际运行时使用的大小，以及此函数中所调用其他函数所用的内存大小。
-CallTree--bytes-self = Self（字节）
-    .title = “Self”字节数只包含函数在栈底分配或释放的内存用量。若此函数是通过其他函数调用的，则不包含“该函数”的用量。“Self”字节数适合用于了解程序中实际用了多少内存在哪些函数上。
+CallTree--bytes-self = 自身（字节）
+    .title = “自身”字节数只包含函数在栈底分配或释放的内存用量。若此函数是通过其他函数调用的，则不包含“该函数”的用量。“自身”字节数适合用于了解程序中实际用了多少内存在哪些函数上。
 
 ## Call tree "badges" (icons) with tooltips
 ##

From fd558cb37f65349205010f302e03b657ae7736da Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Wed, 8 Apr 2026 15:00:33 +0000
Subject: [PATCH 19/64] Pontoon/Firefox Profiler: Update Chinese (China)
 (zh-CN)

Co-authored-by: Olvcpr423 <oliverchan86@outlook.com> (zh-CN)
---
 locales/zh-CN/app.ftl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/locales/zh-CN/app.ftl b/locales/zh-CN/app.ftl
index b32c9f2e33..34d6c306fc 100644
--- a/locales/zh-CN/app.ftl
+++ b/locales/zh-CN/app.ftl
@@ -76,6 +76,14 @@ CallNodeContextMenu--transform-focus-function = 聚焦于函数
 CallNodeContextMenu--transform-focus-function-inverted = 聚焦于函数（反向）
     .title = { CallNodeContextMenu--transform-focus-function-title }
 
+## The translation for "self" in these strings should match the translation used
+## in CallTree--samples-self and CallTree--bytes-self. Alternatively it can be
+## translated as "self values" or "self time" (though "self time" is less desirable
+## because this menu item is also shown in "bytes" mode).
+
+CallNodeContextMenu--transform-focus-self = 只聚焦于自身
+    .title = { CallNodeContextMenu--transform-focus-self-title }
+
 ##
 
 CallNodeContextMenu--transform-focus-subtree = 只聚焦于子树
@@ -290,8 +298,8 @@ IdleSearchField--search-input =
 ## JsTracerSettings
 ## JSTracer is an experimental feature and it's currently disabled. See Bug 1565788.
 
-JsTracerSettings--show-only-self-time = 只显示 self 时间
-    .title = 只显示调用节点所用的时间，而忽略其 children。
+JsTracerSettings--show-only-self-time = 只显示自身时间
+    .title = 只显示调用节点所用的时间，而忽略其子节点。
 
 ## ListOfPublishedProfiles
 ## This is the component that displays all the profiles the user has uploaded.

From 38a994c21a20e8ff926bc67ad6aa7e5acd779872 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Wed, 8 Apr 2026 15:10:35 +0000
Subject: [PATCH 20/64] Pontoon/Firefox Profiler: Update Chinese (China)
 (zh-CN)

Co-authored-by: wxie <xiewensheng@hotmail.com> (zh-CN)
Co-authored-by: Olvcpr423 <oliverchan86@outlook.com> (zh-CN)
---
 locales/zh-CN/app.ftl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/locales/zh-CN/app.ftl b/locales/zh-CN/app.ftl
index 34d6c306fc..cbd3215b82 100644
--- a/locales/zh-CN/app.ftl
+++ b/locales/zh-CN/app.ftl
@@ -275,6 +275,10 @@ Home--enable-button-unavailable =
 # This message can be seen on https://main--perf-html.netlify.app/ .
 Home--web-channel-unavailable = 此分析器无法连接至 WebChannel。通常是因为运行分析器的主机与 <code>devtools.performance.recording.ui-base-url</code> 首选项中指定的主机不同。若您想要使用此分析器捕捉新的性能分析记录，并可程序化控制分析器菜单按钮，可到 <code>about:config</code> 调整该首选项。
 Home--record-instructions = 要进行分析，请点击“分析”按钮，或使用键盘快捷键。在性能记录时，此图标将会变为蓝色。按下<kbd>捕捉</kbd>即可将数据加载至 profiler.firefox.com。
+Home--fenix-instructions-directly = 可直接在此设备上对 { -firefox-android-brand-name } 进行性能分析。有关更多信息，请阅读<a>直接在设备上对 { -firefox-android-brand-name } 进行性能分析</a>。
+Home--fenix-instructions-remotely =
+    您也可以通过桌面版 { -firefox-brand-name } 对 { -firefox-android-brand-name } 进行远程性能分析。有关更多信息，请参阅文档：
+    <a>对 { -firefox-android-brand-name } 进行远程性能分析</a>。
 Home--record-instructions-start-stop = 停止并开始分析
 Home--record-instructions-capture-load = 捕捉并加载分析记录
 Home--profiler-motto = 捕捉性能分析记录。剖析、分享、让网站速度更快。
@@ -282,6 +286,7 @@ Home--additional-content-title = 加载现有分析记录
 Home--additional-content-content = 您可以将分析记录<strong>拖放</strong>至此处，或：
 Home--compare-recordings-info = 您也可以比较记录内容。<a>打开比较界面。</a>
 Home--your-recent-uploaded-recordings-title = 您最近上传的记录
+Home--dark-mode-title = 深色模式
 # We replace the elements such as <perf> and <simpleperf> with links to the
 # documentation to use these tools.
 Home--load-files-from-other-tools2 = { -profiler-brand-name } 也可以从其他分析器导入记录，例如 <perf>Linux perf</perf>、<simpleperf>Android SimplePerf</simpleperf>、Chrome 性能面板、<androidstudio>Android Studio</androidstudio>，支持直接导入 <dhat>dhat</dhat>、<traceevent>Google 的 Trace Event</traceevent> 格式保存的分析记录。<write>点此了解如何编写您自己的导入程序</write>。

From 0db3bfd3303c7bd7955dc96cd5c58f6509b49a22 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Wed, 8 Apr 2026 15:50:32 +0000
Subject: [PATCH 21/64] Pontoon/Firefox Profiler: Update Chinese (China)
 (zh-CN)

Co-authored-by: Olvcpr423 <oliverchan86@outlook.com> (zh-CN)
---
 locales/zh-CN/app.ftl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/locales/zh-CN/app.ftl b/locales/zh-CN/app.ftl
index cbd3215b82..249ec052f3 100644
--- a/locales/zh-CN/app.ftl
+++ b/locales/zh-CN/app.ftl
@@ -275,6 +275,7 @@ Home--enable-button-unavailable =
 # This message can be seen on https://main--perf-html.netlify.app/ .
 Home--web-channel-unavailable = 此分析器无法连接至 WebChannel。通常是因为运行分析器的主机与 <code>devtools.performance.recording.ui-base-url</code> 首选项中指定的主机不同。若您想要使用此分析器捕捉新的性能分析记录，并可程序化控制分析器菜单按钮，可到 <code>about:config</code> 调整该首选项。
 Home--record-instructions = 要进行分析，请点击“分析”按钮，或使用键盘快捷键。在性能记录时，此图标将会变为蓝色。按下<kbd>捕捉</kbd>即可将数据加载至 profiler.firefox.com。
+Home--instructions-content2 = 记录性能分析数据需要使用<a>桌面版 { -firefox-brand-name }</a>，但已有的分析记录可使用任意现代浏览器查看。
 Home--fenix-instructions-directly = 可直接在此设备上对 { -firefox-android-brand-name } 进行性能分析。有关更多信息，请阅读<a>直接在设备上对 { -firefox-android-brand-name } 进行性能分析</a>。
 Home--fenix-instructions-remotely =
     您也可以通过桌面版 { -firefox-brand-name } 对 { -firefox-android-brand-name } 进行远程性能分析。有关更多信息，请参阅文档：
@@ -967,6 +968,12 @@ TransformNavigator--focus-subtree = 聚焦节点：{ $item }
 # Variables:
 #   $item (String) - Name of the function that transform applied to.
 TransformNavigator--focus-function = 聚焦：{ $item }
+# "Focus self" transform.
+# See: https://profiler.firefox.com/docs/#/./guide-filtering-call-trees?id=focus-on-function-self
+# Also see the translation note above CallNodeContextMenu--transform-focus-self.
+# Variables:
+#   $item (String) - Name of the function that transform applied to.
+TransformNavigator--focus-self = 聚焦于自身：{ $item }
 # "Focus category" transform. The word "Focus" has the meaning of an adjective here.
 # See: https://profiler.firefox.com/docs/#/./guide-filtering-call-trees?id=focus-category
 # Variables:

From 7018717379644f77b369631e11c51d7b844880db Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Thu, 2 Apr 2026 18:49:19 -0400
Subject: [PATCH 22/64] Replace react-transition-group usage with plain CSS
 animations.

---
 package.json                |   2 -
 src/components/app/Home.css |  21 +-
 src/components/app/Home.tsx | 537 ++++++++++++++++++------------------
 yarn.lock                   |  27 +-
 4 files changed, 278 insertions(+), 309 deletions(-)

diff --git a/package.json b/package.json
index 43354850f9..5a43e7340b 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,6 @@
     "react-intersection-observer": "^10.0.3",
     "react-redux": "^9.2.0",
     "react-splitter-layout": "^4.0.0",
-    "react-transition-group": "^4.4.5",
     "redux": "^5.0.1",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^3.1.0",
@@ -131,7 +130,6 @@
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.1",
     "@types/react-splitter-layout": "^4.0.0",
-    "@types/react-transition-group": "^4.4.5",
     "@types/redux-logger": "^3.0.6",
     "@types/tgwf__co2": "^0.14.2",
     "@typescript-eslint/eslint-plugin": "^8.58.0",
diff --git a/src/components/app/Home.css b/src/components/app/Home.css
index fe2fb6c878..24805022d5 100644
--- a/src/components/app/Home.css
+++ b/src/components/app/Home.css
@@ -199,17 +199,20 @@
 
 /* Only show the home transition when reduced motion is not preferred */
 @media (prefers-reduced-motion: no-preference) {
-  .homeTransition-enter {
-    opacity: 0.1;
-    transform: translateX(100px);
+  @keyframes homeSlideIn {
+    from {
+      opacity: 0.1;
+      transform: translateX(100px);
+    }
+
+    to {
+      opacity: 1;
+      transform: translateX(0);
+    }
   }
 
-  .homeTransition-enter.homeTransition-enter-active {
-    opacity: 1;
-    transform: translateX(0);
-    transition:
-      opacity 300ms ease-out,
-      transform 300ms ease-out;
+  .homeInstructions-animate {
+    animation: homeSlideIn 300ms ease-out;
   }
 }
 
diff --git a/src/components/app/Home.tsx b/src/components/app/Home.tsx
index b3df5dea00..1dc03a0847 100644
--- a/src/components/app/Home.tsx
+++ b/src/components/app/Home.tsx
@@ -16,7 +16,6 @@ import {
   triggerLoadingFromUrl,
 } from 'firefox-profiler/actions/receive-profile';
 import type { BrowserConnection } from 'firefox-profiler/app-logic/browser-connection';
-import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import {
   queryIsMenuButtonEnabled,
   enableMenuButton,
@@ -182,17 +181,6 @@ function DocsButton() {
   );
 }
 
-function InstructionTransition(props: { children: React.ReactNode }) {
-  return (
-    <CSSTransition
-      {...props}
-      classNames="homeTransition"
-      timeout={300}
-      exit={false}
-    />
-  );
-}
-
 type OwnHomeProps = {
   readonly specialMessage?: string;
 };
@@ -264,6 +252,18 @@ class HomeImpl extends React.PureComponent<HomeProps, HomeState> {
   }
 
   _renderInstructions() {
+    // The returned element's `key` controls whether React remounts the element
+    // or reuses it when the phase changes. Remounting triggers the CSS slide-in
+    // animation. All setup phases share key="setup" so they transition without
+    // animation; switching to key="record" forces a remount and plays the animation.
+    //
+    // Transition scenarios:
+    //   Initial page load                            → no animation (first paint)
+    //   checking-webchannel → suggest-enable-popup   → no animation (same key)
+    //   checking-webchannel → webchannel-unavailable → no animation (same key)
+    //   checking-webchannel → popup-enabled          → animates (key change)
+    //   suggest-enable-popup → popup-enabled         → animates (key change, user clicked)
+    //   All other phases (android, chrome, other)    → fixed at initial state, never change
     const { popupInstallPhase } = this.state;
     switch (popupInstallPhase) {
       case 'checking-webchannel':
@@ -302,137 +302,137 @@ class HomeImpl extends React.PureComponent<HomeProps, HomeState> {
 
   _renderEnablePopupInstructions(webChannelAvailable: boolean) {
     return (
-      <InstructionTransition key={0}>
-        <div
-          className="homeInstructions"
-          data-testid="home-enable-popup-instructions"
-        >
-          {/* Grid container: homeInstructions */}
-          {/* Left column: img */}
-          <img
-            className="homeSectionScreenshot"
-            src={PerfScreenshot}
-            alt="screenshot of profiler.firefox.com"
-          />
-          {/* Right column: instructions */}
-          <div>
-            <Localized
-              id="Home--enable-button-unavailable"
-              attrs={{ title: !webChannelAvailable }}
+      <div
+        key="setup"
+        className="homeInstructions"
+        data-testid="home-enable-popup-instructions"
+      >
+        {/* Grid container: homeInstructions */}
+        {/* Left column: img */}
+        <img
+          className="homeSectionScreenshot"
+          src={PerfScreenshot}
+          alt="screenshot of profiler.firefox.com"
+        />
+        {/* Right column: instructions */}
+        <div>
+          <Localized
+            id="Home--enable-button-unavailable"
+            attrs={{ title: !webChannelAvailable }}
+          >
+            <button
+              type="button"
+              className="homeSectionButton"
+              onClick={this._enableMenuButton}
+              disabled={!webChannelAvailable}
+              title={
+                webChannelAvailable
+                  ? undefined
+                  : 'This profiler instance was unable to connect to the WebChannel, so it cannot enable the profiler menu button.'
+              }
             >
-              <button
-                type="button"
-                className="homeSectionButton"
-                onClick={this._enableMenuButton}
-                disabled={!webChannelAvailable}
-                title={
-                  webChannelAvailable
-                    ? undefined
-                    : 'This profiler instance was unable to connect to the WebChannel, so it cannot enable the profiler menu button.'
-                }
-              >
-                <span className="homeSectionPlus">+</span>
-                <Localized id="Home--menu-button">
-                  Enable Profiler Menu Button
-                </Localized>
-              </button>
-            </Localized>
-            <DocsButton />
-            {webChannelAvailable ? (
-              <Localized id="Home--menu-button-instructions">
-                <p>
-                  Enable the profiler menu button to start recording a
-                  performance profile in Firefox, then analyze it and share it
-                  with profiler.firefox.com.
-                </p>
-              </Localized>
-            ) : (
-              <Localized
-                id="Home--web-channel-unavailable"
-                elems={{
-                  code: <code />,
-                }}
-              >
-                <p>
-                  This profiler instance was unable to connect to the
-                  WebChannel. This usually means that it’s running on a
-                  different host from the one that is specified in the
-                  preference{' '}
-                  <code>devtools.performance.recording.ui-base-url</code>. If
-                  you would like to capture new profiles with this instance, and
-                  give it programmatic control of the profiler menu button, you
-                  can go to <code>about:config</code>
-                  and change the preference.
-                </p>
+              <span className="homeSectionPlus">+</span>
+              <Localized id="Home--menu-button">
+                Enable Profiler Menu Button
               </Localized>
-            )}
+            </button>
+          </Localized>
+          <DocsButton />
+          {webChannelAvailable ? (
+            <Localized id="Home--menu-button-instructions">
+              <p>
+                Enable the profiler menu button to start recording a performance
+                profile in Firefox, then analyze it and share it with
+                profiler.firefox.com.
+              </p>
+            </Localized>
+          ) : (
             <Localized
-              id="Home--profile-firefox-android-instructions"
+              id="Home--web-channel-unavailable"
               elems={{
-                a: (
-                  <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
-                ),
+                code: <code />,
               }}
             >
               <p>
-                You can also profile Firefox for Android. For more information,
-                please consult this documentation:{' '}
-                <a>Profiling Firefox for Android directly on device</a>.
+                This profiler instance was unable to connect to the WebChannel.
+                This usually means that it’s running on a different host from
+                the one that is specified in the preference{' '}
+                <code>devtools.performance.recording.ui-base-url</code>. If you
+                would like to capture new profiles with this instance, and give
+                it programmatic control of the profiler menu button, you can go
+                to <code>about:config</code>
+                and change the preference.
               </p>
             </Localized>
-          </div>
-          {/* end of grid container */}
+          )}
+          <Localized
+            id="Home--profile-firefox-android-instructions"
+            elems={{
+              a: (
+                <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
+              ),
+            }}
+          >
+            <p>
+              You can also profile Firefox for Android. For more information,
+              please consult this documentation:{' '}
+              <a>Profiling Firefox for Android directly on device</a>.
+            </p>
+          </Localized>
         </div>
-      </InstructionTransition>
+        {/* end of grid container */}
+      </div>
     );
   }
 
   _renderFenixInstructions() {
     return (
-      <InstructionTransition key={0}>
-        <div className="homeInstructions" data-testid="home-fenix-instructions">
-          {/* Grid container: homeInstructions */}
-          {/* Left column: img */}
-          <img
-            className="homeSectionScreenshot"
-            src={PerfScreenshot}
-            alt="screenshot of profiler.firefox.com"
-          />
-          {/* Right column: instructions */}
-          <div>
-            <DocsButton />
-            <Localized
-              id="Home--fenix-instructions-directly"
-              elems={{
-                a: (
-                  <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
-                ),
-              }}
-            >
-              <p>
-                Firefox for Android can be profiled directly on this device. For
-                more information, read{' '}
-                <a>Profiling Firefox for Android directly on device</a>.
-              </p>
-            </Localized>
-            <Localized
-              id="Home--fenix-instructions-remotely"
-              elems={{
-                a: (
-                  <a href="https://profiler.firefox.com/docs/#/./guide-remote-profiling?id=remote-profiling-firefox-for-android" />
-                ),
-              }}
-            >
-              <p>
-                You can also profile Firefox for Android remotely from Firefox
-                for desktop. For more information, please consult this
-                documentation: <a>Profiling Firefox for Android remotely</a>.
-              </p>
-            </Localized>
-          </div>
-          {/* end of grid container */}
+      <div
+        key="setup"
+        className="homeInstructions"
+        data-testid="home-fenix-instructions"
+      >
+        {/* Grid container: homeInstructions */}
+        {/* Left column: img */}
+        <img
+          className="homeSectionScreenshot"
+          src={PerfScreenshot}
+          alt="screenshot of profiler.firefox.com"
+        />
+        {/* Right column: instructions */}
+        <div>
+          <DocsButton />
+          <Localized
+            id="Home--fenix-instructions-directly"
+            elems={{
+              a: (
+                <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
+              ),
+            }}
+          >
+            <p>
+              Firefox for Android can be profiled directly on this device. For
+              more information, read{' '}
+              <a>Profiling Firefox for Android directly on device</a>.
+            </p>
+          </Localized>
+          <Localized
+            id="Home--fenix-instructions-remotely"
+            elems={{
+              a: (
+                <a href="https://profiler.firefox.com/docs/#/./guide-remote-profiling?id=remote-profiling-firefox-for-android" />
+              ),
+            }}
+          >
+            <p>
+              You can also profile Firefox for Android remotely from Firefox for
+              desktop. For more information, please consult this documentation:{' '}
+              <a>Profiling Firefox for Android remotely</a>.
+            </p>
+          </Localized>
         </div>
-      </InstructionTransition>
+        {/* end of grid container */}
+      </div>
     );
   }
 
@@ -440,164 +440,155 @@ class HomeImpl extends React.PureComponent<HomeProps, HomeState> {
     const chromeExtensionUrl =
       'https://chromewebstore.google.com/detail/firefox-profiler/ljmahpnflmbkgaipnfbpgjipcnahlghn';
     return (
-      <InstructionTransition key={0}>
-        <div
-          className="homeInstructions"
-          data-testid="home-enable-popup-instructions"
-        >
-          {/* Grid container: homeInstructions */}
-          {/* Left column: img */}
-          <img
-            className="homeSectionScreenshot"
-            src={PerfScreenshot}
-            alt="screenshot of profiler.firefox.com"
-          />
-          {/* Right column: instructions */}
-          <div>
-            <a
-              className="homeSectionButton"
-              href={chromeExtensionUrl}
-              target="_blank"
-              rel="noreferrer"
-            >
-              <span className="homeSectionPlus">+</span>
-              <Localized id="Home--install-chrome-extension">
-                Install the Chrome extension
-              </Localized>
-            </a>
-            <DocsButton />
-            <Localized
-              id="Home--chrome-extension-instructions"
-              elems={{
-                a: (
-                  <a
-                    href={chromeExtensionUrl}
-                    target="_blank"
-                    rel="noreferrer"
-                  />
-                ),
-              }}
-            >
-              <p>
-                Use the <a>Firefox Profiler extension for Chrome</a> to capture
-                performance profiles in Chrome and analyze them in the Firefox
-                Profiler. Install the extension from the Chrome Web Store.
-              </p>
-            </Localized>
-            <Localized id="Home--chrome-extension-recording-instructions">
-              <p>
-                Once installed, use the extension’s toolbar icon or the
-                shortcuts to start and stop profiling. You can also export
-                profiles and load them here for detailed analysis.
-              </p>
+      <div
+        key="setup"
+        className="homeInstructions"
+        data-testid="home-enable-popup-instructions"
+      >
+        {/* Grid container: homeInstructions */}
+        {/* Left column: img */}
+        <img
+          className="homeSectionScreenshot"
+          src={PerfScreenshot}
+          alt="screenshot of profiler.firefox.com"
+        />
+        {/* Right column: instructions */}
+        <div>
+          <a
+            className="homeSectionButton"
+            href={chromeExtensionUrl}
+            target="_blank"
+            rel="noreferrer"
+          >
+            <span className="homeSectionPlus">+</span>
+            <Localized id="Home--install-chrome-extension">
+              Install the Chrome extension
             </Localized>
-            {this._renderShortcuts()}
-          </div>
-          {/* end of grid container */}
+          </a>
+          <DocsButton />
+          <Localized
+            id="Home--chrome-extension-instructions"
+            elems={{
+              a: (
+                <a href={chromeExtensionUrl} target="_blank" rel="noreferrer" />
+              ),
+            }}
+          >
+            <p>
+              Use the <a>Firefox Profiler extension for Chrome</a> to capture
+              performance profiles in Chrome and analyze them in the Firefox
+              Profiler. Install the extension from the Chrome Web Store.
+            </p>
+          </Localized>
+          <Localized id="Home--chrome-extension-recording-instructions">
+            <p>
+              Once installed, use the extension’s toolbar icon or the shortcuts
+              to start and stop profiling. You can also export profiles and load
+              them here for detailed analysis.
+            </p>
+          </Localized>
+          {this._renderShortcuts()}
         </div>
-      </InstructionTransition>
+        {/* end of grid container */}
+      </div>
     );
   }
 
   _renderRecordInstructions(screenshotSrc: string) {
     return (
-      <InstructionTransition key={1}>
-        <div
-          className="homeInstructions"
-          data-testid="home-record-instructions"
-        >
-          {/* Grid container: homeInstructions */}
-          {/* Left column: img */}
-          <img
-            className="homeSectionScreenshot"
-            src={screenshotSrc}
-            alt="Screenshot of the profiler settings from the Firefox menu."
-          />
-          {/* Right column: instructions */}
-          <div>
-            <DocsButton />
-            <Localized
-              id="Home--record-instructions"
-              elems={{
-                kbd: <kbd />,
-              }}
-            >
-              <p>
-                To start profiling, click on the profiling button, or use the
-                keyboard shortcuts. The icon is blue when a profile is
-                recording. Hit <kbd>Capture</kbd> to load the data into
-                profiler.firefox.com.
-              </p>
-            </Localized>
-            {this._renderShortcuts()}
-            <Localized
-              id="Home--profile-firefox-android-instructions"
-              elems={{
-                a: (
-                  <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
-                ),
-              }}
-            >
-              <p>
-                You can also profile Firefox for Android. For more information,
-                please consult this documentation:{' '}
-                <a>Profiling Firefox for Android directly on device</a>.
-              </p>
-            </Localized>
-          </div>
-          {/* end of grid container */}
+      <div
+        key="record"
+        className="homeInstructions homeInstructions-animate"
+        data-testid="home-record-instructions"
+      >
+        {/* Grid container: homeInstructions */}
+        {/* Left column: img */}
+        <img
+          className="homeSectionScreenshot"
+          src={screenshotSrc}
+          alt="Screenshot of the profiler settings from the Firefox menu."
+        />
+        {/* Right column: instructions */}
+        <div>
+          <DocsButton />
+          <Localized
+            id="Home--record-instructions"
+            elems={{
+              kbd: <kbd />,
+            }}
+          >
+            <p>
+              To start profiling, click on the profiling button, or use the
+              keyboard shortcuts. The icon is blue when a profile is recording.
+              Hit <kbd>Capture</kbd> to load the data into profiler.firefox.com.
+            </p>
+          </Localized>
+          {this._renderShortcuts()}
+          <Localized
+            id="Home--profile-firefox-android-instructions"
+            elems={{
+              a: (
+                <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
+              ),
+            }}
+          >
+            <p>
+              You can also profile Firefox for Android. For more information,
+              please consult this documentation:{' '}
+              <a>Profiling Firefox for Android directly on device</a>.
+            </p>
+          </Localized>
         </div>
-      </InstructionTransition>
+        {/* end of grid container */}
+      </div>
     );
   }
 
   _renderOtherBrowserInstructions() {
     return (
-      <InstructionTransition key={0}>
-        <div
-          className="homeInstructions"
-          data-testid="home-other-browser-instructions"
-        >
-          {/* Grid container: homeInstructions */}
-          {/* Left column: img */}
-          <img
-            className="homeSectionScreenshot"
-            src={PerfScreenshot}
-            alt="screenshot of profiler.firefox.com"
-          />
-          {/* Right column: instructions */}
-          <div>
-            <DocsButton />
-            <Localized
-              id="Home--instructions-content2"
-              elems={{
-                a: <a href="https://www.firefox.com" />,
-              }}
-            >
-              <p>
-                Recording performance profiles requires{' '}
-                <a>Firefox for desktop</a>. However, existing profiles can be
-                viewed in any modern browser.
-              </p>
-            </Localized>
-            <Localized
-              id="Home--profile-firefox-android-instructions"
-              elems={{
-                a: (
-                  <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
-                ),
-              }}
-            >
-              <p>
-                You can also profile Firefox for Android. For more information,
-                please consult this documentation:{' '}
-                <a>Profiling Firefox for Android directly on device</a>.
-              </p>
-            </Localized>
-          </div>
-          {/* end of grid container */}
+      <div
+        key="setup"
+        className="homeInstructions"
+        data-testid="home-other-browser-instructions"
+      >
+        {/* Grid container: homeInstructions */}
+        {/* Left column: img */}
+        <img
+          className="homeSectionScreenshot"
+          src={PerfScreenshot}
+          alt="screenshot of profiler.firefox.com"
+        />
+        {/* Right column: instructions */}
+        <div>
+          <DocsButton />
+          <Localized
+            id="Home--instructions-content2"
+            elems={{
+              a: <a href="https://www.firefox.com" />,
+            }}
+          >
+            <p>
+              Recording performance profiles requires <a>Firefox for desktop</a>
+              . However, existing profiles can be viewed in any modern browser.
+            </p>
+          </Localized>
+          <Localized
+            id="Home--profile-firefox-android-instructions"
+            elems={{
+              a: (
+                <a href="https://profiler.firefox.com/docs/#/./guide-profiling-android-directly-on-device?id=profiling-firefox-for-android-directly-on-device" />
+              ),
+            }}
+          >
+            <p>
+              You can also profile Firefox for Android. For more information,
+              please consult this documentation:{' '}
+              <a>Profiling Firefox for Android directly on device</a>.
+            </p>
+          </Localized>
         </div>
-      </InstructionTransition>
+        {/* end of grid container */}
+      </div>
     );
   }
 
@@ -644,9 +635,9 @@ class HomeImpl extends React.PureComponent<HomeProps, HomeState> {
               faster.
             </p>
           </Localized>
-          <TransitionGroup className="homeInstructionsTransitionGroup">
+          <div className="homeInstructionsTransitionGroup">
             {this._renderInstructions()}
-          </TransitionGroup>
+          </div>
           <section className="homeAdditionalContent">
             {/* Grid container: homeAdditionalContent */}
             <h2 className="homeAdditionalContentTitle protocol-display-xs">
diff --git a/yarn.lock b/yarn.lock
index dd43ea0c55..2e53af1ad4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1011,7 +1011,7 @@
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
     "@babel/plugin-transform-typescript" "^7.28.5"
 
-"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3":
   version "7.26.10"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.10.tgz#a07b4d8fa27af131a633d7b3524db803eb4764c2"
   integrity sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==
@@ -2417,11 +2417,6 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-transition-group@^4.4.5":
-  version "4.4.12"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.12.tgz#b5d76568485b02a307238270bfe96cb51ee2a044"
-  integrity sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==
-
 "@types/react@*", "@types/react@^18.3.28":
   version "18.3.28"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.28.tgz#0a85b1a7243b4258d9f626f43797ba18eb5f8781"
@@ -3957,7 +3952,7 @@ cssstyle@^4.2.1:
     "@asamuzakjp/css-color" "^3.2.0"
     rrweb-cssom "^0.8.0"
 
-csstype@^3.0.2, csstype@^3.2.2:
+csstype@^3.2.2:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
   integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
@@ -4242,14 +4237,6 @@ dom-accessibility-api@^0.6.3:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8"
   integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==
 
-dom-helpers@^5.0.1:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"
-  integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==
-  dependencies:
-    "@babel/runtime" "^7.8.7"
-    csstype "^3.0.2"
-
 dot-prop@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
@@ -9368,16 +9355,6 @@ react-splitter-layout@^4.0.0:
   resolved "https://registry.yarnpkg.com/react-splitter-layout/-/react-splitter-layout-4.0.0.tgz#70b43ca6a78c056f5e5fbf29c67b597f040fbf2e"
   integrity sha512-SLqOjBOxRuizWUa83w6q5/u9cDWa9/yj9Iko9V9JFN8x+cqIXiDlUFWSx+icz3IIgvsN/oRIw3za5/32RjIwrA==
 
-react-transition-group@^4.4.5:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1"
-  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-
 react@^16.8.6:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"

From 2486c9594f22269dc13ca796d8a424ae642d1c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Thu, 9 Apr 2026 16:54:50 +0200
Subject: [PATCH 23/64] Move some profile fetching code into a separate module.
 (#5939)

This logic can be useful independently of redux actions, for CLI scripts
which want to support profiler URLs.

Co-authored-by: Markus Stange <mstange.moz@gmail.com>
---
 src/actions/receive-profile.ts                | 287 +--------------
 src/test/components/Root-history.test.tsx     |   2 +-
 src/test/fixtures/utils.ts                    |  20 +
 .../receive-profile.test.ts.snap              |  54 ---
 src/test/store/receive-profile.test.ts        | 207 +----------
 .../__snapshots__/profile-fetch.test.ts.snap  |  55 +++
 src/test/unit/profile-fetch.test.ts           | 208 +++++++++++
 src/utils/profile-fetch.ts                    | 346 ++++++++++++++++++
 8 files changed, 648 insertions(+), 531 deletions(-)
 create mode 100644 src/test/unit/__snapshots__/profile-fetch.test.ts.snap
 create mode 100644 src/test/unit/profile-fetch.test.ts
 create mode 100644 src/utils/profile-fetch.ts

diff --git a/src/actions/receive-profile.ts b/src/actions/receive-profile.ts
index faa49d33d4..7eb4182cdd 100644
--- a/src/actions/receive-profile.ts
+++ b/src/actions/receive-profile.ts
@@ -2,6 +2,13 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 import { oneLine } from 'common-tags';
+import {
+  fetchProfile,
+  getProfileUrlForHash,
+  type ProfileOrZip,
+  deduceContentType,
+  extractJsonFromArrayBuffer,
+} from 'firefox-profiler/utils/profile-fetch';
 import queryString from 'query-string';
 import type JSZip from 'jszip';
 import {
@@ -20,10 +27,8 @@ import {
 } from 'firefox-profiler/profile-logic/symbolication';
 import * as MozillaSymbolicationAPI from 'firefox-profiler/profile-logic/mozilla-symbolication-api';
 import { mergeProfilesForDiffing } from 'firefox-profiler/profile-logic/merge-compare';
-import { decompress, isGzip } from 'firefox-profiler/utils/gz';
 import { expandUrl } from 'firefox-profiler/utils/shorten-url';
 import { TemporaryError } from 'firefox-profiler/utils/errors';
-import { isLocalURL } from 'firefox-profiler/utils/url';
 import {
   getSelectedThreadIndexesOrNull,
   getGlobalTrackOrder,
@@ -67,7 +72,6 @@ import {
 import { setDataSource } from './profile-view';
 import { fatalError } from './errors';
 import { batchLoadDataUrlIcons } from './icons';
-import { GOOGLE_STORAGE_BUCKET } from 'firefox-profiler/app-logic/constants';
 import {
   determineTimelineType,
   hasUsefulSamples,
@@ -547,7 +551,7 @@ async function _unpackGeckoProfileFromBrowser(
   // global. This happens especially with tests but could happen in the future
   // in Firefox too.
   if (Object.prototype.toString.call(profile) === '[object ArrayBuffer]') {
-    return _extractJsonFromArrayBuffer(profile as ArrayBuffer);
+    return extractJsonFromArrayBuffer(profile as ArrayBuffer);
   }
   return profile;
 }
@@ -557,9 +561,9 @@ function getSymbolStore(
   symbolServerUrl: string,
   browserConnection: BrowserConnection | null
 ): SymbolStore | null {
-  if (!window.indexedDB) {
-    // We could be running in a test environment with no indexedDB support. Do not
-    // return a symbol store in this case.
+  if (typeof window === 'undefined' || !window.indexedDB) {
+    // We could be running in a test environment or Node.js with no indexedDB support.
+    // Do not return a symbol store in this case.
     return null;
   }
 
@@ -983,265 +987,6 @@ export function temporaryError(error: TemporaryError): Action {
   };
 }
 
-function _wait(delayMs: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, delayMs));
-}
-
-function _loadProbablyFailedDueToSafariLocalhostHTTPRestriction(
-  url: string,
-  error: Error
-): boolean {
-  if (!navigator.userAgent.match(/Safari\/\d+\.\d+/)) {
-    return false;
-  }
-  // Check if Safari considers this mixed content.
-  const parsedUrl = new URL(url);
-  return (
-    error.name === 'TypeError' &&
-    parsedUrl.protocol === 'http:' &&
-    isLocalURL(parsedUrl) &&
-    location.protocol === 'https:'
-  );
-}
-
-class SafariLocalhostHTTPLoadError extends Error {
-  override name = 'SafariLocalhostHTTPLoadError';
-}
-
-type FetchProfileArgs = {
-  url: string;
-  onTemporaryError: (param: TemporaryError) => void;
-  // Allow tests to capture the reported error, but normally use console.error.
-  reportError?: (...data: Array<any>) => void;
-};
-
-type ProfileOrZip =
-  | { responseType: 'PROFILE'; profile: unknown }
-  | { responseType: 'ZIP'; zip: JSZip };
-
-/**
- * Tries to fetch a profile on `url`. If the profile is not found,
- * `onTemporaryError` is called with an appropriate error, we wait 1 second, and
- * then tries again. If we still can't find the profile after 11 tries, the
- * returned promise is rejected with a fatal error.
- * If we can retrieve the profile properly, the returned promise is resolved
- * with the JSON.parsed profile.
- */
-export async function _fetchProfile(
-  args: FetchProfileArgs
-): Promise<ProfileOrZip> {
-  const MAX_WAIT_SECONDS = 10;
-  let i = 0;
-  const { url, onTemporaryError } = args;
-  // Allow tests to capture the reported error, but normally use console.error.
-  const reportError = args.reportError || console.error;
-
-  while (true) {
-    let response;
-    try {
-      response = await fetch(url);
-    } catch (e) {
-      // Case 1: Exception.
-      if (_loadProbablyFailedDueToSafariLocalhostHTTPRestriction(url, e)) {
-        throw new SafariLocalhostHTTPLoadError();
-      }
-      throw e;
-    }
-
-    // Case 2: successful answer.
-    if (response.ok) {
-      return _extractProfileOrZipFromResponse(url, response, reportError);
-    }
-
-    // case 3: unrecoverable error.
-    if (response.status !== 403) {
-      throw new Error(oneLine`
-          Could not fetch the profile on remote server.
-          Response was: ${response.status} ${response.statusText}.
-        `);
-    }
-
-    // case 4: 403 errors can be transient while a profile is uploaded.
-
-    if (i++ === MAX_WAIT_SECONDS) {
-      // In the last iteration we don't send a temporary error because we'll
-      // throw an error right after the while loop.
-      break;
-    }
-
-    onTemporaryError(
-      new TemporaryError(
-        'Profile not found on remote server.',
-        { count: i, total: MAX_WAIT_SECONDS + 1 } // 11 tries during 10 seconds
-      )
-    );
-
-    await _wait(1000);
-  }
-
-  throw new Error(oneLine`
-    Could not fetch the profile on remote server:
-    still not found after ${MAX_WAIT_SECONDS} seconds.
-  `);
-}
-
-/**
- * Deduce the file type from a url and content type. Third parties can give us
- * arbitrary information, so make sure that we try out best to extract the proper
- * information about it.
- */
-function _deduceContentType(
-  url: string,
-  contentType: string | null
-): 'application/json' | 'application/zip' | null {
-  if (contentType === 'application/zip' || contentType === 'application/json') {
-    return contentType;
-  }
-  if (url.match(/\.zip$/)) {
-    return 'application/zip';
-  }
-  if (url.match(/\.json/)) {
-    return 'application/json';
-  }
-  return null;
-}
-
-/**
- * This function guesses the correct content-type (even if one isn't sent) and then
- * attempts to use the proper method to extract the response.
- */
-async function _extractProfileOrZipFromResponse(
-  url: string,
-  response: Response,
-  reportError: (...data: Array<any>) => void
-): Promise<ProfileOrZip> {
-  const contentType = _deduceContentType(
-    url,
-    response.headers.get('content-type')
-  );
-  switch (contentType) {
-    case 'application/zip':
-      return {
-        responseType: 'ZIP',
-        zip: await _extractZipFromResponse(response, reportError),
-      };
-    case 'application/json':
-    case null:
-      // The content type is null if it is unknown, or an unsupported type. Go ahead
-      // and try to process it as a profile.
-      return {
-        responseType: 'PROFILE',
-        profile: await _extractJsonFromResponse(
-          response,
-          reportError,
-          contentType
-        ),
-      };
-    default:
-      throw assertExhaustiveCheck(contentType);
-  }
-}
-
-/**
- * Attempt to load a zip file from a third party. This process can fail, so make sure
- * to handle and report the error if it does.
- */
-async function _extractZipFromResponse(
-  response: Response,
-  reportError: (...data: Array<any>) => void
-): Promise<JSZip> {
-  const buffer = await response.arrayBuffer();
-  // Workaround for https://github.com/Stuk/jszip/issues/941
-  // When running this code in tests, `buffer` doesn't inherits from _this_
-  // realm's ArrayBuffer object, and this breaks JSZip which doesn't account for
-  // this case. We workaround the issue by wrapping the buffer in an Uint8Array
-  // that comes from this realm.
-  const typedBuffer = new Uint8Array(buffer);
-  try {
-    const { default: JSZip } = await import('jszip');
-    const zip = await JSZip.loadAsync(typedBuffer);
-    // Catch the error if unable to load the zip.
-    return zip;
-  } catch (error) {
-    const message = 'Unable to open the archive file.';
-    reportError(message);
-    reportError('Error:', error);
-    reportError('Fetch response:', response);
-    throw new Error(
-      `${message} The full error information has been printed out to the DevTool’s console.`
-    );
-  }
-}
-
-/**
- * Parse JSON from an optionally gzipped array buffer.
- */
-async function _extractJsonFromArrayBuffer(
-  arrayBuffer: ArrayBuffer
-): Promise<unknown> {
-  let profileBytes = new Uint8Array(arrayBuffer);
-  // Check for the gzip magic number in the header.
-  if (isGzip(profileBytes)) {
-    profileBytes = await decompress(profileBytes);
-  }
-
-  const textDecoder = new TextDecoder();
-  return JSON.parse(textDecoder.decode(profileBytes));
-}
-
-/**
- * Don't trust third party responses, try and handle a variety of responses gracefully.
- */
-async function _extractJsonFromResponse(
-  response: Response,
-  reportError: (...data: Array<any>) => void,
-  fileType: 'application/json' | null
-): Promise<unknown> {
-  let arrayBuffer: ArrayBuffer | null = null;
-  try {
-    // await before returning so that we can catch JSON parse errors.
-    arrayBuffer = await response.arrayBuffer();
-    return await _extractJsonFromArrayBuffer(arrayBuffer);
-  } catch (error) {
-    // Change the error message depending on the circumstance:
-    let message;
-    if (error && typeof error === 'object' && error.name === 'AbortError') {
-      message = 'The network request to load the profile was aborted.';
-    } else if (fileType === 'application/json') {
-      message = 'The profile’s JSON could not be decoded.';
-    } else if (fileType === null && arrayBuffer !== null) {
-      // If the content type is not specified, use a raw array buffer
-      // to fallback to other supported profile formats.
-      return arrayBuffer;
-    } else {
-      message = oneLine`
-        The profile could not be downloaded and decoded. This does not look like a supported file
-        type.
-      `;
-    }
-
-    // Provide helpful debugging information to the console.
-    reportError(message);
-    reportError('JSON parsing error:', error);
-    reportError('Fetch response:', response);
-
-    throw new Error(
-      `${message} The full error information has been printed out to the DevTool’s console.`
-    );
-  }
-}
-
-export function getProfileUrlForHash(hash: string): string {
-  // See https://cloud.google.com/storage/docs/access-public-data
-  // The URL is https://storage.googleapis.com/<BUCKET>/<FILEPATH>.
-  // https://<BUCKET>.storage.googleapis.com/<FILEPATH> seems to also work but
-  // is not documented nowadays.
-
-  // By convention, "profile-store" is the name of our bucket, and the file path
-  // is the hash we receive in the URL.
-  return `https://storage.googleapis.com/${GOOGLE_STORAGE_BUCKET}/${hash}`;
-}
-
 export function retrieveProfileFromStore(
   hash: string,
   initialLoad: boolean = false
@@ -1262,7 +1007,7 @@ export function retrieveProfileOrZipFromUrl(
     dispatch(waitingForProfileFromUrl(profileUrl));
 
     try {
-      const response: ProfileOrZip = await _fetchProfile({
+      const response: ProfileOrZip = await fetchProfile({
         url: profileUrl,
         onTemporaryError: (e: TemporaryError) => {
           dispatch(temporaryError(e));
@@ -1293,7 +1038,7 @@ export function retrieveProfileOrZipFromUrl(
         default:
           throw assertExhaustiveCheck(
             response as never,
-            'Expected to receive an archive or profile from _fetchProfile.'
+            'Expected to receive an archive or profile from fetchProfile.'
           );
       }
     } catch (error) {
@@ -1349,7 +1094,7 @@ export function retrieveProfileFromFile(
     dispatch(waitingForProfileFromFile());
 
     try {
-      if (_deduceContentType(file.name, file.type) === 'application/zip') {
+      if (deduceContentType(file.name, file.type) === 'application/zip') {
         // Open a zip file in the zip file viewer
         const buffer = await fileReader(file).asArrayBuffer();
         const { default: JSZip } = await import('jszip');
@@ -1446,14 +1191,14 @@ export function retrieveProfilesToCompare(
 
           const profileUrl = getProfileFetchUrl(url);
 
-          const response: ProfileOrZip = await _fetchProfile({
+          const response: ProfileOrZip = await fetchProfile({
             url: profileUrl,
             onTemporaryError: (e: TemporaryError) => {
               dispatch(temporaryError(e));
             },
           });
           if (response.responseType !== 'PROFILE') {
-            throw new Error('Expected to receive a profile from _fetchProfile');
+            throw new Error('Expected to receive a profile from fetchProfile');
           }
 
           const upgradeInfo: ProfileUpgradeInfo = {};
diff --git a/src/test/components/Root-history.test.tsx b/src/test/components/Root-history.test.tsx
index e2c34a6bf2..13a130aa71 100644
--- a/src/test/components/Root-history.test.tsx
+++ b/src/test/components/Root-history.test.tsx
@@ -11,7 +11,7 @@ import {
 import { Root } from '../../components/app/Root';
 import { autoMockCanvasContext } from '../fixtures/mocks/canvas-context';
 import { fireFullClick } from '../fixtures/utils';
-import { getProfileUrlForHash } from '../../actions/receive-profile';
+import { getProfileUrlForHash } from '../../utils/profile-fetch';
 import { blankStore } from '../fixtures/stores';
 import { getProfileFromTextSamples } from '../fixtures/profiles/processed-profile';
 import {
diff --git a/src/test/fixtures/utils.ts b/src/test/fixtures/utils.ts
index 0f50030d9d..84290f4f7b 100644
--- a/src/test/fixtures/utils.ts
+++ b/src/test/fixtures/utils.ts
@@ -641,6 +641,26 @@ function isControlInput(element: HTMLElement): boolean {
   );
 }
 
+/**
+ * Returns an ArrayBuffer which contains only the bytes that are covered by the
+ * Uint8Array, making a copy if needed.
+ */
+export function extractArrayBuffer(
+  bufferView: Uint8Array<ArrayBuffer>
+): ArrayBuffer {
+  if (
+    bufferView.byteOffset === 0 &&
+    bufferView.byteLength === bufferView.buffer.byteLength
+  ) {
+    return bufferView.buffer;
+  }
+
+  // There was extra data at the start or at the end. Make a copy.
+  const copy = new Uint8Array(bufferView.byteLength);
+  copy.set(bufferView);
+  return copy.buffer;
+}
+
 /**
  * Adds a source entry to the sources table and returns the index.
  * If a source with the same URL already exists, returns the existing index.
diff --git a/src/test/store/__snapshots__/receive-profile.test.ts.snap b/src/test/store/__snapshots__/receive-profile.test.ts.snap
index 04b089ee95..02c2f06f5a 100644
--- a/src/test/store/__snapshots__/receive-profile.test.ts.snap
+++ b/src/test/store/__snapshots__/receive-profile.test.ts.snap
@@ -1,59 +1,5 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
-exports[`actions/receive-profile _fetchProfile fails if a bad profile JSON is passed in 1`] = `[Error: The profile’s JSON could not be decoded. The full error information has been printed out to the DevTool’s console.]`;
-
-exports[`actions/receive-profile _fetchProfile fails if a bad profile JSON is passed in 2`] = `
-Array [
-  Array [
-    "The profile’s JSON could not be decoded.",
-  ],
-  Array [
-    "JSON parsing error:",
-    [SyntaxError: Unexpected token 'i', "invalid" is not valid JSON],
-  ],
-  Array [
-    "Fetch response:",
-    Response {},
-  ],
-]
-`;
-
-exports[`actions/receive-profile _fetchProfile fails if a bad profile JSON is passed in, with no content type 1`] = `[Error: The profile’s JSON could not be decoded. The full error information has been printed out to the DevTool’s console.]`;
-
-exports[`actions/receive-profile _fetchProfile fails if a bad profile JSON is passed in, with no content type 2`] = `
-Array [
-  Array [
-    "The profile’s JSON could not be decoded.",
-  ],
-  Array [
-    "JSON parsing error:",
-    [SyntaxError: Unexpected token 'i', "invalid" is not valid JSON],
-  ],
-  Array [
-    "Fetch response:",
-    Response {},
-  ],
-]
-`;
-
-exports[`actions/receive-profile _fetchProfile fails if a bad zip file is passed in 1`] = `[Error: Unable to open the archive file. The full error information has been printed out to the DevTool’s console.]`;
-
-exports[`actions/receive-profile _fetchProfile fails if a bad zip file is passed in 2`] = `
-Array [
-  Array [
-    "Unable to open the archive file.",
-  ],
-  Array [
-    "Error:",
-    [Error: Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html],
-  ],
-  Array [
-    "Fetch response:",
-    Response {},
-  ],
-]
-`;
-
 exports[`actions/receive-profile retrieveProfileFromFile will be an error to view a profile with no threads 1`] = `"No threads were captured in this profile, there is nothing to display."`;
 
 exports[`actions/receive-profile retrieveProfileFromFile will give an error when unable to decompress a zipped profile 1`] = `[Error: Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html]`;
diff --git a/src/test/store/receive-profile.test.ts b/src/test/store/receive-profile.test.ts
index 0b336a05d8..08fa5b3601 100644
--- a/src/test/store/receive-profile.test.ts
+++ b/src/test/store/receive-profile.test.ts
@@ -27,9 +27,9 @@ import {
   retrieveProfileOrZipFromUrl,
   retrieveProfileFromFile,
   retrieveProfilesToCompare,
-  _fetchProfile,
   retrieveProfileForRawUrl,
 } from '../../actions/receive-profile';
+import { fetchProfile as _fetchProfile } from '../../utils/profile-fetch';
 import { SymbolsNotFoundError } from '../../profile-logic/errors';
 
 import { createGeckoProfile } from '../fixtures/profiles/gecko-profile';
@@ -46,7 +46,7 @@ import {
   getProfileWithThreadCPUDelta,
 } from '../fixtures/profiles/processed-profile';
 import { getHumanReadableTracks } from '../fixtures/profiles/tracks';
-import { waitUntilState } from '../fixtures/utils';
+import { waitUntilState, extractArrayBuffer } from '../fixtures/utils';
 import { dataUrlToBytes } from 'firefox-profiler/utils/base64';
 
 import { compress } from '../../utils/gz';
@@ -88,22 +88,6 @@ function simulateSymbolStoreHasNoCache() {
   }));
 }
 
-// Returns an ArrayBuffer which contains only the bytes that
-// are covered by the Uint8Array, making a copy if needed.
-function extractArrayBuffer(bufferView: Uint8Array<ArrayBuffer>): ArrayBuffer {
-  if (
-    bufferView.byteOffset === 0 &&
-    bufferView.byteLength === bufferView.buffer.byteLength
-  ) {
-    return bufferView.buffer;
-  }
-
-  // There was extra data at the start or at the end. Make a copy.
-  const copy = new Uint8Array(bufferView.byteLength);
-  copy.set(bufferView);
-  return copy.buffer;
-}
-
 describe('actions/receive-profile', function () {
   beforeEach(() => {
     // The SymbolStore requires the use of IndexedDB, ensure that it exists so that
@@ -1150,193 +1134,6 @@ describe('actions/receive-profile', function () {
     });
   });
 
-  /**
-   * _fetchProfile is a helper function for the actions, but it is tested separately
-   * since it has a decent amount of complexity around different issues with loading
-   * in different support URL formats. It's mainly testing what happens when JSON
-   * and zip file is sent, and what happens when things fail.
-   */
-  describe('_fetchProfile', function () {
-    /**
-     * This helper function encapsulates various configurations for the type of content
-     * as well and response headers.
-     */
-    async function configureFetch(obj: {
-      url: string;
-      contentType?: string;
-      content: 'generated-zip' | 'generated-json' | Uint8Array;
-    }) {
-      const { url, contentType, content } = obj;
-      const stringProfile = serializeProfile(_getSimpleProfile());
-      const profile = JSON.parse(stringProfile);
-      let arrayBuffer;
-
-      switch (content) {
-        case 'generated-zip': {
-          const zip = new JSZip();
-          zip.file('profile.json', stringProfile);
-          arrayBuffer = await zip.generateAsync({ type: 'uint8array' });
-          break;
-        }
-        case 'generated-json':
-          arrayBuffer = encode(stringProfile);
-          break;
-        default:
-          arrayBuffer = content;
-          break;
-      }
-
-      window.fetchMock.catch(403).get(url, {
-        body: arrayBuffer,
-        headers: {
-          'content-type': contentType,
-        },
-      });
-
-      const reportError = jest.fn();
-      const args = {
-        url,
-        onTemporaryError: () => {},
-        reportError,
-      };
-
-      // Return fetch's args, based on the inputs.
-      return { profile, args, reportError };
-    }
-
-    it('fetches a normal profile with the correct content-type headers', async function () {
-      const { profile, args } = await configureFetch({
-        url: 'https://example.com/profile.json',
-        contentType: 'application/json',
-        content: 'generated-json',
-      });
-
-      const profileOrZip = await _fetchProfile(args);
-      expect(profileOrZip).toEqual({ responseType: 'PROFILE', profile });
-    });
-
-    it('fetches a zipped profile with correct content-type headers', async function () {
-      const { args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.zip',
-        contentType: 'application/zip',
-        content: 'generated-zip',
-      });
-
-      const profileOrZip = await _fetchProfile(args);
-      expect(profileOrZip.responseType).toBe('ZIP');
-      expect(reportError.mock.calls.length).toBe(0);
-    });
-
-    it('fetches a zipped profile with incorrect content-type headers, but .zip extension', async function () {
-      const { args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.zip',
-        content: 'generated-zip',
-      });
-
-      const profileOrZip = await _fetchProfile(args);
-      expect(profileOrZip.responseType).toBe('ZIP');
-      expect(reportError.mock.calls.length).toBe(0);
-    });
-
-    it('fetches a profile with incorrect content-type headers, but .json extension', async function () {
-      const { profile, args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.json',
-        content: 'generated-json',
-      });
-
-      const profileOrZip = await _fetchProfile(args);
-      expect(profileOrZip).toEqual({ responseType: 'PROFILE', profile });
-      expect(reportError.mock.calls.length).toBe(0);
-    });
-
-    it('fetches a profile with incorrect content-type headers, no known extension, and attempts to JSON parse it it', async function () {
-      const { profile, args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.file',
-        content: 'generated-json',
-      });
-
-      const profileOrZip = await _fetchProfile(args);
-      expect(profileOrZip).toEqual({ responseType: 'PROFILE', profile });
-      expect(reportError.mock.calls.length).toBe(0);
-    });
-
-    it('fails if a bad zip file is passed in', async function () {
-      const { args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.file',
-        contentType: 'application/zip',
-        content: new Uint8Array([0, 1, 2, 3]),
-      });
-
-      let userFacingError;
-      try {
-        await _fetchProfile(args);
-      } catch (error) {
-        userFacingError = error;
-      }
-      expect(userFacingError).toMatchSnapshot();
-      expect(reportError.mock.calls.length).toBeGreaterThan(0);
-      expect(reportError.mock.calls).toMatchSnapshot();
-    });
-
-    it('fails if a bad profile JSON is passed in', async function () {
-      const invalidJSON = 'invalid';
-      const { args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.json',
-        contentType: 'application/json',
-        content: encode(invalidJSON),
-      });
-
-      let userFacingError;
-      try {
-        await _fetchProfile(args);
-      } catch (error) {
-        userFacingError = error;
-      }
-      expect(userFacingError).toMatchSnapshot();
-      expect(reportError.mock.calls.length).toBeGreaterThan(0);
-      expect(reportError.mock.calls).toMatchSnapshot();
-    });
-
-    it('fails if a bad profile JSON is passed in, with no content type', async function () {
-      const invalidJSON = 'invalid';
-      const { args, reportError } = await configureFetch({
-        url: 'https://example.com/profile.json',
-        content: encode(invalidJSON),
-      });
-
-      let userFacingError;
-      try {
-        await _fetchProfile(args);
-      } catch (error) {
-        userFacingError = error;
-      }
-      expect(userFacingError).toMatchSnapshot();
-      expect(reportError.mock.calls.length).toBeGreaterThan(0);
-      expect(reportError.mock.calls).toMatchSnapshot();
-    });
-
-    it('fallback behavior if a completely unknown file is passed in', async function () {
-      const invalidJSON = 'invalid';
-      const profile = encode(invalidJSON);
-      const { args } = await configureFetch({
-        url: 'https://example.com/profile.unknown',
-        content: profile,
-      });
-
-      let userFacingError = null;
-      try {
-        const profileOrZip = await _fetchProfile(args);
-        expect(profileOrZip).toEqual({
-          responseType: 'PROFILE',
-          profile: extractArrayBuffer(profile),
-        });
-      } catch (error) {
-        userFacingError = error;
-      }
-      expect(userFacingError).toBeNull();
-    });
-  });
-
   describe('retrieveProfileFromFile', function () {
     /**
      * Bypass all of Flow's checks, and mock out the file interface.
diff --git a/src/test/unit/__snapshots__/profile-fetch.test.ts.snap b/src/test/unit/__snapshots__/profile-fetch.test.ts.snap
new file mode 100644
index 0000000000..1de4f42d93
--- /dev/null
+++ b/src/test/unit/__snapshots__/profile-fetch.test.ts.snap
@@ -0,0 +1,55 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`fetchProfile fails if a bad profile JSON is passed in 1`] = `[Error: The profile’s JSON could not be decoded. The full error information has been printed out to the DevTool’s console.]`;
+
+exports[`fetchProfile fails if a bad profile JSON is passed in 2`] = `
+Array [
+  Array [
+    "The profile’s JSON could not be decoded.",
+  ],
+  Array [
+    "JSON parsing error:",
+    [SyntaxError: Unexpected token 'i', "invalid" is not valid JSON],
+  ],
+  Array [
+    "Fetch response:",
+    Response {},
+  ],
+]
+`;
+
+exports[`fetchProfile fails if a bad profile JSON is passed in, with no content type 1`] = `[Error: The profile’s JSON could not be decoded. The full error information has been printed out to the DevTool’s console.]`;
+
+exports[`fetchProfile fails if a bad profile JSON is passed in, with no content type 2`] = `
+Array [
+  Array [
+    "The profile’s JSON could not be decoded.",
+  ],
+  Array [
+    "JSON parsing error:",
+    [SyntaxError: Unexpected token 'i', "invalid" is not valid JSON],
+  ],
+  Array [
+    "Fetch response:",
+    Response {},
+  ],
+]
+`;
+
+exports[`fetchProfile fails if a bad zip file is passed in 1`] = `[Error: Unable to open the archive file. The full error information has been printed out to the DevTool’s console.]`;
+
+exports[`fetchProfile fails if a bad zip file is passed in 2`] = `
+Array [
+  Array [
+    "Unable to open the archive file.",
+  ],
+  Array [
+    "Error:",
+    [Error: Can't find end of central directory : is this a zip file ? If it is, see https://stuk.github.io/jszip/documentation/howto/read_zip.html],
+  ],
+  Array [
+    "Fetch response:",
+    Response {},
+  ],
+]
+`;
diff --git a/src/test/unit/profile-fetch.test.ts b/src/test/unit/profile-fetch.test.ts
new file mode 100644
index 0000000000..f971b291ad
--- /dev/null
+++ b/src/test/unit/profile-fetch.test.ts
@@ -0,0 +1,208 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+import JSZip from 'jszip';
+
+import { fetchProfile } from '../../utils/profile-fetch';
+import { serializeProfile } from '../../profile-logic/process-profile';
+import { getProfileFromTextSamples } from '../fixtures/profiles/processed-profile';
+import { extractArrayBuffer } from '../fixtures/utils';
+
+import type { Profile } from 'firefox-profiler/types';
+
+function encode(string: string): Uint8Array<ArrayBuffer> {
+  return new TextEncoder().encode(string);
+}
+
+/**
+ * This profile will have a single sample, and a single thread.
+ */
+function _getSimpleProfile(): Profile {
+  return getProfileFromTextSamples('A').profile;
+}
+
+/**
+ * fetchProfile has a decent amount of complexity around different issues with loading
+ * in different support URL formats. It's mainly testing what happens when JSON
+ * and zip file is sent, and what happens when things fail.
+ */
+describe('fetchProfile', function () {
+  /**
+   * This helper function encapsulates various configurations for the type of content
+   * as well and response headers.
+   */
+  async function configureFetch(obj: {
+    url: string;
+    contentType?: string;
+    content: 'generated-zip' | 'generated-json' | Uint8Array;
+  }) {
+    const { url, contentType, content } = obj;
+    const stringProfile = serializeProfile(_getSimpleProfile());
+    const profile = JSON.parse(stringProfile);
+    let arrayBuffer;
+
+    switch (content) {
+      case 'generated-zip': {
+        const zip = new JSZip();
+        zip.file('profile.json', stringProfile);
+        arrayBuffer = await zip.generateAsync({ type: 'uint8array' });
+        break;
+      }
+      case 'generated-json':
+        arrayBuffer = encode(stringProfile);
+        break;
+      default:
+        arrayBuffer = content;
+        break;
+    }
+
+    window.fetchMock.catch(403).get(url, {
+      body: arrayBuffer,
+      headers: {
+        'content-type': contentType,
+      },
+    });
+
+    const reportError = jest.fn();
+    const args = {
+      url,
+      onTemporaryError: () => {},
+      reportError,
+    };
+
+    // Return fetch's args, based on the inputs.
+    return { profile, args, reportError };
+  }
+
+  it('fetches a normal profile with the correct content-type headers', async function () {
+    const { profile, args } = await configureFetch({
+      url: 'https://example.com/profile.json',
+      contentType: 'application/json',
+      content: 'generated-json',
+    });
+
+    const profileOrZip = await fetchProfile(args);
+    expect(profileOrZip).toEqual({ responseType: 'PROFILE', profile });
+  });
+
+  it('fetches a zipped profile with correct content-type headers', async function () {
+    const { args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.zip',
+      contentType: 'application/zip',
+      content: 'generated-zip',
+    });
+
+    const profileOrZip = await fetchProfile(args);
+    expect(profileOrZip.responseType).toBe('ZIP');
+    expect(reportError.mock.calls.length).toBe(0);
+  });
+
+  it('fetches a zipped profile with incorrect content-type headers, but .zip extension', async function () {
+    const { args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.zip',
+      content: 'generated-zip',
+    });
+
+    const profileOrZip = await fetchProfile(args);
+    expect(profileOrZip.responseType).toBe('ZIP');
+    expect(reportError.mock.calls.length).toBe(0);
+  });
+
+  it('fetches a profile with incorrect content-type headers, but .json extension', async function () {
+    const { profile, args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.json',
+      content: 'generated-json',
+    });
+
+    const profileOrZip = await fetchProfile(args);
+    expect(profileOrZip).toEqual({ responseType: 'PROFILE', profile });
+    expect(reportError.mock.calls.length).toBe(0);
+  });
+
+  it('fetches a profile with incorrect content-type headers, no known extension, and attempts to JSON parse it', async function () {
+    const { profile, args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.file',
+      content: 'generated-json',
+    });
+
+    const profileOrZip = await fetchProfile(args);
+    expect(profileOrZip).toEqual({ responseType: 'PROFILE', profile });
+    expect(reportError.mock.calls.length).toBe(0);
+  });
+
+  it('fails if a bad zip file is passed in', async function () {
+    const { args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.file',
+      contentType: 'application/zip',
+      content: new Uint8Array([0, 1, 2, 3]),
+    });
+
+    let userFacingError;
+    try {
+      await fetchProfile(args);
+    } catch (error) {
+      userFacingError = error;
+    }
+    expect(userFacingError).toMatchSnapshot();
+    expect(reportError.mock.calls.length).toBeGreaterThan(0);
+    expect(reportError.mock.calls).toMatchSnapshot();
+  });
+
+  it('fails if a bad profile JSON is passed in', async function () {
+    const invalidJSON = 'invalid';
+    const { args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.json',
+      contentType: 'application/json',
+      content: encode(invalidJSON),
+    });
+
+    let userFacingError;
+    try {
+      await fetchProfile(args);
+    } catch (error) {
+      userFacingError = error;
+    }
+    expect(userFacingError).toMatchSnapshot();
+    expect(reportError.mock.calls.length).toBeGreaterThan(0);
+    expect(reportError.mock.calls).toMatchSnapshot();
+  });
+
+  it('fails if a bad profile JSON is passed in, with no content type', async function () {
+    const invalidJSON = 'invalid';
+    const { args, reportError } = await configureFetch({
+      url: 'https://example.com/profile.json',
+      content: encode(invalidJSON),
+    });
+
+    let userFacingError;
+    try {
+      await fetchProfile(args);
+    } catch (error) {
+      userFacingError = error;
+    }
+    expect(userFacingError).toMatchSnapshot();
+    expect(reportError.mock.calls.length).toBeGreaterThan(0);
+    expect(reportError.mock.calls).toMatchSnapshot();
+  });
+
+  it('fallback behavior if a completely unknown file is passed in', async function () {
+    const invalidJSON = 'invalid';
+    const profile = encode(invalidJSON);
+    const { args } = await configureFetch({
+      url: 'https://example.com/profile.unknown',
+      content: profile,
+    });
+
+    let userFacingError = null;
+    try {
+      const profileOrZip = await fetchProfile(args);
+      expect(profileOrZip).toEqual({
+        responseType: 'PROFILE',
+        profile: extractArrayBuffer(profile),
+      });
+    } catch (error) {
+      userFacingError = error;
+    }
+    expect(userFacingError).toBeNull();
+  });
+});
diff --git a/src/utils/profile-fetch.ts b/src/utils/profile-fetch.ts
new file mode 100644
index 0000000000..3a7f1638ba
--- /dev/null
+++ b/src/utils/profile-fetch.ts
@@ -0,0 +1,346 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { oneLine } from 'common-tags';
+import { assertExhaustiveCheck } from './types';
+import { TemporaryError } from './errors';
+import { decompress, isGzip } from './gz';
+import { isLocalURL } from './url';
+import { GOOGLE_STORAGE_BUCKET } from 'firefox-profiler/app-logic/constants';
+import type JSZip from 'jszip';
+
+/**
+ * Shared utilities for fetching profiles from URLs.
+ * Used by both the web app (receive-profile.ts) and the CLI (profile-query).
+ *
+ * This module was extracted from receive-profile.ts to make the fetching
+ * logic reusable across different contexts (Redux vs CLI).
+ */
+
+/**
+ * Convert a profile hash to its Google Cloud Storage URL.
+ * Public profiles are stored in Google Cloud Storage in the profile-store bucket.
+ * See https://cloud.google.com/storage/docs/access-public-data
+ */
+export function getProfileUrlForHash(hash: string): string {
+  return `https://storage.googleapis.com/${GOOGLE_STORAGE_BUCKET}/${hash}`;
+}
+
+/**
+ * Extract the actual profile URL from a profiler.firefox.com URL.
+ *
+ * Parses URLs like:
+ * - https://profiler.firefox.com/from-url/http%3A%2F%2F127.0.0.1%3A3000%2Fprofile.json/
+ * - https://profiler.firefox.com/public/g9w0fmjjx4bqrky4zg0wb90n65b8g3w0qjjx1t0/calltree/
+ *
+ * Returns the decoded profile URL, or null if this is not a supported datasource.
+ * This mimics the logic in retrieveProfileFromStore and retrieveProfileForRawUrl
+ * from receive-profile.ts
+ */
+export function extractProfileUrlFromProfilerUrl(
+  profilerUrl: string
+): string | null {
+  try {
+    // Handle both full URLs and just pathnames
+    let pathname: string;
+    if (
+      profilerUrl.startsWith('http://') ||
+      profilerUrl.startsWith('https://')
+    ) {
+      const url = new URL(profilerUrl);
+      pathname = url.pathname;
+    } else {
+      pathname = profilerUrl;
+    }
+
+    const pathParts = pathname.split('/').filter((d) => d);
+
+    // Check if this is a from-url datasource
+    // URL structure: /from-url/{encoded-profile-url}/...
+    if (pathParts[0] === 'from-url' && pathParts[1]) {
+      return decodeURIComponent(pathParts[1]);
+    }
+
+    // Check if this is a public datasource
+    // URL structure: /public/{hash}/...
+    // Profile is stored in Google Cloud Storage
+    if (pathParts[0] === 'public' && pathParts[1]) {
+      const hash = pathParts[1];
+      return getProfileUrlForHash(hash);
+    }
+
+    return null;
+  } catch (error) {
+    console.error('Failed to parse profiler URL:', error);
+    return null;
+  }
+}
+
+function _wait(delayMs: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, delayMs));
+}
+
+/**
+ * Check if a load failure is likely due to Safari's localhost HTTP restriction.
+ * Safari blocks mixed content (HTTP on HTTPS page) even for localhost.
+ * This check works in both browser and Node.js (returns false in Node).
+ */
+function _loadProbablyFailedDueToSafariLocalhostHTTPRestriction(
+  url: string,
+  error: Error
+): boolean {
+  // In Node.js, navigator won't exist
+  if (
+    typeof navigator === 'undefined' ||
+    !navigator.userAgent.match(/Safari\/\d+\.\d+/)
+  ) {
+    return false;
+  }
+  // Check if Safari considers this mixed content.
+  try {
+    const parsedUrl = new URL(url);
+    return (
+      error.name === 'TypeError' &&
+      parsedUrl.protocol === 'http:' &&
+      isLocalURL(parsedUrl) &&
+      typeof location !== 'undefined' &&
+      location.protocol === 'https:'
+    );
+  } catch {
+    return false;
+  }
+}
+
+export class SafariLocalhostHTTPLoadError extends Error {
+  override name = 'SafariLocalhostHTTPLoadError';
+}
+
+/**
+ * Deduce the file type from a URL and content type.
+ * This is used to detect zip files vs profile files.
+ * Exported for use in receive-profile.ts for file handling.
+ */
+export function deduceContentType(
+  url: string,
+  contentType: string | null
+): 'application/json' | 'application/zip' | null {
+  if (contentType === 'application/zip' || contentType === 'application/json') {
+    return contentType;
+  }
+  if (url.match(/\.zip$/)) {
+    return 'application/zip';
+  }
+  if (url.match(/\.json/)) {
+    return 'application/json';
+  }
+  return null;
+}
+
+/**
+ * Parse JSON from an optionally gzipped array buffer.
+ * Exported for use in receive-profile.ts for direct file processing.
+ */
+export async function extractJsonFromArrayBuffer(
+  arrayBuffer: ArrayBuffer
+): Promise<unknown> {
+  let profileBytes = new Uint8Array(arrayBuffer);
+  // Check for the gzip magic number in the header.
+  if (isGzip(profileBytes)) {
+    profileBytes = await decompress(profileBytes);
+  }
+
+  const textDecoder = new TextDecoder();
+  return JSON.parse(textDecoder.decode(profileBytes));
+}
+
+/**
+ * Don't trust third party responses, try and handle a variety of responses gracefully.
+ */
+async function _extractJsonFromResponse(
+  response: Response,
+  reportError: (...data: Array<any>) => void,
+  fileType: 'application/json' | null
+): Promise<unknown> {
+  let arrayBuffer: ArrayBuffer | null = null;
+  try {
+    // await before returning so that we can catch JSON parse errors.
+    arrayBuffer = await response.arrayBuffer();
+    return await extractJsonFromArrayBuffer(arrayBuffer);
+  } catch (error) {
+    // Change the error message depending on the circumstance:
+    let message;
+    if (error && typeof error === 'object' && error.name === 'AbortError') {
+      message = 'The network request to load the profile was aborted.';
+    } else if (fileType === 'application/json') {
+      message = 'The profile’s JSON could not be decoded.';
+    } else if (fileType === null && arrayBuffer !== null) {
+      // If the content type is not specified, use a raw array buffer
+      // to fallback to other supported profile formats.
+      return arrayBuffer;
+    } else {
+      message = oneLine`
+        The profile could not be downloaded and decoded. This does not look like a supported file
+        type.
+      `;
+    }
+
+    // Provide helpful debugging information to the console.
+    reportError(message);
+    reportError('JSON parsing error:', error);
+    reportError('Fetch response:', response);
+
+    throw new Error(
+      `${message} The full error information has been printed out to the DevTool’s console.`
+    );
+  }
+}
+
+/**
+ * Attempt to load a zip file from a third party. This process can fail, so make sure
+ * to handle and report the error if it does.
+ */
+async function _extractZipFromResponse(
+  response: Response,
+  reportError: (...data: Array<any>) => void
+): Promise<JSZip> {
+  const buffer = await response.arrayBuffer();
+  // Workaround for https://github.com/Stuk/jszip/issues/941
+  // When running this code in tests, `buffer` doesn't inherits from _this_
+  // realm's ArrayBuffer object, and this breaks JSZip which doesn't account for
+  // this case. We workaround the issue by wrapping the buffer in an Uint8Array
+  // that comes from this realm.
+  const typedBuffer = new Uint8Array(buffer);
+  try {
+    const { default: JSZip } = await import('jszip');
+    const zip = await JSZip.loadAsync(typedBuffer);
+    // Catch the error if unable to load the zip.
+    return zip;
+  } catch (error) {
+    const message = 'Unable to open the archive file.';
+    reportError(message);
+    reportError('Error:', error);
+    reportError('Fetch response:', response);
+    throw new Error(
+      `${message} The full error information has been printed out to the DevTool’s console.`
+    );
+  }
+}
+
+export type ProfileOrZip =
+  | { responseType: 'PROFILE'; profile: unknown }
+  | { responseType: 'ZIP'; zip: JSZip };
+
+/**
+ * This function guesses the correct content-type (even if one isn't sent) and then
+ * attempts to use the proper method to extract the response.
+ */
+async function _extractProfileOrZipFromResponse(
+  url: string,
+  response: Response,
+  reportError: (...data: Array<any>) => void
+): Promise<ProfileOrZip> {
+  const contentType = deduceContentType(
+    url,
+    response.headers.get('content-type')
+  );
+  switch (contentType) {
+    case 'application/zip':
+      return {
+        responseType: 'ZIP',
+        zip: await _extractZipFromResponse(response, reportError),
+      };
+    case 'application/json':
+    case null:
+      // The content type is null if it is unknown, or an unsupported type. Go ahead
+      // and try to process it as a profile.
+      return {
+        responseType: 'PROFILE',
+        profile: await _extractJsonFromResponse(
+          response,
+          reportError,
+          contentType
+        ),
+      };
+    default:
+      throw assertExhaustiveCheck(contentType);
+  }
+}
+
+export type FetchProfileArgs = {
+  url: string;
+  onTemporaryError: (param: TemporaryError) => void;
+  // Allow tests to capture the reported error, but normally use console.error.
+  reportError?: (...data: Array<any>) => void;
+};
+
+/**
+ * Tries to fetch a profile on `url`. If the profile is not found,
+ * `onTemporaryError` is called with an appropriate error, we wait 1 second, and
+ * then tries again. If we still can't find the profile after 11 tries, the
+ * returned promise is rejected with a fatal error.
+ * If we can retrieve the profile properly, the returned promise is resolved
+ * with the parsed profile or zip file.
+ *
+ * This function was moved from receive-profile.ts to make it reusable by
+ * both the web app and CLI.
+ */
+export async function fetchProfile(
+  args: FetchProfileArgs
+): Promise<ProfileOrZip> {
+  const MAX_WAIT_SECONDS = 10;
+  let i = 0;
+  const { url, onTemporaryError } = args;
+  // Allow tests to capture the reported error, but normally use console.error.
+  const reportError = args.reportError || console.error;
+
+  while (true) {
+    let response;
+    try {
+      response = await fetch(url);
+    } catch (e) {
+      // Case 1: Exception.
+      if (
+        _loadProbablyFailedDueToSafariLocalhostHTTPRestriction(url, e as Error)
+      ) {
+        throw new SafariLocalhostHTTPLoadError();
+      }
+      throw e;
+    }
+
+    // Case 2: successful answer.
+    if (response.ok) {
+      return _extractProfileOrZipFromResponse(url, response, reportError);
+    }
+
+    // case 3: unrecoverable error.
+    if (response.status !== 403) {
+      throw new Error(oneLine`
+          Could not fetch the profile on remote server.
+          Response was: ${response.status} ${response.statusText}.
+        `);
+    }
+
+    // case 4: 403 errors can be transient while a profile is uploaded.
+
+    if (i++ === MAX_WAIT_SECONDS) {
+      // In the last iteration we don't send a temporary error because we'll
+      // throw an error right after the while loop.
+      break;
+    }
+
+    onTemporaryError(
+      new TemporaryError(
+        'Profile not found on remote server.',
+        { count: i, total: MAX_WAIT_SECONDS + 1 } // 11 tries during 10 seconds
+      )
+    );
+
+    await _wait(1000);
+  }
+
+  throw new Error(oneLine`
+    Could not fetch the profile on remote server:
+    still not found after ${MAX_WAIT_SECONDS} seconds.
+  `);
+}

From a4b9d4ed88019048d8de3dd7dbf06a6ae3b56db9 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 14:58:38 +0200
Subject: [PATCH 24/64] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20esbuild=20t?=
 =?UTF-8?q?o=20version=200.28.0=20(#5941)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 418 ++++++++++++++++++++-------------------------------
 2 files changed, 165 insertions(+), 255 deletions(-)

diff --git a/package.json b/package.json
index 43354850f9..532cbb3747 100644
--- a/package.json
+++ b/package.json
@@ -144,7 +144,7 @@
     "caniuse-lite": "^1.0.30001770",
     "cross-env": "^10.1.0",
     "devtools-license-check": "^0.9.0",
-    "esbuild": "^0.27.0",
+    "esbuild": "^0.28.0",
     "esbuild-plugin-copy": "^2.1.1",
     "esbuild-plugin-wasm": "^1.1.0",
     "eslint": "^9.39.4",
diff --git a/yarn.lock b/yarn.lock
index dd43ea0c55..92e0fdb88d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1238,135 +1238,135 @@
   resolved "https://registry.yarnpkg.com/@epic-web/invariant/-/invariant-1.0.0.tgz#1073e5dee6dd540410784990eb73e4acd25c9813"
   integrity sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==
 
-"@esbuild/aix-ppc64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz#815b39267f9bffd3407ea6c376ac32946e24f8d2"
-  integrity sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==
-
-"@esbuild/android-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz#19b882408829ad8e12b10aff2840711b2da361e8"
-  integrity sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==
-
-"@esbuild/android-arm@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.27.3.tgz#90be58de27915efa27b767fcbdb37a4470627d7b"
-  integrity sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==
-
-"@esbuild/android-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.27.3.tgz#d7dcc976f16e01a9aaa2f9b938fbec7389f895ac"
-  integrity sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==
-
-"@esbuild/darwin-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz#9f6cac72b3a8532298a6a4493ed639a8988e8abd"
-  integrity sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==
-
-"@esbuild/darwin-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz#ac61d645faa37fd650340f1866b0812e1fb14d6a"
-  integrity sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==
-
-"@esbuild/freebsd-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz#b8625689d73cf1830fe58c39051acdc12474ea1b"
-  integrity sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==
-
-"@esbuild/freebsd-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz#07be7dd3c9d42fe0eccd2ab9f9ded780bc53bead"
-  integrity sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==
-
-"@esbuild/linux-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz#bf31918fe5c798586460d2b3d6c46ed2c01ca0b6"
-  integrity sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==
-
-"@esbuild/linux-arm@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz#28493ee46abec1dc3f500223cd9f8d2df08f9d11"
-  integrity sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==
-
-"@esbuild/linux-ia32@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz#750752a8b30b43647402561eea764d0a41d0ee29"
-  integrity sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==
-
-"@esbuild/linux-loong64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz#a5a92813a04e71198c50f05adfaf18fc1e95b9ed"
-  integrity sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==
-
-"@esbuild/linux-mips64el@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz#deb45d7fd2d2161eadf1fbc593637ed766d50bb1"
-  integrity sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==
-
-"@esbuild/linux-ppc64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz#6f39ae0b8c4d3d2d61a65b26df79f6e12a1c3d78"
-  integrity sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==
-
-"@esbuild/linux-riscv64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz#4c5c19c3916612ec8e3915187030b9df0b955c1d"
-  integrity sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==
-
-"@esbuild/linux-s390x@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz#9ed17b3198fa08ad5ccaa9e74f6c0aff7ad0156d"
-  integrity sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==
-
-"@esbuild/linux-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz#12383dcbf71b7cf6513e58b4b08d95a710bf52a5"
-  integrity sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==
-
-"@esbuild/netbsd-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz#dd0cb2fa543205fcd931df44f4786bfcce6df7d7"
-  integrity sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==
-
-"@esbuild/netbsd-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz#028ad1807a8e03e155153b2d025b506c3787354b"
-  integrity sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==
-
-"@esbuild/openbsd-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz#e3c16ff3490c9b59b969fffca87f350ffc0e2af5"
-  integrity sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==
-
-"@esbuild/openbsd-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz#c5a4693fcb03d1cbecbf8b422422468dfc0d2a8b"
-  integrity sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==
-
-"@esbuild/openharmony-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz#082082444f12db564a0775a41e1991c0e125055e"
-  integrity sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==
-
-"@esbuild/sunos-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz#5ab036c53f929e8405c4e96e865a424160a1b537"
-  integrity sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==
-
-"@esbuild/win32-arm64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz#38de700ef4b960a0045370c171794526e589862e"
-  integrity sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==
-
-"@esbuild/win32-ia32@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz#451b93dc03ec5d4f38619e6cd64d9f9eff06f55c"
-  integrity sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==
-
-"@esbuild/win32-x64@0.27.3":
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz#0eaf705c941a218a43dba8e09f1df1d6cd2f1f17"
-  integrity sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==
+"@esbuild/aix-ppc64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.28.0.tgz#7a289c158e29cbf59ea0afc83cc80f06d1c89402"
+  integrity sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA==
+
+"@esbuild/android-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.28.0.tgz#b8828d9edfa3a92660644eb8de6e4f3c203d7b17"
+  integrity sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw==
+
+"@esbuild/android-arm@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.28.0.tgz#5ec1847605e05b5dbe5df90db9ff7e3e4c58dca7"
+  integrity sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ==
+
+"@esbuild/android-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.28.0.tgz#390642175b88ef82bad4cce03f8ab13fe9b1912e"
+  integrity sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA==
+
+"@esbuild/darwin-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.28.0.tgz#ae45325960d5950cd6951e4f97396f4e1ff7d8d3"
+  integrity sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q==
+
+"@esbuild/darwin-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.28.0.tgz#c079247d589b6b99449659d94f06951b84bff2e4"
+  integrity sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ==
+
+"@esbuild/freebsd-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.0.tgz#45c456215a486593c94900297202dc11c880a37a"
+  integrity sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q==
+
+"@esbuild/freebsd-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.28.0.tgz#0399494c1c85e4388e9b7040bd60d48f2a5b0d2c"
+  integrity sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw==
+
+"@esbuild/linux-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.28.0.tgz#d6d9f09ef0de54116bf459a4d53cac7e0952fe39"
+  integrity sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A==
+
+"@esbuild/linux-arm@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.28.0.tgz#7b42ffa84c288ae94fdc431c1b28a89e3c3b9278"
+  integrity sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw==
+
+"@esbuild/linux-ia32@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.28.0.tgz#deb15d112ed8dd605346b6b953d23a21ff81253f"
+  integrity sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ==
+
+"@esbuild/linux-loong64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.28.0.tgz#81fb89d07eecc79b157dea61033757726fce0ca4"
+  integrity sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg==
+
+"@esbuild/linux-mips64el@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.28.0.tgz#d0e42691b3ff7af9fb2217b70fc01f343bdb62bb"
+  integrity sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w==
+
+"@esbuild/linux-ppc64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.28.0.tgz#389f3e5e98f17d477c467cc87136e1a076eead87"
+  integrity sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg==
+
+"@esbuild/linux-riscv64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.28.0.tgz#763bd60d59b242be12da1e67d5729f3024c605fa"
+  integrity sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ==
+
+"@esbuild/linux-s390x@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.28.0.tgz#aac6061634872e4677de693bce8030d73b1fd055"
+  integrity sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q==
+
+"@esbuild/linux-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.28.0.tgz#4f2917747188fe77632bcec65b2d84b422419779"
+  integrity sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ==
+
+"@esbuild/netbsd-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.0.tgz#814df0ae57a0c386814491b8397eeba82094a947"
+  integrity sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw==
+
+"@esbuild/netbsd-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.28.0.tgz#e01bdf7e60fa1a08e46d46d960b0d9bb8ac210af"
+  integrity sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw==
+
+"@esbuild/openbsd-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.0.tgz#4a15c36aacca68d2d5a4c90b710c06759f4c1ffa"
+  integrity sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g==
+
+"@esbuild/openbsd-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.28.0.tgz#475e6101498a8ecce3008d7c388111d7a27c17bd"
+  integrity sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA==
+
+"@esbuild/openharmony-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.0.tgz#cfdc3957f0b7a69f1bde129aad17fcc2f6fa033e"
+  integrity sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w==
+
+"@esbuild/sunos-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.28.0.tgz#a013c856fecacd1c3aec985c8afe1d1cb017497d"
+  integrity sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw==
+
+"@esbuild/win32-arm64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.28.0.tgz#eae05e0f35271cad3898b43168d3e9a3bbaf47e5"
+  integrity sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA==
+
+"@esbuild/win32-ia32@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.28.0.tgz#06161ebc5bf75c08d69feb3c6b22560515913998"
+  integrity sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA==
+
+"@esbuild/win32-x64@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.28.0.tgz#04d90d5752b4ce65d2b6ac25eba08ff7624fe07c"
+  integrity sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw==
 
 "@eslint-community/eslint-utils@^4.8.0", "@eslint-community/eslint-utils@^4.9.1":
   version "4.9.1"
@@ -2514,15 +2514,6 @@
     "@typescript-eslint/visitor-keys" "8.58.0"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.56.1":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.56.1.tgz#65c8d645f028b927bfc4928593b54e2ecd809244"
-  integrity sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==
-  dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.56.1"
-    "@typescript-eslint/types" "^8.56.1"
-    debug "^4.4.3"
-
 "@typescript-eslint/project-service@8.58.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.0.tgz#66ceda0aabf7427aec3e2713fa43eb278dead2aa"
@@ -2532,15 +2523,7 @@
     "@typescript-eslint/types" "^8.58.0"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.56.1", "@typescript-eslint/scope-manager@^8.56.0":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz#254df93b5789a871351335dd23e20bc164060f24"
-  integrity sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==
-  dependencies:
-    "@typescript-eslint/types" "8.56.1"
-    "@typescript-eslint/visitor-keys" "8.56.1"
-
-"@typescript-eslint/scope-manager@8.58.0":
+"@typescript-eslint/scope-manager@8.58.0", "@typescript-eslint/scope-manager@^8.56.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.0.tgz#e304142775e49a1b7ac3c8bf2536714447c72cab"
   integrity sha512-W1Lur1oF50FxSnNdGp3Vs6P+yBRSmZiw4IIjEeYxd8UQJwhUF0gDgDD/W/Tgmh73mxgEU3qX0Bzdl/NGuSPEpQ==
@@ -2548,11 +2531,6 @@
     "@typescript-eslint/types" "8.58.0"
     "@typescript-eslint/visitor-keys" "8.58.0"
 
-"@typescript-eslint/tsconfig-utils@8.56.1", "@typescript-eslint/tsconfig-utils@^8.56.1":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz#1afa830b0fada5865ddcabdc993b790114a879b7"
-  integrity sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==
-
 "@typescript-eslint/tsconfig-utils@8.58.0", "@typescript-eslint/tsconfig-utils@^8.58.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.0.tgz#c5a8edb21f31e0fdee565724e1b984171c559482"
@@ -2569,31 +2547,11 @@
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.56.1", "@typescript-eslint/types@^8.56.1":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.56.1.tgz#975e5942bf54895291337c91b9191f6eb0632ab9"
-  integrity sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==
-
 "@typescript-eslint/types@8.58.0", "@typescript-eslint/types@^8.58.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.0.tgz#e94ae7abdc1c6530e71183c1007b61fa93112a5a"
   integrity sha512-O9CjxypDT89fbHxRfETNoAnHj/i6IpRK0CvbVN3qibxlLdo5p5hcLmUuCCrHMpxiWSwKyI8mCP7qRNYuOJ0Uww==
 
-"@typescript-eslint/typescript-estree@8.56.1":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz#3b9e57d8129a860c50864c42188f761bdef3eab0"
-  integrity sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==
-  dependencies:
-    "@typescript-eslint/project-service" "8.56.1"
-    "@typescript-eslint/tsconfig-utils" "8.56.1"
-    "@typescript-eslint/types" "8.56.1"
-    "@typescript-eslint/visitor-keys" "8.56.1"
-    debug "^4.4.3"
-    minimatch "^10.2.2"
-    semver "^7.7.3"
-    tinyglobby "^0.2.15"
-    ts-api-utils "^2.4.0"
-
 "@typescript-eslint/typescript-estree@8.58.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.0.tgz#ed233faa8e2f2a2e1357c3e7d553d6465a0ee59a"
@@ -2609,7 +2567,7 @@
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.58.0":
+"@typescript-eslint/utils@8.58.0", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.0.tgz#21a74a7963b0d288b719a4121c7dd555adaab3c3"
   integrity sha512-RfeSqcFeHMHlAWzt4TBjWOAtoW9lnsAGiP3GbaX9uVgTYYrMbVnGONEfUCiSss+xMHFl+eHZiipmA8WkQ7FuNA==
@@ -2619,24 +2577,6 @@
     "@typescript-eslint/types" "8.58.0"
     "@typescript-eslint/typescript-estree" "8.58.0"
 
-"@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.56.1.tgz#5a86acaf9f1b4c4a85a42effb217f73059f6deb7"
-  integrity sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.56.1"
-    "@typescript-eslint/types" "8.56.1"
-    "@typescript-eslint/typescript-estree" "8.56.1"
-
-"@typescript-eslint/visitor-keys@8.56.1":
-  version "8.56.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz#50e03475c33a42d123dc99e63acf1841c0231f87"
-  integrity sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==
-  dependencies:
-    "@typescript-eslint/types" "8.56.1"
-    eslint-visitor-keys "^5.0.0"
-
 "@typescript-eslint/visitor-keys@8.58.0":
   version "8.58.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.0.tgz#2abd55a4be70fd55967aceaba4330b9ba9f45189"
@@ -4489,37 +4429,37 @@ esbuild-plugin-wasm@^1.1.0:
   resolved "https://registry.yarnpkg.com/esbuild-plugin-wasm/-/esbuild-plugin-wasm-1.1.0.tgz#062c0e62c266e94165c66ebcbb5852a1cdbfd7cd"
   integrity sha512-0bQ6+1tUbySSnxzn5jnXHMDvYnT0cN/Wd4Syk8g/sqAIJUg7buTIi22svS3Qz6ssx895NT+TgLPb33xi1OkZig==
 
-esbuild@^0.27.0:
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.27.3.tgz#5859ca8e70a3af956b26895ce4954d7e73bd27a8"
-  integrity sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==
+esbuild@^0.28.0:
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.28.0.tgz#5dee347ffb3e3874212a35a69836b077b1ce6d96"
+  integrity sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.27.3"
-    "@esbuild/android-arm" "0.27.3"
-    "@esbuild/android-arm64" "0.27.3"
-    "@esbuild/android-x64" "0.27.3"
-    "@esbuild/darwin-arm64" "0.27.3"
-    "@esbuild/darwin-x64" "0.27.3"
-    "@esbuild/freebsd-arm64" "0.27.3"
-    "@esbuild/freebsd-x64" "0.27.3"
-    "@esbuild/linux-arm" "0.27.3"
-    "@esbuild/linux-arm64" "0.27.3"
-    "@esbuild/linux-ia32" "0.27.3"
-    "@esbuild/linux-loong64" "0.27.3"
-    "@esbuild/linux-mips64el" "0.27.3"
-    "@esbuild/linux-ppc64" "0.27.3"
-    "@esbuild/linux-riscv64" "0.27.3"
-    "@esbuild/linux-s390x" "0.27.3"
-    "@esbuild/linux-x64" "0.27.3"
-    "@esbuild/netbsd-arm64" "0.27.3"
-    "@esbuild/netbsd-x64" "0.27.3"
-    "@esbuild/openbsd-arm64" "0.27.3"
-    "@esbuild/openbsd-x64" "0.27.3"
-    "@esbuild/openharmony-arm64" "0.27.3"
-    "@esbuild/sunos-x64" "0.27.3"
-    "@esbuild/win32-arm64" "0.27.3"
-    "@esbuild/win32-ia32" "0.27.3"
-    "@esbuild/win32-x64" "0.27.3"
+    "@esbuild/aix-ppc64" "0.28.0"
+    "@esbuild/android-arm" "0.28.0"
+    "@esbuild/android-arm64" "0.28.0"
+    "@esbuild/android-x64" "0.28.0"
+    "@esbuild/darwin-arm64" "0.28.0"
+    "@esbuild/darwin-x64" "0.28.0"
+    "@esbuild/freebsd-arm64" "0.28.0"
+    "@esbuild/freebsd-x64" "0.28.0"
+    "@esbuild/linux-arm" "0.28.0"
+    "@esbuild/linux-arm64" "0.28.0"
+    "@esbuild/linux-ia32" "0.28.0"
+    "@esbuild/linux-loong64" "0.28.0"
+    "@esbuild/linux-mips64el" "0.28.0"
+    "@esbuild/linux-ppc64" "0.28.0"
+    "@esbuild/linux-riscv64" "0.28.0"
+    "@esbuild/linux-s390x" "0.28.0"
+    "@esbuild/linux-x64" "0.28.0"
+    "@esbuild/netbsd-arm64" "0.28.0"
+    "@esbuild/netbsd-x64" "0.28.0"
+    "@esbuild/openbsd-arm64" "0.28.0"
+    "@esbuild/openbsd-x64" "0.28.0"
+    "@esbuild/openharmony-arm64" "0.28.0"
+    "@esbuild/sunos-x64" "0.28.0"
+    "@esbuild/win32-arm64" "0.28.0"
+    "@esbuild/win32-ia32" "0.28.0"
+    "@esbuild/win32-x64" "0.28.0"
 
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
@@ -10364,16 +10304,7 @@ string-length@^4.0.2:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10503,7 +10434,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -10517,13 +10448,6 @@ strip-ansi@^0.3.0:
   dependencies:
     ansi-regex "^0.2.1"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1, strip-ansi@^7.1.0, strip-ansi@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
@@ -10923,11 +10847,6 @@ trough@^2.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz#94a3aa9d5ce379fc561f6244905b3f36b7458d96"
   integrity sha512-FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w==
 
-ts-api-utils@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.4.0.tgz#2690579f96d2790253bdcf1ca35d569ad78f9ad8"
-  integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==
-
 ts-api-utils@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz#4acd4a155e22734990a5ed1fe9e97f113bcb37c1"
@@ -11905,16 +11824,7 @@ workbox-window@7.4.0, workbox-window@^7.4.0:
     "@types/trusted-types" "^2.0.2"
     workbox-core "7.4.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

From 38336c8a6db44478f670f5e75db092d5a652a93b Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Thu, 9 Apr 2026 23:08:47 -0400
Subject: [PATCH 25/64] Remove panelLayoutGeneration.

We originally introduced this to resolve #1205 and #736, but these
days it's not needed anymore because we have ResizeObservers in the
relevant places.
---
 src/actions/app.ts                            |  4 --
 src/components/app/DetailsContainer.tsx       | 20 ++-------
 src/components/app/ProfileViewer.tsx          |  6 ---
 src/components/shared/chart/Viewport.tsx      | 11 +----
 src/components/timeline/FullTimeline.tsx      |  5 ---
 .../timeline/OverflowEdgeIndicator.tsx        |  1 -
 src/reducers/app.ts                           | 42 -------------------
 src/selectors/app.tsx                         |  2 -
 src/test/components/Viewport.test.tsx         | 12 ++----
 src/test/store/app.test.ts                    | 31 +-------------
 src/types/actions.ts                          |  3 --
 src/types/state.ts                            |  1 -
 12 files changed, 10 insertions(+), 128 deletions(-)

diff --git a/src/actions/app.ts b/src/actions/app.ts
index aabb1706b5..5792312927 100644
--- a/src/actions/app.ts
+++ b/src/actions/app.ts
@@ -109,10 +109,6 @@ export function changeSidebarOpenState(tab: TabSlug, isOpen: boolean): Action {
   return { type: 'CHANGE_SIDEBAR_OPEN_STATE', tab, isOpen };
 }
 
-export function invalidatePanelLayout(): Action {
-  return { type: 'INCREMENT_PANEL_LAYOUT_GENERATION' as const };
-}
-
 /**
  * The viewport component provides a hint to use shift to zoom scroll. The first
  * time a user does this, the hint goes away.
diff --git a/src/components/app/DetailsContainer.tsx b/src/components/app/DetailsContainer.tsx
index 5f3911efbd..b1fe74f00d 100644
--- a/src/components/app/DetailsContainer.tsx
+++ b/src/components/app/DetailsContainer.tsx
@@ -7,7 +7,6 @@ import SplitterLayout from 'react-splitter-layout';
 import { Details } from './Details';
 import { selectSidebar } from 'firefox-profiler/components/sidebar';
 
-import { invalidatePanelLayout } from 'firefox-profiler/actions/app';
 import { getSelectedTab } from 'firefox-profiler/selectors/url-state';
 import { getIsSidebarOpen } from 'firefox-profiler/selectors/app';
 import explicitConnect from 'firefox-profiler/utils/connect';
@@ -22,17 +21,9 @@ type StateProps = {
   readonly isSidebarOpen: boolean;
 };
 
-type DispatchProps = {
-  readonly invalidatePanelLayout: typeof invalidatePanelLayout;
-};
-
-type Props = ConnectedProps<{}, StateProps, DispatchProps>;
+type Props = ConnectedProps<{}, StateProps, {}>;
 
-function DetailsContainerImpl({
-  selectedTab,
-  isSidebarOpen,
-  invalidatePanelLayout,
-}: Props) {
+function DetailsContainerImpl({ selectedTab, isSidebarOpen }: Props) {
   const Sidebar = selectSidebar(selectedTab);
 
   return (
@@ -40,7 +31,6 @@ function DetailsContainerImpl({
       customClassName="DetailsContainer"
       percentage
       secondaryInitialSize={20}
-      onDragEnd={invalidatePanelLayout}
     >
       <Details />
       {Sidebar && isSidebarOpen ? <Sidebar /> : null}
@@ -48,13 +38,11 @@ function DetailsContainerImpl({
   );
 }
 
-export const DetailsContainer = explicitConnect<{}, StateProps, DispatchProps>({
+export const DetailsContainer = explicitConnect<{}, StateProps, {}>({
   mapStateToProps: (state) => ({
     selectedTab: getSelectedTab(state),
     isSidebarOpen: getIsSidebarOpen(state),
   }),
-  mapDispatchToProps: {
-    invalidatePanelLayout,
-  },
+  mapDispatchToProps: {},
   component: DetailsContainerImpl,
 });
diff --git a/src/components/app/ProfileViewer.tsx b/src/components/app/ProfileViewer.tsx
index e00a87117d..bc140e3af4 100644
--- a/src/components/app/ProfileViewer.tsx
+++ b/src/components/app/ProfileViewer.tsx
@@ -21,7 +21,6 @@ import { returnToZipFileList } from 'firefox-profiler/actions/zipped-profiles';
 import { Timeline } from 'firefox-profiler/components/timeline';
 import { getHasZipFile } from 'firefox-profiler/selectors/zipped-profiles';
 import SplitterLayout from 'react-splitter-layout';
-import { invalidatePanelLayout } from 'firefox-profiler/actions/app';
 import { getTimelineHeight } from 'firefox-profiler/selectors/app';
 import { getIsBottomBoxOpen } from 'firefox-profiler/selectors/url-state';
 import {
@@ -54,7 +53,6 @@ type StateProps = {
 
 type DispatchProps = {
   readonly returnToZipFileList: typeof returnToZipFileList;
-  readonly invalidatePanelLayout: typeof invalidatePanelLayout;
 };
 
 type Props = ConnectedProps<{}, StateProps, DispatchProps>;
@@ -64,7 +62,6 @@ class ProfileViewerImpl extends PureComponent<Props> {
     const {
       hasZipFile,
       returnToZipFileList,
-      invalidatePanelLayout,
       timelineHeight,
       isUploading,
       uploadProgress,
@@ -136,7 +133,6 @@ class ProfileViewerImpl extends PureComponent<Props> {
             primaryIndex={1}
             // The Timeline is secondary.
             secondaryInitialSize={270}
-            onDragEnd={invalidatePanelLayout}
           >
             <Timeline />
             <SplitterLayout
@@ -146,7 +142,6 @@ class ProfileViewerImpl extends PureComponent<Props> {
               primaryIndex={0}
               // The BottomBox is secondary.
               secondaryInitialSize={40}
-              onDragEnd={invalidatePanelLayout}
             >
               <DetailsContainer />
               {isBottomBoxOpen ? <BottomBox /> : null}
@@ -178,7 +173,6 @@ export const ProfileViewer = explicitConnect<{}, StateProps, DispatchProps>({
   }),
   mapDispatchToProps: {
     returnToZipFileList,
-    invalidatePanelLayout,
   },
   component: ProfileViewerImpl,
 });
diff --git a/src/components/shared/chart/Viewport.tsx b/src/components/shared/chart/Viewport.tsx
index 4471702639..8d732deeda 100644
--- a/src/components/shared/chart/Viewport.tsx
+++ b/src/components/shared/chart/Viewport.tsx
@@ -6,10 +6,7 @@ import * as React from 'react';
 import classNames from 'classnames';
 import explicitConnect from 'firefox-profiler/utils/connect';
 import { getResizeObserverWrapper } from 'firefox-profiler/utils/resize-observer-wrapper';
-import {
-  getHasZoomedViaMousewheel,
-  getPanelLayoutGeneration,
-} from 'firefox-profiler/selectors/app';
+import { getHasZoomedViaMousewheel } from 'firefox-profiler/selectors/app';
 import { setHasZoomedViaMousewheel } from 'firefox-profiler/actions/app';
 import { updatePreviewSelection } from 'firefox-profiler/actions/profile-view';
 
@@ -132,7 +129,6 @@ export type Viewport = {
 };
 
 type ChartViewportImplStateProps = {
-  readonly panelLayoutGeneration: number;
   readonly hasZoomedViaMousewheel?: boolean;
 };
 
@@ -316,10 +312,6 @@ class ChartViewportImpl<OwnProps> extends React.PureComponent<
       this.setState({
         horizontalViewport,
       });
-    } else if (
-      this.props.panelLayoutGeneration !== newProps.panelLayoutGeneration
-    ) {
-      this._setSizeNextFrame();
     }
   }
 
@@ -871,7 +863,6 @@ export function withChartViewport<ChartProps>(
     ChartViewportImplDispatchProps
   >({
     mapStateToProps: (state) => ({
-      panelLayoutGeneration: getPanelLayoutGeneration(state),
       hasZoomedViaMousewheel: getHasZoomedViaMousewheel(state),
     }),
     mapDispatchToProps: { setHasZoomedViaMousewheel, updatePreviewSelection },
diff --git a/src/components/timeline/FullTimeline.tsx b/src/components/timeline/FullTimeline.tsx
index 97eb3b65d3..cf1729f8e6 100644
--- a/src/components/timeline/FullTimeline.tsx
+++ b/src/components/timeline/FullTimeline.tsx
@@ -21,7 +21,6 @@ import {
   getGlobalTrackReferences,
   getTrackCount,
   getGlobalTrackOrder,
-  getPanelLayoutGeneration,
 } from 'firefox-profiler/selectors';
 import { TimelineTrackContextMenu } from './TrackContextMenu';
 
@@ -57,7 +56,6 @@ type StateProps = {
   readonly globalTracks: GlobalTrack[];
   readonly globalTrackOrder: TrackIndex[];
   readonly globalTrackReferences: GlobalTrackReference[];
-  readonly panelLayoutGeneration: number;
   readonly zeroAt: Milliseconds;
   readonly profileTimelineUnit: TimelineUnit;
   readonly trackCount: TrackCount;
@@ -145,7 +143,6 @@ class FullTimelineImpl extends React.PureComponent<Props, State> {
       profileTimelineUnit,
       width,
       globalTrackReferences,
-      panelLayoutGeneration,
       trackCount,
       changeRightClickedTrack,
       innerElementRef,
@@ -173,7 +170,6 @@ class FullTimelineImpl extends React.PureComponent<Props, State> {
           </div>
           <OverflowEdgeIndicator
             className="tracksContainer timelineOverflowEdgeIndicator"
-            panelLayoutGeneration={panelLayoutGeneration}
             initialSelected={this.state.initialSelected}
           >
             <Reorderable
@@ -214,7 +210,6 @@ export const FullTimeline = explicitConnect<
     committedRange: getCommittedRange(state),
     zeroAt: getZeroAt(state),
     profileTimelineUnit: getProfileTimelineUnit(state),
-    panelLayoutGeneration: getPanelLayoutGeneration(state),
     trackCount: getTrackCount(state),
   }),
   mapDispatchToProps: {
diff --git a/src/components/timeline/OverflowEdgeIndicator.tsx b/src/components/timeline/OverflowEdgeIndicator.tsx
index b9c5bc0072..b73d562f21 100644
--- a/src/components/timeline/OverflowEdgeIndicator.tsx
+++ b/src/components/timeline/OverflowEdgeIndicator.tsx
@@ -11,7 +11,6 @@ import './OverflowEdgeIndicator.css';
 type Props = {
   className: string;
   children: React.ReactNode;
-  panelLayoutGeneration: number;
   initialSelected: InitialSelectedTrackReference | null;
   forceLayoutGeneration?: number;
 };
diff --git a/src/reducers/app.ts b/src/reducers/app.ts
index 5c3653dfd9..05d1856400 100644
--- a/src/reducers/app.ts
+++ b/src/reducers/app.ts
@@ -110,47 +110,6 @@ const isSidebarOpenPerPanel: Reducer<IsOpenPerPanelState> = (
   }
 };
 
-/**
- * The panels that make up the timeline, details view, and sidebar can all change
- * their sizes depending on the state that is fed to them. In order to control
- * the invalidations of this sizing information, provide a "generation" value that
- * increases monotonically for any change that potentially changes the sizing of
- * any of the panels. This provides a mechanism for subscribing components to
- * deterministically update their sizing correctly.
- */
-const panelLayoutGeneration: Reducer<number> = (state = 0, action) => {
-  switch (action.type) {
-    case 'INCREMENT_PANEL_LAYOUT_GENERATION':
-    // Sidebar: (fallthrough)
-    case 'CHANGE_SIDEBAR_OPEN_STATE':
-    // Timeline: (fallthrough)
-    case 'HIDE_GLOBAL_TRACK':
-    case 'SHOW_ALL_TRACKS':
-    case 'SHOW_PROVIDED_TRACKS':
-    case 'HIDE_PROVIDED_TRACKS':
-    case 'SHOW_GLOBAL_TRACK':
-    case 'SHOW_GLOBAL_TRACK_INCLUDING_LOCAL_TRACKS':
-    case 'ISOLATE_PROCESS':
-    case 'ISOLATE_PROCESS_MAIN_THREAD':
-    case 'HIDE_LOCAL_TRACK':
-    case 'SHOW_LOCAL_TRACK':
-    case 'ISOLATE_LOCAL_TRACK':
-    case 'TOGGLE_RESOURCES_PANEL':
-    case 'ENABLE_EXPERIMENTAL_CPU_GRAPHS':
-    case 'ENABLE_EXPERIMENTAL_PROCESS_CPU_TRACKS':
-    case 'CHANGE_TAB_FILTER':
-    // Committed range changes: (fallthrough)
-    case 'COMMIT_RANGE':
-    case 'POP_COMMITTED_RANGES':
-    // Bottom box: (fallthrough)
-    case 'UPDATE_BOTTOM_BOX':
-    case 'CLOSE_BOTTOM_BOX_FOR_TAB':
-      return state + 1;
-    default:
-      return state;
-  }
-};
-
 /**
  * Clicking on tracks can switch between different tabs. This piece of state holds
  * on to the last relevant thread-based tab that was viewed. This makes the UX nicer
@@ -365,7 +324,6 @@ const appStateReducer: Reducer<AppState> = combineReducers({
   urlSetupPhase,
   hasZoomedViaMousewheel,
   isSidebarOpenPerPanel,
-  panelLayoutGeneration,
   lastVisibleThreadTabSlug,
   trackThreadHeights,
   isNewlyPublished,
diff --git a/src/selectors/app.tsx b/src/selectors/app.tsx
index d46d71eb4e..ec78760d84 100644
--- a/src/selectors/app.tsx
+++ b/src/selectors/app.tsx
@@ -55,8 +55,6 @@ export const getHasZoomedViaMousewheel: Selector<boolean> = (state) => {
 };
 export const getIsSidebarOpen: Selector<boolean> = (state) =>
   getApp(state).isSidebarOpenPerPanel[getSelectedTab(state)];
-export const getPanelLayoutGeneration: Selector<number> = (state) =>
-  getApp(state).panelLayoutGeneration;
 export const getLastVisibleThreadTabSlug: Selector<TabSlug> = (state) =>
   getApp(state).lastVisibleThreadTabSlug;
 export const getTrackThreadHeights: Selector<{
diff --git a/src/test/components/Viewport.test.tsx b/src/test/components/Viewport.test.tsx
index b32f27be94..b0f822007f 100644
--- a/src/test/components/Viewport.test.tsx
+++ b/src/test/components/Viewport.test.tsx
@@ -17,8 +17,6 @@ import {
   getPreviewSelection,
 } from '../../selectors/profile';
 
-import { changeSidebarOpenState } from '../../actions/app';
-
 import explicitConnect from '../../utils/connect';
 import { ensureExists } from '../../utils/types';
 
@@ -27,6 +25,7 @@ import {
   autoMockElementSize,
   setMockedElementSize,
 } from '../fixtures/mocks/element-size';
+import { triggerResizeObservers } from '../fixtures/mocks/resize-observer';
 import { mockRaf } from '../fixtures/mocks/request-animation-frame';
 import { storeWithProfile } from '../fixtures/stores';
 import { getProfileFromTextSamples } from '../fixtures/profiles/processed-profile';
@@ -589,8 +588,8 @@ describe('Viewport', function () {
     });
   });
 
-  it('reacts to changes to the panel layout generation', function () {
-    const { dispatch, getChartViewport, flushRafCalls } = setup();
+  it('reacts to container size changes', function () {
+    const { getChartViewport } = setup();
 
     expect(getChartViewport()).toMatchObject({
       containerWidth: BOUNDING_BOX_WIDTH,
@@ -606,10 +605,7 @@ describe('Viewport', function () {
       ...INITIAL_ELEMENT_SIZE,
       width: BOUNDING_BOX_WIDTH - boundingWidthDiff,
     });
-    act(() => {
-      dispatch(changeSidebarOpenState('calltree', true));
-    });
-    flushRafCalls();
+    triggerResizeObservers();
 
     expect(getChartViewport()).toMatchObject({
       containerWidth: BOUNDING_BOX_WIDTH - boundingWidthDiff,
diff --git a/src/test/store/app.test.ts b/src/test/store/app.test.ts
index 1ff0040aab..42542a8787 100644
--- a/src/test/store/app.test.ts
+++ b/src/test/store/app.test.ts
@@ -1,13 +1,11 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { storeWithSimpleProfile, storeWithProfile } from '../fixtures/stores';
+import { storeWithSimpleProfile } from '../fixtures/stores';
 import * as UrlStateSelectors from '../../selectors/url-state';
 import * as AppSelectors from '../../selectors/app';
 import createStore from '../../app-logic/create-store';
 import { withAnalyticsMock } from '../fixtures/mocks/analytics';
-import { isolateProcess } from '../../actions/profile-view';
-import { getProfileWithNiceTracks } from '../fixtures/profiles/tracks';
 
 import * as AppActions from '../../actions/app';
 
@@ -148,31 +146,4 @@ describe('app actions', function () {
       expect(UrlStateSelectors.getSelectedTab(getState())).toEqual('calltree');
     });
   });
-
-  describe('panelLayoutGeneration', function () {
-    it('can be manually updated using an action', function () {
-      const { dispatch, getState } = storeWithSimpleProfile();
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(0);
-      dispatch(AppActions.invalidatePanelLayout());
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(1);
-      dispatch(AppActions.invalidatePanelLayout());
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(2);
-    });
-
-    it('will be updated when working with the sidebar', function () {
-      const { dispatch, getState } = storeWithSimpleProfile();
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(0);
-      dispatch(AppActions.changeSidebarOpenState('flame-graph', false));
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(1);
-    });
-
-    it('will be updated when working with the timeline', function () {
-      const { dispatch, getState } = storeWithProfile(
-        getProfileWithNiceTracks()
-      );
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(0);
-      dispatch(isolateProcess(0));
-      expect(AppSelectors.getPanelLayoutGeneration(getState())).toBe(1);
-    });
-  });
 });
diff --git a/src/types/actions.ts b/src/types/actions.ts
index 6f11b70e73..6f8e0bd1ed 100644
--- a/src/types/actions.ts
+++ b/src/types/actions.ts
@@ -321,9 +321,6 @@ type ProfileAction =
       readonly type: 'SET_CONTEXT_MENU_VISIBILITY';
       readonly isVisible: boolean;
     }
-  | {
-      readonly type: 'INCREMENT_PANEL_LAYOUT_GENERATION';
-    }
   | { readonly type: 'HAS_ZOOMED_VIA_MOUSEWHEEL' }
   | { readonly type: 'DISMISS_NEWLY_PUBLISHED' }
   | {
diff --git a/src/types/state.ts b/src/types/state.ts
index 6e18bb2630..b7fbf9e6c2 100644
--- a/src/types/state.ts
+++ b/src/types/state.ts
@@ -186,7 +186,6 @@ export type AppState = {
   readonly hasZoomedViaMousewheel: boolean;
   readonly isSidebarOpenPerPanel: IsOpenPerPanelState;
   readonly sidebarOpenCategories: Map<string, Set<number>>;
-  readonly panelLayoutGeneration: number;
   readonly lastVisibleThreadTabSlug: TabSlug;
   readonly trackThreadHeights: Record<ThreadsKey, CssPixels>;
   readonly isNewlyPublished: boolean;

From 8115beb1c5f77e257b9cd8c9a74fad9f1ce96023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Sun, 12 Apr 2026 14:17:13 +0200
Subject: [PATCH 26/64] Fix output-fixing-commands.js silently failing on
 Windows

On Windows, npm binaries (cross-env, jest, run-p, etc.) are installed as
.cmd files and can't be found by spawnSync without shell: true. This
caused all scripts using this wrapper to silently succeed without
running anything, since spawnSync returns status: null on ENOENT, which
Node.js treats as exit code 0.

Fix by passing the command as a single joined string with shell: true,
and add an explicit error check for result.error to catch spawn failures
in the future.
---
 bin/output-fixing-commands.js | 18 +++++++++++++-----
 package.json                  |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bin/output-fixing-commands.js b/bin/output-fixing-commands.js
index 262437fd81..22204d3dce 100644
--- a/bin/output-fixing-commands.js
+++ b/bin/output-fixing-commands.js
@@ -5,7 +5,7 @@
 // This file runs before linting commands and intercept errors so that more
 // friendly errors can be output.
 
-const cp = require('child_process');
+const spawn = require('cross-spawn');
 
 const fixingCommands = {
   lint: 'lint-fix',
@@ -21,14 +21,22 @@ const currentScriptName = process.env.npm_lifecycle_event;
 // Redirect the main lint command, but not individual commands.
 if (currentScriptName === 'lint' && command.includes('--fix')) {
   console.log(`🔧 Detected --fix flag, running: yarn lint-fix`);
-  const result = cp.spawnSync('yarn', ['lint-fix'], { stdio: 'inherit' });
-  process.exitCode = result.status;
+  const result = spawn.sync('yarn', ['lint-fix'], { stdio: 'inherit' });
+  if (result.error) {
+    console.error(`❌ Failed to spawn command: ${result.error.message}`);
+    process.exitCode = 1;
+  } else {
+    process.exitCode = result.status;
+  }
   process.exit();
 }
 
-const result = cp.spawnSync(command[0], command.slice(1), { stdio: 'inherit' });
+const result = spawn.sync(command[0], command.slice(1), { stdio: 'inherit' });
 
-if (result.status !== 0) {
+if (result.error) {
+  console.error(`❌ Failed to spawn command: ${result.error.message}`);
+  process.exitCode = 1;
+} else if (result.status !== 0) {
   process.exitCode = result.status;
   if (currentScriptName && currentScriptName in fixingCommands) {
     console.log(
diff --git a/package.json b/package.json
index 67ff4c974e..df7257899f 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,7 @@
     "browserslist-to-esbuild": "^2.1.1",
     "caniuse-lite": "^1.0.30001770",
     "cross-env": "^10.1.0",
+    "cross-spawn": "^7.0.6",
     "devtools-license-check": "^0.9.0",
     "esbuild": "^0.28.0",
     "esbuild-plugin-copy": "^2.1.1",

From c678a01ff753613c4da63b3c938a24adf4ad3bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Sun, 12 Apr 2026 14:30:31 +0200
Subject: [PATCH 27/64] Fix line ending issues on GitHub Actions in CI

It looks like GitHub Actions always converts line endings to CRLF, which
was triggering an error for our linter. This makes sure that all line
endings are normalized to LF
---
 .gitattributes | 3 +++
 .prettierrc.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 02a029af7f..2db04380d0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,6 @@
+# Normalize line endings to LF on all platforms.
+* text=auto eol=lf
+
 # The following are not technically binary, but this makes it so that git does not try
 # and treat them like normal text.
 *.min.js binary
diff --git a/.prettierrc.js b/.prettierrc.js
index a425d3f761..ed20b91246 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,4 +1,5 @@
 module.exports = {
   singleQuote: true,
   trailingComma: 'es5',
+  endOfLine: 'lf',
 };

From 855eaf1f296bd1730c74157c53e8b32f26114003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 13 Apr 2026 14:14:57 +0200
Subject: [PATCH 28/64] Convert profile-logic/js-tracer.tsx to a ts file
 (#5942)

It looks like this was made a tsx file by mistake. Let's convert it
back. It will help with the pq tool.
---
 src/profile-logic/{js-tracer.tsx => js-tracer.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/profile-logic/{js-tracer.tsx => js-tracer.ts} (100%)

diff --git a/src/profile-logic/js-tracer.tsx b/src/profile-logic/js-tracer.ts
similarity index 100%
rename from src/profile-logic/js-tracer.tsx
rename to src/profile-logic/js-tracer.ts

From fde7ca6065c8953129f1dfb61787a731aab94278 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 16:49:02 +0200
Subject: [PATCH 29/64] Update all Yarn dependencies (2026-04-13) (#5911)

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
---
 package.json |   42 +-
 yarn.lock    | 1113 +++++++++++++++++++++++++-------------------------
 2 files changed, 568 insertions(+), 587 deletions(-)

diff --git a/package.json b/package.json
index df7257899f..08a9fb32c3 100644
--- a/package.json
+++ b/package.json
@@ -63,9 +63,9 @@
     "@codemirror/lang-cpp": "^6.0.3",
     "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lang-rust": "^6.0.2",
-    "@codemirror/language": "^6.12.2",
-    "@codemirror/state": "^6.5.4",
-    "@codemirror/view": "^6.39.14",
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/state": "^6.6.0",
+    "@codemirror/view": "^6.41.0",
     "@firefox-devtools/react-contextmenu": "^5.2.3",
     "@fluent/bundle": "^0.19.1",
     "@fluent/langneg": "^0.7.0",
@@ -78,8 +78,8 @@
     "classnames": "^2.5.1",
     "common-tags": "^1.8.2",
     "copy-to-clipboard": "^3.3.3",
-    "core-js": "^3.48.0",
-    "devtools-reps": "^0.27.4",
+    "core-js": "^3.49.0",
+    "devtools-reps": "^0.27.6",
     "escape-string-regexp": "^4.0.0",
     "gecko-profiler-demangle": "^0.4.0",
     "idb": "^8.0.3",
@@ -92,7 +92,7 @@
     "mixedtuplemap": "^1.0.0",
     "namedtuplemap": "^1.0.0",
     "photon-colors": "^3.3.2",
-    "protobufjs": "^8.0.0",
+    "protobufjs": "^8.0.1",
     "query-string": "^9.3.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -104,7 +104,7 @@
     "redux-thunk": "^3.1.0",
     "reselect": "^4.1.8",
     "url": "^0.11.4",
-    "valibot": "^1.2.0",
+    "valibot": "^1.3.1",
     "weaktuplemap": "^1.0.0",
     "workbox-window": "^7.4.0"
   },
@@ -114,7 +114,7 @@
     "@babel/eslint-parser": "^7.28.6",
     "@babel/eslint-plugin": "^7.27.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.29.0",
+    "@babel/preset-env": "^7.29.2",
     "@babel/preset-react": "^7.28.5",
     "@babel/preset-typescript": "^7.28.5",
     "@eslint/js": "^9.39.4",
@@ -125,21 +125,21 @@
     "@types/common-tags": "^1.8.4",
     "@types/jest": "^30.0.0",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^22.19.15",
+    "@types/node": "^22.19.17",
     "@types/query-string": "^6.3.0",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.1",
     "@types/react-splitter-layout": "^4.0.0",
     "@types/redux-logger": "^3.0.6",
     "@types/tgwf__co2": "^0.14.2",
-    "@typescript-eslint/eslint-plugin": "^8.58.0",
-    "@typescript-eslint/parser": "^8.58.0",
+    "@typescript-eslint/eslint-plugin": "^8.58.1",
+    "@typescript-eslint/parser": "^8.58.1",
     "alex": "^11.0.1",
-    "babel-jest": "^30.2.0",
-    "babel-plugin-module-resolver": "^5.0.2",
-    "browserslist": "^4.28.1",
+    "babel-jest": "^30.3.0",
+    "babel-plugin-module-resolver": "^5.0.3",
+    "browserslist": "^4.28.2",
     "browserslist-to-esbuild": "^2.1.1",
-    "caniuse-lite": "^1.0.30001770",
+    "caniuse-lite": "^1.0.30001780",
     "cross-env": "^10.1.0",
     "cross-spawn": "^7.0.6",
     "devtools-license-check": "^0.9.0",
@@ -150,17 +150,17 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^29.15.0",
+    "eslint-plugin-jest": "^29.15.1",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-testing-library": "^7.16.0",
+    "eslint-plugin-testing-library": "^7.16.2",
     "fake-indexeddb": "^6.2.5",
     "fetch-mock": "^12.6.0",
     "globals": "^17.4.0",
     "husky": "^4.3.8",
-    "jest": "^30.2.0",
-    "jest-environment-jsdom": "^30.2.0",
+    "jest": "^30.3.0",
+    "jest-environment-jsdom": "^30.3.0",
     "jest-extended": "^7.0.0",
     "local-web-server": "^5.4.0",
     "lockfile-lint": "^5.0.0",
@@ -172,11 +172,11 @@
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^3.8.1",
     "rimraf": "^6.1.3",
-    "stylelint": "^17.3.0",
+    "stylelint": "^17.6.0",
     "stylelint-config-idiomatic-order": "^10.0.0",
     "stylelint-config-standard": "^40.0.0",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.0",
+    "typescript-eslint": "^8.58.1",
     "workbox-cli": "^7.4.0",
     "yargs": "^18.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 6303ce04b5..c1354c1ef9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -903,10 +903,10 @@
     "@babel/helper-create-regexp-features-plugin" "^7.28.5"
     "@babel/helper-plugin-utils" "^7.28.6"
 
-"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.29.0.tgz#c55db400c515a303662faaefd2d87e796efa08d0"
-  integrity sha512-fNEdfc0yi16lt6IZo2Qxk3knHVdfMYX33czNb4v8yWhemoBhibCpQK/uYHtSKIiO+p/zd3+8fYVXhQdOVV608w==
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.29.2":
+  version "7.29.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.29.2.tgz#5a173f22c7d8df362af1c9fe31facd320de4a86c"
+  integrity sha512-DYD23veRYGvBFhcTY1iUvJnDNpuqNd/BzBwCvzOTKUnJjKg5kpUBh3/u9585Agdkgj+QuygG7jLfOPWMa2KVNw==
   dependencies:
     "@babel/compat-data" "^7.29.0"
     "@babel/helper-compilation-targets" "^7.28.6"
@@ -1110,10 +1110,10 @@
     "@codemirror/language" "^6.0.0"
     "@lezer/rust" "^1.0.0"
 
-"@codemirror/language@^6.0.0", "@codemirror/language@^6.12.2", "@codemirror/language@^6.6.0":
-  version "6.12.2"
-  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.12.2.tgz#7db5a46757411cf251e8f450474c05710c27d42c"
-  integrity sha512-jEPmz2nGGDxhRTg3lTpzmIyGKxz3Gp3SJES4b0nAuE5SWQoKdT5GoQ69cwMmFd+wvFUhYirtDTr0/DRHpQAyWg==
+"@codemirror/language@^6.0.0", "@codemirror/language@^6.12.3", "@codemirror/language@^6.6.0":
+  version "6.12.3"
+  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.12.3.tgz#0b220182973a4c19850b29f7dd82aec1bbae3d7e"
+  integrity sha512-QwCZW6Tt1siP37Jet9Tb02Zs81TQt6qQrZR2H+eGMcFsL1zMrk2/b9CLC7/9ieP1fjIUMgviLWMmgiHoJrj+ZA==
   dependencies:
     "@codemirror/state" "^6.0.0"
     "@codemirror/view" "^6.23.0"
@@ -1131,19 +1131,19 @@
     "@codemirror/view" "^6.0.0"
     crelt "^1.0.5"
 
-"@codemirror/state@^6.0.0", "@codemirror/state@^6.5.0", "@codemirror/state@^6.5.4":
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.4.tgz#f5be4b8c0d2310180d5f15a9f641c21ca69faf19"
-  integrity sha512-8y7xqG/hpB53l25CIoit9/ngxdfoG+fx+V3SHBrinnhOtLvKHRyAJJuHzkWrR4YXXLX8eXBsejgAAxHUOdW1yw==
+"@codemirror/state@^6.0.0", "@codemirror/state@^6.6.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.6.0.tgz#b88dbdc14aea4ace3c6d67bb77fe28bb84e4394e"
+  integrity sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==
   dependencies:
     "@marijn/find-cluster-break" "^1.0.0"
 
-"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.39.14":
-  version "6.39.14"
-  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.39.14.tgz#ebecaee4c76566c3eb61dfe4d6bf386c617de5cf"
-  integrity sha512-WJcvgHm/6Q7dvGT0YFv/6PSkoc36QlR0VCESS6x9tGsnF1lWLmmYxOgX3HH6v8fo6AvSLgpcs+H0Olre6MKXlg==
+"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.41.0":
+  version "6.41.0"
+  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.41.0.tgz#482cbcb5f8f90131908e5f9c0e2f4681e0684db0"
+  integrity sha512-6H/qadXsVuDY219Yljhohglve8xf4B8xJkVOEWfA5uiYKiTFppjqsvsfR5iPA0RbvRBoOyTZpbLIxe9+0UR8xA==
   dependencies:
-    "@codemirror/state" "^6.5.0"
+    "@codemirror/state" "^6.6.0"
     crelt "^1.0.6"
     style-mod "^4.1.0"
     w3c-keyname "^2.2.4"
@@ -1181,10 +1181,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz#e1c65dc09378b42f26a111fca7f7075fc2c26164"
   integrity sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==
 
-"@csstools/css-syntax-patches-for-csstree@^1.0.26":
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.28.tgz#cd239a16f95c0ed7c6d74315da4e38f2e93bbf19"
-  integrity sha512-1NRf1CUBjnr3K7hu8BLxjQrKCxEe8FP/xmPTenAxCRZWVLbmGotkFvG9mfNpjA6k7Bw1bw4BilZq9cu19RA5pg==
+"@csstools/css-syntax-patches-for-csstree@^1.1.1":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.3.tgz#3204cf40deb97db83e225b0baa9e37d9c3bd344d"
+  integrity sha512-SH60bMfrRCJF3morcdk57WklujF4Jr/EsQUzqkarfHXEFcAR1gg7fS/chAE922Sehgzc1/+Tz5H3Ypa1HiEKrg==
 
 "@csstools/css-tokenizer@^3.0.3":
   version "3.0.4"
@@ -1522,121 +1522,120 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.2.0.tgz#c52fcd5b58fdd2e8eb66b2fd8ae56f2f64d05b28"
-  integrity sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==
+"@jest/console@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.3.0.tgz#42ccc3f995d400a8fe35b8850cfe10a8d4804cdf"
+  integrity sha512-PAwCvFJ4696XP2qZj+LAn1BWjZaJ6RjG6c7/lkMaUJnkyMS34ucuIsfqYvfskVNvUI27R/u4P1HMYFnlVXG/Ww==
   dependencies:
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     chalk "^4.1.2"
-    jest-message-util "30.2.0"
-    jest-util "30.2.0"
+    jest-message-util "30.3.0"
+    jest-util "30.3.0"
     slash "^3.0.0"
 
-"@jest/core@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.2.0.tgz#813d59faa5abd5510964a8b3a7b17cc77b775275"
-  integrity sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==
+"@jest/core@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.3.0.tgz#d06bb8456f35350f6494fd2405bcec4abb97b994"
+  integrity sha512-U5mVPsBxLSO6xYbf+tgkymLx+iAhvZX43/xI1+ej2ZOPnPdkdO1CzDmFKh2mZBn2s4XZixszHeQnzp1gm/DIxw==
   dependencies:
-    "@jest/console" "30.2.0"
+    "@jest/console" "30.3.0"
     "@jest/pattern" "30.0.1"
-    "@jest/reporters" "30.2.0"
-    "@jest/test-result" "30.2.0"
-    "@jest/transform" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/reporters" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     exit-x "^0.2.2"
     graceful-fs "^4.2.11"
-    jest-changed-files "30.2.0"
-    jest-config "30.2.0"
-    jest-haste-map "30.2.0"
-    jest-message-util "30.2.0"
+    jest-changed-files "30.3.0"
+    jest-config "30.3.0"
+    jest-haste-map "30.3.0"
+    jest-message-util "30.3.0"
     jest-regex-util "30.0.1"
-    jest-resolve "30.2.0"
-    jest-resolve-dependencies "30.2.0"
-    jest-runner "30.2.0"
-    jest-runtime "30.2.0"
-    jest-snapshot "30.2.0"
-    jest-util "30.2.0"
-    jest-validate "30.2.0"
-    jest-watcher "30.2.0"
-    micromatch "^4.0.8"
-    pretty-format "30.2.0"
+    jest-resolve "30.3.0"
+    jest-resolve-dependencies "30.3.0"
+    jest-runner "30.3.0"
+    jest-runtime "30.3.0"
+    jest-snapshot "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
+    jest-watcher "30.3.0"
+    pretty-format "30.3.0"
     slash "^3.0.0"
 
-"@jest/diff-sequences@30.0.1":
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz#0ededeae4d071f5c8ffe3678d15f3a1be09156be"
-  integrity sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==
+"@jest/diff-sequences@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz#25b0818d3d83f00b9c7b04e069b8810f9014b143"
+  integrity sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==
 
-"@jest/environment-jsdom-abstract@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.2.0.tgz#1313f9b3b509c31298c241203161b36622865181"
-  integrity sha512-kazxw2L9IPuZpQ0mEt9lu9Z98SqR74xcagANmMBU16X0lS23yPc0+S6hGLUz8kVRlomZEs/5S/Zlpqwf5yu6OQ==
+"@jest/environment-jsdom-abstract@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment-jsdom-abstract/-/environment-jsdom-abstract-30.3.0.tgz#c97b2bf3ec35336d543c174a758f3dc07478c172"
+  integrity sha512-0hNFs5N6We3DMCwobzI0ydhkY10sT1tZSC0AAiy+0g2Dt/qEWgrcV5BrMxPczhe41cxW4qm6X+jqZaUdpZIajA==
   dependencies:
-    "@jest/environment" "30.2.0"
-    "@jest/fake-timers" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/environment" "30.3.0"
+    "@jest/fake-timers" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/jsdom" "^21.1.7"
     "@types/node" "*"
-    jest-mock "30.2.0"
-    jest-util "30.2.0"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
 
-"@jest/environment@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.2.0.tgz#1e673cdb8b93ded707cf6631b8353011460831fa"
-  integrity sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==
+"@jest/environment@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.3.0.tgz#b0657c2944b6ef3352f7b25903cc3a23e6ab70f6"
+  integrity sha512-SlLSF4Be735yQXyh2+mctBOzNDx5s5uLv88/j8Qn1wH679PDcwy67+YdADn8NJnGjzlXtN62asGH/T4vWOkfaw==
   dependencies:
-    "@jest/fake-timers" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/fake-timers" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    jest-mock "30.2.0"
+    jest-mock "30.3.0"
 
-"@jest/expect-utils@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.2.0.tgz#4f95413d4748454fdb17404bf1141827d15e6011"
-  integrity sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==
+"@jest/expect-utils@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.3.0.tgz#c45b2da9802ffed33bf43b3e019ddb95e5ad95e8"
+  integrity sha512-j0+W5iQQ8hBh7tHZkTQv3q2Fh/M7Je72cIsYqC4OaktgtO7v1So9UTjp6uPBHIaB6beoF/RRsCgMJKvti0wADA==
   dependencies:
     "@jest/get-type" "30.1.0"
 
-"@jest/expect@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.2.0.tgz#9a5968499bb8add2bbb09136f69f7df5ddbf3185"
-  integrity sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==
+"@jest/expect@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.3.0.tgz#08ee7f5b610167b0068743246c0b568f4c40c773"
+  integrity sha512-76Nlh4xJxk2D/9URCn3wFi98d2hb19uWE1idLsTt2ywhvdOldbw3S570hBgn25P4ICUZ/cBjybrBex2g17IDbg==
   dependencies:
-    expect "30.2.0"
-    jest-snapshot "30.2.0"
+    expect "30.3.0"
+    jest-snapshot "30.3.0"
 
-"@jest/fake-timers@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.2.0.tgz#0941ddc28a339b9819542495b5408622dc9e94ec"
-  integrity sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==
+"@jest/fake-timers@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.3.0.tgz#2b2868130c1d28233a79566874c42cae1c5a70bc"
+  integrity sha512-WUQDs8SOP9URStX1DzhD425CqbN/HxUYCTwVrT8sTVBfMvFqYt/s61EK5T05qnHu0po6RitXIvP9otZxYDzTGQ==
   dependencies:
-    "@jest/types" "30.2.0"
-    "@sinonjs/fake-timers" "^13.0.0"
+    "@jest/types" "30.3.0"
+    "@sinonjs/fake-timers" "^15.0.0"
     "@types/node" "*"
-    jest-message-util "30.2.0"
-    jest-mock "30.2.0"
-    jest-util "30.2.0"
+    jest-message-util "30.3.0"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
 
 "@jest/get-type@30.1.0":
   version "30.1.0"
   resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
   integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
 
-"@jest/globals@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.2.0.tgz#2f4b696d5862664b89c4ee2e49ae24d2bb7e0988"
-  integrity sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==
+"@jest/globals@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.3.0.tgz#40f4c90e5602629ecda1ca773a8fb21575bb64ea"
+  integrity sha512-+owLCBBdfpgL3HU+BD5etr1SvbXpSitJK0is1kiYjJxAAJggYMRQz5hSdd5pq1sSggfxPbw2ld71pt4x5wwViA==
   dependencies:
-    "@jest/environment" "30.2.0"
-    "@jest/expect" "30.2.0"
-    "@jest/types" "30.2.0"
-    jest-mock "30.2.0"
+    "@jest/environment" "30.3.0"
+    "@jest/expect" "30.3.0"
+    "@jest/types" "30.3.0"
+    jest-mock "30.3.0"
 
 "@jest/pattern@30.0.1":
   version "30.0.1"
@@ -1646,31 +1645,31 @@
     "@types/node" "*"
     jest-regex-util "30.0.1"
 
-"@jest/reporters@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.2.0.tgz#a36b28fcbaf0c4595250b108e6f20e363348fd91"
-  integrity sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==
+"@jest/reporters@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.3.0.tgz#0c1065f6c892665e5a051df22b19df4466ed816b"
+  integrity sha512-a09z89S+PkQnL055bVj8+pe2Caed2PBOaczHcXCykW5ngxX9EWx/1uAwncxc/HiU0oZqfwseMjyhxgRjS49qPw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "30.2.0"
-    "@jest/test-result" "30.2.0"
-    "@jest/transform" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/console" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@jridgewell/trace-mapping" "^0.3.25"
     "@types/node" "*"
     chalk "^4.1.2"
     collect-v8-coverage "^1.0.2"
     exit-x "^0.2.2"
-    glob "^10.3.10"
+    glob "^10.5.0"
     graceful-fs "^4.2.11"
     istanbul-lib-coverage "^3.0.0"
     istanbul-lib-instrument "^6.0.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^5.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "30.2.0"
-    jest-util "30.2.0"
-    jest-worker "30.2.0"
+    jest-message-util "30.3.0"
+    jest-util "30.3.0"
+    jest-worker "30.3.0"
     slash "^3.0.0"
     string-length "^4.0.2"
     v8-to-istanbul "^9.0.1"
@@ -1682,12 +1681,12 @@
   dependencies:
     "@sinclair/typebox" "^0.34.0"
 
-"@jest/snapshot-utils@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz#387858eb90c2f98f67bff327435a532ac5309fbe"
-  integrity sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==
+"@jest/snapshot-utils@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.3.0.tgz#ca003c91a3e1e4e4956dee716a2aaf04b6707f31"
+  integrity sha512-ORbRN9sf5PP82v3FXNSwmO1OTDR2vzR2YTaR+E3VkSBZ8zadQE6IqYdYEeFH1NIkeB2HIGdF02dapb6K0Mj05g==
   dependencies:
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     natural-compare "^1.4.0"
@@ -1701,51 +1700,50 @@
     callsites "^3.1.0"
     graceful-fs "^4.2.11"
 
-"@jest/test-result@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.2.0.tgz#9c0124377fb7996cdffb86eda3dbc56eacab363d"
-  integrity sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==
+"@jest/test-result@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.3.0.tgz#cd8882d683d467fcffb98c09501a65687a76aae9"
+  integrity sha512-e/52nJGuD74AKTSe0P4y5wFRlaXP0qmrS17rqOMHeSwm278VyNyXE3gFO/4DTGF9w+65ra3lo3VKj0LBrzmgdQ==
   dependencies:
-    "@jest/console" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/console" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/istanbul-lib-coverage" "^2.0.6"
     collect-v8-coverage "^1.0.2"
 
-"@jest/test-sequencer@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz#bf0066bc72e176d58f5dfa7f212b6e7eee44f221"
-  integrity sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==
+"@jest/test-sequencer@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.3.0.tgz#27002b2093f4e0d9e0e1ebb0bc274a242fdadc14"
+  integrity sha512-dgbWy9b8QDlQeRZcv7LNF+/jFiiYHTKho1xirauZ7kVwY7avjFF6uTT0RqlgudB5OuIPagFdVtfFMosjVbk1eA==
   dependencies:
-    "@jest/test-result" "30.2.0"
+    "@jest/test-result" "30.3.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.2.0"
+    jest-haste-map "30.3.0"
     slash "^3.0.0"
 
-"@jest/transform@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.2.0.tgz#54bef1a4510dcbd58d5d4de4fe2980a63077ef2a"
-  integrity sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==
+"@jest/transform@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.3.0.tgz#9e6f78ffa205449bf956e269fd707c160f47ce2f"
+  integrity sha512-TLKY33fSLVd/lKB2YI1pH69ijyUblO/BQvCj566YvnwuzoTNr648iE0j22vRvVNk2HsPwByPxATg3MleS3gf5A==
   dependencies:
     "@babel/core" "^7.27.4"
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     "@jridgewell/trace-mapping" "^0.3.25"
     babel-plugin-istanbul "^7.0.1"
     chalk "^4.1.2"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.2.0"
+    jest-haste-map "30.3.0"
     jest-regex-util "30.0.1"
-    jest-util "30.2.0"
-    micromatch "^4.0.8"
+    jest-util "30.3.0"
     pirates "^4.0.7"
     slash "^3.0.0"
     write-file-atomic "^5.0.1"
 
-"@jest/types@30.2.0":
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.2.0.tgz#1c678a7924b8f59eafd4c77d56b6d0ba976d62b8"
-  integrity sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==
+"@jest/types@30.3.0":
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.3.0.tgz#cada800d323cb74945c24ac74615fdb312a6c85f"
+  integrity sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==
   dependencies:
     "@jest/pattern" "30.0.1"
     "@jest/schemas" "30.0.5"
@@ -2102,10 +2100,10 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^13.0.0":
-  version "13.0.5"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz#36b9dbc21ad5546486ea9173d6bea063eb1717d5"
-  integrity sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==
+"@sinonjs/fake-timers@^15.0.0":
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-15.3.2.tgz#afecc36681e26aab9e0fe809fd9ad578096a3058"
+  integrity sha512-mrn35Jl2pCpns+mE3HaZa1yPN5EYCRgiMI+135COjr2hr8Cls9DXqIZ57vZe2cz7y2XVSq92tcs6kGQcT1J8Rw==
   dependencies:
     "@sinonjs/commons" "^3.0.1"
 
@@ -2366,10 +2364,10 @@
   dependencies:
     "@types/unist" "*"
 
-"@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.19.15":
-  version "22.19.15"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.15.tgz#6091d99fdf7c08cb57dc8b1345d407ba9a1df576"
-  integrity sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@^22.19.17":
+  version "22.19.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.17.tgz#09c71fb34ba2510f8ac865361b1fcb9552b8a581"
+  integrity sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==
   dependencies:
     undici-types "~6.21.0"
 
@@ -2484,100 +2482,100 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.58.0", "@typescript-eslint/eslint-plugin@^8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.0.tgz#ad40e492f1931f46da1bd888e52b9e56df9063aa"
-  integrity sha512-RLkVSiNuUP1C2ROIWfqX+YcUfLaSnxGE/8M+Y57lopVwg9VTYYfhuz15Yf1IzCKgZj6/rIbYTmJCUSqr76r0Wg==
+"@typescript-eslint/eslint-plugin@8.58.1", "@typescript-eslint/eslint-plugin@^8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.1.tgz#cb53038b83d165ca0ef96d67d875efbd56c50fa8"
+  integrity sha512-eSkwoemjo76bdXl2MYqtxg51HNwUSkWfODUOQ3PaTLZGh9uIWWFZIjyjaJnex7wXDu+TRx+ATsnSxdN9YWfRTQ==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.58.0"
-    "@typescript-eslint/type-utils" "8.58.0"
-    "@typescript-eslint/utils" "8.58.0"
-    "@typescript-eslint/visitor-keys" "8.58.0"
+    "@typescript-eslint/scope-manager" "8.58.1"
+    "@typescript-eslint/type-utils" "8.58.1"
+    "@typescript-eslint/utils" "8.58.1"
+    "@typescript-eslint/visitor-keys" "8.58.1"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.58.0", "@typescript-eslint/parser@^8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.0.tgz#da04ece1967b6c2fe8f10c3473dabf3825795ef7"
-  integrity sha512-rLoGZIf9afaRBYsPUMtvkDWykwXwUPL60HebR4JgTI8mxfFe2cQTu3AGitANp4b9B2QlVru6WzjgB2IzJKiCSA==
+"@typescript-eslint/parser@8.58.1", "@typescript-eslint/parser@^8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.1.tgz#0943eca522ac408bcdd649882c3d95b10ff00f62"
+  integrity sha512-gGkiNMPqerb2cJSVcruigx9eHBlLG14fSdPdqMoOcBfh+vvn4iCq2C8MzUB89PrxOXk0y3GZ1yIWb9aOzL93bw==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.58.0"
-    "@typescript-eslint/types" "8.58.0"
-    "@typescript-eslint/typescript-estree" "8.58.0"
-    "@typescript-eslint/visitor-keys" "8.58.0"
+    "@typescript-eslint/scope-manager" "8.58.1"
+    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/typescript-estree" "8.58.1"
+    "@typescript-eslint/visitor-keys" "8.58.1"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.0.tgz#66ceda0aabf7427aec3e2713fa43eb278dead2aa"
-  integrity sha512-8Q/wBPWLQP1j16NxoPNIKpDZFMaxl7yWIoqXWYeWO+Bbd2mjgvoF0dxP2jKZg5+x49rgKdf7Ck473M8PC3V9lg==
+"@typescript-eslint/project-service@8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.1.tgz#c78781b1ca1ec1e7bc6522efba89318c6d249feb"
+  integrity sha512-gfQ8fk6cxhtptek+/8ZIqw8YrRW5048Gug8Ts5IYcMLCw18iUgrZAEY/D7s4hkI0FxEfGakKuPK/XUMPzPxi5g==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.58.0"
-    "@typescript-eslint/types" "^8.58.0"
+    "@typescript-eslint/tsconfig-utils" "^8.58.1"
+    "@typescript-eslint/types" "^8.58.1"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.58.0", "@typescript-eslint/scope-manager@^8.56.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.0.tgz#e304142775e49a1b7ac3c8bf2536714447c72cab"
-  integrity sha512-W1Lur1oF50FxSnNdGp3Vs6P+yBRSmZiw4IIjEeYxd8UQJwhUF0gDgDD/W/Tgmh73mxgEU3qX0Bzdl/NGuSPEpQ==
+"@typescript-eslint/scope-manager@8.58.1", "@typescript-eslint/scope-manager@^8.56.0":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.1.tgz#35168f561bab4e3fd10dd6b03e8b83c157479211"
+  integrity sha512-TPYUEqJK6avLcEjumWsIuTpuYODTTDAtoMdt8ZZa93uWMTX13Nb8L5leSje1NluammvU+oI3QRr5lLXPgihX3w==
   dependencies:
-    "@typescript-eslint/types" "8.58.0"
-    "@typescript-eslint/visitor-keys" "8.58.0"
+    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/visitor-keys" "8.58.1"
 
-"@typescript-eslint/tsconfig-utils@8.58.0", "@typescript-eslint/tsconfig-utils@^8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.0.tgz#c5a8edb21f31e0fdee565724e1b984171c559482"
-  integrity sha512-doNSZEVJsWEu4htiVC+PR6NpM+pa+a4ClH9INRWOWCUzMst/VA9c4gXq92F8GUD1rwhNvRLkgjfYtFXegXQF7A==
+"@typescript-eslint/tsconfig-utils@8.58.1", "@typescript-eslint/tsconfig-utils@^8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.1.tgz#eb16792c579300c7bfb3c74b0f5e1dfbb0a2454d"
+  integrity sha512-JAr2hOIct2Q+qk3G+8YFfqkqi7sC86uNryT+2i5HzMa2MPjw4qNFvtjnw1IiA1rP7QhNKVe21mSSLaSjwA1Olw==
 
-"@typescript-eslint/type-utils@8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.0.tgz#ce0e72cd967ffbbe8de322db6089bd4374be352f"
-  integrity sha512-aGsCQImkDIqMyx1u4PrVlbi/krmDsQUs4zAcCV6M7yPcPev+RqVlndsJy9kJ8TLihW9TZ0kbDAzctpLn5o+lOg==
+"@typescript-eslint/type-utils@8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.1.tgz#b21085a233087bde94c92ba6f5b4dfb77ca56730"
+  integrity sha512-HUFxvTJVroT+0rXVJC7eD5zol6ID+Sn5npVPWoFuHGg9Ncq5Q4EYstqR+UOqaNRFXi5TYkpXXkLhoCHe3G0+7w==
   dependencies:
-    "@typescript-eslint/types" "8.58.0"
-    "@typescript-eslint/typescript-estree" "8.58.0"
-    "@typescript-eslint/utils" "8.58.0"
+    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/typescript-estree" "8.58.1"
+    "@typescript-eslint/utils" "8.58.1"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.58.0", "@typescript-eslint/types@^8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.0.tgz#e94ae7abdc1c6530e71183c1007b61fa93112a5a"
-  integrity sha512-O9CjxypDT89fbHxRfETNoAnHj/i6IpRK0CvbVN3qibxlLdo5p5hcLmUuCCrHMpxiWSwKyI8mCP7qRNYuOJ0Uww==
+"@typescript-eslint/types@8.58.1", "@typescript-eslint/types@^8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.1.tgz#9dfb4723fcd2b13737d8b03d941354cf73190313"
+  integrity sha512-io/dV5Aw5ezwzfPBBWLoT+5QfVtP8O7q4Kftjn5azJ88bYyp/ZMCsyW1lpKK46EXJcaYMZ1JtYj+s/7TdzmQMw==
 
-"@typescript-eslint/typescript-estree@8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.0.tgz#ed233faa8e2f2a2e1357c3e7d553d6465a0ee59a"
-  integrity sha512-7vv5UWbHqew/dvs+D3e1RvLv1v2eeZ9txRHPnEEBUgSNLx5ghdzjHa0sgLWYVKssH+lYmV0JaWdoubo0ncGYLA==
+"@typescript-eslint/typescript-estree@8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.1.tgz#8230cc9628d2cffef101e298c62807c4b9bf2fe9"
+  integrity sha512-w4w7WR7GHOjqqPnvAYbazq+Y5oS68b9CzasGtnd6jIeOIeKUzYzupGTB2T4LTPSv4d+WPeccbxuneTFHYgAAWg==
   dependencies:
-    "@typescript-eslint/project-service" "8.58.0"
-    "@typescript-eslint/tsconfig-utils" "8.58.0"
-    "@typescript-eslint/types" "8.58.0"
-    "@typescript-eslint/visitor-keys" "8.58.0"
+    "@typescript-eslint/project-service" "8.58.1"
+    "@typescript-eslint/tsconfig-utils" "8.58.1"
+    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/visitor-keys" "8.58.1"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.58.0", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.0.tgz#21a74a7963b0d288b719a4121c7dd555adaab3c3"
-  integrity sha512-RfeSqcFeHMHlAWzt4TBjWOAtoW9lnsAGiP3GbaX9uVgTYYrMbVnGONEfUCiSss+xMHFl+eHZiipmA8WkQ7FuNA==
+"@typescript-eslint/utils@8.58.1", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.1.tgz#099a327b04ed921e6ee3988cde9ef34bc4b5435a"
+  integrity sha512-Ln8R0tmWC7pTtLOzgJzYTXSCjJ9rDNHAqTaVONF4FEi2qwce8mD9iSOxOpLFFvWp/wBFlew0mjM1L1ihYWfBdQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.58.0"
-    "@typescript-eslint/types" "8.58.0"
-    "@typescript-eslint/typescript-estree" "8.58.0"
+    "@typescript-eslint/scope-manager" "8.58.1"
+    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/typescript-estree" "8.58.1"
 
-"@typescript-eslint/visitor-keys@8.58.0":
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.0.tgz#2abd55a4be70fd55967aceaba4330b9ba9f45189"
-  integrity sha512-XJ9UD9+bbDo4a4epraTwG3TsNPeiB9aShrUneAVXy8q4LuwowN+qu89/6ByLMINqvIMeI9H9hOHQtg/ijrYXzQ==
+"@typescript-eslint/visitor-keys@8.58.1":
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.1.tgz#7c197533177f1ba9b8249f55f7f685e32bb6f204"
+  integrity sha512-y+vH7QE8ycjoa0bWciFg7OpFcipUuem1ujhrdLtq1gByKwfbC7bPeKsiny9e0urg93DqwGcHey+bGRKCnF1nZQ==
   dependencies:
-    "@typescript-eslint/types" "8.58.0"
+    "@typescript-eslint/types" "8.58.1"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.3.0":
@@ -3038,15 +3036,15 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
-babel-jest@30.2.0, babel-jest@^30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.2.0.tgz#fd44a1ec9552be35ead881f7381faa7d8f3b95ac"
-  integrity sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==
+babel-jest@30.3.0, babel-jest@^30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.3.0.tgz#3ff5553fa3bcbb8738d2d7335a4dbdc3bd1a0eb5"
+  integrity sha512-gRpauEU2KRrCox5Z296aeVHR4jQ98BCnu0IO332D/xpHNOsIH/bgSRk9k6GbKIbBw8vFeN6ctuu6tV8WOyVfYQ==
   dependencies:
-    "@jest/transform" "30.2.0"
+    "@jest/transform" "30.3.0"
     "@types/babel__core" "^7.20.5"
     babel-plugin-istanbul "^7.0.1"
-    babel-preset-jest "30.2.0"
+    babel-preset-jest "30.3.0"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     slash "^3.0.0"
@@ -3062,17 +3060,17 @@ babel-plugin-istanbul@^7.0.1:
     istanbul-lib-instrument "^6.0.2"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz#94c250d36b43f95900f3a219241e0f4648191ce2"
-  integrity sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==
+babel-plugin-jest-hoist@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.3.0.tgz#235ad714a45c18b12566becf439e1c604e277015"
+  integrity sha512-+TRkByhsws6sfPjVaitzadk1I0F5sPvOVUH5tyTSzhePpsGIVrdeunHSw/C36QeocS95OOk8lunc4rlu5Anwsg==
   dependencies:
     "@types/babel__core" "^7.20.5"
 
-babel-plugin-module-resolver@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.2.tgz#cdeac5d4aaa3b08dd1ac23ddbf516660ed2d293e"
-  integrity sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg==
+babel-plugin-module-resolver@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.3.tgz#13f03cf29048ad7e0239e6a1c4dcc669d199f394"
+  integrity sha512-h8h6H71ZvdLJZxZrYkaeR30BojTaV7O9GfqacY14SNj5CNB8ocL9tydNzTC0JrnNN7vY3eJhwCmkDj7tuEUaqQ==
   dependencies:
     find-babel-config "^2.1.1"
     glob "^9.3.3"
@@ -3125,12 +3123,12 @@ babel-preset-current-node-syntax@^1.2.0:
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
-babel-preset-jest@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz#04717843e561347781d6d7f69c81e6bcc3ed11ce"
-  integrity sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==
+babel-preset-jest@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.3.0.tgz#21cf3d19a6f5e9924426c879ee0b7f092636d043"
+  integrity sha512-6ZcUbWHC+dMz2vfzdNwi87Z1gQsLNK2uLuK1Q89R11xdvejcivlYYwDlEv0FHX3VwEXpbBQ9uufB/MUNpZGfhQ==
   dependencies:
-    babel-plugin-jest-hoist "30.2.0"
+    babel-plugin-jest-hoist "30.3.0"
     babel-preset-current-node-syntax "^1.2.0"
 
 bail@^2.0.0:
@@ -3143,11 +3141,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-balanced-match@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-3.0.1.tgz#e854b098724b15076384266497392a271f4a26a0"
-  integrity sha512-vjtV3hiLqYDNRoiAv0zC4QaGAMPomEoq83PRmYIofPswwZurCeWR5LByXm7SyoL0Zh5+2z0+HC7jG8gSZJUh0w==
-
 balanced-match@^4.0.2:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a"
@@ -3158,10 +3151,10 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-baseline-browser-mapping@^2.9.0:
-  version "2.9.10"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.10.tgz#099221e89b30ec784675af076fbd4a93e58b53c3"
-  integrity sha512-2VIKvDx8Z1a9rTB2eCkdPE5nSe28XnA+qivGnWHoB40hMMt/h1hSz0960Zqsn6ZyxWXUie0EBdElKv8may20AA==
+baseline-browser-mapping@^2.10.12:
+  version "2.10.18"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.18.tgz#565745085ba7743af7d4072707ad132db3a5a42f"
+  integrity sha512-VSnGQAOLtP5mib/DPyg2/t+Tlv65NTBz83BJBJvmLVHHuKJVaDOBvJJykiT5TR++em5nfAySPccDZDa4oSrn8A==
 
 basic-auth@^2.0.1, basic-auth@~2.0.1:
   version "2.0.1"
@@ -3253,16 +3246,16 @@ browserslist-to-esbuild@^2.1.1:
   dependencies:
     meow "^13.0.0"
 
-browserslist@^4.24.0, browserslist@^4.28.1:
-  version "4.28.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
-  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
+browserslist@^4.24.0, browserslist@^4.28.1, browserslist@^4.28.2:
+  version "4.28.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.2.tgz#f50b65362ef48974ca9f50b3680566d786b811d2"
+  integrity sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==
   dependencies:
-    baseline-browser-mapping "^2.9.0"
-    caniuse-lite "^1.0.30001759"
-    electron-to-chromium "^1.5.263"
-    node-releases "^2.0.27"
-    update-browserslist-db "^1.2.0"
+    baseline-browser-mapping "^2.10.12"
+    caniuse-lite "^1.0.30001782"
+    electron-to-chromium "^1.5.328"
+    node-releases "^2.0.36"
+    update-browserslist-db "^1.2.3"
 
 bser@2.1.1:
   version "2.1.1"
@@ -3436,10 +3429,10 @@ camelcase@^8.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-8.0.0.tgz#c0d36d418753fb6ad9c5e0437579745c1c14a534"
   integrity sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==
 
-caniuse-lite@^1.0.30001759, caniuse-lite@^1.0.30001770:
-  version "1.0.30001770"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz#4dc47d3b263a50fbb243448034921e0a88591a84"
-  integrity sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==
+caniuse-lite@^1.0.30001780, caniuse-lite@^1.0.30001782:
+  version "1.0.30001787"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz#fd25c5e42e2d35df5c75eddda00d15d9c0c68f81"
+  integrity sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==
 
 ccount@^2.0.0:
   version "2.0.1"
@@ -3791,10 +3784,10 @@ core-js-compat@^3.48.0:
   dependencies:
     browserslist "^4.28.1"
 
-core-js@^3.48.0:
-  version "3.48.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.48.0.tgz#1f813220a47bbf0e667e3885c36cd6f0593bf14d"
-  integrity sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==
+core-js@^3.49.0:
+  version "3.49.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.49.0.tgz#8b4d520ac034311fa21aa616f017ada0e0dbbddd"
+  integrity sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
@@ -3812,10 +3805,10 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
-cosmiconfig@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d"
-  integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==
+cosmiconfig@^9.0.0, cosmiconfig@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.1.tgz#df110631a8547b5d1a98915271986f06e3011379"
+  integrity sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==
   dependencies:
     env-paths "^2.2.1"
     import-fresh "^3.3.0"
@@ -3861,18 +3854,18 @@ crypto-random-string@^4.0.0:
   dependencies:
     type-fest "^1.0.1"
 
-css-functions-list@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.2.3.tgz#95652b0c24f0f59b291a9fc386041a19d4f40dbe"
-  integrity sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==
+css-functions-list@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.3.3.tgz#c4ab5008659de2e3baf3752c8fdef7662f3ffe23"
+  integrity sha512-8HFEBPKhOpJPEPu70wJJetjKta86Gw9+CCyCnB3sui2qQfOvRyqBy4IKLKKAwdMpWb2lHXWk9Wb4Z6AmaUT1Pg==
 
-css-tree@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-3.1.0.tgz#7aabc035f4e66b5c86f54570d55e05b1346eb0fd"
-  integrity sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==
+css-tree@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-3.2.1.tgz#86cac7011561272b30e6b1e042ba6ce047aa7518"
+  integrity sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==
   dependencies:
-    mdn-data "2.12.2"
-    source-map-js "^1.0.1"
+    mdn-data "2.27.1"
+    source-map-js "^1.2.1"
 
 css.escape@^1.5.1:
   version "1.5.1"
@@ -4130,10 +4123,10 @@ devtools-license-check@^0.9.0:
   dependencies:
     license-checker "^9.0.3"
 
-devtools-reps@^0.27.4:
-  version "0.27.4"
-  resolved "https://registry.yarnpkg.com/devtools-reps/-/devtools-reps-0.27.4.tgz#71cd2e595a1fd51164b18e2bbf15d6f83e747d8b"
-  integrity sha512-YQJy8Quz6H3BNcUYgmjPWYX736owTIU6MKE/k1WuArPtzkyWbP9EEQFgir48GSqc/w5QGuDDmBF4LhM9AS7mcg==
+devtools-reps@^0.27.6:
+  version "0.27.6"
+  resolved "https://registry.yarnpkg.com/devtools-reps/-/devtools-reps-0.27.6.tgz#26aa682cfd058e171064bc86da6590e80785933f"
+  integrity sha512-ukQco/6e3nmTOk/qDnW7VuMga6XAlshJ/aBsCfq6ZTmaqJG2YybK7STV6oEiy2vi1U/YGQpg46mhPNx4fKytzw==
   dependencies:
     prop-types "^15.7.2"
     react "^16.8.6"
@@ -4222,10 +4215,10 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.5.263:
-  version "1.5.267"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
-  integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
+electron-to-chromium@^1.5.328:
+  version "1.5.335"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.335.tgz#0b957cea44ef86795c227c616d16b4803d119daa"
+  integrity sha512-q9n5T4BR4Xwa2cwbrwcsDJtHD/enpQ5S1xF1IAtdqf5AAgqDFmR/aakqH3ChFdqd/QXJhS3rnnXFtexU7rax6Q==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -4547,10 +4540,10 @@ eslint-plugin-jest-formatting@^3.1.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest-formatting/-/eslint-plugin-jest-formatting-3.1.0.tgz#b26dd5a40f432b642dcc880021a771bb1c93dcd2"
   integrity sha512-XyysraZ1JSgGbLSDxjj5HzKKh0glgWf+7CkqxbTqb7zEhW7X2WHo5SBQ8cGhnszKN+2Lj3/oevBlHNbHezoc/A==
 
-eslint-plugin-jest@^29.15.0:
-  version "29.15.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-29.15.0.tgz#58a5917a88244f7536ae10c68b5bd58d407896f0"
-  integrity sha512-ZCGr7vTH2WSo2hrK5oM2RULFmMruQ7W3cX7YfwoTiPfzTGTFBMmrVIz45jZHd++cGKj/kWf02li/RhTGcANJSA==
+eslint-plugin-jest@^29.15.1:
+  version "29.15.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-29.15.1.tgz#f663f9f7903a7181efddea5a92d1d31e66362596"
+  integrity sha512-6BjyErCQauz3zfJvzLw/kAez2lf4LEpbHLvWBfEcG4EI0ZiRSwjoH2uZulMouU8kRkBH+S0rhqn11IhTvxKgKw==
   dependencies:
     "@typescript-eslint/utils" "^8.0.0"
 
@@ -4578,10 +4571,10 @@ eslint-plugin-react@^7.37.5:
     string.prototype.matchall "^4.0.12"
     string.prototype.repeat "^1.0.0"
 
-eslint-plugin-testing-library@^7.16.0:
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.16.0.tgz#ac8dd5e4069e9264d997079b4cb5f45e79d2b8a7"
-  integrity sha512-lHZI6/Olb2oZqxd1+s1nOLCtL2PXKrc1ERz6oDbUKS0xZAMFH3Fy6wJo75z3pXTop3BV6+loPi2MSjIYt3vpAg==
+eslint-plugin-testing-library@^7.16.2:
+  version "7.16.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.16.2.tgz#b59738085db6bb3b2fed0294c70c9098b45bbf90"
+  integrity sha512-8gleGnQXK2ZA3hHwjCwpYTZvM+9VsrJ+/9kDI8CjqAQGAdMQOdn/rJNu7ZySENuiWlGKQWyZJ4ZjEg2zamaRHw==
   dependencies:
     "@typescript-eslint/scope-manager" "^8.56.0"
     "@typescript-eslint/utils" "^8.56.0"
@@ -4771,17 +4764,17 @@ exit-x@^0.2.2:
   resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
   integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
 
-expect@30.2.0, expect@^30.0.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-30.2.0.tgz#d4013bed267013c14bc1199cec8aa57cee9b5869"
-  integrity sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==
+expect@30.3.0, expect@^30.0.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.3.0.tgz#1b82111517d1ab030f3db0cf1b4061c8aa644f61"
+  integrity sha512-1zQrciTiQfRdo7qJM1uG4navm8DayFa2TgCSRlzUyNkhcJ6XUZF3hjnpkyr3VhAqPH7i/9GkG7Tv5abz6fqz0Q==
   dependencies:
-    "@jest/expect-utils" "30.2.0"
+    "@jest/expect-utils" "30.3.0"
     "@jest/get-type" "30.1.0"
-    jest-matcher-utils "30.2.0"
-    jest-message-util "30.2.0"
-    jest-mock "30.2.0"
-    jest-util "30.2.0"
+    jest-matcher-utils "30.3.0"
+    jest-message-util "30.3.0"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
 
 extend@^3.0.0:
   version "3.0.2"
@@ -5187,10 +5180,10 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.10:
-  version "10.4.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
-  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+glob@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^3.1.2"
@@ -5313,10 +5306,10 @@ globby@^11.0.3:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^16.1.0:
-  version "16.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-16.1.0.tgz#71ab8199e4fc1c4c21a59bd14ec0f31c71d7d7d4"
-  integrity sha512-+A4Hq7m7Ze592k9gZRy4gJ27DrXRNnC1vPjxTt1qQxEY8RxagBkBxivkCwg7FxSTG0iLLEMaUx13oOr0R2/qcQ==
+globby@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-16.2.0.tgz#6ab1351fbac1d9b9e47ed423814c2ad41af308ea"
+  integrity sha512-QrJia2qDf5BB/V6HYlDTs0I0lBahyjLzpGQg3KT7FnCdTonAyPy2RtY802m2k4ALx6Dp752f82WsOczEVr3l6Q==
   dependencies:
     "@sindresorhus/merge-streams" "^4.0.0"
     fast-glob "^3.3.3"
@@ -6360,96 +6353,95 @@ jake@^10.8.5:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
-jest-changed-files@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.2.0.tgz#602266e478ed554e1e1469944faa7efd37cee61c"
-  integrity sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==
+jest-changed-files@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.3.0.tgz#055849df695f9a9fcde0ae44024f815bbc627f3a"
+  integrity sha512-B/7Cny6cV5At6M25EWDgf9S617lHivamL8vl6KEpJqkStauzcG4e+WPfDgMMF+H4FVH4A2PLRyvgDJan4441QA==
   dependencies:
     execa "^5.1.1"
-    jest-util "30.2.0"
+    jest-util "30.3.0"
     p-limit "^3.1.0"
 
-jest-circus@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.2.0.tgz#98b8198b958748a2f322354311023d1d02e7603f"
-  integrity sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==
+jest-circus@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.3.0.tgz#153614c11ab35867f371bd93496ecb9690b92077"
+  integrity sha512-PyXq5szeSfR/4f1lYqCmmQjh0vqDkURUYi9N6whnHjlRz4IUQfMcXkGLeEoiJtxtyPqgUaUUfyQlApXWBSN1RA==
   dependencies:
-    "@jest/environment" "30.2.0"
-    "@jest/expect" "30.2.0"
-    "@jest/test-result" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/environment" "30.3.0"
+    "@jest/expect" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     chalk "^4.1.2"
     co "^4.6.0"
     dedent "^1.6.0"
     is-generator-fn "^2.1.0"
-    jest-each "30.2.0"
-    jest-matcher-utils "30.2.0"
-    jest-message-util "30.2.0"
-    jest-runtime "30.2.0"
-    jest-snapshot "30.2.0"
-    jest-util "30.2.0"
+    jest-each "30.3.0"
+    jest-matcher-utils "30.3.0"
+    jest-message-util "30.3.0"
+    jest-runtime "30.3.0"
+    jest-snapshot "30.3.0"
+    jest-util "30.3.0"
     p-limit "^3.1.0"
-    pretty-format "30.2.0"
+    pretty-format "30.3.0"
     pure-rand "^7.0.0"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
-jest-cli@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.2.0.tgz#1780f8e9d66bf84a10b369aea60aeda7697dcc67"
-  integrity sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==
+jest-cli@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.3.0.tgz#5ed75a337f486a1f1c5acbb2de8acddb106ead6c"
+  integrity sha512-l6Tqx+j1fDXJEW5bqYykDQQ7mQg+9mhWXtnj+tQZrTWYHyHoi6Be8HPumDSA+UiX2/2buEgjA58iJzdj146uCw==
   dependencies:
-    "@jest/core" "30.2.0"
-    "@jest/test-result" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/core" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/types" "30.3.0"
     chalk "^4.1.2"
     exit-x "^0.2.2"
     import-local "^3.2.0"
-    jest-config "30.2.0"
-    jest-util "30.2.0"
-    jest-validate "30.2.0"
+    jest-config "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
     yargs "^17.7.2"
 
-jest-config@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.2.0.tgz#29df8c50e2ad801cc59c406b50176c18c362a90b"
-  integrity sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==
+jest-config@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.3.0.tgz#b969e0aaaf5964419e62953bb712c16d15972425"
+  integrity sha512-WPMAkMAtNDY9P/oKObtsRG/6KTrhtgPJoBTmk20uDn4Uy6/3EJnnaZJre/FMT1KVRx8cve1r7/FlMIOfRVWL4w==
   dependencies:
     "@babel/core" "^7.27.4"
     "@jest/get-type" "30.1.0"
     "@jest/pattern" "30.0.1"
-    "@jest/test-sequencer" "30.2.0"
-    "@jest/types" "30.2.0"
-    babel-jest "30.2.0"
+    "@jest/test-sequencer" "30.3.0"
+    "@jest/types" "30.3.0"
+    babel-jest "30.3.0"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     deepmerge "^4.3.1"
-    glob "^10.3.10"
+    glob "^10.5.0"
     graceful-fs "^4.2.11"
-    jest-circus "30.2.0"
+    jest-circus "30.3.0"
     jest-docblock "30.2.0"
-    jest-environment-node "30.2.0"
+    jest-environment-node "30.3.0"
     jest-regex-util "30.0.1"
-    jest-resolve "30.2.0"
-    jest-runner "30.2.0"
-    jest-util "30.2.0"
-    jest-validate "30.2.0"
-    micromatch "^4.0.8"
+    jest-resolve "30.3.0"
+    jest-runner "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
     parse-json "^5.2.0"
-    pretty-format "30.2.0"
+    pretty-format "30.3.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@30.2.0, jest-diff@^30.0.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.2.0.tgz#e3ec3a6ea5c5747f605c9e874f83d756cba36825"
-  integrity sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==
+jest-diff@30.3.0, jest-diff@^30.0.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.3.0.tgz#e0a4c84ef350ffd790ffd5b0016acabeecf5f759"
+  integrity sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==
   dependencies:
-    "@jest/diff-sequences" "30.0.1"
+    "@jest/diff-sequences" "30.3.0"
     "@jest/get-type" "30.1.0"
     chalk "^4.1.2"
-    pretty-format "30.2.0"
+    pretty-format "30.3.0"
 
 jest-docblock@30.2.0:
   version "30.2.0"
@@ -6458,40 +6450,38 @@ jest-docblock@30.2.0:
   dependencies:
     detect-newline "^3.1.0"
 
-jest-each@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.2.0.tgz#39e623ae71641c2ac3ee69b3ba3d258fce8e768d"
-  integrity sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==
+jest-each@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.3.0.tgz#faa7229bf7a9fa6426dc604057a7d2a173493b1e"
+  integrity sha512-V8eMndg/aZ+3LnCJgSm13IxS5XSBM22QSZc9BtPK8Dek6pm+hfUNfwBdvsB3d342bo1q7wnSkC38zjX259qZNA==
   dependencies:
     "@jest/get-type" "30.1.0"
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     chalk "^4.1.2"
-    jest-util "30.2.0"
-    pretty-format "30.2.0"
+    jest-util "30.3.0"
+    pretty-format "30.3.0"
 
-jest-environment-jsdom@^30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-30.2.0.tgz#e95e0921ed22be974f1d8a324766d12b1844cb2c"
-  integrity sha512-zbBTiqr2Vl78pKp/laGBREYzbZx9ZtqPjOK4++lL4BNDhxRnahg51HtoDrk9/VjIy9IthNEWdKVd7H5bqBhiWQ==
+jest-environment-jsdom@^30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-30.3.0.tgz#6bf80519643333ae2faa07b5660d80451d328578"
+  integrity sha512-RLEOJy6ip1lpw0yqJ8tB3i88FC7VBz7i00Zvl2qF71IdxjS98gC9/0SPWYIBVXHm5hgCYK0PAlSlnHGGy9RoMg==
   dependencies:
-    "@jest/environment" "30.2.0"
-    "@jest/environment-jsdom-abstract" "30.2.0"
-    "@types/jsdom" "^21.1.7"
-    "@types/node" "*"
+    "@jest/environment" "30.3.0"
+    "@jest/environment-jsdom-abstract" "30.3.0"
     jsdom "^26.1.0"
 
-jest-environment-node@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.2.0.tgz#3def7980ebd2fd86e74efd4d2e681f55ab38da0f"
-  integrity sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==
+jest-environment-node@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.3.0.tgz#aa8a57c5d0c4af0f8b1f7403ba737fec6b3aabbe"
+  integrity sha512-4i6HItw/JSiJVsC5q0hnKIe/hbYfZLVG9YJ/0pU9Hz2n/9qZe3Rhn5s5CUZA5ORZlcdT/vmAXRMyONXJwPrmYQ==
   dependencies:
-    "@jest/environment" "30.2.0"
-    "@jest/fake-timers" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/environment" "30.3.0"
+    "@jest/fake-timers" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    jest-mock "30.2.0"
-    jest-util "30.2.0"
-    jest-validate "30.2.0"
+    jest-mock "30.3.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
 
 jest-extended@^7.0.0:
   version "7.0.0"
@@ -6500,65 +6490,65 @@ jest-extended@^7.0.0:
   dependencies:
     jest-diff "^30.0.0"
 
-jest-haste-map@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.2.0.tgz#808e3889f288603ac70ff0ac047598345a66022e"
-  integrity sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==
+jest-haste-map@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.3.0.tgz#1ea6843e6e45c077d91270666a4fcba958c24cd5"
+  integrity sha512-mMi2oqG4KRU0R9QEtscl87JzMXfUhbKaFqOxmjb2CKcbHcUGFrJCBWHmnTiUqi6JcnzoBlO4rWfpdl2k/RfLCA==
   dependencies:
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     anymatch "^3.1.3"
     fb-watchman "^2.0.2"
     graceful-fs "^4.2.11"
     jest-regex-util "30.0.1"
-    jest-util "30.2.0"
-    jest-worker "30.2.0"
-    micromatch "^4.0.8"
+    jest-util "30.3.0"
+    jest-worker "30.3.0"
+    picomatch "^4.0.3"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.3"
 
-jest-leak-detector@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz#292fdca7b7c9cf594e1e570ace140b01d8beb736"
-  integrity sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==
+jest-leak-detector@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.3.0.tgz#a695a851e353f517a554a2f5c91c2742fc131c98"
+  integrity sha512-cuKmUUGIjfXZAiGJ7TbEMx0bcqNdPPI6P1V+7aF+m/FUJqFDxkFR4JqkTu8ZOiU5AaX/x0hZ20KaaIPXQzbMGQ==
   dependencies:
     "@jest/get-type" "30.1.0"
-    pretty-format "30.2.0"
+    pretty-format "30.3.0"
 
-jest-matcher-utils@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz#69a0d4c271066559ec8b0d8174829adc3f23a783"
-  integrity sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==
+jest-matcher-utils@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.3.0.tgz#d6c739fec1ecd33809f2d2b1348f6ab01d2f2493"
+  integrity sha512-HEtc9uFQgaUHkC7nLSlQL3Tph4Pjxt/yiPvkIrrDCt9jhoLIgxaubo1G+CFOnmHYMxHwwdaSN7mkIFs6ZK8OhA==
   dependencies:
     "@jest/get-type" "30.1.0"
     chalk "^4.1.2"
-    jest-diff "30.2.0"
-    pretty-format "30.2.0"
+    jest-diff "30.3.0"
+    pretty-format "30.3.0"
 
-jest-message-util@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.2.0.tgz#fc97bf90d11f118b31e6131e2b67fc4f39f92152"
-  integrity sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==
+jest-message-util@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.3.0.tgz#4d723544d36890ba862ac3961db52db5b0d1ba39"
+  integrity sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     "@types/stack-utils" "^2.0.3"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
-    micromatch "^4.0.8"
-    pretty-format "30.2.0"
+    picomatch "^4.0.3"
+    pretty-format "30.3.0"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
-jest-mock@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.2.0.tgz#69f991614eeb4060189459d3584f710845bff45e"
-  integrity sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==
+jest-mock@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.3.0.tgz#e0fa4184a596a6c4fdec53d4f412158418923747"
+  integrity sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==
   dependencies:
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
-    jest-util "30.2.0"
+    jest-util "30.3.0"
 
 jest-pnp-resolver@^1.2.3:
   version "1.2.3"
@@ -6570,169 +6560,169 @@ jest-regex-util@30.0.1:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
   integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
 
-jest-resolve-dependencies@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz#3370e2c0b49cc560f6a7e8ec3a59dd99525e1a55"
-  integrity sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==
+jest-resolve-dependencies@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.3.0.tgz#4d638c9f0d93a62a6ed25dec874bfd7e756c8ce5"
+  integrity sha512-9ev8s3YN6Hsyz9LV75XUwkCVFlwPbaFn6Wp75qnI0wzAINYWY8Fb3+6y59Rwd3QaS3kKXffHXsZMziMavfz/nw==
   dependencies:
     jest-regex-util "30.0.1"
-    jest-snapshot "30.2.0"
+    jest-snapshot "30.3.0"
 
-jest-resolve@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.2.0.tgz#2e2009cbd61e8f1f003355d5ec87225412cebcd7"
-  integrity sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==
+jest-resolve@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.3.0.tgz#b7bee9927279805b1b50715d2170a545553b87ff"
+  integrity sha512-NRtTAHQlpd15F9rUR36jqwelbrDV/dY4vzNte3S2kxCKUJRYNd5/6nTSbYiak1VX5g8IoFF23Uj5TURkUW8O5g==
   dependencies:
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.2.0"
+    jest-haste-map "30.3.0"
     jest-pnp-resolver "^1.2.3"
-    jest-util "30.2.0"
-    jest-validate "30.2.0"
+    jest-util "30.3.0"
+    jest-validate "30.3.0"
     slash "^3.0.0"
     unrs-resolver "^1.7.11"
 
-jest-runner@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.2.0.tgz#c62b4c3130afa661789705e13a07bdbcec26a114"
-  integrity sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==
-  dependencies:
-    "@jest/console" "30.2.0"
-    "@jest/environment" "30.2.0"
-    "@jest/test-result" "30.2.0"
-    "@jest/transform" "30.2.0"
-    "@jest/types" "30.2.0"
+jest-runner@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.3.0.tgz#fa970fc4e45d418ad7e7d581b24cac7af5944cb7"
+  integrity sha512-gDv6C9LGKWDPLia9TSzZwf4h3kMQCqyTpq+95PODnTRDO0g9os48XIYYkS6D236vjpBir2fF63YmJFtqkS5Duw==
+  dependencies:
+    "@jest/console" "30.3.0"
+    "@jest/environment" "30.3.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     chalk "^4.1.2"
     emittery "^0.13.1"
     exit-x "^0.2.2"
     graceful-fs "^4.2.11"
     jest-docblock "30.2.0"
-    jest-environment-node "30.2.0"
-    jest-haste-map "30.2.0"
-    jest-leak-detector "30.2.0"
-    jest-message-util "30.2.0"
-    jest-resolve "30.2.0"
-    jest-runtime "30.2.0"
-    jest-util "30.2.0"
-    jest-watcher "30.2.0"
-    jest-worker "30.2.0"
+    jest-environment-node "30.3.0"
+    jest-haste-map "30.3.0"
+    jest-leak-detector "30.3.0"
+    jest-message-util "30.3.0"
+    jest-resolve "30.3.0"
+    jest-runtime "30.3.0"
+    jest-util "30.3.0"
+    jest-watcher "30.3.0"
+    jest-worker "30.3.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.2.0.tgz#395ea792cde048db1b0cd1a92dc9cb9f1921bf8a"
-  integrity sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==
+jest-runtime@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.3.0.tgz#1a9bec7a9b68db12dfe4136bbe41ab883ea2c996"
+  integrity sha512-CgC+hIBJbuh78HEffkhNKcbXAytQViplcl8xupqeIWyKQF50kCQA8J7GeJCkjisC6hpnC9Muf8jV5RdtdFbGng==
   dependencies:
-    "@jest/environment" "30.2.0"
-    "@jest/fake-timers" "30.2.0"
-    "@jest/globals" "30.2.0"
+    "@jest/environment" "30.3.0"
+    "@jest/fake-timers" "30.3.0"
+    "@jest/globals" "30.3.0"
     "@jest/source-map" "30.0.1"
-    "@jest/test-result" "30.2.0"
-    "@jest/transform" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     chalk "^4.1.2"
     cjs-module-lexer "^2.1.0"
     collect-v8-coverage "^1.0.2"
-    glob "^10.3.10"
+    glob "^10.5.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.2.0"
-    jest-message-util "30.2.0"
-    jest-mock "30.2.0"
+    jest-haste-map "30.3.0"
+    jest-message-util "30.3.0"
+    jest-mock "30.3.0"
     jest-regex-util "30.0.1"
-    jest-resolve "30.2.0"
-    jest-snapshot "30.2.0"
-    jest-util "30.2.0"
+    jest-resolve "30.3.0"
+    jest-snapshot "30.3.0"
+    jest-util "30.3.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.2.0.tgz#266fbbb4b95fc4665ce6f32f1f38eeb39f4e26d0"
-  integrity sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==
+jest-snapshot@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.3.0.tgz#6e7ea75069dda86e36311a0f73189e830d4f51ad"
+  integrity sha512-f14c7atpb4O2DeNhwcvS810Y63wEn8O1HqK/luJ4F6M4NjvxmAKQwBUWjbExUtMxWJQ0wVgmCKymeJK6NZMnfQ==
   dependencies:
     "@babel/core" "^7.27.4"
     "@babel/generator" "^7.27.5"
     "@babel/plugin-syntax-jsx" "^7.27.1"
     "@babel/plugin-syntax-typescript" "^7.27.1"
     "@babel/types" "^7.27.3"
-    "@jest/expect-utils" "30.2.0"
+    "@jest/expect-utils" "30.3.0"
     "@jest/get-type" "30.1.0"
-    "@jest/snapshot-utils" "30.2.0"
-    "@jest/transform" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/snapshot-utils" "30.3.0"
+    "@jest/transform" "30.3.0"
+    "@jest/types" "30.3.0"
     babel-preset-current-node-syntax "^1.2.0"
     chalk "^4.1.2"
-    expect "30.2.0"
+    expect "30.3.0"
     graceful-fs "^4.2.11"
-    jest-diff "30.2.0"
-    jest-matcher-utils "30.2.0"
-    jest-message-util "30.2.0"
-    jest-util "30.2.0"
-    pretty-format "30.2.0"
+    jest-diff "30.3.0"
+    jest-matcher-utils "30.3.0"
+    jest-message-util "30.3.0"
+    jest-util "30.3.0"
+    pretty-format "30.3.0"
     semver "^7.7.2"
     synckit "^0.11.8"
 
-jest-util@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.2.0.tgz#5142adbcad6f4e53c2776c067a4db3c14f913705"
-  integrity sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==
+jest-util@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.3.0.tgz#95a4fbacf2dac20e768e2f1744b70519f2ba7980"
+  integrity sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==
   dependencies:
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     graceful-fs "^4.2.11"
-    picomatch "^4.0.2"
+    picomatch "^4.0.3"
 
-jest-validate@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.2.0.tgz#273eaaed4c0963b934b5b31e96289edda6e0a2ef"
-  integrity sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==
+jest-validate@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.3.0.tgz#215e11b8fcc5e2ca4b99ea5d730a5b4c969e4355"
+  integrity sha512-I/xzC8h5G+SHCb2P2gWkJYrNiTbeL47KvKeW5EzplkyxzBRBw1ssSHlI/jXec0ukH2q7x2zAWQm7015iusg62Q==
   dependencies:
     "@jest/get-type" "30.1.0"
-    "@jest/types" "30.2.0"
+    "@jest/types" "30.3.0"
     camelcase "^6.3.0"
     chalk "^4.1.2"
     leven "^3.1.0"
-    pretty-format "30.2.0"
+    pretty-format "30.3.0"
 
-jest-watcher@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.2.0.tgz#f9c055de48e18c979e7756a3917e596e2d69b07b"
-  integrity sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==
+jest-watcher@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.3.0.tgz#3afa1af355b9fe80f0261eb8a23981a315858596"
+  integrity sha512-PJ1d9ThtTR8aMiBWUdcownq9mDdLXsQzJayTk4kmaBRHKvwNQn+ANveuhEBUyNI2hR1TVhvQ8D5kHubbzBHR/w==
   dependencies:
-    "@jest/test-result" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/test-result" "30.3.0"
+    "@jest/types" "30.3.0"
     "@types/node" "*"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
     emittery "^0.13.1"
-    jest-util "30.2.0"
+    jest-util "30.3.0"
     string-length "^4.0.2"
 
-jest-worker@30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.2.0.tgz#fd5c2a36ff6058ec8f74366ec89538cc99539d26"
-  integrity sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==
+jest-worker@30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.3.0.tgz#ae4dc1f1d93d0cba1415624fcedaec40ea764f14"
+  integrity sha512-DrCKkaQwHexjRUFTmPzs7sHQe0TSj9nvDALKGdwmK5mW9v7j90BudWirKAJHt3QQ9Dhrg1F7DogPzhChppkJpQ==
   dependencies:
     "@types/node" "*"
     "@ungap/structured-clone" "^1.3.0"
-    jest-util "30.2.0"
+    jest-util "30.3.0"
     merge-stream "^2.0.0"
     supports-color "^8.1.1"
 
-jest@^30.2.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-30.2.0.tgz#9f0a71e734af968f26952b5ae4b724af82681630"
-  integrity sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==
+jest@^30.3.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.3.0.tgz#6460b889dd805e9677400505f16f1d9b14c285a3"
+  integrity sha512-AkXIIFcaazymvey2i/+F94XRnM6TsVLZDhBMLsd1Sf/W0wzsvvpjeyUrCZD6HGG4SDYPgDJDBKeiJTBb10WzMg==
   dependencies:
-    "@jest/core" "30.2.0"
-    "@jest/types" "30.2.0"
+    "@jest/core" "30.3.0"
+    "@jest/types" "30.3.0"
     import-local "^3.2.0"
-    jest-cli "30.2.0"
+    jest-cli "30.3.0"
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -6933,11 +6923,6 @@ kleur@^4.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.4.tgz#8c202987d7e577766d039a8cd461934c01cda04d"
   integrity sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==
 
-known-css-properties@^0.37.0:
-  version "0.37.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.37.0.tgz#10ebe49b9dbb6638860ff8a002fb65a053f4aec5"
-  integrity sha512-JCDrsP4Z1Sb9JwG0aJ8Eo2r7k4Ou5MwmThS/6lcIe1ICyb7UBJKGRIUUdqc2ASdE/42lgz6zFUnzAIhtXnBVrQ==
-
 koa-bodyparser@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/koa-bodyparser/-/koa-bodyparser-4.4.1.tgz#a908d848e142cc57d9eece478e932bf00dce3029"
@@ -7681,10 +7666,10 @@ mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0:
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9"
   integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==
 
-mdn-data@2.12.2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.12.2.tgz#9ae6c41a9e65adf61318b32bff7b64fbfb13f8cf"
-  integrity sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==
+mdn-data@2.27.1:
+  version "2.27.1"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.27.1.tgz#e37b9c50880b75366c4d40ac63d9bbcacdb61f0e"
+  integrity sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==
 
 media-typer@0.3.0:
   version "0.3.0"
@@ -7736,10 +7721,10 @@ meow@^13.0.0:
   resolved "https://registry.yarnpkg.com/meow/-/meow-13.2.0.tgz#6b7d63f913f984063b3cc261b6e8800c4cd3474f"
   integrity sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==
 
-meow@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-14.0.0.tgz#97d44d2f9eeb9836db06108570891f7523103bbc"
-  integrity sha512-JhC3R1f6dbspVtmF3vKjAWz1EVIvwFrGGPLSdU6rK79xBwHWTuHoLnRX/t1/zHS1Ch1Y2UtIrih7DAHuH9JFJA==
+meow@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-14.1.0.tgz#3cd2d16ad534829ab12fcb5010fc2fdb89facd31"
+  integrity sha512-EDYo6VlmtnumlcBCbh1gLJ//9jvM/ndXHfVXIFrZVr6fGcwTUyCTFNTLCKuY3ffbK8L/+3Mzqnd58RojiZqHVw==
 
 meow@^7.1.0:
   version "7.1.1"
@@ -8374,10 +8359,10 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
-node-releases@^2.0.27:
-  version "2.0.27"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
-  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
+node-releases@^2.0.36:
+  version "2.0.37"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.37.tgz#9bd4f10b77ba39c2b9402d4e8399c482a797f671"
+  integrity sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==
 
 nopt@^2.2.0:
   version "2.2.1"
@@ -9016,7 +9001,7 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.32, postcss@^8.5.6, postcss@^8.5.8:
+postcss@^8.4.32, postcss@^8.5.8:
   version "8.5.8"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.8.tgz#6230ecc8fb02e7a0f6982e53990937857e13f399"
   integrity sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==
@@ -9050,10 +9035,10 @@ pretty-bytes@^5.3.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-format@30.2.0, pretty-format@^30.0.0:
-  version "30.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.2.0.tgz#2d44fe6134529aed18506f6d11509d8a62775ebe"
-  integrity sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==
+pretty-format@30.3.0, pretty-format@^30.0.0:
+  version "30.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.3.0.tgz#e977eed4bcd1b6195faed418af8eac68b9ea1f29"
+  integrity sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==
   dependencies:
     "@jest/schemas" "30.0.5"
     ansi-styles "^5.2.0"
@@ -9102,10 +9087,10 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protobufjs@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-8.0.0.tgz#d884102c1fe8d0b1e2493789ad37bc7ea47c0893"
-  integrity sha512-jx6+sE9h/UryaCZhsJWbJtTEy47yXoGNYI4z8ZaRncM0zBKeRqjO2JEcOUYwrYGb1WLhXM1FfMzW3annvFv0rw==
+protobufjs@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-8.0.1.tgz#c1781abf9a73812cbd483b32138ac59948223806"
+  integrity sha512-NWWCCscLjs+cOKF/s/XVNFRW7Yih0fdH+9brffR5NZCy8k42yRdl5KlWKMVXuI1vfCoy4o1z80XR/W/QUb3V3w==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -10107,7 +10092,7 @@ smob@^1.0.0:
   resolved "https://registry.yarnpkg.com/smob/-/smob-1.5.0.tgz#85d79a1403abf128d24d3ebc1cdc5e1a9548d3ab"
   integrity sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==
 
-source-map-js@^1.0.1, source-map-js@^1.2.1:
+source-map-js@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
   integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
@@ -10308,7 +10293,7 @@ string-width@^7.0.0, string-width@^7.2.0:
     get-east-asian-width "^1.0.0"
     strip-ansi "^7.1.0"
 
-string-width@^8.1.1:
+string-width@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.2.0.tgz#bdb6a9bd6d7800db635adae96cdb0443fec56c42"
   integrity sha512-6hJPQ8N0V0P3SNmP6h2J99RLuzrWz2gvT7VnK5tKvrNqJoyS9W4/Fb8mo31UiPvy00z7DQXkP2hnKBVav76thw==
@@ -10520,50 +10505,47 @@ stylelint-order@^6.0.2:
     postcss "^8.4.32"
     postcss-sorting "^8.0.2"
 
-stylelint@^17.3.0:
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-17.3.0.tgz#18fa199862205516d7011524557fae4ff5b9d60f"
-  integrity sha512-1POV91lcEMhj6SLVaOeA0KlS9yattS+qq+cyWqP/nYzWco7K5jznpGH1ExngvPlTM9QF1Kjd2bmuzJu9TH2OcA==
+stylelint@^17.6.0:
+  version "17.6.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-17.6.0.tgz#029731f853f407699ef49713b1a7b550cc458012"
+  integrity sha512-tokrsMIVAR9vAQ/q3UVEr7S0dGXCi7zkCezPRnS2kqPUulvUh5Vgfwngrk4EoAoW7wnrThqTdnTFN5Ra7CaxIg==
   dependencies:
     "@csstools/css-calc" "^3.1.1"
     "@csstools/css-parser-algorithms" "^4.0.0"
-    "@csstools/css-syntax-patches-for-csstree" "^1.0.26"
+    "@csstools/css-syntax-patches-for-csstree" "^1.1.1"
     "@csstools/css-tokenizer" "^4.0.0"
     "@csstools/media-query-list-parser" "^5.0.0"
     "@csstools/selector-resolve-nested" "^4.0.0"
     "@csstools/selector-specificity" "^6.0.0"
-    balanced-match "^3.0.1"
     colord "^2.9.3"
-    cosmiconfig "^9.0.0"
-    css-functions-list "^3.2.3"
-    css-tree "^3.1.0"
+    cosmiconfig "^9.0.1"
+    css-functions-list "^3.3.3"
+    css-tree "^3.2.1"
     debug "^4.4.3"
     fast-glob "^3.3.3"
     fastest-levenshtein "^1.0.16"
     file-entry-cache "^11.1.2"
     global-modules "^2.0.0"
-    globby "^16.1.0"
+    globby "^16.1.1"
     globjoin "^0.1.4"
     html-tags "^5.1.0"
     ignore "^7.0.5"
     import-meta-resolve "^4.2.0"
-    imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.37.0"
     mathml-tag-names "^4.0.0"
-    meow "^14.0.0"
+    meow "^14.1.0"
     micromatch "^4.0.8"
     normalize-path "^3.0.0"
     picocolors "^1.1.1"
-    postcss "^8.5.6"
+    postcss "^8.5.8"
     postcss-safe-parser "^7.0.1"
     postcss-selector-parser "^7.1.1"
     postcss-value-parser "^4.2.0"
-    string-width "^8.1.1"
+    string-width "^8.2.0"
     supports-hyperlinks "^4.4.0"
     svg-tags "^1.0.0"
     table "^6.9.0"
-    write-file-atomic "^7.0.0"
+    write-file-atomic "^7.0.1"
 
 supports-color@^0.2.0:
   version "0.2.0"
@@ -10981,15 +10963,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.58.0:
-  version "8.58.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.0.tgz#5758b1b68ae7ec05d756b98c63a1f6953a01172b"
-  integrity sha512-e2TQzKfaI85fO+F3QywtX+tCTsu/D3WW5LVU6nz8hTFKFZ8yBJ6mSYRpXqdR3mFjPWmO0eWsTa5f+UpAOe/FMA==
+typescript-eslint@^8.58.1:
+  version "8.58.1"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.1.tgz#e765cbfea5774dcb4b1473e5e77a46254f309b32"
+  integrity sha512-gf6/oHChByg9HJvhMO1iBexJh12AqqTfnuxscMDOVqfJW3htsdRJI/GfPpHTTcyeB8cSTUY2JcZmVgoyPqcrDg==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.58.0"
-    "@typescript-eslint/parser" "8.58.0"
-    "@typescript-eslint/typescript-estree" "8.58.0"
-    "@typescript-eslint/utils" "8.58.0"
+    "@typescript-eslint/eslint-plugin" "8.58.1"
+    "@typescript-eslint/parser" "8.58.1"
+    "@typescript-eslint/typescript-estree" "8.58.1"
+    "@typescript-eslint/utils" "8.58.1"
 
 typescript@^6.0.2:
   version "6.0.2"
@@ -11256,7 +11238,7 @@ upath@^1.2.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.2.0:
+update-browserslist-db@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d"
   integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==
@@ -11350,10 +11332,10 @@ v8-to-istanbul@^9.0.1:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
 
-valibot@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/valibot/-/valibot-1.2.0.tgz#8fc720d9e4082ba16e30a914064a39619b2f1d6f"
-  integrity sha512-mm1rxUsmOxzrwnX5arGS+U4T25RdvpPjPN4yR0u9pUBov9+zGVtO84tif1eY4r6zWxVxu3KzIyknJy3rxfRZZg==
+valibot@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/valibot/-/valibot-1.3.1.tgz#483c5e229b75c0cb441dfaa9392ffe0a1ec53f2f"
+  integrity sha512-sfdRir/QFM0JaF22hqTroPc5xy4DimuGQVKFrzF1YfGwaS1nJot3Y8VqMdLO2Lg27fMzat2yD3pY5PbAYO39Gg==
 
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4:
   version "3.0.4"
@@ -11851,12 +11833,11 @@ write-file-atomic@^5.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
-write-file-atomic@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-7.0.0.tgz#f89def4f223e9bf8b06cc6fdb12bda3a917505c7"
-  integrity sha512-YnlPC6JqnZl6aO4uRc+dx5PHguiR9S6WeoLtpxNT9wIG+BDya7ZNE1q7KOjVgaA73hKhKLpVPgJ5QA9THQ5BRg==
+write-file-atomic@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-7.0.1.tgz#0e2a450ab5aa306bcfcd3aed61833b10cc4fb885"
+  integrity sha512-OTIk8iR8/aCRWBqvxrzxR0hgxWpnYBblY1S5hDWBQfk/VFmJwzmJgQFN3WsoUKHISv2eAwe+PpbUzyL1CKTLXg==
   dependencies:
-    imurmurhash "^0.1.4"
     signal-exit "^4.0.1"
 
 ws@^8.18.0:

From 7f631a0af0a84fb3c1ff03f492713fe3244961b7 Mon Sep 17 00:00:00 2001
From: fatadel <afatkhutdinov@mozilla.com>
Date: Wed, 15 Apr 2026 12:18:45 +0200
Subject: [PATCH 30/64] Add CounterDisplayConfig to counters in the processed
 profile format (#5912)

* Add CounterDisplayConfig to counters in the processed profile format

Make counters self-describing in terms of rendering by adding `display`
field of `CounterDisplayConfig` type. The value is derived from a
counter's `category` and `name` fields. This data is sufficient to
understand how a counter should be rendered allowing us to remove
hardcoded logic for each counter.

This is the first PR for issue #5752.

* Migrate counter.color into display.color in the processed profile upgrader

The existing optional `color` field on counters (used by external
importers) is now consolidated into `display.color`. The upgrader
uses the old `color` value as a fallback when deriving the display
config, then removes the standalone field. Components now read
color from `counter.display.color` directly.
---
 docs-developer/CHANGELOG-formats.md           |  6 ++
 src/app-logic/constants.ts                    |  5 +-
 .../timeline/TrackBandwidthGraph.tsx          | 13 +---
 src/components/timeline/TrackMemoryGraph.tsx  | 11 +---
 src/components/timeline/TrackPowerGraph.tsx   | 11 +---
 src/profile-logic/process-profile.ts          | 57 +++++++++++++++++
 .../processed-profile-versioning.ts           | 61 +++++++++++++++++++
 src/profile-logic/profile-data.ts             |  3 +-
 src/test/components/TrackBandwidth.test.tsx   | 37 +++++------
 src/test/components/TrackMemory.test.tsx      |  9 ++-
 .../fixtures/profiles/processed-profile.ts    | 15 +++++
 .../symbolicator-cli.test.ts.snap             |  4 +-
 .../__snapshots__/profile-view.test.ts.snap   |  2 +-
 .../profile-conversion.test.ts.snap           | 36 +++++------
 .../profile-upgrading.test.ts.snap            | 16 +++--
 src/types/profile-derived.ts                  |  4 +-
 src/types/profile.ts                          | 23 ++++++-
 17 files changed, 233 insertions(+), 80 deletions(-)

diff --git a/docs-developer/CHANGELOG-formats.md b/docs-developer/CHANGELOG-formats.md
index b1be78b6bb..50da5c96d4 100644
--- a/docs-developer/CHANGELOG-formats.md
+++ b/docs-developer/CHANGELOG-formats.md
@@ -6,6 +6,12 @@ Note that this is not an exhaustive list. Processed profile format upgraders can
 
 ## Processed profile format
 
+### Version 62
+
+A new `display` field of type `CounterDisplayConfig` was added to `RawCounter`.
+This metadata makes counters self-describing in terms of how they are rendered in the UI.
+For existing profiles, the display config is derived from the counter's `category` and `name`.
+
 ### Version 61
 
 The `SourceTable` in `profile.shared.sources` was updated:
diff --git a/src/app-logic/constants.ts b/src/app-logic/constants.ts
index f70f544144..955a410194 100644
--- a/src/app-logic/constants.ts
+++ b/src/app-logic/constants.ts
@@ -12,7 +12,7 @@ export const GECKO_PROFILE_VERSION = 34;
 // The current version of the "processed" profile format.
 // Please don't forget to update the processed profile format changelog in
 // `docs-developer/CHANGELOG-formats.md`.
-export const PROCESSED_PROFILE_VERSION = 61;
+export const PROCESSED_PROFILE_VERSION = 62;
 
 // The following are the margin sizes for the left and right of the timeline. Independent
 // components need to share these values.
@@ -35,12 +35,10 @@ export const TRACK_MEMORY_MARKERS_HEIGHT = 15;
 export const TRACK_MEMORY_HEIGHT =
   TRACK_MEMORY_GRAPH_HEIGHT + TRACK_MEMORY_MARKERS_HEIGHT;
 export const TRACK_MEMORY_LINE_WIDTH = 2;
-export const TRACK_MEMORY_DEFAULT_COLOR = 'orange';
 
 // The following values are for the bandwidth track.
 export const TRACK_BANDWIDTH_HEIGHT = 25;
 export const TRACK_BANDWIDTH_LINE_WIDTH = 2;
-export const TRACK_BANDWIDTH_DEFAULT_COLOR = 'blue';
 
 // The following values are for experimental event delay track.
 export const TRACK_EVENT_DELAY_HEIGHT = 40;
@@ -64,7 +62,6 @@ export const TIMELINE_RULER_HEIGHT = 20;
 // Height of the power track.
 export const TRACK_POWER_HEIGHT = 25;
 export const TRACK_POWER_LINE_WIDTH = 2;
-export const TRACK_POWER_DEFAULT_COLOR = 'grey';
 
 // Height of the process cpu track.
 export const TRACK_PROCESS_CPU_HEIGHT = 25;
diff --git a/src/components/timeline/TrackBandwidthGraph.tsx b/src/components/timeline/TrackBandwidthGraph.tsx
index 6f05c80bd2..0110b3c9a3 100644
--- a/src/components/timeline/TrackBandwidthGraph.tsx
+++ b/src/components/timeline/TrackBandwidthGraph.tsx
@@ -31,7 +31,6 @@ import {
   TooltipDetailSeparator,
 } from 'firefox-profiler/components/tooltip/TooltipDetails';
 import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-import { TRACK_BANDWIDTH_DEFAULT_COLOR } from 'firefox-profiler/app-logic/constants';
 import { getSampleIndexRangeForSelection } from 'firefox-profiler/profile-logic/profile-data';
 import { co2 } from '@tgwf/co2';
 
@@ -140,12 +139,8 @@ class TrackBandwidthCanvas extends React.PureComponent<CanvasProps> {
 
       ctx.lineWidth = deviceLineWidth;
       ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = getStrokeColor(
-        counter.color || TRACK_BANDWIDTH_DEFAULT_COLOR
-      );
-      ctx.fillStyle = getFillColor(
-        counter.color || TRACK_BANDWIDTH_DEFAULT_COLOR
-      );
+      ctx.strokeStyle = getStrokeColor(counter.display.color);
+      ctx.fillStyle = getFillColor(counter.display.color);
       ctx.beginPath();
 
       const getX = (i: number) =>
@@ -618,9 +613,7 @@ class TrackBandwidthGraphImpl extends React.PureComponent<Props, State> {
         style={{
           left,
           top,
-          backgroundColor: getDotColor(
-            counter.color || TRACK_BANDWIDTH_DEFAULT_COLOR
-          ),
+          backgroundColor: getDotColor(counter.display.color),
         }}
         className="timelineTrackBandwidthGraphDot"
       />
diff --git a/src/components/timeline/TrackMemoryGraph.tsx b/src/components/timeline/TrackMemoryGraph.tsx
index 8e1a0f74a6..e3d9f4772e 100644
--- a/src/components/timeline/TrackMemoryGraph.tsx
+++ b/src/components/timeline/TrackMemoryGraph.tsx
@@ -25,7 +25,6 @@ import {
 import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
 import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
 import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-import { TRACK_MEMORY_DEFAULT_COLOR } from 'firefox-profiler/app-logic/constants';
 
 import type {
   CounterIndex,
@@ -130,10 +129,8 @@ class TrackMemoryCanvas extends React.PureComponent<CanvasProps> {
 
       ctx.lineWidth = deviceLineWidth;
       ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = getStrokeColor(
-        counter.color || TRACK_MEMORY_DEFAULT_COLOR
-      );
-      ctx.fillStyle = getFillColor(counter.color || TRACK_MEMORY_DEFAULT_COLOR);
+      ctx.strokeStyle = getStrokeColor(counter.display.color);
+      ctx.fillStyle = getFillColor(counter.display.color);
       ctx.beginPath();
 
       // The x and y are used after the loop.
@@ -460,9 +457,7 @@ class TrackMemoryGraphImpl extends React.PureComponent<Props, State> {
         style={{
           left,
           top,
-          backgroundColor: getDotColor(
-            counter.color || TRACK_MEMORY_DEFAULT_COLOR
-          ),
+          backgroundColor: getDotColor(counter.display.color),
         }}
         className="timelineTrackMemoryGraphDot"
       />
diff --git a/src/components/timeline/TrackPowerGraph.tsx b/src/components/timeline/TrackPowerGraph.tsx
index c8613636f5..fe654222dd 100644
--- a/src/components/timeline/TrackPowerGraph.tsx
+++ b/src/components/timeline/TrackPowerGraph.tsx
@@ -21,7 +21,6 @@ import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
 import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
 import { TooltipTrackPower } from 'firefox-profiler/components/tooltip/TrackPower';
 import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-import { TRACK_POWER_DEFAULT_COLOR } from 'firefox-profiler/app-logic/constants';
 
 import type {
   CounterIndex,
@@ -122,10 +121,8 @@ class TrackPowerCanvas extends React.PureComponent<CanvasProps> {
 
       ctx.lineWidth = deviceLineWidth;
       ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = getStrokeColor(
-        counter.color || TRACK_POWER_DEFAULT_COLOR
-      );
-      ctx.fillStyle = getFillColor(counter.color || TRACK_POWER_DEFAULT_COLOR);
+      ctx.strokeStyle = getStrokeColor(counter.display.color);
+      ctx.fillStyle = getFillColor(counter.display.color);
       ctx.beginPath();
 
       const getX = (i: number) =>
@@ -483,9 +480,7 @@ class TrackPowerGraphImpl extends React.PureComponent<Props, State> {
         style={{
           left,
           top,
-          backgroundColor: getDotColor(
-            counter.color || TRACK_POWER_DEFAULT_COLOR
-          ),
+          backgroundColor: getDotColor(counter.display.color),
         }}
         className="timelineTrackPowerGraphDot"
       />
diff --git a/src/profile-logic/process-profile.ts b/src/profile-logic/process-profile.ts
index fbf4c99cb5..d95355d18d 100644
--- a/src/profile-logic/process-profile.ts
+++ b/src/profile-logic/process-profile.ts
@@ -97,6 +97,7 @@ import type {
   GeckoSourceTable,
   IndexIntoCategoryList,
   IndexIntoFrameTable,
+  CounterDisplayConfig,
 } from 'firefox-profiler/types';
 import { decompress, isGzip } from 'firefox-profiler/utils/gz';
 
@@ -972,6 +973,61 @@ function _processSamples(
   return samples;
 }
 
+/**
+ * Derive a CounterDisplayConfig from a counter's category and name.
+ */
+function _deriveCounterDisplay(
+  category: string,
+  name: string
+): CounterDisplayConfig {
+  if (category === 'Memory') {
+    return {
+      graphType: 'line-accumulated',
+      unit: 'bytes',
+      color: 'orange',
+      markerSchemaLocation: 'timeline-memory',
+      sortWeight: 20,
+      label: 'Memory',
+    };
+  } else if (category === 'power') {
+    return {
+      graphType: 'line-rate',
+      unit: 'pWh',
+      color: 'grey',
+      markerSchemaLocation: null,
+      sortWeight: 30,
+      label: name,
+    };
+  } else if (category === 'Bandwidth') {
+    return {
+      graphType: 'line-rate',
+      unit: 'bytes',
+      color: 'blue',
+      markerSchemaLocation: null,
+      sortWeight: 10,
+      label: 'Bandwidth',
+    };
+  } else if (category === 'CPU' && name === 'processCPU') {
+    return {
+      graphType: 'line-rate',
+      unit: 'percent',
+      color: 'grey',
+      markerSchemaLocation: null,
+      sortWeight: 40,
+      label: 'Process CPU',
+    };
+  }
+
+  return {
+    graphType: 'line-rate',
+    unit: '',
+    color: 'grey',
+    markerSchemaLocation: null,
+    sortWeight: 50,
+    label: name,
+  };
+}
+
 /**
  * Converts the Gecko list of counters into the processed format.
  */
@@ -1031,6 +1087,7 @@ function _processCounters(
         pid: mainThreadPid,
         mainThreadIndex,
         samples: adjustTableTimeDeltas(processedCounterSamples, delta),
+        display: _deriveCounterDisplay(category, name),
       });
       return result;
     },
diff --git a/src/profile-logic/processed-profile-versioning.ts b/src/profile-logic/processed-profile-versioning.ts
index 691380cf78..c8d94509d9 100644
--- a/src/profile-logic/processed-profile-versioning.ts
+++ b/src/profile-logic/processed-profile-versioning.ts
@@ -3049,6 +3049,67 @@ const _upgraders: {
     }
   },
 
+  [62]: (profile: any) => {
+    // Added CounterDisplayConfig to counters. This metadata controls how a
+    // counter is rendered (graph type, color, unit, etc.).
+    // Derive defaults from the counter's category and name.
+    if (profile.counters) {
+      for (const counter of profile.counters) {
+        if (counter.display !== undefined) {
+          continue;
+        }
+        const { category, name } = counter;
+        if (category === 'Memory') {
+          counter.display = {
+            graphType: 'line-accumulated',
+            unit: 'bytes',
+            color: counter.color ?? 'orange',
+            markerSchemaLocation: 'timeline-memory',
+            sortWeight: 20,
+            label: 'Memory',
+          };
+        } else if (category === 'power') {
+          counter.display = {
+            graphType: 'line-rate',
+            unit: 'pWh',
+            color: counter.color ?? 'grey',
+            markerSchemaLocation: null,
+            sortWeight: 30,
+            label: name,
+          };
+        } else if (category === 'Bandwidth') {
+          counter.display = {
+            graphType: 'line-rate',
+            unit: 'bytes',
+            color: counter.color ?? 'blue',
+            markerSchemaLocation: null,
+            sortWeight: 10,
+            label: 'Bandwidth',
+          };
+        } else if (category === 'CPU' && name === 'processCPU') {
+          counter.display = {
+            graphType: 'line-rate',
+            unit: 'percent',
+            color: counter.color ?? 'grey',
+            markerSchemaLocation: null,
+            sortWeight: 40,
+            label: 'Process CPU',
+          };
+        } else {
+          counter.display = {
+            graphType: 'line-rate',
+            unit: '',
+            color: counter.color ?? 'grey',
+            markerSchemaLocation: null,
+            sortWeight: 50,
+            label: name,
+          };
+        }
+        delete counter.color;
+      }
+    }
+  },
+
   // If you add a new upgrader here, please document the change in
   // `docs-developer/CHANGELOG-formats.md`.
 };
diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index 645d8a9cc8..2e6093270b 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -2304,10 +2304,9 @@ export function processCounter(rawCounter: RawCounter): Counter {
     name: rawCounter.name,
     category: rawCounter.category,
     description: rawCounter.description,
-    color: rawCounter.color,
     pid: rawCounter.pid,
     mainThreadIndex: rawCounter.mainThreadIndex,
-
+    display: rawCounter.display,
     samples,
   };
 
diff --git a/src/test/components/TrackBandwidth.test.tsx b/src/test/components/TrackBandwidth.test.tsx
index b8109c8693..609fb05856 100644
--- a/src/test/components/TrackBandwidth.test.tsx
+++ b/src/test/components/TrackBandwidth.test.tsx
@@ -66,23 +66,26 @@ describe('TrackBandwidth', function () {
     for (let i = 7; i < thread.samples.length - 1; ++i) {
       sampleTimes[i] = 7 + i / 100;
     }
-    profile.counters = [
-      getCounterForThreadWithSamples(
-        thread,
-        threadIndex,
-        {
-          time: sampleTimes.slice(),
-          // Bandwidth usage numbers. They are bytes.
-          count: [
-            10000, 40000, 50000, 100000, 2000000, 5000000, 30000, 1000000,
-            20000, 1, 12000, 100000,
-          ],
-          length: SAMPLE_COUNT,
-        },
-        'SystemBandwidth',
-        'bandwidth'
-      ),
-    ];
+    const counter = getCounterForThreadWithSamples(
+      thread,
+      threadIndex,
+      {
+        time: sampleTimes.slice(),
+        // Bandwidth usage numbers. They are bytes.
+        count: [
+          10000, 40000, 50000, 100000, 2000000, 5000000, 30000, 1000000, 20000,
+          1, 12000, 100000,
+        ],
+        length: SAMPLE_COUNT,
+      },
+      'SystemBandwidth',
+      'bandwidth'
+    );
+    counter.display = {
+      ...counter.display,
+      color: 'blue',
+    };
+    profile.counters = [counter];
     const store = storeWithProfile(profile);
     const { getState, dispatch } = store;
     const flushRafCalls = mockRaf();
diff --git a/src/test/components/TrackMemory.test.tsx b/src/test/components/TrackMemory.test.tsx
index ab31d78e21..add3f14fea 100644
--- a/src/test/components/TrackMemory.test.tsx
+++ b/src/test/components/TrackMemory.test.tsx
@@ -63,9 +63,12 @@ describe('TrackMemory', function () {
     );
     const threadIndex = 0;
     const thread = profile.threads[threadIndex];
-    profile.counters = [
-      getCounterForThread(thread, threadIndex, counterConfig),
-    ];
+    const counter = getCounterForThread(thread, threadIndex, counterConfig);
+    counter.display = {
+      ...counter.display,
+      color: 'orange',
+    };
+    profile.counters = [counter];
     const store = storeWithProfile(profile);
     const { getState, dispatch } = store;
     const flushRafCalls = mockRaf();
diff --git a/src/test/fixtures/profiles/processed-profile.ts b/src/test/fixtures/profiles/processed-profile.ts
index 5961d2c0bf..428b559836 100644
--- a/src/test/fixtures/profiles/processed-profile.ts
+++ b/src/test/fixtures/profiles/processed-profile.ts
@@ -33,6 +33,7 @@ import type {
   CategoryList,
   JsTracerTable,
   RawCounter,
+  CounterDisplayConfig,
   TabID,
   MarkerPayload,
   NetworkPayload,
@@ -1479,6 +1480,18 @@ export function getProfileWithJsTracerEvents(
   return profile;
 }
 
+/**
+ * Default display configuration for test counters.
+ */
+const DEFAULT_TEST_COUNTER_DISPLAY: CounterDisplayConfig = {
+  graphType: 'line-rate',
+  unit: '',
+  color: 'grey',
+  markerSchemaLocation: null,
+  sortWeight: 50,
+  label: 'My Counter',
+};
+
 /**
  * Creates a Counter fixture for a given thread.
  */
@@ -1504,6 +1517,7 @@ export function getCounterForThread(
       count: sampleTimes.map((_, i) => Math.sin(i)),
       length: thread.samples.length,
     },
+    display: DEFAULT_TEST_COUNTER_DISPLAY,
   };
   return counter;
 }
@@ -1541,6 +1555,7 @@ export function getCounterForThreadWithSamples(
     pid: thread.pid,
     mainThreadIndex,
     samples: newSamples,
+    display: DEFAULT_TEST_COUNTER_DISPLAY,
   };
   return counter;
 }
diff --git a/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap b/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap
index 19dd70789f..3af235db1a 100644
--- a/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap
+++ b/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap
@@ -87,7 +87,7 @@ Object {
     "markerSchema": Array [],
     "oscpu": "macOS 14.6.1",
     "pausedRanges": Array [],
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "a.out",
     "sampleUnits": Object {
@@ -1415,7 +1415,7 @@ Object {
     "markerSchema": Array [],
     "oscpu": "macOS 14.6.1",
     "pausedRanges": Array [],
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "a.out",
     "sampleUnits": Object {
diff --git a/src/test/store/__snapshots__/profile-view.test.ts.snap b/src/test/store/__snapshots__/profile-view.test.ts.snap
index f04baf9582..9f9343610e 100644
--- a/src/test/store/__snapshots__/profile-view.test.ts.snap
+++ b/src/test/store/__snapshots__/profile-view.test.ts.snap
@@ -418,7 +418,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "sourceURL": "",
diff --git a/src/test/unit/__snapshots__/profile-conversion.test.ts.snap b/src/test/unit/__snapshots__/profile-conversion.test.ts.snap
index 6a5e04368e..b804fe58c0 100644
--- a/src/test/unit/__snapshots__/profile-conversion.test.ts.snap
+++ b/src/test/unit/__snapshots__/profile-conversion.test.ts.snap
@@ -591,7 +591,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "ART Trace (Android)",
     "sampleUnits": undefined,
@@ -79192,7 +79192,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "ART Trace (Android)",
     "sampleUnits": undefined,
@@ -315562,7 +315562,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "profilingEndTime": 119159778.026,
@@ -350479,7 +350479,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "profilingEndTime": 119159778.026,
@@ -385375,7 +385375,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "profilingEndTime": 66155012.423,
@@ -387980,7 +387980,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "sourceURL": "",
@@ -389809,7 +389809,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "profilingEndTime": 355035987.653,
@@ -393482,7 +393482,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "sourceURL": "",
@@ -398697,7 +398697,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Chrome Trace",
     "profilingEndTime": 66155012.423,
@@ -399739,7 +399739,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "sampleUnits": undefined,
@@ -403614,7 +403614,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "sampleUnits": undefined,
@@ -418512,7 +418512,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "sampleUnits": undefined,
@@ -424719,7 +424719,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "sampleUnits": undefined,
@@ -441164,7 +441164,7 @@ Object {
     "keepProfileThreadOrder": true,
     "markerSchema": Array [],
     "platform": "Android",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "com.example.sampleapplication",
     "sourceCodeIsNotOnSearchfox": true,
@@ -498819,7 +498819,7 @@ Object {
     "keepProfileThreadOrder": true,
     "markerSchema": Array [],
     "platform": "Android",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "com.example.sampleapplication",
     "sourceCodeIsNotOnSearchfox": true,
@@ -561079,7 +561079,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "target/debug/examples/work_log (dhat)",
     "sourceURL": "",
@@ -563127,7 +563127,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Flamegraph",
     "sourceURL": "",
@@ -871013,7 +871013,7 @@ Object {
     "oscpu": "",
     "physicalCPUs": 0,
     "platform": "",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Flamegraph",
     "sourceURL": "",
diff --git a/src/test/unit/__snapshots__/profile-upgrading.test.ts.snap b/src/test/unit/__snapshots__/profile-upgrading.test.ts.snap
index e139904c6d..e85d4f0300 100644
--- a/src/test/unit/__snapshots__/profile-upgrading.test.ts.snap
+++ b/src/test/unit/__snapshots__/profile-upgrading.test.ts.snap
@@ -40,7 +40,7 @@ Object {
     "oscpu": undefined,
     "physicalCPUs": undefined,
     "platform": undefined,
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "sampleUnits": undefined,
@@ -7358,7 +7358,7 @@ Object {
     "misc": "rv:48.0",
     "oscpu": "Intel Mac OS X 10.11",
     "platform": "Macintosh",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "stackwalk": 1,
@@ -8693,7 +8693,7 @@ Object {
     "misc": "rv:48.0",
     "oscpu": "Intel Mac OS X 10.11",
     "platform": "Macintosh",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "stackwalk": 1,
@@ -9693,6 +9693,14 @@ Object {
     Object {
       "category": "Memory",
       "description": "Amount of allocated memory",
+      "display": Object {
+        "color": "orange",
+        "graphType": "line-accumulated",
+        "label": "Memory",
+        "markerSchemaLocation": "timeline-memory",
+        "sortWeight": 20,
+        "unit": "bytes",
+      },
       "mainThreadIndex": 0,
       "name": "malloc",
       "pid": "11111",
@@ -10155,7 +10163,7 @@ Object {
     "misc": "rv:48.0",
     "oscpu": "Intel Mac OS X 10.11",
     "platform": "Macintosh",
-    "preprocessedProfileVersion": 61,
+    "preprocessedProfileVersion": 62,
     "processType": 0,
     "product": "Firefox",
     "stackwalk": 1,
diff --git a/src/types/profile-derived.ts b/src/types/profile-derived.ts
index f52454fd9e..b634b0e876 100644
--- a/src/types/profile-derived.ts
+++ b/src/types/profile-derived.ts
@@ -13,7 +13,6 @@ import type {
   IndexIntoResourceTable,
   IndexIntoLibs,
   CounterIndex,
-  GraphColor,
   IndexIntoRawMarkerTable,
   IndexIntoStringTable,
   TabID,
@@ -33,6 +32,7 @@ import type {
   IndexIntoFrameTable,
   SourceTable,
   IndexIntoSourceTable,
+  CounterDisplayConfig,
 } from './profile';
 import type { IndexedArray } from './utils';
 import type { BitSet } from '../utils/bitset';
@@ -187,10 +187,10 @@ export type Counter = {
   name: string;
   category: string;
   description: string;
-  color?: GraphColor;
   pid: Pid;
   mainThreadIndex: ThreadIndex;
   samples: CounterSamplesTable;
+  display: CounterDisplayConfig;
 };
 
 /**
diff --git a/src/types/profile.ts b/src/types/profile.ts
index 90486b7ecd..a4072ca72e 100644
--- a/src/types/profile.ts
+++ b/src/types/profile.ts
@@ -529,14 +529,35 @@ export type GraphColor =
   | 'teal'
   | 'yellow';
 
+export type CounterGraphType = 'line-accumulated' | 'line-rate';
+
+/**
+ * Specifies how a counter should be displayed in the UI.
+ */
+export type CounterDisplayConfig = {
+  graphType: CounterGraphType;
+  unit: string;
+  color: GraphColor;
+  // The marker schema display location to filter markers for this track,
+  // e.g., "timeline-memory". If null, no markers are shown.
+  markerSchemaLocation: string | null;
+  // Controls the default display position of this counter track relative to
+  // other tracks. Tracks with lower values appear closer to the top.
+  sortWeight: number;
+  // The human-readable label shown in the track sidebar. For known counter
+  // types this is a friendly name (eg, "Memory"); for generic counters
+  // it falls back to counter.name.
+  label: string;
+};
+
 export type RawCounter = {
   name: string;
   category: string;
   description: string;
-  color?: GraphColor;
   pid: Pid;
   mainThreadIndex: ThreadIndex;
   samples: RawCounterSamplesTable;
+  display: CounterDisplayConfig;
 };
 
 /**

From d5eb4f2fdc6bb2c0d2fb5ee8ed9799a6ff04f747 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 15 Apr 2026 14:34:19 +0200
Subject: [PATCH 31/64] Update all Yarn dependencies (2026-04-15) (#5950)

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: fatadel <afatkhutdinov@mozilla.com>
---
 package.json |   8 +--
 yarn.lock    | 150 +++++++++++++++++++++++++--------------------------
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/package.json b/package.json
index 08a9fb32c3..e091457a9c 100644
--- a/package.json
+++ b/package.json
@@ -132,8 +132,8 @@
     "@types/react-splitter-layout": "^4.0.0",
     "@types/redux-logger": "^3.0.6",
     "@types/tgwf__co2": "^0.14.2",
-    "@typescript-eslint/eslint-plugin": "^8.58.1",
-    "@typescript-eslint/parser": "^8.58.1",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
     "alex": "^11.0.1",
     "babel-jest": "^30.3.0",
     "babel-plugin-module-resolver": "^5.0.3",
@@ -168,7 +168,7 @@
     "npm-run-all2": "^8.0.4",
     "open": "^11.0.0",
     "patch-package": "^8.0.1",
-    "postcss": "^8.5.8",
+    "postcss": "^8.5.9",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^3.8.1",
     "rimraf": "^6.1.3",
@@ -176,7 +176,7 @@
     "stylelint-config-idiomatic-order": "^10.0.0",
     "stylelint-config-standard": "^40.0.0",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.1",
+    "typescript-eslint": "^8.58.2",
     "workbox-cli": "^7.4.0",
     "yargs": "^18.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index c1354c1ef9..3ef98d3b9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2482,100 +2482,100 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.58.1", "@typescript-eslint/eslint-plugin@^8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.1.tgz#cb53038b83d165ca0ef96d67d875efbd56c50fa8"
-  integrity sha512-eSkwoemjo76bdXl2MYqtxg51HNwUSkWfODUOQ3PaTLZGh9uIWWFZIjyjaJnex7wXDu+TRx+ATsnSxdN9YWfRTQ==
+"@typescript-eslint/eslint-plugin@8.58.2", "@typescript-eslint/eslint-plugin@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.2.tgz#a6882a6a328e1259cff259fdb03184245ef06191"
+  integrity sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.58.1"
-    "@typescript-eslint/type-utils" "8.58.1"
-    "@typescript-eslint/utils" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/type-utils" "8.58.2"
+    "@typescript-eslint/utils" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.58.1", "@typescript-eslint/parser@^8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.1.tgz#0943eca522ac408bcdd649882c3d95b10ff00f62"
-  integrity sha512-gGkiNMPqerb2cJSVcruigx9eHBlLG14fSdPdqMoOcBfh+vvn4iCq2C8MzUB89PrxOXk0y3GZ1yIWb9aOzL93bw==
+"@typescript-eslint/parser@8.58.2", "@typescript-eslint/parser@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.2.tgz#b267545e4bd515d896fe1f3a5b6f334fa6aa0026"
+  integrity sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.58.1"
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.1.tgz#c78781b1ca1ec1e7bc6522efba89318c6d249feb"
-  integrity sha512-gfQ8fk6cxhtptek+/8ZIqw8YrRW5048Gug8Ts5IYcMLCw18iUgrZAEY/D7s4hkI0FxEfGakKuPK/XUMPzPxi5g==
+"@typescript-eslint/project-service@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.2.tgz#8c980249100e21b87baba0ca10880fdf893e0a8e"
+  integrity sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.58.1"
-    "@typescript-eslint/types" "^8.58.1"
+    "@typescript-eslint/tsconfig-utils" "^8.58.2"
+    "@typescript-eslint/types" "^8.58.2"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.58.1", "@typescript-eslint/scope-manager@^8.56.0":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.1.tgz#35168f561bab4e3fd10dd6b03e8b83c157479211"
-  integrity sha512-TPYUEqJK6avLcEjumWsIuTpuYODTTDAtoMdt8ZZa93uWMTX13Nb8L5leSje1NluammvU+oI3QRr5lLXPgihX3w==
+"@typescript-eslint/scope-manager@8.58.2", "@typescript-eslint/scope-manager@^8.56.0":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz#aa73784d78f117940e83f71705af07ba695cd60c"
+  integrity sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==
   dependencies:
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
 
-"@typescript-eslint/tsconfig-utils@8.58.1", "@typescript-eslint/tsconfig-utils@^8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.1.tgz#eb16792c579300c7bfb3c74b0f5e1dfbb0a2454d"
-  integrity sha512-JAr2hOIct2Q+qk3G+8YFfqkqi7sC86uNryT+2i5HzMa2MPjw4qNFvtjnw1IiA1rP7QhNKVe21mSSLaSjwA1Olw==
+"@typescript-eslint/tsconfig-utils@8.58.2", "@typescript-eslint/tsconfig-utils@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.2.tgz#fa13f96432c9348bf87f6f44826def585fad7bca"
+  integrity sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==
 
-"@typescript-eslint/type-utils@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.1.tgz#b21085a233087bde94c92ba6f5b4dfb77ca56730"
-  integrity sha512-HUFxvTJVroT+0rXVJC7eD5zol6ID+Sn5npVPWoFuHGg9Ncq5Q4EYstqR+UOqaNRFXi5TYkpXXkLhoCHe3G0+7w==
+"@typescript-eslint/type-utils@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.2.tgz#024eb1dd597f8a34cb22d8d9ab32da857bc9a817"
+  integrity sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==
   dependencies:
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
-    "@typescript-eslint/utils" "8.58.1"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/utils" "8.58.2"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.58.1", "@typescript-eslint/types@^8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.1.tgz#9dfb4723fcd2b13737d8b03d941354cf73190313"
-  integrity sha512-io/dV5Aw5ezwzfPBBWLoT+5QfVtP8O7q4Kftjn5azJ88bYyp/ZMCsyW1lpKK46EXJcaYMZ1JtYj+s/7TdzmQMw==
+"@typescript-eslint/types@8.58.2", "@typescript-eslint/types@^8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.2.tgz#3ab8051de0f19a46ddefb0749d0f7d82974bd57c"
+  integrity sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==
 
-"@typescript-eslint/typescript-estree@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.1.tgz#8230cc9628d2cffef101e298c62807c4b9bf2fe9"
-  integrity sha512-w4w7WR7GHOjqqPnvAYbazq+Y5oS68b9CzasGtnd6jIeOIeKUzYzupGTB2T4LTPSv4d+WPeccbxuneTFHYgAAWg==
+"@typescript-eslint/typescript-estree@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.2.tgz#b1beb1f959385b341cc76f0aebbf028e23dfdb8b"
+  integrity sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==
   dependencies:
-    "@typescript-eslint/project-service" "8.58.1"
-    "@typescript-eslint/tsconfig-utils" "8.58.1"
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/visitor-keys" "8.58.1"
+    "@typescript-eslint/project-service" "8.58.2"
+    "@typescript-eslint/tsconfig-utils" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/visitor-keys" "8.58.2"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.58.1", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.1.tgz#099a327b04ed921e6ee3988cde9ef34bc4b5435a"
-  integrity sha512-Ln8R0tmWC7pTtLOzgJzYTXSCjJ9rDNHAqTaVONF4FEi2qwce8mD9iSOxOpLFFvWp/wBFlew0mjM1L1ihYWfBdQ==
+"@typescript-eslint/utils@8.58.2", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.2.tgz#27165554a02d1ff57d98262fa92060498dabc8b3"
+  integrity sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.58.1"
-    "@typescript-eslint/types" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
+    "@typescript-eslint/scope-manager" "8.58.2"
+    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
 
-"@typescript-eslint/visitor-keys@8.58.1":
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.1.tgz#7c197533177f1ba9b8249f55f7f685e32bb6f204"
-  integrity sha512-y+vH7QE8ycjoa0bWciFg7OpFcipUuem1ujhrdLtq1gByKwfbC7bPeKsiny9e0urg93DqwGcHey+bGRKCnF1nZQ==
+"@typescript-eslint/visitor-keys@8.58.2":
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.2.tgz#9ed699eaa9b5720b6b6b6f9c16e6c7d4cd32b276"
+  integrity sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==
   dependencies:
-    "@typescript-eslint/types" "8.58.1"
+    "@typescript-eslint/types" "8.58.2"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.3.0":
@@ -9001,10 +9001,10 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.32, postcss@^8.5.8:
-  version "8.5.8"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.8.tgz#6230ecc8fb02e7a0f6982e53990937857e13f399"
-  integrity sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==
+postcss@^8.4.32, postcss@^8.5.8, postcss@^8.5.9:
+  version "8.5.9"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.9.tgz#f6ee9e0b94f0f19c97d2f172bfbd7fc71fe1cca4"
+  integrity sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==
   dependencies:
     nanoid "^3.3.11"
     picocolors "^1.1.1"
@@ -10963,15 +10963,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.58.1:
-  version "8.58.1"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.1.tgz#e765cbfea5774dcb4b1473e5e77a46254f309b32"
-  integrity sha512-gf6/oHChByg9HJvhMO1iBexJh12AqqTfnuxscMDOVqfJW3htsdRJI/GfPpHTTcyeB8cSTUY2JcZmVgoyPqcrDg==
+typescript-eslint@^8.58.2:
+  version "8.58.2"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.2.tgz#55f425fc668c2d5148f45587f2cd04532d715c6a"
+  integrity sha512-V8iSng9mRbdZjl54VJ9NKr6ZB+dW0J3TzRXRGcSbLIej9jV86ZRtlYeTKDR/QLxXykocJ5icNzbsl2+5TzIvcQ==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.58.1"
-    "@typescript-eslint/parser" "8.58.1"
-    "@typescript-eslint/typescript-estree" "8.58.1"
-    "@typescript-eslint/utils" "8.58.1"
+    "@typescript-eslint/eslint-plugin" "8.58.2"
+    "@typescript-eslint/parser" "8.58.2"
+    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/utils" "8.58.2"
 
 typescript@^6.0.2:
   version "6.0.2"

From bb3b854dde013f8298fa5c8bc4e2c5c95b01df4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 20 Apr 2026 13:35:29 +0200
Subject: [PATCH 32/64] Fix eslint-config-prettier silently overriding custom
 rules (#5955)

Move prettierConfig before our custom rules block so it only disables
formatting rules from the base configs, while our explicit rules take
precedence. This was causing `curly: 'error'` (and potentially other
custom rules) to be silently disabled.
---
 eslint.config.mjs                     | 10 ++++++----
 scripts/lib/dev-server.mjs            |  4 +++-
 scripts/lib/esbuild-plugins.mjs       |  4 +++-
 src/components/stack-chart/Canvas.tsx |  4 +++-
 src/test/store/symbolication.test.ts  |  4 +++-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 6706b48b92..8c4f1150dd 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -34,6 +34,11 @@ export default defineConfig(
   // React config
   reactPlugin.configs.flat.recommended,
 
+  // Prettier config must be placed here to disable formatting rules from the
+  // base configs above, while allowing our custom rules below to take
+  // precedence.
+  prettierConfig,
+
   // Custom configuration for all files
   {
     files: ['**/*.js', '**/*.mjs', '**/*.cjs', '**/*.ts', '**/*.tsx'],
@@ -311,8 +316,5 @@ export default defineConfig(
         ...globals.jest,
       },
     },
-  },
-
-  // Prettier config (must be last to override other formatting rules)
-  prettierConfig
+  }
 );
diff --git a/scripts/lib/dev-server.mjs b/scripts/lib/dev-server.mjs
index d813bdfc6a..39f86bc4b3 100644
--- a/scripts/lib/dev-server.mjs
+++ b/scripts/lib/dev-server.mjs
@@ -128,7 +128,9 @@ export async function startDevServer(buildConfig, options = {}) {
   // Graceful shutdown
   let isShuttingDown = false;
   process.on('SIGINT', async () => {
-    if (isShuttingDown) return;
+    if (isShuttingDown) {
+      return;
+    }
     isShuttingDown = true;
 
     console.log('\nShutting down...');
diff --git a/scripts/lib/esbuild-plugins.mjs b/scripts/lib/esbuild-plugins.mjs
index 40d62d0741..c3cd6eac3b 100644
--- a/scripts/lib/esbuild-plugins.mjs
+++ b/scripts/lib/esbuild-plugins.mjs
@@ -24,7 +24,9 @@ export function circularDependencyPlugin() {
     setup(build) {
       build.initialOptions.metafile = true;
       build.onEnd((result) => {
-        if (!result.metafile?.inputs) return;
+        if (!result.metafile?.inputs) {
+          return;
+        }
 
         const { inputs } = result.metafile;
         const recursionStack = new Set();
diff --git a/src/components/stack-chart/Canvas.tsx b/src/components/stack-chart/Canvas.tsx
index a30950153b..71bd684ab2 100644
--- a/src/components/stack-chart/Canvas.tsx
+++ b/src/components/stack-chart/Canvas.tsx
@@ -665,7 +665,9 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
   };
 
   _onDoubleClickStack = (hoveredItem: HoveredStackTiming | null) => {
-    if (!hoveredItem) return;
+    if (!hoveredItem) {
+      return;
+    }
 
     const result =
       this._getCallNodeIndexOrMarkerIndexFromHoveredItem(hoveredItem);
diff --git a/src/test/store/symbolication.test.ts b/src/test/store/symbolication.test.ts
index 40c47f71ed..17226e2450 100644
--- a/src/test/store/symbolication.test.ts
+++ b/src/test/store/symbolication.test.ts
@@ -259,7 +259,9 @@ describe('doSymbolicateProfile', function () {
       // Helper function to get filename from source index
       const getFileName = (funcIndex: number): string | null => {
         const sourceIndex = funcTable.source[funcIndex];
-        if (sourceIndex === null) return null;
+        if (sourceIndex === null) {
+          return null;
+        }
         const urlIndex = sources.filename[sourceIndex];
         return stringTable.getString(urlIndex);
       };

From 484cfd2f9b56ebb6d2941631034363a1d4e68ee0 Mon Sep 17 00:00:00 2001
From: fatadel <afatkhutdinov@mozilla.com>
Date: Mon, 20 Apr 2026 17:14:25 +0200
Subject: [PATCH 33/64] Dim non-matching nodes in the stack chart when
 searching (#5935)

When the search box is active, the stack chart now dims funcs that don't
match the search, making hits visually scannable without losing the
surrounding context. Matching is OR-combined across comma-separated
search strings (a func is highlighted if any term matches its name,
filename, or library), while the existing stack-drop behavior keeps its
AND semantics.

The match computation lives in a memoized selector
(computeSearchStringFilterOutput) that returns both the stack-drop
TransformOutput and a combined func-match BitSet, shared between
getFilteredThread and getSearchFilteredFuncMatchesBitSet. The canvas
draw loop does a single checkBit lookup per node instead of rebuilding
a Set and re-running string matching on every frame.
---
 src/components/stack-chart/Canvas.tsx   |  33 +++++--
 src/components/stack-chart/index.tsx    |   6 ++
 src/profile-logic/profile-data.ts       | 111 ++++++++++++++++--------
 src/selectors/per-thread/thread.tsx     |  43 ++++++---
 src/test/components/StackChart.test.tsx |  51 +++++++++++
 src/test/store/profile-view.test.ts     |  86 ++++++++++++++++++
 src/utils/bitset.ts                     |   9 ++
 src/utils/colors.ts                     |  19 ++++
 8 files changed, 302 insertions(+), 56 deletions(-)

diff --git a/src/components/stack-chart/Canvas.tsx b/src/components/stack-chart/Canvas.tsx
index 71bd684ab2..5468e8e3a0 100644
--- a/src/components/stack-chart/Canvas.tsx
+++ b/src/components/stack-chart/Canvas.tsx
@@ -15,6 +15,7 @@ import type { changeMouseTimePosition } from '../../actions/profile-view';
 type ChangeMouseTimePosition = typeof changeMouseTimePosition;
 import {
   mapCategoryColorNameToStackChartStyles,
+  getDimmedStyles,
   getForegroundColor,
   getBackgroundColor,
 } from '../../utils/colors';
@@ -40,6 +41,8 @@ import type {
   Page,
   TimelineUnit,
 } from 'firefox-profiler/types';
+import type { BitSet } from 'firefox-profiler/utils/bitset';
+import { checkBit } from 'firefox-profiler/utils/bitset';
 import type { CallNodeInfo } from 'firefox-profiler/profile-logic/call-node-info';
 
 import type {
@@ -78,6 +81,7 @@ type OwnProps = {
   readonly displayStackType: boolean;
   readonly useStackChartSameWidths: boolean;
   readonly timelineUnit: TimelineUnit;
+  readonly searchFilteredFuncMatchesBitSet: BitSet | null;
 };
 
 type Props = Readonly<
@@ -183,6 +187,7 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
       getMarker,
       marginLeft,
       useStackChartSameWidths,
+      searchFilteredFuncMatchesBitSet,
       viewport: {
         containerWidth,
         containerHeight,
@@ -480,9 +485,11 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
 
         // Look up information about this stack frame.
         let text, category, isSelected;
+        let currentFuncIndex: number | null = null;
         if ('callNode' in stackTiming && stackTiming.callNode) {
           const callNodeIndex = stackTiming.callNode[i];
           const funcIndex = callNodeTable.func[callNodeIndex];
+          currentFuncIndex = funcIndex;
           const funcNameIndex = thread.funcTable.name[funcIndex];
           text = thread.stringTable.getString(funcNameIndex);
           const categoryIndex = callNodeTable.category[callNodeIndex];
@@ -507,9 +514,19 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
           depth === hoveredItem.depth &&
           i === hoveredItem.stackTimingIndex;
 
-        const colorStyles = mapCategoryColorNameToStackChartStyles(
-          category.color
-        );
+        // When a search is active, use the dimmed style for non-matching nodes
+        // so that matching nodes stand out with their category color.
+        // Hovered or selected nodes always use their real category color.
+        const isDimmed =
+          searchFilteredFuncMatchesBitSet !== null &&
+          currentFuncIndex !== null &&
+          !checkBit(searchFilteredFuncMatchesBitSet, currentFuncIndex) &&
+          !isHovered &&
+          !isSelected;
+        const colorStyles = isDimmed
+          ? getDimmedStyles()
+          : mapCategoryColorNameToStackChartStyles(category.color);
+
         // Draw the box.
         fastFillStyle.set(
           isHovered || isSelected
@@ -542,11 +559,11 @@ class StackChartCanvasImpl extends React.PureComponent<Props> {
         if (textW > textMeasurement.minWidth) {
           const fittedText = textMeasurement.getFittedText(text, textW);
           if (fittedText) {
-            fastFillStyle.set(
-              isHovered || isSelected
-                ? colorStyles.getSelectedTextColor()
-                : getForegroundColor()
-            );
+            if (isHovered || isSelected || isDimmed) {
+              fastFillStyle.set(colorStyles.getSelectedTextColor());
+            } else {
+              fastFillStyle.set(getForegroundColor());
+            }
             ctx.fillText(fittedText, textX, intY + textDevicePixelsOffsetTop);
           }
         }
diff --git a/src/components/stack-chart/index.tsx b/src/components/stack-chart/index.tsx
index ba98f87a9b..ea20211a15 100644
--- a/src/components/stack-chart/index.tsx
+++ b/src/components/stack-chart/index.tsx
@@ -58,6 +58,7 @@ import type {
   Page,
   TimelineUnit,
 } from 'firefox-profiler/types';
+import type { BitSet } from 'firefox-profiler/utils/bitset';
 import type { CallNodeInfo } from 'firefox-profiler/profile-logic/call-node-info';
 
 import type { ConnectedProps } from '../../utils/connect';
@@ -87,6 +88,7 @@ type StateProps = {
   readonly hasFilteredCtssSamples: boolean;
   readonly useStackChartSameWidths: boolean;
   readonly timelineUnit: TimelineUnit;
+  readonly searchFilteredFuncMatchesBitSet: BitSet | null;
 };
 
 type DispatchProps = {
@@ -244,6 +246,7 @@ class StackChartImpl extends React.PureComponent<Props> {
       hasFilteredCtssSamples,
       useStackChartSameWidths,
       timelineUnit,
+      searchFilteredFuncMatchesBitSet,
     } = this.props;
 
     const maxViewportHeight = combinedTimingRows.length * STACK_FRAME_HEIGHT;
@@ -304,6 +307,7 @@ class StackChartImpl extends React.PureComponent<Props> {
                   displayStackType: displayStackType,
                   useStackChartSameWidths,
                   timelineUnit,
+                  searchFilteredFuncMatchesBitSet,
                 }}
               />
             </div>
@@ -347,6 +351,8 @@ export const StackChart = explicitConnect<{}, StateProps, DispatchProps>({
         selectedThreadSelectors.getHasFilteredCtssSamples(state),
       useStackChartSameWidths: getStackChartSameWidths(state),
       timelineUnit: getProfileTimelineUnit(state),
+      searchFilteredFuncMatchesBitSet:
+        selectedThreadSelectors.getSearchFilteredFuncMatchesBitSet(state),
     };
   },
   mapDispatchToProps: {
diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index 2e6093270b..15d2721118 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -28,6 +28,7 @@ import {
   type BitSet,
   checkBit,
   combineTwoBitSetsWithAnd,
+  combineTwoBitSetsWithOr,
   makeBitSet,
   setBit,
 } from 'firefox-profiler/utils/bitset';
@@ -1720,7 +1721,22 @@ export function applyTransformOutputToThread(
   });
 }
 
-export function computeTransformOutputForSearchStringFilter(
+/**
+ * Output of the search string filter: both the filter's TransformOutput (used
+ * to drop non-matching stacks) and the combined func bitset (used to highlight
+ * matching nodes in the stack chart). Exposed together so both are computed
+ * once and memoized together.
+ *
+ * Stacks are AND-combined across search strings (a stack is kept only if it
+ * contains a match for every search string), while funcs are OR-combined (a
+ * func is highlighted if it matches any of the search strings).
+ */
+export type SearchStringFilterOutput = {
+  transformOutput: TransformOutput;
+  funcMatchesSearchStrings: BitSet | null;
+};
+
+export function computeSearchStringFilterOutput(
   stackTable: StackTable,
   frameTable: FrameTable,
   funcTable: FuncTable,
@@ -1728,51 +1744,67 @@ export function computeTransformOutputForSearchStringFilter(
   sources: SourceTable,
   stringTable: StringTable,
   searchStrings: string[] | null
-): TransformOutput {
-  return timeCode('computeTransformOutputForSearchStringFilter', () => {
-    if (!searchStrings) {
-      return { newStackTable: stackTable, effectOnThreadData: {} };
+): SearchStringFilterOutput {
+  return timeCode('computeSearchStringFilterOutput', () => {
+    if (!searchStrings || searchStrings.length === 0) {
+      return {
+        transformOutput: { newStackTable: stackTable, effectOnThreadData: {} },
+        funcMatchesSearchStrings: null,
+      };
     }
 
-    const stackMatchesAllSearchStrings = searchStrings
-      .filter((s) => s)
-      .reduce(
-        (
-          stackMatchesPreviousSearchStrings: BitSet | undefined,
-          searchString: string
-        ) => {
-          const stackMatchesThisString = _computeStackMatchesSearchString(
-            stackTable,
-            frameTable,
-            funcTable,
-            resourceTable,
-            sources,
-            stringTable,
-            searchString
-          );
-          if (stackMatchesPreviousSearchStrings !== undefined) {
-            return combineTwoBitSetsWithAnd(
-              stackMatchesThisString,
-              stackMatchesPreviousSearchStrings
-            );
-          }
-          return stackMatchesThisString;
-        },
-        undefined
+    const computeMatchesForString = (searchString: string) => {
+      const funcMatches = computeFuncMatchesSearchString(
+        funcTable,
+        resourceTable,
+        sources,
+        stringTable,
+        searchString
+      );
+      const stackMatches = _computeStackMatchesFromFuncMatches(
+        stackTable,
+        frameTable,
+        funcMatches
       );
+      return { funcMatches, stackMatches };
+    };
+
+    let {
+      funcMatches: combinedFuncMatches,
+      stackMatches: combinedStackMatches,
+    } = computeMatchesForString(searchStrings[0]);
+    for (let i = 1; i < searchStrings.length; i++) {
+      const { funcMatches, stackMatches } = computeMatchesForString(
+        searchStrings[i]
+      );
+      combinedFuncMatches = combineTwoBitSetsWithOr(
+        funcMatches,
+        combinedFuncMatches
+      );
+      combinedStackMatches = combineTwoBitSetsWithAnd(
+        stackMatches,
+        combinedStackMatches
+      );
+    }
 
     return {
-      newStackTable: stackTable,
-      effectOnThreadData: {
-        dropIfOldStackIsNot: stackMatchesAllSearchStrings,
+      transformOutput: {
+        newStackTable: stackTable,
+        effectOnThreadData: {
+          dropIfOldStackIsNot: combinedStackMatches,
+        },
       },
+      funcMatchesSearchStrings: combinedFuncMatches,
     };
   });
 }
 
-function _computeStackMatchesSearchString(
-  stackTable: StackTable,
-  frameTable: FrameTable,
+/**
+ * Compute a BitSet of functions whose name, source filename, or resource name
+ * matches the given search string. This is used both for filtering stacks and
+ * for dimming non-matching nodes in the stack chart.
+ */
+export function computeFuncMatchesSearchString(
   funcTable: FuncTable,
   resourceTable: ResourceTable,
   sources: SourceTable,
@@ -1815,7 +1847,14 @@ function _computeStackMatchesSearchString(
       setBit(funcMatchesSearch, funcIndex);
     }
   }
+  return funcMatchesSearch;
+}
 
+function _computeStackMatchesFromFuncMatches(
+  stackTable: StackTable,
+  frameTable: FrameTable,
+  funcMatchesSearch: BitSet
+): BitSet {
   const stackMatchesSearch = makeBitSet(stackTable.length);
   for (let stackIndex = 0; stackIndex < stackTable.length; stackIndex++) {
     const prefix = stackTable.prefix[stackIndex];
diff --git a/src/selectors/per-thread/thread.tsx b/src/selectors/per-thread/thread.tsx
index 00158837aa..8f62a266fa 100644
--- a/src/selectors/per-thread/thread.tsx
+++ b/src/selectors/per-thread/thread.tsx
@@ -46,6 +46,7 @@ import type {
 } from 'firefox-profiler/types';
 
 import type { TransformLabeL10nIds } from 'firefox-profiler/profile-logic/transforms';
+import type { BitSet } from 'firefox-profiler/utils/bitset';
 import type { MarkerSelectorsPerThread } from './markers';
 
 import { mergeThreads } from '../../profile-logic/merge-compare';
@@ -62,8 +63,8 @@ const globallyMemoizedComputeTransformOutputForImplementationFilter = memoize(
     limit: 2,
   }
 );
-const globallyMemoizedComputeTransformOutputForSearchStringFilter = memoize(
-  ProfileData.computeTransformOutputForSearchStringFilter,
+const globallyMemoizedComputeSearchStringFilterOutput = memoize(
+  ProfileData.computeSearchStringFilterOutput,
   {
     limit: 2,
   }
@@ -488,13 +489,17 @@ export function getThreadSelectorsWithMarkersPerThread(
     }
   );
 
-  const getFilteredThread: Selector<Thread> = createSelector(
-    _getImplementationFilteredThread,
-    UrlState.getSearchStrings,
-    (thread: Thread, searchStrings) => {
-      // Apply the search string filter.
-      const transformOutput =
-        globallyMemoizedComputeTransformOutputForSearchStringFilter(
+  /**
+   * Single memoized computation of the search string filter, shared by
+   * `getFilteredThread` (which needs the stack-drop bitset) and
+   * `getSearchFilteredFuncMatchesBitSet` (which needs the func-match bitset).
+   */
+  const _getSearchStringFilterOutput: Selector<ProfileData.SearchStringFilterOutput> =
+    createSelector(
+      _getImplementationFilteredThread,
+      UrlState.getSearchStrings,
+      (thread: Thread, searchStrings) =>
+        globallyMemoizedComputeSearchStringFilterOutput(
           thread.stackTable,
           thread.frameTable,
           thread.funcTable,
@@ -502,11 +507,24 @@ export function getThreadSelectorsWithMarkersPerThread(
           thread.sources,
           thread.stringTable,
           searchStrings
-        );
-      return ProfileData.applyTransformOutputToThread(transformOutput, thread);
-    }
+        )
+    );
+
+  const getFilteredThread: Selector<Thread> = createSelector(
+    _getImplementationFilteredThread,
+    _getSearchStringFilterOutput,
+    (thread: Thread, { transformOutput }) =>
+      ProfileData.applyTransformOutputToThread(transformOutput, thread)
   );
 
+  /**
+   * Get a BitSet of func indices that match the current search strings.
+   * Returns null when there is no active search. This is used by the stack
+   * chart to dim non-matching nodes without recomputing on every draw call.
+   */
+  const getSearchFilteredFuncMatchesBitSet: Selector<BitSet | null> = (state) =>
+    _getSearchStringFilterOutput(state).funcMatchesSearchStrings;
+
   const getPreviewFilteredThread: Selector<Thread> = createSelector(
     getFilteredThread,
     ProfileSelectors.getPreviewSelection,
@@ -613,6 +631,7 @@ export function getThreadSelectorsWithMarkersPerThread(
     getTransformStack,
     getRangeAndTransformFilteredThread,
     getFilteredThread,
+    getSearchFilteredFuncMatchesBitSet,
     getPreviewFilteredThread,
     getFilteredCtssSamples,
     getPreviewFilteredCtssSamples,
diff --git a/src/test/components/StackChart.test.tsx b/src/test/components/StackChart.test.tsx
index e8a2769361..1dab68d697 100644
--- a/src/test/components/StackChart.test.tsx
+++ b/src/test/components/StackChart.test.tsx
@@ -33,6 +33,7 @@ import {
   changeImplementationFilter,
   changeCallTreeSummaryStrategy,
   updatePreviewSelection,
+  changeCallTreeSearchString,
 } from '../../actions/profile-view';
 import { changeSelectedTab } from '../../actions/app';
 import { selectedThreadSelectors } from '../../selectors/per-thread';
@@ -271,6 +272,56 @@ describe('StackChart', function () {
     expect(drawnFrames).not.toContain('Z');
   });
 
+  it('dims non-matching boxes when searching', function () {
+    const { dispatch, flushRafCalls } = setupSamples();
+    flushDrawLog();
+
+    // Dispatch a search string that matches some function names.
+    act(() => {
+      dispatch(changeCallTreeSearchString('B'));
+    });
+    flushRafCalls();
+
+    const drawCalls = flushDrawLog();
+
+    // Non-matching boxes should be drawn with the dimmed style.
+    const dimmedFillCalls = drawCalls.filter(
+      ([fn, value]) => fn === 'set fillStyle' && value === '#f9f9fa'
+    );
+    expect(dimmedFillCalls.length).toBeGreaterThan(0);
+  });
+
+  it('does not dim boxes that match the search string', function () {
+    // Use a single-node call stack so there is exactly one box.
+    const { dispatch, flushRafCalls } = setupSamples(`
+      A[cat:DOM]
+    `);
+    flushDrawLog();
+
+    // Search for "A" — the only node matches, so nothing should be dimmed.
+    act(() => {
+      dispatch(changeCallTreeSearchString('A'));
+    });
+    flushRafCalls();
+
+    const drawCalls = flushDrawLog();
+    const dimmedFillCalls = drawCalls.filter(
+      ([fn, value]) => fn === 'set fillStyle' && value === '#f9f9fa'
+    );
+    expect(dimmedFillCalls).toHaveLength(0);
+  });
+
+  it('does not dim any boxes when there is no search string', function () {
+    setupSamples();
+    const drawCalls = flushDrawLog();
+
+    // No dimmed fill should be applied without a search.
+    const dimmedFillCalls = drawCalls.filter(
+      ([fn, value]) => fn === 'set fillStyle' && value === '#f9f9fa'
+    );
+    expect(dimmedFillCalls).toHaveLength(0);
+  });
+
   describe('EmptyReasons', () => {
     it('shows reasons when a profile has no samples', () => {
       const profile = getEmptyProfile();
diff --git a/src/test/store/profile-view.test.ts b/src/test/store/profile-view.test.ts
index c78779dcf3..45f07b4ae4 100644
--- a/src/test/store/profile-view.test.ts
+++ b/src/test/store/profile-view.test.ts
@@ -48,6 +48,7 @@ import {
   type BreakdownByCategory,
 } from '../../profile-logic/profile-data';
 import { getSelfAndTotalForCallNode } from '../../profile-logic/call-tree';
+import { checkBit } from '../../utils/bitset';
 
 import type {
   TrackReference,
@@ -922,6 +923,91 @@ describe('actions/ProfileView', function () {
     });
   });
 
+  /**
+   * Covers the bitset returned by `getSearchFilteredFuncMatchesBitSet`, which
+   * the stack chart uses to dim non-matching nodes. The stack filter above
+   * only exercises whether each stack is kept; these tests pin down the
+   * per-func match semantics across name, filename, and library fields, and
+   * the OR semantics when multiple search strings are provided.
+   */
+  describe('getSearchFilteredFuncMatchesBitSet', function () {
+    // Each func's three searchable fields (name, resource/lib, filename) use
+    // distinct prefixes ("fn", "rs", "sc") and a unique per-func index, so
+    // every search string used below appears in exactly one field on exactly
+    // one func. That lets us assert unambiguously which field triggered a
+    // match.
+    function setup() {
+      const {
+        profile,
+        funcNamesPerThread: [funcNames],
+      } = getProfileFromTextSamples(`
+        fn1[lib:rs1][file:sc1]  fn2[lib:rs2][file:sc2]  fn3[lib:rs3][file:sc3]
+        fn4[lib:rs4][file:sc4]
+      `);
+      const { dispatch, getState } = storeWithProfile(profile);
+      return { dispatch, getState, funcNames };
+    }
+
+    function getMatchingFuncNames(
+      getState: () => any,
+      funcNames: string[]
+    ): string[] {
+      const bitSet =
+        selectedThreadSelectors.getSearchFilteredFuncMatchesBitSet(getState());
+      if (bitSet === null) {
+        return [];
+      }
+      const matched: string[] = [];
+      for (let i = 0; i < funcNames.length; i++) {
+        if (checkBit(bitSet, i)) {
+          matched.push(funcNames[i]);
+        }
+      }
+      return matched.sort();
+    }
+
+    it('returns null when there is no active search', function () {
+      const { getState } = setup();
+      expect(
+        selectedThreadSelectors.getSearchFilteredFuncMatchesBitSet(getState())
+      ).toBeNull();
+    });
+
+    it('matches a single func by its name', function () {
+      const { dispatch, getState, funcNames } = setup();
+      dispatch(ProfileView.changeCallTreeSearchString('fn1'));
+      expect(getMatchingFuncNames(getState, funcNames)).toEqual(['fn1']);
+    });
+
+    it('matches a func by its filename', function () {
+      const { dispatch, getState, funcNames } = setup();
+      // sc2 is only set on fn2.
+      dispatch(ProfileView.changeCallTreeSearchString('sc2'));
+      expect(getMatchingFuncNames(getState, funcNames)).toEqual(['fn2']);
+    });
+
+    it('matches a func by its resource/library name', function () {
+      const { dispatch, getState, funcNames } = setup();
+      // rs3 is only set on fn3. Match is case-insensitive.
+      dispatch(ProfileView.changeCallTreeSearchString('RS3'));
+      expect(getMatchingFuncNames(getState, funcNames)).toEqual(['fn3']);
+    });
+
+    it('matches every func matching any of several search strings (OR)', function () {
+      const { dispatch, getState, funcNames } = setup();
+      // "fn1" matches only func fn1; "fn3" matches only func fn3.
+      dispatch(ProfileView.changeCallTreeSearchString('fn1,fn3'));
+      expect(getMatchingFuncNames(getState, funcNames)).toEqual(['fn1', 'fn3']);
+    });
+
+    it('combines matches across different fields with OR', function () {
+      const { dispatch, getState, funcNames } = setup();
+      // "sc1" matches fn1 by filename; "rs4" matches fn4 by lib name.
+      dispatch(ProfileView.changeCallTreeSearchString('sc1,rs4'));
+      expect(getMatchingFuncNames(getState, funcNames)).toEqual(['fn1', 'fn4']);
+    });
+  });
+
   /**
    * This test is more involved on checking for correctness compared to the other
    * tests, which are more for asserting their simple getter/setter types of behavior.
diff --git a/src/utils/bitset.ts b/src/utils/bitset.ts
index 2393189679..5dcd1db063 100644
--- a/src/utils/bitset.ts
+++ b/src/utils/bitset.ts
@@ -54,6 +54,15 @@ export function combineTwoBitSetsWithAnd(a: BitSet, b: BitSet): BitSet {
   return result;
 }
 
+export function combineTwoBitSetsWithOr(a: BitSet, b: BitSet): BitSet {
+  const slotCount = a.length;
+  const result = new Int32Array(slotCount);
+  for (let i = 0; i < slotCount; i++) {
+    result[i] = a[i] | b[i];
+  }
+  return result;
+}
+
 export class BitSetOutOfBoundsError extends Error {
   override name = 'BitSetOutOfBoundsError';
   bitIndex: number;
diff --git a/src/utils/colors.ts b/src/utils/colors.ts
index 0efd24d0f6..b93ec771d3 100644
--- a/src/utils/colors.ts
+++ b/src/utils/colors.ts
@@ -10,12 +10,14 @@ import {
   GREEN_50,
   GREEN_60,
   GREEN_70,
+  GREY_10,
   GREY_20,
   GREY_30,
   GREY_40,
   GREY_50,
   GREY_60,
   GREY_70,
+  GREY_80,
   MAGENTA_60,
   MAGENTA_70,
   ORANGE_50,
@@ -209,6 +211,23 @@ export function mapCategoryColorNameToStackChartStyles(
   return mapCategoryColorNameToStyles(colorName);
 }
 
+/**
+ * A neutral style used to dim non-matching nodes in the stack chart when a
+ * search filter is active. Closer to the background than any category color
+ * so that matching nodes stand out clearly.
+ */
+const DIMMED_STYLE: ColorStyles = {
+  ...DEFAULT_STYLE,
+  _selectedFillStyle: [GREY_10, GREY_80],
+  _unselectedFillStyle: [GREY_10, GREY_80],
+  _selectedTextColor: [GREY_50, GREY_40],
+  gravity: 0,
+};
+
+export function getDimmedStyles(): ColorStyles {
+  return DIMMED_STYLE;
+}
+
 export function getForegroundColor(): string {
   return lightDark('#000000', GREY_20);
 }

From 2e7e9ab7dd204c3d570d0f415e4ef3d261d1ed20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Tue, 21 Apr 2026 18:53:34 +0200
Subject: [PATCH 34/64] Fix loading .json.gz profiles from inside zip archives
 (#5959)

When clicking a .json.gz entry in a zip file, viewProfileFromZip called
file.async('string'), which decoded the gzip bytes as UTF-8 and
corrupted the stream before unserializeProfileOfArbitraryFormat could
detect the gzip magic and decompress. Switching to 'uint8array' keeps
the content binary so the existing isGzip/decompress path runs. Plain
.json entries still work via the Uint8Array to TextDecoder fallback.
---
 src/actions/zipped-profiles.ts         |  2 +-
 src/test/store/zipped-profiles.test.ts | 30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/actions/zipped-profiles.ts b/src/actions/zipped-profiles.ts
index e51d660ae8..acde01eee1 100644
--- a/src/actions/zipped-profiles.ts
+++ b/src/actions/zipped-profiles.ts
@@ -57,7 +57,7 @@ export function viewProfileFromZip(
     try {
       // Attempt to unserialize the profile.
       const profile = await unserializeProfileOfArbitraryFormat(
-        await file.async('string'),
+        await file.async('uint8array'),
         pathInZipFile
       );
 
diff --git a/src/test/store/zipped-profiles.test.ts b/src/test/store/zipped-profiles.test.ts
index aceee2a398..19db955c36 100644
--- a/src/test/store/zipped-profiles.test.ts
+++ b/src/test/store/zipped-profiles.test.ts
@@ -15,6 +15,9 @@ import JSZip from 'jszip';
 import * as ZippedProfilesActions from '../../actions/zipped-profiles';
 import * as ReceiveProfileActions from '../../actions/receive-profile';
 import * as ProfileViewActions from '../../actions/profile-view';
+import { getProfileFromTextSamples } from '../fixtures/profiles/processed-profile';
+import { serializeProfile } from '../../profile-logic/process-profile';
+import { compress } from '../../utils/gz';
 import type { PreviewSelection } from 'firefox-profiler/types';
 
 describe('reducer zipFileState', function () {
@@ -101,6 +104,33 @@ describe('reducer zipFileState', function () {
     });
   });
 
+  it('can load a gzipped profile from a zip file', async function () {
+    const store = createStore();
+    const { getState, dispatch } = store;
+    const { profile } = getProfileFromTextSamples('A');
+    // Re-wrap in this realm's Uint8Array: the worker-backed `compress`
+    // returns a typed array whose `instanceof Uint8Array` check fails against
+    // the main realm's global, so JSZip wouldn't recognize it directly.
+    const gzippedProfile = new Uint8Array(
+      await compress(serializeProfile(profile))
+    );
+
+    const zip = new JSZip();
+    zip.file('profile.json.gz', gzippedProfile);
+    const zipBytes = await zip.generateAsync({ type: 'uint8array' });
+    const loadedZip = await JSZip.loadAsync(zipBytes);
+    dispatch(ReceiveProfileActions.receiveZipFile(loadedZip));
+
+    await dispatch(
+      ZippedProfilesActions.viewProfileFromPathInZipFile('profile.json.gz')
+    );
+
+    expect(ZippedProfilesSelectors.getZipFileState(getState()).phase).toBe(
+      'VIEW_PROFILE_IN_ZIP_FILE'
+    );
+    expect(ProfileViewSelectors.getProfile(getState())).toBeTruthy();
+  });
+
   it('will fail when trying to load an invalid profile', async function () {
     const store = createStore();
     const { getState, dispatch } = store;

From edba2fd95f9838a7020691fda4e1121bd1a72c43 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 22 Apr 2026 11:10:42 +0200
Subject: [PATCH 35/64] Update all Yarn dependencies (2026-04-22) (#5960)

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
---
 package.json |  14 ++---
 yarn.lock    | 174 +++++++++++++++++++++++++--------------------------
 2 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/package.json b/package.json
index e091457a9c..1eff7286c0 100644
--- a/package.json
+++ b/package.json
@@ -132,14 +132,14 @@
     "@types/react-splitter-layout": "^4.0.0",
     "@types/redux-logger": "^3.0.6",
     "@types/tgwf__co2": "^0.14.2",
-    "@typescript-eslint/eslint-plugin": "^8.58.2",
-    "@typescript-eslint/parser": "^8.58.2",
+    "@typescript-eslint/eslint-plugin": "^8.59.0",
+    "@typescript-eslint/parser": "^8.59.0",
     "alex": "^11.0.1",
     "babel-jest": "^30.3.0",
     "babel-plugin-module-resolver": "^5.0.3",
     "browserslist": "^4.28.2",
     "browserslist-to-esbuild": "^2.1.1",
-    "caniuse-lite": "^1.0.30001780",
+    "caniuse-lite": "^1.0.30001788",
     "cross-env": "^10.1.0",
     "cross-spawn": "^7.0.6",
     "devtools-license-check": "^0.9.0",
@@ -150,14 +150,14 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jest": "^29.15.1",
+    "eslint-plugin-jest": "^29.15.2",
     "eslint-plugin-jest-dom": "^5.5.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-testing-library": "^7.16.2",
     "fake-indexeddb": "^6.2.5",
     "fetch-mock": "^12.6.0",
-    "globals": "^17.4.0",
+    "globals": "^17.5.0",
     "husky": "^4.3.8",
     "jest": "^30.3.0",
     "jest-environment-jsdom": "^30.3.0",
@@ -170,13 +170,13 @@
     "patch-package": "^8.0.1",
     "postcss": "^8.5.9",
     "postinstall-postinstall": "^2.1.0",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.3",
     "rimraf": "^6.1.3",
     "stylelint": "^17.6.0",
     "stylelint-config-idiomatic-order": "^10.0.0",
     "stylelint-config-standard": "^40.0.0",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.58.2",
+    "typescript-eslint": "^8.59.0",
     "workbox-cli": "^7.4.0",
     "yargs": "^18.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 3ef98d3b9a..136ea89def 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2482,100 +2482,100 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@8.58.2", "@typescript-eslint/eslint-plugin@^8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.58.2.tgz#a6882a6a328e1259cff259fdb03184245ef06191"
-  integrity sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==
+"@typescript-eslint/eslint-plugin@8.59.0", "@typescript-eslint/eslint-plugin@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.59.0.tgz#fcbe76b693ce2412410cf4d48aefd617d345f2d9"
+  integrity sha512-HyAZtpdkgZwpq8Sz3FSUvCR4c+ScbuWa9AksK2Jweub7w4M3yTz4O11AqVJzLYjy/B9ZWPyc81I+mOdJU/bDQw==
   dependencies:
     "@eslint-community/regexpp" "^4.12.2"
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/type-utils" "8.58.2"
-    "@typescript-eslint/utils" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/type-utils" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     ignore "^7.0.5"
     natural-compare "^1.4.0"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/parser@8.58.2", "@typescript-eslint/parser@^8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.58.2.tgz#b267545e4bd515d896fe1f3a5b6f334fa6aa0026"
-  integrity sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==
+"@typescript-eslint/parser@8.59.0", "@typescript-eslint/parser@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.59.0.tgz#57a138280b3ceaf07904fbd62c433d5cc1ee1573"
+  integrity sha512-TI1XGwKbDpo9tRW8UDIXCOeLk55qe9ZFGs8MTKU6/M08HWTw52DD/IYhfQtOEhEdPhLMT26Ka/x7p70nd3dzDg==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     debug "^4.4.3"
 
-"@typescript-eslint/project-service@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.58.2.tgz#8c980249100e21b87baba0ca10880fdf893e0a8e"
-  integrity sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==
+"@typescript-eslint/project-service@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.59.0.tgz#914bf62069d870faa0389ffd725774a200f511bf"
+  integrity sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.58.2"
-    "@typescript-eslint/types" "^8.58.2"
+    "@typescript-eslint/tsconfig-utils" "^8.59.0"
+    "@typescript-eslint/types" "^8.59.0"
     debug "^4.4.3"
 
-"@typescript-eslint/scope-manager@8.58.2", "@typescript-eslint/scope-manager@^8.56.0":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.58.2.tgz#aa73784d78f117940e83f71705af07ba695cd60c"
-  integrity sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==
+"@typescript-eslint/scope-manager@8.59.0", "@typescript-eslint/scope-manager@^8.56.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.59.0.tgz#f71be268bd31da1c160815c689e4dde7c9bc9e8e"
+  integrity sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==
   dependencies:
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
 
-"@typescript-eslint/tsconfig-utils@8.58.2", "@typescript-eslint/tsconfig-utils@^8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.58.2.tgz#fa13f96432c9348bf87f6f44826def585fad7bca"
-  integrity sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==
+"@typescript-eslint/tsconfig-utils@8.59.0", "@typescript-eslint/tsconfig-utils@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.59.0.tgz#1276077f5ad77e384446ea28a2474e8f8be1af41"
+  integrity sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==
 
-"@typescript-eslint/type-utils@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.58.2.tgz#024eb1dd597f8a34cb22d8d9ab32da857bc9a817"
-  integrity sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==
+"@typescript-eslint/type-utils@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.59.0.tgz#2834ea3b179cedfc9244dcd4f74105a27751a439"
+  integrity sha512-3TRiZaQSltGqGeNrJzzr1+8YcEobKH9rHnqIp/1psfKFmhRQDNMGP5hBufanYTGznwShzVLs3Mz+gDN7HkWfXg==
   dependencies:
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-    "@typescript-eslint/utils" "8.58.2"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
     debug "^4.4.3"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/types@8.58.2", "@typescript-eslint/types@^8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.58.2.tgz#3ab8051de0f19a46ddefb0749d0f7d82974bd57c"
-  integrity sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==
+"@typescript-eslint/types@8.59.0", "@typescript-eslint/types@^8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.59.0.tgz#cfcc643c6e879016479775850d86d84c14492738"
+  integrity sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==
 
-"@typescript-eslint/typescript-estree@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.58.2.tgz#b1beb1f959385b341cc76f0aebbf028e23dfdb8b"
-  integrity sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==
+"@typescript-eslint/typescript-estree@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.59.0.tgz#feba58a70ab6ea7ac53a2f3ae900db28ce3454c2"
+  integrity sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==
   dependencies:
-    "@typescript-eslint/project-service" "8.58.2"
-    "@typescript-eslint/tsconfig-utils" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/visitor-keys" "8.58.2"
+    "@typescript-eslint/project-service" "8.59.0"
+    "@typescript-eslint/tsconfig-utils" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/visitor-keys" "8.59.0"
     debug "^4.4.3"
     minimatch "^10.2.2"
     semver "^7.7.3"
     tinyglobby "^0.2.15"
     ts-api-utils "^2.5.0"
 
-"@typescript-eslint/utils@8.58.2", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.58.2.tgz#27165554a02d1ff57d98262fa92060498dabc8b3"
-  integrity sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==
+"@typescript-eslint/utils@8.59.0", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.56.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.59.0.tgz#f50df9bd6967881ef64fba62230111153179ead5"
+  integrity sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==
   dependencies:
     "@eslint-community/eslint-utils" "^4.9.1"
-    "@typescript-eslint/scope-manager" "8.58.2"
-    "@typescript-eslint/types" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
+    "@typescript-eslint/scope-manager" "8.59.0"
+    "@typescript-eslint/types" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
 
-"@typescript-eslint/visitor-keys@8.58.2":
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.58.2.tgz#9ed699eaa9b5720b6b6b6f9c16e6c7d4cd32b276"
-  integrity sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==
+"@typescript-eslint/visitor-keys@8.59.0":
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.59.0.tgz#2e80de30e7e944ed4bd47d751e37dcb04db03795"
+  integrity sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==
   dependencies:
-    "@typescript-eslint/types" "8.58.2"
+    "@typescript-eslint/types" "8.59.0"
     eslint-visitor-keys "^5.0.0"
 
 "@ungap/structured-clone@^1.3.0":
@@ -3429,10 +3429,10 @@ camelcase@^8.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-8.0.0.tgz#c0d36d418753fb6ad9c5e0437579745c1c14a534"
   integrity sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==
 
-caniuse-lite@^1.0.30001780, caniuse-lite@^1.0.30001782:
-  version "1.0.30001787"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz#fd25c5e42e2d35df5c75eddda00d15d9c0c68f81"
-  integrity sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==
+caniuse-lite@^1.0.30001782, caniuse-lite@^1.0.30001788:
+  version "1.0.30001788"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001788.tgz#31e97d1bfec332b3f2d7eea7781460c97629b3bf"
+  integrity sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==
 
 ccount@^2.0.0:
   version "2.0.1"
@@ -4540,10 +4540,10 @@ eslint-plugin-jest-formatting@^3.1.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-jest-formatting/-/eslint-plugin-jest-formatting-3.1.0.tgz#b26dd5a40f432b642dcc880021a771bb1c93dcd2"
   integrity sha512-XyysraZ1JSgGbLSDxjj5HzKKh0glgWf+7CkqxbTqb7zEhW7X2WHo5SBQ8cGhnszKN+2Lj3/oevBlHNbHezoc/A==
 
-eslint-plugin-jest@^29.15.1:
-  version "29.15.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-29.15.1.tgz#f663f9f7903a7181efddea5a92d1d31e66362596"
-  integrity sha512-6BjyErCQauz3zfJvzLw/kAez2lf4LEpbHLvWBfEcG4EI0ZiRSwjoH2uZulMouU8kRkBH+S0rhqn11IhTvxKgKw==
+eslint-plugin-jest@^29.15.2:
+  version "29.15.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-29.15.2.tgz#e4ecd1c88dfb8a62b4a0857724792c2aab7e9b6d"
+  integrity sha512-kEN4r9RZl1xcsb4arGq89LrcVdOUFII/JSCwtTPJyv16mDwmPrcuEQwpxqZHeINvcsd7oK5O/rhdGlxFRaZwvQ==
   dependencies:
     "@typescript-eslint/utils" "^8.0.0"
 
@@ -5281,10 +5281,10 @@ globals@^14.0.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
-globals@^17.4.0:
-  version "17.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-17.4.0.tgz#33d7d297ed1536b388a0e2f4bcd0ff19c8ff91b5"
-  integrity sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==
+globals@^17.5.0:
+  version "17.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-17.5.0.tgz#a82c641d898f8dfbe0e81f66fdff7d0de43f88c6"
+  integrity sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==
 
 globalthis@^1.0.4:
   version "1.0.4"
@@ -9025,10 +9025,10 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prettier@^3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.1.tgz#edf48977cf991558f4fcbd8a3ba6015ba2a3a173"
-  integrity sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==
+prettier@^3.8.3:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.3.tgz#560f2de55bf01b4c0503bc629d5df99b9a1d09b0"
+  integrity sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==
 
 pretty-bytes@^5.3.0:
   version "5.6.0"
@@ -10963,15 +10963,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.58.2:
-  version "8.58.2"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.58.2.tgz#55f425fc668c2d5148f45587f2cd04532d715c6a"
-  integrity sha512-V8iSng9mRbdZjl54VJ9NKr6ZB+dW0J3TzRXRGcSbLIej9jV86ZRtlYeTKDR/QLxXykocJ5icNzbsl2+5TzIvcQ==
+typescript-eslint@^8.59.0:
+  version "8.59.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.59.0.tgz#d1cc7c63559ce7116aeb66d35ec9dbe0063379fd"
+  integrity sha512-BU3ONW9X+v90EcCH9ZS6LMackcVtxRLlI3XrYyqZIwVSHIk7Qf7bFw1z0M9Q0IUxhTMZCf8piY9hTYaNEIASrw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.58.2"
-    "@typescript-eslint/parser" "8.58.2"
-    "@typescript-eslint/typescript-estree" "8.58.2"
-    "@typescript-eslint/utils" "8.58.2"
+    "@typescript-eslint/eslint-plugin" "8.59.0"
+    "@typescript-eslint/parser" "8.59.0"
+    "@typescript-eslint/typescript-estree" "8.59.0"
+    "@typescript-eslint/utils" "8.59.0"
 
 typescript@^6.0.2:
   version "6.0.2"

From 5fffe925d00302d435481dc855d53dcbbd99a5ea Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Thu, 23 Apr 2026 14:10:34 +0000
Subject: [PATCH 36/64] Pontoon/Firefox Profiler: Update French (fr)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Théo Chevalier <theo@theochevalier.org> (fr)
---
 locales/fr/app.ftl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/locales/fr/app.ftl b/locales/fr/app.ftl
index ddb5b9711e..9e2e5bfc72 100644
--- a/locales/fr/app.ftl
+++ b/locales/fr/app.ftl
@@ -815,6 +815,11 @@ TrackPower--tooltip-power-watt = { $value } W
 #   $value (String) - the power value at this location
 TrackPower--tooltip-power-milliwatt = { $value } mW
     .label = Puissance
+# This is used in the tooltip when the instant power value uses the microwatt unit.
+# Variables:
+#   $value (String) - the power value at this location
+TrackPower--tooltip-power-microwatt = { $value } μW
+    .label = Puissance
 # This is used in the tooltip when the power value uses the kilowatt unit.
 # Variables:
 #   $value (String) - the power value at this location

From 595ff0a5d621ba5980d02f5fa8851a7c7bb66a3a Mon Sep 17 00:00:00 2001
From: Ryan Hunt <rhunt@eqrion.net>
Date: Fri, 24 Apr 2026 08:29:44 -0500
Subject: [PATCH 37/64] Add a fullscreen button to the bottom box (#5605)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nazım Can Altınova <canaltinova@gmail.com>
---
 locales/en-US/app.ftl                         |  8 ++
 res/img/svg/fullscreen-exit.svg               |  6 ++
 res/img/svg/fullscreen.svg                    |  6 ++
 src/actions/profile-view.ts                   |  8 ++
 src/app-logic/url-handling.ts                 | 13 +++-
 src/components/app/BottomBox.css              | 19 +++++
 src/components/app/BottomBox.tsx              | 40 +++++++++-
 src/components/app/FullscreenToggleButton.tsx | 77 +++++++++++++++++++
 src/reducers/url-state.ts                     | 11 +++
 src/selectors/url-state.ts                    |  4 +
 src/types/actions.ts                          |  3 +
 src/types/state.ts                            |  1 +
 12 files changed, 191 insertions(+), 5 deletions(-)
 create mode 100644 res/img/svg/fullscreen-exit.svg
 create mode 100644 res/img/svg/fullscreen.svg
 create mode 100644 src/components/app/FullscreenToggleButton.tsx

diff --git a/locales/en-US/app.ftl b/locales/en-US/app.ftl
index 9475a20d4c..17f323d1af 100644
--- a/locales/en-US/app.ftl
+++ b/locales/en-US/app.ftl
@@ -1260,6 +1260,14 @@ BottomBox--assembly-code-not-available-title = Assembly code not available
 BottomBox--assembly-code-not-available-text =
     See <a>issue #4520</a> for supported scenarios and planned improvements.
 
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Exit fullscreen
+
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Fullscreen
+
 SourceView--close-button =
     .title = Close the source view
 
diff --git a/res/img/svg/fullscreen-exit.svg b/res/img/svg/fullscreen-exit.svg
new file mode 100644
index 0000000000..2843b49fae
--- /dev/null
+++ b/res/img/svg/fullscreen-exit.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill="rgba(12, 12, 13, .8)" fill-rule="evenodd" clip-rule="evenodd" d="M15.3743 0C15.5402 0 15.6994 0.0658946 15.8168 0.183199C15.9339 0.30041 15.9998 0.459281 16 0.624986C16.0002 0.790692 15.9346 0.949711 15.8178 1.06719L12.1928 4.69213L13.6468 6.14611C13.7169 6.21604 13.7647 6.30521 13.784 6.40231C13.8034 6.49942 13.7935 6.60009 13.7556 6.69156C13.7177 6.78304 13.6534 6.86119 13.5711 6.91612C13.4887 6.97104 13.3918 7.00027 13.2928 7.0001H9.29987L8.99987 6.7001V2.70716C9.00009 2.60843 9.02953 2.51198 9.08449 2.42996C9.13944 2.34794 9.21745 2.28402 9.30868 2.24627C9.3999 2.20852 9.50026 2.19862 9.59711 2.21782C9.69395 2.23702 9.78294 2.28446 9.85286 2.35417L11.0258 3.52715L11.3068 3.80814L14.9318 0.183199C15.0492 0.0658946 15.2083 0 15.3743 0ZM3.42871 8.08406C3.5111 8.02914 3.60794 7.99991 3.70696 8.00008H7.6999L7.99989 8.30008V12.293C7.99987 12.392 7.9705 12.4887 7.9155 12.5709C7.86049 12.6531 7.78233 12.7172 7.6909 12.755C7.59947 12.7928 7.49888 12.8026 7.40186 12.7832C7.30485 12.7638 7.21577 12.7161 7.1459 12.646L5.97292 11.473L5.69193 11.192L2.06698 14.817C1.94922 14.9334 1.79032 14.9989 1.62469 14.999C1.45906 14.9992 1.30002 14.9342 1.182 14.818C1.06518 14.7003 0.999619 14.5413 0.999619 14.3755C0.999619 14.2097 1.06518 14.0506 1.182 13.933L4.80694 10.308L3.35296 8.85407C3.28286 8.78414 3.23509 8.69497 3.21573 8.59787C3.19636 8.50076 3.20626 8.40009 3.24418 8.30862C3.2821 8.21714 3.34632 8.13899 3.42871 8.08406Z"/>
+</svg>
diff --git a/res/img/svg/fullscreen.svg b/res/img/svg/fullscreen.svg
new file mode 100644
index 0000000000..ce460de24e
--- /dev/null
+++ b/res/img/svg/fullscreen.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill="rgba(12, 12, 13, .8)" d="M29 2C29.552 2 30 2.448 30 3V10.5859C30 11.4755 28.9231 11.9235 28.293 11.2949L25.5586 8.56055L8.56055 25.5605L11.293 28.293C11.9215 28.9231 11.4755 30 10.5859 30H3C2.448 30 2 29.552 2 29V21.4141C2 20.5245 3.0769 20.0765 3.70703 20.7051L6.43945 23.4375L23.4395 6.4375L20.709 3.70703C20.079 3.07703 20.5241 2 21.4141 2H29Z"/>
+</svg>
diff --git a/src/actions/profile-view.ts b/src/actions/profile-view.ts
index a7bf7ddc39..c61ef144af 100644
--- a/src/actions/profile-view.ts
+++ b/src/actions/profile-view.ts
@@ -1987,6 +1987,14 @@ export function closeBottomBox(): ThunkAction<void> {
   };
 }
 
+export function toggleBottomBoxFullscreen(): ThunkAction<void> {
+  return (dispatch) => {
+    dispatch({
+      type: 'TOGGLE_BOTTOM_BOX_FULLSCREEN',
+    });
+  };
+}
+
 export function handleCallNodeTransformShortcut(
   event: React.KeyboardEvent<HTMLElement>,
   threadsKey: ThreadsKey,
diff --git a/src/app-logic/url-handling.ts b/src/app-logic/url-handling.ts
index eecd06a2be..aa6b1dad77 100644
--- a/src/app-logic/url-handling.ts
+++ b/src/app-logic/url-handling.ts
@@ -216,6 +216,7 @@ type Query = BaseQuery & {
   transforms?: string;
   sourceViewIndex?: number;
   assemblyView?: string;
+  bottomFullscreen?: boolean;
 
   // StackChart specific
   showUserTimings?: null | undefined;
@@ -352,8 +353,12 @@ export function getQueryStringFromUrlState(urlState: UrlState): string {
         'timing'
           ? undefined
           : urlState.profileSpecific.lastSelectedCallTreeSummaryStrategy;
-      const { sourceView, assemblyView, isBottomBoxOpenPerPanel } =
-        urlState.profileSpecific;
+      const {
+        sourceView,
+        assemblyView,
+        isBottomBoxOpenPerPanel,
+        isBottomBoxFullscreen,
+      } = urlState.profileSpecific;
 
       if (isBottomBoxOpenPerPanel[selectedTab]) {
         if (sourceView.sourceIndex !== null) {
@@ -365,6 +370,9 @@ export function getQueryStringFromUrlState(urlState: UrlState): string {
             nativeSymbols[currentNativeSymbol]
           );
         }
+        if (isBottomBoxFullscreen) {
+          query.bottomFullscreen = true;
+        }
       }
       break;
     }
@@ -593,6 +601,7 @@ export function stateFromLocation(
       sourceView,
       assemblyView,
       isBottomBoxOpenPerPanel,
+      isBottomBoxFullscreen: query.bottomFullscreen || false,
       timelineType: validateTimelineType(query.timelineType),
       showJsTracerSummary: query.summary === undefined ? false : true,
       globalTrackOrder: convertGlobalTrackOrderFromString(
diff --git a/src/components/app/BottomBox.css b/src/components/app/BottomBox.css
index dc80d0345b..16676702d2 100644
--- a/src/components/app/BottomBox.css
+++ b/src/components/app/BottomBox.css
@@ -2,6 +2,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+.bottom-box-fullscreen {
+  position: fixed;
+  z-index: 100;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
 .bottom-box-pane {
   --internal-sourceview-background-color: var(--grey-20);
   --internal-close-icon: url(../../../res/img/svg/close-dark.svg);
@@ -73,6 +82,8 @@
 
 .bottom-close-button,
 .bottom-assembly-button,
+.bottom-fullscreen-hide-button,
+.bottom-fullscreen-show-button,
 .bottom-prev-button,
 .bottom-next-button {
   width: 24px;
@@ -101,6 +112,14 @@
   background-image: var(--internal-assembly-icon);
 }
 
+.bottom-fullscreen-show-button {
+  background-image: url(firefox-profiler-res/img/svg/fullscreen.svg);
+}
+
+.bottom-fullscreen-hide-button {
+  background-image: url(firefox-profiler-res/img/svg/fullscreen-exit.svg);
+}
+
 .codeLoadingOverlay,
 .sourceCodeErrorOverlay,
 .assemblyCodeErrorOverlay {
diff --git a/src/components/app/BottomBox.tsx b/src/components/app/BottomBox.tsx
index 96558f3b9c..8e103ce6d3 100644
--- a/src/components/app/BottomBox.tsx
+++ b/src/components/app/BottomBox.tsx
@@ -8,6 +8,7 @@ import classNames from 'classnames';
 
 import { SourceView } from '../shared/SourceView';
 import { AssemblyView } from '../shared/AssemblyView';
+import { FullscreenToggleButton } from './FullscreenToggleButton';
 import { AssemblyViewToggleButton } from './AssemblyViewToggleButton';
 import { AssemblyViewNativeSymbolNavigator } from './AssemblyViewNativeSymbolNavigator';
 import { IonGraphView } from '../shared/IonGraphView';
@@ -22,9 +23,13 @@ import {
   getAssemblyViewScrollGeneration,
   getAssemblyViewScrollToInstructionAddress,
   getAssemblyViewHighlightedInstruction,
+  getIsBottomBoxFullscreen,
 } from 'firefox-profiler/selectors/url-state';
+import {
+  closeBottomBox,
+  toggleBottomBoxFullscreen,
+} from 'firefox-profiler/actions/profile-view';
 import { selectedThreadSelectors } from 'firefox-profiler/selectors/per-thread';
-import { closeBottomBox } from 'firefox-profiler/actions/profile-view';
 import { parseFileNameFromSymbolication } from 'firefox-profiler/utils/special-paths';
 import {
   getSourceViewCode,
@@ -53,6 +58,7 @@ import { Localized } from '@fluent/react';
 import './BottomBox.css';
 
 type StateProps = {
+  readonly isFullscreen: boolean;
   readonly sourceViewFile: string | null;
   readonly sourceViewCode: SourceCodeStatus | void;
   readonly sourceViewScrollGeneration: number;
@@ -71,6 +77,7 @@ type StateProps = {
 
 type DispatchProps = {
   readonly closeBottomBox: typeof closeBottomBox;
+  readonly toggleBottomBoxFullscreen: typeof toggleBottomBoxFullscreen;
 };
 
 type Props = ConnectedProps<{}, StateProps, DispatchProps>;
@@ -153,12 +160,31 @@ class BottomBoxImpl extends React.PureComponent<Props> {
   _sourceView = React.createRef<SourceView>();
   _assemblyView = React.createRef<AssemblyView>();
 
+  override componentDidMount() {
+    document.addEventListener('keydown', this._onKeyDown);
+  }
+
+  override componentWillUnmount() {
+    document.removeEventListener('keydown', this._onKeyDown);
+  }
+
+  _onKeyDown = (event: KeyboardEvent) => {
+    if (event.key === 'Escape' && this.props.isFullscreen) {
+      this.props.toggleBottomBoxFullscreen();
+    }
+  };
+
   _onClickCloseButton = () => {
     this.props.closeBottomBox();
+    // Close the fullscreen if we're closing the bottom box
+    if (this.props.isFullscreen) {
+      this.props.toggleBottomBoxFullscreen();
+    }
   };
 
   override render() {
     const {
+      isFullscreen,
       sourceViewFile,
       sourceViewCode,
       globalLineTimings,
@@ -200,6 +226,7 @@ class BottomBoxImpl extends React.PureComponent<Props> {
       <div className="bottom-box-header-trailing-buttons">
         {assemblyViewIsOpen ? <AssemblyViewNativeSymbolNavigator /> : null}
         <AssemblyViewToggleButton />
+        <FullscreenToggleButton />
         <Localized id="SourceView--close-button" attrs={{ title: true }}>
           <button
             className={classNames(
@@ -216,8 +243,13 @@ class BottomBoxImpl extends React.PureComponent<Props> {
     );
 
     return (
-      <div className="bottom-box">
-        <SplitterLayout customClassName="bottom-box" percentage>
+      <div
+        className={classNames(
+          'bottom-box',
+          isFullscreen ? 'bottom-box-fullscreen' : null
+        )}
+      >
+        <SplitterLayout percentage>
           <div className="bottom-box-pane">
             <div className="bottom-box-bar">
               <h3 className="bottom-box-title">{path ?? '(no source file)'}</h3>
@@ -303,6 +335,7 @@ function convertErrors(errors: ApiQueryError[]): SourceCodeLoadingError[] {
 
 export const BottomBox = explicitConnect<{}, StateProps, DispatchProps>({
   mapStateToProps: (state) => ({
+    isFullscreen: getIsBottomBoxFullscreen(state),
     sourceViewFile: getSourceViewFile(state),
     sourceViewCode: getSourceViewCode(state),
     globalLineTimings: selectedThreadSelectors.getSourceViewLineTimings(state),
@@ -323,6 +356,7 @@ export const BottomBox = explicitConnect<{}, StateProps, DispatchProps>({
   }),
   mapDispatchToProps: {
     closeBottomBox,
+    toggleBottomBoxFullscreen,
   },
   component: BottomBoxImpl,
 });
diff --git a/src/components/app/FullscreenToggleButton.tsx b/src/components/app/FullscreenToggleButton.tsx
new file mode 100644
index 0000000000..9a28f60156
--- /dev/null
+++ b/src/components/app/FullscreenToggleButton.tsx
@@ -0,0 +1,77 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import React from 'react';
+import classNames from 'classnames';
+
+import { getIsBottomBoxFullscreen } from 'firefox-profiler/selectors/url-state';
+import { toggleBottomBoxFullscreen } from 'firefox-profiler/actions/profile-view';
+import explicitConnect from 'firefox-profiler/utils/connect';
+
+import type { ConnectedProps } from 'firefox-profiler/utils/connect';
+
+import { Localized } from '@fluent/react';
+
+type StateProps = {
+  readonly isBottomBoxFullscreen: boolean;
+};
+
+type DispatchProps = {
+  readonly toggleBottomBoxFullscreen: typeof toggleBottomBoxFullscreen;
+};
+
+type Props = ConnectedProps<{}, StateProps, DispatchProps>;
+
+class FullscreenToggleButtonImpl extends React.PureComponent<Props> {
+  _onClick = () => {
+    this.props.toggleBottomBoxFullscreen();
+  };
+
+  override render() {
+    const { isBottomBoxFullscreen } = this.props;
+
+    return isBottomBoxFullscreen ? (
+      <Localized id="BottomBox--hide-fullscreen" attrs={{ title: true }}>
+        <button
+          className={classNames(
+            'bottom-fullscreen-hide-button',
+            'photon-button',
+            'photon-button-ghost',
+            'photon-button-ghost--checked'
+          )}
+          title="Exit fullscreen"
+          type="button"
+          onClick={this._onClick}
+        />
+      </Localized>
+    ) : (
+      <Localized id="BottomBox--show-fullscreen" attrs={{ title: true }}>
+        <button
+          className={classNames(
+            'bottom-fullscreen-show-button',
+            'photon-button',
+            'photon-button-ghost'
+          )}
+          title="Show fullscreen"
+          type="button"
+          onClick={this._onClick}
+        />
+      </Localized>
+    );
+  }
+}
+
+export const FullscreenToggleButton = explicitConnect<
+  {},
+  StateProps,
+  DispatchProps
+>({
+  mapStateToProps: (state) => ({
+    isBottomBoxFullscreen: getIsBottomBoxFullscreen(state),
+  }),
+  mapDispatchToProps: {
+    toggleBottomBoxFullscreen,
+  },
+  component: FullscreenToggleButtonImpl,
+});
diff --git a/src/reducers/url-state.ts b/src/reducers/url-state.ts
index 0d7a5e5c08..d75b0dec06 100644
--- a/src/reducers/url-state.ts
+++ b/src/reducers/url-state.ts
@@ -707,6 +707,16 @@ const isBottomBoxOpenPerPanel: Reducer<IsOpenPerPanelState> = (
   }
 };
 
+const isBottomBoxFullscreen: Reducer<boolean> = (state = false, action) => {
+  switch (action.type) {
+    case 'TOGGLE_BOTTOM_BOX_FULLSCREEN': {
+      return !state;
+    }
+    default:
+      return state;
+  }
+};
+
 /**
  * This value is only set from the URL and never changed.
  */
@@ -750,6 +760,7 @@ const profileSpecific = combineReducers({
   sourceView,
   assemblyView,
   isBottomBoxOpenPerPanel,
+  isBottomBoxFullscreen,
   timelineType,
   globalTrackOrder,
   hiddenGlobalTracks,
diff --git a/src/selectors/url-state.ts b/src/selectors/url-state.ts
index c3ff9e27e6..16043c4cab 100644
--- a/src/selectors/url-state.ts
+++ b/src/selectors/url-state.ts
@@ -248,6 +248,10 @@ export const getIsBottomBoxOpen: Selector<boolean> = (state) => {
   return getProfileSpecificState(state).isBottomBoxOpenPerPanel[tab];
 };
 
+export const getIsBottomBoxFullscreen: Selector<boolean> = (state) => {
+  return getProfileSpecificState(state).isBottomBoxFullscreen;
+};
+
 /**
  * The URL predictor is used to generate a link for an uploaded profile, to predict
  * what the URL will be.
diff --git a/src/types/actions.ts b/src/types/actions.ts
index 6f8e0bd1ed..81d3307e82 100644
--- a/src/types/actions.ts
+++ b/src/types/actions.ts
@@ -363,6 +363,9 @@ type ProfileAction =
   | {
       readonly type: 'CLOSE_BOTTOM_BOX_FOR_TAB';
       readonly tab: TabSlug;
+    }
+  | {
+      readonly type: 'TOGGLE_BOTTOM_BOX_FULLSCREEN';
     };
 
 type ReceiveProfileAction =
diff --git a/src/types/state.ts b/src/types/state.ts
index b7fbf9e6c2..5cabc5ddac 100644
--- a/src/types/state.ts
+++ b/src/types/state.ts
@@ -366,6 +366,7 @@ export type ProfileSpecificUrlState = {
   sourceView: SourceViewState;
   assemblyView: AssemblyViewState;
   isBottomBoxOpenPerPanel: IsOpenPerPanelState;
+  isBottomBoxFullscreen: boolean;
   globalTrackOrder: TrackIndex[];
   hiddenGlobalTracks: Set<TrackIndex>;
   hiddenLocalTracksByPid: Map<Pid, Set<TrackIndex>>;

From 0ed576c2040b428c38edc2b041c435ebea714dfc Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Thu, 23 Apr 2026 10:08:42 -0400
Subject: [PATCH 38/64] Speed up _computeCallNodeTableHierarchy by keeping
 siblings ordered by func.

Fixes #5957.

The ordering allows us to early-exit during the "is there an existing
sibling with this func" check. And by keeping track of the last used
sibling, some degenerate profiles with lots of siblings now have ~O(n)
performance rather than O(n^2) in the number of siblings, because we're
able to skip all the previously-inserted siblings since those have lower
funcs.
---
 src/profile-logic/profile-data.ts    | 160 +++++++++++++++++++--------
 src/test/store/profile-view.test.ts  |   2 +-
 src/test/store/symbolication.test.ts |   6 +-
 3 files changed, 116 insertions(+), 52 deletions(-)

diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index 15d2721118..4ee83eb75c 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -224,6 +224,9 @@ type CallNodeTableHierarchy = {
   prefix: Array<IndexIntoCallNodeTable>;
   firstChild: Array<IndexIntoFuncTable>;
   nextSibling: Array<IndexIntoFuncTable>;
+  // The smallest-func root, i.e. the head of the roots' sibling list. -1 when
+  // there are no call nodes.
+  firstRoot: IndexIntoCallNodeTable;
   length: number;
   stackIndexToCallNodeIndex: Int32Array;
 };
@@ -269,6 +272,19 @@ type CallNodeTableExtraColumns = {
  * structure represented by those columns only has a very basic property, which
  * is "a prefix always comes before its children".
  *
+ * Sibling lists are kept sorted by func (ascending). This speeds up the "is
+ * there already a sibling with this func?" lookup: we can stop scanning as
+ * soon as we see a sibling with a greater func.
+ *
+ * On top of that, for each parent we remember the child we most recently
+ * matched or inserted. Consecutive stacks that share a prefix very often also
+ * share a func (different frames of the same function), so checking the
+ * last-used child first catches those repeats in O(1). When the last-used
+ * child's func is less than the new func, we can start the scan from it
+ * rather than from the head; in the common case where the last-used child is
+ * also the tail (because funcs have been arriving in ascending order), that
+ * scan starts at -1 and we append without any work.
+ *
  * This function does not compute the other columns yet, because at this point
  * we don't know the final order of the call nodes. And we want to store those
  * other values in typed arrays, for which we need to know the size upfront, and
@@ -288,14 +304,14 @@ function _computeCallNodeTableHierarchy(
   let length = 0;
 
   // An extra column that only gets used while the table is built up: For each
-  // node A, currentLastChild[A] tracks the last currently-known child node of A.
-  // It is updated whenever a new node is created; e.g. creating node B updates
-  // currentLastChild[prefix[B]].
-  // currentLastChild[A] is -1 while A has no children.
-  const currentLastChild: Array<IndexIntoCallNodeTable> = [];
+  // node A, lastUsedChild[A] is the child of A that we most recently matched
+  // or inserted. It is -1 while A has no children.
+  const lastUsedChild: Array<IndexIntoCallNodeTable> = [];
 
-  // The last currently-known root node, i.e. the last known "child of -1".
-  let currentLastRoot = -1;
+  // The root counterparts to firstChild / lastUsedChild for the "virtual"
+  // parent -1.
+  let firstRoot = -1;
+  let lastUsedRoot = -1;
 
   // Go through each stack, and create a new callNode table, which is based off of
   // functions rather than frames.
@@ -308,25 +324,70 @@ function _computeCallNodeTableHierarchy(
     const frameIndex = stackTable.frame[stackIndex];
     const funcIndex = frameTable.func[frameIndex];
 
-    // Check if the call node for this stack already exists.
+    const firstSibling =
+      prefixCallNode === -1 ? firstRoot : firstChild[prefixCallNode];
+    const lastUsed =
+      prefixCallNode === -1 ? lastUsedRoot : lastUsedChild[prefixCallNode];
+
+    // Locate this (prefixCallNode, funcIndex) in the sorted sibling list.
+    // Either we find an existing match and reuse it, or we find the insertion
+    // point for a new node. When we need to insert, prevSibling is the node
+    // our new node should be linked after, or -1 if it should become the new
+    // head of the sibling list.
     let callNodeIndex = -1;
-    if (stackIndex !== 0) {
-      const currentFirstSibling =
-        prefixCallNode === -1 ? 0 : firstChild[prefixCallNode];
-      for (
-        let currentSibling = currentFirstSibling;
-        currentSibling !== -1;
-        currentSibling = nextSibling[currentSibling]
-      ) {
-        if (func[currentSibling] === funcIndex) {
-          callNodeIndex = currentSibling;
+    let prevSibling = -1;
+
+    if (firstSibling === -1) {
+      // No existing siblings. The new node will be both head and tail.
+    } else if (func[lastUsed] === funcIndex) {
+      // Hot path: same func as the last child we touched for this parent.
+      callNodeIndex = lastUsed;
+    } else if (func[lastUsed] < funcIndex) {
+      // The new func sits somewhere after lastUsed in the sorted list, so we
+      // can skip everything up to and including lastUsed. If lastUsed is the
+      // tail, sibling starts at -1 and we append without scanning.
+      prevSibling = lastUsed;
+      let sibling = nextSibling[lastUsed];
+      while (sibling !== -1) {
+        const siblingFunc = func[sibling];
+        if (siblingFunc === funcIndex) {
+          callNodeIndex = sibling;
           break;
         }
+        if (siblingFunc > funcIndex) {
+          // Insert before `sibling`; prevSibling is already its predecessor.
+          break;
+        }
+        prevSibling = sibling;
+        sibling = nextSibling[sibling];
+      }
+    } else {
+      // func[lastUsed] > funcIndex, so scanning from the head is guaranteed
+      // to either find a match or an insertion point before falling off the
+      // end.
+      let sibling = firstSibling;
+      while (true) {
+        const siblingFunc = func[sibling];
+        if (siblingFunc === funcIndex) {
+          callNodeIndex = sibling;
+          break;
+        }
+        if (siblingFunc > funcIndex) {
+          // Insert before `sibling`; prevSibling is already its predecessor.
+          break;
+        }
+        prevSibling = sibling;
+        sibling = nextSibling[sibling];
       }
     }
 
     if (callNodeIndex !== -1) {
       stackIndexToCallNodeIndex[stackIndex] = callNodeIndex;
+      if (prefixCallNode === -1) {
+        lastUsedRoot = callNodeIndex;
+      } else {
+        lastUsedChild[prefixCallNode] = callNodeIndex;
+      }
       continue;
     }
 
@@ -336,39 +397,34 @@ function _computeCallNodeTableHierarchy(
 
     prefix[callNodeIndex] = prefixCallNode;
     func[callNodeIndex] = funcIndex;
-
-    // Initialize these firstChild and nextSibling to -1. They will be updated
-    // once this node's first child or next sibling gets created.
     firstChild[callNodeIndex] = -1;
-    nextSibling[callNodeIndex] = -1;
-    currentLastChild[callNodeIndex] = -1;
+    lastUsedChild[callNodeIndex] = -1;
+
+    // Splice the new node into the sibling list.
+    if (prevSibling === -1) {
+      // Insert at head.
+      nextSibling[callNodeIndex] = firstSibling;
+      if (prefixCallNode === -1) {
+        firstRoot = callNodeIndex;
+      } else {
+        firstChild[prefixCallNode] = callNodeIndex;
+      }
+    } else {
+      // Insert after prevSibling.
+      nextSibling[callNodeIndex] = nextSibling[prevSibling];
+      nextSibling[prevSibling] = callNodeIndex;
+    }
 
-    // Update the next sibling of our previous sibling, and the first child of
-    // our prefix (if we're the first child).
-    // Also set this node's depth.
     if (prefixCallNode === -1) {
-      // This node is a root. Just update the previous root's nextSibling. Because
-      // this node has no parent, there's also no firstChild information to update.
-      if (currentLastRoot !== -1) {
-        nextSibling[currentLastRoot] = callNodeIndex;
-      }
-      currentLastRoot = callNodeIndex;
+      lastUsedRoot = callNodeIndex;
     } else {
-      // This node is not a root: update both firstChild and nextSibling information
-      // when appropriate.
-      const prevSiblingIndex = currentLastChild[prefixCallNode];
-      if (prevSiblingIndex === -1) {
-        // This is the first child for this prefix.
-        firstChild[prefixCallNode] = callNodeIndex;
-      } else {
-        nextSibling[prevSiblingIndex] = callNodeIndex;
-      }
-      currentLastChild[prefixCallNode] = callNodeIndex;
+      lastUsedChild[prefixCallNode] = callNodeIndex;
     }
   }
   return {
     prefix,
     firstChild,
+    firstRoot,
     nextSibling,
     length,
     stackIndexToCallNodeIndex,
@@ -390,15 +446,21 @@ function _computeCallNodeTableHierarchy(
  * column and allows other parts of the codebase to perform cheap "is descendant"
  * checks.
  *
- * We do not order siblings by func. The order of siblings is meaningless, and
- * is based on the somewhat arbitrary order in which we encounter the original
- * stack nodes in the stack table.
+ * Sibling nodes are ordered by func, though this happens in
+ * _computeCallNodeTableHierarchy. (This function just keeps the same order of
+ * siblings as what's in the `hierarchy` argument.)
  */
 function _computeCallNodeTableDFSOrder(
   hierarchy: CallNodeTableHierarchy
 ): CallNodeTableDFSOrder {
-  const { prefix, firstChild, nextSibling, length, stackIndexToCallNodeIndex } =
-    hierarchy;
+  const {
+    prefix,
+    firstChild,
+    firstRoot,
+    nextSibling,
+    length,
+    stackIndexToCallNodeIndex,
+  } = hierarchy;
 
   const prefixSorted = new Int32Array(length);
   const nextSiblingSorted = new Int32Array(length);
@@ -423,8 +485,10 @@ function _computeCallNodeTableDFSOrder(
   //     the unsorted columns into the sorted columns.
   //  2. Find the next node in DFS order, set nextOldIndex to it, and continue
   //     to the next loop iteration.
+  // Start at firstRoot because, with func-sorted siblings, the head of the
+  // roots' sibling list is not necessarily call node 0.
   const oldIndexToNewIndex = new Uint32Array(length);
-  let nextOldIndex = 0;
+  let nextOldIndex = firstRoot;
   let nextNewIndex = 0;
   let currentDepth = 0;
   let currentOldPrefix = -1;
diff --git a/src/test/store/profile-view.test.ts b/src/test/store/profile-view.test.ts
index 45f07b4ae4..01ffc01b71 100644
--- a/src/test/store/profile-view.test.ts
+++ b/src/test/store/profile-view.test.ts
@@ -839,8 +839,8 @@ describe('actions/ProfileView', function () {
         '    - C (total: 1, self: —)',
         '      - D (total: 1, self: 1)',
         '  - E (total: 1, self: 1)',
-        '- D (total: 1, self: 1)',
         '- C (total: 1, self: 1)',
+        '- D (total: 1, self: 1)',
       ]);
     });
 
diff --git a/src/test/store/symbolication.test.ts b/src/test/store/symbolication.test.ts
index 17226e2450..81771af3ea 100644
--- a/src/test/store/symbolication.test.ts
+++ b/src/test/store/symbolication.test.ts
@@ -247,8 +247,8 @@ describe('doSymbolicateProfile', function () {
         '  - second symbol (total: 1, self: —)',
         '    - last symbol (total: 1, self: 1)',
         '  - last symbol (total: 1, self: 1)',
-        '- third symbol (total: 1, self: 1)',
         '- second symbol (total: 1, self: 1)',
+        '- third symbol (total: 1, self: 1)',
       ]);
 
       const thread = getThread(getState());
@@ -483,8 +483,8 @@ describe('doSymbolicateProfile', function () {
       '  - second symbol (total: 1, self: —)',
       '    - last symbol (total: 1, self: 1)',
       '  - last symbol (total: 1, self: 1)',
-      '- third symbol (total: 1, self: 1)',
       '- second symbol (total: 1, self: 1)',
+      '- third symbol (total: 1, self: 1)',
     ]);
   });
 
@@ -587,8 +587,8 @@ describe('doSymbolicateProfile', function () {
       '  - second symbol (total: 1, self: —)',
       '    - last symbol (total: 1, self: 1)',
       '  - last symbol (total: 1, self: 1)',
-      '- third symbol (total: 1, self: 1)',
       '- second symbol (total: 1, self: 1)',
+      '- third symbol (total: 1, self: 1)',
     ]);
   });
 });

From fde75e37d6db41b82c65277ce3ab3a61600425c0 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange.moz@gmail.com>
Date: Fri, 24 Apr 2026 11:25:57 -0400
Subject: [PATCH 39/64] Combine two branches.

---
 src/profile-logic/profile-data.ts | 79 ++++++++++++++-----------------
 1 file changed, 36 insertions(+), 43 deletions(-)

diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index 4ee83eb75c..c1e241f575 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -326,8 +326,6 @@ function _computeCallNodeTableHierarchy(
 
     const firstSibling =
       prefixCallNode === -1 ? firstRoot : firstChild[prefixCallNode];
-    const lastUsed =
-      prefixCallNode === -1 ? lastUsedRoot : lastUsedChild[prefixCallNode];
 
     // Locate this (prefixCallNode, funcIndex) in the sorted sibling list.
     // Either we find an existing match and reuse it, or we find the insertion
@@ -335,49 +333,44 @@ function _computeCallNodeTableHierarchy(
     // our new node should be linked after, or -1 if it should become the new
     // head of the sibling list.
     let callNodeIndex = -1;
-    let prevSibling = -1;
-
-    if (firstSibling === -1) {
-      // No existing siblings. The new node will be both head and tail.
-    } else if (func[lastUsed] === funcIndex) {
-      // Hot path: same func as the last child we touched for this parent.
-      callNodeIndex = lastUsed;
-    } else if (func[lastUsed] < funcIndex) {
-      // The new func sits somewhere after lastUsed in the sorted list, so we
-      // can skip everything up to and including lastUsed. If lastUsed is the
-      // tail, sibling starts at -1 and we append without scanning.
-      prevSibling = lastUsed;
-      let sibling = nextSibling[lastUsed];
-      while (sibling !== -1) {
-        const siblingFunc = func[sibling];
-        if (siblingFunc === funcIndex) {
-          callNodeIndex = sibling;
-          break;
-        }
-        if (siblingFunc > funcIndex) {
-          // Insert before `sibling`; prevSibling is already its predecessor.
-          break;
-        }
-        prevSibling = sibling;
-        sibling = nextSibling[sibling];
-      }
-    } else {
-      // func[lastUsed] > funcIndex, so scanning from the head is guaranteed
-      // to either find a match or an insertion point before falling off the
-      // end.
-      let sibling = firstSibling;
-      while (true) {
-        const siblingFunc = func[sibling];
-        if (siblingFunc === funcIndex) {
-          callNodeIndex = sibling;
-          break;
+    let prevSibling = -1; // used for insertion, if callNodeIndex === -1
+
+    if (firstSibling !== -1) {
+      // Get the sibling that we used most recently for this parent.
+      // We know lastUsed is !== -1 because we know there is at least one sibling.
+      const lastUsed =
+        prefixCallNode === -1 ? lastUsedRoot : lastUsedChild[prefixCallNode];
+
+      if (funcIndex === func[lastUsed]) {
+        // Hot path: same func as the last child we touched for this parent.
+        callNodeIndex = lastUsed;
+      } else {
+        // We'll have to scan (at least part of) the list of siblings.
+        let sibling = firstSibling;
+        if (funcIndex > func[lastUsed]) {
+          // Since the list of siblings is ordered by func, we now know that can
+          // skip the part of the list that's before lastUsed.
+          // If lastUsed is the tail, sibling starts at -1 and we append without
+          // scanning.
+          prevSibling = lastUsed;
+          sibling = nextSibling[lastUsed];
         }
-        if (siblingFunc > funcIndex) {
-          // Insert before `sibling`; prevSibling is already its predecessor.
-          break;
+        while (sibling !== -1) {
+          const siblingFunc = func[sibling];
+          if (siblingFunc === funcIndex) {
+            // Found a match!
+            callNodeIndex = sibling;
+            break;
+          }
+          if (siblingFunc > funcIndex) {
+            // No match, and we can stop scanning here due to the ordering.
+            // We'll insert the new node before `sibling`; prevSibling is
+            // already its predecessor.
+            break;
+          }
+          prevSibling = sibling;
+          sibling = nextSibling[sibling];
         }
-        prevSibling = sibling;
-        sibling = nextSibling[sibling];
       }
     }
 

From c7c4a52adefe79b06de4c099ac27a7765b930d31 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Fri, 24 Apr 2026 18:19:48 +0200
Subject: [PATCH 40/64] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20postcss=20t?=
 =?UTF-8?q?o=20version=208.5.10=20(#5969)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1eff7286c0..2cd1ba5ce2 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,7 @@
     "npm-run-all2": "^8.0.4",
     "open": "^11.0.0",
     "patch-package": "^8.0.1",
-    "postcss": "^8.5.9",
+    "postcss": "^8.5.10",
     "postinstall-postinstall": "^2.1.0",
     "prettier": "^3.8.3",
     "rimraf": "^6.1.3",
diff --git a/yarn.lock b/yarn.lock
index 136ea89def..40aad56b21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9001,10 +9001,10 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.4.32, postcss@^8.5.8, postcss@^8.5.9:
-  version "8.5.9"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.9.tgz#f6ee9e0b94f0f19c97d2f172bfbd7fc71fe1cca4"
-  integrity sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==
+postcss@^8.4.32, postcss@^8.5.10, postcss@^8.5.8:
+  version "8.5.10"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.10.tgz#8992d8c30acf3f12169e7c09514a12fed7e48356"
+  integrity sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==
   dependencies:
     nanoid "^3.3.11"
     picocolors "^1.1.1"

From a802dc1a87501fc9a82977c7c0e7b9fc2b6abb73 Mon Sep 17 00:00:00 2001
From: Markus Stange <markus.stange@gmail.com>
Date: Tue, 6 May 2025 15:04:46 -0400
Subject: [PATCH 41/64] Replace symbolicator-cli with a profiler-edit node tool

Before:

```
  node dist/symbolicator-cli.js \
    --input samply-profile.json \
    --output profile-symbolicated.json \
    --server http://localhost:3000
```

After:

```
  node node-tools-dist/profiler-edit.js \
    -i samply-profile.json \
    -o profile-symbolicated.json \
    --symbolicate-with-server http://localhost:3000
```

The new tool also accepts a URL or profile storage hash as input, and can
write gzip-compressed output:

```
  node node-tools-dist/profiler-edit.js \
    --from-hash w1spyw917hg... \
    -o out.json.gz \
    --symbolicate-with-server http://localhost:8001/abcdef/
```

The reason for this change is that I want to add further ways to
modify profiles in the future (such as an `--insert-label-frames`
argument) and it doesn't really make sense to have a separate tool
for each modification.

This commit also moves the script file to /src/node-tools/ and the output to /node-tools-dist/.
I'm planning to add more scripts of this type in the future.
---
 .github/workflows/ci.yml                      |    4 +-
 .gitignore                                    |    1 +
 eslint.config.mjs                             |    1 +
 package.json                                  |    3 +-
 ...-symbolicator.mjs => build-node-tools.mjs} |   11 +-
 src/node-tools/profiler-edit.ts               |  211 +
 src/symbolicator-cli/index.ts                 |  151 -
 .../__snapshots__/profiler-edit.test.ts.snap  | 5313 +++++++++++++++++
 .../profiler-edit/profiler-edit.test.ts       |  194 +
 .../symbol-server-response.json               |    0
 .../unsymbolicated.json                       |    0
 .../unsymbolicated.json.gz                    |  Bin
 .../symbolicator-cli.test.ts.snap             | 2657 ---------
 .../symbolicator-cli/symbolicator-cli.test.ts |   88 -
 src/test/unit/profiler-edit.test.ts           |  147 +
 src/test/unit/symbolicator-cli.test.ts        |   99 -
 16 files changed, 5875 insertions(+), 3005 deletions(-)
 rename scripts/{build-symbolicator.mjs => build-node-tools.mjs} (61%)
 create mode 100644 src/node-tools/profiler-edit.ts
 delete mode 100644 src/symbolicator-cli/index.ts
 create mode 100644 src/test/integration/profiler-edit/__snapshots__/profiler-edit.test.ts.snap
 create mode 100644 src/test/integration/profiler-edit/profiler-edit.test.ts
 rename src/test/integration/{symbolicator-cli => profiler-edit}/symbol-server-response.json (100%)
 rename src/test/integration/{symbolicator-cli => profiler-edit}/unsymbolicated.json (100%)
 rename src/test/integration/{symbolicator-cli => profiler-edit}/unsymbolicated.json.gz (100%)
 delete mode 100644 src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap
 delete mode 100644 src/test/integration/symbolicator-cli/symbolicator-cli.test.ts
 create mode 100644 src/test/unit/profiler-edit.test.ts
 delete mode 100644 src/test/unit/symbolicator-cli.test.ts

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e0b60c7eec..682b6c8d4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,8 +61,8 @@ jobs:
       - name: Build production
         run: yarn build-prod:quiet
 
-      - name: Build symbolicator CLI
-        run: yarn build-symbolicator-cli:quiet
+      - name: Build node tools
+        run: yarn build-node-tools
 
   licence-check:
     runs-on: ${{ matrix.os }}
diff --git a/.gitignore b/.gitignore
index 6d621273ed..a3bd91ed88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ yarn-error.log
 node_modules/
 .DS_Store
 dist/
+node-tools-dist/
 public_html/
 build-meta/
 flow-coverage
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 8c4f1150dd..5bb495b649 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -20,6 +20,7 @@ export default defineConfig(
       'src/types/libdef/npm/**',
       'res/**',
       'dist/**',
+      'node-tools-dist/**',
       'docs-user/**',
       'coverage/**',
     ],
diff --git a/package.json b/package.json
index 2cd1ba5ce2..a183afb8d2 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,8 @@
     "build-l10n-prod": "cross-env NODE_ENV=production L10N=1 node scripts/build.mjs && yarn build-sw && yarn build-photon",
     "build-photon": "cross-env NODE_ENV=production node scripts/build-photon.mjs",
     "build-sw": "workbox generateSW workbox-config.js",
-    "build-symbolicator-cli": "cross-env NODE_ENV=production node scripts/build-symbolicator.mjs",
     "build-prod:quiet": "yarn build-prod",
-    "build-symbolicator-cli:quiet": "yarn build-symbolicator-cli",
+    "build-node-tools": "cross-env NODE_ENV=production node scripts/build-node-tools.mjs",
     "lint": "node bin/output-fixing-commands.js run-p lint-js lint-css prettier-run",
     "lint-fix": "run-p lint-fix-js lint-fix-css prettier-fix",
     "lint-js": "node bin/output-fixing-commands.js eslint . --report-unused-disable-directives --cache --cache-strategy content",
diff --git a/scripts/build-symbolicator.mjs b/scripts/build-node-tools.mjs
similarity index 61%
rename from scripts/build-symbolicator.mjs
rename to scripts/build-node-tools.mjs
index 3068727f24..72aa260e96 100644
--- a/scripts/build-symbolicator.mjs
+++ b/scripts/build-node-tools.mjs
@@ -4,16 +4,15 @@
 import esbuild from 'esbuild';
 import { nodeBaseConfig } from './lib/esbuild-configs.mjs';
 
-const symbolicatorConfig = {
+const profilerEditConfig = {
   ...nodeBaseConfig,
-  metafile: true,
-  entryPoints: ['src/symbolicator-cli/index.ts'],
-  outfile: 'dist/symbolicator-cli.js',
+  entryPoints: ['src/node-tools/profiler-edit.ts'],
+  outfile: 'node-tools-dist/profiler-edit.js',
 };
 
 async function build() {
-  await esbuild.build(symbolicatorConfig);
-  console.log('✅ Symbolicator-cli build completed');
+  await esbuild.build(profilerEditConfig);
+  console.log('✅ profiler-edit build completed');
 }
 
 build().catch(console.error);
diff --git a/src/node-tools/profiler-edit.ts b/src/node-tools/profiler-edit.ts
new file mode 100644
index 0000000000..961df029b3
--- /dev/null
+++ b/src/node-tools/profiler-edit.ts
@@ -0,0 +1,211 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+import fs from 'fs';
+import minimist from 'minimist';
+
+import { unserializeProfileOfArbitraryFormat } from 'firefox-profiler/profile-logic/process-profile';
+import { GOOGLE_STORAGE_BUCKET } from 'firefox-profiler/app-logic/constants';
+import { compress } from 'firefox-profiler/utils/gz';
+import { SymbolStore } from 'firefox-profiler/profile-logic/symbol-store';
+import {
+  symbolicateProfile,
+  applySymbolicationSteps,
+} from 'firefox-profiler/profile-logic/symbolication';
+import type { SymbolicationStepInfo } from 'firefox-profiler/profile-logic/symbolication';
+import * as MozillaSymbolicationAPI from 'firefox-profiler/profile-logic/mozilla-symbolication-api';
+import type { Profile } from 'firefox-profiler/types/profile';
+import { assertExhaustiveCheck } from 'firefox-profiler/utils/types';
+
+/**
+ * A CLI tool for editing profiles.
+ *
+ * To use it, first build:
+ *   yarn build-node-tools
+ *
+ * Then run:
+ *   node node-tools-dist/profiler-edit.js -i <profile> -o <output> [options]
+ *
+ * Examples:
+ *   node node-tools-dist/profiler-edit.js -i samply-profile.json -o out.json \
+ *     --symbolicate-with-server http://localhost:8001/abcdef/
+ */
+
+type ProfileSource =
+  | { type: 'FILE'; path: string }
+  | { type: 'URL'; url: string }
+  | { type: 'HASH'; hash: string };
+
+export interface CliOptions {
+  input: ProfileSource;
+  output: string;
+  symbolicateWithServer?: string;
+}
+
+async function loadProfile(source: ProfileSource): Promise<Profile> {
+  switch (source.type) {
+    case 'FILE': {
+      console.log(`Loading profile from file ${source.path}`);
+      const bytes = fs.readFileSync(source.path, null);
+      const profile = await unserializeProfileOfArbitraryFormat(bytes);
+      if (profile === undefined) {
+        throw new Error('Unable to parse the profile.');
+      }
+      return profile;
+    }
+    case 'URL': {
+      console.log(`Loading profile from URL ${source.url}`);
+      const response = await fetch(source.url);
+      if (!response.ok) {
+        throw new Error(
+          `Unexpected response code: ${response.status} / ${response.statusText}`
+        );
+      }
+      const bytes = await response.arrayBuffer();
+      const profile = await unserializeProfileOfArbitraryFormat(
+        new Uint8Array(bytes)
+      );
+      if (profile === undefined) {
+        throw new Error('Unable to parse the profile.');
+      }
+      return profile;
+    }
+    case 'HASH': {
+      const url = `https://storage.googleapis.com/${GOOGLE_STORAGE_BUCKET}/${source.hash}`;
+      console.log(`Loading profile from hash ${source.hash}`);
+      const response = await fetch(url);
+      if (!response.ok) {
+        throw new Error(
+          `Unexpected response code: ${response.status} / ${response.statusText}`
+        );
+      }
+      const bytes = await response.arrayBuffer();
+      const profile = await unserializeProfileOfArbitraryFormat(
+        new Uint8Array(bytes)
+      );
+      if (profile === undefined) {
+        throw new Error('Unable to parse the profile.');
+      }
+      return profile;
+    }
+    default:
+      throw assertExhaustiveCheck(source);
+  }
+}
+
+export async function run(options: CliOptions) {
+  const profile = await loadProfile(options.input);
+
+  if (options.symbolicateWithServer !== undefined) {
+    const server = options.symbolicateWithServer;
+    const symbolStore = new SymbolStore({
+      requestSymbolsFromServer: async (requests) => {
+        for (const { lib } of requests) {
+          console.log(`  Loading symbols for ${lib.debugName}`);
+        }
+        try {
+          return await MozillaSymbolicationAPI.requestSymbols(
+            'symbol server',
+            requests,
+            async (path, json) => {
+              const response = await fetch(server + path, {
+                body: json,
+                method: 'POST',
+              });
+              return response.json();
+            }
+          );
+        } catch (e) {
+          throw new Error(
+            `There was a problem with the symbolication API request to the symbol server: ${e.message}`
+          );
+        }
+      },
+      requestSymbolsFromBrowser: async () => [],
+      requestSymbolsViaSymbolTableFromBrowser: async () => {
+        throw new Error('Not supported in this context');
+      },
+    });
+
+    console.log('Symbolicating...');
+    const symbolicationSteps: SymbolicationStepInfo[] = [];
+    await symbolicateProfile(profile, symbolStore, (step) => {
+      symbolicationSteps.push(step);
+    });
+    console.log('Applying collected symbolication steps...');
+    const { shared, threads } = applySymbolicationSteps(
+      profile.threads,
+      profile.shared,
+      symbolicationSteps
+    );
+    profile.shared = shared;
+    profile.threads = threads;
+    profile.meta.symbolicated = true;
+  }
+
+  console.log(`Saving profile to ${options.output}`);
+  if (options.output.endsWith('.gz')) {
+    fs.writeFileSync(options.output, await compress(JSON.stringify(profile)));
+  } else {
+    fs.writeFileSync(options.output, JSON.stringify(profile));
+  }
+  console.log('Finished.');
+}
+
+export function makeOptionsFromArgv(processArgv: string[]): CliOptions {
+  const argv = minimist(processArgv.slice(2), {
+    alias: { i: 'input', o: 'output' },
+  });
+
+  const sources: ProfileSource[] = [];
+
+  if (typeof argv.input === 'string' && argv.input !== '') {
+    if (/^https?:\/\//i.test(argv.input)) {
+      sources.push({ type: 'URL', url: argv.input });
+    } else {
+      sources.push({ type: 'FILE', path: argv.input });
+    }
+  }
+  if (typeof argv['from-file'] === 'string' && argv['from-file'] !== '') {
+    sources.push({ type: 'FILE', path: argv['from-file'] });
+  }
+  if (typeof argv['from-url'] === 'string' && argv['from-url'] !== '') {
+    sources.push({ type: 'URL', url: argv['from-url'] });
+  }
+  if (typeof argv['from-hash'] === 'string' && argv['from-hash'] !== '') {
+    sources.push({ type: 'HASH', hash: argv['from-hash'] });
+  }
+
+  if (sources.length === 0) {
+    throw new Error(
+      'An input must be supplied: use -i <FILE_OR_URL>, --from-file <path>, --from-url <url>, or --from-hash <hash>'
+    );
+  }
+  if (sources.length > 1) {
+    throw new Error(
+      'Only one input may be supplied (-i, --from-file, --from-url, --from-hash)'
+    );
+  }
+
+  if (!(typeof argv.output === 'string' && argv.output !== '')) {
+    throw new Error('An output path must be supplied with --output / -o');
+  }
+
+  return {
+    input: sources[0],
+    output: argv.output,
+    symbolicateWithServer:
+      typeof argv['symbolicate-with-server'] === 'string' &&
+      argv['symbolicate-with-server'] !== ''
+        ? argv['symbolicate-with-server']
+        : undefined,
+  };
+}
+
+if (require.main === module) {
+  const options = makeOptionsFromArgv(process.argv);
+  run(options).catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
+}
diff --git a/src/symbolicator-cli/index.ts b/src/symbolicator-cli/index.ts
deleted file mode 100644
index 533a726955..0000000000
--- a/src/symbolicator-cli/index.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * This implements a simple CLI to symbolicate profiles captured by the profiler
- * or by samply.
- *
- * To use it it first needs to be built:
- *   yarn build-symbolicator-cli
- *
- * Then it can be run from the `dist` directory:
- *   node dist/symbolicator-cli.js --input <input profile> --output <symbolicated profile> --server <symbol server URL>
- *
- * For example:
- *   node dist/symbolicator-cli.js --input samply-profile.json --output profile-symbolicated.json --server http://localhost:3000
- *
- */
-
-import fs from 'fs';
-import minimist from 'minimist';
-
-import { unserializeProfileOfArbitraryFormat } from '../profile-logic/process-profile';
-import { SymbolStore } from '../profile-logic/symbol-store';
-import {
-  symbolicateProfile,
-  applySymbolicationSteps,
-} from '../profile-logic/symbolication';
-import type { SymbolicationStepInfo } from '../profile-logic/symbolication';
-import * as MozillaSymbolicationAPI from '../profile-logic/mozilla-symbolication-api';
-
-export interface CliOptions {
-  input: string;
-  output: string;
-  server: string;
-}
-
-export async function run(options: CliOptions) {
-  console.log(`Loading profile from ${options.input}`);
-
-  // Read the raw bytes from the file. It might be a JSON file, but it could also
-  // be a binary file, e.g. a .json.gz file, or any of the binary formats supported
-  // by our importers.
-  const bytes = fs.readFileSync(options.input, null);
-
-  // Load the profile.
-  const profile = await unserializeProfileOfArbitraryFormat(bytes);
-  if (profile === undefined) {
-    throw new Error('Unable to parse the profile.');
-  }
-
-  /**
-   * SymbolStore implementation which just forwards everything to the symbol server in
-   * MozillaSymbolicationAPI format. No support for getting symbols from 'the browser' as
-   * there is no browser in this context.
-   */
-  const symbolStore = new SymbolStore({
-    requestSymbolsFromServer: async (requests) => {
-      for (const { lib } of requests) {
-        console.log(`  Loading symbols for ${lib.debugName}`);
-      }
-      try {
-        return await MozillaSymbolicationAPI.requestSymbols(
-          'symbol server',
-          requests,
-          async (path, json) => {
-            const response = await fetch(options.server + path, {
-              body: json,
-              method: 'POST',
-            });
-            return response.json();
-          }
-        );
-      } catch (e) {
-        throw new Error(
-          `There was a problem with the symbolication API request to the symbol server: ${e.message}`
-        );
-      }
-    },
-
-    requestSymbolsFromBrowser: async () => {
-      return [];
-    },
-
-    requestSymbolsViaSymbolTableFromBrowser: async () => {
-      throw new Error('Not supported in this context');
-    },
-  });
-
-  console.log('Symbolicating...');
-
-  const symbolicationSteps: SymbolicationStepInfo[] = [];
-  await symbolicateProfile(
-    profile,
-    symbolStore,
-    (symbolicationStepInfo: SymbolicationStepInfo) => {
-      symbolicationSteps.push(symbolicationStepInfo);
-    }
-  );
-
-  console.log('Applying collected symbolication steps...');
-
-  const { shared, threads } = applySymbolicationSteps(
-    profile.threads,
-    profile.shared,
-    symbolicationSteps
-  );
-  profile.shared = shared;
-  profile.threads = threads;
-  profile.meta.symbolicated = true;
-
-  console.log(`Saving profile to ${options.output}`);
-  fs.writeFileSync(options.output, JSON.stringify(profile));
-  console.log('Finished.');
-}
-
-export function makeOptionsFromArgv(processArgv: string[]): CliOptions {
-  const argv = minimist(processArgv.slice(2));
-
-  if (!('input' in argv && typeof argv.input === 'string')) {
-    throw new Error(
-      'Argument --input must be supplied with the path to the input profile'
-    );
-  }
-
-  if (!('output' in argv && typeof argv.output === 'string')) {
-    throw new Error(
-      'Argument --output must be supplied with the path to the output profile'
-    );
-  }
-
-  if (!('server' in argv && typeof argv.server === 'string')) {
-    throw new Error(
-      'Argument --server must be supplied with the URI of the symbol server endpoint'
-    );
-  }
-
-  return {
-    input: argv.input,
-    output: argv.output,
-    server: argv.server,
-  };
-}
-
-if (!module.parent) {
-  try {
-    const options = makeOptionsFromArgv(process.argv);
-    run(options).catch((err) => {
-      throw err;
-    });
-  } catch (e) {
-    console.error(e);
-    process.exit(1);
-  }
-}
diff --git a/src/test/integration/profiler-edit/__snapshots__/profiler-edit.test.ts.snap b/src/test/integration/profiler-edit/__snapshots__/profiler-edit.test.ts.snap
new file mode 100644
index 0000000000..28da043c8d
--- /dev/null
+++ b/src/test/integration/profiler-edit/__snapshots__/profiler-edit.test.ts.snap
@@ -0,0 +1,5313 @@
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
+
+exports[`profiler-edit tool is symbolicating a .json.gz trace correctly 1`] = `
+Object {
+  "counters": Array [],
+  "libs": Array [
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "F635824E318B3F0C842CC369737F2B680",
+      "codeId": "F635824E318B3F0C842CC369737F2B68",
+      "debugName": "dyld",
+      "debugPath": "/usr/lib/dyld",
+      "name": "dyld",
+      "path": "/usr/lib/dyld",
+    },
+    Object {
+      "arch": "arm64",
+      "breakpadId": "F61DA4D57CBB38CA8BDF059C645834520",
+      "codeId": "F61DA4D57CBB38CA8BDF059C64583452",
+      "debugName": "a.out",
+      "debugPath": "/usr/helloworld/a.out",
+      "name": "a.out",
+      "path": "/usr/helloworld/a.out",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "E03E84786F5C3D21A79A58408F5140000",
+      "codeId": "E03E84786F5C3D21A79A58408F514000",
+      "debugName": "libsystem_pthread.dylib",
+      "debugPath": "/usr/lib/system/libsystem_pthread.dylib",
+      "name": "libsystem_pthread.dylib",
+      "path": "/usr/lib/system/libsystem_pthread.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "71FF45B8F14E36669E966CF58315B91D0",
+      "codeId": "71FF45B8F14E36669E966CF58315B91D",
+      "debugName": "libsystem_kernel.dylib",
+      "debugPath": "/usr/lib/system/libsystem_kernel.dylib",
+      "name": "libsystem_kernel.dylib",
+      "path": "/usr/lib/system/libsystem_kernel.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "D30F183093D03D0B8CBA9544E84BFD5B0",
+      "codeId": "D30F183093D03D0B8CBA9544E84BFD5B",
+      "debugName": "libsystem_c.dylib",
+      "debugPath": "/usr/lib/system/libsystem_c.dylib",
+      "name": "libsystem_c.dylib",
+      "path": "/usr/lib/system/libsystem_c.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "B4BF9F8931D737428CE7AB3554F9F5250",
+      "codeId": "B4BF9F8931D737428CE7AB3554F9F525",
+      "debugName": "libsystem_platform.dylib",
+      "debugPath": "/usr/lib/system/libsystem_platform.dylib",
+      "name": "libsystem_platform.dylib",
+      "path": "/usr/lib/system/libsystem_platform.dylib",
+    },
+  ],
+  "meta": Object {
+    "categories": Array [
+      Object {
+        "color": "grey",
+        "name": "Other",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+      Object {
+        "color": "yellow",
+        "name": "User",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+    ],
+    "debug": false,
+    "extensions": Object {
+      "baseURL": Array [],
+      "id": Array [],
+      "length": 0,
+      "name": Array [],
+    },
+    "interval": 1,
+    "markerSchema": Array [],
+    "oscpu": "macOS 14.6.1",
+    "pausedRanges": Array [],
+    "preprocessedProfileVersion": 62,
+    "processType": 0,
+    "product": "a.out",
+    "sampleUnits": Object {
+      "eventDelay": "ms",
+      "threadCPUDelta": "µs",
+      "time": "ms",
+    },
+    "sourceCodeIsNotOnSearchfox": true,
+    "startTime": 1726433495880.2869,
+    "symbolicated": true,
+    "usesOnlyOneStackType": true,
+    "version": 24,
+  },
+  "pages": Array [],
+  "profilerOverhead": Array [],
+  "shared": Object {
+    "frameTable": Object {
+      "address": Array [
+        24915,
+        16067,
+        38027,
+        11180,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28575,
+        30367,
+        18819,
+        16188,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+      ],
+      "category": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+      "column": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "func": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        11,
+        12,
+        14,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+      ],
+      "inlineDepth": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+      "innerWindowID": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 42,
+      "line": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "nativeSymbol": Array [
+        0,
+        1,
+        4,
+        8,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        6,
+        7,
+        12,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+      ],
+      "subcategory": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+    },
+    "funcTable": Object {
+      "columnNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "isJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "length": 15,
+      "lineNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "name": Array [
+        21,
+        22,
+        25,
+        29,
+        26,
+        23,
+        24,
+        31,
+        32,
+        30,
+        15,
+        27,
+        28,
+        18,
+        33,
+      ],
+      "relevantForJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "resource": Array [
+        0,
+        1,
+        2,
+        3,
+        2,
+        1,
+        1,
+        4,
+        4,
+        3,
+        1,
+        2,
+        2,
+        2,
+        5,
+      ],
+      "source": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    "nativeSymbols": Object {
+      "address": Array [
+        22440,
+        15828,
+        15752,
+        15644,
+        37420,
+        28428,
+        30256,
+        18740,
+        11172,
+        17376,
+        54332,
+        54412,
+        16080,
+      ],
+      "functionSize": Array [
+        2788,
+        380,
+        76,
+        108,
+        1028,
+        320,
+        120,
+        92,
+        44,
+        44,
+        80,
+        464,
+        212,
+      ],
+      "length": 13,
+      "libIndex": Array [
+        0,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        2,
+        3,
+        3,
+        4,
+        4,
+        5,
+      ],
+      "name": Array [
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        31,
+        32,
+        33,
+      ],
+    },
+    "resourceTable": Object {
+      "host": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 6,
+      "lib": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+      ],
+      "name": Array [
+        4,
+        5,
+        6,
+        7,
+        14,
+        20,
+      ],
+      "type": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+    },
+    "sources": Object {
+      "filename": Array [],
+      "id": Array [],
+      "length": 0,
+      "sourceMapURL": Array [],
+      "startColumn": Array [],
+      "startLine": Array [],
+    },
+    "stackTable": Object {
+      "frame": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        12,
+        13,
+        14,
+        15,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+      ],
+      "length": 88,
+      "prefix": Array [
+        null,
+        0,
+        1,
+        2,
+        null,
+        4,
+        5,
+        6,
+        7,
+        8,
+        null,
+        10,
+        11,
+        12,
+        13,
+        14,
+        11,
+        16,
+        17,
+        18,
+        19,
+        null,
+        21,
+        22,
+        23,
+        24,
+        25,
+        22,
+        27,
+        28,
+        29,
+        30,
+        27,
+        32,
+        33,
+        34,
+        35,
+        null,
+        37,
+        38,
+        39,
+        40,
+        41,
+        38,
+        43,
+        44,
+        45,
+        46,
+        43,
+        48,
+        49,
+        50,
+        51,
+        48,
+        53,
+        54,
+        55,
+        56,
+        null,
+        58,
+        59,
+        60,
+        null,
+        62,
+        63,
+        64,
+        65,
+        66,
+        63,
+        68,
+        69,
+        70,
+        71,
+        68,
+        73,
+        74,
+        75,
+        76,
+        73,
+        78,
+        79,
+        80,
+        81,
+        78,
+        83,
+        84,
+        85,
+        86,
+      ],
+    },
+    "stringArray": Array [
+      "0x6153",
+      "0x3ec3",
+      "0x948b",
+      "0x2bac",
+      "dyld",
+      "a.out",
+      "libsystem_pthread.dylib",
+      "libsystem_kernel.dylib",
+      "0x6f93",
+      "0x3db3",
+      "0x3d33",
+      "0xd47f",
+      "0xd567",
+      "0x43e8",
+      "libsystem_c.dylib",
+      "0x3d67",
+      "0x6f9f",
+      "0x769f",
+      "0x4983",
+      "0x3f3c",
+      "libsystem_platform.dylib",
+      "start",
+      "main",
+      "threadfunc(void*)",
+      "fac(unsigned long)",
+      "_pthread_join",
+      "_pthread_start",
+      "_pthread_exit",
+      "_pthread_terminate_invoke",
+      "__ulock_wait",
+      "__semwait_signal",
+      "usleep",
+      "nanosleep",
+      "_platform_memset",
+    ],
+  },
+  "threads": Array [
+    Object {
+      "isMainThread": true,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "a.out",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 237.805292,
+      "samples": Object {
+        "length": 11,
+        "stack": Array [
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+        ],
+        "threadCPUDelta": Array [
+          11273,
+          0,
+          8,
+          0,
+          3,
+          4,
+          0,
+          30,
+          0,
+          21,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          263.723459,
+          274.768584,
+          275.7785,
+          286.765084,
+          287.756375,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          1,
+          11,
+          1,
+          11,
+          1,
+          12,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274156",
+      "unregisterTime": 300.814417,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274161>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 2,
+        "stack": Array [
+          9,
+          9,
+        ],
+        "threadCPUDelta": Array [
+          7,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+        ],
+        "weight": Array [
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274161",
+      "unregisterTime": 252.728334,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274162>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 4,
+        "stack": Array [
+          15,
+          15,
+          20,
+          20,
+        ],
+        "threadCPUDelta": Array [
+          3,
+          0,
+          5,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274162",
+      "unregisterTime": 262.732625,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274163>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 6,
+        "stack": Array [
+          26,
+          26,
+          31,
+          31,
+          36,
+          36,
+        ],
+        "threadCPUDelta": Array [
+          1,
+          0,
+          5,
+          0,
+          3,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274163",
+      "unregisterTime": 275.7785,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274164>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 9,
+        "stack": Array [
+          42,
+          42,
+          47,
+          47,
+          52,
+          52,
+          57,
+          57,
+          61,
+        ],
+        "threadCPUDelta": Array [
+          6,
+          0,
+          9,
+          0,
+          20,
+          0,
+          6,
+          0,
+          2,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          273.755,
+          274.768584,
+          285.764042,
+          286.765084,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          11,
+          1,
+          11,
+          1,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274164",
+      "unregisterTime": 287.756375,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274165>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 10,
+        "stack": Array [
+          67,
+          67,
+          72,
+          72,
+          77,
+          77,
+          82,
+          82,
+          87,
+          87,
+        ],
+        "threadCPUDelta": Array [
+          2,
+          0,
+          6,
+          0,
+          4,
+          0,
+          5,
+          0,
+          4,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+          275.7785,
+          287.756375,
+          288.76475,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+          1,
+          12,
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274165",
+      "unregisterTime": 300.814417,
+    },
+  ],
+}
+`;
+
+exports[`profiler-edit tool is symbolicating a trace correctly 1`] = `
+Object {
+  "counters": Array [],
+  "libs": Array [
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "F635824E318B3F0C842CC369737F2B680",
+      "codeId": "F635824E318B3F0C842CC369737F2B68",
+      "debugName": "dyld",
+      "debugPath": "/usr/lib/dyld",
+      "name": "dyld",
+      "path": "/usr/lib/dyld",
+    },
+    Object {
+      "arch": "arm64",
+      "breakpadId": "F61DA4D57CBB38CA8BDF059C645834520",
+      "codeId": "F61DA4D57CBB38CA8BDF059C64583452",
+      "debugName": "a.out",
+      "debugPath": "/usr/helloworld/a.out",
+      "name": "a.out",
+      "path": "/usr/helloworld/a.out",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "E03E84786F5C3D21A79A58408F5140000",
+      "codeId": "E03E84786F5C3D21A79A58408F514000",
+      "debugName": "libsystem_pthread.dylib",
+      "debugPath": "/usr/lib/system/libsystem_pthread.dylib",
+      "name": "libsystem_pthread.dylib",
+      "path": "/usr/lib/system/libsystem_pthread.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "71FF45B8F14E36669E966CF58315B91D0",
+      "codeId": "71FF45B8F14E36669E966CF58315B91D",
+      "debugName": "libsystem_kernel.dylib",
+      "debugPath": "/usr/lib/system/libsystem_kernel.dylib",
+      "name": "libsystem_kernel.dylib",
+      "path": "/usr/lib/system/libsystem_kernel.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "D30F183093D03D0B8CBA9544E84BFD5B0",
+      "codeId": "D30F183093D03D0B8CBA9544E84BFD5B",
+      "debugName": "libsystem_c.dylib",
+      "debugPath": "/usr/lib/system/libsystem_c.dylib",
+      "name": "libsystem_c.dylib",
+      "path": "/usr/lib/system/libsystem_c.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "B4BF9F8931D737428CE7AB3554F9F5250",
+      "codeId": "B4BF9F8931D737428CE7AB3554F9F525",
+      "debugName": "libsystem_platform.dylib",
+      "debugPath": "/usr/lib/system/libsystem_platform.dylib",
+      "name": "libsystem_platform.dylib",
+      "path": "/usr/lib/system/libsystem_platform.dylib",
+    },
+  ],
+  "meta": Object {
+    "categories": Array [
+      Object {
+        "color": "grey",
+        "name": "Other",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+      Object {
+        "color": "yellow",
+        "name": "User",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+    ],
+    "debug": false,
+    "extensions": Object {
+      "baseURL": Array [],
+      "id": Array [],
+      "length": 0,
+      "name": Array [],
+    },
+    "interval": 1,
+    "markerSchema": Array [],
+    "oscpu": "macOS 14.6.1",
+    "pausedRanges": Array [],
+    "preprocessedProfileVersion": 62,
+    "processType": 0,
+    "product": "a.out",
+    "sampleUnits": Object {
+      "eventDelay": "ms",
+      "threadCPUDelta": "µs",
+      "time": "ms",
+    },
+    "sourceCodeIsNotOnSearchfox": true,
+    "startTime": 1726433495880.2869,
+    "symbolicated": true,
+    "usesOnlyOneStackType": true,
+    "version": 24,
+  },
+  "pages": Array [],
+  "profilerOverhead": Array [],
+  "shared": Object {
+    "frameTable": Object {
+      "address": Array [
+        24915,
+        16067,
+        38027,
+        11180,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28575,
+        30367,
+        18819,
+        16188,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+      ],
+      "category": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+      "column": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "func": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        11,
+        12,
+        14,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+      ],
+      "inlineDepth": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+      "innerWindowID": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 42,
+      "line": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "nativeSymbol": Array [
+        0,
+        1,
+        4,
+        8,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        6,
+        7,
+        12,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+      ],
+      "subcategory": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+    },
+    "funcTable": Object {
+      "columnNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "isJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "length": 15,
+      "lineNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "name": Array [
+        21,
+        22,
+        25,
+        29,
+        26,
+        23,
+        24,
+        31,
+        32,
+        30,
+        15,
+        27,
+        28,
+        18,
+        33,
+      ],
+      "relevantForJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "resource": Array [
+        0,
+        1,
+        2,
+        3,
+        2,
+        1,
+        1,
+        4,
+        4,
+        3,
+        1,
+        2,
+        2,
+        2,
+        5,
+      ],
+      "source": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    "nativeSymbols": Object {
+      "address": Array [
+        22440,
+        15828,
+        15752,
+        15644,
+        37420,
+        28428,
+        30256,
+        18740,
+        11172,
+        17376,
+        54332,
+        54412,
+        16080,
+      ],
+      "functionSize": Array [
+        2788,
+        380,
+        76,
+        108,
+        1028,
+        320,
+        120,
+        92,
+        44,
+        44,
+        80,
+        464,
+        212,
+      ],
+      "length": 13,
+      "libIndex": Array [
+        0,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        2,
+        3,
+        3,
+        4,
+        4,
+        5,
+      ],
+      "name": Array [
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        31,
+        32,
+        33,
+      ],
+    },
+    "resourceTable": Object {
+      "host": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 6,
+      "lib": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+      ],
+      "name": Array [
+        4,
+        5,
+        6,
+        7,
+        14,
+        20,
+      ],
+      "type": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+    },
+    "sources": Object {
+      "filename": Array [],
+      "id": Array [],
+      "length": 0,
+      "sourceMapURL": Array [],
+      "startColumn": Array [],
+      "startLine": Array [],
+    },
+    "stackTable": Object {
+      "frame": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        12,
+        13,
+        14,
+        15,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+      ],
+      "length": 88,
+      "prefix": Array [
+        null,
+        0,
+        1,
+        2,
+        null,
+        4,
+        5,
+        6,
+        7,
+        8,
+        null,
+        10,
+        11,
+        12,
+        13,
+        14,
+        11,
+        16,
+        17,
+        18,
+        19,
+        null,
+        21,
+        22,
+        23,
+        24,
+        25,
+        22,
+        27,
+        28,
+        29,
+        30,
+        27,
+        32,
+        33,
+        34,
+        35,
+        null,
+        37,
+        38,
+        39,
+        40,
+        41,
+        38,
+        43,
+        44,
+        45,
+        46,
+        43,
+        48,
+        49,
+        50,
+        51,
+        48,
+        53,
+        54,
+        55,
+        56,
+        null,
+        58,
+        59,
+        60,
+        null,
+        62,
+        63,
+        64,
+        65,
+        66,
+        63,
+        68,
+        69,
+        70,
+        71,
+        68,
+        73,
+        74,
+        75,
+        76,
+        73,
+        78,
+        79,
+        80,
+        81,
+        78,
+        83,
+        84,
+        85,
+        86,
+      ],
+    },
+    "stringArray": Array [
+      "0x6153",
+      "0x3ec3",
+      "0x948b",
+      "0x2bac",
+      "dyld",
+      "a.out",
+      "libsystem_pthread.dylib",
+      "libsystem_kernel.dylib",
+      "0x6f93",
+      "0x3db3",
+      "0x3d33",
+      "0xd47f",
+      "0xd567",
+      "0x43e8",
+      "libsystem_c.dylib",
+      "0x3d67",
+      "0x6f9f",
+      "0x769f",
+      "0x4983",
+      "0x3f3c",
+      "libsystem_platform.dylib",
+      "start",
+      "main",
+      "threadfunc(void*)",
+      "fac(unsigned long)",
+      "_pthread_join",
+      "_pthread_start",
+      "_pthread_exit",
+      "_pthread_terminate_invoke",
+      "__ulock_wait",
+      "__semwait_signal",
+      "usleep",
+      "nanosleep",
+      "_platform_memset",
+    ],
+  },
+  "threads": Array [
+    Object {
+      "isMainThread": true,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "a.out",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 237.805292,
+      "samples": Object {
+        "length": 11,
+        "stack": Array [
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+        ],
+        "threadCPUDelta": Array [
+          11273,
+          0,
+          8,
+          0,
+          3,
+          4,
+          0,
+          30,
+          0,
+          21,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          263.723459,
+          274.768584,
+          275.7785,
+          286.765084,
+          287.756375,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          1,
+          11,
+          1,
+          11,
+          1,
+          12,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274156",
+      "unregisterTime": 300.814417,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274161>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 2,
+        "stack": Array [
+          9,
+          9,
+        ],
+        "threadCPUDelta": Array [
+          7,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+        ],
+        "weight": Array [
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274161",
+      "unregisterTime": 252.728334,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274162>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 4,
+        "stack": Array [
+          15,
+          15,
+          20,
+          20,
+        ],
+        "threadCPUDelta": Array [
+          3,
+          0,
+          5,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274162",
+      "unregisterTime": 262.732625,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274163>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 6,
+        "stack": Array [
+          26,
+          26,
+          31,
+          31,
+          36,
+          36,
+        ],
+        "threadCPUDelta": Array [
+          1,
+          0,
+          5,
+          0,
+          3,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274163",
+      "unregisterTime": 275.7785,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274164>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 9,
+        "stack": Array [
+          42,
+          42,
+          47,
+          47,
+          52,
+          52,
+          57,
+          57,
+          61,
+        ],
+        "threadCPUDelta": Array [
+          6,
+          0,
+          9,
+          0,
+          20,
+          0,
+          6,
+          0,
+          2,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          273.755,
+          274.768584,
+          285.764042,
+          286.765084,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          11,
+          1,
+          11,
+          1,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274164",
+      "unregisterTime": 287.756375,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274165>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 10,
+        "stack": Array [
+          67,
+          67,
+          72,
+          72,
+          77,
+          77,
+          82,
+          82,
+          87,
+          87,
+        ],
+        "threadCPUDelta": Array [
+          2,
+          0,
+          6,
+          0,
+          4,
+          0,
+          5,
+          0,
+          4,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+          275.7785,
+          287.756375,
+          288.76475,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+          1,
+          12,
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274165",
+      "unregisterTime": 300.814417,
+    },
+  ],
+}
+`;
+
+exports[`profiler-edit tool loads a profile from a URL 1`] = `
+Object {
+  "counters": Array [],
+  "libs": Array [
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "F635824E318B3F0C842CC369737F2B680",
+      "codeId": "F635824E318B3F0C842CC369737F2B68",
+      "debugName": "dyld",
+      "debugPath": "/usr/lib/dyld",
+      "name": "dyld",
+      "path": "/usr/lib/dyld",
+    },
+    Object {
+      "arch": "arm64",
+      "breakpadId": "F61DA4D57CBB38CA8BDF059C645834520",
+      "codeId": "F61DA4D57CBB38CA8BDF059C64583452",
+      "debugName": "a.out",
+      "debugPath": "/usr/helloworld/a.out",
+      "name": "a.out",
+      "path": "/usr/helloworld/a.out",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "E03E84786F5C3D21A79A58408F5140000",
+      "codeId": "E03E84786F5C3D21A79A58408F514000",
+      "debugName": "libsystem_pthread.dylib",
+      "debugPath": "/usr/lib/system/libsystem_pthread.dylib",
+      "name": "libsystem_pthread.dylib",
+      "path": "/usr/lib/system/libsystem_pthread.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "71FF45B8F14E36669E966CF58315B91D0",
+      "codeId": "71FF45B8F14E36669E966CF58315B91D",
+      "debugName": "libsystem_kernel.dylib",
+      "debugPath": "/usr/lib/system/libsystem_kernel.dylib",
+      "name": "libsystem_kernel.dylib",
+      "path": "/usr/lib/system/libsystem_kernel.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "D30F183093D03D0B8CBA9544E84BFD5B0",
+      "codeId": "D30F183093D03D0B8CBA9544E84BFD5B",
+      "debugName": "libsystem_c.dylib",
+      "debugPath": "/usr/lib/system/libsystem_c.dylib",
+      "name": "libsystem_c.dylib",
+      "path": "/usr/lib/system/libsystem_c.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "B4BF9F8931D737428CE7AB3554F9F5250",
+      "codeId": "B4BF9F8931D737428CE7AB3554F9F525",
+      "debugName": "libsystem_platform.dylib",
+      "debugPath": "/usr/lib/system/libsystem_platform.dylib",
+      "name": "libsystem_platform.dylib",
+      "path": "/usr/lib/system/libsystem_platform.dylib",
+    },
+  ],
+  "meta": Object {
+    "categories": Array [
+      Object {
+        "color": "grey",
+        "name": "Other",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+      Object {
+        "color": "yellow",
+        "name": "User",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+    ],
+    "debug": false,
+    "extensions": Object {
+      "baseURL": Array [],
+      "id": Array [],
+      "length": 0,
+      "name": Array [],
+    },
+    "interval": 1,
+    "markerSchema": Array [],
+    "oscpu": "macOS 14.6.1",
+    "pausedRanges": Array [],
+    "preprocessedProfileVersion": 62,
+    "processType": 0,
+    "product": "a.out",
+    "sampleUnits": Object {
+      "eventDelay": "ms",
+      "threadCPUDelta": "µs",
+      "time": "ms",
+    },
+    "sourceCodeIsNotOnSearchfox": true,
+    "startTime": 1726433495880.2869,
+    "symbolicated": true,
+    "usesOnlyOneStackType": true,
+    "version": 24,
+  },
+  "pages": Array [],
+  "profilerOverhead": Array [],
+  "shared": Object {
+    "frameTable": Object {
+      "address": Array [
+        24915,
+        16067,
+        38027,
+        11180,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28575,
+        30367,
+        18819,
+        16188,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+      ],
+      "category": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+      "column": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "func": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        11,
+        12,
+        14,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+      ],
+      "inlineDepth": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+      "innerWindowID": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 42,
+      "line": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "nativeSymbol": Array [
+        0,
+        1,
+        4,
+        8,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        6,
+        7,
+        12,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+      ],
+      "subcategory": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+    },
+    "funcTable": Object {
+      "columnNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "isJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "length": 15,
+      "lineNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "name": Array [
+        21,
+        22,
+        25,
+        29,
+        26,
+        23,
+        24,
+        31,
+        32,
+        30,
+        15,
+        27,
+        28,
+        18,
+        33,
+      ],
+      "relevantForJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "resource": Array [
+        0,
+        1,
+        2,
+        3,
+        2,
+        1,
+        1,
+        4,
+        4,
+        3,
+        1,
+        2,
+        2,
+        2,
+        5,
+      ],
+      "source": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    "nativeSymbols": Object {
+      "address": Array [
+        22440,
+        15828,
+        15752,
+        15644,
+        37420,
+        28428,
+        30256,
+        18740,
+        11172,
+        17376,
+        54332,
+        54412,
+        16080,
+      ],
+      "functionSize": Array [
+        2788,
+        380,
+        76,
+        108,
+        1028,
+        320,
+        120,
+        92,
+        44,
+        44,
+        80,
+        464,
+        212,
+      ],
+      "length": 13,
+      "libIndex": Array [
+        0,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        2,
+        3,
+        3,
+        4,
+        4,
+        5,
+      ],
+      "name": Array [
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        31,
+        32,
+        33,
+      ],
+    },
+    "resourceTable": Object {
+      "host": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 6,
+      "lib": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+      ],
+      "name": Array [
+        4,
+        5,
+        6,
+        7,
+        14,
+        20,
+      ],
+      "type": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+    },
+    "sources": Object {
+      "filename": Array [],
+      "id": Array [],
+      "length": 0,
+      "sourceMapURL": Array [],
+      "startColumn": Array [],
+      "startLine": Array [],
+    },
+    "stackTable": Object {
+      "frame": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        12,
+        13,
+        14,
+        15,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+      ],
+      "length": 88,
+      "prefix": Array [
+        null,
+        0,
+        1,
+        2,
+        null,
+        4,
+        5,
+        6,
+        7,
+        8,
+        null,
+        10,
+        11,
+        12,
+        13,
+        14,
+        11,
+        16,
+        17,
+        18,
+        19,
+        null,
+        21,
+        22,
+        23,
+        24,
+        25,
+        22,
+        27,
+        28,
+        29,
+        30,
+        27,
+        32,
+        33,
+        34,
+        35,
+        null,
+        37,
+        38,
+        39,
+        40,
+        41,
+        38,
+        43,
+        44,
+        45,
+        46,
+        43,
+        48,
+        49,
+        50,
+        51,
+        48,
+        53,
+        54,
+        55,
+        56,
+        null,
+        58,
+        59,
+        60,
+        null,
+        62,
+        63,
+        64,
+        65,
+        66,
+        63,
+        68,
+        69,
+        70,
+        71,
+        68,
+        73,
+        74,
+        75,
+        76,
+        73,
+        78,
+        79,
+        80,
+        81,
+        78,
+        83,
+        84,
+        85,
+        86,
+      ],
+    },
+    "stringArray": Array [
+      "0x6153",
+      "0x3ec3",
+      "0x948b",
+      "0x2bac",
+      "dyld",
+      "a.out",
+      "libsystem_pthread.dylib",
+      "libsystem_kernel.dylib",
+      "0x6f93",
+      "0x3db3",
+      "0x3d33",
+      "0xd47f",
+      "0xd567",
+      "0x43e8",
+      "libsystem_c.dylib",
+      "0x3d67",
+      "0x6f9f",
+      "0x769f",
+      "0x4983",
+      "0x3f3c",
+      "libsystem_platform.dylib",
+      "start",
+      "main",
+      "threadfunc(void*)",
+      "fac(unsigned long)",
+      "_pthread_join",
+      "_pthread_start",
+      "_pthread_exit",
+      "_pthread_terminate_invoke",
+      "__ulock_wait",
+      "__semwait_signal",
+      "usleep",
+      "nanosleep",
+      "_platform_memset",
+    ],
+  },
+  "threads": Array [
+    Object {
+      "isMainThread": true,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "a.out",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 237.805292,
+      "samples": Object {
+        "length": 11,
+        "stack": Array [
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+        ],
+        "threadCPUDelta": Array [
+          11273,
+          0,
+          8,
+          0,
+          3,
+          4,
+          0,
+          30,
+          0,
+          21,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          263.723459,
+          274.768584,
+          275.7785,
+          286.765084,
+          287.756375,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          1,
+          11,
+          1,
+          11,
+          1,
+          12,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274156",
+      "unregisterTime": 300.814417,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274161>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 2,
+        "stack": Array [
+          9,
+          9,
+        ],
+        "threadCPUDelta": Array [
+          7,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+        ],
+        "weight": Array [
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274161",
+      "unregisterTime": 252.728334,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274162>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 4,
+        "stack": Array [
+          15,
+          15,
+          20,
+          20,
+        ],
+        "threadCPUDelta": Array [
+          3,
+          0,
+          5,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274162",
+      "unregisterTime": 262.732625,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274163>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 6,
+        "stack": Array [
+          26,
+          26,
+          31,
+          31,
+          36,
+          36,
+        ],
+        "threadCPUDelta": Array [
+          1,
+          0,
+          5,
+          0,
+          3,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274163",
+      "unregisterTime": 275.7785,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274164>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 9,
+        "stack": Array [
+          42,
+          42,
+          47,
+          47,
+          52,
+          52,
+          57,
+          57,
+          61,
+        ],
+        "threadCPUDelta": Array [
+          6,
+          0,
+          9,
+          0,
+          20,
+          0,
+          6,
+          0,
+          2,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          273.755,
+          274.768584,
+          285.764042,
+          286.765084,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          11,
+          1,
+          11,
+          1,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274164",
+      "unregisterTime": 287.756375,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274165>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 10,
+        "stack": Array [
+          67,
+          67,
+          72,
+          72,
+          77,
+          77,
+          82,
+          82,
+          87,
+          87,
+        ],
+        "threadCPUDelta": Array [
+          2,
+          0,
+          6,
+          0,
+          4,
+          0,
+          5,
+          0,
+          4,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+          275.7785,
+          287.756375,
+          288.76475,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+          1,
+          12,
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274165",
+      "unregisterTime": 300.814417,
+    },
+  ],
+}
+`;
+
+exports[`profiler-edit tool loads a profile from a storage hash 1`] = `
+Object {
+  "counters": Array [],
+  "libs": Array [
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "F635824E318B3F0C842CC369737F2B680",
+      "codeId": "F635824E318B3F0C842CC369737F2B68",
+      "debugName": "dyld",
+      "debugPath": "/usr/lib/dyld",
+      "name": "dyld",
+      "path": "/usr/lib/dyld",
+    },
+    Object {
+      "arch": "arm64",
+      "breakpadId": "F61DA4D57CBB38CA8BDF059C645834520",
+      "codeId": "F61DA4D57CBB38CA8BDF059C64583452",
+      "debugName": "a.out",
+      "debugPath": "/usr/helloworld/a.out",
+      "name": "a.out",
+      "path": "/usr/helloworld/a.out",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "E03E84786F5C3D21A79A58408F5140000",
+      "codeId": "E03E84786F5C3D21A79A58408F514000",
+      "debugName": "libsystem_pthread.dylib",
+      "debugPath": "/usr/lib/system/libsystem_pthread.dylib",
+      "name": "libsystem_pthread.dylib",
+      "path": "/usr/lib/system/libsystem_pthread.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "71FF45B8F14E36669E966CF58315B91D0",
+      "codeId": "71FF45B8F14E36669E966CF58315B91D",
+      "debugName": "libsystem_kernel.dylib",
+      "debugPath": "/usr/lib/system/libsystem_kernel.dylib",
+      "name": "libsystem_kernel.dylib",
+      "path": "/usr/lib/system/libsystem_kernel.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "D30F183093D03D0B8CBA9544E84BFD5B0",
+      "codeId": "D30F183093D03D0B8CBA9544E84BFD5B",
+      "debugName": "libsystem_c.dylib",
+      "debugPath": "/usr/lib/system/libsystem_c.dylib",
+      "name": "libsystem_c.dylib",
+      "path": "/usr/lib/system/libsystem_c.dylib",
+    },
+    Object {
+      "arch": "arm64e",
+      "breakpadId": "B4BF9F8931D737428CE7AB3554F9F5250",
+      "codeId": "B4BF9F8931D737428CE7AB3554F9F525",
+      "debugName": "libsystem_platform.dylib",
+      "debugPath": "/usr/lib/system/libsystem_platform.dylib",
+      "name": "libsystem_platform.dylib",
+      "path": "/usr/lib/system/libsystem_platform.dylib",
+    },
+  ],
+  "meta": Object {
+    "categories": Array [
+      Object {
+        "color": "grey",
+        "name": "Other",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+      Object {
+        "color": "yellow",
+        "name": "User",
+        "subcategories": Array [
+          "Other",
+        ],
+      },
+    ],
+    "debug": false,
+    "extensions": Object {
+      "baseURL": Array [],
+      "id": Array [],
+      "length": 0,
+      "name": Array [],
+    },
+    "interval": 1,
+    "markerSchema": Array [],
+    "oscpu": "macOS 14.6.1",
+    "pausedRanges": Array [],
+    "preprocessedProfileVersion": 62,
+    "processType": 0,
+    "product": "a.out",
+    "sampleUnits": Object {
+      "eventDelay": "ms",
+      "threadCPUDelta": "µs",
+      "time": "ms",
+    },
+    "sourceCodeIsNotOnSearchfox": true,
+    "startTime": 1726433495880.2869,
+    "symbolicated": true,
+    "usesOnlyOneStackType": true,
+    "version": 24,
+  },
+  "pages": Array [],
+  "profilerOverhead": Array [],
+  "shared": Object {
+    "frameTable": Object {
+      "address": Array [
+        24915,
+        16067,
+        38027,
+        11180,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+        28575,
+        30367,
+        18819,
+        16188,
+        28563,
+        15795,
+        15667,
+        54399,
+        54631,
+        17384,
+        15719,
+      ],
+      "category": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+      "column": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "func": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+        4,
+        11,
+        12,
+        14,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        6,
+      ],
+      "inlineDepth": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+      "innerWindowID": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 42,
+      "line": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "nativeSymbol": Array [
+        0,
+        1,
+        4,
+        8,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+        5,
+        6,
+        7,
+        12,
+        5,
+        2,
+        3,
+        10,
+        11,
+        9,
+        3,
+      ],
+      "subcategory": Array [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+      ],
+    },
+    "funcTable": Object {
+      "columnNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "isJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "length": 15,
+      "lineNumber": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "name": Array [
+        21,
+        22,
+        25,
+        29,
+        26,
+        23,
+        24,
+        31,
+        32,
+        30,
+        15,
+        27,
+        28,
+        18,
+        33,
+      ],
+      "relevantForJS": Array [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
+      "resource": Array [
+        0,
+        1,
+        2,
+        3,
+        2,
+        1,
+        1,
+        4,
+        4,
+        3,
+        1,
+        2,
+        2,
+        2,
+        5,
+      ],
+      "source": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+    },
+    "nativeSymbols": Object {
+      "address": Array [
+        22440,
+        15828,
+        15752,
+        15644,
+        37420,
+        28428,
+        30256,
+        18740,
+        11172,
+        17376,
+        54332,
+        54412,
+        16080,
+      ],
+      "functionSize": Array [
+        2788,
+        380,
+        76,
+        108,
+        1028,
+        320,
+        120,
+        92,
+        44,
+        44,
+        80,
+        464,
+        212,
+      ],
+      "length": 13,
+      "libIndex": Array [
+        0,
+        1,
+        1,
+        1,
+        2,
+        2,
+        2,
+        2,
+        3,
+        3,
+        4,
+        4,
+        5,
+      ],
+      "name": Array [
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        31,
+        32,
+        33,
+      ],
+    },
+    "resourceTable": Object {
+      "host": Array [
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+      ],
+      "length": 6,
+      "lib": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+      ],
+      "name": Array [
+        4,
+        5,
+        6,
+        7,
+        14,
+        20,
+      ],
+      "type": Array [
+        1,
+        1,
+        1,
+        1,
+        1,
+        1,
+      ],
+    },
+    "sources": Object {
+      "filename": Array [],
+      "id": Array [],
+      "length": 0,
+      "sourceMapURL": Array [],
+      "startColumn": Array [],
+      "startLine": Array [],
+    },
+    "stackTable": Object {
+      "frame": Array [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+        10,
+        11,
+        12,
+        13,
+        14,
+        15,
+        16,
+        12,
+        13,
+        14,
+        15,
+        17,
+        18,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        23,
+        19,
+        20,
+        21,
+        22,
+        24,
+        25,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        30,
+        26,
+        27,
+        28,
+        29,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+        41,
+        37,
+        38,
+        39,
+        40,
+      ],
+      "length": 88,
+      "prefix": Array [
+        null,
+        0,
+        1,
+        2,
+        null,
+        4,
+        5,
+        6,
+        7,
+        8,
+        null,
+        10,
+        11,
+        12,
+        13,
+        14,
+        11,
+        16,
+        17,
+        18,
+        19,
+        null,
+        21,
+        22,
+        23,
+        24,
+        25,
+        22,
+        27,
+        28,
+        29,
+        30,
+        27,
+        32,
+        33,
+        34,
+        35,
+        null,
+        37,
+        38,
+        39,
+        40,
+        41,
+        38,
+        43,
+        44,
+        45,
+        46,
+        43,
+        48,
+        49,
+        50,
+        51,
+        48,
+        53,
+        54,
+        55,
+        56,
+        null,
+        58,
+        59,
+        60,
+        null,
+        62,
+        63,
+        64,
+        65,
+        66,
+        63,
+        68,
+        69,
+        70,
+        71,
+        68,
+        73,
+        74,
+        75,
+        76,
+        73,
+        78,
+        79,
+        80,
+        81,
+        78,
+        83,
+        84,
+        85,
+        86,
+      ],
+    },
+    "stringArray": Array [
+      "0x6153",
+      "0x3ec3",
+      "0x948b",
+      "0x2bac",
+      "dyld",
+      "a.out",
+      "libsystem_pthread.dylib",
+      "libsystem_kernel.dylib",
+      "0x6f93",
+      "0x3db3",
+      "0x3d33",
+      "0xd47f",
+      "0xd567",
+      "0x43e8",
+      "libsystem_c.dylib",
+      "0x3d67",
+      "0x6f9f",
+      "0x769f",
+      "0x4983",
+      "0x3f3c",
+      "libsystem_platform.dylib",
+      "start",
+      "main",
+      "threadfunc(void*)",
+      "fac(unsigned long)",
+      "_pthread_join",
+      "_pthread_start",
+      "_pthread_exit",
+      "_pthread_terminate_invoke",
+      "__ulock_wait",
+      "__semwait_signal",
+      "usleep",
+      "nanosleep",
+      "_platform_memset",
+    ],
+  },
+  "threads": Array [
+    Object {
+      "isMainThread": true,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "a.out",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 237.805292,
+      "samples": Object {
+        "length": 11,
+        "stack": Array [
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+          3,
+        ],
+        "threadCPUDelta": Array [
+          11273,
+          0,
+          8,
+          0,
+          3,
+          4,
+          0,
+          30,
+          0,
+          21,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          263.723459,
+          274.768584,
+          275.7785,
+          286.765084,
+          287.756375,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          1,
+          11,
+          1,
+          11,
+          1,
+          12,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274156",
+      "unregisterTime": 300.814417,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274161>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 2,
+        "stack": Array [
+          9,
+          9,
+        ],
+        "threadCPUDelta": Array [
+          7,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+        ],
+        "weight": Array [
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274161",
+      "unregisterTime": 252.728334,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274162>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 4,
+        "stack": Array [
+          15,
+          15,
+          20,
+          20,
+        ],
+        "threadCPUDelta": Array [
+          3,
+          0,
+          5,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274162",
+      "unregisterTime": 262.732625,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274163>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 6,
+        "stack": Array [
+          26,
+          26,
+          31,
+          31,
+          36,
+          36,
+        ],
+        "threadCPUDelta": Array [
+          1,
+          0,
+          5,
+          0,
+          3,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274163",
+      "unregisterTime": 275.7785,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274164>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 9,
+        "stack": Array [
+          42,
+          42,
+          47,
+          47,
+          52,
+          52,
+          57,
+          57,
+          61,
+        ],
+        "threadCPUDelta": Array [
+          6,
+          0,
+          9,
+          0,
+          20,
+          0,
+          6,
+          0,
+          2,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          261.724667,
+          262.732625,
+          273.755,
+          274.768584,
+          285.764042,
+          286.765084,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          9,
+          1,
+          11,
+          1,
+          11,
+          1,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274164",
+      "unregisterTime": 287.756375,
+    },
+    Object {
+      "isMainThread": false,
+      "markers": Object {
+        "category": Array [],
+        "data": Array [],
+        "endTime": Array [],
+        "length": 0,
+        "name": Array [],
+        "phase": Array [],
+        "startTime": Array [],
+      },
+      "name": "Thread <6274165>",
+      "pausedRanges": Array [],
+      "pid": "56127",
+      "processName": "a.out",
+      "processShutdownTime": 300.814417,
+      "processStartupTime": 237.805292,
+      "processType": "default",
+      "registerTime": 240.520375,
+      "samples": Object {
+        "length": 10,
+        "stack": Array [
+          67,
+          67,
+          72,
+          72,
+          77,
+          77,
+          82,
+          82,
+          87,
+          87,
+        ],
+        "threadCPUDelta": Array [
+          2,
+          0,
+          6,
+          0,
+          4,
+          0,
+          5,
+          0,
+          4,
+          0,
+        ],
+        "time": Array [
+          240.520375,
+          251.722709,
+          252.728334,
+          263.723459,
+          264.733042,
+          274.768584,
+          275.7785,
+          287.756375,
+          288.76475,
+          299.7795,
+        ],
+        "weight": Array [
+          1,
+          11,
+          1,
+          11,
+          1,
+          10,
+          1,
+          12,
+          1,
+          11,
+        ],
+        "weightType": "samples",
+      },
+      "tid": "6274165",
+      "unregisterTime": 300.814417,
+    },
+  ],
+}
+`;
diff --git a/src/test/integration/profiler-edit/profiler-edit.test.ts b/src/test/integration/profiler-edit/profiler-edit.test.ts
new file mode 100644
index 0000000000..26baa85eac
--- /dev/null
+++ b/src/test/integration/profiler-edit/profiler-edit.test.ts
@@ -0,0 +1,194 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import type { CliOptions } from '../../../node-tools/profiler-edit';
+import { run } from '../../../node-tools/profiler-edit';
+import { GOOGLE_STORAGE_BUCKET } from 'firefox-profiler/app-logic/constants';
+
+// An end-to-end test for the profiler-edit tool's symbolication feature.
+
+// Note that this test is running in a Jest environment which includes
+// various mocks / shims that makes it feel more like a browser environment.
+// For example, window.Worker is available.
+//
+// This is somewhat unfortunate because profiler-edit is intended to
+// run in vanilla Node, not in a browser, so we're not really testing
+// under realistic conditions here.
+//
+// It may be worth splitting this test off into a separate "vanilla Node"
+// testing environment at some point.
+
+describe('profiler-edit tool', function () {
+  async function runToTempFileAndReturnOutput(options: CliOptions) {
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'profiler-edit-test')
+    );
+    const tempFile = path.join(tempDir, 'temp.json');
+    options.output = tempFile;
+
+    try {
+      await run(options);
+      return JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
+    } finally {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  }
+
+  it('is symbolicating a trace correctly', async function () {
+    jest.spyOn(console, 'log').mockImplementation(() => {});
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+    const symbolsJson = fs.readFileSync(
+      'src/test/integration/profiler-edit/symbol-server-response.json'
+    );
+
+    window.fetchMock.post(
+      'http://symbol.server/symbolicate/v5',
+      new Response(symbolsJson as any)
+    );
+
+    const options: CliOptions = {
+      input: {
+        type: 'FILE',
+        path: 'src/test/integration/profiler-edit/unsymbolicated.json',
+      },
+      output: '',
+      symbolicateWithServer: 'http://symbol.server',
+    };
+
+    const result = await runToTempFileAndReturnOutput(options);
+
+    expect(console.warn).not.toHaveBeenCalled();
+    expect(result).toMatchSnapshot();
+  });
+
+  it('is symbolicating a .json.gz trace correctly', async function () {
+    jest.spyOn(console, 'log').mockImplementation(() => {});
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+    const symbolsJson = fs.readFileSync(
+      'src/test/integration/profiler-edit/symbol-server-response.json'
+    );
+
+    window.fetchMock.post(
+      'http://symbol.server/symbolicate/v5',
+      new Response(symbolsJson as any)
+    );
+
+    const options: CliOptions = {
+      input: {
+        type: 'FILE',
+        path: 'src/test/integration/profiler-edit/unsymbolicated.json.gz',
+      },
+      output: '',
+      symbolicateWithServer: 'http://symbol.server',
+    };
+
+    const result = await runToTempFileAndReturnOutput(options);
+
+    expect(console.warn).not.toHaveBeenCalled();
+    expect(result).toMatchSnapshot();
+  });
+
+  it('writes gzip-compressed output when the output filename ends with .gz', async function () {
+    jest.spyOn(console, 'log').mockImplementation(() => {});
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+    const tempDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'profiler-edit-test')
+    );
+    const tempFile = path.join(tempDir, 'out.json.gz');
+
+    try {
+      const options: CliOptions = {
+        input: {
+          type: 'FILE',
+          path: 'src/test/integration/profiler-edit/unsymbolicated.json',
+        },
+        output: tempFile,
+      };
+
+      await run(options);
+
+      const bytes = fs.readFileSync(tempFile);
+      expect(bytes[0]).toBe(0x1f);
+      expect(bytes[1]).toBe(0x8b);
+    } finally {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  it('loads a profile from a URL', async function () {
+    jest.spyOn(console, 'log').mockImplementation(() => {});
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+    const profileJson = fs.readFileSync(
+      'src/test/integration/profiler-edit/unsymbolicated.json'
+    );
+    const symbolsJson = fs.readFileSync(
+      'src/test/integration/profiler-edit/symbol-server-response.json'
+    );
+
+    window.fetchMock.get(
+      'http://example.profile/profile.json',
+      new Response(profileJson as any)
+    );
+    window.fetchMock.post(
+      'http://symbol.server/symbolicate/v5',
+      new Response(symbolsJson as any)
+    );
+
+    const options: CliOptions = {
+      input: {
+        type: 'URL',
+        url: 'http://example.profile/profile.json',
+      },
+      output: '',
+      symbolicateWithServer: 'http://symbol.server',
+    };
+
+    const result = await runToTempFileAndReturnOutput(options);
+
+    expect(console.warn).not.toHaveBeenCalled();
+    expect(result).toMatchSnapshot();
+  });
+
+  it('loads a profile from a storage hash', async function () {
+    jest.spyOn(console, 'log').mockImplementation(() => {});
+    jest.spyOn(console, 'warn').mockImplementation(() => {});
+
+    const profileJson = fs.readFileSync(
+      'src/test/integration/profiler-edit/unsymbolicated.json'
+    );
+    const symbolsJson = fs.readFileSync(
+      'src/test/integration/profiler-edit/symbol-server-response.json'
+    );
+
+    const hash = 'testHash123';
+    window.fetchMock.get(
+      `https://storage.googleapis.com/${GOOGLE_STORAGE_BUCKET}/${hash}`,
+      new Response(profileJson as any)
+    );
+    window.fetchMock.post(
+      'http://symbol.server/symbolicate/v5',
+      new Response(symbolsJson as any)
+    );
+
+    const options: CliOptions = {
+      input: {
+        type: 'HASH',
+        hash,
+      },
+      output: '',
+      symbolicateWithServer: 'http://symbol.server',
+    };
+
+    const result = await runToTempFileAndReturnOutput(options);
+
+    expect(console.warn).not.toHaveBeenCalled();
+    expect(result).toMatchSnapshot();
+  });
+});
diff --git a/src/test/integration/symbolicator-cli/symbol-server-response.json b/src/test/integration/profiler-edit/symbol-server-response.json
similarity index 100%
rename from src/test/integration/symbolicator-cli/symbol-server-response.json
rename to src/test/integration/profiler-edit/symbol-server-response.json
diff --git a/src/test/integration/symbolicator-cli/unsymbolicated.json b/src/test/integration/profiler-edit/unsymbolicated.json
similarity index 100%
rename from src/test/integration/symbolicator-cli/unsymbolicated.json
rename to src/test/integration/profiler-edit/unsymbolicated.json
diff --git a/src/test/integration/symbolicator-cli/unsymbolicated.json.gz b/src/test/integration/profiler-edit/unsymbolicated.json.gz
similarity index 100%
rename from src/test/integration/symbolicator-cli/unsymbolicated.json.gz
rename to src/test/integration/profiler-edit/unsymbolicated.json.gz
diff --git a/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap b/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap
deleted file mode 100644
index 3af235db1a..0000000000
--- a/src/test/integration/symbolicator-cli/__snapshots__/symbolicator-cli.test.ts.snap
+++ /dev/null
@@ -1,2657 +0,0 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-
-exports[`symbolicator-cli tool is symbolicating a .json.gz trace correctly 1`] = `
-Object {
-  "counters": Array [],
-  "libs": Array [
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "F635824E318B3F0C842CC369737F2B680",
-      "codeId": "F635824E318B3F0C842CC369737F2B68",
-      "debugName": "dyld",
-      "debugPath": "/usr/lib/dyld",
-      "name": "dyld",
-      "path": "/usr/lib/dyld",
-    },
-    Object {
-      "arch": "arm64",
-      "breakpadId": "F61DA4D57CBB38CA8BDF059C645834520",
-      "codeId": "F61DA4D57CBB38CA8BDF059C64583452",
-      "debugName": "a.out",
-      "debugPath": "/usr/helloworld/a.out",
-      "name": "a.out",
-      "path": "/usr/helloworld/a.out",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "E03E84786F5C3D21A79A58408F5140000",
-      "codeId": "E03E84786F5C3D21A79A58408F514000",
-      "debugName": "libsystem_pthread.dylib",
-      "debugPath": "/usr/lib/system/libsystem_pthread.dylib",
-      "name": "libsystem_pthread.dylib",
-      "path": "/usr/lib/system/libsystem_pthread.dylib",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "71FF45B8F14E36669E966CF58315B91D0",
-      "codeId": "71FF45B8F14E36669E966CF58315B91D",
-      "debugName": "libsystem_kernel.dylib",
-      "debugPath": "/usr/lib/system/libsystem_kernel.dylib",
-      "name": "libsystem_kernel.dylib",
-      "path": "/usr/lib/system/libsystem_kernel.dylib",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "D30F183093D03D0B8CBA9544E84BFD5B0",
-      "codeId": "D30F183093D03D0B8CBA9544E84BFD5B",
-      "debugName": "libsystem_c.dylib",
-      "debugPath": "/usr/lib/system/libsystem_c.dylib",
-      "name": "libsystem_c.dylib",
-      "path": "/usr/lib/system/libsystem_c.dylib",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "B4BF9F8931D737428CE7AB3554F9F5250",
-      "codeId": "B4BF9F8931D737428CE7AB3554F9F525",
-      "debugName": "libsystem_platform.dylib",
-      "debugPath": "/usr/lib/system/libsystem_platform.dylib",
-      "name": "libsystem_platform.dylib",
-      "path": "/usr/lib/system/libsystem_platform.dylib",
-    },
-  ],
-  "meta": Object {
-    "categories": Array [
-      Object {
-        "color": "grey",
-        "name": "Other",
-        "subcategories": Array [
-          "Other",
-        ],
-      },
-      Object {
-        "color": "yellow",
-        "name": "User",
-        "subcategories": Array [
-          "Other",
-        ],
-      },
-    ],
-    "debug": false,
-    "extensions": Object {
-      "baseURL": Array [],
-      "id": Array [],
-      "length": 0,
-      "name": Array [],
-    },
-    "interval": 1,
-    "markerSchema": Array [],
-    "oscpu": "macOS 14.6.1",
-    "pausedRanges": Array [],
-    "preprocessedProfileVersion": 62,
-    "processType": 0,
-    "product": "a.out",
-    "sampleUnits": Object {
-      "eventDelay": "ms",
-      "threadCPUDelta": "µs",
-      "time": "ms",
-    },
-    "sourceCodeIsNotOnSearchfox": true,
-    "startTime": 1726433495880.2869,
-    "symbolicated": true,
-    "usesOnlyOneStackType": true,
-    "version": 24,
-  },
-  "pages": Array [],
-  "profilerOverhead": Array [],
-  "shared": Object {
-    "frameTable": Object {
-      "address": Array [
-        24915,
-        16067,
-        38027,
-        11180,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-        28575,
-        30367,
-        18819,
-        16188,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-      ],
-      "category": Array [
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-      ],
-      "column": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "func": Array [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-        4,
-        11,
-        12,
-        14,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-      ],
-      "inlineDepth": Array [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-      ],
-      "innerWindowID": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "length": 42,
-      "line": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "nativeSymbol": Array [
-        0,
-        1,
-        4,
-        8,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-        5,
-        6,
-        7,
-        12,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-      ],
-      "subcategory": Array [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-      ],
-    },
-    "funcTable": Object {
-      "columnNumber": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "isJS": Array [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-      ],
-      "length": 15,
-      "lineNumber": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "name": Array [
-        21,
-        22,
-        25,
-        29,
-        26,
-        23,
-        24,
-        31,
-        32,
-        30,
-        15,
-        27,
-        28,
-        18,
-        33,
-      ],
-      "relevantForJS": Array [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-      ],
-      "resource": Array [
-        0,
-        1,
-        2,
-        3,
-        2,
-        1,
-        1,
-        4,
-        4,
-        3,
-        1,
-        2,
-        2,
-        2,
-        5,
-      ],
-      "source": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-    },
-    "nativeSymbols": Object {
-      "address": Array [
-        22440,
-        15828,
-        15752,
-        15644,
-        37420,
-        28428,
-        30256,
-        18740,
-        11172,
-        17376,
-        54332,
-        54412,
-        16080,
-      ],
-      "functionSize": Array [
-        2788,
-        380,
-        76,
-        108,
-        1028,
-        320,
-        120,
-        92,
-        44,
-        44,
-        80,
-        464,
-        212,
-      ],
-      "length": 13,
-      "libIndex": Array [
-        0,
-        1,
-        1,
-        1,
-        2,
-        2,
-        2,
-        2,
-        3,
-        3,
-        4,
-        4,
-        5,
-      ],
-      "name": Array [
-        21,
-        22,
-        23,
-        24,
-        25,
-        26,
-        27,
-        28,
-        29,
-        30,
-        31,
-        32,
-        33,
-      ],
-    },
-    "resourceTable": Object {
-      "host": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "length": 6,
-      "lib": Array [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-      ],
-      "name": Array [
-        4,
-        5,
-        6,
-        7,
-        14,
-        20,
-      ],
-      "type": Array [
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-      ],
-    },
-    "sources": Object {
-      "filename": Array [],
-      "id": Array [],
-      "length": 0,
-      "sourceMapURL": Array [],
-      "startColumn": Array [],
-      "startLine": Array [],
-    },
-    "stackTable": Object {
-      "frame": Array [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10,
-        11,
-        12,
-        13,
-        14,
-        15,
-        16,
-        12,
-        13,
-        14,
-        15,
-        17,
-        18,
-        19,
-        20,
-        21,
-        22,
-        23,
-        19,
-        20,
-        21,
-        22,
-        23,
-        19,
-        20,
-        21,
-        22,
-        24,
-        25,
-        26,
-        27,
-        28,
-        29,
-        30,
-        26,
-        27,
-        28,
-        29,
-        30,
-        26,
-        27,
-        28,
-        29,
-        30,
-        26,
-        27,
-        28,
-        29,
-        31,
-        32,
-        33,
-        34,
-        35,
-        36,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-      ],
-      "length": 88,
-      "prefix": Array [
-        null,
-        0,
-        1,
-        2,
-        null,
-        4,
-        5,
-        6,
-        7,
-        8,
-        null,
-        10,
-        11,
-        12,
-        13,
-        14,
-        11,
-        16,
-        17,
-        18,
-        19,
-        null,
-        21,
-        22,
-        23,
-        24,
-        25,
-        22,
-        27,
-        28,
-        29,
-        30,
-        27,
-        32,
-        33,
-        34,
-        35,
-        null,
-        37,
-        38,
-        39,
-        40,
-        41,
-        38,
-        43,
-        44,
-        45,
-        46,
-        43,
-        48,
-        49,
-        50,
-        51,
-        48,
-        53,
-        54,
-        55,
-        56,
-        null,
-        58,
-        59,
-        60,
-        null,
-        62,
-        63,
-        64,
-        65,
-        66,
-        63,
-        68,
-        69,
-        70,
-        71,
-        68,
-        73,
-        74,
-        75,
-        76,
-        73,
-        78,
-        79,
-        80,
-        81,
-        78,
-        83,
-        84,
-        85,
-        86,
-      ],
-    },
-    "stringArray": Array [
-      "0x6153",
-      "0x3ec3",
-      "0x948b",
-      "0x2bac",
-      "dyld",
-      "a.out",
-      "libsystem_pthread.dylib",
-      "libsystem_kernel.dylib",
-      "0x6f93",
-      "0x3db3",
-      "0x3d33",
-      "0xd47f",
-      "0xd567",
-      "0x43e8",
-      "libsystem_c.dylib",
-      "0x3d67",
-      "0x6f9f",
-      "0x769f",
-      "0x4983",
-      "0x3f3c",
-      "libsystem_platform.dylib",
-      "start",
-      "main",
-      "threadfunc(void*)",
-      "fac(unsigned long)",
-      "_pthread_join",
-      "_pthread_start",
-      "_pthread_exit",
-      "_pthread_terminate_invoke",
-      "__ulock_wait",
-      "__semwait_signal",
-      "usleep",
-      "nanosleep",
-      "_platform_memset",
-    ],
-  },
-  "threads": Array [
-    Object {
-      "isMainThread": true,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "a.out",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 237.805292,
-      "samples": Object {
-        "length": 11,
-        "stack": Array [
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-        ],
-        "threadCPUDelta": Array [
-          11273,
-          0,
-          8,
-          0,
-          3,
-          4,
-          0,
-          30,
-          0,
-          21,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          261.724667,
-          262.732625,
-          263.723459,
-          274.768584,
-          275.7785,
-          286.765084,
-          287.756375,
-          299.7795,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          9,
-          1,
-          1,
-          11,
-          1,
-          11,
-          1,
-          12,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274156",
-      "unregisterTime": 300.814417,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274161>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 2,
-        "stack": Array [
-          9,
-          9,
-        ],
-        "threadCPUDelta": Array [
-          7,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-        ],
-        "weight": Array [
-          1,
-          11,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274161",
-      "unregisterTime": 252.728334,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274162>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 4,
-        "stack": Array [
-          15,
-          15,
-          20,
-          20,
-        ],
-        "threadCPUDelta": Array [
-          3,
-          0,
-          5,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          261.724667,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          9,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274162",
-      "unregisterTime": 262.732625,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274163>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 6,
-        "stack": Array [
-          26,
-          26,
-          31,
-          31,
-          36,
-          36,
-        ],
-        "threadCPUDelta": Array [
-          1,
-          0,
-          5,
-          0,
-          3,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          263.723459,
-          264.733042,
-          274.768584,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          11,
-          1,
-          10,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274163",
-      "unregisterTime": 275.7785,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274164>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 9,
-        "stack": Array [
-          42,
-          42,
-          47,
-          47,
-          52,
-          52,
-          57,
-          57,
-          61,
-        ],
-        "threadCPUDelta": Array [
-          6,
-          0,
-          9,
-          0,
-          20,
-          0,
-          6,
-          0,
-          2,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          261.724667,
-          262.732625,
-          273.755,
-          274.768584,
-          285.764042,
-          286.765084,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          9,
-          1,
-          11,
-          1,
-          11,
-          1,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274164",
-      "unregisterTime": 287.756375,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274165>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 10,
-        "stack": Array [
-          67,
-          67,
-          72,
-          72,
-          77,
-          77,
-          82,
-          82,
-          87,
-          87,
-        ],
-        "threadCPUDelta": Array [
-          2,
-          0,
-          6,
-          0,
-          4,
-          0,
-          5,
-          0,
-          4,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          263.723459,
-          264.733042,
-          274.768584,
-          275.7785,
-          287.756375,
-          288.76475,
-          299.7795,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          11,
-          1,
-          10,
-          1,
-          12,
-          1,
-          11,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274165",
-      "unregisterTime": 300.814417,
-    },
-  ],
-}
-`;
-
-exports[`symbolicator-cli tool is symbolicating a trace correctly 1`] = `
-Object {
-  "counters": Array [],
-  "libs": Array [
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "F635824E318B3F0C842CC369737F2B680",
-      "codeId": "F635824E318B3F0C842CC369737F2B68",
-      "debugName": "dyld",
-      "debugPath": "/usr/lib/dyld",
-      "name": "dyld",
-      "path": "/usr/lib/dyld",
-    },
-    Object {
-      "arch": "arm64",
-      "breakpadId": "F61DA4D57CBB38CA8BDF059C645834520",
-      "codeId": "F61DA4D57CBB38CA8BDF059C64583452",
-      "debugName": "a.out",
-      "debugPath": "/usr/helloworld/a.out",
-      "name": "a.out",
-      "path": "/usr/helloworld/a.out",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "E03E84786F5C3D21A79A58408F5140000",
-      "codeId": "E03E84786F5C3D21A79A58408F514000",
-      "debugName": "libsystem_pthread.dylib",
-      "debugPath": "/usr/lib/system/libsystem_pthread.dylib",
-      "name": "libsystem_pthread.dylib",
-      "path": "/usr/lib/system/libsystem_pthread.dylib",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "71FF45B8F14E36669E966CF58315B91D0",
-      "codeId": "71FF45B8F14E36669E966CF58315B91D",
-      "debugName": "libsystem_kernel.dylib",
-      "debugPath": "/usr/lib/system/libsystem_kernel.dylib",
-      "name": "libsystem_kernel.dylib",
-      "path": "/usr/lib/system/libsystem_kernel.dylib",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "D30F183093D03D0B8CBA9544E84BFD5B0",
-      "codeId": "D30F183093D03D0B8CBA9544E84BFD5B",
-      "debugName": "libsystem_c.dylib",
-      "debugPath": "/usr/lib/system/libsystem_c.dylib",
-      "name": "libsystem_c.dylib",
-      "path": "/usr/lib/system/libsystem_c.dylib",
-    },
-    Object {
-      "arch": "arm64e",
-      "breakpadId": "B4BF9F8931D737428CE7AB3554F9F5250",
-      "codeId": "B4BF9F8931D737428CE7AB3554F9F525",
-      "debugName": "libsystem_platform.dylib",
-      "debugPath": "/usr/lib/system/libsystem_platform.dylib",
-      "name": "libsystem_platform.dylib",
-      "path": "/usr/lib/system/libsystem_platform.dylib",
-    },
-  ],
-  "meta": Object {
-    "categories": Array [
-      Object {
-        "color": "grey",
-        "name": "Other",
-        "subcategories": Array [
-          "Other",
-        ],
-      },
-      Object {
-        "color": "yellow",
-        "name": "User",
-        "subcategories": Array [
-          "Other",
-        ],
-      },
-    ],
-    "debug": false,
-    "extensions": Object {
-      "baseURL": Array [],
-      "id": Array [],
-      "length": 0,
-      "name": Array [],
-    },
-    "interval": 1,
-    "markerSchema": Array [],
-    "oscpu": "macOS 14.6.1",
-    "pausedRanges": Array [],
-    "preprocessedProfileVersion": 62,
-    "processType": 0,
-    "product": "a.out",
-    "sampleUnits": Object {
-      "eventDelay": "ms",
-      "threadCPUDelta": "µs",
-      "time": "ms",
-    },
-    "sourceCodeIsNotOnSearchfox": true,
-    "startTime": 1726433495880.2869,
-    "symbolicated": true,
-    "usesOnlyOneStackType": true,
-    "version": 24,
-  },
-  "pages": Array [],
-  "profilerOverhead": Array [],
-  "shared": Object {
-    "frameTable": Object {
-      "address": Array [
-        24915,
-        16067,
-        38027,
-        11180,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-        28575,
-        30367,
-        18819,
-        16188,
-        28563,
-        15795,
-        15667,
-        54399,
-        54631,
-        17384,
-        15719,
-      ],
-      "category": Array [
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-      ],
-      "column": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "func": Array [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-        4,
-        11,
-        12,
-        14,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        6,
-      ],
-      "inlineDepth": Array [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-      ],
-      "innerWindowID": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "length": 42,
-      "line": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "nativeSymbol": Array [
-        0,
-        1,
-        4,
-        8,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-        5,
-        6,
-        7,
-        12,
-        5,
-        2,
-        3,
-        10,
-        11,
-        9,
-        3,
-      ],
-      "subcategory": Array [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-      ],
-    },
-    "funcTable": Object {
-      "columnNumber": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "isJS": Array [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-      ],
-      "length": 15,
-      "lineNumber": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "name": Array [
-        21,
-        22,
-        25,
-        29,
-        26,
-        23,
-        24,
-        31,
-        32,
-        30,
-        15,
-        27,
-        28,
-        18,
-        33,
-      ],
-      "relevantForJS": Array [
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-        false,
-      ],
-      "resource": Array [
-        0,
-        1,
-        2,
-        3,
-        2,
-        1,
-        1,
-        4,
-        4,
-        3,
-        1,
-        2,
-        2,
-        2,
-        5,
-      ],
-      "source": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-    },
-    "nativeSymbols": Object {
-      "address": Array [
-        22440,
-        15828,
-        15752,
-        15644,
-        37420,
-        28428,
-        30256,
-        18740,
-        11172,
-        17376,
-        54332,
-        54412,
-        16080,
-      ],
-      "functionSize": Array [
-        2788,
-        380,
-        76,
-        108,
-        1028,
-        320,
-        120,
-        92,
-        44,
-        44,
-        80,
-        464,
-        212,
-      ],
-      "length": 13,
-      "libIndex": Array [
-        0,
-        1,
-        1,
-        1,
-        2,
-        2,
-        2,
-        2,
-        3,
-        3,
-        4,
-        4,
-        5,
-      ],
-      "name": Array [
-        21,
-        22,
-        23,
-        24,
-        25,
-        26,
-        27,
-        28,
-        29,
-        30,
-        31,
-        32,
-        33,
-      ],
-    },
-    "resourceTable": Object {
-      "host": Array [
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-      ],
-      "length": 6,
-      "lib": Array [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-      ],
-      "name": Array [
-        4,
-        5,
-        6,
-        7,
-        14,
-        20,
-      ],
-      "type": Array [
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-      ],
-    },
-    "sources": Object {
-      "filename": Array [],
-      "id": Array [],
-      "length": 0,
-      "sourceMapURL": Array [],
-      "startColumn": Array [],
-      "startLine": Array [],
-    },
-    "stackTable": Object {
-      "frame": Array [
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10,
-        11,
-        12,
-        13,
-        14,
-        15,
-        16,
-        12,
-        13,
-        14,
-        15,
-        17,
-        18,
-        19,
-        20,
-        21,
-        22,
-        23,
-        19,
-        20,
-        21,
-        22,
-        23,
-        19,
-        20,
-        21,
-        22,
-        24,
-        25,
-        26,
-        27,
-        28,
-        29,
-        30,
-        26,
-        27,
-        28,
-        29,
-        30,
-        26,
-        27,
-        28,
-        29,
-        30,
-        26,
-        27,
-        28,
-        29,
-        31,
-        32,
-        33,
-        34,
-        35,
-        36,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-        41,
-        37,
-        38,
-        39,
-        40,
-      ],
-      "length": 88,
-      "prefix": Array [
-        null,
-        0,
-        1,
-        2,
-        null,
-        4,
-        5,
-        6,
-        7,
-        8,
-        null,
-        10,
-        11,
-        12,
-        13,
-        14,
-        11,
-        16,
-        17,
-        18,
-        19,
-        null,
-        21,
-        22,
-        23,
-        24,
-        25,
-        22,
-        27,
-        28,
-        29,
-        30,
-        27,
-        32,
-        33,
-        34,
-        35,
-        null,
-        37,
-        38,
-        39,
-        40,
-        41,
-        38,
-        43,
-        44,
-        45,
-        46,
-        43,
-        48,
-        49,
-        50,
-        51,
-        48,
-        53,
-        54,
-        55,
-        56,
-        null,
-        58,
-        59,
-        60,
-        null,
-        62,
-        63,
-        64,
-        65,
-        66,
-        63,
-        68,
-        69,
-        70,
-        71,
-        68,
-        73,
-        74,
-        75,
-        76,
-        73,
-        78,
-        79,
-        80,
-        81,
-        78,
-        83,
-        84,
-        85,
-        86,
-      ],
-    },
-    "stringArray": Array [
-      "0x6153",
-      "0x3ec3",
-      "0x948b",
-      "0x2bac",
-      "dyld",
-      "a.out",
-      "libsystem_pthread.dylib",
-      "libsystem_kernel.dylib",
-      "0x6f93",
-      "0x3db3",
-      "0x3d33",
-      "0xd47f",
-      "0xd567",
-      "0x43e8",
-      "libsystem_c.dylib",
-      "0x3d67",
-      "0x6f9f",
-      "0x769f",
-      "0x4983",
-      "0x3f3c",
-      "libsystem_platform.dylib",
-      "start",
-      "main",
-      "threadfunc(void*)",
-      "fac(unsigned long)",
-      "_pthread_join",
-      "_pthread_start",
-      "_pthread_exit",
-      "_pthread_terminate_invoke",
-      "__ulock_wait",
-      "__semwait_signal",
-      "usleep",
-      "nanosleep",
-      "_platform_memset",
-    ],
-  },
-  "threads": Array [
-    Object {
-      "isMainThread": true,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "a.out",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 237.805292,
-      "samples": Object {
-        "length": 11,
-        "stack": Array [
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-          3,
-        ],
-        "threadCPUDelta": Array [
-          11273,
-          0,
-          8,
-          0,
-          3,
-          4,
-          0,
-          30,
-          0,
-          21,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          261.724667,
-          262.732625,
-          263.723459,
-          274.768584,
-          275.7785,
-          286.765084,
-          287.756375,
-          299.7795,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          9,
-          1,
-          1,
-          11,
-          1,
-          11,
-          1,
-          12,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274156",
-      "unregisterTime": 300.814417,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274161>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 2,
-        "stack": Array [
-          9,
-          9,
-        ],
-        "threadCPUDelta": Array [
-          7,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-        ],
-        "weight": Array [
-          1,
-          11,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274161",
-      "unregisterTime": 252.728334,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274162>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 4,
-        "stack": Array [
-          15,
-          15,
-          20,
-          20,
-        ],
-        "threadCPUDelta": Array [
-          3,
-          0,
-          5,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          261.724667,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          9,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274162",
-      "unregisterTime": 262.732625,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274163>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 6,
-        "stack": Array [
-          26,
-          26,
-          31,
-          31,
-          36,
-          36,
-        ],
-        "threadCPUDelta": Array [
-          1,
-          0,
-          5,
-          0,
-          3,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          263.723459,
-          264.733042,
-          274.768584,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          11,
-          1,
-          10,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274163",
-      "unregisterTime": 275.7785,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274164>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 9,
-        "stack": Array [
-          42,
-          42,
-          47,
-          47,
-          52,
-          52,
-          57,
-          57,
-          61,
-        ],
-        "threadCPUDelta": Array [
-          6,
-          0,
-          9,
-          0,
-          20,
-          0,
-          6,
-          0,
-          2,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          261.724667,
-          262.732625,
-          273.755,
-          274.768584,
-          285.764042,
-          286.765084,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          9,
-          1,
-          11,
-          1,
-          11,
-          1,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274164",
-      "unregisterTime": 287.756375,
-    },
-    Object {
-      "isMainThread": false,
-      "markers": Object {
-        "category": Array [],
-        "data": Array [],
-        "endTime": Array [],
-        "length": 0,
-        "name": Array [],
-        "phase": Array [],
-        "startTime": Array [],
-      },
-      "name": "Thread <6274165>",
-      "pausedRanges": Array [],
-      "pid": "56127",
-      "processName": "a.out",
-      "processShutdownTime": 300.814417,
-      "processStartupTime": 237.805292,
-      "processType": "default",
-      "registerTime": 240.520375,
-      "samples": Object {
-        "length": 10,
-        "stack": Array [
-          67,
-          67,
-          72,
-          72,
-          77,
-          77,
-          82,
-          82,
-          87,
-          87,
-        ],
-        "threadCPUDelta": Array [
-          2,
-          0,
-          6,
-          0,
-          4,
-          0,
-          5,
-          0,
-          4,
-          0,
-        ],
-        "time": Array [
-          240.520375,
-          251.722709,
-          252.728334,
-          263.723459,
-          264.733042,
-          274.768584,
-          275.7785,
-          287.756375,
-          288.76475,
-          299.7795,
-        ],
-        "weight": Array [
-          1,
-          11,
-          1,
-          11,
-          1,
-          10,
-          1,
-          12,
-          1,
-          11,
-        ],
-        "weightType": "samples",
-      },
-      "tid": "6274165",
-      "unregisterTime": 300.814417,
-    },
-  ],
-}
-`;
diff --git a/src/test/integration/symbolicator-cli/symbolicator-cli.test.ts b/src/test/integration/symbolicator-cli/symbolicator-cli.test.ts
deleted file mode 100644
index c0dd627b79..0000000000
--- a/src/test/integration/symbolicator-cli/symbolicator-cli.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import type { CliOptions } from '../../../symbolicator-cli';
-import { run } from '../../../symbolicator-cli';
-
-// An end-to-end test for the symbolicator-cli tool.
-
-// Note that this test is running in a Jest environment which includes
-// various mocks / shims that makes it feel more like a browser environment.
-// For example, window.Worker is available.
-//
-// This is somewhat unfortunate because symbolicator-cli is intended to
-// run in vanilla Node, not in a browser, so we're not really testing
-// under realistic conditions here.
-//
-// It may be worth splitting this test off into a separate "vanilla Node"
-// testing environment at some point.
-
-describe('symbolicator-cli tool', function () {
-  async function runToTempFileAndReturnOutput(options: CliOptions) {
-    const tempDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'symbolicator-cli-test')
-    );
-    const tempFile = path.join(tempDir, 'temp.json');
-    options.output = tempFile;
-
-    try {
-      await run(options);
-      return JSON.parse(fs.readFileSync(tempFile, 'utf-8'));
-    } finally {
-      fs.rmSync(tempDir, { recursive: true, force: true });
-    }
-  }
-
-  it('is symbolicating a trace correctly', async function () {
-    jest.spyOn(console, 'log').mockImplementation(() => {});
-    jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-    const symbolsJson = fs.readFileSync(
-      'src/test/integration/symbolicator-cli/symbol-server-response.json'
-    );
-
-    window.fetchMock.post(
-      'http://symbol.server/symbolicate/v5',
-      new Response(symbolsJson as any)
-    );
-
-    const options = {
-      input: 'src/test/integration/symbolicator-cli/unsymbolicated.json',
-      output: '',
-      server: 'http://symbol.server',
-    };
-
-    const result = await runToTempFileAndReturnOutput(options);
-
-    expect(console.warn).not.toHaveBeenCalled();
-    expect(result).toMatchSnapshot();
-  });
-
-  it('is symbolicating a .json.gz trace correctly', async function () {
-    jest.spyOn(console, 'log').mockImplementation(() => {});
-    jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-    const symbolsJson = fs.readFileSync(
-      'src/test/integration/symbolicator-cli/symbol-server-response.json'
-    );
-
-    window.fetchMock.post(
-      'http://symbol.server/symbolicate/v5',
-      new Response(symbolsJson as any)
-    );
-
-    const options = {
-      input: 'src/test/integration/symbolicator-cli/unsymbolicated.json.gz',
-      output: '',
-      server: 'http://symbol.server',
-    };
-
-    const result = await runToTempFileAndReturnOutput(options);
-
-    expect(console.warn).not.toHaveBeenCalled();
-    expect(result).toMatchSnapshot();
-  });
-});
diff --git a/src/test/unit/profiler-edit.test.ts b/src/test/unit/profiler-edit.test.ts
new file mode 100644
index 0000000000..82205160fa
--- /dev/null
+++ b/src/test/unit/profiler-edit.test.ts
@@ -0,0 +1,147 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+import { makeOptionsFromArgv } from '../../node-tools/profiler-edit';
+
+describe('makeOptionsFromArgv', function () {
+  const commonArgs = ['/path/to/node', '/path/to/profiler-edit.js'];
+
+  it('recognizes -i with a file path', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '-i',
+      '/path/to/profile.json',
+      '-o',
+      '/path/to/output.json',
+    ]);
+    expect(options.input).toEqual({
+      type: 'FILE',
+      path: '/path/to/profile.json',
+    });
+    expect(options.output).toEqual('/path/to/output.json');
+    expect(options.symbolicateWithServer).toBeUndefined();
+  });
+
+  it('recognizes -i with an http URL', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '-i',
+      'http://example.com/profile.json',
+      '-o',
+      '/path/to/output.json',
+    ]);
+    expect(options.input).toEqual({
+      type: 'URL',
+      url: 'http://example.com/profile.json',
+    });
+  });
+
+  it('recognizes -i with an https URL', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '-i',
+      'https://example.com/profile.json',
+      '-o',
+      '/path/to/output.json',
+    ]);
+    expect(options.input).toEqual({
+      type: 'URL',
+      url: 'https://example.com/profile.json',
+    });
+  });
+
+  it('recognizes --from-file', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '--from-file',
+      '/path/to/profile.json',
+      '-o',
+      '/path/to/output.json',
+    ]);
+    expect(options.input).toEqual({
+      type: 'FILE',
+      path: '/path/to/profile.json',
+    });
+  });
+
+  it('recognizes --from-url', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '--from-url',
+      'https://example.com/profile.json',
+      '-o',
+      '/path/to/output.json',
+    ]);
+    expect(options.input).toEqual({
+      type: 'URL',
+      url: 'https://example.com/profile.json',
+    });
+  });
+
+  it('recognizes --from-hash', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '--from-hash',
+      'abc123',
+      '-o',
+      '/path/to/output.json',
+    ]);
+    expect(options.input).toEqual({ type: 'HASH', hash: 'abc123' });
+  });
+
+  it('recognizes --output as an alias for -o', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '-i',
+      '/path/to/profile.json',
+      '--output',
+      '/path/to/output.json',
+    ]);
+    expect(options.output).toEqual('/path/to/output.json');
+  });
+
+  it('recognizes optional --symbolicate-with-server', function () {
+    const options = makeOptionsFromArgv([
+      ...commonArgs,
+      '-i',
+      '/path/to/profile.json',
+      '-o',
+      '/path/to/output.json',
+      '--symbolicate-with-server',
+      'http://localhost:8001/',
+    ]);
+    expect(options.symbolicateWithServer).toEqual('http://localhost:8001/');
+  });
+
+  it('throws when no input is provided', function () {
+    expect(() =>
+      makeOptionsFromArgv([...commonArgs, '-o', '/path/to/output.json'])
+    ).toThrow();
+  });
+
+  it('throws when multiple inputs are provided', function () {
+    expect(() =>
+      makeOptionsFromArgv([
+        ...commonArgs,
+        '-i',
+        '/path/to/profile.json',
+        '--from-hash',
+        'abc123',
+        '-o',
+        '/path/to/output.json',
+      ])
+    ).toThrow();
+  });
+
+  it('throws when no output is provided', function () {
+    expect(() =>
+      makeOptionsFromArgv([...commonArgs, '-i', '/path/to/profile.json'])
+    ).toThrow();
+  });
+
+  it('throws when -i has no value because next token is a flag', function () {
+    expect(() =>
+      makeOptionsFromArgv([...commonArgs, '-i', '-o', '/path/to/output.json'])
+    ).toThrow();
+  });
+});
diff --git a/src/test/unit/symbolicator-cli.test.ts b/src/test/unit/symbolicator-cli.test.ts
deleted file mode 100644
index 59138c332b..0000000000
--- a/src/test/unit/symbolicator-cli.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-import { makeOptionsFromArgv } from '../../symbolicator-cli';
-
-describe('makeOptionsFromArgv', function () {
-  const commonArgs = ['/path/to/node', '/path/to/symbolicator-cli.js'];
-
-  it('should pass arguments into options object', function () {
-    const options = makeOptionsFromArgv([
-      ...commonArgs,
-      '--input',
-      '/path/to/input',
-      '--output',
-      '/path/to/output',
-      '--server',
-      'http://symbol.server/',
-    ]);
-
-    expect(options.input).toEqual('/path/to/input');
-    expect(options.output).toEqual('/path/to/output');
-    expect(options.server).toEqual('http://symbol.server/');
-  });
-
-  it('should throw if an argument is missing', function () {
-    expect(() => makeOptionsFromArgv(commonArgs)).toThrow();
-
-    expect(() =>
-      makeOptionsFromArgv([...commonArgs, '--input', 'value'])
-    ).toThrow();
-    expect(() =>
-      makeOptionsFromArgv([...commonArgs, '--output', 'value'])
-    ).toThrow();
-    expect(() =>
-      makeOptionsFromArgv([...commonArgs, '--server', 'value'])
-    ).toThrow();
-
-    expect(() =>
-      makeOptionsFromArgv([
-        ...commonArgs,
-        '--output',
-        'value',
-        '--server',
-        'value',
-      ])
-    ).toThrow();
-    expect(() =>
-      makeOptionsFromArgv([
-        ...commonArgs,
-        '--input',
-        'value',
-        '--server',
-        'value',
-      ])
-    ).toThrow();
-    expect(() =>
-      makeOptionsFromArgv([
-        ...commonArgs,
-        '--input',
-        'value',
-        '--output',
-        'value',
-      ])
-    ).toThrow();
-  });
-
-  it('should throw if argument has no specified value', function () {
-    expect(() =>
-      makeOptionsFromArgv([
-        ...commonArgs,
-        '--input',
-        '--output',
-        'value',
-        '--server',
-        'value',
-      ])
-    ).toThrow();
-    expect(() =>
-      makeOptionsFromArgv([
-        ...commonArgs,
-        '--input',
-        'value',
-        '--output',
-        '--server',
-        'value',
-      ])
-    ).toThrow();
-    expect(() =>
-      makeOptionsFromArgv([
-        ...commonArgs,
-        '--input',
-        'value',
-        '--output',
-        'value',
-        '--server',
-      ])
-    ).toThrow();
-  });
-});

From 318389377e70fc510b9447a4f7095bb267be0b2d Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 08:40:35 +0000
Subject: [PATCH 42/64] Pontoon/Firefox Profiler: Update Chinese (Taiwan)
 (zh-TW), English (Great Britain) (en-GB)

Co-authored-by: Pin-guang Chen <petercpg@mail.moztw.org> (zh-TW)
Co-authored-by: Ian Neal <iann_bugzilla@blueyonder.co.uk> (en-GB)
---
 locales/en-GB/app.ftl | 6 ++++++
 locales/zh-TW/app.ftl | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/locales/en-GB/app.ftl b/locales/en-GB/app.ftl
index fa8671bd65..17fe0cb44b 100644
--- a/locales/en-GB/app.ftl
+++ b/locales/en-GB/app.ftl
@@ -1149,6 +1149,12 @@ BottomBox--assembly-code-not-available-title = Assembly code not available
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = See <a>issue #4520</a> for supported scenarios and planned improvements.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Exit fullscreen
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Fullscreen
 SourceView--close-button =
     .title = Close the source view
 
diff --git a/locales/zh-TW/app.ftl b/locales/zh-TW/app.ftl
index 7c73dd81b5..988304431e 100644
--- a/locales/zh-TW/app.ftl
+++ b/locales/zh-TW/app.ftl
@@ -1043,6 +1043,12 @@ BottomBox--assembly-code-not-available-title = 無法取得機器碼
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = 關於支援的使用情境與規劃中的改進，請參考<a>issue #4520</a>。
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = 離開全螢幕模式
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = 全螢幕
 SourceView--close-button =
     .title = 關閉原始碼畫面
 

From 6646bb2a8a6591060f3ae193e2647c31a4976816 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 08:50:33 +0000
Subject: [PATCH 43/64] Pontoon/Firefox Profiler: Update Interlingua (ia)

Co-authored-by: Melo46 <melo@carmu.com> (ia)
---
 locales/ia/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/ia/app.ftl b/locales/ia/app.ftl
index fd857a0850..5e1092593e 100644
--- a/locales/ia/app.ftl
+++ b/locales/ia/app.ftl
@@ -1133,6 +1133,12 @@ BottomBox--assembly-code-not-available-title = Codice assembly non disponibile
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Vide <a>issue #4520</a> pro scenarios supportate e meliorationes planate.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Exir del plen schermo
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Plen schermo
 SourceView--close-button =
     .title = Clauder le vista fonte
 

From bc02a2be92fd8187b0d403c2ec2ac0bc52f15051 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 09:00:29 +0000
Subject: [PATCH 44/64] Pontoon/Firefox Profiler: Update Italian (it)

Co-authored-by: Francesco Lodolo [:flod] <flod+pontoon@mozilla.com> (it)
---
 locales/it/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/it/app.ftl b/locales/it/app.ftl
index 51ee27a18c..89963dd5b8 100644
--- a/locales/it/app.ftl
+++ b/locales/it/app.ftl
@@ -1055,6 +1055,12 @@ BottomBox--assembly-code-not-available-title = Codice assembly non disponibile
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Vedi <a>issue #4520</a> per gli scenari supportati e i miglioramenti in programma.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Esci da schermo intero
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Schermo intero
 SourceView--close-button =
     .title = Chiudi la vista sorgente
 

From 928a9be967753bfd0b71f22a6632117ae61db4f5 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 09:10:36 +0000
Subject: [PATCH 45/64] Pontoon/Firefox Profiler: Update German (de)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michael Köhler <michael.koehler1@gmx.de> (de)
---
 locales/de/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/de/app.ftl b/locales/de/app.ftl
index 36adcf71ef..3c1b6df8a2 100644
--- a/locales/de/app.ftl
+++ b/locales/de/app.ftl
@@ -1125,6 +1125,12 @@ BottomBox--assembly-code-not-available-title = Assembly-Code nicht verfügbar
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = <a>Bericht #4520</a> beschreibt unterstützte Szenarien und geplante Verbesserungen.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Vollbild beenden
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Vollbild
 SourceView--close-button =
     .title = Quelltextansicht schließen
 

From 738b05c3d33a4313be0ba605ae924060a713399e Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 13:30:32 +0000
Subject: [PATCH 46/64] Pontoon/Firefox Profiler: Update Swedish (sv-SE)

Co-authored-by: Andreas Pettersson <amvpet@gmail.com> (sv-SE)
---
 locales/sv-SE/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/sv-SE/app.ftl b/locales/sv-SE/app.ftl
index f328810f24..b45537da3a 100644
--- a/locales/sv-SE/app.ftl
+++ b/locales/sv-SE/app.ftl
@@ -1144,6 +1144,12 @@ BottomBox--assembly-code-not-available-title = Assembly-koden inte tillgänglig
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Se <a>problem #4520</a> för scenarier som stöds och planerade förbättringar.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Avsluta helskärm
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Helskärm
 SourceView--close-button =
     .title = Stäng källvyn
 

From c09675f991e8c915698b09f62166688ffd61a6f1 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 14:50:37 +0000
Subject: [PATCH 47/64] Pontoon/Firefox Profiler: Update Turkish (tr)

Co-authored-by: Grk <gu0townkg@relay.firefox.com> (tr)
---
 locales/tr/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/tr/app.ftl b/locales/tr/app.ftl
index 82988e1eca..e6a62e4070 100644
--- a/locales/tr/app.ftl
+++ b/locales/tr/app.ftl
@@ -1009,6 +1009,12 @@ BottomBox--assembly-code-not-available-title = Assembly kodu mevcut değil
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Desteklenen senaryolar ve planlanan iyileştirmeler için <a>sorun #4520</a>’ye bakabilirsiniz.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Tam ekrandan çık
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Tam ekran
 SourceView--close-button =
     .title = Kaynak görünümünü kapat
 

From 44af18956ef2905fd89616b9abddb3968348fd39 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sat, 25 Apr 2026 19:30:40 +0000
Subject: [PATCH 48/64] Pontoon/Firefox Profiler: Update Turkish (tr)

Co-authored-by: Grk <gu0townkg@relay.firefox.com> (tr)
---
 locales/tr/app.ftl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/tr/app.ftl b/locales/tr/app.ftl
index e6a62e4070..9940814c48 100644
--- a/locales/tr/app.ftl
+++ b/locales/tr/app.ftl
@@ -421,6 +421,7 @@ MenuButtons--metaInfo--profile-not-symbolicated = Profil sembolleştirilmemiş
 MenuButtons--metaInfo--resymbolicate-profile = Profili yeniden sembolleştir
 MenuButtons--metaInfo--symbolicate-profile = Profili sembolleştir
 MenuButtons--metaInfo--attempting-resymbolicate = Profil yeniden sembolleştirilmeye çalışılıyor
+MenuButtons--metaInfo--currently-symbolicating = Şu anda profil sembolleştiriliyor
 MenuButtons--metaInfo--cpu-model = İşlemci modeli:
 MenuButtons--metaInfo--cpu-cores = İşlemci çekirdekleri:
 MenuButtons--metaInfo--main-memory = Ana bellek:

From 94dc032ccc514c5b1390b4baf50295c5c7c3957d Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sun, 26 Apr 2026 09:00:35 +0000
Subject: [PATCH 49/64] Pontoon/Firefox Profiler: Update Russian (ru)

Co-authored-by: Valery Ledovskoy <valery@ledovskoy.com> (ru)
---
 locales/ru/app.ftl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/ru/app.ftl b/locales/ru/app.ftl
index 2e1833b7c1..58869fc86a 100644
--- a/locales/ru/app.ftl
+++ b/locales/ru/app.ftl
@@ -1150,6 +1150,9 @@ BottomBox--assembly-code-not-available-title = Ассемблерный код 
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = См. <a>проблему #4520</a>, чтобы узнать о поддерживаемых сценариях и запланированных улучшениях.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Выйти из полноэкранного режима
 SourceView--close-button =
     .title = Закрыть исходный вид
 

From cde256d096b7cdf310245c78608c5284017766e7 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sun, 26 Apr 2026 09:10:36 +0000
Subject: [PATCH 50/64] Pontoon/Firefox Profiler: Update Russian (ru)

Co-authored-by: Valery Ledovskoy <valery@ledovskoy.com> (ru)
---
 locales/ru/app.ftl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/ru/app.ftl b/locales/ru/app.ftl
index 58869fc86a..89f2aa8859 100644
--- a/locales/ru/app.ftl
+++ b/locales/ru/app.ftl
@@ -1153,6 +1153,9 @@ BottomBox--assembly-code-not-available-text = См. <a>проблему #4520</a
 # The toggle button for making the bottom box fullscreen.
 BottomBox--hide-fullscreen =
     .title = Выйти из полноэкранного режима
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Полноэкранный режим
 SourceView--close-button =
     .title = Закрыть исходный вид
 

From c81342bfa2ebafcee3c331236ea1569641547ac3 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sun, 26 Apr 2026 13:00:42 +0000
Subject: [PATCH 51/64] Pontoon/Firefox Profiler: Update Greek (el)

Co-authored-by: Jim Spentzos <jimspentzos2000@gmail.com> (el)
---
 locales/el/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/el/app.ftl b/locales/el/app.ftl
index 871a503a7f..128cc375a3 100644
--- a/locales/el/app.ftl
+++ b/locales/el/app.ftl
@@ -1144,6 +1144,12 @@ BottomBox--assembly-code-not-available-title = Ο κώδικας assembly δεν
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Δείτε το <a>ζήτημα #4520</a> για υποστηριζόμενα σενάρια και προγραμματισμένες βελτιώσεις.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Έξοδος από πλήρη οθόνη
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Πλήρης οθόνη
 SourceView--close-button =
     .title = Κλείσιμο προβολής πηγής
 

From 7c85e99ed79537fc26a321102cde48194e54d62b Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Sun, 26 Apr 2026 21:00:51 +0000
Subject: [PATCH 52/64] Pontoon/Firefox Profiler: Update Spanish (Chile)
 (es-CL)

Co-authored-by: ravmn <ravmn@ravmn.cl> (es-CL)
---
 locales/es-CL/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/es-CL/app.ftl b/locales/es-CL/app.ftl
index 2fb531cc02..8d83f50f2b 100644
--- a/locales/es-CL/app.ftl
+++ b/locales/es-CL/app.ftl
@@ -1068,6 +1068,12 @@ BottomBox--assembly-code-not-available-title = Código de ensamblaje no disponib
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Consulta el <a>problema #4520</a> para conocer los escenarios compatibles y las mejoras planificadas.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Salir de pantalla completa
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Pantalla completa
 SourceView--close-button =
     .title = Cerrar la vista de fuente
 

From 678aadb3759c83b8d1b2ff811961e86ba75a3542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Thu, 23 Apr 2026 21:18:35 +0200
Subject: [PATCH 53/64] Add "Include idle samples" toggle to the call tree
 settings

Adds a checkbox next to "Invert call stack" in the call tree, flame
graph, and stack chart settings. It is on by default, and when
unchecked, samples whose leaf frame is in the Idle category are hidden
from the call tree and related views by nulling out their sample.stack
entry. The checkbox is only rendered when the profile actually has an
"Idle" category.

Implemented as a new step in the per-thread filter pipeline, sitting
between the transforms and the implementation filter. Since we use the
category column that belongs to the derived samples table, we don't need
to worry about transforms changing the stack table.
---
 locales/en-US/app.ftl                         |   2 +
 src/actions/profile-view.ts                   |  11 +
 src/app-logic/url-handling.ts                 |   9 +
 src/components/calltree/CallTree.tsx          |  14 +-
 src/components/shared/StackSettings.tsx       |  51 +++-
 src/profile-logic/profile-data.ts             |  29 +++
 src/reducers/url-state.ts                     |  10 +
 src/selectors/per-thread/thread.tsx           |  24 +-
 src/selectors/profile.ts                      |   6 +
 src/selectors/url-state.ts                    |   2 +
 .../components/ProfileCallTreeView.test.tsx   |  22 ++
 .../__snapshots__/FlameGraph.test.tsx.snap    |  18 ++
 .../ProfileCallTreeView.test.tsx.snap         | 238 ++++++++++++++++++
 .../__snapshots__/StackChart.test.tsx.snap    |  70 ++++++
 src/test/store/profile-view.test.ts           |  72 ++++++
 src/test/url-handling.test.ts                 |  23 ++
 src/types/actions.ts                          |   4 +
 src/types/state.ts                            |   1 +
 18 files changed, 586 insertions(+), 20 deletions(-)

diff --git a/locales/en-US/app.ftl b/locales/en-US/app.ftl
index 17f323d1af..be577ee3a9 100644
--- a/locales/en-US/app.ftl
+++ b/locales/en-US/app.ftl
@@ -888,6 +888,8 @@ StackSettings--call-tree-strategy-native-deallocations-sites = Deallocation Site
 
 StackSettings--invert-call-stack = Invert call stack
     .title = Sort by the time spent in a call node, ignoring its children.
+StackSettings--include-idle-samples = Include idle samples
+    .title = Uncheck to hide samples whose leaf frame is in the Idle category.
 StackSettings--show-user-timing = Show user timing
 StackSettings--use-stack-chart-same-widths = Use the same width for each stack
 
diff --git a/src/actions/profile-view.ts b/src/actions/profile-view.ts
index c61ef144af..c3d6daa277 100644
--- a/src/actions/profile-view.ts
+++ b/src/actions/profile-view.ts
@@ -1711,6 +1711,17 @@ export function changeShowUserTimings(
   };
 }
 
+export function changeIncludeIdleSamples(
+  includeIdleSamples: boolean
+): ThunkAction<void> {
+  return (dispatch) => {
+    dispatch({
+      type: 'CHANGE_INCLUDE_IDLE_SAMPLES',
+      includeIdleSamples,
+    });
+  };
+}
+
 export function changeStackChartSameWidths(
   stackChartSameWidths: boolean
 ): ThunkAction<void> {
diff --git a/src/app-logic/url-handling.ts b/src/app-logic/url-handling.ts
index aa6b1dad77..d8ab78b002 100644
--- a/src/app-logic/url-handling.ts
+++ b/src/app-logic/url-handling.ts
@@ -183,6 +183,7 @@ type BaseQuery = {
 type CallTreeQuery = BaseQuery & {
   search: string; // "js::RunScript"
   invertCallstack: null | undefined;
+  hideIdleSamples: null | undefined;
   ctSummary: string;
 };
 
@@ -198,6 +199,7 @@ type NetworkQuery = BaseQuery & {
 type StackChartQuery = BaseQuery & {
   search: string; // "js::RunScript"
   invertCallstack: null | undefined;
+  hideIdleSamples: null | undefined;
   showUserTimings: null | undefined;
   sameWidths: null | undefined;
   ctSummary: string;
@@ -212,6 +214,7 @@ type Query = BaseQuery & {
   // CallTree/StackChart specific
   search?: string;
   invertCallstack?: null | undefined;
+  hideIdleSamples?: null | undefined;
   ctSummary?: string;
   transforms?: string;
   sourceViewIndex?: number;
@@ -339,6 +342,11 @@ export function getQueryStringFromUrlState(urlState: UrlState): string {
       query.invertCallstack = urlState.profileSpecific.invertCallstack
         ? null
         : undefined;
+      // The URL param is inverted (`hideIdleSamples`) so the default-on state
+      // doesn't clutter the URL; only the non-default "hide" case is encoded.
+      query.hideIdleSamples = urlState.profileSpecific.includeIdleSamples
+        ? undefined
+        : null;
       if (
         selectedThreadsKey !== null &&
         urlState.profileSpecific.transforms[selectedThreadsKey]
@@ -590,6 +598,7 @@ export function stateFromLocation(
         query.ctSummary || undefined
       ),
       invertCallstack: query.invertCallstack === undefined ? false : true,
+      includeIdleSamples: query.hideIdleSamples === undefined,
       showUserTimings: query.showUserTimings === undefined ? false : true,
       stackChartSameWidths: query.sameWidths === undefined ? false : true,
       committedRanges: query.range ? parseCommittedRanges(query.range) : [],
diff --git a/src/components/calltree/CallTree.tsx b/src/components/calltree/CallTree.tsx
index 02e6b7333d..e593b01644 100644
--- a/src/components/calltree/CallTree.tsx
+++ b/src/components/calltree/CallTree.tsx
@@ -17,7 +17,7 @@ import {
   getScrollToSelectionGeneration,
   getFocusCallTreeGeneration,
   getPreviewSelectionIsBeingModified,
-  getCategories,
+  getIdleCategoryIndex,
   getCurrentTableViewOptions,
 } from 'firefox-profiler/selectors/profile';
 import { selectedThreadSelectors } from 'firefox-profiler/selectors/per-thread';
@@ -36,7 +36,7 @@ import type {
   State,
   ImplementationFilter,
   ThreadsKey,
-  CategoryList,
+  IndexIntoCategoryList,
   IndexIntoCallNodeTable,
   CallNodeDisplayData,
   WeightType,
@@ -60,7 +60,7 @@ type StateProps = {
   readonly focusCallTreeGeneration: number;
   readonly tree: CallTreeType;
   readonly callNodeInfo: CallNodeInfo;
-  readonly categories: CategoryList;
+  readonly idleCategoryIndex: IndexIntoCategoryList | null;
   readonly selectedCallNodeIndex: IndexIntoCallNodeTable | null;
   readonly rightClickedCallNodeIndex: IndexIntoCallNodeTable | null;
   readonly expandedCallNodeIndexes: Array<IndexIntoCallNodeTable | null>;
@@ -300,7 +300,7 @@ class CallTreeImpl extends PureComponent<Props> {
       expandedCallNodeIndexes,
       selectedCallNodeIndex,
       callNodeInfo,
-      categories,
+      idleCategoryIndex,
     } = this.props;
 
     if (selectedCallNodeIndex !== null || expandedCallNodeIndexes.length > 0) {
@@ -308,10 +308,6 @@ class CallTreeImpl extends PureComponent<Props> {
       return;
     }
 
-    const idleCategoryIndex = categories.findIndex(
-      (category) => category.name === 'Idle'
-    );
-
     const newExpandedCallNodeIndexes = expandedCallNodeIndexes.slice();
     const maxInterestingDepth = 17; // scientifically determined
     let currentCallNodeIndex = tree.getRoots()[0];
@@ -402,7 +398,7 @@ export const CallTree = explicitConnect<{}, StateProps, DispatchProps>({
     focusCallTreeGeneration: getFocusCallTreeGeneration(state),
     tree: selectedThreadSelectors.getCallTree(state),
     callNodeInfo: selectedThreadSelectors.getCallNodeInfo(state),
-    categories: getCategories(state),
+    idleCategoryIndex: getIdleCategoryIndex(state),
     selectedCallNodeIndex:
       selectedThreadSelectors.getSelectedCallNodeIndex(state),
     rightClickedCallNodeIndex:
diff --git a/src/components/shared/StackSettings.tsx b/src/components/shared/StackSettings.tsx
index 2a502293c9..f0b558d375 100644
--- a/src/components/shared/StackSettings.tsx
+++ b/src/components/shared/StackSettings.tsx
@@ -7,18 +7,23 @@ import { Localized } from '@fluent/react';
 
 import {
   changeInvertCallstack,
+  changeIncludeIdleSamples,
   changeCallTreeSearchString,
   changeShowUserTimings,
   changeStackChartSameWidths,
 } from 'firefox-profiler/actions/profile-view';
 import {
   getInvertCallstack,
+  getIncludeIdleSamples,
   getSelectedTab,
   getShowUserTimings,
   getStackChartSameWidths,
   getCurrentSearchString,
 } from 'firefox-profiler/selectors/url-state';
-import { getProfileUsesMultipleStackTypes } from 'firefox-profiler/selectors/profile';
+import {
+  getIdleCategoryIndex,
+  getProfileUsesMultipleStackTypes,
+} from 'firefox-profiler/selectors/profile';
 import { PanelSearch } from './PanelSearch';
 import { StackImplementationSetting } from './StackImplementationSetting';
 import { CallTreeStrategySetting } from './CallTreeStrategySetting';
@@ -39,6 +44,8 @@ type StateProps = {
   readonly selectedTab: string;
   readonly allowSwitchingStackType: boolean;
   readonly invertCallstack: boolean;
+  readonly includeIdleSamples: boolean;
+  readonly hasIdleCategory: boolean;
   readonly showUserTimings: boolean;
   readonly stackChartSameWidths: boolean;
   readonly currentSearchString: string;
@@ -48,6 +55,7 @@ type StateProps = {
 
 type DispatchProps = {
   readonly changeInvertCallstack: typeof changeInvertCallstack;
+  readonly changeIncludeIdleSamples: typeof changeIncludeIdleSamples;
   readonly changeShowUserTimings: typeof changeShowUserTimings;
   readonly changeCallTreeSearchString: typeof changeCallTreeSearchString;
   readonly changeStackChartSameWidths: typeof changeStackChartSameWidths;
@@ -60,6 +68,10 @@ class StackSettingsImpl extends PureComponent<Props> {
     this.props.changeInvertCallstack(e.currentTarget.checked);
   };
 
+  _onIncludeIdleSamplesClick = (e: React.ChangeEvent<HTMLInputElement>) => {
+    this.props.changeIncludeIdleSamples(e.currentTarget.checked);
+  };
+
   _onShowUserTimingsClick = (e: React.ChangeEvent<HTMLInputElement>) => {
     this.props.changeShowUserTimings(e.currentTarget.checked);
   };
@@ -76,6 +88,8 @@ class StackSettingsImpl extends PureComponent<Props> {
     const {
       allowSwitchingStackType,
       invertCallstack,
+      includeIdleSamples,
+      hasIdleCategory,
       selectedTab,
       showUserTimings,
       stackChartSameWidths,
@@ -86,6 +100,10 @@ class StackSettingsImpl extends PureComponent<Props> {
     } = this.props;
 
     const hasAllocations = hasUsefulJsAllocations || hasUsefulNativeAllocations;
+    const showInvertCallstack = !hideInvertCallstack;
+    const showStackChartOptions = selectedTab === 'stack-chart';
+    const showSettingsItem =
+      showInvertCallstack || showStackChartOptions || hasIdleCategory;
 
     return (
       <div className="stackSettings">
@@ -100,9 +118,9 @@ class StackSettingsImpl extends PureComponent<Props> {
               <CallTreeStrategySetting />
             </li>
           ) : null}
-          {hideInvertCallstack && selectedTab !== 'stack-chart' ? null : (
+          {showSettingsItem ? (
             <li className="panelSettingsListItem">
-              {hideInvertCallstack ? null : (
+              {showInvertCallstack ? (
                 <label className="photon-label photon-label-micro photon-label-horiz-padding">
                   <input
                     type="checkbox"
@@ -117,8 +135,24 @@ class StackSettingsImpl extends PureComponent<Props> {
                     <span>Invert call stack</span>
                   </Localized>
                 </label>
-              )}
-              {selectedTab !== 'stack-chart' ? null : (
+              ) : null}
+              {hasIdleCategory ? (
+                <label className="photon-label photon-label-micro photon-label-horiz-padding">
+                  <input
+                    type="checkbox"
+                    className="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+                    onChange={this._onIncludeIdleSamplesClick}
+                    checked={includeIdleSamples}
+                  />
+                  <Localized
+                    id="StackSettings--include-idle-samples"
+                    attrs={{ title: true }}
+                  >
+                    <span>Include idle samples</span>
+                  </Localized>
+                </label>
+              ) : null}
+              {showStackChartOptions ? (
                 <>
                   <label className="photon-label photon-label-micro photon-label-horiz-padding">
                     <input
@@ -143,9 +177,9 @@ class StackSettingsImpl extends PureComponent<Props> {
                     </Localized>
                   </label>
                 </>
-              )}
+              ) : null}
             </li>
-          )}
+          ) : null}
         </ul>
         <Localized
           id="StackSettings--panel-search"
@@ -172,6 +206,8 @@ export const StackSettings = explicitConnect<
   mapStateToProps: (state) => ({
     allowSwitchingStackType: getProfileUsesMultipleStackTypes(state),
     invertCallstack: getInvertCallstack(state),
+    includeIdleSamples: getIncludeIdleSamples(state),
+    hasIdleCategory: getIdleCategoryIndex(state) !== null,
     selectedTab: getSelectedTab(state),
     showUserTimings: getShowUserTimings(state),
     stackChartSameWidths: getStackChartSameWidths(state),
@@ -183,6 +219,7 @@ export const StackSettings = explicitConnect<
   }),
   mapDispatchToProps: {
     changeInvertCallstack,
+    changeIncludeIdleSamples,
     changeCallTreeSearchString,
     changeShowUserTimings,
     changeStackChartSameWidths,
diff --git a/src/profile-logic/profile-data.ts b/src/profile-logic/profile-data.ts
index c1e241f575..28cfba5169 100644
--- a/src/profile-logic/profile-data.ts
+++ b/src/profile-logic/profile-data.ts
@@ -2058,6 +2058,35 @@ export function getInclusiveIndexRangeForSelection(
   return [sampleStart, sampleEnd];
 }
 
+/**
+ * Return a thread where samples whose leaf stack frame is in the given
+ * category have had their stack nulled out. These samples are still present in
+ * the samples table (indexes are preserved), but they become invisible to the
+ * call tree, stack chart, and flame graph.
+ *
+ * This is used by the "Include idle samples" toggle to hide idle time from
+ * the call tree.
+ */
+export function filterThreadSamplesByLeafCategory(
+  thread: Thread,
+  categoryToExclude: IndexIntoCategoryList
+): Thread {
+  const { samples } = thread;
+  const newStackCol = samples.stack.slice();
+  for (let i = 0; i < samples.length; i++) {
+    if (samples.category[i] === categoryToExclude) {
+      newStackCol[i] = null;
+    }
+  }
+  return {
+    ...thread,
+    samples: {
+      ...samples,
+      stack: newStackCol,
+    },
+  };
+}
+
 /**
  * Return a thread whose samples (including allocation samples) have been
  * filtered to include just those in the given time window.
diff --git a/src/reducers/url-state.ts b/src/reducers/url-state.ts
index d75b0dec06..724b545b9f 100644
--- a/src/reducers/url-state.ts
+++ b/src/reducers/url-state.ts
@@ -312,6 +312,15 @@ const invertCallstack: Reducer<boolean> = (state = false, action) => {
   }
 };
 
+const includeIdleSamples: Reducer<boolean> = (state = true, action) => {
+  switch (action.type) {
+    case 'CHANGE_INCLUDE_IDLE_SAMPLES':
+      return action.includeIdleSamples;
+    default:
+      return state;
+  }
+};
+
 /**
  * Signals whether user timing markers will be shown in the stack chart.
  */
@@ -750,6 +759,7 @@ const profileSpecific = combineReducers({
   implementation,
   lastSelectedCallTreeSummaryStrategy,
   invertCallstack,
+  includeIdleSamples,
   showUserTimings,
   stackChartSameWidths,
   committedRanges,
diff --git a/src/selectors/per-thread/thread.tsx b/src/selectors/per-thread/thread.tsx
index 8f62a266fa..0fbab489ab 100644
--- a/src/selectors/per-thread/thread.tsx
+++ b/src/selectors/per-thread/thread.tsx
@@ -157,9 +157,10 @@ export function getBasicThreadSelectorsPerThread(
    * 3. Reserved functions - New funcTable with reserved functions for collapsed resources.
    * 4. Range - New samples table with only samples in the committed range.
    * 5. Transform - Apply the transform stack that modifies the stacks and samples.
-   * 6. Implementation - Modify stacks and samples to only show a single implementation.
-   * 7. Search - Exclude samples that don't include some text in the stack.
-   * 8. Preview - Only include samples that are within a user's preview range selection.
+   * 6. Idle - Optionally null out the stack of samples whose leaf frame is idle.
+   * 7. Implementation - Modify stacks and samples to only show a single implementation.
+   * 8. Search - Exclude samples that don't include some text in the stack.
+   * 9. Preview - Only include samples that are within a user's preview range selection.
    */
 
   const getThread: Selector<Thread> = createSelector(
@@ -472,8 +473,23 @@ export function getThreadSelectorsWithMarkersPerThread(
     }
   );
 
-  const _getImplementationFilteredThread: Selector<Thread> = createSelector(
+  const _getIdleFilteredThread: Selector<Thread> = createSelector(
     getRangeAndTransformFilteredThread,
+    UrlState.getIncludeIdleSamples,
+    ProfileSelectors.getIdleCategoryIndex,
+    (thread, includeIdleSamples, idleCategoryIndex) => {
+      if (includeIdleSamples || idleCategoryIndex === null) {
+        return thread;
+      }
+      return ProfileData.filterThreadSamplesByLeafCategory(
+        thread,
+        idleCategoryIndex
+      );
+    }
+  );
+
+  const _getImplementationFilteredThread: Selector<Thread> = createSelector(
+    _getIdleFilteredThread,
     UrlState.getImplementationFilter,
     (thread: Thread, implementationFilter: ImplementationFilter) => {
       // Apply the implementation filter.
diff --git a/src/selectors/profile.ts b/src/selectors/profile.ts
index 7ac0ef4f2c..4661385abd 100644
--- a/src/selectors/profile.ts
+++ b/src/selectors/profile.ts
@@ -192,6 +192,12 @@ export const getPageList = (state: State): PageList | null =>
   getProfile(state).pages || null;
 export const getDefaultCategory: Selector<IndexIntoCategoryList> = (state) =>
   getCategories(state).findIndex((c) => c.color === 'grey');
+export const getIdleCategoryIndex: Selector<IndexIntoCategoryList | null> = (
+  state
+) => {
+  const index = getCategories(state).findIndex((c) => c.name === 'Idle');
+  return index === -1 ? null : index;
+};
 export const getThreads: Selector<RawThread[]> = (state) =>
   getProfile(state).threads;
 export const getThreadNames: Selector<string[]> = (state) =>
diff --git a/src/selectors/url-state.ts b/src/selectors/url-state.ts
index 16043c4cab..bf2bc8fe65 100644
--- a/src/selectors/url-state.ts
+++ b/src/selectors/url-state.ts
@@ -124,6 +124,8 @@ export const getSelectedTab: Selector<TabSlug> = (state) =>
 export const getInvertCallstack: Selector<boolean> = (state) =>
   getSelectedTab(state) === 'calltree' &&
   getProfileSpecificState(state).invertCallstack;
+export const getIncludeIdleSamples: Selector<boolean> = (state) =>
+  getProfileSpecificState(state).includeIdleSamples;
 
 export const getSelectedThreadIndexesOrNull: Selector<
   Set<ThreadIndex> | null
diff --git a/src/test/components/ProfileCallTreeView.test.tsx b/src/test/components/ProfileCallTreeView.test.tsx
index c6fc3fd80e..ec74c00529 100644
--- a/src/test/components/ProfileCallTreeView.test.tsx
+++ b/src/test/components/ProfileCallTreeView.test.tsx
@@ -25,6 +25,7 @@ import {
 import {
   changeCallTreeSearchString,
   changeImplementationFilter,
+  changeIncludeIdleSamples,
   changeInvertCallstack,
   commitRange,
   addTransformToStack,
@@ -343,6 +344,27 @@ describe('calltree/ProfileCallTreeView', function () {
     expect(getRowElement('E', { selected: true })).toHaveClass('isSelected');
     expect(getRowElement('B', { expanded: true })).toBeInTheDocument();
   });
+
+  it('hides samples whose leaf frame is idle when "Include idle samples" is unchecked', () => {
+    const { profile } = getProfileFromTextSamples(`
+      A  A            A  A
+      B  B            B  B
+      C  D[cat:Idle]  C  D[cat:Idle]
+    `);
+    const { dispatch } = setup(profile);
+
+    expect(screen.getByRole('treeitem', { name: /^C/ })).toBeInTheDocument();
+    expect(screen.getByRole('treeitem', { name: /^D/ })).toBeInTheDocument();
+
+    act(() => {
+      dispatch(changeIncludeIdleSamples(false));
+    });
+
+    expect(screen.getByRole('treeitem', { name: /^C/ })).toBeInTheDocument();
+    expect(
+      screen.queryByRole('treeitem', { name: /^D/ })
+    ).not.toBeInTheDocument();
+  });
 });
 
 describe('calltree/ProfileCallTreeView EmptyReasons', function () {
diff --git a/src/test/components/__snapshots__/FlameGraph.test.tsx.snap b/src/test/components/__snapshots__/FlameGraph.test.tsx.snap
index ee201e3c8d..9af19bd667 100644
--- a/src/test/components/__snapshots__/FlameGraph.test.tsx.snap
+++ b/src/test/components/__snapshots__/FlameGraph.test.tsx.snap
@@ -468,6 +468,24 @@ exports[`FlameGraph matches the snapshot 1`] = `
           </span>
         </label>
       </li>
+      <li
+        class="panelSettingsListItem"
+      >
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
+      </li>
     </ul>
     <div
       class="panelSearchField stackSettingsSearchField"
diff --git a/src/test/components/__snapshots__/ProfileCallTreeView.test.tsx.snap b/src/test/components/__snapshots__/ProfileCallTreeView.test.tsx.snap
index 937030aa27..7c4300f51d 100644
--- a/src/test/components/__snapshots__/ProfileCallTreeView.test.tsx.snap
+++ b/src/test/components/__snapshots__/ProfileCallTreeView.test.tsx.snap
@@ -109,6 +109,20 @@ exports[`ProfileCallTreeView with JS Allocations matches the snapshot for JS all
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -902,6 +916,20 @@ exports[`ProfileCallTreeView with balanced native allocations matches the snapsh
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -1695,6 +1723,20 @@ exports[`ProfileCallTreeView with balanced native allocations matches the snapsh
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -2476,6 +2518,20 @@ exports[`ProfileCallTreeView with unbalanced native allocations matches the snap
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -3257,6 +3313,20 @@ exports[`ProfileCallTreeView with unbalanced native allocations matches the snap
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -3856,6 +3926,20 @@ exports[`calltree/ProfileCallTreeView EmptyReasons shows a reason for a call tre
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -4006,6 +4090,20 @@ exports[`calltree/ProfileCallTreeView EmptyReasons shows reasons for being out o
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -4156,6 +4254,20 @@ exports[`calltree/ProfileCallTreeView EmptyReasons shows reasons for when sample
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -4353,6 +4465,20 @@ exports[`calltree/ProfileCallTreeView renders an inverted call tree 1`] = `
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -5101,6 +5227,20 @@ exports[`calltree/ProfileCallTreeView renders an unfiltered call tree 1`] = `
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -5849,6 +5989,20 @@ exports[`calltree/ProfileCallTreeView renders an unfiltered call tree with filen
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -6381,6 +6535,20 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -7129,6 +7297,20 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -7805,6 +7987,20 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -8481,6 +8677,20 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -9014,6 +9224,20 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
@@ -9547,6 +9771,20 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
             Invert call stack
           </span>
         </label>
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
       </li>
     </ul>
     <div
diff --git a/src/test/components/__snapshots__/StackChart.test.tsx.snap b/src/test/components/__snapshots__/StackChart.test.tsx.snap
index b08ccac01b..5b5491cd4b 100644
--- a/src/test/components/__snapshots__/StackChart.test.tsx.snap
+++ b/src/test/components/__snapshots__/StackChart.test.tsx.snap
@@ -169,6 +169,20 @@ exports[`CombinedChart renders combined stack chart 1`] = `
       <li
         class="panelSettingsListItem"
       >
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
         >
@@ -674,6 +688,20 @@ exports[`MarkerChart matches the snapshots for the component and draw log 1`] =
       <li
         class="panelSettingsListItem"
       >
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
         >
@@ -1233,6 +1261,20 @@ exports[`StackChart matches the snapshot and can display a tooltip with the same
           <li
             class="panelSettingsListItem"
           >
+            <label
+              class="photon-label photon-label-micro photon-label-horiz-padding"
+            >
+              <input
+                checked=""
+                class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+                type="checkbox"
+              />
+              <span
+                title="Uncheck to hide samples whose leaf frame is in the Idle category."
+              >
+                Include idle samples
+              </span>
+            </label>
             <label
               class="photon-label photon-label-micro photon-label-horiz-padding"
             >
@@ -1939,6 +1981,20 @@ exports[`StackChart matches the snapshot and can display a tooltip: dom 1`] = `
       <li
         class="panelSettingsListItem"
       >
+        <label
+          class="photon-label photon-label-micro photon-label-horiz-padding"
+        >
+          <input
+            checked=""
+            class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+            type="checkbox"
+          />
+          <span
+            title="Uncheck to hide samples whose leaf frame is in the Idle category."
+          >
+            Include idle samples
+          </span>
+        </label>
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
         >
@@ -2474,6 +2530,20 @@ exports[`StackChart works when the user selects the JS allocations option 1`] =
           <li
             class="panelSettingsListItem"
           >
+            <label
+              class="photon-label photon-label-micro photon-label-horiz-padding"
+            >
+              <input
+                checked=""
+                class="photon-checkbox photon-checkbox-micro stackSettingsCheckbox"
+                type="checkbox"
+              />
+              <span
+                title="Uncheck to hide samples whose leaf frame is in the Idle category."
+              >
+                Include idle samples
+              </span>
+            </label>
             <label
               class="photon-label photon-label-micro photon-label-horiz-padding"
             >
diff --git a/src/test/store/profile-view.test.ts b/src/test/store/profile-view.test.ts
index 01ffc01b71..7ca08b5fbb 100644
--- a/src/test/store/profile-view.test.ts
+++ b/src/test/store/profile-view.test.ts
@@ -1715,6 +1715,78 @@ describe('actions/ProfileView', function () {
     });
   });
 
+  describe('changeIncludeIdleSamples', function () {
+    function setup() {
+      // Four samples: two with an Idle leaf, two with a non-idle leaf.
+      const { profile } = getProfileFromTextSamples(`
+        A          A              A          A
+        B[cat:DOM] B[cat:Idle]    B[cat:DOM] B[cat:Idle]
+      `);
+      return storeWithProfile(profile);
+    }
+
+    it('defaults to true and toggles through the reducer', function () {
+      const { dispatch, getState } = setup();
+
+      expect(UrlStateSelectors.getIncludeIdleSamples(getState())).toEqual(true);
+      dispatch(ProfileView.changeIncludeIdleSamples(false));
+      expect(UrlStateSelectors.getIncludeIdleSamples(getState())).toEqual(
+        false
+      );
+    });
+
+    it('nulls out stacks of samples whose leaf frame is idle when off', function () {
+      const { dispatch, getState } = setup();
+
+      const beforeThread =
+        selectedThreadSelectors.getFilteredThread(getState());
+      expect(beforeThread.samples.stack.every((s) => s !== null)).toBe(true);
+
+      dispatch(ProfileView.changeIncludeIdleSamples(false));
+
+      const afterThread = selectedThreadSelectors.getFilteredThread(getState());
+      const idleCategoryIndex = ensureExists(
+        ProfileViewSelectors.getIdleCategoryIndex(getState()),
+        'Expected the test profile to have an Idle category'
+      );
+
+      // Samples 0 and 2 have DOM leaves; 1 and 3 have Idle leaves.
+      expect(afterThread.samples.stack[0]).not.toBe(null);
+      expect(afterThread.samples.stack[1]).toBe(null);
+      expect(afterThread.samples.stack[2]).not.toBe(null);
+      expect(afterThread.samples.stack[3]).toBe(null);
+
+      // The stackTable is untouched. Only sample.stack entries are nulled.
+      expect(afterThread.stackTable).toBe(beforeThread.stackTable);
+      // The kept samples still point at a stack whose category is not idle.
+      const keptStackCategories = afterThread.samples.stack
+        .filter((s): s is number => s !== null)
+        .map((s) => afterThread.stackTable.category[s]);
+      expect(keptStackCategories).not.toContain(idleCategoryIndex);
+    });
+
+    it('is a no-op when the profile has no idle category', function () {
+      const { profile } = getProfileFromTextSamples(`
+        A          A
+        B[cat:DOM] B[cat:DOM]
+      `);
+      // Replace categories with a set that has no "Idle" entry.
+      profile.meta.categories = [
+        { name: 'Other', color: 'grey', subcategories: ['Other'] },
+        { name: 'DOM', color: 'blue', subcategories: ['Other'] },
+      ];
+      const { dispatch, getState } = storeWithProfile(profile);
+
+      expect(ProfileViewSelectors.getIdleCategoryIndex(getState())).toBe(null);
+
+      const before = selectedThreadSelectors.getFilteredThread(getState());
+      dispatch(ProfileView.changeIncludeIdleSamples(false));
+      const after = selectedThreadSelectors.getFilteredThread(getState());
+      // Without an idle category there is nothing to filter.
+      expect(after).toBe(before);
+    });
+  });
+
   describe('updatePreviewSelection', function () {
     it('updates the profile selection', function () {
       const { profile } = getProfileFromTextSamples('A');
diff --git a/src/test/url-handling.test.ts b/src/test/url-handling.test.ts
index 88ff994ee0..ae1a987eb9 100644
--- a/src/test/url-handling.test.ts
+++ b/src/test/url-handling.test.ts
@@ -20,6 +20,7 @@ import {
   closeBottomBox,
   changeShowUserTimings,
   changeStackChartSameWidths,
+  changeIncludeIdleSamples,
   changeSelectedMarker,
 } from '../actions/profile-view';
 import { changeSelectedTab, changeProfilesToCompare } from '../actions/app';
@@ -1664,6 +1665,28 @@ describe('stack chart specific queries', function () {
   });
 });
 
+describe('"include idle samples" query', function () {
+  it('defaults to true and is absent from the URL', function () {
+    const { getState } = _getStoreWithURL();
+    expect(urlStateSelectors.getIncludeIdleSamples(getState())).toBe(true);
+    expect(getQueryStringFromState(getState())).not.toContain(
+      'hideIdleSamples'
+    );
+  });
+
+  it('persists hideIdleSamples through a URL roundtrip when toggled off', function () {
+    const { getState, dispatch } = _getStoreWithURL();
+
+    dispatch(changeIncludeIdleSamples(false));
+    expect(getQueryStringFromState(getState())).toContain('hideIdleSamples');
+
+    const storeAfterReload = _getStoreFromStateAfterUrlRoundtrip(getState());
+    expect(
+      urlStateSelectors.getIncludeIdleSamples(storeAfterReload.getState())
+    ).toBe(false);
+  });
+});
+
 describe('symbolServerUrl', function () {
   function setup(search: string) {
     jest.spyOn(console, 'error').mockImplementation(() => {});
diff --git a/src/types/actions.ts b/src/types/actions.ts
index 81d3307e82..8bd6eadb26 100644
--- a/src/types/actions.ts
+++ b/src/types/actions.ts
@@ -526,6 +526,10 @@ type UrlStateAction =
       readonly type: 'CHANGE_SHOW_USER_TIMINGS';
       readonly showUserTimings: boolean;
     }
+  | {
+      readonly type: 'CHANGE_INCLUDE_IDLE_SAMPLES';
+      readonly includeIdleSamples: boolean;
+    }
   | {
       readonly type: 'CHANGE_STACK_CHART_SAME_WIDTHS';
       readonly stackChartSameWidths: boolean;
diff --git a/src/types/state.ts b/src/types/state.ts
index 5cabc5ddac..7e47f287ae 100644
--- a/src/types/state.ts
+++ b/src/types/state.ts
@@ -355,6 +355,7 @@ export type ProfileSpecificUrlState = {
   implementation: ImplementationFilter;
   lastSelectedCallTreeSummaryStrategy: CallTreeSummaryStrategy;
   invertCallstack: boolean;
+  includeIdleSamples: boolean;
   showUserTimings: boolean;
   stackChartSameWidths: boolean;
   committedRanges: StartEndRange[];

From c155fdfda03f50fd391e39f8e8300fedc4a475f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Fri, 24 Apr 2026 10:42:12 +0200
Subject: [PATCH 54/64] Update empty reasons to includes the possibility of
 removed idle samples

Ideally they should be localized, but apparently they weren't. So let's
keep it like this for now, and we can localize these as a follow-up.
---
 src/components/calltree/CallTreeEmptyReasons.tsx   | 14 +++++++++++---
 .../flame-graph/FlameGraphEmptyReasons.tsx         | 14 +++++++++++---
 .../stack-chart/StackChartEmptyReasons.tsx         | 14 +++++++++++---
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/components/calltree/CallTreeEmptyReasons.tsx b/src/components/calltree/CallTreeEmptyReasons.tsx
index 859225bf36..aa24a462e9 100644
--- a/src/components/calltree/CallTreeEmptyReasons.tsx
+++ b/src/components/calltree/CallTreeEmptyReasons.tsx
@@ -5,6 +5,7 @@ import { PureComponent } from 'react';
 
 import { EmptyReasons } from '../shared/EmptyReasons';
 import { selectedThreadSelectors } from '../../selectors/per-thread';
+import { getIncludeIdleSamples } from 'firefox-profiler/selectors/url-state';
 import { oneLine } from 'common-tags';
 import explicitConnect, {
   type ConnectedProps,
@@ -16,6 +17,7 @@ type StateProps = {
   threadName: string;
   rangeFilteredThread: Thread;
   thread: Thread;
+  includeIdleSamples: boolean;
 };
 
 type Props = ConnectedProps<{}, StateProps, {}>;
@@ -26,7 +28,9 @@ type Props = ConnectedProps<{}, StateProps, {}>;
  */
 class CallTreeEmptyReasonsImpl extends PureComponent<Props> {
   override render() {
-    const { thread, rangeFilteredThread, threadName } = this.props;
+    const { thread, rangeFilteredThread, threadName, includeIdleSamples } =
+      this.props;
+    // FIXME: These strings should be localized.
     let reason;
 
     if (thread.samples.length === 0) {
@@ -34,9 +38,12 @@ class CallTreeEmptyReasonsImpl extends PureComponent<Props> {
     } else if (rangeFilteredThread.samples.length === 0) {
       reason = 'Broaden the selected range to view samples.';
     } else {
+      const idleHint = includeIdleSamples
+        ? ''
+        : ', checking "Include idle samples"';
       reason = oneLine`
-        Try broadening the selected range, removing search terms, or call tree transforms
-        to view samples.
+        Try broadening the selected range, removing search terms${idleHint},
+        or call tree transforms to view samples.
       `;
     }
 
@@ -55,6 +62,7 @@ export const CallTreeEmptyReasons = explicitConnect<{}, StateProps, {}>({
     threadName: selectedThreadSelectors.getFriendlyThreadName(state),
     thread: selectedThreadSelectors.getThread(state),
     rangeFilteredThread: selectedThreadSelectors.getRangeFilteredThread(state),
+    includeIdleSamples: getIncludeIdleSamples(state),
   }),
   component: CallTreeEmptyReasonsImpl,
 });
diff --git a/src/components/flame-graph/FlameGraphEmptyReasons.tsx b/src/components/flame-graph/FlameGraphEmptyReasons.tsx
index 7b61a235fd..fe51451472 100644
--- a/src/components/flame-graph/FlameGraphEmptyReasons.tsx
+++ b/src/components/flame-graph/FlameGraphEmptyReasons.tsx
@@ -5,6 +5,7 @@ import { PureComponent } from 'react';
 
 import { EmptyReasons } from '../shared/EmptyReasons';
 import { selectedThreadSelectors } from '../../selectors/per-thread';
+import { getIncludeIdleSamples } from 'firefox-profiler/selectors/url-state';
 import { oneLine } from 'common-tags';
 import explicitConnect, {
   type ConnectedProps,
@@ -16,6 +17,7 @@ type StateProps = {
   threadName: string;
   rangeFilteredThread: Thread;
   thread: Thread;
+  includeIdleSamples: boolean;
 };
 
 type Props = ConnectedProps<{}, StateProps, {}>;
@@ -26,7 +28,9 @@ type Props = ConnectedProps<{}, StateProps, {}>;
  */
 class FlameGraphEmptyReasonsImpl extends PureComponent<Props> {
   override render() {
-    const { thread, rangeFilteredThread, threadName } = this.props;
+    const { thread, rangeFilteredThread, threadName, includeIdleSamples } =
+      this.props;
+    // FIXME: These strings should be localized.
     let reason;
 
     if (thread.samples.length === 0) {
@@ -34,9 +38,12 @@ class FlameGraphEmptyReasonsImpl extends PureComponent<Props> {
     } else if (rangeFilteredThread.samples.length === 0) {
       reason = 'Broaden the selected range to view samples.';
     } else {
+      const idleHint = includeIdleSamples
+        ? ''
+        : ', checking "Include idle samples"';
       reason = oneLine`
-        Try broadening the selected range, removing search terms, or call tree transforms
-        to view samples.
+        Try broadening the selected range, removing search terms${idleHint},
+        or call tree transforms to view samples.
       `;
     }
 
@@ -55,6 +62,7 @@ export const FlameGraphEmptyReasons = explicitConnect<{}, StateProps, {}>({
     threadName: selectedThreadSelectors.getFriendlyThreadName(state),
     thread: selectedThreadSelectors.getThread(state),
     rangeFilteredThread: selectedThreadSelectors.getRangeFilteredThread(state),
+    includeIdleSamples: getIncludeIdleSamples(state),
   }),
   component: FlameGraphEmptyReasonsImpl,
 });
diff --git a/src/components/stack-chart/StackChartEmptyReasons.tsx b/src/components/stack-chart/StackChartEmptyReasons.tsx
index d08ff26ec9..6f6a3be387 100644
--- a/src/components/stack-chart/StackChartEmptyReasons.tsx
+++ b/src/components/stack-chart/StackChartEmptyReasons.tsx
@@ -5,6 +5,7 @@ import { PureComponent } from 'react';
 
 import { EmptyReasons } from '../shared/EmptyReasons';
 import { selectedThreadSelectors } from '../../selectors/per-thread';
+import { getIncludeIdleSamples } from 'firefox-profiler/selectors/url-state';
 import { oneLine } from 'common-tags';
 import explicitConnect, { type ConnectedProps } from '../../utils/connect';
 
@@ -14,6 +15,7 @@ type StateProps = {
   threadName: string;
   rangeFilteredThread: Thread;
   thread: Thread;
+  includeIdleSamples: boolean;
 };
 
 type Props = ConnectedProps<{}, StateProps, {}>;
@@ -24,7 +26,9 @@ type Props = ConnectedProps<{}, StateProps, {}>;
  */
 class StackChartEmptyReasonsImpl extends PureComponent<Props> {
   override render() {
-    const { thread, rangeFilteredThread, threadName } = this.props;
+    const { thread, rangeFilteredThread, threadName, includeIdleSamples } =
+      this.props;
+    // FIXME: These strings should be localized.
     let reason;
 
     if (thread.samples.length === 0) {
@@ -32,9 +36,12 @@ class StackChartEmptyReasonsImpl extends PureComponent<Props> {
     } else if (rangeFilteredThread.samples.length === 0) {
       reason = 'Broaden the selected range to view samples.';
     } else {
+      const idleHint = includeIdleSamples
+        ? ''
+        : ', checking "Include idle samples"';
       reason = oneLine`
-        Try broadening the selected range, removing search terms, or call tree transforms
-        to view samples.
+        Try broadening the selected range, removing search terms${idleHint},
+        or call tree transforms to view samples.
       `;
     }
 
@@ -53,6 +60,7 @@ export const StackChartEmptyReasons = explicitConnect<{}, StateProps, {}>({
     threadName: selectedThreadSelectors.getFriendlyThreadName(state),
     thread: selectedThreadSelectors.getThread(state),
     rangeFilteredThread: selectedThreadSelectors.getRangeFilteredThread(state),
+    includeIdleSamples: getIncludeIdleSamples(state),
   }),
   component: StackChartEmptyReasonsImpl,
 });

From 423727b23b71af4a3bb90113075118f163f32088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Mon, 27 Apr 2026 12:22:27 +0200
Subject: [PATCH 55/64] Add dark mode versions of the fullscreen icons (#5972)

These svg icons were hardcoded to black color, which made them very
difficult to see in the dark mode. This commit adds dark mode
equivalents of these icons to make sure that they are visible there as
well.
---
 res/img/svg/fullscreen-exit-light.svg | 6 ++++++
 res/img/svg/fullscreen-light.svg      | 6 ++++++
 src/components/app/BottomBox.css      | 8 ++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 res/img/svg/fullscreen-exit-light.svg
 create mode 100644 res/img/svg/fullscreen-light.svg

diff --git a/res/img/svg/fullscreen-exit-light.svg b/res/img/svg/fullscreen-exit-light.svg
new file mode 100644
index 0000000000..f19a0303a8
--- /dev/null
+++ b/res/img/svg/fullscreen-exit-light.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill="rgba(249, 249, 250, .8)" fill-rule="evenodd" clip-rule="evenodd" d="M15.3743 0C15.5402 0 15.6994 0.0658946 15.8168 0.183199C15.9339 0.30041 15.9998 0.459281 16 0.624986C16.0002 0.790692 15.9346 0.949711 15.8178 1.06719L12.1928 4.69213L13.6468 6.14611C13.7169 6.21604 13.7647 6.30521 13.784 6.40231C13.8034 6.49942 13.7935 6.60009 13.7556 6.69156C13.7177 6.78304 13.6534 6.86119 13.5711 6.91612C13.4887 6.97104 13.3918 7.00027 13.2928 7.0001H9.29987L8.99987 6.7001V2.70716C9.00009 2.60843 9.02953 2.51198 9.08449 2.42996C9.13944 2.34794 9.21745 2.28402 9.30868 2.24627C9.3999 2.20852 9.50026 2.19862 9.59711 2.21782C9.69395 2.23702 9.78294 2.28446 9.85286 2.35417L11.0258 3.52715L11.3068 3.80814L14.9318 0.183199C15.0492 0.0658946 15.2083 0 15.3743 0ZM3.42871 8.08406C3.5111 8.02914 3.60794 7.99991 3.70696 8.00008H7.6999L7.99989 8.30008V12.293C7.99987 12.392 7.9705 12.4887 7.9155 12.5709C7.86049 12.6531 7.78233 12.7172 7.6909 12.755C7.59947 12.7928 7.49888 12.8026 7.40186 12.7832C7.30485 12.7638 7.21577 12.7161 7.1459 12.646L5.97292 11.473L5.69193 11.192L2.06698 14.817C1.94922 14.9334 1.79032 14.9989 1.62469 14.999C1.45906 14.9992 1.30002 14.9342 1.182 14.818C1.06518 14.7003 0.999619 14.5413 0.999619 14.3755C0.999619 14.2097 1.06518 14.0506 1.182 13.933L4.80694 10.308L3.35296 8.85407C3.28286 8.78414 3.23509 8.69497 3.21573 8.59787C3.19636 8.50076 3.20626 8.40009 3.24418 8.30862C3.2821 8.21714 3.34632 8.13899 3.42871 8.08406Z"/>
+</svg>
diff --git a/res/img/svg/fullscreen-light.svg b/res/img/svg/fullscreen-light.svg
new file mode 100644
index 0000000000..e5f3130602
--- /dev/null
+++ b/res/img/svg/fullscreen-light.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill="rgba(249, 249, 250, .8)" d="M29 2C29.552 2 30 2.448 30 3V10.5859C30 11.4755 28.9231 11.9235 28.293 11.2949L25.5586 8.56055L8.56055 25.5605L11.293 28.293C11.9215 28.9231 11.4755 30 10.5859 30H3C2.448 30 2 29.552 2 29V21.4141C2 20.5245 3.0769 20.0765 3.70703 20.7051L6.43945 23.4375L23.4395 6.4375L20.709 3.70703C20.079 3.07703 20.5241 2 21.4141 2H29Z"/>
+</svg>
diff --git a/src/components/app/BottomBox.css b/src/components/app/BottomBox.css
index 16676702d2..a35d14361d 100644
--- a/src/components/app/BottomBox.css
+++ b/src/components/app/BottomBox.css
@@ -15,6 +15,8 @@
   --internal-sourceview-background-color: var(--grey-20);
   --internal-close-icon: url(../../../res/img/svg/close-dark.svg);
   --internal-assembly-icon: url(../../../res/img/svg/asm-icon.svg);
+  --internal-fullscreen-icon: url(../../../res/img/svg/fullscreen.svg);
+  --internal-fullscreen-exit-icon: url(../../../res/img/svg/fullscreen-exit.svg);
 
   display: flex;
   height: 100%; /* direct child of SplitterLayout */
@@ -113,11 +115,11 @@
 }
 
 .bottom-fullscreen-show-button {
-  background-image: url(firefox-profiler-res/img/svg/fullscreen.svg);
+  background-image: var(--internal-fullscreen-icon);
 }
 
 .bottom-fullscreen-hide-button {
-  background-image: url(firefox-profiler-res/img/svg/fullscreen-exit.svg);
+  background-image: var(--internal-fullscreen-exit-icon);
 }
 
 .codeLoadingOverlay,
@@ -181,6 +183,8 @@
     --internal-sourceview-background-color: var(--grey-80);
     --internal-close-icon: url(../../../res/img/svg/close-light.svg);
     --internal-assembly-icon: url(../../../res/img/svg/asm-icon-light.svg);
+    --internal-fullscreen-icon: url(../../../res/img/svg/fullscreen-light.svg);
+    --internal-fullscreen-exit-icon: url(../../../res/img/svg/fullscreen-exit-light.svg);
   }
 
   .codeLoadingOverlay,

From 354d108db40275f806775b8c63b4069a84584678 Mon Sep 17 00:00:00 2001
From: fatadel <afatkhutdinov@mozilla.com>
Date: Mon, 27 Apr 2026 12:57:43 +0200
Subject: [PATCH 56/64] Replace 4 counter track components with a single
 generic TrackCounter (#5944)

Collapse the separate Memory, Power, ProcessCPU, and Bandwidth track
implementations into a single TrackCounter component that renders any
counter type using CounterDisplayConfig from PR #5912.

The LocalTrack union is simplified from 8 variants to 5 by replacing
'memory', 'power', 'process-cpu', and 'bandwidth' with a single
'counter' type. The graph branches on display.graphType for canvas
drawing (accumulated vs rate) and on counter.category/counter.name
for tooltip rendering, while display.unit and display.label drive
value formatting and the track label.

Counter tracks get a single dedicated slot in LOCAL_TRACK_INDEX_ORDER;
existing URLs are remapped by a new v16 URL upgrader. Display ordering
between counters uses the new display.sortWeight field, falling back
to a natural sort on counter name.

Closes #5752.
---
 src/actions/profile-view.ts                   |   5 +-
 src/app-logic/constants.ts                    |  22 +-
 src/app-logic/url-handling.ts                 | 254 ++++-
 src/components/timeline/LocalTrack.tsx        |  20 +-
 src/components/timeline/Markers.tsx           |  51 +
 src/components/timeline/TrackBandwidth.css    |  25 -
 src/components/timeline/TrackBandwidth.tsx    |  83 --
 .../timeline/TrackBandwidthGraph.tsx          | 705 --------------
 src/components/timeline/TrackContextMenu.tsx  |   2 +-
 .../{TrackMemory.css => TrackCounter.css}     |  13 +-
 .../{TrackProcessCPU.tsx => TrackCounter.tsx} |  58 +-
 src/components/timeline/TrackCounterGraph.tsx | 901 ++++++++++++++++++
 src/components/timeline/TrackMemory.tsx       | 103 --
 src/components/timeline/TrackMemoryGraph.tsx  | 544 -----------
 src/components/timeline/TrackPower.css        |  25 -
 src/components/timeline/TrackPower.tsx        |  83 --
 src/components/timeline/TrackPowerGraph.tsx   | 569 -----------
 src/components/timeline/TrackProcessCPU.css   |  39 -
 .../timeline/TrackProcessCPUGraph.tsx         | 477 ----------
 src/profile-logic/process-profile.ts          |  20 +-
 .../processed-profile-versioning.ts           |  20 +-
 src/profile-logic/tracks.ts                   | 129 ++-
 src/selectors/app.tsx                         |  29 +-
 src/selectors/per-thread/markers.ts           |  57 +-
 src/selectors/profile.ts                      |  11 +-
 src/test/components/TrackBandwidth.test.tsx   |  18 +-
 src/test/components/TrackMemory.test.tsx      |  20 +-
 src/test/components/TrackPower.test.tsx       |  50 +-
 src/test/components/TrackProcessCPU.test.tsx  |  46 +-
 .../__snapshots__/LocalTrack.test.tsx.snap    |  12 +-
 .../TrackBandwidth.test.tsx.snap              |  10 +-
 .../__snapshots__/TrackMemory.test.tsx.snap   |  38 +-
 .../__snapshots__/TrackPower.test.tsx.snap    |  32 +-
 .../TrackProcessCPU.test.tsx.snap             |  30 +-
 src/test/fixtures/profiles/tracks.ts          |  32 +-
 src/test/store/profile-view.test.ts           |   4 +-
 src/test/url-handling.test.ts                 | 137 +++
 src/types/profile-derived.ts                  |   5 +-
 src/types/profile.ts                          |   9 +-
 39 files changed, 1705 insertions(+), 2983 deletions(-)
 delete mode 100644 src/components/timeline/TrackBandwidth.css
 delete mode 100644 src/components/timeline/TrackBandwidth.tsx
 delete mode 100644 src/components/timeline/TrackBandwidthGraph.tsx
 rename src/components/timeline/{TrackMemory.css => TrackCounter.css} (74%)
 rename src/components/timeline/{TrackProcessCPU.tsx => TrackCounter.tsx} (52%)
 create mode 100644 src/components/timeline/TrackCounterGraph.tsx
 delete mode 100644 src/components/timeline/TrackMemory.tsx
 delete mode 100644 src/components/timeline/TrackMemoryGraph.tsx
 delete mode 100644 src/components/timeline/TrackPower.css
 delete mode 100644 src/components/timeline/TrackPower.tsx
 delete mode 100644 src/components/timeline/TrackPowerGraph.tsx
 delete mode 100644 src/components/timeline/TrackProcessCPU.css
 delete mode 100644 src/components/timeline/TrackProcessCPUGraph.tsx

diff --git a/src/actions/profile-view.ts b/src/actions/profile-view.ts
index c3d6daa277..7584c1f7be 100644
--- a/src/actions/profile-view.ts
+++ b/src/actions/profile-view.ts
@@ -347,10 +347,7 @@ function getInformationFromTrackReference(
             relatedThreadIndex: localTrack.threadIndex,
             relatedTab: null,
           };
-        case 'memory':
-        case 'bandwidth':
-        case 'process-cpu':
-        case 'power': {
+        case 'counter': {
           const counterSelectors = getCounterSelectors(localTrack.counterIndex);
           const counter = counterSelectors.getCounter(state);
           return {
diff --git a/src/app-logic/constants.ts b/src/app-logic/constants.ts
index 955a410194..a8bdb0e23c 100644
--- a/src/app-logic/constants.ts
+++ b/src/app-logic/constants.ts
@@ -29,16 +29,10 @@ export const TRACK_NETWORK_ROW_REPEAT = 7;
 export const TRACK_NETWORK_HEIGHT =
   TRACK_NETWORK_ROW_HEIGHT * TRACK_NETWORK_ROW_REPEAT;
 
-// The following values are for memory track.
-export const TRACK_MEMORY_GRAPH_HEIGHT = 25;
-export const TRACK_MEMORY_MARKERS_HEIGHT = 15;
-export const TRACK_MEMORY_HEIGHT =
-  TRACK_MEMORY_GRAPH_HEIGHT + TRACK_MEMORY_MARKERS_HEIGHT;
-export const TRACK_MEMORY_LINE_WIDTH = 2;
-
-// The following values are for the bandwidth track.
-export const TRACK_BANDWIDTH_HEIGHT = 25;
-export const TRACK_BANDWIDTH_LINE_WIDTH = 2;
+// The following values are for counter tracks (Memory, Power, Bandwidth, etc.).
+export const TRACK_COUNTER_GRAPH_HEIGHT = 25;
+export const TRACK_COUNTER_MARKERS_HEIGHT = 15;
+export const TRACK_COUNTER_LINE_WIDTH = 2;
 
 // The following values are for experimental event delay track.
 export const TRACK_EVENT_DELAY_HEIGHT = 40;
@@ -59,14 +53,6 @@ export const TRACK_PROCESS_BLANK_HEIGHT = 30;
 // Height of timeline ruler.
 export const TIMELINE_RULER_HEIGHT = 20;
 
-// Height of the power track.
-export const TRACK_POWER_HEIGHT = 25;
-export const TRACK_POWER_LINE_WIDTH = 2;
-
-// Height of the process cpu track.
-export const TRACK_PROCESS_CPU_HEIGHT = 25;
-export const TRACK_PROCESS_CPU_LINE_WIDTH = 2;
-
 // JS Tracer has very high fidelity information, and needs a more fine-grained zoom.
 export const JS_TRACER_MAXIMUM_CHART_ZOOM = 0.001;
 
diff --git a/src/app-logic/url-handling.ts b/src/app-logic/url-handling.ts
index d8ab78b002..02b2907421 100644
--- a/src/app-logic/url-handling.ts
+++ b/src/app-logic/url-handling.ts
@@ -53,7 +53,7 @@ import { StringTable } from 'firefox-profiler/utils/string-table';
 import type { ProfileUpgradeInfo } from 'firefox-profiler/profile-logic/processed-profile-versioning';
 import type { ProfileAndProfileUpgradeInfo } from 'firefox-profiler/actions/receive-profile';
 
-export const CURRENT_URL_VERSION = 15;
+export const CURRENT_URL_VERSION = 16;
 
 /**
  * This static piece of state might look like an anti-pattern, but it's a relatively
@@ -1369,8 +1369,260 @@ const _upgraders: {
       .map(mapIndexesInTransform)
       .join('~');
   },
+  [16]: (
+    processedLocation: ProcessedLocationBeforeUpgrade,
+    profile?: Profile
+  ) => {
+    // The 'memory', 'power', 'bandwidth', and 'process-cpu' LocalTrack types
+    // have been collapsed into a single 'counter' type. This moves counter
+    // tracks into a single group inside each PID's local track array, which
+    // shifts the track indexes that older URLs recorded. Remap
+    // localTrackOrderByPid and hiddenLocalTracksByPid so existing URLs keep
+    // pointing at the same tracks.
+    const { query } = processedLocation;
+    if (!profile || !profile.counters || profile.counters.length === 0) {
+      return;
+    }
+    if (!query.localTrackOrderByPid && !query.hiddenLocalTracksByPid) {
+      return;
+    }
+
+    const oldToNewIndexByPid = _computeV16LocalTrackIndexRemap(profile);
+
+    if (query.localTrackOrderByPid) {
+      query.localTrackOrderByPid = (query.localTrackOrderByPid as string)
+        .split('~')
+        .map((pidAndTracks) => {
+          const dash = pidAndTracks.indexOf('-');
+          if (dash === -1) {
+            return pidAndTracks;
+          }
+          const pid = pidAndTracks.slice(0, dash);
+          const encoded = pidAndTracks.slice(dash + 1);
+          const remap = oldToNewIndexByPid.get(pid);
+          if (!remap) {
+            return pidAndTracks;
+          }
+          const oldOrder = decodeUintArrayFromUrlComponent(encoded);
+          const newOrder = [];
+          for (const oldIndex of oldOrder) {
+            const newIndex = remap[oldIndex];
+            if (newIndex !== undefined && newIndex !== null) {
+              newOrder.push(newIndex);
+            }
+          }
+          return `${pid}-${encodeUintArrayForUrlComponent(newOrder)}`;
+        })
+        .join('~');
+    }
+
+    if (query.hiddenLocalTracksByPid) {
+      query.hiddenLocalTracksByPid = (query.hiddenLocalTracksByPid as string)
+        .split('~')
+        .map((pidAndTracks) => {
+          const dash = pidAndTracks.indexOf('-');
+          if (dash === -1) {
+            return pidAndTracks;
+          }
+          const pid = pidAndTracks.slice(0, dash);
+          const encoded = pidAndTracks.slice(dash + 1);
+          const remap = oldToNewIndexByPid.get(pid);
+          if (!remap) {
+            return pidAndTracks;
+          }
+          const oldHidden = decodeUintArrayFromUrlComponent(encoded);
+          const newHidden = new Set<number>();
+          for (const oldIndex of oldHidden) {
+            const newIndex = remap[oldIndex];
+            if (newIndex !== undefined && newIndex !== null) {
+              newHidden.add(newIndex);
+            }
+          }
+          return `${pid}-${encodeUintSetForUrlComponent(newHidden)}`;
+        })
+        .join('~');
+    }
+  },
 };
 
+/**
+ * Produce a per-PID mapping from old local-track indexes (using the pre-v16
+ * LOCAL_TRACK_INDEX_ORDER) to new local-track indexes (post-v16). Used by the
+ * v16 URL upgrader.
+ *
+ * The two layouts share the same set of tracks; only the relative positions of
+ * counter tracks differ. The helper reconstructs both layouts by simulating
+ * what computeLocalTracksByPid would have produced under each.
+ */
+function _computeV16LocalTrackIndexRemap(
+  profile: Profile
+): Map<Pid, Array<number | null>> {
+  // Pre-v16 LOCAL_TRACK_INDEX_ORDER.
+  // Note: we don't preserve 'event-delay' and 'process-cpu' in URLs,
+  // as they are experimental.
+  const OLD_SLOT = {
+    thread: 0,
+    network: 1,
+    memory: 2,
+    ipc: 3,
+    marker: 7,
+    power: 6,
+    bandwidth: 8,
+  };
+  // Post-v16 LOCAL_TRACK_INDEX_ORDER.
+  const NEW_SLOT = {
+    thread: 0,
+    network: 1,
+    counter: 2,
+    ipc: 3,
+    marker: 5,
+  };
+
+  type Entry = {
+    id: string;
+    oldSlot: number | null;
+    newSlot: number | null;
+  };
+
+  const entriesByPid = new Map<Pid, Entry[]>();
+  const ensurePid = (pid: Pid): Entry[] => {
+    let entries = entriesByPid.get(pid);
+    if (entries === undefined) {
+      entries = [];
+      entriesByPid.set(pid, entries);
+    }
+    return entries;
+  };
+
+  const markerSchemasWithGraphs = (profile.meta.markerSchema || []).filter(
+    (schema) => Array.isArray(schema.graphs) && schema.graphs.length > 0
+  );
+
+  for (
+    let threadIndex = 0;
+    threadIndex < profile.threads.length;
+    threadIndex++
+  ) {
+    const thread = profile.threads[threadIndex];
+    const { pid, markers } = thread;
+
+    if (!thread.isMainThread) {
+      ensurePid(pid).push({
+        id: `t:${threadIndex}`,
+        oldSlot: OLD_SLOT.thread,
+        newSlot: NEW_SLOT.thread,
+      });
+    }
+    if (markers.data.some((datum) => datum && datum.type === 'Network')) {
+      ensurePid(pid).push({
+        id: `n:${threadIndex}`,
+        oldSlot: OLD_SLOT.network,
+        newSlot: NEW_SLOT.network,
+      });
+    }
+    if (markers.data.some((datum) => datum && datum.type === 'IPC')) {
+      ensurePid(pid).push({
+        id: `i:${threadIndex}`,
+        oldSlot: OLD_SLOT.ipc,
+        newSlot: NEW_SLOT.ipc,
+      });
+    }
+
+    if (markerSchemasWithGraphs.length > 0) {
+      const markerTracksBySchemaName: Map<
+        string,
+        { keys: string[]; markerNames: Set<number> }
+      > = new Map();
+      for (const markerSchema of markerSchemasWithGraphs) {
+        markerTracksBySchemaName.set(markerSchema.name, {
+          keys: (markerSchema.graphs || []).map((graph) => graph.key),
+          markerNames: new Set(),
+        });
+      }
+      for (let i = 0; i < markers.length; ++i) {
+        const markerNameIndex = markers.name[i];
+        const markerData = markers.data[i];
+        if (markerData && markerData.type) {
+          const mapEntry = markerTracksBySchemaName.get(markerData.type);
+          if (mapEntry && mapEntry.keys.every((k) => k in markerData)) {
+            mapEntry.markerNames.add(markerNameIndex);
+          }
+        }
+      }
+      for (const [schemaName, { markerNames }] of markerTracksBySchemaName) {
+        for (const markerName of markerNames) {
+          ensurePid(pid).push({
+            id: `m:${threadIndex}:${schemaName}:${markerName}`,
+            oldSlot: OLD_SLOT.marker,
+            newSlot: NEW_SLOT.marker,
+          });
+        }
+      }
+    }
+  }
+
+  const { counters } = profile;
+  if (counters) {
+    for (let counterIndex = 0; counterIndex < counters.length; counterIndex++) {
+      const counter = counters[counterIndex];
+      const { pid, category, name, samples } = counter;
+
+      // OLD behavior: only Memory / Bandwidth / Power produced tracks.
+      let oldSlot: number | null;
+      if (category === 'Memory') {
+        oldSlot = OLD_SLOT.memory;
+      } else if (category === 'Bandwidth') {
+        oldSlot = OLD_SLOT.bandwidth;
+      }
+      // We assumed there was no data when <= 2 samples.
+      else if (category === 'power' && samples.length > 2) {
+        oldSlot = OLD_SLOT.power;
+      } else {
+        oldSlot = null;
+      }
+
+      // NEW behavior: mirror computeLocalTracksByPid. processCPU counters are
+      // added later by addProcessCPUTracksForProcess when the experimental
+      // toggle fires, every other counter becomes a track.
+      const newSlot: number | null =
+        category === 'CPU' && name === 'processCPU' ? null : NEW_SLOT.counter;
+
+      if (oldSlot === null && newSlot === null) {
+        continue;
+      }
+
+      ensurePid(pid).push({
+        id: `c:${counterIndex}`,
+        oldSlot,
+        newSlot,
+      });
+    }
+  }
+
+  const remapByPid = new Map<Pid, Array<number | null>>();
+  for (const [pid, entries] of entriesByPid) {
+    const oldList = entries
+      .filter((e) => e.oldSlot !== null)
+      .slice()
+      .sort((a, b) => (a.oldSlot as number) - (b.oldSlot as number));
+    const newList = entries
+      .filter((e) => e.newSlot !== null)
+      .slice()
+      .sort((a, b) => (a.newSlot as number) - (b.newSlot as number));
+
+    const newIdToIndex = new Map<string, number>();
+    newList.forEach((entry, i) => newIdToIndex.set(entry.id, i));
+
+    const remap: Array<number | null> = oldList.map((entry) => {
+      const newIndex = newIdToIndex.get(entry.id);
+      return newIndex === undefined ? null : newIndex;
+    });
+    remapByPid.set(pid, remap);
+  }
+
+  return remapByPid;
+}
+
 for (let destVersion = 1; destVersion <= CURRENT_URL_VERSION; destVersion++) {
   if (!_upgraders[destVersion]) {
     throw new Error(`There is no upgrader for version ${destVersion}.`);
diff --git a/src/components/timeline/LocalTrack.tsx b/src/components/timeline/LocalTrack.tsx
index f43e2b991f..ff670bb722 100644
--- a/src/components/timeline/LocalTrack.tsx
+++ b/src/components/timeline/LocalTrack.tsx
@@ -26,11 +26,8 @@ import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
 import { TimelineTrackThread } from './TrackThread';
 import { TrackEventDelay } from './TrackEventDelay';
 import { TrackNetwork } from './TrackNetwork';
-import { TrackMemory } from './TrackMemory';
-import { TrackBandwidth } from './TrackBandwidth';
+import { TrackCounter } from './TrackCounter';
 import { TrackIPC } from './TrackIPC';
-import { TrackProcessCPU } from './TrackProcessCPU';
-import { TrackPower } from './TrackPower';
 import { getTrackSelectionModifiers } from 'firefox-profiler/utils';
 import type {
   TrackReference,
@@ -106,18 +103,12 @@ class LocalTrackComponent extends PureComponent<Props> {
         );
       case 'network':
         return <TrackNetwork threadIndex={localTrack.threadIndex} />;
-      case 'memory':
-        return <TrackMemory counterIndex={localTrack.counterIndex} />;
-      case 'bandwidth':
-        return <TrackBandwidth counterIndex={localTrack.counterIndex} />;
+      case 'counter':
+        return <TrackCounter counterIndex={localTrack.counterIndex} />;
       case 'ipc':
         return <TrackIPC threadIndex={localTrack.threadIndex} />;
       case 'event-delay':
         return <TrackEventDelay threadIndex={localTrack.threadIndex} />;
-      case 'process-cpu':
-        return <TrackProcessCPU counterIndex={localTrack.counterIndex} />;
-      case 'power':
-        return <TrackPower counterIndex={localTrack.counterIndex} />;
       case 'marker':
         return (
           <TrackCustomMarker
@@ -241,10 +232,7 @@ export const TimelineLocalTrack = explicitConnect<
           'Event Delay of ' + selectors.getThreadProcessDetails(state);
         break;
       }
-      case 'memory':
-      case 'bandwidth':
-      case 'process-cpu':
-      case 'power': {
+      case 'counter': {
         titleText = getCounterSelectors(localTrack.counterIndex).getDescription(
           state
         );
diff --git a/src/components/timeline/Markers.tsx b/src/components/timeline/Markers.tsx
index 5a9cd953f6..536f3e4e2b 100644
--- a/src/components/timeline/Markers.tsx
+++ b/src/components/timeline/Markers.tsx
@@ -27,6 +27,7 @@ import type {
   CssPixels,
   Marker,
   MarkerIndex,
+  MarkerDisplayLocation,
   ThreadsKey,
 } from 'firefox-profiler/types';
 
@@ -658,3 +659,53 @@ export const TimelineMarkersIPC = explicitConnect<
   mapDispatchToProps: { changeRightClickedMarker },
   component: withSize(TimelineMarkers),
 });
+
+/**
+ * Marker row rendered above a counter track's graph. Filters markers by the
+ * schema location declared on the counter, so any counter type can host its
+ * own marker row without the component having to know which category it is.
+ */
+type TimelineMarkersCounterOwnProps = OwnProps & {
+  readonly markerSchemaLocation: MarkerDisplayLocation;
+};
+
+// Drops the counter-specific own prop before forwarding to the base markers
+// component, which doesn't know about markerSchemaLocation.
+const _SizedTimelineMarkers = withSize(TimelineMarkers);
+function _TimelineMarkersCounterInner(
+  props: ConnectedProps<
+    TimelineMarkersCounterOwnProps,
+    StateProps,
+    DispatchProps
+  >
+) {
+  const { markerSchemaLocation: _unused, ...rest } = props;
+  return <_SizedTimelineMarkers {...rest} />;
+}
+
+export const TimelineMarkersCounter = explicitConnect<
+  TimelineMarkersCounterOwnProps,
+  StateProps,
+  DispatchProps
+>({
+  mapStateToProps: (state, props) => {
+    const { threadsKey, markerSchemaLocation } = props;
+    const selectors = getThreadSelectorsFromThreadsKey(threadsKey);
+    const selectedThreads = getSelectedThreadIndexes(state);
+
+    return {
+      getMarker: selectors.getMarkerGetter(state),
+      markerIndexes:
+        selectors.getTimelineMarkerIndexesBySchemaLocation(
+          markerSchemaLocation
+        )(state),
+      isSelected: _getTimelineMarkersIsSelected(selectedThreads, threadsKey),
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
+      additionalClassName: 'timelineMarkersCounter',
+      testId: 'TimelineMarkersCounter',
+      rightClickedMarker: selectors.getRightClickedMarker(state),
+    };
+  },
+  mapDispatchToProps: { changeRightClickedMarker },
+  component: _TimelineMarkersCounterInner,
+});
diff --git a/src/components/timeline/TrackBandwidth.css b/src/components/timeline/TrackBandwidth.css
deleted file mode 100644
index 8d2d520faf..0000000000
--- a/src/components/timeline/TrackBandwidth.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.timelineTrackBandwidthGraph {
-  position: relative;
-  width: 100%;
-  height: var(--graph-height);
-}
-
-.timelineTrackBandwidthCanvas {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-}
-
-.timelineTrackBandwidthGraphDot {
-  position: absolute;
-  width: 6px;
-  height: 6px;
-  border-radius: 3px;
-  margin-top: -3px;
-  margin-left: -3px;
-  pointer-events: none;
-}
diff --git a/src/components/timeline/TrackBandwidth.tsx b/src/components/timeline/TrackBandwidth.tsx
deleted file mode 100644
index 3935008d35..0000000000
--- a/src/components/timeline/TrackBandwidth.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-} from 'firefox-profiler/selectors/profile';
-import { TrackBandwidthGraph } from './TrackBandwidthGraph';
-import {
-  TRACK_BANDWIDTH_HEIGHT,
-  TRACK_BANDWIDTH_LINE_WIDTH,
-} from 'firefox-profiler/app-logic/constants';
-
-import type {
-  CounterIndex,
-  ThreadIndex,
-  Milliseconds,
-} from 'firefox-profiler/types';
-
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-
-import './TrackBandwidth.css';
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-};
-
-type DispatchProps = {};
-
-type Props = ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {};
-
-export class TrackBandwidthImpl extends React.PureComponent<Props, State> {
-  override render() {
-    const { counterIndex } = this.props;
-    return (
-      <div
-        className="timelineTrackBandwidth"
-        style={
-          {
-            height: TRACK_BANDWIDTH_HEIGHT,
-            '--graph-height': `${TRACK_BANDWIDTH_HEIGHT}px`,
-          } as React.CSSProperties
-        }
-      >
-        <TrackBandwidthGraph
-          counterIndex={counterIndex}
-          lineWidth={TRACK_BANDWIDTH_LINE_WIDTH}
-          graphHeight={TRACK_BANDWIDTH_HEIGHT}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackBandwidth = explicitConnect<
-  OwnProps,
-  StateProps,
-  DispatchProps
->({
-  mapStateToProps: (state, ownProps) => {
-    const { counterIndex } = ownProps;
-    const counterSelectors = getCounterSelectors(counterIndex);
-    const counter = counterSelectors.getCounter(state);
-    const { start, end } = getCommittedRange(state);
-    return {
-      threadIndex: counter.mainThreadIndex,
-      rangeStart: start,
-      rangeEnd: end,
-    };
-  },
-  component: TrackBandwidthImpl,
-});
diff --git a/src/components/timeline/TrackBandwidthGraph.tsx b/src/components/timeline/TrackBandwidthGraph.tsx
deleted file mode 100644
index 0110b3c9a3..0000000000
--- a/src/components/timeline/TrackBandwidthGraph.tsx
+++ /dev/null
@@ -1,705 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import { InView } from 'react-intersection-observer';
-import { Localized } from '@fluent/react';
-import { withSize } from 'firefox-profiler/components/shared/WithSize';
-import {
-  getStrokeColor,
-  getFillColor,
-  getDotColor,
-} from 'firefox-profiler/profile-logic/graph-color';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import {
-  formatBytes,
-  formatNumber,
-} from 'firefox-profiler/utils/format-numbers';
-import { bisectionRight } from 'firefox-profiler/utils/bisect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-  getPreviewSelection,
-  getProfileInterval,
-} from 'firefox-profiler/selectors/profile';
-import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
-import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
-import {
-  TooltipDetails,
-  TooltipDetail,
-  TooltipDetailSeparator,
-} from 'firefox-profiler/components/tooltip/TooltipDetails';
-import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-import { getSampleIndexRangeForSelection } from 'firefox-profiler/profile-logic/profile-data';
-import { co2 } from '@tgwf/co2';
-
-import type {
-  CounterIndex,
-  Counter,
-  Thread,
-  ThreadIndex,
-  AccumulatedCounterSamples,
-  Milliseconds,
-  PreviewSelection,
-  CssPixels,
-  StartEndRange,
-  IndexIntoSamplesTable,
-} from 'firefox-profiler/types';
-
-import type { SizeProps } from 'firefox-profiler/components/shared/WithSize';
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-
-import './TrackBandwidth.css';
-
-/**
- * When adding properties to these props, please consider the comment above the component.
- */
-type CanvasProps = {
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly accumulatedSamples: AccumulatedCounterSamples;
-  readonly maxCounterSampleCountPerMs: number;
-  readonly interval: Milliseconds;
-  readonly width: CssPixels;
-  readonly height: CssPixels;
-  readonly lineWidth: CssPixels;
-};
-
-/**
- * This component controls the rendering of the canvas. Every render call through
- * React triggers a new canvas render. Because of this, it's important to only pass
- * in the props that are needed for the canvas draw call.
- */
-class TrackBandwidthCanvas extends React.PureComponent<CanvasProps> {
-  _canvas: null | HTMLCanvasElement = null;
-  _requestedAnimationFrame: boolean = false;
-  _canvasState: { renderScheduled: boolean; inView: boolean } = {
-    renderScheduled: false,
-    inView: false,
-  };
-
-  drawCanvas(canvas: HTMLCanvasElement): void {
-    const {
-      rangeStart,
-      rangeEnd,
-      counter,
-      height,
-      width,
-      lineWidth,
-      interval,
-      maxCounterSampleCountPerMs,
-      counterSampleRange,
-    } = this.props;
-    if (width === 0) {
-      // This is attempting to draw before the canvas was laid out.
-      return;
-    }
-
-    const ctx = canvas.getContext('2d')!;
-    const devicePixelRatio = window.devicePixelRatio;
-    const deviceWidth = width * devicePixelRatio;
-    const deviceHeight = height * devicePixelRatio;
-    const deviceLineWidth = lineWidth * devicePixelRatio;
-    const deviceLineHalfWidth = deviceLineWidth * 0.5;
-    const innerDeviceHeight = deviceHeight - deviceLineWidth;
-    const rangeLength = rangeEnd - rangeStart;
-    const millisecondWidth = deviceWidth / rangeLength;
-    const intervalWidth = interval * millisecondWidth;
-
-    // Resize and clear the canvas.
-    canvas.width = Math.round(deviceWidth);
-    canvas.height = Math.round(deviceHeight);
-    ctx.clearRect(0, 0, deviceWidth, deviceHeight);
-
-    const samples = counter.samples;
-    if (samples.length === 0) {
-      // There's no reason to draw the samples, there are none.
-      return;
-    }
-
-    // Take the sample information, and convert it into chart coordinates. Use a slightly
-    // smaller space than the deviceHeight, so that the stroke will be fully visible
-    // both at the top and bottom of the chart.
-    const [sampleStart, sampleEnd] = counterSampleRange;
-    const countRangePerMs = maxCounterSampleCountPerMs;
-
-    {
-      // Draw the chart.
-      //
-      //                 ...--`
-      //  1 ...---```..--      `--. 2
-      //    |_____________________|
-      //  4                        3
-      //
-      // Start by drawing from 1 - 2. This will be the top of all the peaks of the
-      // bandwidth graph.
-
-      ctx.lineWidth = deviceLineWidth;
-      ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = getStrokeColor(counter.display.color);
-      ctx.fillStyle = getFillColor(counter.display.color);
-      ctx.beginPath();
-
-      const getX = (i: number) =>
-        Math.round((samples.time[i] - rangeStart) * millisecondWidth);
-      const getY = (i: number) => {
-        const rawY = samples.count[i];
-        if (!rawY) {
-          // Make the 0 values invisible so that 'almost 0' is noticeable.
-          return deviceHeight + deviceLineHalfWidth;
-        }
-
-        const sampleTimeDeltaInMs =
-          i === 0 ? interval : samples.time[i] - samples.time[i - 1];
-        const unitGraphCount = rawY / sampleTimeDeltaInMs / countRangePerMs;
-        return (
-          innerDeviceHeight -
-          innerDeviceHeight * unitGraphCount +
-          // Add on half the stroke's line width so that it won't be cut off the edge
-          // of the graph.
-          deviceLineHalfWidth
-        );
-      };
-
-      // The x and y are used after the loop.
-      const firstX = getX(sampleStart);
-      let x = firstX;
-      let y = getY(sampleStart);
-
-      // For the first sample, only move the line, do not draw it. Also
-      // remember this first X, as the bottom of the graph will need to connect
-      // back up to it.
-      ctx.moveTo(x, y);
-
-      // Create a path for the top of the chart. This is the line that will have
-      // a stroke applied to it.
-      for (let i = sampleStart + 1; i < sampleEnd; i++) {
-        x = getX(i);
-        y = getY(i);
-        ctx.lineTo(x, y);
-
-        // If we have multiple samples to draw on the same horizontal pixel,
-        // we process all of them together with a max-min decimation algorithm
-        // to save time:
-        // - We draw the first and last samples to ensure the display is
-        //   correct if there are sampling gaps.
-        // - For the values in between, we only draw the min and max values,
-        //   to draw a vertical line covering all the other sample values.
-        const values = [y];
-        while (i + 1 < sampleEnd && getX(i + 1) === x) {
-          values.push(getY(++i));
-        }
-
-        // Looking for the min and max only makes sense if we have more than 2
-        // samples to draw.
-        if (values.length > 2) {
-          const maxY = Math.max(...values);
-          if (maxY !== y) {
-            y = maxY;
-            ctx.lineTo(x, y);
-          }
-          const minY = Math.min(...values);
-          if (minY !== y) {
-            y = minY;
-            ctx.lineTo(x, y);
-          }
-        }
-
-        const lastY = values[values.length - 1];
-        if (lastY !== y) {
-          y = lastY;
-          ctx.lineTo(x, y);
-        }
-      }
-
-      // The samples range ends at the time of the last sample, plus the interval.
-      // Draw this last bit.
-      ctx.lineTo(x + intervalWidth, y);
-
-      // Don't do the fill yet, just stroke the top line. This will draw a line from
-      // point 1 to 2 in the diagram above.
-      ctx.stroke();
-
-      // After doing the stroke, continue the path to complete the fill to the bottom
-      // of the canvas. This continues the path to point 3 and then 4.
-
-      // Create a line from 2 to 3.
-      ctx.lineTo(x + intervalWidth, deviceHeight);
-
-      // Create a line from 3 to 4.
-      ctx.lineTo(firstX, deviceHeight);
-
-      // The line from 4 to 1 will be implicitly filled in.
-      ctx.fill();
-    }
-  }
-
-  _scheduleDraw() {
-    if (!this._canvasState.inView) {
-      // Canvas is not in the view. Schedule the render for a later intersection
-      // observer callback.
-      this._canvasState.renderScheduled = true;
-      return;
-    }
-
-    // Canvas is in the view. Render the canvas and reset the schedule state.
-    this._canvasState.renderScheduled = false;
-
-    if (!this._requestedAnimationFrame) {
-      this._requestedAnimationFrame = true;
-      window.requestAnimationFrame(() => {
-        this._requestedAnimationFrame = false;
-        const canvas = this._canvas;
-        if (canvas) {
-          this.drawCanvas(canvas);
-        }
-      });
-    }
-  }
-
-  _takeCanvasRef = (canvas: HTMLCanvasElement | null) => {
-    this._canvas = canvas;
-  };
-
-  _observerCallback = (inView: boolean, _entry: IntersectionObserverEntry) => {
-    this._canvasState.inView = inView;
-    if (!this._canvasState.renderScheduled) {
-      // Skip if render is not scheduled.
-      return;
-    }
-
-    this._scheduleDraw();
-  };
-
-  override componentDidMount() {
-    this._scheduleDraw();
-  }
-
-  override componentDidUpdate() {
-    this._scheduleDraw();
-  }
-
-  override render() {
-    return (
-      <InView onChange={this._observerCallback}>
-        <canvas
-          className="timelineTrackBandwidthCanvas"
-          ref={this._takeCanvasRef}
-        />
-      </InView>
-    );
-  }
-}
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-  readonly lineWidth: CssPixels;
-  readonly graphHeight: CssPixels;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly accumulatedSamples: AccumulatedCounterSamples;
-  readonly maxCounterSampleCountPerMs: number;
-  readonly interval: Milliseconds;
-  readonly filteredThread: Thread;
-  readonly unfilteredSamplesRange: StartEndRange | null;
-  readonly previewSelection: PreviewSelection | null;
-};
-
-type DispatchProps = {};
-
-type Props = SizeProps & ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {
-  hoveredCounter: null | number;
-  mouseX: CssPixels;
-  mouseY: CssPixels;
-};
-
-/**
- * The bandwidth track graph takes bandwidth information from counters, and renders it as a
- * graph in the timeline.
- */
-class TrackBandwidthGraphImpl extends React.PureComponent<Props, State> {
-  override state = {
-    hoveredCounter: null,
-    mouseX: 0,
-    mouseY: 0,
-  };
-
-  _onMouseLeave = () => {
-    // This persistTooltips property is part of the web console API. It helps
-    // in being able to inspect and debug tooltips.
-    if (window.persistTooltips) {
-      return;
-    }
-
-    this.setState({ hoveredCounter: null });
-  };
-
-  _onMouseMove = (event: React.MouseEvent<HTMLDivElement>) => {
-    const { pageX: mouseX, pageY: mouseY } = event;
-    // Get the offset from here, and apply it to the time lookup.
-    const { left } = event.currentTarget.getBoundingClientRect();
-    const {
-      width,
-      rangeStart,
-      rangeEnd,
-      counter,
-      interval,
-      counterSampleRange,
-    } = this.props;
-    const rangeLength = rangeEnd - rangeStart;
-    const timeAtMouse = rangeStart + ((mouseX - left) / width) * rangeLength;
-
-    if (counter.samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No sample group found for bandwidth counter');
-    }
-    const { samples } = counter;
-
-    if (
-      timeAtMouse < samples.time[0] ||
-      timeAtMouse > samples.time[samples.length - 1] + interval
-    ) {
-      // We are outside the range of the samples, do not display hover information.
-      this.setState({ hoveredCounter: null });
-    } else {
-      // When the mouse pointer hovers between two points, select the point that's closer.
-      let hoveredCounter;
-      const [sampleStart, sampleEnd] = counterSampleRange;
-      const bisectionCounter = bisectionRight(
-        samples.time,
-        timeAtMouse,
-        sampleStart,
-        sampleEnd
-      );
-      if (bisectionCounter > 0 && bisectionCounter < samples.time.length) {
-        const leftDistance = timeAtMouse - samples.time[bisectionCounter - 1];
-        const rightDistance = samples.time[bisectionCounter] - timeAtMouse;
-        if (leftDistance < rightDistance) {
-          // Left point is closer
-          hoveredCounter = bisectionCounter - 1;
-        } else {
-          // Right point is closer
-          hoveredCounter = bisectionCounter;
-        }
-
-        // If there are samples before or after hoveredCounter that fall
-        // horizontally on the same pixel, move hoveredCounter to the sample
-        // with the highest power value.
-        const mouseAtTime = (t: number) =>
-          Math.round(((t - rangeStart) / rangeLength) * width + left);
-        for (
-          let currentIndex = hoveredCounter - 1;
-          mouseAtTime(samples.time[currentIndex]) === mouseX &&
-          currentIndex > 0;
-          --currentIndex
-        ) {
-          if (samples.count[currentIndex] > samples.count[hoveredCounter]) {
-            hoveredCounter = currentIndex;
-          }
-        }
-        for (
-          let currentIndex = hoveredCounter + 1;
-          mouseAtTime(samples.time[currentIndex]) === mouseX &&
-          currentIndex < samples.time.length;
-          ++currentIndex
-        ) {
-          if (samples.count[currentIndex] > samples.count[hoveredCounter]) {
-            hoveredCounter = currentIndex;
-          }
-        }
-      } else {
-        hoveredCounter = bisectionCounter;
-      }
-
-      if (hoveredCounter === samples.length) {
-        // When hovering the last sample, it's possible the mouse is past the time.
-        // In this case, hover over the last sample. This happens because of the
-        // ` + interval` line in the `if` condition above.
-        hoveredCounter = samples.time.length - 1;
-      }
-
-      this.setState({
-        mouseX,
-        mouseY,
-        hoveredCounter,
-      });
-    }
-  };
-
-  _co2: InstanceType<typeof co2> | null = null;
-  _formatDataTransferValue(bytes: number, l10nId: string) {
-    if (!this._co2) {
-      this._co2 = new co2({ model: 'swd' });
-    }
-    // By default when estimating emissions per byte, co2.js takes into account
-    // emissions for the user device, the data center and the network.
-    // Because we already have power tracks showing the power use and estimated
-    // emissions of the device, set the 'device' grid intensity to 0 to avoid
-    // double counting.
-    const co2eq = this._co2!.perByteTrace(bytes, false, {
-      gridIntensity: { device: 0 },
-    });
-    const carbonValue = formatNumber(
-      typeof co2eq.co2 === 'number' ? co2eq.co2 : co2eq.co2.total
-    );
-    const value = formatBytes(bytes);
-    return (
-      <Localized
-        id={l10nId}
-        vars={{ value, carbonValue }}
-        attrs={{ label: true }}
-      >
-        <TooltipDetail label="">{value}</TooltipDetail>
-      </Localized>
-    );
-  }
-
-  _renderTooltip(counterIndex: number): React.ReactNode {
-    const {
-      accumulatedSamples,
-      counter,
-      rangeStart,
-      rangeEnd,
-      interval,
-      previewSelection,
-    } = this.props;
-    const { mouseX, mouseY } = this.state;
-    const { samples } = counter;
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No accumulated sample found for bandwidth counter');
-    }
-
-    const sampleTime = samples.time[counterIndex];
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the tooltip if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
-    const bytes = accumulatedCounts[counterIndex] - minCount;
-    const operations =
-      samples.number !== undefined ? samples.number[counterIndex] : null;
-
-    const sampleTimeDeltaInMs =
-      counterIndex === 0
-        ? interval
-        : samples.time[counterIndex] - samples.time[counterIndex - 1];
-    const unitGraphCount = samples.count[counterIndex] / sampleTimeDeltaInMs;
-
-    let rangeTotal = 0;
-    if (previewSelection) {
-      const [beginIndex, endIndex] = getSampleIndexRangeForSelection(
-        samples,
-        previewSelection.selectionStart,
-        previewSelection.selectionEnd
-      );
-
-      for (
-        let counterSampleIndex = beginIndex;
-        counterSampleIndex < endIndex;
-        counterSampleIndex++
-      ) {
-        rangeTotal += samples.count[counterSampleIndex];
-      }
-    }
-
-    let ops;
-    if (operations !== null) {
-      ops = formatNumber(operations, 2, 0);
-    }
-
-    return (
-      <Tooltip mouseX={mouseX} mouseY={mouseY}>
-        <div className="timelineTrackBandwidthTooltip">
-          <TooltipDetails>
-            {this._formatDataTransferValue(
-              unitGraphCount * 1000 /* ms -> s */,
-              'TrackBandwidthGraph--speed'
-            )}
-            {operations !== null ? (
-              <Localized
-                id="TrackBandwidthGraph--read-write-operations-since-the-previous-sample"
-                vars={{ value: ops || '' }}
-                attrs={{ label: true }}
-              >
-                <TooltipDetail label="">{ops}</TooltipDetail>
-              </Localized>
-            ) : null}
-            <TooltipDetailSeparator />
-            {this._formatDataTransferValue(
-              bytes,
-              'TrackBandwidthGraph--cumulative-bandwidth-at-this-time'
-            )}
-            {this._formatDataTransferValue(
-              countRange,
-              'TrackBandwidthGraph--total-bandwidth-in-graph'
-            )}
-            {previewSelection
-              ? this._formatDataTransferValue(
-                  rangeTotal,
-                  'TrackBandwidthGraph--total-bandwidth-in-range'
-                )
-              : null}
-          </TooltipDetails>
-        </div>
-      </Tooltip>
-    );
-  }
-
-  /**
-   * Create a div that is a dot on top of the graph representing the current
-   * height of the graph.
-   */
-  _renderBandwidthDot(counterIndex: number): React.ReactNode {
-    const {
-      counter,
-      rangeStart,
-      rangeEnd,
-      graphHeight,
-      width,
-      lineWidth,
-      maxCounterSampleCountPerMs,
-      interval,
-    } = this.props;
-
-    const { samples } = counter;
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No sample found for bandwidth counter');
-    }
-    const rangeLength = rangeEnd - rangeStart;
-    const sampleTime = samples.time[counterIndex];
-
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the dot if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const left = (width * (sampleTime - rangeStart)) / rangeLength;
-    const countRangePerMs = maxCounterSampleCountPerMs;
-    const sampleTimeDeltaInMs =
-      counterIndex === 0
-        ? interval
-        : samples.time[counterIndex] - samples.time[counterIndex - 1];
-    const unitSampleCount =
-      samples.count[counterIndex] / sampleTimeDeltaInMs / countRangePerMs;
-    const innerTrackHeight = graphHeight - lineWidth / 2;
-    const top =
-      innerTrackHeight - unitSampleCount * innerTrackHeight + lineWidth / 2;
-
-    return (
-      <div
-        style={{
-          left,
-          top,
-          backgroundColor: getDotColor(counter.display.color),
-        }}
-        className="timelineTrackBandwidthGraphDot"
-      />
-    );
-  }
-
-  override render() {
-    const { hoveredCounter } = this.state;
-    const {
-      filteredThread,
-      interval,
-      rangeStart,
-      rangeEnd,
-      unfilteredSamplesRange,
-      counter,
-      counterSampleRange,
-      graphHeight,
-      width,
-      lineWidth,
-      accumulatedSamples,
-      maxCounterSampleCountPerMs,
-    } = this.props;
-
-    return (
-      <div
-        className="timelineTrackBandwidthGraph"
-        onMouseMove={this._onMouseMove}
-        onMouseLeave={this._onMouseLeave}
-      >
-        <TrackBandwidthCanvas
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          counter={counter}
-          counterSampleRange={counterSampleRange}
-          height={graphHeight}
-          width={width}
-          lineWidth={lineWidth}
-          interval={interval}
-          accumulatedSamples={accumulatedSamples}
-          maxCounterSampleCountPerMs={maxCounterSampleCountPerMs}
-        />
-        {hoveredCounter === null ? null : (
-          <>
-            {this._renderBandwidthDot(hoveredCounter)}
-            {this._renderTooltip(hoveredCounter)}
-          </>
-        )}
-        <EmptyThreadIndicator
-          thread={filteredThread}
-          interval={interval}
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          unfilteredSamplesRange={unfilteredSamplesRange}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackBandwidthGraph = explicitConnect<
-  OwnProps,
-  StateProps,
-  DispatchProps
->({
-  mapStateToProps: (state, ownProps) => {
-    const { counterIndex } = ownProps;
-    const counterSelectors = getCounterSelectors(counterIndex);
-    const counter = counterSelectors.getCounter(state);
-    const { start, end } = getCommittedRange(state);
-    const counterSampleRange =
-      counterSelectors.getCommittedRangeCounterSampleRange(state);
-    const selectors = getThreadSelectors(counter.mainThreadIndex);
-    return {
-      counter,
-      threadIndex: counter.mainThreadIndex,
-      maxCounterSampleCountPerMs:
-        counterSelectors.getMaxRangeCounterSampleCountPerMs(state),
-      accumulatedSamples: counterSelectors.getAccumulateCounterSamples(state),
-      rangeStart: start,
-      rangeEnd: end,
-      counterSampleRange,
-      interval: getProfileInterval(state),
-      filteredThread: selectors.getFilteredThread(state),
-      unfilteredSamplesRange: selectors.unfilteredSamplesRange(state),
-      previewSelection: getPreviewSelection(state),
-    };
-  },
-  component: withSize(TrackBandwidthGraphImpl),
-});
diff --git a/src/components/timeline/TrackContextMenu.tsx b/src/components/timeline/TrackContextMenu.tsx
index d4939d3526..eb17df155e 100644
--- a/src/components/timeline/TrackContextMenu.tsx
+++ b/src/components/timeline/TrackContextMenu.tsx
@@ -936,7 +936,7 @@ class TimelineTrackContextMenuImpl extends PureComponent<
 
     const ALLOWED_TYPES = [
       'screenshots',
-      'memory',
+      'counter',
       'network',
       'ipc',
       'event-delay',
diff --git a/src/components/timeline/TrackMemory.css b/src/components/timeline/TrackCounter.css
similarity index 74%
rename from src/components/timeline/TrackMemory.css
rename to src/components/timeline/TrackCounter.css
index 404b625b0c..f76deda599 100644
--- a/src/components/timeline/TrackMemory.css
+++ b/src/components/timeline/TrackCounter.css
@@ -2,19 +2,19 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-.timelineTrackMemoryGraph {
+.timelineTrackCounterGraph {
   position: relative;
   width: 100%;
   height: var(--graph-height);
 }
 
-.timelineTrackMemoryCanvas {
+.timelineTrackCounterCanvas {
   position: absolute;
   width: 100%;
   height: 100%;
 }
 
-.timelineTrackMemoryGraphDot {
+.timelineTrackCounterGraphDot {
   position: absolute;
   width: 6px;
   height: 6px;
@@ -24,18 +24,19 @@
   pointer-events: none;
 }
 
-.timelineTrackMemoryTooltipLine {
+.timelineTrackCounterTooltipLine {
   white-space: nowrap;
 }
 
-.timelineTrackMemoryTooltipNumber {
+.timelineTrackCounterTooltipNumber {
   display: inline-block;
   min-width: 60px;
   color: var(--tooltip-number-foreground-color);
   font-weight: bold;
 }
 
+.timelineMarkersCounter,
 .timelineMarkersMemory {
-  height: var(--markers-height, 15px);
+  height: var(--markers-height);
   opacity: 1;
 }
diff --git a/src/components/timeline/TrackProcessCPU.tsx b/src/components/timeline/TrackCounter.tsx
similarity index 52%
rename from src/components/timeline/TrackProcessCPU.tsx
rename to src/components/timeline/TrackCounter.tsx
index 44b6eb15b6..effc64db1d 100644
--- a/src/components/timeline/TrackProcessCPU.tsx
+++ b/src/components/timeline/TrackCounter.tsx
@@ -8,22 +8,25 @@ import {
   getCommittedRange,
   getCounterSelectors,
 } from 'firefox-profiler/selectors/profile';
+import { TimelineMarkersCounter } from './Markers';
 import { updatePreviewSelection } from 'firefox-profiler/actions/profile-view';
-import { TrackProcessCPUGraph } from './TrackProcessCPUGraph';
+import { TrackCounterGraph } from './TrackCounterGraph';
 import {
-  TRACK_PROCESS_CPU_HEIGHT,
-  TRACK_PROCESS_CPU_LINE_WIDTH,
+  TRACK_COUNTER_GRAPH_HEIGHT,
+  TRACK_COUNTER_MARKERS_HEIGHT,
+  TRACK_COUNTER_LINE_WIDTH,
 } from 'firefox-profiler/app-logic/constants';
 
 import type {
   CounterIndex,
   ThreadIndex,
   Milliseconds,
+  MarkerDisplayLocation,
 } from 'firefox-profiler/types';
 
 import type { ConnectedProps } from 'firefox-profiler/utils/connect';
 
-import './TrackProcessCPU.css';
+import './TrackCounter.css';
 
 type OwnProps = {
   readonly counterIndex: CounterIndex;
@@ -33,6 +36,7 @@ type StateProps = {
   readonly threadIndex: ThreadIndex;
   readonly rangeStart: Milliseconds;
   readonly rangeEnd: Milliseconds;
+  readonly markerSchemaLocation: MarkerDisplayLocation | null;
 };
 
 type DispatchProps = {
@@ -41,32 +45,55 @@ type DispatchProps = {
 
 type Props = ConnectedProps<OwnProps, StateProps, DispatchProps>;
 
-type State = {};
+export class TrackCounterImpl extends React.PureComponent<Props> {
+  _onMarkerSelect = (start: Milliseconds, end: Milliseconds) => {
+    const { rangeStart, rangeEnd, updatePreviewSelection } = this.props;
+    updatePreviewSelection({
+      isModifying: false,
+      selectionStart: Math.max(rangeStart, start),
+      selectionEnd: Math.min(rangeEnd, end),
+    });
+  };
 
-export class TrackProcessCPUImpl extends React.PureComponent<Props, State> {
   override render() {
-    const { counterIndex } = this.props;
+    const {
+      counterIndex,
+      rangeStart,
+      rangeEnd,
+      threadIndex,
+      markerSchemaLocation,
+    } = this.props;
+
     return (
       <div
-        className="timelineTrackProcessCPU"
+        className="timelineTrackCounter"
         style={
           {
-            height: TRACK_PROCESS_CPU_HEIGHT,
-            '--graph-height': `${TRACK_PROCESS_CPU_HEIGHT}px`,
+            '--graph-height': `${TRACK_COUNTER_GRAPH_HEIGHT}px`,
+            '--markers-height': `${TRACK_COUNTER_MARKERS_HEIGHT}px`,
           } as React.CSSProperties
         }
       >
-        <TrackProcessCPUGraph
+        {markerSchemaLocation !== null ? (
+          <TimelineMarkersCounter
+            rangeStart={rangeStart}
+            rangeEnd={rangeEnd}
+            threadsKey={threadIndex}
+            markerSchemaLocation={markerSchemaLocation}
+            onSelect={this._onMarkerSelect}
+          />
+        ) : null}
+        <TrackCounterGraph
           counterIndex={counterIndex}
-          lineWidth={TRACK_PROCESS_CPU_LINE_WIDTH}
-          graphHeight={TRACK_PROCESS_CPU_HEIGHT}
+          lineWidth={TRACK_COUNTER_LINE_WIDTH}
+          graphHeight={TRACK_COUNTER_GRAPH_HEIGHT}
         />
       </div>
     );
   }
 }
 
-export const TrackProcessCPU = explicitConnect<
+export const TrackCounter = explicitConnect<
   OwnProps,
   StateProps,
   DispatchProps
@@ -80,8 +107,9 @@ export const TrackProcessCPU = explicitConnect<
       threadIndex: counter.mainThreadIndex,
       rangeStart: start,
       rangeEnd: end,
+      markerSchemaLocation: counter.display.markerSchemaLocation,
     };
   },
   mapDispatchToProps: { updatePreviewSelection },
-  component: TrackProcessCPUImpl,
+  component: TrackCounterImpl,
 });
diff --git a/src/components/timeline/TrackCounterGraph.tsx b/src/components/timeline/TrackCounterGraph.tsx
new file mode 100644
index 0000000000..a90c36eb39
--- /dev/null
+++ b/src/components/timeline/TrackCounterGraph.tsx
@@ -0,0 +1,901 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import * as React from 'react';
+import { InView } from 'react-intersection-observer';
+import { Localized } from '@fluent/react';
+import { withSize } from 'firefox-profiler/components/shared/WithSize';
+import {
+  getStrokeColor,
+  getFillColor,
+  getDotColor,
+} from 'firefox-profiler/profile-logic/graph-color';
+import explicitConnect from 'firefox-profiler/utils/connect';
+import {
+  formatBytes,
+  formatNumber,
+  formatPercent,
+} from 'firefox-profiler/utils/format-numbers';
+import { bisectionRight } from 'firefox-profiler/utils/bisect';
+import {
+  getCommittedRange,
+  getCounterSelectors,
+  getPreviewSelection,
+  getProfileInterval,
+} from 'firefox-profiler/selectors/profile';
+import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
+import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
+import { TooltipTrackPower } from 'firefox-profiler/components/tooltip/TrackPower';
+import {
+  TooltipDetails,
+  TooltipDetail,
+  TooltipDetailSeparator,
+} from 'firefox-profiler/components/tooltip/TooltipDetails';
+import { EmptyThreadIndicator } from './EmptyThreadIndicator';
+import { getSampleIndexRangeForSelection } from 'firefox-profiler/profile-logic/profile-data';
+import { assertExhaustiveCheck } from 'firefox-profiler/utils/types';
+import { co2 } from '@tgwf/co2';
+
+import type {
+  CounterIndex,
+  Counter,
+  Thread,
+  ThreadIndex,
+  AccumulatedCounterSamples,
+  Milliseconds,
+  PreviewSelection,
+  CssPixels,
+  StartEndRange,
+  IndexIntoSamplesTable,
+} from 'firefox-profiler/types';
+
+import type { SizeProps } from 'firefox-profiler/components/shared/WithSize';
+import type { ConnectedProps } from 'firefox-profiler/utils/connect';
+
+import './TrackCounter.css';
+
+/**
+ * When adding properties to these props, please consider the comment above `TrackCounterCanvas`.
+ */
+type CanvasProps = {
+  readonly rangeStart: Milliseconds;
+  readonly rangeEnd: Milliseconds;
+  readonly counter: Counter;
+  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
+  readonly accumulatedSamples: AccumulatedCounterSamples;
+  readonly maxCounterSampleCountPerMs: number;
+  readonly interval: Milliseconds;
+  readonly width: CssPixels;
+  readonly height: CssPixels;
+  readonly lineWidth: CssPixels;
+};
+
+/**
+ * This component controls the rendering of the canvas. Every render call through
+ * React triggers a new canvas render. Because of this, it's important to only pass
+ * in the props that are needed for the canvas draw call.
+ */
+class TrackCounterCanvas extends React.PureComponent<CanvasProps> {
+  _canvas: null | HTMLCanvasElement = null;
+  _requestedAnimationFrame: boolean = false;
+  _canvasState: { renderScheduled: boolean; inView: boolean } = {
+    renderScheduled: false,
+    inView: false,
+  };
+
+  drawCanvas(canvas: HTMLCanvasElement): void {
+    const {
+      rangeStart,
+      rangeEnd,
+      counter,
+      height,
+      width,
+      lineWidth,
+      interval,
+      accumulatedSamples,
+      maxCounterSampleCountPerMs,
+      counterSampleRange,
+    } = this.props;
+    const { display } = counter;
+    if (width === 0) {
+      // Attempt to draw before the canvas was laid out.
+      return;
+    }
+
+    const ctx = canvas.getContext('2d')!;
+    const devicePixelRatio = window.devicePixelRatio;
+    const deviceWidth = width * devicePixelRatio;
+    const deviceHeight = height * devicePixelRatio;
+    const deviceLineWidth = lineWidth * devicePixelRatio;
+    const deviceLineHalfWidth = deviceLineWidth * 0.5;
+    const innerDeviceHeight = deviceHeight - deviceLineWidth;
+    const rangeLength = rangeEnd - rangeStart;
+    const millisecondWidth = deviceWidth / rangeLength;
+    const intervalWidth = interval * millisecondWidth;
+
+    // Resize and clear the canvas.
+    canvas.width = Math.round(deviceWidth);
+    canvas.height = Math.round(deviceHeight);
+    ctx.clearRect(0, 0, deviceWidth, deviceHeight);
+
+    const samples = counter.samples;
+    if (samples.length === 0) {
+      // There's no reason to draw the samples, there are none.
+      return;
+    }
+
+    // Take the sample information, and convert it into chart coordinates. Use a slightly
+    // smaller space than the deviceHeight, so that the stroke will be fully visible
+    // both at the top and bottom of the chart.
+    const [sampleStart, sampleEnd] = counterSampleRange;
+
+    {
+      // Draw the chart.
+      //
+      //                 ...--`
+      //  1 ...---```..--      `--. 2
+      //    |_____________________|
+      //  4                        3
+      //
+      // Start by drawing from 1 to 2. This will be the top of all the peaks of the
+      // counter graph.
+
+      ctx.lineWidth = deviceLineWidth;
+      ctx.lineJoin = 'bevel';
+      ctx.strokeStyle = getStrokeColor(display.color);
+      ctx.fillStyle = getFillColor(display.color);
+      ctx.beginPath();
+
+      switch (display.graphType) {
+        case 'line-accumulated': {
+          // Accumulated graph: plot the running total.
+          const { minCount, countRange, accumulatedCounts } =
+            accumulatedSamples;
+
+          // The x and y are used after the loop.
+          let x = 0;
+          let y = 0;
+          let firstX = 0;
+          for (let i = sampleStart; i < sampleEnd; i++) {
+            // Create a path for the top of the chart. This is the line that will have
+            // a stroke applied to it.
+            x = (samples.time[i] - rangeStart) * millisecondWidth;
+            // Add on half the stroke's line width so that it won't be cut off the edge
+            // of the graph.
+            const unitGraphCount =
+              (accumulatedCounts[i] - minCount) / countRange;
+            y =
+              innerDeviceHeight -
+              innerDeviceHeight * unitGraphCount +
+              deviceLineHalfWidth;
+            if (i === sampleStart) {
+              // This is the first iteration, only move the line, do not draw it. Also
+              // remember this first X, as the bottom of the graph will need to connect
+              // back up to it.
+              firstX = x;
+              ctx.moveTo(x, y);
+            } else {
+              ctx.lineTo(x, y);
+            }
+          }
+          // The samples range ends at the time of the last sample, plus the interval.
+          // Draw this last bit.
+          ctx.lineTo(x + intervalWidth, y);
+
+          // Don't do the fill yet, just stroke the top line. This will draw a line from
+          // point 1 to 2 in the diagram above.
+          ctx.stroke();
+
+          // After doing the stroke, continue the path to complete the fill to the bottom
+          // of the canvas. This continues the path to point 3 and then 4.
+
+          // Create a line from 2 to 3.
+          ctx.lineTo(x + intervalWidth, deviceHeight);
+
+          // Create a line from 3 to 4.
+          ctx.lineTo(firstX, deviceHeight);
+
+          // The line from 4 to 1 will be implicitly filled in.
+          ctx.fill();
+          break;
+        }
+        case 'line-rate': {
+          // Rate graph: plot count / timeDelta with min-max decimation.
+          const countRangePerMs = maxCounterSampleCountPerMs;
+
+          const getX = (i: number) =>
+            Math.round((samples.time[i] - rangeStart) * millisecondWidth);
+          const getY = (rawY: number) => {
+            if (!rawY) {
+              // Make the 0 values invisible so that 'almost 0' is noticeable.
+              return deviceHeight + deviceLineHalfWidth;
+            }
+            const unitGraphCount = rawY / countRangePerMs;
+            return (
+              innerDeviceHeight -
+              innerDeviceHeight * unitGraphCount +
+              // Add on half the stroke's line width so that it won't be cut off the edge
+              // of the graph.
+              deviceLineHalfWidth
+            );
+          };
+
+          const getRate = (i: number) => {
+            const sampleTimeDeltaInMs =
+              i === 0 ? interval : samples.time[i] - samples.time[i - 1];
+            return samples.count[i] / sampleTimeDeltaInMs;
+          };
+
+          // The x and y are used after the loop.
+          const firstX = getX(sampleStart);
+          let x = firstX;
+          let y = getY(getRate(sampleStart));
+
+          // For the first sample, only move the line, do not draw it. Also
+          // remember this first X, as the bottom of the graph will need to connect
+          // back up to it.
+          ctx.moveTo(x, y);
+
+          // Create a path for the top of the chart. This is the line that will have
+          // a stroke applied to it.
+          for (let i = sampleStart + 1; i < sampleEnd; i++) {
+            const rateValues = [getRate(i)];
+            x = getX(i);
+            y = getY(rateValues[0]);
+            ctx.lineTo(x, y);
+
+            // If we have multiple samples to draw on the same horizontal pixel,
+            // we process all of them together with a max-min decimation algorithm
+            // to save time:
+            // - We draw the first and last samples to ensure the display is
+            //   correct if there are sampling gaps.
+            // - For the values in between, we only draw the min and max values,
+            //   to draw a vertical line covering all the other sample values.
+            while (i + 1 < sampleEnd && getX(i + 1) === x) {
+              rateValues.push(getRate(++i));
+            }
+
+            // Looking for the min and max only makes sense if we have more than 2
+            // samples to draw.
+            if (rateValues.length > 2) {
+              const minY = getY(Math.min(...rateValues));
+              if (minY !== y) {
+                y = minY;
+                ctx.lineTo(x, y);
+              }
+              const maxY = getY(Math.max(...rateValues));
+              if (maxY !== y) {
+                y = maxY;
+                ctx.lineTo(x, y);
+              }
+            }
+
+            const lastY = getY(rateValues[rateValues.length - 1]);
+            if (lastY !== y) {
+              y = lastY;
+              ctx.lineTo(x, y);
+            }
+          }
+
+          // The samples range ends at the time of the last sample, plus the interval.
+          // Draw this last bit.
+          ctx.lineTo(x + intervalWidth, y);
+
+          // Don't do the fill yet, just stroke the top line. This will draw a line from
+          // point 1 to 2 in the diagram above.
+          ctx.stroke();
+
+          // After doing the stroke, continue the path to complete the fill to the bottom
+          // of the canvas. This continues the path to point 3 and then 4.
+
+          // Create a line from 2 to 3.
+          ctx.lineTo(x + intervalWidth, deviceHeight);
+
+          // Create a line from 3 to 4.
+          ctx.lineTo(firstX, deviceHeight);
+
+          // The line from 4 to 1 will be implicitly filled in.
+          ctx.fill();
+          break;
+        }
+        default:
+          throw assertExhaustiveCheck(display.graphType);
+      }
+    }
+  }
+
+  _scheduleDraw() {
+    if (!this._canvasState.inView) {
+      // Canvas is not in the view. Schedule the render for a later intersection
+      // observer callback.
+      this._canvasState.renderScheduled = true;
+      return;
+    }
+
+    // Canvas is in the view. Render the canvas and reset the schedule state.
+    this._canvasState.renderScheduled = false;
+
+    if (!this._requestedAnimationFrame) {
+      this._requestedAnimationFrame = true;
+      window.requestAnimationFrame(() => {
+        this._requestedAnimationFrame = false;
+        const canvas = this._canvas;
+        if (canvas) {
+          this.drawCanvas(canvas);
+        }
+      });
+    }
+  }
+
+  _takeCanvasRef = (canvas: HTMLCanvasElement | null) => {
+    this._canvas = canvas;
+  };
+
+  _observerCallback = (inView: boolean, _entry: IntersectionObserverEntry) => {
+    this._canvasState.inView = inView;
+    if (!this._canvasState.renderScheduled) {
+      // Skip if render is not scheduled.
+      return;
+    }
+
+    this._scheduleDraw();
+  };
+
+  override componentDidMount() {
+    this._scheduleDraw();
+  }
+
+  override componentDidUpdate() {
+    this._scheduleDraw();
+  }
+
+  override render() {
+    return (
+      <InView onChange={this._observerCallback}>
+        <canvas
+          className="timelineTrackCounterCanvas"
+          ref={this._takeCanvasRef}
+        />
+      </InView>
+    );
+  }
+}
+
+type OwnProps = {
+  readonly counterIndex: CounterIndex;
+  readonly lineWidth: CssPixels;
+  readonly graphHeight: CssPixels;
+};
+
+type StateProps = {
+  readonly threadIndex: ThreadIndex;
+  readonly rangeStart: Milliseconds;
+  readonly rangeEnd: Milliseconds;
+  readonly counter: Counter;
+  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
+  readonly accumulatedSamples: AccumulatedCounterSamples;
+  readonly maxCounterSampleCountPerMs: number;
+  readonly interval: Milliseconds;
+  readonly filteredThread: Thread;
+  readonly unfilteredSamplesRange: StartEndRange | null;
+  readonly previewSelection: PreviewSelection | null;
+};
+
+type DispatchProps = {};
+
+type Props = SizeProps & ConnectedProps<OwnProps, StateProps, DispatchProps>;
+
+type State = {
+  hoveredCounter: null | number;
+  mouseX: CssPixels;
+  mouseY: CssPixels;
+};
+
+/**
+ * The generic counter track graph component. It renders information from any counters
+ * (eg, Memory, Power, etc.) as a graph in the timeline. It branches on
+ * `display.graphType` for drawing, and on `counter.category`/`counter.name`
+ * for tooltip rendering of known counter types.
+ */
+class TrackCounterGraphImpl extends React.PureComponent<Props, State> {
+  override state = {
+    hoveredCounter: null,
+    mouseX: 0,
+    mouseY: 0,
+  };
+
+  _co2: InstanceType<typeof co2> | null = null;
+
+  _onMouseLeave = () => {
+    // This persistTooltips property is part of the web console API. It helps
+    // in being able to inspect and debug tooltips.
+    if (window.persistTooltips) {
+      return;
+    }
+
+    this.setState({ hoveredCounter: null });
+  };
+
+  _onMouseMove = (event: React.MouseEvent<HTMLDivElement>) => {
+    const { pageX: mouseX, pageY: mouseY } = event;
+    // Get the offset from here, and apply it to the time lookup.
+    const { left } = event.currentTarget.getBoundingClientRect();
+    const {
+      width,
+      rangeStart,
+      rangeEnd,
+      counter,
+      interval,
+      counterSampleRange,
+    } = this.props;
+    const rangeLength = rangeEnd - rangeStart;
+    const timeAtMouse = rangeStart + ((mouseX - left) / width) * rangeLength;
+
+    if (counter.samples.length === 0) {
+      throw new Error('No sample group found for counter');
+    }
+    const { samples } = counter;
+
+    if (
+      timeAtMouse < samples.time[0] ||
+      timeAtMouse > samples.time[samples.length - 1] + interval
+    ) {
+      // We are outside the range of the samples, do not display hover information.
+      this.setState({ hoveredCounter: null });
+    } else {
+      // When the mouse pointer hovers between two points, select the point that's closer.
+      let hoveredCounter;
+      const [sampleStart, sampleEnd] = counterSampleRange;
+      const bisectionCounter = bisectionRight(
+        samples.time,
+        timeAtMouse,
+        sampleStart,
+        sampleEnd
+      );
+      if (bisectionCounter > 0 && bisectionCounter < samples.time.length) {
+        const leftDistance = timeAtMouse - samples.time[bisectionCounter - 1];
+        const rightDistance = samples.time[bisectionCounter] - timeAtMouse;
+        if (leftDistance < rightDistance) {
+          // Left point is closer
+          hoveredCounter = bisectionCounter - 1;
+        } else {
+          // Right point is closer
+          hoveredCounter = bisectionCounter;
+        }
+
+        // For rate-based graphs with decimation, find the sample with the
+        // highest value at the same pixel position.
+        if (this.props.counter.display.graphType === 'line-rate') {
+          const mouseAtTime = (t: number) =>
+            Math.round(((t - rangeStart) / rangeLength) * width + left);
+          for (
+            let currentIndex = hoveredCounter - 1;
+            mouseAtTime(samples.time[currentIndex]) === mouseX &&
+            currentIndex > 0;
+            --currentIndex
+          ) {
+            if (samples.count[currentIndex] > samples.count[hoveredCounter]) {
+              hoveredCounter = currentIndex;
+            }
+          }
+          for (
+            let currentIndex = hoveredCounter + 1;
+            mouseAtTime(samples.time[currentIndex]) === mouseX &&
+            currentIndex < samples.time.length;
+            ++currentIndex
+          ) {
+            if (samples.count[currentIndex] > samples.count[hoveredCounter]) {
+              hoveredCounter = currentIndex;
+            }
+          }
+        }
+      } else {
+        hoveredCounter = bisectionCounter;
+      }
+
+      if (hoveredCounter === samples.length) {
+        // When hovering the last sample, it's possible the mouse is past the time.
+        // In this case, hover over the last sample. This happens because of the
+        // ` + interval` line in the `if` condition above.
+        hoveredCounter = samples.time.length - 1;
+      }
+
+      this.setState({
+        mouseX,
+        mouseY,
+        hoveredCounter,
+      });
+    }
+  };
+
+  _formatDataTransferValue(bytes: number, l10nId: string) {
+    if (!this._co2) {
+      this._co2 = new co2({ model: 'swd' });
+    }
+    // By default, when estimating emissions per byte, co2.js takes into account
+    // emissions for the user device, the data center and the network.
+    // Because we already have power tracks showing the power use and estimated
+    // emissions of the device, set the 'device' grid intensity to 0 to avoid
+    // double counting.
+    const co2eq = this._co2.perByteTrace(bytes, false, {
+      gridIntensity: { device: 0 },
+    });
+    const carbonValue = formatNumber(
+      typeof co2eq.co2 === 'number' ? co2eq.co2 : co2eq.co2.total
+    );
+    const value = formatBytes(bytes);
+    return (
+      <Localized
+        id={l10nId}
+        vars={{ value, carbonValue }}
+        attrs={{ label: true }}
+      >
+        <TooltipDetail label="">{value}</TooltipDetail>
+      </Localized>
+    );
+  }
+
+  _renderTooltip(counterIndex: number): React.ReactNode {
+    const {
+      accumulatedSamples,
+      counter,
+      rangeStart,
+      rangeEnd,
+      interval,
+      maxCounterSampleCountPerMs,
+      previewSelection,
+    } = this.props;
+    const { display } = counter;
+    const { mouseX, mouseY } = this.state;
+    const { samples } = counter;
+
+    if (samples.length === 0) {
+      throw new Error('No sample found for counter');
+    }
+
+    const sampleTime = samples.time[counterIndex];
+    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
+      // Do not draw the tooltip if it will be rendered outside the timeline.
+      // This could happen when a sample time is outside the time range.
+      // While range filtering the counters, we add the sample before start and
+      // after end, so charts will not be cut off at the edges.
+      return null;
+    }
+
+    const { category, name } = counter;
+
+    // Power tooltip — delegate to the dedicated component.
+    if (category === 'power') {
+      return (
+        <Tooltip mouseX={mouseX} mouseY={mouseY}>
+          <TooltipTrackPower
+            counter={counter}
+            counterSampleIndex={counterIndex}
+          />
+        </Tooltip>
+      );
+    }
+
+    // Process CPU tooltip.
+    if (category === 'CPU' && name === 'processCPU') {
+      const cpuUsage = samples.count[counterIndex];
+      const sampleTimeDeltaInMs =
+        counterIndex === 0
+          ? interval
+          : samples.time[counterIndex] - samples.time[counterIndex - 1];
+      const cpuRatio =
+        cpuUsage / sampleTimeDeltaInMs / maxCounterSampleCountPerMs;
+      return (
+        <Tooltip mouseX={mouseX} mouseY={mouseY}>
+          <div className="timelineTrackCounterTooltip">
+            <div className="timelineTrackCounterTooltipLine">
+              CPU:{' '}
+              <span className="timelineTrackCounterTooltipNumber">
+                {formatPercent(cpuRatio)}
+              </span>
+            </div>
+          </div>
+        </Tooltip>
+      );
+    }
+
+    // Bandwidth tooltip — bytes with rate, CO2, and accumulated total.
+    if (category === 'Bandwidth') {
+      const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
+      const bytes = accumulatedCounts[counterIndex] - minCount;
+      const operations =
+        samples.number !== undefined ? samples.number[counterIndex] : null;
+
+      const sampleTimeDeltaInMs =
+        counterIndex === 0
+          ? interval
+          : samples.time[counterIndex] - samples.time[counterIndex - 1];
+      const unitGraphCount = samples.count[counterIndex] / sampleTimeDeltaInMs;
+
+      let rangeTotal = 0;
+      if (previewSelection) {
+        const [beginIndex, endIndex] = getSampleIndexRangeForSelection(
+          samples,
+          previewSelection.selectionStart,
+          previewSelection.selectionEnd
+        );
+
+        for (
+          let counterSampleIndex = beginIndex;
+          counterSampleIndex < endIndex;
+          counterSampleIndex++
+        ) {
+          rangeTotal += samples.count[counterSampleIndex];
+        }
+      }
+
+      let ops;
+      if (operations !== null) {
+        ops = formatNumber(operations, 2, 0);
+      }
+
+      return (
+        <Tooltip mouseX={mouseX} mouseY={mouseY}>
+          <div className="timelineTrackCounterTooltip">
+            <TooltipDetails>
+              {this._formatDataTransferValue(
+                unitGraphCount * 1000 /* ms -> s */,
+                'TrackBandwidthGraph--speed'
+              )}
+              {operations !== null ? (
+                <Localized
+                  id="TrackBandwidthGraph--read-write-operations-since-the-previous-sample"
+                  vars={{ value: ops || '' }}
+                  attrs={{ label: true }}
+                >
+                  <TooltipDetail label="">{ops}</TooltipDetail>
+                </Localized>
+              ) : null}
+              <TooltipDetailSeparator />
+              {this._formatDataTransferValue(
+                bytes,
+                'TrackBandwidthGraph--cumulative-bandwidth-at-this-time'
+              )}
+              {this._formatDataTransferValue(
+                countRange,
+                'TrackBandwidthGraph--total-bandwidth-in-graph'
+              )}
+              {previewSelection
+                ? this._formatDataTransferValue(
+                    rangeTotal,
+                    'TrackBandwidthGraph--total-bandwidth-in-range'
+                  )
+                : null}
+            </TooltipDetails>
+          </div>
+        </Tooltip>
+      );
+    }
+
+    // Memory tooltip — accumulated bytes with operations count.
+    if (category === 'Memory') {
+      const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
+      const bytes = accumulatedCounts[counterIndex] - minCount;
+      const operations =
+        samples.number !== undefined ? samples.number[counterIndex] : null;
+      return (
+        <Tooltip mouseX={mouseX} mouseY={mouseY}>
+          <div className="timelineTrackCounterTooltip">
+            <div className="timelineTrackCounterTooltipLine">
+              <span className="timelineTrackCounterTooltipNumber">
+                {formatBytes(bytes)}
+              </span>
+              <Localized id="TrackMemoryGraph--relative-memory-at-this-time">
+                relative memory at this time
+              </Localized>
+            </div>
+
+            <div className="timelineTrackCounterTooltipLine">
+              <span className="timelineTrackCounterTooltipNumber">
+                {formatBytes(countRange)}
+              </span>
+              <Localized id="TrackMemoryGraph--memory-range-in-graph">
+                memory range in graph
+              </Localized>
+            </div>
+            {operations !== null ? (
+              <div className="timelineTrackCounterTooltipLine">
+                <span className="timelineTrackCounterTooltipNumber">
+                  {formatNumber(operations, 2, 0)}
+                </span>
+                <Localized id="TrackMemoryGraph--allocations-and-deallocations-since-the-previous-sample">
+                  allocations and deallocations since the previous sample
+                </Localized>
+              </div>
+            ) : null}
+          </div>
+        </Tooltip>
+      );
+    }
+
+    // Generic tooltip for unknown counter types - format the value based on
+    // the counter's unit.
+    const value = samples.count[counterIndex];
+    let formattedValue;
+    if (display.unit === 'bytes') {
+      formattedValue = formatBytes(value);
+    } else if (display.unit === 'percent') {
+      formattedValue = formatPercent(value);
+    } else if (display.unit) {
+      // Bypasses i18n but this is hit only for unknown counters.
+      formattedValue = `${formatNumber(value)} ${display.unit}`;
+    } else {
+      formattedValue = formatNumber(value);
+    }
+    return (
+      <Tooltip mouseX={mouseX} mouseY={mouseY}>
+        <div className="timelineTrackCounterTooltip">
+          <div className="timelineTrackCounterTooltipLine">
+            <span className="timelineTrackCounterTooltipNumber">
+              {formattedValue}
+            </span>
+            {display.label || name}
+          </div>
+        </div>
+      </Tooltip>
+    );
+  }
+
+  /**
+   * Create a div that is a dot on top of the graph representing the current
+   * height of the graph.
+   */
+  _renderDot(counterIndex: number): React.ReactNode {
+    const {
+      counter,
+      rangeStart,
+      rangeEnd,
+      graphHeight,
+      width,
+      lineWidth,
+      accumulatedSamples,
+      maxCounterSampleCountPerMs,
+      interval,
+    } = this.props;
+
+    const { samples, display } = counter;
+    if (samples.length === 0) {
+      throw new Error('No sample found for counter');
+    }
+    const rangeLength = rangeEnd - rangeStart;
+    const sampleTime = samples.time[counterIndex];
+
+    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
+      // Do not draw the dot if it will be rendered outside the timeline.
+      // This could happen when a sample time is outside the time range.
+      // While range filtering the counters, we add the sample before start and
+      // after end, so charts will not be cut off at the edges.
+      return null;
+    }
+
+    const left = (width * (sampleTime - rangeStart)) / rangeLength;
+    const innerTrackHeight = graphHeight - lineWidth / 2;
+    let top;
+
+    switch (display.graphType) {
+      case 'line-accumulated': {
+        const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
+        const unitSampleCount =
+          (accumulatedCounts[counterIndex] - minCount) / countRange;
+        top =
+          innerTrackHeight - unitSampleCount * innerTrackHeight + lineWidth / 2;
+        break;
+      }
+      case 'line-rate': {
+        const sampleTimeDeltaInMs =
+          counterIndex === 0
+            ? interval
+            : samples.time[counterIndex] - samples.time[counterIndex - 1];
+        const unitSampleCount =
+          samples.count[counterIndex] /
+          sampleTimeDeltaInMs /
+          maxCounterSampleCountPerMs;
+        top =
+          innerTrackHeight - unitSampleCount * innerTrackHeight + lineWidth / 2;
+        break;
+      }
+      default:
+        throw assertExhaustiveCheck(display.graphType);
+    }
+
+    return (
+      <div
+        style={{
+          left,
+          top,
+          backgroundColor: getDotColor(display.color),
+        }}
+        className="timelineTrackCounterGraphDot"
+      />
+    );
+  }
+
+  override render() {
+    const { hoveredCounter } = this.state;
+    const {
+      filteredThread,
+      interval,
+      rangeStart,
+      rangeEnd,
+      unfilteredSamplesRange,
+      counter,
+      counterSampleRange,
+      graphHeight,
+      width,
+      lineWidth,
+      accumulatedSamples,
+      maxCounterSampleCountPerMs,
+    } = this.props;
+
+    return (
+      <div
+        className="timelineTrackCounterGraph"
+        onMouseMove={this._onMouseMove}
+        onMouseLeave={this._onMouseLeave}
+      >
+        <TrackCounterCanvas
+          rangeStart={rangeStart}
+          rangeEnd={rangeEnd}
+          counter={counter}
+          counterSampleRange={counterSampleRange}
+          height={graphHeight}
+          width={width}
+          lineWidth={lineWidth}
+          interval={interval}
+          accumulatedSamples={accumulatedSamples}
+          maxCounterSampleCountPerMs={maxCounterSampleCountPerMs}
+        />
+        {hoveredCounter === null ? null : (
+          <>
+            {this._renderDot(hoveredCounter)}
+            {this._renderTooltip(hoveredCounter)}
+          </>
+        )}
+        <EmptyThreadIndicator
+          thread={filteredThread}
+          interval={interval}
+          rangeStart={rangeStart}
+          rangeEnd={rangeEnd}
+          unfilteredSamplesRange={unfilteredSamplesRange}
+        />
+      </div>
+    );
+  }
+}
+
+export const TrackCounterGraph = explicitConnect<
+  OwnProps,
+  StateProps,
+  DispatchProps
+>({
+  mapStateToProps: (state, ownProps) => {
+    const { counterIndex } = ownProps;
+    const counterSelectors = getCounterSelectors(counterIndex);
+    const counter = counterSelectors.getCounter(state);
+    const { start, end } = getCommittedRange(state);
+    const counterSampleRange =
+      counterSelectors.getCommittedRangeCounterSampleRange(state);
+    const selectors = getThreadSelectors(counter.mainThreadIndex);
+    return {
+      counter,
+      threadIndex: counter.mainThreadIndex,
+      accumulatedSamples: counterSelectors.getAccumulateCounterSamples(state),
+      maxCounterSampleCountPerMs:
+        counterSelectors.getMaxRangeCounterSampleCountPerMs(state),
+      rangeStart: start,
+      rangeEnd: end,
+      counterSampleRange,
+      interval: getProfileInterval(state),
+      filteredThread: selectors.getFilteredThread(state),
+      unfilteredSamplesRange: selectors.unfilteredSamplesRange(state),
+      previewSelection: getPreviewSelection(state),
+    };
+  },
+  component: withSize(TrackCounterGraphImpl),
+});
diff --git a/src/components/timeline/TrackMemory.tsx b/src/components/timeline/TrackMemory.tsx
deleted file mode 100644
index 7c0dc3cf00..0000000000
--- a/src/components/timeline/TrackMemory.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-} from 'firefox-profiler/selectors/profile';
-import { TimelineMarkersMemory } from './Markers';
-import { updatePreviewSelection } from 'firefox-profiler/actions/profile-view';
-import { TrackMemoryGraph } from './TrackMemoryGraph';
-import {
-  TRACK_MEMORY_GRAPH_HEIGHT,
-  TRACK_MEMORY_MARKERS_HEIGHT,
-  TRACK_MEMORY_LINE_WIDTH,
-} from 'firefox-profiler/app-logic/constants';
-
-import type {
-  CounterIndex,
-  ThreadIndex,
-  Milliseconds,
-} from 'firefox-profiler/types';
-
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-
-import './TrackMemory.css';
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-};
-
-type DispatchProps = {
-  updatePreviewSelection: typeof updatePreviewSelection;
-};
-
-type Props = ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {};
-
-export class TrackMemoryImpl extends React.PureComponent<Props, State> {
-  _onMarkerSelect = (start: Milliseconds, end: Milliseconds) => {
-    const { rangeStart, rangeEnd, updatePreviewSelection } = this.props;
-    updatePreviewSelection({
-      isModifying: false,
-      selectionStart: Math.max(rangeStart, start),
-      selectionEnd: Math.min(rangeEnd, end),
-    });
-  };
-
-  override render() {
-    const { counterIndex, rangeStart, rangeEnd, threadIndex } = this.props;
-    return (
-      <div
-        className="timelineTrackMemory"
-        style={
-          {
-            height: TRACK_MEMORY_GRAPH_HEIGHT + TRACK_MEMORY_MARKERS_HEIGHT,
-            '--graph-height': `${TRACK_MEMORY_GRAPH_HEIGHT}px`,
-            '--markers-height': `${TRACK_MEMORY_MARKERS_HEIGHT}px`,
-          } as React.CSSProperties
-        }
-      >
-        <TimelineMarkersMemory
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          threadsKey={threadIndex}
-          onSelect={this._onMarkerSelect}
-        />
-        <TrackMemoryGraph
-          counterIndex={counterIndex}
-          lineWidth={TRACK_MEMORY_LINE_WIDTH}
-          graphHeight={TRACK_MEMORY_GRAPH_HEIGHT}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackMemory = explicitConnect<OwnProps, StateProps, DispatchProps>(
-  {
-    mapStateToProps: (state, ownProps) => {
-      const { counterIndex } = ownProps;
-      const counterSelectors = getCounterSelectors(counterIndex);
-      const counter = counterSelectors.getCounter(state);
-      const { start, end } = getCommittedRange(state);
-      return {
-        threadIndex: counter.mainThreadIndex,
-        rangeStart: start,
-        rangeEnd: end,
-      };
-    },
-    mapDispatchToProps: { updatePreviewSelection },
-    component: TrackMemoryImpl,
-  }
-);
diff --git a/src/components/timeline/TrackMemoryGraph.tsx b/src/components/timeline/TrackMemoryGraph.tsx
deleted file mode 100644
index e3d9f4772e..0000000000
--- a/src/components/timeline/TrackMemoryGraph.tsx
+++ /dev/null
@@ -1,544 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import { InView } from 'react-intersection-observer';
-import { Localized } from '@fluent/react';
-import { withSize } from 'firefox-profiler/components/shared/WithSize';
-import {
-  getStrokeColor,
-  getFillColor,
-  getDotColor,
-} from 'firefox-profiler/profile-logic/graph-color';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import {
-  formatBytes,
-  formatNumber,
-} from 'firefox-profiler/utils/format-numbers';
-import { bisectionRight } from 'firefox-profiler/utils/bisect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-  getProfileInterval,
-} from 'firefox-profiler/selectors/profile';
-import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
-import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
-import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-
-import type {
-  CounterIndex,
-  Counter,
-  Thread,
-  ThreadIndex,
-  AccumulatedCounterSamples,
-  Milliseconds,
-  CssPixels,
-  StartEndRange,
-  IndexIntoSamplesTable,
-} from 'firefox-profiler/types';
-
-import type { SizeProps } from 'firefox-profiler/components/shared/WithSize';
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-
-import './TrackMemory.css';
-
-/**
- * When adding properties to these props, please consider the comment above the component.
- */
-type CanvasProps = {
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly accumulatedSamples: AccumulatedCounterSamples;
-  readonly interval: Milliseconds;
-  readonly width: CssPixels;
-  readonly height: CssPixels;
-  readonly lineWidth: CssPixels;
-};
-
-/**
- * This component controls the rendering of the canvas. Every render call through
- * React triggers a new canvas render. Because of this, it's important to only pass
- * in the props that are needed for the canvas draw call.
- */
-class TrackMemoryCanvas extends React.PureComponent<CanvasProps> {
-  _canvas: null | HTMLCanvasElement = null;
-  _requestedAnimationFrame: boolean = false;
-  _canvasState: { renderScheduled: boolean; inView: boolean } = {
-    renderScheduled: false,
-    inView: false,
-  };
-
-  drawCanvas(canvas: HTMLCanvasElement): void {
-    const {
-      rangeStart,
-      rangeEnd,
-      counter,
-      height,
-      width,
-      lineWidth,
-      interval,
-      accumulatedSamples,
-      counterSampleRange,
-    } = this.props;
-    if (width === 0) {
-      // This is attempting to draw before the canvas was laid out.
-      return;
-    }
-
-    const ctx = canvas.getContext('2d')!;
-    const devicePixelRatio = window.devicePixelRatio;
-    const deviceWidth = width * devicePixelRatio;
-    const deviceHeight = height * devicePixelRatio;
-    const deviceLineWidth = lineWidth * devicePixelRatio;
-    const deviceLineHalfWidth = deviceLineWidth * 0.5;
-    const innerDeviceHeight = deviceHeight - deviceLineWidth;
-    const rangeLength = rangeEnd - rangeStart;
-    const millisecondWidth = deviceWidth / rangeLength;
-    const intervalWidth = interval * millisecondWidth;
-
-    // Resize and clear the canvas.
-    canvas.width = Math.round(deviceWidth);
-    canvas.height = Math.round(deviceHeight);
-    ctx.clearRect(0, 0, deviceWidth, deviceHeight);
-
-    const samples = counter.samples;
-    if (samples.length === 0) {
-      // There's no reason to draw the samples, there are none.
-      return;
-    }
-
-    // Take the sample information, and convert it into chart coordinates. Use a slightly
-    // smaller space than the deviceHeight, so that the stroke will be fully visible
-    // both at the top and bottom of the chart.
-    const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
-    const [sampleStart, sampleEnd] = counterSampleRange;
-
-    {
-      // Draw the chart.
-      //
-      //                 ...--`
-      //  1 ...---```..--      `--. 2
-      //    |_____________________|
-      //  4                        3
-      //
-      // Start by drawing from 1 - 2. This will be the top of all the peaks of the
-      // memory graph.
-
-      ctx.lineWidth = deviceLineWidth;
-      ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = getStrokeColor(counter.display.color);
-      ctx.fillStyle = getFillColor(counter.display.color);
-      ctx.beginPath();
-
-      // The x and y are used after the loop.
-      let x = 0;
-      let y = 0;
-      let firstX = 0;
-      for (let i = sampleStart; i < sampleEnd; i++) {
-        // Create a path for the top of the chart. This is the line that will have
-        // a stroke applied to it.
-        x = (samples.time[i] - rangeStart) * millisecondWidth;
-        // Add on half the stroke's line width so that it won't be cut off the edge
-        // of the graph.
-        const unitGraphCount = (accumulatedCounts[i] - minCount) / countRange;
-        y =
-          innerDeviceHeight -
-          innerDeviceHeight * unitGraphCount +
-          deviceLineHalfWidth;
-        if (i === 0) {
-          // This is the first iteration, only move the line, do not draw it. Also
-          // remember this first X, as the bottom of the graph will need to connect
-          // back up to it.
-          firstX = x;
-          ctx.moveTo(x, y);
-        } else {
-          ctx.lineTo(x, y);
-        }
-      }
-      // The samples range ends at the time of the last sample, plus the interval.
-      // Draw this last bit.
-      ctx.lineTo(x + intervalWidth, y);
-
-      // Don't do the fill yet, just stroke the top line. This will draw a line from
-      // point 1 to 2 in the diagram above.
-      ctx.stroke();
-
-      // After doing the stroke, continue the path to complete the fill to the bottom
-      // of the canvas. This continues the path to point 3 and then 4.
-
-      // Create a line from 2 to 3.
-      ctx.lineTo(x + intervalWidth, deviceHeight);
-
-      // Create a line from 3 to 4.
-      ctx.lineTo(firstX, deviceHeight);
-
-      // The line from 4 to 1 will be implicitly filled in.
-      ctx.fill();
-    }
-  }
-
-  _scheduleDraw() {
-    if (!this._canvasState.inView) {
-      // Canvas is not in the view. Schedule the render for a later intersection
-      // observer callback.
-      this._canvasState.renderScheduled = true;
-      return;
-    }
-
-    // Canvas is in the view. Render the canvas and reset the schedule state.
-    this._canvasState.renderScheduled = false;
-
-    if (!this._requestedAnimationFrame) {
-      this._requestedAnimationFrame = true;
-      window.requestAnimationFrame(() => {
-        this._requestedAnimationFrame = false;
-        const canvas = this._canvas;
-        if (canvas) {
-          this.drawCanvas(canvas);
-        }
-      });
-    }
-  }
-
-  _takeCanvasRef = (canvas: HTMLCanvasElement | null) => {
-    this._canvas = canvas;
-  };
-
-  _observerCallback = (inView: boolean, _entry: IntersectionObserverEntry) => {
-    this._canvasState.inView = inView;
-    if (!this._canvasState.renderScheduled) {
-      // Skip if render is not scheduled.
-      return;
-    }
-
-    this._scheduleDraw();
-  };
-
-  override componentDidMount() {
-    this._scheduleDraw();
-  }
-
-  override componentDidUpdate() {
-    this._scheduleDraw();
-  }
-
-  override render() {
-    return (
-      <InView onChange={this._observerCallback}>
-        <canvas
-          className="timelineTrackMemoryCanvas"
-          ref={this._takeCanvasRef}
-        />
-      </InView>
-    );
-  }
-}
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-  readonly lineWidth: CssPixels;
-  readonly graphHeight: CssPixels;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly accumulatedSamples: AccumulatedCounterSamples;
-  readonly interval: Milliseconds;
-  readonly filteredThread: Thread;
-  readonly unfilteredSamplesRange: StartEndRange | null;
-};
-
-type DispatchProps = {};
-
-type Props = SizeProps & ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {
-  hoveredCounter: null | number;
-  mouseX: CssPixels;
-  mouseY: CssPixels;
-};
-
-/**
- * The memory track graph takes memory information from counters, and renders it as a
- * graph in the timeline.
- */
-class TrackMemoryGraphImpl extends React.PureComponent<Props, State> {
-  override state = {
-    hoveredCounter: null,
-    mouseX: 0,
-    mouseY: 0,
-  };
-
-  _onMouseLeave = () => {
-    // This persistTooltips property is part of the web console API. It helps
-    // in being able to inspect and debug tooltips.
-    if (window.persistTooltips) {
-      return;
-    }
-
-    this.setState({ hoveredCounter: null });
-  };
-
-  _onMouseMove = (event: React.MouseEvent<HTMLDivElement>) => {
-    const { pageX: mouseX, pageY: mouseY } = event;
-    // Get the offset from here, and apply it to the time lookup.
-    const { left } = event.currentTarget.getBoundingClientRect();
-    const {
-      width,
-      rangeStart,
-      rangeEnd,
-      counter,
-      interval,
-      counterSampleRange,
-    } = this.props;
-    const rangeLength = rangeEnd - rangeStart;
-    const timeAtMouse = rangeStart + ((mouseX - left) / width) * rangeLength;
-
-    if (counter.samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No sample group found for memory counter');
-    }
-    const { samples } = counter;
-
-    if (
-      timeAtMouse < samples.time[0] ||
-      timeAtMouse > samples.time[samples.length - 1] + interval
-    ) {
-      // We are outside the range of the samples, do not display hover information.
-      this.setState({ hoveredCounter: null });
-    } else {
-      // When the mouse pointer hovers between two points, select the point that's closer.
-      let hoveredCounter;
-      const [sampleStart, sampleEnd] = counterSampleRange;
-      const bisectionCounter = bisectionRight(
-        samples.time,
-        timeAtMouse,
-        sampleStart,
-        sampleEnd
-      );
-      if (bisectionCounter > 0 && bisectionCounter < samples.time.length) {
-        const leftDistance = timeAtMouse - samples.time[bisectionCounter - 1];
-        const rightDistance = samples.time[bisectionCounter] - timeAtMouse;
-        if (leftDistance < rightDistance) {
-          // Left point is closer
-          hoveredCounter = bisectionCounter - 1;
-        } else {
-          // Right point is closer
-          hoveredCounter = bisectionCounter;
-        }
-      } else {
-        hoveredCounter = bisectionCounter;
-      }
-
-      if (hoveredCounter === samples.length) {
-        // When hovering the last sample, it's possible the mouse is past the time.
-        // In this case, hover over the last sample. This happens because of the
-        // ` + interval` line in the `if` condition above.
-        hoveredCounter = samples.time.length - 1;
-      }
-
-      this.setState({
-        mouseX,
-        mouseY,
-        hoveredCounter,
-      });
-    }
-  };
-
-  _renderTooltip(counterIndex: number): React.ReactNode {
-    const { accumulatedSamples, counter, rangeStart, rangeEnd } = this.props;
-    const { mouseX, mouseY } = this.state;
-    const { samples } = counter;
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No accumulated sample found for memory counter');
-    }
-
-    const sampleTime = samples.time[counterIndex];
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the tooltip if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
-    const bytes = accumulatedCounts[counterIndex] - minCount;
-    const operations =
-      samples.number !== undefined ? samples.number[counterIndex] : null;
-    return (
-      <Tooltip mouseX={mouseX} mouseY={mouseY}>
-        <div className="timelineTrackMemoryTooltip">
-          <div className="timelineTrackMemoryTooltipLine">
-            <span className="timelineTrackMemoryTooltipNumber">
-              {formatBytes(bytes)}
-            </span>
-            <Localized id="TrackMemoryGraph--relative-memory-at-this-time">
-              relative memory at this time
-            </Localized>
-          </div>
-
-          <div className="timelineTrackMemoryTooltipLine">
-            <span className="timelineTrackMemoryTooltipNumber">
-              {formatBytes(countRange)}
-            </span>
-            <Localized id="TrackMemoryGraph--memory-range-in-graph">
-              memory range in graph
-            </Localized>
-          </div>
-          {operations !== null ? (
-            <div className="timelineTrackMemoryTooltipLine">
-              <span className="timelineTrackMemoryTooltipNumber">
-                {formatNumber(operations, 2, 0)}
-              </span>
-              <Localized id="TrackMemoryGraph--allocations-and-deallocations-since-the-previous-sample">
-                allocations and deallocations since the previous sample
-              </Localized>
-            </div>
-          ) : null}
-        </div>
-      </Tooltip>
-    );
-  }
-
-  /**
-   * Create a div that is a dot on top of the graph representing the current
-   * height of the graph.
-   */
-  _renderMemoryDot(counterIndex: number): React.ReactNode {
-    const {
-      counter,
-      rangeStart,
-      rangeEnd,
-      graphHeight,
-      width,
-      lineWidth,
-      accumulatedSamples,
-    } = this.props;
-
-    const { samples } = counter;
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No sample found for memory counter');
-    }
-    const rangeLength = rangeEnd - rangeStart;
-    const sampleTime = samples.time[counterIndex];
-
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the dot if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const left = (width * (sampleTime - rangeStart)) / rangeLength;
-
-    const { minCount, countRange, accumulatedCounts } = accumulatedSamples;
-    const unitSampleCount =
-      (accumulatedCounts[counterIndex] - minCount) / countRange;
-    const innerTrackHeight = graphHeight - lineWidth / 2;
-    const top =
-      innerTrackHeight - unitSampleCount * innerTrackHeight + lineWidth / 2;
-
-    return (
-      <div
-        style={{
-          left,
-          top,
-          backgroundColor: getDotColor(counter.display.color),
-        }}
-        className="timelineTrackMemoryGraphDot"
-      />
-    );
-  }
-
-  override render() {
-    const { hoveredCounter } = this.state;
-    const {
-      filteredThread,
-      interval,
-      rangeStart,
-      rangeEnd,
-      unfilteredSamplesRange,
-      counter,
-      counterSampleRange,
-      graphHeight,
-      width,
-      lineWidth,
-      accumulatedSamples,
-    } = this.props;
-
-    return (
-      <div
-        className="timelineTrackMemoryGraph"
-        onMouseMove={this._onMouseMove}
-        onMouseLeave={this._onMouseLeave}
-      >
-        <TrackMemoryCanvas
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          counter={counter}
-          counterSampleRange={counterSampleRange}
-          height={graphHeight}
-          width={width}
-          lineWidth={lineWidth}
-          interval={interval}
-          accumulatedSamples={accumulatedSamples}
-        />
-        {hoveredCounter === null ? null : (
-          <>
-            {this._renderMemoryDot(hoveredCounter)}
-            {this._renderTooltip(hoveredCounter)}
-          </>
-        )}
-        <EmptyThreadIndicator
-          thread={filteredThread}
-          interval={interval}
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          unfilteredSamplesRange={unfilteredSamplesRange}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackMemoryGraph = explicitConnect<
-  OwnProps,
-  StateProps,
-  DispatchProps
->({
-  mapStateToProps: (state, ownProps) => {
-    const { counterIndex } = ownProps;
-    const counterSelectors = getCounterSelectors(counterIndex);
-    const counter = counterSelectors.getCounter(state);
-    const { start, end } = getCommittedRange(state);
-    const counterSampleRange =
-      counterSelectors.getCommittedRangeCounterSampleRange(state);
-    const selectors = getThreadSelectors(counter.mainThreadIndex);
-    return {
-      counter,
-      threadIndex: counter.mainThreadIndex,
-      accumulatedSamples: counterSelectors.getAccumulateCounterSamples(state),
-      rangeStart: start,
-      rangeEnd: end,
-      counterSampleRange,
-      interval: getProfileInterval(state),
-      filteredThread: selectors.getFilteredThread(state),
-      unfilteredSamplesRange: selectors.unfilteredSamplesRange(state),
-    };
-  },
-  component: withSize(TrackMemoryGraphImpl),
-});
diff --git a/src/components/timeline/TrackPower.css b/src/components/timeline/TrackPower.css
deleted file mode 100644
index 09f616a1c2..0000000000
--- a/src/components/timeline/TrackPower.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.timelineTrackPowerGraph {
-  position: relative;
-  width: 100%;
-  height: var(--graph-height);
-}
-
-.timelineTrackPowerCanvas {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-}
-
-.timelineTrackPowerGraphDot {
-  position: absolute;
-  width: 6px;
-  height: 6px;
-  border-radius: 3px;
-  margin-top: -3px;
-  margin-left: -3px;
-  pointer-events: none;
-}
diff --git a/src/components/timeline/TrackPower.tsx b/src/components/timeline/TrackPower.tsx
deleted file mode 100644
index 3272f09c19..0000000000
--- a/src/components/timeline/TrackPower.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-} from 'firefox-profiler/selectors/profile';
-import { updatePreviewSelection } from 'firefox-profiler/actions/profile-view';
-import { TrackPowerGraph } from './TrackPowerGraph';
-import {
-  TRACK_POWER_HEIGHT,
-  TRACK_POWER_LINE_WIDTH,
-} from 'firefox-profiler/app-logic/constants';
-
-import type {
-  CounterIndex,
-  ThreadIndex,
-  Milliseconds,
-} from 'firefox-profiler/types';
-
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-
-import './TrackPower.css';
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-};
-
-type DispatchProps = {
-  updatePreviewSelection: typeof updatePreviewSelection;
-};
-
-type Props = ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {};
-
-export class TrackPowerImpl extends React.PureComponent<Props, State> {
-  override render() {
-    const { counterIndex } = this.props;
-    return (
-      <div
-        className="timelineTrackPower"
-        style={
-          {
-            height: TRACK_POWER_HEIGHT,
-            '--graph-height': `${TRACK_POWER_HEIGHT}px`,
-          } as React.CSSProperties
-        }
-      >
-        <TrackPowerGraph
-          counterIndex={counterIndex}
-          lineWidth={TRACK_POWER_LINE_WIDTH}
-          graphHeight={TRACK_POWER_HEIGHT}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackPower = explicitConnect<OwnProps, StateProps, DispatchProps>({
-  mapStateToProps: (state, ownProps) => {
-    const { counterIndex } = ownProps;
-    const counterSelectors = getCounterSelectors(counterIndex);
-    const counter = counterSelectors.getCounter(state);
-    const { start, end } = getCommittedRange(state);
-    return {
-      threadIndex: counter.mainThreadIndex,
-      rangeStart: start,
-      rangeEnd: end,
-    };
-  },
-  mapDispatchToProps: { updatePreviewSelection },
-  component: TrackPowerImpl,
-});
diff --git a/src/components/timeline/TrackPowerGraph.tsx b/src/components/timeline/TrackPowerGraph.tsx
deleted file mode 100644
index fe654222dd..0000000000
--- a/src/components/timeline/TrackPowerGraph.tsx
+++ /dev/null
@@ -1,569 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import { InView } from 'react-intersection-observer';
-import { withSize } from 'firefox-profiler/components/shared/WithSize';
-import {
-  getStrokeColor,
-  getFillColor,
-  getDotColor,
-} from 'firefox-profiler/profile-logic/graph-color';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import { bisectionRight } from 'firefox-profiler/utils/bisect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-  getProfileInterval,
-} from 'firefox-profiler/selectors/profile';
-import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
-import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
-import { TooltipTrackPower } from 'firefox-profiler/components/tooltip/TrackPower';
-import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-
-import type {
-  CounterIndex,
-  Counter,
-  Thread,
-  ThreadIndex,
-  Milliseconds,
-  CssPixels,
-  StartEndRange,
-  IndexIntoSamplesTable,
-} from 'firefox-profiler/types';
-
-import type { SizeProps } from 'firefox-profiler/components/shared/WithSize';
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-import { timeCode } from 'firefox-profiler/utils/time-code';
-
-import './TrackPower.css';
-
-/**
- * When adding properties to these props, please consider the comment above the component.
- */
-type CanvasProps = {
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly maxCounterSampleCountPerMs: number;
-  readonly interval: Milliseconds;
-  readonly width: CssPixels;
-  readonly height: CssPixels;
-  readonly lineWidth: CssPixels;
-};
-
-/**
- * This component controls the rendering of the canvas. Every render call through
- * React triggers a new canvas render. Because of this, it's important to only pass
- * in the props that are needed for the canvas draw call.
- */
-class TrackPowerCanvas extends React.PureComponent<CanvasProps> {
-  _canvas: null | HTMLCanvasElement = null;
-  _canvasState: { renderScheduled: boolean; inView: boolean } = {
-    renderScheduled: false,
-    inView: false,
-  };
-
-  drawCanvas(canvas: HTMLCanvasElement): void {
-    const {
-      rangeStart,
-      rangeEnd,
-      counter,
-      height,
-      width,
-      lineWidth,
-      interval,
-      maxCounterSampleCountPerMs,
-      counterSampleRange,
-    } = this.props;
-    if (width === 0) {
-      // This is attempting to draw before the canvas was laid out.
-      return;
-    }
-
-    const ctx = canvas.getContext('2d')!;
-    const devicePixelRatio = window.devicePixelRatio;
-    const deviceWidth = width * devicePixelRatio;
-    const deviceHeight = height * devicePixelRatio;
-    const deviceLineWidth = lineWidth * devicePixelRatio;
-    const deviceLineHalfWidth = deviceLineWidth * 0.5;
-    const innerDeviceHeight = deviceHeight - deviceLineWidth;
-    const rangeLength = rangeEnd - rangeStart;
-    const millisecondWidth = deviceWidth / rangeLength;
-    const intervalWidth = interval * millisecondWidth;
-
-    // Resize and clear the canvas.
-    canvas.width = Math.round(deviceWidth);
-    canvas.height = Math.round(deviceHeight);
-    ctx.clearRect(0, 0, deviceWidth, deviceHeight);
-
-    const samples = counter.samples;
-    if (samples.length === 0) {
-      // There's no reason to draw the samples, there are none.
-      return;
-    }
-
-    const [sampleStart, sampleEnd] = counterSampleRange;
-    const countRangePerMs = maxCounterSampleCountPerMs;
-
-    {
-      // Draw the chart.
-      //
-      //                 ...--`
-      //  1 ...---```..--      `--. 2
-      //    |_____________________|
-      //  4                        3
-      //
-      // Start by drawing from 1 - 2. This will be the top of all the peaks of the
-      // power graph.
-
-      ctx.lineWidth = deviceLineWidth;
-      ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = getStrokeColor(counter.display.color);
-      ctx.fillStyle = getFillColor(counter.display.color);
-      ctx.beginPath();
-
-      const getX = (i: number) =>
-        Math.round((samples.time[i] - rangeStart) * millisecondWidth);
-      const getPower = (i: number) => {
-        const sampleTimeDeltaInMs =
-          i === 0 ? interval : samples.time[i] - samples.time[i - 1];
-        return samples.count[i] / sampleTimeDeltaInMs;
-      };
-      const getY = (rawY: number) => {
-        if (!rawY) {
-          // Make the 0 values invisible so that 'almost 0' is noticeable.
-          return deviceHeight + deviceLineHalfWidth;
-        }
-
-        const unitGraphCount = rawY / countRangePerMs;
-        // Add on half the stroke's line width so that it won't be cut off the edge
-        // of the graph.
-        return Math.round(
-          innerDeviceHeight -
-            innerDeviceHeight * unitGraphCount +
-            deviceLineHalfWidth
-        );
-      };
-
-      // The x and y are used after the loop.
-      const firstX = getX(sampleStart);
-      let x = firstX;
-      let y = getY(getPower(sampleStart));
-
-      // For the first sample, only move the line, do not draw it. Also
-      // remember this first X, as the bottom of the graph will need to connect
-      // back up to it.
-      ctx.moveTo(x, y);
-
-      // Create a path for the top of the chart. This is the line that will have
-      // a stroke applied to it.
-      for (let i = sampleStart + 1; i < sampleEnd; i++) {
-        const powerValues = [getPower(i)];
-        x = getX(i);
-        y = getY(powerValues[0]);
-        ctx.lineTo(x, y);
-
-        // If we have multiple samples to draw on the same horizontal pixel,
-        // we process all of them together with a max-min decimation algorithm
-        // to save time:
-        // - We draw the first and last samples to ensure the display is
-        //   correct if there are sampling gaps.
-        // - For the values in between, we only draw the min and max values,
-        //   to draw a vertical line covering all the other sample values.
-        while (i + 1 < sampleEnd && getX(i + 1) === x) {
-          powerValues.push(getPower(++i));
-        }
-
-        // Looking for the min and max only makes sense if we have more than 2
-        // samples to draw.
-        if (powerValues.length > 2) {
-          const minY = getY(Math.min(...powerValues));
-          if (minY !== y) {
-            y = minY;
-            ctx.lineTo(x, y);
-          }
-          const maxY = getY(Math.max(...powerValues));
-          if (maxY !== y) {
-            y = maxY;
-            ctx.lineTo(x, y);
-          }
-        }
-
-        const lastY = getY(powerValues[powerValues.length - 1]);
-        if (lastY !== y) {
-          y = lastY;
-          ctx.lineTo(x, y);
-        }
-      }
-
-      // The samples range ends at the time of the last sample, plus the interval.
-      // Draw this last bit.
-      ctx.lineTo(x + intervalWidth, y);
-
-      // Don't do the fill yet, just stroke the top line. This will draw a line from
-      // point 1 to 2 in the diagram above.
-      ctx.stroke();
-
-      // After doing the stroke, continue the path to complete the fill to the bottom
-      // of the canvas. This continues the path to point 3 and then 4.
-
-      // Create a line from 2 to 3.
-      ctx.lineTo(x + intervalWidth, deviceHeight);
-
-      // Create a line from 3 to 4.
-      ctx.lineTo(firstX, deviceHeight);
-
-      // The line from 4 to 1 will be implicitly filled in.
-      ctx.fill();
-    }
-  }
-
-  _renderCanvas() {
-    if (!this._canvasState.inView) {
-      // Canvas is not in the view. Schedule the render for a later intersection
-      // observer callback.
-      this._canvasState.renderScheduled = true;
-      return;
-    }
-
-    // Canvas is in the view. Render the canvas and reset the schedule state.
-    this._canvasState.renderScheduled = false;
-
-    const canvas = this._canvas;
-    if (canvas) {
-      timeCode('TrackPowerCanvas render', () => {
-        this.drawCanvas(canvas);
-      });
-    }
-  }
-
-  _takeCanvasRef = (canvas: HTMLCanvasElement | null) => {
-    this._canvas = canvas;
-  };
-
-  _observerCallback = (inView: boolean, _entry: IntersectionObserverEntry) => {
-    this._canvasState.inView = inView;
-    if (!this._canvasState.renderScheduled) {
-      // Skip if render is not scheduled.
-      return;
-    }
-
-    this._renderCanvas();
-  };
-
-  override render() {
-    this._renderCanvas();
-
-    return (
-      <InView onChange={this._observerCallback}>
-        <canvas
-          className="timelineTrackPowerCanvas"
-          ref={this._takeCanvasRef}
-        />
-      </InView>
-    );
-  }
-}
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-  readonly lineWidth: CssPixels;
-  readonly graphHeight: CssPixels;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly maxCounterSampleCountPerMs: number;
-  readonly interval: Milliseconds;
-  readonly filteredThread: Thread;
-  readonly unfilteredSamplesRange: StartEndRange | null;
-};
-
-type DispatchProps = {};
-
-type Props = SizeProps & ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {
-  hoveredCounter: null | number;
-  mouseX: CssPixels;
-  mouseY: CssPixels;
-};
-
-/**
- * The power track graph takes power use information from counters, and renders it as a
- * graph in the timeline.
- */
-class TrackPowerGraphImpl extends React.PureComponent<Props, State> {
-  override state = {
-    hoveredCounter: null,
-    mouseX: 0,
-    mouseY: 0,
-  };
-
-  _onMouseLeave = () => {
-    this.setState({ hoveredCounter: null });
-  };
-
-  _onMouseMove = (event: React.MouseEvent<HTMLDivElement>) => {
-    const { pageX: mouseX, pageY: mouseY } = event;
-    // Get the offset from here, and apply it to the time lookup.
-    const { left } = event.currentTarget.getBoundingClientRect();
-    const {
-      width,
-      rangeStart,
-      rangeEnd,
-      counter,
-      interval,
-      counterSampleRange,
-    } = this.props;
-    const rangeLength = rangeEnd - rangeStart;
-    const timeAtMouse = rangeStart + ((mouseX - left) / width) * rangeLength;
-
-    const { samples } = counter;
-
-    if (
-      timeAtMouse < samples.time[0] ||
-      timeAtMouse > samples.time[samples.length - 1] + interval
-    ) {
-      // We are outside the range of the samples, do not display hover information.
-      this.setState({ hoveredCounter: null });
-    } else {
-      // When the mouse pointer hovers between two points, select the point that's closer.
-      let hoveredCounter;
-      const [sampleStart, sampleEnd] = counterSampleRange;
-      const bisectionCounter = bisectionRight(
-        samples.time,
-        timeAtMouse,
-        sampleStart,
-        sampleEnd
-      );
-      if (bisectionCounter > 0 && bisectionCounter < samples.time.length) {
-        const leftDistance = timeAtMouse - samples.time[bisectionCounter - 1];
-        const rightDistance = samples.time[bisectionCounter] - timeAtMouse;
-        if (leftDistance < rightDistance) {
-          // Left point is closer
-          hoveredCounter = bisectionCounter - 1;
-        } else {
-          // Right point is closer
-          hoveredCounter = bisectionCounter;
-        }
-
-        // If there are samples before or after hoveredCounter that fall
-        // horizontally on the same pixel, move hoveredCounter to the sample
-        // with the highest power value.
-        const mouseAtTime = (t: number) =>
-          Math.round(((t - rangeStart) / rangeLength) * width + left);
-        for (
-          let currentIndex = hoveredCounter - 1;
-          mouseAtTime(samples.time[currentIndex]) === mouseX &&
-          currentIndex > 0;
-          --currentIndex
-        ) {
-          if (samples.count[currentIndex] > samples.count[hoveredCounter]) {
-            hoveredCounter = currentIndex;
-          }
-        }
-        for (
-          let currentIndex = hoveredCounter + 1;
-          mouseAtTime(samples.time[currentIndex]) === mouseX &&
-          currentIndex < samples.time.length;
-          ++currentIndex
-        ) {
-          if (samples.count[currentIndex] > samples.count[hoveredCounter]) {
-            hoveredCounter = currentIndex;
-          }
-        }
-      } else {
-        hoveredCounter = bisectionCounter;
-      }
-
-      if (hoveredCounter === samples.length) {
-        // When hovering the last sample, it's possible the mouse is past the time.
-        // In this case, hover over the last sample. This happens because of the
-        // ` + interval` line in the `if` condition above.
-        hoveredCounter = samples.time.length - 1;
-      }
-
-      this.setState({
-        mouseX,
-        mouseY,
-        hoveredCounter,
-      });
-    }
-  };
-
-  _renderTooltip(counterSampleIndex: number): React.ReactNode {
-    const { counter, rangeStart, rangeEnd } = this.props;
-    const { mouseX, mouseY } = this.state;
-
-    const { samples } = counter;
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No sample found for power counter');
-    }
-
-    const sampleTime = samples.time[counterSampleIndex];
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the tooltip if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    return (
-      <Tooltip mouseX={mouseX} mouseY={mouseY}>
-        <TooltipTrackPower
-          counter={counter}
-          counterSampleIndex={counterSampleIndex}
-        />
-      </Tooltip>
-    );
-  }
-
-  /**
-   * Create a div that is a dot on top of the graph representing the current
-   * height of the graph.
-   */
-  _renderDot(counterIndex: number): React.ReactNode {
-    const {
-      counter,
-      rangeStart,
-      rangeEnd,
-      graphHeight,
-      width,
-      lineWidth,
-      maxCounterSampleCountPerMs,
-      interval,
-    } = this.props;
-
-    const { samples } = counter;
-    const rangeLength = rangeEnd - rangeStart;
-    const sampleTime = samples.time[counterIndex];
-
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the dot if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const left = (width * (sampleTime - rangeStart)) / rangeLength;
-
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // power counter. Print an error and bail out early.
-      throw new Error('No sample found for power counter');
-    }
-    const countRangePerMs = maxCounterSampleCountPerMs;
-    const sampleTimeDeltaInMs =
-      counterIndex === 0
-        ? interval
-        : samples.time[counterIndex] - samples.time[counterIndex - 1];
-    const unitSampleCount =
-      samples.count[counterIndex] / sampleTimeDeltaInMs / countRangePerMs;
-    const innerTrackHeight = graphHeight - lineWidth / 2;
-    const top =
-      innerTrackHeight - unitSampleCount * innerTrackHeight + lineWidth / 2;
-
-    return (
-      <div
-        style={{
-          left,
-          top,
-          backgroundColor: getDotColor(counter.display.color),
-        }}
-        className="timelineTrackPowerGraphDot"
-      />
-    );
-  }
-
-  override render() {
-    const { hoveredCounter } = this.state;
-    const {
-      filteredThread,
-      interval,
-      rangeStart,
-      rangeEnd,
-      unfilteredSamplesRange,
-      counter,
-      counterSampleRange,
-      graphHeight,
-      width,
-      lineWidth,
-      maxCounterSampleCountPerMs,
-    } = this.props;
-
-    return (
-      <div
-        className="timelineTrackPowerGraph"
-        onMouseMove={this._onMouseMove}
-        onMouseLeave={this._onMouseLeave}
-      >
-        <TrackPowerCanvas
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          counter={counter}
-          counterSampleRange={counterSampleRange}
-          height={graphHeight}
-          width={width}
-          lineWidth={lineWidth}
-          interval={interval}
-          maxCounterSampleCountPerMs={maxCounterSampleCountPerMs}
-        />
-        {hoveredCounter === null ? null : (
-          <>
-            {this._renderDot(hoveredCounter)}
-            {this._renderTooltip(hoveredCounter)}
-          </>
-        )}
-        <EmptyThreadIndicator
-          thread={filteredThread}
-          interval={interval}
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          unfilteredSamplesRange={unfilteredSamplesRange}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackPowerGraph = explicitConnect<
-  OwnProps,
-  StateProps,
-  DispatchProps
->({
-  mapStateToProps: (state, ownProps) => {
-    const { counterIndex } = ownProps;
-    const counterSelectors = getCounterSelectors(counterIndex);
-    const counter = counterSelectors.getCounter(state);
-    const { start, end } = getCommittedRange(state);
-    const counterSampleRange =
-      counterSelectors.getCommittedRangeCounterSampleRange(state);
-
-    const selectors = getThreadSelectors(counter.mainThreadIndex);
-    return {
-      counter,
-      threadIndex: counter.mainThreadIndex,
-      maxCounterSampleCountPerMs:
-        counterSelectors.getMaxRangeCounterSampleCountPerMs(state),
-      rangeStart: start,
-      rangeEnd: end,
-      counterSampleRange,
-      interval: getProfileInterval(state),
-      filteredThread: selectors.getFilteredThread(state),
-      unfilteredSamplesRange: selectors.unfilteredSamplesRange(state),
-    };
-  },
-  component: withSize(TrackPowerGraphImpl),
-});
diff --git a/src/components/timeline/TrackProcessCPU.css b/src/components/timeline/TrackProcessCPU.css
deleted file mode 100644
index 76f8c45d52..0000000000
--- a/src/components/timeline/TrackProcessCPU.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.timelineTrackProcessCPUGraph {
-  position: relative;
-  width: 100%;
-  height: var(--graph-height);
-}
-
-.timelineTrackProcessCPUCanvas {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-}
-
-.timelineTrackProcessCPUGraphDot {
-  --internal-background-color: var(--grey-50);
-
-  position: absolute;
-  width: 6px;
-  height: 6px;
-  border-radius: 3px;
-  margin-top: -3px;
-  margin-left: -3px;
-  background-color: var(--internal-background-color);
-  pointer-events: none;
-}
-
-.timelineTrackProcessCPUTooltipLine {
-  white-space: nowrap;
-}
-
-.timelineTrackProcessCPUTooltipNumber {
-  display: inline-block;
-  min-width: 60px;
-  color: var(--tooltip-number-foreground-color);
-  font-weight: bold;
-}
diff --git a/src/components/timeline/TrackProcessCPUGraph.tsx b/src/components/timeline/TrackProcessCPUGraph.tsx
deleted file mode 100644
index 0f6c7d7fe3..0000000000
--- a/src/components/timeline/TrackProcessCPUGraph.tsx
+++ /dev/null
@@ -1,477 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-import * as React from 'react';
-import { withSize } from 'firefox-profiler/components/shared/WithSize';
-import explicitConnect from 'firefox-profiler/utils/connect';
-import { formatPercent } from 'firefox-profiler/utils/format-numbers';
-import { bisectionRight } from 'firefox-profiler/utils/bisect';
-import {
-  getCommittedRange,
-  getCounterSelectors,
-  getProfileInterval,
-} from 'firefox-profiler/selectors/profile';
-import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
-import { GREY_50 } from 'photon-colors';
-import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
-import { EmptyThreadIndicator } from './EmptyThreadIndicator';
-
-import type {
-  CounterIndex,
-  Counter,
-  Thread,
-  ThreadIndex,
-  Milliseconds,
-  CssPixels,
-  StartEndRange,
-  IndexIntoSamplesTable,
-} from 'firefox-profiler/types';
-
-import type { SizeProps } from 'firefox-profiler/components/shared/WithSize';
-import type { ConnectedProps } from 'firefox-profiler/utils/connect';
-
-import './TrackProcessCPU.css';
-
-/**
- * When adding properties to these props, please consider the comment above the component.
- */
-type CanvasProps = {
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly maxCounterSampleCountPerMs: number;
-  readonly interval: Milliseconds;
-  readonly width: CssPixels;
-  readonly height: CssPixels;
-  readonly lineWidth: CssPixels;
-};
-
-/**
- * This component controls the rendering of the canvas. Every render call through
- * React triggers a new canvas render. Because of this, it's important to only pass
- * in the props that are needed for the canvas draw call.
- */
-class TrackProcessCPUCanvas extends React.PureComponent<CanvasProps> {
-  _canvas: null | HTMLCanvasElement = null;
-  _requestedAnimationFrame: boolean = false;
-
-  drawCanvas(canvas: HTMLCanvasElement): void {
-    const {
-      rangeStart,
-      rangeEnd,
-      counter,
-      height,
-      width,
-      lineWidth,
-      interval,
-      maxCounterSampleCountPerMs,
-      counterSampleRange,
-    } = this.props;
-    if (width === 0) {
-      // This is attempting to draw before the canvas was laid out.
-      return;
-    }
-
-    const ctx = canvas.getContext('2d')!;
-    const devicePixelRatio = window.devicePixelRatio;
-    const deviceWidth = width * devicePixelRatio;
-    const deviceHeight = height * devicePixelRatio;
-    const deviceLineWidth = lineWidth * devicePixelRatio;
-    const deviceLineHalfWidth = deviceLineWidth * 0.5;
-    const innerDeviceHeight = deviceHeight - deviceLineWidth;
-    const rangeLength = rangeEnd - rangeStart;
-    const millisecondWidth = deviceWidth / rangeLength;
-    const intervalWidth = interval * millisecondWidth;
-
-    // Resize and clear the canvas.
-    canvas.width = Math.round(deviceWidth);
-    canvas.height = Math.round(deviceHeight);
-    ctx.clearRect(0, 0, deviceWidth, deviceHeight);
-
-    const samples = counter.samples;
-    if (samples.length === 0) {
-      // There's no reason to draw the samples, there are none.
-      return;
-    }
-
-    const [sampleStart, sampleEnd] = counterSampleRange;
-    const countRangePerMs = maxCounterSampleCountPerMs;
-
-    {
-      // Draw the chart.
-      //
-      //                 ...--`
-      //  1 ...---```..--      `--. 2
-      //    |_____________________|
-      //  4                        3
-      //
-      // Start by drawing from 1 - 2. This will be the top of all the peaks of the
-      // process CPU graph.
-
-      ctx.lineWidth = deviceLineWidth;
-      ctx.lineJoin = 'bevel';
-      ctx.strokeStyle = GREY_50;
-      ctx.fillStyle = '#73737388'; // Grey 50 with transparency.
-      ctx.beginPath();
-
-      // The x and y are used after the loop.
-      let x = 0;
-      let y = 0;
-      let firstX = 0;
-      for (let i = sampleStart; i < sampleEnd; i++) {
-        // Create a path for the top of the chart. This is the line that will have
-        // a stroke applied to it.
-        x = (samples.time[i] - rangeStart) * millisecondWidth;
-        const sampleTimeDeltaInMs =
-          i === 0 ? interval : samples.time[i] - samples.time[i - 1];
-        const unitGraphCount =
-          samples.count[i] / sampleTimeDeltaInMs / countRangePerMs;
-        // Add on half the stroke's line width so that it won't be cut off the edge
-        // of the graph.
-        y =
-          innerDeviceHeight -
-          innerDeviceHeight * unitGraphCount +
-          deviceLineHalfWidth;
-        if (i === 0) {
-          // This is the first iteration, only move the line, do not draw it. Also
-          // remember this first X, as the bottom of the graph will need to connect
-          // back up to it.
-          firstX = x;
-          ctx.moveTo(x, y);
-        } else {
-          ctx.lineTo(x, y);
-        }
-      }
-      // The samples range ends at the time of the last sample, plus the interval.
-      // Draw this last bit.
-      ctx.lineTo(x + intervalWidth, y);
-
-      // Don't do the fill yet, just stroke the top line. This will draw a line from
-      // point 1 to 2 in the diagram above.
-      ctx.stroke();
-
-      // After doing the stroke, continue the path to complete the fill to the bottom
-      // of the canvas. This continues the path to point 3 and then 4.
-
-      // Create a line from 2 to 3.
-      ctx.lineTo(x + intervalWidth, deviceHeight);
-
-      // Create a line from 3 to 4.
-      ctx.lineTo(firstX, deviceHeight);
-
-      // The line from 4 to 1 will be implicitly filled in.
-      ctx.fill();
-    }
-  }
-
-  _scheduleDraw() {
-    if (!this._requestedAnimationFrame) {
-      this._requestedAnimationFrame = true;
-      window.requestAnimationFrame(() => {
-        this._requestedAnimationFrame = false;
-        const canvas = this._canvas;
-        if (canvas) {
-          this.drawCanvas(canvas);
-        }
-      });
-    }
-  }
-
-  _takeCanvasRef = (canvas: HTMLCanvasElement | null) => {
-    this._canvas = canvas;
-  };
-
-  override render() {
-    this._scheduleDraw();
-
-    return (
-      <canvas
-        className="timelineTrackProcessCPUCanvas"
-        ref={this._takeCanvasRef}
-      />
-    );
-  }
-}
-
-type OwnProps = {
-  readonly counterIndex: CounterIndex;
-  readonly lineWidth: CssPixels;
-  readonly graphHeight: CssPixels;
-};
-
-type StateProps = {
-  readonly threadIndex: ThreadIndex;
-  readonly rangeStart: Milliseconds;
-  readonly rangeEnd: Milliseconds;
-  readonly counter: Counter;
-  readonly counterSampleRange: [IndexIntoSamplesTable, IndexIntoSamplesTable];
-  readonly maxCounterSampleCountPerMs: number;
-  readonly interval: Milliseconds;
-  readonly filteredThread: Thread;
-  readonly unfilteredSamplesRange: StartEndRange | null;
-};
-
-type DispatchProps = {};
-
-type Props = SizeProps & ConnectedProps<OwnProps, StateProps, DispatchProps>;
-
-type State = {
-  hoveredCounter: null | number;
-  mouseX: CssPixels;
-  mouseY: CssPixels;
-};
-
-/**
- * The process CPU track graph takes CPU information from counters, and renders it as a
- * graph in the timeline.
- */
-class TrackProcessCPUGraphImpl extends React.PureComponent<Props, State> {
-  override state = {
-    hoveredCounter: null,
-    mouseX: 0,
-    mouseY: 0,
-  };
-
-  _onMouseLeave = () => {
-    this.setState({ hoveredCounter: null });
-  };
-
-  _onMouseMove = (event: React.MouseEvent<HTMLDivElement>) => {
-    const { pageX: mouseX, pageY: mouseY } = event;
-    // Get the offset from here, and apply it to the time lookup.
-    const { left } = event.currentTarget.getBoundingClientRect();
-    const {
-      width,
-      rangeStart,
-      rangeEnd,
-      counter,
-      interval,
-      counterSampleRange,
-    } = this.props;
-    const rangeLength = rangeEnd - rangeStart;
-    const timeAtMouse = rangeStart + ((mouseX - left) / width) * rangeLength;
-
-    const { samples } = counter;
-
-    if (
-      timeAtMouse < samples.time[0] ||
-      timeAtMouse > samples.time[samples.length - 1] + interval
-    ) {
-      // We are outside the range of the samples, do not display hover information.
-      this.setState({ hoveredCounter: null });
-    } else {
-      // When the mouse pointer hovers between two points, select the point that's closer.
-      let hoveredCounter;
-      const [sampleStart, sampleEnd] = counterSampleRange;
-      const bisectionCounter = bisectionRight(
-        samples.time,
-        timeAtMouse,
-        sampleStart,
-        sampleEnd
-      );
-      if (bisectionCounter > 0 && bisectionCounter < samples.time.length) {
-        const leftDistance = timeAtMouse - samples.time[bisectionCounter - 1];
-        const rightDistance = samples.time[bisectionCounter] - timeAtMouse;
-        if (leftDistance < rightDistance) {
-          // Left point is closer
-          hoveredCounter = bisectionCounter - 1;
-        } else {
-          // Right point is closer
-          hoveredCounter = bisectionCounter;
-        }
-      } else {
-        hoveredCounter = bisectionCounter;
-      }
-
-      if (hoveredCounter === samples.length) {
-        // When hovering the last sample, it's possible the mouse is past the time.
-        // In this case, hover over the last sample. This happens because of the
-        // ` + interval` line in the `if` condition above.
-        hoveredCounter = samples.time.length - 1;
-      }
-
-      this.setState({
-        mouseX,
-        mouseY,
-        hoveredCounter,
-      });
-    }
-  };
-
-  _renderTooltip(counterIndex: number): React.ReactNode {
-    const {
-      counter,
-      maxCounterSampleCountPerMs,
-      interval,
-      rangeStart,
-      rangeEnd,
-    } = this.props;
-    const { mouseX, mouseY } = this.state;
-    const { samples } = counter;
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // malloc counter. Print an error and bail out early.
-      throw new Error('No sample found for process CPU counter');
-    }
-    const sampleTime = samples.time[counterIndex];
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the tooltip if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const maxCPUPerMs = maxCounterSampleCountPerMs;
-    const cpuUsage = samples.count[counterIndex];
-    const sampleTimeDeltaInMs =
-      counterIndex === 0
-        ? interval
-        : samples.time[counterIndex] - samples.time[counterIndex - 1];
-    const cpuRatio = cpuUsage / sampleTimeDeltaInMs / maxCPUPerMs;
-    return (
-      <Tooltip mouseX={mouseX} mouseY={mouseY}>
-        <div className="timelineTrackProcessCPUTooltip">
-          <div className="timelineTrackProcessCPUTooltipLine">
-            CPU:{' '}
-            <span className="timelineTrackProcessCPUTooltipNumber">
-              {formatPercent(cpuRatio)}
-            </span>
-          </div>
-        </div>
-      </Tooltip>
-    );
-  }
-
-  /**
-   * Create a div that is a dot on top of the graph representing the current
-   * height of the graph.
-   */
-  _renderDot(counterIndex: number): React.ReactNode {
-    const {
-      counter,
-      rangeStart,
-      rangeEnd,
-      graphHeight,
-      width,
-      lineWidth,
-      maxCounterSampleCountPerMs,
-      interval,
-    } = this.props;
-    const { samples } = counter;
-    const rangeLength = rangeEnd - rangeStart;
-    const sampleTime = samples.time[counterIndex];
-
-    if (sampleTime < rangeStart || sampleTime > rangeEnd) {
-      // Do not draw the dot if it will be rendered outside of the timeline.
-      // This could happen when a sample time is outside of the time range.
-      // While range filtering the counters, we add the sample before start and
-      // after end, so charts will not be cut off at the edges.
-      return null;
-    }
-
-    const left =
-      (width * (samples.time[counterIndex] - rangeStart)) / rangeLength;
-
-    if (samples.length === 0) {
-      // Gecko failed to capture samples for some reason and it shouldn't happen for
-      // process CPU counter. Print an error and bail out early.
-      throw new Error('No sample found for process CPU counter');
-    }
-    const countRangePerMs = maxCounterSampleCountPerMs;
-    const sampleTimeDeltaInMs =
-      counterIndex === 0
-        ? interval
-        : samples.time[counterIndex] - samples.time[counterIndex - 1];
-    const unitSampleCount =
-      samples.count[counterIndex] / sampleTimeDeltaInMs / countRangePerMs;
-    const innerTrackHeight = graphHeight - lineWidth / 2;
-    const top =
-      innerTrackHeight - unitSampleCount * innerTrackHeight + lineWidth / 2;
-
-    return (
-      <div style={{ left, top }} className="timelineTrackProcessCPUGraphDot" />
-    );
-  }
-
-  override render() {
-    const { hoveredCounter } = this.state;
-    const {
-      filteredThread,
-      interval,
-      rangeStart,
-      rangeEnd,
-      unfilteredSamplesRange,
-      counter,
-      counterSampleRange,
-      graphHeight,
-      width,
-      lineWidth,
-      maxCounterSampleCountPerMs,
-    } = this.props;
-
-    return (
-      <div
-        className="timelineTrackProcessCPUGraph"
-        onMouseMove={this._onMouseMove}
-        onMouseLeave={this._onMouseLeave}
-      >
-        <TrackProcessCPUCanvas
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          counter={counter}
-          counterSampleRange={counterSampleRange}
-          height={graphHeight}
-          width={width}
-          lineWidth={lineWidth}
-          interval={interval}
-          maxCounterSampleCountPerMs={maxCounterSampleCountPerMs}
-        />
-        {hoveredCounter === null ? null : (
-          <>
-            {this._renderDot(hoveredCounter)}
-            {this._renderTooltip(hoveredCounter)}
-          </>
-        )}
-        <EmptyThreadIndicator
-          thread={filteredThread}
-          interval={interval}
-          rangeStart={rangeStart}
-          rangeEnd={rangeEnd}
-          unfilteredSamplesRange={unfilteredSamplesRange}
-        />
-      </div>
-    );
-  }
-}
-
-export const TrackProcessCPUGraph = explicitConnect<
-  OwnProps,
-  StateProps,
-  DispatchProps
->({
-  mapStateToProps: (state, ownProps) => {
-    const { counterIndex } = ownProps;
-    const counterSelectors = getCounterSelectors(counterIndex);
-    const counter = counterSelectors.getCounter(state);
-    const { start, end } = getCommittedRange(state);
-    const counterSampleRange =
-      counterSelectors.getCommittedRangeCounterSampleRange(state);
-    const selectors = getThreadSelectors(counter.mainThreadIndex);
-    return {
-      counter,
-      threadIndex: counter.mainThreadIndex,
-      maxCounterSampleCountPerMs:
-        counterSelectors.getMaxCounterSampleCountPerMs(state),
-      rangeStart: start,
-      rangeEnd: end,
-      counterSampleRange,
-      interval: getProfileInterval(state),
-      filteredThread: selectors.getFilteredThread(state),
-      unfilteredSamplesRange: selectors.unfilteredSamplesRange(state),
-    };
-  },
-  component: withSize(TrackProcessCPUGraphImpl),
-});
diff --git a/src/profile-logic/process-profile.ts b/src/profile-logic/process-profile.ts
index d95355d18d..709b3c048e 100644
--- a/src/profile-logic/process-profile.ts
+++ b/src/profile-logic/process-profile.ts
@@ -980,7 +980,16 @@ function _deriveCounterDisplay(
   category: string,
   name: string
 ): CounterDisplayConfig {
-  if (category === 'Memory') {
+  if (category === 'Bandwidth') {
+    return {
+      graphType: 'line-rate',
+      unit: 'bytes',
+      color: 'blue',
+      markerSchemaLocation: null,
+      sortWeight: 10,
+      label: 'Bandwidth',
+    };
+  } else if (category === 'Memory') {
     return {
       graphType: 'line-accumulated',
       unit: 'bytes',
@@ -998,15 +1007,6 @@ function _deriveCounterDisplay(
       sortWeight: 30,
       label: name,
     };
-  } else if (category === 'Bandwidth') {
-    return {
-      graphType: 'line-rate',
-      unit: 'bytes',
-      color: 'blue',
-      markerSchemaLocation: null,
-      sortWeight: 10,
-      label: 'Bandwidth',
-    };
   } else if (category === 'CPU' && name === 'processCPU') {
     return {
       graphType: 'line-rate',
diff --git a/src/profile-logic/processed-profile-versioning.ts b/src/profile-logic/processed-profile-versioning.ts
index c8d94509d9..725b597997 100644
--- a/src/profile-logic/processed-profile-versioning.ts
+++ b/src/profile-logic/processed-profile-versioning.ts
@@ -3059,7 +3059,16 @@ const _upgraders: {
           continue;
         }
         const { category, name } = counter;
-        if (category === 'Memory') {
+        if (category === 'Bandwidth') {
+          counter.display = {
+            graphType: 'line-rate',
+            unit: 'bytes',
+            color: counter.color ?? 'blue',
+            markerSchemaLocation: null,
+            sortWeight: 10,
+            label: 'Bandwidth',
+          };
+        } else if (category === 'Memory') {
           counter.display = {
             graphType: 'line-accumulated',
             unit: 'bytes',
@@ -3077,15 +3086,6 @@ const _upgraders: {
             sortWeight: 30,
             label: name,
           };
-        } else if (category === 'Bandwidth') {
-          counter.display = {
-            graphType: 'line-rate',
-            unit: 'bytes',
-            color: counter.color ?? 'blue',
-            markerSchemaLocation: null,
-            sortWeight: 10,
-            label: 'Bandwidth',
-          };
         } else if (category === 'CPU' && name === 'processCPU') {
           counter.display = {
             graphType: 'line-rate',
diff --git a/src/profile-logic/tracks.ts b/src/profile-logic/tracks.ts
index c831ad796e..ea5c690bbb 100644
--- a/src/profile-logic/tracks.ts
+++ b/src/profile-logic/tracks.ts
@@ -56,28 +56,22 @@ export type HiddenTracks = {
 const LOCAL_TRACK_INDEX_ORDER = {
   thread: 0,
   network: 1,
-  memory: 2,
+  counter: 2,
   ipc: 3,
   'event-delay': 4,
-  'process-cpu': 5,
-  power: 6,
-  marker: 7,
-  bandwidth: 8,
+  marker: 5,
 };
 const LOCAL_TRACK_DISPLAY_ORDER = {
   network: 0,
-  bandwidth: 1,
-  memory: 2,
-  power: 3,
+  counter: 1,
   // IPC tracks that belong to the global track will appear right after network
   // and counter tracks. But we want to show the IPC tracks that belong to the
   // local threads right after their track. This special handling happens inside
   // the sort function.
-  ipc: 4,
-  thread: 5,
-  'event-delay': 6,
-  'process-cpu': 7,
-  marker: 8,
+  ipc: 2,
+  thread: 3,
+  'event-delay': 4,
+  marker: 5,
 };
 
 const GLOBAL_TRACK_INDEX_ORDER = {
@@ -103,6 +97,27 @@ function _getDefaultLocalTrackOrder(
   const naturalSort = new Intl.Collator('en-US', { numeric: true });
   // In place sort!
   trackOrder.sort((a, b) => {
+    // Tie-break between two counter tracks using their display.sortWeight.
+    // Cross-type ordering is handled below by LOCAL_TRACK_DISPLAY_ORDER.
+    if (
+      tracks[a].type === 'counter' &&
+      tracks[b].type === 'counter' &&
+      profile &&
+      profile.counters
+    ) {
+      if (profile.meta.keepProfileThreadOrder) {
+        return tracks[a].counterIndex - tracks[b].counterIndex;
+      }
+      const counterA = profile.counters[tracks[a].counterIndex];
+      const counterB = profile.counters[tracks[b].counterIndex];
+      const sortWeightDiff =
+        counterA.display.sortWeight - counterB.display.sortWeight;
+      if (sortWeightDiff !== 0) {
+        return sortWeightDiff;
+      }
+      return naturalSort.compare(counterA.name, counterB.name);
+    }
+
     if (
       tracks[a].type === 'thread' &&
       tracks[b].type === 'ipc' &&
@@ -123,22 +138,6 @@ function _getDefaultLocalTrackOrder(
       return 1;
     }
 
-    if (
-      profile &&
-      profile.counters &&
-      tracks[a].type === 'power' &&
-      tracks[b].type === 'power'
-    ) {
-      const idxA = tracks[a].counterIndex;
-      const idxB = tracks[b].counterIndex;
-      if (profile.meta.keepProfileThreadOrder) {
-        return idxA - idxB;
-      }
-      const nameA = profile.counters[idxA].name;
-      const nameB = profile.counters[idxB].name;
-      return naturalSort.compare(nameA, nameB);
-    }
-
     // If the tracks are both threads, sort them by thread name, and then by
     // creation time if they have the same name.
     if (tracks[a].type === 'thread' && tracks[b].type === 'thread' && profile) {
@@ -400,30 +399,24 @@ export function computeLocalTracksByPid(
   const { counters } = profile;
   if (counters) {
     for (let counterIndex = 0; counterIndex < counters.length; counterIndex++) {
-      const { pid, category, samples } = counters[counterIndex];
+      const { pid, category, name } = counters[counterIndex];
       if (!availablePids.has(pid)) {
         // If the global track is filtered out ignore it here too.
         continue;
       }
 
-      if (['Memory', 'power', 'Bandwidth'].includes(category)) {
-        if (category === 'power' && samples.length <= 2) {
-          // If we have only 2 samples, they are likely both 0 and we don't have a real counter.
-          continue;
-        }
-        let tracks = localTracksByPid.get(pid);
-        if (tracks === undefined) {
-          tracks = [];
-          localTracksByPid.set(pid, tracks);
-        }
-        if (category === 'Memory') {
-          tracks.push({ type: 'memory', counterIndex });
-        } else if (category === 'Bandwidth') {
-          tracks.push({ type: 'bandwidth', counterIndex });
-        } else {
-          tracks.push({ type: 'power', counterIndex });
-        }
+      // Skip processCPU counters — they are added separately by
+      // addProcessCPUTracksForProcess when the experimental flag is enabled.
+      if (category === 'CPU' && name === 'processCPU') {
+        continue;
+      }
+
+      let tracks = localTracksByPid.get(pid);
+      if (tracks === undefined) {
+        tracks = [];
+        localTracksByPid.set(pid, tracks);
       }
+      tracks.push({ type: 'counter', counterIndex });
     }
   }
 
@@ -496,7 +489,7 @@ export function addProcessCPUTracksForProcess(
     let localTracks = newLocalTracksByPid.get(pid) ?? [];
 
     // Do not mutate the current state.
-    localTracks = [...localTracks, { type: 'process-cpu', counterIndex }];
+    localTracks = [...localTracks, { type: 'counter', counterIndex }];
     newLocalTracksByPid.set(pid, localTracks);
   }
 
@@ -1116,10 +1109,10 @@ export function getLocalTrackName(
       return getFriendlyThreadName(threads, threads[localTrack.threadIndex]);
     case 'network':
       return 'Network';
-    case 'memory':
-      return 'Memory';
-    case 'bandwidth':
-      return 'Bandwidth';
+    case 'counter': {
+      const counter = counters[localTrack.counterIndex];
+      return counter.display.label || counter.name;
+    }
     case 'ipc':
       return `IPC — ${getFriendlyThreadName(
         threads,
@@ -1130,10 +1123,6 @@ export function getLocalTrackName(
         getFriendlyThreadName(threads, threads[localTrack.threadIndex]) +
         ' Event Delay'
       );
-    case 'process-cpu':
-      return 'Process CPU';
-    case 'power':
-      return counters[localTrack.counterIndex].name;
     case 'marker':
       return shared.stringArray[localTrack.markerName];
     default:
@@ -1577,14 +1566,18 @@ export function getSearchFilteredLocalTracksByPid(
           }
           break;
         }
+        case 'counter': {
+          const trackName = localTrackNames[trackIndex];
+          if (searchRegExp.test(trackName)) {
+            searchFilteredLocalTracks.add(trackIndex);
+            continue;
+          }
+          break;
+        }
         case 'network':
-        case 'memory':
-        case 'bandwidth':
         case 'marker':
         case 'ipc':
-        case 'event-delay':
-        case 'power':
-        case 'process-cpu': {
+        case 'event-delay': {
           const { type } = localTrack;
           if (searchRegExp.test(type)) {
             searchFilteredLocalTracks.add(trackIndex);
@@ -1762,7 +1755,8 @@ export function getTrackReferenceFromThreadIndex(
  * of them can be hidden to reduce the noise. This mostly depends on either the
  * usefulness or the activity of that track.
  *
- * TODO: Check the memory track activity here to decide if it should be visible.
+ * TODO: Check the counter track activity here to decide if it should be visible,
+ *   see https://github.com/firefox-devtools/profiler/issues/5967.
  */
 function _isLocalTrackVisible(
   localTrack: LocalTrack,
@@ -1774,15 +1768,10 @@ function _isLocalTrackVisible(
       return visibleThreadIndexes.has(localTrack.threadIndex);
     case 'marker':
     case 'network':
-    case 'memory':
-    case 'bandwidth':
-    // 'event-delay' and 'process-cpu' tracks are experimental and they should
-    // be visible by default whenever they are included in a profile. (fallthrough)
+    case 'counter':
+    // 'event-delay' track is experimental, and it should be visible by default
+    // whenever it is included in a profile. (fallthrough)
     case 'event-delay':
-    case 'process-cpu':
-    // Power tracks are there only if the power feature is enabled. So they should
-    // be visible by default whenever they're included in a profile. (fallthrough)
-    case 'power':
       // Keep non-thread local tracks visible.
       return true;
     case 'ipc':
diff --git a/src/selectors/app.tsx b/src/selectors/app.tsx
index ec78760d84..c477985be5 100644
--- a/src/selectors/app.tsx
+++ b/src/selectors/app.tsx
@@ -9,21 +9,20 @@ import {
   getHiddenGlobalTracks,
   getHiddenLocalTracksByPid,
 } from './url-state';
-import { getGlobalTracks, getLocalTracksByPid } from './profile';
+import { getGlobalTracks, getLocalTracksByPid, getCounters } from './profile';
 import { getZipFileState } from './zipped-profiles';
 import { assertExhaustiveCheck, ensureExists } from '../utils/types';
 import {
   FULL_TRACK_SCREENSHOT_HEIGHT,
   TRACK_NETWORK_HEIGHT,
-  TRACK_MEMORY_HEIGHT,
-  TRACK_BANDWIDTH_HEIGHT,
   TRACK_IPC_HEIGHT,
   TRACK_PROCESS_BLANK_HEIGHT,
   TIMELINE_RULER_HEIGHT,
   TRACK_VISUAL_PROGRESS_HEIGHT,
   TRACK_EVENT_DELAY_HEIGHT,
-  TRACK_PROCESS_CPU_HEIGHT,
   TRACK_MARKER_HEIGHT,
+  TRACK_COUNTER_GRAPH_HEIGHT,
+  TRACK_COUNTER_MARKERS_HEIGHT,
 } from '../app-logic/constants';
 
 import type {
@@ -104,12 +103,14 @@ export const getTimelineHeight: Selector<null | CssPixels> = createSelector(
   getHiddenGlobalTracks,
   getHiddenLocalTracksByPid,
   getTrackThreadHeights,
+  getCounters,
   (
     globalTracks,
     localTracksByPid,
     hiddenGlobalTracks,
     hiddenLocalTracksByPid,
-    trackThreadHeights
+    trackThreadHeights,
+    counters
   ) => {
     let height = TIMELINE_RULER_HEIGHT;
     const border = 1;
@@ -184,22 +185,22 @@ export const getTimelineHeight: Selector<null | CssPixels> = createSelector(
             case 'network':
               height += TRACK_NETWORK_HEIGHT + border;
               break;
-            case 'memory':
-              height += TRACK_MEMORY_HEIGHT + border;
-              break;
-            case 'bandwidth':
-              height += TRACK_BANDWIDTH_HEIGHT + border;
+            case 'counter': {
+              // Counter track height depends on whether the counter asks for
+              // markers to be rendered above the graph.
+              const counter = ensureExists(counters)[localTrack.counterIndex];
+              height += counter.display.markerSchemaLocation
+                ? TRACK_COUNTER_GRAPH_HEIGHT + TRACK_COUNTER_MARKERS_HEIGHT
+                : TRACK_COUNTER_GRAPH_HEIGHT;
+              height += border;
               break;
+            }
             case 'event-delay':
               height += TRACK_EVENT_DELAY_HEIGHT + border;
               break;
             case 'ipc':
               height += TRACK_IPC_HEIGHT + border;
               break;
-            case 'process-cpu':
-            case 'power':
-              height += TRACK_PROCESS_CPU_HEIGHT + border;
-              break;
             case 'marker':
               height += TRACK_MARKER_HEIGHT + border;
               break;
diff --git a/src/selectors/per-thread/markers.ts b/src/selectors/per-thread/markers.ts
index 8f083a15a7..27d5b86483 100644
--- a/src/selectors/per-thread/markers.ts
+++ b/src/selectors/per-thread/markers.ts
@@ -21,6 +21,7 @@ import type {
   MarkerIndex,
   Marker,
   MarkerSchema,
+  MarkerDisplayLocation,
   MarkerTiming,
   MarkerTimingAndBuckets,
   DerivedMarkerInfo,
@@ -492,29 +493,40 @@ export function getMarkerSelectorsPerThread(
     );
 
   /**
-   * This returns only memory markers.
-   */
-  const getTimelineMemoryMarkerIndexes: Selector<MarkerIndex[]> =
-    createSelector(
-      getMarkerGetter,
-      getCommittedRangeFilteredMarkerIndexes,
-      ProfileSelectors.getMarkerSchema,
-      ProfileSelectors.getMarkerSchemaByName,
-      () => 'timeline-memory' as const,
-      MarkerData.filterMarkerByDisplayLocation
-    );
+   * Returns markers for an arbitrary schema location. The inner selectors are
+   * memoized per location so repeated lookups with the same location reuse a
+   * single reselect instance.
+   */
+  const _timelineMarkerIndexesSelectorsBySchemaLocation: Map<
+    MarkerDisplayLocation,
+    Selector<MarkerIndex[]>
+  > = new Map();
+  const getTimelineMarkerIndexesBySchemaLocation = (
+    schemaLocation: MarkerDisplayLocation
+  ): Selector<MarkerIndex[]> => {
+    let selector =
+      _timelineMarkerIndexesSelectorsBySchemaLocation.get(schemaLocation);
+    if (selector === undefined) {
+      selector = createSelector(
+        getMarkerGetter,
+        getCommittedRangeFilteredMarkerIndexes,
+        ProfileSelectors.getMarkerSchema,
+        ProfileSelectors.getMarkerSchemaByName,
+        () => schemaLocation,
+        MarkerData.filterMarkerByDisplayLocation
+      );
+      _timelineMarkerIndexesSelectorsBySchemaLocation.set(
+        schemaLocation,
+        selector
+      );
+    }
+    return selector;
+  };
 
-  /**
-   * This returns only IPC markers.
-   */
-  const getTimelineIPCMarkerIndexes: Selector<MarkerIndex[]> = createSelector(
-    getMarkerGetter,
-    getCommittedRangeFilteredMarkerIndexes,
-    ProfileSelectors.getMarkerSchema,
-    ProfileSelectors.getMarkerSchemaByName,
-    () => 'timeline-ipc' as const,
-    MarkerData.filterMarkerByDisplayLocation
-  );
+  const getTimelineMemoryMarkerIndexes =
+    getTimelineMarkerIndexesBySchemaLocation('timeline-memory');
+  const getTimelineIPCMarkerIndexes =
+    getTimelineMarkerIndexesBySchemaLocation('timeline-ipc');
 
   /**
    * This organizes the network markers in rows so that they're nicely displayed
@@ -783,6 +795,7 @@ export function getMarkerSelectorsPerThread(
     getTimelineFileIoMarkerIndexes,
     getTimelineMemoryMarkerIndexes,
     getTimelineIPCMarkerIndexes,
+    getTimelineMarkerIndexesBySchemaLocation,
     getNetworkTrackTiming,
     getRangeFilteredScreenshotsById,
     getSearchFilteredMarkerIndexes,
diff --git a/src/selectors/profile.ts b/src/selectors/profile.ts
index 4661385abd..331b27ed6f 100644
--- a/src/selectors/profile.ts
+++ b/src/selectors/profile.ts
@@ -555,10 +555,17 @@ export const getLocalTrackFromReference: DangerousSelectorWithArguments<
  */
 export const getProcessesWithMemoryTrack: Selector<Set<Pid>> = createSelector(
   getLocalTracksByPid,
-  (localTracksByPid) => {
+  getCounters,
+  (localTracksByPid, counters) => {
     const processesWithMemoryTrack = new Set<Pid>();
     for (const [pid, localTracks] of localTracksByPid.entries()) {
-      if (localTracks.some((track) => track.type === 'memory')) {
+      if (
+        localTracks.some(
+          (track) =>
+            track.type === 'counter' &&
+            ensureExists(counters)[track.counterIndex].category === 'Memory'
+        )
+      ) {
         processesWithMemoryTrack.add(pid);
       }
     }
diff --git a/src/test/components/TrackBandwidth.test.tsx b/src/test/components/TrackBandwidth.test.tsx
index 609fb05856..f019d06bb5 100644
--- a/src/test/components/TrackBandwidth.test.tsx
+++ b/src/test/components/TrackBandwidth.test.tsx
@@ -13,7 +13,7 @@ import {
 } from 'firefox-profiler/test/fixtures/testing-library';
 
 import { updatePreviewSelection } from 'firefox-profiler/actions/profile-view';
-import { TrackBandwidth } from '../../components/timeline/TrackBandwidth';
+import { TrackCounter } from '../../components/timeline/TrackCounter';
 import { ensureExists } from '../../utils/types';
 
 import {
@@ -79,11 +79,15 @@ describe('TrackBandwidth', function () {
         length: SAMPLE_COUNT,
       },
       'SystemBandwidth',
-      'bandwidth'
+      'Bandwidth'
     );
     counter.display = {
       ...counter.display,
+      graphType: 'line-rate',
+      unit: 'bytes',
       color: 'blue',
+      sortWeight: 10,
+      label: 'Bandwidth',
     };
     profile.counters = [counter];
     const store = storeWithProfile(profile);
@@ -92,7 +96,7 @@ describe('TrackBandwidth', function () {
 
     const renderResult = render(
       <Provider store={store}>
-        <TrackBandwidth counterIndex={0} />
+        <TrackCounter counterIndex={0} />
       </Provider>
     );
     const { container } = renderResult;
@@ -101,13 +105,13 @@ describe('TrackBandwidth', function () {
     flushRafCalls();
 
     const canvas = ensureExists(
-      container.querySelector('.timelineTrackBandwidthCanvas'),
-      `Couldn't find the bandwidth canvas, with selector .timelineTrackBandwidthCanvas`
+      container.querySelector('.timelineTrackCounterCanvas'),
+      `Couldn't find the bandwidth canvas, with selector .timelineTrackCounterCanvas`
     );
     const getTooltipContents = () =>
-      document.querySelector('.timelineTrackBandwidthTooltip');
+      document.querySelector('.timelineTrackCounterTooltip');
     const getBandwidthDot = () =>
-      container.querySelector('.timelineTrackBandwidthGraphDot');
+      container.querySelector('.timelineTrackCounterGraphDot');
     const moveMouseAtCounter = (index: number, pos: number) =>
       fireEvent(
         canvas,
diff --git a/src/test/components/TrackMemory.test.tsx b/src/test/components/TrackMemory.test.tsx
index add3f14fea..757293cd48 100644
--- a/src/test/components/TrackMemory.test.tsx
+++ b/src/test/components/TrackMemory.test.tsx
@@ -7,7 +7,7 @@ import { Provider } from 'react-redux';
 import { fireEvent } from '@testing-library/react';
 
 import { render } from 'firefox-profiler/test/fixtures/testing-library';
-import { TrackMemory } from '../../components/timeline/TrackMemory';
+import { TrackCounter } from '../../components/timeline/TrackCounter';
 import { ensureExists } from '../../utils/types';
 
 import {
@@ -64,9 +64,15 @@ describe('TrackMemory', function () {
     const threadIndex = 0;
     const thread = profile.threads[threadIndex];
     const counter = getCounterForThread(thread, threadIndex, counterConfig);
+    counter.category = 'Memory';
     counter.display = {
       ...counter.display,
+      graphType: 'line-accumulated',
+      unit: 'bytes',
       color: 'orange',
+      markerSchemaLocation: 'timeline-memory',
+      sortWeight: 20,
+      label: 'Memory',
     };
     profile.counters = [counter];
     const store = storeWithProfile(profile);
@@ -75,7 +81,7 @@ describe('TrackMemory', function () {
 
     const renderResult = render(
       <Provider store={store}>
-        <TrackMemory counterIndex={0} />
+        <TrackCounter counterIndex={0} />
       </Provider>
     );
     const { container } = renderResult;
@@ -84,13 +90,13 @@ describe('TrackMemory', function () {
     flushRafCalls();
 
     const canvas = ensureExists(
-      container.querySelector('.timelineTrackMemoryCanvas'),
-      `Couldn't find the memory canvas, with selector .timelineTrackMemoryCanvas`
+      container.querySelector('.timelineTrackCounterCanvas'),
+      `Couldn't find the memory canvas, with selector .timelineTrackCounterCanvas`
     );
     const getTooltipContents = () =>
-      document.querySelector('.timelineTrackMemoryTooltip');
+      document.querySelector('.timelineTrackCounterTooltip');
     const getMemoryDot = () =>
-      container.querySelector('.timelineTrackMemoryGraphDot');
+      container.querySelector('.timelineTrackCounterGraphDot');
     const moveMouseAtCounter = (index: number, pos: number) =>
       fireEvent(
         canvas,
@@ -197,7 +203,7 @@ describe('TrackMemory with intersection observer', function () {
 
     const renderResult = render(
       <Provider store={store}>
-        <TrackMemory counterIndex={0} />
+        <TrackCounter counterIndex={0} />
       </Provider>
     );
 
diff --git a/src/test/components/TrackPower.test.tsx b/src/test/components/TrackPower.test.tsx
index 402180cec9..c952a33f35 100644
--- a/src/test/components/TrackPower.test.tsx
+++ b/src/test/components/TrackPower.test.tsx
@@ -9,7 +9,7 @@ import { fireEvent } from '@testing-library/react';
 import { render, screen } from 'firefox-profiler/test/fixtures/testing-library';
 
 import { updatePreviewSelection } from 'firefox-profiler/actions/profile-view';
-import { TrackPower } from '../../components/timeline/TrackPower';
+import { TrackCounter } from '../../components/timeline/TrackCounter';
 import { ensureExists } from '../../utils/types';
 
 import {
@@ -62,30 +62,36 @@ describe('TrackPower', function () {
     for (let i = 7; i < sampleTimes.length - 1; ++i) {
       sampleTimes[i] = 7 + i / 100;
     }
-    profile.counters = [
-      getCounterForThreadWithSamples(
-        thread,
-        threadIndex,
-        {
-          time: sampleTimes.slice(),
-          // Power usage numbers. They are pWh so they are pretty big.
-          count: [
-            10000, 40000, 50000, 100000, 2000000, 5000000, 30000, 1000000,
-            20000, 1, 12000, 100000,
-          ],
-          length: SAMPLE_COUNT,
-        },
-        'SystemPower',
-        'power'
-      ),
-    ];
+    const counter = getCounterForThreadWithSamples(
+      thread,
+      threadIndex,
+      {
+        time: sampleTimes.slice(),
+        // Power usage numbers. They are pWh so they are pretty big.
+        count: [
+          10000, 40000, 50000, 100000, 2000000, 5000000, 30000, 1000000, 20000,
+          1, 12000, 100000,
+        ],
+        length: SAMPLE_COUNT,
+      },
+      'SystemPower',
+      'power'
+    );
+    counter.display = {
+      ...counter.display,
+      graphType: 'line-rate',
+      unit: 'pWh',
+      sortWeight: 30,
+      label: 'SystemPower',
+    };
+    profile.counters = [counter];
     const store = storeWithProfile(profile);
     const { getState, dispatch } = store;
     const flushRafCalls = mockRaf();
 
     const renderResult = render(
       <Provider store={store}>
-        <TrackPower counterIndex={0} />
+        <TrackCounter counterIndex={0} />
       </Provider>
     );
     const { container } = renderResult;
@@ -94,13 +100,13 @@ describe('TrackPower', function () {
     flushRafCalls();
 
     const canvas = ensureExists(
-      container.querySelector('.timelineTrackPowerCanvas'),
-      `Couldn't find the power canvas, with selector .timelineTrackPowerCanvas`
+      container.querySelector('.timelineTrackCounterCanvas'),
+      `Couldn't find the power canvas, with selector .timelineTrackCounterCanvas`
     );
     const getTooltipContents = () =>
       document.querySelector('.timelineTrackPowerTooltip');
     const getPowerDot = () =>
-      container.querySelector('.timelineTrackPowerGraphDot');
+      container.querySelector('.timelineTrackCounterGraphDot');
     const moveMouseAtCounter = (index: number, pos: number) =>
       fireEvent(
         canvas,
diff --git a/src/test/components/TrackProcessCPU.test.tsx b/src/test/components/TrackProcessCPU.test.tsx
index 0fc742f5e4..9772159547 100644
--- a/src/test/components/TrackProcessCPU.test.tsx
+++ b/src/test/components/TrackProcessCPU.test.tsx
@@ -7,7 +7,7 @@ import { Provider } from 'react-redux';
 import { fireEvent } from '@testing-library/react';
 
 import { render, screen } from 'firefox-profiler/test/fixtures/testing-library';
-import { TrackProcessCPU } from '../../components/timeline/TrackProcessCPU';
+import { TrackCounter } from '../../components/timeline/TrackCounter';
 import { ensureExists } from '../../utils/types';
 
 import {
@@ -55,27 +55,33 @@ describe('TrackProcessCPU', function () {
     const sampleTimes = ensureExists(thread.samples.time);
     // Changing one of the sample times, so we can test different intervals.
     sampleTimes[1] = 1.5; // It was 1 before.
-    profile.counters = [
-      getCounterForThreadWithSamples(
-        thread,
-        threadIndex,
-        {
-          time: sampleTimes.slice(),
-          // CPU usage numbers for the per-process CPU.
-          count: [100, 400, 500, 1000, 200, 500, 300, 100],
-          length: SAMPLE_COUNT,
-        },
-        'processCPU',
-        'CPU'
-      ),
-    ];
+    const counter = getCounterForThreadWithSamples(
+      thread,
+      threadIndex,
+      {
+        time: sampleTimes.slice(),
+        // CPU usage numbers for the per-process CPU.
+        count: [100, 400, 500, 1000, 200, 500, 300, 100],
+        length: SAMPLE_COUNT,
+      },
+      'processCPU',
+      'CPU'
+    );
+    counter.display = {
+      ...counter.display,
+      graphType: 'line-rate',
+      unit: 'percent',
+      sortWeight: 70,
+      label: 'Process CPU',
+    };
+    profile.counters = [counter];
     const store = storeWithProfile(profile);
     const { getState, dispatch } = store;
     const flushRafCalls = mockRaf();
 
     const renderResult = render(
       <Provider store={store}>
-        <TrackProcessCPU counterIndex={0} />
+        <TrackCounter counterIndex={0} />
       </Provider>
     );
     const { container } = renderResult;
@@ -84,13 +90,13 @@ describe('TrackProcessCPU', function () {
     flushRafCalls();
 
     const canvas = ensureExists(
-      container.querySelector('.timelineTrackProcessCPUCanvas'),
-      `Couldn't find the process CPU canvas, with selector .timelineTrackProcessCPUCanvas`
+      container.querySelector('.timelineTrackCounterCanvas'),
+      `Couldn't find the process CPU canvas, with selector .timelineTrackCounterCanvas`
     );
     const getTooltipContents = () =>
-      document.querySelector('.timelineTrackProcessCPUTooltip');
+      document.querySelector('.timelineTrackCounterTooltip');
     const getProcessCPUDot = () =>
-      container.querySelector('.timelineTrackProcessCPUGraphDot');
+      container.querySelector('.timelineTrackCounterGraphDot');
     const moveMouseAtCounter = (index: number, pos: number) =>
       fireEvent(
         canvas,
diff --git a/src/test/components/__snapshots__/LocalTrack.test.tsx.snap b/src/test/components/__snapshots__/LocalTrack.test.tsx.snap
index f1c568e5db..6247499fde 100644
--- a/src/test/components/__snapshots__/LocalTrack.test.tsx.snap
+++ b/src/test/components/__snapshots__/LocalTrack.test.tsx.snap
@@ -27,12 +27,12 @@ exports[`timeline/LocalTrack with a memory track matches the snapshot of the mem
       class="timelineTrackTrack"
     >
       <div
-        class="timelineTrackMemory"
-        style="height: 40px; --graph-height: 25px; --markers-height: 15px;"
+        class="timelineTrackCounter"
+        style="--graph-height: 25px; --markers-height: 15px;"
       >
         <div
-          class="timelineMarkers timelineMarkersMemory"
-          data-testid="TimelineMarkersMemory"
+          class="timelineMarkers timelineMarkersCounter"
+          data-testid="TimelineMarkersCounter"
         >
           <div
             class="react-contextmenu-wrapper"
@@ -47,11 +47,11 @@ exports[`timeline/LocalTrack with a memory track matches the snapshot of the mem
           </div>
         </div>
         <div
-          class="timelineTrackMemoryGraph"
+          class="timelineTrackCounterGraph"
         >
           <div>
             <canvas
-              class="timelineTrackMemoryCanvas"
+              class="timelineTrackCounterCanvas"
               height="25"
               width="400"
             />
diff --git a/src/test/components/__snapshots__/TrackBandwidth.test.tsx.snap b/src/test/components/__snapshots__/TrackBandwidth.test.tsx.snap
index 26028f6e40..0af9de7c48 100644
--- a/src/test/components/__snapshots__/TrackBandwidth.test.tsx.snap
+++ b/src/test/components/__snapshots__/TrackBandwidth.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`TrackBandwidth draws a dot that matches the snapshot 1`] = `
 <div
-  class="timelineTrackBandwidthGraphDot"
+  class="timelineTrackCounterGraphDot"
   style="left: 15px; top: 24.872px; background-color: rgb(0, 96, 223);"
 />
 `;
@@ -121,15 +121,15 @@ Array [
 
 exports[`TrackBandwidth matches the component snapshot 1`] = `
 <div
-  class="timelineTrackBandwidth"
-  style="height: 25px; --graph-height: 25px;"
+  class="timelineTrackCounter"
+  style="--graph-height: 25px; --markers-height: 15px;"
 >
   <div
-    class="timelineTrackBandwidthGraph"
+    class="timelineTrackCounterGraph"
   >
     <div>
       <canvas
-        class="timelineTrackBandwidthCanvas"
+        class="timelineTrackCounterCanvas"
         height="25"
         width="120"
       />
diff --git a/src/test/components/__snapshots__/TrackMemory.test.tsx.snap b/src/test/components/__snapshots__/TrackMemory.test.tsx.snap
index 60376ab22d..77575f665c 100644
--- a/src/test/components/__snapshots__/TrackMemory.test.tsx.snap
+++ b/src/test/components/__snapshots__/TrackMemory.test.tsx.snap
@@ -2,40 +2,40 @@
 
 exports[`TrackMemory draws a dot that matches the snapshot 1`] = `
 <div
-  class="timelineTrackMemoryGraphDot"
+  class="timelineTrackCounterGraphDot"
   style="left: 20px; top: 2.697563250235465px; background-color: rgb(215, 110, 0);"
 />
 `;
 
 exports[`TrackMemory has a tooltip that matches the snapshot 1`] = `
 <div
-  class="timelineTrackMemoryTooltip"
+  class="timelineTrackCounterTooltip"
 >
   <div
-    class="timelineTrackMemoryTooltipLine"
+    class="timelineTrackCounterTooltipLine"
   >
     <span
-      class="timelineTrackMemoryTooltipNumber"
+      class="timelineTrackCounterTooltipNumber"
     >
       0B
     </span>
     relative memory at this time
   </div>
   <div
-    class="timelineTrackMemoryTooltipLine"
+    class="timelineTrackCounterTooltipLine"
   >
     <span
-      class="timelineTrackMemoryTooltipNumber"
+      class="timelineTrackCounterTooltipNumber"
     >
       2B
     </span>
     memory range in graph
   </div>
   <div
-    class="timelineTrackMemoryTooltipLine"
+    class="timelineTrackCounterTooltipLine"
   >
     <span
-      class="timelineTrackMemoryTooltipNumber"
+      class="timelineTrackCounterTooltipNumber"
     >
       36
     </span>
@@ -46,23 +46,23 @@ exports[`TrackMemory has a tooltip that matches the snapshot 1`] = `
 
 exports[`TrackMemory has a tooltip that matches the snapshot for counts equalling zero 1`] = `
 <div
-  class="timelineTrackMemoryTooltip"
+  class="timelineTrackCounterTooltip"
 >
   <div
-    class="timelineTrackMemoryTooltipLine"
+    class="timelineTrackCounterTooltipLine"
   >
     <span
-      class="timelineTrackMemoryTooltipNumber"
+      class="timelineTrackCounterTooltipNumber"
     >
       0B
     </span>
     relative memory at this time
   </div>
   <div
-    class="timelineTrackMemoryTooltipLine"
+    class="timelineTrackCounterTooltipLine"
   >
     <span
-      class="timelineTrackMemoryTooltipNumber"
+      class="timelineTrackCounterTooltipNumber"
     >
       2B
     </span>
@@ -182,12 +182,12 @@ Array [
 
 exports[`TrackMemory matches the component snapshot 1`] = `
 <div
-  class="timelineTrackMemory"
-  style="height: 40px; --graph-height: 25px; --markers-height: 15px;"
+  class="timelineTrackCounter"
+  style="--graph-height: 25px; --markers-height: 15px;"
 >
   <div
-    class="timelineMarkers timelineMarkersMemory selected"
-    data-testid="TimelineMarkersMemory"
+    class="timelineMarkers timelineMarkersCounter selected"
+    data-testid="TimelineMarkersCounter"
   >
     <div
       class="react-contextmenu-wrapper"
@@ -202,11 +202,11 @@ exports[`TrackMemory matches the component snapshot 1`] = `
     </div>
   </div>
   <div
-    class="timelineTrackMemoryGraph"
+    class="timelineTrackCounterGraph"
   >
     <div>
       <canvas
-        class="timelineTrackMemoryCanvas"
+        class="timelineTrackCounterCanvas"
         height="25"
         width="80"
       />
diff --git a/src/test/components/__snapshots__/TrackPower.test.tsx.snap b/src/test/components/__snapshots__/TrackPower.test.tsx.snap
index 7d6bb71bb8..d0285e6d0f 100644
--- a/src/test/components/__snapshots__/TrackPower.test.tsx.snap
+++ b/src/test/components/__snapshots__/TrackPower.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`TrackPower draws a dot that matches the snapshot 1`] = `
 <div
-  class="timelineTrackPowerGraphDot"
+  class="timelineTrackCounterGraphDot"
   style="left: 15px; top: 24.872px; background-color: rgb(74, 74, 79);"
 />
 `;
@@ -68,22 +68,22 @@ Array [
   Array [
     "lineTo",
     15,
-    24,
+    23.877333333333333,
   ],
   Array [
     "lineTo",
     20,
-    24,
+    23.54,
   ],
   Array [
     "lineTo",
     30,
-    24,
+    23.54,
   ],
   Array [
     "lineTo",
     40,
-    15,
+    14.799999999999999,
   ],
   Array [
     "lineTo",
@@ -93,37 +93,37 @@ Array [
   Array [
     "lineTo",
     60,
-    24,
+    23.862,
   ],
   Array [
     "lineTo",
     71,
-    20,
+    19.700934579439256,
   ],
   Array [
     "lineTo",
     71,
-    24,
+    23.99954,
   ],
   Array [
     "lineTo",
     71,
-    15,
+    14.799999999999804,
   ],
   Array [
     "lineTo",
     71,
-    18,
+    18.479999999999883,
   ],
   Array [
     "lineTo",
     110,
-    24,
+    23.882051282051282,
   ],
   Array [
     "lineTo",
     120,
-    24,
+    23.882051282051282,
   ],
   Array [
     "stroke",
@@ -146,15 +146,15 @@ Array [
 
 exports[`TrackPower matches the component snapshot 1`] = `
 <div
-  class="timelineTrackPower"
-  style="height: 25px; --graph-height: 25px;"
+  class="timelineTrackCounter"
+  style="--graph-height: 25px; --markers-height: 15px;"
 >
   <div
-    class="timelineTrackPowerGraph"
+    class="timelineTrackCounterGraph"
   >
     <div>
       <canvas
-        class="timelineTrackPowerCanvas"
+        class="timelineTrackCounterCanvas"
         height="25"
         width="120"
       />
diff --git a/src/test/components/__snapshots__/TrackProcessCPU.test.tsx.snap b/src/test/components/__snapshots__/TrackProcessCPU.test.tsx.snap
index c5adef80e4..a5cbda9940 100644
--- a/src/test/components/__snapshots__/TrackProcessCPU.test.tsx.snap
+++ b/src/test/components/__snapshots__/TrackProcessCPU.test.tsx.snap
@@ -2,22 +2,22 @@
 
 exports[`TrackProcessCPU draws a dot that matches the snapshot 1`] = `
 <div
-  class="timelineTrackProcessCPUGraphDot"
-  style="left: 15px; top: 18.6px;"
+  class="timelineTrackCounterGraphDot"
+  style="left: 15px; top: 18.6px; background-color: rgb(74, 74, 79);"
 />
 `;
 
 exports[`TrackProcessCPU has a tooltip that matches the snapshot 1`] = `
 <div
-  class="timelineTrackProcessCPUTooltip"
+  class="timelineTrackCounterTooltip"
 >
   <div
-    class="timelineTrackProcessCPUTooltipLine"
+    class="timelineTrackCounterTooltipLine"
   >
     CPU:
      
     <span
-      class="timelineTrackProcessCPUTooltipNumber"
+      class="timelineTrackCounterTooltipNumber"
     >
       50%
     </span>
@@ -56,7 +56,7 @@ Array [
   Array [
     "moveTo",
     0,
-    24,
+    26,
   ],
   Array [
     "lineTo",
@@ -119,17 +119,19 @@ Array [
 
 exports[`TrackProcessCPU matches the component snapshot 1`] = `
 <div
-  class="timelineTrackProcessCPU"
-  style="height: 25px; --graph-height: 25px;"
+  class="timelineTrackCounter"
+  style="--graph-height: 25px; --markers-height: 15px;"
 >
   <div
-    class="timelineTrackProcessCPUGraph"
+    class="timelineTrackCounterGraph"
   >
-    <canvas
-      class="timelineTrackProcessCPUCanvas"
-      height="25"
-      width="80"
-    />
+    <div>
+      <canvas
+        class="timelineTrackCounterCanvas"
+        height="25"
+        width="80"
+      />
+    </div>
     <div
       class="timelineEmptyThreadIndicator"
     />
diff --git a/src/test/fixtures/profiles/tracks.ts b/src/test/fixtures/profiles/tracks.ts
index ae23c71340..88df189e41 100644
--- a/src/test/fixtures/profiles/tracks.ts
+++ b/src/test/fixtures/profiles/tracks.ts
@@ -88,22 +88,11 @@ export function getHumanReadableTracks(state: State): string[] {
       for (const trackIndex of trackOrder) {
         const track = tracks[trackIndex];
         let trackName;
-        if (track.type === 'memory') {
-          trackName = profileViewSelectors
+        if (track.type === 'counter') {
+          const counter = profileViewSelectors
             .getCounterSelectors(track.counterIndex)
-            .getPid(state);
-        } else if (track.type === 'bandwidth') {
-          trackName = profileViewSelectors
-            .getCounterSelectors(track.counterIndex)
-            .getPid(state);
-        } else if (track.type === 'process-cpu') {
-          trackName = profileViewSelectors
-            .getCounterSelectors(track.counterIndex)
-            .getPid(state);
-        } else if (track.type === 'power') {
-          trackName = profileViewSelectors
-            .getCounterSelectors(track.counterIndex)
-            .getCounter(state).name;
+            .getCounter(state);
+          trackName = counter.display.label || counter.name;
         } else if (track.type === 'marker') {
           trackName = stringArray[track.markerName];
         } else {
@@ -297,6 +286,15 @@ export function getStoreWithMemoryTrack(pid: Pid = '222') {
     thread.pid = pid;
     const counter = getCounterForThread(thread, threadIndex);
     counter.category = 'Memory';
+    counter.display = {
+      ...counter.display,
+      graphType: 'line-accumulated',
+      unit: 'bytes',
+      color: 'orange',
+      markerSchemaLocation: 'timeline-memory',
+      sortWeight: 20,
+      label: 'Memory',
+    };
     profile.counters = [counter];
   }
 
@@ -306,8 +304,8 @@ export function getStoreWithMemoryTrack(pid: Pid = '222') {
     trackReference
   );
 
-  if (localTrack.type !== 'memory') {
-    throw new Error('Expected a memory track.');
+  if (localTrack.type !== 'counter') {
+    throw new Error('Expected a counter track.');
   }
   return { store, ...store, profile, trackReference, localTrack, threadIndex };
 }
diff --git a/src/test/store/profile-view.test.ts b/src/test/store/profile-view.test.ts
index 7ca08b5fbb..2b830e08c5 100644
--- a/src/test/store/profile-view.test.ts
+++ b/src/test/store/profile-view.test.ts
@@ -512,8 +512,8 @@ describe('actions/ProfileView', function () {
             store.getState(),
             memoryTrackReference
           );
-          if (memoryTrack.type !== 'memory') {
-            throw new Error('Expected to get memory track.');
+          if (memoryTrack.type !== 'counter') {
+            throw new Error('Expected to get counter track.');
           }
         }
 
diff --git a/src/test/url-handling.test.ts b/src/test/url-handling.test.ts
index ae1a987eb9..30abd56b90 100644
--- a/src/test/url-handling.test.ts
+++ b/src/test/url-handling.test.ts
@@ -52,6 +52,7 @@ import {
 import {
   getProfileFromTextSamples,
   getProfileWithMarkers,
+  getCounterForThread,
 } from './fixtures/profiles/processed-profile';
 import { selectedThreadSelectors } from '../selectors/per-thread';
 import {
@@ -1279,6 +1280,142 @@ describe('url upgrading', function () {
     });
   });
 
+  describe('version 16: collapse counter track types into a single counter type', function () {
+    // Build a profile whose pid '222' has one main thread with an IPC marker and
+    // three counters (Memory, power, Bandwidth). This exercises the v16 upgrader:
+    // under the pre-v16 LOCAL_TRACK_INDEX_ORDER the ipc track sat between
+    // 'memory' (slot 2) and 'power' (slot 6), which no longer holds now that all
+    // counters share slot 2.
+    function buildCounterProfile() {
+      const { profile } = getProfileFromTextSamples('A  B  C  D  E');
+      const mainThread = profile.threads[0];
+      mainThread.pid = '222';
+      mainThread.name = 'GeckoMain';
+      mainThread.isMainThread = true;
+      mainThread.processType = 'tab';
+
+      // Push a single IPC marker onto the main thread. The upgrader only
+      // checks markers.data[i].type === 'IPC', so a minimal payload is enough.
+      const stringTable = StringTable.withBackingArray(
+        profile.shared.stringArray
+      );
+      mainThread.markers.name.push(stringTable.indexForString('IPC'));
+      mainThread.markers.phase.push(0);
+      mainThread.markers.startTime.push(0);
+      mainThread.markers.endTime.push(null);
+      mainThread.markers.category.push(0);
+      mainThread.markers.data.push({
+        type: 'IPC',
+        startTime: 0,
+        endTime: 1,
+        otherPid: '333',
+        messageSeqno: 1,
+        messageType: 'Foo',
+        side: 'parent',
+        direction: 'sending',
+        phase: 'endpoint',
+        sync: false,
+      } as any);
+      mainThread.markers.length++;
+
+      const memoryCounter = getCounterForThread(mainThread, 0);
+      memoryCounter.category = 'Memory';
+      memoryCounter.name = 'Memory';
+      const powerCounter = getCounterForThread(mainThread, 0);
+      powerCounter.category = 'power';
+      powerCounter.name = 'Power';
+      const bandwidthCounter = getCounterForThread(mainThread, 0);
+      bandwidthCounter.category = 'Bandwidth';
+      bandwidthCounter.name = 'Bandwidth';
+      profile.counters = [memoryCounter, powerCounter, bandwidthCounter];
+
+      return profile;
+    }
+
+    it('remaps localTrackOrderByPid when counter tracks change position', function () {
+      const profile = buildCounterProfile();
+
+      // Pre-v16 layout for pid '222' (sorted by old LOCAL_TRACK_INDEX_ORDER):
+      //   [0] memory    (slot 2)
+      //   [1] ipc       (slot 3)
+      //   [2] power     (slot 6)
+      //   [3] bandwidth (slot 8)
+      const oldOrder = [3, 2, 1, 0];
+
+      // Post-v16 layout: counters grouped at slot 2, ipc at slot 3.
+      //   [0] memory    (counter, insertion order)
+      //   [1] power     (counter)
+      //   [2] bandwidth (counter)
+      //   [3] ipc
+      const expectedNewOrder = [2, 1, 3, 0];
+
+      const { query } = upgradeLocationToCurrentVersion(
+        {
+          pathname: '',
+          hash: '',
+          query: {
+            v: '15',
+            localTrackOrderByPid:
+              '222-' + encodeUintArrayForUrlComponent(oldOrder),
+          },
+        },
+        profile
+      );
+
+      expect(query.localTrackOrderByPid).toBe(
+        '222-' + encodeUintArrayForUrlComponent(expectedNewOrder)
+      );
+    });
+
+    it('remaps hiddenLocalTracksByPid when counter tracks change position', function () {
+      const profile = buildCounterProfile();
+
+      // Hide the old 'ipc' (index 1) and old 'bandwidth' (index 3).
+      const oldHidden = new Set([1, 3]);
+      // In the new layout those tracks live at indexes 3 (ipc) and 2 (bandwidth).
+      const expectedNewHidden = new Set([3, 2]);
+
+      const { query } = upgradeLocationToCurrentVersion(
+        {
+          pathname: '',
+          hash: '',
+          query: {
+            v: '15',
+            hiddenLocalTracksByPid:
+              '222-' + encodeUintSetForUrlComponent(oldHidden),
+          },
+        },
+        profile
+      );
+
+      expect(query.hiddenLocalTracksByPid).toBe(
+        '222-' + encodeUintSetForUrlComponent(expectedNewHidden)
+      );
+    });
+
+    it('leaves unrelated PIDs untouched', function () {
+      const profile = buildCounterProfile();
+
+      // pid '999' isn't in the profile, so the upgrader has nothing to remap
+      // for it and should leave the segment as-is.
+      const untouched = '999-' + encodeUintArrayForUrlComponent([1, 0]);
+
+      const { query } = upgradeLocationToCurrentVersion(
+        {
+          pathname: '',
+          hash: '',
+          query: {
+            v: '15',
+            localTrackOrderByPid: untouched,
+          },
+        },
+        profile
+      );
+
+      expect(query.localTrackOrderByPid).toBe(untouched);
+    });
+  });
+
   // More general checks
   it("won't run if the current version is specified", function () {
     const { getState } = _getStoreWithURL({
diff --git a/src/types/profile-derived.ts b/src/types/profile-derived.ts
index b634b0e876..cc641fbe78 100644
--- a/src/types/profile-derived.ts
+++ b/src/types/profile-derived.ts
@@ -634,12 +634,9 @@ export type GlobalTrack =
 export type LocalTrack =
   | { readonly type: 'thread'; readonly threadIndex: ThreadIndex }
   | { readonly type: 'network'; readonly threadIndex: ThreadIndex }
-  | { readonly type: 'memory'; readonly counterIndex: CounterIndex }
-  | { readonly type: 'bandwidth'; readonly counterIndex: CounterIndex }
+  | { readonly type: 'counter'; readonly counterIndex: CounterIndex }
   | { readonly type: 'ipc'; readonly threadIndex: ThreadIndex }
   | { readonly type: 'event-delay'; readonly threadIndex: ThreadIndex }
-  | { readonly type: 'process-cpu'; readonly counterIndex: CounterIndex }
-  | { readonly type: 'power'; readonly counterIndex: CounterIndex }
   | {
       readonly type: 'marker';
       readonly threadIndex: ThreadIndex;
diff --git a/src/types/profile.ts b/src/types/profile.ts
index a4072ca72e..04d8a2ee79 100644
--- a/src/types/profile.ts
+++ b/src/types/profile.ts
@@ -3,7 +3,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import type { Milliseconds, Address, Microseconds, Bytes } from './units';
-import type { MarkerPayload, MarkerSchema, MarkerFormatType } from './markers';
+import type {
+  MarkerPayload,
+  MarkerSchema,
+  MarkerFormatType,
+  MarkerDisplayLocation,
+} from './markers';
 import type { MarkerPhase, ProfilingLog } from './gecko-profile';
 
 export type IndexIntoStackTable = number;
@@ -540,7 +545,7 @@ export type CounterDisplayConfig = {
   color: GraphColor;
   // The marker schema display location to filter markers for this track,
   // e.g., "timeline-memory". If null, no markers are shown.
-  markerSchemaLocation: string | null;
+  markerSchemaLocation: MarkerDisplayLocation | null;
   // Controls the default display position of this counter track relative to
   // other tracks. Tracks with lower values appear closer to the top.
   sortWeight: number;

From 506473ddca1fe826b34f0c12a07175bfad895418 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Tue, 28 Apr 2026 05:40:34 +0000
Subject: [PATCH 57/64] Pontoon/Firefox Profiler: Update Dutch (nl)

Co-authored-by: Mark Heijl <markh@babelzilla.org> (nl)
---
 locales/nl/app.ftl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locales/nl/app.ftl b/locales/nl/app.ftl
index 9a4cf236b6..432cab77d7 100644
--- a/locales/nl/app.ftl
+++ b/locales/nl/app.ftl
@@ -1149,6 +1149,12 @@ BottomBox--assembly-code-not-available-title = Samenstellingscode niet beschikba
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Zie <a>issue #4520</a> voor ondersteunde scenario’s en geplande verbeteringen.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Volledig scherm verlaten
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Volledig scherm
 SourceView--close-button =
     .title = Bronweergave sluiten
 

From 70b849239301a2e782235683d504c9fed0ef0d13 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Tue, 28 Apr 2026 09:10:36 +0000
Subject: [PATCH 58/64] Pontoon/Firefox Profiler: Update Greek (el), French
 (fr)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jim Spentzos <jimspentzos2000@gmail.com> (el)
Co-authored-by: Théo Chevalier <theo@theochevalier.org> (fr)
---
 locales/el/app.ftl | 2 ++
 locales/fr/app.ftl | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/locales/el/app.ftl b/locales/el/app.ftl
index 128cc375a3..80e5033b98 100644
--- a/locales/el/app.ftl
+++ b/locales/el/app.ftl
@@ -818,6 +818,8 @@ StackSettings--call-tree-strategy-native-deallocations-sites = Ιστότοπο
     .title = Περίληψη με τα bytes της μνήμης που απελευθερώθηκαν, κατά τον ιστότοπο όπου αποδεσμεύθηκε η μνήμη
 StackSettings--invert-call-stack = Αναστροφή στοίβας κλήσεων
     .title = Ταξινόμηση κατά χρόνο που χρησιμοποιήθηκε σε κόμβο κλήσεων, αγνοώντας τους θυγατρικούς του.
+StackSettings--include-idle-samples = Συμπερίληψη αδρανών δειγμάτων
+    .title = Απενεργοποιήστε την επιλογή για να αποκρύψετε τα δείγματα των οποίων το πλαίσιο φύλλου είναι στην κατηγορία «Αδρανή».
 StackSettings--show-user-timing = Εμφάνιση χρονισμού χρήστη
 StackSettings--use-stack-chart-same-widths = Χρήση του ίδιου πλάτους για κάθε στοίβα
 StackSettings--panel-search =
diff --git a/locales/fr/app.ftl b/locales/fr/app.ftl
index 9e2e5bfc72..7dffa35e7a 100644
--- a/locales/fr/app.ftl
+++ b/locales/fr/app.ftl
@@ -1040,6 +1040,12 @@ BottomBox--assembly-code-not-available-title = Code assembleur non disponible
 # Elements:
 #   <a>link text</a> - A link to the github issue about supported scenarios.
 BottomBox--assembly-code-not-available-text = Consultez le <a>ticket n°4520</a> pour les scénarios pris en charge et les améliorations prévues.
+# The toggle button for making the bottom box fullscreen.
+BottomBox--hide-fullscreen =
+    .title = Quitter le mode plein écran
+# The toggle button for making the bottom box fullscreen.
+BottomBox--show-fullscreen =
+    .title = Plein écran
 SourceView--close-button =
     .title = Fermer la vue du code source
 

From da9277533bbbc9141d8f9099670abcd26e4cb0c6 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Tue, 28 Apr 2026 09:20:38 +0000
Subject: [PATCH 59/64] Pontoon/Firefox Profiler: Update Italian (it)

Co-authored-by: Francesco Lodolo [:flod] <flod+pontoon@mozilla.com> (it)
---
 locales/it/app.ftl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/it/app.ftl b/locales/it/app.ftl
index 89963dd5b8..ca335aa98a 100644
--- a/locales/it/app.ftl
+++ b/locales/it/app.ftl
@@ -729,6 +729,8 @@ StackSettings--call-tree-strategy-native-deallocations-sites = Deallocazione sit
     .title = Sintetizza usando i byte di memoria deallocati, in base dal sito in cui la memoria è stata deallocata
 StackSettings--invert-call-stack = Inverti stack di chiamata
     .title = Ordina in base al tempo trascorso in un nodo di chiamata, ignorando i nodi figlio.
+StackSettings--include-idle-samples = Includi campioni inattivi
+    .title = Deseleziona per nascondere i campioni il cui frame foglia è nella categoria inattivi.
 StackSettings--show-user-timing = Mostra tempo utente
 StackSettings--use-stack-chart-same-widths = Utilizza la stessa larghezza per ogni stack
 StackSettings--panel-search =

From 90f5b98923a0a9c7fbdee4192d77dd9845163664 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Tue, 28 Apr 2026 11:10:50 +0000
Subject: [PATCH 60/64] Pontoon/Firefox Profiler: Update Chinese (Taiwan)
 (zh-TW)

Co-authored-by: Pin-guang Chen <petercpg@mail.moztw.org> (zh-TW)
---
 locales/zh-TW/app.ftl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/zh-TW/app.ftl b/locales/zh-TW/app.ftl
index 988304431e..73c37ac4c2 100644
--- a/locales/zh-TW/app.ftl
+++ b/locales/zh-TW/app.ftl
@@ -717,6 +717,8 @@ StackSettings--call-tree-strategy-native-deallocations-sites = 取消分配的
     .title = 依照取消分配記憶體的位置，根據取消分配的記憶體位元組數進行摘要
 StackSettings--invert-call-stack = 反轉呼叫堆疊
     .title = 依照呼叫節點當中花費的時間排序，並忽略其 children。
+StackSettings--include-idle-samples = 包含閒置的樣本
+    .title = 取消勾選即可隱藏 leaf frame 屬於閒置分類的樣本。
 StackSettings--show-user-timing = 顯示使用者計時
 StackSettings--use-stack-chart-same-widths = 將每個堆疊以相同寬度顯示
 StackSettings--panel-search =

From 8a302d7c14c8b93aa753f5c9d656a2e9d4bd29a0 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Tue, 28 Apr 2026 11:23:47 +0000
Subject: [PATCH 61/64] Pontoon/Firefox Profiler: Update Chinese (Taiwan)
 (zh-TW)

Co-authored-by: Pin-guang Chen <petercpg@mail.moztw.org> (zh-TW)
---
 locales/zh-TW/app.ftl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/locales/zh-TW/app.ftl b/locales/zh-TW/app.ftl
index 73c37ac4c2..9dcb93831c 100644
--- a/locales/zh-TW/app.ftl
+++ b/locales/zh-TW/app.ftl
@@ -70,7 +70,7 @@ CallNodeContextMenu--transform-merge-call-node = 只合併節點
     .title = 合併節點後會將其從效能檢測檔移除，並將時間歸入呼叫該節點的函數節點。只會移除效能樹當中特定部分的函數，其他對該函數呼叫的部分將保留在檢測檔中。
 # This is used as the context menu item title for "Focus on function" and "Focus
 # on function (inverted)" transforms.
-CallNodeContextMenu--transform-focus-function-title = 聚焦於函數，將移除該函數之外所有紀錄到的項目。除此之外，還會重新將呼叫樹的根指定為該函數。此功能可以將檢測檔中的多個函數呼叫點合併為單一呼叫節點。
+CallNodeContextMenu--transform-focus-function-title = 聚焦於函數，將移除該函數之外所有紀錄到的樣本。除此之外，還會重新將呼叫樹的根指定為該函數。此功能可以將檢測檔中的多個函數呼叫點合併為單一呼叫節點。
 CallNodeContextMenu--transform-focus-function = 聚焦於函數
     .title = { CallNodeContextMenu--transform-focus-function-title }
 CallNodeContextMenu--transform-focus-function-inverted = 聚焦於函數（反向）
@@ -81,14 +81,14 @@ CallNodeContextMenu--transform-focus-function-inverted = 聚焦於函數（反
 ## translated as "self values" or "self time" (though "self time" is less desirable
 ## because this menu item is also shown in "bytes" mode).
 
-CallNodeContextMenu--transform-focus-self-title = 聚焦於 self 與聚焦於函數類似，但只保留與函數的 self 時間有關的取樣。將捨棄被呼叫者的取樣，並將呼叫樹重新放置於聚焦的函數根上。
+CallNodeContextMenu--transform-focus-self-title = 聚焦於 self 與聚焦於函數類似，但只保留與函數的 self 時間有關的樣本。將捨棄被呼叫者的樣本，並將呼叫樹重新放置於聚焦的函數根上。
 CallNodeContextMenu--transform-focus-self = 只聚焦於 self
     .title = { CallNodeContextMenu--transform-focus-self-title }
 
 ##
 
 CallNodeContextMenu--transform-focus-subtree = 只聚焦於子樹
-    .title = 聚焦於子樹，將從呼叫樹中拉出分支，並移除不屬於該分支的內容。然而此功能只對單一呼叫節點有效，將忽略其他呼叫該函數的部分。
+    .title = 聚焦於子樹，將從呼叫樹中拉出分支，並移除不屬於該分支的樣本。然而此功能只對單一呼叫節點有效，將忽略其他呼叫該函數的部分。
 # This is used as the context menu item to apply the "Focus on category" transform.
 # Variables:
 #   $categoryName (String) - Name of the category to focus on.
@@ -177,9 +177,9 @@ CallTreeSidebar--running-time =
 CallTreeSidebar--self-time =
     .label = Self 時間
 CallTreeSidebar--running-samples =
-    .label = 執行取樣
+    .label = 執行中的樣本
 CallTreeSidebar--self-samples =
-    .label = Self 取樣
+    .label = Self 樣本
 CallTreeSidebar--running-size =
     .label = 執行大小
 CallTreeSidebar--self-size =
@@ -187,10 +187,10 @@ CallTreeSidebar--self-size =
 CallTreeSidebar--categories = 分類
 CallTreeSidebar--implementation = 實作
 CallTreeSidebar--running-milliseconds = 執行時間（ms）
-CallTreeSidebar--running-sample-count = 執行取樣數
+CallTreeSidebar--running-sample-count = 執行中的樣本數
 CallTreeSidebar--running-bytes = 執行位元組
 CallTreeSidebar--self-milliseconds = Self 時間（ms）
-CallTreeSidebar--self-sample-count = Self 取樣數
+CallTreeSidebar--self-sample-count = Self 樣本數
 CallTreeSidebar--self-bytes = Self 位元組
 
 ## CompareHome
@@ -364,7 +364,7 @@ MarkerContextMenu--select-the-sender-thread = 選擇傳送執行緒「<strong>{
 # This string is used on the marker filters menu item when clicked on the filter icon.
 # Variables:
 #   $filter (String) - Search string that will be used to filter the markers.
-MarkerFiltersContextMenu--drop-samples-outside-of-markers-matching = 丟棄不符合「<strong>{ $filter }</strong>」標記的取樣
+MarkerFiltersContextMenu--drop-samples-outside-of-markers-matching = 丟棄不符合「<strong>{ $filter }</strong>」標記的樣本
 
 ## MarkerCopyTableContextMenu
 ## This is the menu when the copy icon is clicked in Marker Chart and Marker
@@ -541,7 +541,7 @@ MenuButtons--metaOverheadStatistics-statkeys-cleaning = 清理
 MenuButtons--metaOverheadStatistics-statkeys-counter = 計數
     .title = 用來取得所有計數器的時間。
 MenuButtons--metaOverheadStatistics-statkeys-interval = 間隔
-    .title = 兩次計量間的間隔。
+    .title = 兩次取樣的間隔。
 MenuButtons--metaOverheadStatistics-statkeys-lockings = 鎖定
     .title = 進行計量前取得鎖定所需的時間。
 MenuButtons--metaOverheadStatistics-overhead-duration = 額外負荷持續時間：
@@ -1012,7 +1012,7 @@ TransformNavigator--collapse-function-subtree = 摺疊子樹：{ $item }
 # "Drop samples outside of markers matching ..." transform.
 # Variables:
 #   $item (String) - Search filter of the markers that transform will apply to.
-TransformNavigator--drop-samples-outside-of-markers-matching = 丟棄不符合「{ $item }」標記的取樣
+TransformNavigator--drop-samples-outside-of-markers-matching = 丟棄不符合「{ $item }」標記的樣本
 
 ## "Bottom box" - a view which contains the source view and the assembly view,
 ## at the bottom of the profiler UI

From f274d8d18023236562624f415bd5ad205fc67458 Mon Sep 17 00:00:00 2001
From: fatadel <afatkhutdinov@mozilla.com>
Date: Tue, 28 Apr 2026 14:53:03 +0200
Subject: [PATCH 62/64] Use ephemeral port for esbuild's internal dev server
 (#5974)

Pass `port: 0` to `buildContext.serve` so esbuild binds an OS-assigned
ephemeral port instead of grabbing 8000, which is commonly used by
other local projects. The public port (4242 by default) is unaffected.

Fixes #5881
---
 scripts/lib/dev-server.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/lib/dev-server.mjs b/scripts/lib/dev-server.mjs
index 39f86bc4b3..471924d58e 100644
--- a/scripts/lib/dev-server.mjs
+++ b/scripts/lib/dev-server.mjs
@@ -66,6 +66,7 @@ export async function startDevServer(buildConfig, options = {}) {
   // Create build context for watching
   const buildContext = await esbuild.context(buildConfig);
   const { hosts, port: esbuildServerPort } = await buildContext.serve({
+    port: 0,
     host: '127.0.0.1',
     servedir: distDir,
     fallback: fallback ? path.join(distDir, fallback) : undefined,

From 59d35be7f5a15507c6808e2d70f7d279f82d68f4 Mon Sep 17 00:00:00 2001
From: carverdamien <dcarver@mozilla.com>
Date: Tue, 28 Apr 2026 14:58:24 +0200
Subject: [PATCH 63/64] Remove category from LongTaskMarkerPayload (#5975)

---
 src/types/markers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/types/markers.ts b/src/types/markers.ts
index 8f5f5e5005..9f15b29104 100644
--- a/src/types/markers.ts
+++ b/src/types/markers.ts
@@ -717,7 +717,6 @@ export type BHRMarkerPayload = {
 
 export type LongTaskMarkerPayload = {
   type: 'MainThreadLongTask';
-  category: 'LongTask';
 };
 
 export type JsAllocationPayload_Gecko = {

From 06adfec125097eb8eef58d3b9320352b67081e94 Mon Sep 17 00:00:00 2001
From: Pontoon <pontoon@mozilla.com>
Date: Tue, 28 Apr 2026 14:40:34 +0000
Subject: [PATCH 64/64] Pontoon/Firefox Profiler: Update German (de)

Co-authored-by: Ger <ger_a@web.de> (de)
---
 locales/de/app.ftl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/de/app.ftl b/locales/de/app.ftl
index 3c1b6df8a2..2105e61eb7 100644
--- a/locales/de/app.ftl
+++ b/locales/de/app.ftl
@@ -799,6 +799,8 @@ StackSettings--call-tree-strategy-native-deallocations-sites = Freigegebene Webs
     .title = Zusammenfassung erstellen mit freigegebenen Speicherbytes, von der Website, auf der der Speicher alloziert wurde
 StackSettings--invert-call-stack = Aufrufstack umkehren
     .title = Sortieren nach in einem Aufrufknoten, die Unterpunkte werden ignoriert.
+StackSettings--include-idle-samples = Untätige Samples einschließen
+    .title = Deaktivieren Sie dieses Kontrollkästchen, um Samples auszublenden, deren Leaf-Frame der Kategorie „untätig“ angehört.
 StackSettings--show-user-timing = Nutzer-Zeitrechnung anzeigen
 StackSettings--use-stack-chart-same-widths = Für jeden Stapel die gleiche Breite verwenden
 StackSettings--panel-search =