@codingame/monaco-vscode-api 9.0.3 → 10.0.0

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js

@@ -1,6 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter, Event } from '../../../../base/common/event.js';
-import { TrackedRangeStickiness } from '../../../../editor/common/model.js';
 import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '../common/inlineChat.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
@@ -159,10 +158,10 @@ class Session {
     asTelemetryData() {
         for (const item of this.hunkData.getInfo()) {
             switch (item.getState()) {
-                case HunkState.Accepted:
+                case 1 :
                     this._teldata.acceptedHunks += 1;
                     break;
-                case HunkState.Rejected:
+                case 2 :
                     this._teldata.discardedHunks += 1;
                     break;
             }
@@ -218,20 +217,20 @@ function lineRangeAsRange(lineRange, model) {
         lineRange.startLineNumber,
         1,
         lineRange.startLineNumber,
-        model.getLineLength(lineRange.startLineNumber)
+        Number.MAX_SAFE_INTEGER
     ))
         : ( new Range(
         lineRange.startLineNumber,
         1,
         lineRange.endLineNumberExclusive - 1,
-        model.getLineLength(lineRange.endLineNumberExclusive - 1)
+        Number.MAX_SAFE_INTEGER
     ));
 }
 let HunkData = class HunkData {
     static { HunkData_1 = this; }
     static { this._HUNK_TRACKED_RANGE = ModelDecorationOptions.register({
         description: 'inline-chat-hunk-tracked-range',
-        stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
+        stickiness: 0
     }); }
     static { this._HUNK_THRESHOLD = 8; }
     constructor(_editorWorkerService, _textModel0, _textModelN) {
@@ -275,19 +274,19 @@ let HunkData = class HunkData {
         const hunkRanges = [];
         const ranges0 = [];
         for (const entry of ( this._data.values())) {
-            if (entry.state === HunkState.Pending) {
+            if (entry.state === 0 ) {
                 for (let i = 1; i < entry.textModelNDecorations.length; i++) {
                     const rangeN = this._textModelN.getDecorationRange(entry.textModelNDecorations[i]);
                     const range0 = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
                     if (rangeN && range0) {
                         hunkRanges.push({
                             rangeN, range0,
-                            markAccepted: () => entry.state = HunkState.Accepted
+                            markAccepted: () => entry.state = 1
                         });
                     }
                 }
             }
-            else if (entry.state === HunkState.Accepted) {
+            else if (entry.state === 1 ) {
                 for (let i = 1; i < entry.textModel0Decorations.length; i++) {
                     const range = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
                     if (range) {
@@ -365,8 +364,8 @@ let HunkData = class HunkData {
                 for (const hunk of hunks) {
                     const textModelNDecorations = [];
                     const textModel0Decorations = [];
-                    textModelNDecorations.push(accessorN.addDecoration(lineRangeAsRange(hunk.modified, this._textModelN), HunkData_1._HUNK_TRACKED_RANGE));
-                    textModel0Decorations.push(accessor0.addDecoration(lineRangeAsRange(hunk.original, this._textModel0), HunkData_1._HUNK_TRACKED_RANGE));
+                    textModelNDecorations.push(accessorN.addDecoration(lineRangeAsRange(hunk.modified), HunkData_1._HUNK_TRACKED_RANGE));
+                    textModel0Decorations.push(accessor0.addDecoration(lineRangeAsRange(hunk.original), HunkData_1._HUNK_TRACKED_RANGE));
                     for (const change of hunk.changes) {
                         textModelNDecorations.push(accessorN.addDecoration(change.modifiedRange, HunkData_1._HUNK_TRACKED_RANGE));
                         textModel0Decorations.push(accessor0.addDecoration(change.originalRange, HunkData_1._HUNK_TRACKED_RANGE));
@@ -375,7 +374,7 @@ let HunkData = class HunkData {
                         editState,
                         textModelNDecorations,
                         textModel0Decorations,
-                        state: HunkState.Pending
+                        state: 0
                     });
                 }
             });
@@ -385,7 +384,7 @@ let HunkData = class HunkData {
         return this._data.size;
     }
     get pending() {
-        return Iterable.reduce(( this._data.values()), (r, { state }) => r + (state === HunkState.Pending ? 1 : 0), 0);
+        return Iterable.reduce(( this._data.values()), (r, { state }) => r + (state === 0  ? 1 : 0), 0);
     }
     _discardEdits(item) {
         const edits = [];
@@ -401,7 +400,7 @@ let HunkData = class HunkData {
     discardAll() {
         const edits = [];
         for (const item of this.getInfo()) {
-            if (item.getState() === HunkState.Pending) {
+            if (item.getState() === 0 ) {
                 edits.push(this._discardEdits(item));
             }
         }
@@ -433,17 +432,17 @@ let HunkData = class HunkData {
                     return ranges;
                 },
                 discardChanges: () => {
-                    if (data.state === HunkState.Pending) {
+                    if (data.state === 0 ) {
                         const edits = this._discardEdits(item);
                         this._textModelN.pushEditOperations(null, edits, () => null);
-                        data.state = HunkState.Rejected;
+                        data.state = 2 ;
                         if (data.editState.applied > 0) {
                             data.editState.applied -= 1;
                         }
                     }
                 },
                 acceptChanges: () => {
-                    if (data.state === HunkState.Pending) {
+                    if (data.state === 0 ) {
                         const edits = [];
                         const rangesN = item.getRangesN();
                         const ranges0 = item.getRanges0();
@@ -453,7 +452,7 @@ let HunkData = class HunkData {
                             edits.push(EditOperation.replace(originalRange, modifiedValue));
                         }
                         this._textModel0.pushEditOperations(null, edits, () => null);
-                        data.state = HunkState.Accepted;
+                        data.state = 1 ;
                     }
                 }
             };
@@ -472,10 +471,4 @@ class RawHunk {
         this.changes = changes;
     }
 }
-var HunkState;
-( (function(HunkState) {
-    HunkState[HunkState["Pending"] = 0] = "Pending";
-    HunkState[HunkState["Accepted"] = 1] = "Accepted";
-    HunkState[HunkState["Rejected"] = 2] = "Rejected";
-})(HunkState || (HunkState = {})));
-export { HunkData, HunkState, Session, SessionWholeRange, StashedSession };
+export { HunkData, Session, SessionWholeRange, StashedSession };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js

@@ -3,6 +3,7 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
+import { isCodeEditor, isDiffEditor, isCompositeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { createTextBufferFactoryFromSnapshot } from '../../../../editor/common/model/textModel.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
@@ -16,7 +17,7 @@ import { DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { IChatAgentService } from '../../chat/common/chatAgents.service.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
-import { CTX_INLINE_CHAT_HAS_AGENT } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_POSSIBLE } from '../common/inlineChat.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { UntitledTextEditorInput } from '../../../services/untitled/common/untitledTextEditorInput.js';
 import { Session, SessionWholeRange, HunkData, StashedSession } from './inlineChatSession.js';
@@ -112,7 +113,7 @@ let InlineChatSessionServiceImpl = class InlineChatSessionServiceImpl {
             });
         }));
         store.add(this._chatAgentService.onDidChangeAgents(e => {
-            if (e === undefined && !this._chatAgentService.getAgent(agent.id)) {
+            if (e === undefined && (!this._chatAgentService.getAgent(agent.id) || !this._chatAgentService.getActivatedAgents().includes(agent))) {
                 this._logService.trace(`[IE] provider GONE for ${editor.getId()}, ${agent.extensionId}`);
                 this._releaseSession(session, true);
             }
@@ -253,21 +254,33 @@ InlineChatSessionServiceImpl = ( __decorate([
 ], InlineChatSessionServiceImpl));
 let InlineChatEnabler = class InlineChatEnabler {
     static { this.Id = 'inlineChat.enabler'; }
-    constructor(contextKeyService, chatAgentService) {
+    constructor(contextKeyService, chatAgentService, editorService) {
         this._store = ( new DisposableStore());
         this._ctxHasProvider = CTX_INLINE_CHAT_HAS_AGENT.bindTo(contextKeyService);
-        this._store.add(chatAgentService.onDidChangeAgents(() => {
+        this._ctxPossible = CTX_INLINE_CHAT_POSSIBLE.bindTo(contextKeyService);
+        const updateAgent = () => {
             const hasEditorAgent = Boolean(chatAgentService.getDefaultAgent(ChatAgentLocation.Editor));
             this._ctxHasProvider.set(hasEditorAgent);
-        }));
+        };
+        this._store.add(chatAgentService.onDidChangeAgents(updateAgent));
+        updateAgent();
+        const updateEditor = () => {
+            const ctrl = editorService.activeEditorPane?.getControl();
+            const isCodeEditorLike = isCodeEditor(ctrl) || isDiffEditor(ctrl) || isCompositeEditor(ctrl);
+            this._ctxPossible.set(isCodeEditorLike);
+        };
+        this._store.add(editorService.onDidActiveEditorChange(updateEditor));
+        updateEditor();
     }
     dispose() {
+        this._ctxPossible.reset();
         this._ctxHasProvider.reset();
         this._store.dispose();
     }
 };
 InlineChatEnabler = ( __decorate([
     ( __param(0, IContextKeyService)),
-    ( __param(1, IChatAgentService))
+    ( __param(1, IChatAgentService)),
+    ( __param(2, IEditorService))
 ], InlineChatEnabler));
 export { InlineChatEnabler, InlineChatError, InlineChatSessionServiceImpl };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js

@@ -8,16 +8,14 @@ import { StableEditorScrollState } from '../../../../editor/browser/stableEditor
 import { RenderOptions, LineSource, renderLines } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { OverviewRulerLane, MinimapPosition, TrackedRangeStickiness } from '../../../../editor/common/model.js';
+import { OverviewRulerLane } from '../../../../editor/common/model.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
-import { InlineDecoration, InlineDecorationType } from '../../../../editor/common/viewModel.js';
+import { InlineDecoration } from '../../../../editor/common/viewModel.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
-import { SaveReason } from '../../../common/editor.js';
 import { countWords } from '../../chat/common/chatWordCounter.js';
-import { HunkState } from './inlineChatSession.js';
-import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, MENU_INLINE_CHAT_ZONE, InlineChatConfigKeys, ACTION_TOGGLE_DIFF } from '../common/inlineChat.js';
+import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '../common/inlineChat.js';
 import { assertType } from '../../../../base/common/types.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
@@ -30,25 +28,16 @@ import { DefaultChatTextEditor } from '../../chat/browser/codeBlockPart.js';
 import { isEqual } from '../../../../base/common/resources.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { MenuWorkbenchButtonBar } from '../../../../platform/actions/browser/buttonbar.js';
-import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { Iterable } from '../../../../base/common/iterator.js';
 import { ConflictActionsFactory } from '../../mergeEditor/browser/view/conflictActions.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
+import '../../../../base/common/observableInternal/utils.js';
 import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 var EditModeStrategy_1;
-var HunkAction;
-( (function(HunkAction) {
-    HunkAction[HunkAction["Accept"] = 0] = "Accept";
-    HunkAction[HunkAction["Discard"] = 1] = "Discard";
-    HunkAction[HunkAction["MoveNext"] = 2] = "MoveNext";
-    HunkAction[HunkAction["MovePrev"] = 3] = "MovePrev";
-    HunkAction[HunkAction["ToggleDiff"] = 4] = "ToggleDiff";
-})(HunkAction || (HunkAction = {})));
 let EditModeStrategy = class EditModeStrategy {
     static { EditModeStrategy_1 = this; }
     static { this._decoBlock = ModelDecorationOptions.register({
@@ -72,10 +61,10 @@ let EditModeStrategy = class EditModeStrategy {
         this._store.dispose();
     }
     performHunkAction(_hunk, action) {
-        if (action === HunkAction.Accept) {
+        if (action === 0 ) {
             this._onDidAccept.fire();
         }
-        else if (action === HunkAction.Discard) {
+        else if (action === 1 ) {
             this._onDidDiscard.fire();
         }
     }
@@ -105,7 +94,7 @@ let EditModeStrategy = class EditModeStrategy {
         for (const untitledModel of untitledModels) {
             if (!untitledModel.isDisposed()) {
                 await untitledModel.resolve();
-                await untitledModel.save({ reason: SaveReason.EXPLICIT });
+                await untitledModel.save({ reason: 1  });
             }
         }
     }
@@ -176,14 +165,14 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                 color: themeColorFromId(overviewRulerInlineChatDiffInserted),
             },
             minimap: {
-                position: MinimapPosition.Inline,
+                position: 1 ,
                 color: themeColorFromId(minimapInlineChatDiffInserted),
             }
         });
         this._decoInsertedTextRange = ModelDecorationOptions.register({
             description: 'inline-chat-inserted-range-linehighlight',
             className: 'inline-chat-inserted-range',
-            stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+            stickiness: 1 ,
         });
         this._editCount = 0;
         this._hunkDisplayData = ( new Map());
@@ -263,27 +252,27 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
     performHunkAction(hunk, action) {
         const displayData = this._findDisplayData(hunk);
         if (!displayData) {
-            if (action === HunkAction.Accept) {
+            if (action === 0 ) {
                 this._onDidAccept.fire();
             }
-            else if (action === HunkAction.Discard) {
+            else if (action === 1 ) {
                 this._onDidDiscard.fire();
             }
             return;
         }
-        if (action === HunkAction.Accept) {
+        if (action === 0 ) {
             displayData.acceptHunk();
         }
-        else if (action === HunkAction.Discard) {
+        else if (action === 1 ) {
             displayData.discardHunk();
         }
-        else if (action === HunkAction.MoveNext) {
+        else if (action === 2 ) {
             displayData.move(true);
         }
-        else if (action === HunkAction.MovePrev) {
+        else if (action === 3 ) {
             displayData.move(false);
         }
-        else if (action === HunkAction.ToggleDiff) {
+        else if (action === 4 ) {
             displayData.toggleDiff?.();
         }
     }
@@ -296,7 +285,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             const zoneLine = this._zone.position.lineNumber;
             let distance = Number.MAX_SAFE_INTEGER;
             for (const candidate of ( this._hunkDisplayData.values())) {
-                if (candidate.hunk.getState() !== HunkState.Pending) {
+                if (candidate.hunk.getState() !== 0 ) {
                     continue;
                 }
                 const hunkRanges = candidate.hunk.getRangesN();
@@ -310,7 +299,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             }
         }
         if (!result) {
-            result = Iterable.first(Iterable.filter(( this._hunkDisplayData.values()), candidate => candidate.hunk.getState() === HunkState.Pending));
+            result = Iterable.first(Iterable.filter(( this._hunkDisplayData.values()), candidate => candidate.hunk.getState() === 0 ));
         }
         return result;
     }
@@ -352,7 +341,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                         ));
                         const domNode = document.createElement('div');
                         domNode.className = 'inline-chat-original-zone2';
-                        const result = renderLines(source, renderOptions, [( new InlineDecoration(( new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1)), '', InlineDecorationType.Regular))], domNode);
+                        const result = renderLines(source, renderOptions, [( new InlineDecoration(( new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1)), '', 0 ))], domNode);
                         const viewZoneData = {
                             afterLineNumber: -1,
                             heightInLines: result.heightInLines,
@@ -383,12 +372,12 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                             : undefined;
                         let lensActions;
                         const lensActionsViewZoneIds = [];
-                        if (this._showOverlayToolbar && hunkData.getState() === HunkState.Pending) {
+                        if (this._showOverlayToolbar && hunkData.getState() === 0 ) {
                             lensActions = ( new DisposableStore());
                             const menu = this._menuService.createMenu(MENU_INLINE_CHAT_ZONE, this._contextService);
                             const makeActions = () => {
                                 const actions = [];
-                                const tuples = menu.getActions();
+                                const tuples = menu.getActions({ arg: hunkData });
                                 for (const [, group] of tuples) {
                                     for (const item of group) {
                                         if (item instanceof MenuItemAction) {
@@ -461,7 +450,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                         };
                         this._hunkDisplayData.set(hunkData, data);
                     }
-                    else if (hunkData.getState() !== HunkState.Pending) {
+                    else if (hunkData.getState() !== 0 ) {
                         data.remove();
                     }
                     else {
@@ -472,7 +461,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                             ? modifiedRangeNow.startLineNumber - zoneLineNumber
                             : zoneLineNumber - modifiedRangeNow.endLineNumber;
                     }
-                    if (hunkData.getState() === HunkState.Pending && (!widgetData || data.distance < widgetData.distance)) {
+                    if (hunkData.getState() === 0  && (!widgetData || data.distance < widgetData.distance)) {
                         widgetData = data;
                     }
                 }
@@ -485,8 +474,8 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
                 }
             });
             if (widgetData) {
-                this._zone.updatePositionAndHeight(widgetData.position);
-                const mode = this._configService.getValue(InlineChatConfigKeys.AccessibleDiffView);
+                this._zone.reveal(widgetData.position);
+                const mode = this._configService.getValue("inlineChat.accessibleDiffView" );
                 if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
                     this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
                 }
@@ -495,7 +484,7 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
             else if (this._hunkDisplayData.size > 0) {
                 let oneAccepted = false;
                 for (const hunkData of this._session.hunkData.getInfo()) {
-                    if (hunkData.getState() === HunkState.Accepted) {
+                    if (hunkData.getState() === 1 ) {
                         oneAccepted = true;
                         break;
                     }
@@ -546,7 +535,7 @@ let InlineChangeOverlay = class InlineChangeOverlay {
         this._store = ( new DisposableStore());
         this._extraTopLines = 0;
         this._domNode.classList.add('inline-chat-diff-overlay');
-        if (_hunkInfo.getState() === HunkState.Pending) {
+        if (_hunkInfo.getState() === 0 ) {
             const menuBar = this._store.add(this._instaService.createInstance(MenuWorkbenchButtonBar, this._domNode, MENU_INLINE_CHAT_ZONE, {
                 menuOptions: { arg: _hunkInfo },
                 telemetrySource: 'inlineChat-changesZone',
@@ -579,7 +568,7 @@ let InlineChangeOverlay = class InlineChangeOverlay {
         const info = this._editor.getLayoutInfo();
         const top = this._editor.getTopForLineNumber(line) - this._editor.getScrollTop();
         const left = info.contentLeft + info.contentWidth - info.verticalScrollbarWidth;
-        const extraTop = this._editor.getOption(EditorOption.lineHeight) * this._extraTopLines;
+        const extraTop = this._editor.getOption(69 ) * this._extraTopLines;
         const width = getTotalWidth(this._domNode);
         return { preference: { top: top - extraTop, left: left - width } };
     }
@@ -593,4 +582,4 @@ let InlineChangeOverlay = class InlineChangeOverlay {
 InlineChangeOverlay = ( __decorate([
     ( __param(2, IInstantiationService))
 ], InlineChangeOverlay));
-export { EditModeStrategy, HunkAction, LiveStrategy, PreviewStrategy };
+export { EditModeStrategy, LiveStrategy, PreviewStrategy };

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js

@@ -7,17 +7,15 @@ import { Emitter, Event } from '../../../../base/common/event.js';
 import { MarkdownString } from '../../../../base/common/htmlContent.js';
 import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
-import { constObservable } from '../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
+import { constObservable } from '../../../../base/common/observableInternal/utils.js';
 import './media/inlineChat.css.js';
 import { AccessibleDiffViewer } from '../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
-import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { LineRange } from '../../../../editor/common/core/lineRange.js';
 import { Selection } from '../../../../editor/common/core/selection.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
-import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { localize } from '../../../../nls.js';
 import { IAccessibleViewService } from '../../../../platform/accessibility/browser/accessibleView.service.js';
@@ -43,8 +41,6 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
-import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 import { MarkUnhelpfulActionId } from '../../chat/browser/actions/chatTitleActions.js';
 import { ChatVoteDownButton } from '../../chat/browser/chatListRenderer.js';
 import { ChatWidget } from '../../chat/browser/chatWidget.js';
@@ -54,8 +50,9 @@ import { CONTEXT_RESPONSE, CONTEXT_RESPONSE_VOTE, CONTEXT_CHAT_RESPONSE_SUPPORT_
 import { ChatModel } from '../../chat/common/chatModel.js';
 import { ChatAgentVoteDirection } from '../../chat/common/chatService.js';
 import { IChatService } from '../../chat/common/chatService.service.js';
-import { isWelcomeVM, isResponseVM } from '../../chat/common/chatViewModel.js';
+import { isResponseVM } from '../../chat/common/chatViewModel.js';
 import { inlineChatForeground, inlineChatBackground, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_FOCUSED } from '../common/inlineChat.js';
+import { EDITOR_DRAG_AND_DROP_BACKGROUND } from '../../../common/theme.js';
 var HunkAccessibleDiffViewer_1;
 let InlineChatWidget = class InlineChatWidget {
     constructor(location, options, _instantiationService, _contextKeyService, _keybindingService, _accessibilityService, _configurationService, _accessibleViewService, _textModelResolverService, _chatService, _hoverService) {
@@ -96,9 +93,6 @@ let InlineChatWidget = class InlineChatWidget {
             renderFollowups: true,
             supportsFileReferences: _configurationService.getValue(`chat.experimental.variables.${location.location}`) === true,
             filter: item => {
-                if (isWelcomeVM(item)) {
-                    return false;
-                }
                 if (isResponseVM(item) && item.isComplete && !item.errorDetails) {
                     if (item.response.value.length > 0 && item.response.value.every(item => item.kind === 'textEditGroup' && options.chatWidgetViewOptions?.rendererOptions?.renderTextEditsAsSummary?.(item.uri))) {
                         return false;
@@ -114,6 +108,7 @@ let InlineChatWidget = class InlineChatWidget {
         }, {
             listForeground: inlineChatForeground,
             listBackground: inlineChatBackground,
+            overlayBackground: EDITOR_DRAG_AND_DROP_BACKGROUND,
             inputEditorBackground: inputBackground,
             resultEditorBackground: editorBackground
         });
@@ -186,7 +181,7 @@ let InlineChatWidget = class InlineChatWidget {
         this._store.add(toolbar2.onDidChangeMenuItems(() => this._onDidChangeHeight.fire()));
         this._store.add(toolbar2);
         this._store.add(this._configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AccessibilityVerbositySettingId.InlineChat)) {
+            if (e.affectsConfiguration("accessibility.verbosity.inlineChat" )) {
                 this._updateAriaLabel();
             }
         }));
@@ -207,19 +202,19 @@ let InlineChatWidget = class InlineChatWidget {
         this.setChatModel(this._defaultChatModel);
     }
     _updateAriaLabel() {
-        this._elements.root.ariaLabel = this._accessibleViewService.getOpenAriaHint(AccessibilityVerbositySettingId.InlineChat);
+        this._elements.root.ariaLabel = this._accessibleViewService.getOpenAriaHint("accessibility.verbosity.inlineChat" );
         if (this._accessibilityService.isScreenReaderOptimized()) {
             let label = defaultAriaLabel;
-            if (this._configurationService.getValue(AccessibilityVerbositySettingId.InlineChat)) {
-                const kbLabel = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
+            if (this._configurationService.getValue("accessibility.verbosity.inlineChat" )) {
+                const kbLabel = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getLabel();
                 label = kbLabel
                     ? ( localize(
-                    11456,
+                    11490,
                     "Inline Chat Input, Use {0} for Inline Chat Accessibility Help.",
                     kbLabel
                 ))
                     : ( localize(
-                    11457,
+                    11491,
                     "Inline Chat Input, Run the Inline Chat Accessibility Help command for more information."
                 ));
             }
@@ -434,10 +429,15 @@ InlineChatWidget = ( (__decorate([
     ( (__param(9, IChatService))),
     ( (__param(10, IHoverService)))
 ], InlineChatWidget)));
-const defaultAriaLabel = ( localize(11458, "Inline Chat Input"));
+const defaultAriaLabel = ( localize(11492, "Inline Chat Input"));
 let EditorBasedInlineChatWidget = class EditorBasedInlineChatWidget extends InlineChatWidget {
     constructor(location, _parentEditor, options, contextKeyService, keybindingService, instantiationService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService) {
-        super(location, { ...options, chatWidgetViewOptions: { ...options.chatWidgetViewOptions, editorOverflowWidgetsDomNode: _parentEditor.getOverflowWidgetsDomNode() } }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
+        super(location, {
+            ...options,
+            chatWidgetViewOptions: {
+                ...options.chatWidgetViewOptions,
+            }
+        }, instantiationService, contextKeyService, keybindingService, accessibilityService, configurationService, accessibleViewService, textModelResolverService, chatService, hoverService);
         this._parentEditor = _parentEditor;
         this._accessibleViewer = this._store.add(( (new MutableDisposable())));
     }
@@ -488,7 +488,7 @@ let HunkAccessibleDiffViewer = HunkAccessibleDiffViewer_1 = class HunkAccessible
         const diff = observableValue('diff', HunkAccessibleDiffViewer_1._asMapping(hunk));
         const diffs = derived(r => [diff.read(r)]);
         const lines = Math.min(10, 8 + diff.get().changedLineCount);
-        const height = models.getModifiedOptions().get(EditorOption.lineHeight) * lines;
+        const height = models.getModifiedOptions().get(69 ) * lines;
         super(parentNode, constObservable(true), () => { }, constObservable(false), width, constObservable(height), diffs, models, instantiationService);
         this.height = height;
         this._width2 = width;
@@ -534,7 +534,7 @@ class AccessibleHunk {
     originalReveal(range) {
     }
     modifiedReveal(range) {
-        this._editor.revealRangeInCenterIfOutsideViewport(range || this._hunk.getRangesN()[0], ScrollType.Smooth);
+        this._editor.revealRangeInCenterIfOutsideViewport(range || this._hunk.getRangesN()[0], 0 );
     }
     modifiedSetSelection(range) {
     }