Fixes #96681 & more

Adds `workbench.workspaceFirstOpen` workspace setting to control applying a default layout
Removes `firstRun` flag from `IDefaultLayout`
Changes `IDefaultEditor` to require a `uri` rather than path+scheme - still supports a fallback until embedders can migrate
Adds `openOnlyIfExists` property to `IDefaultEditor` for better control on if a file should be opened or not

src/vs/platform/windows/common/windows.ts

@@ -141,6 +141,9 @@ export interface IPathData {
 	// file exists, if false it does not. with
 	// undefined the state is unknown.
 	exists?: boolean;
+
+	// Specifies if the file should be only be opened if it exists
+	openOnlyIfExists?: boolean;
 }
 
 export interface IOpenFileRequest {

src/vs/workbench/browser/layout.ts

@@ -44,7 +44,7 @@ import { LineNumbersType } from 'vs/editor/common/config/editorOptions';
 import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart';
 import { URI } from 'vs/base/common/uri';
 
-enum Settings {
+export enum Settings {
 	ACTIVITYBAR_VISIBLE = 'workbench.activityBar.visible',
 	STATUSBAR_VISIBLE = 'workbench.statusBar.visible',
 
@@ -52,6 +52,7 @@ enum Settings {
 	PANEL_POSITION = 'workbench.panel.defaultLocation',
 
 	ZEN_MODE_RESTORE = 'zenMode.restore',
+	WORKSPACE_FIRST_OPEN = 'workbench.workspaceFirstOpen'
 }
 
 enum Storage {
@@ -547,7 +548,12 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 
 	private applyDefaultLayout(environmentService: IWorkbenchEnvironmentService, storageService: IStorageService) {
 		const defaultLayout = environmentService.options?.defaultLayout;
-		if (!defaultLayout || !defaultLayout.firstRun) {
+		if (!defaultLayout) {
+			return;
+		}
+
+		const firstOpen = storageService.getBoolean(Settings.WORKSPACE_FIRST_OPEN, StorageScope.WORKSPACE);
+		if (!firstOpen) {
 			return;
 		}
 
@@ -752,14 +758,25 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
 		return [];
 	}
 
+	private _openedDefaultEditors: boolean = false;
+	get openedDefaultEditors() {
+		return this._openedDefaultEditors;
+	}
+
 	private getInitialFilesToOpen(): { filesToOpenOrCreate?: IPath[], filesToDiff?: IPath[] } | undefined {
 		const defaultLayout = this.environmentService.options?.defaultLayout;
-		if (defaultLayout?.firstRun && defaultLayout?.editors?.length) {
-			//
+		if (defaultLayout?.editors?.length && this.storageService.getBoolean(Settings.WORKSPACE_FIRST_OPEN, StorageScope.WORKSPACE)) {
+			this._openedDefaultEditors = true;
+
 			return {
 				filesToOpenOrCreate: defaultLayout.editors
-					.sort((a, b) => (a.active ? -1 : 1) - (b.active ? -1 : 1))
-					.map(f => ({ fileUri: URI.file(f.path).with({ scheme: f.scheme }), inactive: !f.active }))
+					.map<IPath>(f => {
+						// Support the old path+scheme api until embedders can migrate
+						if ('path' in f && 'scheme' in f) {
+							return { fileUri: URI.file((f as any).path).with({ scheme: (f as any).scheme }) };
+						}
+						return { fileUri: URI.revive(f.uri), openOnlyIfExists: f.openOnlyIfExists };
+					})
 			};
 		}
 

src/vs/workbench/browser/web.main.ts

@@ -38,7 +38,7 @@ import { FileUserDataProvider } from 'vs/workbench/services/userData/common/file
 import { BACKUPS } from 'vs/platform/environment/common/environment';
 import { joinPath } from 'vs/base/common/resources';
 import { BrowserStorageService } from 'vs/platform/storage/browser/storageService';
-import { IStorageService } from 'vs/platform/storage/common/storage';
+import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { getThemeTypeSelector, DARK, HIGH_CONTRAST, LIGHT } from 'vs/platform/theme/common/themeService';
 import { registerWindowDriver } from 'vs/platform/driver/browser/driver';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
@@ -52,6 +52,7 @@ import { coalesce } from 'vs/base/common/arrays';
 import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
 import { WebResourceIdentityService, IResourceIdentityService } from 'vs/platform/resource/common/resourceIdentityService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
+import { Settings } from 'vs/workbench/browser/layout';
 
 class BrowserMain extends Disposable {
 
@@ -65,12 +66,12 @@ class BrowserMain extends Disposable {
 	async open(): Promise<IWorkbench> {
 		const services = await this.initServices();
 
-		// const defaultLayout = this.configuration?.defaultLayout;
-		// if (defaultLayout) {
-		// 	defaultLayout.firstRun = services.storageService.get(firstSessionDateStorageKey, StorageScope.GLOBAL) === undefined;
-		// }
+		const firstOpen = services.storageService.getBoolean(Settings.WORKSPACE_FIRST_OPEN, StorageScope.WORKSPACE);
+		if (firstOpen === undefined || firstOpen) {
+			services.storageService.store(Settings.WORKSPACE_FIRST_OPEN, !(firstOpen ?? false), StorageScope.WORKSPACE);
+		}
 
-		await domContentLoaded();
+		{ await domContentLoaded(); }
 		mark('willStartWorkbench');
 
 		// Base Theme

src/vs/workbench/common/editor.ts

@@ -1481,6 +1481,9 @@ export async function pathsToEditors(paths: IPathData[] | undefined, fileService
 		}
 
 		const exists = (typeof path.exists === 'boolean') ? path.exists : await fileService.exists(resource);
+		if (!exists && path.openOnlyIfExists) {
+			return;
+		}
 
 		const options: ITextEditorOptions = (exists && typeof path.lineNumber === 'number') ? {
 			selection: {

src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts

@@ -44,8 +44,8 @@ import { IRecentlyOpened, isRecentWorkspace, IRecentWorkspace, IRecentFolder, is
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IHostService } from 'vs/workbench/services/host/browser/host';
 import { IProductService } from 'vs/platform/product/common/productService';
-import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
+import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 
 const configurationKey = 'workbench.startupEditor';
 const oldConfigurationKey = 'workbench.welcome.enabled';
@@ -61,13 +61,14 @@ export class WelcomePageContribution implements IWorkbenchContribution {
 		@IFileService fileService: IFileService,
 		@IWorkspaceContextService contextService: IWorkspaceContextService,
 		@ILifecycleService lifecycleService: ILifecycleService,
-		@IEditorService editorGroupsService: IEditorGroupsService,
+		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
 		@ICommandService private readonly commandService: ICommandService,
 	) {
 		const enabled = isWelcomePageEnabled(configurationService, contextService);
 		if (enabled && lifecycleService.startupKind !== StartupKind.ReloadedWindow) {
 			backupFileService.hasBackups().then(hasBackups => {
-				if (!editorGroupsService.willRestoreEditors && !hasBackups) {
+				// Open the welcome even if we opened a set of default editors
+				if ((!editorService.activeEditor || layoutService.openedDefaultEditors) && !hasBackups) {
 					const openWithReadme = configurationService.getValue(configurationKey) === 'readme';
 					if (openWithReadme) {
 						return Promise.all(contextService.getWorkspace().folders.map(folder => {

src/vs/workbench/services/layout/browser/layoutService.ts

@@ -224,4 +224,9 @@ export interface IWorkbenchLayoutService extends ILayoutService {
 	 * Returns the next visible view part in a given direction
 	 */
 	getVisibleNeighborPart(part: Parts, direction: Direction): Parts | undefined;
+
+	/**
+	 * True if a default layout with default editors was applied at startup
+	 */
+	readonly openedDefaultEditors: boolean;
 }

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -370,6 +370,8 @@ export class TestLayoutService implements IWorkbenchLayoutService {
 
 	_serviceBrand: undefined;
 
+	openedDefaultEditors = false;
+
 	dimension: IDimension = { width: 800, height: 600 };
 
 	container: HTMLElement = window.document.body;

src/vs/workbench/workbench.web.api.ts

@@ -146,18 +146,14 @@ interface IDefaultPanelLayout {
 }
 
 interface IDefaultEditor {
-	path: string;
-	scheme: string;
-	active?: boolean;
+	readonly uri: UriComponents;
+	readonly openOnlyIfExists?: boolean;
 }
 
 interface IDefaultLayout {
-	sidebar?: IDefaultSideBarLayout;
-	panel?: IDefaultPanelLayout;
-	editors?: IDefaultEditor[];
-
-	// Internal only
-	firstRun?: boolean;
+	readonly sidebar?: IDefaultSideBarLayout;
+	readonly panel?: IDefaultPanelLayout;
+	readonly editors?: IDefaultEditor[];
 }
 
 interface IWorkbenchConstructionOptions {
@@ -270,6 +266,8 @@ interface IWorkbenchConstructionOptions {
 	 */
 	readonly homeIndicator?: IHomeIndicator;
 
+	readonly defaultLayout?: IDefaultLayout;
+
 	//#endregion
 
 
@@ -286,8 +284,6 @@ interface IWorkbenchConstructionOptions {
 	readonly driver?: boolean;
 
 	//#endregion
-
-	defaultLayout?: IDefaultLayout;
 }
 
 interface IWorkbench {
@@ -421,6 +417,7 @@ export {
 	IHomeIndicator,
 
 	// Default layout
+	IDefaultEditor,
 	IDefaultLayout,
 	IDefaultPanelLayout,
 	IDefaultSideBarLayout,