chrome-devtools-mcp 0.10.1 → 0.10.2

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriSignatureInputHeaderMissingRequiredParameters.md

@@ -0,0 +1,8 @@
+# Missing a required parameter on the list of components in a `signature-input` header.
+
+The [`signature-input`][signatureInputHeader] header's [Inner Lists](sfInnerList)
+must be specified with both the [`keyid` and `type` parameters](signatureParameters).
+
+```
+Signature-Input: signature=("unencoded-digest";sf);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri"
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriSignatureInputHeaderValueMissingComponents.md

@@ -0,0 +1,11 @@
+# Missing a required component in a `signature-input` header.
+
+The [`signature-input`](signatureInputHeader) header's
+[Inner Lists](sfInnerList) must contain the string "`unencoded-digest`" with an
+`sf` parameter:
+
+For example:
+
+```
+Signature-Input: signature=("unencoded-digest";sf);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri"
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriSignatureInputHeaderValueNotInnerList.md

@@ -0,0 +1,11 @@
+# A `signature-input` header has a member whose value is not an Inner List.
+
+The value of each member of a [`signature-input`](signatureInputHeader) header's
+[Dictionary][sfDictionary] must be an [Inner List](sfInnerList) containing the
+set of components over which a signature is generated.
+
+For example:
+
+```
+Signature-Input: signature=("unencoded-digest";sf);keyid="JrQLj5P/89iXES9+vFgrIy29clF9CC/oPPsw3c5D0bs=";tag="sri"
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriValidationFailedIntegrityMismatch.md

@@ -0,0 +1,10 @@
+# Integrity verification failed.
+
+The signature associated with a response could be successfully verified, but the
+public keys asserted in the [`signature-input`](signatureInputHeader)
+header's [`keyid` parameter](signatureParameters) do not match the integrity
+assertions made by the request's initiator. Verificiation failed.
+
+The following are the keys specified by the request's initiator:
+
+{PLACEHOLDER_integrityAssertions}

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriValidationFailedInvalidLength.md

@@ -0,0 +1,5 @@
+# Signature verification failed: the signature provided is not an Ed25519 signature.
+
+The signature specified in a [`signature`](signatureHeader) header is not a
+base64-encoded 512 bit byte sequence, and can therefore not be verified as an
+Ed25519 signature.

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriValidationFailedSignatureExpired.md

@@ -0,0 +1,6 @@
+# Signature verification failed: the signature is expired.
+
+The [`expires` parameter](signatureParameters) specified in a
+[`signature-input`](signatureInputHeader) header is a UNIX timestamp
+representing a time in the past. The signature has therefore expired, and
+verification is not possible.

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/sriValidationFailedSignatureMismatch.md

@@ -0,0 +1,11 @@
+# Signature verification failed.
+
+The public key specified in the [`signature-input`](signatureInputHeader)
+header's [`keyid` parameter](signatureParameters) does not match the signature
+specified in the [`signature`](signatureHeader) header. Verification failed.
+
+The following is the signature base over which the verification attempt was made:
+
+```
+{PLACEHOLDER_signatureBase}
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/stylesheetLateImport.md

@@ -0,0 +1,4 @@
+# Define @import rules at the top of the stylesheet
+
+An @import rule was ignored because it wasn't defined at the top of the stylesheet. Such rules must appear at the top,
+before any style declaration and any other at-rule with the exception of @charset and @layer.

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/stylesheetRequestFailed.md

@@ -0,0 +1,3 @@
+# Verify stylesheet URLs
+
+This page failed to load a stylesheet from a URL.

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/summaryElementAccessibilityInteractiveContentSummaryDescendant.md

@@ -0,0 +1,3 @@
+# Interactive element inside of a <summary> element
+
+An interactive element was found within a `<summary>` element. These elements will not consistently be accessible to people navigating by keyboard or using assistive technology.

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/unencodedDigestIncorrectDigestLength.md

@@ -0,0 +1,12 @@
+# An `unencoded-digest` header contains a digest with an incorrect length.
+
+[`unencoded-digest`](unencodedDigestHeader) headers contain SHA2 digests of a
+response's body. The digest delivered with this response is not the correct
+length for the algorithm specified. SHA-256 digests should be 256 bits long,
+SHA-512 digests 512 bits long. For example, if the body was "Hello, world.", the
+following might be an appropriate header:
+
+```
+Unencoded-Digest: sha-256=:+MO/YqmqPm/BYZwlDkir51GTc9Pt9BvmLrXcRRma8u8=:,
+                  sha-512=:S7LmUoguRQsq3IHIZ0Xhm5jjCDqH6uUQbumuj5CnrIFDk+RyBW/dWuqzEiV4mPaB:
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/unencodedDigestIncorrectDigestType.md

@@ -0,0 +1,17 @@
+# An `unencoded-digest` header contains a digest with an invalid type.
+
+[`unencoded-digest`](unencodedDigestHeader) headers must be formatted as a
+[Dictionary](sfDictionary), wherein each member's label specifies the hashing
+algorithm, and the value is a [Byte Sequence](sfByteSequence) containing the
+digest. The digest delivered with this response did not deliver the digest as a
+byte sequence.
+
+For example, if the body was "Hello, world.":
+
+```
+// Correctly formatted header:
+Unencoded-Digest: sha-256=:+MO/YqmqPm/BYZwlDkir51GTc9Pt9BvmLrXcRRma8u8=:
+
+// Incorrectly formatted header (quotes rather than colons):
+Unencoded-Digest: sha-256="+MO/YqmqPm/BYZwlDkir51GTc9Pt9BvmLrXcRRma8u8="
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/unencodedDigestMalformedDictionary.md

@@ -0,0 +1,14 @@
+# An `unencoded-digest` header cannot be parsed.
+
+[`unencoded-digest`](unencodedDigestHeader) headers must be formatted as a
+[Dictionary](sfDictionary), wherein each member's label specifies the hashing
+algorithm, and the value is a [Byte Sequence](sfByteSequence) containing the
+digest. The digest delivered with this response did not format the response
+correctly.
+
+For example, if the body was "Hello, world.", the following would be a correctly
+formatted header:
+
+```
+Unencoded-Digest: sha-256=:+MO/YqmqPm/BYZwlDkir51GTc9Pt9BvmLrXcRRma8u8=:
+```

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/descriptions/unencodedDigestUnknownAlgorithm.md

@@ -0,0 +1,15 @@
+# An `unencoded-digest` header contains a digest with an invalid algorithm.
+
+[`unencoded-digest`](unencodedDigestHeader) headers support only two hashing
+algorithms, SHA-256, and SHA-512. The digests delivered with this response
+specified an unsupported algorithm:
+
+For example, if the body was "Hello, world.", the following would be an
+appropriate header:
+
+```
+Unencoded-Digest: sha-256=:+MO/YqmqPm/BYZwlDkir51GTc9Pt9BvmLrXcRRma8u8=:,
+                  sha-512=:S7LmUoguRQsq3IHIZ0Xhm5jjCDqH6uUQbumuj5CnrIFDk+RyBW/dWuqzEiV4mPaB:
+```
+
+Note also that the labels must be lower-case.

package/build/node_modules/chrome-devtools-frontend/front_end/models/issues_manager/issues_manager.js

@@ -0,0 +1,35 @@
+// Copyright 2019 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+import * as AttributionReportingIssue from './AttributionReportingIssue.js';
+import * as CheckFormsIssuesTrigger from './CheckFormsIssuesTrigger.js';
+import * as ClientHintIssue from './ClientHintIssue.js';
+import * as ContentSecurityPolicyIssue from './ContentSecurityPolicyIssue.js';
+import * as ContrastCheckTrigger from './ContrastCheckTrigger.js';
+import * as CookieDeprecationMetadataIssue from './CookieDeprecationMetadataIssue.js';
+import * as CookieIssue from './CookieIssue.js';
+import * as CorsIssue from './CorsIssue.js';
+import * as CrossOriginEmbedderPolicyIssue from './CrossOriginEmbedderPolicyIssue.js';
+import * as DeprecationIssue from './DeprecationIssue.js';
+import * as ElementAccessibilityIssue from './ElementAccessibilityIssue.js';
+import * as FederatedAuthUserInfoRequestIssue from './FederatedAuthUserInfoRequestIssue.js';
+import * as GenericIssue from './GenericIssue.js';
+import * as HeavyAdIssue from './HeavyAdIssue.js';
+import * as Issue from './Issue.js';
+import * as IssueAggregator from './IssueAggregator.js';
+import * as IssueResolver from './IssueResolver.js';
+import * as IssuesManager from './IssuesManager.js';
+import * as LowTextContrastIssue from './LowTextContrastIssue.js';
+import * as MarkdownIssueDescription from './MarkdownIssueDescription.js';
+import * as MixedContentIssue from './MixedContentIssue.js';
+import * as PartitioningBlobURLIssue from './PartitioningBlobURLIssue.js';
+import * as PropertyRuleIssue from './PropertyRuleIssue.js';
+import * as QuirksModeIssue from './QuirksModeIssue.js';
+import * as RelatedIssue from './RelatedIssue.js';
+import * as SharedArrayBufferIssue from './SharedArrayBufferIssue.js';
+import * as SharedDictionaryIssue from './SharedDictionaryIssue.js';
+import * as SourceFrameIssuesManager from './SourceFrameIssuesManager.js';
+import * as SRIMessageSignatureIssue from './SRIMessageSignatureIssue.js';
+import * as StylesheetLoadingIssue from './StylesheetLoadingIssue.js';
+import * as UnencodedDigestIssue from './UnencodedDigestIssue.js';
+export { AttributionReportingIssue, CheckFormsIssuesTrigger, ClientHintIssue, ContentSecurityPolicyIssue, ContrastCheckTrigger, CookieDeprecationMetadataIssue, CookieIssue, CorsIssue, CrossOriginEmbedderPolicyIssue, DeprecationIssue, ElementAccessibilityIssue, FederatedAuthUserInfoRequestIssue, GenericIssue, HeavyAdIssue, Issue, IssueAggregator, IssueResolver, IssuesManager, LowTextContrastIssue, MarkdownIssueDescription, MixedContentIssue, PartitioningBlobURLIssue, PropertyRuleIssue, QuirksModeIssue, RelatedIssue, SharedArrayBufferIssue, SharedDictionaryIssue, SourceFrameIssuesManager, SRIMessageSignatureIssue, StylesheetLoadingIssue, UnencodedDigestIssue, };

package/build/node_modules/chrome-devtools-frontend/front_end/models/trace/Processor.js

@@ -351,9 +351,12 @@ export class TraceProcessor extends EventTarget {
     }
     #computeInsightSet(data, context) {
         const logger = context.options.logger;
+        if (!this.#insights) {
+            this.#insights = new Map();
+        }
         let id, urlString, navigation;
         if (context.navigation) {
-            id = context.navigationId;
+            id = `NAVIGATION_${this.#insights.size}`;
             urlString = data.Meta.finalDisplayUrlByNavigationId.get(context.navigationId) ?? data.Meta.mainFrameURL;
             navigation = context.navigation;
         }
@@ -421,9 +424,6 @@ export class TraceProcessor extends EventTarget {
             bounds: context.bounds,
             model: insightSetModel,
         };
-        if (!this.#insights) {
-            this.#insights = new Map();
-        }
         this.#insights.set(insightSet.id, insightSet);
         this.sortInsightSet(insightSet, context.options.metadata ?? null);
     }

package/build/node_modules/chrome-devtools-frontend/front_end/models/trace/Styles.js

@@ -428,7 +428,7 @@ const UIStrings = {
     /**
      * @description Event category in the Performance panel for time spent to perform Garbage Collection for C++: https://chromium.googlesource.com/v8/v8/+/main/include/cppgc/README.md
      */
-    cppGc: 'CPP GC',
+    cppGc: 'C++ GC',
     /**
      * @description Event category in the Performance panel for time spent to perform encryption
      */

package/build/node_modules/chrome-devtools-frontend/front_end/models/trace/handlers/SamplesHandler.js

@@ -17,23 +17,66 @@ let entryToNode = new Map();
 // are matched by profile id, which we then finish processing to export
 // events matched by thread id.
 let preprocessedData = new Map();
+/**
+ * Profile source selection priority when multiple profiles exist for the same thread.
+ *
+ * Profile sources and their typical scenarios:
+ * - 'Internal': Browser-initiated profiling performance panel traces.
+ *   This is the profiling mechanism when users click "Record" in the Devtools UI.
+ * - 'Inspector': User-initiated via console.profile()/profileEnd() calls.
+ *   Represents explicit developer intent to profile specific code.
+ * - 'SelfProfiling': Page-initiated via JS Self-Profiling API.
+ *    Lower signal vs the two above; treated as fallback.
+ *
+ * Selection strategy:
+ * - CPU Profile mode: Prefer 'Inspector' (explicit user request).
+ * - Performance trace: Prefer 'Internal' (integrated timeline context), then 'Inspector'.
+ * - Sources not in the priority list (including 'SelfProfiling') act as fallbacks.
+ *   When no priority source matches, the first candidate profile is selected.
+ */
+const PROFILE_SOURCES_BY_PRIORITY = {
+    cpuProfile: ['Inspector'],
+    performanceTrace: ['Internal', 'Inspector'],
+};
 function parseCPUProfileData(parseOptions) {
+    const priorityList = parseOptions.isCPUProfile ? PROFILE_SOURCES_BY_PRIORITY.cpuProfile : PROFILE_SOURCES_BY_PRIORITY.performanceTrace;
     for (const [processId, profiles] of preprocessedData) {
+        const profilesByThread = new Map();
         for (const [profileId, preProcessedData] of profiles) {
             const threadId = preProcessedData.threadId;
-            if (!preProcessedData.rawProfile.nodes.length || threadId === undefined) {
+            if (threadId === undefined) {
+                continue;
+            }
+            const listForThread = Platform.MapUtilities.getWithDefault(profilesByThread, threadId, () => []);
+            listForThread.push({ id: profileId, data: preProcessedData });
+        }
+        for (const [threadId, candidates] of profilesByThread) {
+            if (!candidates.length) {
+                continue;
+            }
+            let chosen = candidates[0];
+            for (const source of priorityList) {
+                const match = candidates.find(p => p.data.source === source);
+                if (match) {
+                    chosen = match;
+                    break;
+                }
+            }
+            const chosenData = chosen.data;
+            if (!chosenData.rawProfile.nodes.length) {
                 continue;
             }
             const indexStack = [];
-            const profileModel = new CPUProfile.CPUProfileDataModel.CPUProfileDataModel(preProcessedData.rawProfile);
+            const profileModel = new CPUProfile.CPUProfileDataModel.CPUProfileDataModel(chosenData.rawProfile);
             const profileTree = Helpers.TreeHelpers.makeEmptyTraceEntryTree();
             profileTree.maxDepth = profileModel.maxDepth;
+            const selectedProfileId = chosen.id;
             const finalizedData = {
-                rawProfile: preProcessedData.rawProfile,
+                rawProfile: chosenData.rawProfile,
                 parsedProfile: profileModel,
                 profileCalls: [],
                 profileTree,
-                profileId,
+                profileId: selectedProfileId,
             };
             const dataByThread = Platform.MapUtilities.getWithDefault(profilesInProcess, processId, () => new Map());
             dataByThread.set(threadId, finalizedData);
@@ -49,7 +92,7 @@ function parseCPUProfileData(parseOptions) {
                     }
                     const ts = Helpers.Timing.milliToMicro(Types.Timing.Milli(timeStampMilliseconds));
                     const nodeId = node.id;
-                    const profileCall = Helpers.Trace.makeProfileCall(node, profileId, sampleIndex, ts, processId, threadId);
+                    const profileCall = Helpers.Trace.makeProfileCall(node, selectedProfileId, sampleIndex, ts, processId, threadId);
                     finalizedData.profileCalls.push(profileCall);
                     indexStack.push(finalizedData.profileCalls.length - 1);
                     const traceEntryNode = Helpers.TreeHelpers.makeEmptyTraceEntryNode(profileCall, nodeId);
@@ -68,7 +111,7 @@ function parseCPUProfileData(parseOptions) {
                     }
                     const { callFrame, ts, pid, tid } = profileCall;
                     const traceEntryNode = entryToNode.get(profileCall);
-                    if (callFrame === undefined || ts === undefined || pid === undefined || profileId === undefined ||
+                    if (callFrame === undefined || ts === undefined || pid === undefined || selectedProfileId === undefined ||
                         tid === undefined || traceEntryNode === undefined) {
                         return;
                     }
@@ -119,6 +162,7 @@ export function handleEvent(event) {
         const profileData = getOrCreatePreProcessedData(event.pid, event.id);
         profileData.rawProfile.startTime = event.ts;
         profileData.threadId = event.tid;
+        assignProfileSourceIfKnown(profileData, event.args?.data?.source);
         return;
     }
     if (Types.Events.isProfileChunk(event)) {
@@ -163,12 +207,18 @@ export function handleEvent(event) {
             const timeDeltas = cdpProfile.timeDeltas;
             cdpProfile.endTime = timeDeltas.reduce((x, y) => x + y, cdpProfile.startTime);
         }
+        assignProfileSourceIfKnown(profileData, event.args?.data?.source);
         return;
     }
 }
 export async function finalize(parseOptions = {}) {
     parseCPUProfileData(parseOptions);
 }
+function assignProfileSourceIfKnown(profileData, source) {
+    if (Types.Events.VALID_PROFILE_SOURCES.includes(source)) {
+        profileData.source = source;
+    }
+}
 export function data() {
     return {
         profilesInProcess,

package/build/node_modules/chrome-devtools-frontend/front_end/models/trace/handlers/ScriptsHandler.js

@@ -7,11 +7,13 @@ import * as Types from '../types/types.js';
 import { data as metaHandlerData } from './MetaHandler.js';
 import { data as networkRequestsHandlerData } from './NetworkRequestsHandler.js';
 let scriptById = new Map();
+let frameIdByIsolate = new Map();
 export function deps() {
     return ['Meta', 'NetworkRequests'];
 }
 export function reset() {
     scriptById = new Map();
+    frameIdByIsolate = new Map();
 }
 export function handleEvent(event) {
     const getOrMakeScript = (isolate, scriptIdAsNumber) => {
@@ -29,6 +31,9 @@ export function handleEvent(event) {
     if (Types.Events.isRundownScript(event)) {
         const { isolate, scriptId, url, sourceUrl, sourceMapUrl, sourceMapUrlElided } = event.args.data;
         const script = getOrMakeScript(isolate, scriptId);
+        if (!script.frame) {
+            script.frame = frameIdByIsolate.get(String(isolate)) ?? '';
+        }
         script.url = url;
         script.ts = event.ts;
         if (sourceUrl) {
@@ -59,6 +64,25 @@ export function handleEvent(event) {
         script.content = (script.content ?? '') + sourceText;
         return;
     }
+    // Setup frameIdByIsolate, which is used only in the case that we are missing
+    // rundown events for a script. We won't get a frame association from the rundown
+    // events if the recording started only after the script was first compiled. In
+    // that scenario, derive the frame via the isolate / FunctionCall events.
+    // TODO: ideally, we put the frame on ScriptCatchup event. So much easier. This approach has some
+    // issues.
+    if (Types.Events.isFunctionCall(event) && event.args.data?.isolate && event.args.data.frame) {
+        const { isolate, frame } = event.args.data;
+        const existingValue = frameIdByIsolate.get(isolate);
+        if (existingValue !== frame) {
+            frameIdByIsolate.set(isolate, frame);
+            // Update the scripts we discovered but without knowing their frame.
+            for (const script of scriptById.values()) {
+                if (!script.frame && script.isolate === isolate) {
+                    script.frame = frame;
+                }
+            }
+        }
+    }
 }
 function findFrame(meta, frameId) {
     for (const frames of meta.frameByProcessId?.values()) {

package/build/node_modules/chrome-devtools-frontend/front_end/models/trace/types/TraceEvents.js

@@ -19,6 +19,7 @@ export function objectIsCallFrame(object) {
         ('lineNumber' in object && typeof object.lineNumber === 'number') &&
         ('url' in object && typeof object.url === 'string');
 }
+export const VALID_PROFILE_SOURCES = ['Inspector', 'SelfProfiling', 'Internal'];
 export function isRunTask(event) {
     return event.name === "RunTask" /* Name.RUN_TASK */ && event.ph === "X" /* Phase.COMPLETE */;
 }

package/build/node_modules/chrome-devtools-frontend/front_end/models/workspace/IgnoreListManager.js

@@ -4,6 +4,7 @@
 import * as Common from '../../core/common/common.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
+import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import { projectTypes } from './WorkspaceImpl.js';
 const UIStrings = {
@@ -34,45 +35,38 @@ const UIStrings = {
 };
 const str_ = i18n.i18n.registerUIStrings('models/workspace/IgnoreListManager.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
-let ignoreListManagerInstance;
 export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper {
-    #listeners;
-    #isIgnoreListedURLCache;
-    #contentScriptExecutionContexts;
-    constructor() {
+    #settings;
+    #targetManager;
+    #listeners = new Set();
+    #isIgnoreListedURLCache = new Map();
+    #contentScriptExecutionContexts = new Set();
+    constructor(settings, targetManager) {
         super();
-        SDK.TargetManager.TargetManager.instance().addModelListener(SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.GlobalObjectCleared, this.clearCacheIfNeeded.bind(this), this);
-        SDK.TargetManager.TargetManager.instance().addModelListener(SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextCreated, this.onExecutionContextCreated, this, { scoped: true });
-        SDK.TargetManager.TargetManager.instance().addModelListener(SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextDestroyed, this.onExecutionContextDestroyed, this, { scoped: true });
-        Common.Settings.Settings.instance()
-            .moduleSetting('skip-stack-frames-pattern')
+        this.#settings = settings;
+        this.#targetManager = targetManager;
+        this.#targetManager.addModelListener(SDK.DebuggerModel.DebuggerModel, SDK.DebuggerModel.Events.GlobalObjectCleared, this.clearCacheIfNeeded.bind(this), this);
+        this.#targetManager.addModelListener(SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextCreated, this.onExecutionContextCreated, this, { scoped: true });
+        this.#targetManager.addModelListener(SDK.RuntimeModel.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextDestroyed, this.onExecutionContextDestroyed, this, { scoped: true });
+        this.#settings.moduleSetting('skip-stack-frames-pattern').addChangeListener(this.patternChanged.bind(this));
+        this.#settings.moduleSetting('skip-content-scripts').addChangeListener(this.patternChanged.bind(this));
+        this.#settings.moduleSetting('automatically-ignore-list-known-third-party-scripts')
             .addChangeListener(this.patternChanged.bind(this));
-        Common.Settings.Settings.instance()
-            .moduleSetting('skip-content-scripts')
-            .addChangeListener(this.patternChanged.bind(this));
-        Common.Settings.Settings.instance()
-            .moduleSetting('automatically-ignore-list-known-third-party-scripts')
-            .addChangeListener(this.patternChanged.bind(this));
-        Common.Settings.Settings.instance()
-            .moduleSetting('enable-ignore-listing')
-            .addChangeListener(this.patternChanged.bind(this));
-        Common.Settings.Settings.instance()
-            .moduleSetting('skip-anonymous-scripts')
-            .addChangeListener(this.patternChanged.bind(this));
-        this.#listeners = new Set();
-        this.#isIgnoreListedURLCache = new Map();
-        this.#contentScriptExecutionContexts = new Set();
-        SDK.TargetManager.TargetManager.instance().observeModels(SDK.DebuggerModel.DebuggerModel, this);
+        this.#settings.moduleSetting('enable-ignore-listing').addChangeListener(this.patternChanged.bind(this));
+        this.#settings.moduleSetting('skip-anonymous-scripts').addChangeListener(this.patternChanged.bind(this));
+        this.#targetManager.observeModels(SDK.DebuggerModel.DebuggerModel, this);
     }
-    static instance(opts = { forceNew: null }) {
+    static instance(opts = {
+        forceNew: null,
+    }) {
         const { forceNew } = opts;
-        if (!ignoreListManagerInstance || forceNew) {
-            ignoreListManagerInstance = new IgnoreListManager();
+        if (forceNew) {
+            Root.DevToolsContext.globalInstance().set(IgnoreListManager, new IgnoreListManager(opts.settings ?? Common.Settings.Settings.instance(), opts.targetManager ?? SDK.TargetManager.TargetManager.instance()));
         }
-        return ignoreListManagerInstance;
+        return Root.DevToolsContext.globalInstance().get(IgnoreListManager);
     }
     static removeInstance() {
-        ignoreListManagerInstance = undefined;
+        Root.DevToolsContext.globalInstance().delete(IgnoreListManager);
     }
     addChangeListener(listener) {
         this.#listeners.add(listener);
@@ -99,7 +93,7 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper {
         if (this.isContentScript(event.data)) {
             this.#contentScriptExecutionContexts.add(event.data.uniqueId);
             if (this.skipContentScripts) {
-                for (const debuggerModel of SDK.TargetManager.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
+                for (const debuggerModel of this.#targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
                     void this.updateIgnoredExecutionContexts(debuggerModel);
                 }
             }
@@ -109,7 +103,7 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper {
         if (this.isContentScript(event.data)) {
             this.#contentScriptExecutionContexts.delete(event.data.uniqueId);
             if (this.skipContentScripts) {
-                for (const debuggerModel of SDK.TargetManager.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
+                for (const debuggerModel of this.#targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
                     void this.updateIgnoredExecutionContexts(debuggerModel);
                 }
             }
@@ -121,7 +115,7 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper {
         }
     }
     getSkipStackFramesPatternSetting() {
-        return Common.Settings.Settings.instance().moduleSetting('skip-stack-frames-pattern');
+        return this.#settings.moduleSetting('skip-stack-frames-pattern');
     }
     setIgnoreListPatterns(debuggerModel) {
         const regexPatterns = this.enableIgnoreListing ? this.getSkipStackFramesPatternSetting().getAsArray() : [];
@@ -253,48 +247,47 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper {
         this.unIgnoreListURL(this.uiSourceCodeURL(uiSourceCode), this.getGeneralRulesForUISourceCode(uiSourceCode));
     }
     get enableIgnoreListing() {
-        return Common.Settings.Settings.instance().moduleSetting('enable-ignore-listing').get();
+        return this.#settings.moduleSetting('enable-ignore-listing').get();
     }
     set enableIgnoreListing(value) {
-        Common.Settings.Settings.instance().moduleSetting('enable-ignore-listing').set(value);
+        this.#settings.moduleSetting('enable-ignore-listing').set(value);
     }
     get skipContentScripts() {
-        return this.enableIgnoreListing && Common.Settings.Settings.instance().moduleSetting('skip-content-scripts').get();
+        return this.enableIgnoreListing && this.#settings.moduleSetting('skip-content-scripts').get();
     }
     get skipAnonymousScripts() {
-        return this.enableIgnoreListing &&
-            Common.Settings.Settings.instance().moduleSetting('skip-anonymous-scripts').get();
+        return this.enableIgnoreListing && this.#settings.moduleSetting('skip-anonymous-scripts').get();
     }
     get automaticallyIgnoreListKnownThirdPartyScripts() {
         return this.enableIgnoreListing &&
-            Common.Settings.Settings.instance().moduleSetting('automatically-ignore-list-known-third-party-scripts').get();
+            this.#settings.moduleSetting('automatically-ignore-list-known-third-party-scripts').get();
     }
     ignoreListContentScripts() {
         if (!this.enableIgnoreListing) {
             this.enableIgnoreListing = true;
         }
-        Common.Settings.Settings.instance().moduleSetting('skip-content-scripts').set(true);
+        this.#settings.moduleSetting('skip-content-scripts').set(true);
     }
     unIgnoreListContentScripts() {
-        Common.Settings.Settings.instance().moduleSetting('skip-content-scripts').set(false);
+        this.#settings.moduleSetting('skip-content-scripts').set(false);
     }
     ignoreListAnonymousScripts() {
         if (!this.enableIgnoreListing) {
             this.enableIgnoreListing = true;
         }
-        Common.Settings.Settings.instance().moduleSetting('skip-anonymous-scripts').set(true);
+        this.#settings.moduleSetting('skip-anonymous-scripts').set(true);
     }
     unIgnoreListAnonymousScripts() {
-        Common.Settings.Settings.instance().moduleSetting('skip-anonymous-scripts').set(false);
+        this.#settings.moduleSetting('skip-anonymous-scripts').set(false);
     }
     ignoreListThirdParty() {
         if (!this.enableIgnoreListing) {
             this.enableIgnoreListing = true;
         }
-        Common.Settings.Settings.instance().moduleSetting('automatically-ignore-list-known-third-party-scripts').set(true);
+        this.#settings.moduleSetting('automatically-ignore-list-known-third-party-scripts').set(true);
     }
     unIgnoreListThirdParty() {
-        Common.Settings.Settings.instance().moduleSetting('automatically-ignore-list-known-third-party-scripts').set(false);
+        this.#settings.moduleSetting('automatically-ignore-list-known-third-party-scripts').set(false);
     }
     ignoreListURL(url) {
         const regexValue = this.urlToRegExpString(url);
@@ -372,7 +365,7 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper {
     async patternChanged() {
         this.#isIgnoreListedURLCache.clear();
         const promises = [];
-        for (const debuggerModel of SDK.TargetManager.TargetManager.instance().models(SDK.DebuggerModel.DebuggerModel)) {
+        for (const debuggerModel of this.#targetManager.models(SDK.DebuggerModel.DebuggerModel)) {
             promises.push(this.setIgnoreListPatterns(debuggerModel));
             const sourceMapManager = debuggerModel.sourceMapManager();
             for (const script of debuggerModel.scripts()) {

package/build/node_modules/chrome-devtools-frontend/front_end/models/workspace/WorkspaceImpl.js

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 import * as Common from '../../core/common/common.js';
+import * as Root from '../../core/root/root.js';
 import { UISourceCode } from './UISourceCode.js';
 /* eslint-disable @typescript-eslint/naming-convention -- Used by web_tests. */
 export var projectTypes;
@@ -92,22 +93,18 @@ export class ProjectStore {
     indexContent(_progress) {
     }
 }
-let workspaceInstance;
 export class WorkspaceImpl extends Common.ObjectWrapper.ObjectWrapper {
     #projects = new Map();
     #hasResourceContentTrackingExtensions = false;
-    constructor() {
-        super();
-    }
     static instance(opts = { forceNew: null }) {
         const { forceNew } = opts;
-        if (!workspaceInstance || forceNew) {
-            workspaceInstance = new WorkspaceImpl();
+        if (!Root.DevToolsContext.globalInstance().has(WorkspaceImpl) || forceNew) {
+            Root.DevToolsContext.globalInstance().set(WorkspaceImpl, new WorkspaceImpl());
         }
-        return workspaceInstance;
+        return Root.DevToolsContext.globalInstance().get(WorkspaceImpl);
     }
     static removeInstance() {
-        workspaceInstance = undefined;
+        Root.DevToolsContext.globalInstance().delete(WorkspaceImpl);
     }
     uiSourceCode(projectId, url) {
         const project = this.#projects.get(projectId);