chrome-devtools-frontend 1.0.1642899 → 1.0.1643855

package/eslint.config.mjs

@@ -721,7 +721,8 @@ export default defineConfig([
       'test/**/*.ts',
       '**/testing/*.ts',
       'scripts/eslint_rules/test/**/*',
-      'extensions/cxx_debugging/e2e/**',
+      'extensions/cxx_debugging/e2e/**/*.ts',
+      'extensions/cxx_debugging/tests/**/*.ts',
     ],
 
     rules: {
@@ -750,6 +751,7 @@ export default defineConfig([
       ],
 
       '@devtools/check-test-definitions': 'error',
+      '@devtools/prefer-chai-assert': 'error',
       '@devtools/no-assert-strict-equal-for-arrays-and-objects': 'error',
       '@devtools/no-assert-deep-strict-equal': 'error',
       '@devtools/no-assert-equal': 'error',

package/extension-api/ExtensionAPI.d.ts

@@ -19,8 +19,35 @@ export namespace Chrome {
        */
       readonly buildId?: string;
 
+      /**
+       * Returns the `content` and `encoding` of the resource. If a `callback`
+       * is provided, it is invoked with the `content` and `encoding` and the
+       * method returns `void`. If no `callback` is provided, the method returns
+       * a `Promise`.
+       *
+       * @param callback Optional callback to be invoked with the content and
+       * encoding.
+       * @returns A Promise that resolves to an object containing the content
+       * and encoding if no callback is provided, otherwise void. Rejects with
+       * an error object on failure.
+       */
+      getContent(): Promise<{content: string, encoding: string}>;
       getContent(callback: (content: string, encoding: string) => unknown): void;
-      setContent(content: string, commit: boolean, callback?: (error?: Object) => unknown): void;
+
+      /**
+       * Sets the content of the resource. If a `callback` is provided, it is
+       * invoked when the content is set and the method returns `void`. If no
+       * `callback` is provided, the method returns a `Promise`.
+       *
+       * @param content The new content of the resource.
+       * @param commit Whether to commit the changes.
+       * @param callback Optional callback to be invoked when the content is
+       * set.
+       * @returns A Promise that resolves when the content is set if no callback
+       * is provided, otherwise void. Rejects with an error object on failure.
+       */
+      setContent(content: string, commit: boolean): Promise<void>;
+      setContent(content: string, commit: boolean, callback: (error?: object) => unknown): void;
       /**
        * Augments this resource's scopes information based on the list of {@link NamedFunctionRange}s
        * for improved debuggability and function naming.
@@ -40,18 +67,62 @@ export namespace Chrome {
       onResourceAdded: EventSink<(resource: Resource) => unknown>;
       onResourceContentCommitted: EventSink<(resource: Resource, content: string) => unknown>;
 
-      eval(
-          expression: string,
-          options?: {scriptExecutionContext?: string, frameURL?: string, useContentScriptContext?: boolean},
-          callback?: (result: unknown, exceptioninfo: {
-            code: string,
-            description: string,
-            details: unknown[],
-            isError: boolean,
-            isException: boolean,
-            value: string,
-          }) => unknown): void;
+      /**
+       * Evaluates a JavaScript expression in the context of the inspected page.
+       *
+       * If a `callback` is provided, it is invoked with the result and
+       * exception information and the method returns `void`. If no `callback`
+       * is provided, the method returns a `Promise`.
+       *
+       * @template E The type of the value that the Promise resolves to.
+       * @param expression The JavaScript expression to evaluate.
+       * @param optionsOrCallback Optional options for evaluation, or a callback
+       * function.
+       * @param callback Optional callback to be invoked with the evaluation
+       * result and exception information.
+       * @returns A Promise that resolves to the result if no callback is
+       * provided, otherwise void. Rejects with an error object on failure.
+       */
+      eval<E = unknown>(expression: string, options?: {
+        scriptExecutionContext?: string,
+        frameURL?: string,
+        useContentScriptContext?: boolean,
+      }): Promise<E>;
+      eval(expression: string,
+           optionsOrCallback: {scriptExecutionContext?: string, frameURL?: string, useContentScriptContext?: boolean}|
+           undefined|((result: unknown, exceptioninfo: {
+                        code: string,
+                        description: string,
+                        details: unknown[],
+                        isError: boolean,
+                        isException: boolean,
+                        value: string,
+                      }) => unknown),
+           callback?: (result: unknown, exceptioninfo: {
+             code: string,
+             description: string,
+             details: unknown[],
+             isError: boolean,
+             isException: boolean,
+             value: string,
+           }) => unknown): void;
+
+      /**
+       * Retrieves all resources within the inspected window.
+       *
+       * If a `callback` is provided, it is invoked with the array of resources
+       * and the method returns `void`. If no `callback` is provided, the method
+       * returns a `Promise`.
+       *
+       * @param callback Optional callback to be invoked with the array of
+       * resources.
+       * @returns A Promise that resolves to an array of resources if no
+       * callback is provided, otherwise void. Rejects with an error object on
+       * failure.
+       */
+      getResources(): Promise<Resource[]>;
       getResources(callback: (resources: Resource[]) => unknown): void;
+
       reload(reloadOptions?: {ignoreCache?: boolean, injectedScript?: string, userAgent?: string}): void;
     }
 

package/front_end/core/host/UserMetrics.ts

@@ -767,7 +767,6 @@ export enum DevtoolsExperiments {
   /* eslint-disable @typescript-eslint/naming-convention */
   'protocol-monitor' = 13,
   'instrumentation-breakpoints' = 61,
-  'use-source-map-scopes' = 76,
   'durable-messages' = 110,
   'jpeg-xl' = 111,
   'plus-button' = 112,

package/front_end/core/protocol_client/InspectorBackend.ts

@@ -339,6 +339,10 @@ export class TargetBase {
     return this.getAgent('Autofill');
   }
 
+  adsAgent(): ProtocolProxyApi.AdsApi {
+    return this.getAgent('Ads');
+  }
+
   browserAgent(): ProtocolProxyApi.BrowserApi {
     return this.getAgent('Browser');
   }

package/front_end/core/root/ExperimentNames.ts

@@ -6,7 +6,6 @@ export enum ExperimentName {
   ALL = '*',
   PROTOCOL_MONITOR = 'protocol-monitor',
   INSTRUMENTATION_BREAKPOINTS = 'instrumentation-breakpoints',
-  USE_SOURCE_MAP_SCOPES = 'use-source-map-scopes',
   DURABLE_MESSAGES = 'durable-messages',
   JPEG_XL = 'jpeg-xl',
   PLUS_BUTTON = 'plus-button',

package/front_end/core/sdk/ConsoleModel.ts

@@ -547,6 +547,7 @@ export interface ConsoleMessageDetails {
   context?: string;
   affectedResources?: AffectedResources;
   category?: Protocol.Log.LogEntryCategory;
+  exceptionDetails?: Protocol.Runtime.ExceptionDetails;
 }
 
 export class ConsoleMessage {
@@ -570,6 +571,7 @@ export class ConsoleMessage {
   #exceptionId?: number = undefined;
   #affectedResources?: AffectedResources;
   category?: Protocol.Log.LogEntryCategory;
+  readonly exceptionDetails?: Protocol.Runtime.ExceptionDetails;
 
   /**
    * The parent frame of the `console.log` call of logpoints or conditional breakpoints
@@ -600,6 +602,7 @@ export class ConsoleMessage {
     this.workerId = details?.workerId;
     this.#affectedResources = details?.affectedResources;
     this.category = details?.category;
+    this.exceptionDetails = details?.exceptionDetails;
 
     if (!this.#executionContextId && this.#runtimeModel) {
       if (this.scriptId) {
@@ -646,6 +649,7 @@ export class ConsoleMessage {
       executionContextId: exceptionDetails.executionContextId,
       scriptId: exceptionDetails.scriptId,
       affectedResources,
+      exceptionDetails,
     };
     return new ConsoleMessage(
         runtimeModel, Protocol.Log.LogEntrySource.Javascript, Protocol.Log.LogEntryLevel.Error,

package/front_end/core/sdk/NetworkRequest.ts

@@ -299,6 +299,10 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   #contentDataProvider?: () => Promise<TextUtils.ContentData.ContentDataOrError>;
   #isSameSite: boolean|null = null;
   #wasIntercepted = false;
+  /**
+   * Whether this request was imported from a HAR file.
+   */
+  #isImportedHar = false;
   #associatedData = new Map<string, object>();
   #hasOverriddenContent = false;
   #hasThirdPartyCookiePhaseoutIssue = false;
@@ -1148,6 +1152,14 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.#wasIntercepted = wasIntercepted;
   }
 
+  isImportedHar(): boolean {
+    return this.#isImportedHar;
+  }
+
+  setIsImportedHar(isImportedHar: boolean): void {
+    this.#isImportedHar = isImportedHar;
+  }
+
   setEarlyHintsHeaders(headers: NameValue[]): void {
     this.earlyHintsHeaders = headers;
   }

package/front_end/core/sdk/SourceMap.ts

@@ -6,7 +6,6 @@ import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as ScopesCodec from '../../third_party/source-map-scopes-codec/source-map-scopes-codec.js';
 import * as Common from '../common/common.js';
 import * as Platform from '../platform/platform.js';
-import * as Root from '../root/root.js';
 
 import type {CallFrame, ScopeChainEntry} from './DebuggerModel.js';
 import {scopeTreeForScript} from './ScopeTreeCache.js';
@@ -584,23 +583,21 @@ export class SourceMap {
           lineNumber, columnNumber, sourceIndex, sourceURL, sourceLineNumber, sourceColumnNumber, names[nameIndex]));
     }
 
-    if (Root.Runtime.experiments.isEnabled(Root.ExperimentNames.ExperimentName.USE_SOURCE_MAP_SCOPES)) {
-      if (!this.#scopesInfo) {
-        this.#scopesInfo = new SourceMapScopesInfo(this, {scopes: [], ranges: []});
-      }
-      if (map.scopes) {
-        const {scopes, ranges} = ScopesCodec.decode(
-            map as ScopesCodec.SourceMapJson,
-            {mode: ScopesCodec.DecodeMode.LAX, generatedOffset: {line: baseLineNumber, column: baseColumnNumber}});
-        this.#scopesInfo.addOriginalScopes(scopes);
-        this.#scopesInfo.addGeneratedRanges(ranges);
-      } else if (map.x_com_bloomberg_sourcesFunctionMappings) {
-        const originalScopes = this.parseBloombergScopes(map);
-        this.#scopesInfo.addOriginalScopes(originalScopes);
-      } else {
-        // Keep the OriginalScope[] tree array consistent with sources.
-        this.#scopesInfo.addOriginalScopes(new Array(map.sources.length).fill(null));
-      }
+    if (!this.#scopesInfo) {
+      this.#scopesInfo = new SourceMapScopesInfo(this, {scopes: [], ranges: []});
+    }
+    if (map.scopes) {
+      const {scopes, ranges} = ScopesCodec.decode(
+          map as ScopesCodec.SourceMapJson,
+          {mode: ScopesCodec.DecodeMode.LAX, generatedOffset: {line: baseLineNumber, column: baseColumnNumber}});
+      this.#scopesInfo.addOriginalScopes(scopes);
+      this.#scopesInfo.addGeneratedRanges(ranges);
+    } else if (map.x_com_bloomberg_sourcesFunctionMappings) {
+      const originalScopes = this.parseBloombergScopes(map);
+      this.#scopesInfo.addOriginalScopes(originalScopes);
+    } else {
+      // Keep the OriginalScope[] tree array consistent with sources.
+      this.#scopesInfo.addOriginalScopes(new Array(map.sources.length).fill(null));
     }
   }
 

package/front_end/entrypoints/greendev_floaty/FloatyEntrypoint.ts

@@ -593,8 +593,6 @@ async function init(): Promise<void> {
 
     safeRegisterExperiment(
         Root.ExperimentNames.ExperimentName.INSTRUMENTATION_BREAKPOINTS, 'Enable instrumentation breakpoints');
-    safeRegisterExperiment(
-        Root.ExperimentNames.ExperimentName.USE_SOURCE_MAP_SCOPES, 'Use scope information from source maps');
     safeRegisterExperiment(Root.ExperimentNames.ExperimentName.PROTOCOL_MONITOR, 'Protocol Monitor');
 
     const hostUnsyncedStorage: Common.Settings.SettingsBackingStore = {

package/front_end/entrypoints/greendev_floaty/greendev_floaty.ts

@@ -247,8 +247,6 @@ async function init(): Promise<void> {
     // Register necessary experiments to avoid "Unknown experiment" errors.
     Root.Runtime.experiments.register(
         Root.ExperimentNames.ExperimentName.INSTRUMENTATION_BREAKPOINTS, 'Enable instrumentation breakpoints');
-    Root.Runtime.experiments.register(
-        Root.ExperimentNames.ExperimentName.USE_SOURCE_MAP_SCOPES, 'Use scope information from source maps');
     Root.Runtime.experiments.register(Root.ExperimentNames.ExperimentName.PROTOCOL_MONITOR, 'Protocol Monitor');
 
     const WINDOW_LOCAL_STORAGE: Common.Settings.SettingsBackingStore = {

package/front_end/entrypoints/heap_snapshot_worker/HeapSnapshot.ts

@@ -876,7 +876,7 @@ export abstract class HeapSnapshot {
   readonly #progress: HeapSnapshotProgress;
   readonly #noDistance = -5;
   rootNodeIndexInternal = 0;
-  #snapshotDiffs: Record<string, Record<string, HeapSnapshotModel.HeapSnapshotModel.Diff>> = {};
+  #snapshotDiffs: Record<number, Record<string, HeapSnapshotModel.HeapSnapshotModel.Diff>> = {};
   #aggregatesForDiff?: {
     interfaceDefinitions: string,
     aggregates: Record<string, HeapSnapshotModel.HeapSnapshotModel.AggregateForDiff>,
@@ -2688,9 +2688,8 @@ export abstract class HeapSnapshot {
     throw new Error('Not implemented');
   }
 
-  calculateSnapshotDiff(
-      baseSnapshotId: string,
-      baseSnapshotAggregates: Record<string, HeapSnapshotModel.HeapSnapshotModel.AggregateForDiff>):
+  calculateSnapshotDiff(baseSnapshotId: number,
+                        baseSnapshotAggregates: Record<string, HeapSnapshotModel.HeapSnapshotModel.AggregateForDiff>):
       Record<string, HeapSnapshotModel.HeapSnapshotModel.Diff> {
     let snapshotDiff: Record<string, HeapSnapshotModel.HeapSnapshotModel.Diff> = this.#snapshotDiffs[baseSnapshotId];
     if (snapshotDiff) {
@@ -2976,7 +2975,7 @@ export abstract class HeapSnapshot {
     return {paths, limitsReached};
   }
 
-  createAddedNodesProvider(baseSnapshotId: string, classKey: string): HeapSnapshotNodesProvider {
+  createAddedNodesProvider(baseSnapshotId: number, classKey: string): HeapSnapshotNodesProvider {
     const snapshotDiff = this.#snapshotDiffs[baseSnapshotId];
     const diffForClass = snapshotDiff[classKey];
     return new HeapSnapshotNodesProvider(this, diffForClass.addedIndexes);

package/front_end/entrypoints/main/MainImpl.ts

@@ -365,8 +365,6 @@ export class MainImpl {
     // Debugging
     Root.Runtime.experiments.register(
         Root.ExperimentNames.ExperimentName.INSTRUMENTATION_BREAKPOINTS, 'Instrumentation breakpoints');
-    Root.Runtime.experiments.register(
-        Root.ExperimentNames.ExperimentName.USE_SOURCE_MAP_SCOPES, 'Use scope information from source maps');
 
     Root.Runtime.experiments.registerHostExperiment({
       name: Root.ExperimentNames.ExperimentName.DURABLE_MESSAGES,
@@ -392,10 +390,6 @@ export class MainImpl {
       requiresChromeRestart: false,
     });
 
-    Root.Runtime.experiments.enableExperimentsByDefault([
-      Root.ExperimentNames.ExperimentName.USE_SOURCE_MAP_SCOPES,
-    ]);
-
     const enabledExperiments = Root.Runtime.Runtime.queryParam('enabledExperiments');
     if (enabledExperiments) {
       Root.Runtime.experiments.setServerEnabledExperiments(enabledExperiments.split(';'));

package/front_end/generated/InspectorBackendCommands.ts

@@ -435,7 +435,7 @@ inspectorBackend.registerCommand("DOM.getFrameOwner", [{"name": "frameId", "type
 inspectorBackend.registerCommand("DOM.getContainerForNode", [{"name": "nodeId", "type": "number", "optional": false, "description": "", "typeRef": "DOM.NodeId"}, {"name": "containerName", "type": "string", "optional": true, "description": "", "typeRef": null}, {"name": "physicalAxes", "type": "string", "optional": true, "description": "", "typeRef": "DOM.PhysicalAxes"}, {"name": "logicalAxes", "type": "string", "optional": true, "description": "", "typeRef": "DOM.LogicalAxes"}, {"name": "queriesScrollState", "type": "boolean", "optional": true, "description": "", "typeRef": null}, {"name": "queriesAnchored", "type": "boolean", "optional": true, "description": "", "typeRef": null}], ["nodeId"], "Returns the query container of the given node based on container query conditions: containerName, physical and logical axes, and whether it queries scroll-state or anchored elements. If no axes are provided and queriesScrollState is false, the style container is returned, which is the direct parent or the closest element with a matching container-name.");
 inspectorBackend.registerCommand("DOM.getQueryingDescendantsForContainer", [{"name": "nodeId", "type": "number", "optional": false, "description": "Id of the container node to find querying descendants from.", "typeRef": "DOM.NodeId"}], ["nodeIds"], "Returns the descendants of a container query container that have container queries against this container.");
 inspectorBackend.registerCommand("DOM.getAnchorElement", [{"name": "nodeId", "type": "number", "optional": false, "description": "Id of the positioned element from which to find the anchor.", "typeRef": "DOM.NodeId"}, {"name": "anchorSpecifier", "type": "string", "optional": true, "description": "An optional anchor specifier, as defined in https://www.w3.org/TR/css-anchor-position-1/#anchor-specifier. If not provided, it will return the implicit anchor element for the given positioned element.", "typeRef": null}], ["nodeId"], "Returns the target anchor element of the given anchor query according to https://www.w3.org/TR/css-anchor-position-1/#target.");
-inspectorBackend.registerCommand("DOM.forceShowPopover", [{"name": "nodeId", "type": "number", "optional": false, "description": "Id of the popover HTMLElement", "typeRef": "DOM.NodeId"}, {"name": "enable", "type": "boolean", "optional": false, "description": "If true, opens the popover and keeps it open. If false, closes the popover if it was previously force-opened.", "typeRef": null}], ["nodeIds"], "When enabling, this API force-opens the popover identified by nodeId and keeps it open until disabled.");
+inspectorBackend.registerCommand("DOM.forceShowPopover", [{"name": "nodeId", "type": "number", "optional": false, "description": "Id of the popover HTMLElement", "typeRef": "DOM.NodeId"}, {"name": "enable", "type": "boolean", "optional": false, "description": "If true, opens the popover and keeps it open. If false, closes the popover if it was previously force-opened.", "typeRef": null}, {"name": "invokerNodeId", "type": "number", "optional": true, "description": "Optional ID of the element invoking this popover, used to establish the implicit anchor. If not provided, it will fall back to the first invoker in the document, preferring elements with a popovertarget attribute over those with a commandfor attribute. Note that if there are multiple invokers, this is just an estimate.", "typeRef": "DOM.BackendNodeId"}], ["nodeIds"], "When enabling, this API force-opens the popover identified by nodeId and keeps it open until disabled.");
 inspectorBackend.registerType("DOM.BackendNode", [{"name": "nodeType", "type": "number", "optional": false, "description": "`Node`'s nodeType.", "typeRef": null}, {"name": "nodeName", "type": "string", "optional": false, "description": "`Node`'s nodeName.", "typeRef": null}, {"name": "backendNodeId", "type": "number", "optional": false, "description": "", "typeRef": "DOM.BackendNodeId"}]);
 inspectorBackend.registerType("DOM.Node", [{"name": "nodeId", "type": "number", "optional": false, "description": "Node identifier that is passed into the rest of the DOM messages as the `nodeId`. Backend will only push node with given `id` once. It is aware of all requested nodes and will only fire DOM events for nodes known to the client.", "typeRef": "DOM.NodeId"}, {"name": "parentId", "type": "number", "optional": true, "description": "The id of the parent node if any.", "typeRef": "DOM.NodeId"}, {"name": "backendNodeId", "type": "number", "optional": false, "description": "The BackendNodeId for this node.", "typeRef": "DOM.BackendNodeId"}, {"name": "nodeType", "type": "number", "optional": false, "description": "`Node`'s nodeType.", "typeRef": null}, {"name": "nodeName", "type": "string", "optional": false, "description": "`Node`'s nodeName.", "typeRef": null}, {"name": "localName", "type": "string", "optional": false, "description": "`Node`'s localName.", "typeRef": null}, {"name": "nodeValue", "type": "string", "optional": false, "description": "`Node`'s nodeValue.", "typeRef": null}, {"name": "childNodeCount", "type": "number", "optional": true, "description": "Child count for `Container` nodes.", "typeRef": null}, {"name": "children", "type": "array", "optional": true, "description": "Child nodes of this node when requested with children.", "typeRef": "DOM.Node"}, {"name": "attributes", "type": "array", "optional": true, "description": "Attributes of the `Element` node in the form of flat array `[name1, value1, name2, value2]`.", "typeRef": "string"}, {"name": "documentURL", "type": "string", "optional": true, "description": "Document URL that `Document` or `FrameOwner` node points to.", "typeRef": null}, {"name": "baseURL", "type": "string", "optional": true, "description": "Base URL that `Document` or `FrameOwner` node uses for URL completion.", "typeRef": null}, {"name": "publicId", "type": "string", "optional": true, "description": "`DocumentType`'s publicId.", "typeRef": null}, {"name": "systemId", "type": "string", "optional": true, "description": "`DocumentType`'s systemId.", "typeRef": null}, {"name": "internalSubset", "type": "string", "optional": true, "description": "`DocumentType`'s internalSubset.", "typeRef": null}, {"name": "xmlVersion", "type": "string", "optional": true, "description": "`Document`'s XML version in case of XML documents.", "typeRef": null}, {"name": "name", "type": "string", "optional": true, "description": "`Attr`'s name.", "typeRef": null}, {"name": "value", "type": "string", "optional": true, "description": "`Attr`'s value.", "typeRef": null}, {"name": "pseudoType", "type": "string", "optional": true, "description": "Pseudo element type for this node.", "typeRef": "DOM.PseudoType"}, {"name": "pseudoIdentifier", "type": "string", "optional": true, "description": "Pseudo element identifier for this node. Only present if there is a valid pseudoType.", "typeRef": null}, {"name": "shadowRootType", "type": "string", "optional": true, "description": "Shadow root type.", "typeRef": "DOM.ShadowRootType"}, {"name": "frameId", "type": "string", "optional": true, "description": "Frame ID for frame owner elements.", "typeRef": "Page.FrameId"}, {"name": "contentDocument", "type": "object", "optional": true, "description": "Content document for frame owner elements.", "typeRef": "DOM.Node"}, {"name": "shadowRoots", "type": "array", "optional": true, "description": "Shadow root list for given element host.", "typeRef": "DOM.Node"}, {"name": "templateContent", "type": "object", "optional": true, "description": "Content document fragment for template elements.", "typeRef": "DOM.Node"}, {"name": "pseudoElements", "type": "array", "optional": true, "description": "Pseudo elements associated with this node.", "typeRef": "DOM.Node"}, {"name": "importedDocument", "type": "object", "optional": true, "description": "Deprecated, as the HTML Imports API has been removed (crbug.com/937746). This property used to return the imported document for the HTMLImport links. The property is always undefined now.", "typeRef": "DOM.Node"}, {"name": "distributedNodes", "type": "array", "optional": true, "description": "Distributed nodes for given insertion point.", "typeRef": "DOM.BackendNode"}, {"name": "isSVG", "type": "boolean", "optional": true, "description": "Whether the node is SVG.", "typeRef": null}, {"name": "compatibilityMode", "type": "string", "optional": true, "description": "", "typeRef": "DOM.CompatibilityMode"}, {"name": "assignedSlot", "type": "object", "optional": true, "description": "", "typeRef": "DOM.BackendNode"}, {"name": "isScrollable", "type": "boolean", "optional": true, "description": "", "typeRef": null}, {"name": "affectedByStartingStyles", "type": "boolean", "optional": true, "description": "", "typeRef": null}, {"name": "adoptedStyleSheets", "type": "array", "optional": true, "description": "", "typeRef": "DOM.StyleSheetId"}, {"name": "adProvenance", "type": "object", "optional": true, "description": "", "typeRef": "Network.AdProvenance"}]);
 inspectorBackend.registerType("DOM.DetachedElementInfo", [{"name": "treeNode", "type": "object", "optional": false, "description": "", "typeRef": "DOM.Node"}, {"name": "retainedNodeIds", "type": "array", "optional": false, "description": "", "typeRef": "DOM.NodeId"}]);

package/front_end/generated/protocol.ts

@@ -5849,6 +5849,13 @@ export namespace DOM {
      * popover if it was previously force-opened.
      */
     enable: boolean;
+    /**
+     * Optional ID of the element invoking this popover, used to establish the implicit anchor.
+     * If not provided, it will fall back to the first invoker in the document, preferring
+     * elements with a popovertarget attribute over those with a commandfor attribute. Note that
+     * if there are multiple invokers, this is just an estimate.
+     */
+    invokerNodeId?: BackendNodeId;
   }
 
   export interface ForceShowPopoverResponse extends ProtocolResponseWithError {

package/front_end/models/ai_assistance/AiAgent2.ts

@@ -5,7 +5,6 @@
 import * as Host from '../../core/host/host.js';
 
 import {
-  type AgentOptions,
   AiAgent,
   type ContextResponse,
   type ConversationContext,
@@ -13,7 +12,11 @@ import {
   type RequestOptions,
   ResponseType
 } from './agents/AiAgent.js';
+import {type ExecuteJsAgentOptions, executeJsCode} from './agents/ExecuteJavascript.js';
+import {ChangeManager} from './ChangeManager.js';
+import {DOMNodeContext} from './contexts/DOMNodeContext.js';
 import {debugLog} from './debug.js';
+import {ExtensionScope} from './ExtensionScope.js';
 import type {Skill, SkillName} from './skills/Skill.js';
 import {SKILLS} from './skills/SkillRegistry.js';
 import type {Tool} from './tools/Tool.js';
@@ -30,6 +33,8 @@ export class AiAgent2 extends AiAgent<unknown> {
   readonly userTier = 'TESTERS';
 
   #skillsInjected = false;
+  #changes = new ChangeManager();
+  #execJs: typeof executeJsCode;
 
   get options(): RequestOptions {
     return {};
@@ -38,8 +43,9 @@ export class AiAgent2 extends AiAgent<unknown> {
   readonly #activeSkills = new Set<SkillName>();
   readonly #declaredTools = new Set<string>();
 
-  constructor(opts: AgentOptions) {
+  constructor(opts: ExecuteJsAgentOptions) {
     super(opts);
+    this.#execJs = opts.execJs ?? executeJsCode;
     this.#declaredTools.add('learnSkills');
     const skillsList = Object.keys(SKILLS).join(', ');
     this.declareFunction<{skills: SkillName[]}>('learnSkills', {
@@ -154,6 +160,11 @@ User query: ${enhancedQuery}`;
     return response.trim();
   }
 
+  #createExtensionScope(changes: ChangeManager): {install(): Promise<void>, uninstall(): Promise<void>} {
+    const selectedNode = this.context && this.context instanceof DOMNodeContext ? this.context.getItem() : null;
+    return new ExtensionScope(changes, this.sessionId, selectedNode);
+  }
+
   /**
    * Declares a tool to be available to the agent model, verifying first that
    * it hasn't already been declared to prevent duplicate declaration errors.
@@ -168,9 +179,17 @@ User query: ${enhancedQuery}`;
       description: tool.description,
       parameters: tool.parameters,
       displayInfoFromArgs: tool.displayInfoFromArgs,
-      handler: args => tool.handler(args, {
-        conversationContext: this.context ?? null,
-      }),
+      handler: (args, options) => tool.handler(
+          args,
+          {
+            conversationContext: this.context ?? null,
+            changeManager: this.#changes,
+            createExtensionScope: this.#createExtensionScope.bind(this),
+            execJs: this.#execJs,
+            getExecutionContextNode: () => this.context instanceof DOMNodeContext ? this.context.getItem() : null,
+          },
+          options,
+          ),
     });
   }
 

package/front_end/models/ai_assistance/AiConversation.ts

@@ -328,24 +328,27 @@ export class AiConversation {
     };
   }
 
+  #filterHistoryForNewAgent(): Host.AidaClient.Content[] {
+    return this.#agent?.history
+               .map(content => {
+                 return {
+                   ...content,
+                   parts: content.parts.filter(part => !('functionCall' in part) && !('functionResponse' in part)),
+                 };
+               })
+               .filter(content => content.parts.length > 0) ??
+        [];
+  }
+
   #updateAgent(type: ConversationType): void {
     if (this.#type === type) {
       return;
     }
 
-    this.#type = type;
+    const isTransitioningFromStorage = this.#type === ConversationType.STORAGE && type !== ConversationType.STORAGE;
+    const history = isTransitioningFromStorage ? [] : this.#filterHistoryForNewAgent();
 
-    // We need to filter out the function calls
-    // as the LLM tries to call the existing ones.
-    const history =
-        this.#agent?.history
-            .map(content => {
-              return {
-                ...content,
-                parts: content.parts.filter(part => !('functionCall' in part) && !('functionResponse' in part)),
-              };
-            })
-            .filter(content => content.parts.length > 0);
+    this.#type = type;
 
     const options = {
       aidaClient: this.#aidaClient,

package/front_end/models/ai_assistance/AiUtils.ts

@@ -8,6 +8,8 @@ import * as i18n from '../../core/i18n/i18n.js';
 import type * as Platform from '../../core/platform/platform.js';
 import * as Root from '../../core/root/root.js';
 
+import {debugLog} from './debug.js';
+
 const UIStrings = {
   /**
    * @description Message shown to the user if the age check is not successful.
@@ -71,3 +73,72 @@ export function isSameOrigin(url1: Platform.DevToolsPath.UrlString, url2: Platfo
   const origin2 = Common.ParsedURL.ParsedURL.extractOrigin(url2);
   return origin1 !== '' && origin1 === origin2;
 }
+
+export interface OneShotPromptRequest {
+  aidaClient: Host.AidaClient.AidaClient;
+  preamble: string;
+  query: string;
+  clientFeature: Host.AidaClient.ClientFeature;
+  temperature?: number;
+  modelId?: string;
+  userTier?: string;
+  serverSideLoggingEnabled?: boolean;
+  signal?: AbortSignal;
+}
+
+export async function runOneShotPrompt({
+  aidaClient,
+  preamble,
+  query,
+  clientFeature,
+  temperature,
+  modelId,
+  userTier,
+  serverSideLoggingEnabled,
+  signal,
+}: OneShotPromptRequest): Promise<string> {
+  const chromeVersion = Root.Runtime.getChromeVersion();
+  if (!chromeVersion) {
+    throw new Error('Cannot determine Chrome version');
+  }
+  const disallowLogging = !serverSideLoggingEnabled;
+  const sessionId = crypto.randomUUID();
+
+  const userTierEnum = Host.AidaClient.convertToUserTierEnum(userTier);
+  const finalPreamble = userTierEnum === Host.AidaClient.UserTier.TESTERS ? preamble : undefined;
+
+  const request: Host.AidaClient.DoConversationRequest = {
+    client: Host.AidaClient.CLIENT_NAME,
+    current_message: {
+      parts: [{text: query}],
+      role: Host.AidaClient.Role.USER,
+    },
+    preamble: finalPreamble,
+    options: {
+      temperature: typeof temperature === 'number' && temperature >= 0 ? temperature : undefined,
+      model_id: modelId || undefined,
+    },
+    metadata: {
+      disable_user_content_logging: disallowLogging,
+      string_session_id: sessionId,
+      user_tier: userTierEnum,
+      client_version: chromeVersion,
+    },
+    functionality_type: Host.AidaClient.FunctionalityType.CHAT,
+    client_feature: clientFeature,
+  };
+
+  let textResponse = '';
+  try {
+    for await (const response of aidaClient.doConversation(request, {signal})) {
+      if (response.explanation) {
+        textResponse = response.explanation;
+      }
+    }
+  } catch (err) {
+    debugLog('Error calling AIDA for one-shot prompt', err);
+    throw err;
+  }
+
+  return textResponse;
+}

package/front_end/models/ai_assistance/ChangeManager.ts

@@ -9,8 +9,6 @@ import type * as Protocol from '../../generated/protocol.js';
 
 export interface Change {
   groupId: string;
-  // Optional turn ID to group changes from the same turn.
-  turnId?: number;
   // Optional about where in the source the selector was defined.
   sourceLocation?: string;
   // Selector used by the page or a simple selector as the fallback.
@@ -104,7 +102,6 @@ export class ChangeManager {
       // it currently causes crashes in the Styles tab when duplicate selectors exist (crbug.com/393515428).
       // This workaround avoids that crash.
       existingChange.groupId = change.groupId;
-      existingChange.turnId = change.turnId;
     } else {
       changes.push({
         ...change,
@@ -126,11 +123,11 @@ export class ChangeManager {
         .join('\n\n');
   }
 
-  getChangedNodesForGroupId(groupId: string, turnId?: number): Protocol.DOM.BackendNodeId[] {
+  getChangedNodesForGroupId(groupId: string): Protocol.DOM.BackendNodeId[] {
     const nodes = new Set<Protocol.DOM.BackendNodeId>();
     for (const changes of this.#stylesheetChanges.values()) {
       for (const change of changes) {
-        if (change.groupId === groupId && change.backendNodeId && (turnId === undefined || change.turnId === turnId)) {
+        if (change.groupId === groupId && change.backendNodeId) {
           nodes.add(change.backendNodeId);
         }
       }