chrome-devtools-frontend 1.0.1667564 → 1.0.1669021

package/.agents/skills/gerrit-cli/scripts/import_upstream.py

@@ -0,0 +1,230 @@
+#!/usr/bin/env python3
+# Copyright 2026 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Imports the Gerrit CLI skill from upstream and applies DevTools revisions.
+
+No external checkouts (like chromium/src) are required. The script downloads
+the skill directly from the public Git repository.
+"""
+
+import io
+import re
+import sys
+import tarfile
+import urllib.request
+from pathlib import Path
+
+UPSTREAM_URL = "https://chromium.googlesource.com/chromium/agents/+archive/refs/heads/main/skills/gerrit-cli.tar.gz"
+
+DEVTOOLS_WRAPPER_LOGIC = """    # DevTools specific defaults
+    default_args = [
+        '--host', 'https://chromium-review.googlesource.com',
+        '--project', 'devtools/devtools-frontend',
+    ]
+
+    # gerrit_client.py expects: <command> [options] [args]
+    # We need to extract the command from sys.argv and put it first.
+    user_args = sys.argv[1:]
+    command = []
+    other_args = []
+    for i, arg in enumerate(user_args):
+        if not arg.startswith('-'):
+            command = [arg]
+            other_args = user_args[:i] + user_args[i + 1:]
+            break
+    else:
+        other_args = user_args
+
+    full_args = command + default_args + other_args
+
+    rc = subprocess.call(['vpython3', client] + full_args)"""
+
+CAUTION_TEXT = """> [!CAUTION]
+> **NEVER** use this to add patchset comments to an existing comment thread that
+> contains human reviewers in it. Using an agent to reply to a human is a
+> violation of Chromium's code of conduct.
+>
+> If the user requests this or you encounter this scenario as part of your work,
+> inform the user about which comment threads cannot be updated but otherwise
+> continue work.
+"""
+
+
+def fetch_upstream_skill(target_dir: Path):
+    print(f"Downloading upstream skill from {UPSTREAM_URL}...")
+    try:
+        req = urllib.request.Request(UPSTREAM_URL,
+                                     headers={'User-Agent': 'Mozilla/5.0'})
+        with urllib.request.urlopen(req) as response:
+            tar_data = response.read()
+    except Exception as e:
+        print(f"Failed to download upstream skill: {e}")
+        sys.exit(1)
+
+    print(f"Extracting to {target_dir}...")
+    target_dir.mkdir(parents=True, exist_ok=True)
+    with tarfile.open(fileobj=io.BytesIO(tar_data), mode='r:gz') as tar:
+        tar.extractall(path=target_dir)
+
+
+def apply_devtools_revisions(target_dir: Path):
+    print("Applying DevTools-specific adaptations...")
+
+    # 1. Update gerrit_client_wrapper.py
+    wrapper_path = target_dir / "scripts" / "gerrit_client_wrapper.py"
+    if wrapper_path.exists():
+        code = wrapper_path.read_text()
+        # Remove ". All rights reserved." from license header to satisfy DevTools presubmit
+        code = code.replace(". All rights reserved.", "")
+        target_line = "    rc = subprocess.call(['vpython3', client] + sys.argv[1:])"
+        if target_line in code:
+            code = code.replace(target_line, DEVTOOLS_WRAPPER_LOGIC)
+        else:
+            # Fallback if upstream changed to python3
+            fallback_line = "    rc = subprocess.call(['python3', client] + sys.argv[1:])"
+            code = code.replace(fallback_line, DEVTOOLS_WRAPPER_LOGIC)
+        wrapper_path.write_text(code)
+        print("  - Adapted gerrit_client_wrapper.py")
+
+    # 2. Update SKILL.md
+    skill_md_path = target_dir / "SKILL.md"
+    if skill_md_path.exists():
+        content = skill_md_path.read_text()
+
+        # Re-route wrapper script path & change python3 to vpython3
+        content = content.replace(
+            "python3 agents/shared/skills/gerrit-cli/scripts/gerrit_client_wrapper.py",
+            "vpython3 .agents/skills/gerrit-cli/scripts/gerrit_client_wrapper.py"
+        )
+
+        # Add vpython3 environment warning under Prerequisites
+        if "- **Environment**:" not in content:
+            prereq_note = "- **Environment**: Always execute the wrapper script using **`vpython3`** instead of `python3` to ensure all internal dependencies are satisfied.\n"
+            content = content.replace("## Prerequisites\n",
+                                      f"## Prerequisites\n\n{prereq_note}")
+
+        # Replace Gotchas section with DevTools defaults info
+        global_flags_section = """## Global Flags
+
+The wrapper script includes DevTools-specific defaults for `--host` and
+`--project`. You do not need to provide them unless you are targeting a
+different host or project.
+
+- **Default Host**: `https://chromium-review.googlesource.com`
+- **Default Project**: `devtools/devtools-frontend`
+- **JSON Output**: Always use the `--json_file=<path>` flag when querying
+  changes or fetching metadata to obtain structured, machine-readable output.
+"""
+        gotchas_pattern = r"## Gotchas & Environment Constraints\n\n(?:[^\n]+\n)+"
+        content = re.sub(gotchas_pattern, global_flags_section, content)
+
+        # Add attribution note at the bottom
+        attribution = """
+> [!NOTE]
+> This skill was adapted from the [Chromium Gerrit CLI skill](https://chromium.googlesource.com/chromium/agents/+/main/skills/gerrit-cli/)
+> (automatically rolled in from upstream).
+"""
+        if "> [!NOTE]" not in content:
+            content += "\n" + attribution
+
+        skill_md_path.write_text(content)
+        print("  - Adapted SKILL.md")
+
+    # 3. Update references/commands.md and references/workflows.md
+    for filename in ["commands.md", "workflows.md"]:
+        ref_path = target_dir / "references" / filename
+        if ref_path.exists():
+            c = ref_path.read_text()
+
+            # Path & executable transformations
+            c = c.replace("python3 agents/shared/skills/gerrit-cli/",
+                          "vpython3 .agents/skills/gerrit-cli/")
+
+            # Remove redundant host/project flags since our wrapper defaults them
+            # This matches the flag and any trailing backslash & newline to keep shell syntax valid
+            c = re.sub(r'^[ \t]+--(host|project)[ \t]+\S+[ \t]*(?:\\)?\n',
+                       '',
+                       c,
+                       flags=re.M)
+
+            # Re-route positional arguments to flags for various commands.
+            # TODO(b/40292850): Simplify/remove these once CL lands upstream:
+            # https://chromium-review.googlesource.com/c/chromium/agents/+/8146436
+
+            # content
+            c = c.replace(
+                "<change_id> <revision> <file_path>",
+                "--change <change_id> --revision <revision> --path <file_path>"
+            )
+            c = c.replace(
+                "<change_id> current <file_path>",
+                "--change <change_id> --revision current --path <file_path>")
+
+            # changes (query flag is required)
+            c = c.replace('changes \\\n    "owner:self status:open"',
+                          'changes \\\n    --query "owner:self status:open"')
+            c = c.replace('changes \\\n     "change:<id>"',
+                          'changes \\\n     --query "change:<id>"')
+
+            # relatedchanges
+            c = c.replace(
+                "relatedchanges \\\n    <change_id> <revision>",
+                "relatedchanges \\\n    --change <change_id> --revision <revision>"
+            )
+            c = c.replace(
+                "relatedchanges \\\n     <change_id> current",
+                "relatedchanges \\\n     --change <change_id> --revision current"
+            )
+
+            # addpatchsetcomment
+            c = c.replace(
+                'addpatchsetcomment \\\n    --message "Review findings: <message>" \\\n    <change_id> <revision>',
+                'addpatchsetcomment \\\n    --change <change_id> --revision <revision> \\\n    --message "Review findings: <message>"'
+            )
+            c = c.replace(
+                'addpatchsetcomment \\\n     --message "Review findings: ..." \\\n     <change_id> current',
+                'addpatchsetcomment \\\n     --change <change_id> --revision current \\\n     --message "Review findings: ..."'
+            )
+
+            # setlabel
+            c = c.replace(
+                'setlabel \\\n    --label "Code-Review" \\\n    --value 1 \\\n    <change_id>',
+                'setlabel \\\n    --change <change_id> \\\n    --label Code-Review 1'
+            )
+            c = c.replace(
+                'setlabel \\\n     --label "Code-Review" \\\n     --value 1 \\\n     <change_id>',
+                'setlabel \\\n     --change <change_id> \\\n     --label Code-Review 1'
+            )
+
+            # submitchange
+            c = c.replace("submitchange \\\n    <change_id>",
+                          "submitchange \\\n    --change <change_id>")
+            c = c.replace("submitchange \\\n     <change_id>",
+                          "submitchange \\\n     --change <change_id>")
+
+            # abandon
+            c = c.replace(
+                'abandon \\\n    --message "<reason>" \\\n    <change_id>',
+                'abandon \\\n    --change <change_id> \\\n    --message "<reason>"'
+            )
+
+            # restore
+            c = c.replace(
+                'restore \\\n    --message "<reason>" \\\n    <change_id>',
+                'restore \\\n    --change <change_id> \\\n    --message "<reason>"'
+            )
+
+            ref_path.write_text(c)
+            print(f"  - Adapted references/{filename}")
+
+
+def main():
+    skill_dir = Path(__file__).parent.parent.resolve()
+    fetch_upstream_skill(skill_dir)
+    apply_devtools_revisions(skill_dir)
+    print("Upstream sync completed successfully!")
+
+
+if __name__ == "__main__":
+    main()

package/.agents/skills/ui-eng-vision-widget-promoter/SKILL.md

@@ -36,13 +36,21 @@ clean `UI.Widget` classes that use native update rendering delegates.
         };
         ```
 
-    *   Make the view injectable in the constructor for testability (as per `docs/ui_engineering.md`):
+    *   Make the view injectable in the constructor for testability (as per `docs/ui_engineering.md`), and use static `INJECT` if requesting dependencies from `Universe`:
 
         ```typescript
         class MyWidget extends UI.Widget.VBox {
+          static override readonly INJECT = [SDK.TargetManager.TargetManager] as const;
+
+          #targetManager: SDK.TargetManager.TargetManager;
           #view: View;
-          constructor(element?: HTMLElement, view: View = DEFAULT_VIEW) {
-            super(true, element);
+          constructor(
+            element?: HTMLElement,
+            [targetManager]: UI.Widget.WidgetDependencies<typeof MyWidget> = [],
+            view: View = DEFAULT_VIEW,
+          ) {
+            super(element);
+            this.#targetManager = targetManager;
             this.#view = view;
           }
         ```
@@ -84,4 +92,3 @@ clean `UI.Widget` classes that use native update rendering delegates.
 2.  ❓ **Inheritance**: Does the class now cleanly inherit from `UI.Widget` or its variants?
 3.  ❓ **Injectability**: Is the view injectable in the constructor?
 4.  ❓ **Build**: Does the code compile and do tests pass?
-

package/.agents/skills/ui-widgets/SKILL.md

@@ -19,6 +19,7 @@ Adhere strictly to the Model-View-Presenter (MVP) architecture.
 * MUST extend a base `UI.Widget` class (e.g., `UI.Widget.Widget`). Note that `UI.Widget.Widget` is not an `HTMLElement` and must be appended via `.show()` or `UI.Widget.widget`
 * Constructor MUST assign the injected view function to a private `#view` field.
 * Constructor MUST call `super()`. If taking `element?: HTMLElement`, pass it to `super(element)`. `super(true)` is forbidden.
+* Dependencies from `Universe` SHOULD be requested via static `INJECT`: `static override readonly INJECT = [...] as const;` and received as constructor parameter #2 (`[dep1, dep2]: UI.Widget.WidgetDependencies<typeof MyWidget>`).
 * Styling MUST be handled within the View. `this.registerCSSFiles()` is forbidden.
 * Initial render MUST be triggered in `override wasShown(): void` by calling `this.requestUpdate()`.
 * MUST hold all UI state as private class fields (e.g., `#counter`).
@@ -109,7 +110,30 @@ render(html`
 *   **Child Widgets:** Use `UI.Widget.widgetRef` to obtain the class instance of a child widget if you need to call methods on it directly (though declarative data flow is preferred).
 
 ### Dependencies
-The `DEFAULT_VIEW` is typically a module-level function. Ensure all dependencies (enums, constants, other components) are imported at the top of the file so they are available in the function scope.
+
+* **View Dependencies:** The `DEFAULT_VIEW` is typically a module-level function. Ensure all dependencies (enums, constants, other components) are imported at the top of the file so they are available in the function scope.
+* **Presenter (`Universe`) Dependencies:** To access dependencies managed by `Universe` (e.g. `SDK.TargetManager.TargetManager`, `Common.Settings.Settings`), declare a static `INJECT` array on the `Widget` subclass:
+  ```ts
+  export class MyWidget extends UI.Widget.Widget {
+    static override readonly INJECT = [SDK.TargetManager.TargetManager, Common.Settings.Settings] as const;
+
+    #targetManager: SDK.TargetManager.TargetManager;
+    #settings: Common.Settings.Settings;
+    #view: View;
+
+    constructor(
+      element?: HTMLElement,
+      [targetManager, settings]: UI.Widget.WidgetDependencies<typeof MyWidget> = [],
+      view: View = DEFAULT_VIEW,
+    ) {
+      super(element);
+      this.#targetManager = targetManager;
+      this.#settings = settings;
+      this.#view = view;
+    }
+  }
+  ```
+  `instantiateWidget` automatically resolves dependencies from `Universe` and passes them as constructor parameter #2. In unit tests using `renderElementIntoDOM`, `TestUniverse` handles injection automatically (override via `setTestUniverseForWidgets`).
 
 ## Step-by-Step Implementation Example
 

package/docs/contributing/infrastructure.md

@@ -257,7 +257,13 @@ because they picked up the test as it was being touched.
 
 You can skip Flake Detection for your tests by adding the `Skip-Flake-Detection`
 CL footer (see example [CL](https://crrev.com/c/6994031)). Make sure you use the
-full path to your test.
+full path to your test. If you need to skip multiple tests, you can repeat the footer:
+```
+Skip-Flake-Detection: test/e2e/foo.test.ts
+Skip-Flake-Detection: test/e2e/bar.test.ts
+```
+
+You can also skip Flake Detection for multiple tests using a glob pattern by adding the `Skip-Flake-Detection-Pattern` CL footer. For example: `Skip-Flake-Detection-Pattern: test/e2e/performance/*`.
 
 ### Common build failures
 

package/docs/ui_engineering.md

@@ -38,13 +38,42 @@ Note that `VBox` and `HBox` inherit directly from `Widget`. They fully support v
 
 To test the `DEFAULT_VIEW` function itself, we should use screenshot and e2e tests.
 
+### Dependency Injection via `INJECT`
+
+Subclasses of `UI.Widget.Widget` can declare dependencies from `Universe` to be automatically injected when instantiated (e.g. via `<devtools-widget>` or `UI.Widget.widget()`).
+
+To opt into dependency injection, define a static `INJECT` array containing dependency constructors:
+
+```ts
+class MyWidget extends UI.Widget.Widget {
+  static override readonly INJECT = [SDK.TargetManager.TargetManager, Common.Settings.Settings] as const;
+
+  #targetManager: SDK.TargetManager.TargetManager;
+  #settings: Common.Settings.Settings;
+
+  constructor(
+    element?: HTMLElement,
+    [targetManager, settings]: UI.Widget.WidgetDependencies<typeof MyWidget> = [],
+    view: View = DEFAULT_VIEW,
+  ) {
+    super(element);
+    this.#targetManager = targetManager;
+    this.#settings = settings;
+  }
+}
+```
+
+When `instantiateWidget` creates a widget with a non-empty `INJECT` array, it automatically resolves each requested constructor from the active `Universe` and passes the resolved instances array as parameter #2 to the constructor.
+
+Use `UI.Widget.WidgetDependencies<typeof MyWidget>` to type the injected dependencies parameter.
+
 ## Declarative and orchestrated DOM updates
 
 We should no longer use imperative API to update DOM. Instead we rely on orchestrated rendering of lit-html templates. The view function described above should be a call to lit-html `render`. The view function should be called from `UI.Widget`’s `performUpdate` method, which by default is scheduled using `requestAnimationFrame`.
 
 To embed another presenter (`UI.Widget`) in the lit-html template, use `widget(<class>, {foo: 1, bar: 2})`
 
-This will instantiate a `Widget` class with the web component as its `element` and, optionally, will set the properties provided in the second parameter. The widget won’t be re-instantiated on the subsequent template renders, but the properties would be updated. For this to work, the widget needs to accept `HTMLElement` as a sole constructor parameter and properties need to be public members or setters.
+This will instantiate a `Widget` class with the web component as its `element` and, optionally, will set the properties provided in the second parameter. The widget won’t be re-instantiated on the subsequent template renders, but the properties would be updated. For this to work, the widget needs to accept `HTMLElement` as its first constructor parameter, optional injected dependencies as parameter #2 (if `INJECT` is declared), and properties need to be public members or setters.
 
 For backwards compatibility, the first argument to `widget` can also be a factory function: `widget(element => new MyWidget(foo, bar, element))`. Similar to the class constructor version, `element` is the actual `<devtools-widget>` so the following two invocations of `widget` are equivalent: `widget(MyWidget)` and `widget(element => new MyWidget(element))`.
 
@@ -218,6 +247,20 @@ const presenter = new Presenter();
 presenter.doSomething();
 ```
 
+#### Testing widgets with `INJECT` dependencies
+
+When rendering widgets into DOM in unit tests (e.g. via `renderElementIntoDOM`), DOM test helpers automatically supply a default `TestUniverse` for resolving `INJECT` dependencies.
+
+If a test requires a custom `TestUniverse` instance, pass it via `setTestUniverseForWidgets`:
+
+```ts
+import {setTestUniverseForWidgets} from '../../testing/DOMHelpers.js';
+import {TestUniverse} from '../../testing/TestUniverse.js';
+
+const customUniverse = new TestUniverse();
+setTestUniverseForWidgets(customUniverse);
+```
+
 # Migrating Widgets and other "legacy" components
 
 This section provides a series of examples for migrating from imperative DOM manipulation to a declarative approach using lit-html templates.

package/front_end/core/common/Settings.ts

@@ -362,6 +362,8 @@ export class Settings {
         this.createRegExpSetting(name, evaluatedDefaultValue, undefined, storageType) :
         this.createSetting(name, evaluatedDefaultValue, storageType);
 
+    setting.setSettingType(type);
+
     this.registerModuleSetting(setting);
     return setting as Setting<T>;
   }
@@ -511,6 +513,7 @@ export class Deprecation {
 
 export class Setting<V> {
   #registration: SettingRegistration|null = null;
+  #type: SettingType|null = null;
   #requiresUserAction?: boolean;
   #value?: V;
   // TODO(crbug.com/1172300) Type cannot be inferred without changes to consumers. See above.
@@ -679,8 +682,15 @@ export class Setting<V> {
     this.eventSupport.dispatchEventToListeners(this.name, value);
   }
 
+  setSettingType(type: SettingType): void {
+    this.#type = type;
+  }
+
   setRegistration(registration: SettingRegistration): void {
     this.#registration = registration;
+    if (registration.settingType) {
+      this.#type = registration.settingType;
+    }
     const {deprecationNotice} = registration;
     if (deprecationNotice?.disabled) {
       const experiment = deprecationNotice.experiment ?
@@ -694,10 +704,7 @@ export class Setting<V> {
   }
 
   type(): SettingType|null {
-    if (this.#registration) {
-      return this.#registration.settingType;
-    }
-    return null;
+    return this.#type ?? this.#registration?.settingType ?? null;
   }
 
   options(): SimpleSettingOption[] {

package/front_end/core/host/AidaClient.ts

@@ -33,7 +33,7 @@ import * as GcaClient from './GcaClient.js';
 import type {GenerateContentResponse} from './GcaTypes.js';
 import {InspectorFrontendHostInstance} from './InspectorFrontendHost.js';
 import type {AidaClientResult, AidaCodeCompleteResult, SyncInformation} from './InspectorFrontendHostAPI.js';
-import {bindOutputStream} from './ResourceLoader.js';
+import {bindOutputStream, discardOutputStream} from './ResourceLoader.js';
 
 export * from './AidaClientTypes.js';
 
@@ -159,6 +159,10 @@ export class AidaClient {
       throw new Error('dispatchHttpRequest is not available');
     }
 
+    if (options?.signal?.aborted) {
+      throw new AidaAbortError();
+    }
+
     // Disable logging for now.
     // For context, see b/454563259#comment35.
     // We should be able to remove this ~end of April.
@@ -166,51 +170,67 @@ export class AidaClient {
       request.metadata.disable_user_content_logging = true;
     }
 
-    const stream = (() => {
-      let {promise, resolve, reject} = Promise.withResolvers<string|null>();
-      options?.signal?.addEventListener('abort', () => {
-        reject(new AidaAbortError());
-      }, {once: true});
-      return {
-        write: async(data: string): Promise<void> => {
-          resolve(data);
-          ({promise, resolve, reject} = Promise.withResolvers<string|null>());
-        },
-        close: async(): Promise<void> => {
-          resolve(null);
-        },
-        read: (): Promise<string|null> => {
-          return promise;
+    let abortListener: (() => void)|undefined;
+    let streamId: number|undefined;
+    try {
+      const stream = (() => {
+        let {promise, resolve, reject} = Promise.withResolvers<string|null>();
+        // Prevent unhandled promise rejections if stream.fail() is called after
+        // doConversation has already exited early (e.g. on recitation block or abort).
+        // Active readers calling await stream.read() will still receive the rejection.
+        promise.catch(() => {});
+        abortListener = () => {
+          reject(new AidaAbortError());
+        };
+        options?.signal?.addEventListener('abort', abortListener, {once: true});
+        return {
+          write: async(data: string): Promise<void> => {
+            resolve(data);
+            ({promise, resolve, reject} = Promise.withResolvers<string|null>());
+            promise.catch(() => {});
+          },
+          close: async(): Promise<void> => {
+            resolve(null);
+          },
+          read: (): Promise<string|null> => {
+            return promise;
+          },
+          fail: (e: Error) => reject(e),
+        };
+      })();
+      streamId = bindOutputStream(stream);
+
+      let response;
+      if (this.#gcaClient.enabled()) {
+        // Inline and remove the else clause after migration
+        response = this.#gcaClient.conversationRequest(request, streamId, options);
+      } else {
+        response = DispatchHttpRequestClient.makeHttpRequest({
+          service: SERVICE_NAME,
+          path: '/v1/aida:doConversation',
+          method: 'POST',
+          body: JSON.stringify(request),
+          streamId,
         },
-        fail: (e: Error) => reject(e),
-      };
-    })();
-    const streamId = bindOutputStream(stream);
-
-    let response;
-    if (this.#gcaClient.enabled()) {
-      // Inline and remove the else clause after migration
-      response = this.#gcaClient.conversationRequest(request, streamId, options);
-    } else {
-      response = DispatchHttpRequestClient.makeHttpRequest(
-          {
-            service: SERVICE_NAME,
-            path: '/v1/aida:doConversation',
-            method: 'POST',
-            body: JSON.stringify(request),
-            streamId,
+                                                             options);
+      }
+      response.then(
+          () => {
+            void stream.close();
           },
-          options);
+          err => {
+            debugLog('doConversation failed with error:', JSON.stringify(err));
+            stream.fail(mapError(err));
+          });
+      yield* this.#handleResponseStream(stream);
+    } finally {
+      if (options?.signal && abortListener) {
+        options.signal.removeEventListener('abort', abortListener);
+      }
+      if (streamId !== undefined) {
+        discardOutputStream(streamId);
+      }
     }
-    response.then(
-        () => {
-          void stream.close();
-        },
-        err => {
-          debugLog('doConversation failed with error:', JSON.stringify(err));
-          stream.fail(mapError(err));
-        });
-    await (yield* this.#handleResponseStream(stream));
   }
 
   async * #handleResponseStream(stream: AiStream): AsyncGenerator<DoConversationResponse, void, void> {
@@ -397,8 +417,7 @@ export class AidaClient {
     return {generatedSamples, metadata};
   }
 
-  async generateCode(request: GenerateCodeRequest, options?: {signal?: AbortSignal}):
-      Promise<GenerateCodeResponse|null> {
+  async generateCode(request: GenerateCodeRequest, options?: {signal?: AbortSignal}): Promise<GenerateCodeResponse> {
     // Disable logging for now.
     // For context, see b/454563259#comment35.
     // We should be able to remove this ~end of April.
@@ -495,8 +514,8 @@ export class HostConfigTracker extends Common.ObjectWrapper.ObjectWrapper<EventT
     return eventDescriptor;
   }
 
-  override removeEventListener(eventType: Events, listener: Common.EventTarget.EventListener<EventTypes, Events>):
-      void {
+  override removeEventListener(eventType: Events,
+                               listener: Common.EventTarget.EventListener<EventTypes, Events>): void {
     super.removeEventListener(eventType, listener);
     if (!this.hasEventListeners(eventType)) {
       clearTimeout(this.#pollTimer);

package/front_end/core/host/GcaClient.ts

@@ -77,18 +77,16 @@ export class GcaClient {
         });
   }
 
-  async completeCode(request: CompletionRequest): Promise<CompletionResponse|null> {
+  async completeCode(request: CompletionRequest): Promise<CompletionResponse> {
     const gcaRequest = aidaCompletionRequestToGcaRequest(request);
     const result = await this.#requestContent(gcaRequest);
-    const aidaResult = result ? gcaResponseToAidaCompletionResponse(result) : null;
-    return aidaResult;
+    return gcaResponseToAidaCompletionResponse(result);
   }
 
-  async generateCode(request: GenerateCodeRequest, options?: {signal?: AbortSignal}):
-      Promise<GenerateCodeResponse|null> {
+  async generateCode(request: GenerateCodeRequest, options?: {signal?: AbortSignal}): Promise<GenerateCodeResponse> {
     const gcaRequest = aidaGenerateCodeRequestToGcaRequest(request);
     const result = await this.#requestContent(gcaRequest, options);
-    return result ? gcaResponseToAidaGenerateCodeResponse(result) : null;
+    return gcaResponseToAidaGenerateCodeResponse(result);
   }
 
   async #requestContent(request: GenerateContentRequest,

package/front_end/core/host/ResourceLoader.ts

@@ -80,8 +80,10 @@ export const bindOutputStream = function(stream: Common.StringOutputStream.Outpu
 };
 
 export const discardOutputStream = function(id: number): void {
-  void _boundStreams[id].close();
-  delete _boundStreams[id];
+  if (_boundStreams[id]) {
+    void _boundStreams[id].close();
+    delete _boundStreams[id];
+  }
 };
 
 export const streamWrite = function(id: number, chunk: string): void {

package/front_end/core/root/Runtime.ts

@@ -560,10 +560,6 @@ export interface HostConfigJpegXlImageFormat {
   enabled: boolean;
 }
 
-export interface HostConfigAiAssistanceV2 {
-  enabled: boolean;
-}
-
 interface AiGeneratedTimelineLabels {
   enabled: boolean;
 }
@@ -648,6 +644,10 @@ interface DevToolsPlusButton {
   enabled: boolean;
 }
 
+interface DevToolsInstrumentationBreakpoints {
+  enabled: boolean;
+}
+
 /**
  * The host configuration that we expect from the DevTools back-end.
  *
@@ -673,7 +673,6 @@ export type HostConfig = Platform.TypeScriptUtilities.RecursivePartial<{
   devToolsAiAssistancePerformanceAgent: HostConfigAiAssistancePerformanceAgent,
   devToolsAiAssistanceAccessibilityAgent: HostConfigAiAssistanceAccessibilityAgent,
   devToolsAiAssistanceStorageAgent: HostConfigAiAssistanceStorageAgent,
-  devToolsAiAssistanceV2: HostConfigAiAssistanceV2,
   devToolsAiV2Architecture: DevToolsAiV2Architecture,
   devToolsAiCodeCompletion: HostConfigAiCodeCompletion,
   devToolsAiCodeGeneration: HostConfigAiCodeGeneration,
@@ -705,6 +704,7 @@ export type HostConfig = Platform.TypeScriptUtilities.RecursivePartial<{
   devToolsAdsPanel: DevToolsAdsPanel,
   devToolsUseGcaApi: UseGcaApi,
   devToolsPlusButton: DevToolsPlusButton,
+  devToolsInstrumentationBreakpoints: DevToolsInstrumentationBreakpoints,
   extensionsOnChromeUrls: ExtensionsOnChromeUrls,
 }>;