@codingame/monaco-vscode-api 4.5.2 → 5.0.1

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

@@ -3,7 +3,7 @@ import { MultiCommand } from '../../../../editor/browser/editorExtensions.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { registerAction2, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewGoToSymbolSupported, accessibleViewVerbosityEnabled, accessibleViewCurrentProviderId } from './accessibilityConfiguration.js';
+import { accessibilityHelpIsShown, accessibleViewIsShown, accessibleViewSupportsNavigation, accessibleViewContainsCodeBlocks, accessibleViewCurrentProviderId, accessibleViewGoToSymbolSupported, accessibleViewVerbosityEnabled } from './accessibilityConfiguration.js';
 import { IAccessibleViewService } from './accessibleView.service.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
@@ -43,6 +43,58 @@ class AccessibleViewNextAction extends Action2 {
     }
 }
 registerAction2(AccessibleViewNextAction);
+class AccessibleViewNextCodeBlockAction extends Action2 {
+    constructor() {
+        super({
+            id: "editor.action.accessibleViewNextCodeBlock" ,
+            precondition: ( (ContextKeyExpr.and(accessibleViewContainsCodeBlocks,  (ContextKeyExpr.equals(
+                accessibleViewCurrentProviderId.key,
+                "panelChat"
+            ))))),
+            keybinding: {
+                primary: 2048  | 512  | 12 ,
+                mac: { primary: 2048  | 512  | 12 , },
+                weight: 200 ,
+            },
+            icon: Codicon.arrowRight,
+            menu: {
+                ...accessibleViewMenu,
+                when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
+            },
+            title: ( localizeWithPath(_moduleId, 1, "Accessible View: Next Code Block"))
+        });
+    }
+    run(accessor) {
+        accessor.get(IAccessibleViewService).navigateToCodeBlock('next');
+    }
+}
+registerAction2(AccessibleViewNextCodeBlockAction);
+class AccessibleViewPreviousCodeBlockAction extends Action2 {
+    constructor() {
+        super({
+            id: "editor.action.accessibleViewPreviousCodeBlock" ,
+            precondition: ( (ContextKeyExpr.and(accessibleViewContainsCodeBlocks,  (ContextKeyExpr.equals(
+                accessibleViewCurrentProviderId.key,
+                "panelChat"
+            ))))),
+            keybinding: {
+                primary: 2048  | 512  | 11 ,
+                mac: { primary: 2048  | 512  | 11 , },
+                weight: 200 ,
+            },
+            icon: Codicon.arrowLeft,
+            menu: {
+                ...accessibleViewMenu,
+                when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
+            },
+            title: ( localizeWithPath(_moduleId, 2, "Accessible View: Previous Code Block"))
+        });
+    }
+    run(accessor) {
+        accessor.get(IAccessibleViewService).navigateToCodeBlock('previous');
+    }
+}
+registerAction2(AccessibleViewPreviousCodeBlockAction);
 class AccessibleViewPreviousAction extends Action2 {
     constructor() {
         super({
@@ -60,7 +112,7 @@ class AccessibleViewPreviousAction extends Action2 {
                     when: ( (ContextKeyExpr.and(accessibleViewIsShown, accessibleViewSupportsNavigation))),
                 }
             ],
-            title: ( localizeWithPath(_moduleId, 1, "Show Previous in Accessible View"))
+            title: ( localizeWithPath(_moduleId, 3, "Show Previous in Accessible View"))
         });
     }
     run(accessor) {
@@ -92,7 +144,7 @@ class AccessibleViewGoToSymbolAction extends Action2 {
                     ))),
                 }
             ],
-            title: ( localizeWithPath(_moduleId, 2, "Go To Symbol in Accessible View"))
+            title: ( localizeWithPath(_moduleId, 4, "Go To Symbol in Accessible View"))
         });
     }
     run(accessor) {
@@ -119,7 +171,7 @@ const AccessibilityHelpAction = registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localizeWithPath(_moduleId, 3, "Open Accessibility Help")),
+            title: ( localizeWithPath(_moduleId, 5, "Open Accessibility Help")),
             order: 1
         }],
 }))));
@@ -137,7 +189,7 @@ const AccessibleViewAction = registerCommand(( (new MultiCommand({
     menuOpts: [{
             menuId: MenuId.CommandPalette,
             group: '',
-            title: ( localizeWithPath(_moduleId, 4, "Open Accessible View")),
+            title: ( localizeWithPath(_moduleId, 6, "Open Accessible View")),
             order: 1
         }],
 }))));
@@ -165,7 +217,7 @@ class AccessibleViewDisableHintAction extends Action2 {
                     ))),
                 }
             ],
-            title: ( localizeWithPath(_moduleId, 5, "Disable Accessible View Hint"))
+            title: ( localizeWithPath(_moduleId, 7, "Disable Accessible View Hint"))
         });
     }
     run(accessor) {
@@ -199,7 +251,7 @@ class AccessibleViewAcceptInlineCompletionAction extends Action2 {
                     )))))
                 }
             ],
-            title: ( localizeWithPath(_moduleId, 6, "Accept Inline Completion"))
+            title: ( localizeWithPath(_moduleId, 8, "Accept Inline Completion"))
         });
     }
     async run(accessor) {

package/vscode/src/vs/workbench/contrib/accessibility/browser/{accessibilityContributions.js → accessibleViewContributions.js}

@@ -1,28 +1,40 @@
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { accessibleViewIsShown } from './accessibilityConfiguration.js';
 import { format } from '../../../../base/common/strings.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
-import { HoverController } from '../../../../editor/contrib/hover/browser/hover.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { getNotificationFromContext } from '../../../browser/parts/notifications/notificationsCommands.js';
 import { WorkbenchList } from '../../../../platform/list/browser/listService.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
-import { NotificationFocusedContext } from '../../../common/contextkeys.js';
+import { FocusedViewContext, NotificationFocusedContext } from '../../../common/contextkeys.js';
+import { ExtensionContentProvider } from './accessibleView.js';
 import { IAccessibleViewService } from './accessibleView.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
-import { AccessibleViewAction, AccessibilityHelpAction } from './accessibleViewActions.js';
+import { AccessibilityHelpAction, AccessibleViewAction } from './accessibleViewActions.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { InlineCompletionsController } from '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
 import '../../../../editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.js';
 import '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
 import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
-const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibilityContributions";
+import { Extensions } from '../../../common/views.js';
+import { Registry } from '../../../../platform/registry/common/platform.js';
+import { COMMENTS_VIEW_ID, CommentsMenus } from '../../comments/browser/commentsTreeViewer.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
+import { CONTEXT_KEY_HAS_COMMENTS } from '../../comments/browser/commentsView.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+import { HoverController } from '../../../../editor/contrib/hover/browser/hoverController.js';
+import { MarkdownString } from '../../../../base/common/htmlContent.js';
+import { URI } from '../../../../base/common/uri.js';
+const _moduleId = "vs/workbench/contrib/accessibility/browser/accessibleViewContributions";
 function descriptionForCommand(commandId, msg, noKbMsg, keybindingService) {
     const kb = keybindingService.lookupKeybinding(commandId);
     if (kb) {
@@ -203,6 +215,72 @@ function alertFocusChange(index, length, type) {
     }
     return;
 }
+class CommentAccessibleViewContribution extends Disposable {
+    constructor() {
+        super();
+        this._register(AccessibleViewAction.addImplementation(90, 'comment', accessor => {
+            const accessibleViewService = accessor.get(IAccessibleViewService);
+            const contextKeyService = accessor.get(IContextKeyService);
+            const viewsService = accessor.get(IViewsService);
+            const menuService = accessor.get(IMenuService);
+            const commentsView = viewsService.getActiveViewWithId(COMMENTS_VIEW_ID);
+            if (!commentsView) {
+                return false;
+            }
+            const menus = this._register(( (new CommentsMenus(menuService))));
+            menus.setContextKeyService(contextKeyService);
+            function renderAccessibleView() {
+                if (!commentsView) {
+                    return false;
+                }
+                const commentNode = commentsView.focusedCommentNode;
+                const content = commentsView.focusedCommentInfo?.toString();
+                if (!commentNode || !content) {
+                    return false;
+                }
+                const menuActions = [...menus.getResourceContextActions(commentNode)].filter(i => i.enabled);
+                const actions = ( (menuActions.map(action => {
+                    return {
+                        ...action,
+                        run: () => {
+                            commentsView.focus();
+                            action.run({
+                                thread: commentNode.thread,
+                                $mid: 7 ,
+                                commentControlHandle: commentNode.controllerHandle,
+                                commentThreadHandle: commentNode.threadHandle,
+                            });
+                        }
+                    };
+                })));
+                accessibleViewService.show({
+                    id: "notification" ,
+                    provideContent: () => {
+                        return content;
+                    },
+                    onClose() {
+                        commentsView.focus();
+                    },
+                    next() {
+                        commentsView.focus();
+                        commentsView.focusNextNode();
+                        renderAccessibleView();
+                    },
+                    previous() {
+                        commentsView.focus();
+                        commentsView.focusPreviousNode();
+                        renderAccessibleView();
+                    },
+                    verbositySettingKey: "accessibility.verbosity.comments" ,
+                    options: { type: "view"  },
+                    actions
+                });
+                return true;
+            }
+            return renderAccessibleView();
+        }, CONTEXT_KEY_HAS_COMMENTS));
+    }
+}
 class InlineCompletionsAccessibleViewContribution extends Disposable {
     constructor() {
         super();
@@ -250,4 +328,80 @@ class InlineCompletionsAccessibleViewContribution extends Disposable {
         }));
     }
 }
-export { HoverAccessibleViewContribution, InlineCompletionsAccessibleViewContribution, NotificationAccessibleViewContribution, alertFocusChange, descriptionForCommand };
+let ExtensionAccessibilityHelpDialogContribution = class ExtensionAccessibilityHelpDialogContribution extends Disposable {
+    static { this.ID = 'extensionAccessibilityHelpDialogContribution'; }
+    constructor(keybindingService) {
+        super();
+        this._viewHelpDialogMap = this._register(( (new DisposableMap())));
+        this._register(( (Registry.as(Extensions.ViewsRegistry))).onViewsRegistered(e => {
+            for (const view of e) {
+                for (const viewDescriptor of view.views) {
+                    if (viewDescriptor.accessibilityHelpContent) {
+                        this._viewHelpDialogMap.set(viewDescriptor.id, registerAccessibilityHelpAction(keybindingService, viewDescriptor));
+                    }
+                }
+            }
+        }));
+        this._register(( (Registry.as(Extensions.ViewsRegistry))).onViewsDeregistered(e => {
+            for (const viewDescriptor of e.views) {
+                if (viewDescriptor.accessibilityHelpContent) {
+                    this._viewHelpDialogMap.get(viewDescriptor.id)?.dispose();
+                }
+            }
+        }));
+    }
+};
+ExtensionAccessibilityHelpDialogContribution = ( (__decorate([
+    ( (__param(0, IKeybindingService)))
+], ExtensionAccessibilityHelpDialogContribution)));
+function registerAccessibilityHelpAction(keybindingService, viewDescriptor) {
+    const disposableStore = ( (new DisposableStore()));
+    const helpContent = resolveExtensionHelpContent(keybindingService, viewDescriptor.accessibilityHelpContent);
+    if (!helpContent) {
+        throw ( (new Error('No help content for view')));
+    }
+    disposableStore.add(AccessibilityHelpAction.addImplementation(95, viewDescriptor.id, accessor => {
+        const accessibleViewService = accessor.get(IAccessibleViewService);
+        const viewsService = accessor.get(IViewsService);
+        accessibleViewService.show(( (new ExtensionContentProvider(
+            viewDescriptor.id,
+            { type: "help"  },
+            () => helpContent.value,
+            () => viewsService.openView(viewDescriptor.id, true)
+        ))));
+        return true;
+    }, ( (FocusedViewContext.isEqualTo(viewDescriptor.id)))));
+    disposableStore.add(keybindingService.onDidUpdateKeybindings(() => {
+        disposableStore.clear();
+        disposableStore.add(registerAccessibilityHelpAction(keybindingService, viewDescriptor));
+    }));
+    return disposableStore;
+}
+function resolveExtensionHelpContent(keybindingService, content) {
+    if (!content) {
+        return;
+    }
+    let resolvedContent = typeof content === 'string' ? content : content.value;
+    const matches = resolvedContent.matchAll(/\<keybinding:(?<commandId>.*)\>/gm);
+    for (const match of [...matches]) {
+        const commandId = match?.groups?.commandId;
+        if (match?.length && commandId) {
+            const keybinding = keybindingService.lookupKeybinding(commandId)?.getAriaLabel();
+            let kbLabel = keybinding;
+            if (!kbLabel) {
+                const args = ( (URI.parse(
+                    `command:workbench.action.openGlobalKeybindings?${encodeURIComponent(JSON.stringify(commandId))}`
+                )));
+                kbLabel = ` [Configure a keybinding](${args})`;
+            }
+            else {
+                kbLabel = ' (' + keybinding + ')';
+            }
+            resolvedContent = resolvedContent.replace(match[0], kbLabel);
+        }
+    }
+    const result = ( (new MarkdownString(resolvedContent)));
+    result.isTrusted = true;
+    return result;
+}
+export { CommentAccessibleViewContribution, ExtensionAccessibilityHelpDialogContribution, HoverAccessibleViewContribution, InlineCompletionsAccessibleViewContribution, NotificationAccessibleViewContribution, alertFocusChange, descriptionForCommand };

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

@@ -8,10 +8,10 @@ import { ICommandService } from '../../../../platform/commands/common/commands.s
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { descriptionForCommand } from './accessibilityContributions.js';
+import { descriptionForCommand } from './accessibleViewContributions.js';
 import { IAccessibleViewService } from './accessibleView.service.js';
 import { AccessibilityHelpAction } from './accessibleViewActions.js';
-import { CONTEXT_PROVIDER_EXISTS } from '../../chat/common/chatContextKeys.js';
+import { CONTEXT_CHAT_ENABLED } from '../../chat/common/chatContextKeys.js';
 import { CommentAccessibilityHelpNLS } from '../../comments/browser/commentsAccessibility.js';
 import { CommentContextKeys } from '../../comments/common/commentContextKeys.js';
 import { NEW_UNTITLED_FILE_COMMAND_ID } from '../../files/browser/fileConstants.js';
@@ -104,7 +104,7 @@ function getCommentCommandInfo(keybindingService, contextKeyService, editor) {
     return;
 }
 function getChatCommandInfo(keybindingService, contextKeyService) {
-    if (CONTEXT_PROVIDER_EXISTS.getValue(contextKeyService)) {
+    if (CONTEXT_CHAT_ENABLED.getValue(contextKeyService)) {
         const commentCommandInfo = [];
         commentCommandInfo.push(descriptionForCommand('workbench.action.quickchat.toggle', AccessibilityHelpNLS.quickChat, AccessibilityHelpNLS.quickChatNoKb, keybindingService));
         commentCommandInfo.push(descriptionForCommand('inlineChat.start', AccessibilityHelpNLS.startInlineChat, AccessibilityHelpNLS.startInlineChatNoKb, keybindingService));

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

@@ -4,7 +4,7 @@ import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { EditorAction2 } from '../../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../../editor/browser/services/codeEditorService.js';
 import { localize2WithPath, localizeWithPath } from '../../../../../nls.js';
-import { MenuId, registerAction2, Action2 } from '../../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId } 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.service.js';
@@ -13,17 +13,19 @@ import { ViewAction } from '../../../../browser/parts/views/viewPane.js';
 import { Extensions } from '../../../../common/contributions.js';
 import { AccessibilityHelpAction } from '../../../accessibility/browser/accessibleViewActions.js';
 import { runAccessibilityHelpAction } from './chatAccessibilityHelp.js';
+import { showChatView, CHAT_VIEW_ID } from '../chat.js';
 import { IChatWidgetService } from '../chat.service.js';
 import { ChatEditorInput } from '../chatEditorInput.js';
-import { IChatAgentService } from '../../common/chatAgents.service.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.service.js';
-import { chatAgentLeader } from '../../common/chatParserTypes.js';
+import { ChatAgentLocation } from '../../common/chatAgents.js';
+import { CONTEXT_CHAT_ENABLED, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_LOCATION, CONTEXT_CHAT_INPUT_CURSOR_AT_TOP, CONTEXT_IN_CHAT_SESSION, CONTEXT_RESPONSE, CONTEXT_REQUEST } from '../../common/chatContextKeys.js';
 import { IChatService } from '../../common/chatService.service.js';
 import { IChatWidgetHistoryService } from '../../common/chatWidgetHistoryService.service.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
 import { IViewsService } from '../../../../services/views/common/viewsService.service.js';
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatActions";
+function isChatViewTitleActionContext(obj) {
+    return obj instanceof Object && 'chatView' in obj;
+}
 const CHAT_CATEGORY = ( localize2WithPath(_moduleId, 0, 'Chat'));
 const CHAT_OPEN_ACTION_ID = 'workbench.action.chat.open';
 class OpenChatGlobalAction extends Action2 {
@@ -31,7 +33,6 @@ class OpenChatGlobalAction extends Action2 {
         super({
             id: CHAT_OPEN_ACTION_ID,
             title: ( localize2WithPath(_moduleId, 1, "Open Chat")),
-            precondition: CONTEXT_PROVIDER_EXISTS,
             icon: Codicon.commentDiscussion,
             f1: false,
             category: CHAT_CATEGORY,
@@ -46,13 +47,7 @@ class OpenChatGlobalAction extends Action2 {
     }
     async run(accessor, opts) {
         opts = typeof opts === 'string' ? { query: opts } : opts;
-        const chatService = accessor.get(IChatService);
-        const chatWidgetService = accessor.get(IChatWidgetService);
-        const providers = chatService.getProviderInfos();
-        if (!providers.length) {
-            return;
-        }
-        const chatWidget = await chatWidgetService.revealViewForProvider(providers[0].id);
+        const chatWidget = await showChatView(accessor.get(IViewsService));
         if (!chatWidget) {
             return;
         }
@@ -67,88 +62,76 @@ class OpenChatGlobalAction extends Action2 {
         chatWidget.focusInput();
     }
 }
-class ChatSubmitSecondaryAgentEditorAction extends EditorAction2 {
-    static { this.ID = 'workbench.action.chat.submitSecondaryAgent'; }
+class ChatHistoryAction extends ViewAction {
     constructor() {
         super({
-            id: ChatSubmitSecondaryAgentEditorAction.ID,
-            title: ( localize2WithPath(_moduleId, 2, "Submit to Secondary Agent")),
-            precondition: ( (ContextKeyExpr.and(
-                CONTEXT_CHAT_INPUT_HAS_TEXT,
-                 (CONTEXT_CHAT_INPUT_HAS_AGENT.negate()),
-                 (CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate())
-            ))),
-            keybinding: {
-                when: CONTEXT_IN_CHAT_INPUT,
-                primary: 2048  | 3 ,
-                weight: 100
-            },
+            viewId: CHAT_VIEW_ID,
+            id: `workbench.action.chat.history`,
+            title: ( localize2WithPath(_moduleId, 2, "Show Chats...")),
             menu: {
-                id: MenuId.ChatExecuteSecondary,
-                group: 'group_1',
-                when: ( (CONTEXT_CHAT_INPUT_HAS_AGENT.negate())),
-            }
+                id: MenuId.ViewTitle,
+                when: ( (ContextKeyExpr.equals('view', CHAT_VIEW_ID))),
+                group: 'navigation',
+                order: -1
+            },
+            category: CHAT_CATEGORY,
+            icon: Codicon.history,
+            f1: true,
+            precondition: CONTEXT_CHAT_ENABLED
         });
     }
-    runEditorCommand(accessor, editor) {
-        const editorUri = editor.getModel()?.uri;
-        if (editorUri) {
-            const agentService = accessor.get(IChatAgentService);
-            const secondaryAgent = agentService.getSecondaryAgent();
-            if (!secondaryAgent) {
-                return;
-            }
-            const widgetService = accessor.get(IChatWidgetService);
-            const widget = widgetService.getWidgetByInputUri(editorUri);
-            if (!widget) {
-                return;
-            }
-            if (widget.getInput().match(/^\s*@/)) {
-                widget.acceptInput();
-            }
-            else {
-                widget.acceptInputWithPrefix(`${chatAgentLeader}${secondaryAgent.name}`);
+    async runInView(accessor, view) {
+        const chatService = accessor.get(IChatService);
+        const quickInputService = accessor.get(IQuickInputService);
+        const viewsService = accessor.get(IViewsService);
+        const items = chatService.getHistory();
+        const picks = ( (items.map(i => ({
+            label: i.title,
+            chat: i,
+            buttons: [{
+                    iconClass: ThemeIcon.asClassName(Codicon.x),
+                    tooltip: ( localizeWithPath(_moduleId, 3, "Delete")),
+                }]
+        }))));
+        const selection = await quickInputService.pick(picks, {
+            placeHolder: ( localizeWithPath(_moduleId, 4, "Switch to chat")),
+            onDidTriggerItemButton: context => {
+                chatService.removeHistoryEntry(context.item.chat.sessionId);
+                context.removeItem();
             }
+        });
+        if (selection) {
+            const sessionId = selection.chat.sessionId;
+            const view = await viewsService.openView(CHAT_VIEW_ID);
+            view.loadSession(sessionId);
         }
     }
 }
-class ChatSubmitEditorAction extends EditorAction2 {
-    static { this.ID = 'workbench.action.chat.acceptInput'; }
+class OpenChatEditorAction extends Action2 {
     constructor() {
         super({
-            id: ChatSubmitEditorAction.ID,
-            title: ( localize2WithPath(_moduleId, 3, "Submit")),
-            precondition: CONTEXT_CHAT_INPUT_HAS_TEXT,
-            keybinding: {
-                when: CONTEXT_IN_CHAT_INPUT,
-                primary: 3 ,
-                weight: 100
-            },
-            menu: {
-                id: MenuId.ChatExecuteSecondary,
-                when: ( (CONTEXT_CHAT_REQUEST_IN_PROGRESS.negate())),
-                group: 'group_1',
-            },
+            id: `workbench.action.openChat`,
+            title: ( localize2WithPath(_moduleId, 5, "Open Editor")),
+            f1: true,
+            category: CHAT_CATEGORY,
+            precondition: CONTEXT_CHAT_ENABLED
         });
     }
-    runEditorCommand(accessor, editor) {
-        const editorUri = editor.getModel()?.uri;
-        if (editorUri) {
-            const widgetService = accessor.get(IChatWidgetService);
-            widgetService.getWidgetByInputUri(editorUri)?.acceptInput();
-        }
+    async run(accessor) {
+        const editorService = accessor.get(IEditorService);
+        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true } });
     }
 }
 function registerChatActions() {
     registerAction2(OpenChatGlobalAction);
-    registerAction2(ChatSubmitEditorAction);
-    registerAction2(ChatSubmitSecondaryAgentEditorAction);
+    registerAction2(ChatHistoryAction);
+    registerAction2(OpenChatEditorAction);
     registerAction2(class ClearChatInputHistoryAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.clearInputHistory',
-                title: ( localize2WithPath(_moduleId, 4, "Clear Input History")),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 6, "Clear Input History")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 category: CHAT_CATEGORY,
                 f1: true,
             });
@@ -162,8 +145,8 @@ function registerChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.clearHistory',
-                title: ( localize2WithPath(_moduleId, 5, "Clear All Workspace Chats")),
-                precondition: CONTEXT_PROVIDER_EXISTS,
+                title: ( localize2WithPath(_moduleId, 7, "Clear All Workspace Chats")),
+                precondition: CONTEXT_CHAT_ENABLED,
                 category: CHAT_CATEGORY,
                 f1: true,
             });
@@ -177,8 +160,11 @@ function registerChatActions() {
         constructor() {
             super({
                 id: 'chat.action.focus',
-                title: ( localize2WithPath(_moduleId, 6, 'Focus Chat List')),
-                precondition: CONTEXT_IN_CHAT_INPUT,
+                title: ( localize2WithPath(_moduleId, 8, 'Focus Chat List')),
+                precondition: ( (ContextKeyExpr.and(
+                    CONTEXT_IN_CHAT_INPUT,
+                     (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel))
+                ))),
                 category: CHAT_CATEGORY,
                 keybinding: [
                     {
@@ -217,7 +203,7 @@ function registerChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.focusInput',
-                title: ( localize2WithPath(_moduleId, 7, "Focus Chat Input")),
+                title: ( localize2WithPath(_moduleId, 9, "Focus Chat Input")),
                 f1: false,
                 keybinding: {
                     primary: 2048  | 18 ,
@@ -232,74 +218,4 @@ function registerChatActions() {
         }
     });
 }
-function getOpenChatEditorAction(id, label, when) {
-    return class OpenChatEditor extends Action2 {
-        constructor() {
-            super({
-                id: `workbench.action.openChat.${id}`,
-                title: ( localize2WithPath(_moduleId, 8, "Open Editor ({0})", label)),
-                f1: true,
-                category: CHAT_CATEGORY,
-                precondition: ContextKeyExpr.deserialize(when)
-            });
-        }
-        async run(accessor) {
-            const editorService = accessor.get(IEditorService);
-            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { providerId: id }, pinned: true } });
-        }
-    };
-}
-const getHistoryChatActionDescriptorForViewTitle = (viewId, providerId) => ({
-    viewId,
-    id: `workbench.action.chat.${providerId}.history`,
-    title: ( localize2WithPath(_moduleId, 9, "Show Chats")),
-    menu: {
-        id: MenuId.ViewTitle,
-        when: ( (ContextKeyExpr.equals('view', viewId))),
-        group: 'navigation',
-        order: -1
-    },
-    category: CHAT_CATEGORY,
-    icon: Codicon.history,
-    f1: true,
-    precondition: CONTEXT_PROVIDER_EXISTS
-});
-function getHistoryAction(viewId, providerId) {
-    return class HistoryAction extends ViewAction {
-        constructor() {
-            super(getHistoryChatActionDescriptorForViewTitle(viewId, providerId));
-        }
-        async runInView(accessor, view) {
-            const chatService = accessor.get(IChatService);
-            const quickInputService = accessor.get(IQuickInputService);
-            const chatContribService = accessor.get(IChatContributionService);
-            const viewsService = accessor.get(IViewsService);
-            const items = chatService.getHistory();
-            const picks = ( (items.map(i => ({
-                label: i.title,
-                chat: i,
-                buttons: [{
-                        iconClass: ThemeIcon.asClassName(Codicon.x),
-                        tooltip: ( localizeWithPath(_moduleId, 10, "Delete")),
-                    }]
-            }))));
-            const selection = await quickInputService.pick(picks, {
-                placeHolder: ( localizeWithPath(_moduleId, 11, "Switch to chat")),
-                onDidTriggerItemButton: context => {
-                    chatService.removeHistoryEntry(context.item.chat.sessionId);
-                    context.removeItem();
-                }
-            });
-            if (selection) {
-                const sessionId = selection.chat.sessionId;
-                const provider = chatContribService.registeredProviders[0]?.id;
-                if (provider) {
-                    const viewId = chatContribService.getViewIdForProvider(provider);
-                    const view = await viewsService.openView(viewId);
-                    view.loadSession(sessionId);
-                }
-            }
-        }
-    };
-}
-export { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID, ChatSubmitEditorAction, ChatSubmitSecondaryAgentEditorAction, getHistoryAction, getOpenChatEditorAction, registerChatActions };
+export { CHAT_CATEGORY, CHAT_OPEN_ACTION_ID, isChatViewTitleActionContext, registerChatActions };