@codingame/monaco-vscode-api 36.2.7 → 37.1.0

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

@@ -303,12 +303,12 @@ const terminalContributionsDescriptor = {
         }
     },
     jsonSchema: {
-        description: ( localize(14959, "Contributes terminal functionality.")),
+        description: ( localize(17024, "Contributes terminal functionality.")),
         type: "object",
         properties: {
             profiles: {
                 type: "array",
-                description: ( localize(14960, "Defines additional terminal profiles that the user can create.")),
+                description: ( localize(17025, "Defines additional terminal profiles that the user can create.")),
                 items: {
                     type: "object",
                     required: ["id", "title"],
@@ -320,16 +320,16 @@ const terminalContributionsDescriptor = {
                     }],
                     properties: {
                         id: {
-                            description: ( localize(14961, "The ID of the terminal profile provider.")),
+                            description: ( localize(17026, "The ID of the terminal profile provider.")),
                             type: "string"
                         },
                         title: {
-                            description: ( localize(14962, "Title for this terminal profile.")),
+                            description: ( localize(17027, "Title for this terminal profile.")),
                             type: "string"
                         },
                         icon: {
                             description: ( localize(
-                                14963,
+                                17028,
                                 "A codicon, URI, or light and dark URIs to associate with this terminal type."
                             )),
                             anyOf: [{
@@ -338,11 +338,11 @@ const terminalContributionsDescriptor = {
                                 type: "object",
                                 properties: {
                                     light: {
-                                        description: ( localize(14964, "Icon path when a light theme is used")),
+                                        description: ( localize(17029, "Icon path when a light theme is used")),
                                         type: "string"
                                     },
                                     dark: {
-                                        description: ( localize(14965, "Icon path when a dark theme is used")),
+                                        description: ( localize(17030, "Icon path when a dark theme is used")),
                                         type: "string"
                                     }
                                 }
@@ -350,7 +350,7 @@ const terminalContributionsDescriptor = {
                         },
                         titleTemplate: {
                             description: ( localize(
-                                14966,
+                                17031,
                                 "A title template string for the terminal tab. Supports variables like ${sequence}, ${process}, ${cwd}, etc. Overrides the default terminal.integrated.tabs.title setting for terminals created with this profile."
                             )),
                             type: "string"
@@ -361,7 +361,7 @@ const terminalContributionsDescriptor = {
             completionProviders: {
                 type: "array",
                 description: ( localize(
-                    14967,
+                    17032,
                     "Defines terminal completion providers that will be registered when the extension activates."
                 )),
                 items: {
@@ -376,7 +376,7 @@ const terminalContributionsDescriptor = {
                     properties: {
                         description: {
                             description: ( localize(
-                                14968,
+                                17033,
                                 "A description of what the completion provider does. This will be shown in the settings UI."
                             )),
                             type: "string"

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

@@ -16,7 +16,7 @@ import { PANEL_BORDER, EDITOR_DRAG_AND_DROP_BACKGROUND, TAB_ACTIVE_BORDER } from
 
 const ansiColorIdentifiers = [];
 const TERMINAL_BACKGROUND_COLOR = registerColor("terminal.background", null, ( localize(
-    14969,
+    17034,
     "The background color of the terminal, this allows coloring the terminal differently to the panel."
 )));
 const TERMINAL_FOREGROUND_COLOR = registerColor("terminal.foreground", {
@@ -24,20 +24,20 @@ const TERMINAL_FOREGROUND_COLOR = registerColor("terminal.foreground", {
     dark: "#CCCCCC",
     hcDark: "#FFFFFF",
     hcLight: "#292929"
-}, ( localize(14970, "The foreground color of the terminal.")));
-const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor("terminalCursor.foreground", null, ( localize(14971, "The foreground color of the terminal cursor.")));
+}, ( localize(17035, "The foreground color of the terminal.")));
+const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor("terminalCursor.foreground", null, ( localize(17036, "The foreground color of the terminal cursor.")));
 const TERMINAL_CURSOR_BACKGROUND_COLOR = registerColor("terminalCursor.background", null, ( localize(
-    14972,
+    17037,
     "The background color of the terminal cursor. Allows customizing the color of a character overlapped by a block cursor."
 )));
-const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor("terminal.selectionBackground", editorSelectionBackground, ( localize(14973, "The selection background color of the terminal.")));
+const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor("terminal.selectionBackground", editorSelectionBackground, ( localize(17038, "The selection background color of the terminal.")));
 const TERMINAL_INACTIVE_SELECTION_BACKGROUND_COLOR = registerColor("terminal.inactiveSelectionBackground", {
     light: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5)),
     dark: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5)),
     hcDark: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.7)),
     hcLight: ( transparent(TERMINAL_SELECTION_BACKGROUND_COLOR, 0.5))
 }, ( localize(
-    14974,
+    17039,
     "The selection background color of the terminal when it does not have focus."
 )));
 const TERMINAL_SELECTION_FOREGROUND_COLOR = registerColor("terminal.selectionForeground", {
@@ -46,7 +46,7 @@ const TERMINAL_SELECTION_FOREGROUND_COLOR = registerColor("terminal.selectionFor
     hcDark: "#000000",
     hcLight: "#ffffff"
 }, ( localize(
-    14975,
+    17040,
     "The selection foreground color of the terminal. When this is null the selection foreground will be retained and have the minimum contrast ratio feature applied."
 )));
 const TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR = registerColor("terminalCommandDecoration.defaultBackground", {
@@ -54,14 +54,14 @@ const TERMINAL_COMMAND_DECORATION_DEFAULT_BACKGROUND_COLOR = registerColor("term
     dark: "#ffffff40",
     hcDark: "#ffffff80",
     hcLight: "#00000040"
-}, ( localize(14976, "The default terminal command decoration background color.")));
+}, ( localize(17041, "The default terminal command decoration background color.")));
 const TERMINAL_COMMAND_DECORATION_SUCCESS_BACKGROUND_COLOR = registerColor("terminalCommandDecoration.successBackground", {
     dark: "#1B81A8",
     light: "#2090D3",
     hcDark: "#1B81A8",
     hcLight: "#007100"
 }, ( localize(
-    14977,
+    17042,
     "The terminal command decoration background color for successful commands."
 )));
 const TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR = registerColor("terminalCommandDecoration.errorBackground", {
@@ -70,26 +70,26 @@ const TERMINAL_COMMAND_DECORATION_ERROR_BACKGROUND_COLOR = registerColor("termin
     hcDark: "#F14C4C",
     hcLight: "#B5200D"
 }, ( localize(
-    14978,
+    17043,
     "The terminal command decoration background color for error commands."
 )));
-const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor("terminalOverviewRuler.cursorForeground", "#A0A0A0CC", ( localize(14979, "The overview ruler cursor color.")));
+const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor("terminalOverviewRuler.cursorForeground", "#A0A0A0CC", ( localize(17044, "The overview ruler cursor color.")));
 registerColor("terminal.border", PANEL_BORDER, ( localize(
-    14980,
+    17045,
     "The color of the border that separates split panes within the terminal. This defaults to panel.border."
 )));
-const TERMINAL_OVERVIEW_RULER_BORDER_COLOR = registerColor("terminalOverviewRuler.border", editorOverviewRulerBorder, ( localize(14981, "The overview ruler left-side border color.")));
+const TERMINAL_OVERVIEW_RULER_BORDER_COLOR = registerColor("terminalOverviewRuler.border", editorOverviewRulerBorder, ( localize(17046, "The overview ruler left-side border color.")));
 const TERMINAL_FIND_MATCH_BACKGROUND_COLOR = registerColor("terminal.findMatchBackground", {
     dark: editorFindMatch,
     light: editorFindMatch,
     hcDark: null,
     hcLight: "#0F4A85"
 }, ( localize(
-    14982,
+    17047,
     "Color of the current search match in the terminal. The color must not be opaque so as not to hide underlying terminal content."
 )), true);
 registerColor("terminal.hoverHighlightBackground", ( transparent(editorHoverHighlight, 0.5)), ( localize(
-    14983,
+    17048,
     "Highlight below the word for which a hover is shown. The color must not be opaque so as not to hide underlying decorations."
 )));
 const TERMINAL_FIND_MATCH_BORDER_COLOR = registerColor("terminal.findMatchBorder", {
@@ -97,14 +97,14 @@ const TERMINAL_FIND_MATCH_BORDER_COLOR = registerColor("terminal.findMatchBorder
     light: null,
     hcDark: "#f38518",
     hcLight: "#0F4A85"
-}, ( localize(14984, "Border color of the current search match in the terminal.")));
+}, ( localize(17049, "Border color of the current search match in the terminal.")));
 const TERMINAL_FIND_MATCH_HIGHLIGHT_BACKGROUND_COLOR = registerColor("terminal.findMatchHighlightBackground", {
     dark: editorFindMatchHighlight,
     light: editorFindMatchHighlight,
     hcDark: null,
     hcLight: null
 }, ( localize(
-    14985,
+    17050,
     "Color of the other search matches in the terminal. The color must not be opaque so as not to hide underlying terminal content."
 )), true);
 const TERMINAL_FIND_MATCH_HIGHLIGHT_BORDER_COLOR = registerColor("terminal.findMatchHighlightBorder", {
@@ -112,19 +112,19 @@ const TERMINAL_FIND_MATCH_HIGHLIGHT_BORDER_COLOR = registerColor("terminal.findM
     light: null,
     hcDark: "#f38518",
     hcLight: "#0F4A85"
-}, ( localize(14986, "Border color of the other search matches in the terminal.")));
+}, ( localize(17051, "Border color of the other search matches in the terminal.")));
 const TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR = registerColor("terminalOverviewRuler.findMatchForeground", {
     dark: overviewRulerFindMatchForeground,
     light: overviewRulerFindMatchForeground,
     hcDark: "#f38518",
     hcLight: "#0F4A85"
-}, ( localize(14987, "Overview ruler marker color for find matches in the terminal.")));
+}, ( localize(17052, "Overview ruler marker color for find matches in the terminal.")));
 registerColor("terminal.dropBackground", EDITOR_DRAG_AND_DROP_BACKGROUND, ( localize(
-    14988,
+    17053,
     "Background color when dragging on top of terminals. The color should have transparency so that the terminal contents can still shine through."
 )), true);
 registerColor("terminal.tab.activeBorder", TAB_ACTIVE_BORDER, ( localize(
-    14989,
+    17054,
     "Border on the side of the terminal tab in the panel. This defaults to tab.activeBorder."
 )));
 registerColor("terminal.initialHintForeground", {
@@ -132,7 +132,7 @@ registerColor("terminal.initialHintForeground", {
     light: "#0007",
     hcDark: null,
     hcLight: null
-}, ( localize(14990, "Foreground color of the terminal initial hint.")));
+}, ( localize(17055, "Foreground color of the terminal initial hint.")));
 const ansiColorMap = {
     "terminal.ansiBlack": {
         index: 0,
@@ -283,7 +283,7 @@ function registerColors() {
     for (const id in ansiColorMap) {
         const entry = ansiColorMap[id];
         const colorName = id.substring(13);
-        ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, ( localize(14991, "'{0}' ANSI color in the terminal.", colorName)));
+        ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, ( localize(17056, "'{0}' ANSI color in the terminal.", colorName)));
     }
 }
 

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

@@ -43,17 +43,17 @@ var TerminalContextKeyStrings;
 var TerminalContextKeys;
 (function(TerminalContextKeys) {
     TerminalContextKeys.isOpen = ( new RawContextKey(TerminalContextKeyStrings.IsOpen, false, true));
-    TerminalContextKeys.focus = ( new RawContextKey(TerminalContextKeyStrings.Focus, false, ( localize(15156, "Whether the terminal is focused."))));
+    TerminalContextKeys.focus = ( new RawContextKey(TerminalContextKeyStrings.Focus, false, ( localize(17221, "Whether the terminal is focused."))));
     TerminalContextKeys.focusInAny = ( new RawContextKey(TerminalContextKeyStrings.FocusInAny, false, ( localize(
-        15157,
+        17222,
         "Whether any terminal is focused, including detached terminals used in other UI."
     ))));
-    TerminalContextKeys.editorFocus = ( new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localize(15158, "Whether a terminal in the editor area is focused."))));
-    TerminalContextKeys.count = ( new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localize(15159, "The current number of terminals."))));
+    TerminalContextKeys.editorFocus = ( new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localize(17223, "Whether a terminal in the editor area is focused."))));
+    TerminalContextKeys.count = ( new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localize(17224, "The current number of terminals."))));
     TerminalContextKeys.groupCount = ( new RawContextKey(TerminalContextKeyStrings.GroupCount, 0, true));
     TerminalContextKeys.tabsNarrow = ( new RawContextKey(TerminalContextKeyStrings.TabsNarrow, false, true));
     TerminalContextKeys.terminalHasFixedWidth = ( new RawContextKey(TerminalContextKeyStrings.HasFixedWidth, false, true));
-    TerminalContextKeys.tabsFocus = ( new RawContextKey(TerminalContextKeyStrings.TabsFocus, false, ( localize(15160, "Whether the terminal tabs widget is focused."))));
+    TerminalContextKeys.tabsFocus = ( new RawContextKey(TerminalContextKeyStrings.TabsFocus, false, ( localize(17225, "Whether the terminal tabs widget is focused."))));
     TerminalContextKeys.webExtensionContributedProfile = ( new RawContextKey(TerminalContextKeyStrings.WebExtensionContributedProfile, false, true));
     TerminalContextKeys.terminalHasBeenCreated = ( new RawContextKey(TerminalContextKeyStrings.TerminalHasBeenCreated, false, true));
     TerminalContextKeys.terminalEditorActive = ( new RawContextKey(TerminalContextKeyStrings.TerminalEditorActive, false, true));
@@ -61,16 +61,16 @@ var TerminalContextKeys;
     TerminalContextKeys.shellType = ( new RawContextKey(TerminalContextKeyStrings.ShellType, undefined, {
         type: "string",
         description: ( localize(
-            15161,
+            17226,
             "The shell type of the active terminal, this is set if the type can be detected."
         ))
     }));
-    TerminalContextKeys.altBufferActive = ( new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localize(15162, "Whether the terminal's alt buffer is active."))));
-    TerminalContextKeys.suggestWidgetVisible = ( new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localize(15163, "Whether the terminal's suggest widget is visible."))));
+    TerminalContextKeys.altBufferActive = ( new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localize(17227, "Whether the terminal's alt buffer is active."))));
+    TerminalContextKeys.suggestWidgetVisible = ( new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localize(17228, "Whether the terminal's suggest widget is visible."))));
     TerminalContextKeys.notFocus = ( TerminalContextKeys.focus.toNegated());
-    TerminalContextKeys.viewShowing = ( new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localize(15164, "Whether the terminal view is showing"))));
-    TerminalContextKeys.textSelected = ( new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localize(15165, "Whether text is selected in the active terminal."))));
-    TerminalContextKeys.textSelectedInFocused = ( new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localize(15166, "Whether text is selected in a focused terminal."))));
+    TerminalContextKeys.viewShowing = ( new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localize(17229, "Whether the terminal view is showing"))));
+    TerminalContextKeys.textSelected = ( new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localize(17230, "Whether text is selected in the active terminal."))));
+    TerminalContextKeys.textSelectedInFocused = ( new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localize(17231, "Whether text is selected in a focused terminal."))));
     TerminalContextKeys.notTextSelected = ( TerminalContextKeys.textSelected.toNegated());
     TerminalContextKeys.findVisible = ( new RawContextKey(TerminalContextKeyStrings.FindVisible, false, true));
     TerminalContextKeys.notFindVisible = ( TerminalContextKeys.findVisible.toNegated());
@@ -78,21 +78,21 @@ var TerminalContextKeys;
     TerminalContextKeys.findFocus = ( new RawContextKey(TerminalContextKeyStrings.FindFocused, false, true));
     TerminalContextKeys.notFindFocus = ( TerminalContextKeys.findInputFocus.toNegated());
     TerminalContextKeys.processSupported = ( new RawContextKey(TerminalContextKeyStrings.ProcessSupported, false, ( localize(
-        15167,
+        17232,
         "Whether terminal processes can be launched in the current workspace."
     ))));
-    TerminalContextKeys.tabsSingularSelection = ( new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localize(15168, "Whether one terminal is selected in the terminal tabs list."))));
-    TerminalContextKeys.splitTerminalTabFocused = ( new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localize(15169, "Whether the focused tab's terminal is a split terminal."))));
-    TerminalContextKeys.splitTerminalActive = ( new RawContextKey(TerminalContextKeyStrings.SplitPaneActive, false, ( localize(15170, "Whether the active terminal is a split pane."))));
+    TerminalContextKeys.tabsSingularSelection = ( new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localize(17233, "Whether one terminal is selected in the terminal tabs list."))));
+    TerminalContextKeys.splitTerminalTabFocused = ( new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localize(17234, "Whether the focused tab's terminal is a split terminal."))));
+    TerminalContextKeys.splitTerminalActive = ( new RawContextKey(TerminalContextKeyStrings.SplitPaneActive, false, ( localize(17235, "Whether the active terminal is a split pane."))));
     TerminalContextKeys.inTerminalRunCommandPicker = ( new RawContextKey(
         TerminalContextKeyStrings.InTerminalRunCommandPicker,
         false,
-        ( localize(15171, "Whether the terminal run command picker is currently open."))
+        ( localize(17236, "Whether the terminal run command picker is currently open."))
     ));
     TerminalContextKeys.terminalShellIntegrationEnabled = ( new RawContextKey(
         TerminalContextKeyStrings.TerminalShellIntegrationEnabled,
         false,
-        ( localize(15172, "Whether shell integration is enabled in the active terminal"))
+        ( localize(17237, "Whether shell integration is enabled in the active terminal"))
     ));
     TerminalContextKeys.terminalDictationInProgress = ( new RawContextKey(TerminalContextKeyStrings.DictationInProgress, false));
     TerminalContextKeys.shouldShowViewInlineActions = ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", TERMINAL_VIEW_ID)), ( ContextKeyExpr.notEquals(`config.${TerminalSettingId.TabsHideCondition}`, "never")), ContextKeyExpr.not(TerminalContribContextKeyStrings.ChatHasHiddenTerminals), ( ContextKeyExpr.or(

package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.d.ts

@@ -14,9 +14,9 @@ export declare const terminalStrings: {
     focusInstance: import("../../../../nls.js").ILocalizedString;
     focusAndHideAccessibleBuffer: import("../../../../nls.js").ILocalizedString;
     kill: {
-        short: string;
         original: string;
         value: string;
+        short: string;
     };
     moveToEditor: import("../../../../nls.js").ILocalizedString;
     moveIntoNewWindow: import("../../../../nls.js").ILocalizedString;
@@ -25,9 +25,9 @@ export declare const terminalStrings: {
     changeIcon: import("../../../../nls.js").ILocalizedString;
     changeColor: import("../../../../nls.js").ILocalizedString;
     split: {
-        short: string;
         original: string;
         value: string;
+        short: string;
     };
     unsplit: import("../../../../nls.js").ILocalizedString;
     rename: import("../../../../nls.js").ILocalizedString;

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

@@ -2,35 +2,35 @@
 import { localize2, localize } from '../../../../nls.js';
 
 const terminalStrings = {
-    terminal: ( localize(15173, "Terminal")),
-    new: ( localize(15174, "New Terminal")),
-    currentSessionCategory: ( localize(15175, "current session")),
-    previousSessionCategory: ( localize(15176, "previous session")),
-    typeTask: ( localize(15177, "Task")),
-    typeLocal: ( localize(15178, "Local")),
-    actionCategory: ( localize2(15179, "Terminal")),
-    focus: ( localize2(15180, "Focus Terminal")),
+    terminal: ( localize(17238, "Terminal")),
+    new: ( localize(17239, "New Terminal")),
+    currentSessionCategory: ( localize(17240, "current session")),
+    previousSessionCategory: ( localize(17241, "previous session")),
+    typeTask: ( localize(17242, "Task")),
+    typeLocal: ( localize(17243, "Local")),
+    actionCategory: ( localize2(17244, "Terminal")),
+    focus: ( localize2(17245, "Focus Terminal")),
     kill: {
-        ...( localize2(15181, "Kill Terminal")),
-        short: ( localize(15182, "Kill"))
+        ...( localize2(17246, "Kill Terminal")),
+        short: ( localize(17247, "Kill"))
     },
-    moveToEditor: ( localize2(15183, "Move Terminal into Editor Area")),
-    moveIntoNewWindow: ( localize2(15184, "Move Terminal into New Window")),
-    newInNewWindow: ( localize2(15185, "New Terminal Window")),
-    moveToTerminalPanel: ( localize2(15186, "Move Terminal into Panel")),
-    changeIcon: ( localize2(15187, "Change Icon...")),
-    changeColor: ( localize2(15188, "Change Color...")),
+    moveToEditor: ( localize2(17248, "Move Terminal into Editor Area")),
+    moveIntoNewWindow: ( localize2(17249, "Move Terminal into New Window")),
+    newInNewWindow: ( localize2(17250, "New Terminal Window")),
+    moveToTerminalPanel: ( localize2(17251, "Move Terminal into Panel")),
+    changeIcon: ( localize2(17252, "Change Icon...")),
+    changeColor: ( localize2(17253, "Change Color...")),
     split: {
-        ...( localize2(15189, "Split Terminal")),
-        short: ( localize(15190, "Split"))
+        ...( localize2(17254, "Split Terminal")),
+        short: ( localize(17255, "Split"))
     },
-    unsplit: ( localize2(15191, "Unsplit Terminal")),
-    rename: ( localize2(15192, "Rename...")),
-    toggleSizeToContentWidth: ( localize2(15193, "Toggle Size to Content Width")),
-    focusHover: ( localize2(15194, "Focus Hover")),
-    newWithCwd: ( localize2(15195, "Create New Terminal Starting in a Custom Working Directory")),
-    renameWithArgs: ( localize2(15196, "Rename the Currently Active Terminal")),
-    scrollToPreviousCommand: ( localize2(15197, "Scroll to Previous Command")),
-    scrollToNextCommand: ( localize2(15198, "Scroll to Next Command"))};
+    unsplit: ( localize2(17256, "Unsplit Terminal")),
+    rename: ( localize2(17257, "Rename...")),
+    toggleSizeToContentWidth: ( localize2(17258, "Toggle Size to Content Width")),
+    focusHover: ( localize2(17259, "Focus Hover")),
+    newWithCwd: ( localize2(17260, "Create New Terminal Starting in a Custom Working Directory")),
+    renameWithArgs: ( localize2(17261, "Rename the Currently Active Terminal")),
+    scrollToPreviousCommand: ( localize2(17262, "Scroll to Previous Command")),
+    scrollToNextCommand: ( localize2(17263, "Scroll to Next Command"))};
 
 export { terminalStrings };

package/vscode/src/vs/workbench/contrib/terminal/terminalContribExports.d.ts

@@ -16,6 +16,9 @@ export declare enum TerminalContribSettingId {
     SuggestEnabled = "terminal.integrated.suggest.enabled",
     AutoApprove = "chat.tools.terminal.autoApprove",
     EnableAutoApprove = "chat.tools.terminal.enableAutoApprove",
+    AutoApproveWorkspaceNpmScripts = "chat.tools.terminal.autoApproveWorkspaceNpmScripts",
+    IgnoreDefaultAutoApproveRules = "chat.tools.terminal.ignoreDefaultAutoApproveRules",
+    BlockDetectedFileWrites = "chat.tools.terminal.blockDetectedFileWrites",
     ShellIntegrationTimeout = "chat.tools.terminal.shellIntegrationTimeout",
     OutputLocation = "chat.tools.terminal.outputLocation",
     AgentSandboxEnabled = "chat.agent.sandbox.enabled",
@@ -24,9 +27,6 @@ export declare enum TerminalContribSettingId {
     AgentSandboxAllowUnsandboxedCommands = "chat.agent.sandbox.allowUnsandboxedCommands",
     AgentSandboxRetryWithAllowNetworkRequests = "chat.agent.sandbox.retryWithAllowNetworkRequests",
     AgentSandboxAllowAutoApprove = "chat.agent.sandbox.allowAutoApprove",
-    DeprecatedAgentSandboxEnabled = "chat.agent.sandbox",
-    DeprecatedAgentSandboxLinuxFileSystem = "chat.agent.sandboxFileSystem.linux",
-    DeprecatedAgentSandboxMacFileSystem = "chat.agent.sandboxFileSystem.mac",
     AgentSandboxLinuxFileSystem = "chat.agent.sandbox.fileSystem.linux",
     AgentSandboxMacFileSystem = "chat.agent.sandbox.fileSystem.mac",
     AgentSandboxWindowsFileSystem = "chat.agent.sandbox.fileSystem.windows"

package/vscode/src/vs/workbench/contrib/terminal/terminalContribExports.js

@@ -8,6 +8,7 @@ import { terminalCommandGuideConfiguration } from '../terminalContrib/commandGui
 import { defaultTerminalFindCommandToSkipShell } from '../terminalContrib/find/common/terminal.find.js';
 import { terminalHistoryConfiguration, defaultTerminalHistoryCommandsToSkipShell } from '../terminalContrib/history/common/terminal.history.js';
 import { terminalOscNotificationsConfiguration } from '../terminalContrib/notification/common/terminalNotificationConfiguration.js';
+import { terminalResizeDimensionsOverlayConfiguration } from '../terminalContrib/resizeDimensionsOverlay/common/terminalResizeDimensionsOverlayConfiguration.js';
 import { terminalStickyScrollConfiguration } from '../terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.js';
 import { defaultTerminalSuggestCommandsToSkipShell } from '../terminalContrib/suggest/common/terminal.suggest.js';
 import { terminalSuggestConfiguration } from '../terminalContrib/suggest/common/terminalSuggestConfiguration.js';
@@ -32,6 +33,9 @@ var TerminalContribSettingId;
     TerminalContribSettingId["SuggestEnabled"] = "terminal.integrated.suggest.enabled";
     TerminalContribSettingId["AutoApprove"] = "chat.tools.terminal.autoApprove";
     TerminalContribSettingId["EnableAutoApprove"] = "chat.tools.terminal.enableAutoApprove";
+    TerminalContribSettingId["AutoApproveWorkspaceNpmScripts"] = "chat.tools.terminal.autoApproveWorkspaceNpmScripts";
+    TerminalContribSettingId["IgnoreDefaultAutoApproveRules"] = "chat.tools.terminal.ignoreDefaultAutoApproveRules";
+    TerminalContribSettingId["BlockDetectedFileWrites"] = "chat.tools.terminal.blockDetectedFileWrites";
     TerminalContribSettingId["ShellIntegrationTimeout"] = "chat.tools.terminal.shellIntegrationTimeout";
     TerminalContribSettingId["OutputLocation"] = "chat.tools.terminal.outputLocation";
     TerminalContribSettingId["AgentSandboxEnabled"] = "chat.agent.sandbox.enabled";
@@ -40,9 +44,6 @@ var TerminalContribSettingId;
     TerminalContribSettingId["AgentSandboxAllowUnsandboxedCommands"] = "chat.agent.sandbox.allowUnsandboxedCommands";
     TerminalContribSettingId["AgentSandboxRetryWithAllowNetworkRequests"] = "chat.agent.sandbox.retryWithAllowNetworkRequests";
     TerminalContribSettingId["AgentSandboxAllowAutoApprove"] = "chat.agent.sandbox.allowAutoApprove";
-    TerminalContribSettingId["DeprecatedAgentSandboxEnabled"] = "chat.agent.sandbox";
-    TerminalContribSettingId["DeprecatedAgentSandboxLinuxFileSystem"] = "chat.agent.sandboxFileSystem.linux";
-    TerminalContribSettingId["DeprecatedAgentSandboxMacFileSystem"] = "chat.agent.sandboxFileSystem.mac";
     TerminalContribSettingId["AgentSandboxLinuxFileSystem"] = "chat.agent.sandbox.fileSystem.linux";
     TerminalContribSettingId["AgentSandboxMacFileSystem"] = "chat.agent.sandbox.fileSystem.mac";
     TerminalContribSettingId["AgentSandboxWindowsFileSystem"] = "chat.agent.sandbox.fileSystem.windows";
@@ -60,6 +61,7 @@ const terminalContribConfiguration = {
     ...terminalCommandGuideConfiguration,
     ...terminalHistoryConfiguration,
     ...terminalOscNotificationsConfiguration,
+    ...terminalResizeDimensionsOverlayConfiguration,
     ...terminalStickyScrollConfiguration,
     ...terminalSuggestConfiguration,
     ...terminalTypeAheadConfiguration,

package/vscode/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.d.ts

@@ -4,8 +4,11 @@ export declare enum TerminalAccessibilitySettingId {
     AccessibleViewPreserveCursorPosition = "terminal.integrated.accessibleViewPreserveCursorPosition",
     AccessibleViewFocusOnCommandExecution = "terminal.integrated.accessibleViewFocusOnCommandExecution"
 }
+export declare enum TerminalAccessibleViewPreserveCursorPosition {
+    Always = "always"
+}
 export interface ITerminalAccessibilityConfiguration {
-    accessibleViewPreserveCursorPosition: boolean;
+    accessibleViewPreserveCursorPosition: boolean | TerminalAccessibleViewPreserveCursorPosition;
     accessibleViewFocusOnCommandExecution: number;
 }
 export declare const terminalAccessibilityConfiguration: IStringDictionary<IConfigurationPropertySchema>;

package/vscode/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.js

@@ -6,20 +6,34 @@ var TerminalAccessibilitySettingId;
     TerminalAccessibilitySettingId["AccessibleViewPreserveCursorPosition"] = "terminal.integrated.accessibleViewPreserveCursorPosition";
     TerminalAccessibilitySettingId["AccessibleViewFocusOnCommandExecution"] = "terminal.integrated.accessibleViewFocusOnCommandExecution";
 })(TerminalAccessibilitySettingId || (TerminalAccessibilitySettingId = {}));
+var TerminalAccessibleViewPreserveCursorPosition;
+(function(TerminalAccessibleViewPreserveCursorPosition) {
+    TerminalAccessibleViewPreserveCursorPosition["Always"] = "always";
+})(
+    TerminalAccessibleViewPreserveCursorPosition || (TerminalAccessibleViewPreserveCursorPosition = {})
+);
 const terminalAccessibilityConfiguration = {
     [TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition]: {
         markdownDescription: ( localize(
-            15224,
-            "Preserve the cursor position on reopen of the terminal's accessible view rather than setting it to the bottom of the buffer."
+            17290,
+            "Controls whether the cursor position is preserved in the terminal's accessible view."
         )),
-        type: "boolean",
+        type: ["boolean", "string"],
+        enum: [false, true, TerminalAccessibleViewPreserveCursorPosition.Always],
+        enumDescriptions: [( localize(17291, "Always position the cursor at the bottom of the buffer.")), ( localize(
+            17292,
+            "Preserve the cursor position on reopen until new terminal content arrives."
+        )), ( localize(
+            17293,
+            "Always preserve the cursor position, including when new terminal content arrives."
+        ))],
         default: false
     },
     [TerminalAccessibilitySettingId.AccessibleViewFocusOnCommandExecution]: {
-        markdownDescription: ( localize(15225, "Focus the terminal accessible view when a command is executed.")),
+        markdownDescription: ( localize(17294, "Focus the terminal accessible view when a command is executed.")),
         type: "boolean",
         default: false
     }
 };
 
-export { TerminalAccessibilitySettingId, terminalAccessibilityConfiguration };
+export { TerminalAccessibilitySettingId, TerminalAccessibleViewPreserveCursorPosition, terminalAccessibilityConfiguration };

package/vscode/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.js

@@ -8,7 +8,7 @@ var TerminalAutoRepliesSettingId;
 const terminalAutoRepliesConfiguration = {
     [TerminalAutoRepliesSettingId.AutoReplies]: {
         markdownDescription: ( localize(
-            15226,
+            17295,
             "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.",
             "`\"Terminate batch job (Y/N)\": \"Y\\r\"`",
             "`\"\\r\"`"
@@ -17,7 +17,7 @@ const terminalAutoRepliesConfiguration = {
         additionalProperties: {
             oneOf: [{
                 type: "string",
-                description: ( localize(15227, "The reply to send to the process."))
+                description: ( localize(17296, "The reply to send to the process."))
             }, {
                 type: "null"
             }]

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver.service.d.ts

@@ -0,0 +1,9 @@
+import { CancellationToken } from "../../../../../base/common/cancellation.js";
+import { OperatingSystem } from "../../../../../base/common/platform.js";
+import { ITerminalChatSessionResolution } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatSessionResolver";
+export declare const ITerminalChatSessionResolver: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalChatSessionResolver>;
+/** Resolves the chat model reference used by the terminal chat surface. */
+export interface ITerminalChatSessionResolver {
+    readonly _serviceBrand: undefined;
+    resolve(token: CancellationToken, shellType: string | undefined, os: OperatingSystem): Promise<ITerminalChatSessionResolution | undefined>;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+
+const ITerminalChatSessionResolver = ( createDecorator("terminalChatSessionResolver"));
+
+export { ITerminalChatSessionResolver };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.d.ts

@@ -23,12 +23,11 @@ export declare enum TerminalChatAgentToolsSettingId {
     DetachBackgroundProcesses = "chat.tools.terminal.detachBackgroundProcesses",
     BackgroundNotifications = "chat.tools.terminal.backgroundNotifications",
     OutputDeltas = "chat.tools.terminal.outputDeltas",
+    OutputCompaction = "chat.tools.terminal.outputCompaction",
     IdlePollInterval = "chat.tools.terminal.idlePollInterval",
     TerminalProfileLinux = "chat.tools.terminal.terminalProfile.linux",
     TerminalProfileMacOs = "chat.tools.terminal.terminalProfile.osx",
     TerminalProfileWindows = "chat.tools.terminal.terminalProfile.windows",
-    DeprecatedAgentSandboxLinuxFileSystem = "chat.agent.sandboxFileSystem.linux",
-    DeprecatedAgentSandboxMacFileSystem = "chat.agent.sandboxFileSystem.mac",
     DeprecatedAutoApproveCompatible = "chat.agent.terminal.autoApprove",
     DeprecatedAutoApprove1 = "chat.agent.terminal.allowList",
     DeprecatedAutoApprove2 = "chat.agent.terminal.denyList",