refactor: adopt Harald's type-safe metrics API (EditSource/EditOutcome, 2 survival histograms)

Author: zhichli

src/extension/conversation/vscode-node/userActions.ts

@@ -10,6 +10,7 @@ import { EditSurvivalResult } from '../../../platform/editSurvivalTracking/commo
 import { ILanguageDiagnosticsService } from '../../../platform/languages/common/languageDiagnosticsService';
 import { IMultiFileEditInternalTelemetryService } from '../../../platform/multiFileEdit/common/multiFileEditQualityTelemetry';
 import { INotebookService } from '../../../platform/notebook/common/notebookService';
+import type { EditOutcome } from '../../../platform/otel/common/genAiAttributes';
 import { emitEditFeedbackEvent, emitEditHunkActionEvent, emitEditSurvivalEvent, emitInlineDoneEvent, emitUserFeedbackEvent } from '../../../platform/otel/common/genAiEvents';
 import { GenAiMetrics } from '../../../platform/otel/common/genAiMetrics';
 import { IOTelService } from '../../../platform/otel/common/otelService';
@@ -567,7 +568,7 @@ function reportInlineEditSurvivalEvent(res: EditSurvivalResult, sharedProps: Tel
 	GenAiMetrics.recordEditSurvivalNoRevert(otelService, 'inline_chat', res.noRevert, res.timeDelayMs);
 }
 
-const outcomes = new Map([
+const outcomes = new Map<vscode.ChatEditingSessionActionOutcome, EditOutcome>([
 	[vscode.ChatEditingSessionActionOutcome.Accepted, 'accepted'],
 	[vscode.ChatEditingSessionActionOutcome.Rejected, 'rejected'],
 	[vscode.ChatEditingSessionActionOutcome.Saved, 'saved']

src/extension/prompts/node/codeMapper/codeMapperService.ts

@@ -347,5 +347,6 @@ function reportEditSurvivalEvent(res: EditSurvivalResult, { requestId, speculati
 	});
 
 	emitEditSurvivalEvent(otelService, 'code_mapper', res.fourGram, res.noRevert, res.timeDelayMs, res.didBranchChange, requestId ?? '');
-	GenAiMetrics.recordEditSurvivalRate(otelService, 'code_mapper', res.fourGram, res.timeDelayMs);
+	GenAiMetrics.recordEditSurvivalFourGram(otelService, 'code_mapper', res.fourGram, res.timeDelayMs);
+	GenAiMetrics.recordEditSurvivalNoRevert(otelService, 'code_mapper', res.noRevert, res.timeDelayMs);
 }

src/extension/tools/node/abstractReplaceStringTool.tsx

@@ -361,7 +361,8 @@ export abstract class AbstractReplaceStringTool<T extends { explanation: string
 						});
 
 						emitEditSurvivalEvent(this._otelService, 'replace_string', res.fourGram, res.noRevert, res.timeDelayMs, res.didBranchChange, this._promptContext?.requestId ?? '');
-						GenAiMetrics.recordEditSurvivalRate(this._otelService, 'replace_string', res.fourGram, res.timeDelayMs);
+						GenAiMetrics.recordEditSurvivalFourGram(this._otelService, 'replace_string', res.fourGram, res.timeDelayMs);
+						GenAiMetrics.recordEditSurvivalNoRevert(this._otelService, 'replace_string', res.noRevert, res.timeDelayMs);
 					});
 				});
 

src/extension/tools/node/applyPatchTool.tsx

@@ -472,7 +472,8 @@ export class ApplyPatchTool implements ICopilotTool<IApplyPatchToolParams> {
 						});
 
 						emitEditSurvivalEvent(this._otelService, 'apply_patch', res.fourGram, res.noRevert, res.timeDelayMs, res.didBranchChange, this._promptContext?.requestId ?? '');
-						GenAiMetrics.recordEditSurvivalRate(this._otelService, 'apply_patch', res.fourGram, res.timeDelayMs);
+						GenAiMetrics.recordEditSurvivalFourGram(this._otelService, 'apply_patch', res.fourGram, res.timeDelayMs);
+						GenAiMetrics.recordEditSurvivalNoRevert(this._otelService, 'apply_patch', res.noRevert, res.timeDelayMs);
 					});
 				}
 			});

src/platform/otel/common/genAiAttributes.ts

@@ -129,7 +129,7 @@ export const CopilotChatAttr = {
 	DEBUG_LOG_LABEL: 'copilot_chat.debug_log_label',
 	/** Markdown content for standalone content events */
 	MARKDOWN_CONTENT: 'copilot_chat.markdown_content',
-	/** Edit source: inline_chat, chat_editing, chat_editing_hunk */
+	/** Edit source: inline_chat, chat_editing, chat_editing_hunk, apply_patch, replace_string, code_mapper */
 	EDIT_SOURCE: 'copilot_chat.edit.source',
 	/** Edit outcome: accepted, rejected, saved, unknown */
 	EDIT_OUTCOME: 'copilot_chat.edit.outcome',
@@ -141,7 +141,7 @@ export const CopilotChatAttr = {
 	HAS_REMAINING_EDITS: 'copilot_chat.has_remaining_edits',
 } as const;
 
-export type EditSource = 'inline_chat' | 'chat_editing' | 'chat_editing_hunk';
+export type EditSource = 'inline_chat' | 'chat_editing' | 'chat_editing_hunk' | 'apply_patch' | 'replace_string' | 'code_mapper';
 export type EditOutcome = 'accepted' | 'rejected' | 'saved' | 'unknown';
 
 /**