From b2408d05c5afe13e1decb8f2bff49a5e2c3afff5 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Sat, 26 Aug 2023 00:05:47 -0400
Subject: [PATCH] Adds `webviewId` to all webview state Adds
 `data-vscode-context` w/ a webview id property for context menus

---
 src/plus/webviews/account/accountWebview.ts        |  1 +
 src/plus/webviews/account/protocol.ts              |  2 ++
 src/plus/webviews/focus/focusWebview.ts            |  6 ++++++
 src/plus/webviews/focus/protocol.ts                |  2 ++
 src/plus/webviews/graph/graphWebview.ts            |  5 +++--
 src/plus/webviews/graph/protocol.ts                |  2 ++
 src/plus/webviews/timeline/protocol.ts             |  2 ++
 src/plus/webviews/timeline/timelineWebview.ts      |  3 +++
 src/webviews/apps/commitDetails/commitDetails.html |  6 +++++-
 src/webviews/apps/home/home.html                   |  2 +-
 src/webviews/apps/plus/account/account.html        |  6 +++++-
 src/webviews/apps/plus/focus/focus.html            |  2 +-
 src/webviews/apps/plus/graph/graph.html            |  2 +-
 src/webviews/apps/plus/timeline/timeline.html      |  2 +-
 src/webviews/apps/rebase/rebase.html               |  2 +-
 src/webviews/apps/settings/settings.html           |  2 +-
 src/webviews/apps/shared/appBase.ts                |  8 +++++++-
 src/webviews/apps/welcome/welcome.html             |  6 +++++-
 src/webviews/commitDetails/commitDetailsWebview.ts |  1 +
 src/webviews/commitDetails/protocol.ts             |  2 ++
 src/webviews/home/homeWebview.ts                   |  1 +
 src/webviews/home/protocol.ts                      |  2 ++
 src/webviews/rebase/protocol.ts                    |  2 ++
 src/webviews/rebase/rebaseEditor.ts                |  2 ++
 src/webviews/settings/protocol.ts                  |  2 ++
 src/webviews/settings/settingsWebview.ts           |  1 +
 src/webviews/webviewController.ts                  |  6 +++++-
 src/webviews/webviewsController.ts                 | 10 +++++-----
 src/webviews/welcome/protocol.ts                   |  3 +++
 src/webviews/welcome/welcomeWebview.ts             |  1 +
 30 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/src/plus/webviews/account/accountWebview.ts b/src/plus/webviews/account/accountWebview.ts
index 963b917..aa9b945 100644
--- a/src/plus/webviews/account/accountWebview.ts
+++ b/src/plus/webviews/account/accountWebview.ts
@@ -84,6 +84,7 @@ export class AccountWebviewProvider implements WebviewProvider<State> {
 		const subscriptionResult = await this.getSubscription(subscription);
 
 		return {
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			webroot: this.host.getWebRoot(),
 			subscription: subscriptionResult.subscription,
diff --git a/src/plus/webviews/account/protocol.ts b/src/plus/webviews/account/protocol.ts
index 6919fc2..30b27ff 100644
--- a/src/plus/webviews/account/protocol.ts
+++ b/src/plus/webviews/account/protocol.ts
@@ -1,7 +1,9 @@
+import type { WebviewIds, WebviewViewIds } from '../../../constants';
 import type { Subscription } from '../../../subscription';
 import { IpcNotificationType } from '../../../webviews/protocol';
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	webroot?: string;
diff --git a/src/plus/webviews/focus/focusWebview.ts b/src/plus/webviews/focus/focusWebview.ts
index 3aca829..ce943c1 100644
--- a/src/plus/webviews/focus/focusWebview.ts
+++ b/src/plus/webviews/focus/focusWebview.ts
@@ -243,9 +243,12 @@ export class FocusWebviewProvider implements WebviewProvider<State> {
 	}
 
 	private async getState(deferState?: boolean): Promise<State> {
+		const webviewId = this.host.id;
+
 		const access = await this.container.git.access(PlusFeatures.Focus);
 		if (access.allowed !== true) {
 			return {
+				webviewId: webviewId,
 				timestamp: Date.now(),
 				access: access,
 			};
@@ -258,6 +261,7 @@ export class FocusWebviewProvider implements WebviewProvider<State> {
 
 		if (!hasConnectedRepos) {
 			return {
+				webviewId: webviewId,
 				timestamp: Date.now(),
 				access: access,
 				repos: githubRepos.map(r => serializeRepoWithRichRemote(r)),
@@ -274,6 +278,7 @@ export class FocusWebviewProvider implements WebviewProvider<State> {
 		async function getStateCore() {
 			const [prsResult, issuesResult] = await statePromise;
 			return {
+				webviewId: webviewId,
 				timestamp: Date.now(),
 				access: access,
 				repos: repos,
@@ -299,6 +304,7 @@ export class FocusWebviewProvider implements WebviewProvider<State> {
 			});
 
 			return {
+				webviewId: webviewId,
 				timestamp: Date.now(),
 				access: access,
 				repos: repos,
diff --git a/src/plus/webviews/focus/protocol.ts b/src/plus/webviews/focus/protocol.ts
index 4989d31..df1063e 100644
--- a/src/plus/webviews/focus/protocol.ts
+++ b/src/plus/webviews/focus/protocol.ts
@@ -1,9 +1,11 @@
+import type { WebviewIds, WebviewViewIds } from '../../../constants';
 import type { FeatureAccess } from '../../../features';
 import type { IssueShape } from '../../../git/models/issue';
 import type { PullRequestShape } from '../../../git/models/pullRequest';
 import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol';
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	access: FeatureAccess;
diff --git a/src/plus/webviews/graph/graphWebview.ts b/src/plus/webviews/graph/graphWebview.ts
index eadce0c..d3c851b 100644
--- a/src/plus/webviews/graph/graphWebview.ts
+++ b/src/plus/webviews/graph/graphWebview.ts
@@ -1845,13 +1845,13 @@ export class GraphWebviewProvider implements WebviewProvider<State> {
 
 	private async getState(deferRows?: boolean): Promise<State> {
 		if (this.container.git.repositoryCount === 0) {
-			return { timestamp: Date.now(), allowed: true, repositories: [] };
+			return { webviewId: this.host.id, timestamp: Date.now(), allowed: true, repositories: [] };
 		}
 
 		if (this.repository == null) {
 			this.repository = this.container.git.getBestRepositoryOrFirst();
 			if (this.repository == null) {
-				return { timestamp: Date.now(), allowed: true, repositories: [] };
+				return { webviewId: this.host.id, timestamp: Date.now(), allowed: true, repositories: [] };
 			}
 		}
 
@@ -1931,6 +1931,7 @@ export class GraphWebviewProvider implements WebviewProvider<State> {
 		}
 
 		return {
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			windowFocused: this.isWindowFocused,
 			repositories: formatRepositories(this.container.git.openRepositories),
diff --git a/src/plus/webviews/graph/protocol.ts b/src/plus/webviews/graph/protocol.ts
index 68ec89b..7c66bbe 100644
--- a/src/plus/webviews/graph/protocol.ts
+++ b/src/plus/webviews/graph/protocol.ts
@@ -23,6 +23,7 @@ import type {
 	WorkDirStats,
 } from '@gitkraken/gitkraken-components';
 import type { Config, DateStyle } from '../../../config';
+import type { WebviewIds, WebviewViewIds } from '../../../constants';
 import type { RepositoryVisibility } from '../../../git/gitProvider';
 import type { GitTrackingState } from '../../../git/models/branch';
 import type { GitGraphRowType } from '../../../git/models/graph';
@@ -84,6 +85,7 @@ export type GraphMinimapMarkerTypes =
 export const supportedRefMetadataTypes: GraphRefMetadataType[] = Object.values(GraphRefMetadataTypes);
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	windowFocused?: boolean;
diff --git a/src/plus/webviews/timeline/protocol.ts b/src/plus/webviews/timeline/protocol.ts
index 30c2a1a..4666e06 100644
--- a/src/plus/webviews/timeline/protocol.ts
+++ b/src/plus/webviews/timeline/protocol.ts
@@ -1,7 +1,9 @@
+import type { WebviewIds, WebviewViewIds } from '../../../constants';
 import type { FeatureAccess } from '../../../features';
 import { IpcCommandType, IpcNotificationType } from '../../../webviews/protocol';
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	dataset?: Commit[];
diff --git a/src/plus/webviews/timeline/timelineWebview.ts b/src/plus/webviews/timeline/timelineWebview.ts
index 8576adc..6ddf246 100644
--- a/src/plus/webviews/timeline/timelineWebview.ts
+++ b/src/plus/webviews/timeline/timelineWebview.ts
@@ -282,6 +282,7 @@ export class TimelineWebviewProvider implements WebviewProvider<State> {
 		if (current.uri == null || gitUri == null || repoPath == null || access.allowed === false) {
 			const access = await this.container.git.access(PlusFeatures.Timeline, repoPath);
 			return {
+				webviewId: this.host.id,
 				timestamp: Date.now(),
 				period: period,
 				title: gitUri?.relativePath,
@@ -304,6 +305,7 @@ export class TimelineWebviewProvider implements WebviewProvider<State> {
 
 		if (log == null) {
 			return {
+				webviewId: this.host.id,
 				timestamp: Date.now(),
 				dataset: [],
 				period: period,
@@ -362,6 +364,7 @@ export class TimelineWebviewProvider implements WebviewProvider<State> {
 		dataset.sort((a, b) => b.sort - a.sort);
 
 		return {
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			dataset: dataset,
 			period: period,
diff --git a/src/webviews/apps/commitDetails/commitDetails.html b/src/webviews/apps/commitDetails/commitDetails.html
index 36c1980..80e3966 100644
--- a/src/webviews/apps/commitDetails/commitDetails.html
+++ b/src/webviews/apps/commitDetails/commitDetails.html
@@ -16,7 +16,11 @@
 		</style>
 	</head>
 
-	<body class="preload" data-placement="#{placement}">
+	<body
+		class="preload"
+		data-placement="#{placement}"
+		data-vscode-context='{ "preventDefaultContextMenuItems": true, "webview": "#{webviewId}" }'
+	>
 		<gl-commit-details-app id="app"></gl-commit-details-app>
 		#{endOfBody}
 	</body>
diff --git a/src/webviews/apps/home/home.html b/src/webviews/apps/home/home.html
index 42124cc..c10bf9b 100644
--- a/src/webviews/apps/home/home.html
+++ b/src/webviews/apps/home/home.html
@@ -16,7 +16,7 @@
 		</style>
 	</head>
 
-	<body class="home preload" data-placement="#{placement}">
+	<body class="home preload" data-placement="#{placement}" data-vscode-context='{ "webview": "#{webviewId}" }'>
 		<div class="home__nav">
 			<nav class="inline-nav" id="links" aria-label="Help and Resources">
 				<div class="inline-nav__group">
diff --git a/src/webviews/apps/plus/account/account.html b/src/webviews/apps/plus/account/account.html
index aad5527..d7ef27e 100644
--- a/src/webviews/apps/plus/account/account.html
+++ b/src/webviews/apps/plus/account/account.html
@@ -11,7 +11,11 @@
 		</style>
 	</head>
 
-	<body class="account scrollable preload" data-placement="#{placement}">
+	<body
+		class="account scrollable preload"
+		data-placement="#{placement}"
+		data-vscode-context='{ "webview": "#{webviewId}" }'
+	>
 		<account-content id="account-content"></account-content>
 
 		#{endOfBody}
diff --git a/src/webviews/apps/plus/focus/focus.html b/src/webviews/apps/plus/focus/focus.html
index e936bcc..66746f5 100644
--- a/src/webviews/apps/plus/focus/focus.html
+++ b/src/webviews/apps/plus/focus/focus.html
@@ -20,7 +20,7 @@
 		</style>
 	</head>
 
-	<body class="preload" data-placement="#{placement}">
+	<body class="preload" data-placement="#{placement}" data-vscode-context='{ "webview": "#{webviewId}" }'>
 		<gl-focus-app id="app"></gl-focus-app>
 		#{endOfBody}
 	</body>
diff --git a/src/webviews/apps/plus/graph/graph.html b/src/webviews/apps/plus/graph/graph.html
index d3f8129..d8b94fd 100644
--- a/src/webviews/apps/plus/graph/graph.html
+++ b/src/webviews/apps/plus/graph/graph.html
@@ -22,7 +22,7 @@
 	<body
 		class="graph-app scrollable"
 		data-placement="#{placement}"
-		data-vscode-context='{ "preventDefaultContextMenuItems": true }'
+		data-vscode-context='{ "preventDefaultContextMenuItems": true, "webview": "#{webviewId}" }'
 	>
 		<div id="root" class="graph-app__container"></div>
 		#{endOfBody}
diff --git a/src/webviews/apps/plus/timeline/timeline.html b/src/webviews/apps/plus/timeline/timeline.html
index 6ae298e..d1ce49e 100644
--- a/src/webviews/apps/plus/timeline/timeline.html
+++ b/src/webviews/apps/plus/timeline/timeline.html
@@ -16,7 +16,7 @@
 		</style>
 	</head>
 
-	<body class="preload" data-placement="#{placement}">
+	<body class="preload" data-placement="#{placement}" data-vscode-context='{ "webview": "#{webviewId}" }'>
 		<gk-feature-gate id="subscription-gate" class="scrollable"
 			><p slot="feature">
 				Visualize the evolution of a file, including when changes were made, how large they were, and who made
diff --git a/src/webviews/apps/rebase/rebase.html b/src/webviews/apps/rebase/rebase.html
index c181c64..a3e37b6 100644
--- a/src/webviews/apps/rebase/rebase.html
+++ b/src/webviews/apps/rebase/rebase.html
@@ -11,7 +11,7 @@
 		</style>
 	</head>
 
-	<body class="scrollable preload" data-placement="#{placement}">
+	<body class="scrollable preload" data-placement="#{placement}" data-vscode-context='{ "webview": "#{webviewId}" }'>
 		<div class="container">
 			<header>
 				<h2>GitLens Interactive Rebase</h2>
diff --git a/src/webviews/apps/settings/settings.html b/src/webviews/apps/settings/settings.html
index 2ddc867..79dc561 100644
--- a/src/webviews/apps/settings/settings.html
+++ b/src/webviews/apps/settings/settings.html
@@ -11,7 +11,7 @@
 		</style>
 	</head>
 
-	<body class="scrollable preload" data-placement="#{placement}">
+	<body class="scrollable preload" data-placement="#{placement}" data-vscode-context='{ "webview": "#{webviewId}" }'>
 		<!-- <canvas class="snow"></canvas>
 		<img
 			class="snow__trigger snow__trigger--fixed-right snow__trigger--flipped"
diff --git a/src/webviews/apps/shared/appBase.ts b/src/webviews/apps/shared/appBase.ts
index 4045f8d..7e30731 100644
--- a/src/webviews/apps/shared/appBase.ts
+++ b/src/webviews/apps/shared/appBase.ts
@@ -1,4 +1,5 @@
 /*global window document*/
+import type { CustomEditorIds, WebviewIds, WebviewViewIds } from '../../../constants';
 import { debounce } from '../../../system/function';
 import { Logger } from '../../../system/logger';
 import { LogLevel } from '../../../system/logger.constants';
@@ -38,7 +39,12 @@ function nextIpcId() {
 	return `webview:${ipcSequence}`;
 }
 
-export abstract class App<State extends { timestamp: number } = { timestamp: number }> {
+export abstract class App<
+	State extends { webviewId: CustomEditorIds | WebviewIds | WebviewViewIds; timestamp: number } = {
+		webviewId: CustomEditorIds | WebviewIds | WebviewViewIds;
+		timestamp: number;
+	},
+> {
 	private readonly _api: VsCodeApi;
 	protected state: State;
 	protected readonly placement: 'editor' | 'view';
diff --git a/src/webviews/apps/welcome/welcome.html b/src/webviews/apps/welcome/welcome.html
index 1e64fb3..85fc68b 100644
--- a/src/webviews/apps/welcome/welcome.html
+++ b/src/webviews/apps/welcome/welcome.html
@@ -16,7 +16,11 @@
 		</style>
 	</head>
 
-	<body class="welcome scrollable preload" data-placement="#{placement}">
+	<body
+		class="welcome scrollable preload"
+		data-placement="#{placement}"
+		data-vscode-context='{ "webview": "#{webviewId}" }'
+	>
 		<!-- <canvas class="snow"></canvas>
 		<img
 			class="snow__trigger snow__trigger--fixed-right snow__trigger--flipped"
diff --git a/src/webviews/commitDetails/commitDetailsWebview.ts b/src/webviews/commitDetails/commitDetailsWebview.ts
index 5ab3654..854df7e 100644
--- a/src/webviews/commitDetails/commitDetailsWebview.ts
+++ b/src/webviews/commitDetails/commitDetailsWebview.ts
@@ -472,6 +472,7 @@ export class CommitDetailsWebviewProvider implements WebviewProvider<State, Seri
 		// const commitChoices = await Promise.all(this.commits.map(async commit => summaryModel(commit)));
 
 		const state = serialize<State>({
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			pinned: current.pinned,
 			includeRichContent: current.richStateLoaded,
diff --git a/src/webviews/commitDetails/protocol.ts b/src/webviews/commitDetails/protocol.ts
index d9debc1..b95f92c 100644
--- a/src/webviews/commitDetails/protocol.ts
+++ b/src/webviews/commitDetails/protocol.ts
@@ -1,6 +1,7 @@
 import type { TextDocumentShowOptions } from 'vscode';
 import type { Autolink } from '../../annotations/autolinks';
 import type { Config } from '../../config';
+import type { WebviewIds, WebviewViewIds } from '../../constants';
 import type { GitCommitIdentityShape, GitCommitStats } from '../../git/models/commit';
 import type { GitFileChangeShape } from '../../git/models/file';
 import type { IssueOrPullRequest } from '../../git/models/issue';
@@ -36,6 +37,7 @@ export interface Preferences {
 }
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	pinned: boolean;
diff --git a/src/webviews/home/homeWebview.ts b/src/webviews/home/homeWebview.ts
index 24a626b..9efe795 100644
--- a/src/webviews/home/homeWebview.ts
+++ b/src/webviews/home/homeWebview.ts
@@ -48,6 +48,7 @@ export class HomeWebviewProvider implements WebviewProvider<State> {
 
 	private getState(): State {
 		return {
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			repositories: this.getRepositoriesState(),
 			webroot: this.host.getWebRoot(),
diff --git a/src/webviews/home/protocol.ts b/src/webviews/home/protocol.ts
index df4818e..3e1f672 100644
--- a/src/webviews/home/protocol.ts
+++ b/src/webviews/home/protocol.ts
@@ -1,6 +1,8 @@
+import type { WebviewIds, WebviewViewIds } from '../../constants';
 import { IpcNotificationType } from '../protocol';
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	repositories: DidChangeRepositoriesParams;
diff --git a/src/webviews/rebase/protocol.ts b/src/webviews/rebase/protocol.ts
index 97002b7..7f318f2 100644
--- a/src/webviews/rebase/protocol.ts
+++ b/src/webviews/rebase/protocol.ts
@@ -1,6 +1,8 @@
+import type { CustomEditorIds } from '../../constants';
 import { IpcCommandType, IpcNotificationType } from '../protocol';
 
 export interface State {
+	webviewId: CustomEditorIds;
 	timestamp: number;
 
 	branch: string;
diff --git a/src/webviews/rebase/rebaseEditor.ts b/src/webviews/rebase/rebaseEditor.ts
index 1991796..48a3859 100644
--- a/src/webviews/rebase/rebaseEditor.ts
+++ b/src/webviews/rebase/rebaseEditor.ts
@@ -598,6 +598,7 @@ export class RebaseEditorProvider implements CustomTextEditorProvider, Disposabl
 
 		const html = replaceWebviewHtmlTokens(
 			utf8TextDecoder.decode(bytes),
+			'gitlens.rebase',
 			context.panel.webview.cspSource,
 			getNonce(),
 			context.panel.webview.asWebviewUri(this.container.context.extensionUri).toString(),
@@ -691,6 +692,7 @@ async function parseRebaseTodo(
 	}
 
 	return {
+		webviewId: 'gitlens.rebase',
 		timestamp: Date.now(),
 		branch: context.branchName ?? '',
 		onto: onto
diff --git a/src/webviews/settings/protocol.ts b/src/webviews/settings/protocol.ts
index d5681a0..1bb6d56 100644
--- a/src/webviews/settings/protocol.ts
+++ b/src/webviews/settings/protocol.ts
@@ -1,6 +1,8 @@
 import type { Config } from '../../config';
+import type { WebviewIds, WebviewViewIds } from '../../constants';
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
 
 	version: string;
diff --git a/src/webviews/settings/settingsWebview.ts b/src/webviews/settings/settingsWebview.ts
index 184591e..e83424f 100644
--- a/src/webviews/settings/settingsWebview.ts
+++ b/src/webviews/settings/settingsWebview.ts
@@ -47,6 +47,7 @@ export class SettingsWebviewProvider implements WebviewProvider<State> {
 		}
 
 		return {
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			version: this.container.version,
 			// Make sure to get the raw config, not from the container which has the modes mixed in
diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts
index e4a949d..0b9abac 100644
--- a/src/webviews/webviewController.ts
+++ b/src/webviews/webviewController.ts
@@ -447,6 +447,7 @@ export class WebviewController<
 
 		const html = replaceWebviewHtmlTokens(
 			utf8TextDecoder.decode(bytes),
+			this.descriptor.id,
 			webview.cspSource,
 			this._cspNonce,
 			this.asWebviewUri(this.getRootUri()).toString(),
@@ -547,6 +548,7 @@ export class WebviewController<
 
 export function replaceWebviewHtmlTokens<SerializedState>(
 	html: string,
+	webviewId: string,
 	cspSource: string,
 	cspNonce: string,
 	root: string,
@@ -558,7 +560,7 @@ export function replaceWebviewHtmlTokens<SerializedState>(
 	endOfBody?: string,
 ) {
 	return html.replace(
-		/#{(head|body|endOfBody|placement|cspSource|cspNonce|root|webroot)}/g,
+		/#{(head|body|endOfBody|webviewId|placement|cspSource|cspNonce|root|webroot)}/g,
 		(_substring: string, token: string) => {
 			switch (token) {
 				case 'head':
@@ -573,6 +575,8 @@ export function replaceWebviewHtmlTokens<SerializedState>(
 							  )};</script>`
 							: ''
 					}${endOfBody ?? ''}`;
+				case 'webviewId':
+					return webviewId;
 				case 'placement':
 					return placement;
 				case 'cspSource':
diff --git a/src/webviews/webviewsController.ts b/src/webviews/webviewsController.ts
index d10b0a1..ba2f52a 100644
--- a/src/webviews/webviewsController.ts
+++ b/src/webviews/webviewsController.ts
@@ -7,7 +7,7 @@ import type {
 	WebviewViewResolveContext,
 } from 'vscode';
 import { Disposable, Uri, ViewColumn, window } from 'vscode';
-import type { Commands, WebviewTypes, WebviewViewTypes } from '../constants';
+import type { Commands, WebviewIds, WebviewTypes, WebviewViewIds, WebviewViewTypes } from '../constants';
 import type { Container } from '../container';
 import { ensurePlusFeaturesEnabled } from '../plus/subscription/utils';
 import { executeCoreCommand, registerCommand } from '../system/command';
@@ -19,7 +19,7 @@ import type { WebviewProvider } from './webviewController';
 import { WebviewController } from './webviewController';
 
 export interface WebviewPanelDescriptor {
-	id: `gitlens.${WebviewTypes}`;
+	id: WebviewIds;
 	readonly fileName: string;
 	readonly iconPath: string;
 	readonly title: string;
@@ -37,7 +37,7 @@ interface WebviewPanelRegistration<State, SerializedState = State> {
 }
 
 export interface WebviewPanelProxy extends Disposable {
-	readonly id: `gitlens.${WebviewTypes}`;
+	readonly id: WebviewIds;
 	readonly ready: boolean;
 	readonly visible: boolean;
 	close(): void;
@@ -46,7 +46,7 @@ export interface WebviewPanelProxy extends Disposable {
 }
 
 export interface WebviewViewDescriptor {
-	id: `gitlens.views.${WebviewViewTypes}`;
+	id: WebviewViewIds;
 	readonly fileName: string;
 	readonly title: string;
 	readonly contextKeyPrefix: `gitlens:webviewView:${WebviewViewTypes}`;
@@ -65,7 +65,7 @@ interface WebviewViewRegistration<State, SerializedState = State> {
 }
 
 export interface WebviewViewProxy extends Disposable {
-	readonly id: `gitlens.views.${WebviewViewTypes}`;
+	readonly id: WebviewViewIds;
 	readonly ready: boolean;
 	readonly visible: boolean;
 	refresh(force?: boolean): Promise<void>;
diff --git a/src/webviews/welcome/protocol.ts b/src/webviews/welcome/protocol.ts
index f987009..9d6742e 100644
--- a/src/webviews/welcome/protocol.ts
+++ b/src/webviews/welcome/protocol.ts
@@ -1,8 +1,11 @@
 import type { Config } from '../../config';
+import type { WebviewIds, WebviewViewIds } from '../../constants';
 import { IpcCommandType, IpcNotificationType } from '../protocol';
 
 export interface State {
+	webviewId: WebviewIds | WebviewViewIds;
 	timestamp: number;
+
 	version: string;
 	config: {
 		codeLens: Config['codeLens']['enabled'];
diff --git a/src/webviews/welcome/welcomeWebview.ts b/src/webviews/welcome/welcomeWebview.ts
index c4b411b..528c28e 100644
--- a/src/webviews/welcome/welcomeWebview.ts
+++ b/src/webviews/welcome/welcomeWebview.ts
@@ -65,6 +65,7 @@ export class WelcomeWebviewProvider implements WebviewProvider<State> {
 	}
 	private async getState(subscription?: Subscription): Promise<State> {
 		return {
+			webviewId: this.host.id,
 			timestamp: Date.now(),
 			version: this.container.version,
 			// Make sure to get the raw config so to avoid having the mode mixed in