combine ai-feedback and ai-feedback-service

Author: sergeibbb

src/commands/aiFeedback.ts

@@ -1,19 +1,85 @@
 import type { TextEditor, Uri } from 'vscode';
 import { window } from 'vscode';
 import { Schemes } from '../constants';
+import type { AIFeedbackEvent, Source } from '../constants.telemetry';
 import type { Container } from '../container';
 import type { MarkdownContentMetadata } from '../documents/markdown';
 import { decodeGitLensRevisionUriAuthority } from '../git/gitUri.authority';
-import type { AIFeedbackContext } from '../plus/ai/aiFeedbackService';
 import { command } from '../system/-webview/command';
 import { Logger } from '../system/logger';
 import { ActiveEditorCommand } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 
+export interface AIFeedbackContext {
+	feature: AIFeedbackEvent['feature'];
+	model: {
+		id: string;
+		providerId: string;
+		providerName: string;
+	};
+	usage?: {
+		promptTokens?: number;
+		completionTokens?: number;
+		totalTokens?: number;
+		limits?: {
+			used: number;
+			limit: number;
+			resetsOn: Date;
+		};
+	};
+	aiRequestId: string | undefined;
+	outputLength: number;
+}
+
 export interface AIFeedbackCommandArgs {
 	context: AIFeedbackContext;
 }
 
+function sendFeedbackEvent(
+	container: Container,
+	context: AIFeedbackContext,
+	rating: 'positive' | 'negative',
+	feedback: {
+		presetReasons?: string[];
+		writeInFeedback?: string;
+	},
+	source: Source,
+): void {
+	const hasPresetReasons = feedback.presetReasons && feedback.presetReasons.length > 0;
+	const writeInFeedback = feedback.writeInFeedback?.trim() ?? undefined;
+
+	let feedbackType: 'preset' | 'writeIn' | 'both';
+	if (hasPresetReasons && writeInFeedback?.length) {
+		feedbackType = 'both';
+	} else if (hasPresetReasons) {
+		feedbackType = 'preset';
+	} else {
+		feedbackType = 'writeIn';
+	}
+
+	const eventData: AIFeedbackEvent = {
+		feature: context.feature,
+		rating: rating,
+		feedbackType: feedbackType,
+		presetReason: hasPresetReasons ? feedback.presetReasons!.join(', ') : undefined,
+		'writeInFeedback.length': writeInFeedback?.length ?? undefined,
+		'writeInFeedback.text': writeInFeedback?.length ? writeInFeedback : undefined,
+		'model.id': context.model.id,
+		'model.provider.id': context.model.providerId as any,
+		'model.provider.name': context.model.providerName,
+		'usage.promptTokens': context.usage?.promptTokens,
+		'usage.completionTokens': context.usage?.completionTokens,
+		'usage.totalTokens': context.usage?.totalTokens,
+		'usage.limits.used': context.usage?.limits?.used,
+		'usage.limits.limit': context.usage?.limits?.limit,
+		'usage.limits.resetsOn': context.usage?.limits?.resetsOn?.toISOString(),
+		'ai.request.id': context.aiRequestId,
+		'output.length': context.outputLength,
+	};
+
+	container.telemetry.sendEvent('ai/feedback', eventData, source);
+}
+
 @command()
 export class AIFeedbackPositiveCommand extends ActiveEditorCommand {
 	constructor(private readonly container: Container) {
@@ -30,7 +96,8 @@ export class AIFeedbackPositiveCommand extends ActiveEditorCommand {
 
 		try {
 			// For positive feedback, just send the event immediately without showing any form
-			this.container.aiFeedback.sendFeedbackEvent(
+			sendFeedbackEvent(
+				this.container,
 				context,
 				'positive',
 				{
@@ -142,7 +209,8 @@ async function showDetailedFeedbackForm(container: Container, context: AIFeedbac
 	});
 
 	// Always send feedback submission telemetry for negative feedback
-	container.aiFeedback.sendFeedbackEvent(
+	sendFeedbackEvent(
+		container,
 		context,
 		'negative',
 		{

src/commands/explainBase.ts

@@ -5,10 +5,10 @@ import type { MarkdownContentMetadata } from '../documents/markdown';
 import { getMarkdownHeaderContent } from '../documents/markdown';
 import type { GitRepositoryService } from '../git/gitRepositoryService';
 import { GitUri } from '../git/gitUri';
-import type { AIFeedbackContext } from '../plus/ai/aiFeedbackService';
 import type { AIExplainSource, AISummarizeResult } from '../plus/ai/aiProviderService';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { showMarkdownPreview } from '../system/-webview/markdown';
+import type { AIFeedbackContext } from './aiFeedback';
 import { GlCommandBase } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 

src/commands/generateRebase.ts

@@ -10,14 +10,14 @@ import type { GitReference, GitStashReference } from '../git/models/reference';
 import { uncommitted } from '../git/models/revision';
 import { createReference } from '../git/utils/reference.utils';
 import { showGenericErrorMessage } from '../messages';
-import type { AIFeedbackContext } from '../plus/ai/aiFeedbackService';
 import type { AIRebaseResult } from '../plus/ai/aiProviderService';
 import { showComparisonPicker } from '../quickpicks/comparisonPicker';
 import { getRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command, executeCommand } from '../system/-webview/command';
 import { showMarkdownPreview } from '../system/-webview/markdown';
 import { Logger } from '../system/logger';
 import { escapeMarkdownCodeBlocks } from '../system/markdown';
+import type { AIFeedbackContext } from './aiFeedback';
 import { GlCommandBase } from './commandBase';
 import type { CommandContext } from './commandContext';
 import {

src/container.ts

@@ -25,7 +25,6 @@ import { GitFileSystemProvider } from './git/fsProvider';
 import { GitProviderService } from './git/gitProviderService';
 import type { RepositoryLocationProvider } from './git/location/repositorylocationProvider';
 import { LineHoverController } from './hovers/lineHoverController';
-import { AIFeedbackService } from './plus/ai/aiFeedbackService';
 import { AIProviderService } from './plus/ai/aiProviderService';
 import { DraftService } from './plus/drafts/draftsService';
 import { AccountAuthenticationProvider } from './plus/gk/authenticationProvider';
@@ -368,14 +367,6 @@ export class Container {
 		return this._ai;
 	}
 
-	private _aiFeedback: AIFeedbackService | undefined;
-	get aiFeedback(): AIFeedbackService {
-		if (this._aiFeedback == null) {
-			this._disposables.push((this._aiFeedback = new AIFeedbackService(this)));
-		}
-		return this._aiFeedback;
-	}
-
 	private _autolinks: AutolinksProvider | undefined;
 	get autolinks(): AutolinksProvider {
 		if (this._autolinks == null) {