Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/telemetry-events.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@

```typescript
{
'feature': string,
'id': string,
'model.id': string,
'model.provider.id': 'anthropic' | 'azure' | 'deepseek' | 'gemini' | 'github' | 'gitkraken' | 'huggingface' | 'mistral' | 'ollama' | 'openai' | 'openaicompatible' | 'openrouter' | 'vscode' | 'xai',
Expand Down
1 change: 1 addition & 0 deletions src/commands/aiFeedback.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ function sendFeedbackEvent(
): void {
const eventData: AIFeedbackEvent = {
type: context.type,
feature: context.feature,
sentiment: sentiment,
'unhelpful.reasons': unhelpful?.reasons?.length ? unhelpful.reasons.join(',') : undefined,
'unhelpful.custom': unhelpful?.custom?.trim() ?? undefined,
Expand Down
1 change: 1 addition & 0 deletions src/constants.telemetry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ export type AIFeedbackUnhelpfulReasons =
export interface AIFeedbackEvent extends AIEventDataBase {
/** The AI feature that feedback was submitted for */
type: AIActionType;
feature: string;
sentiment: 'helpful' | 'unhelpful';
/** Unhelpful reasons selected (if any) - comma-separated list of AIFeedbackUnhelpfulReasons values */
'unhelpful.reasons'?: string;
Expand Down
42 changes: 36 additions & 6 deletions src/plus/ai/aiProviderService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function dedent(template: string): string {
export interface AIResult {
readonly id: string;
readonly type: AIActionType;
readonly feature: string;
readonly content: string;
readonly model: AIModel;
readonly usage?: {
Expand Down Expand Up @@ -647,7 +648,12 @@ export class AIProviderService implements Disposable {
return result === 'cancelled'
? result
: result != null
? { ...result, type: 'explain-changes', parsed: parseSummarizeResult(result.content) }
? {
...result,
type: 'explain-changes',
feature: `explain-${type}`,
parsed: parseSummarizeResult(result.content),
}
: undefined;
}

Expand Down Expand Up @@ -703,7 +709,12 @@ export class AIProviderService implements Disposable {
return result === 'cancelled'
? result
: result != null
? { ...result, type: 'generate-commitMessage', parsed: parseSummarizeResult(result.content) }
? {
...result,
type: 'generate-commitMessage',
feature: 'generate-commitMessage',
parsed: parseSummarizeResult(result.content),
}
: undefined;
}

Expand Down Expand Up @@ -767,7 +778,12 @@ export class AIProviderService implements Disposable {
return result === 'cancelled'
? result
: result != null
? { ...result, type: 'generate-create-pullRequest', parsed: parseSummarizeResult(result.content) }
? {
...result,
type: 'generate-create-pullRequest',
feature: 'generate-create-pullRequest',
parsed: parseSummarizeResult(result.content),
}
: undefined;
}

Expand Down Expand Up @@ -839,6 +855,9 @@ export class AIProviderService implements Disposable {
? {
...result,
type: options?.codeSuggestion ? 'generate-create-codeSuggestion' : 'generate-create-cloudPatch',
feature: options?.codeSuggestion
? 'generate-create-codeSuggestion'
: 'generate-create-cloudPatch',
parsed: parseSummarizeResult(result.content),
}
: undefined;
Expand Down Expand Up @@ -896,7 +915,12 @@ export class AIProviderService implements Disposable {
return result === 'cancelled'
? result
: result != null
? { ...result, type: 'generate-stashMessage', parsed: parseSummarizeResult(result.content) }
? {
...result,
type: 'generate-stashMessage',
feature: 'generate-stashMessage',
parsed: parseSummarizeResult(result.content),
}
: undefined;
}

Expand Down Expand Up @@ -943,7 +967,11 @@ export class AIProviderService implements Disposable {
}),
options,
);
return result === 'cancelled' ? result : result != null ? { ...result, type: 'generate-changelog' } : undefined;
return result === 'cancelled'
? result
: result != null
? { ...result, type: 'generate-changelog', feature: 'generate-changelog' }
: undefined;
}

async generateSearchQuery(
Expand Down Expand Up @@ -990,7 +1018,7 @@ export class AIProviderService implements Disposable {
return result === 'cancelled'
? result
: result != null
? { ...result, type: 'generate-searchQuery' }
? { ...result, type: 'generate-searchQuery', feature: 'generate-searchQuery' }
: undefined;
}

Expand Down Expand Up @@ -1064,6 +1092,8 @@ export class AIProviderService implements Disposable {
return {
...rq,
...result,
type: 'generate-rebase',
feature: options?.generateCommits ? 'generate-commits' : 'generate-rebase',
};
}

Expand Down
1 change: 1 addition & 0 deletions src/plus/ai/utils/-webview/ai.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ export function getAIResultContext(result: AIResult): AIResultContext {
return {
id: result.id,
type: result.type,
feature: result.feature,
model: result.model,
usage:
result.usage != null
Expand Down