Fixes walkthrough links

Author: eamodio

src/commands/walkthroughs.ts

@@ -2,7 +2,7 @@ import type { TelemetrySources, WalkthroughSteps } from '../constants';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
-import { openWalkthrough } from '../system/utils';
+import { openWalkthrough as openWalkthroughCore } from '../system/utils';
 import { Command } from './base';
 
 @command()
@@ -11,8 +11,10 @@ export class GetStartedCommand extends Command {
 		super(Commands.GetStarted);
 	}
 
-	execute() {
-		void openWalkthrough(this.container.context.extension.id, 'welcome', undefined, false);
+	execute(extensionIdOrsource?: TelemetrySources) {
+		// If the extensionIdOrsource is the same as the current extension, then it came from the extension content menu in the extension view, so don't pass the source
+		const source = extensionIdOrsource !== this.container.context.extension.id ? undefined : extensionIdOrsource;
+		openWalkthrough(this.container, source ? { source: source } : undefined);
 	}
 }
 
@@ -29,14 +31,18 @@ export class OpenWalkthroughCommand extends Command {
 	}
 
 	execute(args?: OpenWalkthroughCommandArgs) {
-		if (this.container.telemetry.enabled) {
-			this.container.telemetry.sendEvent('walkthrough', {
-				step: args?.step,
-				source: args?.source ?? 'commandPalette',
-				detail: args?.detail,
-			});
-		}
+		openWalkthrough(this.container, args);
+	}
+}
 
-		void openWalkthrough(this.container.context.extension.id, 'welcome', args?.step, false);
+function openWalkthrough(container: Container, args?: OpenWalkthroughCommandArgs) {
+	if (container.telemetry.enabled) {
+		container.telemetry.sendEvent('walkthrough', {
+			step: args?.step,
+			source: args?.source ?? 'commandPalette',
+			detail: args?.detail,
+		});
 	}
+
+	void openWalkthroughCore(container.context.extension.id, 'welcome', args?.step, false);
 }

src/plus/gk/account/subscriptionService.ts

@@ -1216,7 +1216,7 @@ export class SubscriptionService implements Disposable {
 								{ infix: ' more ' },
 						  )} in your **${effective.name}** trial.`
 						: `You have ${pluralize('day', remaining ?? 0)} remaining in your **${effective.name}** trial.`
-				} Once your trial ends, you'll need a paid plan for full access to [Pro features](command:gitlens.openWalkthrough?{"source": "trial-indicator" }).\n\nYour trial also includes access to our [DevEx platform](${
+				} Once your trial ends, you'll need a paid plan for full access to [Pro features](command:gitlens.openWalkthrough?%7B%22step%22%3A%22pro-trial%22,%22source%22%3A%22prompt%22%7D).\n\nYour trial also includes access to our [DevEx platform](${
 					urls.platform
 				}), unleashing powerful Git visualization & productivity capabilities everywhere you work: IDE, desktop, browser, and terminal.`,
 				true,

src/webviews/apps/home/home.html

@@ -172,7 +172,7 @@ <h1 class="alert__title">Get Started with GitLens</h1>
 					<p>Explore all of the powerful features in GitLens</p>
 					<p class="button-container">
 						<span class="button-group button-group--single">
-							<gl-button appearance="secondary" full data-action="command:gitlens.getStarted"
+							<gl-button appearance="secondary" full data-action="command:gitlens.getStarted?%22home%22"
 								><code-icon icon="info" slot="prefix"></code-icon> Open Walkthrough</gl-button
 							>
 							<gl-tooltip hoist>
@@ -471,7 +471,7 @@ <h2 class="nav-list__title t-eyebrow sticky">Getting Started</h2>
 				<div class="nav-list__item">
 					<a
 						class="nav-list__link"
-						href="command:gitlens.getStarted"
+						href="command:gitlens.getStarted?%22home%22"
 						aria-label="Open GitLens Feature Walkthrough"
 						><code-icon class="nav-list__icon" icon="info"></code-icon
 						><gl-tooltip hoist class="nav-list__label" content="Open GitLens Feature Walkthrough"

src/webviews/apps/welcome/welcome.html

@@ -83,7 +83,7 @@ <h2 class="sticky">Get Started</h2>
 					</p>
 					<p class="button-container">
 						<span class="button-group button-group--single">
-							<gl-button appearance="secondary" full href="command:gitlens.getStarted"
+							<gl-button appearance="secondary" full href="command:gitlens.getStarted?%22welcome%22"
 								><code-icon icon="info" slot="prefix"></code-icon> Get Started Walkthrough</gl-button
 							>
 						</span>
@@ -368,7 +368,7 @@ <h3 class="sticky">
 							<a
 								class="muted"
 								data-org-requires="drafts"
-								href="command:gitlens.getStarted?%22code-collab%22"
+								href="command:gitlens.openWalkthrough?%7B%22step%22%3A%22code-collab%22,%22source%22%3A%22welcome%22%7D"
 								aria-label="Learn more about Code Suggest"
 								><gl-tooltip hoist content="Learn more about Code Suggest"
 									><span>Code Suggest</span></gl-tooltip
@@ -556,7 +556,7 @@ <h2 class="sticky">Get Started</h2>
 						to get started.
 					</p>
 					<p>
-						<gl-button appearance="secondary" full href="command:gitlens.getStarted"
+						<gl-button appearance="secondary" full href="command:gitlens.getStarted?%22welcome%22"
 							><code-icon icon="info" slot="prefix"></code-icon> Get Started Walkthrough</gl-button
 						>
 					</p>
@@ -626,7 +626,7 @@ <h3 class="t-eyebrow sticky">Popular</h3>
 							><gl-tooltip hoist content="Show Inspect view"><span>Inspect</span></gl-tooltip>
 						</a>
 						<a
-							href="command:gitlens.openWalkthrough?%7B%22step%22%3A%22code-collab%22,%22source%22%3A%22home%22%7D"
+							href="command:gitlens.openWalkthrough?%7B%22step%22%3A%22code-collab%22,%22source%22%3A%22welcome%22%7D"
 							data-requires="repo"
 							data-org-requires="drafts"
 							aria-label="Open Code Suggest walkthrough"