development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

voice - use mute and unmute for chat responses to trigger synthesis (#212283)

Browse source
This commit is contained in:
Benjamin Pasero 2024-05-08 20:39:58 +02:00 committed by GitHub
parent 19758c41f2
commit 8d653939de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
View file

@ -38,9 +38,9 @@ import { CHAT_CATEGORY, stringifyItem } from 'vs/workbench/contrib/chat/browser/
import { IChatExecuteActionContext } from 'vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
import { CHAT_VIEW_ID, IChatWidget, IChatWidgetService, IQuickChatService, showChatView } from 'vs/workbench/contrib/chat/browser/chat';
import { ChatAgentLocation, IChatAgentService } from 'vs/workbench/contrib/chat/common/chatAgents';
import { CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_ENABLED, CONTEXT_RESPONSE_FILTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
import { CONTEXT_CHAT_REQUEST_IN_PROGRESS, CONTEXT_IN_CHAT_INPUT, CONTEXT_CHAT_ENABLED, CONTEXT_RESPONSE, CONTEXT_RESPONSE_FILTERED } from 'vs/workbench/contrib/chat/common/chatContextKeys';
import { IChatService, KEYWORD_ACTIVIATION_SETTING_ID } from 'vs/workbench/contrib/chat/common/chatService';
import { isRequestVM, isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
import { isResponseVM } from 'vs/workbench/contrib/chat/common/chatViewModel';
import { IVoiceChatService } from 'vs/workbench/contrib/chat/common/voiceChat';
import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
import { InlineChatController } from 'vs/workbench/contrib/inlineChat/browser/inlineChatController';
@ -864,18 +864,24 @@ export class ReadChatItemAloud extends Action2 {
title: localize2('workbench.action.chat.readChatItemAloud', "Read Aloud"),
f1: false,
category: CHAT_CATEGORY,
icon: Codicon.unmute,
precondition: CanVoiceChat,
menu: {
id: MenuId.ChatContext,
when: ContextKeyExpr.and(CanVoiceChat, CONTEXT_RESPONSE_FILTERED.negate()),
group: 'textToSpeech'
id: MenuId.ChatMessageTitle,
when: ContextKeyExpr.and(
CanVoiceChat,
CONTEXT_RESPONSE, // only for responses
TextToSpeechInProgress.negate(), // but not when already in progress
CONTEXT_RESPONSE_FILTERED.negate() // and not when response is filtered
),
group: 'navigation'
}
});
}
run(accessor: ServicesAccessor, ...args: any[]) {
const item = args[0];
if (!isRequestVM(item) && !isResponseVM(item)) {
if (!isResponseVM(item)) {
return;
}
@ -899,16 +905,53 @@ export class StopReadAloud extends Action2 {
weight: KeybindingWeight.WorkbenchContrib + 100,
primary: KeyCode.Escape,
},
menu: [{
id: MenuId.ChatContext,
when: TextToSpeechInProgress,
group: 'textToSpeech'
}, {
id: MenuId.ChatExecute,
when: TextToSpeechInProgress,
group: 'navigation',
order: -1
}]
menu: [
{
id: MenuId.ChatExecute,
when: TextToSpeechInProgress,
group: 'navigation',
order: -1
},
{
id: MenuId.for('terminalChatInput'),
when: TextToSpeechInProgress,
group: 'navigation',
order: -1
}
]
});
}
async run(accessor: ServicesAccessor, ...args: any[]) {
ChatSynthesizerSessions.getInstance(accessor.get(IInstantiationService)).stop();
}
}
export class StopReadChatItemAloud extends Action2 {
static readonly ID = 'workbench.action.chat.stopRadChatItemAloud';
constructor() {
super({
id: StopReadChatItemAloud.ID,
icon: Codicon.mute,
title: localize2('workbench.action.chat.stopRadChatItemAloud', "Stop Reading Aloud"),
precondition: TextToSpeechInProgress,
keybinding: {
weight: KeybindingWeight.WorkbenchContrib + 100,
primary: KeyCode.Escape,
},
menu: [
{
id: MenuId.ChatMessageTitle,
when: ContextKeyExpr.and(
TextToSpeechInProgress, // only when in progress
CONTEXT_RESPONSE, // only for responses
CONTEXT_RESPONSE_FILTERED.negate() // but not when response is filtered
),
group: 'navigation'
}
]
});
}

3
src/vs/workbench/contrib/chat/electron-sandbox/chat.contribution.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { InlineVoiceChatAction, QuickVoiceChatAction, StartVoiceChatAction, StopListeningInQuickChatAction, StopListeningInChatEditorAction, StopListeningInChatViewAction, VoiceChatInChatViewAction, StopListeningAction, StopListeningAndSubmitAction, KeywordActivationContribution, InstallVoiceChatAction, StopListeningInTerminalChatAction, HoldToVoiceChatInChatViewAction, ReadChatItemAloud, StopReadAloud } from 'vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions';
import { InlineVoiceChatAction, QuickVoiceChatAction, StartVoiceChatAction, StopListeningInQuickChatAction, StopListeningInChatEditorAction, StopListeningInChatViewAction, VoiceChatInChatViewAction, StopListeningAction, StopListeningAndSubmitAction, KeywordActivationContribution, InstallVoiceChatAction, StopListeningInTerminalChatAction, HoldToVoiceChatInChatViewAction, ReadChatItemAloud, StopReadAloud, StopReadChatItemAloud } from 'vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions';
import { registerAction2 } from 'vs/platform/actions/common/actions';
import { WorkbenchPhase, registerWorkbenchContribution2 } from 'vs/workbench/common/contributions';
@ -24,6 +24,7 @@ registerAction2(StopListeningInQuickChatAction);
registerAction2(StopListeningInTerminalChatAction);
registerAction2(ReadChatItemAloud);
registerAction2(StopReadChatItemAloud);
registerAction2(StopReadAloud);
registerWorkbenchContribution2(KeywordActivationContribution.ID, KeywordActivationContribution, WorkbenchPhase.AfterRestored);