fix(voice): retain STT environment configuration

Author: johnmatthewtennant

src-tauri/src/commands/openai_audio.rs

@@ -113,6 +113,7 @@ enum OpenAiStreamCommand {
 pub struct OpenAiVoiceStatus {
     stt_configured: bool,
     tts_configured: bool,
+    stt_configuration_source: OpenAiVoiceConfigurationSource,
     tts_configuration_source: OpenAiVoiceConfigurationSource,
     stt_unavailable_reason: Option<String>,
     tts_unavailable_reason: Option<String>,
@@ -254,6 +255,17 @@ fn tts_configuration_source() -> OpenAiVoiceConfigurationSource {
     }
 }
 
+fn stt_configuration_source() -> OpenAiVoiceConfigurationSource {
+    if [BASE_URL_ENV, STT_MODEL_ENV]
+        .iter()
+        .any(|name| env_trimmed(name).is_some())
+    {
+        OpenAiVoiceConfigurationSource::Environment
+    } else {
+        OpenAiVoiceConfigurationSource::Default
+    }
+}
+
 fn endpoint(path: &str) -> Result<String, String> {
     endpoint_for_base_url(&base_url()?, path)
 }
@@ -343,6 +355,7 @@ pub async fn get_openai_voice_status(
     Ok(OpenAiVoiceStatus {
         stt_configured,
         tts_configured,
+        stt_configuration_source: stt_configuration_source(),
         tts_configuration_source: tts_configuration_source(),
         stt_unavailable_reason: stt_error,
         tts_unavailable_reason: tts_error,
@@ -1302,6 +1315,7 @@ mod tests {
     #[test]
     fn voice_configuration_uses_berd_scoped_environment_names() {
         assert_eq!(BASE_URL_ENV, "BERD_OPENAI_VOICE_BASE_URL");
+        assert_eq!(STT_MODEL_ENV, "BERD_OPENAI_STT_MODEL");
         assert_eq!(TTS_MODEL_ENV, "BERD_OPENAI_TTS_MODEL");
         assert_eq!(TTS_VOICE_ENV, "BERD_OPENAI_TTS_VOICE");
     }

src-tauri/src/commands/openai_voice_credentials.rs

@@ -95,6 +95,7 @@ pub(crate) fn clear(credential: OpenAiVoiceCredential) -> Result<(), String> {
         || clear_account(LEGACY_TTS_KEYCHAIN_ACCOUNT),
     )
 }
+
 pub(crate) fn require(credential: OpenAiVoiceCredential) -> Result<String, String> {
     read(credential)?.ok_or_else(|| credential.missing_message().to_string())
 }

src/features/voice-conversation/api/openAiVoice.ts

@@ -9,6 +9,7 @@ import type {
 export interface OpenAiVoiceStatus {
   sttConfigured: boolean;
   ttsConfigured: boolean;
+  sttConfigurationSource: "default" | "environment";
   ttsConfigurationSource: "default" | "environment";
   sttUnavailableReason: string | null;
   ttsUnavailableReason: string | null;

src/features/voice-conversation/hooks/useOpenAiVoiceSetup.test.tsx

@@ -35,6 +35,7 @@ function status(configured: boolean): OpenAiVoiceStatus {
   return {
     sttConfigured: configured,
     ttsConfigured: configured,
+    sttConfigurationSource: "default",
     ttsConfigurationSource: "default",
     sttUnavailableReason: null,
     ttsUnavailableReason: null,

src/features/voice-conversation/ui/VoiceSettings.test.tsx

@@ -54,6 +54,7 @@ const openAiStatusState = vi.hoisted(() => ({
   current: {
     sttConfigured: true,
     ttsConfigured: true,
+    sttConfigurationSource: "default" as "default" | "environment",
     ttsConfigurationSource: "default" as "default" | "environment",
     sttUnavailableReason: null,
     ttsUnavailableReason: null,
@@ -228,6 +229,7 @@ describe("VoiceSettings", () => {
     openAiStatusState.current = {
       sttConfigured: true,
       ttsConfigured: true,
+      sttConfigurationSource: "default",
       ttsConfigurationSource: "default",
       sttUnavailableReason: null,
       ttsUnavailableReason: null,
@@ -295,19 +297,20 @@ describe("VoiceSettings", () => {
     ).toBeInTheDocument();
   });
 
-  it("saves a dedicated OpenAI speech-to-text API key", async () => {
+  it("labels speech-to-text environment overrides", async () => {
     inputState.backend = "openai";
-    setupState.current = setup(pocketStatus({ pocketInstalled: true }));
+    openAiStatusState.current = {
+      ...openAiStatusState.current,
+      sttConfigurationSource: "environment",
+    };
+    setupState.current = setup(pocketStatus());
     renderWithProviders(<VoiceSettings />);
 
-    const user = userEvent.setup();
-    await user.type(
-      screen.getByLabelText("OpenAI speech-to-text API key"),
-      "stt-secret",
-    );
-    await user.click(screen.getAllByRole("button", { name: "Save key" })[0]);
-
-    expect(openAiApiMocks.setSttApiKey).toHaveBeenCalledWith("stt-secret");
+    expect(
+      await screen.findByText(
+        "Development configuration is overridden by the Berd process environment.",
+      ),
+    ).toBeInTheDocument();
   });
 
   it("saves the shared OpenAI voice key from the text-to-speech settings", async () => {

src/features/voice-conversation/ui/VoiceSettings.tsx

@@ -247,6 +247,11 @@ export function VoiceSettings() {
                         : t("voice.openAiSttNotConfigured")
                       : t("voice.openAiChecking"))}
                 </p>
+                {openAiStatus?.sttConfigurationSource === "environment" ? (
+                  <p className="text-xs text-muted-foreground">
+                    {t("voice.openAiEnvironmentOverride")}
+                  </p>
+                ) : null}
               </div>
             ) : input.backend === "macos" ? (
               <MacSpeechSettings setup={macSpeechSetup} />