chrome-devtools-frontend 1.0.1611825 → 1.0.1613625

package/front_end/panels/changes/ChangesView.ts

@@ -6,13 +6,11 @@ import '../../ui/legacy/legacy.js';
 
 import * as i18n from '../../core/i18n/i18n.js';
 import type * as Platform from '../../core/platform/platform.js';
-import * as GreenDev from '../../models/greendev/greendev.js';
 import type * as Workspace from '../../models/workspace/workspace.js';
 import * as WorkspaceDiff from '../../models/workspace_diff/workspace_diff.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import * as Lit from '../../ui/lit/lit.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
-import * as PanelsCommon from '../common/common.js';
 
 import {ChangesSidebar, Events} from './ChangesSidebar.js';
 import changesViewStyles from './changesView.css.js';
@@ -48,8 +46,6 @@ export const DEFAULT_VIEW: View = (input, _output, target) => {
         Events.SELECTED_UI_SOURCE_CODE_CHANGED, () => input.onSelect(sidebar.selectedUISourceCode()));
   };
 
-  const hasCopyToPrompt = GreenDev.Prototypes.instance().isEnabled('copyToGemini');
-
   render(
       // clang-format off
       html`
@@ -70,14 +66,6 @@ export const DEFAULT_VIEW: View = (input, _output, target) => {
                 workspaceDiff: input.workspaceDiff
             })}
           </div>
-          ${hasCopyToPrompt ? html`
-            <devtools-widget class="copy-to-prompt"
-              ${widget(PanelsCommon.CopyChangesToPrompt, {
-                workspaceDiff: input.workspaceDiff,
-                patchAgentCSSChange: null,
-              })}
-            ></devtools-widget>
-          ` : Lit.nothing}
         </div>
         <devtools-widget slot="sidebar" ${widget(ChangesSidebar, {workspaceDiff: input.workspaceDiff})}
           ${UI.Widget.widgetRef(ChangesSidebar, onSidebar)}>

package/front_end/panels/common/common.ts

@@ -111,4 +111,3 @@ export * as PersistenceUtils from './PersistenceUtils.js';
 export * as DOMLinkifier from './DOMLinkifier.js';
 export * as ThrottlingUtils from './ThrottlingUtils.js';
 export * as ExtensionIframe from './ExtensionView.js';
-export {CopyChangesToPrompt} from './CopyChangesToPrompt.js';

package/front_end/panels/console/ConsolePrompt.ts

@@ -29,11 +29,11 @@ const UIStrings = {
    */
   consolePrompt: 'Console prompt',
   /**
-   * @description Warning shown to users when pasting text into the DevTools console.
+   * @description Warning shown to users when pasting text into the DevTools console. IMPORTANT: keep double quotes around PH1 and do not use single quotes.
    * @example {allow pasting} PH1
    */
   selfXssWarning:
-      'Warning: Don’t paste code into the DevTools Console that you don’t understand or haven’t reviewed yourself. This could allow attackers to steal your identity or take control of your computer. Please type ‘{PH1}’ below and press Enter to allow pasting.',
+      'Warning: Don’t paste code into the DevTools Console that you don’t understand or haven’t reviewed yourself. This could allow attackers to steal your identity or take control of your computer. Please type “{PH1}” below and press Enter to allow pasting.',
   /**
    * @description Text a user needs to type in order to confirm that they are aware of the danger of pasting code into the DevTools console.
    */

package/front_end/panels/elements/StylePropertyTreeElement.ts

@@ -2782,7 +2782,8 @@ export class StylePropertyTreeElement extends UI.TreeOutline.TreeElement {
       existingElement?.remove();
     }
 
-    if (!this.overriddenByAnimation() || UI.ViewManager.ViewManager.instance().isViewVisible('animations')) {
+    if (!this.overriddenByAnimation() || UI.ViewManager.ViewManager.instance().isViewVisible('animations') ||
+        !Common.Settings.Settings.instance().moduleSetting('css-animations-only-when-animations-tab-open').get()) {
       return;
     }
 

package/front_end/panels/elements/StylesSidebarPane.ts

@@ -1096,10 +1096,12 @@ export class StylesSidebarPane extends Common.ObjectWrapper.eventMixin<EventType
     // the matched styles we reenable the button.
     LayersWidget.ButtonProvider.instance().item().setVisible(false);
     const animationsPanelVisible = UI.ViewManager.ViewManager.instance().isViewVisible('animations');
+    const cssAnimationsOnlyWhenAnimationsTabOpen =
+        Common.Settings.Settings.instance().moduleSetting('css-animations-only-when-animations-tab-open').get();
     for (const style of matchedStyles.nodeStyles()) {
       const isTransitionOrAnimationStyle = style.type === SDK.CSSStyleDeclaration.Type.Transition ||
           style.type === SDK.CSSStyleDeclaration.Type.Animation;
-      if (isTransitionOrAnimationStyle && !animationsPanelVisible) {
+      if (isTransitionOrAnimationStyle && cssAnimationsOnlyWhenAnimationsTabOpen && !animationsPanelVisible) {
         continue;
       }
 
@@ -2288,7 +2290,7 @@ export class CSSPropertyPrompt extends UI.TextPrompt.TextPrompt {
             do {
               if (cursor.name === ':') {
                 name = suggestionText.slice(node.from, cursor.from);
-                value = suggestionText.slice(cursor.to + 1, node.to);
+                value = suggestionText.slice(cursor.to, node.to);
               }
             } while (cursor.nextSibling());
           }
@@ -2348,6 +2350,8 @@ export class CSSPropertyPrompt extends UI.TextPrompt.TextPrompt {
       }
 
       if (suggestionForCurrentPrompt !== textAfterAccept) {
+        // Explicitly set the query range as it is cleared during `acceptAutoComplete`
+        this.queryRange = new TextUtils.TextRange.TextRange(0, 0, 0, textAfterAccept.length);
         // Re-apply the ghost text for the remainder
         this.applySuggestion({text: suggestionForCurrentPrompt}, true);
       }

package/front_end/panels/elements/elements-meta.ts

@@ -163,6 +163,10 @@ const UIStrings = {
    * @description Command for toggling the eye dropper when the color picker is open
    */
   toggleEyeDropper: 'Toggle eye dropper',
+  /**
+   * @description Title of a setting under the Elements category.
+   */
+  cssAnimationsOnlyWhenAnimationsTabOpen: 'Show animation styles only when the Animations tab is open',
 } as const;
 const str_ = i18n.i18n.registerUIStrings('panels/elements/elements-meta.ts', UIStrings);
 const i18nLazyString = i18n.i18n.getLazilyComputedLocalizedString.bind(undefined, str_);
@@ -569,6 +573,16 @@ Common.Settings.registerSettingExtension({
   defaultValue: true,
 });
 
+Common.Settings.registerSettingExtension({
+  category: Common.Settings.SettingCategory.ELEMENTS,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+  order: 6,
+  title: i18nLazyString(UIStrings.cssAnimationsOnlyWhenAnimationsTabOpen),
+  settingName: 'css-animations-only-when-animations-tab-open',
+  settingType: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: true,
+});
+
 Common.Settings.registerSettingExtension({
   settingName: 'show-event-listeners-for-ancestors',
   settingType: Common.Settings.SettingType.BOOLEAN,

package/front_end/panels/emulation/DeviceModeToolbar.ts

@@ -217,6 +217,7 @@ export class DeviceModeToolbar {
   private widthInput: EmulationComponents.DeviceSizeInputElement.SizeInputElement;
   private heightInput: EmulationComponents.DeviceSizeInputElement.SizeInputElement;
   private deviceScaleItem!: UI.Toolbar.ToolbarComboBox;
+  private deviceScaleItems: UI.Toolbar.ToolbarItem[] = [];
   private deviceSelectItem!: UI.Toolbar.ToolbarComboBox;
   private scaleItem!: UI.Toolbar.ToolbarComboBox;
   private uaItem!: UI.Toolbar.ToolbarComboBox;
@@ -341,10 +342,14 @@ export class DeviceModeToolbar {
     this.deviceScaleItem = new UI.Toolbar.ToolbarComboBox(
         this.onDeviceScaleChange.bind(this), i18nString(UIStrings.devicePixelRatio), 'dark-text', 'device-pixel-ratio');
     this.deviceScaleItem.turnShrinkable();
-    this.deviceScaleItem.setVisible(this.showDeviceScaleFactorSetting.get());
     const deviceScaleSpan = uiI18n.getFormatLocalizedString(str_, UIStrings.dpr, {PH1: this.deviceScaleItem.element});
-    mainToolbar.append(...deviceScaleSpan.childNodes);
-    mainToolbar.appendToolbarItem(this.deviceScaleItem);
+    for (const node of Array.from(deviceScaleSpan.childNodes)) {
+      const item = node === this.deviceScaleItem.element ? this.deviceScaleItem :
+                                                           new UI.Toolbar.ToolbarText(node.textContent || '');
+      item.setVisible(this.showDeviceScaleFactorSetting.get());
+      this.deviceScaleItems.push(item);
+      mainToolbar.appendToolbarItem(item);
+    }
     mainToolbar.appendToolbarItem(new UI.Toolbar.ToolbarItem(this.createEmptyToolbarElement()));
     this.uaItem = new UI.Toolbar.ToolbarComboBox(
         this.onUAChange.bind(this), i18nString(UIStrings.deviceType), 'dark-text', 'device-type');
@@ -758,7 +763,11 @@ export class DeviceModeToolbar {
 
   private updateDeviceScaleFactorVisibility(): void {
     if (this.deviceScaleItem) {
-      this.deviceScaleItem.setVisible(this.showDeviceScaleFactorSetting.get());
+      const visible = this.showDeviceScaleFactorSetting.get();
+      this.deviceScaleItem.setVisible(visible);
+      for (const item of this.deviceScaleItems) {
+        item.setVisible(visible);
+      }
     }
   }
 

package/front_end/panels/network/NetworkLogView.ts

@@ -1880,10 +1880,30 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
       const throttlingMenu =
           contextMenu.debugSection().appendSubMenuItem(i18nString(UIStrings.throttleRequests), /* disabled=*/ true);
 
-      const urlWithoutScheme = request.parsedURL.urlWithoutScheme();
-      const urlPattern = urlWithoutScheme &&
+      const parsed = request.parsedURL;
+      let urlPatternString = '';
+      if (parsed.isValid) {
+        // We cannot escape parsed.urlWithoutScheme() directly. If we escaped the first '?'
+        // URLPattern would treat the entire string as the pathname and fail to match the query string.
+        // Thus, we must escape the components individually and reconstruct the pattern string.
+        urlPatternString = '*://' + Platform.StringUtilities.escapeForURLPattern(parsed.host);
+        if (parsed.port) {
+          urlPatternString += ':' + Platform.StringUtilities.escapeForURLPattern(parsed.port);
+        }
+        urlPatternString += Platform.StringUtilities.escapeForURLPattern(parsed.path);
+        if (parsed.queryParams) {
+          urlPatternString += '?' + Platform.StringUtilities.escapeForURLPattern(parsed.queryParams);
+        }
+        if (parsed.fragment) {
+          urlPatternString += '#' + Platform.StringUtilities.escapeForURLPattern(parsed.fragment);
+        }
+      } else if (parsed.urlWithoutScheme()) {
+        urlPatternString = '*://' + Platform.StringUtilities.escapeForURLPattern(parsed.urlWithoutScheme());
+      }
+
+      const urlPattern = urlPatternString &&
           SDK.NetworkManager.RequestURLPattern.create(
-              `*://${urlWithoutScheme}` as SDK.NetworkManager.URLPatternConstructorString);
+              urlPatternString as SDK.NetworkManager.URLPatternConstructorString);
       if (urlPattern) {
         throttlingMenu.setEnabled(true);
         blockingMenu.setEnabled(true);
@@ -1906,30 +1926,39 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
             {jslogContext: 'throttle-request-url'});
       }
 
-        const domain = request.parsedURL.domain();
-        const domainPattern = domain &&
-            SDK.NetworkManager.RequestURLPattern.create(
-                `*://${domain}` as SDK.NetworkManager.URLPatternConstructorString);
-        if (domainPattern) {
-          throttlingMenu.setEnabled(true);
-          blockingMenu.setEnabled(true);
-          const existingConditions = manager.requestConditions.findCondition(domainPattern.constructorString);
-          const isBlocking = existingConditions?.conditions === SDK.NetworkManager.BlockingConditions;
-          const isThrottling = existingConditions &&
-              existingConditions.conditions !== SDK.NetworkManager.BlockingConditions &&
-              existingConditions.conditions !== SDK.NetworkManager.NoThrottlingConditions;
-          const croppedURL = Platform.StringUtilities.trimMiddle(domainPattern.constructorString, maxBlockedURLLength);
-          blockingMenu.debugSection().appendItem(
-              isBlocking ? i18nString(UIStrings.unblockS, {PH1: croppedURL}) : i18nString(UIStrings.blockRequestDomain),
-              () => isBlocking ? removeRequestCondition(domainPattern) :
-                                 addRequestCondition(domainPattern, SDK.NetworkManager.BlockingConditions),
-              {jslogContext: 'block-request-domain'});
-          throttlingMenu.debugSection().appendItem(
-              isThrottling ? i18nString(UIStrings.unthrottleS, {PH1: croppedURL}) :
-                             i18nString(UIStrings.throttleRequestDomain),
-              () => isThrottling ? removeRequestCondition(domainPattern) :
-                                   addRequestCondition(domainPattern, SDK.NetworkManager.Slow3GConditions),
-              {jslogContext: 'throttle-request-domain'});
+      let domainPatternString = '';
+      if (parsed.isValid) {
+        domainPatternString = '*://' + Platform.StringUtilities.escapeForURLPattern(parsed.host);
+        if (parsed.port) {
+          domainPatternString += ':' + Platform.StringUtilities.escapeForURLPattern(parsed.port);
+        }
+      } else if (parsed.domain()) {
+        domainPatternString = '*://' + Platform.StringUtilities.escapeForURLPattern(parsed.domain());
+      }
+
+      const domainPattern = domainPatternString &&
+          SDK.NetworkManager.RequestURLPattern.create(
+              domainPatternString as SDK.NetworkManager.URLPatternConstructorString);
+      if (domainPattern) {
+        throttlingMenu.setEnabled(true);
+        blockingMenu.setEnabled(true);
+        const existingConditions = manager.requestConditions.findCondition(domainPattern.constructorString);
+        const isBlocking = existingConditions?.conditions === SDK.NetworkManager.BlockingConditions;
+        const isThrottling = existingConditions &&
+            existingConditions.conditions !== SDK.NetworkManager.BlockingConditions &&
+            existingConditions.conditions !== SDK.NetworkManager.NoThrottlingConditions;
+        const croppedURL = Platform.StringUtilities.trimMiddle(domainPattern.constructorString, maxBlockedURLLength);
+        blockingMenu.debugSection().appendItem(
+            isBlocking ? i18nString(UIStrings.unblockS, {PH1: croppedURL}) : i18nString(UIStrings.blockRequestDomain),
+            () => isBlocking ? removeRequestCondition(domainPattern) :
+                               addRequestCondition(domainPattern, SDK.NetworkManager.BlockingConditions),
+            {jslogContext: 'block-request-domain'});
+        throttlingMenu.debugSection().appendItem(
+            isThrottling ? i18nString(UIStrings.unthrottleS, {PH1: croppedURL}) :
+                           i18nString(UIStrings.throttleRequestDomain),
+            () => isThrottling ? removeRequestCondition(domainPattern) :
+                                 addRequestCondition(domainPattern, SDK.NetworkManager.Slow3GConditions),
+            {jslogContext: 'throttle-request-domain'});
       }
 
       if (SDK.NetworkManager.NetworkManager.canReplayRequest(request)) {
@@ -1944,7 +1973,8 @@ export class NetworkLogView extends Common.ObjectWrapper.eventMixin<EventTypes,
     const requests = Logs.NetworkLog.NetworkLog.instance().requests().filter(request => this.applyFilter(request));
     return requests.filter(NetworkLogView.getHTTPRequestsFilter).filter(request => {
       return request.finished ||
-          (request.resourceType() === Common.ResourceType.resourceTypes.WebSocket && request.responseReceivedTime);
+          (request.resourceType() === Common.ResourceType.resourceTypes.WebSocket && request.responseReceivedTime) ||
+          Boolean(request.eventSourceMessages()?.length);
     });
   }
 

package/front_end/panels/profiler/HeapSnapshotDataGrids.ts

@@ -300,7 +300,7 @@ export class HeapSnapshotSortableDataGrid extends Common.ObjectWrapper
       let field1 = nodeA[sortFields.fieldName1];
       // @ts-expect-error
       let field2 = nodeB[sortFields.fieldName1];
-      let result: number|(0 | 1 | -1) = field1 < field2 ? -1 : (field1 > field2 ? 1 : 0);
+      let result: number = field1 < field2 ? -1 : (field1 > field2 ? 1 : 0);
       if (!sortFields.ascending1) {
         result = -result;
       }

package/front_end/panels/profiler/HeapSnapshotGridNodes.ts

@@ -136,31 +136,23 @@ export class HeapSnapshotGridNode extends
     Common.ObjectWrapper.eventMixin<HeapSnapshotGridNode.EventTypes, typeof HeapSnapshotGridNodeBase>(
         HeapSnapshotGridNodeBase) {
   dataGridInternal: HeapSnapshotSortableDataGrid;
-  instanceCount: number;
-  readonly savedChildren: Map<number, HeapSnapshotGridNode>;
+  instanceCount = 0;
+  readonly savedChildren = new Map<number, HeapSnapshotGridNode>();
+  /**
+   * List of position ranges for all visible nodes: [startPos1, endPos1),...,[startPosN, endPosN)
+   * Position is an item position in the provider.
+   */
   retrievedChildrenRanges: Array<{
     from: number,
     to: number,
-  }>;
-  providerObject: HeapSnapshotModel.ChildrenProvider.ChildrenProvider|null;
-  reachableFromWindow: boolean;
+  }> = [];
+  providerObject: HeapSnapshotModel.ChildrenProvider.ChildrenProvider|null = null;
+  reachableFromWindow = false;
   populated?: boolean;
 
   constructor(tree: HeapSnapshotSortableDataGrid, hasChildren: boolean) {
     super(null, hasChildren);
     this.dataGridInternal = tree;
-    this.instanceCount = 0;
-
-    this.savedChildren = new Map();
-
-    /**
-     * List of position ranges for all visible nodes: [startPos1, endPos1),...,[startPosN, endPosN)
-     * Position is an item position in the provider.
-     */
-    this.retrievedChildrenRanges = [];
-
-    this.providerObject = null;
-    this.reachableFromWindow = false;
   }
 
   get name(): string|undefined {

package/front_end/panels/protocol_monitor/JSONEditor.ts

@@ -64,6 +64,7 @@ export const enum ParameterType {
   BOOLEAN = 'boolean',
   ARRAY = 'array',
   OBJECT = 'object',
+  UNKNOWN = 'unknown',
 }
 
 interface BaseParameter {
@@ -100,7 +101,13 @@ interface ObjectParameter extends BaseParameter {
   value?: Parameter[];
 }
 
-export type Parameter = ArrayParameter|NumberParameter|StringParameter|BooleanParameter|ObjectParameter;
+interface UnknownParameter extends BaseParameter {
+  type: ParameterType.UNKNOWN;
+  value?: string;
+}
+
+export type Parameter =
+    ArrayParameter|NumberParameter|StringParameter|BooleanParameter|ObjectParameter|UnknownParameter;
 
 export interface Command {
   command: string;
@@ -128,6 +135,8 @@ interface ViewInput {
   onParameterKeydown: (event: KeyboardEvent) => void;
   onParameterKeyBlur: (event: Event) => void;
   onParameterValueBlur: (event: Event) => void;
+  displayTargetSelector?: boolean;
+  displayCommandInput?: boolean;
 }
 
 export type View = (input: ViewInput, output: object, target: HTMLElement) => void;
@@ -149,6 +158,7 @@ const defaultValueByType = new Map<string, string|number|boolean>([
   ['string', ''],
   ['number', 0],
   ['boolean', false],
+  ['unknown', ''],
 ]);
 
 const DUMMY_DATA = 'dummy';
@@ -176,6 +186,8 @@ export class JSONEditor extends Common.ObjectWrapper.eventMixin<EventTypes, type
   #targetId?: string;
   #hintPopoverHelper?: UI.PopoverHelper.PopoverHelper;
   #view: View;
+  displayTargetSelector = true;
+  displayCommandInput = true;
 
   constructor(element: HTMLElement, view = DEFAULT_VIEW) {
     super(element, {useShadowDom: true});
@@ -240,6 +252,10 @@ export class JSONEditor extends Common.ObjectWrapper.eventMixin<EventTypes, type
     }
   }
 
+  set commandToDisplay(command: string) {
+    this.displayCommand(command, {});
+  }
+
   get targetId(): string|undefined {
     return this.#targetId;
   }
@@ -312,6 +328,13 @@ export class JSONEditor extends Common.ObjectWrapper.eventMixin<EventTypes, type
           }
           return nestedArrayParameters.length === 0 ? [] : nestedArrayParameters;
         }
+        case ParameterType.UNKNOWN: {
+          try {
+            return JSON.parse(parameter.value as string);
+          } catch {
+            return parameter.value;
+          }
+        }
         default: {
           return parameter.value;
         }
@@ -387,7 +410,7 @@ export class JSONEditor extends Common.ObjectWrapper.eventMixin<EventTypes, type
       typeRef: schema?.typeRef,
       value,
       description,
-    } as Parameter;
+    } as unknown as Parameter;
   }
 
   #convertPrimitiveParameter(key: string, value: unknown, schema?: Parameter): Parameter {
@@ -967,6 +990,8 @@ export class JSONEditor extends Common.ObjectWrapper.eventMixin<EventTypes, type
       computeDropdownValues: (parameter: Parameter) => {
         return this.#computeDropdownValues(parameter);
       },
+      displayTargetSelector: this.displayTargetSelector,
+      displayCommandInput: this.displayCommandInput,
     };
     const viewOutput = {};
     this.#view(viewInput, viewOutput, this.contentElement);
@@ -1229,7 +1254,8 @@ export const DEFAULT_VIEW: View = (input, _output, target) => {
   render(html`
     <div class="wrapper" @keydown=${input.onKeydown} jslog=${VisualLogging.pane('command-editor').track({resize: true})}>
       <div class="editor-wrapper">
-        ${renderTargetSelectorRow(input)}
+        ${input.displayTargetSelector !== false ? renderTargetSelectorRow(input) : nothing}
+        ${input.displayCommandInput !== false ? html`
         <div class="row attribute padded">
           <div class="command">command<span class="separator">:</span></div>
           <devtools-suggestion-input
@@ -1241,7 +1267,7 @@ export const DEFAULT_VIEW: View = (input, _output, target) => {
             @blur=${input.onCommandInputBlur}
             class=${classMap({'json-input': true})}
           ></devtools-suggestion-input>
-        </div>
+        </div>` : nothing}
         ${input.parameters.length ? html`
         <div class="row attribute padded">
           <div>parameters<span class="separator">:</span></div>

package/front_end/panels/recorder/RecorderController.ts

@@ -133,21 +133,21 @@ const UIStrings = {
    */
   doYouTrustThisCode: 'Do you trust this recording?',
   /**
-   * @description Warning shown to users when imports code into DevTools Recorder.
+   * @description Warning shown to users when imports code into DevTools Recorder. IMPORTANT: keep double quotes around PH1 and do not use single quotes.
    * @example {allow importing} PH1
    */
   doNotImport:
-      'Don\'t import recordings you do not understand or have not reviewed yourself into DevTools. This could allow attackers to steal your identity or take control of your computer. Please type \'\'{PH1}\'\' below to allow importing.',
+      'Don\'t import recordings you do not understand or have not reviewed yourself into DevTools. This could allow attackers to steal your identity or take control of your computer. Please type “{PH1}” below to allow importing.',
   /**
    * @description Text a user needs to type in order to confirm that they
    *are aware of the danger of import code into the DevTools Recorder.
    */
   allowImporting: 'allow importing',
   /**
-   * @description Input box placeholder which instructs the user to type 'allow importing' into the input box.
+   * @description Input box placeholder which instructs the user to type 'allow importing' into the input box. IMPORTANT: keep double quotes around PH1 and do not use single quotes.
    * @example {allow importing} PH1
    */
-  typeAllowImporting: 'Type \'\'{PH1}\'\'',
+  typeAllowImporting: 'Type “{PH1}”',
 } as const;
 const str_ = i18n.i18n.registerUIStrings('panels/recorder/RecorderController.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);

package/front_end/panels/recorder/models/RecordingPlayer.ts

@@ -133,7 +133,7 @@ export class RecordingPlayer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
       throw new Error('could not find main page!');
     }
 
-    browser.on('targetdiscovered', (targetInfo: Protocol.Target.TargetInfo) => {
+    browser.on('targetdiscovered', (targetInfo: ReturnType<puppeteer.Target['_getTargetInfo']>) => {
       // Pop-ups opened by the main target won't be auto-attached. Therefore,
       // we need to create a session for them explicitly. We user openedId
       // and type to classify a target as requiring a session.

package/front_end/panels/settings/AISettingsTab.ts

@@ -120,6 +120,29 @@ const UIStrings = {
    */
   helpUnderstandStylingNetworkPerformanceAndFile:
       'Get help with understanding CSS styles, network requests, performance, and files',
+  /**
+   * @description Text describing the 'AI assistance' feature when V2 is enabled
+   */
+  aiAssistanceDescriptionV2: 'Get context-aware help on the inspected page',
+  /**
+   * @description First item in the description of the AI assistance feature when V2 is enabled
+   */
+  aiAssistanceWhenOnItem1V2:
+      'Debug styling, network, performance, source code, accessibility and storage issues with DevTools AI assistance',
+  /**
+   * @description Second item in the description of the AI assistance feature when V2 is enabled
+   */
+  aiAssistanceWhenOnItem2V2: 'Follow the agent\'s reasoning step-by-step and quickly jump to the relevant source data',
+  /**
+   * @description Explainer for which data is being sent by the AI assistance feature when V2 is enabled
+   */
+  aiAssistanceThingsToConsiderV2:
+      'To generate explanations, chat messages, data accessible for this site via DevTools panels and Web APIs, and items you select such as network requests, files, and performance traces are sent to Google and may be seen by human reviewers to improve this feature. This is an experimental AI feature and won’t always get it right.',
+  /**
+   * @description Explainer for which data is being sent by the AI assistance feature when V2 is enabled and logging is disabled
+   */
+  aiAssistanceThingsToConsiderNoLoggingV2:
+      'To generate explanations, chat messages, data accessible for this site via DevTools panels and Web APIs, and items you select such as network requests, files, and performance traces are sent to Google. The content you submit and that is generated by this feature will not be used to improve Google’s AI models. This is an experimental AI feature and won’t always get it right.',
   /**
    * @description Text describing the 'Code suggestions' feature
    */
@@ -480,6 +503,7 @@ export class AISettingsTab extends UI.Widget.VBox {
     }
 
     if (this.#aiAssistanceSetting) {
+      const isV2 = Root.Runtime.hostConfig.devToolsAiAssistanceV2?.enabled;
       const aiAssistanceData: AiSettingParams = {
         settingName: i18n.i18n.lockedString(
             AiAssistanceModel.AiUtils.isGeminiBranding() ? 'Gemini in Chrome DevTools' : 'AI assistance'),
@@ -488,12 +512,18 @@ export class AISettingsTab extends UI.Widget.VBox {
         enableSettingText: i18nString(UIStrings.enableAiAssistance),
         settingItems: [
           {iconName: 'info', text: this.#getAiAssistanceSettingInfo()},
-          {iconName: 'pen-spark', text: i18nString(UIStrings.receiveStylingSuggestions)}
+          {
+            iconName: 'pen-spark',
+            text: isV2 ? i18nString(UIStrings.aiAssistanceWhenOnItem2V2) :
+                         i18nString(UIStrings.receiveStylingSuggestions),
+          },
         ],
         toConsiderSettingItems: [{
           iconName: 'google',
-          text: noLogging ? i18nString(UIStrings.freestylerSendsDataNoLogging) :
-                            i18nString(UIStrings.freestylerSendsData)
+          text: isV2 ? (noLogging ? i18nString(UIStrings.aiAssistanceThingsToConsiderNoLoggingV2) :
+                                    i18nString(UIStrings.aiAssistanceThingsToConsiderV2)) :
+                       (noLogging ? i18nString(UIStrings.freestylerSendsDataNoLogging) :
+                                    i18nString(UIStrings.freestylerSendsData)),
         }],
         learnMoreLink: {
           url: 'https://developer.chrome.com/docs/devtools/ai-assistance',
@@ -581,6 +611,9 @@ export class AISettingsTab extends UI.Widget.VBox {
 
   #getAiAssistanceSettingDescription(): Platform.UIString.LocalizedString {
     const {hostConfig} = Root.Runtime;
+    if (hostConfig.devToolsAiAssistanceV2?.enabled) {
+      return i18nString(UIStrings.aiAssistanceDescriptionV2);
+    }
     if (hostConfig.devToolsAiAssistancePerformanceAgent?.enabled) {
       return i18nString(UIStrings.helpUnderstandStylingNetworkPerformanceAndFile);
     }
@@ -595,6 +628,9 @@ export class AISettingsTab extends UI.Widget.VBox {
 
   #getAiAssistanceSettingInfo(): Platform.UIString.LocalizedString {
     const {hostConfig} = Root.Runtime;
+    if (hostConfig.devToolsAiAssistanceV2?.enabled) {
+      return i18nString(UIStrings.aiAssistanceWhenOnItem1V2);
+    }
     if (hostConfig.devToolsAiAssistancePerformanceAgent?.enabled) {
       return i18nString(UIStrings.explainStylingNetworkPerformanceAndFile);
     }
@@ -648,9 +684,20 @@ export class AISettingsTab extends UI.Widget.VBox {
             .createSetting('console-insights-skip-reminder', true, Common.Settings.SettingStorageType.SESSION)
             .set(true);
       }
-    } else if (setting.name === 'ai-assistance-enabled' && !setting.get()) {
-      // If the "AI Assistance" is toggled off, we remove all the history entries related to the feature.
-      void AiAssistanceModel.AiHistoryStorage.AiHistoryStorage.instance().deleteAll();
+    } else if (setting.name === 'ai-assistance-enabled') {
+      if (!setting.get()) {
+        // If the "AI Assistance" is toggled off, we remove all the history entries related to the feature.
+        void AiAssistanceModel.AiHistoryStorage.AiHistoryStorage.instance().deleteAll();
+      }
+
+      if (Root.Runtime.hostConfig.devToolsAiAssistanceV2?.enabled && setting.get()) {
+        // If the user turns on ai-assistance whilst on the V2 experiment, they
+        // do not need to see the opt-in change management dialog. This dialog
+        // exists to inform users who opted-in to "V1" that in "V2" there are
+        // some data access changes. But if a user opts-in when on "V2", they
+        // do not need to see that dialog.
+        Common.Settings.Settings.instance().moduleSetting('ai-assistance-v2-opt-in-change-dialog-seen').set(true);
+      }
     }
     this.requestUpdate();
   }

package/front_end/panels/settings/SettingsScreen.ts

@@ -636,7 +636,7 @@ const GREENDEV_VIEW: View = (input, _output, target) => {
               <span>${i18nString(UIStrings.greenDevUnstable)}</span>
              </div>
              <div class="settings-experiments-block">
-               ${renderPrototypeCheckboxes(input.settings, ['aiAnnotations', 'copyToGemini', 'breakpointDebuggerAgent', 'emulationCapabilities'])}
+               ${renderPrototypeCheckboxes(input.settings, ['aiAnnotations', 'beyondStyling', 'breakpointDebuggerAgent', 'emulationCapabilities'])}
              </div>
            </devtools-card>
          </div>
@@ -646,7 +646,7 @@ const GREENDEV_VIEW: View = (input, _output, target) => {
 
 const GREENDEV_PROTOTYPE_NAMES: Record<keyof GreenDev.GreenDevSettings, string> = {
   aiAnnotations: 'AI auto-annotations',
-  copyToGemini: 'Copy changes to AI Prompt',
+  beyondStyling: 'Beyond Styling',
   breakpointDebuggerAgent: 'Breakpoint Debugger Agent',
   emulationCapabilities: 'Emulation Capabilities',
 };

package/front_end/services/puppeteer/PuppeteerConnection.ts

@@ -91,7 +91,7 @@ export class PuppeteerConnectionHelper {
         undefined /* process */,
         undefined /* closeCallback */,
         undefined /* targetFilterCallback */,
-        target => isPageTargetCallback((target as puppeteer.Target)._getTargetInfo()),
+        target => isPageTargetCallback((target as puppeteer.Target)._getTargetInfo() as Protocol.Target.TargetInfo),
         false /* waitForInitiallyDiscoveredTargets */,
     );
 

package/front_end/third_party/chromium/README.chromium

@@ -1,7 +1,7 @@
 Name: Dependencies sourced from the upstream `chromium` repository
 URL: Internal
 Version: N/A
-Revision: ba9b7fcecd6da792b29305cac5a406adc76fc1e5
+Revision: a287ca9049cc3727d680078c1d9275b32f721c2d
 Update Mechanism: Manual (https://crbug.com/428069060)
 License: BSD-3-Clause
 License File: LICENSE

package/front_end/ui/kit/icons/Icon.ts

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 /* eslint-disable @devtools/no-imperative-dom-api */
 
+// @ts-expect-error tsc 6 can't find type declarations for this file.
 import '../../../Images/Images.js';
 
 import iconStyles from './icon.css.js';