@codingame/monaco-vscode-chat-service-override 16.1.0 → 17.0.0

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

@@ -1,34 +1,36 @@
 
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { SnippetController2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { createPromptFile } from './utils/createPromptFile.js';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { askForPromptName } from './dialogs/askForPromptName.js';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { askForPromptSourceFolder } from './dialogs/askForPromptSourceFolder.js';
+import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
+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 { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { NeverShowAgainScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { PromptsConfig } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/config';
-import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
-import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { PromptsConfig } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/config';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { CONFIGURE_SYNC_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataSync/common/userDataSync';
 import { SyncResource } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync';
 import { IUserDataSyncEnablementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/userDataSync.service';
-import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
-import { NeverShowAgainScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
-import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { CONFIGURE_SYNC_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataSync/common/userDataSync';
+import { ISnippetsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/snippets/browser/snippets.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
+import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { askForPromptFileName } from './dialogs/askForPromptName.js';
+import { askForPromptSourceFolder } from './dialogs/askForPromptSourceFolder.js';
+import { createPromptFile } from './utils/createPromptFile.js';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-const BASE_COMMAND_ID = 'workbench.command.prompts.create';
-const LOCAL_COMMAND_ID = `${BASE_COMMAND_ID}.local`;
-const USER_COMMAND_ID = `${BASE_COMMAND_ID}.user`;
-const LOCAL_COMMAND_TITLE = ( localize(4908, "Create Prompt"));
-const USER_COMMAND_TITLE = ( localize(4909, "Create User Prompt"));
 const command = async (accessor, type) => {
     const logService = accessor.get(ILogService);
     const fileService = accessor.get(IFileService);
@@ -40,12 +42,14 @@ const command = async (accessor, type) => {
     const notificationService = accessor.get(INotificationService);
     const workspaceService = accessor.get(IWorkspaceContextService);
     const userDataSyncEnablementService = accessor.get(IUserDataSyncEnablementService);
-    const fileName = await askForPromptName(type, quickInputService);
-    if (!fileName) {
-        return;
-    }
+    const snippetService = accessor.get(ISnippetsService);
+    const editorService = accessor.get(IEditorService);
+    const placeHolder = (type === 'instructions')
+        ? ( localize(4974, "Select a location to create the instructions file in..."))
+        : ( localize(4975, "Select a location to create the prompt file in..."));
     const selectedFolder = await askForPromptSourceFolder({
-        type: type,
+        type,
+        placeHolder,
         labelService,
         openerService,
         promptsService,
@@ -55,16 +59,30 @@ const command = async (accessor, type) => {
     if (!selectedFolder) {
         return;
     }
-    const content = ( localize(4910, "Add prompt contents..."));
+    const fileName = await askForPromptFileName(type, selectedFolder.uri, quickInputService, fileService);
+    if (!fileName) {
+        return;
+    }
     const promptUri = await createPromptFile({
         fileName,
-        folder: selectedFolder,
-        content,
+        folder: selectedFolder.uri,
+        content: '',
         fileService,
         openerService,
     });
     await openerService.open(promptUri);
-    if (type !== 'user') {
+    const editor = getCodeEditor(editorService.activeTextEditorControl);
+    if (editor && editor.hasModel() && isEqual(editor.getModel().uri, promptUri)) {
+        const languageId = type === 'instructions' ? INSTRUCTIONS_LANGUAGE_ID : PROMPT_LANGUAGE_ID;
+        const snippets = await snippetService.getSnippets(languageId, { fileTemplateSnippets: true, noRecencySort: true, includeNoPrefixSnippets: true });
+        if (snippets.length > 0) {
+            SnippetController2.get(editor)?.apply([{
+                    range: editor.getModel().getFullModelRange(),
+                    template: snippets[0].body
+                }]);
+        }
+    }
+    if (selectedFolder.storage !== 'user') {
         return;
     }
     const isConfigured = userDataSyncEnablementService
@@ -74,18 +92,24 @@ const command = async (accessor, type) => {
         return;
     }
     notificationService.prompt(Severity.Info, ( localize(
-        4911,
-        "User prompts are not currently synchronized. Do you want to enable synchronization of the user prompts?"
+        4976,
+        "Do you want to backup and sync your user prompt and instruction files with Setting Sync?'"
     )), [
         {
-            label: ( localize(4912, "Enable")),
+            label: ( localize(4977, "Enable")),
             run: () => {
                 commandService.executeCommand(CONFIGURE_SYNC_COMMAND_ID)
                     .catch((error) => {
                     logService.error(`Failed to run '${CONFIGURE_SYNC_COMMAND_ID}' command: ${error}.`);
                 });
             },
-        }
+        },
+        {
+            label: ( localize(4978, "Learn More")),
+            run: () => {
+                openerService.open(( URI.parse('https://aka.ms/vscode-settings-sync-help')));
+            },
+        },
     ], {
         neverShowAgain: {
             id: 'workbench.command.prompts.create.user.enable-sync-notification',
@@ -93,36 +117,27 @@ const command = async (accessor, type) => {
         },
     });
 };
-const commandFactory = (type) => {
-    return async (accessor) => {
-        return command(accessor, type);
-    };
-};
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: LOCAL_COMMAND_ID,
-    weight: KeybindingWeight.WorkbenchContrib,
-    handler: commandFactory('local'),
-    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
-});
-KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: USER_COMMAND_ID,
-    weight: KeybindingWeight.WorkbenchContrib,
-    handler: commandFactory('user'),
-    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
-});
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-    command: {
-        id: LOCAL_COMMAND_ID,
-        title: LOCAL_COMMAND_TITLE,
-        category: CHAT_CATEGORY
-    },
-    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled))
-});
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-    command: {
-        id: USER_COMMAND_ID,
-        title: USER_COMMAND_TITLE,
-        category: CHAT_CATEGORY,
-    },
-    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled))
-});
+function register(type, id, title) {
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id,
+        weight: KeybindingWeight.WorkbenchContrib,
+        handler: async (accessor) => {
+            return command(accessor, type);
+        },
+        when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
+    });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id,
+            title,
+            category: CHAT_CATEGORY
+        },
+        when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled))
+    });
+}
+const NEW_PROMPT_COMMAND_ID = 'workbench.command.new.prompt';
+const NEW_INSTRUCTIONS_COMMAND_ID = 'workbench.command.new.instructions';
+register('instructions', NEW_INSTRUCTIONS_COMMAND_ID, ( localize(4979, "New Instructions File...")));
+register('prompt', NEW_PROMPT_COMMAND_ID, ( localize(4980, "New Prompt File...")));
+
+export { NEW_INSTRUCTIONS_COMMAND_ID, NEW_PROMPT_COMMAND_ID };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.d.ts

@@ -1,2 +1,5 @@
+import { TPromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
-export declare const askForPromptName: (_type: "local" | "user", quickInputService: IQuickInputService) => Promise<string | undefined>;
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
+export declare const askForPromptFileName: (type: TPromptsType, selectedFolder: URI, quickInputService: IQuickInputService, fileService: IFileService) => Promise<string | undefined>;

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptName.js

@@ -1,22 +1,52 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { PROMPT_FILE_EXTENSION } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
+import { getPromptFileExtension } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { isValidBasename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
 
-const askForPromptName = async (_type, quickInputService) => {
-    const result = await quickInputService.input({
-        placeHolder: ( localize(4913, "Provide a prompt name", PROMPT_FILE_EXTENSION)),
-    });
-    if (!result) {
+const askForPromptFileName = async (type, selectedFolder, quickInputService, fileService) => {
+    const placeHolder = (type === 'instructions')
+        ? ( localize(4981, "Enter the name of the instructions file"))
+        : ( localize(4982, "Enter the name of the prompt file"));
+    const sanitizeInput = (input) => {
+        const trimmedName = input.trim();
+        if (!trimmedName) {
+            return undefined;
+        }
+        const fileExtension = getPromptFileExtension(type);
+        return (trimmedName.endsWith(fileExtension))
+            ? trimmedName
+            : `${trimmedName}${fileExtension}`;
+    };
+    const validateInput = async (value) => {
+        const fileName = sanitizeInput(value);
+        if (!fileName) {
+            return {
+                content: ( localize(4983, "Please enter a name.")),
+                severity: Severity.Warning
+            };
+        }
+        if (!isValidBasename(fileName)) {
+            return {
+                content: ( localize(4984, "The name contains invalid characters.")),
+                severity: Severity.Error
+            };
+        }
+        const fileUri = URI.joinPath(selectedFolder, fileName);
+        if (await fileService.exists(fileUri)) {
+            return {
+                content: ( localize(4985, "A file for the given name already exists.")),
+                severity: Severity.Error
+            };
+        }
         return undefined;
-    }
-    const trimmedName = result.trim();
-    if (!trimmedName) {
+    };
+    const result = await quickInputService.input({ placeHolder, validateInput });
+    if (!result) {
         return undefined;
     }
-    const cleanName = (trimmedName.endsWith(PROMPT_FILE_EXTENSION))
-        ? trimmedName
-        : `${trimmedName}${PROMPT_FILE_EXTENSION}`;
-    return cleanName;
+    return sanitizeInput(result);
 };
 
-export { askForPromptName };
+export { askForPromptFileName };

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.d.ts

@@ -1,16 +1,17 @@
-import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IPromptPath, TPromptsType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types";
+import { IPromptsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/types.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 interface IAskForFolderOptions {
-    readonly type: "local" | "user";
+    readonly type: TPromptsType;
+    readonly placeHolder: string;
     readonly labelService: ILabelService;
     readonly openerService: IOpenerService;
     readonly promptsService: IPromptsService;
     readonly quickInputService: IQuickInputService;
     readonly workspaceService: IWorkspaceContextService;
 }
-export declare const askForPromptSourceFolder: (options: IAskForFolderOptions) => Promise<URI | undefined>;
+export declare const askForPromptSourceFolder: (options: IAskForFolderOptions) => Promise<IPromptPath | undefined>;
 export {};

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/dialogs/askForPromptSourceFolder.js

@@ -1,24 +1,34 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { DOCUMENTATION_URL } from '../../../../../common/promptSyntax/constants.js';
 import { extUri, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/constants';
 
 const askForPromptSourceFolder = async (options) => {
-    const { type, promptsService, quickInputService, labelService, openerService, workspaceService } = options;
+    const { type, placeHolder, promptsService, quickInputService, labelService, openerService, workspaceService } = options;
     const folders = promptsService.getSourceFolders(type);
     if (folders.length === 0) {
         return await showNoFoldersDialog(quickInputService, openerService);
     }
     if (folders.length === 1) {
-        return folders[0].uri;
+        return folders[0];
     }
     const pickOptions = {
-        placeHolder: ( localize(4914, "Select a prompt source folder")),
+        placeHolder,
         canPickMany: false,
         matchOnDescription: true,
     };
-    const foldersList = ( folders.map(({ uri }) => {
+    const foldersList = ( folders.map(folder => {
+        const uri = folder.uri;
+        if (folder.storage === 'user') {
+            return {
+                type: 'item',
+                label: ( localize(4986, "User Data Folder")),
+                description: labelService.getUriLabel(uri),
+                tooltip: uri.fsPath,
+                folder
+            };
+        }
         const { folders } = workspaceService.getWorkspace();
         const isMultirootWorkspace = (folders.length > 1);
         const firstFolder = folders[0];
@@ -28,33 +38,33 @@ const askForPromptSourceFolder = async (options) => {
                 label: basename(uri),
                 description: labelService.getUriLabel(uri, { relative: true }),
                 tooltip: uri.fsPath,
-                value: uri,
+                folder,
             };
         }
         return {
             type: 'item',
-            label: ( localize(4915, "Current Workspace")),
+            label: ( localize(4987, "Current Workspace")),
             description: labelService.getUriLabel(uri, { relative: false }),
             tooltip: uri.fsPath,
-            value: uri,
+            folder,
         };
     }));
     const answer = await quickInputService.pick(foldersList, pickOptions);
     if (!answer) {
         return;
     }
-    return answer.value;
+    return answer.folder;
 };
 const showNoFoldersDialog = async (quickInputService, openerService) => {
     const docsQuickPick = {
         type: 'item',
-        label: ( localize(4916, 'Learn how to configure reusable prompts')),
-        description: DOCUMENTATION_URL,
-        tooltip: DOCUMENTATION_URL,
-        value: ( URI.parse(DOCUMENTATION_URL)),
+        label: ( localize(4988, 'Learn how to configure reusable prompts')),
+        description: PROMPT_DOCUMENTATION_URL,
+        tooltip: PROMPT_DOCUMENTATION_URL,
+        value: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
     };
     const result = await quickInputService.pick([docsQuickPick], {
-        placeHolder: ( localize(4917, 'No prompt source folders found.')),
+        placeHolder: ( localize(4989, 'No prompt source folders found.')),
         canPickMany: false,
     });
     if (!result) {

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/errors.js

@@ -5,12 +5,12 @@ class BaseCreatePromptError extends Error {
 }
 class FolderExists extends BaseCreatePromptError {
     constructor(path) {
-        super(( localize(4918, "Folder already exists at '{0}'.", path)));
+        super(( localize(4990, "Folder already exists at '{0}'.", path)));
     }
 }
 class InvalidPromptName extends BaseCreatePromptError {
     constructor(name) {
-        super(( localize(4919, "Invalid prompt file name '{0}'.", name)));
+        super(( localize(4991, "Invalid prompt file name '{0}'.", name)));
     }
 }
 

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/contributions/createPromptCommand/utils/createPromptFile.js

@@ -4,12 +4,12 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { assert } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { isPromptFile } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
+import { isPromptOrInstructionsFile } from '@codingame/monaco-vscode-51fed910-d648-5620-9b80-9232cd79d116-common/vscode/vs/platform/prompts/common/constants';
 
 const createPromptFile = async (options) => {
     const { fileName, folder, content, fileService, openerService } = options;
     const promptUri = URI.joinPath(folder, fileName);
-    assert(isPromptFile(promptUri), ( new InvalidPromptName(fileName)));
+    assert(isPromptOrInstructionsFile(promptUri), ( new InvalidPromptName(fileName)));
     if (await fileService.exists(promptUri)) {
         const promptInfo = await fileService.resolve(promptUri);
         assert(!promptInfo.isDirectory, ( new FolderExists(promptUri.fsPath)));

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

@@ -8,12 +8,12 @@ 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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
+import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/viewsWelcome/chatViewsWelcome';
 
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(4922, 'Contributes a welcome message to a chat view')),
+        description: ( localize(4993, '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(4923, 'The icon for the welcome message.')),
+                    description: ( localize(4994, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(4924, 'The title of the welcome message.')),
+                    description: ( localize(4995, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        4925,
+                        4996,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(4926, 'Condition when the welcome message is shown.')),
+                    description: ( localize(4997, 'Condition when the welcome message is shown.')),
                 }
             }
         },

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

@@ -16,6 +16,8 @@ export interface ICodeMapperCodeBlock {
 export interface ICodeMapperRequest {
     readonly codeBlocks: ICodeMapperCodeBlock[];
     readonly chatRequestId?: string;
+    readonly chatRequestModel?: string;
+    readonly chatSessionId?: string;
     readonly location?: string;
 }
 export interface ICodeMapperResult {

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 { IChatTerminalToolInvocationData, IChatToolInputInvocationData, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
-import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { IPreparedToolInvocation, IToolConfirmationMessages, IToolData, IToolProgressStep, IToolResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 export declare class ChatToolInvocation implements IChatToolInvocation {
     readonly toolCallId: string;
     readonly kind: "toolInvocation";
@@ -16,13 +16,19 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     private _resultDetails;
     get resultDetails(): IToolResult["toolResultDetails"] | undefined;
     readonly invocationMessage: string | IMarkdownString;
+    readonly originMessage: string | IMarkdownString | undefined;
     pastTenseMessage: string | IMarkdownString | undefined;
     private _confirmationMessages;
     readonly presentation: IPreparedToolInvocation["presentation"];
     readonly toolId: string;
     readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
+    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);
     complete(result: IToolResult | undefined): void;
     get confirmationMessages(): IToolConfirmationMessages | undefined;
+    acceptProgress(step: IToolProgressStep): void;
     toJSON(): IChatToolInvocationSerialized;
 }

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

@@ -1,6 +1,8 @@
 
 import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 
 class ChatToolInvocation {
     get isComplete() {
@@ -24,10 +26,12 @@ class ChatToolInvocation {
         this._isComplete = false;
         this._isCompleteDeferred = ( new DeferredPromise());
         this._confirmDeferred = ( new DeferredPromise());
-        const defaultMessage = ( localize(4983, "Using {0}", `"${toolData.displayName}"`));
+        this.progress = observableValue(this, { progress: 0 });
+        const defaultMessage = ( localize(5053, "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.presentation = preparedInvocation?.presentation;
         this.toolSpecificData = preparedInvocation?.toolSpecificData;
@@ -54,17 +58,26 @@ class ChatToolInvocation {
     get confirmationMessages() {
         return this._confirmationMessages;
     }
+    acceptProgress(step) {
+        const prev = this.progress.get();
+        this.progress.set({
+            progress: step.increment ? (prev.progress + step.increment) : prev.progress,
+            message: step.message,
+        }, undefined);
+    }
     toJSON() {
         return {
             kind: 'toolInvocationSerialized',
             presentation: this.presentation,
             invocationMessage: this.invocationMessage,
             pastTenseMessage: this.pastTenseMessage,
+            originMessage: this.originMessage,
             isConfirmed: this._isConfirmed,
             isComplete: this._isComplete,
             resultDetails: this._resultDetails,
             toolSpecificData: this.toolSpecificData,
             toolCallId: this.toolCallId,
+            toolId: this.toolId,
         };
     }
 }

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

@@ -11,12 +11,12 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/assignment/common/assignmentService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.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-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IParsedChatRequest } from "@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes";
+import { ChatModel, IChatModel, IChatRequestModel, IChatRequestVariableData, IExportableChatData, ISerializableChatData } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
+import { IParsedChatRequest } from "@codingame/monaco-vscode-api/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 { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
 import { IChatSlashCommandService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service";
-import { IChatVariablesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariables.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";
 export declare class ChatService extends Disposable implements IChatService {
     private readonly storageService;
@@ -26,10 +26,10 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly telemetryService;
     private readonly workspaceContextService;
     private readonly chatSlashCommandService;
-    private readonly chatVariablesService;
     private readonly chatAgentService;
     private readonly configurationService;
     private readonly experimentService;
+    private readonly chatTransferService;
     _serviceBrand: undefined;
     private readonly _sessionModels;
     private readonly _pendingRequests;
@@ -51,10 +51,10 @@ export declare class ChatService extends Disposable implements IChatService {
     private readonly _sessionFollowupCancelTokens;
     private readonly _chatServiceTelemetry;
     private readonly _chatSessionStore;
-    get unifiedViewEnabled(): boolean;
     private get useFileStorage();
+    get edits2Enabled(): boolean;
     private get isEmptyWindow();
-    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatVariablesService: IChatVariablesService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, experimentService: IWorkbenchAssignmentService);
+    constructor(storageService: IStorageService, logService: ILogService, extensionService: IExtensionService, instantiationService: IInstantiationService, telemetryService: ITelemetryService, workspaceContextService: IWorkspaceContextService, chatSlashCommandService: IChatSlashCommandService, chatAgentService: IChatAgentService, configurationService: IConfigurationService, experimentService: IWorkbenchAssignmentService, chatTransferService: IChatTransferService);
     isEnabled(location: ChatAgentLocation): boolean;
     private saveState;
     private syncEmptyWindowChats;
@@ -70,6 +70,7 @@ export declare class ChatService extends Disposable implements IChatService {
     startSession(location: ChatAgentLocation, token: CancellationToken, isGlobalEditingSession?: boolean): ChatModel;
     private _startSession;
     private initializeSession;
+    activateDefaultAgent(location: ChatAgentLocation): Promise<void>;
     getSession(sessionId: string): IChatModel | undefined;
     getOrRestoreSession(sessionId: string): Promise<ChatModel | undefined>;
     isPersistedSessionEmpty(sessionId: string): boolean;
@@ -79,6 +80,7 @@ export declare class ChatService extends Disposable implements IChatService {
     private parseChatRequest;
     private refreshFollowupsCancellationToken;
     private _sendRequestAsync;
+    private prepareContext;
     private checkAgentAllowed;
     private attachmentKindsForTelemetry;
     private getHistoryEntriesFromModel;
@@ -89,7 +91,6 @@ export declare class ChatService extends Disposable implements IChatService {
     clearSession(sessionId: string): Promise<void>;
     hasSessions(): boolean;
     transferChatSession(transferredSessionData: IChatTransferredSessionData, toWorkspace: URI): void;
-    isEditingLocation(location: ChatAgentLocation): boolean;
     getChatStorageFolder(): URI;
     logChatIndex(): void;
 }