Standardizes source type handling across commands

Removes unnecessary markdown command link helpers
Replaces command enum usage with type-safe strings

Author: eamodio

src/commands/cloudIntegrations.ts

@@ -1,47 +1,39 @@
-import { GlCommand } from '../constants.commands';
 import type { SupportedCloudIntegrationIds } from '../constants.integrations';
 import type { Source } from '../constants.telemetry';
 import type { Container } from '../container';
 import { command } from '../system/-webview/command';
-import { createMarkdownCommandLink } from '../system/commands';
 import { GlCommandBase } from './commandBase';
 
-export interface ManageCloudIntegrationsCommandArgs extends Source {}
+export interface ManageCloudIntegrationsCommandArgs {
+	source?: Source;
+}
 
-export interface ConnectCloudIntegrationsCommandArgs extends Source {
+export interface ConnectCloudIntegrationsCommandArgs {
 	integrationIds?: SupportedCloudIntegrationIds[];
+	source?: Source;
 }
 
 @command()
 export class ManageCloudIntegrationsCommand extends GlCommandBase {
 	constructor(private readonly container: Container) {
-		super(GlCommand.PlusManageCloudIntegrations);
+		super('gitlens.plus.cloudIntegrations.manage');
 	}
 
 	async execute(args?: ManageCloudIntegrationsCommandArgs): Promise<void> {
-		await this.container.integrations.manageCloudIntegrations(
-			args?.source ? { source: args.source, detail: args?.detail } : undefined,
-		);
+		await this.container.integrations.manageCloudIntegrations(args?.source);
 	}
 }
 
 @command()
 export class ConnectCloudIntegrationsCommand extends GlCommandBase {
-	static createMarkdownCommandLink(args: ConnectCloudIntegrationsCommandArgs): string {
-		return createMarkdownCommandLink<ConnectCloudIntegrationsCommandArgs>(
-			GlCommand.PlusConnectCloudIntegrations,
-			args,
-		);
-	}
-
 	constructor(private readonly container: Container) {
-		super(GlCommand.PlusConnectCloudIntegrations);
+		super('gitlens.plus.cloudIntegrations.connect');
 	}
 
 	async execute(args?: ConnectCloudIntegrationsCommandArgs): Promise<void> {
 		await this.container.integrations.connectCloudIntegrations(
 			args?.integrationIds ? { integrationIds: args.integrationIds } : undefined,
-			args?.source ? { source: args.source, detail: args?.detail } : undefined,
+			args?.source,
 		);
 	}
 }

src/commands/showView.ts

@@ -11,7 +11,7 @@ import type { CommandContext } from './commandContext';
 export class ShowViewCommand extends GlCommandBase {
 	constructor(private readonly container: Container) {
 		super([
-			GlCommand.ShowAccountView,
+			'gitlens.showAccountView',
 			GlCommand.ShowBranchesView,
 			GlCommand.ShowCommitDetailsView,
 			GlCommand.ShowCommitsView,
@@ -56,7 +56,7 @@ export class ShowViewCommand extends GlCommandBase {
 	async execute(context: CommandContext, ...args: unknown[]): Promise<void> {
 		const command = context.command;
 		switch (command) {
-			case GlCommand.ShowAccountView:
+			case 'gitlens.showAccountView':
 				return this.container.views.home.show(
 					undefined,
 					...([{ focusAccount: true }, ...args] as HomeWebviewShowingArgs),

src/commands/walkthroughs.ts

@@ -6,6 +6,7 @@ import type { Source, Sources } from '../constants.telemetry';
 import type { Container } from '../container';
 import { command, executeCommand } from '../system/-webview/command';
 import { openUrl, openWalkthrough as openWalkthroughCore } from '../system/-webview/vscode';
+import type { ConnectCloudIntegrationsCommandArgs } from './cloudIntegrations';
 import { GlCommandBase } from './commandBase';
 
 @command()
@@ -72,7 +73,7 @@ export class WalkthroughPlusUpgradeCommand extends GlCommandBase {
 	}
 
 	execute(): void {
-		const command = GlCommand.PlusUpgrade;
+		const command: GlCommands = 'gitlens.plus.upgrade';
 		this.container.telemetry.sendEvent('walkthrough/action', {
 			type: 'command',
 			name: 'plus/upgrade',
@@ -108,7 +109,7 @@ export class WalkthroughPlusSignUpCommand extends GlCommandBase {
 	}
 
 	execute(): void {
-		const command = GlCommand.PlusSignUp;
+		const command: GlCommands = 'gitlens.plus.signUp';
 		this.container.telemetry.sendEvent('walkthrough/action', {
 			type: 'command',
 			name: 'plus/sign-up',
@@ -125,7 +126,7 @@ export class WalkthroughPlusReactivateCommand extends GlCommandBase {
 	}
 
 	execute(): void {
-		const command = GlCommand.PlusReactivateProTrial;
+		const command: GlCommands = 'gitlens.plus.reactivateProTrial';
 		this.container.telemetry.sendEvent('walkthrough/action', {
 			type: 'command',
 			name: 'plus/reactivate',
@@ -322,13 +323,15 @@ export class WalkthroughConnectIntegrationsCommand extends GlCommandBase {
 	}
 
 	execute(): void {
-		const command = GlCommand.PlusConnectCloudIntegrations;
+		const command: GlCommands = 'gitlens.plus.cloudIntegrations.connect';
 		this.container.telemetry.sendEvent('walkthrough/action', {
 			type: 'command',
 			name: 'connect/integrations',
 			command: command,
 		});
-		executeCommand(command);
+		executeCommand<ConnectCloudIntegrationsCommandArgs>(command, {
+			source: { source: 'walkthrough' },
+		});
 	}
 }
 

src/constants.commands.ts

@@ -83,7 +83,6 @@ export const enum GlCommand {
 	GenerateCommitMessage = 'gitlens.generateCommitMessage',
 	GenerateCommitMessageScm = 'gitlens.scm.generateCommitMessage',
 	GetStarted = 'gitlens.getStarted',
-	GKSwitchOrganization = 'gitlens.gk.switchOrganization',
 	InviteToLiveShare = 'gitlens.inviteToLiveShare',
 	OpenBlamePriorToChange = 'gitlens.openBlamePriorToChange',
 	OpenBranchesOnRemote = 'gitlens.openBranchesOnRemote',
@@ -147,25 +146,7 @@ export const enum GlCommand {
 	GitCommandsWorktreeDelete = 'gitlens.gitCommands.worktree.delete',
 	GitCommandsWorktreeOpen = 'gitlens.gitCommands.worktree.open',
 	OpenOrCreateWorktreeForGHPR = 'gitlens.ghpr.views.openOrCreateWorktree',
-	PlusConnectCloudIntegrations = 'gitlens.plus.cloudIntegrations.connect',
-	PlusHide = 'gitlens.plus.hide',
-	PlusLogin = 'gitlens.plus.login',
-	PlusLogout = 'gitlens.plus.logout',
-	PlusManage = 'gitlens.plus.manage',
-	PlusManageCloudIntegrations = 'gitlens.plus.cloudIntegrations.manage',
-	PlusReactivateProTrial = 'gitlens.plus.reactivateProTrial',
-	PlusResendVerification = 'gitlens.plus.resendVerification',
-	PlusRestore = 'gitlens.plus.restore',
-	PlusShowPlans = 'gitlens.plus.showPlans',
-	PlusSignUp = 'gitlens.plus.signUp',
-	PlusStartPreviewTrial = 'gitlens.plus.startPreviewTrial',
-	PlusContinueFeaturePreview = 'gitlens.plus.continueFeaturePreview',
-	PlusUpgrade = 'gitlens.plus.upgrade',
-	PlusValidate = 'gitlens.plus.validate',
-	PlusSimulateSubscription = 'gitlens.plus.simulateSubscription',
 	QuickOpenFileHistory = 'gitlens.quickOpenFileHistory',
-	RefreshLaunchpad = 'gitlens.launchpad.refresh',
-	RefreshGraph = 'gitlens.graph.refresh',
 	RefreshHover = 'gitlens.refreshHover',
 	Reset = 'gitlens.reset',
 	ResetAIKey = 'gitlens.resetAIKey',
@@ -186,7 +167,6 @@ export const enum GlCommand {
 	ShowGraphPage = 'gitlens.showGraphPage',
 	ShowGraphView = 'gitlens.showGraphView',
 	ShowHomeView = 'gitlens.showHomeView',
-	ShowAccountView = 'gitlens.showAccountView',
 	ShowInCommitGraph = 'gitlens.showInCommitGraph',
 	ShowInCommitGraphView = 'gitlens.showInCommitGraphView',
 	ShowInDetailsView = 'gitlens.showInDetailsView',

src/constants.telemetry.ts

@@ -1,7 +1,7 @@
 import type { Config, GraphBranchesVisibility, GraphConfig } from './config';
 import type { WalkthroughSteps } from './constants';
 import type { AIProviders } from './constants.ai';
-import type { GlCommand } from './constants.commands';
+import type { GlCommands } from './constants.commands';
 import type { IntegrationId, SupportedCloudIntegrationIds } from './constants.integrations';
 import type { SubscriptionState, SubscriptionStateString } from './constants.subscription';
 import type { CustomEditorTypes, TreeViewTypes, WebviewTypes, WebviewViewTypes } from './constants.views';
@@ -440,7 +440,7 @@ interface CommandEventData {
 }
 
 interface GitCommandEventData {
-	command: GlCommand.GitCommands;
+	command: Extract<GlCommands, 'gitlens.gitCommands'>;
 	'context.mode'?: string;
 	'context.submode'?: string;
 	webview?: string;

src/plus/gk/__debug__accountDebug.ts

@@ -1,6 +1,5 @@
 import type { Disposable } from 'vscode';
 import { ThemeIcon, window } from 'vscode';
-import { GlCommand } from '../../constants.commands';
 import {
 	proFeaturePreviewUsages,
 	proTrialLengthInDays,
@@ -77,7 +76,7 @@ class AccountDebug {
 		private readonly service: SubscriptionServiceFacade,
 	) {
 		this.container.context.subscriptions.push(
-			registerCommand(GlCommand.PlusSimulateSubscription, () => this.showSimulator()),
+			registerCommand('gitlens.plus.simulateSubscription', () => this.showSimulator()),
 		);
 	}
 

src/plus/gk/models/promo.ts

@@ -1,3 +1,4 @@
+import type { GlCommands } from '../../../constants.commands';
 import type { SubscriptionState } from '../../../constants.subscription';
 
 export type PromoLocation = 'account' | 'badge' | 'gate' | 'home';
@@ -20,7 +21,7 @@ export interface Promo {
 			readonly link?: {
 				readonly html: string;
 				readonly title: string;
-				readonly command?: `command:${string}`;
+				readonly command?: GlCommands;
 			};
 		};
 	};

src/plus/gk/productConfigProvider.ts

@@ -1,3 +1,4 @@
+import type { GlCommands } from '../../constants.commands';
 import { SubscriptionState } from '../../constants.subscription';
 import type { Container } from '../../container';
 import { deviceCohortGroup } from '../../system/-webview/vscode';
@@ -152,13 +153,13 @@ function createConfigValidator(): Validator<ConfigJson> {
 		html: Is.Optional(Is.String),
 	});
 
-	const isCommandPattern = (value: unknown): value is `command:${string}` =>
-		typeof value === 'string' && value.startsWith('command:');
+	const isCommandPattern = (value: unknown): value is GlCommands =>
+		typeof value === 'string' && value.startsWith('gitlens.');
 
 	const isWebviewLink = createValidator({
 		html: Is.String,
 		title: Is.String,
-		command: Is.Optional((value): value is `command:${string}` => isCommandPattern(value)),
+		command: Is.Optional((value): value is GlCommands => isCommandPattern(value)),
 	});
 
 	const isWebview = createValidator({

src/plus/gk/subscriptionService.ts

@@ -23,7 +23,7 @@ import { getPlatform } from '@env/platform';
 import type { OpenWalkthroughCommandArgs } from '../../commands/walkthroughs';
 import { urls } from '../../constants';
 import type { CoreColors } from '../../constants.colors';
-import { GlCommand } from '../../constants.commands';
+import type { GlCommands } from '../../constants.commands';
 import type { StoredFeaturePreviewUsagePeriod } from '../../constants.storage';
 import {
 	proFeaturePreviewUsageDurationInDays,
@@ -51,6 +51,7 @@ import { executeCommand, registerCommand } from '../../system/-webview/command';
 import { configuration } from '../../system/-webview/configuration';
 import { setContext } from '../../system/-webview/context';
 import { openUrl } from '../../system/-webview/vscode';
+import { createCommandLink } from '../../system/commands';
 import { createFromDateDelta, fromNow } from '../../system/date';
 import { gate } from '../../system/decorators/-webview/gate';
 import { debug, log } from '../../system/decorators/log';
@@ -339,24 +340,24 @@ export class SubscriptionService implements Disposable {
 
 	private registerCommands(): Disposable[] {
 		return [
-			registerCommand(GlCommand.PlusLogin, (src?: Source) => this.loginOrSignUp(false, src)),
-			registerCommand(GlCommand.PlusSignUp, (src?: Source) => this.loginOrSignUp(true, src)),
-			registerCommand(GlCommand.PlusLogout, (src?: Source) => this.logout(src)),
-			registerCommand(GlCommand.GKSwitchOrganization, (src?: Source) => this.switchOrganization(src)),
+			registerCommand('gitlens.plus.login', (src?: Source) => this.loginOrSignUp(false, src)),
+			registerCommand('gitlens.plus.signUp', (src?: Source) => this.loginOrSignUp(true, src)),
+			registerCommand('gitlens.plus.logout', (src?: Source) => this.logout(src)),
+			registerCommand('gitlens.gk.switchOrganization', (src?: Source) => this.switchOrganization(src)),
 
-			registerCommand(GlCommand.PlusManage, (src?: Source) => this.manage(src)),
-			registerCommand(GlCommand.PlusShowPlans, (src?: Source) => this.showPlans(src)),
-			registerCommand(GlCommand.PlusStartPreviewTrial, (src?: Source) => this.startPreviewTrial(src)),
-			registerCommand(GlCommand.PlusReactivateProTrial, (src?: Source) => this.reactivateProTrial(src)),
-			registerCommand(GlCommand.PlusResendVerification, (src?: Source) => this.resendVerification(src)),
-			registerCommand(GlCommand.PlusUpgrade, (src?: Source) => this.upgrade(src)),
+			registerCommand('gitlens.plus.manage', (src?: Source) => this.manage(src)),
+			registerCommand('gitlens.plus.showPlans', (src?: Source) => this.showPlans(src)),
+			registerCommand('gitlens.plus.startPreviewTrial', (src?: Source) => this.startPreviewTrial(src)),
+			registerCommand('gitlens.plus.reactivateProTrial', (src?: Source) => this.reactivateProTrial(src)),
+			registerCommand('gitlens.plus.resendVerification', (src?: Source) => this.resendVerification(src)),
+			registerCommand('gitlens.plus.upgrade', (src?: Source) => this.upgrade(src)),
 
-			registerCommand(GlCommand.PlusHide, (src?: Source) => this.setProFeaturesVisibility(false, src)),
-			registerCommand(GlCommand.PlusRestore, (src?: Source) => this.setProFeaturesVisibility(true, src)),
+			registerCommand('gitlens.plus.hide', (src?: Source) => this.setProFeaturesVisibility(false, src)),
+			registerCommand('gitlens.plus.restore', (src?: Source) => this.setProFeaturesVisibility(true, src)),
 
-			registerCommand(GlCommand.PlusValidate, (src?: Source) => this.validate({ force: true }, src)),
+			registerCommand('gitlens.plus.validate', (src?: Source) => this.validate({ force: true }, src)),
 
-			registerCommand(GlCommand.PlusContinueFeaturePreview, ({ feature }: { feature: FeaturePreviews }) =>
+			registerCommand('gitlens.plus.continueFeaturePreview', ({ feature }: { feature: FeaturePreviews }) =>
 				this.continueFeaturePreview(feature),
 			),
 		];
@@ -797,7 +798,7 @@ export class SubscriptionService implements Disposable {
 		if (silent && !configuration.get('plusFeatures.enabled', undefined, true)) return;
 
 		if (!this.container.views.home.visible) {
-			await executeCommand(GlCommand.ShowAccountView);
+			await executeCommand('gitlens.showAccountView');
 		}
 	}
 
@@ -855,7 +856,10 @@ export class SubscriptionService implements Disposable {
 			const result = await window.showInformationMessage(
 				`You can now preview local Pro features for ${
 					days < 1 ? '1 day' : pluralize('day', days)
-				}, or for full access to all GitLens Pro features, [start your free ${proTrialLengthInDays}-day Pro trial](command:gitlens.plus.signUp "Try GitLens Pro") — no credit card required.`,
+				}, or for full access to all GitLens Pro features, [start your free ${proTrialLengthInDays}-day Pro trial](${createCommandLink<Source>(
+					'gitlens.plus.signUp',
+					source,
+				)} "Try GitLens Pro") — no credit card required.`,
 				confirm,
 				learn,
 			);
@@ -1587,7 +1591,7 @@ export class SubscriptionService implements Disposable {
 
 		this._statusBarSubscription.name = 'GitLens Pro';
 		this._statusBarSubscription.text = '$(gitlens-gitlens)';
-		this._statusBarSubscription.command = GlCommand.ShowAccountView;
+		this._statusBarSubscription.command = 'gitlens.showAccountView' satisfies GlCommands;
 		this._statusBarSubscription.backgroundColor = undefined;
 
 		if (account?.verified === false) {

src/plus/startWork/startWork.ts

@@ -2,6 +2,7 @@ import slug from 'slug';
 import type { QuickInputButton, QuickPick, QuickPickItem } from 'vscode';
 import { Uri } from 'vscode';
 import { md5 } from '@env/crypto';
+import type { ManageCloudIntegrationsCommandArgs } from '../../commands/cloudIntegrations';
 import type {
 	AsyncStepResultGenerator,
 	PartialStepState,
@@ -26,7 +27,6 @@ import {
 } from '../../commands/quickCommand.buttons';
 import { getSteps } from '../../commands/quickWizard.utils';
 import { proBadge } from '../../constants';
-import { GlCommand } from '../../constants.commands';
 import type { IntegrationId } from '../../constants.integrations';
 import { HostingIntegrationId, IssueIntegrationId, SelfHostedIntegrationId } from '../../constants.integrations';
 import type { Source, Sources, StartWorkTelemetryContext, TelemetryEvents } from '../../constants.telemetry';
@@ -514,7 +514,9 @@ export abstract class StartWorkBaseCommand extends QuickCommand<State> {
 			return StepResultBreak;
 		} else if (isManageIntegrationsItem(element)) {
 			this.sendActionTelemetry('manage', context);
-			executeCommand(GlCommand.PlusManageCloudIntegrations, { source: this.overrides?.ownSource ?? 'startWork' });
+			executeCommand<ManageCloudIntegrationsCommandArgs>('gitlens.plus.cloudIntegrations.manage', {
+				source: { source: this.overrides?.ownSource ?? 'startWork' },
+			});
 			endSteps(state);
 			return StepResultBreak;
 		}