mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
Add local audio device selection to TUI voice settings (#49437)
## Why Voice conversations previously opened the system-default microphone and speaker. Users need to choose which local devices to use, including when connected to a remote app server. ## What changed - Add input and output device pickers alongside voice selection, with back navigation and a System default option. - Persist selections as `audio.microphone` and `audio.speaker` on the TUI's machine, excluding project configuration layers. Apply them to the next voice conversation. - Enumerate devices without opening audio streams and pass the selected names to the voice helper at startup. - Disable ambiguous device names in the picker and use the same eligibility filtering for discovery and named-device startup. ## Testing Add tests for device preference persistence across project and remote transitions, picker navigation and duplicate names, discovery without capture, and forwarding selected devices to the helper. GitOrigin-RevId: d48fb3a09fa9b982a408f5a7c96bdd81776af21d
This commit is contained in:
committed by
copyberry
parent
d8f69ea8bc
commit
fc81a7154b
@@ -2451,8 +2451,20 @@ impl App {
|
||||
}
|
||||
self.chat_widget.on_plugin_mentions_loaded(plugins);
|
||||
}
|
||||
AppEvent::OpenRealtimeSettings => {
|
||||
self.open_realtime_settings(app_server).await;
|
||||
AppEvent::OpenRealtimeSettings => self.chat_widget.open_realtime_settings(),
|
||||
AppEvent::OpenRealtimeSoundDevices => self.chat_widget.open_realtime_sound_devices(),
|
||||
AppEvent::OpenRealtimeVoices => self.open_realtime_voices(app_server).await,
|
||||
AppEvent::OpenRealtimeDevicePicker { kind } => self.list_realtime_devices(kind),
|
||||
AppEvent::RealtimeDevicesListed { origin, kind, result } => {
|
||||
if origin == self.active_thread_id {
|
||||
match result {
|
||||
Ok(devices) => self.chat_widget.open_realtime_device_picker(kind, devices),
|
||||
Err(error) => self.chat_widget.add_error_message(error),
|
||||
}
|
||||
}
|
||||
}
|
||||
AppEvent::PersistRealtimeDevice { kind, name } => {
|
||||
self.persist_realtime_device(kind, name).await;
|
||||
}
|
||||
AppEvent::PersistRealtimeVoiceSelection { voice } => {
|
||||
self.persist_realtime_voice(app_server, voice).await;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
//! Resolve and persist voice preferences through the owning server before updating the UI.
|
||||
//! Persist server voice preferences and machine-local audio selections before updating the UI.
|
||||
|
||||
use super::*;
|
||||
use crate::legacy_core::config::edit::ConfigEdit;
|
||||
use codex_app_server_protocol::ClientRequest;
|
||||
use codex_app_server_protocol::RequestId;
|
||||
use codex_app_server_protocol::ThreadRealtimeListVoicesParams;
|
||||
use codex_app_server_protocol::ThreadRealtimeListVoicesResponse;
|
||||
use codex_protocol::protocol::RealtimeVoice;
|
||||
use codex_protocol::protocol::RealtimeVoicesList;
|
||||
use codex_realtime_webrtc::AudioDeviceKind;
|
||||
use uuid::Uuid;
|
||||
|
||||
/// Unknown voices belong to newer servers; omit the override instead of blocking audio.
|
||||
@@ -29,6 +31,111 @@ fn configured_voice(
|
||||
}
|
||||
|
||||
impl App {
|
||||
pub(super) async fn persist_realtime_device(
|
||||
&mut self,
|
||||
kind: AudioDeviceKind,
|
||||
name: Option<String>,
|
||||
) {
|
||||
let key = match kind {
|
||||
AudioDeviceKind::Input => "microphone",
|
||||
AudioDeviceKind::Output => "speaker",
|
||||
};
|
||||
self.persist_realtime_audio(key, name.map(Into::into)).await;
|
||||
self.list_realtime_devices(kind);
|
||||
}
|
||||
|
||||
async fn persist_realtime_audio(&mut self, key: &str, value: Option<toml::Value>) {
|
||||
// Audio runs on the TUI's machine, even when the app server is remote.
|
||||
let segments = vec!["audio".to_string(), key.to_string()];
|
||||
let edits = vec![match &value {
|
||||
Some(toml::Value::String(value)) => ConfigEdit::SetPath {
|
||||
segments,
|
||||
value: value.clone().into(),
|
||||
},
|
||||
Some(_) => unreachable!("audio device settings are names"),
|
||||
None => ConfigEdit::ClearPath { segments },
|
||||
}];
|
||||
if let Err(error) =
|
||||
ConfigEditsBuilder::for_config_path(self.local_settings.user_config_path.as_path())
|
||||
.with_edits(edits)
|
||||
.apply()
|
||||
.await
|
||||
{
|
||||
self.chat_widget
|
||||
.add_error_message(format!("Failed to save audio setting: {error}"));
|
||||
return;
|
||||
}
|
||||
match crate::legacy_core::config::load_config_toml_with_layer_stack(
|
||||
self.local_settings.codex_home.as_path(),
|
||||
/*cwd*/ None,
|
||||
self.cli_kv_overrides.clone(),
|
||||
codex_config::ConfigLoadOptions {
|
||||
loader_overrides: self.loader_overrides.clone(),
|
||||
cloud_config_bundle: self.cloud_config_bundle.clone(),
|
||||
..Default::default()
|
||||
},
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(config) => {
|
||||
self.config.config_layer_stack = self
|
||||
.config
|
||||
.config_layer_stack
|
||||
.with_user_layer_from(&config.config_layer_stack);
|
||||
let audio = config.config_toml.audio.unwrap_or_default();
|
||||
let effective = toml::Value::try_from(&audio)
|
||||
.ok()
|
||||
.and_then(|audio| audio.get(key).cloned());
|
||||
self.local_settings.audio = Ok(audio);
|
||||
self.chat_widget.local_settings.audio = self.local_settings.audio.clone();
|
||||
if effective == value {
|
||||
self.chat_widget.add_info_message(
|
||||
"Audio setting saved. Applies to your next voice conversation.".to_string(),
|
||||
/*hint*/ None,
|
||||
);
|
||||
} else {
|
||||
self.chat_widget.add_error_message(
|
||||
"Audio setting was saved but is overridden by another configuration layer."
|
||||
.to_string(),
|
||||
);
|
||||
}
|
||||
}
|
||||
Err(error) => self.chat_widget.add_error_message(format!(
|
||||
"Audio setting was saved, but effective settings could not be read: {error}"
|
||||
)),
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn list_realtime_devices(&self, kind: AudioDeviceKind) {
|
||||
let tx = self.app_event_tx.clone();
|
||||
let origin = self.active_thread_id;
|
||||
tokio::spawn(async move {
|
||||
let result = async {
|
||||
let package = codex_install_context::InstallContext::current()
|
||||
.package_layout
|
||||
.as_ref()
|
||||
.ok_or_else(|| anyhow::anyhow!("voice package unavailable"))?;
|
||||
let mut host = codex_realtime_webrtc::VoiceHost::connect(
|
||||
package,
|
||||
codex_build_info::BuildInfo::get().build_commit(),
|
||||
)
|
||||
.await?;
|
||||
let result = host.list_devices(kind).await;
|
||||
host.close().await?;
|
||||
result
|
||||
}
|
||||
.await;
|
||||
tx.send(AppEvent::RealtimeDevicesListed {
|
||||
origin,
|
||||
kind,
|
||||
result: result.map_err(|_| {
|
||||
"Could not list audio devices. Check your audio device and voice package."
|
||||
.to_owned()
|
||||
}),
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
pub(super) async fn realtime_voices(
|
||||
&self,
|
||||
app_server: &AppServerSession,
|
||||
@@ -63,7 +170,7 @@ impl App {
|
||||
.map(Option::flatten)
|
||||
}
|
||||
|
||||
pub(super) async fn open_realtime_settings(&mut self, app_server: &AppServerSession) {
|
||||
pub(super) async fn open_realtime_voices(&mut self, app_server: &AppServerSession) {
|
||||
let voices = match self.realtime_voices(app_server).await {
|
||||
Ok(voices) => voices,
|
||||
Err(error) => {
|
||||
@@ -73,7 +180,7 @@ impl App {
|
||||
}
|
||||
};
|
||||
match self.effective_realtime_voice(app_server, &voices).await {
|
||||
Ok(voice) => self.chat_widget.open_realtime_settings(voice, voices),
|
||||
Ok(voice) => self.chat_widget.open_realtime_voices(voice, voices),
|
||||
Err(error) => self
|
||||
.chat_widget
|
||||
.add_error_message(format!("Failed to read voice settings: {error}")),
|
||||
|
||||
@@ -7,6 +7,7 @@ use crate::app::tests::session_lifecycle_requests::start_recording_realtime_spee
|
||||
use crate::app::tests::session_lifecycle_requests::start_recording_remote_app_server;
|
||||
use crate::chatwidget::commit_realtime_history_events;
|
||||
use crate::chatwidget::tests::make_chatwidget_manual_with_sender;
|
||||
use crate::local_settings::LocalSettings;
|
||||
use codex_app_server_protocol::ItemCompletedNotification;
|
||||
use codex_app_server_protocol::ItemStartedNotification;
|
||||
use codex_app_server_protocol::ServerNotification;
|
||||
@@ -1832,7 +1833,7 @@ async fn embedded_voice_settings_follow_project_after_thread_switch() -> Result<
|
||||
),
|
||||
);
|
||||
Box::pin(app.select_agent_thread(&mut tui, &mut server, thread_id)).await?;
|
||||
app.open_realtime_settings(&server).await;
|
||||
app.open_realtime_voices(&server).await;
|
||||
let popup = crate::chatwidget::tests::helpers::render_bottom_popup(
|
||||
&app.chat_widget,
|
||||
/*width*/ 80,
|
||||
@@ -1872,7 +1873,7 @@ async fn remote_voice_picker_reads_server_preference() -> Result<()> {
|
||||
app.chat_widget
|
||||
.set_realtime_voice(Some(codex_protocol::protocol::RealtimeVoice::Maple));
|
||||
let (server, requests, proxy) = start_recording_remote_app_server(&app.config).await?;
|
||||
app.open_realtime_settings(&server).await;
|
||||
app.open_realtime_voices(&server).await;
|
||||
assert_eq!(
|
||||
recorded_params(&requests, "thread/realtime/listVoices").len(),
|
||||
1
|
||||
@@ -1906,7 +1907,7 @@ async fn remote_voice_catalog_success_and_failure() -> Result<()> {
|
||||
)
|
||||
.await?;
|
||||
while events.try_recv().is_ok() {}
|
||||
app.open_realtime_settings(&server).await;
|
||||
app.open_realtime_voices(&server).await;
|
||||
let popup = crate::chatwidget::tests::helpers::render_bottom_popup(
|
||||
&app.chat_widget,
|
||||
/*width*/ 80,
|
||||
@@ -2078,3 +2079,123 @@ async fn overridden_voice_save_keeps_effective_voice() -> Result<()> {
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn audio_devices_are_persisted() -> Result<()> {
|
||||
use codex_realtime_webrtc::AudioDeviceKind;
|
||||
let mut app = make_test_app().await;
|
||||
app.persist_realtime_device(AudioDeviceKind::Output, Some("Headphones".into()))
|
||||
.await;
|
||||
app.persist_realtime_device(AudioDeviceKind::Input, Some("Interface".into()))
|
||||
.await;
|
||||
let expected = codex_config::config_toml::RealtimeAudioToml {
|
||||
microphone: Some("Interface".into()),
|
||||
speaker: Some("Headphones".into()),
|
||||
};
|
||||
assert_eq!(app.local_settings.audio.as_ref().unwrap(), &expected);
|
||||
assert_eq!(LocalSettings::from(&app.config).audio, Ok(expected));
|
||||
app.persist_realtime_device(AudioDeviceKind::Input, /*name*/ None)
|
||||
.await;
|
||||
app.persist_realtime_device(AudioDeviceKind::Output, /*name*/ None)
|
||||
.await;
|
||||
assert_eq!(app.local_settings.audio, Ok(Default::default()));
|
||||
assert_eq!(
|
||||
app.chat_widget.local_settings.audio,
|
||||
app.local_settings.audio
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn audio_device_is_machine_local_across_project_and_remote_transitions() -> Result<()> {
|
||||
let mut app = make_test_app().await;
|
||||
let project = tempfile::tempdir()?;
|
||||
let remote = tempfile::tempdir()?;
|
||||
std::fs::create_dir_all(project.path().join(".codex"))?;
|
||||
std::fs::write(
|
||||
project.path().join(".codex/config.toml"),
|
||||
"default_permissions = \"work\"\n[audio]\nmicrophone = \"Project mic\"\n[permissions.work]\nextends = \":workspace\"\n",
|
||||
)?;
|
||||
crate::legacy_core::config::set_project_trust_level(
|
||||
&app.config.codex_home,
|
||||
project.path(),
|
||||
codex_protocol::config_types::TrustLevel::Trusted,
|
||||
)
|
||||
.map_err(|error| color_eyre::eyre::eyre!(error.to_string()))?;
|
||||
app.cli_kv_overrides = vec![("default_permissions".into(), "work".into())];
|
||||
app.config = app.rebuild_config_for_cwd(project.path().into()).await?;
|
||||
app.app_server_target = AppServerTarget::Remote {
|
||||
endpoint: crate::resolve_remote_addr("ws://127.0.0.1:9")?,
|
||||
};
|
||||
app.chat_widget
|
||||
.handle_thread_session_quiet(test_thread_session(
|
||||
ThreadId::new(),
|
||||
remote.path().to_path_buf(),
|
||||
));
|
||||
app.persist_realtime_device(
|
||||
codex_realtime_webrtc::AudioDeviceKind::Input,
|
||||
Some("Machine mic".into()),
|
||||
)
|
||||
.await;
|
||||
app.cli_kv_overrides.clear();
|
||||
assert_eq!(
|
||||
LocalSettings::from(&app.config).audio,
|
||||
app.local_settings.audio
|
||||
);
|
||||
for cwd in [project.path(), remote.path()] {
|
||||
let config = app.rebuild_config_for_cwd(cwd.to_path_buf()).await?;
|
||||
let reloaded = app.local_settings.reloaded(&config);
|
||||
assert_eq!(reloaded.audio, app.chat_widget.local_settings.audio);
|
||||
assert_eq!(
|
||||
reloaded.audio.as_ref().unwrap().microphone.as_deref(),
|
||||
Some("Machine mic")
|
||||
);
|
||||
}
|
||||
// A project value must not hide invalid machine audio.
|
||||
std::fs::write(
|
||||
app.local_settings.user_config_path.as_path(),
|
||||
std::fs::read_to_string(app.local_settings.user_config_path.as_path())?
|
||||
.replace("microphone = \"Machine mic\"", "microphone = 0"),
|
||||
)?;
|
||||
let config = app
|
||||
.rebuild_config_for_cwd(project.path().to_path_buf())
|
||||
.await?;
|
||||
app.chat_widget.local_settings = app.local_settings.reloaded(&config);
|
||||
assert!(app.chat_widget.local_settings.audio.is_err());
|
||||
app.chat_widget.open_realtime_sound_devices();
|
||||
assert!(!app.chat_widget.has_active_view());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn microphone_discovery_ignores_another_threads_completion() -> Result<()> {
|
||||
let (mut app, _events, _ops) = make_test_app_with_channels().await;
|
||||
let (mut server, _requests, proxy) = start_recording_remote_app_server(&app.config).await?;
|
||||
let mut tui = crate::tui::test_support::make_test_tui()?;
|
||||
app.active_thread_id = Some(ThreadId::new());
|
||||
for origin in [Some(ThreadId::new()), app.active_thread_id] {
|
||||
let result = Ok(vec![codex_realtime_webrtc::AudioDevice {
|
||||
name: "Interface".into(),
|
||||
channels: 16,
|
||||
is_default: true,
|
||||
}]);
|
||||
Box::pin(app.handle_event(
|
||||
&mut tui,
|
||||
&mut server,
|
||||
AppEvent::RealtimeDevicesListed {
|
||||
origin,
|
||||
kind: codex_realtime_webrtc::AudioDeviceKind::Input,
|
||||
result,
|
||||
},
|
||||
))
|
||||
.await?;
|
||||
assert_eq!(
|
||||
app.chat_widget.has_active_view(),
|
||||
origin == app.active_thread_id
|
||||
);
|
||||
}
|
||||
server.shutdown().await?;
|
||||
proxy.await??;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
+1
@@ -9,5 +9,6 @@ expression: popup
|
||||
› 1. maple (current)
|
||||
2. cove
|
||||
3. juniper
|
||||
4. Back
|
||||
|
||||
enter select · esc back
|
||||
|
||||
@@ -1220,6 +1220,20 @@ pub(crate) enum AppEvent {
|
||||
|
||||
/// Read the owning server preference before showing the voice picker.
|
||||
OpenRealtimeSettings,
|
||||
OpenRealtimeSoundDevices,
|
||||
OpenRealtimeVoices,
|
||||
OpenRealtimeDevicePicker {
|
||||
kind: codex_realtime_webrtc::AudioDeviceKind,
|
||||
},
|
||||
RealtimeDevicesListed {
|
||||
origin: Option<ThreadId>,
|
||||
kind: codex_realtime_webrtc::AudioDeviceKind,
|
||||
result: Result<Vec<codex_realtime_webrtc::AudioDevice>, String>,
|
||||
},
|
||||
PersistRealtimeDevice {
|
||||
kind: codex_realtime_webrtc::AudioDeviceKind,
|
||||
name: Option<String>,
|
||||
},
|
||||
|
||||
/// Save the voice for subsequent conversations through the app server.
|
||||
PersistRealtimeVoiceSelection {
|
||||
|
||||
@@ -312,6 +312,9 @@ impl ChatWidget {
|
||||
}
|
||||
|
||||
fn start_realtime_conversation(&mut self, thread_id: ThreadId) {
|
||||
let Some(audio) = self.realtime_audio_settings() else {
|
||||
return;
|
||||
};
|
||||
self.realtime_conversation.recover_late_transcripts = false;
|
||||
self.realtime_conversation.attempt_id =
|
||||
NEXT_REALTIME_ATTEMPT_ID.fetch_add(1, Ordering::Relaxed);
|
||||
@@ -322,9 +325,13 @@ impl ChatWidget {
|
||||
self.realtime_conversation.phase = RealtimeConversationPhase::Starting;
|
||||
self.update_realtime_footer();
|
||||
let app_event_tx = self.app_event_tx.clone();
|
||||
let selection = codex_realtime_webrtc::AudioDeviceSelection {
|
||||
microphone: audio.microphone,
|
||||
speaker: audio.speaker,
|
||||
};
|
||||
std::thread::spawn(move || {
|
||||
let result =
|
||||
RealtimeWebrtcSession::start(abort_registration).map_err(|error| error.to_string());
|
||||
let result = RealtimeWebrtcSession::start(abort_registration, selection)
|
||||
.map_err(|error| error.to_string());
|
||||
app_event_tx.send(AppEvent::RealtimeWebrtcOfferCreated {
|
||||
thread_id,
|
||||
attempt_id,
|
||||
|
||||
@@ -1,17 +1,62 @@
|
||||
//! Voice selection for subsequent conversations; saving never interrupts live audio.
|
||||
//! Voice settings hierarchy with parent navigation; selections apply to subsequent conversations.
|
||||
|
||||
use super::*;
|
||||
use codex_protocol::protocol::RealtimeVoice;
|
||||
use codex_protocol::protocol::RealtimeVoicesList;
|
||||
use codex_realtime_webrtc::AudioDevice;
|
||||
use codex_realtime_webrtc::AudioDeviceKind;
|
||||
|
||||
fn back_item(parent: fn() -> AppEvent) -> SelectionItem {
|
||||
SelectionItem {
|
||||
name: "Back".to_string(),
|
||||
actions: vec![Box::new(move |tx| tx.send(parent()))],
|
||||
dismiss_on_select: true,
|
||||
..Default::default()
|
||||
}
|
||||
}
|
||||
|
||||
impl ChatWidget {
|
||||
pub(crate) fn open_realtime_settings(
|
||||
pub(super) fn realtime_audio_settings(
|
||||
&mut self,
|
||||
) -> Option<codex_config::config_toml::RealtimeAudioToml> {
|
||||
match self.local_settings.audio.clone() {
|
||||
Ok(audio) => Some(audio),
|
||||
Err(error) => {
|
||||
self.add_error_message(error);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn open_realtime_settings(&mut self) {
|
||||
self.bottom_pane.show_selection_view(SelectionViewParams {
|
||||
title: Some("Voice settings".to_string()),
|
||||
items: vec![
|
||||
SelectionItem {
|
||||
name: "Set sound devices".to_string(),
|
||||
actions: vec![Box::new(|tx| tx.send(AppEvent::OpenRealtimeSoundDevices))],
|
||||
dismiss_on_select: true,
|
||||
..Default::default()
|
||||
},
|
||||
SelectionItem {
|
||||
name: "Choose a voice".to_string(),
|
||||
actions: vec![Box::new(|tx| tx.send(AppEvent::OpenRealtimeVoices))],
|
||||
dismiss_on_select: true,
|
||||
..Default::default()
|
||||
},
|
||||
],
|
||||
footer_hint: Some(standard_popup_hint_line()),
|
||||
..SelectionViewParams::picker()
|
||||
});
|
||||
}
|
||||
|
||||
pub(crate) fn open_realtime_voices(
|
||||
&mut self,
|
||||
current: Option<RealtimeVoice>,
|
||||
voices: RealtimeVoicesList,
|
||||
) {
|
||||
// The TUI uses V3, which shares the V1 voice catalog.
|
||||
let items = voices
|
||||
let mut items: Vec<SelectionItem> = voices
|
||||
.v1
|
||||
.into_iter()
|
||||
.map(|voice| SelectionItem {
|
||||
@@ -24,11 +69,101 @@ impl ChatWidget {
|
||||
..Default::default()
|
||||
})
|
||||
.collect();
|
||||
items.push(back_item(|| AppEvent::OpenRealtimeSettings));
|
||||
self.bottom_pane.show_selection_view(SelectionViewParams {
|
||||
title: Some("Select voice".to_string()),
|
||||
subtitle: Some("Applies to your next voice conversation.".to_string()),
|
||||
footer_hint: Some(standard_popup_hint_line()),
|
||||
items,
|
||||
on_cancel: Some(Box::new(|tx| tx.send(AppEvent::OpenRealtimeSettings))),
|
||||
..SelectionViewParams::picker()
|
||||
});
|
||||
}
|
||||
|
||||
pub(crate) fn open_realtime_sound_devices(&mut self) {
|
||||
let Some(audio) = self.realtime_audio_settings() else {
|
||||
return;
|
||||
};
|
||||
let mut items = Vec::new();
|
||||
for (kind, label, selected) in [
|
||||
(AudioDeviceKind::Input, "Input device", audio.microphone),
|
||||
(AudioDeviceKind::Output, "Output device", audio.speaker),
|
||||
] {
|
||||
items.push(SelectionItem {
|
||||
name: label.into(),
|
||||
description: Some(selected.unwrap_or_else(|| "System default".into())),
|
||||
actions: vec![Box::new(move |tx| {
|
||||
tx.send(AppEvent::OpenRealtimeDevicePicker { kind })
|
||||
})],
|
||||
dismiss_on_select: true,
|
||||
..Default::default()
|
||||
});
|
||||
}
|
||||
items.push(back_item(|| AppEvent::OpenRealtimeSettings));
|
||||
self.bottom_pane.show_selection_view(SelectionViewParams {
|
||||
title: Some("Sound devices".to_string()),
|
||||
subtitle: Some("Applies to your next voice conversation.".into()),
|
||||
footer_hint: Some(standard_popup_hint_line()),
|
||||
items,
|
||||
on_cancel: Some(Box::new(|tx| tx.send(AppEvent::OpenRealtimeSettings))),
|
||||
..SelectionViewParams::picker()
|
||||
});
|
||||
}
|
||||
|
||||
pub(crate) fn open_realtime_device_picker(
|
||||
&mut self,
|
||||
kind: AudioDeviceKind,
|
||||
devices: Vec<AudioDevice>,
|
||||
) {
|
||||
let Some(audio) = self.realtime_audio_settings() else {
|
||||
return;
|
||||
};
|
||||
let (title, current) = match kind {
|
||||
AudioDeviceKind::Input => ("Input device", audio.microphone),
|
||||
AudioDeviceKind::Output => ("Output device", audio.speaker),
|
||||
};
|
||||
let ambiguous: std::collections::HashSet<_> = devices
|
||||
.iter()
|
||||
.filter(|device| {
|
||||
devices
|
||||
.iter()
|
||||
.filter(|other| other.name == device.name)
|
||||
.count()
|
||||
> 1
|
||||
})
|
||||
.map(|device| device.name.clone())
|
||||
.collect();
|
||||
let mut items: Vec<SelectionItem> = std::iter::once(/*value*/ None)
|
||||
.chain(devices.into_iter().map(Some))
|
||||
.map(|device| {
|
||||
let name = device.map(|device| device.name);
|
||||
let is_current = name == current;
|
||||
let disabled_reason = name
|
||||
.as_ref()
|
||||
.filter(|name| ambiguous.contains(*name))
|
||||
.map(|_| "Identical device names; use System default.".into());
|
||||
SelectionItem {
|
||||
name: name.clone().unwrap_or_else(|| "System default".into()),
|
||||
is_current,
|
||||
disabled_reason,
|
||||
actions: vec![Box::new(move |tx| {
|
||||
tx.send(AppEvent::PersistRealtimeDevice {
|
||||
kind,
|
||||
name: name.clone(),
|
||||
})
|
||||
})],
|
||||
dismiss_on_select: true,
|
||||
..Default::default()
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
items.push(back_item(|| AppEvent::OpenRealtimeSoundDevices));
|
||||
self.bottom_pane.show_selection_view(SelectionViewParams {
|
||||
title: Some(title.into()),
|
||||
subtitle: Some("Applies to your next voice conversation.".into()),
|
||||
items,
|
||||
footer_hint: Some(standard_popup_hint_line()),
|
||||
on_cancel: Some(Box::new(|tx| tx.send(AppEvent::OpenRealtimeSoundDevices))),
|
||||
..SelectionViewParams::picker()
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//! Voice picker rendering and selection routing without audio hardware.
|
||||
//! Voice settings hierarchy, parent navigation and selection routing without audio hardware.
|
||||
|
||||
use super::*;
|
||||
use crate::chatwidget::tests::make_chatwidget_manual_with_sender;
|
||||
@@ -21,8 +21,18 @@ async fn voice_settings_selects_a_voice_without_starting_audio() {
|
||||
std::iter::from_fn(|| events.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::OpenRealtimeSettings))
|
||||
);
|
||||
chat.open_realtime_settings(Some(RealtimeVoice::Maple), RealtimeVoicesList::builtin());
|
||||
chat.open_realtime_settings();
|
||||
insta::assert_snapshot!("voice_settings", render_bottom_popup(&chat, /*width*/ 80));
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Down, KeyModifiers::NONE));
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
|
||||
assert!(
|
||||
std::iter::from_fn(|| events.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::OpenRealtimeVoices))
|
||||
);
|
||||
chat.open_realtime_voices(Some(RealtimeVoice::Maple), RealtimeVoicesList::builtin());
|
||||
insta::assert_snapshot!("voice_choices", render_bottom_popup(&chat, /*width*/ 80));
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Home, KeyModifiers::NONE));
|
||||
chat.bottom_pane
|
||||
@@ -57,7 +67,7 @@ async fn saved_voice_confirmation_snapshot() {
|
||||
#[tokio::test]
|
||||
async fn voice_settings_uses_server_catalog() {
|
||||
let (mut chat, _sender, _events, _ops) = make_chatwidget_manual_with_sender().await;
|
||||
chat.open_realtime_settings(
|
||||
chat.open_realtime_voices(
|
||||
Some(RealtimeVoice::Cove),
|
||||
RealtimeVoicesList {
|
||||
v1: vec![RealtimeVoice::Cove, RealtimeVoice::Maple],
|
||||
@@ -69,3 +79,148 @@ async fn voice_settings_uses_server_catalog() {
|
||||
render_bottom_popup(&chat, /*width*/ 80)
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn sound_devices_picker_routes_selection_without_starting_audio() {
|
||||
let (mut chat, _sender, mut events, mut ops) = make_chatwidget_manual_with_sender().await;
|
||||
chat.local_settings.audio.as_mut().unwrap().microphone =
|
||||
Some("Zen Go Synergy Core Playback".to_string());
|
||||
chat.open_realtime_settings();
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
|
||||
assert!(
|
||||
std::iter::from_fn(|| events.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::OpenRealtimeSoundDevices))
|
||||
);
|
||||
chat.open_realtime_sound_devices();
|
||||
insta::assert_snapshot!(
|
||||
"voice_settings_input_channel",
|
||||
render_bottom_popup(&chat, /*width*/ 90)
|
||||
);
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Home, KeyModifiers::NONE));
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
|
||||
assert!(
|
||||
std::iter::from_fn(|| events.try_recv().ok()).any(|event| matches!(
|
||||
event,
|
||||
AppEvent::OpenRealtimeDevicePicker {
|
||||
kind: AudioDeviceKind::Input
|
||||
}
|
||||
))
|
||||
);
|
||||
assert!(ops.try_recv().is_err());
|
||||
assert!(!chat.realtime_conversation_is_running());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn submenus_return_to_their_parent_with_back_or_escape() {
|
||||
let (mut chat, _sender, mut events, mut ops) = make_chatwidget_manual_with_sender().await;
|
||||
type OpenMenu = fn(&mut ChatWidget);
|
||||
let menus: [OpenMenu; 2] = [
|
||||
|chat| chat.open_realtime_voices(/*current*/ None, RealtimeVoicesList::builtin()),
|
||||
ChatWidget::open_realtime_sound_devices,
|
||||
];
|
||||
for open in menus {
|
||||
for key in [KeyCode::Esc, KeyCode::Enter] {
|
||||
while events.try_recv().is_ok() {}
|
||||
open(&mut chat);
|
||||
if key == KeyCode::Enter {
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::End, KeyModifiers::NONE));
|
||||
}
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(key, KeyModifiers::NONE));
|
||||
assert!(
|
||||
std::iter::from_fn(|| events.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::OpenRealtimeSettings))
|
||||
);
|
||||
}
|
||||
}
|
||||
assert!(ops.try_recv().is_err());
|
||||
assert!(!chat.realtime_conversation_is_running());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn device_pickers_route_selection() {
|
||||
let (mut chat, _sender, mut events, mut ops) = make_chatwidget_manual_with_sender().await;
|
||||
for (kind, channels, microphone, snapshot) in [
|
||||
(
|
||||
AudioDeviceKind::Input,
|
||||
2,
|
||||
None,
|
||||
"voice_stereo_input_devices",
|
||||
),
|
||||
(
|
||||
AudioDeviceKind::Input,
|
||||
4,
|
||||
None,
|
||||
"voice_multichannel_input_devices",
|
||||
),
|
||||
(
|
||||
AudioDeviceKind::Input,
|
||||
4,
|
||||
Some("Audio interface".into()),
|
||||
"voice_multichannel_selected_input_devices",
|
||||
),
|
||||
(AudioDeviceKind::Output, 4, None, "voice_output_devices"),
|
||||
] {
|
||||
chat.local_settings.audio.as_mut().unwrap().microphone = microphone;
|
||||
let device = AudioDevice {
|
||||
name: "Audio interface".into(),
|
||||
channels,
|
||||
is_default: true,
|
||||
};
|
||||
let devices = vec![
|
||||
device.clone(),
|
||||
AudioDevice {
|
||||
name: "Other device".into(),
|
||||
channels: 2,
|
||||
is_default: false,
|
||||
},
|
||||
];
|
||||
chat.open_realtime_device_picker(kind, devices.clone());
|
||||
insta::assert_snapshot!(snapshot, render_bottom_popup(&chat, /*width*/ 80));
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Char('2'), KeyModifiers::NONE));
|
||||
let selected =
|
||||
std::iter::from_fn(|| events.try_recv().ok()).find_map(|event| match event {
|
||||
AppEvent::PersistRealtimeDevice { kind, name } => Some((kind, name)),
|
||||
_ => None,
|
||||
});
|
||||
assert_eq!(selected, Some((kind, Some(device.name.clone()))));
|
||||
chat.open_realtime_device_picker(kind, devices);
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Char('4'), KeyModifiers::NONE));
|
||||
assert!(
|
||||
std::iter::from_fn(|| events.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::OpenRealtimeSoundDevices))
|
||||
);
|
||||
}
|
||||
assert!(ops.try_recv().is_err());
|
||||
assert!(!chat.realtime_conversation_is_running());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn ambiguous_device_names_cannot_select_the_wrong_device() {
|
||||
let (mut chat, _sender, mut events, _ops) = make_chatwidget_manual_with_sender().await;
|
||||
let devices = [2, 4]
|
||||
.map(|channels| AudioDevice {
|
||||
name: "USB microphone".into(),
|
||||
channels,
|
||||
is_default: false,
|
||||
})
|
||||
.to_vec();
|
||||
chat.open_realtime_device_picker(AudioDeviceKind::Input, devices);
|
||||
insta::assert_snapshot!(
|
||||
"voice_ambiguous_input_devices",
|
||||
render_bottom_popup(&chat, /*width*/ 80)
|
||||
);
|
||||
while events.try_recv().is_ok() {}
|
||||
chat.bottom_pane
|
||||
.handle_key_event(KeyEvent::new(KeyCode::Char('2'), KeyModifiers::NONE));
|
||||
assert!(
|
||||
!std::iter::from_fn(|| events.try_recv().ok())
|
||||
.any(|event| matches!(event, AppEvent::PersistRealtimeDevice { .. }))
|
||||
);
|
||||
}
|
||||
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Input device
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
› 1. System default (current)
|
||||
USB microphone (disabled) Identical device names; use System default.
|
||||
USB microphone (disabled) Identical device names; use System default.
|
||||
2. Back
|
||||
|
||||
enter select · esc back
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Select voice
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
1. juniper
|
||||
› 2. maple (current)
|
||||
3. spruce
|
||||
4. ember
|
||||
5. vale
|
||||
6. breeze
|
||||
7. arbor
|
||||
8. sol
|
||||
↓
|
||||
enter select · esc back
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Input device
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
› 1. System default (current)
|
||||
2. Audio interface
|
||||
3. Other device
|
||||
4. Back
|
||||
|
||||
enter select · esc back
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Input device
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
1. System default
|
||||
› 2. Audio interface (current)
|
||||
3. Other device
|
||||
4. Back
|
||||
|
||||
enter select · esc back
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Output device
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
› 1. System default (current)
|
||||
2. Audio interface
|
||||
3. Other device
|
||||
4. Back
|
||||
|
||||
enter select · esc back
|
||||
+4
-11
@@ -2,17 +2,10 @@
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Select voice
|
||||
Applies to your next voice conversation.
|
||||
Voice settings
|
||||
|
||||
|
||||
1. juniper
|
||||
› 2. maple (current)
|
||||
3. spruce
|
||||
4. ember
|
||||
5. vale
|
||||
6. breeze
|
||||
7. arbor
|
||||
8. sol
|
||||
↓
|
||||
› 1. Set sound devices
|
||||
2. Choose a voice
|
||||
|
||||
enter select · esc back
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 90)"
|
||||
---
|
||||
Sound devices
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
› 1. Input device Zen Go Synergy Core Playback
|
||||
2. Output device System default
|
||||
3. Back
|
||||
|
||||
enter select · esc back
|
||||
+1
@@ -8,5 +8,6 @@ expression: "render_bottom_popup(&chat, 80)"
|
||||
|
||||
› 1. cove (current)
|
||||
2. maple
|
||||
3. Back
|
||||
|
||||
enter select · esc back
|
||||
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
---
|
||||
source: tui/src/chatwidget/realtime_settings_tests.rs
|
||||
expression: "render_bottom_popup(&chat, 80)"
|
||||
---
|
||||
Input device
|
||||
Applies to your next voice conversation.
|
||||
|
||||
|
||||
› 1. System default (current)
|
||||
2. Audio interface
|
||||
3. Other device
|
||||
4. Back
|
||||
|
||||
enter select · esc back
|
||||
@@ -3,6 +3,7 @@
|
||||
//! The resolved core config is a temporary input at local load/reload boundaries. Server thread
|
||||
//! responses must never refresh these values; live preference changes belong here. The remaining
|
||||
//! Config-based lifecycle adapters also use this conversion until their interfaces are migrated.
|
||||
//! Audio preferences exclude project layers so thread cwd cannot route local capture.
|
||||
//! Effective animations also respect the TUI host's launch-time accessibility preference.
|
||||
//! The selected transcript ownership and alternate-screen restrictions survive local reloads.
|
||||
|
||||
@@ -20,6 +21,7 @@ use codex_utils_absolute_path::AbsolutePathBuf;
|
||||
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub(crate) struct LocalSettings {
|
||||
pub(crate) audio: Result<codex_config::config_toml::RealtimeAudioToml, String>,
|
||||
pub(crate) tui: Tui,
|
||||
pub(crate) transcript_mode: TranscriptMode,
|
||||
pub(crate) history: History,
|
||||
@@ -56,7 +58,18 @@ impl LocalSettings {
|
||||
} else {
|
||||
config.animations
|
||||
};
|
||||
let mut audio = toml::Value::Table(Default::default());
|
||||
for layer in config.config_layer_stack.layers_low_to_high() {
|
||||
if !matches!(layer.name, codex_config::ConfigLayerSource::Project { .. })
|
||||
&& let Some(value) = layer.config.get("audio")
|
||||
{
|
||||
codex_config::merge_toml_values(&mut audio, value);
|
||||
}
|
||||
}
|
||||
Self {
|
||||
audio: audio.try_into().map_err(|error: toml::de::Error| {
|
||||
format!("Invalid machine audio settings: {error}")
|
||||
}),
|
||||
transcript_mode: TranscriptMode::resolve(
|
||||
config.tui_fullscreen_transcript,
|
||||
config.tui_alternate_screen != codex_config::types::AltScreenMode::Never,
|
||||
|
||||
Reference in New Issue
Block a user