@codingame/monaco-vscode-api 25.0.1 → 25.1.1

package/missing-services.js

@@ -309,6 +309,7 @@ import { ChatEntitlement } from './vscode/src/vs/workbench/services/chat/common/
 import { IInlineCompletionsUnificationService } from './vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.service.js';
 import { IAgentSessionsService } from './vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service.js';
 import { IUserAttentionService } from './vscode/src/vs/workbench/services/userAttention/common/userAttentionService.service.js';
+import { ICodeCompareModelService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.js';
 import { EditorWorkerService } from './vscode/src/vs/editor/browser/services/editorWorkerService.js';
 import { IEditorWorkerService } from './vscode/src/vs/editor/common/services/editorWorker.service.js';
 import { getBuiltInExtensionTranslationsUris, getExtensionIdProvidingCurrentLocale } from './l10n.js';
@@ -7815,3 +7816,12 @@ class UserAttentionService {
     }
 }
 registerSingleton(IUserAttentionService, UserAttentionService, InstantiationType.Delayed);
+class CodeCompareModelService {
+    constructor() {
+        this.createModel = unsupported;
+    }
+}
+__decorate([
+    Unsupported
+], CodeCompareModelService.prototype, "createModel", void 0);
+registerSingleton(ICodeCompareModelService, CodeCompareModelService, InstantiationType.Delayed);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "25.0.1",
+  "version": "25.1.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
@@ -15,13 +15,13 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-base-service-override": "25.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "25.0.1",
-    "@codingame/monaco-vscode-extensions-service-override": "25.0.1",
-    "@codingame/monaco-vscode-files-service-override": "25.0.1",
-    "@codingame/monaco-vscode-host-service-override": "25.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "25.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "25.0.1",
+    "@codingame/monaco-vscode-base-service-override": "25.1.1",
+    "@codingame/monaco-vscode-environment-service-override": "25.1.1",
+    "@codingame/monaco-vscode-extensions-service-override": "25.1.1",
+    "@codingame/monaco-vscode-files-service-override": "25.1.1",
+    "@codingame/monaco-vscode-host-service-override": "25.1.1",
+    "@codingame/monaco-vscode-layout-service-override": "25.1.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "25.1.1",
     "@vscode/iconv-lite-umd": "0.7.1",
     "dompurify": "3.3.1",
     "jschardet": "3.1.4",

package/services.d.ts

@@ -339,3 +339,4 @@ export { ISCMRepositorySelectionMode } from "./vscode/src/vs/workbench/contrib/s
 export { IAgentSessionsService } from "./vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service.js";
 export { IUserAttentionService } from "./vscode/src/vs/workbench/services/userAttention/common/userAttentionService.service.js";
 export type { IAgentSessionsModel } from "./vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js";
+export { ICodeCompareModelService } from "./vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.js";

package/services.js

@@ -408,11 +408,12 @@ export { IRandomService } from './vscode/src/vs/workbench/contrib/editTelemetry/
 export { ISCMRepositorySelectionMode } from './vscode/src/vs/workbench/contrib/scm/common/scm.js';
 export { IAgentSessionsService } from './vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsService.service.js';
 export { IUserAttentionService } from './vscode/src/vs/workbench/services/userAttention/common/userAttentionService.service.js';
+export { ICodeCompareModelService } from './vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.js';
 
-if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.108.1-1a09aa35-63b0-43ba-b0e6-9c2000373997") {
-    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.108.1-1a09aa35-63b0-43ba-b0e6-9c2000373997"}, ${window.monacoVscodeApiBuildId} is already loaded`);
+if (window.monacoVscodeApiBuildId != null && window.monacoVscodeApiBuildId !== "1.108.2-ce653e52-3c01-43c5-b5a5-7390d7997f61") {
+    throw new Error(`Another version of monaco-vscode-api has already been loaded. Trying to load ${"1.108.2-ce653e52-3c01-43c5-b5a5-7390d7997f61"}, ${window.monacoVscodeApiBuildId} is already loaded`);
 }
-window.monacoVscodeApiBuildId = "1.108.1-1a09aa35-63b0-43ba-b0e6-9c2000373997";
+window.monacoVscodeApiBuildId = "1.108.2-ce653e52-3c01-43c5-b5a5-7390d7997f61";
 function registerCommands(options) {
     function asMenuId(menu) {
         switch (menu) {

package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js

@@ -25,7 +25,7 @@ import { ILabelService } from '../../../../platform/label/common/label.service.j
 import { MarkerSeverity } from '../../../../platform/markers/common/markers.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { SeverityIcon } from '../../../../base/browser/ui/severityIcon/severityIcon.js';
-import { registerColor, oneOf, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import { oneOf, registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
 import { editorErrorForeground, editorErrorBorder, editorWarningForeground, editorWarningBorder, editorInfoForeground, editorInfoBorder, editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.js

@@ -18,8 +18,8 @@ import { getEditorBlendedColor, inlineEditIndicatorPrimaryBorder, inlineEditIndi
 import { rectToProps } from '../utils/utils.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/observables/constObservable.js';
-import { DebugLocation } from '../../../../../../../base/common/observableInternal/debugLocation.js';
 import { observableFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { DebugLocation } from '../../../../../../../base/common/observableInternal/debugLocation.js';
 import { autorun } from '../../../../../../../base/common/observableInternal/reactions/autorun.js';
 
 let JumpToView = class JumpToView extends Disposable {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.js

@@ -22,9 +22,9 @@ import { RangeMapping } from '../../../../../../common/diff/rangeMapping.js';
 import { indentOfLine } from '../../../../../../common/model/textModel.js';
 import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
 import { Size2D } from '../../../../../../common/core/2d/size.js';
-import { DebugLocation } from '../../../../../../../base/common/observableInternal/debugLocation.js';
 import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils/utils.js';
 import { derived, derivedOpts } from '../../../../../../../base/common/observableInternal/observables/derived.js';
+import { DebugLocation } from '../../../../../../../base/common/observableInternal/debugLocation.js';
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { observableSignalFromEvent } from '../../../../../../../base/common/observableInternal/observables/observableSignalFromEvent.js';
 

package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { onDidRegisterWindow, trackActiveElement, getActiveElement, isEditableElement, trackFocus, getActiveDocument } from '../../../base/browser/dom.js';
+import { onDidRegisterWindow, trackActiveElement, isEditableElement, getActiveElement, trackFocus, getActiveDocument } from '../../../base/browser/dom.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { PauseableEmitter, Event } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';

package/vscode/src/vs/platform/observable/common/platformObservableUtils.js

@@ -1,8 +1,8 @@
 
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import '../../../base/common/observableInternal/index.js';
-import { DebugLocation } from '../../../base/common/observableInternal/debugLocation.js';
 import { observableFromEventOpts } from '../../../base/common/observableInternal/observables/observableFromEvent.js';
+import { DebugLocation } from '../../../base/common/observableInternal/debugLocation.js';
 import { derivedOpts } from '../../../base/common/observableInternal/observables/derived.js';
 
 function observableConfigValue(key, defaultValue, configurationService, debugLocation = DebugLocation.ofCaller()) {

package/vscode/src/vs/platform/product/common/product.js

@@ -4,9 +4,9 @@ import productJson from '../../../../../product.json.js';
 var product = {
   ...productJson,
   quality: 'stable',
-  version: '1.108.1',
-  commit: '585eba7c0c34fd6b30faac7c62a42050bfbc0086',
-  date: '2026-01-21T14:40:09.333Z',
+  version: '1.108.2',
+  commit: 'c9d77990917f3102ada88be140d28b038d1dd7c7',
+  date: '2026-02-02T14:47:51.463Z',
   ...(globalThis._VSCODE_PRODUCT_JSON ?? {})
 };
 

package/vscode/src/vs/platform/quickinput/browser/quickInputService.js

@@ -8,7 +8,7 @@ import { IInstantiationService } from '../../instantiation/common/instantiation.
 import { ILayoutService } from '../../layout/browser/layoutService.service.js';
 import { IOpenerService } from '../../opener/common/opener.service.js';
 import { QuickAccessController } from './quickAccess.js';
-import { getListStyles, defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultButtonStyles, defaultCountBadgeStyles, defaultToggleStyles, defaultInputBoxStyles } from '../../theme/browser/defaultStyles.js';
+import { defaultKeybindingLabelStyles, defaultProgressBarStyles, defaultButtonStyles, defaultCountBadgeStyles, defaultToggleStyles, defaultInputBoxStyles, getListStyles } from '../../theme/browser/defaultStyles.js';
 import { asCssVariable } from '../../theme/common/colorUtils.js';
 import { activeContrastBorder } from '../../theme/common/colors/baseColors.js';
 import '../../theme/common/colors/chartsColors.js';

package/vscode/src/vs/platform/terminal/common/terminal.d.ts

@@ -92,6 +92,7 @@ export declare enum TerminalSettingId {
     PersistentSessionReviveProcess = "terminal.integrated.persistentSessionReviveProcess",
     HideOnStartup = "terminal.integrated.hideOnStartup",
     HideOnLastClosed = "terminal.integrated.hideOnLastClosed",
+    PreserveDrawingBuffer = "terminal.integrated.preserveDrawingBuffer",
     CustomGlyphs = "terminal.integrated.customGlyphs",
     RescaleOverlappingGlyphs = "terminal.integrated.rescaleOverlappingGlyphs",
     PersistentSessionScrollback = "terminal.integrated.persistentSessionScrollback",

package/vscode/src/vs/platform/terminal/common/terminal.js

@@ -85,6 +85,7 @@ var TerminalSettingId;
     TerminalSettingId["PersistentSessionReviveProcess"] = "terminal.integrated.persistentSessionReviveProcess";
     TerminalSettingId["HideOnStartup"] = "terminal.integrated.hideOnStartup";
     TerminalSettingId["HideOnLastClosed"] = "terminal.integrated.hideOnLastClosed";
+    TerminalSettingId["PreserveDrawingBuffer"] = "terminal.integrated.preserveDrawingBuffer";
     TerminalSettingId["CustomGlyphs"] = "terminal.integrated.customGlyphs";
     TerminalSettingId["RescaleOverlappingGlyphs"] = "terminal.integrated.rescaleOverlappingGlyphs";
     TerminalSettingId["PersistentSessionScrollback"] = "terminal.integrated.persistentSessionScrollback";

package/vscode/src/vs/platform/userDataSync/common/globalStateSync.js

@@ -19,7 +19,7 @@ import { IUriIdentityService } from '../../uriIdentity/common/uriIdentity.servic
 import { AbstractSynchroniser, getSyncResourceLogLabel, AbstractInitializer, isSyncData } from './abstractSynchronizer.js';
 import { edit } from './content.js';
 import { merge } from './globalStateMerge.js';
-import { SyncResource, USER_DATA_SYNC_SCHEME, Change, ALL_SYNC_RESOURCES, SYNC_SERVICE_URL_TYPE, getEnablementKey, createSyncHeaders, UserDataSyncError, UserDataSyncErrorCode } from './userDataSync.js';
+import { SyncResource, USER_DATA_SYNC_SCHEME, Change, SYNC_SERVICE_URL_TYPE, ALL_SYNC_RESOURCES, getEnablementKey, createSyncHeaders, UserDataSyncError, UserDataSyncErrorCode } from './userDataSync.js';
 import { IUserDataSyncStoreService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncEnablementService } from './userDataSync.service.js';
 import { IUserDataProfilesService } from '../../userDataProfile/common/userDataProfile.service.js';
 import { IUserDataProfileStorageService } from '../../userDataProfile/common/userDataProfileStorageService.service.js';

package/vscode/src/vs/workbench/api/common/extHostApiCommands.js

@@ -6,11 +6,11 @@ import { isLocationLink } from '../../../editor/common/languages.js';
 import { decodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { validateWhenClauses } from '../../../platform/contextkey/common/contextkey.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
-import { DocumentHighlight, SymbolKind, Range, TextEdit, location, Hover, Position as Position$1, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, CompletionItem, SignatureHelp, Selection, Color, ColorPresentation, InlayHint, FoldingRange, NotebookExclusiveDocumentPattern, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
+import { DocumentHighlight, SymbolKind, Range, TextEdit, location, Hover, Position as Position$1, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, CompletionItem, SignatureHelp, Selection as Selection$1, Color, ColorPresentation, InlayHint, FoldingRange, NotebookExclusiveDocumentPattern, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
 import { SelectionRange, SemanticTokensLegend, SemanticTokens, CompletionList, CodeLens, CodeAction, ColorInformation, Color as Color$1 } from './extHostTypes.js';
 import { Position } from './extHostTypes/position.js';
 import { Range as Range$1 } from './extHostTypes/range.js';
-import { Selection as Selection$1 } from './extHostTypes/selection.js';
+import { Selection } from './extHostTypes/selection.js';
 import { SymbolInformation } from './extHostTypes/symbolInformation.js';
 import { Location } from './extHostTypes/location.js';
 import { CodeActionKind } from './extHostTypes/codeActionKind.js';
@@ -440,7 +440,7 @@ const newCommands = [
                 'rangeOrSelection',
                 'Range in a text document. Some refactoring provider requires Selection object.',
                 v => Range$1.isRange(v),
-                v => Selection$1.isSelection(v) ? Selection.from(v) : Range.from(v)
+                v => Selection.isSelection(v) ? Selection$1.from(v) : Range.from(v)
             )),
             ApiCommandArgument.String.with('kind', 'Code action kind to return code actions for').optional(),
             ApiCommandArgument.Number.with('itemResolveCount', 'Number of code actions to resolve (too large numbers slow down code actions)').optional()
@@ -748,7 +748,7 @@ const newCommands = [
                 }
                 return {
                     initialRange: v.initialRange ? Range.from(v.initialRange) : undefined,
-                    initialSelection: Selection$1.isSelection(v.initialSelection) ? Selection.from(v.initialSelection) : undefined,
+                    initialSelection: Selection.isSelection(v.initialSelection) ? Selection$1.from(v.initialSelection) : undefined,
                     message: v.message,
                     attachments: v.attachments,
                     autoSend: v.autoSend,

package/vscode/src/vs/workbench/api/common/extHostChatSessions.js

@@ -17,7 +17,7 @@ import { MarkdownString, ChatAgentRequest, Location, Diagnostic, ChatResponsePar
 import { Disposable as Disposable$1, ChatRequestTurn, ChatReferenceDiagnostic } from './extHostTypes.js';
 import { IDiagnosticVariableEntryFilterData, PromptFileVariableKind } from '../../contrib/chat/common/attachments/chatVariableEntries.js';
 import { basename } from '../../../base/common/resources.js';
-import { SymbolKinds, SymbolKind } from '../../../editor/common/languages.js';
+import { SymbolKind, SymbolKinds } from '../../../editor/common/languages.js';
 import { Location as Location$1 } from './extHostTypes/location.js';
 
 var ExtHostChatSessions_1;

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -13,14 +13,14 @@ import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { Range as Range$1 } from '../../../editor/common/core/range.js';
 import { Selection } from '../../../editor/common/core/selection.js';
-import { NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, CompletionItemInsertTextRule, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1, InlineCompletionHintStyle as InlineCompletionHintStyle$1 } from '../../../editor/common/languages.js';
+import { NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, CompletionItemInsertTextRule, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1, InlineCompletionHintStyle } from '../../../editor/common/languages.js';
 import { encodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Cache } from './cache.js';
 import { ISuggestResultDtoField, ISuggestDataDtoField, MainContext } from './extHost.protocol.js';
-import { DocumentSymbol as DocumentSymbol$1, Range, SymbolTag, SymbolKind, DefinitionLink, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, WorkspaceEdit, Diagnostic, DataTransfer, DataTransferItem, TextEdit, WorkspaceSymbol, CompletionContext, MarkdownString, CompletionItemTag, CompletionItemKind, CompletionCommand, IconPath, InlineCompletionHintStyle, PartialAcceptInfo, InlineCompletionEndOfLifeReason, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.js';
+import { DocumentSymbol as DocumentSymbol$1, Range, SymbolTag, SymbolKind, DefinitionLink, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, WorkspaceEdit, Diagnostic, DataTransfer, DataTransferItem, TextEdit, WorkspaceSymbol, CompletionContext, MarkdownString, CompletionItemTag, CompletionItemKind, CompletionCommand, IconPath, InlineCompletionHintStyle as InlineCompletionHintStyle$1, PartialAcceptInfo, InlineCompletionEndOfLifeReason, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.js';
 import { DocumentSymbol, CodeAction, InternalDataTransferItem, DataTransfer as DataTransfer$1, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, CompletionList, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, Disposable as Disposable$1, SyntaxTokenType } from './extHostTypes.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Range as Range$2 } from './extHostTypes/range.js';
@@ -1178,7 +1178,7 @@ class InlineCompletionAdapter {
                     hint: (item.displayLocation && this._isAdditionsProposedApiEnabled) ? {
                         range: Range.from(item.displayLocation.range),
                         content: item.displayLocation.label,
-                        style: item.displayLocation.kind ? InlineCompletionHintStyle.from(item.displayLocation.kind) : InlineCompletionHintStyle$1.Code,
+                        style: item.displayLocation.kind ? InlineCompletionHintStyle$1.from(item.displayLocation.kind) : InlineCompletionHintStyle.Code,
                     } : undefined,
                     warning: (item.warning && this._isAdditionsProposedApiEnabled) ? {
                         message: MarkdownString.from(item.warning.message),

package/vscode/src/vs/workbench/api/common/extHostNotebook.js

@@ -13,7 +13,7 @@ import { FileOperationError, FileOperationResult, etag, FilePermission, FileType
 import { Cache } from './cache.js';
 import { MainContext } from './extHost.protocol.js';
 import { ApiCommandArgument, ApiCommand, ApiCommandResult } from './extHostCommands.js';
-import { NotebookExclusiveDocumentPattern, NotebookData, ViewColumn, NotebookRange, NotebookStatusBarItem, NotebookDocumentContentOptions } from './extHostTypeConverters.js';
+import { NotebookExclusiveDocumentPattern, NotebookData, NotebookRange, ViewColumn, NotebookStatusBarItem, NotebookDocumentContentOptions } from './extHostTypeConverters.js';
 import { Disposable } from './extHostTypes.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { ExtHostNotebookDocument, ExtHostCell } from './extHostNotebookDocument.js';

package/vscode/src/vs/workbench/browser/actions/textInputActions.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { toAction, Separator } from '../../../base/common/actions.js';
+import { Separator, toAction } from '../../../base/common/actions.js';
 import { localize } from '../../../nls.js';
 import { IWorkbenchLayoutService } from '../../services/layout/browser/layoutService.service.js';
 import { IContextMenuService } from '../../../platform/contextview/browser/contextView.service.js';

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js

@@ -30,7 +30,7 @@ import { assertReturnsDefined } from '../../../../base/common/types.js';
 import { CustomMenubarControl } from '../titlebar/menubarControl.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { MenuSettings, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
-import { toAction, Separator, SubmenuAction } from '../../../../base/common/actions.js';
+import { Separator, toAction, SubmenuAction } from '../../../../base/common/actions.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';

package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js

@@ -14,7 +14,7 @@ import { CompositeBarActionViewItem, CompositeBarAction } from './compositeBarAc
 import { Codicon } from '../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { registerIcon } from '../../../platform/theme/common/iconRegistry.js';
-import { Action, toAction, Separator, SubmenuAction } from '../../../base/common/actions.js';
+import { Action, Separator, toAction, SubmenuAction } from '../../../base/common/actions.js';
 import { MenuId } from '../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../platform/actions/common/actions.service.js';
 import { $, addDisposableListener, EventType, EventHelper, getWindow, runWhenWindowIdle, append, clearNode, hide, show } from '../../../base/browser/dom.js';

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.d.ts

@@ -0,0 +1,13 @@
+import { IReference } from "../../../../../../base/common/lifecycle.js";
+import { IResolvedTextEditorModel } from "@codingame/monaco-vscode-model-service-override/vscode/vs/editor/common/services/resolverService";
+import { IChatTextEditGroup } from "../../../common/model/chatModel.js";
+import { IChatResponseViewModel } from "../../../common/model/chatViewModel.js";
+export declare const ICodeCompareModelService: import("../../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ICodeCompareModelService>;
+export interface ICodeCompareModelService {
+    _serviceBrand: undefined;
+    createModel(response: IChatResponseViewModel, chatTextEdit: IChatTextEditGroup): Promise<IReference<{
+        originalSha1: string;
+        original: IResolvedTextEditorModel;
+        modified: IResolvedTextEditorModel;
+    }>>;
+}

package/vscode/src/vs/workbench/contrib/chat/browser/widget/chatContentParts/chatTextEditContentPart.service.js

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

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

@@ -32,6 +32,13 @@ export interface IChatSessionProviderOptionGroup {
     name: string;
     description?: string;
     items: IChatSessionProviderOptionItem[];
+    /**
+     * A context key expression that controls visibility of this option group picker.
+     * When specified, the picker is only visible when the expression evaluates to true.
+     * The expression can reference other option group values via `chatSessionOption.<groupId>`.
+     * Example: `"chatSessionOption.models == 'gpt-4'"`
+     */
+    when?: string;
 }
 export interface IChatSessionsExtensionPoint {
     readonly type: string;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js

@@ -27,7 +27,7 @@ import { AllowedExtensionsConfigKey, WEB_EXTENSION_TAG, EXTENSION_INSTALL_SKIP_P
 import { IExtensionGalleryService, IAllowedExtensionsService } from '../../../../platform/extensionManagement/common/extensionManagement.service.js';
 import { getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, findMatchingMaliciousEntry, areSameExtensions, groupByExtension, getGalleryExtensionId } from '../../../../platform/extensionManagement/common/extensionManagementUtil.js';
 import { ExtensionType, TargetPlatform, ExtensionIdentifier, isApplicationScopedExtension } from '../../../../platform/extensions/common/extensions.js';
-import { areApiProposalsCompatible, isEngineValid } from '../../../../platform/extensions/common/extensionValidator.js';
+import { isEngineValid, areApiProposalsCompatible } from '../../../../platform/extensions/common/extensionValidator.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { getLocale } from '../../../../platform/languagePacks/common/languagePacks.js';

package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js

@@ -12,7 +12,7 @@ import { NOTEBOOK_ACTIONS_CATEGORY, SELECT_KERNEL_ID } from '../controller/coreA
 import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
 import { selectKernelIcon } from '../notebookIcons.js';
 import { KernelPickerMRUStrategy } from './notebookKernelQuickPickStrategy.js';
-import { NOTEBOOK_KERNEL_COUNT, NOTEBOOK_IS_ACTIVE_EDITOR } from '../../common/notebookContextKeys.js';
+import { NOTEBOOK_IS_ACTIVE_EDITOR, NOTEBOOK_KERNEL_COUNT } from '../../common/notebookContextKeys.js';
 import { INotebookKernelService, INotebookKernelHistoryService } from '../../common/notebookKernelService.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { createElement } from '../../../../../base/browser/dom.js';

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -3,7 +3,7 @@ import { registerCss } from '../../../../../../../css.js';
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import * as tunnelView from './media/tunnelView.css';
 import { localize, localize2 } from '../../../../nls.js';
-import { append, $, addStandardDisposableListener, addDisposableListener, EventType, clearNode } from '../../../../base/browser/dom.js';
+import { append, $, addStandardDisposableListener, EventType, addDisposableListener, clearNode } from '../../../../base/browser/dom.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';

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

@@ -161,6 +161,7 @@ export interface ITerminalConfiguration {
         fallbackLigatures: string[];
     };
     hideOnLastClosed: boolean;
+    preserveDrawingBuffer: boolean;
 }
 export interface ITerminalFont {
     fontFamily: string;

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(11895, "Whether the terminal is focused."))));
+    TerminalContextKeys.focus = ( new RawContextKey(TerminalContextKeyStrings.Focus, false, ( localize(11896, "Whether the terminal is focused."))));
     TerminalContextKeys.focusInAny = ( new RawContextKey(TerminalContextKeyStrings.FocusInAny, false, ( localize(
-        11896,
+        11897,
         "Whether any terminal is focused, including detached terminals used in other UI."
     ))));
-    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.editorFocus = ( new RawContextKey(TerminalContextKeyStrings.EditorFocus, false, ( localize(11898, "Whether a terminal in the editor area is focused."))));
+    TerminalContextKeys.count = ( new RawContextKey(TerminalContextKeyStrings.Count, 0, ( localize(11899, "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(11899, "Whether the terminal tabs widget is focused."))));
+    TerminalContextKeys.tabsFocus = ( new RawContextKey(TerminalContextKeyStrings.TabsFocus, false, ( localize(11900, "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));
@@ -62,16 +62,16 @@ var TerminalContextKeys;
         TerminalContextKeyStrings.ShellType,
         undefined,
         { type: 'string', description: ( localize(
-            11900,
+            11901,
             "The shell type of the active terminal, this is set if the type can be detected."
         )) }
     ));
-    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.altBufferActive = ( new RawContextKey(TerminalContextKeyStrings.AltBufferActive, false, ( localize(11902, "Whether the terminal's alt buffer is active."))));
+    TerminalContextKeys.suggestWidgetVisible = ( new RawContextKey(TerminalContextKeyStrings.SuggestWidgetVisible, false, ( localize(11903, "Whether the terminal's suggest widget is visible."))));
     TerminalContextKeys.notFocus = ( TerminalContextKeys.focus.toNegated());
-    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.viewShowing = ( new RawContextKey(TerminalContextKeyStrings.ViewShowing, false, ( localize(11904, "Whether the terminal view is showing"))));
+    TerminalContextKeys.textSelected = ( new RawContextKey(TerminalContextKeyStrings.TextSelected, false, ( localize(11905, "Whether text is selected in the active terminal."))));
+    TerminalContextKeys.textSelectedInFocused = ( new RawContextKey(TerminalContextKeyStrings.TextSelectedInFocused, false, ( localize(11906, "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());
@@ -79,21 +79,21 @@ var TerminalContextKeys;
     TerminalContextKeys.findFocus = ( new RawContextKey(TerminalContextKeyStrings.FindFocused, false, true));
     TerminalContextKeys.notFindFocus = ( TerminalContextKeys.findInputFocus.toNegated());
     TerminalContextKeys.processSupported = ( new RawContextKey(TerminalContextKeyStrings.ProcessSupported, false, ( localize(
-        11906,
+        11907,
         "Whether terminal processes can be launched in the current workspace."
     ))));
-    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.tabsSingularSelection = ( new RawContextKey(TerminalContextKeyStrings.TabsSingularSelection, false, ( localize(11908, "Whether one terminal is selected in the terminal tabs list."))));
+    TerminalContextKeys.splitTerminalTabFocused = ( new RawContextKey(TerminalContextKeyStrings.SplitTerminal, false, ( localize(11909, "Whether the focused tab's terminal is a split terminal."))));
+    TerminalContextKeys.splitTerminalActive = ( new RawContextKey(TerminalContextKeyStrings.SplitPaneActive, false, ( localize(11910, "Whether the active terminal is a split pane."))));
     TerminalContextKeys.inTerminalRunCommandPicker = ( new RawContextKey(
         TerminalContextKeyStrings.InTerminalRunCommandPicker,
         false,
-        ( localize(11910, "Whether the terminal run command picker is currently open."))
+        ( localize(11911, "Whether the terminal run command picker is currently open."))
     ));
     TerminalContextKeys.terminalShellIntegrationEnabled = ( new RawContextKey(
         TerminalContextKeyStrings.TerminalShellIntegrationEnabled,
         false,
-        ( localize(11911, "Whether shell integration is enabled in the active terminal"))
+        ( localize(11912, "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.js

@@ -2,35 +2,35 @@
 import { localize2, localize } from '../../../../nls.js';
 
 const terminalStrings = {
-    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")),
+    terminal: ( localize(11913, "Terminal")),
+    new: ( localize(11914, "New Terminal")),
+    currentSessionCategory: ( localize(11915, 'current session')),
+    previousSessionCategory: ( localize(11916, 'previous session')),
+    typeTask: ( localize(11917, "Task")),
+    typeLocal: ( localize(11918, "Local")),
+    actionCategory: ( localize2(11919, "Terminal")),
+    focus: ( localize2(11920, "Focus Terminal")),
     kill: {
-        ...( localize2(11920, "Kill Terminal")),
-        short: ( localize(11921, "Kill")),
+        ...( localize2(11921, "Kill Terminal")),
+        short: ( localize(11922, "Kill")),
     },
-    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...")),
+    moveToEditor: ( localize2(11923, "Move Terminal into Editor Area")),
+    moveIntoNewWindow: ( localize2(11924, "Move Terminal into New Window")),
+    newInNewWindow: ( localize2(11925, "New Terminal Window")),
+    moveToTerminalPanel: ( localize2(11926, "Move Terminal into Panel")),
+    changeIcon: ( localize2(11927, "Change Icon...")),
+    changeColor: ( localize2(11928, "Change Color...")),
     split: {
-        ...( localize2(11928, "Split Terminal")),
-        short: ( localize(11929, "Split")),
+        ...( localize2(11929, "Split Terminal")),
+        short: ( localize(11930, "Split")),
     },
-    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"))};
+    unsplit: ( localize2(11931, "Unsplit Terminal")),
+    rename: ( localize2(11932, "Rename...")),
+    toggleSizeToContentWidth: ( localize2(11933, "Toggle Size to Content Width")),
+    focusHover: ( localize2(11934, "Focus Hover")),
+    newWithCwd: ( localize2(11935, "Create New Terminal Starting in a Custom Working Directory")),
+    renameWithArgs: ( localize2(11936, "Rename the Currently Active Terminal")),
+    scrollToPreviousCommand: ( localize2(11937, "Scroll to Previous Command")),
+    scrollToNextCommand: ( localize2(11938, "Scroll to Next Command"))};
 
 export { terminalStrings };

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

@@ -9,14 +9,14 @@ var TerminalAccessibilitySettingId;
 const terminalAccessibilityConfiguration = {
     [TerminalAccessibilitySettingId.AccessibleViewPreserveCursorPosition]: {
         markdownDescription: ( localize(
-            11963,
+            11964,
             "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(11964, "Focus the terminal accessible view when a command is executed.")),
+        markdownDescription: ( localize(11965, "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(
-            11965,
+            11966,
             "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(11966, "The reply to send to the process."))
+                    description: ( localize(11967, "The reply to send to the process."))
                 },
                 { type: 'null' }]
         },