chrome-devtools-frontend 1.0.1701636 → 1.0.1703574

package/eslint.config.mjs

@@ -59,6 +59,7 @@ export default defineConfig([
     'scripts/migration/**/*.js',
     'scripts/protocol_typescript/*.js',
     'scripts/deps/tests/fixtures',
+    'scripts/gn_deps_verifier/tests/fixtures',
     'test/**/fixtures/',
     'test/e2e/**/*.js',
     'test/shared/**/*.js',
@@ -740,7 +741,8 @@ export default defineConfig([
       'front_end/**/*.docs.ts',
       'test/**/*.ts',
       '**/testing/*.ts',
-      'scripts/eslint_rules/test/**/*',
+      'scripts/eslint_rules/tests/**/*',
+      'scripts/gn_deps_verifier/tests/**/*',
       'extensions/cxx_debugging/e2e/**/*.ts',
       'extensions/cxx_debugging/tests/**/*.ts',
     ],

package/front_end/core/common/ParsedURL.ts

@@ -179,7 +179,11 @@ export class ParsedURL {
         preEncodedPath = 'file:///' + preEncodedPath;
       }
     }
-    return new URL(preEncodedPath).toString() as Platform.DevToolsPath.UrlString;
+    let url = new URL(preEncodedPath).toString();
+    while (url.endsWith('/') && url.length > 'file:///'.length) {
+      url = url.substring(0, url.length - 1);
+    }
+    return url as Platform.DevToolsPath.UrlString;
   }
 
   static relativePathToUrlString(

package/front_end/core/host/UserMetricsEnums.ts

@@ -498,10 +498,11 @@ export enum DevtoolsExperiments {
   'durable-messages' = 110,
   'jpeg-xl' = 111,
   'plus-button' = 112,
+  'source-map-scopes-in-sources-panel' = 113,
   /* eslint-enable @typescript-eslint/naming-convention */
 
   // Increment this when new experiments are added.
-  MAX_VALUE = 113,
+  MAX_VALUE = 114,
 }
 
 /** Update DevToolsIssuesPanelIssueExpanded from tools/metrics/histograms/enums.xml if new enum is added. **/

package/front_end/core/root/ExperimentNames.ts

@@ -9,6 +9,7 @@ export enum ExperimentName {
   DURABLE_MESSAGES = 'durable-messages',
   JPEG_XL = 'jpeg-xl',
   PLUS_BUTTON = 'plus-button',
+  SOURCE_MAP_SCOPES_IN_SOURCES_PANEL = 'source-map-scopes-in-sources-panel',
   // Adding or removing an entry from this enum?
   // You will need to update:
   // 1. DevToolsExperiments enum in host/UserMetrics.ts

package/front_end/core/sdk/CSSPropertyParserMatchers.ts

@@ -56,13 +56,8 @@ export class BaseVariableMatch implements Match {
   }
 }
 
-// TODO(b/533783988): Remove ValueName handling once https://code.haverbeke.berlin/lezer/css/issues/36 is fixed and rolled.
 function isVariableNameNode(node: CodeMirror.SyntaxNode|null|undefined, ast: SyntaxTree): boolean {
-  if (node?.name !== 'VariableName' && node?.name !== 'ValueName') {
-    return false;
-  }
-  const text = ast.text(node);
-  return text.length > 2 && text.startsWith('--');
+  return node?.name === 'VariableName' && ast.text(node).length > 2;
 }
 
 const BaseVariableMatcherBase: MatcherClass<BaseVariableMatch> = matcherBase(BaseVariableMatch);
@@ -1122,7 +1117,7 @@ export class CustomFunctionMatcher extends CustomFunctionMatcherBase {
     if (node.name !== 'CallExpression') {
       return null;
     }
-    const callee = matching.ast.text(node.getChild('VariableName') ?? node.getChild('Callee'));
+    const callee = matching.ast.text(node.getChild('VariableName'));
     if (!callee || callee.length <= 2 || !callee.startsWith('--')) {
       return null;
     }

package/front_end/core/text_utils/Markdown.ts

@@ -0,0 +1,73 @@
+// Copyright 2026 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 Marked from '../../third_party/marked/marked.js';
+
+export interface PlaceholderToken extends Marked.Marked.Tokens.Generic {
+  type: 'placeholder';
+  raw: string;
+  key: string;
+}
+
+export const VALID_PLACEHOLDER_MATCH_PATTERN: RegExp = /\{(PLACEHOLDER_[a-zA-Z][a-zA-Z0-9_]*)\}/g;
+const VALID_PLACEHOLDER_NAME_PATTERN = /^PLACEHOLDER_[a-zA-Z][a-zA-Z0-9_]*$/;
+
+const placeholderExtension: Marked.Marked.TokenizerExtension = {
+  name: 'placeholder',
+  level: 'inline',
+  start(src: string): number |
+      undefined {
+        return src.match(/\{PLACEHOLDER_[a-zA-Z][a-zA-Z0-9_]*\}/)?.index;
+      },
+  tokenizer(src: string): PlaceholderToken |
+      undefined {
+        const match = /^\{(PLACEHOLDER_[a-zA-Z][a-zA-Z0-9_]*)\}/.exec(src);
+        if (match) {
+          return {
+            type: 'placeholder',
+            raw: match[0],
+            key: match[1],
+          };
+        }
+        return undefined;
+      },
+};
+
+export function validateSubstitutions(rawMarkdown: string, substitutions?: Map<string, string>): void {
+  if (!substitutions) {
+    return;
+  }
+  const unusedPlaceholders = new Set(substitutions.keys());
+  for (const key of unusedPlaceholders) {
+    if (!VALID_PLACEHOLDER_NAME_PATTERN.test(key)) {
+      throw new Error(`Invalid placeholder '${key}' provided in the substitutions map.`);
+    }
+  }
+  for (const [, placeholder] of rawMarkdown.matchAll(VALID_PLACEHOLDER_MATCH_PATTERN)) {
+    if (!substitutions.has(placeholder)) {
+      throw new Error(`No replacement provided for placeholder '${placeholder}'.`);
+    }
+    unusedPlaceholders.delete(placeholder);
+  }
+  if (unusedPlaceholders.size > 0) {
+    throw new Error(`Unused replacements provided: ${[...unusedPlaceholders]}`);
+  }
+}
+
+/**
+ * Tokenizes markdown into a Marked AST while preserving `{PLACEHOLDER_*}` tokens
+ * as `PlaceholderToken` AST nodes instead of substituting strings before lexing.
+ */
+export function tokenizeWithPlaceholders(markdown: string|Marked.Marked.Token[],
+                                         substitutions?: Map<string, string>): Marked.Marked.Token[] {
+  const rawMarkdown = typeof markdown === 'string' ? markdown : markdown.map(token => token.raw).join('');
+  validateSubstitutions(rawMarkdown, substitutions);
+  if (typeof markdown !== 'string' && !rawMarkdown.includes('{PLACEHOLDER_')) {
+    return markdown;
+  }
+  const markedInstance = new Marked.Marked.Marked({
+    extensions: [placeholderExtension],
+  });
+  return markedInstance.lexer(rawMarkdown);
+}

package/front_end/core/text_utils/text_utils.ts

@@ -5,6 +5,7 @@
 import * as CodeMirrorUtils from './CodeMirrorUtils.js';
 import * as ContentData from './ContentData.js';
 import * as ContentProvider from './ContentProvider.js';
+import * as Markdown from './Markdown.js';
 import * as StaticContentProvider from './StaticContentProvider.js';
 import * as StreamingContentData from './StreamingContentData.js';
 import * as Text from './Text.js';
@@ -17,6 +18,7 @@ export {
   CodeMirrorUtils,
   ContentData,
   ContentProvider,
+  Markdown,
   StaticContentProvider,
   StreamingContentData,
   Text,

package/front_end/devtools_compatibility.js

@@ -876,7 +876,8 @@
       'durable-messages': 110,
       'jpeg-xl': 111,
       'plus-button': 112,
-      MAX_VALUE: 113,
+      'source-map-scopes-in-sources-panel': 113,
+      MAX_VALUE: 114,
     },
     IssueExpanded: {
       CrossOriginEmbedderPolicy: 0,

package/front_end/entrypoints/main/MainImpl.ts

@@ -415,6 +415,14 @@ export class MainImpl {
       requiresChromeRestart: false,
     });
 
+    Root.Runtime.experiments.register({
+      name: Root.ExperimentNames.ExperimentName.SOURCE_MAP_SCOPES_IN_SOURCES_PANEL,
+      title: 'Source map scopes in the Sources panel',
+      aboutFlag: 'devtools-source-map-scopes-in-sources-panel',
+      isEnabled: Root.Runtime.hostConfig.devToolsSourceMapScopesInSourcesPanel?.enabled ?? false,
+      requiresChromeRestart: false,
+    });
+
     for (const experiment of Root.Runtime.experiments.allConfigurableExperiments()) {
       if (experiment.isEnabled()) {
         Host.userMetrics.experimentEnabledAtLaunch(experiment.name);

package/front_end/generated/InspectorBackendCommands.ts

@@ -73,7 +73,7 @@ inspectorBackend.registerType("Animation.KeyframesRule", [{"name": "name", "type
 inspectorBackend.registerType("Animation.KeyframeStyle", [{"name": "offset", "type": "string", "optional": false, "description": "Keyframe's time offset.", "typeRef": null}, {"name": "easing", "type": "string", "optional": false, "description": "`AnimationEffect`'s timing function.", "typeRef": null}]);
 
 // Audits.
-inspectorBackend.registerEnum("Audits.CookieExclusionReason", {ExcludeSameSiteUnspecifiedTreatedAsLax: "ExcludeSameSiteUnspecifiedTreatedAsLax", ExcludeSameSiteNoneInsecure: "ExcludeSameSiteNoneInsecure", ExcludeSameSiteLax: "ExcludeSameSiteLax", ExcludeSameSiteStrict: "ExcludeSameSiteStrict", ExcludeDomainNonASCII: "ExcludeDomainNonASCII", ExcludeThirdPartyCookieBlockedInFirstPartySet: "ExcludeThirdPartyCookieBlockedInFirstPartySet", ExcludeThirdPartyPhaseout: "ExcludeThirdPartyPhaseout", ExcludePortMismatch: "ExcludePortMismatch", ExcludeSchemeMismatch: "ExcludeSchemeMismatch"});
+inspectorBackend.registerEnum("Audits.CookieExclusionReason", {ExcludeSameSiteUnspecifiedTreatedAsLax: "ExcludeSameSiteUnspecifiedTreatedAsLax", ExcludeSameSiteNoneInsecure: "ExcludeSameSiteNoneInsecure", ExcludeSameSiteLax: "ExcludeSameSiteLax", ExcludeSameSiteStrict: "ExcludeSameSiteStrict", ExcludeDomainNonASCII: "ExcludeDomainNonASCII", ExcludeThirdPartyPhaseout: "ExcludeThirdPartyPhaseout", ExcludePortMismatch: "ExcludePortMismatch", ExcludeSchemeMismatch: "ExcludeSchemeMismatch"});
 inspectorBackend.registerEnum("Audits.CookieWarningReason", {WarnSameSiteUnspecifiedCrossSiteContext: "WarnSameSiteUnspecifiedCrossSiteContext", WarnSameSiteNoneInsecure: "WarnSameSiteNoneInsecure", WarnSameSiteUnspecifiedLaxAllowUnsafe: "WarnSameSiteUnspecifiedLaxAllowUnsafe", WarnSameSiteStrictLaxDowngradeStrict: "WarnSameSiteStrictLaxDowngradeStrict", WarnSameSiteStrictCrossDowngradeStrict: "WarnSameSiteStrictCrossDowngradeStrict", WarnSameSiteStrictCrossDowngradeLax: "WarnSameSiteStrictCrossDowngradeLax", WarnSameSiteLaxCrossDowngradeStrict: "WarnSameSiteLaxCrossDowngradeStrict", WarnSameSiteLaxCrossDowngradeLax: "WarnSameSiteLaxCrossDowngradeLax", WarnAttributeValueExceedsMaxSize: "WarnAttributeValueExceedsMaxSize", WarnDomainNonASCII: "WarnDomainNonASCII", WarnThirdPartyPhaseout: "WarnThirdPartyPhaseout", WarnCrossSiteRedirectDowngradeChangesInclusion: "WarnCrossSiteRedirectDowngradeChangesInclusion", WarnDeprecationTrialMetadata: "WarnDeprecationTrialMetadata", WarnThirdPartyCookieHeuristic: "WarnThirdPartyCookieHeuristic"});
 inspectorBackend.registerEnum("Audits.CookieOperation", {SetCookie: "SetCookie", ReadCookie: "ReadCookie"});
 inspectorBackend.registerEnum("Audits.InsightType", {GitHubResource: "GitHubResource", GracePeriod: "GracePeriod", Heuristics: "Heuristics"});
@@ -815,8 +815,8 @@ inspectorBackend.registerEnum("Network.TrustTokenOperationType", {Issuance: "Iss
 inspectorBackend.registerEnum("Network.AlternateProtocolUsage", {AlternativeJobWonWithoutRace: "alternativeJobWonWithoutRace", AlternativeJobWonRace: "alternativeJobWonRace", MainJobWonRace: "mainJobWonRace", MappingMissing: "mappingMissing", Broken: "broken", DnsAlpnH3JobWonWithoutRace: "dnsAlpnH3JobWonWithoutRace", DnsAlpnH3JobWonRace: "dnsAlpnH3JobWonRace", UnspecifiedReason: "unspecifiedReason"});
 inspectorBackend.registerEnum("Network.ServiceWorkerRouterSource", {Network: "network", Cache: "cache", FetchEvent: "fetch-event", RaceNetworkAndFetchHandler: "race-network-and-fetch-handler", RaceNetworkAndCache: "race-network-and-cache"});
 inspectorBackend.registerEnum("Network.InitiatorType", {Parser: "parser", Script: "script", Preload: "preload", SignedExchange: "SignedExchange", Preflight: "preflight", FedCM: "FedCM", Other: "other"});
-inspectorBackend.registerEnum("Network.SetCookieBlockedReason", {SecureOnly: "SecureOnly", SameSiteStrict: "SameSiteStrict", SameSiteLax: "SameSiteLax", SameSiteUnspecifiedTreatedAsLax: "SameSiteUnspecifiedTreatedAsLax", SameSiteNoneInsecure: "SameSiteNoneInsecure", UserPreferences: "UserPreferences", ThirdPartyPhaseout: "ThirdPartyPhaseout", ThirdPartyBlockedInFirstPartySet: "ThirdPartyBlockedInFirstPartySet", SyntaxError: "SyntaxError", SchemeNotSupported: "SchemeNotSupported", OverwriteSecure: "OverwriteSecure", InvalidDomain: "InvalidDomain", InvalidPrefix: "InvalidPrefix", UnknownError: "UnknownError", SchemefulSameSiteStrict: "SchemefulSameSiteStrict", SchemefulSameSiteLax: "SchemefulSameSiteLax", SchemefulSameSiteUnspecifiedTreatedAsLax: "SchemefulSameSiteUnspecifiedTreatedAsLax", NameValuePairExceedsMaxSize: "NameValuePairExceedsMaxSize", DisallowedCharacter: "DisallowedCharacter", NoCookieContent: "NoCookieContent"});
-inspectorBackend.registerEnum("Network.CookieBlockedReason", {SecureOnly: "SecureOnly", NotOnPath: "NotOnPath", DomainMismatch: "DomainMismatch", SameSiteStrict: "SameSiteStrict", SameSiteLax: "SameSiteLax", SameSiteUnspecifiedTreatedAsLax: "SameSiteUnspecifiedTreatedAsLax", SameSiteNoneInsecure: "SameSiteNoneInsecure", UserPreferences: "UserPreferences", ThirdPartyPhaseout: "ThirdPartyPhaseout", ThirdPartyBlockedInFirstPartySet: "ThirdPartyBlockedInFirstPartySet", UnknownError: "UnknownError", SchemefulSameSiteStrict: "SchemefulSameSiteStrict", SchemefulSameSiteLax: "SchemefulSameSiteLax", SchemefulSameSiteUnspecifiedTreatedAsLax: "SchemefulSameSiteUnspecifiedTreatedAsLax", NameValuePairExceedsMaxSize: "NameValuePairExceedsMaxSize", PortMismatch: "PortMismatch", SchemeMismatch: "SchemeMismatch", AnonymousContext: "AnonymousContext"});
+inspectorBackend.registerEnum("Network.SetCookieBlockedReason", {SecureOnly: "SecureOnly", SameSiteStrict: "SameSiteStrict", SameSiteLax: "SameSiteLax", SameSiteUnspecifiedTreatedAsLax: "SameSiteUnspecifiedTreatedAsLax", SameSiteNoneInsecure: "SameSiteNoneInsecure", UserPreferences: "UserPreferences", ThirdPartyPhaseout: "ThirdPartyPhaseout", SyntaxError: "SyntaxError", SchemeNotSupported: "SchemeNotSupported", OverwriteSecure: "OverwriteSecure", InvalidDomain: "InvalidDomain", InvalidPrefix: "InvalidPrefix", UnknownError: "UnknownError", SchemefulSameSiteStrict: "SchemefulSameSiteStrict", SchemefulSameSiteLax: "SchemefulSameSiteLax", SchemefulSameSiteUnspecifiedTreatedAsLax: "SchemefulSameSiteUnspecifiedTreatedAsLax", NameValuePairExceedsMaxSize: "NameValuePairExceedsMaxSize", DisallowedCharacter: "DisallowedCharacter", NoCookieContent: "NoCookieContent"});
+inspectorBackend.registerEnum("Network.CookieBlockedReason", {SecureOnly: "SecureOnly", NotOnPath: "NotOnPath", DomainMismatch: "DomainMismatch", SameSiteStrict: "SameSiteStrict", SameSiteLax: "SameSiteLax", SameSiteUnspecifiedTreatedAsLax: "SameSiteUnspecifiedTreatedAsLax", SameSiteNoneInsecure: "SameSiteNoneInsecure", UserPreferences: "UserPreferences", ThirdPartyPhaseout: "ThirdPartyPhaseout", UnknownError: "UnknownError", SchemefulSameSiteStrict: "SchemefulSameSiteStrict", SchemefulSameSiteLax: "SchemefulSameSiteLax", SchemefulSameSiteUnspecifiedTreatedAsLax: "SchemefulSameSiteUnspecifiedTreatedAsLax", NameValuePairExceedsMaxSize: "NameValuePairExceedsMaxSize", PortMismatch: "PortMismatch", SchemeMismatch: "SchemeMismatch", AnonymousContext: "AnonymousContext"});
 inspectorBackend.registerEnum("Network.CookieExemptionReason", {None: "None", UserSetting: "UserSetting", EnterprisePolicy: "EnterprisePolicy", StorageAccess: "StorageAccess", TopLevelStorageAccess: "TopLevelStorageAccess", Scheme: "Scheme", SameSiteNoneCookiesInSandbox: "SameSiteNoneCookiesInSandbox"});
 inspectorBackend.registerEnum("Network.AuthChallengeSource", {Server: "Server", Proxy: "Proxy"});
 inspectorBackend.registerEnum("Network.AuthChallengeResponseResponse", {Default: "Default", CancelAuth: "CancelAuth", ProvideCredentials: "ProvideCredentials"});
@@ -1183,7 +1183,7 @@ inspectorBackend.registerType("Page.FrameResource", [{"name": "url", "type": "st
 inspectorBackend.registerType("Page.FrameResourceTree", [{"name": "frame", "type": "object", "optional": false, "description": "Frame information for this tree item.", "typeRef": "Page.Frame"}, {"name": "childFrames", "type": "array", "optional": true, "description": "Child frames.", "typeRef": "Page.FrameResourceTree"}, {"name": "resources", "type": "array", "optional": false, "description": "Information about frame resources.", "typeRef": "Page.FrameResource"}]);
 inspectorBackend.registerType("Page.FrameTree", [{"name": "frame", "type": "object", "optional": false, "description": "Frame information for this tree item.", "typeRef": "Page.Frame"}, {"name": "childFrames", "type": "array", "optional": true, "description": "Child frames.", "typeRef": "Page.FrameTree"}]);
 inspectorBackend.registerType("Page.NavigationEntry", [{"name": "id", "type": "number", "optional": false, "description": "Unique id of the navigation history entry.", "typeRef": null}, {"name": "url", "type": "string", "optional": false, "description": "URL of the navigation history entry.", "typeRef": null}, {"name": "userTypedURL", "type": "string", "optional": false, "description": "URL that the user typed in the url bar.", "typeRef": null}, {"name": "title", "type": "string", "optional": false, "description": "Title of the navigation history entry.", "typeRef": null}, {"name": "transitionType", "type": "string", "optional": false, "description": "Transition type.", "typeRef": "Page.TransitionType"}]);
-inspectorBackend.registerType("Page.ScreencastFrameMetadata", [{"name": "offsetTop", "type": "number", "optional": false, "description": "Top offset in DIP.", "typeRef": null}, {"name": "pageScaleFactor", "type": "number", "optional": false, "description": "Page scale factor.", "typeRef": null}, {"name": "deviceWidth", "type": "number", "optional": false, "description": "Device screen width in DIP.", "typeRef": null}, {"name": "deviceHeight", "type": "number", "optional": false, "description": "Device screen height in DIP.", "typeRef": null}, {"name": "scrollOffsetX", "type": "number", "optional": false, "description": "Position of horizontal scroll in CSS pixels.", "typeRef": null}, {"name": "scrollOffsetY", "type": "number", "optional": false, "description": "Position of vertical scroll in CSS pixels.", "typeRef": null}, {"name": "timestamp", "type": "number", "optional": true, "description": "Frame swap timestamp.", "typeRef": "Network.TimeSinceEpoch"}]);
+inspectorBackend.registerType("Page.ScreencastFrameMetadata", [{"name": "offsetTop", "type": "number", "optional": false, "description": "Top offset in DIP.", "typeRef": null}, {"name": "pageScaleFactor", "type": "number", "optional": false, "description": "Page scale factor.", "typeRef": null}, {"name": "deviceWidth", "type": "number", "optional": false, "description": "Device screen width in DIP.", "typeRef": null}, {"name": "deviceHeight", "type": "number", "optional": false, "description": "Device screen height in DIP.", "typeRef": null}, {"name": "scrollOffsetX", "type": "number", "optional": false, "description": "Position of horizontal scroll in CSS pixels.", "typeRef": null}, {"name": "scrollOffsetY", "type": "number", "optional": false, "description": "Position of vertical scroll in CSS pixels.", "typeRef": null}, {"name": "timestamp", "type": "number", "optional": true, "description": "Frame swap timestamp.", "typeRef": "Network.TimeSinceEpoch"}, {"name": "monotonicTimestamp", "type": "number", "optional": true, "description": "Frame swap timestamp as monotonic time.", "typeRef": "Network.MonotonicTime"}]);
 inspectorBackend.registerType("Page.AppManifestError", [{"name": "message", "type": "string", "optional": false, "description": "Error message.", "typeRef": null}, {"name": "critical", "type": "number", "optional": false, "description": "If critical, this is a non-recoverable parse error.", "typeRef": null}, {"name": "line", "type": "number", "optional": false, "description": "Error line.", "typeRef": null}, {"name": "column", "type": "number", "optional": false, "description": "Error column.", "typeRef": null}]);
 inspectorBackend.registerType("Page.AppManifestParsedProperties", [{"name": "scope", "type": "string", "optional": false, "description": "Computed scope value", "typeRef": null}]);
 inspectorBackend.registerType("Page.LayoutViewport", [{"name": "pageX", "type": "number", "optional": false, "description": "Horizontal offset relative to the document (CSS pixels).", "typeRef": null}, {"name": "pageY", "type": "number", "optional": false, "description": "Vertical offset relative to the document (CSS pixels).", "typeRef": null}, {"name": "clientWidth", "type": "number", "optional": false, "description": "Width (CSS pixels), excludes scrollbar if present.", "typeRef": null}, {"name": "clientHeight", "type": "number", "optional": false, "description": "Height (CSS pixels), excludes scrollbar if present.", "typeRef": null}]);
@@ -1362,6 +1362,7 @@ inspectorBackend.registerCommand("Storage.untrackIndexedDBForStorageKey", [{"nam
 inspectorBackend.registerCommand("Storage.getTrustTokens", [], ["tokens"], "Returns the number of stored Trust Tokens per issuer for the current browsing context.");
 inspectorBackend.registerCommand("Storage.clearTrustTokens", [{"name": "issuerOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}], ["didDeleteTokens"], "Removes all Trust Tokens issued by the provided issuerOrigin. Leaves other stored data, including the issuer's Redemption Records, intact.");
 inspectorBackend.registerCommand("Storage.getPrivateVerificationTokens", [], ["tokens"], "Returns all stored Private Verification Tokens for the current browsing context.");
+inspectorBackend.registerCommand("Storage.getPrivateVerificationTokensIssuerConfigs", [], ["configs"], "Returns the configured Private Verification Tokens issuers and their redeemer origins.");
 inspectorBackend.registerCommand("Storage.clearPrivateVerificationTokens", [{"name": "issuerOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}], [], "Removes all Private Verification Tokens issued by the provided issuerOrigin.");
 inspectorBackend.registerCommand("Storage.deletePrivateVerificationToken", [{"name": "tokenId", "type": "string", "optional": false, "description": "", "typeRef": null}], [], "Removes a specific Private Verification Token by its ID.");
 inspectorBackend.registerCommand("Storage.setPrivateVerificationTokensTracking", [{"name": "enable", "type": "boolean", "optional": false, "description": "", "typeRef": null}], [], "Set tracking for Private Verification Tokens.");
@@ -1371,6 +1372,7 @@ inspectorBackend.registerCommand("Storage.runBounceTrackingMitigations", [], ["d
 inspectorBackend.registerType("Storage.UsageForType", [{"name": "storageType", "type": "string", "optional": false, "description": "Name of storage type.", "typeRef": "Storage.StorageType"}, {"name": "usage", "type": "number", "optional": false, "description": "Storage usage (bytes).", "typeRef": null}]);
 inspectorBackend.registerType("Storage.TrustTokens", [{"name": "issuerOrigin", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "count", "type": "number", "optional": false, "description": "", "typeRef": null}]);
 inspectorBackend.registerType("Storage.PrivateVerificationToken", [{"name": "id", "type": "string", "optional": false, "description": "Unique identifier of the token in the database.", "typeRef": null}, {"name": "issuerOrigin", "type": "string", "optional": false, "description": "Origin of the token issuer.", "typeRef": null}, {"name": "keyId", "type": "number", "optional": false, "description": "Public key ID used to issue the token.", "typeRef": null}, {"name": "expiration", "type": "number", "optional": false, "description": "Expiration timestamp in seconds since the epoch.", "typeRef": "Network.TimeSinceEpoch"}, {"name": "creationTime", "type": "number", "optional": false, "description": "Token creation timestamp in seconds since the epoch.", "typeRef": "Network.TimeSinceEpoch"}, {"name": "version", "type": "number", "optional": false, "description": "Token protocol version.", "typeRef": null}, {"name": "token", "type": "string", "optional": false, "description": "Base64-encoded serialized token.", "typeRef": null}]);
+inspectorBackend.registerType("Storage.PrivateVerificationTokensIssuerConfig", [{"name": "issuerOrigin", "type": "string", "optional": false, "description": "Origin of the token issuer.", "typeRef": null}, {"name": "redeemerOrigins", "type": "array", "optional": false, "description": "Origins authorized to redeem tokens from this issuer.", "typeRef": "string"}]);
 inspectorBackend.registerType("Storage.StorageBucket", [{"name": "storageKey", "type": "string", "optional": false, "description": "", "typeRef": "Storage.SerializedStorageKey"}, {"name": "name", "type": "string", "optional": true, "description": "If not specified, it is the default bucket of the storageKey.", "typeRef": null}]);
 inspectorBackend.registerType("Storage.StorageBucketInfo", [{"name": "bucket", "type": "object", "optional": false, "description": "", "typeRef": "Storage.StorageBucket"}, {"name": "id", "type": "string", "optional": false, "description": "", "typeRef": null}, {"name": "expiration", "type": "number", "optional": false, "description": "", "typeRef": "Network.TimeSinceEpoch"}, {"name": "quota", "type": "number", "optional": false, "description": "Storage quota (bytes).", "typeRef": null}, {"name": "persistent", "type": "boolean", "optional": false, "description": "", "typeRef": null}, {"name": "durability", "type": "string", "optional": false, "description": "", "typeRef": "Storage.StorageBucketsDurability"}]);
 

package/front_end/generated/protocol-mapping.d.ts

@@ -4954,6 +4954,14 @@ export namespace ProtocolMapping {
       paramsType: [];
       returnType: Protocol.Storage.GetPrivateVerificationTokensResponse;
     };
+    /**
+     * Returns the configured Private Verification Tokens issuers and their redeemer
+     * origins.
+     */
+    'Storage.getPrivateVerificationTokensIssuerConfigs': {
+      paramsType: [];
+      returnType: Protocol.Storage.GetPrivateVerificationTokensIssuerConfigsResponse;
+    };
     /**
      * Removes all Private Verification Tokens issued by the provided issuerOrigin.
      */

package/front_end/generated/protocol-proxy-api.d.ts

@@ -4331,6 +4331,12 @@ declare namespace ProtocolProxyApi {
      */
     invoke_getPrivateVerificationTokens(): Promise<Protocol.Storage.GetPrivateVerificationTokensResponse>;
 
+    /**
+     * Returns the configured Private Verification Tokens issuers and their redeemer
+     * origins.
+     */
+    invoke_getPrivateVerificationTokensIssuerConfigs(): Promise<Protocol.Storage.GetPrivateVerificationTokensIssuerConfigsResponse>;
+
     /**
      * Removes all Private Verification Tokens issued by the provided issuerOrigin.
      */

package/front_end/generated/protocol.ts

@@ -875,7 +875,6 @@ export namespace Audits {
     ExcludeSameSiteLax = 'ExcludeSameSiteLax',
     ExcludeSameSiteStrict = 'ExcludeSameSiteStrict',
     ExcludeDomainNonASCII = 'ExcludeDomainNonASCII',
-    ExcludeThirdPartyCookieBlockedInFirstPartySet = 'ExcludeThirdPartyCookieBlockedInFirstPartySet',
     ExcludeThirdPartyPhaseout = 'ExcludeThirdPartyPhaseout',
     ExcludePortMismatch = 'ExcludePortMismatch',
     ExcludeSchemeMismatch = 'ExcludeSchemeMismatch',
@@ -11318,7 +11317,6 @@ export namespace Network {
     SameSiteNoneInsecure = 'SameSiteNoneInsecure',
     UserPreferences = 'UserPreferences',
     ThirdPartyPhaseout = 'ThirdPartyPhaseout',
-    ThirdPartyBlockedInFirstPartySet = 'ThirdPartyBlockedInFirstPartySet',
     SyntaxError = 'SyntaxError',
     SchemeNotSupported = 'SchemeNotSupported',
     OverwriteSecure = 'OverwriteSecure',
@@ -11346,7 +11344,6 @@ export namespace Network {
     SameSiteNoneInsecure = 'SameSiteNoneInsecure',
     UserPreferences = 'UserPreferences',
     ThirdPartyPhaseout = 'ThirdPartyPhaseout',
-    ThirdPartyBlockedInFirstPartySet = 'ThirdPartyBlockedInFirstPartySet',
     UnknownError = 'UnknownError',
     SchemefulSameSiteStrict = 'SchemefulSameSiteStrict',
     SchemefulSameSiteLax = 'SchemefulSameSiteLax',
@@ -15136,6 +15133,10 @@ export namespace Page {
      * Frame swap timestamp.
      */
     timestamp?: Network.TimeSinceEpoch;
+    /**
+     * Frame swap timestamp as monotonic time.
+     */
+    monotonicTimestamp?: Network.MonotonicTime;
   }
 
   /**
@@ -18507,6 +18508,20 @@ export namespace Storage {
     token: string;
   }
 
+  /**
+   * Configuration for a Private Verification Tokens issuer.
+   */
+  export interface PrivateVerificationTokensIssuerConfig {
+    /**
+     * Origin of the token issuer.
+     */
+    issuerOrigin: string;
+    /**
+     * Origins authorized to redeem tokens from this issuer.
+     */
+    redeemerOrigins: string[];
+  }
+
   export const enum StorageBucketsDurability {
     Relaxed = 'relaxed',
     Strict = 'strict',
@@ -18720,6 +18735,10 @@ export namespace Storage {
     tokens: PrivateVerificationToken[];
   }
 
+  export interface GetPrivateVerificationTokensIssuerConfigsResponse extends ProtocolResponseWithError {
+    configs: PrivateVerificationTokensIssuerConfig[];
+  }
+
   export interface ClearPrivateVerificationTokensRequest {
     issuerOrigin: string;
   }

package/front_end/models/ai_assistance/AiAgent2.ts

@@ -141,7 +141,19 @@ export class AiAgent2 extends AiAgent<unknown> {
   readonly #declaredTools = new Set<string>();
 
   constructor(opts: AiAgent2Options) {
-    super(opts);
+    super({
+      ...opts,
+      allowedOrigin: opts.allowedOrigin ?? (() => {
+                       const lock = opts.originLock();
+                       if (lock.status === 'BLOCKED_BY_NAVIGATION') {
+                         return {blocked: true};
+                       }
+                       if (lock.status === 'ESTABLISHED_ORIGIN') {
+                         return {origin: lock.origin};
+                       }
+                       return {origin: undefined};
+                     }),
+    });
     this.#changes = opts.changeManager ?? new ChangeManager(opts.targetManager);
     this.#lighthouseRecording = opts.lighthouseRecording;
     this.#performanceRecordAndReload = opts.performanceRecordAndReload;

package/front_end/models/ai_assistance/AiConversation.ts

@@ -434,7 +434,7 @@ export class AiConversation {
           } = {},
           ): AsyncGenerator<ResponseData, void, void> {
     this.#navigationOccurredDuringRun = false;
-    const originAtRunStart = getPrimaryPageSecurityOrigin(this.#targetManager);
+    const originAtRunStart = this.#origin ?? getPrimaryPageSecurityOrigin(this.#targetManager);
     const listener = (): void => {
       // Prevent the agent from executing tools or reading data from an untrusted origin
       // if the page navigates unexpectedly during execution.

package/front_end/models/ai_assistance/agents/ContextSelectionAgent.ts

@@ -148,13 +148,12 @@ export class ContextSelectionAgent extends AiAgent<never> {
           };
         }
         const origin = allowedOriginResult.origin;
-        if (origin?.isOpaque()) {
+        if (!origin || origin.isOpaque()) {
           return {
             error: 'No requests recorded by DevTools',
           };
         }
 
-        const allowedSecurityOrigin = origin ?? null;
         let hasCrossOriginRequest = false;
         const requestsToShow: NetworkRequest[] = [];
         for (const request of this.#networkLog.requests()) {
@@ -166,7 +165,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
            * during the loading of the target page, and do not leak URLs from
            * other pages.
            */
-          if (allowedSecurityOrigin && !request.initiatorSecurityOrigin().isSameOriginWith(allowedSecurityOrigin)) {
+          if (!isOriginAllowedByLock({status: 'ESTABLISHED_ORIGIN', origin}, request.initiatorSecurityOrigin())) {
             hasCrossOriginRequest = true;
             continue;
           }
@@ -184,7 +183,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
         if (requests.length === 0) {
           return {
             error: hasCrossOriginRequest ?
-                `No requests showing with origin ${origin?.siteId() ?? ''}. Tell the user to start a new chat` :
+                `No requests showing with origin ${origin.siteId()}. Tell the user to start a new chat` :
                 'No requests recorded by DevTools',
           };
         }
@@ -231,18 +230,17 @@ export class ContextSelectionAgent extends AiAgent<never> {
           };
         }
         const origin = allowedOriginResult.origin;
-        if (origin?.isOpaque()) {
+        if (!origin || origin.isOpaque()) {
           return {
             error: 'No request found',
           };
         }
-        const allowedSecurityOrigin = origin ?? null;
         const request = this.#networkLog.requests().find(req => {
           if (req.requestId() !== id) {
             return false;
           }
 
-          return !allowedSecurityOrigin || req.initiatorSecurityOrigin().isSameOriginWith(allowedSecurityOrigin);
+          return isOriginAllowedByLock({status: 'ESTABLISHED_ORIGIN', origin}, req.initiatorSecurityOrigin());
         });
 
         if (request) {
@@ -288,13 +286,16 @@ export class ContextSelectionAgent extends AiAgent<never> {
           };
         }
         const origin = allowedOriginResult.origin;
+        if (!origin || origin.isOpaque()) {
+          return {
+            result: [],
+          };
+        }
 
         const files: Array<{file: string, id: number | undefined}> = [];
         const uiSourceCodes: Workspace.UISourceCode.UISourceCode[] = [];
         for (const file of ContextSelectionAgent.getUISourceCodes(this.#workspace)) {
-          const fileSecurityOrigin = file.securityOrigin();
-
-          if (origin && !fileSecurityOrigin.isSameOriginWith(origin)) {
+          if (!isOriginAllowedByLock({status: 'ESTABLISHED_ORIGIN', origin}, file.securityOrigin())) {
             continue;
           }
 
@@ -347,14 +348,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
           };
         }
         const origin = allowedOriginResult.origin;
-
-        const file = ContextSelectionAgent.getUISourceCodes(this.#workspace).find(file => {
-          if (ContextSelectionAgent.uiSourceCodeId.get(file) !== params.id) {
-            return false;
-          }
-          const fileSecurityOrigin = file.securityOrigin();
-          return !origin || fileSecurityOrigin.isSameOriginWith(origin);
-        });
+        const file = ContextSelectionAgent.getSourceById(params.id, origin, this.#workspace);
 
         if (!file) {
           return {
@@ -524,7 +518,7 @@ export class ContextSelectionAgent extends AiAgent<never> {
             };
           }
           const origin = allowedOriginResult.origin;
-          if (!origin) {
+          if (!origin || origin.isOpaque()) {
             return {
               error: 'Unable to find page storage.',
             };

package/front_end/models/change_tracker/ChangeTracker.ts

@@ -5,23 +5,11 @@
 import * as Root from '../../core/root/root.js';
 import type * as CommentManager from '../comment_manager/comment_manager.js';
 
-export type ChangeRecord = CommentManager.CommentManager.ChangeRecord;
-
-export const MAX_RECORDS = 1000;
-
 export class ChangeTracker {
-  readonly #records = new Map<string, ChangeRecord>();
   readonly #commentManager: CommentManager.CommentManager.CommentManager;
-  readonly #maxRecords: number;
-  #lastRecord?: ChangeRecord;
 
-  constructor(commentManager: CommentManager.CommentManager.CommentManager, maxRecords: number = MAX_RECORDS) {
+  constructor(commentManager: CommentManager.CommentManager.CommentManager) {
     this.#commentManager = commentManager;
-    this.#maxRecords = Math.max(1, maxRecords);
-  }
-
-  get maxRecords(): number {
-    return this.#maxRecords;
   }
 
   get isTracking(): boolean {
@@ -31,59 +19,12 @@ export class ChangeTracker {
   trackChange(
       description: string,
       anchor: CommentManager.CommentManager.CommentAnchorSignature,
-      ): ChangeRecord|null {
+      ): void {
     if (!this.isTracking) {
-      return null;
-    }
-    const record: ChangeRecord = {
-      id: crypto.randomUUID(),
-      description,
-      timestamp: Date.now(),
-    };
-    while (this.#records.size >= this.#maxRecords) {
-      this.#evictOldestRecord();
-    }
-
-    const thread = this.#commentManager.createCommentThread(anchor, undefined, undefined, [record]);
-    this.#records.set(thread.id, record);
-    this.#lastRecord = record;
-    return record;
-  }
-
-  #evictOldestRecord(): void {
-    // Delete the oldest record for which the comment thread has no user comments.
-    // If all comment threads have user comments, delete the oldest record.
-    for (const threadId of this.#records.keys()) {
-      const thread = this.#commentManager.getCommentThread(threadId);
-      if (!thread || thread.comments.length === 0) {
-        this.#commentManager.removeCommentThread(threadId);
-        this.#records.delete(threadId);
-        return;
-      }
+      return;
     }
 
-    const oldestThreadId = this.#records.keys().next().value;
-    if (oldestThreadId) {
-      this.#records.delete(oldestThreadId);
-    }
-  }
-
-  getChanges(): ChangeRecord[] {
-    return Array.from(this.#records.values());
-  }
-
-  getLastChange(): ChangeRecord|undefined {
-    return this.#lastRecord;
-  }
-
-  clear(): void {
-    for (const threadId of this.#records.keys()) {
-      const thread = this.#commentManager.getCommentThread(threadId);
-      if (!thread || thread.comments.length === 0) {
-        this.#commentManager.removeCommentThread(threadId);
-      }
-    }
-    this.#records.clear();
-    this.#lastRecord = undefined;
+    const thread = this.#commentManager.createCommentThread(anchor, description, 'DEVELOPER', true);
+    thread.save();
   }
 }

package/front_end/models/comment_manager/CD4ABridge.ts

@@ -87,8 +87,13 @@ export class CD4ABridge extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
 
   #formatCommentText(thread: CommentManager.CommentThread): string {
     const rawText = thread.comments[0]?.text ?? '';
+
     const details: string[] = [];
 
+    if (thread.anchor.vePath) {
+      details.push(`- DevTools VEPath: ${thread.anchor.vePath}`);
+    }
+
     if (thread.anchor.textSignature) {
       details.push(`- DevTools element: ${thread.anchor.textSignature}`);
     }

package/front_end/models/comment_manager/CommentManager.ts

@@ -5,7 +5,6 @@
 import * as Common from '../../core/common/common.js';
 
 import {
-  type ChangeRecord,
   type Comment,
   type CommentAnchorSignature,
   CommentThread,
@@ -18,7 +17,6 @@ import {
 } from './CommentThread.js';
 
 export {
-  type ChangeRecord,
   type Comment,
   type CommentAnchorSignature,
   CommentThread,
@@ -92,7 +90,7 @@ export class CommentManager extends Common.ObjectWrapper.ObjectWrapper<EventType
       anchor: CommentAnchorSignature,
       text?: string,
       author: 'DEVELOPER'|'AGENT' = 'DEVELOPER',
-      changes?: ChangeRecord[],
+      isGeneratedComment?: boolean,
       ): CommentThread {
     const comments: Comment[] = text ? [{
       author,
@@ -103,7 +101,7 @@ export class CommentManager extends Common.ObjectWrapper.ObjectWrapper<EventType
     const thread = new CommentThread({
       anchor,
       comments,
-      changes,
+      isGeneratedComment,
     });
     thread.addEventListener(CommentThreadEvents.CHANGED, this.#onThreadChanged, this);
 
@@ -123,7 +121,7 @@ export class CommentManager extends Common.ObjectWrapper.ObjectWrapper<EventType
   takeComments(): CommentThread[] {
     const threads: CommentThread[] = [];
     for (const thread of this.#commentThreads.values()) {
-      if (thread.status === 'ACTIVE' && !thread.transmitted) {
+      if (thread.status === 'SENT_TO_AGENT' && !thread.transmitted) {
         thread.transmitted = true;
         threads.push(thread);
       }