@codingame/monaco-vscode-xterm-common 28.4.1 → 29.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-xterm-common",
-  "version": "28.4.1",
+  "version": "29.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - common package depending on xterm",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "28.4.1",
-    "@codingame/monaco-vscode-xterm-addons-common": "28.4.1",
+    "@codingame/monaco-vscode-api": "29.1.0",
+    "@codingame/monaco-vscode-xterm-addons-common": "29.1.0",
     "@xterm/xterm": "6.1.0-beta.168"
   },
   "exports": {

package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js

@@ -24,7 +24,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
         addExtensionIdentifiers(extSet, ( this._diff.removed.values()));
         addExtensionIdentifiers(extSet, ( this._diff.changed.values()));
         let message = ( localize(
-            13018,
+            13267,
             "The following extensions want to relaunch the terminal to contribute to its environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -32,7 +32,7 @@ let EnvironmentVariableInfoStale = class EnvironmentVariableInfoStale {
     }
     _getActions() {
         return [{
-            label: ( localize(13019, "Relaunch Terminal")),
+            label: ( localize(13268, "Relaunch Terminal")),
             run: () => this._terminalService.getInstanceFromId(this._terminalId)?.relaunch(),
             commandId: TerminalCommandId.Relaunch
         }];
@@ -59,7 +59,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
         const extSet = ( new Set());
         addExtensionIdentifiers(extSet, ( this._collection.getVariableMap(scope).values()));
         let message = ( localize(
-            13020,
+            13269,
             "The following extensions have contributed to this terminal's environment:"
         ));
         message += getMergedDescription(this._collection, scope, this._extensionService, extSet);
@@ -67,7 +67,7 @@ let EnvironmentVariableInfoChangesActive = class EnvironmentVariableInfoChangesA
     }
     _getActions(scope) {
         return [{
-            label: ( localize(13021, "Show Environment Contributions")),
+            label: ( localize(13270, "Show Environment Contributions")),
             run: () => this._commandService.executeCommand(TerminalCommandId.ShowEnvironmentContributions, scope),
             commandId: TerminalCommandId.ShowEnvironmentContributions
         }];
@@ -95,7 +95,7 @@ function getMergedDescription(collection, scope, extensionService, extSet) {
         }
         const workspaceDescription = workspaceDescriptions.get(ext);
         if (workspaceDescription) {
-            const workspaceSuffix = globalDescription ? ` (${( localize(13022, "workspace"))})` : "";
+            const workspaceSuffix = globalDescription ? ` (${( localize(13271, "workspace"))})` : "";
             message.push(`\n- \`${getExtensionName(ext, extensionService)}${workspaceSuffix}\``);
             message.push(`: ${workspaceDescription}`);
         }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalActions.js

@@ -63,7 +63,7 @@ import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { SeparatorSelectOption } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/selectBox/selectBox';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
-const switchTerminalShowTabsTitle = ( localize(13025, "Show Tabs"));
+const switchTerminalShowTabsTitle = ( localize(13274, "Show Tabs"));
 const category = terminalStrings.actionCategory;
 const sharedWhenClause = (() => {
     const terminalAvailable = ( ContextKeyExpr.or(
@@ -86,7 +86,7 @@ async function getCwdForSplit(instance, folders, commandService, configService)
                 return folders[0].uri;
             } else if (folders.length > 1) {
                 const options = {
-                    placeHolder: ( localize(13026, "Select current working directory for new terminal"))
+                    placeHolder: ( localize(13275, "Select current working directory for new terminal"))
                 };
                 const workspace = await commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]);
                 if (!workspace) {
@@ -104,7 +104,7 @@ async function getCwdForSplit(instance, folders, commandService, configService)
 }
 let TerminalLaunchHelpAction = class TerminalLaunchHelpAction extends Action {
     constructor(_openerService) {
-        super("workbench.action.terminal.launchHelp", ( localize(13027, "Open Help")));
+        super("workbench.action.terminal.launchHelp", ( localize(13276, "Open Help")));
         this._openerService = _openerService;
     }
     async run() {
@@ -205,7 +205,7 @@ function getTerminalServices(accessor) {
 function registerTerminalActions() {
     registerTerminalAction({
         id: TerminalCommandId.NewInActiveWorkspace,
-        title: ( localize2(13028, "Create New Terminal (In Active Workspace)")),
+        title: ( localize2(13277, "Create New Terminal (In Active Workspace)")),
         run: async c => {
             if (c.service.isProcessSupportRegistered) {
                 const instance = await c.service.createTerminal({
@@ -222,7 +222,7 @@ function registerTerminalActions() {
     refreshTerminalActions([]);
     registerTerminalAction({
         id: TerminalCommandId.CreateTerminalEditor,
-        title: ( localize2(13029, "Create New Terminal in Editor Area")),
+        title: ( localize2(13278, "Create New Terminal in Editor Area")),
         run: async (c, _, args) => {
             function isCreateTerminalOptions(obj) {
                 return isObject(obj) && "location" in obj;
@@ -238,7 +238,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.CreateTerminalEditorSameGroup,
-        title: ( localize2(13029, "Create New Terminal in Editor Area")),
+        title: ( localize2(13278, "Create New Terminal in Editor Area")),
         f1: false,
         run: async (c, accessor, args) => {
             const editorGroupsService = accessor.get(IEditorGroupsService);
@@ -252,7 +252,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.CreateTerminalEditorSide,
-        title: ( localize2(13030, "Create New Terminal in Editor Area to the Side")),
+        title: ( localize2(13279, "Create New Terminal in Editor Area to the Side")),
         run: async c => {
             const instance = await c.service.createTerminal({
                 location: {
@@ -313,7 +313,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusPreviousPane,
-        title: ( localize2(13031, "Focus Previous Terminal in Terminal Group")),
+        title: ( localize2(13280, "Focus Previous Terminal in Terminal Group")),
         keybinding: {
             primary: KeyMod.Alt | KeyCode.LeftArrow,
             secondary: [KeyMod.Alt | KeyCode.UpArrow],
@@ -332,7 +332,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusNextPane,
-        title: ( localize2(13032, "Focus Next Terminal in Terminal Group")),
+        title: ( localize2(13281, "Focus Next Terminal in Terminal Group")),
         keybinding: {
             primary: KeyMod.Alt | KeyCode.RightArrow,
             secondary: [KeyMod.Alt | KeyCode.DownArrow],
@@ -351,7 +351,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneLeft,
-        title: ( localize2(13033, "Resize Terminal Left")),
+        title: ( localize2(13282, "Resize Terminal Left")),
         keybinding: {
             linux: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.LeftArrow
@@ -367,7 +367,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneRight,
-        title: ( localize2(13034, "Resize Terminal Right")),
+        title: ( localize2(13283, "Resize Terminal Right")),
         keybinding: {
             linux: {
                 primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.RightArrow
@@ -383,7 +383,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneUp,
-        title: ( localize2(13035, "Resize Terminal Up")),
+        title: ( localize2(13284, "Resize Terminal Up")),
         keybinding: {
             mac: {
                 primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.UpArrow
@@ -396,7 +396,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.ResizePaneDown,
-        title: ( localize2(13036, "Resize Terminal Down")),
+        title: ( localize2(13285, "Resize Terminal Down")),
         keybinding: {
             mac: {
                 primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.DownArrow
@@ -433,7 +433,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusTabs,
-        title: ( localize2(13037, "Focus Terminal Tabs View")),
+        title: ( localize2(13286, "Focus Terminal Tabs View")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Backslash,
             weight: KeybindingWeight.WorkbenchContrib,
@@ -444,7 +444,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusNext,
-        title: ( localize2(13038, "Focus Next Terminal Group")),
+        title: ( localize2(13287, "Focus Next Terminal Group")),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.PageDown,
@@ -461,7 +461,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.FocusPrevious,
-        title: ( localize2(13039, "Focus Previous Terminal Group")),
+        title: ( localize2(13288, "Focus Previous Terminal Group")),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.PageUp,
@@ -478,7 +478,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.RunSelectedText,
-        title: ( localize2(13040, "Run Selected Text In Active Terminal")),
+        title: ( localize2(13289, "Run Selected Text In Active Terminal")),
         run: async (c, accessor) => {
             const codeEditorService = accessor.get(ICodeEditorService);
             const editor = codeEditorService.getActiveCodeEditor();
@@ -502,7 +502,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.RunActiveFile,
-        title: ( localize2(13041, "Run Active File In Active Terminal")),
+        title: ( localize2(13290, "Run Active File In Active Terminal")),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (c, accessor) => {
             const codeEditorService = accessor.get(ICodeEditorService);
@@ -518,7 +518,7 @@ function registerTerminalActions() {
             const isRemote = instance ? instance.hasRemoteAuthority : (workbenchEnvironmentService.remoteAuthority ? true : false);
             const uri = editor.getModel().uri;
             if ((!isRemote && uri.scheme !== Schemas.file && uri.scheme !== Schemas.vscodeUserData) || (isRemote && uri.scheme !== Schemas.vscodeRemote)) {
-                notificationService.warn(( localize(13042, "Only files on disk can be run in the terminal")));
+                notificationService.warn(( localize(13291, "Only files on disk can be run in the terminal")));
                 return;
             }
             await instance.sendPath(uri, true);
@@ -527,7 +527,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollDownLine,
-        title: ( localize2(13043, "Scroll Down (Line)")),
+        title: ( localize2(13292, "Scroll Down (Line)")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
             linux: {
@@ -541,7 +541,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollDownPage,
-        title: ( localize2(13044, "Scroll Down (Page)")),
+        title: ( localize2(13293, "Scroll Down (Page)")),
         keybinding: {
             primary: KeyMod.Shift | KeyCode.PageDown,
             mac: {
@@ -555,7 +555,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollToBottom,
-        title: ( localize2(13045, "Scroll to Bottom")),
+        title: ( localize2(13294, "Scroll to Bottom")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.End,
             linux: {
@@ -569,7 +569,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollUpLine,
-        title: ( localize2(13046, "Scroll Up (Line)")),
+        title: ( localize2(13295, "Scroll Up (Line)")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
             linux: {
@@ -583,7 +583,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollUpPage,
-        title: ( localize2(13047, "Scroll Up (Page)")),
+        title: ( localize2(13296, "Scroll Up (Page)")),
         f1: true,
         keybinding: {
             primary: KeyMod.Shift | KeyCode.PageUp,
@@ -598,7 +598,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ScrollToTop,
-        title: ( localize2(13048, "Scroll to Top")),
+        title: ( localize2(13297, "Scroll to Top")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.Home,
             linux: {
@@ -612,7 +612,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.ClearSelection,
-        title: ( localize2(13049, "Clear Selection")),
+        title: ( localize2(13298, "Clear Selection")),
         keybinding: {
             primary: KeyCode.Escape,
             when: ( ContextKeyExpr.and(
@@ -731,12 +731,12 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.DetachSession,
-        title: ( localize2(13050, "Detach Session")),
+        title: ( localize2(13299, "Detach Session")),
         run: activeInstance => activeInstance.detachProcessAndDispose(TerminalExitReason.User)
     });
     registerTerminalAction({
         id: TerminalCommandId.AttachToSession,
-        title: ( localize2(13051, "Attach to Session")),
+        title: ( localize2(13300, "Attach to Session")),
         run: async (c, accessor) => {
             const quickInputService = accessor.get(IQuickInputService);
             const labelService = accessor.get(ILabelService);
@@ -760,7 +760,7 @@ function registerTerminalActions() {
                 };
             }));
             if (items.length === 0) {
-                notificationService.info(( localize(13052, "There are no unattached terminals to attach to")));
+                notificationService.info(( localize(13301, "There are no unattached terminals to attach to")));
                 return;
             }
             const selected = await quickInputService.pick(items, {
@@ -832,7 +832,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SelectToPreviousCommand,
-        title: ( localize2(13053, "Select to Previous Command")),
+        title: ( localize2(13302, "Select to Previous Command")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow,
             when: TerminalContextKeys.focus,
@@ -846,7 +846,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SelectToNextCommand,
-        title: ( localize2(13054, "Select to Next Command")),
+        title: ( localize2(13303, "Select to Next Command")),
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow,
             when: TerminalContextKeys.focus,
@@ -860,7 +860,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.SelectToPreviousLine,
-        title: ( localize2(13055, "Select to Previous Line")),
+        title: ( localize2(13304, "Select to Previous Line")),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (xterm, _, instance) => {
             xterm.markTracker.selectToPreviousLine();
@@ -869,7 +869,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.SelectToNextLine,
-        title: ( localize2(13056, "Select to Next Line")),
+        title: ( localize2(13305, "Select to Next Line")),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (xterm, _, instance) => {
             xterm.markTracker.selectToNextLine();
@@ -888,7 +888,7 @@ function registerTerminalActions() {
                     required: ["cwd"],
                     properties: {
                         cwd: {
-                            description: ( localize(13057, "The directory to start the terminal at")),
+                            description: ( localize(13306, "The directory to start the terminal at")),
                             type: "string"
                         }
                     }
@@ -919,7 +919,7 @@ function registerTerminalActions() {
                     required: ["name"],
                     properties: {
                         name: {
-                            description: ( localize(13058, "The new name for the terminal")),
+                            description: ( localize(13307, "The new name for the terminal")),
                             type: "string",
                             minLength: 1
                         }
@@ -933,7 +933,7 @@ function registerTerminalActions() {
             const notificationService = accessor.get(INotificationService);
             const name = args ? toOptionalString(args.name) : undefined;
             if (!name) {
-                notificationService.warn(( localize(13059, "No name argument provided")));
+                notificationService.warn(( localize(13308, "No name argument provided")));
                 return;
             }
             activeInstance.rename(name);
@@ -941,7 +941,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.Relaunch,
-        title: ( localize2(13060, "Relaunch Active Terminal")),
+        title: ( localize2(13309, "Relaunch Active Terminal")),
         run: activeInstance => activeInstance.relaunch()
     });
     registerTerminalAction({
@@ -1033,7 +1033,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.JoinActiveTab,
-        title: ( localize2(13061, "Join Terminals")),
+        title: ( localize2(13310, "Join Terminals")),
         precondition: ( ContextKeyExpr.and(sharedWhenClause.terminalAvailable, ( TerminalContextKeys.tabsSingularSelection.toNegated()))),
         run: async (c, accessor) => {
             const instances = getSelectedViewInstances(accessor);
@@ -1044,7 +1044,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.Join,
-        title: ( localize2(13062, "Join Terminals...")),
+        title: ( localize2(13311, "Join Terminals...")),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (c, accessor) => {
             const themeService = accessor.get(IThemeService);
@@ -1052,7 +1052,7 @@ function registerTerminalActions() {
             const quickInputService = accessor.get(IQuickInputService);
             const picks = [];
             if (c.groupService.instances.length <= 1) {
-                notificationService.warn(( localize(13063, "Insufficient terminals for the join action")));
+                notificationService.warn(( localize(13312, "Insufficient terminals for the join action")));
                 return;
             }
             const otherInstances = c.groupService.instances.filter(i => i.instanceId !== c.groupService.activeInstance?.instanceId);
@@ -1078,7 +1078,7 @@ function registerTerminalActions() {
                 }
             }
             if (picks.length === 0) {
-                notificationService.warn(( localize(13064, "All terminals are joined already")));
+                notificationService.warn(( localize(13313, "All terminals are joined already")));
                 return;
             }
             const result = await quickInputService.pick(picks, {});
@@ -1089,7 +1089,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SplitInActiveWorkspace,
-        title: ( localize2(13065, "Split Terminal (In Active Workspace)")),
+        title: ( localize2(13314, "Split Terminal (In Active Workspace)")),
         run: async (instance, c) => {
             const newInstance = await c.service.createTerminal({
                 location: {
@@ -1103,7 +1103,7 @@ function registerTerminalActions() {
     });
     registerActiveXtermAction({
         id: TerminalCommandId.SelectAll,
-        title: ( localize2(13066, "Select All")),
+        title: ( localize2(13315, "Select All")),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: [{
             primary: 0,
@@ -1117,7 +1117,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.New,
-        title: ( localize2(13067, "Create New Terminal")),
+        title: ( localize2(13316, "Create New Terminal")),
         precondition: ( ContextKeyExpr.or(
             TerminalContextKeys.processSupported,
             TerminalContextKeys.webExtensionContributedProfile
@@ -1184,7 +1184,7 @@ function registerTerminalActions() {
     }
     registerTerminalAction({
         id: TerminalCommandId.Kill,
-        title: ( localize2(13068, "Kill the Active Terminal Instance")),
+        title: ( localize2(13317, "Kill the Active Terminal Instance")),
         precondition: ( ContextKeyExpr.or(sharedWhenClause.terminalAvailable, TerminalContextKeys.isOpen)),
         icon: killTerminalIcon,
         run: async c => killInstance(c, c.groupService.activeInstance)
@@ -1198,7 +1198,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.KillAll,
-        title: ( localize2(13069, "Kill All Terminals")),
+        title: ( localize2(13318, "Kill All Terminals")),
         precondition: ( ContextKeyExpr.or(sharedWhenClause.terminalAvailable, TerminalContextKeys.isOpen)),
         icon: Codicon.trash,
         run: async c => {
@@ -1211,7 +1211,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.KillEditor,
-        title: ( localize2(13070, "Kill the Active Terminal in Editor Area")),
+        title: ( localize2(13319, "Kill the Active Terminal in Editor Area")),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: {
             primary: KeyMod.CtrlCmd | KeyCode.KeyW,
@@ -1260,7 +1260,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.Clear,
-        title: ( localize2(13071, "Clear")),
+        title: ( localize2(13320, "Clear")),
         precondition: sharedWhenClause.terminalAvailable,
         keybinding: [{
             primary: 0,
@@ -1274,12 +1274,12 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.SelectDefaultProfile,
-        title: ( localize2(13072, "Select Default Profile")),
+        title: ( localize2(13321, "Select Default Profile")),
         run: c => c.service.showProfileQuickPick("setDefault")
     });
     registerTerminalAction({
         id: TerminalCommandId.ConfigureTerminalSettings,
-        title: ( localize2(13073, "Configure Terminal Settings")),
+        title: ( localize2(13322, "Configure Terminal Settings")),
         precondition: sharedWhenClause.terminalAvailable,
         run: (c, accessor) => accessor.get(IPreferencesService).openSettings({
             jsonEditor: false,
@@ -1288,7 +1288,7 @@ function registerTerminalActions() {
     });
     registerActiveInstanceAction({
         id: TerminalCommandId.SetDimensions,
-        title: ( localize2(13074, "Set Fixed Dimensions")),
+        title: ( localize2(13323, "Set Fixed Dimensions")),
         precondition: sharedWhenClause.terminalAvailable_and_opened,
         run: activeInstance => activeInstance.setFixedDimensions()
     });
@@ -1305,7 +1305,7 @@ function registerTerminalActions() {
     });
     registerTerminalAction({
         id: TerminalCommandId.SwitchTerminal,
-        title: ( localize2(13075, "Switch Terminal")),
+        title: ( localize2(13324, "Switch Terminal")),
         precondition: sharedWhenClause.terminalAvailable,
         run: async (c, accessor, args) => {
             const item = toOptionalString(args);
@@ -1388,7 +1388,7 @@ function getSelectedViewInstances(accessor, args, args2) {
 function validateTerminalName(name) {
     if (!name || name.trim().length === 0) {
         return {
-            content: ( localize(13076, "Providing no name will reset it to the default value")),
+            content: ( localize(13325, "Providing no name will reset it to the default value")),
             severity: Severity.Info
         };
     }
@@ -1414,7 +1414,7 @@ function refreshTerminalActions(detectedProfiles) {
         constructor() {
             super({
                 id: TerminalCommandId.NewWithProfile,
-                title: ( localize2(13077, "Create New Terminal (With Profile)")),
+                title: ( localize2(13326, "Create New Terminal (With Profile)")),
                 f1: true,
                 precondition: ( ContextKeyExpr.or(
                     TerminalContextKeys.processSupported,
@@ -1429,16 +1429,16 @@ function refreshTerminalActions(detectedProfiles) {
                             required: ["profileName"],
                             properties: {
                                 profileName: {
-                                    description: ( localize(13078, "The name of the profile to create")),
+                                    description: ( localize(13327, "The name of the profile to create")),
                                     type: "string",
                                     enum: profileEnum.values,
                                     markdownEnumDescriptions: profileEnum.markdownDescriptions
                                 },
                                 location: {
-                                    description: ( localize(13079, "Where to create the terminal")),
+                                    description: ( localize(13328, "Where to create the terminal")),
                                     type: "string",
                                     enum: ["view", "editor"],
-                                    enumDescriptions: [( localize(13080, "Create the terminal in the terminal view")), ( localize(13081, "Create the terminal in the editor"))]
+                                    enumDescriptions: [( localize(13329, "Create the terminal in the terminal view")), ( localize(13330, "Create the terminal in the editor"))]
                                 }
                             }
                         }
@@ -1500,7 +1500,7 @@ function refreshTerminalActions(detectedProfiles) {
             const folders = workspaceContextService.getWorkspace().folders;
             if (folders.length > 1) {
                 const options = {
-                    placeHolder: ( localize(13026, "Select current working directory for new terminal"))
+                    placeHolder: ( localize(13275, "Select current working directory for new terminal"))
                 };
                 const workspace = await commandService.executeCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, [options]);
                 if (!workspace) {
@@ -1546,7 +1546,7 @@ async function pickTerminalCwd(accessor, cancel) {
     }
     const folderPicks = ( shrinkedPairs.map(pair => {
         const label = pair.folder.name;
-        const description = pair.isOverridden ? ( localize(13082, "(Overridden) {0}", labelService.getUriLabel(pair.cwd, {
+        const description = pair.isOverridden ? ( localize(13331, "(Overridden) {0}", labelService.getUriLabel(pair.cwd, {
             relative: !pair.isAbsolute
         }))) : labelService.getUriLabel(dirname(pair.cwd), {
             relative: true
@@ -1559,7 +1559,7 @@ async function pickTerminalCwd(accessor, cancel) {
         };
     }));
     const options = {
-        placeHolder: ( localize(13026, "Select current working directory for new terminal")),
+        placeHolder: ( localize(13275, "Select current working directory for new terminal")),
         matchOnDescription: true,
         canPickMany: false
     };
@@ -1626,7 +1626,7 @@ async function renameWithQuickPick(c, accessor, resource) {
     if (instance) {
         const title = await accessor.get(IQuickInputService).input({
             value: instance.title,
-            prompt: ( localize(13083, "Enter terminal name"))
+            prompt: ( localize(13332, "Enter terminal name"))
         });
         if (title) {
             instance.rename(title);

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.js

@@ -770,13 +770,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         xtermConstructor = Promises.withAsyncBody(async resolve => {
             const Terminal = (await import('@xterm/xterm')).Terminal;
-            Terminal.strings.promptLabel = ( localize(13101, "Terminal input"));
+            Terminal.strings.promptLabel = ( localize(13350, "Terminal input"));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                13102,
+                13351,
                 "Use the accessible buffer {0} to manually review output",
                 keybinding.getLabel()
             )) : ( localize(
-                13103,
+                13352,
                 "Use the Terminal: Focus Accessible Buffer command to manually review output"
             ));
             resolve(Terminal);
@@ -829,7 +829,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                         id: TerminalStatus.Bell,
                         severity: Severity.Warning,
                         icon: Codicon.bell,
-                        tooltip: ( localize(13104, "Bell"))
+                        tooltip: ( localize(13353, "Bell"))
                     }, this._terminalConfigurationService.config.bellDuration);
                 }
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
@@ -858,6 +858,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 lineDataEventAddon.setOperatingSystem(this._processManager.os);
             }
             xterm.raw.options.windowsPty = processTraits.windowsPty;
+            xterm.raw.options.reflowCursorLine = processTraits?.windowsPty?.backend === "conpty" && !!this._terminalConfigurationService.config.windowsUseConptyDll;
         }));
         this._register(
             this._processManager.onRestoreCommands(e => this.xterm?.shellIntegration.deserialize(e))
@@ -906,7 +907,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (!instance.xterm) {
             return;
         }
-        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13105, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13106, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13107, "Injection failed to activate")) : ( localize(13108, "No")));
+        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13354, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13355, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13356, "Injection failed to activate")) : ( localize(13357, "No")));
         const detailedAdditions = [];
         if (instance.shellType) {
             detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
@@ -931,8 +932,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         instance.statusList.add({
             id: TerminalStatus.ShellIntegrationInfo,
             severity: Severity.Info,
-            tooltip: `${( localize(13109, "Shell integration"))}: ${cmdDetectionType}`,
-            detailedTooltip: `${( localize(13109, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
+            tooltip: `${( localize(13358, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(13358, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
         });
     }
     async runCommand(commandLine, shouldExecute, commandId) {
@@ -1043,7 +1044,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 event.preventDefault();
                 return false;
             }
-            if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && ( this._skipTerminalCommands.some(k => k === resolveResult.commandId))) {
+            if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && (event.metaKey || ( this._skipTerminalCommands.some(k => k === resolveResult.commandId)))) {
                 event.preventDefault();
                 return false;
             }
@@ -1394,7 +1395,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 id: TerminalStatus.Disconnected,
                 severity: Severity.Error,
                 icon: Codicon.debugDisconnect,
-                tooltip: ( localize(13110, "Lost connection to process"))
+                tooltip: ( localize(13359, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1412,12 +1413,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const trusted = await this._trust();
         if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
             this._onProcessExit({
-                message: ( localize(13111, "Cannot launch a terminal process in an untrusted workspace"))
+                message: ( localize(13360, "Cannot launch a terminal process in an untrusted workspace"))
             });
         } else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && normalizeDriveLetter(this._cwd) !== normalizeDriveLetter(this._userHome)) {
             this._onProcessExit({
                 message: ( localize(
-                    13112,
+                    13361,
                     "Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
                     this._cwd,
                     this._userHome
@@ -1587,10 +1588,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             id: TerminalStatus.ShellIntegrationAttentionNeeded,
             severity: Severity.Warning,
             icon: Codicon.warning,
-            tooltip: `${exitMessage} ` + ( localize(13113, "Disabling shell integration in user settings might help.")),
+            tooltip: `${exitMessage} ` + ( localize(13362, "Disabling shell integration in user settings might help.")),
             hoverActions: [{
                 commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                label: ( localize(13114, "Learn more about shell integration")),
+                label: ( localize(13363, "Learn more about shell integration")),
                 run: () => {
                     this._openerService.open(
                         "https://code.visualstudio.com/docs/editor/integrated-terminal#_shell-integration"
@@ -1598,7 +1599,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }, {
                 commandId: "workbench.action.openSettings",
-                label: ( localize(13115, "Open user settings")),
+                label: ( localize(13364, "Open user settings")),
                 run: () => {
                     this._commandService.executeCommand(
                         "workbench.action.openSettings",
@@ -1715,7 +1716,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return true;
         }
         const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(13116, "Creating a terminal process requires executing code"))
+            message: ( localize(13365, "Creating a terminal process requires executing code"))
         });
         return trustRequest === true;
     }
@@ -1846,21 +1847,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const labelParts = [];
         if (xterm && xterm.textarea) {
             if (title && title.length > 0) {
-                labelParts.push(( localize(13117, "Terminal {0}, {1}", terminalId, title)));
+                labelParts.push(( localize(13366, "Terminal {0}, {1}", terminalId, title)));
             } else {
-                labelParts.push(( localize(13118, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(13367, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    13119,
+                    13368,
                     "Run the command: Toggle Screen Reader Accessibility Mode for an optimized screen reader experience"
                 )));
             }
             const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             if (this._configurationService.getValue(AccessibilityVerbositySettingId.Terminal) && accessibilityHelpKeybinding) {
                 labelParts.push(( localize(
-                    13120,
+                    13369,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1914,7 +1915,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(13121, "Set Fixed Dimensions: Column")),
+            title: ( localize(13370, "Set Fixed Dimensions: Column")),
             placeHolder: "Enter a number of columns or leave empty for automatic width",
             validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
                 content: "Enter a number or leave empty size automatically",
@@ -1928,7 +1929,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
-            title: ( localize(13122, "Set Fixed Dimensions: Row")),
+            title: ( localize(13371, "Set Fixed Dimensions: Row")),
             placeHolder: "Enter a number of rows or leave empty for automatic height",
             validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
                 content: "Enter a number or leave empty size automatically",
@@ -2038,7 +2039,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
-                13123,
+                13372,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -2194,7 +2195,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         disposables.push(quickPick);
         quickPick.items = items;
         quickPick.matchOnDescription = true;
-        quickPick.placeholder = ( localize(13124, "Select a color for the terminal"));
+        quickPick.placeholder = ( localize(13373, "Select a color for the terminal"));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -2522,24 +2523,24 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        13125,
+                        13374,
                         "The terminal process \"{0}\" failed to launch (exit code: {1}).",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13126, "The terminal process failed to launch (exit code: {0}).", code));
+                    message = ( localize(13375, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             } else {
                 if (commandLine) {
                     message = ( localize(
-                        13127,
+                        13376,
                         "The terminal process \"{0}\" terminated with exit code: {1}.",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13128, "The terminal process terminated with exit code: {0}.", code));
+                    message = ( localize(13377, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2565,7 +2566,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                     break;
                 }
             }
-            message = ( localize(13129, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(13378, "The terminal process failed to launch: {0}.", innerMessage));
             break;
         }
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.js

@@ -25,7 +25,7 @@ import { MergedEnvironmentVariableCollection } from '../../../../platform/termin
 import { serializeEnvironmentVariableCollections } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariableShared';
 import { ProcessState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal';
 import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
-import { getWorkspaceForTerminal, createVariableResolver, createTerminalEnvironment, getCwd } from '../common/terminalEnvironment.js';
+import { getWorkspaceForTerminal, mergeEnvironments, createVariableResolver, createTerminalEnvironment, getCwd } from '../common/terminalEnvironment.js';
 import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
@@ -202,7 +202,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         } catch (e) {
             this._notificationService.notify({
                 message: ( localize(
-                    13160,
+                    13409,
                     "Could not kill process listening on port {0}, command exited with error {1}",
                     port,
                     e
@@ -254,9 +254,13 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
                 ));
             }
             this.backend = backend;
+            const envForResolver = {
+                ...(await this._terminalProfileResolverService.getEnvironment(this.remoteAuthority))
+            };
+            mergeEnvironments(envForResolver, await backend.getShellEnvironment());
             const variableResolver = createVariableResolver(
                 this._cwdWorkspaceFolder,
-                await this._terminalProfileResolverService.getEnvironment(this.remoteAuthority),
+                envForResolver,
                 this._configurationResolverService
             );
             this.userHome = this._pathService.resolvedUserHome?.fsPath;
@@ -426,15 +430,20 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         const workspaceFolder = getWorkspaceForTerminal(shellLaunchConfig.cwd, this._workspaceContextService, this._historyService);
         const platformKey = isWindows ? "windows" : (isMacintosh ? "osx" : "linux");
         const envFromConfigValue = this._configurationService.getValue(`terminal.integrated.env.${platformKey}`);
+        this._logService.debug(
+            `Resolving environment (useShellEnvironment=${shellLaunchConfig.useShellEnvironment}, platformKey=${platformKey}, envFromConfig=${envFromConfigValue ? ( Object.keys(envFromConfigValue)).join(",") : "none"})`
+        );
         let baseEnv;
         if (shellLaunchConfig.useShellEnvironment) {
             const shellEnv = await backend.getShellEnvironment();
             if (!shellEnv) {
                 throw ( new BugIndicatingError("Cannot fetch shell environment to use"));
             }
+            this._logService.debug(`Shell environment resolved with ${( Object.keys(shellEnv)).length} variables: ${( Object.keys(shellEnv)).sort().join(", ")}`);
             baseEnv = shellEnv;
         } else {
             baseEnv = await this._terminalProfileResolverService.getEnvironment(this.remoteAuthority);
+            this._logService.debug(`Profile environment resolved with ${( Object.keys(baseEnv)).length} variables`);
         }
         const env = await createTerminalEnvironment(
             shellLaunchConfig,
@@ -444,6 +453,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
             this._terminalConfigurationService.config.detectLocale,
             baseEnv
         );
+        this._logService.debug(`Terminal environment created with ${( Object.keys(env)).length} variables: ${( Object.keys(env)).sort().join(", ")}`);
         if (!this._isDisposed && shouldUseEnvironmentVariableCollection(shellLaunchConfig)) {
             this._extEnvironmentVariableCollection = this._environmentVariableService.mergedCollection;
             this._register(this._environmentVariableService.onDidChangeCollections(
@@ -528,7 +538,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
                     this._onExit(-1);
                 } else {
                     const message = ( localize(
-                        13161,
+                        13410,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
                     this._onProcessData.fire({

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTabsList.js

@@ -435,7 +435,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                     };
                 }
             },
-            ariaLabel: ( localize(13188, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(13437, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles
         }));
         inputBox.element.style.height = "22px";
@@ -566,7 +566,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         this._terminalGroupService = _terminalGroupService;
     }
     getWidgetAriaLabel() {
-        return localize(13189, "Terminal tabs");
+        return localize(13438, "Terminal tabs");
     }
     getAriaLabel(instance) {
         let ariaLabel = "";
@@ -574,7 +574,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         if (tab && tab.terminalInstances?.length > 1) {
             const terminalIndex = tab.terminalInstances.indexOf(instance);
             ariaLabel = ( localize(
-                13190,
+                13439,
                 "Terminal {0} {1}, split {2} of {3}",
                 instance.instanceId,
                 instance.title,
@@ -582,7 +582,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
                 tab.terminalInstances.length
             ));
         } else {
-            ariaLabel = ( localize(13191, "Terminal {0} {1}", instance.instanceId, instance.title));
+            ariaLabel = ( localize(13440, "Terminal {0} {1}", instance.instanceId, instance.title));
         }
         return ariaLabel;
     }
@@ -770,7 +770,7 @@ let TabDecorationsProvider = class TabDecorationsProvider extends Disposable {
     constructor(_terminalService) {
         super();
         this._terminalService = _terminalService;
-        this.label = ( localize(13192, "Terminal"));
+        this.label = ( localize(13441, "Terminal"));
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._register(

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTooltip.js

@@ -29,7 +29,7 @@ function getInstanceHoverInfo(instance, storageService) {
     }
     actions.push({
         commandId: "toggleDetailedInfo",
-        label: showDetailed ? ( localize(13193, "Hide Details")) : ( localize(13194, "Show Details")),
+        label: showDetailed ? ( localize(13442, "Hide Details")) : ( localize(13443, "Show Details")),
         run() {
             storageService.store(
                 TerminalStorageKeys.TabsShowDetailed,
@@ -51,7 +51,7 @@ function getInstanceHoverInfo(instance, storageService) {
 function getShellProcessTooltip(instance, showDetailed) {
     const lines = [];
     if (instance.processId && instance.processId > 0) {
-        lines.push(( localize(13195, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
+        lines.push(( localize(13444, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
     }
     if (instance.shellLaunchConfig.executable) {
         let commandLine = "";
@@ -67,7 +67,7 @@ function getShellProcessTooltip(instance, showDetailed) {
         if (args) {
             commandLine += ` ${args}`;
         }
-        lines.push(( localize(13196, "Command line: {0}", commandLine)));
+        lines.push(( localize(13445, "Command line: {0}", commandLine)));
     }
     return lines.length ? `\n\n---\n\n${lines.join("\n")}` : "";
 }

package/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.js

@@ -304,6 +304,8 @@ function getShellIntegrationTimeout(configurationService, siInjectionEnabled, is
     let timeoutMs;
     if (!isNumber(timeoutValue) || timeoutValue < 0) {
         timeoutMs = siInjectionEnabled ? 5000 : (isRemote ? 3000 : 2000);
+    } else if (timeoutValue === 0) {
+        timeoutMs = 0;
     } else {
         timeoutMs = Math.max(timeoutValue, 500);
     }

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.js

@@ -44,26 +44,26 @@ var TerminalChatContextKeyStrings;
 })(TerminalChatContextKeyStrings || (TerminalChatContextKeyStrings = {}));
 var TerminalChatContextKeys;
 (function(TerminalChatContextKeys) {
-    TerminalChatContextKeys.focused = ( new RawContextKey(TerminalChatContextKeyStrings.ChatFocus, false, ( localize(13497, "Whether the chat view is focused."))));
-    TerminalChatContextKeys.visible = ( new RawContextKey(TerminalChatContextKeyStrings.ChatVisible, false, ( localize(13498, "Whether the chat view is visible."))));
-    TerminalChatContextKeys.requestActive = ( new RawContextKey(TerminalChatContextKeyStrings.ChatActiveRequest, false, ( localize(13499, "Whether there is an active chat request."))));
-    TerminalChatContextKeys.inputHasText = ( new RawContextKey(TerminalChatContextKeyStrings.ChatInputHasText, false, ( localize(13500, "Whether the chat input has text."))));
+    TerminalChatContextKeys.focused = ( new RawContextKey(TerminalChatContextKeyStrings.ChatFocus, false, ( localize(13746, "Whether the chat view is focused."))));
+    TerminalChatContextKeys.visible = ( new RawContextKey(TerminalChatContextKeyStrings.ChatVisible, false, ( localize(13747, "Whether the chat view is visible."))));
+    TerminalChatContextKeys.requestActive = ( new RawContextKey(TerminalChatContextKeyStrings.ChatActiveRequest, false, ( localize(13748, "Whether there is an active chat request."))));
+    TerminalChatContextKeys.inputHasText = ( new RawContextKey(TerminalChatContextKeyStrings.ChatInputHasText, false, ( localize(13749, "Whether the chat input has text."))));
     TerminalChatContextKeys.responseContainsCodeBlock = ( new RawContextKey(
         TerminalChatContextKeyStrings.ChatResponseContainsCodeBlock,
         false,
-        ( localize(13501, "Whether the chat response contains a code block."))
+        ( localize(13750, "Whether the chat response contains a code block."))
     ));
     TerminalChatContextKeys.responseContainsMultipleCodeBlocks = ( new RawContextKey(
         TerminalChatContextKeyStrings.ChatResponseContainsMultipleCodeBlocks,
         false,
-        ( localize(13502, "Whether the chat response contains multiple code blocks."))
+        ( localize(13751, "Whether the chat response contains multiple code blocks."))
     ));
-    TerminalChatContextKeys.hasChatAgent = ( new RawContextKey(TerminalChatContextKeyStrings.ChatAgentRegistered, false, ( localize(13503, "Whether a chat agent is registered for the terminal location."))));
-    TerminalChatContextKeys.hasChatTerminals = ( new RawContextKey(TerminalChatContextKeyStrings.ChatHasTerminals, false, ( localize(13504, "Whether there are any chat terminals."))));
+    TerminalChatContextKeys.hasChatAgent = ( new RawContextKey(TerminalChatContextKeyStrings.ChatAgentRegistered, false, ( localize(13752, "Whether a chat agent is registered for the terminal location."))));
+    TerminalChatContextKeys.hasChatTerminals = ( new RawContextKey(TerminalChatContextKeyStrings.ChatHasTerminals, false, ( localize(13753, "Whether there are any chat terminals."))));
     TerminalChatContextKeys.hasHiddenChatTerminals = ( new RawContextKey(
         TerminalChatContextKeyStrings.ChatHasHiddenTerminals,
         false,
-        ( localize(13505, "Whether there are any hidden chat terminals."))
+        ( localize(13754, "Whether there are any hidden chat terminals."))
     ));
 })(TerminalChatContextKeys || (TerminalChatContextKeys = {}));
 

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.js

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerColor } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 
 const terminalStickyScrollBackground = registerColor("terminalStickyScroll.background", null, ( localize(
-    13852,
+    14114,
     "The background color of the sticky scroll overlay in the terminal."
 )));
 const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollHover.background", {
@@ -12,7 +12,7 @@ const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollH
     hcDark: "#E48B39",
     hcLight: "#0f4a85"
 }, ( localize(
-    13853,
+    14115,
     "The background color of the sticky scroll overlay in the terminal when hovered."
 )));
 registerColor("terminalStickyScroll.border", {
@@ -20,6 +20,6 @@ registerColor("terminalStickyScroll.border", {
     light: null,
     hcDark: "#6fc3df",
     hcLight: "#0f4a85"
-}, ( localize(13854, "The border of the sticky scroll overlay in the terminal.")));
+}, ( localize(14116, "The border of the sticky scroll overlay in the terminal.")));
 
 export { terminalStickyScrollBackground, terminalStickyScrollHoverBackground };

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.js

@@ -304,19 +304,19 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
         this._element = $(".terminal-sticky-scroll", undefined, hoverOverlay);
         this._xterm.raw.element.parentElement.append(this._element);
         this._register(toDisposable(() => this._element?.remove()));
-        let hoverTitle = ( localize(13855, "Navigate to Command"));
+        let hoverTitle = ( localize(14117, "Navigate to Command"));
         const scrollToPreviousCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToPreviousCommand);
         if (scrollToPreviousCommandKeybinding) {
             const label = scrollToPreviousCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(13856, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
+                hoverTitle += "\n" + ( localize(14118, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
             }
         }
         const scrollToNextCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToNextCommand);
         if (scrollToNextCommandKeybinding) {
             const label = scrollToNextCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(13856, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
+                hoverTitle += "\n" + ( localize(14118, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
             }
         }
         hoverOverlay.title = hoverTitle;