Skip to content

re-add terminal voice action, stop it when appropriate #230552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meganrogge merged 2 commits into from
Oct 8, 2024
Merged

re-add terminal voice action, stop it when appropriate #230552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b8adb2
bring back `TerminalChatExecute` menu so voice input is possible, fir…
meganrogge Oct 4, 2024
3c6fbbf
fix name
meganrogge Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/vs/workbench/contrib/chat/electron-sandbox/actions/voiceChatActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ import { renderStringAsPlaintext } from '../../../../../base/browser/markdownRen
type VoiceChatSessionContext = 'view' | 'inline' | 'terminal' | 'quick' | 'editor';
const VoiceChatSessionContexts: VoiceChatSessionContext[] = ['view', 'inline', 'terminal', 'quick', 'editor'];

const TerminalChatExecute = MenuId.for('terminalChatInput'); // unfortunately, terminal decided to go with their own menu (https://github.com/microsoft/vscode/issues/208789)

// Global Context Keys (set on global context key service)
const CanVoiceChat = ContextKeyExpr.and(CONTEXT_CHAT_ENABLED, HasSpeechProvider);
const FocusInChatInput = ContextKeyExpr.or(CTX_INLINE_CHAT_FOCUSED, CONTEXT_IN_CHAT_INPUT);
Expand Down Expand Up @@ -609,6 +611,16 @@ export class StartVoiceChatAction extends Action2 {
group: 'navigation',
order: 2
},
{
id: TerminalChatExecute,
when: ContextKeyExpr.and(
HasSpeechProvider,
ScopedChatSynthesisInProgress.negate(), // hide when text to speech is in progress
AnyScopedVoiceChatInProgress?.negate(), // hide when voice chat is in progress
),
group: 'navigation',
order: -1
},
]
});
}
Expand Down Expand Up @@ -656,6 +668,12 @@ export class StopListeningAction extends Action2 {
when: ContextKeyExpr.and(CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel).negate(), AnyScopedVoiceChatInProgress),
group: 'navigation',
order: 2
}, {

id: TerminalChatExecute,
when: AnyScopedVoiceChatInProgress,
group: 'navigation',
order: -1
},
]
});
Expand Down Expand Up @@ -991,6 +1009,12 @@ export class StopReadAloud extends Action2 {
group: 'navigation',
order: 2
},
{
id: TerminalChatExecute,
when: ScopedChatSynthesisInProgress,
group: 'navigation',
order: -1
}
]
});
}
Expand Down Expand Up @@ -1325,9 +1349,14 @@ export class InstallSpeechProviderForVoiceChatAction extends BaseInstallSpeechPr
precondition: InstallingSpeechProvider.negate(),
menu: [{
id: MenuId.ChatInput,
when: HasSpeechProvider.negate(),
when: ContextKeyExpr.and(HasSpeechProvider.negate(), CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Terminal).negate()),
group: 'navigation',
order: 3
}, {
id: TerminalChatExecute,
when: HasSpeechProvider.negate(),
group: 'navigation',
order: -1
}]
});
}
Expand Down
1 change: 1 addition & 0 deletions src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ export class TerminalChatController extends Disposable implements ITerminalContr
await this.reveal();
}
assertType(this._model.value);
this._messages.fire(Message.ACCEPT_INPUT);
const lastInput = this._terminalChatWidget.value.inlineChatWidget.value;
if (!lastInput) {
return;
Expand Down