Fix Zhipu ASR endpoint handling

Author: H-Chris233

openless-all/app/src-tauri/src/asr/whisper.rs

@@ -101,8 +101,7 @@ impl WhisperBatchASR {
             .map(|chunk| i16::from_le_bytes([chunk[0], chunk[1]]))
             .collect();
         let wav = encode_wav_16k_mono(&samples);
-        let base_url = self.base_url.trim_end_matches('/');
-        let url = format!("{}/audio/transcriptions", base_url);
+        let url = transcription_url(&self.base_url)?;
 
         let wav_part = reqwest::multipart::Part::bytes(wav)
             .file_name("audio.wav")
@@ -173,6 +172,23 @@ fn split_pcm_by_duration(pcm: &[u8], max_chunk_duration_ms: Option<u64>) -> Vec<
     pcm.chunks(bytes_per_chunk).collect()
 }
 
+fn transcription_url(base_url: &str) -> Result<String> {
+    let parsed = reqwest::Url::parse(base_url.trim()).context("parse Whisper base URL")?;
+    let mut url = parsed.clone();
+    let path = parsed.path().trim_end_matches('/');
+    let next_path = if path.ends_with("/audio/transcriptions") {
+        path.to_string()
+    } else if path.ends_with("/audio") {
+        format!("{path}/transcriptions")
+    } else if let Some(prefix) = path.strip_suffix("/chat/completions") {
+        format!("{prefix}/audio/transcriptions")
+    } else {
+        format!("{path}/audio/transcriptions")
+    };
+    url.set_path(&next_path);
+    Ok(url.to_string())
+}
+
 fn join_transcript_chunks(chunks: &[String]) -> String {
     let mut joined = String::new();
     for chunk in chunks.iter().map(|chunk| chunk.trim()) {
@@ -462,6 +478,29 @@ mod tests {
         assert_eq!(split_pcm_by_duration(&pcm, Some(0)), vec![pcm.as_slice()]);
     }
 
+    #[test]
+    fn transcription_url_accepts_base_audio_or_full_endpoint() {
+        assert_eq!(
+            transcription_url("https://open.bigmodel.cn/api/paas/v4").unwrap(),
+            "https://open.bigmodel.cn/api/paas/v4/audio/transcriptions"
+        );
+        assert_eq!(
+            transcription_url("https://open.bigmodel.cn/api/paas/v4/audio").unwrap(),
+            "https://open.bigmodel.cn/api/paas/v4/audio/transcriptions"
+        );
+        assert_eq!(
+            transcription_url("https://open.bigmodel.cn/api/paas/v4/audio/transcriptions").unwrap(),
+            "https://open.bigmodel.cn/api/paas/v4/audio/transcriptions"
+        );
+        assert_eq!(
+            transcription_url(
+                "https://open.bigmodel.cn/api/paas/v4/audio/transcriptions?api-version=2026-01-01"
+            )
+            .unwrap(),
+            "https://open.bigmodel.cn/api/paas/v4/audio/transcriptions?api-version=2026-01-01"
+        );
+    }
+
     #[test]
     fn join_transcript_chunks_skips_empty_chunks() {
         let chunks = vec![" hello ".to_string(), "".to_string(), "world".to_string()];
@@ -571,6 +610,7 @@ mod tests {
                         Err(err) => panic!("accept ASR test request failed: {err}"),
                     }
                 };
+                stream.set_nonblocking(false).unwrap();
                 stream
                     .set_read_timeout(Some(Duration::from_secs(5)))
                     .unwrap();

openless-all/app/src-tauri/src/coordinator.rs

@@ -79,6 +79,13 @@ enum CapsuleShowStrategy {
     FallbackShow,
 }
 
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum CapsuleWindowAction {
+    Show,
+    Hide,
+    Ignore,
+}
+
 fn capsule_show_strategy_for_platform() -> CapsuleShowStrategy {
     // ⚠️ 如果改下面的 cfg 列表，**必须**同步更新单元测试
     // `capsule_show_strategy_matches_platform_activation_contract` 的两组 cfg —
@@ -112,6 +119,30 @@ fn capsule_state_log_name(state: CapsuleState) -> &'static str {
     }
 }
 
+fn capsule_window_action(state: CapsuleState, show_capsule: bool) -> CapsuleWindowAction {
+    #[cfg(target_os = "linux")]
+    {
+        let _ = show_capsule;
+        if matches!(state, CapsuleState::Error) {
+            return CapsuleWindowAction::Show;
+        }
+        if matches!(state, CapsuleState::Idle) {
+            return CapsuleWindowAction::Hide;
+        }
+        return CapsuleWindowAction::Ignore;
+    }
+
+    #[cfg(not(target_os = "linux"))]
+    {
+        let visible = !matches!(state, CapsuleState::Idle);
+        if show_capsule && visible {
+            CapsuleWindowAction::Show
+        } else {
+            CapsuleWindowAction::Hide
+        }
+    }
+}
+
 fn show_capsule_window_for_recording<R: tauri::Runtime>(
     app: &AppHandle<R>,
     window: &tauri::WebviewWindow<R>,
@@ -3788,6 +3819,45 @@ mod tests {
         );
     }
 
+    #[test]
+    fn capsule_window_action_keeps_linux_errors_visible_without_showing_recording() {
+        #[cfg(target_os = "linux")]
+        {
+            assert_eq!(
+                capsule_window_action(CapsuleState::Recording, true),
+                CapsuleWindowAction::Ignore
+            );
+            assert_eq!(
+                capsule_window_action(CapsuleState::Transcribing, true),
+                CapsuleWindowAction::Ignore
+            );
+            assert_eq!(
+                capsule_window_action(CapsuleState::Error, false),
+                CapsuleWindowAction::Show
+            );
+            assert_eq!(
+                capsule_window_action(CapsuleState::Idle, false),
+                CapsuleWindowAction::Hide
+            );
+        }
+
+        #[cfg(not(target_os = "linux"))]
+        {
+            assert_eq!(
+                capsule_window_action(CapsuleState::Recording, true),
+                CapsuleWindowAction::Show
+            );
+            assert_eq!(
+                capsule_window_action(CapsuleState::Error, false),
+                CapsuleWindowAction::Hide
+            );
+            assert_eq!(
+                capsule_window_action(CapsuleState::Idle, true),
+                CapsuleWindowAction::Hide
+            );
+        }
+    }
+
     #[test]
     #[cfg(target_os = "windows")]
     fn prepared_windows_ime_slot_is_taken_only_for_matching_session() {
@@ -4480,10 +4550,8 @@ fn emit_capsule(
             return;
         };
         let show_capsule = inner_for_main.prefs.get().show_capsule;
-        // Linux: 不操作胶囊窗口（不 show/hide，不 reposition）。
-        // 文字通过 fcitx5 插件直接 commit，用户始终在目标 app 中。
-        #[cfg(target_os = "linux")]
-        {
+        let window_action = capsule_window_action(state, show_capsule);
+        if matches!(window_action, CapsuleWindowAction::Ignore) {
             return;
         }
 
@@ -4493,7 +4561,7 @@ fn emit_capsule(
         // `hide_capsule_window_if_present()` Win32 hard-hide 在 visible=false 分支
         // 处理，不依赖把 Done/Cancelled/Error 打成 invisible。详见 PR #140 评论。
         maybe_position_capsule_bottom_center(&inner_for_main, &window, translation);
-        if show_capsule && visible {
+        if matches!(window_action, CapsuleWindowAction::Show) {
             // 用户报"看不到胶囊"时第一时间能在 log 里确认：胶囊路径有跑、show_capsule
             // 开关是 true、当前进入 visible 帧 —— 排除 prefs 没存住 / emit_capsule 没触
             // 发 / state 一直 Idle 这几类常见 root cause。issue #470。