@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

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

@@ -44,11 +44,11 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(5446, "Empty tool set")),
+            label: ( localize(5506, "Empty tool set")),
             body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
         }],
     type: 'object',
-    description: ( localize(5447, 'User tool sets configuration')),
+    description: ( localize(5507, 'User tool sets configuration')),
     additionalProperties: {
         type: 'object',
         required: ['tools'],
@@ -56,7 +56,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    5448,
+                    5508,
                     "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,7 +69,7 @@ const toolSetsSchema = {
             },
             icon: {
                 description: ( localize(
-                    5449,
+                    5509,
                     'Icon to use for this tool set in the UI. Uses the "\\$(name)"-syntax, like "\\$(zap)"'
                 )),
                 type: 'string',
@@ -77,7 +77,7 @@ const toolSetsSchema = {
                 markdownEnumDescriptions: Array.from(getAllCodicons(), icon => `$(${icon.id})`),
             },
             description: {
-                description: ( localize(5450, "A short description of this tool set.")),
+                description: ( localize(5510, "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(5451, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(5511, "{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(5452, 'Configure Tool Sets...')),
-            shortTitle: ( localize(5453, "Tool Sets")),
+            title: ( localize2(5512, 'Configure Tool Sets...')),
+            shortTitle: ( localize(5513, "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(5454, 'Create new tool sets file...')),
+            label: ( localize(5514, '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(5455, 'Select a tool set to configure')),
+            placeHolder: ( localize(5515, '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(5456, "Type tool sets file name")),
+                placeHolder: ( localize(5516, "Type tool sets file name")),
                 validateInput: async (input) => {
                     if (!input) {
-                        return localize(5457, "Invalid file name");
+                        return localize(5517, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(5458, "'{0}' is not a valid file name", input);
+                        return localize(5518, "'{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(5462, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5524, '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(5463, 'The icon for the welcome message.')),
+                    description: ( localize(5525, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(5464, 'The title of the welcome message.')),
+                    description: ( localize(5526, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        5465,
+                        5527,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(5466, 'Condition when the welcome message is shown.')),
+                    description: ( localize(5528, 'Condition when the welcome message is shown.')),
                 }
             }
         },

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

@@ -1,6 +1,6 @@
 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, ConfirmedReason } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { ConfirmedReason, IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } 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;
@@ -11,7 +11,6 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     get isCompletePromise(): Promise<void>;
     private _confirmDeferred;
     get confirmed(): DeferredPromise<ConfirmedReason>;
-    private _isConfirmed;
     get isConfirmed(): ConfirmedReason | undefined;
     private _resultDetails;
     get resultDetails(): IToolResult["toolResultDetails"] | undefined;
@@ -22,12 +21,13 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly presentation: IPreparedToolInvocation["presentation"];
     readonly toolId: string;
     readonly source: ToolDataSource;
+    readonly fromSubAgent: boolean | undefined;
     readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData | IChatExtensionsContent | IChatTodoListContent;
     readonly progress: import("@codingame/monaco-vscode-api/vscode/vs/base/common/observable").ISettableObservable<{
         message?: string | IMarkdownString;
         progress: number;
     }, void>;
-    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, toolCallId: string);
+    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, toolCallId: string, fromSubAgent: boolean | undefined);
     complete(result: IToolResult | undefined): void;
     get confirmationMessages(): IToolConfirmationMessages | undefined;
     acceptProgress(step: IToolProgressStep): void;

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

@@ -18,19 +18,19 @@ class ChatToolInvocation {
         return this._confirmDeferred;
     }
     get isConfirmed() {
-        return this._isConfirmed;
+        return this._confirmDeferred.value;
     }
     get resultDetails() {
         return this._resultDetails;
     }
-    constructor(preparedInvocation, toolData, toolCallId) {
+    constructor(preparedInvocation, toolData, toolCallId, fromSubAgent) {
         this.toolCallId = toolCallId;
         this.kind = 'toolInvocation';
         this._isComplete = false;
         this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
         this.progress = observableValue(this, { progress: 0 });
-        const defaultMessage = ( localize(5543, "Using {0}", `"${toolData.displayName}"`));
+        const defaultMessage = ( localize(5598, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
@@ -40,12 +40,11 @@ class ChatToolInvocation {
         this.toolSpecificData = preparedInvocation?.toolSpecificData;
         this.toolId = toolData.id;
         this.source = toolData.source;
+        this.fromSubAgent = fromSubAgent;
         if (!this._confirmationMessages) {
-            this._isConfirmed = { type: ToolConfirmKind.ConfirmationNotNeeded };
-            this._confirmDeferred.complete(this._isConfirmed);
+            this._confirmDeferred.complete({ type: ToolConfirmKind.ConfirmationNotNeeded });
         }
-        this._confirmDeferred.p.then(confirmed => {
-            this._isConfirmed = confirmed;
+        this._confirmDeferred.p.then(() => {
             this._confirmationMessages = undefined;
         });
         this._isCompleteDeferred.p.then(() => {
@@ -65,7 +64,7 @@ class ChatToolInvocation {
     acceptProgress(step) {
         const prev = this.progress.get();
         this.progress.set({
-            progress: step.increment ? (prev.progress + step.increment) : prev.progress,
+            progress: step.progress || prev.progress || 0,
             message: step.message,
         }, undefined);
     }
@@ -76,7 +75,7 @@ class ChatToolInvocation {
             invocationMessage: this.invocationMessage,
             pastTenseMessage: this.pastTenseMessage,
             originMessage: this.originMessage,
-            isConfirmed: this._isConfirmed,
+            isConfirmed: this._confirmDeferred.value,
             isComplete: true,
             source: this.source,
             resultDetails: isToolResultOutputDetails(this._resultDetails)
@@ -85,6 +84,7 @@ class ChatToolInvocation {
             toolSpecificData: this.toolSpecificData,
             toolCallId: this.toolCallId,
             toolId: this.toolId,
+            fromSubAgent: this.fromSubAgent,
         };
     }
 }

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

@@ -26,5 +26,6 @@ export declare class ChatResponseResourceFileSystemProvider extends Disposable i
     ][]>;
     rename(): Promise<void>;
     writeFile(): Promise<void>;
+    private findMatchingInvocation;
     private lookupURI;
 }

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

@@ -61,24 +61,32 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
     writeFile() {
         throw createFileSystemProviderError('fs is readonly', FileSystemProviderErrorCode.NoPermissions);
     }
-    lookupURI(uri) {
+    findMatchingInvocation(uri) {
         const parsed = ChatResponseResource.parseUri(uri);
         if (!parsed) {
             throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
         }
-        const { sessionId, requestId, toolCallId } = parsed;
-        const result = this.chatService.getSession(sessionId)
-            ?.getRequests()
-            .find(r => r.id === requestId)
-            ?.response?.entireResponse.value
-            .find((r) => (r.kind === 'toolInvocation' || r.kind === 'toolInvocationSerialized') && r.toolCallId === toolCallId);
-        if (!result) {
+        const { sessionId, toolCallId, index } = parsed;
+        const session = this.chatService.getSession(sessionId);
+        if (!session) {
             throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
         }
+        const requests = session.getRequests();
+        for (let k = requests.length - 1; k >= 0; k--) {
+            const req = requests[k];
+            const tc = req.response?.entireResponse.value.find((r) => (r.kind === 'toolInvocation' || r.kind === 'toolInvocationSerialized') && r.toolCallId === toolCallId);
+            if (tc) {
+                return { result: tc, index };
+            }
+        }
+        throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
+    }
+    lookupURI(uri) {
+        const { result, index } = this.findMatchingInvocation(uri);
         if (!isToolResultInputOutputDetails(result.resultDetails)) {
             throw createFileSystemProviderError(`Tool does not have I/O`, FileSystemProviderErrorCode.FileNotFound);
         }
-        const part = result.resultDetails.output.at(parsed.index);
+        const part = result.resultDetails.output.at(index);
         if (!part) {
             throw createFileSystemProviderError(`Tool does not have part`, FileSystemProviderErrorCode.FileNotFound);
         }

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

@@ -34,10 +34,9 @@ export declare class ChatService extends Disposable implements IChatService {
     _serviceBrand: undefined;
     private readonly _sessionModels;
     private readonly _contentProviderSessionModels;
+    private readonly _modelToExternalSession;
     private readonly _pendingRequests;
     private _persistedSessions;
-    /** Just for empty windows, need to enforce that a chat was deleted, even though other windows still have it */
-    private _deletedChatIds;
     private _transferredSessionData;
     get transferredSessionData(): IChatTransferredSessionData | undefined;
     private readonly _onDidSubmitRequest;
@@ -54,14 +53,14 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly _sessionFollowupCancelTokens;
     private readonly _chatServiceTelemetry;
     private readonly _chatSessionStore;
+    private _mcpServersInteractionMessageShown;
     readonly requestInProgressObs: IObservable<boolean>;
-    private get useFileStorage();
     get edits2Enabled(): boolean;
     private get isEmptyWindow();
     constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, chatTransferService: IChatTransferService, chatSessionService: IChatSessionsService, mcpService: IMcpService);
+    get editingSessions(): import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService").IChatEditingSession[];
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
-    private syncEmptyWindowChats;
     notifyUserAction(action: IChatUserActionEvent): void;
     setChatSessionTitle(sessionId: string, title: string): Promise<void>;
     private trace;
@@ -90,6 +89,11 @@ export declare class ChatService extends Disposable implements IChatService {
     getPersistedSessionTitle(sessionId: string): string | undefined;
     loadSessionFromContent(data: IExportableChatData | ISerializableChatData): IChatModel | undefined;
     loadSessionForResource(resource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
+    getChatSessionFromInternalId(modelSessionId: string): {
+        chatSessionType: string;
+        chatSessionId: string;
+        isUntitled: boolean;
+    } | undefined;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
     sendRequest(sessionId: string, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
     private parseChatRequest;