chrome-devtools-frontend 1.0.1704172 → 1.0.1706026

package/front_end/generated/InspectorBackendCommands.ts

@@ -545,7 +545,8 @@ inspectorBackend.registerCommand("Emulation.setSafeAreaInsetsOverride", [{"name"
 inspectorBackend.registerCommand("Emulation.setVirtualKeyboardGeometryOverride", [{"name": "keyboardRect", "type": "object", "optional": true, "description": "", "typeRef": "DOM.Rect"}], [], "Overrides virtual keyboard geometry in CSS pixels, relative to the top-level viewport. The provided rect is used for navigator.virtualKeyboard.boundingRect, geometrychange events, and env(keyboard-inset-*) values on the inspected frame. The override applies independently of navigator.virtualKeyboard.overlaysContent so clients can preview overlay geometry without mutating page state. Values are rounded to the nearest CSS pixel. Omitting the rect clears the override.");
 inspectorBackend.registerEnum("Emulation.SetDeviceMetricsOverrideRequestScrollbarType", {Overlay: "overlay", Default: "default"});
 inspectorBackend.registerEnum("Emulation.SetDeviceMetricsOverrideRequestViewportMeta", {Enable: "enable", Default: "default"});
-inspectorBackend.registerCommand("Emulation.setDeviceMetricsOverride", [{"name": "width", "type": "number", "optional": false, "description": "Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override.", "typeRef": null}, {"name": "height", "type": "number", "optional": false, "description": "Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override.", "typeRef": null}, {"name": "deviceScaleFactor", "type": "number", "optional": false, "description": "Overriding device scale factor value. 0 disables the override.", "typeRef": null}, {"name": "mobile", "type": "boolean", "optional": false, "description": "Whether to emulate mobile device. This includes viewport meta tag, overlay scrollbars, text autosizing and more.", "typeRef": null}, {"name": "scale", "type": "number", "optional": true, "description": "Scale to apply to resulting view image.", "typeRef": null}, {"name": "screenWidth", "type": "number", "optional": true, "description": "Overriding screen width value in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "screenHeight", "type": "number", "optional": true, "description": "Overriding screen height value in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "positionX", "type": "number", "optional": true, "description": "Overriding view X position on screen in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "positionY", "type": "number", "optional": true, "description": "Overriding view Y position on screen in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "dontSetVisibleSize", "type": "boolean", "optional": true, "description": "Do not set visible view size, rely upon explicit setVisibleSize call.", "typeRef": null}, {"name": "screenOrientation", "type": "object", "optional": true, "description": "Screen orientation override.", "typeRef": "Emulation.ScreenOrientation"}, {"name": "viewport", "type": "object", "optional": true, "description": "If set, the visible area of the page will be overridden to this viewport. This viewport change is not observed by the page, e.g. viewport-relative elements do not change positions.", "typeRef": "Page.Viewport"}, {"name": "displayFeature", "type": "object", "optional": true, "description": "If set, the display feature of a multi-segment screen. If not set, multi-segment support is turned-off. Deprecated, use Emulation.setDisplayFeaturesOverride.", "typeRef": "Emulation.DisplayFeature"}, {"name": "devicePosture", "type": "object", "optional": true, "description": "If set, the posture of a foldable device. If not set the posture is set to continuous. Deprecated, use Emulation.setDevicePostureOverride.", "typeRef": "Emulation.DevicePosture"}, {"name": "scrollbarType", "type": "string", "optional": true, "description": "Scrollbar type. Default: `default`.", "typeRef": "Emulation.SetDeviceMetricsOverrideRequestScrollbarType"}, {"name": "screenOrientationLockEmulation", "type": "boolean", "optional": true, "description": "If set to true, enables screen orientation lock emulation, which intercepts screen.orientation.lock() calls from the page and reports orientation changes via screenOrientationLockChanged events. This is useful for emulating mobile device orientation lock behavior in responsive design mode.", "typeRef": null}, {"name": "viewportMeta", "type": "string", "optional": true, "description": "Viewport meta tag behavior. Default: `default`. Note: if `mobile` is `true`, the viewport meta tag is always enabled.", "typeRef": "Emulation.SetDeviceMetricsOverrideRequestViewportMeta"}], [], "Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and \"device-width\"/\"device-height\"-related CSS media query results).");
+inspectorBackend.registerEnum("Emulation.SetDeviceMetricsOverrideRequestTextLayoutMode", {Mobile: "mobile", Default: "default"});
+inspectorBackend.registerCommand("Emulation.setDeviceMetricsOverride", [{"name": "width", "type": "number", "optional": false, "description": "Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override.", "typeRef": null}, {"name": "height", "type": "number", "optional": false, "description": "Overriding height value in pixels (minimum 0, maximum 10000000). 0 disables the override.", "typeRef": null}, {"name": "deviceScaleFactor", "type": "number", "optional": false, "description": "Overriding device scale factor value. 0 disables the override.", "typeRef": null}, {"name": "mobile", "type": "boolean", "optional": false, "description": "Whether to emulate mobile device. This includes viewport meta tag, overlay scrollbars, text autosizing and more.", "typeRef": null}, {"name": "scale", "type": "number", "optional": true, "description": "Scale to apply to resulting view image.", "typeRef": null}, {"name": "screenWidth", "type": "number", "optional": true, "description": "Overriding screen width value in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "screenHeight", "type": "number", "optional": true, "description": "Overriding screen height value in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "positionX", "type": "number", "optional": true, "description": "Overriding view X position on screen in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "positionY", "type": "number", "optional": true, "description": "Overriding view Y position on screen in pixels (minimum 0, maximum 10000000).", "typeRef": null}, {"name": "dontSetVisibleSize", "type": "boolean", "optional": true, "description": "Do not set visible view size, rely upon explicit setVisibleSize call.", "typeRef": null}, {"name": "screenOrientation", "type": "object", "optional": true, "description": "Screen orientation override.", "typeRef": "Emulation.ScreenOrientation"}, {"name": "viewport", "type": "object", "optional": true, "description": "If set, the visible area of the page will be overridden to this viewport. This viewport change is not observed by the page, e.g. viewport-relative elements do not change positions.", "typeRef": "Page.Viewport"}, {"name": "displayFeature", "type": "object", "optional": true, "description": "If set, the display feature of a multi-segment screen. If not set, multi-segment support is turned-off. Deprecated, use Emulation.setDisplayFeaturesOverride.", "typeRef": "Emulation.DisplayFeature"}, {"name": "devicePosture", "type": "object", "optional": true, "description": "If set, the posture of a foldable device. If not set the posture is set to continuous. Deprecated, use Emulation.setDevicePostureOverride.", "typeRef": "Emulation.DevicePosture"}, {"name": "scrollbarType", "type": "string", "optional": true, "description": "Scrollbar type. Default: `default`.", "typeRef": "Emulation.SetDeviceMetricsOverrideRequestScrollbarType"}, {"name": "screenOrientationLockEmulation", "type": "boolean", "optional": true, "description": "If set to true, enables screen orientation lock emulation, which intercepts screen.orientation.lock() calls from the page and reports orientation changes via screenOrientationLockChanged events. This is useful for emulating mobile device orientation lock behavior in responsive design mode.", "typeRef": null}, {"name": "viewportMeta", "type": "string", "optional": true, "description": "Viewport meta tag behavior. Default: `default`. Note: if `mobile` is `true`, the viewport meta tag is always enabled.", "typeRef": "Emulation.SetDeviceMetricsOverrideRequestViewportMeta"}, {"name": "textLayoutMode", "type": "string", "optional": true, "description": "Text layout mode. Default: `default`. Note: if `mobile` is `true`, mobile text layout mode (text autosizing) is always enabled.", "typeRef": "Emulation.SetDeviceMetricsOverrideRequestTextLayoutMode"}], [], "Overrides the values of device screen dimensions (window.screen.width, window.screen.height, window.innerWidth, window.innerHeight, and \"device-width\"/\"device-height\"-related CSS media query results).");
 inspectorBackend.registerCommand("Emulation.setDevicePostureOverride", [{"name": "posture", "type": "object", "optional": false, "description": "", "typeRef": "Emulation.DevicePosture"}], [], "Start reporting the given posture value to the Device Posture API. This override can also be set in setDeviceMetricsOverride().");
 inspectorBackend.registerCommand("Emulation.clearDevicePostureOverride", [], [], "Clears a device posture override set with either setDeviceMetricsOverride() or setDevicePostureOverride() and starts using posture information from the platform again. Does nothing if no override is set.");
 inspectorBackend.registerCommand("Emulation.setDisplayFeaturesOverride", [{"name": "features", "type": "array", "optional": false, "description": "", "typeRef": "Emulation.DisplayFeature"}], [], "Start using the given display features to pupulate the Viewport Segments API. This override can also be set in setDeviceMetricsOverride().");
@@ -1240,7 +1241,7 @@ inspectorBackend.registerEvent("Preload.ruleSetUpdated", ["ruleSet"]);
 inspectorBackend.registerEvent("Preload.ruleSetRemoved", ["id"]);
 inspectorBackend.registerEvent("Preload.preloadEnabledStateUpdated", ["disabledByPreference", "disabledByDataSaver", "disabledByBatterySaver", "disabledByHoldbackPrefetchSpeculationRules", "disabledByHoldbackPrerenderSpeculationRules"]);
 inspectorBackend.registerEvent("Preload.prefetchStatusUpdated", ["key", "pipelineId", "initiatingFrameId", "prefetchUrl", "status", "prefetchStatus", "requestId"]);
-inspectorBackend.registerEvent("Preload.prerenderStatusUpdated", ["key", "pipelineId", "status", "prerenderStatus", "disallowedMojoInterface", "mismatchedHeaders"]);
+inspectorBackend.registerEvent("Preload.prerenderStatusUpdated", ["key", "pipelineId", "status", "effectiveAction", "prerenderStatus", "disallowedMojoInterface", "mismatchedHeaders"]);
 inspectorBackend.registerEvent("Preload.preloadingAttemptSourcesUpdated", ["loaderId", "preloadingAttemptSources"]);
 inspectorBackend.registerCommand("Preload.enable", [], [], "");
 inspectorBackend.registerCommand("Preload.disable", [], [], "");
@@ -1563,7 +1564,7 @@ inspectorBackend.registerType("Debugger.Location", [{"name": "scriptId", "type":
 inspectorBackend.registerType("Debugger.ScriptPosition", [{"name": "lineNumber", "type": "number", "optional": false, "description": "", "typeRef": null}, {"name": "columnNumber", "type": "number", "optional": false, "description": "", "typeRef": null}]);
 inspectorBackend.registerType("Debugger.LocationRange", [{"name": "scriptId", "type": "string", "optional": false, "description": "", "typeRef": "Runtime.ScriptId"}, {"name": "start", "type": "object", "optional": false, "description": "", "typeRef": "Debugger.ScriptPosition"}, {"name": "end", "type": "object", "optional": false, "description": "", "typeRef": "Debugger.ScriptPosition"}]);
 inspectorBackend.registerType("Debugger.CallFrame", [{"name": "callFrameId", "type": "string", "optional": false, "description": "Call frame identifier. This identifier is only valid while the virtual machine is paused.", "typeRef": "Debugger.CallFrameId"}, {"name": "functionName", "type": "string", "optional": false, "description": "Name of the JavaScript function called on this call frame.", "typeRef": null}, {"name": "functionLocation", "type": "object", "optional": true, "description": "Location in the source code.", "typeRef": "Debugger.Location"}, {"name": "location", "type": "object", "optional": false, "description": "Location in the source code.", "typeRef": "Debugger.Location"}, {"name": "url", "type": "string", "optional": false, "description": "JavaScript script name or url. Deprecated in favor of using the `location.scriptId` to resolve the URL via a previously sent `Debugger.scriptParsed` event.", "typeRef": null}, {"name": "scopeChain", "type": "array", "optional": false, "description": "Scope chain for this call frame.", "typeRef": "Debugger.Scope"}, {"name": "this", "type": "object", "optional": false, "description": "`this` object for this call frame.", "typeRef": "Runtime.RemoteObject"}, {"name": "returnValue", "type": "object", "optional": true, "description": "The value being returned, if the function is at return point.", "typeRef": "Runtime.RemoteObject"}, {"name": "canBeRestarted", "type": "boolean", "optional": true, "description": "Valid only while the VM is paused and indicates whether this frame can be restarted or not. Note that a `true` value here does not guarantee that Debugger#restartFrame with this CallFrameId will be successful, but it is very likely.", "typeRef": null}]);
-inspectorBackend.registerType("Debugger.Scope", [{"name": "type", "type": "string", "optional": false, "description": "Scope type.", "typeRef": null}, {"name": "object", "type": "object", "optional": false, "description": "Object representing the scope. For `global` and `with` scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties.", "typeRef": "Runtime.RemoteObject"}, {"name": "name", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "startLocation", "type": "object", "optional": true, "description": "Location in the source code where scope starts", "typeRef": "Debugger.Location"}, {"name": "endLocation", "type": "object", "optional": true, "description": "Location in the source code where scope ends", "typeRef": "Debugger.Location"}, {"name": "empty", "type": "boolean", "optional": true, "description": "True if the scope does not declare any variables or have a runtime context. Only present if true. Empty scopes are retained in the scope chain because they can be targeted via `evaluateOnCallFrame` (using `scopeNumber`) or matched against scopes in source maps.", "typeRef": null}]);
+inspectorBackend.registerType("Debugger.Scope", [{"name": "type", "type": "string", "optional": false, "description": "Scope type.", "typeRef": null}, {"name": "object", "type": "object", "optional": false, "description": "Object representing the scope. For `global` and `with` scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties.", "typeRef": "Runtime.RemoteObject"}, {"name": "name", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "startLocation", "type": "object", "optional": true, "description": "Location in the source code where scope starts", "typeRef": "Debugger.Location"}, {"name": "endLocation", "type": "object", "optional": true, "description": "Location in the source code where scope ends", "typeRef": "Debugger.Location"}, {"name": "empty", "type": "boolean", "optional": true, "description": "True if the scope does not declare any variables. Only present if true. Empty scopes are retained in the scope chain because they can be targeted via `evaluateOnCallFrame` (using `scopeNumber`) or matched against scopes in source maps.", "typeRef": null}]);
 inspectorBackend.registerType("Debugger.SearchMatch", [{"name": "lineNumber", "type": "number", "optional": false, "description": "Line number in resource content.", "typeRef": null}, {"name": "lineContent", "type": "string", "optional": false, "description": "Line with match content.", "typeRef": null}]);
 inspectorBackend.registerType("Debugger.BreakLocation", [{"name": "scriptId", "type": "string", "optional": false, "description": "Script identifier as reported in the `Debugger.scriptParsed`.", "typeRef": "Runtime.ScriptId"}, {"name": "lineNumber", "type": "number", "optional": false, "description": "Line number in the script (0-based).", "typeRef": null}, {"name": "columnNumber", "type": "number", "optional": true, "description": "Column number in the script (0-based).", "typeRef": null}, {"name": "type", "type": "string", "optional": true, "description": "", "typeRef": null}]);
 inspectorBackend.registerType("Debugger.WasmDisassemblyChunk", [{"name": "lines", "type": "array", "optional": false, "description": "The next chunk of disassembled lines.", "typeRef": "string"}, {"name": "bytecodeOffsets", "type": "array", "optional": false, "description": "The bytecode offsets describing the start of each line.", "typeRef": "integer"}]);

package/front_end/generated/protocol.ts

@@ -7517,6 +7517,11 @@ export namespace Emulation {
     Default = 'default',
   }
 
+  export const enum SetDeviceMetricsOverrideRequestTextLayoutMode {
+    Mobile = 'mobile',
+    Default = 'default',
+  }
+
   export interface SetDeviceMetricsOverrideRequest {
     /**
      * Overriding width value in pixels (minimum 0, maximum 10000000). 0 disables the override.
@@ -7599,6 +7604,11 @@ export namespace Emulation {
      * the viewport meta tag is always enabled.
      */
     viewportMeta?: SetDeviceMetricsOverrideRequestViewportMeta;
+    /**
+     * Text layout mode. Default: `default`. Note: if `mobile` is `true`,
+     * mobile text layout mode (text autosizing) is always enabled.
+     */
+    textLayoutMode?: SetDeviceMetricsOverrideRequestTextLayoutMode;
   }
 
   export interface SetDevicePostureOverrideRequest {
@@ -17557,6 +17567,12 @@ export namespace Preload {
     key: PreloadingAttemptKey;
     pipelineId: PreloadPipelineId;
     status: PreloadingStatus;
+    /**
+     * The action currently performed by this attempt. This differs from
+     * `key.action` after a prerender-until-script attempt is upgraded in place
+     * to a full prerender.
+     */
+    effectiveAction?: SpeculationAction;
     prerenderStatus?: PrerenderFinalStatus;
     /**
      * This is used to give users more information about the name of Mojo interface
@@ -20728,7 +20744,7 @@ export namespace Debugger {
      */
     endLocation?: Location;
     /**
-     * True if the scope does not declare any variables or have a runtime context.
+     * True if the scope does not declare any variables.
      * Only present if true.
      * Empty scopes are retained in the scope chain because
      * they can be targeted via `evaluateOnCallFrame` (using `scopeNumber`) or

package/front_end/models/ai_assistance/AiConversation.ts

@@ -1,6 +1,7 @@
 // Copyright 2024 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+import type * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as Root from '../../core/root/root.js';
@@ -435,11 +436,16 @@ export class AiConversation {
           ): AsyncGenerator<ResponseData, void, void> {
     this.#navigationOccurredDuringRun = false;
     const originAtRunStart = this.#origin ?? getPrimaryPageSecurityOrigin(this.#targetManager);
-    const listener = (): void => {
+    const listener = (event: Common.EventTarget.EventTargetEvent<
+                      SDK.ResourceTreeModel.EventTypes[SDK.ResourceTreeModel.Events.PrimaryPageChanged]>): void => {
       // Prevent the agent from executing tools or reading data from an untrusted origin
       // if the page navigates unexpectedly during execution.
-      const newInspectedURL = this.#targetManager.primaryPageTarget()?.inspectedURL();
-      const newOrigin = newInspectedURL ? SDK.SecurityOrigin.SecurityOrigin.create(newInspectedURL) : undefined;
+      const frame = event.data.frame;
+      if (frame.resourceTreeModel().target() !== this.#targetManager.primaryPageTarget()) {
+        return;
+      }
+      const newOrigin = frame.securityOrigin();
+      const newInspectedURL = frame.url;
       const isSameOrigin = Boolean(originAtRunStart && newOrigin && originAtRunStart.isSameOriginWith(newOrigin));
       const isAllowedNavigation =
           Boolean(newInspectedURL && ALLOWED_PAGE_NAVIGATIONS.some(allowed => newInspectedURL.startsWith(allowed)));
@@ -608,6 +614,9 @@ function isAiAssistanceServerSideLoggingAllowed(): boolean {
 /**
  * Returns the security origin of the primary page target.
  *
+ * Resolves the canonical SecurityOrigin from the main frame, falling back to
+ * the inspected URL as a last resort in test environments where no frame exists.
+ *
  * @param targetManager Target manager used to locate the primary page target.
  * @returns The parsed SecurityOrigin, or undefined if no target or inspected URL exists.
  */
@@ -615,6 +624,10 @@ function getPrimaryPageSecurityOrigin(
     targetManager: SDK.TargetManager.TargetManager,
     ): SDK.SecurityOrigin.SecurityOrigin|undefined {
   const target = targetManager.primaryPageTarget();
+  const frameOrigin = target?.model(SDK.ResourceTreeModel.ResourceTreeModel)?.mainFrame?.securityOrigin();
+  if (frameOrigin) {
+    return frameOrigin;
+  }
   const inspectedURL = target?.inspectedURL();
   return inspectedURL ? SDK.SecurityOrigin.SecurityOrigin.create(inspectedURL) : undefined;
 }

package/front_end/models/ai_assistance/skills/accessibility.md

@@ -1,6 +1,6 @@
 ---
 name: accessibility
-description: Accessibility audits, ARIA properties, accessible tree inspection, color contrast, and screen reader semantics.
+description: Accessibility audits, running Lighthouse accessibility audits and reports, ARIA properties, accessible tree inspection, color contrast, and screen reader semantics.
 allowed-tools:
   - getLighthouseAudits
   - resolveDevtoolsNodePath
@@ -19,12 +19,13 @@ You are an expert accessibility debugging assistant.
    - Use `getStyles` on the backend node ID to inspect layout, color contrast, or font properties.
 
 2. **Lighthouse Accessibility Audits (`getLighthouseAudits` & `runLighthouse`)**:
-   - If an active Lighthouse report context exists, query it via `getLighthouseAudits` with `categoryId: 'accessibility'`.
-   - If no active report exists or new audits are needed, use `runLighthouse` with `categoryId: 'accessibility'`:
-     - Use `"navigation"` mode for full page-load audits.
-     - Use `"snapshot"` mode to re-evaluate live in-page DOM/CSS modifications without reloading.
-     - Use `"timespan"` mode for user interaction flows.
-     - Always honor explicit mode requests from the user.
+   - If the user asks for a Lighthouse audit or report (such as recording a report or checking accessibility scores), or if audits are needed:
+     - If an active Lighthouse report context already exists and no fresh audit is requested, query it via `getLighthouseAudits` with `categoryId: 'accessibility'`.
+     - If no active report exists or a fresh audit is requested, use `runLighthouse` with `categoryId: 'accessibility'`:
+       - Use `"navigation"` mode for full page-load audits.
+       - Use `"snapshot"` mode to re-evaluate live in-page DOM/CSS modifications without reloading.
+       - Use `"timespan"` mode for user interaction flows.
+       - Always honor explicit mode requests from the user.
    - When an audit references failing elements by DevTools node path (e.g. `"1,HTML,1,BODY,2,BUTTON"`), use `resolveDevtoolsNodePath` to resolve the path to a `backendNodeId`, then call `getElementAccessibilityDetails` or `getStyles`.
 
 3. **Dynamic Interaction Verification (`executeJavaScript`)**:

package/front_end/models/formatter/FormatterWorkerPool.ts

@@ -5,7 +5,12 @@
 import * as Platform from '../../core/platform/platform.js';
 import * as FormatterActions from '../../entrypoints/formatter_actions/formatter_actions.js';
 
-export {DefinitionKind, ScopeKind, type ScopeTreeNode} from '../../entrypoints/formatter_actions/formatter_actions.js';
+export {
+  DefinitionKind,
+  ScopeKind,
+  type ScopeTreeNode,
+  type ScopeVariableMapping,
+} from '../../entrypoints/formatter_actions/formatter_actions.js';
 
 let formatterWorkerPoolInstance: FormatterWorkerPool|undefined;
 
@@ -134,12 +139,17 @@ export class FormatterWorkerPool {
     return this.runTask(FormatterActions.FormatterActions.FORMAT, parameters) as Promise<FormatterActions.FormatResult>;
   }
 
-  javaScriptSubstitute(expression: string, mapping: Array<Map<string, string|null>>): Promise<string> {
-    if (mapping.every(m => m.size === 0)) {
+  javaScriptSubstitute(expression: string, mapping: FormatterActions.ScopeVariableMapping[]): Promise<string> {
+    if (mapping.every(scope => scope.bindings.size === 0)) {
       return Promise.resolve(expression);
     }
     return this.runTask(FormatterActions.FormatterActions.JAVASCRIPT_SUBSTITUTE, {content: expression, mapping})
-        .then(result => result || '');
+        .then((result: string|{error: string}|null) => {
+          if (result && typeof result === 'object') {
+            throw new Error(result.error);
+          }
+          return result || '';
+        });
   }
 
   javaScriptScopeTree(expression: string, sourceType: 'module'|'script' = 'script'):

package/front_end/models/javascript_metadata/NativeFunctions.ts

@@ -8972,11 +8972,15 @@ export const NativeFunctions: readonly NativeFunctionValue[] = [
     signatures: [["type","?eventInitDict"]]
   },
   {
-    name: "TouchEvent",
+    name: "ToolActivatedEvent",
     signatures: [["type","?eventInitDict"]]
   },
   {
-    name: "WebMCPEvent",
+    name: "ToolCancelEvent",
+    signatures: [["type","?eventInitDict"]]
+  },
+  {
+    name: "TouchEvent",
     signatures: [["type","?eventInitDict"]]
   },
   {

package/front_end/models/source_map_scopes/NamesResolver.ts

@@ -9,13 +9,25 @@ import * as Protocol from '../../generated/protocol.js';
 import type * as Bindings from '../bindings/bindings.js';
 import * as Formatter from '../formatter/formatter.js';
 
+/**
+ * The result of resolving a generated scope via the source map's mappings/names.
+ */
+interface ResolvedScope {
+  /** Generated name -> authored name, for generated names that we could map. */
+  variableMapping: Map<string, string>;
+  thisMapping: string|null;
+  /** All generated names declared by the scope, including ones that we couldn't map. */
+  generatedNames: string[];
+}
+
 interface CachedScopeMap {
   sourceMap: SDK.SourceMap.SourceMap|undefined;
-  mappingPromise: Promise<{variableMapping: Map<string, string>, thisMapping: string|null}>;
+  mappingPromise: Promise<ResolvedScope>;
 }
 
 const scopeToCachedIdentifiersMap = new WeakMap<Formatter.FormatterWorkerPool.ScopeTreeNode, CachedScopeMap>();
-const cachedMapByCallFrame = new WeakMap<SDK.DebuggerModel.CallFrame, Array<Map<string, string|null>>>();
+const cachedMapByCallFrame =
+    new WeakMap<SDK.DebuggerModel.CallFrame, Formatter.FormatterWorkerPool.ScopeVariableMapping[]>();
 
 export async function getTextFor(contentProvider: TextUtils.ContentProvider.ContentProvider):
     Promise<TextUtils.Text.Text|null> {
@@ -193,13 +205,13 @@ const enum Punctuation {
 const resolveDebuggerScope =
     async(scope: SDK.DebuggerModel.ScopeChainEntry,
           debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding):
-        Promise<{variableMapping: Map<string, string>, thisMapping: string | null}> => {
+        Promise<ResolvedScope> => {
           if (!scope.callFrame()
                    .debuggerModel.target()
                    .targetManager()
                    .settings.resolve(SDK.SDKSettings.jsSourceMapsEnabledSettingDescriptor)
                    .get()) {
-            return {variableMapping: new Map(), thisMapping: null};
+            return {variableMapping: new Map(), thisMapping: null, generatedNames: []};
           }
           const script = scope.callFrame().script;
           const scopeChain = await findScopeChainForDebuggerScope(scope);
@@ -208,10 +220,10 @@ const resolveDebuggerScope =
 
 const resolveScope = async(script: SDK.Script.Script, scopeChain: Formatter.FormatterWorkerPool.ScopeTreeNode[],
                            debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding):
-    Promise<{variableMapping: Map<string, string>, thisMapping: string | null}> => {
+    Promise<ResolvedScope> => {
       const parsedScope = scopeChain[scopeChain.length - 1];
       if (!parsedScope) {
-        return {variableMapping: new Map<string, string>(), thisMapping: null};
+        return {variableMapping: new Map<string, string>(), thisMapping: null, generatedNames: []};
       }
       let cachedScopeMap = scopeToCachedIdentifiersMap.get(parsedScope);
       const sourceMap = script.sourceMap();
@@ -223,7 +235,7 @@ const resolveScope = async(script: SDK.Script.Script, scopeChain: Formatter.Form
               let thisMapping = null;
 
               if (!sourceMap) {
-                return {variableMapping, thisMapping};
+                return {variableMapping, thisMapping, generatedNames: []};
               }
               // Extract as much as possible from SourceMap and resolve
               // missing identifier names from SourceMap ranges.
@@ -261,7 +273,7 @@ const resolveScope = async(script: SDK.Script.Script, scopeChain: Formatter.Form
 
               const parsedVariables = await scopeIdentifiers(script, parsedScope, scopeChain.slice(0, -1));
               if (!parsedVariables) {
-                return {variableMapping, thisMapping};
+                return {variableMapping, thisMapping, generatedNames: []};
               }
               for (const id of parsedVariables.boundVariables) {
                 resolveEntry(id, sourceName => {
@@ -279,7 +291,8 @@ const resolveScope = async(script: SDK.Script.Script, scopeChain: Formatter.Form
                 });
               }
               await Promise.all(promises).then(getScopeResolvedForTest());
-              return {variableMapping, thisMapping};
+              const generatedNames = parsedVariables.boundVariables.map(id => id.name);
+              return {variableMapping, thisMapping, generatedNames};
             })();
         cachedScopeMap = {sourceMap, mappingPromise: identifiersPromise};
         scopeToCachedIdentifiersMap.set(parsedScope, {sourceMap, mappingPromise: identifiersPromise});
@@ -395,31 +408,46 @@ export const resolveScopeChain =
           }
 
           if (callFrame.script.isWasm()) {
-            return callFrame.scopeChain().filter(scope => !scope.empty());
+            return callFrame.scopeChain();
           }
           const thisObject = await resolveThisObject(callFrame, debuggerWorkspaceBinding);
-          const scopes = callFrame.scopeChain().filter(scope => !scope.empty() ||
-                                                           scope.type() === Protocol.Debugger.ScopeType.Local);
-          return scopes.map(scope => new ScopeWithSourceMappedVariables(scope, thisObject, debuggerWorkspaceBinding));
+          return callFrame.scopeChain().map(
+              scope => new ScopeWithSourceMappedVariables(scope, thisObject, debuggerWorkspaceBinding));
         };
 
-function reverseScopeMapping(variableMapping: Map<string, string>): Map<string, string|null> {
-  const result = new Map<string, string|null>();
-  for (const [compiledName, originalName] of variableMapping) {
-    if (originalName && !result.has(originalName)) {
-      result.set(originalName, compiledName);
+/**
+ * Converts the generated name -> authored name mapping of a resolved scope into the
+ * authored name -> generated name form expected by `javaScriptSubstitute`.
+ */
+function toScopeVariableMapping({variableMapping, generatedNames}: ResolvedScope):
+    Formatter.FormatterWorkerPool.ScopeVariableMapping {
+  const bindings = new Map<string, string|null>();
+  for (const [generatedName, authoredName] of variableMapping) {
+    // Multiple generated names can map to the same authored name. We pick the first one. The worker still
+    // learns about the others via `generatedNames`, which it needs to detect shadowing of outer bindings.
+    if (authoredName && !bindings.has(authoredName)) {
+      bindings.set(authoredName, generatedName);
     }
   }
-  return result;
+  return {bindings, generatedNames};
+}
+
+/**
+ * Source map scopes don't tell us which generated names a generated range declares. The worker falls back
+ * to the free identifiers of the binding expressions in that case.
+ */
+function fromSourceMapScopes(mappedVariables: Array<Map<string, string|null>>):
+    Formatter.FormatterWorkerPool.ScopeVariableMapping[] {
+  return mappedVariables.map(bindings => ({bindings, generatedNames: []}));
 }
 
 /**
- * @returns An array of mappings (from inner-most to outer-most scope) of original name -> compiled name or binding expression.
+ * @returns An array of scopes (from inner-most to outer-most) with their original name -> compiled name or binding expression mappings.
  */
 export const allVariablesInCallFrame = async(
     callFrame: SDK.DebuggerModel.CallFrame,
     debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding):
-    Promise<Array<Map<string, string|null>>> => {
+    Promise<Formatter.FormatterWorkerPool.ScopeVariableMapping[]> => {
       if (!callFrame.debuggerModel.target()
                .targetManager()
                .settings.resolve(SDK.SDKSettings.jsSourceMapsEnabledSettingDescriptor)
@@ -437,36 +465,37 @@ export const allVariablesInCallFrame = async(
         const mappedVariables =
             sourceMap?.resolveMappedVariablesAtPosition(callFrame.location(), callFrame.returnValue() !== null);
         if (mappedVariables) {
-          cachedMapByCallFrame.set(callFrame, mappedVariables);
-          return mappedVariables;
+          const result = fromSourceMapScopes(mappedVariables);
+          cachedMapByCallFrame.set(callFrame, result);
+          return result;
         }
       }
 
-      const scopeChain = callFrame.scopeChain().filter(scope => !scope.empty());
-      const nameMappings =
+      const scopeChain = callFrame.scopeChain();
+      const resolvedScopes =
           await Promise.all(scopeChain.map(scope => resolveDebuggerScope(scope, debuggerWorkspaceBinding)));
-      const reverseMapping = nameMappings.map(({variableMapping}) => reverseScopeMapping(variableMapping));
-      cachedMapByCallFrame.set(callFrame, reverseMapping);
-      return reverseMapping;
+      const result = resolvedScopes.map(toScopeVariableMapping);
+      cachedMapByCallFrame.set(callFrame, result);
+      return result;
     };
 
 /**
- * @returns An array of mappings (from inner-most to outer-most scope) of original name -> compiled name or binding expression.
+ * @returns An array of scopes (from inner-most to outer-most) with their original name -> compiled name or binding expression mappings.
  */
 export const allVariablesAtPosition =
     async(location: SDK.DebuggerModel.Location,
           debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding):
-        Promise<Array<Map<string, string|null>>> => {
-          const reverseMapping: Array<Map<string, string|null>> = [];
+        Promise<Formatter.FormatterWorkerPool.ScopeVariableMapping[]> => {
+          const result: Formatter.FormatterWorkerPool.ScopeVariableMapping[] = [];
           const script = location.script();
           if (!script) {
-            return reverseMapping;
+            return result;
           }
           if (!script.debuggerModel.target()
                    .targetManager()
                    .settings.resolve(SDK.SDKSettings.jsSourceMapsEnabledSettingDescriptor)
                    .get()) {
-            return reverseMapping;
+            return result;
           }
 
           if (Root.Runtime.hostConfig.devToolsSourceMapScopesInSourcesPanel?.enabled) {
@@ -474,13 +503,13 @@ export const allVariablesAtPosition =
                 script.sourceMap() ?? await script.debuggerModel.sourceMapManager().sourceMapForClientPromise(script);
             const mappedVariables = sourceMap?.resolveMappedVariablesAtPosition(location);
             if (mappedVariables) {
-              return mappedVariables;
+              return fromSourceMapScopes(mappedVariables);
             }
           }
 
           const scopeTreeAndText = await computeScopeTree(script);
           if (!scopeTreeAndText) {
-            return reverseMapping;
+            return result;
           }
 
           const {scopeTree, text} = scopeTreeAndText;
@@ -489,24 +518,22 @@ export const allVariablesAtPosition =
           const scopeChain = findScopeChain(scopeTree, {start: locationOffset, end: locationOffset});
 
           while (scopeChain.length > 0) {
-            const {variableMapping} = await resolveScope(script, scopeChain, debuggerWorkspaceBinding);
-            reverseMapping.push(reverseScopeMapping(variableMapping));
+            result.push(toScopeVariableMapping(await resolveScope(script, scopeChain, debuggerWorkspaceBinding)));
             scopeChain.pop();
           }
-          return reverseMapping;
+          return result;
         };
 
 export const resolveThisObject = async(
     callFrame: SDK.DebuggerModel.CallFrame,
     debuggerWorkspaceBinding:
         Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding): Promise<SDK.RemoteObject.RemoteObject|null> => {
-  const innermostScope =
-      callFrame.scopeChain().find(scope => !scope.empty() || scope.type() === Protocol.Debugger.ScopeType.Local);
-  if (!innermostScope) {
+  const scopeChain = callFrame.scopeChain();
+  if (scopeChain.length === 0) {
     return callFrame.thisObject();
   }
 
-  const {thisMapping} = await resolveDebuggerScope(innermostScope, debuggerWorkspaceBinding);
+  const {thisMapping} = await resolveDebuggerScope(scopeChain[0], debuggerWorkspaceBinding);
   if (!thisMapping) {
     return callFrame.thisObject();
   }

package/front_end/models/source_map_scopes/ScopeChainModel.ts

@@ -3,10 +3,9 @@
 // found in the LICENSE file.
 
 import * as Common from '../../core/common/common.js';
-import * as SDK from '../../core/sdk/sdk.js';
-import type * as Bindings from '../bindings/bindings.js';
+import type * as SDK from '../../core/sdk/sdk.js';
 
-import {resolveScopeChain} from './NamesResolver.js';
+import {Events as ScopeChainResolverEvents, type ScopeChainResolver} from './ScopeChainResolver.js';
 
 /**
  * This class is responsible for resolving / updating the scope chain for a specific {@link SDK.DebuggerModel.CallFrame}
@@ -18,57 +17,35 @@ import {resolveScopeChain} from './NamesResolver.js';
  *
  * Source maps can be enabled/disabled dynamically and debugger plugins can attach debug info after the fact.
  *
- * This class tracks all that and sends events with the latest scope chain for a specific call frame.
+ * The {@link ScopeChainResolver} tracks all that and invalidates its cache accordingly. This class
+ * sends events with the latest scope chain for a specific call frame.
  */
 export class ScopeChainModel extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
-  static readonly #cachedScopeChainByCallFrame =
-      new WeakMap<SDK.DebuggerModel.CallFrame, Promise<SDK.DebuggerModel.ScopeChainEntry[]>>();
-
   readonly #callFrame: SDK.DebuggerModel.CallFrame;
-  readonly #debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding;
+  readonly #scopeChainResolver: ScopeChainResolver;
 
   /** We use the `Throttler` here to make sure that `#boundUpdate` is not run multiple times simultanously */
   readonly #throttler = new Common.Throttler.Throttler(5);
   readonly #boundUpdate = this.#update.bind(this);
 
-  constructor(callFrame: SDK.DebuggerModel.CallFrame,
-              debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding) {
+  constructor(callFrame: SDK.DebuggerModel.CallFrame, scopeChainResolver: ScopeChainResolver) {
     super();
     this.#callFrame = callFrame;
-    this.#debuggerWorkspaceBinding = debuggerWorkspaceBinding;
-    this.#callFrame.debuggerModel.addEventListener(
-        SDK.DebuggerModel.Events.DebugInfoAttached, this.#debugInfoAttached, this);
-    this.#callFrame.debuggerModel.sourceMapManager().addEventListener(SDK.SourceMapManager.Events.SourceMapAttached,
-                                                                      this.#sourceMapChanged, this);
-    this.#callFrame.debuggerModel.sourceMapManager().addEventListener(SDK.SourceMapManager.Events.SourceMapDetached,
-                                                                      this.#sourceMapChanged, this);
+    this.#scopeChainResolver = scopeChainResolver;
+    this.#scopeChainResolver.addEventListener(ScopeChainResolverEvents.SCOPE_CHAIN_INVALIDATED,
+                                              this.#scopeChainInvalidated, this);
 
     void this.#throttler.schedule(this.#boundUpdate);
   }
 
   dispose(): void {
-    this.#callFrame.debuggerModel.removeEventListener(
-        SDK.DebuggerModel.Events.DebugInfoAttached, this.#debugInfoAttached, this);
-    this.#callFrame.debuggerModel.sourceMapManager().removeEventListener(SDK.SourceMapManager.Events.SourceMapAttached,
-                                                                         this.#sourceMapChanged, this);
-    this.#callFrame.debuggerModel.sourceMapManager().removeEventListener(SDK.SourceMapManager.Events.SourceMapDetached,
-                                                                         this.#sourceMapChanged, this);
+    this.#scopeChainResolver.removeEventListener(ScopeChainResolverEvents.SCOPE_CHAIN_INVALIDATED,
+                                                 this.#scopeChainInvalidated, this);
     this.listeners?.clear();
   }
 
-  static resolveScopeChain(callFrame: SDK.DebuggerModel.CallFrame,
-                           debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding):
-      Promise<SDK.DebuggerModel.ScopeChainEntry[]> {
-    let cachedPromise = ScopeChainModel.#cachedScopeChainByCallFrame.get(callFrame);
-    if (!cachedPromise) {
-      cachedPromise = resolveScopeChain(callFrame, debuggerWorkspaceBinding);
-      ScopeChainModel.#cachedScopeChainByCallFrame.set(callFrame, cachedPromise);
-    }
-    return cachedPromise;
-  }
-
   resolveScopeChain(): Promise<SDK.DebuggerModel.ScopeChainEntry[]> {
-    return ScopeChainModel.resolveScopeChain(this.#callFrame, this.#debuggerWorkspaceBinding);
+    return this.#scopeChainResolver.resolveScopeChain(this.#callFrame);
   }
 
   async #update(): Promise<void> {
@@ -76,17 +53,8 @@ export class ScopeChainModel extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     this.dispatchEventToListeners(Events.SCOPE_CHAIN_UPDATED, new ScopeChain(scopeChain));
   }
 
-  #debugInfoAttached(event: Common.EventTarget.EventTargetEvent<SDK.Script.Script>): void {
+  #scopeChainInvalidated(event: Common.EventTarget.EventTargetEvent<SDK.Script.Script>): void {
     if (event.data === this.#callFrame.script) {
-      ScopeChainModel.#cachedScopeChainByCallFrame.delete(this.#callFrame);
-      void this.#throttler.schedule(this.#boundUpdate);
-    }
-  }
-
-  #sourceMapChanged(event: Common.EventTarget
-                        .EventTargetEvent<{client: SDK.Script.Script, sourceMap: SDK.SourceMap.SourceMap}>): void {
-    if (event.data.client === this.#callFrame.script) {
-      ScopeChainModel.#cachedScopeChainByCallFrame.delete(this.#callFrame);
       void this.#throttler.schedule(this.#boundUpdate);
     }
   }