@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js

@@ -2,25 +2,22 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { OffsetRange } from '../../../../editor/common/core/offsetRange.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { IChatAgentService } from './chatAgents.js';
+import { ChatAgentLocation, IChatAgentService } from './chatAgents.js';
 import { chatVariableLeader, chatAgentLeader, chatSubcommandLeader, ChatRequestTextPart, ChatRequestAgentPart, ChatRequestVariablePart, ChatRequestSlashCommandPart, ChatRequestAgentSubcommandPart, ChatRequestDynamicVariablePart } from './chatParserTypes.js';
-import { IChatService } from './chatService.js';
 import { IChatSlashCommandService } from './chatSlashCommands.js';
 import { IChatVariablesService } from './chatVariables.js';
 const agentReg = /^@([\w_\-]+)(?=(\s|$|\b))/i;
 const variableReg = /^#([\w_\-]+)(:\d+)?(?=(\s|$|\b))/i;
 const slashReg = /\/([\w_\-]+)(?=(\s|$|\b))/i;
 let ChatRequestParser = class ChatRequestParser {
-    constructor(agentService, variableService, slashCommandService, chatService) {
+    constructor(agentService, variableService, slashCommandService) {
         this.agentService = agentService;
         this.variableService = variableService;
         this.slashCommandService = slashCommandService;
-        this.chatService = chatService;
     }
-    parseChatRequest(sessionId, message) {
+    parseChatRequest(sessionId, message, location = ChatAgentLocation.Panel, context) {
         const parts = [];
         const references = this.variableService.getDynamicVariables(sessionId);
-        const model = this.chatService.getSession(sessionId);
         let lineNumber = 1;
         let column = 1;
         for (let i = 0; i < message.length; i++) {
@@ -32,10 +29,10 @@ let ChatRequestParser = class ChatRequestParser {
                     newPart = this.tryToParseVariable(message.slice(i), i, ( new Position(lineNumber, column)), parts);
                 }
                 else if (char === chatAgentLeader) {
-                    newPart = this.tryToParseAgent(message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
+                    newPart = this.tryToParseAgent(message.slice(i), message, i, ( new Position(lineNumber, column)), parts, location, context);
                 }
                 else if (char === chatSubcommandLeader) {
-                    newPart = this.tryToParseSlashCommand(model, message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
+                    newPart = this.tryToParseSlashCommand(message.slice(i), message, i, ( new Position(lineNumber, column)), parts);
                 }
                 if (!newPart) {
                     newPart = this.tryToParseDynamicVariable(message.slice(i), i, ( new Position(lineNumber, column)), references);
@@ -79,21 +76,24 @@ let ChatRequestParser = class ChatRequestParser {
             text: message,
         };
     }
-    tryToParseAgent(message, fullMessage, offset, position, parts) {
-        const nextVariableMatch = message.match(agentReg);
-        if (!nextVariableMatch) {
+    tryToParseAgent(message, fullMessage, offset, position, parts, location, context) {
+        const nextAgentMatch = message.match(agentReg);
+        if (!nextAgentMatch) {
             return;
         }
-        const [full, name] = nextVariableMatch;
-        const varRange = ( new OffsetRange(offset, offset + full.length));
-        const varEditorRange = ( new Range(
+        const [full, name] = nextAgentMatch;
+        const agentRange = ( new OffsetRange(offset, offset + full.length));
+        const agentEditorRange = ( new Range(
             position.lineNumber,
             position.column,
             position.lineNumber,
             position.column + full.length
         ));
-        const agent = this.agentService.getAgent(name);
-        if (!agent) {
+        const agents = this.agentService.getAgentsByName(name);
+        const agent = agents.length > 1 && context?.selectedAgent ?
+            context.selectedAgent :
+            agents[0];
+        if (!agent || !agent.locations.includes(location)) {
             return;
         }
         if (( parts.some(p => p instanceof ChatRequestAgentPart))) {
@@ -110,7 +110,7 @@ let ChatRequestParser = class ChatRequestParser {
         if (textSincePreviousPart.trim() !== '') {
             return;
         }
-        return ( new ChatRequestAgentPart(varRange, varEditorRange, agent));
+        return ( new ChatRequestAgentPart(agentRange, agentEditorRange, agent));
     }
     tryToParseVariable(message, offset, position, parts) {
         const nextVariableMatch = message.match(variableReg);
@@ -131,7 +131,7 @@ let ChatRequestParser = class ChatRequestParser {
         }
         return;
     }
-    tryToParseSlashCommand(model, remainingMessage, fullMessage, offset, position, parts) {
+    tryToParseSlashCommand(remainingMessage, fullMessage, offset, position, parts) {
         const nextSlashMatch = remainingMessage.match(slashReg);
         if (!nextSlashMatch) {
             return;
@@ -160,8 +160,7 @@ let ChatRequestParser = class ChatRequestParser {
             if (textSincePreviousPart.trim() !== '') {
                 return;
             }
-            const subCommands = usedAgent.agent.getLastSlashCommands(model);
-            const subCommand = subCommands?.find(c => c.name === command);
+            const subCommand = usedAgent.agent.slashCommands.find(c => c.name === command);
             if (subCommand) {
                 return ( new ChatRequestAgentSubcommandPart(slashRange, slashEditorRange, subCommand));
             }
@@ -190,7 +189,6 @@ let ChatRequestParser = class ChatRequestParser {
 ChatRequestParser = ( __decorate([
     ( __param(0, IChatAgentService)),
     ( __param(1, IChatVariablesService)),
-    ( __param(2, IChatSlashCommandService)),
-    ( __param(3, IChatService))
+    ( __param(2, IChatSlashCommandService))
 ], ChatRequestParser));
 export { ChatRequestParser };

package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js

@@ -1,8 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import marked_1 from '../../../../../../../external/vscode-marked/lib/marked.esm.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { annotateVulnerabilitiesInText } from './annotations.js';
 import { ChatModelInitState } from './chatModel.js';
 import { countWords } from './chatWordCounter.js';
 function isRequestVM(item) {
@@ -16,7 +18,7 @@ function isWelcomeVM(item) {
 }
 let ChatViewModel = class ChatViewModel extends Disposable {
     get inputPlaceholder() {
-        return this._inputPlaceholder ?? this._model.inputPlaceholder;
+        return this._inputPlaceholder;
     }
     get model() {
         return this._model;
@@ -41,9 +43,10 @@ let ChatViewModel = class ChatViewModel extends Disposable {
     get initState() {
         return this._model.initState;
     }
-    constructor(_model, instantiationService) {
+    constructor(_model, codeBlockModelCollection, instantiationService) {
         super();
         this._model = _model;
+        this.codeBlockModelCollection = codeBlockModelCollection;
         this.instantiationService = instantiationService;
         this._onDidDisposeModel = this._register(( new Emitter()));
         this.onDidDisposeModel = this._onDidDisposeModel.event;
@@ -52,7 +55,9 @@ let ChatViewModel = class ChatViewModel extends Disposable {
         this._items = [];
         this._inputPlaceholder = undefined;
         _model.getRequests().forEach((request, i) => {
-            this._items.push(( new ChatRequestViewModel(request)));
+            const requestModel = this.instantiationService.createInstance(ChatRequestViewModel, request);
+            this._items.push(requestModel);
+            this.updateCodeBlockTextModels(requestModel);
             if (request.response) {
                 this.onAddResponse(request.response);
             }
@@ -60,7 +65,9 @@ let ChatViewModel = class ChatViewModel extends Disposable {
         this._register(_model.onDidDispose(() => this._onDidDisposeModel.fire()));
         this._register(_model.onDidChange(e => {
             if (e.kind === 'addRequest') {
-                this._items.push(( new ChatRequestViewModel(e.request)));
+                const requestModel = this.instantiationService.createInstance(ChatRequestViewModel, e.request);
+                this._items.push(requestModel);
+                this.updateCodeBlockTextModels(requestModel);
                 if (e.request.response) {
                     this.onAddResponse(e.request.response);
                 }
@@ -90,8 +97,14 @@ let ChatViewModel = class ChatViewModel extends Disposable {
     }
     onAddResponse(responseModel) {
         const response = this.instantiationService.createInstance(ChatResponseViewModel, responseModel);
-        this._register(response.onDidChange(() => this._onDidChange.fire(null)));
+        this._register(response.onDidChange(() => {
+            if (response.isComplete) {
+                this.updateCodeBlockTextModels(response);
+            }
+            return this._onDidChange.fire(null);
+        }));
         this._items.push(response);
+        this.updateCodeBlockTextModels(response);
     }
     getItems() {
         return [...(this._model.welcomeMessage ? [this._model.welcomeMessage] : []), ...this._items];
@@ -102,9 +115,49 @@ let ChatViewModel = class ChatViewModel extends Disposable {
             .filter((item) => item instanceof ChatResponseViewModel)
             .forEach((item) => item.dispose());
     }
+    updateCodeBlockTextModels(model) {
+        let content;
+        if (isRequestVM(model)) {
+            content = model.messageText;
+        }
+        else {
+            content = ( annotateVulnerabilitiesInText(model.response.value).map(x => x.content.value)).join('');
+        }
+        let codeBlockIndex = 0;
+        const renderer = new marked_1.Renderer();
+        renderer.code = (value, languageId) => {
+            languageId ??= '';
+            const newText = this.fixCodeText(value, languageId);
+            this.codeBlockModelCollection.update(this._model.sessionId, model, codeBlockIndex++, { text: newText, languageId });
+            return '';
+        };
+        marked_1.parse(this.ensureFencedCodeBlocksTerminated(content), { renderer });
+    }
+    fixCodeText(text, languageId) {
+        if (languageId === 'php') {
+            if (!text.trim().startsWith('<')) {
+                return `<?php\n${text}\n?>`;
+            }
+        }
+        return text;
+    }
+    ensureFencedCodeBlocksTerminated(content) {
+        const lines = content.split('\n');
+        let inCodeBlock = false;
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            if (line.startsWith('```')) {
+                inCodeBlock = !inCodeBlock;
+            }
+        }
+        if (inCodeBlock) {
+            lines.push('```');
+        }
+        return lines.join('\n');
+    }
 };
 ChatViewModel = ( __decorate([
-    ( __param(1, IInstantiationService))
+    ( __param(2, IInstantiationService))
 ], ChatViewModel));
 class ChatRequestViewModel {
     get id() {
@@ -119,7 +172,7 @@ class ChatRequestViewModel {
     get username() {
         return this._model.username;
     }
-    get avatarIconUri() {
+    get avatarIcon() {
         return this._model.avatarIconUri;
     }
     get message() {
@@ -148,8 +201,8 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get username() {
         return this._model.username;
     }
-    get avatarIconUri() {
-        return this._model.avatarIconUri;
+    get avatarIcon() {
+        return this._model.avatarIcon;
     }
     get agent() {
         return this._model.agent;
@@ -157,6 +210,9 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get slashCommand() {
         return this._model.slashCommand;
     }
+    get agentOrSlashCommandDetected() {
+        return this._model.agentOrSlashCommandDetected;
+    }
     get response() {
         return this._model.response;
     }
@@ -169,6 +225,9 @@ let ChatResponseViewModel = class ChatResponseViewModel extends Disposable {
     get progressMessages() {
         return this._model.progressMessages;
     }
+    get edits() {
+        return this._model.edits;
+    }
     get isComplete() {
         return this._model.isComplete;
     }

package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js

@@ -0,0 +1,115 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { Schemas } from '../../../../base/common/network.js';
+import { URI } from '../../../../base/common/uri.js';
+import { Range } from '../../../../editor/common/core/range.js';
+import { ILanguageService } from '../../../../editor/common/languages/language.js';
+import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
+import { isResponseVM } from './chatViewModel.js';
+import { extractVulnerabilitiesFromText } from './annotations.js';
+let CodeBlockModelCollection = class CodeBlockModelCollection extends Disposable {
+    constructor(languageService, textModelService) {
+        super();
+        this.languageService = languageService;
+        this.textModelService = textModelService;
+        this._models = ( new ResourceMap());
+    }
+    dispose() {
+        super.dispose();
+        this.clear();
+    }
+    get(sessionId, chat, codeBlockIndex) {
+        const uri = this.getUri(sessionId, chat, codeBlockIndex);
+        const entry = this._models.get(uri);
+        if (!entry) {
+            return;
+        }
+        return { model: entry.model.then(ref => ref.object), vulns: entry.vulns };
+    }
+    getOrCreate(sessionId, chat, codeBlockIndex) {
+        const existing = this.get(sessionId, chat, codeBlockIndex);
+        if (existing) {
+            return existing;
+        }
+        const uri = this.getUri(sessionId, chat, codeBlockIndex);
+        const ref = this.textModelService.createModelReference(uri);
+        this._models.set(uri, { model: ref, vulns: [] });
+        return { model: ref.then(ref => ref.object), vulns: [] };
+    }
+    clear() {
+        this._models.forEach(async (entry) => (await entry.model).dispose());
+        this._models.clear();
+    }
+    async update(sessionId, chat, codeBlockIndex, content) {
+        const entry = this.getOrCreate(sessionId, chat, codeBlockIndex);
+        const extractedVulns = extractVulnerabilitiesFromText(content.text);
+        const newText = extractedVulns.newText;
+        this.setVulns(sessionId, chat, codeBlockIndex, extractedVulns.vulnerabilities);
+        const textModel = (await entry.model).textEditorModel;
+        if (content.languageId) {
+            const vscodeLanguageId = this.languageService.getLanguageIdByLanguageName(content.languageId);
+            if (vscodeLanguageId && vscodeLanguageId !== textModel.getLanguageId()) {
+                textModel.setLanguage(vscodeLanguageId);
+            }
+        }
+        const currentText = textModel.getValue(1 );
+        if (newText === currentText) {
+            return;
+        }
+        if (newText.startsWith(currentText)) {
+            const text = newText.slice(currentText.length);
+            const lastLine = textModel.getLineCount();
+            const lastCol = textModel.getLineMaxColumn(lastLine);
+            textModel.applyEdits([{ range: ( new Range(lastLine, lastCol, lastLine, lastCol)), text }]);
+        }
+        else {
+            textModel.setValue(newText);
+        }
+    }
+    setVulns(sessionId, chat, codeBlockIndex, vulnerabilities) {
+        const uri = this.getUri(sessionId, chat, codeBlockIndex);
+        const entry = this._models.get(uri);
+        if (entry) {
+            entry.vulns = vulnerabilities;
+        }
+    }
+    getUri(sessionId, chat, index) {
+        const metadata = this.getUriMetaData(chat);
+        return ( URI.from({
+            scheme: Schemas.vscodeChatCodeBlock,
+            authority: sessionId,
+            path: `/${chat.id}/${index}`,
+            fragment: metadata ? JSON.stringify(metadata) : undefined,
+        }));
+    }
+    getUriMetaData(chat) {
+        if (!isResponseVM(chat)) {
+            return undefined;
+        }
+        return {
+            references: ( chat.contentReferences.map(ref => {
+                const uriOrLocation = 'variableName' in ref.reference ?
+                    ref.reference.value :
+                    ref.reference;
+                if (!uriOrLocation) {
+                    return;
+                }
+                if (URI.isUri(uriOrLocation)) {
+                    return {
+                        uri: uriOrLocation.toJSON()
+                    };
+                }
+                return {
+                    uri: uriOrLocation.uri.toJSON(),
+                    range: uriOrLocation.range,
+                };
+            }))
+        };
+    }
+};
+CodeBlockModelCollection = ( __decorate([
+    ( __param(0, ILanguageService)),
+    ( __param(1, ITextModelService))
+], CodeBlockModelCollection));
+export { CodeBlockModelCollection };

package/vscode/src/vs/workbench/contrib/chat/common/{chatProvider.js → languageModels.js}

@@ -1,36 +1,36 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-const IChatProviderService = ( createDecorator('chatProviderService'));
-class ChatProviderService {
+const ILanguageModelsService = ( createDecorator('ILanguageModelsService'));
+class LanguageModelsService {
     constructor() {
         this._providers = ( new Map());
         this._onDidChangeProviders = ( new Emitter());
-        this.onDidChangeProviders = this._onDidChangeProviders.event;
+        this.onDidChangeLanguageModels = this._onDidChangeProviders.event;
     }
     dispose() {
         this._onDidChangeProviders.dispose();
         this._providers.clear();
     }
-    getProviders() {
+    getLanguageModelIds() {
         return Array.from(( this._providers.keys()));
     }
-    lookupChatResponseProvider(identifier) {
+    lookupLanguageModel(identifier) {
         return this._providers.get(identifier)?.metadata;
     }
-    registerChatResponseProvider(identifier, provider) {
+    registerLanguageModelChat(identifier, provider) {
         if (( this._providers.has(identifier))) {
             throw new Error(`Chat response provider with identifier ${identifier} is already registered.`);
         }
         this._providers.set(identifier, provider);
-        this._onDidChangeProviders.fire({ added: [identifier] });
+        this._onDidChangeProviders.fire({ added: [provider.metadata] });
         return toDisposable(() => {
             if (this._providers.delete(identifier)) {
                 this._onDidChangeProviders.fire({ removed: [identifier] });
             }
         });
     }
-    fetchChatResponse(identifier, from, messages, options, progress, token) {
+    makeLanguageModelChatRequest(identifier, from, messages, options, progress, token) {
         const provider = this._providers.get(identifier);
         if (!provider) {
             throw new Error(`Chat response provider with identifier ${identifier} is not registered.`);
@@ -38,4 +38,4 @@ class ChatProviderService {
         return provider.provideChatResponse(messages, from, options, progress, token);
     }
 }
-export { ChatProviderService, IChatProviderService };
+export { ILanguageModelsService, LanguageModelsService };

package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Emitter } from '../../../../base/common/event.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { editorConfigurationBaseNode } from '../../../../editor/common/config/editorConfigurationSchema.js';
 import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from '../../../../editor/contrib/codeAction/browser/codeAction.js';
@@ -113,11 +114,11 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
             .notifyConfigurationSchemaUpdated(editorConfiguration);
     }
     getSourceActions(contributions) {
-        const defaultKinds = ( ( Object.keys(codeActionsOnSaveDefaultProperties)).map(value => ( new CodeActionKind(value))));
+        const defaultKinds = ( ( Object.keys(codeActionsOnSaveDefaultProperties)).map(value => ( new HierarchicalKind(value))));
         const sourceActions = ( new Map());
         for (const contribution of contributions) {
             for (const action of contribution.actions) {
-                const kind = ( new CodeActionKind(action.kind));
+                const kind = ( new HierarchicalKind(action.kind));
                 if (CodeActionKind.Source.contains(kind)
                     && !( defaultKinds.some(defaultKind => defaultKind.contains(kind)))) {
                     sourceActions.set(kind.value, action);
@@ -159,14 +160,14 @@ let CodeActionsContribution = class CodeActionsContribution extends Disposable {
             const allActions = this._contributedCodeActions.flatMap(desc => desc.actions);
             const out = ( new Map());
             for (const action of allActions) {
-                if (!( out.has(action.kind)) && ofKind.contains(( new CodeActionKind(action.kind)))) {
+                if (!( out.has(action.kind)) && ofKind.contains(( new HierarchicalKind(action.kind)))) {
                     out.set(action.kind, action);
                 }
             }
             return Array.from(( out.values()));
         };
         return [
-            conditionalSchema(codeActionCommandId, getActions(CodeActionKind.Empty)),
+            conditionalSchema(codeActionCommandId, getActions(HierarchicalKind.Empty)),
             conditionalSchema(refactorCommandId, getActions(CodeActionKind.Refactor)),
             conditionalSchema(sourceActionCommandId, getActions(CodeActionKind.Source)),
         ];

package/vscode/src/vs/workbench/contrib/codeActions/browser/documentationContribution.js

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
 import { CodeActionKind } from '../../../../editor/contrib/codeAction/common/types.js';
@@ -38,7 +39,7 @@ let CodeActionDocumentationContribution = class CodeActionDocumentationContribut
     }
     _getAdditionalMenuItems(context, actions) {
         if (context.only !== CodeActionKind.Refactor.value) {
-            if (!( actions.some(action => action.kind && CodeActionKind.Refactor.contains(( new CodeActionKind(action.kind)))))) {
+            if (!( actions.some(action => action.kind && CodeActionKind.Refactor.contains(( new HierarchicalKind(action.kind)))))) {
                 return [];
             }
         }

package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import './editorDictation.css.js';
-import { localizeWithPath, localize2WithPath } from '../../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { Disposable, MutableDisposable, toDisposable, DisposableStore } from '../../../../../base/common/lifecycle.js';
 import { RawContextKey, IContextKeyService, ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
 import { SpeechToTextStatus, ISpeechService, HasSpeechProvider } from '../../../speech/common/speechService.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
-import { registerEditorContribution, EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
+import { EditorAction2, registerEditorContribution } from '../../../../../editor/browser/editorExtensions.js';
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
@@ -167,7 +167,7 @@ let EditorDictation = class EditorDictation extends Disposable {
         this.editorDictationInProgress = EDITOR_DICTATION_IN_PROGRESS.bindTo(this.contextKeyService);
         this.sessionDisposables = this._register(( new MutableDisposable()));
     }
-    start() {
+    async start() {
         const disposables = ( new DisposableStore());
         this.sessionDisposables.value = disposables;
         this.widget.show();
@@ -176,6 +176,7 @@ let EditorDictation = class EditorDictation extends Disposable {
         disposables.add(toDisposable(() => this.editorDictationInProgress.reset()));
         const collection = this.editor.createDecorationsCollection();
         disposables.add(toDisposable(() => collection.clear()));
+        disposables.add(this.editor.onDidChangeCursorPosition(() => this.widget.layout()));
         let previewStart = undefined;
         let lastReplaceTextLength = 0;
         const replaceText = (text, isPreview) => {
@@ -208,11 +209,10 @@ let EditorDictation = class EditorDictation extends Disposable {
                 lastReplaceTextLength = 0;
             }
             this.editor.revealPositionInCenterIfOutsideViewport(endPosition);
-            this.widget.layout();
         };
         const cts = ( new CancellationTokenSource());
         disposables.add(toDisposable(() => cts.dispose(true)));
-        const session = this.speechService.createSpeechToTextSession(cts.token);
+        const session = await this.speechService.createSpeechToTextSession(cts.token, 'editor');
         disposables.add(session.onDidChange(e => {
             if (cts.token.isCancellationRequested) {
                 return;

package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js

@@ -1,10 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import '../../../../base/common/observableInternal/derived.js';
+import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { registerDiffEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from '../../../../editor/browser/widget/diffEditor/diffEditor.contribution.js';
+import { AccessibleDiffViewerNext, AccessibleDiffViewerPrev } from '../../../../editor/browser/widget/diffEditor/commands.js';
 import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
-import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService, ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -18,8 +22,6 @@ import { IAccessibleViewService } from '../../accessibility/browser/accessibleVi
 import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
 import { getCommentCommandInfo } from '../../accessibility/browser/editorAccessibilityHelp.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 let DiffEditorHelperContribution = class DiffEditorHelperContribution extends Disposable {
     static { this.ID = 'editor.contrib.diffEditorHelper'; }
     constructor(_diffEditor, _instantiationService, _configurationService, _notificationService) {
@@ -81,8 +83,6 @@ function createScreenReaderHelp() {
         const codeEditorService = accessor.get(ICodeEditorService);
         const keybindingService = accessor.get(IKeybindingService);
         const contextKeyService = accessor.get(IContextKeyService);
-        const next = keybindingService.lookupKeybinding(AccessibleDiffViewerNext.id)?.getAriaLabel();
-        const previous = keybindingService.lookupKeybinding(AccessibleDiffViewerPrev.id)?.getAriaLabel();
         if (!(editorService.activeTextEditorControl instanceof DiffEditorWidget)) {
             return;
         }
@@ -90,6 +90,30 @@ function createScreenReaderHelp() {
         if (!codeEditor) {
             return;
         }
+        const next = keybindingService.lookupKeybinding(AccessibleDiffViewerNext.id)?.getAriaLabel();
+        const previous = keybindingService.lookupKeybinding(AccessibleDiffViewerPrev.id)?.getAriaLabel();
+        let switchSides;
+        const switchSidesKb = keybindingService.lookupKeybinding('diffEditor.switchSide')?.getAriaLabel();
+        if (switchSidesKb) {
+            switchSides = ( localizeWithPath(
+                'vs/workbench/contrib/codeEditor/browser/diffEditorHelper',
+                'msg3',
+                "Run the command Diff Editor: Switch Side ({0}) to toggle between the original and modified editors.",
+                switchSidesKb
+            ));
+        }
+        else {
+            switchSides = ( localizeWithPath(
+                'vs/workbench/contrib/codeEditor/browser/diffEditorHelper',
+                'switchSidesNoKb',
+                "Run the command Diff Editor: Switch Side, which is currently not triggerable via keybinding, to toggle between the original and modified editors."
+            ));
+        }
+        const diffEditorActiveAnnouncement = ( localizeWithPath(
+            'vs/workbench/contrib/codeEditor/browser/diffEditorHelper',
+            'msg5',
+            "The setting, accessibility.verbosity.diffEditorActive, controls if a diff editor announcement is made when it becomes the active editor."
+        ));
         const keys = ['accessibility.signals.diffLineDeleted', 'accessibility.signals.diffLineInserted', 'accessibility.signals.diffLineModified'];
         const content = [
             ( localizeWithPath(
@@ -104,9 +128,11 @@ function createScreenReaderHelp() {
                 next,
                 previous
             )),
+            switchSides,
+            diffEditorActiveAnnouncement,
             ( localizeWithPath(
                 'vs/workbench/contrib/codeEditor/browser/diffEditorHelper',
-                'msg3',
+                'msg4',
                 "To control which accessibility signals should be played, the following settings can be configured: {0}.",
                 keys.join(', ')
             )),

package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js

@@ -13,7 +13,17 @@ import { showHistoryKeybindingHint } from '../../../../../platform/history/brows
 import { status } from '../../../../../base/browser/ui/aria/aria.js';
 import { defaultInputBoxStyles, defaultToggleStyles } from '../../../../../platform/theme/browser/defaultStyles.js';
 import { Sash } from '../../../../../base/browser/ui/sash/sash.js';
-import { registerColor } from '../../../../../platform/theme/common/colorRegistry.js';
+import { registerColor } from '../../../../../platform/theme/common/colorUtils.js';
+import '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../../platform/theme/common/colors/listColors.js';
+import '../../../../../platform/theme/common/colors/menuColors.js';
+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';
 const NLS_FIND_INPUT_LABEL = ( localizeWithPath(
     'vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget',
     'label.find',