chrome-devtools-frontend 1.0.1672557 → 1.0.1675430

package/front_end/core/root/Runtime.ts

@@ -449,10 +449,18 @@ export interface HostConfigJpegXlImageFormat {
   enabled: boolean;
 }
 
+export interface HostConfigSourceMapScopesInSourcesPanel {
+  enabled: boolean;
+}
+
 interface AiGeneratedTimelineLabels {
   enabled: boolean;
 }
 
+interface AllowInterestForcing {
+  enabled: boolean;
+}
+
 interface GlobalAiButton {
   enabled: boolean;
   promotionEnabled: boolean;
@@ -532,6 +540,9 @@ interface DevToolsPlusButton {
 interface DevToolsInstrumentationBreakpoints {
   enabled: boolean;
 }
+interface HostConfigDevToolsComments {
+  enabled: boolean;
+}
 
 /**
  * The host configuration that we expect from the DevTools back-end.
@@ -571,7 +582,9 @@ export type HostConfig = Platform.TypeScriptUtilities.RecursivePartial<{
   devToolsEnableOriginBoundCookies: HostConfigEnableOriginBoundCookies,
   devToolsAnimationStylesInStylesTab: HostConfigAnimationStylesInStylesTab,
   devToolsJpegXlImageFormat: HostConfigJpegXlImageFormat,
+  devToolsSourceMapScopesInSourcesPanel: HostConfigSourceMapScopesInSourcesPanel,
   devToolsAiGeneratedTimelineLabels: AiGeneratedTimelineLabels,
+  devToolsAllowInterestForcing: AllowInterestForcing,
   devToolsGlobalAiButton: GlobalAiButton,
   devToolsGdpProfiles: GdpProfiles,
   devToolsGdpProfilesAvailability: GdpProfilesAvailability,
@@ -589,6 +602,7 @@ export type HostConfig = Platform.TypeScriptUtilities.RecursivePartial<{
   devToolsPlusButton: DevToolsPlusButton,
   devToolsInstrumentationBreakpoints: DevToolsInstrumentationBreakpoints,
   extensionsOnChromeUrls: ExtensionsOnChromeUrls,
+  devToolsComments: HostConfigDevToolsComments,
 }>;
 
 /**

package/front_end/core/sdk/NetworkManager.ts

@@ -2180,7 +2180,6 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
   readonly #targetManager: TargetManager;
   #userAgentOverride = '';
   #userAgentMetadataOverride: Protocol.Emulation.UserAgentMetadata|null = null;
-  #customAcceptedEncodings: Protocol.Network.ContentEncoding[]|null = null;
   readonly #networkAgents = new Set<ProtocolProxyApi.NetworkApi>();
   readonly #fetchAgents = new Set<ProtocolProxyApi.FetchApi>();
   readonly inflightMainResourceRequests = new Map<string, NetworkRequest>();
@@ -2283,11 +2282,6 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     if (this.isIntercepting()) {
       void fetchAgent.invoke_enable({patterns: this.#urlsForRequestInterceptor.valuesArray()});
     }
-    if (this.#customAcceptedEncodings === null) {
-      void networkAgent.invoke_clearAcceptedEncodingsOverride();
-    } else {
-      void networkAgent.invoke_setAcceptedEncodings({encodings: this.#customAcceptedEncodings});
-    }
     this.#networkAgents.add(networkAgent);
     this.#fetchAgents.add(fetchAgent);
   }
@@ -2388,33 +2382,6 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     this.updateUserAgentOverride();
   }
 
-  setCustomAcceptedEncodingsOverride(acceptedEncodings: Protocol.Network.ContentEncoding[]): void {
-    this.#customAcceptedEncodings = acceptedEncodings;
-    this.updateAcceptedEncodingsOverride();
-    this.dispatchEventToListeners(MultitargetNetworkManager.Events.ACCEPTED_ENCODINGS_CHANGED);
-  }
-
-  clearCustomAcceptedEncodingsOverride(): void {
-    this.#customAcceptedEncodings = null;
-    this.updateAcceptedEncodingsOverride();
-    this.dispatchEventToListeners(MultitargetNetworkManager.Events.ACCEPTED_ENCODINGS_CHANGED);
-  }
-
-  isAcceptedEncodingOverrideSet(): boolean {
-    return this.#customAcceptedEncodings !== null;
-  }
-
-  private updateAcceptedEncodingsOverride(): void {
-    const customAcceptedEncodings = this.#customAcceptedEncodings;
-    for (const agent of this.#networkAgents) {
-      if (customAcceptedEncodings === null) {
-        void agent.invoke_clearAcceptedEncodingsOverride();
-      } else {
-        void agent.invoke_setAcceptedEncodings({encodings: customAcceptedEncodings});
-      }
-    }
-  }
-
   get requestConditions(): RequestConditions {
     return this.#requestConditions;
   }
@@ -2516,7 +2483,6 @@ export namespace MultitargetNetworkManager {
     CONDITIONS_CHANGED = 'ConditionsChanged',
     USER_AGENT_CHANGED = 'UserAgentChanged',
     INTERCEPTORS_CHANGED = 'InterceptorsChanged',
-    ACCEPTED_ENCODINGS_CHANGED = 'AcceptedEncodingsChanged',
     REQUEST_INTERCEPTED = 'RequestIntercepted',
     REQUEST_FULFILLED = 'RequestFulfilled',
   }
@@ -2526,7 +2492,6 @@ export namespace MultitargetNetworkManager {
     [Events.CONDITIONS_CHANGED]: void;
     [Events.USER_AGENT_CHANGED]: void;
     [Events.INTERCEPTORS_CHANGED]: void;
-    [Events.ACCEPTED_ENCODINGS_CHANGED]: void;
     [Events.REQUEST_INTERCEPTED]: string;
     [Events.REQUEST_FULFILLED]: Platform.DevToolsPath.UrlString;
   }

package/front_end/core/sdk/SourceMap.ts

@@ -231,26 +231,8 @@ export class SourceMap {
     return this.#scopesFallbackPromise ?? Promise.resolve();
   }
 
-  findEntry(lineNumber: number, columnNumber: number, inlineFrameIndex?: number): SourceMapEntry|null {
+  findEntry(lineNumber: number, columnNumber: number): SourceMapEntry|null {
     this.#ensureSourceMapProcessed();
-    if (inlineFrameIndex && this.#scopesInfo !== null) {
-      // For inlineFrameIndex != 0 we use the callsite info for the corresponding inlining site.
-      // Note that the callsite for "inlineFrameIndex" is actually in the previous frame.
-      const {inlinedFunctions} = this.#scopesInfo.findInlinedFunctions(lineNumber, columnNumber);
-      const {callsite} = inlinedFunctions[inlineFrameIndex - 1];
-      if (!callsite) {
-        console.error('Malformed source map. Expected to have a callsite info for index', inlineFrameIndex);
-        return null;
-      }
-      return {
-        lineNumber,
-        columnNumber,
-        sourceIndex: callsite.sourceIndex,
-        sourceURL: this.sourceURLs()[callsite.sourceIndex],
-        sourceLineNumber: callsite.line,
-        sourceColumnNumber: callsite.column,
-      };
-    }
     const mappings = this.mappings();
     const index = Platform.ArrayUtilities.upperBound(
         mappings, undefined, (_, entry) => lineNumber - entry.lineNumber || columnNumber - entry.columnNumber);

package/front_end/core/sdk/SourceMapManager.ts

@@ -15,9 +15,17 @@ export type SourceMapFactory<T> =
     (compiledURL: Platform.DevToolsPath.UrlString, sourceMappingURL: Platform.DevToolsPath.UrlString,
      payload: SourceMapV3, client: T) => SourceMap;
 
+export const lazyLoadingSettingDescriptor: Common.Settings.SettingDescriptor<boolean> = {
+  name: 'source-maps-lazy-loading',
+  type: Common.Settings.SettingType.BOOLEAN,
+  defaultValue: false,
+  storageType: Common.Settings.SettingStorageType.LOCAL,
+};
+
 export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWrapper.ObjectWrapper<EventTypes<T>> {
   readonly #target: Target;
   readonly #factory: SourceMapFactory<T>;
+  readonly #lazyLoadingSetting: Common.Settings.Setting<boolean>;
   #isEnabled = true;
   readonly #clientData = new Map<T, ClientData>();
   readonly #sourceMaps = new Map<SourceMap, T>();
@@ -31,6 +39,12 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
     this.#factory = factory ??
         ((compiledURL, sourceMappingURL, payload) =>
              new SourceMap(compiledURL, sourceMappingURL, payload, this.#target.targetManager().getConsole()));
+    const settings = target.targetManager().settings;
+    this.#lazyLoadingSetting = settings.resolve(lazyLoadingSettingDescriptor);
+  }
+
+  isLazyLoadEnabled(): boolean {
+    return this.#lazyLoadingSetting.get();
   }
 
   setEnabled(isEnabled: boolean): void {
@@ -75,7 +89,7 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
       return Promise.resolve(undefined);
     }
 
-    return clientData.sourceMapPromise;
+    return clientData.getSourceMap();
   }
 
   clientForSourceMap(sourceMap: SourceMap): T|undefined {
@@ -92,65 +106,78 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
       return;
     }
 
-    let clientData: ClientData|null = {
+    const clientData: ClientData = {
       relativeSourceURL,
       relativeSourceMapURL,
-      sourceMapPromise: Promise.resolve(undefined),
+      getSourceMap: () => Promise.resolve(undefined),
     };
+    this.#clientData.set(client, clientData);
+
     if (this.#isEnabled) {
       // The `// #sourceURL=foo` can be a random string, but is generally an absolute path.
       // Complete it to inspected page url for relative links.
       const sourceURL = SourceMapManager.resolveRelativeSourceURL(this.#target, relativeSourceURL);
       const sourceMapURL = Common.ParsedURL.ParsedURL.completeURL(sourceURL, relativeSourceMapURL);
       if (sourceMapURL) {
-        if (this.#attachingClient) {
-          // This should not happen
-          console.error('Attaching source map may cancel previously attaching source map');
-        }
-        this.#attachingClient = client;
-        this.dispatchEventToListeners(Events.SourceMapWillAttach, {client});
-
-        if (this.#attachingClient === client) {
-          this.#attachingClient = null;
-          const initiator = client.createPageResourceLoadInitiator();
-          // TODO(crbug.com/458180550): Pass PageResourceLoader via constructor.
-          //     The reason we grab it here lazily from the context is that otherwise every
-          //     unit test using `createTarget` would need to set up a `PageResourceLoader`, as
-          //     CSSModel and DebuggerModel are autostarted by default, and they create a
-          //     SourceMapManager in their respective constructors.
-          const resourceLoader = this.#target.targetManager().context.get(PageResourceLoader);
-          clientData.sourceMapPromise =
-              loadSourceMap(resourceLoader, this.#sourceMapCache, sourceMapURL, client.debugId(), initiator)
-                  .then(
-                      payload => {
-                        const sourceMap = this.#factory(sourceURL, sourceMapURL, payload, client);
-                        if (this.#clientData.get(client) === clientData) {
-                          clientData.sourceMap = sourceMap;
-                          this.#sourceMaps.set(sourceMap, client);
-                          this.dispatchEventToListeners(Events.SourceMapAttached, {client, sourceMap});
-                        }
-                        return sourceMap;
-                      },
-                      () => {
-                        if (this.#clientData.get(client) === clientData) {
-                          this.dispatchEventToListeners(Events.SourceMapFailedToAttach, {client});
-                        }
-                        return undefined;
-                      });
-        } else {
-          // Assume cancelAttachSourceMap was called.
-          if (this.#attachingClient) {
-            // This should not happen
-            console.error('Cancelling source map attach because another source map is attaching');
+        let sourceMapPromise: Promise<SourceMap|undefined>|undefined;
+        const doLoad = (): Promise<SourceMap|undefined> => {
+          if (!sourceMapPromise) {
+            if (this.#attachingClient) {
+              // This should not happen
+              console.error('Attaching source map may cancel previously attaching source map');
+            }
+            this.#attachingClient = client;
+            this.dispatchEventToListeners(Events.SourceMapWillAttach, {client});
+
+            if (this.#attachingClient === client) {
+              this.#attachingClient = null;
+              const initiator = client.createPageResourceLoadInitiator();
+              // TODO(crbug.com/458180550): Pass PageResourceLoader via constructor.
+              //     The reason we grab it here lazily from the context is that otherwise every
+              //     unit test using `createTarget` would need to set up a `PageResourceLoader`, as
+              //     CSSModel and DebuggerModel are autostarted by default, and they create a
+              //     SourceMapManager in their respective constructors.
+              const resourceLoader = this.#target.targetManager().context.get(PageResourceLoader);
+              sourceMapPromise =
+                  loadSourceMap(resourceLoader, this.#sourceMapCache, sourceMapURL, client.debugId(), initiator)
+                      .then(
+                          payload => {
+                            const sourceMap = this.#factory(sourceURL, sourceMapURL, payload, client);
+                            if (this.#clientData.get(client) === clientData) {
+                              clientData.sourceMap = sourceMap;
+                              this.#sourceMaps.set(sourceMap, client);
+                              this.dispatchEventToListeners(Events.SourceMapAttached, {client, sourceMap});
+                            }
+                            return sourceMap;
+                          },
+                          () => {
+                            if (this.#clientData.get(client) === clientData) {
+                              this.dispatchEventToListeners(Events.SourceMapFailedToAttach, {client});
+                            }
+                            return undefined;
+                          });
+            } else {
+              // Assume cancelAttachSourceMap was called.
+              if (this.#attachingClient) {
+                // This should not happen
+                console.error('Cancelling source map attach because another source map is attaching');
+              }
+              this.#clientData.delete(client);
+              this.dispatchEventToListeners(Events.SourceMapFailedToAttach, {client});
+              sourceMapPromise = Promise.resolve(undefined);
+            }
           }
-          clientData = null;
-          this.dispatchEventToListeners(Events.SourceMapFailedToAttach, {client});
+          return sourceMapPromise;
+        };
+
+        if (this.isLazyLoadEnabled()) {
+          clientData.getSourceMap = doLoad;
+        } else {
+          const promise = doLoad();
+          clientData.getSourceMap = () => promise;
         }
       }
     }
-    if (clientData) {
-      this.#clientData.set(client, clientData);
-    }
   }
 
   cancelAttachSourceMap(client: T): void {
@@ -231,7 +258,7 @@ interface ClientData {
   // be valid URLs and will be checked and resolved once `attachSourceMap` is called.
   relativeSourceMapURL: string;
   sourceMap?: SourceMap;
-  sourceMapPromise: Promise<SourceMap|undefined>;
+  getSourceMap: () => Promise<SourceMap|undefined>;
 }
 
 export enum Events {

package/front_end/core/sdk/SourceMapScopesInfo.ts

@@ -267,46 +267,6 @@ export class SourceMapScopesInfo {
     return false;
   }
 
-  /**
-   * Given a generated position, returns the original name of the surrounding function as well as
-   * all the original function names that got inlined into the surrounding generated function and their
-   * respective callsites in the original code (ordered from inner to outer).
-   *
-   * @returns a list with inlined functions. Every entry in the list has a callsite in the orignal code,
-   * except the last function (since the last function didn't get inlined).
-   */
-  findInlinedFunctions(generatedLine: number, generatedColumn: number): InlineInfo {
-    const rangeChain = this.#findGeneratedRangeChain(generatedLine, generatedColumn);
-    const result: InlineInfo = {
-      inlinedFunctions: [],
-      originalFunctionName: '',
-    };
-
-    // Walk the generated ranges from the innermost containing range outwards as long as we don't
-    // encounter a range that is a scope in the generated code and a function scope originally.
-    for (let i = rangeChain.length - 1; i >= 0; --i) {
-      const range = rangeChain[i];
-
-      if (range.callSite) {
-        // Record the name and call-site if the range corresponds to an inlined function.
-        result.inlinedFunctions.push({
-          name: range.originalScope?.name ?? '',
-          callsite: {...range.callSite, sourceURL: this.#sourceMap.sourceURLForSourceIndex(range.callSite.sourceIndex)},
-        });
-      }
-      if (range.isStackFrame) {
-        // We arrived at an actual generated JS function, don't go further.
-        // The corresponding original scope could not actually be a function
-        // (e.g. a block scope transpiled down to a JS function), but we'll
-        // filter that out later.
-        result.originalFunctionName = range.originalScope?.name ?? '';
-        break;
-      }
-    }
-
-    return result;
-  }
-
   /**
    * Given a generated position, this returns all the surrounding generated ranges from outer
    * to inner.
@@ -608,28 +568,6 @@ export interface TranslatedFrame {
   url?: Platform.DevToolsPath.UrlString;
 }
 
-/**
- * Represents the inlining information for a given generated position.
- *
- * It contains a list of all the inlined original functions at the generated position
- * as well as the original function name of the generated position's surrounding
- * function.
- *
- * The inlined functions are sorted from inner to outer (or top to bottom on the stack).
- */
-export interface InlineInfo {
-  inlinedFunctions: Array<{
-    name: string,
-    callsite: {
-      line: number,
-      column: number,
-      sourceIndex: number,
-      sourceURL?: Platform.DevToolsPath.UrlString,
-    },
-  }>;
-  originalFunctionName: string;
-}
-
 export function contains(
     range: Pick<ScopesCodec.GeneratedRange, 'start'|'end'>, line: number, column: number): boolean {
   if (range.start.line > line || (range.start.line === line && range.start.column > column)) {

package/front_end/core/sdk/TargetManager.ts

@@ -122,6 +122,24 @@ export class TargetManager extends Common.ObjectWrapper.ObjectWrapper<EventTypes
     Root.DevToolsContext.globalInstance().delete(TargetManager);
   }
 
+  // TODO(crbug.com/542394587): Should be `Symbol.dispose`
+  dispose(): void {
+    for (const target of this.targets()) {
+      target.dispose('TargetManager disposed');
+    }
+    if (this.#browserTarget) {
+      this.#browserTarget.dispose('TargetManager disposed');
+      this.#browserTarget = null;
+    }
+    this.#targets.clear();
+    this.#observers.clear();
+    this.#modelObservers.clear();
+    this.#modelListeners.clear();
+    this.#scopeChangeListeners.clear();
+    this.#scopeTarget = null;
+    this.#scopedObservers = new WeakSet();
+  }
+
   onInspectedURLChange(target: Target): void {
     if (target !== this.#scopeTarget) {
       return;

package/front_end/devtools_compatibility.js

@@ -1290,7 +1290,7 @@
       MAX_VALUE: 16,
     },
   };
-  // LINT.ThenChange(/front_end/core/host/UserMetricsEnums.d.ts)
+  // LINT.ThenChange(/front_end/core/host/UserMetricsEnums.ts)
 
   // InspectorFrontendHostImpl --------------------------------------------------
 

package/front_end/entrypoints/main/MainImpl.ts

@@ -209,6 +209,7 @@ export class MainImpl {
       hostConfig: Root.Runtime.hostConfig,
       inspectorFrontendHost: Host.InspectorFrontendHost.InspectorFrontendHostInstance,
       supportsEmulation: this.#supportsEmulation,
+      initAutomaticFilesystem: true,
     };
     this.#universe = new Foundation.Universe.Universe(creationOptions);
     Root.DevToolsContext.setGlobalInstance(this.#universe.context as Root.DevToolsContext.WritableDevToolsContext);

package/front_end/foundation/Universe.ts

@@ -28,6 +28,7 @@ export interface CreationOptions {
   hostConfig: Root.Runtime.HostConfig;
   inspectorFrontendHost: Host.InspectorFrontendHostAPI.InspectorFrontendHostAPI;
   supportsEmulation: boolean;
+  initAutomaticFilesystem?: boolean;
 }
 
 export class Universe {
@@ -37,6 +38,7 @@ export class Universe {
   readonly context: Root.DevToolsContext.DevToolsContext;
   readonly autofillManager: AutofillManager.AutofillManager.AutofillManager;
   readonly supportsEmulation: boolean;
+  readonly initAutomaticFilesystem: boolean;
   readonly fileSystemWorkspaceBinding: Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding;
 
   constructor(options: CreationOptions) {
@@ -78,11 +80,17 @@ export class Universe {
     const multitargetNetworkManager = new SDK.NetworkManager.MultitargetNetworkManager(targetManager);
     context.set(SDK.NetworkManager.MultitargetNetworkManager, multitargetNetworkManager);
 
+    const workspace = new Workspace.Workspace.WorkspaceImpl();
+    context.set(Workspace.Workspace.WorkspaceImpl, workspace);
+
+    const fileManager = new Workspace.FileManager.FileManager();
+    context.set(Workspace.FileManager.FileManager, fileManager);
+
     this.supportsEmulation = options.supportsEmulation;
     let deviceModeModel = null;
     if (options.supportsEmulation) {
-      deviceModeModel =
-          new Emulation.DeviceModeModel.DeviceModeModel(targetManager, settings, multitargetNetworkManager);
+      deviceModeModel = new Emulation.DeviceModeModel.DeviceModeModel(targetManager, settings,
+                                                                      multitargetNetworkManager, fileManager);
       context.set(Emulation.DeviceModeModel.DeviceModeModel, deviceModeModel);
     }
 
@@ -90,15 +98,20 @@ export class Universe {
         new SDK.PageResourceLoader.PageResourceLoader(targetManager, settings, multitargetNetworkManager, null);
     context.set(SDK.PageResourceLoader.PageResourceLoader, pageResourceLoader);
 
-    const projectSettingsModel = new ProjectSettings.ProjectSettingsModel.ProjectSettingsModel(
-        pageResourceLoader,
-        targetManager,
-    );
-    context.set(ProjectSettings.ProjectSettingsModel.ProjectSettingsModel, projectSettingsModel);
-
-    const automaticFileSystemManager = new Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager(
-        options.inspectorFrontendHost, projectSettingsModel);
-    context.set(Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager, automaticFileSystemManager);
+    this.initAutomaticFilesystem = options.initAutomaticFilesystem ?? false;
+    let automaticFileSystemManager = null;
+    let projectSettingsModel = null;
+    if (this.initAutomaticFilesystem) {
+      projectSettingsModel = new ProjectSettings.ProjectSettingsModel.ProjectSettingsModel(
+          pageResourceLoader,
+          targetManager,
+      );
+      context.set(ProjectSettings.ProjectSettingsModel.ProjectSettingsModel, projectSettingsModel);
+
+      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);
@@ -117,22 +130,18 @@ export class Universe {
     const domModelUndoStack = new SDK.DOMModel.DOMModelUndoStack();
     context.set(SDK.DOMModel.DOMModelUndoStack, domModelUndoStack);
 
-    const workspace = new Workspace.Workspace.WorkspaceImpl();
-    context.set(Workspace.Workspace.WorkspaceImpl, workspace);
-
-    const fileManager = new Workspace.FileManager.FileManager();
-    context.set(Workspace.FileManager.FileManager, fileManager);
-
-    const automaticFileSystemWorkspaceBinding =
-        new Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding(
-            automaticFileSystemManager,
-            isolatedFileSystemManager,
-            workspace,
-        );
-    context.set(
-        Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding,
-        automaticFileSystemWorkspaceBinding,
-    );
+    if (automaticFileSystemManager) {
+      const automaticFileSystemWorkspaceBinding =
+          new Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding(
+              automaticFileSystemManager,
+              isolatedFileSystemManager,
+              workspace,
+          );
+      context.set(
+          Persistence.AutomaticFileSystemWorkspaceBinding.AutomaticFileSystemWorkspaceBinding,
+          automaticFileSystemWorkspaceBinding,
+      );
+    }
 
     this.fileSystemWorkspaceBinding =
         new Persistence.FileSystemWorkspaceBinding.FileSystemWorkspaceBinding(isolatedFileSystemManager, workspace);
@@ -226,6 +235,11 @@ export class Universe {
   dispose(): void {
     // TODO(crbug.com/542394587): Track these in a DisposableStack.
     this.context.get(Persistence.IsolatedFileSystemManager.IsolatedFileSystemManager).dispose();
+    if (this.initAutomaticFilesystem) {
+      this.context.get(Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager).dispose();
+    }
+    this.context.get(Workspace.FileManager.FileManager).dispose();
+    this.context.get(SDK.TargetManager.TargetManager).dispose();
   }
 
   get automaticFileSystemManager(): Persistence.AutomaticFileSystemManager.AutomaticFileSystemManager {
@@ -338,8 +352,9 @@ export class Universe {
     return this.context.get(Bindings.PresentationConsoleMessageHelper.PresentationConsoleMessageManager);
   }
 
-  get projectSettingsModel(): ProjectSettings.ProjectSettingsModel.ProjectSettingsModel {
-    return this.context.get(ProjectSettings.ProjectSettingsModel.ProjectSettingsModel);
+  get projectSettingsModel(): ProjectSettings.ProjectSettingsModel.ProjectSettingsModel|null {
+    return this.initAutomaticFilesystem ? this.context.get(ProjectSettings.ProjectSettingsModel.ProjectSettingsModel) :
+                                          null;
   }
 
   get settings(): Common.Settings.Settings {