@codingame/monaco-vscode-chat-service-override 15.0.2 → 16.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatEditingEditorOverlay.css

@@ -0,0 +1,114 @@
+.chat-editor-overlay-widget {
+	padding: 0px;
+	color: var(--vscode-button-foreground);
+	background-color: var(--vscode-button-background);
+	border-radius: 5px;
+	border: 1px solid var(--vscode-contrastBorder);
+	display: flex;
+	align-items: center;
+	z-index: 10;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	overflow: hidden;
+}
+@keyframes pulse {
+	0% {
+		box-shadow: 0 2px 8px 0 var(--vscode-widget-shadow);
+	}
+	50% {
+		box-shadow: 0 2px 8px 4px var(--vscode-widget-shadow);
+	}
+	100% {
+		box-shadow: 0 2px 8px 0 var(--vscode-widget-shadow);
+	}
+}
+.chat-editor-overlay-widget.busy {
+	animation: pulse ease-in 2.3s infinite;
+}
+.chat-editor-overlay-widget .chat-editor-overlay-progress {
+	align-items: center;
+	display: none;
+	padding: 0px 5px;
+	font-size: 12px;
+	font-variant-numeric: tabular-nums;
+	overflow: hidden;
+	white-space: nowrap;
+}
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress {
+	display: inline-flex;
+}
+@keyframes ellipsis {
+	0% {
+		content: "";
+	}
+	25% {
+		content: ".";
+	}
+	50% {
+		content: "..";
+	}
+	75% {
+		content: "...";
+	}
+	100% {
+		content: "";
+	}
+}
+.chat-editor-overlay-widget.busy.paused .chat-editor-overlay-progress {
+	.codicon-loading {
+		display: none;
+	}
+}
+.chat-editor-overlay-widget .action-item > .action-label {
+	padding: 5px;
+	font-size: 12px;
+}
+.chat-editor-overlay-widget.busy .action-item > .action-label.busy::after {
+	content: "";
+	display: inline-flex;
+	white-space: nowrap;
+	overflow: hidden;
+	width: 3ch;
+	animation: ellipsis steps(4, end) 1s infinite;
+}
+.chat-editor-overlay-widget .action-item:first-child > .action-label {
+	padding-left: 7px;
+}
+.chat-editor-overlay-widget .action-item:last-child > .action-label {
+	padding-right: 7px;
+}
+.chat-editor-overlay-widget.busy .chat-editor-overlay-progress .codicon,
+.chat-editor-overlay-widget .action-item > .action-label.codicon {
+	color: var(--vscode-button-foreground);
+}
+.chat-diff-change-content-widget .monaco-action-bar .action-item.disabled,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.disabled {
+	> .action-label.codicon::before,
+	> .action-label.codicon,
+	> .action-label,
+	> .action-label:hover {
+		color: var(--vscode-button-foreground);
+		opacity: 0.7;
+	}
+}
+.chat-editor-overlay-widget .action-item.label-item {
+	font-variant-numeric: tabular-nums;
+}
+.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label,
+.chat-editor-overlay-widget .monaco-action-bar .action-item.label-item > .action-label:hover {
+	color: var(--vscode-button-foreground);
+	opacity: 1;
+}
+.chat-editor-overlay-widget .action-item.auto {
+	position: relative;
+	overflow: hidden;
+}
+.chat-editor-overlay-widget .action-item.auto::before {
+	content: '';
+	position: absolute;
+	top: 0;
+	left: var(--vscode-action-item-auto-timeout, -100%);
+	width: 100%;
+	height: 100%;
+	background-color: var(--vscode-toolbar-hoverBackground);
+	transition: left 0.5s linear;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatEditorController.css

@@ -0,0 +1,30 @@
+.chat-diff-change-content-widget {
+	opacity: 0;
+	transition: opacity 0.2s ease-in-out;
+	display: flex;
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+}
+.chat-diff-change-content-widget.hover {
+	opacity: 1;
+}
+.chat-diff-change-content-widget .monaco-action-bar {
+	padding: 0;
+	border-radius: 2px;
+	background-color: var(--vscode-button-background);
+	color: var(--vscode-button-foreground);
+}
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label {
+	height: 14px;
+	border-radius: 2px;
+	color: var(--vscode-button-foreground);
+}
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon {
+	width: unset;
+	padding: 2px;
+	font-size: 12px;
+	line-height: 14px;
+	color: var(--vscode-button-foreground);
+}
+.chat-diff-change-content-widget .monaco-action-bar .action-item .action-label.codicon[class*='codicon-'] {
+	font-size: 12px;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatSetup.css

@@ -0,0 +1,56 @@
+.chat-welcome-view .chat-setup-view {
+	text-align: center;
+	.chat-features-container {
+		display: flex;
+		justify-content: center;
+		text-align: initial;
+		border-radius: 2px;
+		border: 1px solid var(--vscode-chat-requestBorder);
+		background-color: var(--vscode-chat-requestBackground);
+	}
+}
+.dialog-message-body .chat-setup-view {
+	p {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+	p.setup-legal {
+		font-size: 12px;
+		color: var(--vscode-descriptionForeground);
+		margin-top: 2em;
+	}
+	p.setup-settings {
+		font-size: 12px;
+		color: var(--vscode-descriptionForeground);
+		margin-top: 1em;
+	}
+}
+.dialog-message-body .chat-setup-view,
+.chat-welcome-view .chat-setup-view {
+	p {
+		width: 100%;
+	}
+	.chat-feature-container {
+		display: flex;
+		align-items: center;
+		gap: 6px;
+		padding: 5px 10px 5px 10px;
+	}
+	.chat-feature-container .codicon[class*='codicon-'] {
+		font-size: 16px;
+	}
+	.codicon[class*='codicon-'] {
+		font-size: 13px;
+		line-height: 1.4em;
+		vertical-align: bottom;
+	}
+	.button-container {
+		padding-top: 20px;
+	}
+	.monaco-button-dropdown {
+		width: 100%;
+	}
+	.monaco-button-dropdown .monaco-text-button {
+		width: 100%;
+	}
+}

package/vscode/src/vs/workbench/contrib/chat/browser/media/chatStatus.css

@@ -0,0 +1,90 @@
+.chat-status-bar-entry-tooltip {
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+.chat-status-bar-entry-tooltip hr {
+	margin-top: 8px;
+	margin-bottom: 8px;
+}
+.chat-status-bar-entry-tooltip div.header {
+	color: var(--vscode-descriptionForeground);
+	margin-bottom: 4px;
+	font-weight: 600;
+}
+.chat-status-bar-entry-tooltip div.description {
+	color: var(--vscode-descriptionForeground);
+}
+.chat-status-bar-entry-tooltip .monaco-button {
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+.chat-status-bar-entry-tooltip .setup .chat-feature-container {
+	display: flex;
+	align-items: center;
+	gap: 5px;
+	padding: 4px;
+}
+.chat-status-bar-entry-tooltip .quota-indicator {
+	margin-bottom: 6px;
+}
+.chat-status-bar-entry-tooltip .quota-indicator .quota-label {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 3px;
+}
+.chat-status-bar-entry-tooltip .quota-indicator .quota-bar {
+	width: 100%;
+	height: 4px;
+	background-color: var(--vscode-gauge-foreground);
+	border-radius: 4px;
+	border: 1px solid var(--vscode-gauge-border);
+}
+.chat-status-bar-entry-tooltip .quota-indicator .quota-bar .quota-bit {
+	height: 100%;
+	background-color: var(--vscode-gauge-background);
+	border-radius: 4px;
+}
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar {
+	background-color: var(--vscode-gauge-warningForeground);
+}
+.chat-status-bar-entry-tooltip .quota-indicator.warning .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-warningBackground);
+}
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar {
+	background-color: var(--vscode-gauge-errorForeground);
+}
+.chat-status-bar-entry-tooltip .quota-indicator.error .quota-bar .quota-bit {
+	background-color: var(--vscode-gauge-errorBackground);
+}
+.chat-status-bar-entry-tooltip .settings {
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+}
+.chat-status-bar-entry-tooltip .settings .setting {
+	display: flex;
+	align-items: center;
+}
+.chat-status-bar-entry-tooltip .settings .setting .monaco-checkbox {
+	height: 14px;
+	width: 14px;
+	margin-right: 5px;
+}
+.chat-status-bar-entry-tooltip .settings .setting .codicon {
+	font-size: 12px;
+}
+.chat-status-bar-entry-tooltip .settings .setting .setting-label {
+	cursor: pointer;
+}
+.chat-status-bar-entry-tooltip .settings .setting.disabled .setting-label {
+	color: var(--vscode-disabledForeground);
+}
+.chat-status-bar-entry-tooltip .contribution .body {
+	display: flex;
+	flex-direction: row;
+	gap: 6px;
+	.detail-item {
+		margin-left: auto;
+		color: var(--vscode-descriptionForeground);
+	}
+}

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

@@ -3,31 +3,43 @@ 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 { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.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 { PromptsConfig } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/config';
+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 { appendToCommandPalette } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
 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 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(4791, "Create Prompt"));
-const USER_COMMAND_TITLE = ( localize(4792, "Create User Prompt"));
+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);
     const labelService = accessor.get(ILabelService);
     const openerService = accessor.get(IOpenerService);
-    const commandService = accessor.get(ICommandService);
     const promptsService = accessor.get(IPromptsService);
+    const commandService = accessor.get(ICommandService);
     const quickInputService = accessor.get(IQuickInputService);
+    const notificationService = accessor.get(INotificationService);
     const workspaceService = accessor.get(IWorkspaceContextService);
+    const userDataSyncEnablementService = accessor.get(IUserDataSyncEnablementService);
     const fileName = await askForPromptName(type, quickInputService);
     if (!fileName) {
         return;
@@ -43,15 +55,43 @@ const command = async (accessor, type) => {
     if (!selectedFolder) {
         return;
     }
-    const content = ( localize(4793, "Add prompt contents.."));
+    const content = ( localize(4910, "Add prompt contents..."));
     const promptUri = await createPromptFile({
         fileName,
         folder: selectedFolder,
         content,
         fileService,
-        commandService,
+        openerService,
     });
     await openerService.open(promptUri);
+    if (type !== 'user') {
+        return;
+    }
+    const isConfigured = userDataSyncEnablementService
+        .isResourceEnablementConfigured(SyncResource.Prompts);
+    const isSettingsSyncEnabled = userDataSyncEnablementService.isEnabled();
+    if ((isConfigured === true) || (isSettingsSyncEnabled === false)) {
+        return;
+    }
+    notificationService.prompt(Severity.Info, ( localize(
+        4911,
+        "User prompts are not currently synchronized. Do you want to enable synchronization of the user prompts?"
+    )), [
+        {
+            label: ( localize(4912, "Enable")),
+            run: () => {
+                commandService.executeCommand(CONFIGURE_SYNC_COMMAND_ID)
+                    .catch((error) => {
+                    logService.error(`Failed to run '${CONFIGURE_SYNC_COMMAND_ID}' command: ${error}.`);
+                });
+            },
+        }
+    ], {
+        neverShowAgain: {
+            id: 'workbench.command.prompts.create.user.enable-sync-notification',
+            scope: NeverShowAgainScope.PROFILE,
+        },
+    });
 };
 const commandFactory = (type) => {
     return async (accessor) => {
@@ -62,21 +102,27 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: LOCAL_COMMAND_ID,
     weight: KeybindingWeight.WorkbenchContrib,
     handler: commandFactory('local'),
-    when: PromptsConfig.enabledCtx,
+    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: USER_COMMAND_ID,
     weight: KeybindingWeight.WorkbenchContrib,
     handler: commandFactory('user'),
-    when: PromptsConfig.enabledCtx,
+    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))
 });
-appendToCommandPalette({
-    id: LOCAL_COMMAND_ID,
-    title: LOCAL_COMMAND_TITLE,
-    category: CHAT_CATEGORY,
-}, PromptsConfig.enabledCtx);
-appendToCommandPalette({
-    id: USER_COMMAND_ID,
-    title: USER_COMMAND_TITLE,
-    category: CHAT_CATEGORY,
-}, PromptsConfig.enabledCtx);

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

@@ -1,10 +1,10 @@
 
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { PROMPT_FILE_EXTENSION } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
+import { PROMPT_FILE_EXTENSION } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
 
 const askForPromptName = async (_type, quickInputService) => {
     const result = await quickInputService.input({
-        placeHolder: ( localize(4794, "Provide a prompt name", PROMPT_FILE_EXTENSION)),
+        placeHolder: ( localize(4913, "Provide a prompt name", PROMPT_FILE_EXTENSION)),
     });
     if (!result) {
         return undefined;

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

@@ -14,7 +14,7 @@ const askForPromptSourceFolder = async (options) => {
         return folders[0].uri;
     }
     const pickOptions = {
-        placeHolder: ( localize(4795, "Select a prompt source folder")),
+        placeHolder: ( localize(4914, "Select a prompt source folder")),
         canPickMany: false,
         matchOnDescription: true,
     };
@@ -33,7 +33,7 @@ const askForPromptSourceFolder = async (options) => {
         }
         return {
             type: 'item',
-            label: ( localize(4796, "Current Workspace")),
+            label: ( localize(4915, "Current Workspace")),
             description: labelService.getUriLabel(uri, { relative: false }),
             tooltip: uri.fsPath,
             value: uri,
@@ -48,13 +48,13 @@ const askForPromptSourceFolder = async (options) => {
 const showNoFoldersDialog = async (quickInputService, openerService) => {
     const docsQuickPick = {
         type: 'item',
-        label: ( localize(4797, 'Learn how to configure reusable prompts')),
+        label: ( localize(4916, 'Learn how to configure reusable prompts')),
         description: DOCUMENTATION_URL,
         tooltip: DOCUMENTATION_URL,
         value: ( URI.parse(DOCUMENTATION_URL)),
     };
     const result = await quickInputService.pick([docsQuickPick], {
-        placeHolder: ( localize(4798, 'No prompt source folders found.')),
+        placeHolder: ( localize(4917, '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(4799, "Folder already exists at '{0}'.", path)));
+        super(( localize(4918, "Folder already exists at '{0}'.", path)));
     }
 }
 class InvalidPromptName extends BaseCreatePromptError {
     constructor(name) {
-        super(( localize(4800, "Invalid prompt file name '{0}'.", name)));
+        super(( localize(4919, "Invalid prompt file name '{0}'.", name)));
     }
 }
 

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

@@ -1,12 +1,12 @@
 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";
-import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
+import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 interface ICreatePromptFileOptions {
     readonly fileName: string;
     readonly folder: URI;
     readonly content: string;
     fileService: IFileService;
-    commandService: ICommandService;
+    openerService: IOpenerService;
 }
 export declare const createPromptFile: (options: ICreatePromptFileOptions) => Promise<URI>;
 export {};

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

@@ -4,16 +4,16 @@ 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-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
+import { isPromptFile } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
 
 const createPromptFile = async (options) => {
-    const { fileName, folder, content, fileService, commandService } = options;
+    const { fileName, folder, content, fileService, openerService } = options;
     const promptUri = URI.joinPath(folder, fileName);
     assert(isPromptFile(promptUri), ( new InvalidPromptName(fileName)));
     if (await fileService.exists(promptUri)) {
         const promptInfo = await fileService.resolve(promptUri);
         assert(!promptInfo.isDirectory, ( new FolderExists(promptUri.fsPath)));
-        await commandService.executeCommand('vscode.open', promptUri);
+        await openerService.open(promptUri);
         return promptUri;
     }
     await fileService.createFolder(dirname(promptUri));

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

@@ -2,13 +2,14 @@
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-9a6d8b6c-ad4c-5ea3-9558-f43d6dc4c0ad-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { PromptsConfig } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/config';
-import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { isPromptFile } from '@codingame/monaco-vscode-52bb4d5b-ba1a-57fd-9bee-b28824214eac-common/vscode/vs/platform/prompts/common/constants';
+import { PromptsConfig } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/config';
+import { isPromptFile } from '@codingame/monaco-vscode-a1eb43d5-da63-5f76-8ad4-acf0d6c3b749-common/vscode/vs/platform/prompts/common/constants';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { appendToCommandPalette } from '@codingame/monaco-vscode-9b5a5e82-d649-5455-b4bf-ef90d6afd294-common/vscode/vs/workbench/contrib/files/browser/fileActions.contribution';
+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 { isCodeEditor, isDiffEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { KeybindingsRegistry, KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ATTACH_PROMPT_ACTION_ID } from '../../actions/chatAttachPromptAction/chatAttachPromptAction.js';
@@ -17,11 +18,9 @@ const COMMAND_ID = 'workbench.command.prompts.use';
 const COMMAND_KEY_BINDING = KeyMod.CtrlCmd | KeyCode.Slash | KeyMod.Alt;
 const command = async (accessor) => {
     const commandService = accessor.get(ICommandService);
-    const viewsService = accessor.get(IViewsService);
     const options = {
         resource: getActivePromptUri(accessor),
         widget: getFocusedChatWidget(accessor),
-        viewsService,
     };
     await commandService.executeCommand(ATTACH_PROMPT_ACTION_ID, options);
 };
@@ -67,12 +66,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     weight: KeybindingWeight.WorkbenchContrib,
     primary: COMMAND_KEY_BINDING,
     handler: command,
-    when: PromptsConfig.enabledCtx,
+    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled)),
+});
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+    command: {
+        id: COMMAND_ID,
+        title: ( localize(4920, "Use Prompt")),
+        category: CHAT_CATEGORY
+    },
+    when: ( ContextKeyExpr.and(PromptsConfig.enabledCtx, ChatContextKeys.enabled))
 });
-appendToCommandPalette({
-    id: COMMAND_ID,
-    title: ( localize(4801, "Use Prompt")),
-    category: CHAT_CATEGORY,
-}, PromptsConfig.enabledCtx);
 
 export { COMMAND_ID, getActiveCodeEditor, getFocusedChatWidget };

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

@@ -13,7 +13,7 @@ import { ChatViewsWelcomeExtensions } from '@codingame/monaco-vscode-9a6d8b6c-ad
 const chatViewsWelcomeExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'chatViewsWelcome',
     jsonSchema: {
-        description: ( localize(4805, 'Contributes a welcome message to a chat view')),
+        description: ( localize(4922, '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(4806, 'The icon for the welcome message.')),
+                    description: ( localize(4923, 'The icon for the welcome message.')),
                 },
                 title: {
                     type: 'string',
-                    description: ( localize(4807, 'The title of the welcome message.')),
+                    description: ( localize(4924, 'The title of the welcome message.')),
                 },
                 content: {
                     type: 'string',
                     description: ( localize(
-                        4808,
+                        4925,
                         'The content of the welcome message. The first command link will be rendered as a button.'
                     )),
                 },
                 when: {
                     type: 'string',
-                    description: ( localize(4809, 'Condition when the welcome message is shown.')),
+                    description: ( localize(4926, 'Condition when the welcome message is shown.')),
                 }
             }
         },

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

@@ -1,8 +1,9 @@
 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, IChatToolInvocation, IChatToolInvocationSerialized } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+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";
 export declare class ChatToolInvocation implements IChatToolInvocation {
+    readonly toolCallId: string;
     readonly kind: "toolInvocation";
     private _isComplete;
     get isComplete(): boolean;
@@ -18,8 +19,9 @@ export declare class ChatToolInvocation implements IChatToolInvocation {
     pastTenseMessage: string | IMarkdownString | undefined;
     private _confirmationMessages;
     readonly presentation: IPreparedToolInvocation["presentation"];
-    readonly toolSpecificData?: IChatTerminalToolInvocationData;
-    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData);
+    readonly toolId: string;
+    readonly toolSpecificData?: IChatTerminalToolInvocationData | IChatToolInputInvocationData;
+    constructor(preparedInvocation: IPreparedToolInvocation | undefined, toolData: IToolData, toolCallId: string);
     complete(result: IToolResult | undefined): void;
     get confirmationMessages(): IToolConfirmationMessages | undefined;
     toJSON(): IChatToolInvocationSerialized;