@codingame/monaco-vscode-telemetry-service-override 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.js

@@ -1,7 +1,7 @@
 
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { EditTelemetryContribution } from './editTelemetryContribution.js';
-import { AI_STATS_SETTING_ID, EDIT_TELEMETRY_SETTING_ID } from './settingIds.js';
+import { AI_STATS_SETTING_ID } from './settingIds.js';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { EDIT_TELEMETRY_SHOW_DECORATIONS, EDIT_TELEMETRY_SHOW_STATUS_BAR, EDIT_TELEMETRY_DETAILS_SETTING_ID } from './settings.js';
@@ -10,6 +10,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ext
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/telemetry/aiEditTelemetry/aiEditTelemetryServiceImpl';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { AgentHostEditTelemetryEnabledConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostSchema';
+import { EDIT_TELEMETRY_SETTING_ID } from '../../../../platform/telemetry/common/editArcTelemetry.js';
 
 registerWorkbenchContribution2(
     "EditTelemetryContribution",
@@ -20,12 +22,12 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: "task",
     order: 100,
-    title: ( localize(10225, "Edit Telemetry")),
+    title: ( localize(12161, "Edit Telemetry")),
     type: "object",
     properties: {
         [EDIT_TELEMETRY_SETTING_ID]: {
             markdownDescription: ( localize(
-                10226,
+                12162,
                 "Controls whether to enable telemetry for edit statistics (only sends statistics if general telemetry is enabled)."
             )),
             type: "boolean",
@@ -33,11 +35,14 @@ configurationRegistry.registerConfiguration({
             tags: ["experimental"],
             experiment: {
                 mode: "auto"
+            },
+            agentHost: {
+                key: AgentHostEditTelemetryEnabledConfigKey
             }
         },
         [AI_STATS_SETTING_ID]: {
             markdownDescription: ( localize(
-                10227,
+                12163,
                 "Controls whether to enable AI statistics in the editor. The gauge shows the average AI rate across 5-minute sessions, where each session's rate is calculated as AI-inserted characters divided by total inserted characters."
             )),
             type: "boolean",
@@ -49,7 +54,7 @@ configurationRegistry.registerConfiguration({
         },
         [EDIT_TELEMETRY_DETAILS_SETTING_ID]: {
             markdownDescription: ( localize(
-                10228,
+                12164,
                 "Controls whether to enable telemetry for detailed edit statistics (only sends statistics if general telemetry is enabled)."
             )),
             type: "boolean",
@@ -60,13 +65,13 @@ configurationRegistry.registerConfiguration({
             }
         },
         [EDIT_TELEMETRY_SHOW_STATUS_BAR]: {
-            markdownDescription: ( localize(10229, "Controls whether to show the status bar for edit telemetry.")),
+            markdownDescription: ( localize(12165, "Controls whether to show the status bar for edit telemetry.")),
             type: "boolean",
             default: false,
             tags: ["experimental"]
         },
         [EDIT_TELEMETRY_SHOW_DECORATIONS]: {
-            markdownDescription: ( localize(10230, "Controls whether to show decorations for edit telemetry.")),
+            markdownDescription: ( localize(12166, "Controls whether to show decorations for edit telemetry.")),
             type: "boolean",
             default: false,
             tags: ["experimental"]

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/editTelemetryContribution.js

@@ -12,10 +12,11 @@ import { AnnotatedDocuments } from './helpers/annotatedDocuments.js';
 import { EditTrackingFeature } from './telemetry/editSourceTrackingFeature.js';
 import { VSCodeWorkspace } from './helpers/vscodeObservableWorkspace.js';
 import { AiStatsFeature } from './editStats/aiStatsFeature.js';
-import { EDIT_TELEMETRY_SETTING_ID, AI_STATS_SETTING_ID } from './settingIds.js';
+import { AI_STATS_SETTING_ID } from './settingIds.js';
 import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { AiContributionFeature } from './aiContributionFeature.js';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { EDIT_TELEMETRY_SETTING_ID } from '../../../../platform/telemetry/common/editArcTelemetry.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let EditTelemetryContribution = class EditTelemetryContribution extends Disposable {

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/helpers/documentWithAnnotatedEdits.d.ts

@@ -47,7 +47,7 @@ export declare abstract class EditSourceBase {
     static create(reason: TextModelEditSource): EditSource;
     abstract getColor(): string;
 }
-export type EditSource = InlineSuggestEditSource | ChatEditSource | IdeEditSource | UserEditSource | UnknownEditSource | ExternalEditSource;
+export type EditSource = InlineSuggestEditSource | ChatEditSource | AgentHostEditSource | IdeEditSource | UserEditSource | UnknownEditSource | ExternalEditSource;
 export declare class InlineSuggestEditSource extends EditSourceBase {
     readonly kind: "completion" | "nes";
     readonly extensionId: string;
@@ -67,6 +67,12 @@ declare class ChatEditSource extends EditSourceBase {
     toString(): string;
     getColor(): string;
 }
+declare class AgentHostEditSource extends EditSourceBase {
+    readonly category = "agentHost";
+    readonly feature = "chat";
+    toString(): string;
+    getColor(): string;
+}
 declare class IdeEditSource extends EditSourceBase {
     readonly feature: "suggest" | "format" | string;
     readonly category = "ide";

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/helpers/documentWithAnnotatedEdits.js

@@ -94,7 +94,7 @@ class EditSourceBase {
             }
             return this._cache.get(( new UnknownEditSource()));
         case "Chat.applyEdits":
-            return this._cache.get(( new ChatEditSource("sidebar")));
+            return "$origin" in data && data.$origin === "agentHost" ? this._cache.get(( new AgentHostEditSource())) : this._cache.get(( new ChatEditSource("sidebar")));
         case "inlineChat.applyEdits":
             return this._cache.get(( new ChatEditSource("inline")));
         case "cursor":
@@ -115,7 +115,7 @@ class InlineSuggestEditSource extends EditSourceBase {
         this.feature = "inlineSuggest";
     }
     toString() {
-        return `${this.category}/${this.feature}/${this.kind}/${this.extensionId}/${this.type}`;
+        return `${this.category}/${this.feature}/${this.kind}/${this.extensionId}/${this.providerId}/${this.type}`;
     }
     getColor() {
         return "#00ff0033";
@@ -135,6 +135,19 @@ class ChatEditSource extends EditSourceBase {
         return "#00ff0066";
     }
 }
+class AgentHostEditSource extends EditSourceBase {
+    constructor() {
+        super(...arguments);
+        this.category = "agentHost";
+        this.feature = "chat";
+    }
+    toString() {
+        return `${this.category}/${this.feature}`;
+    }
+    getColor() {
+        return "#00ff0066";
+    }
+}
 class IdeEditSource extends EditSourceBase {
     constructor(feature) {
         super();

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/settingIds.d.ts

@@ -1,2 +1,2 @@
-export declare const EDIT_TELEMETRY_SETTING_ID = "telemetry.editStats.enabled";
+export { EDIT_TELEMETRY_SETTING_ID } from "../../../../platform/telemetry/common/editArcTelemetry.js";
 export declare const AI_STATS_SETTING_ID = "editor.aiStats.enabled";

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/settingIds.js

@@ -1,6 +1,5 @@
 
 
-const EDIT_TELEMETRY_SETTING_ID = 'telemetry.editStats.enabled';
 const AI_STATS_SETTING_ID = 'editor.aiStats.enabled';
 
-export { AI_STATS_SETTING_ID, EDIT_TELEMETRY_SETTING_ID };
+export { AI_STATS_SETTING_ID };

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/telemetry/agentHostEditMarkerService.d.ts

@@ -0,0 +1,83 @@
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IAgentHostConnectionsService } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/agentHostConnectionsService.service";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { EditTelemetryTrigger } from "../../../../../platform/telemetry/common/editTelemetry.js";
+import { TextModelEditSource } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/textModelEditSource";
+export interface IAgentHostEditAttributionCoverageGap {
+    readonly editCount: number;
+    readonly insertedCount: number;
+}
+export interface IPreparedAgentHostEditAttributionFlush {
+    readonly flushToken: string;
+    readonly agentModifiedCount: number;
+    readonly lastSequence?: number;
+    readonly coverageGapThroughSequence?: number;
+    readonly deferCoverageGap?: boolean;
+    commit(totalModifiedCount: number): Promise<void>;
+}
+export declare class AgentHostEditAttributionUnknownOutcomeError extends Error {
+    constructor(cause: unknown);
+}
+export declare class AgentHostEditAttributionDeferredError extends Error {
+    constructor(cause: unknown);
+}
+export interface IAgentHostEditMarkerService {
+    createCorrelation(resource: URI): IExternalEditCorrelation;
+    takeCoverageGap?(resource: URI, throughSequence?: number): IAgentHostEditAttributionCoverageGap | undefined;
+    prepareFlush(resource: URI, trigger: EditTelemetryTrigger, statsUuid: string, isDirty: boolean, languageId?: string): Promise<IPreparedAgentHostEditAttributionFlush | undefined>;
+}
+export interface IExternalEditCorrelation {
+    readonly onDidSuppress: Event<string>;
+    readonly onDidResolve?: Event<IExternalEditCorrelationResolution>;
+    readonly onDidInvalidate: Event<string>;
+    register(before: string, after: string): string;
+    isSuppressed(id: string): boolean;
+    getResolution?(id: string): IExternalEditCorrelationResolution | undefined;
+    waitForResolution?(ids: readonly string[], timeoutMs: number): Promise<void>;
+    release(id: string): void;
+}
+export interface IExternalEditCorrelationResolution {
+    readonly id: string;
+    readonly source?: TextModelEditSource;
+}
+export declare class AgentHostEditMarkerService extends Disposable implements IAgentHostEditMarkerService {
+    private readonly _connectionsService;
+    private readonly _uriIdentityService;
+    private readonly _markers;
+    private readonly _observations;
+    private readonly _routes;
+    private readonly _coverageGaps;
+    private readonly _acknowledgedCoverageGapIds;
+    private readonly _pendingCoverageGapAcknowledgements;
+    private readonly _onDidSuppress;
+    private readonly _onDidResolve;
+    private readonly _onDidInvalidate;
+    private readonly _onDidReceiveMarker;
+    private readonly _connectionListeners;
+    constructor(_connectionsService: IAgentHostConnectionsService, _uriIdentityService: IUriIdentityService);
+    createCorrelation(resource: URI): IExternalEditCorrelation;
+    takeCoverageGap(resource: URI, throughSequence?: number): IAgentHostEditAttributionCoverageGap | undefined;
+    prepareFlush(resource: URI, trigger: EditTelemetryTrigger, statsUuid: string, isDirty: boolean, languageId?: string): Promise<IPreparedAgentHostEditAttributionFlush | undefined>;
+    private _recoverFailedPrepare;
+    private _waitForMarker;
+    private _resourceRead;
+    private _readOutcome;
+    private _updateConnectionListeners;
+    private _recordCoverageGap;
+    private _acknowledgeCoverageGaps;
+    private _recordCoverageGapAcknowledgement;
+    private _queuePendingCoverageGapAcknowledgements;
+    private _applyPendingCoverageGapAcknowledgements;
+    private _registerObservation;
+    private _recordMarker;
+    private _tryResolve;
+    private _retainObservation;
+    private _releaseObservation;
+    private _invalidateObservations;
+    private _prune;
+    private _key;
+    private _getObservation;
+    private _waitForResolution;
+}