@codingame/monaco-vscode-api 31.0.1 → 32.0.1

package/vscode/src/vs/workbench/contrib/chat/common/customizationHarnessService.js

@@ -1,44 +1,22 @@
 
 import { Codicon } from '../../../../base/common/codicons.js';
 import '../../../../base/common/observableInternal/index.js';
+import { Emitter } from '../../../../base/common/event.js';
 import '../../../../base/common/resources.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { localize } from '../../../../nls.js';
-import { AICustomizationManagementSection } from './aiCustomizationWorkspaceService.js';
+import { AICustomizationManagementSection, BUILTIN_STORAGE } from './aiCustomizationWorkspaceService.js';
 import { PromptsType } from './promptSyntax/promptTypes.js';
 import { AGENT_MD_FILENAME } from './promptSyntax/config/promptFileLocations.js';
-import { PromptsStorage } from './promptSyntax/service/promptsService.js';
+import { PromptsStorage, matchesSessionType } from './promptSyntax/service/promptsService.js';
+import { SessionType } from './chatSessionsService.js';
+import { CustomAgent } from './promptSyntax/service/promptsServiceImpl.js';
+import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
+import { getCanonicalPluginCommandId } from './plugins/agentPluginService.js';
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 
-var CustomizationHarness;
-(function(CustomizationHarness) {
-    CustomizationHarness["VSCode"] = "vscode";
-    CustomizationHarness["CLI"] = "cli";
-})(CustomizationHarness || (CustomizationHarness = {}));
-async function getActiveHarnessSlashCommands(harnessService, promptsService, token) {
-    const itemProvider = harnessService.getActiveDescriptor().itemProvider;
-    if (!itemProvider) {
-        return await promptsService.getPromptSlashCommands(token);
-    }
-    const items = await itemProvider.provideChatSessionCustomizations(token);
-    if (!items) {
-        return [];
-    }
-    const result = [];
-    for (const item of items) {
-        if ((item.enabled !== false) && (item.type === PromptsType.prompt || item.type === PromptsType.skill)) {
-            result.push({
-                uri: item.uri,
-                type: item.type,
-                name: item.name,
-                description: item.description,
-                userInvocable: true,
-                storage: item.storage ?? PromptsStorage.local,
-                when: undefined
-            });
-        }
-    }
-    return result;
+function isPluginCustomizationItem(item) {
+    return item.type === "plugin" || item.type === AICustomizationManagementSection.Plugins;
 }
 const EMPTY_FILTER = {
     sources: []
@@ -64,8 +42,8 @@ function createVSCodeHarnessDescriptor(extras) {
         sources: buildAllSources(extras)
     };
     return {
-        id: CustomizationHarness.VSCode,
-        label: ( localize(7382, "Local")),
+        id: SessionType.Local,
+        label: ( localize(7702, "Local")),
         icon: ThemeIcon.fromId(Codicon.vm.id),
         supportsTroubleshoot: true,
         sectionOverrides: ( new Map([[AICustomizationManagementSection.Instructions, {
@@ -77,36 +55,80 @@ function createVSCodeHarnessDescriptor(extras) {
 function matchesWorkspaceSubpath(filePath, subpaths) {
     return ( subpaths.some(sp => filePath.includes(`/${sp}/`) || filePath.endsWith(`/${sp}`)));
 }
-function matchesInstructionFileFilter(filePath, filters) {
-    const name = filePath.substring(filePath.lastIndexOf("/") + 1);
-    return ( filters.some(f => {
-        if (f.endsWith("/")) {
-            return filePath.includes(`/${f}`) || filePath.startsWith(f);
-        }
-        return name === f;
-    }));
-}
 class CustomizationHarnessServiceBase {
-    constructor(staticHarnesses, defaultHarness) {
+    constructor(staticHarnesses, defaultHarness, promptsService) {
+        this.promptsService = promptsService;
+        this._onDidChangeSlashCommands = ( new Emitter());
+        this.onDidChangeSlashCommands = this._onDidChangeSlashCommands.event;
+        this._onDidChangeCustomAgents = ( new Emitter());
+        this.onDidChangeCustomAgents = this._onDidChangeCustomAgents.event;
+        this._providerListeners = [];
+        this._isDisposed = false;
         this._externalHarnesses = [];
         this._staticHarnesses = staticHarnesses;
+        this.promptsService = promptsService;
         this._activeHarness = observableValue(this, defaultHarness);
         this.activeHarness = this._activeHarness;
         this._availableHarnesses = observableValue(this, [...this._staticHarnesses]);
         this.availableHarnesses = this._availableHarnesses;
+        this._rebindProviderListeners();
     }
     _getAllHarnesses() {
         const externalIds = ( new Set(( this._externalHarnesses.map(h => h.id))));
         return [...this._staticHarnesses.filter(h => !( externalIds.has(h.id))), ...this._externalHarnesses];
     }
     _refreshAvailableHarnesses() {
+        if (this._isDisposed) {
+            return;
+        }
         this._availableHarnesses.set(this._getAllHarnesses(), undefined);
+        this._rebindProviderListeners();
+    }
+    _rebindProviderListeners() {
+        for (const listener of this._providerListeners) {
+            listener.dispose();
+        }
+        this._providerListeners.length = 0;
+        for (const harness of this._getAllHarnesses()) {
+            const provider = harness.itemProvider;
+            if (!provider) {
+                this._providerListeners.push(
+                    this.promptsService.onDidChangeSlashCommands(() => this._onDidChangeSlashCommands.fire({
+                        sessionType: harness.id
+                    }))
+                );
+                this._providerListeners.push(
+                    this.promptsService.onDidChangeCustomAgents(() => this._onDidChangeCustomAgents.fire({
+                        sessionType: harness.id
+                    }))
+                );
+            } else {
+                this._providerListeners.push(provider.onDidChange(() => this._onDidChangeSlashCommands.fire({
+                    sessionType: harness.id
+                })));
+                this._providerListeners.push(provider.onDidChange(() => this._onDidChangeCustomAgents.fire({
+                    sessionType: harness.id
+                })));
+            }
+        }
+    }
+    dispose() {
+        this._isDisposed = true;
+        for (const listener of this._providerListeners) {
+            listener.dispose();
+        }
+        this._providerListeners.length = 0;
+        this._onDidChangeSlashCommands.dispose();
+        this._onDidChangeCustomAgents.dispose();
     }
     registerExternalHarness(descriptor) {
         this._externalHarnesses.push(descriptor);
         this._refreshAvailableHarnesses();
         return {
             dispose: () => {
+                if (this._isDisposed) {
+                    return;
+                }
                 const idx = this._externalHarnesses.indexOf(descriptor);
                 if (idx >= 0) {
                     this._externalHarnesses.splice(idx, 1);
@@ -121,8 +143,12 @@ class CustomizationHarnessServiceBase {
             }
         };
     }
+    findHarnessById(id) {
+        return this._getAllHarnesses().find(h => h.id === id);
+    }
     setActiveHarness(id) {
-        if (( this._getAllHarnesses().some(h => h.id === id))) {
+        const harness = this.findHarnessById(id);
+        if (harness) {
             this._activeHarness.set(id, undefined);
         }
     }
@@ -143,6 +169,97 @@ class CustomizationHarnessServiceBase {
         }
         return all.find(h => h.id === activeId) ?? all[0];
     }
+    async getSlashCommands(sessionType, token) {
+        const harness = this.findHarnessById(sessionType);
+        if (!harness || !harness.itemProvider) {
+            const commands = await this.promptsService.getPromptSlashCommands(token);
+            return commands.filter(command => matchesSessionType(command.sessionTypes, sessionType));
+        }
+        const items = await harness.itemProvider.provideChatSessionCustomizations(token);
+        if (!items) {
+            return [];
+        }
+        const result = [];
+        for (const item of items) {
+            if ((item.enabled !== false) && (item.type === PromptsType.prompt || item.type === PromptsType.skill)) {
+                const storage = item.storage;
+                const narrowStorage = storage !== undefined && storage !== BUILTIN_STORAGE ? storage : PromptsStorage.local;
+                result.push({
+                    uri: item.uri,
+                    type: item.type,
+                    name: item.pluginUri ? getCanonicalPluginCommandId({
+                        uri: item.pluginUri
+                    }, item.name) : item.name,
+                    description: item.description,
+                    userInvocable: item.userInvocable ?? true,
+                    storage: narrowStorage,
+                    sessionTypes: [sessionType]
+                });
+            }
+        }
+        return result;
+    }
+    async getCustomAgents(sessionType, token) {
+        const harness = this.findHarnessById(sessionType);
+        if (!harness || !harness.itemProvider) {
+            const allAgents = await this.promptsService.getCustomAgents(token);
+            return allAgents.filter(agent => matchesSessionType(agent.sessionTypes, sessionType));
+        }
+        const items = await harness.itemProvider.provideChatSessionCustomizations(token);
+        if (!items) {
+            return [];
+        }
+        const getSource = item => {
+            if (item.storage === PromptsStorage.extension && item.extensionId) {
+                return {
+                    storage: PromptsStorage.extension,
+                    extensionId: ( new ExtensionIdentifier(item.extensionId))
+                };
+            } else if (item.storage === PromptsStorage.plugin && item.pluginUri) {
+                return {
+                    storage: PromptsStorage.plugin,
+                    pluginUri: item.pluginUri
+                };
+            } else if (item.storage === PromptsStorage.user) {
+                return {
+                    storage: PromptsStorage.user
+                };
+            }
+            return {
+                storage: PromptsStorage.local
+            };
+        };
+        const result = [];
+        for (const item of items) {
+            if (item.type === PromptsType.agent) {
+                const promptFile = await this.promptsService.parseNew(item.uri, token);
+                const extra = {
+                    name: item.name,
+                    description: item.description,
+                    sessionTypes: [sessionType],
+                    hooks: undefined,
+                    source: getSource(item),
+                    type: PromptsType.agent,
+                    enabled: item.enabled !== false
+                };
+                result.push(CustomAgent.fromParsedPromptFile(promptFile, extra));
+            }
+        }
+        return result;
+    }
+    async resolvePromptSlashCommand(name, sessionType, token) {
+        const commands = await this.getSlashCommands(sessionType, token);
+        const command = commands.find(cmd => cmd.name === name);
+        if (command) {
+            const parsedPromptFile = await this.promptsService.parseNew(command.uri, token);
+            return {
+                ...command,
+                userInvocable: parsedPromptFile.header?.userInvocable ?? command.userInvocable,
+                parsedPromptFile
+            };
+        }
+        return undefined;
+    }
 }
 
-export { CustomizationHarness, CustomizationHarnessServiceBase, createVSCodeHarnessDescriptor, getActiveHarnessSlashCommands, matchesInstructionFileFilter, matchesWorkspaceSubpath };
+export { CustomizationHarnessServiceBase, createVSCodeHarnessDescriptor, isPluginCustomizationItem, matchesWorkspaceSubpath };

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

@@ -1,8 +1,11 @@
+import { CancellationToken } from "../../../../base/common/cancellation.js";
+import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { IStorageSourceFilter } from "./aiCustomizationWorkspaceService.js";
 import { IHarnessDescriptor } from "./customizationHarnessService.js";
 import { PromptsType } from "./promptSyntax/promptTypes.js";
+import { IChatPromptSlashCommand, ICustomAgent, IResolvedChatPromptSlashCommand } from "./promptSyntax/service/promptsService.js";
 export declare const ICustomizationHarnessService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ICustomizationHarnessService>;
 /**
 * Service that manages the active customization harness and provides
@@ -24,10 +27,15 @@ export interface ICustomizationHarnessService {
     */
     readonly availableHarnesses: IObservable<readonly IHarnessDescriptor[]>;
     /**
+    * Finds the descriptor of the harness with the given id, or `undefined` if no such harness exists.
+    * @param sessionType The harness id (sessionType)
+    */
+    findHarnessById(sessionType: string): IHarnessDescriptor | undefined;
+    /**
     * Changes the active harness. The new id must be present in
     * `availableHarnesses`.
     */
-    setActiveHarness(id: string): void;
+    setActiveHarness(sessionType: string): void;
     /**
     * Convenience: returns the storage source filter for the active harness
     * and the given customization type.
@@ -43,4 +51,33 @@ export interface ICustomizationHarnessService {
     * Returns a disposable that removes the harness when disposed.
     */
     registerExternalHarness(descriptor: IHarnessDescriptor): IDisposable;
+    /**
+    * Fires when one of the provided slash commands changes.
+    */
+    readonly onDidChangeSlashCommands: Event<{
+        readonly sessionType: string;
+    }>;
+    /**
+    * Fires when one of the provided custom agents changes.
+    */
+    readonly onDidChangeCustomAgents: Event<{
+        readonly sessionType: string;
+    }>;
+    /**
+    * Returns the prompt and skill slash commands for the given session type.
+    * Provider-backed harnesses contribute their own items directly; the default
+    * VS Code harness falls back to the core prompts service.
+    */
+    getSlashCommands(sessionType: string, token: CancellationToken): Promise<readonly IChatPromptSlashCommand[]>;
+    /**
+    * Returns the custom agents for the given session type.
+    * Provider-backed harnesses select items via their own provider and resolve
+    * details via the core prompts service.
+    */
+    getCustomAgents(sessionType: string, token: CancellationToken): Promise<readonly ICustomAgent[]>;
+    /**
+    * Resolves a slash command to its full metadata, including the parsed prompt file for prompt commands.
+    * Provider-backed harnesses resolve their own items directly; the default VS Code harness falls back to the core prompts service.
+    */
+    resolvePromptSlashCommand(name: string, sessionType: string, token: CancellationToken): Promise<IResolvedChatPromptSlashCommand | undefined>;
 }

package/vscode/src/vs/workbench/contrib/chat/common/editing/chatEditingService.js

@@ -45,9 +45,9 @@ var ChatEditingSessionState;
     ChatEditingSessionState[ChatEditingSessionState["Disposed"] = 3] = "Disposed";
 })(ChatEditingSessionState || (ChatEditingSessionState = {}));
 const CHAT_EDITING_MULTI_DIFF_SOURCE_RESOLVER_SCHEME = "chat-editing-multi-diff-source";
-const chatEditingWidgetFileStateContextKey = ( new RawContextKey("chatEditingWidgetFileState", undefined, ( localize(7383, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey("chatEditingWidgetFileState", undefined, ( localize(7703, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey("chatEditingAgentSupportsReadonlyReferences", undefined, ( localize(
-    7384,
+    7704,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey("decidedChatEditingResource", []));

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

@@ -1,5 +1,5 @@
 import { Disposable } from "../../../../base/common/lifecycle.js";
-import { IReader } from "../../../../base/common/observable.js";
+import { IReader, ITransaction } from "../../../../base/common/observable.js";
 import { IStorageService } from "../../../../platform/storage/common/storage.service.js";
 export declare enum ContributionEnablementState {
     DisabledProfile = 0,
@@ -11,7 +11,7 @@ export declare function isContributionEnabled(state: ContributionEnablementState
 export declare function isContributionDisabled(state: ContributionEnablementState): boolean;
 export interface IEnablementModel {
     readEnabled(key: string, reader?: IReader): ContributionEnablementState;
-    setEnabled(key: string, state: ContributionEnablementState): void;
+    setEnabled(key: string, state: ContributionEnablementState, tx?: ITransaction): void;
     remove(key: string): void;
 }
 /**
@@ -28,7 +28,7 @@ export declare class EnablementModel extends Disposable implements IEnablementMo
     private readonly _workspaceState;
     constructor(storageKey: string, storageService: IStorageService);
     readEnabled(key: string, reader?: IReader): ContributionEnablementState;
-    setEnabled(key: string, state: ContributionEnablementState): void;
+    setEnabled(key: string, state: ContributionEnablementState, tx?: ITransaction): void;
     remove(key: string): void;
     private _setInMap;
     private _deleteFromMap;

package/vscode/src/vs/workbench/contrib/chat/common/enablement.js

@@ -48,28 +48,28 @@ let EnablementModel = class EnablementModel extends Disposable {
         }
         return ContributionEnablementState.EnabledProfile;
     }
-    setEnabled(key, state) {
+    setEnabled(key, state, tx) {
         switch (state) {
         case ContributionEnablementState.EnabledProfile:
             {
-                this._deleteFromMap(this._profileState, key);
-                this._deleteFromMap(this._workspaceState, key);
+                this._deleteFromMap(this._profileState, key, tx);
+                this._deleteFromMap(this._workspaceState, key, tx);
                 break;
             }
         case ContributionEnablementState.DisabledProfile:
             {
-                this._setInMap(this._profileState, key, false);
-                this._deleteFromMap(this._workspaceState, key);
+                this._setInMap(this._profileState, key, false, tx);
+                this._deleteFromMap(this._workspaceState, key, tx);
                 break;
             }
         case ContributionEnablementState.EnabledWorkspace:
             {
-                this._setInMap(this._workspaceState, key, true);
+                this._setInMap(this._workspaceState, key, true, tx);
                 break;
             }
         case ContributionEnablementState.DisabledWorkspace:
             {
-                this._setInMap(this._workspaceState, key, false);
+                this._setInMap(this._workspaceState, key, false, tx);
                 break;
             }
         }
@@ -78,23 +78,23 @@ let EnablementModel = class EnablementModel extends Disposable {
         this._deleteFromMap(this._profileState, key);
         this._deleteFromMap(this._workspaceState, key);
     }
-    _setInMap(memento, key, value) {
+    _setInMap(memento, key, value, tx) {
         const current = memento.get();
         if (current.get(key) === value) {
             return;
         }
         const next = ( new Map(current));
         next.set(key, value);
-        memento.set(next, undefined);
+        memento.set(next, tx);
     }
-    _deleteFromMap(memento, key) {
+    _deleteFromMap(memento, key, tx) {
         const current = memento.get();
         if (!( current.has(key))) {
             return;
         }
         const next = ( new Map(current));
         next.delete(key);
-        memento.set(next, undefined);
+        memento.set(next, tx);
     }
 };
 EnablementModel = ( __decorate([( __param(1, IStorageService))], EnablementModel));

package/vscode/src/vs/workbench/contrib/chat/common/languageModelStats.js

@@ -27,13 +27,13 @@ LanguageModelStatsService = ( __decorate([( __param(0, IExtensionFeaturesManagem
 const CopilotUsageExtensionFeatureId = "copilot";
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: CopilotUsageExtensionFeatureId,
-    label: ( localize(7385, "Copilot")),
-    description: ( localize(7386, "Language models usage statistics of this extension.")),
+    label: ( localize(7705, "Copilot")),
+    description: ( localize(7706, "Language models usage statistics of this extension.")),
     icon: Codicon.copilot,
     access: {
         canToggle: false
     },
-    accessDataLabel: ( localize(7387, "chat"))
+    accessDataLabel: ( localize(7707, "chat"))
 });
 
 export { CopilotUsageExtensionFeatureId, LanguageModelStatsService };

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

@@ -151,8 +151,12 @@ export interface ILanguageModelChatMetadata {
     readonly version: string;
     readonly tooltip?: string;
     readonly detail?: string;
-    readonly multiplier?: string;
     readonly multiplierNumeric?: number;
+    readonly pricing?: string;
+    readonly inputCost?: number;
+    readonly outputCost?: number;
+    readonly cacheCost?: number;
+    readonly priceCategory?: string;
     readonly family: string;
     readonly maxInputTokens: number;
     readonly maxOutputTokens: number;
@@ -349,7 +353,6 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     private readonly _modelsGroups;
     private readonly _modelCache;
     private readonly _resolveLMSequencer;
-    private _modelPickerUserPreferences;
     private readonly _modelConfigurations;
     private readonly _hasUserSelectableModels;
     private readonly _onLanguageModelChange;
@@ -368,11 +371,6 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     constructor(_extensionService: IExtensionService, _logService: ILogService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _languageModelsConfigurationService: ILanguageModelsConfigurationService, _quickInputService: IQuickInputService, _secretStorageService: ISecretStorageService, _productService: IProductService, _requestService: IRequestService);
     deltaLanguageModelChatProviderDescriptors(added: IUserFriendlyLanguageModel[], removed: IUserFriendlyLanguageModel[]): void;
     private _onDidChangeLanguageModelGroups;
-    private _readModelPickerPreferences;
-    private _onDidChangeModelPickerPreferences;
-    private _hasStoredModelForVendor;
-    private _saveModelPickerPreferences;
-    updateModelPickerPreference(modelIdentifier: string, showInModelPicker: boolean): void;
     getVendors(): ILanguageModelProviderDescriptor[];
     getLanguageModelIds(): string[];
     lookupLanguageModel(modelIdentifier: string): ILanguageModelChatMetadata | undefined;
@@ -380,6 +378,7 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     private _resolveAllLanguageModels;
     private _hasGroupStructureChanged;
     getLanguageModelGroups(vendor: string): ILanguageModelsGroup[];
+    hasResolvedVendor(vendor: string): boolean;
     selectLanguageModels(selector: ILanguageModelChatSelector): Promise<string[]>;
     registerLanguageModelProvider(vendor: string, provider: ILanguageModelChatProvider): IDisposable;
     sendChatRequest(modelId: string, from: ExtensionIdentifier | undefined, messages: IChatMessage[], options: ILanguageModelChatRequestOptions, token: CancellationToken): Promise<ILanguageModelChatResponse>;