chrome-devtools-frontend 1.0.1669021 → 1.0.1672388

package/front_end/models/issues_manager/IssuesManager.ts

@@ -173,6 +173,7 @@ export function isIssueCodeSupported(code: Protocol.Audits.InspectorIssueCode):
  */
 export function createIssuesFromProtocolIssue(
     issuesModel: SDK.IssuesModel.IssuesModel|null, inspectorIssue: Protocol.Audits.InspectorIssue,
+    // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
     frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance()): Issue[] {
   const handler = issueCodeHandlers.get(inspectorIssue.code);
   if (handler) {
@@ -203,6 +204,7 @@ export function defaultHideIssueByCodeSetting(): HideIssueMenuSetting {
   return setting;
 }
 
+// eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
 export function getHideIssueByCodeSetting(settings: Common.Settings.Settings = Common.Settings.Settings.instance()):
     Common.Settings.Setting<HideIssueMenuSetting> {
   return settings.createSetting('hide-issue-by-code-setting-experiment-2021', defaultHideIssueByCodeSetting());
@@ -235,13 +237,18 @@ export class IssuesManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
   constructor(
       private readonly showThirdPartyIssuesSetting?: Common.Settings.Setting<boolean>,
       private readonly hideIssueSetting?: Common.Settings.Setting<HideIssueMenuSetting>,
+      // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
       frameManager: SDK.FrameManager.FrameManager = SDK.FrameManager.FrameManager.instance(),
+      // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
       targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
+      // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
       workspace: Workspace.Workspace.WorkspaceImpl = Workspace.Workspace.WorkspaceImpl.instance(),
       debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
-          Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance(),
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+      Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance(),
       cssWorkspaceBinding: Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding =
-          Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding.instance(),
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+      Bindings.CSSWorkspaceBinding.CSSWorkspaceBinding.instance(),
   ) {
     super();
     this.#frameManager = frameManager;
@@ -523,6 +530,7 @@ export interface EventTypes {
 
 // @ts-expect-error
 globalThis.addIssueForTest = (issue: Protocol.Audits.InspectorIssue) => {
+  // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
   const mainTarget = SDK.TargetManager.TargetManager.instance().primaryPageTarget();
   const issuesModel = mainTarget?.model(SDK.IssuesModel.IssuesModel);
   issuesModel?.issueAdded({issue});

package/front_end/models/live-metrics/LiveMetrics.ts

@@ -14,6 +14,13 @@ import * as CrUXManager from '../crux-manager/crux-manager.js';
 
 import * as Spec from './web-vitals-injected/spec/spec.js';
 
+export const timelineEnableSoftNavigationsSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'timeline-enable-soft-navigations',
+  type: Common.Settings.SettingType.BOOLEAN,
+  storageType: Common.Settings.SettingStorageType.SYNCED,
+  defaultValue: true,
+};
+
 const UIStrings = {
   /**
    * @description Warning text indicating that the Largest Contentful Paint (LCP) performance metric was affected by the user changing the simulated device.
@@ -61,18 +68,19 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
   #mutex = new Common.Mutex.Mutex();
   readonly #targetManager: SDK.TargetManager.TargetManager;
   readonly #deviceModeModel: EmulationModel.DeviceModeModel.DeviceModeModel|null;
+  readonly #settings: Common.Settings.Settings;
 
-  constructor(targetManager: SDK.TargetManager.TargetManager,
+  constructor(targetManager: SDK.TargetManager.TargetManager, settings: Common.Settings.Settings,
               deviceModeModel: EmulationModel.DeviceModeModel.DeviceModeModel|null) {
     super();
     this.#targetManager = targetManager;
+    this.#settings = settings;
     this.#deviceModeModel = deviceModeModel;
     this.#targetManager.observeTargets(this, {scoped: true});
     this.#targetManager.addModelListener(SDK.ResourceTreeModel.ResourceTreeModel,
                                          SDK.ResourceTreeModel.Events.PrimaryPageChanged, this.#onPrimaryPageChanged,
                                          this);
-    Common.Settings.Settings.instance()
-        .moduleSetting('timeline-enable-soft-navigations')
+    this.#settings.resolve(timelineEnableSoftNavigationsSettingDescriptor)
         .addChangeListener(this.#onSettingChanged, this);
   }
 
@@ -104,7 +112,8 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     if (!Root.DevToolsContext.globalInstance().has(LiveMetrics) || forceNew) {
       Root.DevToolsContext.globalInstance().set(
           LiveMetrics,
-          new LiveMetrics(SDK.TargetManager.TargetManager.instance(),
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+          new LiveMetrics(SDK.TargetManager.TargetManager.instance(), Common.Settings.Settings.instance(),
                           EmulationModel.DeviceModeModel.DeviceModeModel.tryInstance()));
     }
 
@@ -149,6 +158,19 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       return false;
     }
 
+    // Validate duration at runtime to prevent code injection via interpolation.
+    const duration = Number(interaction.duration);
+    if (!Number.isFinite(duration)) {
+      return false;
+    }
+
+    // JSON.stringify escapes quotes. We concatenate safeInteractionType (which is
+    // wrapped in double quotes) instead of interpolating it directly inside the
+    // single-quoted template below. This avoids syntax errors if the value contains
+    // single quotes (e.g. "pointer'"), which would otherwise terminate the
+    // single-quoted template string.
+    const safeInteractionType = JSON.stringify(interaction.interactionType ?? 'unknown');
+
     const scriptsTable = [];
     for (const loaf of interaction.longAnimationFrameTimings) {
       for (const script of loaf.scripts) {
@@ -179,8 +201,8 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
           '';
       await this.#target.runtimeAgent().invoke_evaluate({
         expression: `
-          console.group('[DevTools] Long animation frames for ${interaction.duration}ms ${
-            interaction.interactionType} interaction');
+          console.group('[DevTools] Long animation frames for ${duration}ms ' + ${
+            safeInteractionType} + ' interaction');
           console.log('Scripts${scriptLimitText}:');
           console.table(${JSON.stringify(scriptsTable)});
           console.log('Intersecting long animation frame events${loafLimitText}:', ${
@@ -206,6 +228,12 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
    */
   async #resolveNodeRef(index: number, executionContextId: Protocol.Runtime.ExecutionContextId):
       Promise<SDK.DOMModel.DOMNode|null> {
+    // Validate index at runtime because the payload comes from an untrusted binding
+    // and could contain malicious strings if type casted.
+    if (!Number.isInteger(index)) {
+      return null;
+    }
+
     if (!this.#target) {
       return null;
     }
@@ -412,7 +440,9 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
         this.#clearMetrics();
         this.#navigationType = webVitalsEvent.navigationType;
         if (webVitalsEvent.url) {
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
           CrUXManager.CrUXManager.instance().setMainDocumentURL(webVitalsEvent.url);
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
           void CrUXManager.CrUXManager.instance().refresh();
         }
         break;
@@ -445,7 +475,10 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
 
     const resourceTreeModel = this.#target.model(SDK.ResourceTreeModel.ResourceTreeModel);
     const primaryFrameId = resourceTreeModel?.mainFrame?.id;
-    return Boolean(primaryFrameId && executionContext.frameId === primaryFrameId);
+    // Ensure the context belongs to our isolated world and is not the default
+    // page context, to prevent the page from spoofing events.
+    return Boolean(primaryFrameId && executionContext.frameId === primaryFrameId &&
+                   executionContext.name === LIVE_METRICS_WORLD_NAME && !executionContext.isDefault);
   }
 
   async #onBindingCalled(event: {data: Protocol.Runtime.BindingCalledEvent}): Promise<void> {
@@ -546,8 +579,7 @@ export class LiveMetrics extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
       });
     }
 
-    const softNavsSettingValue =
-        Common.Settings.Settings.instance().moduleSetting('timeline-enable-soft-navigations').get();
+    const softNavsSettingValue = this.#settings.resolve(timelineEnableSoftNavigationsSettingDescriptor).get();
     const source = `window.devToolsReportSoftNavs = ${softNavsSettingValue};\n` + await InjectedScript.get();
 
     // Inject the script

package/front_end/models/logs/LogManager.ts

@@ -27,11 +27,14 @@ export class LogManager implements SDK.TargetManager.SDKModelObserver<SDK.LogMod
 
   static instance({forceNew}: {forceNew: boolean} = {forceNew: false}): LogManager {
     if (!Root.DevToolsContext.globalInstance().has(LogManager) || forceNew) {
-      Root.DevToolsContext.globalInstance().set(LogManager,
-                                                new LogManager(
-                                                    SDK.TargetManager.TargetManager.instance(),
-                                                    NetworkLog.instance(),
-                                                    ));
+      Root.DevToolsContext.globalInstance().set(
+          LogManager,
+          new LogManager(
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+              SDK.TargetManager.TargetManager.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+              NetworkLog.instance(),
+              ));
     }
 
     return Root.DevToolsContext.globalInstance().get(LogManager);

package/front_end/models/logs/NetworkLog.ts

@@ -56,6 +56,7 @@ export class NetworkLog extends Common.ObjectWrapper.ObjectWrapper<EventTypes> i
   static instance(): NetworkLog {
     if (!Root.DevToolsContext.globalInstance().has(NetworkLog)) {
       Root.DevToolsContext.globalInstance().set(
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
           NetworkLog, new NetworkLog(SDK.TargetManager.TargetManager.instance(), Common.Settings.Settings.instance()));
     }
 

package/front_end/models/persistence/IsolatedFileSystemManager.ts

@@ -47,9 +47,7 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
         Host.InspectorFrontendHostAPI.Events.FileSystemRemoved, this.onFileSystemRemoved, this);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
-        Host.InspectorFrontendHostAPI.Events.FileSystemAdded, event => {
-          this.onFileSystemAdded(event);
-        }, this);
+        Host.InspectorFrontendHostAPI.Events.FileSystemAdded, this.onFileSystemAdded, this);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
         Host.InspectorFrontendHostAPI.Events.FileSystemFilesChangedAddedRemoved, this.onFileSystemFilesChanged, this);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.addEventListener(
@@ -101,13 +99,33 @@ export class IsolatedFileSystemManager extends Common.ObjectWrapper.ObjectWrappe
     this.fileSystemsLoadedPromise = this.requestFileSystems();
   }
 
+  // TODO(crbug.com/542394587): Should be `Symbol.dispsoe`
+  dispose(): void {
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.FileSystemRemoved, this.onFileSystemRemoved, this);
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.FileSystemAdded, this.onFileSystemAdded, this);
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.FileSystemFilesChangedAddedRemoved, this.onFileSystemFilesChanged, this);
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.IndexingTotalWorkCalculated, this.onIndexingTotalWorkCalculated, this);
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.IndexingWorked, this.onIndexingWorked, this);
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.IndexingDone, this.onIndexingDone, this);
+    Host.InspectorFrontendHost.InspectorFrontendHostInstance.events.removeEventListener(
+        Host.InspectorFrontendHostAPI.Events.SearchCompleted, this.onSearchCompleted, this);
+  }
+
   static instance(opts: {
     forceNew?: boolean|null,
     settings?: Common.Settings.Settings|null,
     console?: Common.Console.Console|null,
   } = {}): IsolatedFileSystemManager {
     const forceNew = opts.forceNew ?? null;
+    // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
     const settings = opts.settings ?? Common.Settings.Settings.instance();
+    // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
     const console = opts.console ?? Common.Console.Console.instance();
     if (!Root.DevToolsContext.globalInstance().has(IsolatedFileSystemManager) || forceNew) {
       const instance = new IsolatedFileSystemManager(settings, console);

package/front_end/models/persistence/NetworkPersistenceManager.ts

@@ -103,11 +103,17 @@ export class NetworkPersistenceManager extends Common.ObjectWrapper.ObjectWrappe
           NetworkPersistenceManager,
           new NetworkPersistenceManager(
               workspace,
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               PersistenceImpl.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               Breakpoints.BreakpointManager.BreakpointManager.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               SDK.TargetManager.TargetManager.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               Common.Settings.Settings.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               IsolatedFileSystemManager.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               SDK.NetworkManager.MultitargetNetworkManager.instance(),
               ),
       );

package/front_end/models/project_settings/ProjectSettingsModel.ts

@@ -4,7 +4,6 @@
 
 import * as Common from '../../core/common/common.js';
 import * as Platform from '../../core/platform/platform.js';
-import type * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 
 /** The security origin for all DevTools (front-end) resources. */
@@ -107,23 +106,20 @@ export class ProjectSettingsModel extends Common.ObjectWrapper.ObjectWrapper<Eve
   }
 
   constructor(
-      hostConfig: Root.Runtime.HostConfig,
       pageResourceLoader: SDK.PageResourceLoader.PageResourceLoader,
       targetManager: SDK.TargetManager.TargetManager,
   ) {
     super();
     this.#pageResourceLoader = pageResourceLoader;
     this.#targetManager = targetManager;
-    if (hostConfig.devToolsWellKnown?.enabled) {
-      this.#targetManager.addEventListener(
-          SDK.TargetManager.Events.INSPECTED_URL_CHANGED,
-          this.#inspectedURLChanged,
-          this,
-      );
-      const target = this.#targetManager.primaryPageTarget();
-      if (target !== null) {
-        this.#inspectedURLChanged({data: target});
-      }
+    this.#targetManager.addEventListener(
+        SDK.TargetManager.Events.INSPECTED_URL_CHANGED,
+        this.#inspectedURLChanged,
+        this,
+    );
+    const target = this.#targetManager.primaryPageTarget();
+    if (target !== null) {
+      this.#inspectedURLChanged({data: target});
     }
   }
 

package/front_end/models/trace_source_maps_resolver/SourceMapsResolver.ts

@@ -46,7 +46,9 @@ export class SourceMapsResolver extends EventTarget {
       parsedTrace: Trace.TraceModel.ParsedTrace,
       entityMapper?: Trace.EntityMapper.EntityMapper,
       debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding =
-          Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance(),
+          // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
+      Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance(),
+      // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
       targetManager: SDK.TargetManager.TargetManager = SDK.TargetManager.TargetManager.instance(),
   ) {
     super();

package/front_end/models/workspace/IgnoreListManager.ts

@@ -92,7 +92,9 @@ export class IgnoreListManager extends Common.ObjectWrapper.ObjectWrapper<EventT
       Root.DevToolsContext.globalInstance().set(
           IgnoreListManager,
           new IgnoreListManager(
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               opts.settings ?? Common.Settings.Settings.instance(),
+              // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
               opts.targetManager ?? SDK.TargetManager.TargetManager.instance()));
     }
 

package/front_end/models/workspace/UISourceCode.ts

@@ -503,6 +503,7 @@ export class UISourceCode extends Common.ObjectWrapper.ObjectWrapper<EventTypes>
     return this.#disableEdit;
   }
 
+  // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
   isIgnoreListed(ignoreListManager: IgnoreListManager = IgnoreListManager.instance()): boolean {
     return ignoreListManager.isUserOrSourceMapIgnoreListedUISourceCode(this);
   }
@@ -608,6 +609,7 @@ export class UILocation {
     return this.columnNumber - other.columnNumber;
   }
 
+  // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
   isIgnoreListed(ignoreListManager: IgnoreListManager = IgnoreListManager.instance()): boolean {
     return this.uiSourceCode.isIgnoreListed(ignoreListManager);
   }

package/front_end/models/workspace_diff/WorkspaceDiff.ts

@@ -326,9 +326,13 @@ export function workspaceDiff({forceNew}: {forceNew?: boolean} = {}): WorkspaceD
     Root.DevToolsContext.globalInstance().set(
         WorkspaceDiffImpl,
         new WorkspaceDiffImpl(
+            // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
             Workspace.Workspace.WorkspaceImpl.instance(),
+            // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
             Persistence.Persistence.PersistenceImpl.instance(),
+            // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
             Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance(),
+            // eslint-disable-next-line @devtools/no-instance-of-migrated-singletons
             Common.Settings.Settings.instance(),
             ));
   }

package/front_end/panels/ai_assistance/AiAssistancePanel.ts

@@ -734,8 +734,8 @@ export class AiAssistancePanel extends UI.Panel.Panel {
               void this.#startConversation(text, imageInput, multimodalInputType);
             };
 
-            const seenSetting =
-                Common.Settings.Settings.instance().moduleSetting('ai-assistance-v2-opt-in-change-dialog-seen');
+            const seenSetting = Common.Settings.Settings.instance().resolve(
+                AiAssistanceModel.AiUtils.aiAssistanceV2OptInChangeDialogSeenSettingDescriptor);
             if (!seenSetting.get()) {
               OptInChangeDialog.show({
                 onGotIt: () => {
@@ -1751,7 +1751,7 @@ export class AiAssistancePanel extends UI.Panel.Panel {
         parts: [],
         id: crypto.randomUUID(),
       };
-      let step: Step = {isLoading: true};
+      let step: Step = {state: {type: 'in_progress'}};
 
       /**
        * Commits the step to props only if necessary.
@@ -1771,7 +1771,6 @@ export class AiAssistancePanel extends UI.Panel.Panel {
       let announcedAnswerLoading = false;
       let announcedAnswerReady = false;
       for await (const data of items) {
-        step.requestApproval = undefined;
         switch (data.type) {
           case AiAssistanceModel.AiAgent.ResponseType.USER_QUERY: {
             this.#messages.push({
@@ -1797,7 +1796,7 @@ export class AiAssistancePanel extends UI.Panel.Panel {
             break;
           }
           case AiAssistanceModel.AiAgent.ResponseType.QUERYING: {
-            step = {isLoading: true};
+            step = {state: {type: 'in_progress'}};
             if (!systemMessage.parts.length) {
               commitStep();
             }
@@ -1808,7 +1807,7 @@ export class AiAssistancePanel extends UI.Panel.Panel {
             step.title = lockedString(UIStringsNotTranslate.analyzingData);
             step.contextDetails = data.details;
             step.widgets = data.widgets;
-            step.isLoading = false;
+            step.state = {type: 'completed'};
             commitStep();
             break;
           }
@@ -1818,7 +1817,7 @@ export class AiAssistancePanel extends UI.Panel.Panel {
             break;
           }
           case AiAssistanceModel.AiAgent.ResponseType.THOUGHT: {
-            step.isLoading = false;
+            step.state = {type: 'completed'};
             step.thought = data.thought;
             commitStep();
             break;
@@ -1837,24 +1836,25 @@ export class AiAssistancePanel extends UI.Panel.Panel {
             break;
           }
           case AiAssistanceModel.AiAgent.ResponseType.SIDE_EFFECT: {
-            step.isLoading = false;
             step.code ??= data.code;
-            step.requestApproval = {
-              description: data.description,
-              onAnswer: (result: boolean) => {
-                data.confirm(result);
-                step.requestApproval = undefined;
-                this.requestUpdate();
+            step.state = {
+              type: 'needs_approval',
+              sideEffectDialog: {
+                description: data.description,
+                onAnswer: (result: boolean) => {
+                  data.confirm(result);
+                  step.state = {type: 'completed'};
+                  this.requestUpdate();
+                },
               },
             };
             commitStep();
             break;
           }
           case AiAssistanceModel.AiAgent.ResponseType.ACTION: {
-            step.isLoading = false;
+            step.state = data.canceled ? {type: 'canceled'} : {type: 'completed'};
             step.code ??= data.code;
             step.output ??= data.output;
-            step.canceled = data.canceled;
             step.widgets ??= data.widgets;
             commitStep();
             break;
@@ -1890,12 +1890,12 @@ export class AiAssistancePanel extends UI.Panel.Panel {
             // TODO(crbug.com/463323934): Remove specially handling this case.
             if (systemMessage.parts.length > 1) {
               const firstPart = systemMessage.parts[0];
-              if (firstPart.type === 'step' && firstPart.step.isLoading && !firstPart.step.thought &&
+              if (firstPart.type === 'step' && firstPart.step.state.type === 'in_progress' && !firstPart.step.thought &&
                   !firstPart.step.code && !firstPart.step.contextDetails) {
                 systemMessage.parts.shift();
               }
             }
-            step.isLoading = false;
+            step.state = {type: 'completed'};
             break;
           }
           case AiAssistanceModel.AiAgent.ResponseType.ERROR: {
@@ -1905,9 +1905,9 @@ export class AiAssistancePanel extends UI.Panel.Panel {
               const lastStep = lastPart.step;
               // Mark the last step as cancelled to make the UI feel better.
               if (data.error === AiAssistanceModel.AiAgent.ErrorType.ABORT) {
-                lastStep.canceled = true;
+                lastStep.state = {type: 'canceled'};
                 // If error happens while the step is still loading remove it.
-              } else if (lastStep.isLoading) {
+              } else if (lastStep.state.type === 'in_progress') {
                 systemMessage.parts.pop();
               }
             }
@@ -1923,10 +1923,10 @@ export class AiAssistancePanel extends UI.Panel.Panel {
 
           case AiAssistanceModel.AiAgent.ResponseType.CONTEXT_CHANGE: {
             this.#handleConversationContextChange(data.context);
-            step.isLoading = false;
+            step.state = {type: 'completed'};
             step.widgets = data.widgets;
             commitStep();
-            step = {isLoading: true};
+            step = {state: {type: 'in_progress'}};
             break;
           }
         }

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

@@ -166,13 +166,6 @@ Common.Settings.registerSettingExtension({
   },
 });
 
-Common.Settings.registerSettingExtension({
-  category: Common.Settings.SettingCategory.AI,
-  settingName: 'ai-assistance-v2-opt-in-change-dialog-seen',
-  settingType: Common.Settings.SettingType.BOOLEAN,
-  defaultValue: false,
-});
-
 UI.ActionRegistration.registerActionExtension({
   actionId: 'freestyler.main-menu',
   contextTypes(): [] {

package/front_end/panels/ai_assistance/components/ChatInput.ts

@@ -802,6 +802,10 @@ export class ChatInput extends UI.Widget.Widget implements SDK.TargetManager.Obs
     const imageInput = !this.#imageInput?.isLoading && this.#imageInput?.data ?
         {inlineData: {data: this.#imageInput.data, mimeType: this.#imageInput.mimeType}} :
         undefined;
+    const text = this.#textAreaRef.value?.value?.trim() ?? '';
+    if (!text && !imageInput) {
+      return;
+    }
     this.onTextSubmit(this.#textAreaRef.value?.value ?? '', imageInput, this.#imageInput?.inputType);
     this.#imageInput = undefined;
     this.#historyOffset = -1;