@codingame/monaco-vscode-api 32.0.2 → 33.0.3

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
 import { URI, isUriComponents } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
@@ -15,6 +15,7 @@ import { StorageScope, StorageTarget } from '../../../../platform/storage/common
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { IChatAgentService } from './participants/chatAgents.service.js';
 import { ChatContextKeys } from './actions/chatContextKeys.js';
+import { getChatSessionType, LocalChatSessionUri } from './model/chatUri.js';
 import { ChatConfiguration, ChatModeKind } from './constants.js';
 import { PromptsStorage, matchesSessionType, isCustomAgentVisibility } from './promptSyntax/service/promptsService.js';
 import { IPromptsService } from './promptSyntax/service/promptsService.service.js';
@@ -37,7 +38,7 @@ let ChatModes = class ChatModes extends Disposable {
         this.CUSTOM_MODES_STORAGE_KEY_PREFIX = "chat.customModes.";
     }
     constructor(
-        sessionType,
+        sessionResource,
         promptsService,
         chatAgentService,
         contextKeyService,
@@ -47,7 +48,7 @@ let ChatModes = class ChatModes extends Disposable {
         customizationHarnessService
     ) {
         super();
-        this.sessionType = sessionType;
+        this.sessionResource = sessionResource;
         this.promptsService = promptsService;
         this.chatAgentService = chatAgentService;
         this.logService = logService;
@@ -58,6 +59,7 @@ let ChatModes = class ChatModes extends Disposable {
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._pendingRefresh = Promise.resolve();
+        const sessionType = getChatSessionType(sessionResource);
         this._storageKey = ChatModes_1.CUSTOM_MODES_STORAGE_KEY_PREFIX + sessionType;
         this.hasCustomModes = ChatContextKeys.Modes.hasCustomChatModes.bindTo(contextKeyService);
         this.loadCachedModes();
@@ -66,7 +68,7 @@ let ChatModes = class ChatModes extends Disposable {
             this._pendingRefresh = this.refreshCustomPromptModes(true);
         }));
         this._register(this.customizationHarnessService.onDidChangeCustomAgents(e => {
-            if (e.sessionType === this.sessionType && this.useChatSessionCustomizationsForCustomAgents()) {
+            if (e.sessionType === sessionType && this.useChatSessionCustomizationsForCustomAgents()) {
                 this._pendingRefresh = this.refreshCustomPromptModes(true);
             }
         }));
@@ -174,10 +176,17 @@ let ChatModes = class ChatModes extends Disposable {
     useChatSessionCustomizationsForCustomAgents() {
         return this.configurationService.getValue(ChatConfiguration.UseChatSessionCustomizationsForCustomAgents) === true;
     }
+    async computeCustomAgents() {
+        const useHarness = this.useChatSessionCustomizationsForCustomAgents();
+        if (useHarness) {
+            return await this.customizationHarnessService.getCustomAgents(getChatSessionType(this.sessionResource), CancellationToken.None);
+        }
+        const sessionType = getChatSessionType(this.sessionResource);
+        return (await this.promptsService.getCustomAgents(CancellationToken.None)).filter(mode => matchesSessionType(mode.sessionTypes, sessionType));
+    }
     async refreshCustomPromptModes(fireChangeEvent) {
         try {
-            const useHarness = this.useChatSessionCustomizationsForCustomAgents();
-            const customModes = useHarness ? await this.customizationHarnessService.getCustomAgents(this.sessionType, CancellationToken.None) : (await this.promptsService.getCustomAgents(CancellationToken.None)).filter(mode => matchesSessionType(mode.sessionTypes, this.sessionType));
+            const customModes = await this.computeCustomAgents();
             const seenUris = ( new Set());
             for (const customMode of customModes) {
                 if (!customMode.visibility.userInvocable || !customMode.enabled) {
@@ -229,7 +238,6 @@ let ChatModeService = class ChatModeService extends Disposable {
         super();
         this.instantiationService = instantiationService;
         this.configurationService = configurationService;
-        this._modesBySessionType = this._register(( new DisposableMap()));
         this.agentModeDisabledByPolicy = ChatContextKeys.Modes.agentModeDisabledByPolicy.bindTo(contextKeyService);
         this.updateAgentModePolicyContextKey();
         this._register(this.configurationService.onDidChangeConfiguration(e => {
@@ -238,18 +246,18 @@ let ChatModeService = class ChatModeService extends Disposable {
             }
         }));
     }
-    getModes(sessionType) {
-        let modes = this._modesBySessionType.get(sessionType);
-        if (!modes) {
-            modes = this.instantiationService.createInstance(ChatModes, sessionType);
-            this._modesBySessionType.set(sessionType, modes);
-        }
-        return modes;
+    createModes(sessionResource) {
+        return this.instantiationService.createInstance(ChatModes, sessionResource);
     }
-    async awaitModes(sessionType) {
-        const modes = this.getModes(sessionType);
-        await modes.waitForRefresh();
-        return modes;
+    async getLocalModes() {
+        if (!this.localMode) {
+            this.localMode = (async () => {
+                const modes = this._register(this.createModes(LocalChatSessionUri.getNewSessionUri()));
+                await modes.waitForRefresh();
+                return modes;
+            })();
+        }
+        return this.localMode;
     }
     updateAgentModePolicyContextKey() {
         this.agentModeDisabledByPolicy.set(this.isAgentModeDisabledByPolicy());
@@ -448,9 +456,9 @@ class BuiltinChatMode {
 }
 var ChatMode;
 (function(ChatMode) {
-    ChatMode.Ask = ( new BuiltinChatMode(ChatModeKind.Ask, "Ask", ( localize(7687, "Explore and understand your code")), Codicon.question));
-    ChatMode.Edit = ( new BuiltinChatMode(ChatModeKind.Edit, "Edit", ( localize(7688, "Edit or refactor selected code")), Codicon.edit));
-    ChatMode.Agent = ( new BuiltinChatMode(ChatModeKind.Agent, "Agent", ( localize(7689, "Describe what to build")), Codicon.agent));
+    ChatMode.Ask = ( new BuiltinChatMode(ChatModeKind.Ask, "Ask", ( localize(7774, "Explore and understand your code")), Codicon.question));
+    ChatMode.Edit = ( new BuiltinChatMode(ChatModeKind.Edit, "Edit", ( localize(7775, "Edit or refactor selected code")), Codicon.edit));
+    ChatMode.Agent = ( new BuiltinChatMode(ChatModeKind.Agent, "Agent", ( localize(7776, "Describe what to build")), Codicon.agent));
 })(ChatMode || (ChatMode = {}));
 function isBuiltinChatMode(mode) {
     return mode.id === ChatMode.Ask.id || mode.id === ChatMode.Edit.id || mode.id === ChatMode.Agent.id;

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

@@ -1,18 +1,17 @@
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { URI } from "../../../../base/common/uri.js";
 import { IChatModes } from "./chatModes.js";
 export declare const IChatModeService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IChatModeService>;
 export interface IChatModeService {
     readonly _serviceBrand: undefined;
     /**
-    * Returns the chat modes available for the given session type. Custom modes
-    * are filtered by their declared {@link ICustomAgent.sessionTypes}.
+    * Returns the chat modes available for the given session resource.
     *
-    * Instances are cached by session type and live for the lifetime of the service.
+    * Instances need to be disposed by the caller when no longer needed
     */
-    getModes(sessionType: string): IChatModes;
+    createModes(sessionResource: URI): IChatModes & IDisposable;
     /**
-    * Like {@link getModes}, but awaits the in-flight refresh of custom prompt
-    * modes so callers see an up-to-date snapshot. Use this when synchronous
-    * results are not required and stale data would be surprising.
+    * Returns the local chat modes after awaiting any in-flight refresh.
     */
-    awaitModes(sessionType: string): Promise<IChatModes>;
+    getLocalModes(): Promise<IChatModes>;
 }

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

@@ -840,7 +840,7 @@ export declare class ChatMcpServersStarting implements IChatMcpServersStarting {
     wait(): Promise<IAutostartResult>;
     toJSON(): IChatMcpServersStartingSerialized;
 }
-export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatTreeData | IChatMultiDiffData | IChatMultiDiffDataSerialized | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatInfoMessage | IChatTextEdit | IChatNotebookEdit | IChatWorkspaceEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatQuestionCarousel | IChatPlanReview | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest | IChatElicitationRequestSerialized | IChatMcpServersStarting | IChatMcpServersStartingSerialized | IChatHookPart | IChatExternalToolInvocationUpdate | IChatDisabledClaudeHooksPart;
+export type IChatProgress = IChatMarkdownContent | IChatAgentMarkdownContentWithVulnerability | IChatUsage | IChatTreeData | IChatMultiDiffData | IChatMultiDiffDataSerialized | IChatUsedContext | IChatContentReference | IChatContentInlineReference | IChatCodeCitation | IChatProgressMessage | IChatTask | IChatTaskResult | IChatCommandButton | IChatWarningMessage | IChatInfoMessage | IChatTextEdit | IChatNotebookEdit | IChatWorkspaceEdit | IChatMoveMessage | IChatResponseCodeblockUriPart | IChatConfirmation | IChatQuestionCarousel | IChatPlanReview | IChatClearToPreviousToolInvocation | IChatToolInvocation | IChatToolInvocationSerialized | IChatExtensionsContent | IChatPullRequestContent | IChatUndoStop | IChatThinkingPart | IChatTaskSerialized | IChatElicitationRequest | IChatElicitationRequestSerialized | IChatMcpServersStarting | IChatMcpServersStartingSerialized | IChatHookPart | IChatExternalToolInvocationUpdate | IChatDisabledClaudeHooksPart;
 export interface IChatFollowup {
     kind: "reply";
     message: string;

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

@@ -287,13 +287,13 @@ export interface IChatInputCompletionItem {
     readonly start?: IPosition;
     readonly end?: IPosition;
     /** Attachment associated with the item. */
-    readonly attachment: IChatInputCompletionAttachment;
+    readonly attachment: IChatInputCompletionResourceAttachment | IChatInputCompletionCommandAttachment | IChatInputCompletionSkillAttachment;
 }
 /**
  * Resource attachment associated with a completion item. The workbench
  * adds it to the input's variable model when the item is accepted.
  */
-export interface IChatInputCompletionAttachment {
+export interface IChatInputCompletionResourceAttachment {
     readonly kind: "resource";
     readonly uri: URI;
     readonly displayName?: string;
@@ -305,6 +305,36 @@ export interface IChatInputCompletionAttachment {
      */
     readonly _meta?: Record<string, unknown>;
 }
+/**
+ * Command attachment associated with a completion item.
+ */
+export interface IChatInputCompletionCommandAttachment {
+    readonly kind: "command";
+    readonly command: string;
+    readonly description: string;
+    /**
+     * Implementation-defined metadata that MUST be preserved by the
+     * workbench when the accepted completion is sent back as part of a
+     * user message attachment.
+     */
+    readonly _meta?: Record<string, unknown>;
+}
+/**
+ * Skill attachment associated with a completion item. The workbench
+ * adds it to the input's variable model when the item is accepted.
+ */
+export interface IChatInputCompletionSkillAttachment {
+    readonly kind: "skill";
+    readonly uri: URI;
+    readonly displayName?: string;
+    readonly description?: string;
+    /**
+     * Implementation-defined metadata that MUST be preserved by the
+     * workbench when the accepted completion is sent back as part of a
+     * user message attachment.
+     */
+    readonly _meta?: Record<string, unknown>;
+}
 /**
  * Result of {@link IChatSessionContentProvider.provideChatInputCompletions}.
  */
@@ -315,6 +345,15 @@ export interface IChatNewSessionRequest {
     readonly prompt: string;
     readonly command?: string;
     readonly initialSessionOptions?: ReadonlyChatSessionOptionsMap;
+    /**
+     * The chat-input session resource the user was typing into when this
+     * request was issued. Set when the chat infrastructure is rewriting an
+     * untitled session URI to a real one on first send. Controllers can use
+     * this to bridge any pre-creation state they tracked under the old URI
+     * (e.g. provisional agent-host sessions) to the new resource that the
+     * controller returns.
+     */
+    readonly untitledResource?: URI;
 }
 export interface IChatSessionItemsDelta {
     readonly addedOrUpdated?: readonly IChatSessionItem[];

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

@@ -2,12 +2,15 @@ import { ServicesAccessor } from "../../../../platform/instantiation/common/inst
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 export declare enum ChatConfiguration {
     AIDisabled = "chat.disableAIFeatures",
+    OfflineByok = "chat.offlineByok",
     PluginsEnabled = "chat.plugins.enabled",
     PluginLocations = "chat.pluginLocations",
     PluginMarketplaces = "chat.plugins.marketplaces",
     AgentEnabled = "chat.agent.enabled",
     PlanAgentDefaultModel = "chat.planAgent.defaultModel",
     ExploreAgentDefaultModel = "chat.exploreAgent.defaultModel",
+    UtilityModel = "chat.utilityModel",
+    UtilitySmallModel = "chat.utilitySmallModel",
     RequestQueueingDefaultAction = "chat.requestQueuing.defaultAction",
     AgentStatusEnabled = "chat.agentsControl.enabled",
     EditorAssociations = "chat.editorAssociations",

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

@@ -8,12 +8,15 @@ import '../../../common/contextkeys.js';
 var ChatConfiguration;
 (function(ChatConfiguration) {
     ChatConfiguration["AIDisabled"] = "chat.disableAIFeatures";
+    ChatConfiguration["OfflineByok"] = "chat.offlineByok";
     ChatConfiguration["PluginsEnabled"] = "chat.plugins.enabled";
     ChatConfiguration["PluginLocations"] = "chat.pluginLocations";
     ChatConfiguration["PluginMarketplaces"] = "chat.plugins.marketplaces";
     ChatConfiguration["AgentEnabled"] = "chat.agent.enabled";
     ChatConfiguration["PlanAgentDefaultModel"] = "chat.planAgent.defaultModel";
     ChatConfiguration["ExploreAgentDefaultModel"] = "chat.exploreAgent.defaultModel";
+    ChatConfiguration["UtilityModel"] = "chat.utilityModel";
+    ChatConfiguration["UtilitySmallModel"] = "chat.utilitySmallModel";
     ChatConfiguration["RequestQueueingDefaultAction"] = "chat.requestQueuing.defaultAction";
     ChatConfiguration["AgentStatusEnabled"] = "chat.agentsControl.enabled";
     ChatConfiguration["EditorAssociations"] = "chat.editorAssociations";

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

@@ -43,7 +43,7 @@ function createVSCodeHarnessDescriptor(extras) {
     };
     return {
         id: SessionType.Local,
-        label: ( localize(7702, "Local")),
+        label: ( localize(7789, "Local")),
         icon: ThemeIcon.fromId(Codicon.vm.id),
         supportsTroubleshoot: true,
         sectionOverrides: ( new Map([[AICustomizationManagementSection.Instructions, {

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(7703, "The current state of the file in the chat editing widget"))));
+const chatEditingWidgetFileStateContextKey = ( new RawContextKey("chatEditingWidgetFileState", undefined, ( localize(7790, "The current state of the file in the chat editing widget"))));
 const chatEditingAgentSupportsReadonlyReferencesContextKey = ( new RawContextKey("chatEditingAgentSupportsReadonlyReferences", undefined, ( localize(
-    7704,
+    7791,
     "Whether the chat editing agent supports readonly references (temporary)"
 ))));
 const decidedChatEditingResourceContextKey = ( new RawContextKey("decidedChatEditingResource", []));

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(7705, "Copilot")),
-    description: ( localize(7706, "Language models usage statistics of this extension.")),
+    label: ( localize(7792, "Copilot")),
+    description: ( localize(7793, "Language models usage statistics of this extension.")),
     icon: Codicon.copilot,
     access: {
         canToggle: false
     },
-    accessDataLabel: ( localize(7707, "chat"))
+    accessDataLabel: ( localize(7794, "chat"))
 });
 
 export { CopilotUsageExtensionFeatureId, LanguageModelStatsService };

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

@@ -22,6 +22,11 @@ import { ChatAgentLocation } from "./constants.js";
 import { ILanguageModelsProviderGroup } from "./languageModelsConfiguration.js";
 import { ILanguageModelsConfigurationService } from "./languageModelsConfiguration.service.js";
 import { ILanguageModelsService } from "./languageModels.service.js";
+/**
+ * Vendor id used for the built-in GitHub Copilot language model provider. Treated as the default
+ * vendor across the chat stack (see `ILanguageModelProviderDescriptor.isDefault`).
+ */
+export declare const COPILOT_VENDOR_ID = "copilot";
 export declare enum ChatMessageRole {
     System = 0,
     User = 1,
@@ -165,10 +170,6 @@ export interface ILanguageModelChatMetadata {
     };
     readonly isUserSelectable?: boolean;
     readonly statusIcon?: ThemeIcon;
-    readonly modelPickerCategory: {
-        label: string;
-        order: number;
-    } | undefined;
     readonly auth?: {
         readonly providerLabel: string;
         readonly accountLabel?: string;
@@ -355,11 +356,15 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     private readonly _resolveLMSequencer;
     private readonly _modelConfigurations;
     private readonly _hasUserSelectableModels;
+    private readonly _hasNonCopilotUserSelectableModels;
     private readonly _onLanguageModelChange;
     readonly onDidChangeLanguageModels: Event<string>;
     private _recentlyUsedModelIds;
+    private _pinnedModelIds;
     private readonly _onDidChangeModelsControlManifest;
     readonly onDidChangeModelsControlManifest: Event<IModelsControlManifest>;
+    private readonly _onDidChangePinnedModels;
+    readonly onDidChangePinnedModels: Event<void>;
     private _modelsControlManifest;
     private _modelsControlRawResponse;
     private _chatControlUrl;
@@ -398,7 +403,9 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     private promptForConfiguration;
     private promptForValue;
     private canPromptForProperty;
+    private getDescriptionPlaintext;
     private promptForArray;
+    private promptForEnum;
     private promptForInput;
     private encodeSecretKey;
     private decodeSecretKey;
@@ -413,6 +420,12 @@ export declare class LanguageModelsService implements ILanguageModelsService {
     getRecentlyUsedModelIds(): string[];
     addToRecentlyUsedList(modelIdentifier: string): void;
     clearRecentlyUsedList(): void;
+    private _readPinnedModels;
+    private _savePinnedModels;
+    getPinnedModelIds(): string[];
+    pinModel(modelIdentifier: string): void;
+    unpinModel(modelIdentifier: string): void;
+    isModelPinned(modelIdentifier: string): boolean;
     getModelsControlManifest(): IModelsControlManifest;
     private _setModelsControlManifest;
     private _refreshModelsControlManifest;