@codingame/monaco-vscode-xterm-addons-common 26.2.2 → 28.0.0

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

@@ -6,7 +6,7 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { PromptsStorage, AgentFileType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { extUri, dirname, joinPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { extUri, dirname, joinPath, basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
@@ -15,6 +15,7 @@ import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { getCleanPromptName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { PromptsType, HOOK_DOCUMENTATION_URL, SKILL_DOCUMENTATION_URL, AGENT_DOCUMENTATION_URL, INSTRUCTIONS_DOCUMENTATION_URL, PROMPT_DOCUMENTATION_URL } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { NEW_PROMPT_COMMAND_ID, NEW_INSTRUCTIONS_COMMAND_ID, NEW_AGENT_COMMAND_ID, NEW_SKILL_COMMAND_ID } from '../newPromptFileActions.js';
+import { GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID, GENERATE_ON_DEMAND_INSTRUCTIONS_COMMAND_ID, GENERATE_PROMPT_COMMAND_ID, GENERATE_SKILL_COMMAND_ID, GENERATE_AGENT_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { askForPromptFileName } from './askForPromptName.js';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -24,37 +25,38 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { PromptFileRewriter } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/promptSyntax/promptFileRewriter';
 import { isOrganizationPromptFile } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/utils/promptsServiceUtils';
+import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
 
 function newHelpButton(type) {
     const iconClass = ThemeIcon.asClassName(Codicon.question);
     switch (type) {
     case PromptsType.prompt:
         return {
-            tooltip: ( localize(5767, "Show help on prompt files")),
+            tooltip: ( localize(6348, "Show help on prompt files")),
             helpURI: ( URI.parse(PROMPT_DOCUMENTATION_URL)),
             iconClass
         };
     case PromptsType.instructions:
         return {
-            tooltip: ( localize(5768, "Show help on instruction files")),
+            tooltip: ( localize(6349, "Show help on instruction files")),
             helpURI: ( URI.parse(INSTRUCTIONS_DOCUMENTATION_URL)),
             iconClass
         };
     case PromptsType.agent:
         return {
-            tooltip: ( localize(5769, "Show help on custom agent files")),
+            tooltip: ( localize(6350, "Show help on custom agent files")),
             helpURI: ( URI.parse(AGENT_DOCUMENTATION_URL)),
             iconClass
         };
     case PromptsType.skill:
         return {
-            tooltip: ( localize(5770, "Show help on skill files")),
+            tooltip: ( localize(6351, "Show help on skill files")),
             helpURI: ( URI.parse(SKILL_DOCUMENTATION_URL)),
             iconClass
         };
     case PromptsType.hook:
         return {
-            tooltip: ( localize(5771, "Show help on hook files")),
+            tooltip: ( localize(6352, "Show help on hook files")),
             helpURI: ( URI.parse(HOOK_DOCUMENTATION_URL)),
             iconClass
         };
@@ -71,7 +73,7 @@ function isExtensionPromptPath(prompt) {
 }
 const NEW_PROMPT_FILE_OPTION = {
     type: "item",
-    label: `$(plus) ${( localize(5772, "New prompt file..."))}`,
+    label: `$(plus) ${( localize(6353, "New prompt file..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.prompt)],
@@ -79,23 +81,31 @@ const NEW_PROMPT_FILE_OPTION = {
 };
 const NEW_INSTRUCTIONS_FILE_OPTION = {
     type: "item",
-    label: `$(plus) ${( localize(5773, "New instruction file..."))}`,
+    label: `$(plus) ${( localize(6354, "New instruction file..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.instructions)],
     commandId: NEW_INSTRUCTIONS_COMMAND_ID
 };
-const UPDATE_INSTRUCTIONS_OPTION = {
+const GENERATE_AGENT_INSTRUCTIONS_OPTION = {
     type: "item",
-    label: `$(refresh) ${( localize(5774, "Generate agent instructions..."))}`,
+    label: `$(sparkle) ${( localize(6355, "Generate agent instructions..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.instructions)],
-    commandId: "workbench.action.chat.generateInstructions"
+    commandId: GENERATE_AGENT_INSTRUCTIONS_COMMAND_ID
+};
+const GENERATE_ON_DEMAND_INSTRUCTIONS_OPTION = {
+    type: "item",
+    label: `$(sparkle) ${( localize(6356, "Generate on-demand instructions..."))}`,
+    pickable: false,
+    alwaysShow: true,
+    buttons: [newHelpButton(PromptsType.instructions)],
+    commandId: GENERATE_ON_DEMAND_INSTRUCTIONS_COMMAND_ID
 };
 const NEW_AGENT_FILE_OPTION = {
     type: "item",
-    label: `$(plus) ${( localize(5775, "Create new custom agent..."))}`,
+    label: `$(plus) ${( localize(6357, "Create new custom agent..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.agent)],
@@ -103,36 +113,64 @@ const NEW_AGENT_FILE_OPTION = {
 };
 const NEW_SKILL_FILE_OPTION = {
     type: "item",
-    label: `$(plus) ${( localize(5776, "New skill..."))}`,
+    label: `$(plus) ${( localize(6358, "New skill..."))}`,
     pickable: false,
     alwaysShow: true,
     buttons: [newHelpButton(PromptsType.skill)],
     commandId: NEW_SKILL_COMMAND_ID
 };
+const GENERATE_PROMPT_OPTION = {
+    type: "item",
+    label: `$(sparkle) ${( localize(6359, "Generate prompt..."))}`,
+    pickable: false,
+    alwaysShow: true,
+    buttons: [newHelpButton(PromptsType.prompt)],
+    commandId: GENERATE_PROMPT_COMMAND_ID
+};
+const GENERATE_SKILL_OPTION = {
+    type: "item",
+    label: `$(sparkle) ${( localize(6360, "Generate skill..."))}`,
+    pickable: false,
+    alwaysShow: true,
+    buttons: [newHelpButton(PromptsType.skill)],
+    commandId: GENERATE_SKILL_COMMAND_ID
+};
+const GENERATE_AGENT_OPTION = {
+    type: "item",
+    label: `$(sparkle) ${( localize(6361, "Generate agent..."))}`,
+    pickable: false,
+    alwaysShow: true,
+    buttons: [newHelpButton(PromptsType.agent)],
+    commandId: GENERATE_AGENT_COMMAND_ID
+};
 const EDIT_BUTTON = {
-    tooltip: ( localize(5777, "Open in Editor")),
+    tooltip: ( localize(6362, "Open in Editor")),
     iconClass: ThemeIcon.asClassName(Codicon.fileCode)
 };
 const DELETE_BUTTON = {
-    tooltip: ( localize(5778, "Delete")),
+    tooltip: ( localize(6363, "Delete")),
     iconClass: ThemeIcon.asClassName(Codicon.trash)
 };
 const RENAME_BUTTON = {
-    tooltip: ( localize(5779, "Move and/or Rename")),
+    tooltip: ( localize(6364, "Move and/or Rename")),
     iconClass: ThemeIcon.asClassName(Codicon.replace)
 };
 const COPY_BUTTON = {
-    tooltip: ( localize(5780, "Make a Copy")),
+    tooltip: ( localize(6365, "Make a Copy")),
     iconClass: ThemeIcon.asClassName(Codicon.copy)
 };
 const MAKE_VISIBLE_BUTTON = {
-    tooltip: ( localize(5781, "Hidden from chat view agent picker. Click to show.")),
+    tooltip: ( localize(6366, "Hidden from chat view agent picker. Click to show.")),
     iconClass: ThemeIcon.asClassName(Codicon.eyeClosed),
     alwaysVisible: true
 };
 const MAKE_INVISIBLE_BUTTON = {
-    tooltip: ( localize(5782, "Hide from agent picker")),
-    iconClass: ThemeIcon.asClassName(Codicon.eyeClosed)
+    tooltip: ( localize(6367, "Shown in chat view agent picker. Click to hide.")),
+    iconClass: ThemeIcon.asClassName(Codicon.eye)
+};
+const RUN_IN_CHAT_BUTTON = {
+    tooltip: ( localize(6368, "Run in Chat View")),
+    iconClass: ThemeIcon.asClassName(Codicon.play)
 };
 let PromptFilePickers = class PromptFilePickers {
     constructor(
@@ -162,7 +200,7 @@ let PromptFilePickers = class PromptFilePickers {
             useSeparators: true
         });
         quickPick.busy = true;
-        quickPick.placeholder = ( localize(5783, "Searching file system..."));
+        quickPick.placeholder = ( localize(6369, "Searching file system..."));
         try {
             const fileOptions = await this._createPromptPickItems(options, cts.token);
             const activeItem = options.resource && fileOptions.find(
@@ -234,6 +272,9 @@ let PromptFilePickers = class PromptFilePickers {
     }
     async _createPromptPickItems(options, token) {
         const buttons = [];
+        if (options.type === PromptsType.prompt && options.optionRun !== false) {
+            buttons.push(RUN_IN_CHAT_BUTTON);
+        }
         if (options.optionEdit !== false) {
             buttons.push(EDIT_BUTTON);
         }
@@ -260,7 +301,7 @@ let PromptFilePickers = class PromptFilePickers {
         if (locals.length) {
             result.push({
                 type: "separator",
-                label: ( localize(5784, "Workspace"))
+                label: ( localize(6370, "Workspace"))
             });
             result.push(...sortByLabel(await Promise.all(( locals.map(l => this._createPromptPickItem(l, buttons, getVisibility(l), token))))));
         }
@@ -283,13 +324,16 @@ let PromptFilePickers = class PromptFilePickers {
             const agentButtons = buttons.filter(b => b !== RENAME_BUTTON);
             result.push({
                 type: "separator",
-                label: ( localize(5785, "Agent Instructions"))
+                label: ( localize(6371, "Agent Instructions"))
             });
             result.push(...sortByLabel(await Promise.all(( agentInstructionFiles.map(l => this._createPromptPickItem(l, agentButtons, getVisibility(l), token))))));
         }
         const exts = (await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.extension, token)).filter(isExtensionPromptPath);
         if (exts.length) {
             const extButtons = [];
+            if (options.type === PromptsType.prompt && options.optionRun !== false) {
+                extButtons.push(RUN_IN_CHAT_BUTTON);
+            }
             if (options.optionEdit !== false) {
                 extButtons.push(EDIT_BUTTON);
             }
@@ -317,28 +361,44 @@ let PromptFilePickers = class PromptFilePickers {
         if (users.length) {
             result.push({
                 type: "separator",
-                label: ( localize(5786, "User Data"))
+                label: ( localize(6372, "User Data"))
             });
             result.push(...sortByLabel(await Promise.all(( users.map(u => this._createPromptPickItem(u, buttons, getVisibility(u), token))))));
         }
+        const plugins = await this._promptsService.listPromptFilesForStorage(options.type, PromptsStorage.plugin, token);
+        if (plugins.length) {
+            const pluginButtons = [];
+            if (options.optionCopy !== false) {
+                pluginButtons.push(COPY_BUTTON);
+            }
+            result.push({
+                type: "separator",
+                label: ( localize(6373, "Plugins"))
+            });
+            result.push(...sortByLabel(await Promise.all(( plugins.map(p => this._createPromptPickItem(p, pluginButtons, getVisibility(p), token))))));
+        }
         return result;
     }
     _getExtensionGroupLabel(extPath) {
         if (isOrganizationPromptFile(extPath.uri, extPath.extension.identifier, this._productService)) {
-            return localize(5787, "Organization");
+            return localize(6374, "Organization");
         }
-        return localize(5788, "Extensions");
+        return localize(6375, "Extensions");
     }
     _getNewItems(type) {
         switch (type) {
         case PromptsType.prompt:
-            return [NEW_PROMPT_FILE_OPTION];
+            return [NEW_PROMPT_FILE_OPTION, GENERATE_PROMPT_OPTION];
         case PromptsType.instructions:
-            return [NEW_INSTRUCTIONS_FILE_OPTION, UPDATE_INSTRUCTIONS_OPTION];
+            return [
+                NEW_INSTRUCTIONS_FILE_OPTION,
+                GENERATE_ON_DEMAND_INSTRUCTIONS_OPTION,
+                GENERATE_AGENT_INSTRUCTIONS_OPTION
+            ];
         case PromptsType.agent:
-            return [NEW_AGENT_FILE_OPTION];
+            return [NEW_AGENT_FILE_OPTION, GENERATE_AGENT_OPTION];
         case PromptsType.skill:
-            return [NEW_SKILL_FILE_OPTION];
+            return [NEW_SKILL_FILE_OPTION, GENERATE_SKILL_OPTION];
         default:
             throw ( new Error(`Unknown prompt type '${type}'.`));
         }
@@ -360,12 +420,17 @@ let PromptFilePickers = class PromptFilePickers {
         case PromptsStorage.user:
             tooltip = undefined;
             break;
+        case PromptsStorage.plugin:
+            tooltip = promptFile.name;
+            break;
+        default:
+            assertNever();
         }
         let iconClass;
         if (visibility === false) {
             buttons = (buttons ?? []).concat(MAKE_VISIBLE_BUTTON);
-            promptName = ( localize(5789, "{0} (hidden)", promptName));
-            tooltip = ( localize(5790, "Hidden from chat view agent picker"));
+            promptName = ( localize(6376, "{0} (hidden)", promptName));
+            tooltip = ( localize(6377, "Hidden from chat view agent picker"));
         } else if (visibility === true) {
             buttons = (buttons ?? []).concat(MAKE_INVISIBLE_BUTTON);
         }
@@ -403,6 +468,12 @@ let PromptFilePickers = class PromptFilePickers {
             throw ( new Error(`Unknown button '${JSON.stringify(button)}'.`));
         }
         const value = item.promptFileUri;
+        if (button === RUN_IN_CHAT_BUTTON) {
+            const commandId = quickPick.keyMods.ctrlCmd === true ? "workbench.action.chat.run-in-new-chat.prompt.current" : "workbench.action.chat.run.prompt.current";
+            await this._commandService.executeCommand(commandId, value);
+            quickPick.hide();
+            return false;
+        }
         if (button === EDIT_BUTTON) {
             await this._openerService.open(value);
             return false;
@@ -432,8 +503,13 @@ let PromptFilePickers = class PromptFilePickers {
         }
         if (button === DELETE_BUTTON) {
             return await this.keepQuickPickOpen(quickPick, async () => {
-                const filename = getCleanPromptName(value);
-                const message = ( localize(5791, "Are you sure you want to delete '{0}'?", filename));
+                const isSkill = options.type === PromptsType.skill;
+                const filename = isSkill ? basename(dirname(value)) : item.label;
+                const message = isSkill ? ( localize(
+                    6378,
+                    "Are you sure you want to delete skill '{0}' and its folder?",
+                    filename
+                )) : ( localize(6379, "Are you sure you want to delete '{0}'?", filename));
                 const {
                     confirmed
                 } = await this._dialogService.confirm({
@@ -442,7 +518,11 @@ let PromptFilePickers = class PromptFilePickers {
                 if (!confirmed) {
                     return false;
                 }
-                await this._fileService.del(value);
+                const deleteTarget = isSkill ? dirname(value) : value;
+                await this._fileService.del(deleteTarget, {
+                    recursive: isSkill,
+                    useTrash: true
+                });
                 return true;
             });
         }
@@ -476,7 +556,8 @@ let PromptFilePickers = class PromptFilePickers {
             optionDelete: true,
             optionRename: true,
             optionCopy: true,
-            optionVisibility: false
+            optionVisibility: false,
+            optionRun: false
         };
         try {
             const items = await this._createPromptPickItems(options, cts.token);

package/vscode/src/vs/workbench/contrib/chat/browser/widget/input/editor/chatPasteProviders.js

@@ -18,9 +18,9 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { IChatVariablesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/attachments/chatVariables.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatDynamicVariableModel } from '../../../attachments/chatDynamicVariables.js';
+import { getDynamicVariablesForWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatVariables';
+import { ChatDynamicVariableModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatDynamicVariables';
 import { cleanupOldImages, createFileForMedia, resizeImage, imageToHash } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatImageUtils';
 
 var CopyAttachmentsProvider_1;
@@ -78,7 +78,7 @@ let PasteImageProvider = class PasteImageProvider {
             return;
         }
         const attachedVariables = widget.attachmentModel.attachments;
-        const displayName = ( localize(6194, "Pasted Image"));
+        const displayName = ( localize(6832, "Pasted Image"));
         let tempDisplayName = displayName;
         for (let appendValue = 2; ( attachedVariables.some(attachment => attachment.name === tempDisplayName)); appendValue++)
         {
@@ -100,7 +100,7 @@ let PasteImageProvider = class PasteImageProvider {
         if (( currentContextIds.has(scaledImageContext.id))) {
             return;
         }
-        const edit = createCustomPasteEdit(model, [scaledImageContext], mimeType, this.kind, ( localize(6195, "Pasted Image Attachment")), this.chatWidgetService);
+        const edit = createCustomPasteEdit(model, [scaledImageContext], mimeType, this.kind, ( localize(6833, "Pasted Image Attachment")), this.chatWidgetService);
         return createEditSession(edit);
     }
 };
@@ -163,9 +163,8 @@ let CopyAttachmentsProvider = class CopyAttachmentsProvider {
     static {
         this.ATTACHMENT_MIME_TYPE = "application/vnd.chat.attachment+json";
     }
-    constructor(chatWidgetService, chatVariableService) {
+    constructor(chatWidgetService) {
         this.chatWidgetService = chatWidgetService;
-        this.chatVariableService = chatVariableService;
         this.kind = ( new HierarchicalKind("chat.attach.attachments"));
         this.providedPasteEditKinds = [this.kind];
         this.copyMimeTypes = [CopyAttachmentsProvider_1.ATTACHMENT_MIME_TYPE];
@@ -177,7 +176,7 @@ let CopyAttachmentsProvider = class CopyAttachmentsProvider {
             return undefined;
         }
         const attachments = widget.attachmentModel.attachments;
-        const dynamicVariables = this.chatVariableService.getDynamicVariables(widget.viewModel.sessionResource);
+        const dynamicVariables = getDynamicVariablesForWidget(widget);
         if (attachments.length === 0 && dynamicVariables.length === 0) {
             return undefined;
         }
@@ -219,7 +218,7 @@ let CopyAttachmentsProvider = class CopyAttachmentsProvider {
         }
         const edit = {
             insertText: textdata,
-            title: ( localize(6196, "Insert Prompt & Attachments")),
+            title: ( localize(6834, "Insert Prompt & Attachments")),
             kind: this.kind,
             handledMimeType: CopyAttachmentsProvider_1.ATTACHMENT_MIME_TYPE,
             additionalEdit: {
@@ -243,7 +242,7 @@ let CopyAttachmentsProvider = class CopyAttachmentsProvider {
         return createEditSession(edit);
     }
 };
-CopyAttachmentsProvider = CopyAttachmentsProvider_1 = ( __decorate([( __param(0, IChatWidgetService)), ( __param(1, IChatVariablesService))], CopyAttachmentsProvider));
+CopyAttachmentsProvider = CopyAttachmentsProvider_1 = ( __decorate([( __param(0, IChatWidgetService))], CopyAttachmentsProvider));
 class PasteTextProvider {
     constructor(chatWidgetService, modelService) {
         this.chatWidgetService = chatWidgetService;
@@ -295,7 +294,7 @@ class PasteTextProvider {
         if (( currentContextIds.has(copiedContext.id))) {
             return;
         }
-        const edit = createCustomPasteEdit(model, [copiedContext], Mimes.text, this.kind, ( localize(6197, "Pasted Code Attachment")), this.chatWidgetService);
+        const edit = createCustomPasteEdit(model, [copiedContext], Mimes.text, this.kind, ( localize(6835, "Pasted Code Attachment")), this.chatWidgetService);
         edit.yieldTo = [{
             kind: HierarchicalKind.Empty.append("text", "plain")
         }];
@@ -307,7 +306,7 @@ function getCopiedContext(code, file, language, range) {
     const start = range.startLineNumber;
     const end = range.endLineNumber;
     const resultText = `Copied Selection of Code: \n\n\n From the file: ${fileName} From lines ${start} to ${end} \n \`\`\`${code}\`\`\``;
-    const pastedLines = start === end ? ( localize(6198, "1 line")) : ( localize(6199, "{0} lines", end + 1 - start));
+    const pastedLines = start === end ? ( localize(6836, "1 line")) : ( localize(6837, "{0} lines", end + 1 - start));
     return {
         kind: "paste",
         value: resultText,
@@ -329,7 +328,7 @@ function getCopiedContext(code, file, language, range) {
     };
 }
 function createCustomPasteEdit(model, context, handledMimeType, kind, title, chatWidgetService) {
-    const label = context.length === 1 ? context[0].name : ( localize(6200, "{0} and {1} more", context[0].name, context.length - 1));
+    const label = context.length === 1 ? context[0].name : ( localize(6838, "{0} and {1} more", context[0].name, context.length - 1));
     const customEdit = {
         resource: model.uri,
         variable: context,

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js

@@ -410,7 +410,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         })];
     }
     _getContextMenuActions() {
-        const label = ( localize(12193, "Toggle Visibility"));
+        const label = ( localize(13201, "Toggle Visibility"));
         return [{
             class: undefined,
             tooltip: label,
@@ -433,7 +433,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             actions.push(attachToChatAction, ( new Separator()));
         }
         if (command.command !== "") {
-            const labelRun = ( localize(12194, "Rerun Command"));
+            const labelRun = ( localize(13202, "Rerun Command"));
             actions.push({
                 class: undefined,
                 tooltip: labelRun,
@@ -446,11 +446,11 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                     if (!command.isTrusted) {
                         const shouldRun = await ( new Promise(r => {
-                            this._notificationService.prompt(Severity.Info, ( localize(12195, "Do you want to run the command: {0}", command.command)), [{
-                                label: ( localize(12196, "Yes")),
+                            this._notificationService.prompt(Severity.Info, ( localize(13203, "Do you want to run the command: {0}", command.command)), [{
+                                label: ( localize(13204, "Yes")),
                                 run: () => r(true)
                             }, {
-                                label: ( localize(12197, "No")),
+                                label: ( localize(13205, "No")),
                                 run: () => r(false)
                             }]);
                         }));
@@ -464,7 +464,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                 }
             });
             actions.push(( new Separator()));
-            const labelCopy = ( localize(12198, "Copy Command"));
+            const labelCopy = ( localize(13206, "Copy Command"));
             actions.push({
                 class: undefined,
                 tooltip: labelCopy,
@@ -475,7 +475,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             });
         }
         if (command.hasOutput()) {
-            const labelCopyCommandAndOutput = ( localize(12199, "Copy Command and Output"));
+            const labelCopyCommandAndOutput = ( localize(13207, "Copy Command and Output"));
             actions.push({
                 class: undefined,
                 tooltip: labelCopyCommandAndOutput,
@@ -489,7 +489,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelText = ( localize(12200, "Copy Output"));
+            const labelText = ( localize(13208, "Copy Output"));
             actions.push({
                 class: undefined,
                 tooltip: labelText,
@@ -503,7 +503,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
                     }
                 }
             });
-            const labelHtml = ( localize(12201, "Copy Output as HTML"));
+            const labelHtml = ( localize(13209, "Copy Output as HTML"));
             actions.push({
                 class: undefined,
                 tooltip: labelHtml,
@@ -518,7 +518,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (actions.length > 0) {
             actions.push(( new Separator()));
         }
-        const labelRunRecent = ( localize(12202, "Run Recent Command"));
+        const labelRunRecent = ( localize(13210, "Run Recent Command"));
         actions.push({
             class: undefined,
             tooltip: labelRunRecent,
@@ -527,7 +527,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             enabled: true,
             run: () => this._commandService.executeCommand("workbench.action.terminal.runRecentCommand")
         });
-        const labelGoToRecent = ( localize(12203, "Go To Recent Directory"));
+        const labelGoToRecent = ( localize(13211, "Go To Recent Directory"));
         actions.push({
             class: undefined,
             tooltip: labelRunRecent,
@@ -537,7 +537,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
             run: () => this._commandService.executeCommand("workbench.action.terminal.goToRecentDirectory")
         });
         actions.push(( new Separator()));
-        const labelAbout = ( localize(12204, "Learn About Shell Integration"));
+        const labelAbout = ( localize(13212, "Learn About Shell Integration"));
         actions.push({
             class: undefined,
             tooltip: labelAbout,
@@ -553,7 +553,7 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         if (!chatIsEnabled) {
             return undefined;
         }
-        const labelAttachToChat = ( localize(12205, "Attach To Chat"));
+        const labelAttachToChat = ( localize(13213, "Attach To Chat"));
         return {
             class: undefined,
             tooltip: labelAttachToChat,
@@ -595,14 +595,14 @@ let DecorationAddon = class DecorationAddon extends Disposable {
         quickPick.hideInput = true;
         quickPick.hideCheckAll = true;
         quickPick.canSelectMany = true;
-        quickPick.title = ( localize(12206, "Toggle visibility"));
+        quickPick.title = ( localize(13214, "Toggle visibility"));
         const configValue = this._configurationService.getValue(TerminalSettingId.ShellIntegrationDecorationsEnabled);
         const gutterIcon = {
-            label: ( localize(12207, "Gutter command decorations")),
+            label: ( localize(13215, "Gutter command decorations")),
             picked: configValue !== "never" && configValue !== "overviewRuler"
         };
         const overviewRulerIcon = {
-            label: ( localize(12208, "Overview ruler command decorations")),
+            label: ( localize(13216, "Overview ruler command decorations")),
             picked: configValue !== "never" && configValue !== "gutter"
         };
         quickPick.items = [gutterIcon, overviewRulerIcon];

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts

@@ -174,6 +174,7 @@ export declare class XtermTerminal extends Disposable implements IXtermTerminal,
     focus(): void;
     copySelection(asHtml?: boolean, command?: ITerminalCommand): Promise<void>;
     private _setCursorBlink;
+    private _setTextBlinking;
     private _setCursorStyle;
     private _setCursorStyleInactive;
     private _setCursorWidth;