@codingame/monaco-vscode-api 29.1.0 → 30.0.0

package/vscode/src/vs/workbench/contrib/chat/common/model/chatModel.js

@@ -21,6 +21,7 @@ import { ILogService } from '../../../../../platform/log/common/log.service.js';
 import { CellUri } from '../../../notebook/common/notebookCommon.js';
 import { IChatRequestVariableEntry, isStringVariableEntry, isImplicitVariableEntry, isStringImplicitContextValue } from '../attachments/chatVariableEntries.js';
 import { migrateLegacyTerminalToolSpecificData } from '../chat.js';
+import { markChat, ChatPerfMark } from '../chatPerf.js';
 import { IChatToolInvocation, ChatResponseClearToPreviousToolInvocationReason, ResponseModelState, ElicitationState, isIUsedContext, ChatRequestQueueKind } from '../chatService/chatService.js';
 import { IChatService } from '../chatService/chatService.service.js';
 import { ChatAgentLocation, ChatModeKind } from '../constants.js';
@@ -153,6 +154,46 @@ class AbstractResponse {
         }
         return this._markdownContent;
     }
+    getFinalResponse() {
+        const parts = this._responseParts;
+        let i = parts.length - 1;
+        while (i >= 0) {
+            const part = parts[i];
+            if (part.kind === "markdownContent" || part.kind === "markdownVuln") {
+                if (part.content.value.length > 0) {
+                    break;
+                }
+            } else if (part.kind === "inlineReference") {
+                break;
+            }
+            i--;
+        }
+        if (i < 0) {
+            return "";
+        }
+        const end = i;
+        while (i >= 0) {
+            const part = parts[i];
+            if (part.kind === "markdownContent" || part.kind === "markdownVuln" || part.kind === "inlineReference") {
+                i--;
+            } else {
+                break;
+            }
+        }
+        const start = i + 1;
+        const segments = [];
+        for (let j = start; j <= end; j++) {
+            const part = parts[j];
+            if (part.kind === "inlineReference") {
+                segments.push(this.inlineRefToRepr(part));
+            } else if (part.kind === "markdownContent" || part.kind === "markdownVuln") {
+                if (part.content.value.length > 0) {
+                    segments.push(part.content.value);
+                }
+            }
+        }
+        return segments.join("");
+    }
     _invalidateRepr() {
         this._responseRepr = undefined;
         this._markdownContent = undefined;
@@ -259,7 +300,7 @@ class AbstractResponse {
             blocks.push(currentBlockSegments.join(""));
         }
         if (hasEditGroupsAfterLastClear) {
-            blocks.push(( localize(7235, "Made changes.")));
+            blocks.push(( localize(7292, "Made changes.")));
         }
         return blocks.join("\n\n");
     }
@@ -365,12 +406,12 @@ class Response extends AbstractResponse {
         if (progress.kind === "clearToPreviousToolInvocation") {
             if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.CopyrightContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    7236,
+                    7293,
                     "Response cleared due to possible match to public code, retrying with modified prompt."
                 )));
             } else if (progress.reason === ChatResponseClearToPreviousToolInvocationReason.FilteredContentRetry) {
                 this.clearToPreviousToolInvocation(( localize(
-                    7237,
+                    7294,
                     "Response cleared due to content safety filters, retrying with modified prompt."
                 )));
             } else {
@@ -594,9 +635,6 @@ class ChatResponseModel extends Disposable {
     get vote() {
         return this._vote;
     }
-    get voteDownReason() {
-        return this._voteDownReason;
-    }
     get followups() {
         return this._followups;
     }
@@ -671,7 +709,6 @@ class ChatResponseModel extends Disposable {
         }
         this._timeSpentWaitingAccumulator = params.timeSpentWaiting || 0;
         this._vote = params.vote;
-        this._voteDownReason = params.voteDownReason;
         this._result = params.result;
         this._followups = params.followups ? [...params.followups] : undefined;
         this.isCompleteAddedRequest = params.isCompleteAddedRequest ?? false;
@@ -691,14 +728,14 @@ class ChatResponseModel extends Disposable {
                         return title ? (isMarkdownString(title) ? title.value : title) : undefined;
                     }
                     if (state.type === IChatToolInvocation.StateKind.WaitingForPostApproval) {
-                        return localize(7238, "Approve tool result?");
+                        return localize(7295, "Approve tool result?");
                     }
                 }
                 if (part.kind === "confirmation" && !part.isUsed) {
                     return part.title;
                 }
                 if (part.kind === "questionCarousel" && !part.isUsed) {
-                    return localize(7239, "Answer questions to continue...");
+                    return localize(7296, "Answer questions to continue...");
                 }
                 if (part.kind === "elicitation2" && part.state.read(r) === ElicitationState.Pending) {
                     const title = part.title;
@@ -821,10 +858,6 @@ class ChatResponseModel extends Disposable {
         this._vote = vote;
         this._onDidChange.fire(defaultChatResponseModelChangeReason);
     }
-    setVoteDownReason(reason) {
-        this._voteDownReason = reason;
-        this._onDidChange.fire(defaultChatResponseModelChangeReason);
-    }
     setEditApplied(edit, editCount) {
         if (!this.response.value.includes(edit)) {
             return false;
@@ -860,7 +893,6 @@ class ChatResponseModel extends Disposable {
                 completedAt: Date.now()
             } : modelState,
             vote: this.vote,
-            voteDownReason: this.voteDownReason,
             slashCommand: this.slashCommand,
             usedContext: this.usedContext,
             contentReferences: this.contentReferences,
@@ -962,14 +994,15 @@ class InputModel {
         });
         return {
             contrib: value.contrib,
-            attachments: persistableAttachments,
+            attachments: ( persistableAttachments.map(IChatRequestVariableEntry.toExport)),
             mode: value.mode,
             selectedModel: value.selectedModel ? {
                 identifier: value.selectedModel.identifier,
                 metadata: value.selectedModel.metadata
             } : undefined,
             inputText: value.inputText,
-            selections: value.selections
+            selections: value.selections,
+            permissionLevel: value.permissionLevel
         };
     }
 }
@@ -1174,7 +1207,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
         this._customTitle = isValidFullData ? initialData.customTitle : undefined;
         const serializedInputState = initialModelProps.inputState || (isValidFullData && initialData.inputState ? initialData.inputState : undefined);
         this.inputModel = ( new InputModel(serializedInputState && {
-            attachments: serializedInputState.attachments,
+            attachments: ( (serializedInputState.attachments ?? []).map(IChatRequestVariableEntry.fromExport)),
             mode: serializedInputState.mode,
             selectedModel: serializedInputState.selectedModel && {
                 identifier: serializedInputState.selectedModel.identifier,
@@ -1182,7 +1215,8 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             },
             contrib: serializedInputState.contrib,
             inputText: serializedInputState.inputText,
-            selections: serializedInputState.selections
+            selections: serializedInputState.selections,
+            permissionLevel: serializedInputState.permissionLevel
         }));
         this.dataSerializer = dataRef?.serializer;
         this._initialResponderUsername = initialData?.responderUsername;
@@ -1333,7 +1367,6 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
                 modelState,
                 vote: raw.vote,
                 timestamp: raw.timestamp,
-                voteDownReason: raw.voteDownReason,
                 result,
                 followups: raw.followups,
                 restoredId: raw.responseId,
@@ -1494,6 +1527,7 @@ let ChatModel = ChatModel_1 = class ChatModel extends Disposable {
             codeBlockInfos: undefined
         }));
         this._requests.push(request);
+        markChat(this.sessionResource, ChatPerfMark.RequestUiUpdated);
         this._onDidChange.fire({
             kind: "addRequest",
             request
@@ -1704,7 +1738,7 @@ function getCodeCitationsMessage(citations) {
         return "";
     }
     const licenseTypes = citations.reduce((set, c) => set.add(c.license), ( new Set()));
-    const label = licenseTypes.size === 1 ? ( localize(7240, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(7241, "Similar code found with {0} license types", licenseTypes.size));
+    const label = licenseTypes.size === 1 ? ( localize(7297, "Similar code found with 1 license type", licenseTypes.size)) : ( localize(7298, "Similar code found with {0} license types", licenseTypes.size));
     return label;
 }
 function serializeSendOptions(options) {

package/vscode/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.js

@@ -60,7 +60,7 @@ class ChatToolInvocation {
         if (startOptions.startInStreaming) {
             defaultMessage = toolData.displayName;
         } else if (startOptions.startInCancelled) {
-            defaultMessage = startOptions.cancelReasonMessage ?? ( localize(7242, "Tool \"{0}\" was denied", toolData.displayName));
+            defaultMessage = startOptions.cancelReasonMessage ?? ( localize(7299, "Tool \"{0}\" was denied", toolData.displayName));
         }
         this.invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;

package/vscode/src/vs/workbench/contrib/chat/common/model/chatViewModel.d.ts

@@ -6,7 +6,7 @@ import { ThemeIcon } from "../../../../../base/common/themables.js";
 import { URI } from "../../../../../base/common/uri.js";
 import { IInstantiationService } from "../../../../../platform/instantiation/common/instantiation.js";
 import { IChatRequestVariableEntry } from "../attachments/chatVariableEntries.js";
-import { ChatAgentVoteDirection, ChatAgentVoteDownReason, ChatRequestQueueKind, IChatCodeCitation, IChatContentReference, IChatDisabledClaudeHooksPart, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from "../chatService/chatService.js";
+import { ChatAgentVoteDirection, ChatRequestQueueKind, IChatCodeCitation, IChatContentReference, IChatDisabledClaudeHooksPart, IChatFollowup, IChatMcpServersStarting, IChatProgressMessage, IChatQuestionCarousel, IChatResponseErrorDetails, IChatTask, IChatUsedContext } from "../chatService/chatService.js";
 import { IChatAgentCommand, IChatAgentData, IChatAgentResult } from "../participants/chatAgents.js";
 import { IChatAgentNameService } from "../participants/chatAgents.service.js";
 import { IParsedChatRequest } from "../requestParser/chatParserTypes.js";
@@ -63,6 +63,7 @@ export interface IChatRequestViewModel {
     readonly slashCommand: IChatAgentCommand | undefined;
     readonly agentOrSlashCommandDetected: boolean;
     readonly shouldBeBlocked: IObservable<boolean>;
+    readonly attachedContext?: readonly IChatRequestVariableEntry[];
     readonly modelId?: string;
     readonly timestamp: number;
     /** The kind of pending request, or undefined if not pending */
@@ -160,7 +161,6 @@ export interface IChatResponseViewModel {
     readonly isCanceled: boolean;
     readonly isStale: boolean;
     readonly vote: ChatAgentVoteDirection | undefined;
-    readonly voteDownReason: ChatAgentVoteDownReason | undefined;
     readonly replyFollowups?: IChatFollowup[];
     readonly errorDetails?: IChatResponseErrorDetails;
     readonly result?: IChatAgentResult;
@@ -170,7 +170,6 @@ export interface IChatResponseViewModel {
     renderData?: IChatResponseRenderData;
     currentRenderedHeight: number | undefined;
     setVote(vote: ChatAgentVoteDirection): void;
-    setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
     usedReferencesExpanded?: boolean;
     vulnerabilitiesListExpanded: boolean;
     setEditApplied(edit: IChatTextEditGroup, editCount: number): void;
@@ -239,6 +238,7 @@ export declare class ChatRequestViewModel implements IChatRequestViewModel {
     get slashCommand(): IChatAgentCommand | undefined;
     get agentOrSlashCommandDetected(): boolean;
     currentRenderedHeight: number | undefined;
+    get attachedContext(): IChatRequestVariableEntry[] | undefined;
     get modelId(): string | undefined;
     get timestamp(): number;
     get pendingKind(): ChatRequestQueueKind | undefined;
@@ -274,7 +274,6 @@ export declare class ChatResponseViewModel extends Disposable implements IChatRe
     get result(): IChatAgentResult | undefined;
     get errorDetails(): IChatResponseErrorDetails | undefined;
     get vote(): ChatAgentVoteDirection | undefined;
-    get voteDownReason(): ChatAgentVoteDownReason | undefined;
     get requestId(): string;
     get isStale(): boolean;
     get isLast(): boolean;
@@ -290,6 +289,5 @@ export declare class ChatResponseViewModel extends Disposable implements IChatRe
     get contentUpdateTimings(): IChatStreamStats | undefined;
     constructor(_model: IChatResponseModel, session: IChatViewModel, instantiationService: IInstantiationService, chatAgentNameService: IChatAgentNameService);
     setVote(vote: ChatAgentVoteDirection): void;
-    setVoteDownReason(reason: ChatAgentVoteDownReason | undefined): void;
     setEditApplied(edit: IChatTextEditGroup, editCount: number): void;
 }

package/vscode/src/vs/workbench/contrib/chat/common/model/chatViewModel.js

@@ -221,6 +221,9 @@ class ChatRequestViewModel {
     get agentOrSlashCommandDetected() {
         return this._model.response?.agentOrSlashCommandDetected ?? false;
     }
+    get attachedContext() {
+        return this._model.attachedContext;
+    }
     get modelId() {
         return this._model.modelId;
     }
@@ -310,9 +313,6 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get vote() {
         return this._model.vote;
     }
-    get voteDownReason() {
-        return this._model.voteDownReason;
-    }
     get requestId() {
         return this._model.requestId;
     }
@@ -370,10 +370,6 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
         this._modelChangeCount++;
         this._model.setVote(vote);
     }
-    setVoteDownReason(reason) {
-        this._modelChangeCount++;
-        this._model.setVoteDownReason(reason);
-    }
     setEditApplied(edit, editCount) {
         this._modelChangeCount++;
         this._model.setEditApplied(edit, editCount);

package/vscode/src/vs/workbench/contrib/chat/common/participants/chatAgents.js

@@ -13,6 +13,7 @@ import { ExtensionIdentifier } from '../../../../../platform/extensions/common/e
 import { ChatContextKeys } from '../actions/chatContextKeys.js';
 import { ChatAgentLocation, ChatModeKind, ChatConfiguration } from '../constants.js';
 import { ILanguageModelsService } from '../languageModels.service.js';
+import { markChat, ChatPerfMark } from '../chatPerf.js';
 
 let ChatAgentService = class ChatAgentService extends Disposable {
     static {
@@ -214,11 +215,14 @@ let ChatAgentService = class ChatAgentService extends Disposable {
         return this.getAgentsByName(agent.name).filter(a => a.extensionId.value !== agent.extensionId.value).length > 0;
     }
     async invokeAgent(id, request, progress, history, token) {
+        markChat(request.sessionResource, ChatPerfMark.AgentWillInvoke);
         const data = this._agents.get(id);
         if (!data?.impl) {
             throw ( new Error(`No activated agent with id "${id}"`));
         }
-        return await data.impl.invoke(request, progress, history, token);
+        const result = await data.impl.invoke(request, progress, history, token);
+        markChat(request.sessionResource, ChatPerfMark.AgentDidInvoke);
+        return result;
     }
     setRequestTools(id, requestId, tools) {
         const data = this._agents.get(id);

package/vscode/src/vs/workbench/contrib/chat/common/plugins/agentPluginRepositoryService.service.d.ts

@@ -11,6 +11,12 @@ export declare const IAgentPluginRepositoryService: import("../../../../../platf
 export interface IAgentPluginRepositoryService {
     readonly _serviceBrand: undefined;
     /**
+    * Root directory where agent plugins are stored on disk.
+    * On native this is `~/{dataFolderName}/agent-plugins/`; on web it
+    * falls back to `{cacheHome}/agentPlugins/`.
+    */
+    readonly agentPluginsHome: URI;
+    /**
     * Returns the local cache URI for a marketplace repository reference.
     * Uses a storage-backed marketplace index when available.
     */

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.d.ts

@@ -1,3 +1,4 @@
+import { IMarketplacePlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
 export interface IUpdateAllPluginsOptions {
     /**
      * When `true`, also re-installs npm/pip packages that have no pinned
@@ -18,3 +19,20 @@ export interface IUpdateAllPluginsResult {
     /** Names of plugins/marketplaces that failed to update. */
     readonly failedNames: readonly string[];
 }
+export interface IInstallPluginFromSourceOptions {
+    /**
+     * When set, targets a specific plugin by name within the marketplace
+     * instead of installing all or prompting the user. The matched plugin
+     * is installed and returned in the result.
+     */
+    readonly plugin?: string;
+}
+export interface IInstallPluginFromSourceResult {
+    readonly success: boolean;
+    readonly message?: string;
+    /**
+     * When {@link IInstallPluginFromSourceOptions.plugin} is set and the
+     * plugin was found, this contains the discovered marketplace plugin.
+     */
+    readonly matchedPlugin?: IMarketplacePlugin;
+}

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginInstallService.service.d.ts

@@ -1,6 +1,6 @@
 import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { URI } from "../../../../../base/common/uri.js";
-import { IUpdateAllPluginsOptions, IUpdateAllPluginsResult } from "./pluginInstallService.js";
+import { IInstallPluginFromSourceOptions, IInstallPluginFromSourceResult, IUpdateAllPluginsOptions, IUpdateAllPluginsResult } from "./pluginInstallService.js";
 import { IMarketplacePlugin } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService";
 export declare const IPluginInstallService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IPluginInstallService>;
 export interface IPluginInstallService {
@@ -15,8 +15,11 @@ export interface IPluginInstallService {
     * GitHub shorthand (`owner/repo`) or a full git clone URL. Clones the
     * repository, reads marketplace metadata to discover plugins, and
     * registers the selected plugin.
+    *
+    * When {@link IInstallPluginFromSourceOptions.plugin} is set, targets
+    * a specific plugin, installs it, and returns it.
     */
-    installPluginFromSource(source: string): Promise<void>;
+    installPluginFromSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<void>;
     /**
     * Synchronously validates the format of a plugin source string.
     * Returns an error message if the format is invalid, or undefined if valid.
@@ -26,11 +29,12 @@ export interface IPluginInstallService {
     * Installs a plugin from an already-validated source string.
     * Handles trust, cloning, scanning, and registration. Returns a result
     * with an optional error message (e.g. no plugins found).
+    *
+    * When {@link IInstallPluginFromSourceOptions.plugin} is set, targets
+    * a specific plugin, installs it, and returns it in
+    * {@link IInstallPluginFromSourceResult.matchedPlugin}.
     */
-    installPluginFromValidatedSource(source: string): Promise<{
-        success: boolean;
-        message?: string;
-    }>;
+    installPluginFromValidatedSource(source: string, options?: IInstallPluginFromSourceOptions): Promise<IInstallPluginFromSourceResult>;
     /**
     * Pulls the latest changes for an already-cloned marketplace repository.
     */

package/vscode/src/vs/workbench/contrib/chat/common/plugins/pluginMarketplaceService.service.d.ts

@@ -34,7 +34,6 @@ export interface IPluginMarketplaceService {
     getMarketplacePluginMetadata(pluginUri: URI): IMarketplacePlugin | undefined;
     addInstalledPlugin(pluginUri: URI, plugin: IMarketplacePlugin): void;
     removeInstalledPlugin(pluginUri: URI): void;
-    setInstalledPluginEnabled(pluginUri: URI, enabled: boolean): void;
     /** Returns whether the given marketplace has been explicitly trusted by the user. */
     isMarketplaceTrusted(ref: IMarketplaceReference): boolean;
     /** Records that the user trusts the given marketplace, persisted permanently. */

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.d.ts

@@ -17,6 +17,7 @@ import { IPromptPath } from "./service/promptsService.js";
 import { IPromptsService } from "./service/promptsService.service.js";
 import { ChatModeKind } from "../constants.js";
 import { UserSelectedTools } from "../participants/chatAgents.js";
+import { IAgentPluginService } from "../plugins/agentPluginService.service.js";
 export type InstructionsCollectionEvent = {
     applyingInstructionsCount: number;
     referencedInstructionsCount: number;
@@ -43,11 +44,13 @@ export declare class ComputeAutomaticInstructions {
     private readonly _remoteAgentService;
     private readonly _telemetryService;
     private readonly _languageModelToolsService;
+    private readonly _agentPluginService;
     private _parseResults;
-    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _sessionResource: URI | undefined, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _contextKeyService: IContextKeyService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService);
+    constructor(_modeKind: ChatModeKind, _enabledTools: UserSelectedTools | undefined, _enabledSubagents: (readonly string[]) | undefined, _sessionResource: URI | undefined, _promptsService: IPromptsService, _logService: ILogService, _labelService: ILabelService, _configurationService: IConfigurationService, _contextKeyService: IContextKeyService, _workspaceService: IWorkspaceContextService, _fileService: IFileService, _remoteAgentService: IRemoteAgentService, _telemetryService: ITelemetryService, _languageModelToolsService: ILanguageModelToolsService, _agentPluginService: IAgentPluginService);
     private _parseInstructionsFile;
     collect(variables: ChatRequestVariableSet, token: CancellationToken): Promise<void>;
     private sendTelemetry;
+    private _logSkillLoadedTelemetry;
     /** public for testing */
     addApplyingInstructions(instructionFiles: readonly IPromptPath[], context: {
         files: ResourceSet;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.js

@@ -24,6 +24,8 @@ import { IPromptsService } from './service/promptsService.service.js';
 import { AGENT_DEBUG_LOG_ENABLED_SETTING, AGENT_DEBUG_LOG_FILE_LOGGING_ENABLED_SETTING, TROUBLESHOOT_SKILL_PATH } from './promptTypes.js';
 import { OffsetRange } from '../../../../../editor/common/core/ranges/offsetRange.js';
 import { ChatModeKind, ChatConfiguration } from '../constants.js';
+import { hash } from '../../../../../base/common/hash.js';
+import { IAgentPluginService } from '../plugins/agentPluginService.service.js';
 
 function newInstructionsCollectionEvent() {
     return {
@@ -52,7 +54,8 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         _fileService,
         _remoteAgentService,
         _telemetryService,
-        _languageModelToolsService
+        _languageModelToolsService,
+        _agentPluginService
     ) {
         this._modeKind = _modeKind;
         this._enabledTools = _enabledTools;
@@ -68,6 +71,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         this._remoteAgentService = _remoteAgentService;
         this._telemetryService = _telemetryService;
         this._languageModelToolsService = _languageModelToolsService;
+        this._agentPluginService = _agentPluginService;
         this._parseResults = ( new ResourceMap());
     }
     async _parseInstructionsFile(uri, token) {
@@ -107,6 +111,31 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         telemetryEvent.totalInstructionsCount = telemetryEvent.agentInstructionsCount + telemetryEvent.referencedInstructionsCount + telemetryEvent.applyingInstructionsCount + telemetryEvent.listedInstructionsCount;
         this._telemetryService.publicLog2("instructionsCollected", telemetryEvent);
     }
+    async _logSkillLoadedTelemetry(skills) {
+        try {
+            const pluginByUri = ( new ResourceMap());
+            const allPlugins = this._agentPluginService.plugins.get();
+            for (const plugin of allPlugins) {
+                pluginByUri.set(plugin.uri, plugin);
+            }
+            const hashOrEmpty = value => {
+                return value !== undefined ? String(hash(value)) : "";
+            };
+            for (const skill of skills) {
+                const skillPlugin = skill.pluginUri ? pluginByUri.get(skill.pluginUri) : undefined;
+                this._telemetryService.publicLog2("skillLoadedIntoContext", {
+                    skillNameHash: hashOrEmpty(skill.name),
+                    skillStorage: skill.storage,
+                    extensionIdHash: hashOrEmpty(skill.extension?.identifier.value),
+                    extensionVersion: skill.extension?.version ?? "",
+                    pluginNameHash: hashOrEmpty(skillPlugin?.label),
+                    pluginVersion: skillPlugin?.fromMarketplace?.version ?? ""
+                });
+            }
+        } catch (err) {
+            this._logService.error("[InstructionsContextComputer] Failed to log skill telemetry", err);
+        }
+    }
     async addApplyingInstructions(instructionFiles, context, variables, telemetryEvent, token) {
         const includeApplyingInstructions = this._configurationService.getValue(PromptsConfig.INCLUDE_APPLYING_INSTRUCTIONS);
         if (!includeApplyingInstructions && this._modeKind !== ChatModeKind.Edit) {
@@ -142,8 +171,8 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 this._logService.trace(
                     `[InstructionsContextComputer] Match for ${uri} with ${match.pattern}${match.file ? ` for file ${match.file}` : ""}`
                 );
-                const reason = !match.file ? ( localize(7267, "Automatically attached as pattern is **")) : ( localize(
-                    7268,
+                const reason = !match.file ? ( localize(7334, "Automatically attached as pattern is **")) : ( localize(
+                    7335,
                     "Automatically attached as pattern {0} matches {1}",
                     pattern,
                     this._labelService.getUriLabel(match.file, {
@@ -317,7 +346,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 const folderName = this._labelService.getUriLabel(dirname(uri), {
                     relative: true
                 });
-                const description = folderName.trim().length === 0 ? ( localize(7269, "Instructions for the workspace")) : ( localize(7270, "Instructions for folder '{0}'", folderName));
+                const description = folderName.trim().length === 0 ? ( localize(7336, "Instructions for the workspace")) : ( localize(7337, "Instructions for folder '{0}'", folderName));
                 entries.push("<instruction>");
                 entries.push(`<description>${description}</description>`);
                 entries.push(`<file>${filePath(uri)}</file>`);
@@ -345,6 +374,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                 return true;
             });
             if (modelInvocableSkills && modelInvocableSkills.length > 0) {
+                this._logSkillLoadedTelemetry(modelInvocableSkills);
                 const useSkillAdherencePrompt = this._configurationService.getValue(PromptsConfig.USE_SKILL_ADHERENCE_PROMPT);
                 entries.push("<skills>");
                 if (useSkillAdherencePrompt) {
@@ -498,7 +528,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
                             if (isPromptOrInstructionsFile(uri)) {
                                 todo.push(uri);
                             }
-                            const reason = ( localize(7271, "Referenced by {0}", basename(next)));
+                            const reason = ( localize(7338, "Referenced by {0}", basename(next)));
                             attachedContext.add(
                                 toPromptFileVariableEntry(uri, PromptFileVariableKind.InstructionReference, reason, true)
                             );
@@ -512,7 +542,7 @@ let ComputeAutomaticInstructions = class ComputeAutomaticInstructions {
         }
     }
 };
-ComputeAutomaticInstructions = ( __decorate([( __param(4, IPromptsService)), ( __param(5, ILogService)), ( __param(6, ILabelService)), ( __param(7, IConfigurationService)), ( __param(8, IContextKeyService)), ( __param(9, IWorkspaceContextService)), ( __param(10, IFileService)), ( __param(11, IRemoteAgentService)), ( __param(12, ITelemetryService)), ( __param(13, ILanguageModelToolsService))], ComputeAutomaticInstructions));
+ComputeAutomaticInstructions = ( __decorate([( __param(4, IPromptsService)), ( __param(5, ILogService)), ( __param(6, ILabelService)), ( __param(7, IConfigurationService)), ( __param(8, IContextKeyService)), ( __param(9, IWorkspaceContextService)), ( __param(10, IFileService)), ( __param(11, IRemoteAgentService)), ( __param(12, ITelemetryService)), ( __param(13, ILanguageModelToolsService)), ( __param(14, IAgentPluginService))], ComputeAutomaticInstructions));
 function getFilePath(uri, remoteOS) {
     if (uri.scheme === Schemas.file || uri.scheme === Schemas.vscodeRemote) {
         const fsPath = uri.fsPath;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/config/config.js

@@ -1,6 +1,6 @@
 
-import { PromptsType } from '../promptTypes.js';
-import { getPromptFileDefaultLocations, PromptFileSource } from './promptFileLocations.js';
+import { PromptFileSource, PromptsType } from '../promptTypes.js';
+import { getPromptFileDefaultLocations } from './promptFileLocations.js';
 import { PromptsStorage } from '../service/promptsService.js';
 
 var PromptsConfig;

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.d.ts

@@ -1,5 +1,5 @@
 import { URI } from "../../../../../../base/common/uri.js";
-import { PromptsType } from "../promptTypes.js";
+import { PromptFileSource, PromptsType } from "../promptTypes.js";
 import { PromptsStorage } from "../service/promptsService.js";
 /**
  * File extension for the reusable prompt files.
@@ -81,31 +81,13 @@ export declare const CLAUDE_RULES_SOURCE_FOLDER = ".claude/rules";
  * Hooks folder.
  */
 export declare const HOOKS_SOURCE_FOLDER = ".github/hooks";
-/**
- * Tracks where prompt files originate from.
- */
-export declare enum PromptFileSource {
-    GitHubWorkspace = "github-workspace",
-    CopilotPersonal = "copilot-personal",
-    ClaudePersonal = "claude-personal",
-    ClaudeWorkspace = "claude-workspace",
-    ClaudeWorkspaceLocal = "claude-workspace-local",
-    AgentsWorkspace = "agents-workspace",
-    AgentsPersonal = "agents-personal",
-    ConfigWorkspace = "config-workspace",
-    ConfigPersonal = "config-personal",
-    ExtensionContribution = "extension-contribution",
-    ExtensionAPI = "extension-api",
-    Plugin = "plugin",
-    Internal = "internal"
-}
 /**
  * Prompt source folder path with source and storage type.
  */
 export interface IPromptSourceFolder {
     readonly path: string;
     readonly source: PromptFileSource;
-    readonly storage: PromptsStorage;
+    readonly storage: PromptsStorage.local | PromptsStorage.user;
 }
 /**
  * Resolved prompt folder with source and storage type.
@@ -115,7 +97,7 @@ export interface IResolvedPromptSourceFolder {
     readonly parent: URI;
     readonly filePattern: string | undefined;
     readonly source: PromptFileSource;
-    readonly storage: PromptsStorage;
+    readonly storage: PromptsStorage.local | PromptsStorage.user;
     /**
      * The original path string before resolution (e.g., '~/.copilot/agents' or '.github/agents').
      * Used for display purposes.
@@ -126,14 +108,6 @@ export interface IResolvedPromptSourceFolder {
      */
     readonly isDefault?: boolean;
 }
-/**
- * Resolved prompt markdown file with source and storage type.
- */
-export interface IResolvedPromptFile {
-    readonly fileUri: URI;
-    readonly source: PromptFileSource;
-    readonly storage: PromptsStorage;
-}
 /**
  * All default skill source folders (both workspace and user home).
  */

package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations.js

@@ -1,6 +1,6 @@
 
 import { dirname, basename } from '../../../../../../base/common/resources.js';
-import { PromptsType } from '../promptTypes.js';
+import { PromptFileSource, PromptsType } from '../promptTypes.js';
 import { PromptsStorage } from '../service/promptsService.js';
 
 const PROMPT_FILE_EXTENSION = ".prompt.md";
@@ -22,22 +22,6 @@ const AGENTS_SOURCE_FOLDER = ".github/agents";
 const CLAUDE_AGENTS_SOURCE_FOLDER = ".claude/agents";
 const COPILOT_USER_AGENTS_SOURCE_FOLDER = "~/.copilot/agents";
 const CLAUDE_RULES_SOURCE_FOLDER = ".claude/rules";
-var PromptFileSource;
-(function(PromptFileSource) {
-    PromptFileSource["GitHubWorkspace"] = "github-workspace";
-    PromptFileSource["CopilotPersonal"] = "copilot-personal";
-    PromptFileSource["ClaudePersonal"] = "claude-personal";
-    PromptFileSource["ClaudeWorkspace"] = "claude-workspace";
-    PromptFileSource["ClaudeWorkspaceLocal"] = "claude-workspace-local";
-    PromptFileSource["AgentsWorkspace"] = "agents-workspace";
-    PromptFileSource["AgentsPersonal"] = "agents-personal";
-    PromptFileSource["ConfigWorkspace"] = "config-workspace";
-    PromptFileSource["ConfigPersonal"] = "config-personal";
-    PromptFileSource["ExtensionContribution"] = "extension-contribution";
-    PromptFileSource["ExtensionAPI"] = "extension-api";
-    PromptFileSource["Plugin"] = "plugin";
-    PromptFileSource["Internal"] = "internal";
-})(PromptFileSource || (PromptFileSource = {}));
 const DEFAULT_SKILL_SOURCE_FOLDERS = [{
     path: ".github/skills",
     source: PromptFileSource.GitHubWorkspace,
@@ -230,4 +214,4 @@ function getCleanPromptName(fileUri) {
     return basename(fileUri);
 }
 
-export { AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, AGENT_MD_FILENAME, CLAUDE_AGENTS_SOURCE_FOLDER, CLAUDE_CONFIG_FOLDER, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_RULES_SOURCE_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, COPILOT_USER_AGENTS_SOURCE_FOLDER, DEFAULT_AGENT_SOURCE_FOLDERS, DEFAULT_HOOK_FILE_PATHS, DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS, DEFAULT_PROMPT_SOURCE_FOLDERS, DEFAULT_SKILL_SOURCE_FOLDERS, GITHUB_CONFIG_FOLDER, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, PromptFileSource, SKILL_FILENAME, VALID_SKILL_NAME_REGEX, getCleanPromptName, getPromptFileDefaultLocations, getPromptFileExtension, getPromptFileType, getSkillFolderName, isInClaudeAgentsFolder, isInClaudeRulesFolder, isInCopilotAgentsFolder, isPromptOrInstructionsFile };
+export { AGENTS_SOURCE_FOLDER, AGENT_FILE_EXTENSION, AGENT_MD_FILENAME, CLAUDE_AGENTS_SOURCE_FOLDER, CLAUDE_CONFIG_FOLDER, CLAUDE_LOCAL_MD_FILENAME, CLAUDE_MD_FILENAME, CLAUDE_RULES_SOURCE_FOLDER, COPILOT_CUSTOM_INSTRUCTIONS_FILENAME, COPILOT_USER_AGENTS_SOURCE_FOLDER, DEFAULT_AGENT_SOURCE_FOLDERS, DEFAULT_HOOK_FILE_PATHS, DEFAULT_INSTRUCTIONS_SOURCE_FOLDERS, DEFAULT_PROMPT_SOURCE_FOLDERS, DEFAULT_SKILL_SOURCE_FOLDERS, GITHUB_CONFIG_FOLDER, INSTRUCTIONS_DEFAULT_SOURCE_FOLDER, INSTRUCTION_FILE_EXTENSION, LEGACY_MODE_DEFAULT_SOURCE_FOLDER, LEGACY_MODE_FILE_EXTENSION, PROMPT_DEFAULT_SOURCE_FOLDER, PROMPT_FILE_EXTENSION, SKILL_FILENAME, VALID_SKILL_NAME_REGEX, getCleanPromptName, getPromptFileDefaultLocations, getPromptFileExtension, getPromptFileType, getSkillFolderName, isInClaudeAgentsFolder, isInClaudeRulesFolder, isInCopilotAgentsFolder, isPromptOrInstructionsFile };