@codingame/monaco-vscode-api 24.2.0 → 25.0.0

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(
-    11683,
+    11713,
     '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(11684, 'The foreground color of the terminal.')));
-const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor('terminalCursor.foreground', null, ( localize(11685, 'The foreground color of the terminal cursor.')));
+}, ( localize(11714, 'The foreground color of the terminal.')));
+const TERMINAL_CURSOR_FOREGROUND_COLOR = registerColor('terminalCursor.foreground', null, ( localize(11715, 'The foreground color of the terminal cursor.')));
 const TERMINAL_CURSOR_BACKGROUND_COLOR = registerColor('terminalCursor.background', null, ( localize(
-    11686,
+    11716,
     '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(11687, 'The selection background color of the terminal.')));
+const TERMINAL_SELECTION_BACKGROUND_COLOR = registerColor('terminal.selectionBackground', editorSelectionBackground, ( localize(11717, '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(
-    11688,
+    11718,
     '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(
-    11689,
+    11719,
     '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(11690, 'The default terminal command decoration background color.')));
+}, ( localize(11720, '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(
-    11691,
+    11721,
     '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(
-    11692,
+    11722,
     'The terminal command decoration background color for error commands.'
 )));
-const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor('terminalOverviewRuler.cursorForeground', '#A0A0A0CC', ( localize(11693, 'The overview ruler cursor color.')));
+const TERMINAL_OVERVIEW_RULER_CURSOR_FOREGROUND_COLOR = registerColor('terminalOverviewRuler.cursorForeground', '#A0A0A0CC', ( localize(11723, 'The overview ruler cursor color.')));
 registerColor('terminal.border', PANEL_BORDER, ( localize(
-    11694,
+    11724,
     '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(11695, 'The overview ruler left-side border color.')));
+const TERMINAL_OVERVIEW_RULER_BORDER_COLOR = registerColor('terminalOverviewRuler.border', editorOverviewRulerBorder, ( localize(11725, '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(
-    11696,
+    11726,
     '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(
-    11697,
+    11727,
     '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(11698, 'Border color of the current search match in the terminal.')));
+}, ( localize(11728, '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(
-    11699,
+    11729,
     '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(11700, 'Border color of the other search matches in the terminal.')));
+}, ( localize(11730, '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(11701, 'Overview ruler marker color for find matches in the terminal.')));
+}, ( localize(11731, 'Overview ruler marker color for find matches in the terminal.')));
 registerColor('terminal.dropBackground', EDITOR_DRAG_AND_DROP_BACKGROUND, ( localize(
-    11702,
+    11732,
     "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(
-    11703,
+    11733,
     '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(11704, 'Foreground color of the terminal initial hint.')));
+}, ( localize(11734, '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(11705, '\'{0}\' ANSI color in the terminal.', colorName)));
+        ansiColorIdentifiers[entry.index] = registerColor(id, entry.defaults, ( localize(11735, '\'{0}\' ANSI color in the terminal.', colorName)));
     }
 }
 

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

@@ -3,6 +3,7 @@ import { localize } from '../../../../nls.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
 import { TERMINAL_VIEW_ID } from './terminal.js';
+import { TerminalContribContextKeyStrings } from '../terminalContribExports.js';
 
 var TerminalContextKeyStrings;
 (function (TerminalContextKeyStrings) {
@@ -42,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(11865, "Whether the terminal is focused."))));
+    TerminalContextKeys.focus = ( new RawContextKey(TerminalContextKeyStrings.Focus, false, ( localize(11895, "Whether the terminal is focused."))));
     TerminalContextKeys.focusInAny = ( new RawContextKey(TerminalContextKeyStrings.FocusInAny, false, ( localize(
-        11866,
+        11896,
         "Whether any terminal is focused, including detached terminals used in other UI."
     ))));
-    TerminalContextKeys.editorFocus = ( new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localize(11867, "Whether a terminal in the editor area is focused."))));
-    TerminalContextKeys.count = ( new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localize(11868, "The current number of terminals."))));
+    TerminalContextKeys.editorFocus = ( new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localize(11897, "Whether a terminal in the editor area is focused."))));
+    TerminalContextKeys.count = ( new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localize(11898, "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(11869, "Whether the terminal tabs widget is focused."))));
+    TerminalContextKeys.tabsFocus = ( new RawContextKey(TerminalContextKeyStrings.TabsFocus, false, ( localize(11899, "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 +62,16 @@ var TerminalContextKeys;
         TerminalContextKeyStrings.ShellType,
         undefined,
         { type: 'string', description: ( localize(
-            11870,
+            11900,
             "The shell type of the active terminal, this is set if the type can be detected."
         )) }
     ));
-    TerminalContextKeys.altBufferActive = ( new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localize(11871, "Whether the terminal's alt buffer is active."))));
-    TerminalContextKeys.suggestWidgetVisible = ( new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localize(11872, "Whether the terminal's suggest widget is visible."))));
+    TerminalContextKeys.altBufferActive = ( new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localize(11901, "Whether the terminal's alt buffer is active."))));
+    TerminalContextKeys.suggestWidgetVisible = ( new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localize(11902, "Whether the terminal's suggest widget is visible."))));
     TerminalContextKeys.notFocus = ( TerminalContextKeys.focus.toNegated());
-    TerminalContextKeys.viewShowing = ( new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localize(11873, "Whether the terminal view is showing"))));
-    TerminalContextKeys.textSelected = ( new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localize(11874, "Whether text is selected in the active terminal."))));
-    TerminalContextKeys.textSelectedInFocused = ( new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localize(11875, "Whether text is selected in a focused terminal."))));
+    TerminalContextKeys.viewShowing = ( new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localize(11903, "Whether the terminal view is showing"))));
+    TerminalContextKeys.textSelected = ( new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localize(11904, "Whether text is selected in the active terminal."))));
+    TerminalContextKeys.textSelectedInFocused = ( new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localize(11905, "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,24 +79,24 @@ var TerminalContextKeys;
     TerminalContextKeys.findFocus = ( new RawContextKey(TerminalContextKeyStrings.FindFocused, false, true));
     TerminalContextKeys.notFindFocus = ( TerminalContextKeys.findInputFocus.toNegated());
     TerminalContextKeys.processSupported = ( new RawContextKey(TerminalContextKeyStrings.ProcessSupported, false, ( localize(
-        11876,
+        11906,
         "Whether terminal processes can be launched in the current workspace."
     ))));
-    TerminalContextKeys.tabsSingularSelection = ( new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localize(11877, "Whether one terminal is selected in the terminal tabs list."))));
-    TerminalContextKeys.splitTerminalTabFocused = ( new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localize(11878, "Whether the focused tab's terminal is a split terminal."))));
-    TerminalContextKeys.splitTerminalActive = ( new RawContextKey(TerminalContextKeyStrings.SplitPaneActive, false, ( localize(11879, "Whether the active terminal is a split pane."))));
+    TerminalContextKeys.tabsSingularSelection = ( new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localize(11907, "Whether one terminal is selected in the terminal tabs list."))));
+    TerminalContextKeys.splitTerminalTabFocused = ( new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localize(11908, "Whether the focused tab's terminal is a split terminal."))));
+    TerminalContextKeys.splitTerminalActive = ( new RawContextKey(TerminalContextKeyStrings.SplitPaneActive, false, ( localize(11909, "Whether the active terminal is a split pane."))));
     TerminalContextKeys.inTerminalRunCommandPicker = ( new RawContextKey(
         TerminalContextKeyStrings.InTerminalRunCommandPicker,
         false,
-        ( localize(11880, "Whether the terminal run command picker is currently open."))
+        ( localize(11910, "Whether the terminal run command picker is currently open."))
     ));
     TerminalContextKeys.terminalShellIntegrationEnabled = ( new RawContextKey(
         TerminalContextKeyStrings.TerminalShellIntegrationEnabled,
         false,
-        ( localize(11881, "Whether shell integration is enabled in the active terminal"))
+        ( localize(11911, "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('hasHiddenChatTerminals'), ( ContextKeyExpr.or(
+    TerminalContextKeys.shouldShowViewInlineActions = ( ContextKeyExpr.and(( ContextKeyExpr.equals('view', TERMINAL_VIEW_ID)), ( ContextKeyExpr.notEquals(`config.${TerminalSettingId.TabsHideCondition}`, 'never')), ContextKeyExpr.not(TerminalContribContextKeyStrings.ChatHasHiddenTerminals), ( ContextKeyExpr.or(
         ContextKeyExpr.not(`config.${TerminalSettingId.TabsEnabled}`),
         ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${TerminalSettingId.TabsShowActions}`, 'singleTerminal')), ( ContextKeyExpr.equals(TerminalContextKeyStrings.GroupCount, 1)))),
         ( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${TerminalSettingId.TabsShowActions}`, 'singleTerminalOrNarrow')), ( ContextKeyExpr.or(( ContextKeyExpr.equals(TerminalContextKeyStrings.GroupCount, 1)), ( ContextKeyExpr.has(TerminalContextKeyStrings.TabsNarrow)))))),

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

@@ -2,35 +2,35 @@
 import { localize2, localize } from '../../../../nls.js';
 
 const terminalStrings = {
-    terminal: ( localize(11882, "Terminal")),
-    new: ( localize(11883, "New Terminal")),
-    currentSessionCategory: ( localize(11884, 'current session')),
-    previousSessionCategory: ( localize(11885, 'previous session')),
-    typeTask: ( localize(11886, "Task")),
-    typeLocal: ( localize(11887, "Local")),
-    actionCategory: ( localize2(11888, "Terminal")),
-    focus: ( localize2(11889, "Focus Terminal")),
+    terminal: ( localize(11912, "Terminal")),
+    new: ( localize(11913, "New Terminal")),
+    currentSessionCategory: ( localize(11914, 'current session')),
+    previousSessionCategory: ( localize(11915, 'previous session')),
+    typeTask: ( localize(11916, "Task")),
+    typeLocal: ( localize(11917, "Local")),
+    actionCategory: ( localize2(11918, "Terminal")),
+    focus: ( localize2(11919, "Focus Terminal")),
     kill: {
-        ...( localize2(11890, "Kill Terminal")),
-        short: ( localize(11891, "Kill")),
+        ...( localize2(11920, "Kill Terminal")),
+        short: ( localize(11921, "Kill")),
     },
-    moveToEditor: ( localize2(11892, "Move Terminal into Editor Area")),
-    moveIntoNewWindow: ( localize2(11893, "Move Terminal into New Window")),
-    newInNewWindow: ( localize2(11894, "New Terminal Window")),
-    moveToTerminalPanel: ( localize2(11895, "Move Terminal into Panel")),
-    changeIcon: ( localize2(11896, "Change Icon...")),
-    changeColor: ( localize2(11897, "Change Color...")),
+    moveToEditor: ( localize2(11922, "Move Terminal into Editor Area")),
+    moveIntoNewWindow: ( localize2(11923, "Move Terminal into New Window")),
+    newInNewWindow: ( localize2(11924, "New Terminal Window")),
+    moveToTerminalPanel: ( localize2(11925, "Move Terminal into Panel")),
+    changeIcon: ( localize2(11926, "Change Icon...")),
+    changeColor: ( localize2(11927, "Change Color...")),
     split: {
-        ...( localize2(11898, "Split Terminal")),
-        short: ( localize(11899, "Split")),
+        ...( localize2(11928, "Split Terminal")),
+        short: ( localize(11929, "Split")),
     },
-    unsplit: ( localize2(11900, "Unsplit Terminal")),
-    rename: ( localize2(11901, "Rename...")),
-    toggleSizeToContentWidth: ( localize2(11902, "Toggle Size to Content Width")),
-    focusHover: ( localize2(11903, "Focus Hover")),
-    newWithCwd: ( localize2(11904, "Create New Terminal Starting in a Custom Working Directory")),
-    renameWithArgs: ( localize2(11905, "Rename the Currently Active Terminal")),
-    scrollToPreviousCommand: ( localize2(11906, "Scroll to Previous Command")),
-    scrollToNextCommand: ( localize2(11907, "Scroll to Next Command"))};
+    unsplit: ( localize2(11930, "Unsplit Terminal")),
+    rename: ( localize2(11931, "Rename...")),
+    toggleSizeToContentWidth: ( localize2(11932, "Toggle Size to Content Width")),
+    focusHover: ( localize2(11933, "Focus Hover")),
+    newWithCwd: ( localize2(11934, "Create New Terminal Starting in a Custom Working Directory")),
+    renameWithArgs: ( localize2(11935, "Rename the Currently Active Terminal")),
+    scrollToPreviousCommand: ( localize2(11936, "Scroll to Previous Command")),
+    scrollToNextCommand: ( localize2(11937, "Scroll to Next Command"))};
 
 export { terminalStrings };

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

@@ -18,5 +18,9 @@ export declare enum TerminalContribSettingId {
     ShellIntegrationTimeout = "chat.tools.terminal.shellIntegrationTimeout",
     OutputLocation = "chat.tools.terminal.outputLocation"
 }
+export declare enum TerminalContribContextKeyStrings {
+    ChatHasTerminals = "hasChatTerminals",
+    ChatHasHiddenTerminals = "hasHiddenChatTerminals"
+}
 export declare const terminalContribConfiguration: IConfigurationNode["properties"];
 export declare const defaultTerminalContribCommandsToSkipShell: (TerminalAccessibilityCommandId | import("../terminalContrib/find/common/terminal.find.js").TerminalFindCommandId | import("../terminalContrib/history/common/terminal.history.js").TerminalHistoryCommandId | import("../terminalContrib/suggest/common/terminal.suggest.js").TerminalSuggestCommandId)[];

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

@@ -2,7 +2,7 @@
 import { defaultTerminalAccessibilityCommandsToSkipShell } from '../terminalContrib/accessibility/common/terminal.accessibility.js';
 import { terminalAccessibilityConfiguration } from '../terminalContrib/accessibility/common/terminalAccessibilityConfiguration.js';
 import { terminalAutoRepliesConfiguration } from '../terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.js';
-import { terminalInitialHintConfiguration } from '../terminalContrib/chat/common/terminalInitialHintConfiguration.js';
+import { terminalInitialHintConfiguration } from '../terminalContrib/inlineHint/common/terminalInitialHintConfiguration.js';
 import { terminalChatAgentToolsConfiguration } from '../terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.js';
 import { terminalCommandGuideConfiguration } from '../terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.js';
 import { defaultTerminalFindCommandToSkipShell } from '../terminalContrib/find/common/terminal.find.js';
@@ -33,6 +33,11 @@ var TerminalContribSettingId;
     TerminalContribSettingId["ShellIntegrationTimeout"] = "chat.tools.terminal.shellIntegrationTimeout";
     TerminalContribSettingId["OutputLocation"] = "chat.tools.terminal.outputLocation";
 })(TerminalContribSettingId || (TerminalContribSettingId = {}));
+var TerminalContribContextKeyStrings;
+(function (TerminalContribContextKeyStrings) {
+    TerminalContribContextKeyStrings["ChatHasTerminals"] = "hasChatTerminals";
+    TerminalContribContextKeyStrings["ChatHasHiddenTerminals"] = "hasHiddenChatTerminals";
+})(TerminalContribContextKeyStrings || (TerminalContribContextKeyStrings = {}));
 const terminalContribConfiguration = {
     ...terminalAccessibilityConfiguration,
     ...terminalAutoRepliesConfiguration,
@@ -52,4 +57,4 @@ const defaultTerminalContribCommandsToSkipShell = [
     ...defaultTerminalSuggestCommandsToSkipShell,
 ];
 
-export { TerminalContribCommandId, TerminalContribSettingId, defaultTerminalContribCommandsToSkipShell, terminalContribConfiguration };
+export { TerminalContribCommandId, TerminalContribContextKeyStrings, TerminalContribSettingId, defaultTerminalContribCommandsToSkipShell, terminalContribConfiguration };

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

@@ -9,14 +9,14 @@ var TerminalAccessibilitySettingId;
 const terminalAccessibilityConfiguration = {
     [TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition]: {
         markdownDescription: ( localize(
-            11933,
+            11963,
             "Preserve the cursor position on reopen of the terminal's accessible view rather than setting it to the bottom of the buffer."
         )),
         type: 'boolean',
         default: false
     },
     [TerminalAccessibilitySettingId.AccessibleViewFocusOnCommandExecution]: {
-        markdownDescription: ( localize(11934, "Focus the terminal accessible view when a command is executed.")),
+        markdownDescription: ( localize(11964, "Focus the terminal accessible view when a command is executed.")),
         type: 'boolean',
         default: false
     },

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

@@ -8,7 +8,7 @@ var TerminalAutoRepliesSettingId;
 const terminalAutoRepliesConfiguration = {
     [TerminalAutoRepliesSettingId.AutoReplies]: {
         markdownDescription: ( localize(
-            11935,
+            11965,
             "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(11936, "The reply to send to the process."))
+                    description: ( localize(11966, "The reply to send to the process."))
                 },
                 { type: 'null' }]
         },

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

@@ -3,11 +3,13 @@ import { type IConfigurationPropertySchema } from "../../../../../platform/confi
 export declare enum TerminalChatAgentToolsSettingId {
     EnableAutoApprove = "chat.tools.terminal.enableAutoApprove",
     AutoApprove = "chat.tools.terminal.autoApprove",
+    AutoApproveWorkspaceNpmScripts = "chat.tools.terminal.autoApproveWorkspaceNpmScripts",
     IgnoreDefaultAutoApproveRules = "chat.tools.terminal.ignoreDefaultAutoApproveRules",
     BlockDetectedFileWrites = "chat.tools.terminal.blockDetectedFileWrites",
     ShellIntegrationTimeout = "chat.tools.terminal.shellIntegrationTimeout",
     AutoReplyToPrompts = "chat.tools.terminal.autoReplyToPrompts",
     OutputLocation = "chat.tools.terminal.outputLocation",
+    PreventShellHistory = "chat.tools.terminal.preventShellHistory",
     TerminalProfileLinux = "chat.tools.terminal.terminalProfile.linux",
     TerminalProfileMacOs = "chat.tools.terminal.terminalProfile.osx",
     TerminalProfileWindows = "chat.tools.terminal.terminalProfile.windows",