@codingame/monaco-vscode-chat-service-override 20.4.1 → 21.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/runPromptAction.js

@@ -69,7 +69,7 @@ class RunPromptBaseAction extends Action2 {
         return widget;
     }
 }
-const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(5313, "Run Prompt in Current Chat"));
+const RUN_CURRENT_PROMPT_ACTION_TITLE = ( localize2(5438, "Run Prompt in Current Chat"));
 const RUN_CURRENT_PROMPT_ACTION_ICON = Codicon.playCircle;
 class RunCurrentPromptAction extends RunPromptBaseAction {
     constructor() {
@@ -88,7 +88,7 @@ class RunSelectedPromptAction extends Action2 {
     constructor() {
         super({
             id: RUN_SELECTED_PROMPT_ACTION_ID,
-            title: ( localize2(5314, "Run Prompt...")),
+            title: ( localize2(5439, "Run Prompt...")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
@@ -106,7 +106,7 @@ class RunSelectedPromptAction extends Action2 {
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
         const placeholder = ( localize(
-            5315,
+            5440,
             'Select the prompt file to run (hold {0}-key to use in new chat)',
             UILabelProvider.modifierLabels[OS].ctrlKey
         ));
@@ -130,8 +130,8 @@ class ManagePromptFilesAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_PROMPTS_ACTION_ID,
-            title: ( localize2(5316, "Configure Prompt Files...")),
-            shortTitle: ( localize2(5317, "Prompt Files")),
+            title: ( localize2(5441, "Configure Prompt Files...")),
+            shortTitle: ( localize2(5442, "Prompt Files")),
             icon: Codicon.bookmark,
             f1: true,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
@@ -148,7 +148,7 @@ class ManagePromptFilesAction extends Action2 {
         const openerService = accessor.get(IOpenerService);
         const instaService = accessor.get(IInstantiationService);
         const pickers = instaService.createInstance(PromptFilePickers);
-        const placeholder = ( localize(5318, 'Select the prompt file to open'));
+        const placeholder = ( localize(5443, 'Select the prompt file to open'));
         const result = await pickers.selectPromptFile({ placeholder, type: PromptsType.prompt, optionEdit: false });
         if (result !== undefined) {
             await openerService.open(result.promptFile);
@@ -164,7 +164,7 @@ function getActivePromptFileUri(accessor) {
     return undefined;
 }
 const RUN_CURRENT_PROMPT_IN_NEW_CHAT_ACTION_ID = 'workbench.action.chat.run-in-new-chat.prompt.current';
-const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(5319, "Run Prompt In New Chat"));
+const RUN_IN_NEW_CHAT_ACTION_TITLE = ( localize2(5444, "Run Prompt In New Chat"));
 const RUN_IN_NEW_CHAT_ACTION_ICON = Codicon.play;
 class RunCurrentPromptInNewChatAction extends RunPromptBaseAction {
     constructor() {

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/saveToPromptAction.js

@@ -22,7 +22,7 @@ class SaveToPromptAction extends Action2 {
     constructor() {
         super({
             id: SAVE_TO_PROMPT_ACTION_ID,
-            title: ( localize2(5320, "Save chat session to a prompt file")),
+            title: ( localize2(5445, "Save chat session to a prompt file")),
             f1: false,
             precondition: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
             category: CHAT_CATEGORY,
@@ -36,12 +36,12 @@ class SaveToPromptAction extends Action2 {
         const chatWidget = options.chat;
         const mode = chatWidget.input.currentModeObs.get();
         const model = chatWidget.input.selectedLanguageModel;
-        const toolAndToolsetMap = chatWidget.input.selectedToolsModel.entriesMap.get();
         const output = [];
         output.push('---');
         output.push(`description: New prompt created from chat session`);
         output.push(`mode: ${mode.kind}`);
         if (mode.kind === ChatModeKind.Agent) {
+            const toolAndToolsetMap = chatWidget.input.selectedToolsModel.entriesMap.get();
             output.push(`tools: ${rewriter.getNewValueString(toolAndToolsetMap)}`);
         }
         if (model) {

package/vscode/src/vs/workbench/contrib/chat/browser/tools/toolSetsContribution.js

@@ -44,11 +44,11 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(5321, "Empty tool set")),
+            label: ( localize(5446, "Empty tool set")),
             body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
         }],
     type: 'object',
-    description: ( localize(5322, 'User tool sets configuration')),
+    description: ( localize(5447, 'User tool sets configuration')),
     additionalProperties: {
         type: 'object',
         required: ['tools'],
@@ -56,7 +56,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    5323,
+                    5448,
                     "A list of tools or tool sets to include in this tool set. Cannot be empty and must reference tools the way they are referenced in prompts."
                 )),
                 type: 'array',
@@ -69,15 +69,15 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    5324,
-                    "Icon to use for this tool set in the UI. Uses the `\\$(name)`-syntax, like `\\$(zap)`"
+                    5449,
+                    'Icon to use for this tool set in the UI. Uses the "\\$(name)"-syntax, like "\\$(zap)"'
                 )),
                 type: 'string',
                 enum: Array.from(getAllCodicons(), icon => icon.id),
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`),
             },
             description: {
-                description: ( localize(5325, "A short description of this tool set.")),
+                description: ( localize(5450, "A short description of this tool set.")),
                 type: 'string'
             },
         },
@@ -164,7 +164,7 @@ let UserToolSetsContributions = class UserToolSetsContributions extends Disposab
             });
             for (const item of data) {
                 toolEnumValues.push(item.name);
-                toolEnumDescriptions.push(( localize(5326, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(5451, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
             }
             store.clear();
             reg.registerSchema(toolSetSchemaId, toolSetsSchema, store);
@@ -257,8 +257,8 @@ class ConfigureToolSets extends Action2 {
     constructor() {
         super({
             id: ConfigureToolSets.ID,
-            title: ( localize2(5327, 'Configure Tool Sets...')),
-            shortTitle: ( localize(5328, "Tool Sets")),
+            title: ( localize2(5452, 'Configure Tool Sets...')),
+            shortTitle: ( localize(5453, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
@@ -279,7 +279,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(5329, 'Create new tool sets file...')),
+            label: ( localize(5454, 'Create new tool sets file...')),
             alwaysShow: true,
             iconClass: ThemeIcon.asClassName(Codicon.plus)
         });
@@ -296,7 +296,7 @@ class ConfigureToolSets extends Action2 {
         }
         const pick = await quickInputService.pick(picks, {
             canPickMany: false,
-            placeHolder: ( localize(5330, 'Select a tool set to configure')),
+            placeHolder: ( localize(5455, 'Select a tool set to configure')),
         });
         if (!pick) {
             return;
@@ -304,13 +304,13 @@ class ConfigureToolSets extends Action2 {
         let resource;
         if (!pick.toolset) {
             const name = await quickInputService.input({
-                placeHolder: ( localize(5331, "Type tool sets file name")),
+                placeHolder: ( localize(5456, "Type tool sets file name")),
                 validateInput: async (input) => {
                     if (!input) {
-                        return localize(5332, "Invalid file name");
+                        return localize(5457, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(5333, "'{0}' is not a valid file name", input);
+                        return localize(5458, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

package/vscode/src/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcomeHandler.js

@@ -13,7 +13,7 @@ import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-e28ac690-06
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(5336, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5462, 'Contributes a welcome message to a chat view')),
         type: 'array',
         items: {
             additionalProperties: false,
@@ -21,22 +21,22 @@ const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint
             properties: {
                 icon: {
                     type: 'string',
-                    description: ( localize(5337, 'The icon for the welcome message.')),
+                    description: ( localize(5463, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(5338, 'The title of the welcome message.')),
+                    description: ( localize(5464, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        5339,
+                        5465,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(5340, 'Condition when the welcome message is shown.')),
+                    description: ( localize(5466, 'Condition when the welcome message is shown.')),
                 }
             }
         },

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

@@ -1,7 +1,7 @@
 import { DeferredPromise } from "@codingame/monaco-vscode-api/vscode/vs/base/common/async";
 import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
-import { IChatExtensionsContent, IChatToolInputInvocationData, IChatTodoListContent, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IChatExtensionsContent, IChatToolInputInvocationData, IChatTodoListContent, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData, ConfirmedReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult, ToolDataSource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly toolCallId: string;
     readonly kind: "toolInvocation";
@@ -10,9 +10,9 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     private _isCompleteDeferred;
     get isCompletePromise(): Promise<void>;
     private _confirmDeferred;
-    get confirmed(): DeferredPromise<boolean>;
+    get confirmed(): DeferredPromise<ConfirmedReason>;
     private _isConfirmed;
-    get isConfirmed(): boolean | undefined;
+    get isConfirmed(): ConfirmedReason | undefined;
     private _resultDetails;
     get resultDetails(): IToolResult["toolResultDetails"] | undefined;
     readonly invocationMessage: string | IMarkdownString;
@@ -21,6 +21,7 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     private _confirmationMessages;
     readonly presentation: IPreparedToolInvocation["presentation"];
     readonly toolId: string;
+    readonly source: ToolDataSource;
     readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
     readonly progress: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<{
         message?: string | IMarkdownString;

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

@@ -3,6 +3,7 @@ import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { encodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ToolConfirmKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { isToolResultOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
@@ -29,7 +30,7 @@ class ChatToolInvocation {
         this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
         this.progress = observableValue(this, { progress: 0 });
-        const defaultMessage = ( localize(5415, "Using {0}", `"${toolData.displayName}"`));
+        const defaultMessage = ( localize(5543, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
@@ -38,9 +39,10 @@ class ChatToolInvocation {
         this.presentation = preparedInvocation?.presentation;
         this.toolSpecificData = preparedInvocation?.toolSpecificData;
         this.toolId = toolData.id;
+        this.source = toolData.source;
         if (!this._confirmationMessages) {
-            this._isConfirmed = true;
-            this._confirmDeferred.complete(true);
+            this._isConfirmed = { type: ToolConfirmKind.ConfirmationNotNeeded };
+            this._confirmDeferred.complete(this._isConfirmed);
         }
         this._confirmDeferred.p.then(confirmed => {
             this._isConfirmed = confirmed;
@@ -75,7 +77,8 @@ class ChatToolInvocation {
             pastTenseMessage: this.pastTenseMessage,
             originMessage: this.originMessage,
             isConfirmed: this._isConfirmed,
-            isComplete: this._isComplete,
+            isComplete: true,
+            source: this.source,
             resultDetails: isToolResultOutputDetails(this._resultDetails)
                 ? { output: { type: 'data', mimeType: this._resultDetails.output.mimeType, base64Data: encodeBase64(this._resultDetails.output.value) } }
                 : this._resultDetails,

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

@@ -7,7 +7,6 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
@@ -20,19 +19,16 @@ import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/wor
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
 import { IChatTransferService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatTransferService.service";
 import { ChatAgentLocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants";
-import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 export declare class ChatService extends Disposable implements IChatService {
     private readonly storageService;
     private readonly logService;
     private readonly extensionService;
     private readonly instantiationService;
-    private readonly telemetryService;
     private readonly workspaceContextService;
     private readonly chatSlashCommandService;
     private readonly chatAgentService;
     private readonly configurationService;
     private readonly chatTransferService;
-    private readonly languageModelsService;
     private readonly chatSessionService;
     private readonly mcpService;
     _serviceBrand: undefined;
@@ -62,7 +58,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private get useFileStorage();
     get edits2Enabled(): boolean;
     private get isEmptyWindow();
-    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, chatTransferService: IChatTransferService, languageModelsService: ILanguageModelsService, chatSessionService: IChatSessionsService, mcpService: IMcpService);
+    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, chatTransferService: IChatTransferService, chatSessionService: IChatSessionsService, mcpService: IMcpService);
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
     private syncEmptyWindowChats;
@@ -72,6 +68,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private error;
     private deserializeChats;
     private getTransferredSessionData;
+    private initializePersistedSessionsFromFileStorage;
     /**
      * Returns an array of chat details for all persisted chat sessions that have at least one request.
      * Chat sessions that have already been loaded into the chat view are excluded from the result.
@@ -80,7 +77,7 @@ export declare class ChatService extends Disposable implements IChatService {
     getHistory(): Promise<IChatDetail[]>;
     removeHistoryEntry(sessionId: string): Promise<void>;
     clearAllHistoryEntries(): Promise<void>;
-    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean): ChatModel;
+    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, inputType?: string): ChatModel;
     private _startSession;
     private initializeSession;
     activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
@@ -90,6 +87,7 @@ export declare class ChatService extends Disposable implements IChatService {
      * This is really just for migrating data from the edit session location to the panel.
      */
     isPersistedSessionEmpty(sessionId: string): boolean;
+    getPersistedSessionTitle(sessionId: string): string | undefined;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModel | undefined;
     loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
@@ -97,9 +95,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
-    private resolveModelId;
     private prepareContext;
-    private attachmentKindsForTelemetry;
     private getHistoryEntriesFromModel;
     removeRequest(sessionId: string, requestId: string): Promise<void>;
     adoptRequest(sessionId: string, request: IChatRequestModel): Promise<void>;