Move feedback invitation to the top of the page

Author: sergeibbb

src/commands/explainBase.ts

@@ -56,7 +56,8 @@ export abstract class ExplainCommandBase extends GlCommandBase {
 	}
 
 	protected openDocument(result: AISummarizeResult, path: string, metadata: MarkdownContentMetadata): void {
-		const content = `${getMarkdownHeaderContent(metadata)}\n\n${result.parsed.summary}\n\n${result.parsed.body}`;
+		const headerContent = getMarkdownHeaderContent(metadata, this.container.telemetry.enabled);
+		const content = `${headerContent}\n\n${result.parsed.summary}\n\n${result.parsed.body}`;
 
 		const documentUri = this.container.markdown.openDocument(content, path, metadata.header.title, metadata);
 

src/commands/generateRebase.ts

@@ -361,14 +361,10 @@ export async function generateRebase(
 			usage: result.usage,
 			outputLength: result.content?.length,
 		};
+		const telemetryEnabled = container.telemetry.enabled;
 
 		// Generate the markdown content that shows each commit and its diffs
-		const { content, metadata } = generateRebaseMarkdown(
-			result,
-			title,
-			feedbackContext,
-			container.telemetry.enabled,
-		);
+		const { content, metadata } = generateRebaseMarkdown(result, title, telemetryEnabled, feedbackContext);
 
 		let generateType: 'commits' | 'rebase' = 'rebase';
 		let headRefSlug = head.ref;
@@ -540,8 +536,8 @@ export function extractRebaseDiffInfo(
 function generateRebaseMarkdown(
 	result: AIRebaseResult,
 	title = 'Rebase Commits',
+	telemetryEnabled: boolean,
 	feedbackContext?: AIFeedbackContext,
-	telemetryEnabled?: boolean,
 ): { content: string; metadata: MarkdownContentMetadata } {
 	const metadata: MarkdownContentMetadata = {
 		header: {
@@ -560,7 +556,10 @@ function generateRebaseMarkdown(
 	if (result.commits.length === 0) {
 		markdown = 'No Commits Generated';
 
-		return { content: `${getMarkdownHeaderContent(metadata)}\n\n${markdown}`, metadata: metadata };
+		return {
+			content: `${getMarkdownHeaderContent(metadata, telemetryEnabled)}\n\n${markdown}`,
+			metadata: metadata,
+		};
 	}
 	const { commits, diff: originalDiff, hunkMap } = result;
 
@@ -624,17 +623,10 @@ function generateRebaseMarkdown(
 	markdown += explanations;
 	markdown += changes;
 
-	// Add feedback note if context is provided and telemetry is enabled
-	if (feedbackContext && telemetryEnabled) {
-		markdown += '\n\n---\n\n## Feedback\n\n';
-		markdown += 'Use the 👍 and 👎 buttons in the editor toolbar to provide feedback on this AI response.\n\n';
-		markdown += '*Your feedback helps us improve our AI features.*';
-	}
-
 	// markdown += `\n\n----\n\n## Raw commits\n\n\`\`\`${escapeMarkdownCodeBlocks(JSON.stringify(commits))}\`\`\``;
 	// markdown += `\n\n----\n\n## Original Diff\n\n\`\`\`${escapeMarkdownCodeBlocks(originalDiff)}\`\`\`\n`;
 
-	return { content: `${getMarkdownHeaderContent(metadata)}\n\n${markdown}`, metadata: metadata };
+	return { content: `${getMarkdownHeaderContent(metadata, telemetryEnabled)}\n\n${markdown}`, metadata: metadata };
 }
 
 /**

src/container.ts

@@ -222,7 +222,7 @@ export class Container {
 		this._disposables.push((this._vsls = new VslsController(this)));
 		this._disposables.push((this._eventBus = new EventBus()));
 		this._disposables.push((this._launchpadProvider = new LaunchpadProvider(this)));
-		this._disposables.push((this._markdownProvider = new MarkdownContentProvider()));
+		this._disposables.push((this._markdownProvider = new MarkdownContentProvider(this)));
 
 		this._disposables.push((this._fileAnnotationController = new FileAnnotationController(this)));
 		this._disposables.push((this._lineAnnotationController = new LineAnnotationController(this)));

src/documents/markdown.ts

@@ -2,6 +2,7 @@ import type { Disposable, Event, TextDocumentContentProvider } from 'vscode';
 import { EventEmitter, Uri, workspace } from 'vscode';
 import { Schemes } from '../constants';
 import type { GlCommands } from '../constants.commands';
+import type { Container } from '../container';
 import { decodeGitLensRevisionUriAuthority, encodeGitLensRevisionUriAuthority } from '../git/gitUri.authority';
 
 // gitlens-markdown:{explain}/{entity}/{entityID}/{model}[{/friendlyName}].md
@@ -29,7 +30,7 @@ export class MarkdownContentProvider implements TextDocumentContentProvider {
 		return this._onDidChange.event;
 	}
 
-	constructor() {
+	constructor(private container: Container) {
 		this.registration = workspace.registerTextDocumentContentProvider(Schemes.GitLensMarkdown, this);
 
 		workspace.onDidCloseTextDocument(document => {
@@ -43,7 +44,7 @@ export class MarkdownContentProvider implements TextDocumentContentProvider {
 		let contents = this.contents.get(uri.toString());
 		if (contents != null) return contents;
 
-		contents = getContentFromMarkdownUri(uri);
+		contents = getContentFromMarkdownUri(uri, this.container.telemetry.enabled);
 		if (contents != null) return contents;
 
 		return `# ${uri.path}\n\nNo content available.`;
@@ -87,7 +88,7 @@ export class MarkdownContentProvider implements TextDocumentContentProvider {
 	}
 }
 
-function getContentFromMarkdownUri(uri: Uri): string | undefined {
+function getContentFromMarkdownUri(uri: Uri, telemetryEnabled: boolean): string | undefined {
 	if (!uri.path.startsWith('/explain')) return undefined;
 
 	const authority = uri.authority;
@@ -97,7 +98,7 @@ function getContentFromMarkdownUri(uri: Uri): string | undefined {
 
 	if (metadata.header == null) return undefined;
 
-	const headerContent = getMarkdownHeaderContent(metadata);
+	const headerContent = getMarkdownHeaderContent(metadata, telemetryEnabled);
 
 	if (metadata.command == null) return `${headerContent}\n\nNo content available.`;
 
@@ -106,11 +107,19 @@ function getContentFromMarkdownUri(uri: Uri): string | undefined {
 	return `${headerContent}\n\n${commandContent}`;
 }
 
-export function getMarkdownHeaderContent(metadata: MarkdownContentMetadata): string {
+export function getMarkdownHeaderContent(metadata: MarkdownContentMetadata, telemetryEnabled: boolean): string {
 	let headerContent = `# ${metadata.header.title}`;
 	if (metadata.header.aiModel != null) {
 		headerContent += `\n\n> Generated by ${metadata.header.aiModel}`;
 	}
+
+	// Add feedback note if context is provided and telemetry is enabled
+	if (metadata.feedbackContext != null && telemetryEnabled) {
+		headerContent += '\n\n';
+		headerContent += 'Use the 👍 and 👎 buttons in the editor toolbar to provide feedback on this AI response. ';
+		headerContent += '*Your feedback helps us improve our AI features.*';
+	}
+
 	if (metadata.header.subtitle != null) {
 		headerContent += `\n\n## ${metadata.header.subtitle}`;
 	}