@codingame/monaco-vscode-chat-service-override 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptsDebugContribution.js

@@ -1,9 +1,19 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationTokenSource, CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IChatDebugService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatDebugService.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { formatHookCommandLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { HookType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
+import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
+import { lastInstructionsCollectionResult } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions';
 
 var PromptsDebugContribution_1;
 let PromptsDebugContribution = class PromptsDebugContribution extends Disposable {
@@ -16,67 +26,247 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
     static {
         this.MAX_DISCOVERY_DETAILS = 10_000;
     }
-    constructor(promptsService, chatDebugService) {
+    constructor(
+        promptsService,
+        chatAgentService,
+        chatService,
+        chatDebugService,
+        logService
+    ) {
         super();
+        this.promptsService = promptsService;
         this._discoveryEventDetails = ( new Map());
-        this._register(promptsService.onDidLogDiscovery(entry => {
-            let eventId;
-            if (entry.discoveryInfo) {
-                eventId = generateUuid();
-                this._discoveryEventDetails.set(eventId, entry.discoveryInfo);
-                if (this._discoveryEventDetails.size > PromptsDebugContribution_1.MAX_DISCOVERY_DETAILS) {
-                    const first = ( this._discoveryEventDetails.keys()).next().value;
-                    if (first !== undefined) {
-                        this._discoveryEventDetails.delete(first);
+        this._customizationEventDetails = ( new Map());
+        this._loggedSessions = ( new Set());
+        this._register(chatService.onDidDisposeSession(e => {
+            for (const sessionResource of e.sessionResources) {
+                this._loggedSessions.delete(( sessionResource.toString()));
+            }
+        }));
+        this._register(chatAgentService.onWillInvokeAgent(async e => {
+            const sessionKey = ( e.request.sessionResource.toString());
+            const isFirstInvocation = !( this._loggedSessions.has(sessionKey));
+            this._loggedSessions.add(sessionKey);
+            const sessionResource = e.request.sessionResource;
+            if (isFirstInvocation) {
+                const cts = ( new CancellationTokenSource());
+                try {
+                    const discoveryInfos = await Promise.all(( [
+                        PromptsType.agent,
+                        PromptsType.instructions,
+                        PromptsType.prompt,
+                        PromptsType.skill,
+                        PromptsType.hook
+                    ].map(type => this.promptsService.getDiscoveryInfo(type, cts.token))));
+                    for (const discoveryInfo of discoveryInfos) {
+                        const {
+                            name,
+                            details
+                        } = this.getDiscoveryLogEntry(discoveryInfo);
+                        const eventId = generateUuid();
+                        this._discoveryEventDetails.set(eventId, discoveryInfo);
+                        if (this._discoveryEventDetails.size > PromptsDebugContribution_1.MAX_DISCOVERY_DETAILS) {
+                            const first = ( this._discoveryEventDetails.keys()).next().value;
+                            if (first !== undefined) {
+                                this._discoveryEventDetails.delete(first);
+                            }
+                        }
+                        const loaded = ( discoveryInfo.files.filter(f => f.status === "loaded").map(
+                            f => f.promptPath.name ?? f.promptPath.uri.path.split("/").pop() ?? ( f.promptPath.uri.toString())
+                        ));
+                        const skipped = ( discoveryInfo.files.filter(f => f.status === "skipped").map(f => {
+                            const label = ( f.promptPath.uri.toString());
+                            return f.skipReason ? `${label} (${f.skipReason})` : label;
+                        }));
+                        const folders = discoveryInfo.sourceFolders?.map(sf => sf.uri.path) ?? [];
+                        const parts = [];
+                        if (details) {
+                            parts.push(details);
+                        }
+                        if (loaded.length > 0) {
+                            parts.push(`loaded: [${truncateList(loaded)}]`);
+                        }
+                        if (skipped.length > 0) {
+                            parts.push(`skipped: [${truncateList(skipped)}]`);
+                        }
+                        if (folders.length > 0) {
+                            parts.push(`folders: [${truncateList(folders)}]`);
+                        }
+                        const newDetails = parts.join(" | ") || undefined;
+                        chatDebugService.log(sessionResource, name, newDetails, undefined, {
+                            id: eventId,
+                            category: "discovery"
+                        });
                     }
+                } catch (error) {
+                    logService.error("Error while logging prompt discovery info to chat debug service", error);
+                } finally {
+                    cts.dispose();
                 }
             }
-            let details = entry.details;
-            if (entry.discoveryInfo) {
-                const info = entry.discoveryInfo;
-                const loaded = ( info.files.filter(f => f.status === "loaded").map(
-                    f => f.promptPath.name ?? f.promptPath.uri.path.split("/").pop() ?? ( f.promptPath.uri.toString())
-                ));
-                const skipped = ( info.files.filter(f => f.status === "skipped").map(f => {
-                    const label = ( f.promptPath.uri.toString());
-                    return f.skipReason ? `${label} (${f.skipReason})` : label;
-                }));
-                const folders = info.sourceFolders?.map(sf => sf.uri.path) ?? [];
+            const lastResult = lastInstructionsCollectionResult;
+            if (!isFirstInvocation && lastResult) {
+                const {
+                    telemetryEvent: collectionEvent,
+                    debugInfo
+                } = lastResult;
+                let resolvedHooks;
+                try {
+                    const hookDiscoveryInfo = await this.promptsService.getDiscoveryInfo(PromptsType.hook, CancellationToken.None);
+                    resolvedHooks = hookDiscoveryInfo.hooksInfo?.hooks;
+                } catch (error) {
+                    logService.warn("Error while fetching hooks for customization debug event", error);
+                }
                 const parts = [];
-                if (details) {
-                    parts.push(details);
+                if (collectionEvent.applyingInstructionsCount > 0) {
+                    parts.push(( localize(6675, "{0} applying", collectionEvent.applyingInstructionsCount)));
+                }
+                if (collectionEvent.referencedInstructionsCount > 0) {
+                    parts.push(( localize(6676, "{0} referenced", collectionEvent.referencedInstructionsCount)));
                 }
-                if (loaded.length > 0) {
-                    parts.push(`loaded: [${truncateList(loaded)}]`);
+                if (collectionEvent.agentInstructionsCount > 0) {
+                    parts.push(( localize(6677, "{0} agent", collectionEvent.agentInstructionsCount)));
                 }
-                if (skipped.length > 0) {
-                    parts.push(`skipped: [${truncateList(skipped)}]`);
+                if (collectionEvent.listedInstructionsCount > 0) {
+                    parts.push(( localize(6678, "{0} listed", collectionEvent.listedInstructionsCount)));
                 }
-                if (folders.length > 0) {
-                    parts.push(`folders: [${truncateList(folders)}]`);
+                const durationStr = debugInfo.durationInMillis.toFixed(1);
+                const summary = parts.length > 0 ? ( localize(
+                    6679,
+                    "Resolved {0} customizations ({1}) in {2}ms",
+                    collectionEvent.totalInstructionsCount,
+                    parts.join(", "),
+                    durationStr
+                )) : ( localize(6680, "No customizations resolved"));
+                const detailSummaries = ( debugInfo.debugDetails.map(e => {
+                    const detail = e.reason ? `${e.name} — ${e.reason}` : e.name;
+                    return `[${e.category}] ${detail}`;
+                }));
+                const details = detailSummaries.length > 0 ? `${summary} | ${detailSummaries.join(", ")}` : summary;
+                const customizationEventId = generateUuid();
+                this._customizationEventDetails.set(customizationEventId, {
+                    debugInfo,
+                    hooks: resolvedHooks
+                });
+                if (this._customizationEventDetails.size > PromptsDebugContribution_1.MAX_DISCOVERY_DETAILS) {
+                    const first = ( this._customizationEventDetails.keys()).next().value;
+                    if (first !== undefined) {
+                        this._customizationEventDetails.delete(first);
+                    }
                 }
-                details = parts.join(" | ") || undefined;
+                chatDebugService.log(sessionResource, ( localize(6681, "Resolve Customizations")), details, undefined, {
+                    id: customizationEventId,
+                    category: "customization"
+                });
             }
-            chatDebugService.log(entry.sessionResource, entry.name, details, undefined, {
-                id: eventId,
-                category: entry.category
-            });
         }));
         this._register(chatDebugService.registerProvider({
             provideChatDebugLog: async () => undefined,
             resolveChatDebugLogEvent: async eventId => {
-                return this._resolveDiscoveryEvent(eventId);
+                return this._resolveDiscoveryEvent(eventId) ?? this._resolveCustomizationEvent(eventId);
             }
         }));
     }
+    getDiscoveryLogEntry(discoveryInfo) {
+        const durationInMillis = discoveryInfo.durationInMillis.toFixed(1);
+        const loadedCount = discoveryInfo.files.filter(file => file.status === "loaded").length;
+        const skippedCount = discoveryInfo.files.length - loadedCount;
+        switch (discoveryInfo.type) {
+        case PromptsType.prompt:
+            return {
+                name: ( localize(6682, "Slash Commands Discovery")),
+                details: loadedCount === 1 ? ( localize(6683, "Resolved {0} slash command in {1}ms", loadedCount, durationInMillis)) : ( localize(
+                    6684,
+                    "Resolved {0} slash commands in {1}ms",
+                    loadedCount,
+                    durationInMillis
+                ))
+            };
+        case PromptsType.agent:
+            return {
+                name: ( localize(6685, "Agent Discovery")),
+                details: loadedCount === 1 ? ( localize(6686, "Resolved {0} agent in {1}ms", loadedCount, durationInMillis)) : ( localize(6687, "Resolved {0} agents in {1}ms", loadedCount, durationInMillis))
+            };
+        case PromptsType.skill:
+            return {
+                name: ( localize(6688, "Skill Discovery")),
+                details: loadedCount === 1 ? ( localize(6689, "Resolved {0} skill in {1}ms", loadedCount, durationInMillis)) : ( localize(6690, "Resolved {0} skills in {1}ms", loadedCount, durationInMillis))
+            };
+        case PromptsType.instructions:
+            return {
+                name: ( localize(6691, "Instructions Discovery")),
+                details: loadedCount === 1 ? ( localize(6692, "Resolved {0} instruction in {1}ms", loadedCount, durationInMillis)) : ( localize(6693, "Resolved {0} instructions in {1}ms", loadedCount, durationInMillis))
+            };
+        case PromptsType.hook:
+            {
+                const hookDiscoveryInfo = discoveryInfo;
+                const hookCount = hookDiscoveryInfo.hooksInfo ? ( Object.values(hookDiscoveryInfo.hooksInfo.hooks)).reduce((total, hooks) => total + hooks.length, 0) : loadedCount;
+                const details = skippedCount > 0 ? ( localize(
+                    6694,
+                    "Resolved {0} hooks from {1} files in {2}ms, skipped {3}",
+                    hookCount,
+                    loadedCount,
+                    durationInMillis,
+                    skippedCount
+                )) : hookCount === 1 ? ( localize(6695, "Resolved {0} hook in {1}ms", hookCount, durationInMillis)) : ( localize(6696, "Resolved {0} hooks in {1}ms", hookCount, durationInMillis));
+                return {
+                    name: ( localize(6697, "Hook Discovery")),
+                    details
+                };
+            }
+        }
+    }
     _resolveDiscoveryEvent(eventId) {
         const info = this._discoveryEventDetails.get(eventId);
         if (!info) {
             return undefined;
         }
+        return this._toFileListContent(info);
+    }
+    _resolveCustomizationEvent(eventId) {
+        const data = this._customizationEventDetails.get(eventId);
+        if (!data) {
+            return undefined;
+        }
+        const {
+            debugInfo,
+            hooks
+        } = data;
+        const logs = [...debugInfo.debugDetails];
+        if (hooks) {
+            for (const hookType of ( Object.values(HookType))) {
+                const commands = hooks[hookType];
+                if (commands && commands.length > 0) {
+                    for (const cmd of commands) {
+                        const commandLabel = formatHookCommandLabel(cmd, OS) || ( localize(6698, "(unknown command)"));
+                        logs.push({
+                            category: "hook",
+                            name: commandLabel,
+                            reason: hookType,
+                            uri: cmd.sourceUri
+                        });
+                    }
+                }
+            }
+        }
+        return {
+            kind: "customizationSummary",
+            resolutionLogs: logs,
+            durationInMillis: debugInfo.durationInMillis,
+            counts: {
+                instructions: logs.filter(e => e.category === "applying" || e.category === "referenced").length,
+                skills: logs.filter(e => e.category === "skill").length,
+                agents: logs.filter(e => e.category === "custom-agent").length,
+                hooks: logs.filter(e => e.category === "hook").length,
+                skipped: logs.filter(e => e.category === "skipped").length
+            }
+        };
+    }
+    _toFileListContent(info) {
         return {
             kind: "fileList",
             discoveryType: info.type,
+            durationInMillis: info.durationInMillis,
             files: ( info.files.map(f => ({
                 uri: f.promptPath.uri,
                 name: f.promptPath.name,
@@ -94,7 +284,7 @@ let PromptsDebugContribution = class PromptsDebugContribution extends Disposable
         };
     }
 };
-PromptsDebugContribution = PromptsDebugContribution_1 = ( __decorate([( __param(0, IPromptsService)), ( __param(1, IChatDebugService))], PromptsDebugContribution));
+PromptsDebugContribution = PromptsDebugContribution_1 = ( __decorate([( __param(0, IPromptsService)), ( __param(1, IChatAgentService)), ( __param(2, IChatService)), ( __param(3, IChatDebugService)), ( __param(4, ILogService))], PromptsDebugContribution));
 const MAX_LIST_ITEMS = 100;
 function truncateList(items) {
     if (items.length <= MAX_LIST_ITEMS) {

package/vscode/src/vs/workbench/contrib/chat/browser/telemetry/chatModelCountTelemetry.d.ts

@@ -0,0 +1,23 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
+import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
+/**
+ * Logs telemetry about how many chat models are live at two moments:
+ * 1. At startup, after sessions with pending edits have been revived.
+ * 2. Each time a new chat model is created (skipping the very first one).
+ *
+ * Both events share the same model-count snapshot logic to track background
+ * session accumulation.
+ */
+export declare class ChatModelCountTelemetry extends Disposable implements IWorkbenchContribution {
+    private readonly chatService;
+    private readonly chatWidgetService;
+    private readonly telemetryService;
+    static readonly ID = "workbench.contrib.chatModelCountTelemetry";
+    constructor(chatService: IChatService, chatWidgetService: IChatWidgetService, telemetryService: ITelemetryService);
+    private logStartupTelemetry;
+    private onDidCreateModel;
+    private getSnapshot;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/telemetry/chatModelCountTelemetry.js

@@ -0,0 +1,82 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+
+let ChatModelCountTelemetry = class ChatModelCountTelemetry extends Disposable {
+    static {
+        this.ID = "workbench.contrib.chatModelCountTelemetry";
+    }
+    constructor(chatService, chatWidgetService, telemetryService) {
+        super();
+        this.chatService = chatService;
+        this.chatWidgetService = chatWidgetService;
+        this.telemetryService = telemetryService;
+        this.logStartupTelemetry();
+        this._register(
+            this.chatService.onDidCreateModel(model => this.onDidCreateModel(model.initialLocation))
+        );
+    }
+    logStartupTelemetry() {
+        this.telemetryService.publicLog2("chat.modelsAtStartup", this.getSnapshot());
+    }
+    onDidCreateModel(newModelLocation) {
+        const snapshot = this.getSnapshot();
+        if (snapshot.totalModels <= 1) {
+            return;
+        }
+        this.telemetryService.publicLog2("chat.modelCreatedStats", {
+            ...snapshot,
+            newModelLocation
+        });
+    }
+    getSnapshot() {
+        const snapshot = this.chatService.getChatModelReferenceDebugInfo();
+        let modelsOpenInWidgets = 0;
+        let backgroundModels = 0;
+        let backgroundModels_modifiedEditsKeepAlive = 0;
+        let backgroundModels_requestInProgressKeepAlive = 0;
+        let backgroundModels_otherHolders = 0;
+        for (const model of snapshot.models) {
+            if (this.chatWidgetService.getWidgetBySessionResource(model.sessionResource)) {
+                modelsOpenInWidgets++;
+            } else {
+                backgroundModels++;
+                let hasOther = false;
+                for (const {
+                    holder
+                } of model.holders) {
+                    if (holder === "ChatModel#modifiedEditsKeepAlive") {
+                        backgroundModels_modifiedEditsKeepAlive++;
+                    } else if (holder === "ChatModel#requestInProgressKeepAlive") {
+                        backgroundModels_requestInProgressKeepAlive++;
+                    } else {
+                        hasOther = true;
+                    }
+                }
+                if (hasOther) {
+                    backgroundModels_otherHolders++;
+                }
+            }
+        }
+        return {
+            totalModels: snapshot.totalModels,
+            modelsOpenInWidgets,
+            backgroundModels,
+            backgroundModels_modifiedEditsKeepAlive,
+            backgroundModels_requestInProgressKeepAlive,
+            backgroundModels_otherHolders
+        };
+    }
+};
+ChatModelCountTelemetry = ( __decorate([( __param(0, IChatService)), ( __param(1, IChatWidgetService)), ( __param(2, ITelemetryService))], ChatModelCountTelemetry));
+registerWorkbenchContribution2(
+    ChatModelCountTelemetry.ID,
+    ChatModelCountTelemetry,
+    WorkbenchPhase.AfterRestored
+);
+
+export { ChatModelCountTelemetry };

package/vscode/src/vs/workbench/contrib/chat/browser/tools/languageModelToolsConfirmationService.d.ts

@@ -1,6 +1,7 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
+import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { ConfirmedReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { ILanguageModelToolConfirmationActions, ILanguageModelToolConfirmationContribution, ILanguageModelToolConfirmationRef } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService";
 import { ILanguageModelToolsConfirmationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsConfirmationService.service";
@@ -8,6 +9,7 @@ import { IToolData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/cont
 export declare class LanguageModelToolsConfirmationService extends Disposable implements ILanguageModelToolsConfirmationService {
     private readonly _instantiationService;
     private readonly _quickInputService;
+    private readonly _dialogService;
     readonly _serviceBrand: undefined;
     private _preExecutionToolConfirmStore;
     private _postExecutionToolConfirmStore;
@@ -15,7 +17,7 @@ export declare class LanguageModelToolsConfirmationService extends Disposable im
     private _postExecutionServerConfirmStore;
     private _combinationConfirmStore;
     private _contributions;
-    constructor(_instantiationService: IInstantiationService, _quickInputService: IQuickInputService);
+    constructor(_instantiationService: IInstantiationService, _quickInputService: IQuickInputService, _dialogService: IDialogService);
     getPreConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined;
     getPostConfirmAction(ref: ILanguageModelToolConfirmationRef): ConfirmedReason | undefined;
     getPreConfirmActions(ref: ILanguageModelToolConfirmationRef): ILanguageModelToolConfirmationActions[];