chrome-devtools-frontend 1.0.1667564 → 1.0.1669021

package/front_end/panels/common/AiCodeCompletionDisclaimer.ts

@@ -9,7 +9,6 @@ import type * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Root from '../../core/root/root.js';
-import * as AiCodeCompletion from '../../models/ai_code_completion/ai_code_completion.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import {Directives, html, nothing, render} from '../../ui/lit/lit.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
@@ -71,17 +70,19 @@ const UIStringsNotTranslate = {
 
 const lockedString = i18n.i18n.lockedString;
 
-function getTooltipDisclaimerText(noLogging: boolean, panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor): string {
-  switch (panel) {
-    case AiCodeCompletion.AiCodeCompletion.ContextFlavor.CONSOLE:
+export type DisclaimerTextVariant = 'console'|'sources'|'styles';
+
+function getTooltipDisclaimerText(noLogging: boolean, disclaimerTextVariant: DisclaimerTextVariant): string {
+  switch (disclaimerTextVariant) {
+    case 'console':
       return noLogging ?
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeCompletionNoLoggingInConsole) :
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeCompletionInConsole);
-    case AiCodeCompletion.AiCodeCompletion.ContextFlavor.SOURCES:
+    case 'sources':
       return noLogging ?
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeCompletionNoLoggingInSources) :
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeCompletionInSources);
-    case AiCodeCompletion.AiCodeCompletion.ContextFlavor.STYLES:
+    case 'styles':
       return noLogging ? lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeCompletionNoLoggingInStyles) :
                          lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeCompletionInStyles);
   }
@@ -93,8 +94,7 @@ export interface ViewInput {
   noLogging: boolean;
   aidaAvailability?: Host.AidaClient.AidaAccessPreconditions;
   onManageInSettingsTooltipClick: () => void;
-  // TODO(b/472268298): Remove ContextFlavor explicitly and pass required values
-  panel?: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  disclaimerTextVariant?: DisclaimerTextVariant;
 }
 
 export interface ViewOutput {
@@ -104,83 +104,95 @@ export interface ViewOutput {
 
 export type View = (input: ViewInput, output: ViewOutput, target: HTMLElement) => void;
 
-export const DEFAULT_SUMMARY_TOOLBAR_VIEW: View =
-    (input, output, target) => {
-      if (input.aidaAvailability !== Host.AidaClient.AidaAccessPreconditions.AVAILABLE || !input.disclaimerTooltipId ||
-          !input.spinnerTooltipId || !input.panel) {
-        render(nothing, target);
-        return;
-      }
-      const tooltipDisclaimerText = getTooltipDisclaimerText(input.noLogging, input.panel);
-      // clang-format off
-  render(
-    html`
-        <style>${styles}</style>
-        <div class="ai-code-completion-disclaimer"><devtools-spinner
-          .active=${false}
-          ${Directives.ref(el => {
-            if (el instanceof HTMLElement) {
-              output.setLoading = (isLoading: boolean) => {
-                el.toggleAttribute('active', isLoading);
-              };
-            }
-          })}
-          aria-details=${input.spinnerTooltipId}
-          aria-describedby=${input.spinnerTooltipId}></devtools-spinner>
-          <devtools-tooltip
-              id=${input.spinnerTooltipId}
-              variant="rich"
-              jslogContext="ai-code-completion-spinner-tooltip">
-          <div class="disclaimer-tooltip-container"><div class="tooltip-text">
+export const DEFAULT_SUMMARY_TOOLBAR_VIEW: View = (input, output, target) => {
+  if (input.aidaAvailability !== Host.AidaClient.AidaAccessPreconditions.AVAILABLE || !input.disclaimerTooltipId ||
+      !input.spinnerTooltipId || !input.disclaimerTextVariant) {
+    render(nothing, target);
+    return;
+  }
+  const tooltipDisclaimerText = getTooltipDisclaimerText(input.noLogging, input.disclaimerTextVariant);
+  // clang-format off
+  render(html`
+    <style>${styles}</style>
+    <div class="ai-code-completion-disclaimer">
+      <devtools-spinner
+        .active=${false}
+        ${Directives.ref(el => {
+          if (el instanceof HTMLElement) {
+            output.setLoading = (isLoading: boolean) => {
+              el.toggleAttribute('active', isLoading);
+            };
+          }
+        })}
+        aria-details=${input.spinnerTooltipId}
+        aria-describedby=${input.spinnerTooltipId}>
+      </devtools-spinner>
+      <devtools-tooltip
+        id=${input.spinnerTooltipId}
+        variant="rich"
+        jslogContext="ai-code-completion-spinner-tooltip"
+      >
+        <div class="disclaimer-tooltip-container">
+          <div class="tooltip-text">
             ${lockedString(UIStringsNotTranslate.tooltipTextForSpinner)}
-          </div></div></devtools-tooltip>
-          <span
-              tabIndex="0"
-              class="link"
-              role="link"
-              jslog=${VisualLogging.link('open-ai-settings').track({
-                click: true,
-              })}
-              aria-details=${input.disclaimerTooltipId}
-              aria-describedby=${input.disclaimerTooltipId}
-              @click=${() => {
-                void UI.ViewManager.ViewManager.instance().showView('chrome-ai');
-              }}
-          >${lockedString(UIStringsNotTranslate.relevantData)}</span>${lockedString(UIStringsNotTranslate.isSentToGoogle)}
-          <devtools-tooltip
-              id=${input.disclaimerTooltipId}
-              variant="rich"
-              jslogContext="ai-code-completion-disclaimer"
-              ${Directives.ref(el => {
-                if (el instanceof HTMLElement) {
-                  output.hideTooltip = () => {
-                    el.hidePopover();
-                  };
-                }
-              })}>
-            <div class="disclaimer-tooltip-container"><div class="tooltip-text">
-                ${tooltipDisclaimerText}
-                </div>
-                <span
-                    tabIndex="0"
-                    class="link"
-                    role="link"
-                    jslog=${VisualLogging.link('open-ai-settings').track({
-                      click: true,
-                      keydown: 'Enter',
-                    })}
-                    @click=${input.onManageInSettingsTooltipClick}
-                    @keydown=${(e: KeyboardEvent) => {
-                      if (e.key === 'Enter') {
-                        e.consume(true);
-                        input.onManageInSettingsTooltipClick();
-                      }
-                    }}
-                >${lockedString(UIStringsNotTranslate.manageInSettings)}</span></div></devtools-tooltip>
           </div>
-        `, target);
-      // clang-format on
-    };
+        </div>
+      </devtools-tooltip>
+      <span
+        tabIndex="0"
+        class="link"
+        role="link"
+        jslog=${VisualLogging.link('open-ai-settings').track({
+          click: true,
+        })}
+        aria-details=${input.disclaimerTooltipId}
+        aria-describedby=${input.disclaimerTooltipId}
+        @click=${() => {
+          void UI.ViewManager.ViewManager.instance().showView('chrome-ai');
+        }}
+      >
+        ${lockedString(UIStringsNotTranslate.relevantData)}
+      </span>
+      ${lockedString(UIStringsNotTranslate.isSentToGoogle)}
+      <devtools-tooltip
+        id=${input.disclaimerTooltipId}
+        variant="rich"
+        jslogContext="ai-code-completion-disclaimer"
+        ${Directives.ref(el => {
+          if (el instanceof HTMLElement) {
+            output.hideTooltip = () => {
+              el.hidePopover();
+            };
+          }
+        })}
+      >
+        <div class="disclaimer-tooltip-container">
+          <div class="tooltip-text">
+            ${tooltipDisclaimerText}
+          </div>
+          <span
+            tabIndex="0"
+            class="link"
+            role="link"
+            jslog=${VisualLogging.link('open-ai-settings').track({
+              click: true,
+              keydown: 'Enter',
+            })}
+            @click=${input.onManageInSettingsTooltipClick}
+            @keydown=${(e: KeyboardEvent) => {
+              if (e.key === 'Enter') {
+                e.consume(true);
+                input.onManageInSettingsTooltipClick();
+              }
+            }}
+          >
+            ${lockedString(UIStringsNotTranslate.manageInSettings)}
+          </span>
+        </div>
+      </devtools-tooltip>
+    </div>`, target);
+  // clang-format on
+};
 
 const MINIMUM_LOADING_STATE_TIMEOUT = 1000;
 
@@ -194,7 +206,7 @@ export class AiCodeCompletionDisclaimer extends UI.Widget.Widget {
   #loading = false;
   #loadingStartTime = 0;
   #spinnerLoadingTimeout: number|undefined;
-  #panel?: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  #disclaimerTextVariant?: DisclaimerTextVariant;
 
   #aidaAvailability?: Host.AidaClient.AidaAccessPreconditions;
   #boundOnAidaAvailabilityChange:
@@ -246,8 +258,8 @@ export class AiCodeCompletionDisclaimer extends UI.Widget.Widget {
     }
   }
 
-  set panel(panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor) {
-    this.#panel = panel;
+  set disclaimerTextVariant(disclaimerTextVariant: DisclaimerTextVariant|undefined) {
+    this.#disclaimerTextVariant = disclaimerTextVariant;
     this.requestUpdate();
   }
 
@@ -268,16 +280,15 @@ export class AiCodeCompletionDisclaimer extends UI.Widget.Widget {
   }
 
   override performUpdate(): void {
-    this.#view(
-        {
-          disclaimerTooltipId: this.#disclaimerTooltipId,
-          spinnerTooltipId: this.#spinnerTooltipId,
-          noLogging: this.#noLogging,
-          aidaAvailability: this.#aidaAvailability,
-          onManageInSettingsTooltipClick: this.#onManageInSettingsTooltipClick.bind(this),
-          panel: this.#panel,
-        },
-        this.#viewOutput, this.contentElement);
+    this.#view({
+      disclaimerTooltipId: this.#disclaimerTooltipId,
+      spinnerTooltipId: this.#spinnerTooltipId,
+      noLogging: this.#noLogging,
+      aidaAvailability: this.#aidaAvailability,
+      onManageInSettingsTooltipClick: this.#onManageInSettingsTooltipClick.bind(this),
+      disclaimerTextVariant: this.#disclaimerTextVariant,
+    },
+               this.#viewOutput, this.contentElement);
   }
 
   override wasShown(): void {

package/front_end/panels/common/AiCodeCompletionSummaryToolbar.ts

@@ -9,11 +9,10 @@ import '../../ui/kit/kit.js';
 import type * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
-import type * as AiCodeCompletion from '../../models/ai_code_completion/ai_code_completion.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import {Directives, html, nothing, render} from '../../ui/lit/lit.js';
 
-import {AiCodeCompletionDisclaimer} from './AiCodeCompletionDisclaimer.js';
+import {AiCodeCompletionDisclaimer, type DisclaimerTextVariant} from './AiCodeCompletionDisclaimer.js';
 import styles from './aiCodeCompletionSummaryToolbar.css.js';
 
 const UIStringsNotTranslate = {
@@ -35,7 +34,7 @@ export interface AiCodeCompletionSummaryToolbarProps {
   disclaimerTooltipId?: string;
   spinnerTooltipId?: string;
   hasTopBorder?: boolean;
-  panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  disclaimerTextVariant?: DisclaimerTextVariant;
 }
 
 export interface ViewInput {
@@ -46,7 +45,7 @@ export interface ViewInput {
   loading: boolean;
   hasTopBorder: boolean;
   aidaAvailability?: Host.AidaClient.AidaAccessPreconditions;
-  panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  disclaimerTextVariant?: DisclaimerTextVariant;
 }
 
 export type View = (input: ViewInput, output: undefined, target: HTMLElement) => void;
@@ -70,7 +69,7 @@ export const DEFAULT_SUMMARY_TOOLBAR_VIEW: View = (input, _output, target) => {
       disclaimerTooltipId: input.disclaimerTooltipId,
       spinnerTooltipId: input.spinnerTooltipId,
       loading: input.loading,
-      panel: input.panel,
+      disclaimerTextVariant: input.disclaimerTextVariant,
     })} class="disclaimer-widget"></devtools-widget>` : nothing;
 
   const recitationNotice = input.citations && input.citations.size > 0 ?
@@ -114,7 +113,7 @@ export class AiCodeCompletionSummaryToolbar extends UI.Widget.Widget {
   #citations = new Set<string>();
   #loading = false;
   #hasTopBorder = false;
-  #panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  #disclaimerTextVariant?: DisclaimerTextVariant;
 
   #aidaAvailability?: Host.AidaClient.AidaAccessPreconditions;
   #boundOnAidaAvailabilityChange:
@@ -126,7 +125,7 @@ export class AiCodeCompletionSummaryToolbar extends UI.Widget.Widget {
     this.#spinnerTooltipId = props.spinnerTooltipId;
     this.#citationsTooltipId = props.citationsTooltipId;
     this.#hasTopBorder = props.hasTopBorder ?? false;
-    this.#panel = props.panel;
+    this.#disclaimerTextVariant = props.disclaimerTextVariant;
     this.#boundOnAidaAvailabilityChange = this.#onAidaAvailabilityChange.bind(this);
     this.#view = view ?? DEFAULT_SUMMARY_TOOLBAR_VIEW;
     this.requestUpdate();
@@ -159,18 +158,17 @@ export class AiCodeCompletionSummaryToolbar extends UI.Widget.Widget {
   }
 
   override performUpdate(): void {
-    this.#view(
-        {
-          disclaimerTooltipId: this.#disclaimerTooltipId,
-          spinnerTooltipId: this.#spinnerTooltipId,
-          citations: this.#citations,
-          citationsTooltipId: this.#citationsTooltipId,
-          loading: this.#loading,
-          hasTopBorder: this.#hasTopBorder,
-          aidaAvailability: this.#aidaAvailability,
-          panel: this.#panel,
-        },
-        undefined, this.contentElement);
+    this.#view({
+      disclaimerTooltipId: this.#disclaimerTooltipId,
+      spinnerTooltipId: this.#spinnerTooltipId,
+      citations: this.#citations,
+      citationsTooltipId: this.#citationsTooltipId,
+      loading: this.#loading,
+      hasTopBorder: this.#hasTopBorder,
+      aidaAvailability: this.#aidaAvailability,
+      disclaimerTextVariant: this.#disclaimerTextVariant,
+    },
+               undefined, this.contentElement);
   }
 
   override wasShown(): void {

package/front_end/panels/common/AiCodeCompletionTeaser.ts

@@ -9,13 +9,13 @@ import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Root from '../../core/root/root.js';
 import * as AIAssistance from '../../models/ai_assistance/ai_assistance.js';
-import * as AiCodeCompletion from '../../models/ai_code_completion/ai_code_completion.js';
 import * as AiCodeGeneration from '../../models/ai_code_generation/ai_code_generation.js';
 import * as Snackbars from '../../ui/components/snackbars/snackbars.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import {html, type LitTemplate, nothing, render} from '../../ui/lit/lit.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
 
+import type {DisclaimerTextVariant} from './AiCodeCompletionDisclaimer.js';
 import styles from './aiCodeCompletionTeaser.css.js';
 import {FreDialog} from './FreDialog.js';
 
@@ -164,7 +164,7 @@ export const DEFAULT_VIEW: View = (input, _output, target) => {
 
 interface AiCodeCompletionTeaserConfig {
   onDetach: () => void;
-  panel?: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  disclaimerTextVariant?: DisclaimerTextVariant;
 }
 
 export class AiCodeCompletionTeaser extends UI.Widget.Widget {
@@ -175,7 +175,7 @@ export class AiCodeCompletionTeaser extends UI.Widget.Widget {
       (ev: Common.EventTarget.EventTargetEvent<Host.AidaClient.AidaAccessPreconditions>) => void;
   #boundOnAiCodeCompletionSettingChanged: () => void;
   #onDetach: () => void;
-  #panel?: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  #disclaimerTextVariant?: DisclaimerTextVariant;
 
   // Whether the user completed first run experience dialog or not.
   #aiCodeCompletionFreCompletedSetting =
@@ -190,7 +190,7 @@ export class AiCodeCompletionTeaser extends UI.Widget.Widget {
     super();
     this.markAsExternallyManaged();
     this.#onDetach = config.onDetach;
-    this.#panel = config.panel;
+    this.#disclaimerTextVariant = config.disclaimerTextVariant;
     this.#view = view ?? DEFAULT_VIEW;
     this.#boundOnAidaAvailabilityChange = this.#onAidaAvailabilityChange.bind(this);
     this.#boundOnAiCodeCompletionSettingChanged = this.#onAiCodeCompletionSettingChanged.bind(this);
@@ -291,9 +291,9 @@ export class AiCodeCompletionTeaser extends UI.Widget.Widget {
 
     if (result) {
       this.#aiCodeCompletionFreCompletedSetting.set(true);
-      if (this.#panel === AiCodeCompletion.AiCodeCompletion.ContextFlavor.CONSOLE) {
+      if (this.#disclaimerTextVariant === 'console') {
         Host.userMetrics.actionTaken(Host.UserMetrics.Action.AiCodeCompletionFreCompletedFromConsole);
-      } else if (this.#panel === AiCodeCompletion.AiCodeCompletion.ContextFlavor.SOURCES) {
+      } else if (this.#disclaimerTextVariant === 'sources') {
         Host.userMetrics.actionTaken(Host.UserMetrics.Action.AiCodeCompletionFreCompletedFromSources);
       }
       this.detach();

package/front_end/panels/common/AiCodeGenerationTeaser.ts

@@ -7,12 +7,12 @@ import * as Common from '../../core/common/common.js';
 import * as Host from '../../core/host/host.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Root from '../../core/root/root.js';
-import * as AiCodeCompletion from '../../models/ai_code_completion/ai_code_completion.js';
 import * as Buttons from '../../ui/components/buttons/buttons.js';
 import * as UI from '../../ui/legacy/legacy.js';
 import {Directives, html, nothing, render} from '../../ui/lit/lit.js';
 import * as VisualLogging from '../../ui/visual_logging/visual_logging.js';
 
+import type {DisclaimerTextVariant} from './AiCodeCompletionDisclaimer.js';
 import styles from './aiCodeGenerationTeaser.css.js';
 
 const UIStringsNotTranslate = {
@@ -137,17 +137,17 @@ export enum AiCodeGenerationTeaserDisplayState {
   GENERATED = 'generated',
 }
 
-function getTooltipDisclaimerText(noLogging: boolean, panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor): string {
-  switch (panel) {
-    case AiCodeCompletion.AiCodeCompletion.ContextFlavor.CONSOLE:
+function getTooltipDisclaimerText(noLogging: boolean, disclaimerTextVariant: DisclaimerTextVariant): string {
+  switch (disclaimerTextVariant) {
+    case 'console':
       return noLogging ?
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeGenerationNoLoggingInConsole) :
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeGenerationInConsole);
-    case AiCodeCompletion.AiCodeCompletion.ContextFlavor.SOURCES:
+    case 'sources':
       return noLogging ?
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeGenerationNoLoggingInSources) :
           lockedString(UIStringsNotTranslate.tooltipDisclaimerTextForAiCodeGenerationInSources);
-    case AiCodeCompletion.AiCodeCompletion.ContextFlavor.STYLES:
+    case 'styles':
       // TODO(476101019): update with string for styles pane
       return '';
   }
@@ -160,8 +160,7 @@ export interface ViewInput {
   onManageInSettingsTooltipClick: (event: Event) => void;
   showDataUsageTeaser: boolean;
   showDiscoveryTeaser: boolean;
-  // TODO(b/472268298): Remove ContextFlavor explicitly and pass required values
-  panel?: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  disclaimerTextVariant?: DisclaimerTextVariant;
 }
 
 export interface ViewOutput {
@@ -173,7 +172,7 @@ export interface ViewOutput {
 export type View = (input: ViewInput, output: ViewOutput, target: HTMLElement) => void;
 
 export const DEFAULT_VIEW: View = (input, output, target) => {
-  if (!input.panel) {
+  if (!input.disclaimerTextVariant) {
     render(nothing, target);
     return;
   }
@@ -207,7 +206,7 @@ export const DEFAULT_VIEW: View = (input, output, target) => {
           html`${toGenerateCode}. ${toLearnHowYourDataIsBeingUsedVisible}` :
           toGenerateCode;
 
-      const tooltipDisclaimerText = getTooltipDisclaimerText(input.noLogging, input.panel);
+      const tooltipDisclaimerText = getTooltipDisclaimerText(input.noLogging, input.disclaimerTextVariant);
 
       // clang-format off
       teaserLabel = html`<div class="ai-code-generation-teaser-trigger">
@@ -265,7 +264,7 @@ export const DEFAULT_VIEW: View = (input, output, target) => {
         break;
       }
       const newBadge = UI.UIUtils.maybeCreateNewBadge(PROMOTION_ID);
-      const teaserText = input.panel === AiCodeCompletion.AiCodeCompletion.ContextFlavor.CONSOLE ?
+      const teaserText = input.disclaimerTextVariant === 'console' ?
           lockedString(UIStringsNotTranslate.writeACommentToGenerateCodeInConsole) :
           lockedString(UIStringsNotTranslate.writeACommentToGenerateCode);
       teaserLabel = newBadge ? html`${teaserText}&nbsp;${newBadge}` : nothing;
@@ -326,7 +325,7 @@ export class AiCodeGenerationTeaser extends UI.Widget.Widget {
   #displayState = AiCodeGenerationTeaserDisplayState.DISCOVERY;
   #disclaimerTooltipId?: string;
   #noLogging: boolean;  // Whether the enterprise setting is `ALLOW_WITHOUT_LOGGING` or not.
-  #panel?: AiCodeCompletion.AiCodeCompletion.ContextFlavor;
+  #disclaimerTextVariant?: DisclaimerTextVariant;
   #timerIntervalId?: number;
   #loadStartTime?: number;
   #aiCodeGenerationUsedSetting = Common.Settings.Settings.instance().createSetting('ai-code-generation-used', false);
@@ -343,18 +342,17 @@ export class AiCodeGenerationTeaser extends UI.Widget.Widget {
   }
 
   override performUpdate(): void {
-    this.#view(
-        {
-          displayState: this.#displayState,
-          onManageInSettingsTooltipClick: this.#onManageInSettingsTooltipClick.bind(this),
-          disclaimerTooltipId: this.#disclaimerTooltipId,
-          noLogging: this.#noLogging,
-          showDataUsageTeaser: AiCodeGenerationTeaser.#showDataUsageTeaser,
-          showDiscoveryTeaser:
-              !this.#aiCodeGenerationUsedSetting.get() && !AiCodeGenerationTeaser.#discoveryTeaserShownInSession,
-          panel: this.#panel,
-        },
-        this.#viewOutput, this.contentElement);
+    this.#view({
+      displayState: this.#displayState,
+      onManageInSettingsTooltipClick: this.#onManageInSettingsTooltipClick.bind(this),
+      disclaimerTooltipId: this.#disclaimerTooltipId,
+      noLogging: this.#noLogging,
+      showDataUsageTeaser: AiCodeGenerationTeaser.#showDataUsageTeaser,
+      showDiscoveryTeaser:
+          !this.#aiCodeGenerationUsedSetting.get() && !AiCodeGenerationTeaser.#discoveryTeaserShownInSession,
+      disclaimerTextVariant: this.#disclaimerTextVariant,
+    },
+               this.#viewOutput, this.contentElement);
   }
 
   override willHide(): void {
@@ -415,8 +413,8 @@ export class AiCodeGenerationTeaser extends UI.Widget.Widget {
     this.requestUpdate();
   }
 
-  set panel(panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor) {
-    this.#panel = panel;
+  set disclaimerTextVariant(disclaimerTextVariant: DisclaimerTextVariant) {
+    this.#disclaimerTextVariant = disclaimerTextVariant;
     this.requestUpdate();
   }
 
@@ -434,4 +432,8 @@ export class AiCodeGenerationTeaser extends UI.Widget.Widget {
   static setDiscoveryTeaserShownInSessionForTest(value: boolean): void {
     AiCodeGenerationTeaser.#discoveryTeaserShownInSession = value;
   }
+
+  static setShowDataUsageTeaserForTest(value: boolean): void {
+    AiCodeGenerationTeaser.#showDataUsageTeaser = value;
+  }
 }

package/front_end/panels/common/common.ts

@@ -100,7 +100,7 @@ export {AiCodeGenerationUpgradeDialog} from './AiCodeGenerationUpgradeDialog.js'
 export {FreDialog} from './FreDialog.js';
 export {GdpSignUpDialog} from './GdpSignUpDialog.js';
 export {GeminiRebrandPromoDialog} from './GeminiRebrandPromoDialog.js';
-export {AiCodeCompletionDisclaimer} from './AiCodeCompletionDisclaimer.js';
+export {AiCodeCompletionDisclaimer, type DisclaimerTextVariant} from './AiCodeCompletionDisclaimer.js';
 export * as AiCodeCompletionSummaryToolbar from './AiCodeCompletionSummaryToolbar.js';
 export * from './BadgeNotification.js';
 export * as CPUThrottlingOption from './CPUThrottlingOption.js';

package/front_end/panels/console/ConsoleInsightTeaser.ts

@@ -420,7 +420,8 @@ export class ConsoleInsightTeaser extends UI.Widget.Widget {
   #callShowTooltip = false;
   #startTime = 0;
 
-  constructor(uuid: string, consoleViewMessage: ConsoleViewMessage, element?: HTMLElement, view?: View) {
+  constructor(uuid: string, consoleViewMessage: ConsoleViewMessage, element?: HTMLElement, view?: View,
+              builtInAi: AiAssistanceModel.BuiltInAi.BuiltInAi = AiAssistanceModel.BuiltInAi.BuiltInAi.instance()) {
     super(element);
     this.#view = view ?? DEFAULT_VIEW;
     this.#uuid = uuid;
@@ -430,19 +431,16 @@ export class ConsoleInsightTeaser extends UI.Widget.Widget {
     this.#boundOnAidaAvailabilityChange = this.#onAidaAvailabilityChange.bind(this);
     this.#boundOnDownloadProgressChange = this.#onDownloadProgressChange.bind(this);
     this.#boundOnSessionCreation = this.#onSessionCreation.bind(this);
-    this.#builtInAi = AiAssistanceModel.BuiltInAi.BuiltInAi.instance();
+    this.#builtInAi = builtInAi;
     this.#state = this.#builtInAi.hasSession() ? State.READY : State.NO_MODEL;
     this.#callShowTooltip = true;
     this.requestUpdate();
   }
 
   #getConsoleInsightsEnabledSetting(): Common.Settings.Setting<boolean>|undefined {
-    try {
-      return Common.Settings.Settings.instance().moduleSetting('console-insights-enabled') as
-          Common.Settings.Setting<boolean>;
-    } catch {
-      return;
-    }
+    const result = Common.Settings.Settings.instance().maybeResolve(
+        AiAssistanceModel.AiUtils.consoleInsightsEnabledSettingDescriptor);
+    return 'setting' in result ? (result.setting as Common.Settings.Setting<boolean>) : undefined;
   }
 
   #getOnboardingCompletedSetting(): Common.Settings.Setting<boolean> {

package/front_end/panels/console/ConsoleView.ts

@@ -492,7 +492,8 @@ export class ConsoleView extends UI.Widget.VBox implements
     UI.ARIAUtils.markAsGroup(settingsPane);
 
     const consoleEagerEvalSetting = Common.Settings.Settings.instance().moduleSetting('console-eager-eval');
-    const preserveConsoleLogSetting = Common.Settings.Settings.instance().moduleSetting('preserve-console-log');
+    const preserveConsoleLogSetting =
+        Common.Settings.Settings.instance().resolve(SDK.SDKSettings.preserveConsoleLogSettingDescriptor);
     const userActivationEvalSetting = Common.Settings.Settings.instance().moduleSetting('console-user-activation-eval');
     settingsPane.append(
         SettingsUI.SettingsUI.createSettingCheckbox(
@@ -601,7 +602,8 @@ export class ConsoleView extends UI.Widget.VBox implements
           onSuggestionAccepted: this.#onAiCodeCompletionSuggestionAccepted.bind(this),
           onRequestTriggered: this.#onAiCodeCompletionRequestTriggered.bind(this),
           onResponseReceived: this.#onAiCodeCompletionResponseReceived.bind(this),
-          panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor.CONSOLE,
+          disclaimerTooltipId: 'console-ai-code-generation-disclaimer-tooltip',
+          disclaimerTextVariant: 'console',
         } :
         undefined;
 
@@ -678,7 +680,7 @@ export class ConsoleView extends UI.Widget.VBox implements
       citationsTooltipId: CITATIONS_TOOLTIP_ID,
       disclaimerTooltipId: DISCLAIMER_TOOLTIP_ID,
       spinnerTooltipId: SPINNER_TOOLTIP_ID,
-      panel: AiCodeCompletion.AiCodeCompletion.ContextFlavor.CONSOLE,
+      disclaimerTextVariant: 'console',
     });
     this.aiCodeCompletionSummaryToolbarContainer =
         this.element.createChild('div', 'ai-code-completion-summary-toolbar-container');
@@ -775,7 +777,7 @@ export class ConsoleView extends UI.Widget.VBox implements
   }
 
   modelRemoved(model: SDK.ConsoleModel.ConsoleModel): void {
-    if (!Common.Settings.Settings.instance().moduleSetting('preserve-console-log').get() &&
+    if (!Common.Settings.Settings.instance().resolve(SDK.SDKSettings.preserveConsoleLogSettingDescriptor).get() &&
         model.target().outermostTarget() === model.target()) {
       this.consoleCleared();
     }

package/front_end/panels/console/ConsoleViewMessage.ts

@@ -433,7 +433,7 @@ export class ConsoleViewMessage implements ConsoleViewportElement {
         case Protocol.Runtime.ConsoleAPICalledEventType.Clear:
           messageElement = document.createElement('span');
           messageElement.classList.add('console-info');
-          if (Common.Settings.Settings.instance().moduleSetting('preserve-console-log').get()) {
+          if (Common.Settings.Settings.instance().resolve(SDK.SDKSettings.preserveConsoleLogSettingDescriptor).get()) {
             messageElement.textContent = i18nString(UIStrings.consoleclearWasPreventedDueTo);
           } else {
             messageElement.textContent = i18nString(UIStrings.consoleWasCleared);