chrome-devtools-frontend 1.0.1654411 → 1.0.1656897

package/front_end/core/sdk/SourceMapCache.ts

@@ -8,15 +8,13 @@ import type {DebugId, SourceMapV3} from './SourceMap.js';
 
 /** A thin wrapper around the Cache API to store source map JSONs keyed on Debug IDs */
 export class SourceMapCache {
-  static readonly #INSTANCE = new SourceMapCache('devtools-source-map-cache');
-
-  static instance(): SourceMapCache {
+  static create(): SourceMapCache {
     if (typeof window === 'undefined') {
       // TODO(crbug.com/451502260): Move this behind a `HostRuntime` interface.
       return IN_MEMORY_INSTANCE as unknown as
           SourceMapCache;  // TS doesn't like that our in-memory class doesn't have the same private fields.
     }
-    return this.#INSTANCE;
+    return new SourceMapCache('devtools-source-map-cache');
   }
 
   static createForTest(name: string): SourceMapCache {

package/front_end/core/sdk/SourceMapManager.ts

@@ -22,6 +22,7 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
   readonly #clientData = new Map<T, ClientData>();
   readonly #sourceMaps = new Map<SourceMap, T>();
   #attachingClient: T|null = null;
+  readonly #sourceMapCache = SourceMapCache.create();
 
   constructor(target: Target, factory?: SourceMapFactory<T>) {
     super();
@@ -118,7 +119,7 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
           //     SourceMapManager in their respective constructors.
           const resourceLoader = this.#target.targetManager().context.get(PageResourceLoader);
           clientData.sourceMapPromise =
-              loadSourceMap(resourceLoader, sourceMapURL, client.debugId(), initiator)
+              loadSourceMap(resourceLoader, this.#sourceMapCache, sourceMapURL, client.debugId(), initiator)
                   .then(
                       payload => {
                         const sourceMap = this.#factory(sourceURL, sourceMapURL, payload, client);
@@ -185,14 +186,14 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
   }
 }
 
-async function loadSourceMap(
-    resourceLoader: ResourceLoader, url: Platform.DevToolsPath.UrlString, debugId: DebugId|null,
-    initiator: PageResourceLoadInitiator): Promise<SourceMapV3> {
+async function loadSourceMap(resourceLoader: ResourceLoader, sourceMapCache: SourceMapCache,
+                             url: Platform.DevToolsPath.UrlString, debugId: DebugId|null,
+                             initiator: PageResourceLoadInitiator): Promise<SourceMapV3> {
   try {
     if (debugId) {
       const securityOrigin = initiator.initiatorUrl ? Common.ParsedURL.ParsedURL.extractOrigin(initiator.initiatorUrl) :
                                                       Platform.DevToolsPath.EmptyUrlString;
-      const cachedSourceMap = await SourceMapCache.instance().get(debugId, securityOrigin);
+      const cachedSourceMap = await sourceMapCache.get(debugId, securityOrigin);
       if (cachedSourceMap) {
         return cachedSourceMap;
       }
@@ -204,7 +205,7 @@ async function loadSourceMap(
       // In case something goes wrong with updating the cache, we still want to use the source map.
       const securityOrigin = initiator.initiatorUrl ? Common.ParsedURL.ParsedURL.extractOrigin(initiator.initiatorUrl) :
                                                       Platform.DevToolsPath.EmptyUrlString;
-      await SourceMapCache.instance().set(sourceMap.debugId as DebugId, securityOrigin, sourceMap).catch();
+      await sourceMapCache.set(sourceMap.debugId as DebugId, securityOrigin, sourceMap).catch();
     }
     return sourceMap;
   } catch (cause) {
@@ -216,7 +217,7 @@ export async function tryLoadSourceMap(
     resourceLoader: ResourceLoader, url: Platform.DevToolsPath.UrlString,
     initiator: PageResourceLoadInitiator): Promise<SourceMapV3|null> {
   try {
-    return await loadSourceMap(resourceLoader, url, null, initiator);
+    return await loadSourceMap(resourceLoader, SourceMapCache.create(), url, null, initiator);
   } catch (cause) {
     console.error(cause);
     return null;

package/front_end/core/sdk/TargetManager.ts

@@ -10,6 +10,7 @@ import {assertNotNullOrUndefined} from '../platform/platform.js';
 import type * as ProtocolClient from '../protocol_client/protocol_client.js';
 import * as Root from '../root/root.js';
 
+import {FrameManager} from './FrameManager.js';
 import {type RegistrationInfo, SDKModel, type SDKModelConstructor} from './SDKModel.js';
 import {Target, Type as TargetType} from './Target.js';
 
@@ -31,6 +32,22 @@ export class TargetManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     return this.context.get(Common.Settings.Settings);
   }
 
+  // TODO(crbug.com/493763857): Remove fallback once all unit tests use TestUniverse.
+  getConsole(): Common.Console.Console {
+    if ('has' in this.context && typeof this.context.has === 'function' && !this.context.has(Common.Console.Console)) {
+      return Common.Console.Console.instance();
+    }
+    return this.context.get(Common.Console.Console);
+  }
+
+  // TODO(crbug.com/493763857): Remove fallback once all unit tests use TestUniverse.
+  getFrameManager(): FrameManager {
+    if ('has' in this.context && typeof this.context.has === 'function' && !this.context.has(FrameManager)) {
+      return FrameManager.instance();
+    }
+    return this.context.get(FrameManager);
+  }
+
   /* eslint-disable @typescript-eslint/no-explicit-any */
   #modelListeners: Platform.MapUtilities.Multimap<string|symbol|number, {
     modelClass: SDKModelConstructor,

package/front_end/entrypoints/devtools_app/devtools_app.ts

@@ -5,7 +5,6 @@ import '../shell/shell.js';
 import '../../panels/css_overview/css_overview-meta.js';
 import '../../panels/elements/elements-meta.js';
 import '../../panels/browser_debugger/browser_debugger-meta.js';
-import '../../panels/greendev/greendev-meta.js';
 import '../../panels/network/network-meta.js';
 import '../../panels/security/security-meta.js';
 import '../../panels/emulation/emulation-meta.js';

package/front_end/entrypoints/main/MainImpl.ts

@@ -45,12 +45,10 @@ import * as Foundation from '../../foundation/foundation.js';
 import * as AiAssistanceModel from '../../models/ai_assistance/ai_assistance.js';
 import * as Badges from '../../models/badges/badges.js';
 import * as Bindings from '../../models/bindings/bindings.js';
-import * as Breakpoints from '../../models/breakpoints/breakpoints.js';
 import * as CrUXManager from '../../models/crux-manager/crux-manager.js';
 import * as IssuesManager from '../../models/issues_manager/issues_manager.js';
 import * as LiveMetrics from '../../models/live-metrics/live-metrics.js';
 import * as Persistence from '../../models/persistence/persistence.js';
-import * as ProjectSettings from '../../models/project_settings/project_settings.js';
 import * as Workspace from '../../models/workspace/workspace.js';
 import * as PanelCommon from '../../panels/common/common.js';
 import * as Snippets from '../../panels/snippets/snippets.js';
@@ -180,6 +178,13 @@ export class MainImpl {
     console.timeEnd(label);
   }
 
+  static get universeForTest(): Foundation.Universe.Universe {
+    if (!MainImpl.instanceForTest) {
+      throw new Error('MainImpl not initialized yet!');
+    }
+    return MainImpl.instanceForTest.#universe;
+  }
+
   async #loaded(): Promise<void> {
     console.timeStamp('Main._loaded');
     Root.Runtime.Runtime.setPlatform(Host.Platform.platform());
@@ -202,6 +207,8 @@ export class MainImpl {
         logSettingAccess: VisualLogging.logSettingAccess,
         runSettingsMigration: !Host.InspectorFrontendHost.isUnderTest(),
       },
+      hostConfig: Root.Runtime.hostConfig,
+      inspectorFrontendHost: Host.InspectorFrontendHost.InspectorFrontendHostInstance,
     };
     this.#universe = new Foundation.Universe.Universe(creationOptions);
     Root.DevToolsContext.setGlobalInstance(this.#universe.context as Root.DevToolsContext.WritableDevToolsContext);
@@ -406,7 +413,7 @@ export class MainImpl {
     MainImpl.time('Main._createAppUI');
 
     // Request filesystems early, we won't create connections until callback is fired. Things will happen in parallel.
-    const isolatedFileSystemManager = Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager.instance();
+    const isolatedFileSystemManager = this.#universe.isolatedFileSystemManager;
     isolatedFileSystemManager.addEventListener(
         Persistence.IsolatedFileSystemManager.Events.FileSystemError,
         event => Snackbar.Snackbar.Snackbar.show({message: event.data}));
@@ -441,7 +448,6 @@ export class MainImpl {
     });
 
     UI.DockController.DockController.instance({forceNew: true, canDock});
-    SDK.DOMDebuggerModel.DOMDebuggerManager.instance({forceNew: true});
     const targetManager = SDK.TargetManager.TargetManager.instance();
     targetManager.addEventListener(
         SDK.TargetManager.Events.SUSPEND_STATE_CHANGED, this.#onSuspendStateChanged.bind(this));
@@ -455,13 +461,6 @@ export class MainImpl {
       const outermostTarget = data?.outermostTarget();
       targetManager.setScopeTarget(outermostTarget);
     });
-    Breakpoints.BreakpointManager.BreakpointManager.instance({
-      forceNew: true,
-      workspace: Workspace.Workspace.WorkspaceImpl.instance(),
-      targetManager,
-      debuggerWorkspaceBinding: Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding.instance(),
-      settings: Common.Settings.Settings.instance(),
-    });
     // @ts-expect-error e2e test global
     self.Extensions.extensionServer = PanelCommon.ExtensionServer.ExtensionServer.instance({forceNew: true});
 
@@ -470,11 +469,7 @@ export class MainImpl {
     isolatedFileSystemManager.addPlatformFileSystem(
         'snippet://' as Platform.DevToolsPath.UrlString, new Snippets.ScriptSnippetFileSystem.SnippetFileSystem());
 
-    const persistenceImpl = Persistence.Persistence.PersistenceImpl.instance({
-      forceNew: true,
-      workspace: Workspace.Workspace.WorkspaceImpl.instance(),
-      breakpointManager: Breakpoints.BreakpointManager.BreakpointManager.instance(),
-    });
+    const persistenceImpl = Persistence.Persistence.PersistenceImpl.instance();
     const linkDecorator = new PanelCommon.PersistenceUtils.LinkDecorator(persistenceImpl);
     Components.Linkifier.Linkifier.setLinkDecorator(linkDecorator);
     Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance(
@@ -482,25 +477,6 @@ export class MainImpl {
 
     new ExecutionContextSelector(targetManager, UI.Context.Context.instance());
 
-    const projectSettingsModel = ProjectSettings.ProjectSettingsModel.ProjectSettingsModel.instance({
-      forceNew: true,
-      hostConfig: Root.Runtime.hostConfig,
-      pageResourceLoader: SDK.PageResourceLoader.PageResourceLoader.instance(),
-      targetManager,
-    });
-
-    const automaticFileSystemManager = Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager.instance({
-      forceNew: true,
-      inspectorFrontendHost: Host.InspectorFrontendHost.InspectorFrontendHostInstance,
-      projectSettingsModel,
-    });
-    Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding.instance({
-      forceNew: true,
-      automaticFileSystemManager,
-      isolatedFileSystemManager,
-      workspace: Workspace.Workspace.WorkspaceImpl.instance(),
-    });
-
     LiveMetrics.LiveMetrics.instance();
     CrUXManager.CrUXManager.instance();
 
@@ -573,7 +549,7 @@ export class MainImpl {
         Host.InspectorFrontendHostAPI.Events.RevealSourceLine, this.#revealSourceLine, this);
 
     const inspectorView = UI.InspectorView.InspectorView.instance();
-    Persistence.NetworkPersistenceManager.NetworkPersistenceManager.instance().addEventListener(
+    this.#universe.networkPersistenceManager.addEventListener(
         Persistence.NetworkPersistenceManager.Events.LOCAL_OVERRIDES_REQUESTED, event => {
           inspectorView.displaySelectOverrideFolderInfobar(event.data);
         });

package/front_end/entrypoints/main/SimpleApp.ts

@@ -13,20 +13,7 @@ export class SimpleApp implements UI.App.App {
   }
 }
 
-let simpleAppProviderInstance: SimpleAppProvider;
-
 export class SimpleAppProvider implements UI.AppProvider.AppProvider {
-  static instance(opts: {
-    forceNew: boolean|null,
-  } = {forceNew: null}): SimpleAppProvider {
-    const {forceNew} = opts;
-    if (!simpleAppProviderInstance || forceNew) {
-      simpleAppProviderInstance = new SimpleAppProvider();
-    }
-
-    return simpleAppProviderInstance;
-  }
-
   createApp(): UI.App.App {
     return new SimpleApp();
   }

package/front_end/entrypoints/main/main-meta.ts

@@ -949,7 +949,7 @@ UI.Toolbar.registerToolbarItem({
 UI.AppProvider.registerAppProvider({
   async loadAppProvider() {
     const Main = await loadMainModule();
-    return Main.SimpleApp.SimpleAppProvider.instance();
+    return new Main.SimpleApp.SimpleAppProvider();
   },
   order: 10,
 });

package/front_end/foundation/Universe.ts

@@ -3,16 +3,24 @@
 // found in the LICENSE file.
 
 import * as Common from '../core/common/common.js';
+import type * as Host from '../core/host/host.js';
 import * as Root from '../core/root/root.js';
 import * as SDK from '../core/sdk/sdk.js';
 import * as AutofillManager from '../models/autofill_manager/autofill_manager.js';
 import * as Bindings from '../models/bindings/bindings.js';
+import * as Breakpoints from '../models/breakpoints/breakpoints.js';
+import * as CrUXManager from '../models/crux-manager/crux-manager.js';
+import * as JavaScriptMetadata from '../models/javascript_metadata/javascript_metadata.js';
 import * as Logs from '../models/logs/logs.js';
+import * as Persistence from '../models/persistence/persistence.js';
+import * as ProjectSettings from '../models/project_settings/project_settings.js';
 import * as Workspace from '../models/workspace/workspace.js';
 
 export interface CreationOptions {
-  settingsCreationOptions: Common.Settings.SettingsCreationOptions;
+  settingsCreationOptions: Omit<Common.Settings.SettingsCreationOptions, 'console'>;
   overrideAutoStartModels?: Set<SDK.SDKModel.SDKModelConstructor>;
+  hostConfig: Root.Runtime.HostConfig;
+  inspectorFrontendHost: Host.InspectorFrontendHostAPI.InspectorFrontendHostAPI;
 }
 
 export class Universe {
@@ -26,17 +34,22 @@ export class Universe {
     const context = new Root.DevToolsContext.WritableDevToolsContext();
     this.context = context;
 
+    const console = new Common.Console.Console();
+    context.set(Common.Console.Console, console);
+
     // TODO(crbug.com/458180550): Store instance only on this.context instead.
     //                            For now the global is required as not everything in foundation cleanly
     //                            reads from the scoped `Settings` instance.
     const settings = Common.Settings.Settings.instance({
       forceNew: true,
+      console,
       ...options.settingsCreationOptions,
     });
     context.set(Common.Settings.Settings, settings);
 
-    const console = new Common.Console.Console();
-    context.set(Common.Console.Console, console);
+    const isolatedFileSystemManager =
+        new Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager(settings, console);
+    context.set(Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager, isolatedFileSystemManager);
 
     const targetManager = new SDK.TargetManager.TargetManager(context, options.overrideAutoStartModels);
     context.set(SDK.TargetManager.TargetManager, targetManager);
@@ -51,12 +64,40 @@ export class Universe {
         new SDK.PageResourceLoader.PageResourceLoader(targetManager, settings, multitargetNetworkManager, null);
     context.set(SDK.PageResourceLoader.PageResourceLoader, pageResourceLoader);
 
+    const projectSettingsModel = new ProjectSettings.ProjectSettingsModel.ProjectSettingsModel(
+        options.hostConfig,
+        pageResourceLoader,
+        targetManager,
+    );
+    context.set(ProjectSettings.ProjectSettingsModel.ProjectSettingsModel, projectSettingsModel);
+
+    const automaticFileSystemManager = new Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager(
+        options.inspectorFrontendHost, projectSettingsModel);
+    context.set(Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager, automaticFileSystemManager);
+
     const cpuThrottlingManager = new SDK.CPUThrottlingManager.CPUThrottlingManager(settings, targetManager);
     context.set(SDK.CPUThrottlingManager.CPUThrottlingManager, cpuThrottlingManager);
 
+    const domDebuggerManager = new SDK.DOMDebuggerModel.DOMDebuggerManager(targetManager);
+    context.set(SDK.DOMDebuggerModel.DOMDebuggerManager, domDebuggerManager);
+
+    const cruxManager = new CrUXManager.CrUXManager(targetManager, settings);
+    context.set(CrUXManager.CrUXManager, cruxManager);
+
     const workspace = new Workspace.Workspace.WorkspaceImpl();
     context.set(Workspace.Workspace.WorkspaceImpl, workspace);
 
+    const automaticFileSystemWorkspaceBinding =
+        new Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding(
+            automaticFileSystemManager,
+            isolatedFileSystemManager,
+            workspace,
+        );
+    context.set(
+        Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding,
+        automaticFileSystemWorkspaceBinding,
+    );
+
     const ignoreListManager = new Workspace.IgnoreListManager.IgnoreListManager(settings, targetManager);
     context.set(Workspace.IgnoreListManager.IgnoreListManager, ignoreListManager);
 
@@ -68,20 +109,86 @@ export class Universe {
         resourceMapping, targetManager, ignoreListManager, workspace);
     context.set(Bindings.DebuggerWorkspaceBinding.DebuggerWorkspaceBinding, debuggerWorkspaceBinding);
 
+    const breakpointManager = new Breakpoints.BreakpointManager.BreakpointManager(targetManager, workspace,
+                                                                                  debuggerWorkspaceBinding, settings);
+    context.set(Breakpoints.BreakpointManager.BreakpointManager, breakpointManager);
+
+    const persistence = new Persistence.Persistence.PersistenceImpl(workspace, breakpointManager);
+    context.set(Persistence.Persistence.PersistenceImpl, persistence);
+
+    const networkPersistenceManager = new Persistence.NetworkPersistenceManager.NetworkPersistenceManager(
+        workspace,
+        persistence,
+        breakpointManager,
+        targetManager,
+        settings,
+        isolatedFileSystemManager,
+        multitargetNetworkManager,
+    );
+    context.set(Persistence.NetworkPersistenceManager.NetworkPersistenceManager, networkPersistenceManager);
+
     const networkLog = new Logs.NetworkLog.NetworkLog(targetManager, settings);
     context.set(Logs.NetworkLog.NetworkLog, networkLog);
 
     const logManager = new Logs.LogManager.LogManager(targetManager, networkLog);
     context.set(Logs.LogManager.LogManager, logManager);
 
+    const javaScriptMetadata = new JavaScriptMetadata.JavaScriptMetadata.JavaScriptMetadataImpl();
+    context.set(JavaScriptMetadata.JavaScriptMetadata.JavaScriptMetadataImpl, javaScriptMetadata);
+
     this.autofillManager = new AutofillManager.AutofillManager.AutofillManager(targetManager, frameManager);
   }
 
+  get automaticFileSystemManager(): Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager {
+    return this.context.get(Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager);
+  }
+
+  get automaticFileSystemWorkspaceBinding():
+      Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding {
+    return this.context.get(Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding);
+  }
+
+  get breakpointManager(): Breakpoints.BreakpointManager.BreakpointManager {
+    return this.context.get(Breakpoints.BreakpointManager.BreakpointManager);
+  }
+
   get cpuThrottlingManager(): SDK.CPUThrottlingManager.CPUThrottlingManager {
     return this.context.get(SDK.CPUThrottlingManager.CPUThrottlingManager);
   }
 
+  get cruxManager(): CrUXManager.CrUXManager {
+    return this.context.get(CrUXManager.CrUXManager);
+  }
+
+  get domDebuggerManager(): SDK.DOMDebuggerModel.DOMDebuggerManager {
+    return this.context.get(SDK.DOMDebuggerModel.DOMDebuggerManager);
+  }
+
+  get isolatedFileSystemManager(): Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager {
+    return this.context.get(Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager);
+  }
+
+  get networkPersistenceManager(): Persistence.NetworkPersistenceManager.NetworkPersistenceManager {
+    return this.context.get(Persistence.NetworkPersistenceManager.NetworkPersistenceManager);
+  }
+
   get pageResourceLoader(): SDK.PageResourceLoader.PageResourceLoader {
     return this.context.get(SDK.PageResourceLoader.PageResourceLoader);
   }
+
+  get persistence(): Persistence.Persistence.PersistenceImpl {
+    return this.context.get(Persistence.Persistence.PersistenceImpl);
+  }
+
+  get projectSettingsModel(): ProjectSettings.ProjectSettingsModel.ProjectSettingsModel {
+    return this.context.get(ProjectSettings.ProjectSettingsModel.ProjectSettingsModel);
+  }
+
+  get settings(): Common.Settings.Settings {
+    return this.context.get(Common.Settings.Settings);
+  }
+
+  get targetManager(): SDK.TargetManager.TargetManager {
+    return this.context.get(SDK.TargetManager.TargetManager);
+  }
 }

package/front_end/generated/InspectorBackendCommands.ts

@@ -509,6 +509,10 @@ inspectorBackend.registerType("DeviceAccess.PromptDevice", [{"name": "id", "type
 inspectorBackend.registerCommand("DeviceOrientation.clearDeviceOrientationOverride", [], [], "Clears the overridden Device Orientation.");
 inspectorBackend.registerCommand("DeviceOrientation.setDeviceOrientationOverride", [{"name": "alpha", "type": "number", "optional": false, "description": "Mock alpha", "typeRef": null}, {"name": "beta", "type": "number", "optional": false, "description": "Mock beta", "typeRef": null}, {"name": "gamma", "type": "number", "optional": false, "description": "Mock gamma", "typeRef": null}], [], "Overrides the Device Orientation.");
 
+// DigitalCredentials.
+inspectorBackend.registerEnum("DigitalCredentials.VirtualWalletAction", {Respond: "respond", Decline: "decline", Wait: "wait", Clear: "clear"});
+inspectorBackend.registerCommand("DigitalCredentials.setVirtualWalletBehavior", [{"name": "action", "type": "string", "optional": false, "description": "The action of the virtual wallet.", "typeRef": "DigitalCredentials.VirtualWalletAction"}, {"name": "protocol", "type": "string", "optional": true, "description": "The protocol identifier (e.g. \\\"openid4vp\\\"). Required when |action| is \\\"respond\\\", forbidden otherwise.", "typeRef": null}, {"name": "response", "type": "object", "optional": true, "description": "The response data object returned by the wallet. Required when |action| is \\\"respond\\\", forbidden otherwise.", "typeRef": null}], [], "Sets the behavior of the virtual wallet for digital credential requests issued from this frame.");
+
 // Emulation.
 inspectorBackend.registerEnum("Emulation.ScreenOrientationType", {PortraitPrimary: "portraitPrimary", PortraitSecondary: "portraitSecondary", LandscapePrimary: "landscapePrimary", LandscapeSecondary: "landscapeSecondary"});
 inspectorBackend.registerEnum("Emulation.DisplayFeatureOrientation", {Vertical: "vertical", Horizontal: "horizontal"});
@@ -815,7 +819,7 @@ inspectorBackend.registerEnum("Network.ContentSecurityPolicySource", {HTTP: "HTT
 inspectorBackend.registerEnum("Network.ReportStatus", {Queued: "Queued", Pending: "Pending", MarkedForRemoval: "MarkedForRemoval", Success: "Success"});
 inspectorBackend.registerEnum("Network.DeviceBoundSessionWithUsageUsage", {NotInScope: "NotInScope", InScopeRefreshNotYetNeeded: "InScopeRefreshNotYetNeeded", InScopeRefreshNotAllowed: "InScopeRefreshNotAllowed", ProactiveRefreshNotPossible: "ProactiveRefreshNotPossible", ProactiveRefreshAttempted: "ProactiveRefreshAttempted", Deferred: "Deferred"});
 inspectorBackend.registerEnum("Network.DeviceBoundSessionUrlRuleRuleType", {Exclude: "Exclude", Include: "Include"});
-inspectorBackend.registerEnum("Network.DeviceBoundSessionFetchResult", {Success: "Success", KeyError: "KeyError", SigningError: "SigningError", TransientSigningError: "TransientSigningError", ServerRequestedTermination: "ServerRequestedTermination", InvalidSessionId: "InvalidSessionId", InvalidChallenge: "InvalidChallenge", TooManyChallenges: "TooManyChallenges", InvalidFetcherUrl: "InvalidFetcherUrl", InvalidRefreshUrl: "InvalidRefreshUrl", TransientHttpError: "TransientHttpError", ScopeOriginSameSiteMismatch: "ScopeOriginSameSiteMismatch", RefreshUrlSameSiteMismatch: "RefreshUrlSameSiteMismatch", MismatchedSessionId: "MismatchedSessionId", MissingScope: "MissingScope", NoCredentials: "NoCredentials", SubdomainRegistrationWellKnownUnavailable: "SubdomainRegistrationWellKnownUnavailable", SubdomainRegistrationUnauthorized: "SubdomainRegistrationUnauthorized", SubdomainRegistrationWellKnownMalformed: "SubdomainRegistrationWellKnownMalformed", SessionProviderWellKnownUnavailable: "SessionProviderWellKnownUnavailable", RelyingPartyWellKnownUnavailable: "RelyingPartyWellKnownUnavailable", FederatedKeyThumbprintMismatch: "FederatedKeyThumbprintMismatch", InvalidFederatedSessionUrl: "InvalidFederatedSessionUrl", InvalidFederatedKey: "InvalidFederatedKey", TooManyRelyingOriginLabels: "TooManyRelyingOriginLabels", BoundCookieSetForbidden: "BoundCookieSetForbidden", NetError: "NetError", ProxyError: "ProxyError", EmptySessionConfig: "EmptySessionConfig", InvalidCredentialsConfig: "InvalidCredentialsConfig", InvalidCredentialsType: "InvalidCredentialsType", InvalidCredentialsEmptyName: "InvalidCredentialsEmptyName", InvalidCredentialsCookie: "InvalidCredentialsCookie", PersistentHttpError: "PersistentHttpError", RegistrationAttemptedChallenge: "RegistrationAttemptedChallenge", InvalidScopeOrigin: "InvalidScopeOrigin", ScopeOriginContainsPath: "ScopeOriginContainsPath", RefreshInitiatorNotString: "RefreshInitiatorNotString", RefreshInitiatorInvalidHostPattern: "RefreshInitiatorInvalidHostPattern", InvalidScopeSpecification: "InvalidScopeSpecification", MissingScopeSpecificationType: "MissingScopeSpecificationType", EmptyScopeSpecificationDomain: "EmptyScopeSpecificationDomain", EmptyScopeSpecificationPath: "EmptyScopeSpecificationPath", InvalidScopeSpecificationType: "InvalidScopeSpecificationType", InvalidScopeIncludeSite: "InvalidScopeIncludeSite", MissingScopeIncludeSite: "MissingScopeIncludeSite", FederatedNotAuthorizedByProvider: "FederatedNotAuthorizedByProvider", FederatedNotAuthorizedByRelyingParty: "FederatedNotAuthorizedByRelyingParty", SessionProviderWellKnownMalformed: "SessionProviderWellKnownMalformed", SessionProviderWellKnownHasProviderOrigin: "SessionProviderWellKnownHasProviderOrigin", RelyingPartyWellKnownMalformed: "RelyingPartyWellKnownMalformed", RelyingPartyWellKnownHasRelyingOrigins: "RelyingPartyWellKnownHasRelyingOrigins", InvalidFederatedSessionProviderSessionMissing: "InvalidFederatedSessionProviderSessionMissing", InvalidFederatedSessionWrongProviderOrigin: "InvalidFederatedSessionWrongProviderOrigin", InvalidCredentialsCookieCreationTime: "InvalidCredentialsCookieCreationTime", InvalidCredentialsCookieName: "InvalidCredentialsCookieName", InvalidCredentialsCookieParsing: "InvalidCredentialsCookieParsing", InvalidCredentialsCookieUnpermittedAttribute: "InvalidCredentialsCookieUnpermittedAttribute", InvalidCredentialsCookieInvalidDomain: "InvalidCredentialsCookieInvalidDomain", InvalidCredentialsCookiePrefix: "InvalidCredentialsCookiePrefix", InvalidScopeRulePath: "InvalidScopeRulePath", InvalidScopeRuleHostPattern: "InvalidScopeRuleHostPattern", ScopeRuleOriginScopedHostPatternMismatch: "ScopeRuleOriginScopedHostPatternMismatch", ScopeRuleSiteScopedHostPatternMismatch: "ScopeRuleSiteScopedHostPatternMismatch", SigningQuotaExceeded: "SigningQuotaExceeded", InvalidConfigJson: "InvalidConfigJson", InvalidFederatedSessionProviderFailedToRestoreKey: "InvalidFederatedSessionProviderFailedToRestoreKey", FailedToUnwrapKey: "FailedToUnwrapKey", SessionDeletedDuringRefresh: "SessionDeletedDuringRefresh", CrossOriginRegistrationSiteNotIncluded: "CrossOriginRegistrationSiteNotIncluded"});
+inspectorBackend.registerEnum("Network.DeviceBoundSessionFetchResult", {Success: "Success", SigningKeyGenerationError: "SigningKeyGenerationError", AttestationKeyGenerationError: "AttestationKeyGenerationError", SigningError: "SigningError", TransientSigningError: "TransientSigningError", ServerRequestedTermination: "ServerRequestedTermination", InvalidSessionId: "InvalidSessionId", InvalidChallenge: "InvalidChallenge", TooManyChallenges: "TooManyChallenges", InvalidFetcherUrl: "InvalidFetcherUrl", InvalidRefreshUrl: "InvalidRefreshUrl", TransientHttpError: "TransientHttpError", ScopeOriginSameSiteMismatch: "ScopeOriginSameSiteMismatch", RefreshUrlSameSiteMismatch: "RefreshUrlSameSiteMismatch", MismatchedSessionId: "MismatchedSessionId", MissingScope: "MissingScope", NoCredentials: "NoCredentials", SubdomainRegistrationWellKnownUnavailable: "SubdomainRegistrationWellKnownUnavailable", SubdomainRegistrationUnauthorized: "SubdomainRegistrationUnauthorized", SubdomainRegistrationWellKnownMalformed: "SubdomainRegistrationWellKnownMalformed", SessionProviderWellKnownUnavailable: "SessionProviderWellKnownUnavailable", RelyingPartyWellKnownUnavailable: "RelyingPartyWellKnownUnavailable", FederatedKeyThumbprintMismatch: "FederatedKeyThumbprintMismatch", InvalidFederatedSessionUrl: "InvalidFederatedSessionUrl", InvalidFederatedKey: "InvalidFederatedKey", TooManyRelyingOriginLabels: "TooManyRelyingOriginLabels", BoundCookieSetForbidden: "BoundCookieSetForbidden", NetError: "NetError", ProxyError: "ProxyError", EmptySessionConfig: "EmptySessionConfig", InvalidCredentialsConfig: "InvalidCredentialsConfig", InvalidCredentialsType: "InvalidCredentialsType", InvalidCredentialsEmptyName: "InvalidCredentialsEmptyName", InvalidCredentialsCookie: "InvalidCredentialsCookie", PersistentHttpError: "PersistentHttpError", RegistrationAttemptedChallenge: "RegistrationAttemptedChallenge", InvalidScopeOrigin: "InvalidScopeOrigin", ScopeOriginContainsPath: "ScopeOriginContainsPath", RefreshInitiatorNotString: "RefreshInitiatorNotString", RefreshInitiatorInvalidHostPattern: "RefreshInitiatorInvalidHostPattern", InvalidScopeSpecification: "InvalidScopeSpecification", MissingScopeSpecificationType: "MissingScopeSpecificationType", EmptyScopeSpecificationDomain: "EmptyScopeSpecificationDomain", EmptyScopeSpecificationPath: "EmptyScopeSpecificationPath", InvalidScopeSpecificationType: "InvalidScopeSpecificationType", InvalidScopeIncludeSite: "InvalidScopeIncludeSite", MissingScopeIncludeSite: "MissingScopeIncludeSite", FederatedNotAuthorizedByProvider: "FederatedNotAuthorizedByProvider", FederatedNotAuthorizedByRelyingParty: "FederatedNotAuthorizedByRelyingParty", SessionProviderWellKnownMalformed: "SessionProviderWellKnownMalformed", SessionProviderWellKnownHasProviderOrigin: "SessionProviderWellKnownHasProviderOrigin", RelyingPartyWellKnownMalformed: "RelyingPartyWellKnownMalformed", RelyingPartyWellKnownHasRelyingOrigins: "RelyingPartyWellKnownHasRelyingOrigins", InvalidFederatedSessionProviderSessionMissing: "InvalidFederatedSessionProviderSessionMissing", InvalidFederatedSessionWrongProviderOrigin: "InvalidFederatedSessionWrongProviderOrigin", InvalidCredentialsCookieCreationTime: "InvalidCredentialsCookieCreationTime", InvalidCredentialsCookieName: "InvalidCredentialsCookieName", InvalidCredentialsCookieParsing: "InvalidCredentialsCookieParsing", InvalidCredentialsCookieUnpermittedAttribute: "InvalidCredentialsCookieUnpermittedAttribute", InvalidCredentialsCookieInvalidDomain: "InvalidCredentialsCookieInvalidDomain", InvalidCredentialsCookiePrefix: "InvalidCredentialsCookiePrefix", InvalidScopeRulePath: "InvalidScopeRulePath", InvalidScopeRuleHostPattern: "InvalidScopeRuleHostPattern", ScopeRuleOriginScopedHostPatternMismatch: "ScopeRuleOriginScopedHostPatternMismatch", ScopeRuleSiteScopedHostPatternMismatch: "ScopeRuleSiteScopedHostPatternMismatch", SigningQuotaExceeded: "SigningQuotaExceeded", InvalidConfigJson: "InvalidConfigJson", InvalidFederatedSessionProviderFailedToRestoreKey: "InvalidFederatedSessionProviderFailedToRestoreKey", FailedToUnwrapKey: "FailedToUnwrapKey", SessionDeletedDuringRefresh: "SessionDeletedDuringRefresh", CrossOriginRegistrationSiteNotIncluded: "CrossOriginRegistrationSiteNotIncluded"});
 inspectorBackend.registerEnum("Network.RefreshEventDetailsRefreshResult", {Refreshed: "Refreshed", InitializedService: "InitializedService", Unreachable: "Unreachable", ServerError: "ServerError", RefreshQuotaExceeded: "RefreshQuotaExceeded", FatalError: "FatalError", SigningQuotaExceeded: "SigningQuotaExceeded", RefreshedAsWaiter: "RefreshedAsWaiter", TransientSigningError: "TransientSigningError"});
 inspectorBackend.registerEnum("Network.TerminationEventDetailsDeletionReason", {Expired: "Expired", FailedToRestoreKey: "FailedToRestoreKey", FailedToUnwrapKey: "FailedToUnwrapKey", StoragePartitionCleared: "StoragePartitionCleared", ClearBrowsingData: "ClearBrowsingData", ServerRequested: "ServerRequested", InvalidSessionParams: "InvalidSessionParams", RefreshFatalError: "RefreshFatalError", DevTools: "DevTools"});
 inspectorBackend.registerEnum("Network.ChallengeEventDetailsChallengeResult", {Success: "Success", NoSessionId: "NoSessionId", NoSessionMatch: "NoSessionMatch", CantSetBoundCookie: "CantSetBoundCookie"});

package/front_end/generated/SupportedCSSProperties.js

@@ -1969,9 +1969,7 @@ export const generatedProperties = [
   "keywords": [
    "auto"
   ],
-  "name": "column-height",
-  "runtime_flag": "MulticolColumnWrapping",
-  "runtime_flag_status": "stable"
+  "name": "column-height"
  },
  {
   "longhands": [
@@ -2135,9 +2133,7 @@ export const generatedProperties = [
    "nowrap",
    "wrap"
   ],
-  "name": "column-wrap",
-  "runtime_flag": "MulticolColumnWrapping",
-  "runtime_flag_status": "stable"
+  "name": "column-wrap"
  },
  {
   "devtools_keywords": [

package/front_end/generated/protocol-mapping.d.ts

@@ -2482,6 +2482,14 @@ export namespace ProtocolMapping {
       paramsType: [Protocol.DeviceOrientation.SetDeviceOrientationOverrideRequest];
       returnType: void;
     };
+    /**
+     * Sets the behavior of the virtual wallet for digital credential requests
+     * issued from this frame.
+     */
+    'DigitalCredentials.setVirtualWalletBehavior': {
+      paramsType: [Protocol.DigitalCredentials.SetVirtualWalletBehaviorRequest];
+      returnType: void;
+    };
     /**
      * Tells whether emulation is supported.
      */

package/front_end/generated/protocol-proxy-api.d.ts

@@ -54,6 +54,8 @@ declare namespace ProtocolProxyApi {
 
     DeviceOrientation: DeviceOrientationApi;
 
+    DigitalCredentials: DigitalCredentialsApi;
+
     Emulation: EmulationApi;
 
     EventBreakpoints: EventBreakpointsApi;
@@ -169,6 +171,8 @@ declare namespace ProtocolProxyApi {
 
     DeviceOrientation: DeviceOrientationDispatcher;
 
+    DigitalCredentials: DigitalCredentialsDispatcher;
+
     Emulation: EmulationDispatcher;
 
     EventBreakpoints: EventBreakpointsDispatcher;
@@ -1639,6 +1643,17 @@ declare namespace ProtocolProxyApi {
   export interface DeviceOrientationDispatcher {
   }
 
+  export interface DigitalCredentialsApi {
+    /**
+     * Sets the behavior of the virtual wallet for digital credential requests
+     * issued from this frame.
+     */
+    invoke_setVirtualWalletBehavior(params: Protocol.DigitalCredentials.SetVirtualWalletBehaviorRequest): Promise<Protocol.ProtocolResponseWithError>;
+
+  }
+  export interface DigitalCredentialsDispatcher {
+  }
+
   export interface EmulationApi {
     /**
      * Tells whether emulation is supported.

package/front_end/generated/protocol.ts

@@ -7010,6 +7010,39 @@ export namespace DeviceOrientation {
   }
 }
 
+/**
+ * This domain allows interacting with the Digital Credentials API for automation.
+ */
+export namespace DigitalCredentials {
+
+  /**
+   * The type of virtual wallet action.
+   */
+  export const enum VirtualWalletAction {
+    Respond = 'respond',
+    Decline = 'decline',
+    Wait = 'wait',
+    Clear = 'clear',
+  }
+
+  export interface SetVirtualWalletBehaviorRequest {
+    /**
+     * The action of the virtual wallet.
+     */
+    action: VirtualWalletAction;
+    /**
+     * The protocol identifier (e.g. "openid4vp"). Required when |action| is
+     * "respond", forbidden otherwise.
+     */
+    protocol?: string;
+    /**
+     * The response data object returned by the wallet.
+     * Required when |action| is "respond", forbidden otherwise.
+     */
+    response?: any;
+  }
+}
+
 /**
  * This domain emulates different environments for the page.
  */
@@ -12009,10 +12042,12 @@ export namespace Network {
 
   /**
    * A fetch result for a device bound session creation or refresh.
+   * LINT_SKIP.IfChange(DeviceBoundSessionFetchResult)
    */
   export const enum DeviceBoundSessionFetchResult {
     Success = 'Success',
-    KeyError = 'KeyError',
+    SigningKeyGenerationError = 'SigningKeyGenerationError',
+    AttestationKeyGenerationError = 'AttestationKeyGenerationError',
     SigningError = 'SigningError',
     TransientSigningError = 'TransientSigningError',
     ServerRequestedTermination = 'ServerRequestedTermination',

package/front_end/models/ai_assistance/AiConversation.ts

@@ -8,7 +8,6 @@ import * as Root from '../../core/root/root.js';
 import * as SDK from '../../core/sdk/sdk.js';
 import type * as LHModel from '../../models/lighthouse/lighthouse.js';
 import type * as Trace from '../../models/trace/trace.js';
-import * as Greendev from '../greendev/greendev.js';
 import type * as NetworkTimeCalculator from '../network_time_calculator/network_time_calculator.js';
 
 import {AccessibilityAgent} from './agents/AccessibilityAgent.js';
@@ -205,11 +204,6 @@ export class AiConversation {
     return this.#contexts.at(0);
   }
 
-  getPendingMultimodalInput(): MultimodalInput|undefined {
-    const greenDevEmulationEnabled = Greendev.Prototypes.instance().isEnabled('emulationCapabilities');
-    return greenDevEmulationEnabled ? this.#agent.popPendingMultimodalInput() : undefined;
-  }
-
   #reconstructHistory(historyWithoutImages: ResponseData[]): ResponseData[] {
     const imageHistory = AiHistoryStorage.instance().getImageHistory();
     if (imageHistory && imageHistory.length > 0) {

package/front_end/models/ai_assistance/agents/NetworkAgent.snapshot.txt

@@ -59,7 +59,7 @@ Content:
   {
     "parts": [
       {
-        "text": "# Selected network request\nRequest: https://www.example.com\n\nRequest headers:\ncontent-type: bar1\n\nResponse headers:\ncontent-type: bar2\nx-forwarded-for: bar3\n\nResponse body:\n{\"request\":\"body\"}\n\nResponse status: 200\nNetwork request status: pending\n\nRequest timing:\nQueued at (timestamp): 0 s\nStarted at (timestamp): 501 s\nQueueing (duration): 501 s\nConnection start (stalled) (duration): 800 ms\nRequest sent (duration): 100 ms\nDuration (duration): 501 s\n\nRequest initiator chain:\n- URL: <redacted cross-origin initiator URL>\n\t- URL: https://www.example.com\n\t\t- URL: https://www.example.com/1\n\t\t- URL: https://www.example.com/2\n\n# User request\n\ntest"
+        "text": "# Selected network request\nRequest: https://www.example.com\nRequest headers:\ncontent-type: bar1\n\nResponse headers:\ncontent-type: bar2\nx-forwarded-for: bar3\n\nResponse body:\n{\"request\":\"body\"}\n\nResponse status: 200\nNetwork request status: pending\n\nRequest timing:\nQueued at (timestamp): 0 s\nStarted at (timestamp): 501 s\nQueueing (duration): 501 s\nConnection start (stalled) (duration): 800 ms\nRequest sent (duration): 100 ms\nDuration (duration): 501 s\n\nRequest initiator chain:\n- URL: <redacted cross-origin initiator URL>\n\t- URL: https://www.example.com\n\t\t- URL: https://www.example.com/1\n\t\t- URL: https://www.example.com/2\n\n# User request\n\ntest"
       }
     ],
     "role": 1