@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

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

@@ -0,0 +1,89 @@
+
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { chatEditingWidgetFileStateContextKey, ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { getCleanPromptName } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
+import { PROMPT_LANGUAGE_ID, PromptsType, AGENT_LANGUAGE_ID, INSTRUCTIONS_LANGUAGE_ID } from '@codingame/monaco-vscode-8d4ef243-d8c1-540d-9f11-38df46f54c9f-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { askForPromptFileName } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptName';
+import { askForPromptSourceFolder } from '@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/chat/browser/promptSyntax/pickers/askForPromptSourceFolder';
+
+class BaseSaveAsPromptFileAction extends Action2 {
+    constructor(opts, promptType) {
+        super(opts);
+        this.promptType = promptType;
+    }
+    async run(accessor, configUri) {
+        const instantiationService = accessor.get(IInstantiationService);
+        const codeEditorService = accessor.get(ICodeEditorService);
+        const textFileService = accessor.get(ITextFileService);
+        const fileService = accessor.get(IFileService);
+        const activeCodeEditor = codeEditorService.getActiveCodeEditor();
+        if (!activeCodeEditor) {
+            return;
+        }
+        const model = activeCodeEditor.getModel();
+        if (!model) {
+            return;
+        }
+        const newFolder = await instantiationService.invokeFunction(askForPromptSourceFolder, this.promptType, undefined, true);
+        if (!newFolder) {
+            return;
+        }
+        const newName = await instantiationService.invokeFunction(askForPromptFileName, this.promptType, newFolder.uri, getCleanPromptName(model.uri));
+        if (!newName) {
+            return;
+        }
+        const newFile = joinPath(newFolder.uri, newName);
+        if (model.uri.scheme === Schemas.untitled) {
+            await textFileService.saveAs(model.uri, newFile, { from: model.uri });
+        }
+        else {
+            await fileService.copy(model.uri, newFile);
+        }
+        await codeEditorService.openCodeEditor({ resource: newFile }, activeCodeEditor);
+    }
+}
+function createOptions(id, title, description, languageId) {
+    return {
+        id: id,
+        title: title,
+        metadata: {
+            description: description,
+        },
+        category: CHAT_CATEGORY,
+        f1: false,
+        menu: {
+            id: MenuId.EditorContent,
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals(ResourceContextKey.Scheme.key, Schemas.untitled)), ( ContextKeyExpr.equals(ResourceContextKey.LangId.key, languageId)), ( ContextKeyExpr.notEquals(chatEditingWidgetFileStateContextKey.key, ModifiedFileEntryState.Modified))))
+        }
+    };
+}
+const SAVE_AS_PROMPT_FILE_ACTION_ID = 'workbench.action.chat.save-as-prompt';
+class SaveAsPromptFileAction extends BaseSaveAsPromptFileAction {
+    constructor() {
+        super(createOptions(SAVE_AS_PROMPT_FILE_ACTION_ID, ( localize2(5701, "Save As Prompt File")), ( localize2(5702, "Save as prompt file")), PROMPT_LANGUAGE_ID), PromptsType.prompt);
+    }
+}
+const SAVE_AS_AGENT_FILE_ACTION_ID = 'workbench.action.chat.save-as-agent';
+class SaveAsAgentFileAction extends BaseSaveAsPromptFileAction {
+    constructor() {
+        super(createOptions(SAVE_AS_AGENT_FILE_ACTION_ID, ( localize2(5703, "Save As Agent File")), ( localize2(5704, "Save as agent file")), AGENT_LANGUAGE_ID), PromptsType.agent);
+    }
+}
+const SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID = 'workbench.action.chat.save-as-instructions';
+class SaveAsInstructionsFileAction extends BaseSaveAsPromptFileAction {
+    constructor() {
+        super(createOptions(SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, ( localize2(5705, "Save As Instructions File")), ( localize2(5706, "Save as instructions file")), INSTRUCTIONS_LANGUAGE_ID), PromptsType.instructions);
+    }
+}
+
+export { SAVE_AS_AGENT_FILE_ACTION_ID, SAVE_AS_INSTRUCTIONS_FILE_ACTION_ID, SAVE_AS_PROMPT_FILE_ACTION_ID, SaveAsAgentFileAction, SaveAsInstructionsFileAction, SaveAsPromptFileAction };

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

@@ -18,7 +18,7 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
-import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CONFIG_MENU_ID, CHAT_CATEGORY } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -29,7 +29,7 @@ import { parse } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-17323564
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { ChatViewId } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -44,11 +44,11 @@ const toolSetsSchema = {
     allowComments: true,
     allowTrailingCommas: true,
     defaultSnippets: [{
-            label: ( localize(5506, "Empty tool set")),
+            label: ( localize(5707, "Empty tool set")),
             body: { '${1:toolSetName}': { 'tools': ['${2:someTool}', '${3:anotherTool}'], 'description': '${4:description}', 'icon': '${5:tools}' } }
         }],
     type: 'object',
-    description: ( localize(5507, 'User tool sets configuration')),
+    description: ( localize(5708, 'User tool sets configuration')),
     additionalProperties: {
         type: 'object',
         required: ['tools'],
@@ -56,7 +56,7 @@ const toolSetsSchema = {
         properties: {
             tools: {
                 description: ( localize(
-                    5508,
+                    5709,
                     "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(
-                    5509,
+                    5710,
                     '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(5510, "A short description of this tool set.")),
+                description: ( localize(5711, "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(5511, "{1} ({0})\n\n{2}", item.sourceLabel, item.name, item.description)));
+                toolEnumDescriptions.push(( localize(5712, "{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(5512, 'Configure Tool Sets...')),
-            shortTitle: ( localize(5513, "Tool Sets")),
+            title: ( localize2(5713, 'Configure Tool Sets...')),
+            shortTitle: ( localize(5714, "Tool Sets")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ChatContextKeys.Tools.toolsCount.greater(0))),
@@ -266,7 +266,7 @@ class ConfigureToolSets extends Action2 {
                 id: CHAT_CONFIG_MENU_ID,
                 when: ( ContextKeyExpr.equals('view', ChatViewId)),
                 order: 11,
-                group: '0_level'
+                group: '2_level'
             },
         });
     }
@@ -279,7 +279,7 @@ class ConfigureToolSets extends Action2 {
         const textFileService = accessor.get(ITextFileService);
         const picks = [];
         picks.push({
-            label: ( localize(5514, 'Create new tool sets file...')),
+            label: ( localize(5715, '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(5515, 'Select a tool set to configure')),
+            placeHolder: ( localize(5716, '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(5516, "Type tool sets file name")),
+                placeHolder: ( localize(5717, "Type tool sets file name")),
                 validateInput: async (input) => {
                     if (!input) {
-                        return localize(5517, "Invalid file name");
+                        return localize(5718, "Invalid file name");
                     }
                     if (!isValidBasename(input)) {
-                        return localize(5518, "'{0}' is not a valid file name", input);
+                        return localize(5719, "'{0}' is not a valid file name", input);
                     }
                     return undefined;
                 }

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

@@ -8,40 +8,41 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { checkProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 
+const chatViewsWelcomeJsonSchema = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['icon', 'title', 'contents', 'when'],
+    properties: {
+        icon: {
+            type: 'string',
+            description: ( localize(5725, 'The icon for the welcome message.')),
+        },
+        title: {
+            type: 'string',
+            description: ( localize(5726, 'The title of the welcome message.')),
+        },
+        content: {
+            type: 'string',
+            description: ( localize(
+                5727,
+                'The content of the welcome message. The first command link will be rendered as a button.'
+            )),
+        },
+        when: {
+            type: 'string',
+            description: ( localize(5728, 'Condition when the welcome message is shown.')),
+        }
+    }
+};
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(5524, 'Contributes a welcome message to a chat view')),
+        description: ( localize(5729, 'Contributes a welcome message to a chat view')),
         type: 'array',
-        items: {
-            additionalProperties: false,
-            type: 'object',
-            properties: {
-                icon: {
-                    type: 'string',
-                    description: ( localize(5525, 'The icon for the welcome message.')),
-                },
-                title: {
-                    type: 'string',
-                    description: ( localize(5526, 'The title of the welcome message.')),
-                },
-                content: {
-                    type: 'string',
-                    description: ( localize(
-                        5527,
-                        'The content of the welcome message. The first command link will be rendered as a button.'
-                    )),
-                },
-                when: {
-                    type: 'string',
-                    description: ( localize(5528, 'Condition when the welcome message is shown.')),
-                }
-            }
-        },
-        required: ['icon', 'title', 'contents', 'when'],
-    }
+        items: chatViewsWelcomeJsonSchema,
+    },
 });
 let ChatViewsWelcomeHandler = class ChatViewsWelcomeHandler {
     static { this.ID = 'workbench.contrib.chatViewsWelcomeHandler'; }

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

@@ -1,35 +1,26 @@
-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 { ConfirmedReason, IChatExtensionsContent, IChatTodoListContent, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized, type IChatTerminalToolInvocationData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { 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;
     readonly kind: "toolInvocation";
-    private _isComplete;
-    get isComplete(): boolean;
-    private _isCompleteDeferred;
-    get isCompletePromise(): Promise<void>;
-    private _confirmDeferred;
-    get confirmed(): DeferredPromise<ConfirmedReason>;
-    get isConfirmed(): ConfirmedReason | undefined;
-    private _resultDetails;
-    get resultDetails(): IToolResult["toolResultDetails"] | undefined;
     readonly invocationMessage: string | IMarkdownString;
     readonly originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
-    private _confirmationMessages;
+    confirmationMessages: IToolConfirmationMessages | undefined;
     readonly presentation: IPreparedToolInvocation["presentation"];
     readonly toolId: string;
     readonly source: ToolDataSource;
     readonly fromSubAgent: boolean | undefined;
+    readonly parameters: unknown;
     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, fromSubAgent: boolean | undefined);
-    complete(result: IToolResult | undefined): void;
-    get confirmationMessages(): IToolConfirmationMessages | undefined;
+    private readonly _progress;
+    private readonly _state;
+    get state(): IObservable<IChatToolInvocation.State>;
+    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, toolCallId: string, fromSubAgent: boolean | undefined, parameters: unknown);
+    private _setCompleted;
+    didExecuteTool(result: IToolResult | undefined, final?: boolean): IChatToolInvocation.State;
     acceptProgress(step: IToolProgressStep): void;
     toJSON(): IChatToolInvocationSerialized;
 }

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

@@ -1,86 +1,104 @@
 
-import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 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 { ToolConfirmKind, IChatToolInvocation } 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';
 
 class ChatToolInvocation {
-    get isComplete() {
-        return this._isComplete;
+    get state() {
+        return this._state;
     }
-    get isCompletePromise() {
-        return this._isCompleteDeferred.p;
-    }
-    get confirmed() {
-        return this._confirmDeferred;
-    }
-    get isConfirmed() {
-        return this._confirmDeferred.value;
-    }
-    get resultDetails() {
-        return this._resultDetails;
-    }
-    constructor(preparedInvocation, toolData, toolCallId, fromSubAgent) {
+    constructor(preparedInvocation, toolData, toolCallId, fromSubAgent, parameters) {
         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(5598, "Using {0}", `"${toolData.displayName}"`));
+        this._progress = observableValue(this, { progress: 0 });
+        const defaultMessage = ( localize(5802, "Using {0}", `"${toolData.displayName}"`));
         const invocationMessage = preparedInvocation?.invocationMessage ?? defaultMessage;
         this.invocationMessage = invocationMessage;
         this.pastTenseMessage = preparedInvocation?.pastTenseMessage;
         this.originMessage = preparedInvocation?.originMessage;
-        this._confirmationMessages = preparedInvocation?.confirmationMessages;
+        this.confirmationMessages = preparedInvocation?.confirmationMessages;
         this.presentation = preparedInvocation?.presentation;
         this.toolSpecificData = preparedInvocation?.toolSpecificData;
         this.toolId = toolData.id;
         this.source = toolData.source;
         this.fromSubAgent = fromSubAgent;
-        if (!this._confirmationMessages) {
-            this._confirmDeferred.complete({ type: ToolConfirmKind.ConfirmationNotNeeded });
+        this.parameters = parameters;
+        if (!this.confirmationMessages?.title) {
+            this._state = observableValue(this, { type: IChatToolInvocation.StateKind.Executing, confirmed: { type: ToolConfirmKind.ConfirmationNotNeeded }, progress: this._progress });
+        }
+        else {
+            this._state = observableValue(this, {
+                type: IChatToolInvocation.StateKind.WaitingForConfirmation,
+                confirm: reason => {
+                    if (reason.type === ToolConfirmKind.Denied || reason.type === ToolConfirmKind.Skipped) {
+                        this._state.set({ type: IChatToolInvocation.StateKind.Cancelled, reason: reason.type }, undefined);
+                    }
+                    else {
+                        this._state.set({ type: IChatToolInvocation.StateKind.Executing, confirmed: reason, progress: this._progress }, undefined);
+                    }
+                }
+            });
+        }
+    }
+    _setCompleted(result, postConfirmed) {
+        if (postConfirmed && (postConfirmed.type === ToolConfirmKind.Denied || postConfirmed.type === ToolConfirmKind.Skipped)) {
+            this._state.set({ type: IChatToolInvocation.StateKind.Cancelled, reason: postConfirmed.type }, undefined);
+            return;
         }
-        this._confirmDeferred.p.then(() => {
-            this._confirmationMessages = undefined;
-        });
-        this._isCompleteDeferred.p.then(() => {
-            this._isComplete = true;
-        });
+        this._state.set({
+            type: IChatToolInvocation.StateKind.Completed,
+            confirmed: IChatToolInvocation.executionConfirmedOrDenied(this) || { type: ToolConfirmKind.ConfirmationNotNeeded },
+            resultDetails: result?.toolResultDetails,
+            postConfirmed,
+            contentForModel: result?.content || [],
+        }, undefined);
     }
-    complete(result) {
+    didExecuteTool(result, final) {
         if (result?.toolResultMessage) {
             this.pastTenseMessage = result.toolResultMessage;
         }
-        this._resultDetails = result?.toolResultDetails;
-        this._isCompleteDeferred.complete();
-    }
-    get confirmationMessages() {
-        return this._confirmationMessages;
+        else if (this._progress.get().message) {
+            this.pastTenseMessage = this._progress.get().message;
+        }
+        if (this.confirmationMessages?.confirmResults && !result?.toolResultError && result?.confirmResults !== false && !final) {
+            this._state.set({
+                type: IChatToolInvocation.StateKind.WaitingForPostApproval,
+                confirmed: IChatToolInvocation.executionConfirmedOrDenied(this) || { type: ToolConfirmKind.ConfirmationNotNeeded },
+                resultDetails: result?.toolResultDetails,
+                contentForModel: result?.content || [],
+                confirm: reason => this._setCompleted(result, reason),
+            }, undefined);
+        }
+        else {
+            this._setCompleted(result);
+        }
+        return this._state.get();
     }
     acceptProgress(step) {
-        const prev = this.progress.get();
-        this.progress.set({
+        const prev = this._progress.get();
+        this._progress.set({
             progress: step.progress || prev.progress || 0,
             message: step.message,
         }, undefined);
     }
     toJSON() {
+        const waitingForPostApproval = this.state.get().type === IChatToolInvocation.StateKind.WaitingForPostApproval;
+        const details = waitingForPostApproval ? undefined : IChatToolInvocation.resultDetails(this);
         return {
             kind: 'toolInvocationSerialized',
             presentation: this.presentation,
             invocationMessage: this.invocationMessage,
             pastTenseMessage: this.pastTenseMessage,
             originMessage: this.originMessage,
-            isConfirmed: this._confirmDeferred.value,
+            isConfirmed: waitingForPostApproval ? { type: ToolConfirmKind.Skipped } : IChatToolInvocation.executionConfirmedOrDenied(this),
             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,
+            resultDetails: isToolResultOutputDetails(details)
+                ? { output: { type: 'data', mimeType: details.output.mimeType, base64Data: encodeBase64(details.output.value) } }
+                : details,
             toolSpecificData: this.toolSpecificData,
             toolCallId: this.toolCallId,
             toolId: this.toolId,

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

@@ -6,8 +6,10 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { newWriteableStream } from '@codingame/monaco-vscode-api/vscode/vs/base/common/stream';
 import { FileSystemProviderCapabilities, FileType, createFileSystemProviderError, FileSystemProviderErrorCode } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { ChatResponseResource } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatResponseResource } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { IChatToolInvocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
 import { isToolResultInputOutputDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 
 let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSystemProvider extends Disposable {
@@ -67,7 +69,7 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
             throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
         }
         const { sessionId, toolCallId, index } = parsed;
-        const session = this.chatService.getSession(sessionId);
+        const session = this.chatService.getSession(LocalChatSessionUri.forSession(sessionId));
         if (!session) {
             throw createFileSystemProviderError(`File not found`, FileSystemProviderErrorCode.FileNotFound);
         }
@@ -83,10 +85,11 @@ let ChatResponseResourceFileSystemProvider = class ChatResponseResourceFileSyste
     }
     lookupURI(uri) {
         const { result, index } = this.findMatchingInvocation(uri);
-        if (!isToolResultInputOutputDetails(result.resultDetails)) {
+        const details = IChatToolInvocation.resultDetails(result);
+        if (!isToolResultInputOutputDetails(details)) {
             throw createFileSystemProviderError(`Tool does not have I/O`, FileSystemProviderErrorCode.FileNotFound);
         }
-        const part = result.resultDetails.output.at(index);
+        const part = details.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

@@ -11,9 +11,10 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 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";
 import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
-import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatEditingSession } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { IChatCompleteResponse, IChatDetail, IChatSendRequestData, IChatSendRequestOptions, IChatSessionContext, IChatTransferredSessionData, IChatUserActionEvent } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
@@ -34,35 +35,33 @@ export declare class ChatService extends Disposable implements IChatService {
     _serviceBrand: undefined;
     private readonly _sessionModels;
     private readonly _contentProviderSessionModels;
-    private readonly _modelToExternalSession;
     private readonly _pendingRequests;
     private _persistedSessions;
     private _transferredSessionData;
     get transferredSessionData(): IChatTransferredSessionData | undefined;
     private readonly _onDidSubmitRequest;
     readonly onDidSubmitRequest: Event<{
-        chatSessionId: string;
+        readonly chatSessionResource: URI;
     }>;
     private readonly _onDidPerformUserAction;
     readonly onDidPerformUserAction: Event<IChatUserActionEvent>;
     private readonly _onDidDisposeSession;
     readonly onDidDisposeSession: Event<{
-        sessionId: string;
+        readonly sessionResource: URI;
         reason: "cleared";
     }>;
     private readonly _sessionFollowupCancelTokens;
     private readonly _chatServiceTelemetry;
     private readonly _chatSessionStore;
-    private _mcpServersInteractionMessageShown;
     readonly requestInProgressObs: IObservable<boolean>;
     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[];
+    get editingSessions(): IChatEditingSession[];
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
     notifyUserAction(action: IChatUserActionEvent): void;
-    setChatSessionTitle(sessionId: string, title: string): Promise<void>;
+    setChatSessionTitle(sessionResource: URI, title: string): Promise<void>;
     private trace;
     private error;
     private deserializeChats;
@@ -73,41 +72,42 @@ export declare class ChatService extends Disposable implements IChatService {
      * Chat sessions that have already been loaded into the chat view are excluded from the result.
      * Imported chat sessions are also excluded from the result.
      */
-    getHistory(): Promise<IChatDetail[]>;
-    removeHistoryEntry(sessionId: string): Promise<void>;
+    getLocalSessionHistory(): Promise<IChatDetail[]>;
+    shouldBeInHistory(entry: Partial<ChatModel>): boolean | "" | undefined;
+    removeHistoryEntry(sessionResource: URI): Promise<void>;
     clearAllHistoryEntries(): Promise<void>;
-    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, inputType?: string): ChatModel;
+    startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean, options?: {
+        canUseTools?: boolean;
+    }): ChatModel;
     private _startSession;
     private initializeSession;
     activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
-    getSession(sessionId: string): IChatModel | undefined;
-    getOrRestoreSession(sessionId: string): Promise<ChatModel | undefined>;
+    getSession(sessionResource: URI): IChatModel | undefined;
+    getSessionByLegacyId(sessionId: string): IChatModel | undefined;
+    getOrRestoreSession(sessionResource: URI): Promise<ChatModel | undefined>;
     /**
      * This is really just for migrating data from the edit session location to the panel.
      */
-    isPersistedSessionEmpty(sessionId: string): boolean;
-    getPersistedSessionTitle(sessionId: string): string | undefined;
+    isPersistedSessionEmpty(sessionResource: URI): boolean;
+    getPersistedSessionTitle(sessionResource: URI): 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;
+    loadSessionForResource(chatSessionResource: URI, location: ChatAgentLocation, token: CancellationToken): Promise<IChatModel | undefined>;
+    getChatSessionFromInternalUri(sessionResource: URI): IChatSessionContext | undefined;
     resendRequest(request: IChatRequestModel, options?: IChatSendRequestOptions): Promise<void>;
-    sendRequest(sessionId: string, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
+    sendRequest(sessionResource: URI, request: string, options?: IChatSendRequestOptions): Promise<IChatSendRequestData | undefined>;
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
     private prepareContext;
     private getHistoryEntriesFromModel;
-    removeRequest(sessionId: string, requestId: string): Promise<void>;
-    adoptRequest(sessionId: string, request: IChatRequestModel): Promise<void>;
-    addCompleteRequest(sessionId: string, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): Promise<void>;
-    cancelCurrentRequestForSession(sessionId: string): void;
-    clearSession(sessionId: string): Promise<void>;
+    removeRequest(sessionResource: URI, requestId: string): Promise<void>;
+    adoptRequest(sessionResource: URI, request: IChatRequestModel): Promise<void>;
+    addCompleteRequest(sessionResource: URI, message: IParsedChatRequest | string, variableData: IChatRequestVariableData | undefined, attempt: number | undefined, response: IChatCompleteResponse): Promise<void>;
+    cancelCurrentRequestForSession(sessionResource: URI): void;
+    clearSession(sessionResource: URI): Promise<void>;
     hasSessions(): boolean;
     transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
     getChatStorageFolder(): URI;
     logChatIndex(): void;
+    private toLocalSessionId;
 }