@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js

@@ -5,11 +5,11 @@ import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import marked_1 from '../../../../../../../external/vscode-marked/lib/marked.esm.js';
-import { isMacintosh } from '../../../../base/common/platform.js';
+import { isWindows, isMacintosh } from '../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { URI } from '../../../../base/common/uri.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
-import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditorWidget.js';
+import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { AccessibilityHelpNLS } from '../../../../editor/common/standaloneStrings.js';
@@ -19,6 +19,7 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
 import { MenuId, IMenuService } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
@@ -27,12 +28,13 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled, accessibleViewGoToSymbolSupported, accessibleViewCurrentProviderId, accessibleViewOnLastLine } from './accessibilityConfiguration.js';
+import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewVerbosityEnabled, accessibleViewGoToSymbolSupported, accessibleViewCurrentProviderId, accessibleViewInCodeBlock, accessibleViewContainsCodeBlocks, accessibleViewOnLastLine } from './accessibilityConfiguration.js';
+import { IChatCodeBlockContextProviderService } from '../../chat/browser/chat.js';
 import { getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
 const IAccessibleViewService = ( createDecorator('accessibleViewService'));
 let AccessibleView = class AccessibleView extends Disposable {
     get editorWidget() { return this._editorWidget; }
-    constructor(_openerService, _instantiationService, _configurationService, _modelService, _contextViewService, _contextKeyService, _accessibilityService, _keybindingService, _layoutService, _menuService) {
+    constructor(_openerService, _instantiationService, _configurationService, _modelService, _contextViewService, _contextKeyService, _accessibilityService, _keybindingService, _layoutService, _menuService, _commandService, _codeBlockContextProviderService) {
         super();
         this._openerService = _openerService;
         this._instantiationService = _instantiationService;
@@ -44,12 +46,16 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._keybindingService = _keybindingService;
         this._layoutService = _layoutService;
         this._menuService = _menuService;
+        this._commandService = _commandService;
+        this._codeBlockContextProviderService = _codeBlockContextProviderService;
         this._accessiblityHelpIsShown = accessibilityHelpIsShown.bindTo(this._contextKeyService);
         this._accessibleViewIsShown = accessibleViewIsShown.bindTo(this._contextKeyService);
         this._accessibleViewSupportsNavigation = accessibleViewSupportsNavigation.bindTo(this._contextKeyService);
         this._accessibleViewVerbosityEnabled = accessibleViewVerbosityEnabled.bindTo(this._contextKeyService);
         this._accessibleViewGoToSymbolSupported = accessibleViewGoToSymbolSupported.bindTo(this._contextKeyService);
         this._accessibleViewCurrentProviderId = accessibleViewCurrentProviderId.bindTo(this._contextKeyService);
+        this._accessibleViewInCodeBlock = accessibleViewInCodeBlock.bindTo(this._contextKeyService);
+        this._accessibleViewContainsCodeBlocks = accessibleViewContainsCodeBlocks.bindTo(this._contextKeyService);
         this._onLastLine = accessibleViewOnLastLine.bindTo(this._contextKeyService);
         this._container = document.createElement('div');
         this._container.classList.add('accessible-view');
@@ -108,6 +114,13 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._register(this._editorWidget.onDidChangeCursorPosition(() => {
             this._onLastLine.set(this._editorWidget.getPosition()?.lineNumber === this._editorWidget.getModel()?.getLineCount());
         }));
+        this._register(this._editorWidget.onDidChangeCursorPosition(() => {
+            const cursorPosition = this._editorWidget.getPosition()?.lineNumber;
+            if (this._codeBlocks && cursorPosition !== undefined) {
+                const inCodeBlock = this._codeBlocks.find(c => c.startLine <= cursorPosition && c.endLine >= cursorPosition) !== undefined;
+                this._accessibleViewInCodeBlock.set(inCodeBlock);
+            }
+        }));
     }
     _resetContextKeys() {
         this._accessiblityHelpIsShown.reset();
@@ -129,6 +142,18 @@ let AccessibleView = class AccessibleView extends Disposable {
             this._editorWidget.revealPosition(position);
         }
     }
+    getCodeBlockContext() {
+        const position = this._editorWidget.getPosition();
+        if (!this._codeBlocks?.length || !position) {
+            return;
+        }
+        const codeBlockIndex = this._codeBlocks?.findIndex(c => c.startLine <= position?.lineNumber && c.endLine >= position?.lineNumber);
+        const codeBlock = codeBlockIndex !== undefined && codeBlockIndex > -1 ? this._codeBlocks[codeBlockIndex] : undefined;
+        if (!codeBlock || codeBlockIndex === undefined) {
+            return;
+        }
+        return { code: codeBlock.code, languageId: codeBlock.languageId, codeBlockIndex, element: undefined };
+    }
     showLastProvider(id) {
         if (!this._lastProvider || this._lastProvider.options.id !== id) {
             return;
@@ -174,6 +199,9 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (provider.options.id) {
             this._lastProvider = provider;
         }
+        if (provider.id === "panelChat" ) {
+            this._register(this._codeBlockContextProviderService.registerProvider({ getCodeBlockContext: () => this.getCodeBlockContext() }, 'accessibleView'));
+        }
     }
     previous() {
         if (!this._currentProvider) {
@@ -193,6 +221,33 @@ let AccessibleView = class AccessibleView extends Disposable {
         }
         this._instantiationService.createInstance(AccessibleViewSymbolQuickPick, this).show(this._currentProvider);
     }
+    calculateCodeBlocks(markdown) {
+        if (this._currentProvider?.id !== "panelChat" ) {
+            return;
+        }
+        if (this._currentProvider.options.language && this._currentProvider.options.language !== 'markdown') {
+            return;
+        }
+        const lines = markdown.split('\n');
+        this._codeBlocks = [];
+        let inBlock = false;
+        let startLine = 0;
+        let languageId;
+        lines.forEach((line, i) => {
+            if (!inBlock && line.startsWith('```')) {
+                inBlock = true;
+                startLine = i + 1;
+                languageId = line.substring(3).trim();
+            }
+            else if (inBlock && line.startsWith('```')) {
+                inBlock = false;
+                const endLine = i;
+                const code = lines.slice(startLine, endLine).join('\n');
+                this._codeBlocks?.push({ startLine, endLine, code, languageId });
+            }
+        });
+        this._accessibleViewContainsCodeBlocks.set(this._codeBlocks.length > 0);
+    }
     getSymbols() {
         if (!this._currentProvider || !this._currentContent) {
             return;
@@ -304,10 +359,8 @@ let AccessibleView = class AccessibleView extends Disposable {
         this._accessibleViewGoToSymbolSupported.set(this._goToSymbolsSupported() ? this.getSymbols()?.length > 0 : false);
     }
     _render(provider, container, showAccessibleViewHelp) {
-        if (!showAccessibleViewHelp) {
-            this._currentProvider = provider;
-            this._accessibleViewCurrentProviderId.set(provider.id);
-        }
+        this._currentProvider = provider;
+        this._accessibleViewCurrentProviderId.set(provider.id);
         const value = this._configurationService.getValue(provider.verbositySettingKey);
         const readMoreLink = provider.options.readMoreUrl ? ( localizeWithPath(
             'vs/workbench/contrib/accessibility/browser/accessibleView',
@@ -339,8 +392,11 @@ let AccessibleView = class AccessibleView extends Disposable {
             'exit',
             '\n\nExit this dialog (Escape).'
         )) : '';
-        this._currentContent = message + provider.provideContent() + readMoreLink + disableHelpHint + exitThisDialogHint;
+        const newContent = message + provider.provideContent() + readMoreLink + disableHelpHint + exitThisDialogHint;
+        this.calculateCodeBlocks(newContent);
+        this._currentContent = newContent;
         this._updateContextKeys(provider, true);
+        const widgetIsFocused = this._editorWidget.hasTextFocus() || this._editorWidget.hasWidgetFocus();
         this._getTextModel(( URI.from(
             { path: `accessible-view-${provider.verbositySettingKey}`, scheme: 'accessible-view', fragment: this._currentContent }
         ))).then((model) => {
@@ -394,6 +450,9 @@ let AccessibleView = class AccessibleView extends Disposable {
                     actionsHint
                 ));
             }
+            if (isWindows && widgetIsFocused) {
+                ariaLabel = '';
+            }
             this._editorWidget.updateOptions({ ariaLabel });
             this._editorWidget.focus();
             if (this._currentProvider?.options.position) {
@@ -416,10 +475,14 @@ let AccessibleView = class AccessibleView extends Disposable {
             this._contextViewService.hideContextView();
             this._updateContextKeys(provider, false);
             this._lastProvider = undefined;
+            this._currentContent = undefined;
         };
         const disposableStore = ( new DisposableStore());
         disposableStore.add(this._editorWidget.onKeyDown((e) => {
-            if (e.keyCode === 9  || shouldHide(e.browserEvent, this._keybindingService, this._configurationService)) {
+            if (e.keyCode === 3 ) {
+                this._commandService.executeCommand('editor.action.openLink');
+            }
+            else if (e.keyCode === 9  || shouldHide(e.browserEvent, this._keybindingService, this._configurationService)) {
                 hide(e);
             }
             else if (e.keyCode === 38  && provider.options.readMoreUrl) {
@@ -521,8 +584,9 @@ let AccessibleView = class AccessibleView extends Disposable {
         const toolbarHint = ( localizeWithPath(
             'vs/workbench/contrib/accessibility/browser/accessibleView',
             'toolbar',
-            "Navigate to the toolbar (Shift+Tab))."
+            "Navigate to the toolbar (Shift+Tab)."
         ));
+        const chatHints = this._getChatHints();
         let hint = ( localizeWithPath(
             'vs/workbench/contrib/accessibility/browser/accessibleView',
             'intro',
@@ -537,6 +601,64 @@ let AccessibleView = class AccessibleView extends Disposable {
         if (toolbarHint) {
             hint += ' - ' + toolbarHint + '\n';
         }
+        if (chatHints) {
+            hint += chatHints;
+        }
+        return hint;
+    }
+    _getChatHints() {
+        if (this._currentProvider?.id !== "panelChat" ) {
+            return;
+        }
+        let hint = '';
+        const insertAtCursorKb = this._keybindingService.lookupKeybinding('workbench.action.chat.insertCodeBlock')?.getAriaLabel();
+        const insertIntoNewFileKb = this._keybindingService.lookupKeybinding('workbench.action.chat.insertIntoNewFile')?.getAriaLabel();
+        const runInTerminalKb = this._keybindingService.lookupKeybinding('workbench.action.chat.runInTerminal')?.getAriaLabel();
+        if (insertAtCursorKb) {
+            hint += ( localizeWithPath(
+                'vs/workbench/contrib/accessibility/browser/accessibleView',
+                'insertAtCursor',
+                " - Insert the code block at the cursor ({0}).\n",
+                insertAtCursorKb
+            ));
+        }
+        else {
+            hint += ( localizeWithPath(
+                'vs/workbench/contrib/accessibility/browser/accessibleView',
+                'insertAtCursorNoKb',
+                " - Insert the code block at the cursor by configuring a keybinding for the Chat: Insert Code Block command.\n"
+            ));
+        }
+        if (insertIntoNewFileKb) {
+            hint += ( localizeWithPath(
+                'vs/workbench/contrib/accessibility/browser/accessibleView',
+                'insertIntoNewFile',
+                " - Insert the code block into a new file ({0}).\n",
+                insertIntoNewFileKb
+            ));
+        }
+        else {
+            hint += ( localizeWithPath(
+                'vs/workbench/contrib/accessibility/browser/accessibleView',
+                'insertIntoNewFileNoKb',
+                " - Insert the code block into a new file by configuring a keybinding for the Chat: Insert into New File command.\n"
+            ));
+        }
+        if (runInTerminalKb) {
+            hint += ( localizeWithPath(
+                'vs/workbench/contrib/accessibility/browser/accessibleView',
+                'runInTerminal',
+                " - Run the code block in the terminal ({0}).\n",
+                runInTerminalKb
+            ));
+        }
+        else {
+            hint += ( localizeWithPath(
+                'vs/workbench/contrib/accessibility/browser/accessibleView',
+                'runInTerminalNoKb',
+                " - Run the coe block in the terminal by configuring a keybinding for the Chat: Insert into Terminal command.\n"
+            ));
+        }
         return hint;
     }
     _getNavigationHint() {
@@ -592,7 +714,7 @@ let AccessibleView = class AccessibleView extends Disposable {
                 goToSymbolHint = ( localizeWithPath(
                     'vs/workbench/contrib/accessibility/browser/accessibleView',
                     'goToSymbolHint',
-                    'Go to a symbol ({0})',
+                    'Go to a symbol ({0}).',
                     goToSymbolKb
                 ));
             }
@@ -617,7 +739,9 @@ AccessibleView = ( __decorate([
     ( __param(6, IAccessibilityService)),
     ( __param(7, IKeybindingService)),
     ( __param(8, ILayoutService)),
-    ( __param(9, IMenuService))
+    ( __param(9, IMenuService)),
+    ( __param(10, ICommandService)),
+    ( __param(11, IChatCodeBlockContextProviderService))
 ], AccessibleView));
 let AccessibleViewService = class AccessibleViewService extends Disposable {
     constructor(_instantiationService, _configurationService, _keybindingService) {
@@ -687,6 +811,9 @@ let AccessibleViewService = class AccessibleViewService extends Disposable {
             editorWidget?.revealLine(position.lineNumber);
         }
     }
+    getCodeBlockContext() {
+        return this._accessibleView?.getCodeBlockContext();
+    }
 };
 AccessibleViewService = ( __decorate([
     ( __param(0, IInstantiationService)),

package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js

@@ -76,7 +76,7 @@ let EditorAccessibilityHelpProvider = class EditorAccessibilityHelpProvider {
         if (options.get(115 ).enabled) {
             content.push(descriptionForCommand('editor.action.focusStickyScroll', AccessibilityHelpNLS.stickScrollKb, AccessibilityHelpNLS.stickScrollNoKb, this._keybindingService));
         }
-        if (options.get(143 )) {
+        if (options.get(144 )) {
             content.push(descriptionForCommand(ToggleTabFocusModeAction.ID, AccessibilityHelpNLS.tabFocusModeOnMsg, AccessibilityHelpNLS.tabFocusModeOnMsgNoKb, this._keybindingService));
         }
         else {

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js

@@ -4,6 +4,7 @@ import { registerAction2 } from '../../../../platform/actions/common/actions.js'
 import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
+import '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { AccessibilitySignalLineDebuggerContribution } from './accessibilitySignalDebuggerContribution.js';
 import { SignalLineFeatureContribution } from './accessibilitySignalLineFeatureContribution.js';
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(SignalLineFeatureContribution, 3 );

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.js

@@ -1,9 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Disposable, toDisposable } 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 { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IDebugService } from '../../debug/common/debug.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorunWithStore } from '../../../../base/common/observableInternal/autorun.js';
 let AccessibilitySignalLineDebuggerContribution = class AccessibilitySignalLineDebuggerContribution extends Disposable {
     constructor(debugService, accessibilitySignalService) {
         super();

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalLineFeatureContribution.js

@@ -2,6 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { CachedFunction } from '../../../../base/common/cache.js';
 import { Event } from '../../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { derived, derivedOpts } from '../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunDelta } from '../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent, debouncedObservable2, wasEventTriggeredRecently, observableFromPromise, observableSignalFromEvent } from '../../../../base/common/observableInternal/utils.js';
+import '../../../../base/common/cancellation.js';
 import { isDiffEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { FoldingController } from '../../../../editor/contrib/folding/browser/folding.js';
 import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
@@ -10,9 +14,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { MarkerSeverity, IMarkerService } from '../../../../platform/markers/common/markers.js';
 import { IDebugService } from '../../debug/common/debug.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { observableFromEvent, debouncedObservable, wasEventTriggeredRecently, constObservable, observableFromPromise } from '../../../../base/common/observableInternal/utils.js';
-import { derived, derivedOpts } from '../../../../base/common/observableInternal/derived.js';
-import { autorun, autorunDelta } from '../../../../base/common/observableInternal/autorun.js';
 let SignalLineFeatureContribution = class SignalLineFeatureContribution extends Disposable {
     constructor(editorService, instantiationService, accessibilitySignalService, _configurationService) {
         super();
@@ -27,16 +28,11 @@ let SignalLineFeatureContribution = class SignalLineFeatureContribution extends
             this.instantiationService.createInstance(FoldedAreaLineFeature),
             this.instantiationService.createInstance(BreakpointLineFeature),
         ];
-        this.isSoundEnabledCache = ( new CachedFunction(
-            (cue) => observableFromEvent(this.accessibilitySignalService.onSoundEnabledChanged(cue), () => this.accessibilitySignalService.isSoundEnabled(cue))
+        this.isEnabledCache = ( new CachedFunction(
+            (cue) => observableFromEvent(Event.any(this.accessibilitySignalService.onSoundEnabledChanged(cue), this.accessibilitySignalService.onAnnouncementEnabledChanged(cue)), () => this.accessibilitySignalService.isSoundEnabled(cue) || this.accessibilitySignalService.isAnnouncementEnabled(cue))
         ));
-        this.isAnnouncmentEnabledCahce = ( new CachedFunction(
-            (cue) => observableFromEvent(this.accessibilitySignalService.onAnnouncementEnabledChanged(cue), () => this.accessibilitySignalService.isAnnouncementEnabled(cue))
-        ));
-        const someAccessibilitySignalIsEnabled = derived((reader) => (  this.features.some(
-            (feature) => this.isSoundEnabledCache.get(feature.signal).read(reader) || this.isAnnouncmentEnabledCahce.get(feature.signal).read(reader)
-        )));
-        const activeEditorObservable = observableFromEvent(this.editorService.onDidActiveEditorChange, (_) => {
+        this._someAccessibilitySignalIsEnabled = derived(this, (reader) => ( this.features.some((feature) => this.isEnabledCache.get(feature.signal).read(reader))));
+        this._activeEditorObservable = observableFromEvent(this.editorService.onDidActiveEditorChange, (_) => {
             const activeTextEditorControl = this.editorService.activeTextEditorControl;
             const editor = isDiffEditor(activeTextEditorControl)
                 ? activeTextEditorControl.getOriginalEditor()
@@ -47,10 +43,10 @@ let SignalLineFeatureContribution = class SignalLineFeatureContribution extends
         });
         this._register(autorun(reader => {
             this.store.clear();
-            if (!someAccessibilitySignalIsEnabled.read(reader)) {
+            if (!this._someAccessibilitySignalIsEnabled.read(reader)) {
                 return;
             }
-            const activeEditor = activeEditorObservable.read(reader);
+            const activeEditor = this._activeEditorObservable.read(reader);
             if (activeEditor) {
                 this.registerAccessibilitySignalsForEditor(activeEditor.editor, activeEditor.model, this.store);
             }
@@ -65,19 +61,19 @@ let SignalLineFeatureContribution = class SignalLineFeatureContribution extends
             }
             return editor.getPosition();
         });
-        const debouncedPosition = debouncedObservable(curPosition, this._configurationService.getValue('accessibility.signals.debouncePositionChanges') ? 300 : 0, store);
-        const isTyping = wasEventTriggeredRecently(editorModel.onDidChangeContent.bind(editorModel), 1000, store);
+        const debouncedPosition = debouncedObservable2(curPosition, this._configurationService.getValue('accessibility.signals.debouncePositionChanges') ? 300 : 0);
+        const isTyping = wasEventTriggeredRecently(e => editorModel.onDidChangeContent(e), 1000, store);
         const featureStates = ( this.features.map((feature) => {
-            const lineFeatureState = feature.getObservableState(editor, editorModel);
+            const lineFeatureState = feature.createSource(editor, editorModel);
             const isFeaturePresent = derivedOpts({ debugName: `isPresentInLine:${feature.signal.name}` }, (reader) => {
-                if (!this.isSoundEnabledCache.get(feature.signal).read(reader) && !this.isAnnouncmentEnabledCahce.get(feature.signal).read(reader)) {
+                if (!this.isEnabledCache.get(feature.signal).read(reader)) {
                     return false;
                 }
                 const position = debouncedPosition.read(reader);
                 if (!position) {
                     return false;
                 }
-                return lineFeatureState.read(reader).isPresent(position);
+                return lineFeatureState.isPresent(position, reader);
             });
             return derivedOpts({ debugName: `typingDebouncedFeatureState:\n${feature.signal.name}` }, (reader) => feature.debounceWhileTyping && isTyping.read(reader)
                 ? (debouncedPosition.read(reader), isFeaturePresent.get())
@@ -93,7 +89,7 @@ let SignalLineFeatureContribution = class SignalLineFeatureContribution extends
         store.add(autorunDelta(state, ({ lastValue, newValue }) => {
             const newFeatures = this.features.filter(feature => newValue?.featureStates.get(feature) &&
                 (!lastValue?.featureStates?.get(feature) || newValue.lineNumber !== lastValue.lineNumber));
-            this.accessibilitySignalService.playAccessibilitySignals(( newFeatures.map(f => f.signal)));
+            this.accessibilitySignalService.playSignals(( newFeatures.map(f => f.signal)));
         }));
     }
 };
@@ -111,9 +107,11 @@ let MarkerLineFeature = class MarkerLineFeature {
         this.debounceWhileTyping = true;
         this._previousLine = 0;
     }
-    getObservableState(editor, model) {
-        return observableFromEvent(Event.filter(this.markerService.onMarkerChanged, (changedUris) => ( changedUris.some((u) => ( u.toString()) === ( model.uri.toString())))), () =>  ({
-            isPresent: (position) => {
+    createSource(editor, model) {
+        const obs = observableSignalFromEvent('onMarkerChanged', this.markerService.onMarkerChanged);
+        return {
+            isPresent: (position, reader) => {
+                obs.read(reader);
                 const lineChanged = position.lineNumber !== this._previousLine;
                 this._previousLine = position.lineNumber;
                 const hasMarker = ( this.markerService
@@ -124,7 +122,7 @@ let MarkerLineFeature = class MarkerLineFeature {
                 }));
                 return hasMarker;
             },
-        }));
+        };
     }
 };
 MarkerLineFeature = ( __decorate([
@@ -134,24 +132,23 @@ class FoldedAreaLineFeature {
     constructor() {
         this.signal = AccessibilitySignal.foldedArea;
     }
-    getObservableState(editor, model) {
+    createSource(editor, _model) {
         const foldingController = FoldingController.get(editor);
         if (!foldingController) {
-            return constObservable({
-                isPresent: () => false,
-            });
+            return { isPresent: () => false, };
         }
         const foldingModel = observableFromPromise(foldingController.getFoldingModel() ?? Promise.resolve(undefined));
-        return ( foldingModel.map((v) => ({
-            isPresent: (position) => {
-                const regionAtLine = v.value?.getRegionAtLine(position.lineNumber);
+        return {
+            isPresent: (position, reader) => {
+                const m = foldingModel.read(reader);
+                const regionAtLine = m.value?.getRegionAtLine(position.lineNumber);
                 const hasFolding = !regionAtLine
                     ? false
                     : regionAtLine.isCollapsed &&
                         regionAtLine.startLineNumber === position.lineNumber;
                 return hasFolding;
             },
-        })));
+        };
     }
 }
 let BreakpointLineFeature = class BreakpointLineFeature {
@@ -159,16 +156,18 @@ let BreakpointLineFeature = class BreakpointLineFeature {
         this.debugService = debugService;
         this.signal = AccessibilitySignal.break;
     }
-    getObservableState(editor, model) {
-        return observableFromEvent(this.debugService.getModel().onDidChangeBreakpoints, () =>  ({
-            isPresent: (position) => {
+    createSource(editor, model) {
+        const signal = observableSignalFromEvent('onDidChangeBreakpoints', this.debugService.getModel().onDidChangeBreakpoints);
+        return {
+            isPresent: (position, reader) => {
+                signal.read(reader);
                 const breakpoints = this.debugService
                     .getModel()
                     .getBreakpoints({ uri: model.uri, lineNumber: position.lineNumber });
                 const hasBreakpoints = breakpoints.length > 0;
                 return hasBreakpoints;
             },
-        }));
+        };
     }
 };
 BreakpointLineFeature = ( __decorate([

package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/commands.js

@@ -83,7 +83,7 @@ class ShowSignalSoundHelp extends Action2 {
         });
         qp.placeholder = ( localizeWithPath(
             'vs/workbench/contrib/accessibilitySignals/browser/commands',
-            'audioCues.help.placeholder',
+            'sounds.help.placeholder',
             'Select a sound to play and configure'
         ));
         qp.canSelectMany = true;

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js

@@ -10,7 +10,7 @@ import { SplitView, Sizing } from '../../../../base/browser/ui/splitview/splitvi
 import { Dimension, isKeyboardEvent } from '../../../../base/browser/dom.js';
 import { Event } from '../../../../base/common/event.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/embeddedCodeEditorWidget.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { OverviewRulerLane } from '../../../../editor/common/model.js';

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js

@@ -2,9 +2,9 @@ import { localizeWithPath } from '../../../../../nls.js';
 import { format } from '../../../../../base/common/strings.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
 import { IChatWidgetService } from '../chat.js';
-import { InlineChatController } from '../../../inlineChat/browser/inlineChatController.js';
 import { IAccessibleViewService } from '../../../accessibility/browser/accessibleView.js';
-import { AccessibleDiffViewerNext } from '../../../../../editor/browser/widget/diffEditor/diffEditor.contribution.js';
+import { AccessibleDiffViewerNext } from '../../../../../editor/browser/widget/diffEditor/commands.js';
+import { INLINE_CHAT_ID } from '../../../inlineChat/common/inlineChat.js';
 function getAccessibilityHelpText(accessor, type) {
     const keybindingService = accessor.get(IKeybindingService);
     const content = [];
@@ -185,9 +185,8 @@ async function runAccessibilityHelpAction(accessor, editor, type) {
                 inputEditor.focus();
             }
             else if (type === 'inlineChat') {
-                if (editor) {
-                    InlineChatController.get(editor)?.focus();
-                }
+                const ctrl = editor?.getContribution(INLINE_CHAT_ID);
+                ctrl?.focus();
             }
         },
         options: { type: "help"  }

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js

@@ -3,27 +3,26 @@ import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
-import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
-import { registerAction2, Action2, MenuId } from '../../../../../platform/actions/common/actions.js';
+import { MenuId, registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../../platform/contextkey/common/contextkey.js';
+import { IsWindowsContext, IsLinuxContext } from '../../../../../platform/contextkey/common/contextkeys.js';
 import { IQuickInputService } from '../../../../../platform/quickinput/common/quickInput.js';
 import { Registry } from '../../../../../platform/registry/common/platform.js';
 import { ViewAction } from '../../../../browser/parts/views/viewPane.js';
 import { Extensions } from '../../../../common/contributions.js';
-import { IViewsService } from '../../../../services/views/common/viewsService.js';
 import { AccessibilityHelpAction } from '../../../accessibility/browser/accessibleViewActions.js';
 import { runAccessibilityHelpAction } from './chatAccessibilityHelp.js';
 import { IChatWidgetService } from '../chat.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
 import { IChatAgentService } from '../../common/chatAgents.js';
-import { CONTEXT_IN_CHAT_INPUT, CONTEXT_PROVIDER_EXISTS, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from '../../common/chatContextKeys.js';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT, CONTEXT_CHAT_INPUT_HAS_AGENT, CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT, CONTEXT_PROVIDER_EXISTS, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from '../../common/chatContextKeys.js';
 import { IChatContributionService } from '../../common/chatContributionService.js';
 import { chatAgentLeader } from '../../common/chatParserTypes.js';
 import { IChatService } from '../../common/chatService.js';
 import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IsWindowsContext, IsLinuxContext } from '../../../../../platform/contextkey/common/contextkeys.js';
+import { IViewsService } from '../../../../services/views/common/viewsService.js';
 const CHAT_CATEGORY = ( localize2WithPath(
     'vs/workbench/contrib/chat/browser/actions/chatActions',
     'chat.category',
@@ -85,11 +84,16 @@ class ChatSubmitSecondaryAgentEditorAction extends EditorAction2 {
                 { key: 'actions.chat.submitSecondaryAgent', comment: ['Send input from the chat input box to the secondary agent'] },
                 "Submit to Secondary Agent"
             )),
-            precondition: CONTEXT_IN_CHAT_INPUT,
+            precondition: ( ContextKeyExpr.and(CONTEXT_CHAT_INPUT_HAS_TEXT, ( CONTEXT_CHAT_INPUT_HAS_AGENT.negate()), ( CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate()))),
             keybinding: {
-                when: EditorContextKeys.textInputFocus,
+                when: CONTEXT_IN_CHAT_INPUT,
                 primary: 2048  | 3 ,
                 weight: 100
+            },
+            menu: {
+                id: MenuId.ChatExecuteSecondary,
+                group: 'group_1',
+                when: ( CONTEXT_CHAT_INPUT_HAS_AGENT.negate()),
             }
         });
     }
@@ -110,7 +114,7 @@ class ChatSubmitSecondaryAgentEditorAction extends EditorAction2 {
                 widget.acceptInput();
             }
             else {
-                widget.acceptInputWithPrefix(`${chatAgentLeader}${secondaryAgent.id}`);
+                widget.acceptInputWithPrefix(`${chatAgentLeader}${secondaryAgent.name}`);
             }
         }
     }
@@ -125,12 +129,17 @@ class ChatSubmitEditorAction extends EditorAction2 {
                 { key: 'actions.chat.submit', comment: ['Apply input from the chat input box'] },
                 "Submit"
             )),
-            precondition: CONTEXT_IN_CHAT_INPUT,
+            precondition: CONTEXT_CHAT_INPUT_HAS_TEXT,
             keybinding: {
-                when: EditorContextKeys.textInputFocus,
+                when: CONTEXT_IN_CHAT_INPUT,
                 primary: 3 ,
                 weight: 100
-            }
+            },
+            menu: {
+                id: MenuId.ChatExecuteSecondary,
+                when: ( CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate()),
+                group: 'group_1',
+            },
         });
     }
     runEditorCommand(accessor, editor) {
@@ -288,7 +297,7 @@ const getHistoryChatActionDescriptorForViewTitle = (viewId, providerId) => ({
     },
     category: CHAT_CATEGORY,
     icon: Codicon.history,
-    f1: false,
+    f1: true,
     precondition: CONTEXT_PROVIDER_EXISTS
 });
 function getHistoryAction(viewId, providerId) {