feat(selection-voice): Windows 选区语音编辑 MVP，划词提问面板预览与意图分流 (#987)

openless-all/app/src-tauri/Cargo.toml

@@ -56,6 +56,7 @@ parking_lot = "0.12"
 once_cell = "1"
 uuid = { version = "1", features = ["v4", "serde"] }
 chrono = { version = "0.4", features = ["serde"] }
+regex = "1"
 bytes = "1"
 url = "2"
 raw-window-handle = "0.6"

openless-all/app/src-tauri/backend-tests/tests/backend_rust.rs

@@ -109,6 +109,9 @@ mod asr {
 
 #[path = "../../src/coordinator_state.rs"]
 mod coordinator_state;
+mod selection {
+    pub fn prefetch_selection_workspace_capture() {}
+}
 #[path = "../../src/global_hotkey_runtime.rs"]
 mod global_hotkey_runtime;
 #[path = "../../src/combo_hotkey.rs"]

openless-all/app/src-tauri/src/commands/mod.rs

@@ -87,6 +87,8 @@ mod remote_input;
 mod selection_polish;
 #[cfg(not(mobile))]
 mod selection_polish_preview;
+#[cfg(all(not(mobile), target_os = "windows"))]
+mod selection_voice;
 mod settings;
 #[cfg(not(mobile))]
 mod sherpa_asr;
@@ -118,6 +120,8 @@ pub use settings::*;
 pub use selection_polish::*;
 #[cfg(not(mobile))]
 pub use selection_polish_preview::*;
+#[cfg(all(not(mobile), target_os = "windows"))]
+pub use selection_voice::*;
 #[cfg(not(mobile))]
 #[allow(unused_imports)]
 pub use sherpa_asr::*;

openless-all/app/src-tauri/src/commands/qa.rs

@@ -47,6 +47,12 @@ pub async fn qa_submit_text(coord: CoordinatorState<'_>, text: String) -> Result
     coord.qa_submit_text(text).await
 }
 
+/// 划词提问面板「编辑指令」复选框。
+#[tauri::command]
+pub fn qa_set_edit_instruction_mode(coord: CoordinatorState<'_>, enabled: bool) {
+    coord.qa_set_edit_instruction_mode(enabled);
+}
+
 /// 用户点 ✕ / 按 Esc 关 Less Computer 浮窗。
 #[tauri::command]
 pub fn less_computer_window_dismiss(coord: CoordinatorState<'_>) {

openless-all/app/src-tauri/src/commands/selection_voice.rs

@@ -0,0 +1,47 @@
+use super::*;
+use crate::coordinator_state::SessionId;
+
+#[tauri::command]
+pub fn get_selection_voice_intent_prompt(
+    coord: CoordinatorState<'_>,
+) -> Option<crate::coordinator::selection_voice_session::SelectionVoiceIntentPromptPayload> {
+    coord.selection_voice_intent_prompt()
+}
+
+#[tauri::command]
+pub async fn confirm_selection_voice_intent_prompt(
+    coord: CoordinatorState<'_>,
+    intent: String,
+) -> Result<(), String> {
+    coord.confirm_selection_voice_intent_prompt(intent).await
+}
+
+#[tauri::command]
+pub fn cancel_selection_voice_intent_prompt(coord: CoordinatorState<'_>) {
+    coord.cancel_selection_voice_intent_prompt();
+}
+
+#[tauri::command]
+pub fn get_selection_voice_preview(
+    coord: CoordinatorState<'_>,
+    qa_session_id: SessionId,
+) -> Option<crate::coordinator::selection_voice_session::SelectionVoicePreviewPayload> {
+    coord.selection_voice_preview(qa_session_id)
+}
+
+#[tauri::command]
+pub fn confirm_selection_voice_preview(
+    coord: CoordinatorState<'_>,
+    text: String,
+    qa_session_id: SessionId,
+) -> Result<(), String> {
+    coord.confirm_selection_voice_preview(text, Some(qa_session_id))
+}
+
+#[tauri::command]
+pub fn revert_selection_voice_preview(
+    coord: CoordinatorState<'_>,
+    qa_session_id: SessionId,
+) -> Result<(), String> {
+    coord.revert_selection_voice_preview(qa_session_id)
+}

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

@@ -72,6 +72,8 @@ mod polish_flow;
 mod qa;
 mod qa_session;
 mod resources;
+#[cfg(all(not(mobile), target_os = "windows"))]
+pub(crate) mod selection_voice_session;
 #[cfg(not(mobile))]
 pub(crate) mod selection_polish;
 mod silence_auto_stop;
@@ -1128,6 +1130,14 @@ struct Inner {
     /// 预览确认模式暂存的结果和原选区目标；仅在用户确认时才允许插入。
     #[cfg(not(mobile))]
     selection_polish_preview: Mutex<Option<selection_polish::PendingSelectionPolishPreview>>,
+    /// 选区语音编辑会话状态（issue #987 桌面 MVP）。
+    #[cfg(all(not(mobile), target_os = "windows"))]
+    selection_voice_state: Mutex<selection_voice_session::SelectionVoiceSessionState>,
+    #[cfg(all(not(mobile), target_os = "windows"))]
+    selection_voice_preview: Mutex<Option<selection_voice_session::PendingSelectionVoicePreview>>,
+    #[cfg(all(not(mobile), target_os = "windows"))]
+    selection_voice_intent_prompt:
+        Mutex<Option<selection_voice_session::PendingSelectionVoiceIntentPrompt>>,
     /// 「本次会话真的要翻译」。每次 begin_session 重置为 false；hotkey 监听器在
     /// Listening / Starting 阶段看到 Shift down 边沿（或安卓浮层请求）时，经
     /// `arm_translation_if_effective` 判定翻译确实会生效（设了目标语言、且不等于唯一工作语言）
@@ -1439,6 +1449,14 @@ impl Coordinator {
                     selection_polish_hotkey: Mutex::new(None),
                     #[cfg(not(mobile))]
                     selection_polish_preview: Mutex::new(None),
+                    #[cfg(all(not(mobile), target_os = "windows"))]
+                    selection_voice_state: Mutex::new(
+                        selection_voice_session::SelectionVoiceSessionState::default(),
+                    ),
+                    #[cfg(all(not(mobile), target_os = "windows"))]
+                    selection_voice_preview: Mutex::new(None),
+                    #[cfg(all(not(mobile), target_os = "windows"))]
+                    selection_voice_intent_prompt: Mutex::new(None),
                     translation_active: AtomicBool::new(false),
                     qa_hotkey: Mutex::new(None),
                     coding_agent_modifier_hotkey: Mutex::new(None),
@@ -1571,6 +1589,14 @@ impl Coordinator {
                 selection_polish_hotkey: Mutex::new(None),
                 #[cfg(not(mobile))]
                 selection_polish_preview: Mutex::new(None),
+                #[cfg(all(not(mobile), target_os = "windows"))]
+                selection_voice_state: Mutex::new(
+                    selection_voice_session::SelectionVoiceSessionState::default(),
+                ),
+                #[cfg(all(not(mobile), target_os = "windows"))]
+                selection_voice_preview: Mutex::new(None),
+                #[cfg(all(not(mobile), target_os = "windows"))]
+                selection_voice_intent_prompt: Mutex::new(None),
                 translation_active: AtomicBool::new(false),
                 qa_hotkey: Mutex::new(None),
                 coding_agent_modifier_hotkey: Mutex::new(None),
@@ -2714,6 +2740,39 @@ impl Coordinator {
         submit_qa_text_question(&self.inner, text).await
     }
 
+    pub fn qa_set_edit_instruction_mode(&self, enabled: bool) {
+        let mut qa = self.inner.qa_state.lock();
+        if !qa.panel_visible {
+            return;
+        }
+        qa.edit_instruction_mode = enabled;
+        let session_id = qa.session_id;
+        let messages = qa.messages.clone();
+        let edit_apply = {
+            #[cfg(all(not(mobile), target_os = "windows"))]
+            {
+                self.inner.selection_voice_preview.lock().is_some()
+            }
+            #[cfg(not(all(not(mobile), target_os = "windows")))]
+            {
+                false
+            }
+        };
+        if let Some(app) = self.inner.app.lock().clone() {
+            let _ = app.emit_to(
+                qa_event_target(),
+                "qa:state",
+                serde_json::json!({
+                    "kind": "answer",
+                    "session_id": session_id,
+                    "messages": messages,
+                    "edit_instruction_mode": enabled,
+                    "edit_apply_available": edit_apply,
+                }),
+            );
+        }
+    }
+
     pub fn set_shortcut_recording_active(&self, active: bool) {
         self.inner
             .shortcut_recording_active

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

@@ -2086,6 +2086,11 @@ pub(super) async fn begin_session(inner: &Arc<Inner>) -> Result<(), String> {
 /// begin_session 的带参版本，voice_agent=true 时在 Starting 阶段就标记好，
 /// 防止 finish_starting_session 处理 pending_stop 时丢失标志。
 pub(super) async fn begin_session_as(inner: &Arc<Inner>, voice_agent: bool) -> Result<(), String> {
+    #[cfg(all(not(mobile), target_os = "windows"))]
+    if super::selection_voice_session::selection_voice_blocks_other_recording(inner) {
+        log::info!("[coord] dictation blocked: selection voice session active");
+        return Ok(());
+    }
     let current_session_id = {
         let mut state = inner.state.lock();
         let Some(session_id) =

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

@@ -400,20 +400,55 @@ fn update_selection_polish_hotkey_on_main_thread(
 #[cfg(not(mobile))]
 fn selection_polish_hotkey_bridge_loop(inner: Arc<Inner>, rx: mpsc::Receiver<ComboHotkeyEvent>) {
     while let Ok(event) = rx.recv() {
-        if inner.shortcut_recording_active.load(Ordering::SeqCst)
-            || !matches!(event, ComboHotkeyEvent::Pressed { .. })
-        {
+        if inner.shortcut_recording_active.load(Ordering::SeqCst) {
             continue;
         }
-        let coordinator = Coordinator {
-            inner: Arc::clone(&inner),
-        };
-        async_runtime::spawn(async move {
-            if let Err(error) = coordinator.trigger_selection_polish().await {
-                log::warn!("[selection-polish] combo hotkey workflow failed: {error}");
+        match event {
+            ComboHotkeyEvent::Pressed { .. } => {
+                crate::selection::prefetch_selection_workspace_capture();
+                handle_selection_workspace_hotkey_pressed(&inner);
             }
+            ComboHotkeyEvent::Released { .. } => {
+                handle_selection_workspace_hotkey_released(&inner);
+            }
+        }
+    }
+}
+
+#[cfg(not(mobile))]
+fn handle_selection_workspace_hotkey_pressed(inner: &Arc<Inner>) {
+    #[cfg(target_os = "windows")]
+    if inner.prefs.get().selection_voice_enabled {
+        let inner_cloned = Arc::clone(inner);
+        async_runtime::spawn(async move {
+            super::selection_voice_session::handle_selection_voice_pressed(&inner_cloned).await;
+        });
+        return;
+    }
+    let coordinator = Coordinator {
+        inner: Arc::clone(inner),
+    };
+    async_runtime::spawn(async move {
+        if let Err(error) = coordinator.trigger_selection_polish().await {
+            log::warn!("[selection-polish] hotkey workflow failed: {error}");
+        }
+    });
+}
+
+#[cfg(not(mobile))]
+fn handle_selection_workspace_hotkey_released(inner: &Arc<Inner>) {
+    #[cfg(target_os = "windows")]
+    {
+        if !inner.prefs.get().selection_voice_enabled {
+            return;
+        }
+        let inner_cloned = Arc::clone(inner);
+        async_runtime::spawn(async move {
+            super::selection_voice_session::handle_selection_voice_released(&inner_cloned).await;
         });
     }
+    #[cfg(not(target_os = "windows"))]
+    let _ = inner;
 }
 
 #[cfg(not(mobile))]
@@ -587,7 +622,7 @@ pub(super) fn less_computer_modifier_bridge_loop(
             // combo_abort_bridge_loop（见各自函数注释）。
             HotkeyEvent::TranslationModifierPressed | HotkeyEvent::QaShortcutPressed => {}
             #[cfg(not(mobile))]
-            HotkeyEvent::SelectionPolishShortcutPressed => {}
+            HotkeyEvent::SelectionPolishShortcutPressed | HotkeyEvent::SelectionPolishShortcutReleased => {}
             #[cfg(not(mobile))]
             HotkeyEvent::FnRecordingPressed => {}
         }
@@ -1614,17 +1649,11 @@ pub(super) fn hotkey_bridge_loop(inner: Arc<Inner>, rx: mpsc::Receiver<HotkeyEve
             }
             #[cfg(not(mobile))]
             HotkeyEvent::SelectionPolishShortcutPressed => {
-                let coordinator = Coordinator {
-                    inner: Arc::clone(&inner_cloned),
-                };
-                // Selection Polish has no paired release edge. Run the cloud
-                // workflow independently so its network wait cannot stall the
-                // shared modifier-key bridge (Esc, dictation, QA, etc.).
-                async_runtime::spawn(async move {
-                    if let Err(error) = coordinator.trigger_selection_polish().await {
-                        log::warn!("[selection-polish] hotkey workflow failed: {error}");
-                    }
-                });
+                handle_selection_workspace_hotkey_pressed(&inner_cloned);
+            }
+            #[cfg(not(mobile))]
+            HotkeyEvent::SelectionPolishShortcutReleased => {
+                handle_selection_workspace_hotkey_released(&inner_cloned);
             }
             // 非录制态不会出现（CGEventTap 仅在 recording_active 时上报）；防御性忽略。
             #[cfg(not(mobile))]

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

@@ -35,6 +35,8 @@ pub(super) struct QaSessionState {
     pub(super) panel_visible: bool,
     /// 多轮对话累积。每轮 user→assistant 加两条；关浮窗清空。
     pub(super) messages: Vec<crate::types::QaChatMessage>,
+    /// 划词提问面板「编辑指令」开关：勾选则文字/麦克风走编辑，否则走提问。
+    pub(super) edit_instruction_mode: bool,
 }
 
 impl Default for QaSessionState {
@@ -48,6 +50,7 @@ impl Default for QaSessionState {
             session_id: initial_session_id(),
             panel_visible: false,
             messages: Vec::new(),
+            edit_instruction_mode: false,
         }
     }
 }
@@ -80,13 +83,25 @@ pub(super) async fn handle_qa_option_edge(inner: &Arc<Inner>) {
 }
 
 pub(super) fn open_qa_panel(inner: &Arc<Inner>) {
+    // 选区语音 early_qa 已打开面板时，勿重置 edit_instruction_mode / 历史。
+    {
+        let qa = inner.qa_state.lock();
+        if qa.panel_visible {
+            drop(qa);
+            if let Some(app) = inner.app.lock().clone() {
+                crate::show_qa_window(&app, "idle");
+            }
+            return;
+        }
+    }
     let session_id = {
         let mut state = inner.qa_state.lock();
         state.panel_visible = true;
         state.phase = QaPhase::Idle;
         state.cancelled = false;
         state.messages.clear();
         state.selection = None;
+        state.edit_instruction_mode = false;
         state.front_app = capture_frontmost_app();
         // 在 show_qa_window 抢前台之前抓一下：每次 begin_qa_session 抓选区时拿这个 HWND
         // 临时把焦点还回去，让 simulate_copy 跑在用户原 app 上。issue #466 focus-dance。
@@ -118,6 +133,8 @@ pub(super) fn open_qa_panel(inner: &Arc<Inner>) {
                     "kind": "idle",
                     "session_id": session_id,
                     "messages": Vec::<crate::types::QaChatMessage>::new(),
+                    "edit_instruction_mode": false,
+                    "edit_apply_available": false,
                 }),
             );
         }
@@ -132,13 +149,16 @@ pub(super) fn close_qa_panel(inner: &Arc<Inner>) {
         state.panel_visible = false;
         state.messages.clear();
         state.selection = None;
+        state.edit_instruction_mode = false;
         state.front_app = None;
         state.qa_focus_target = None;
         state.phase = QaPhase::Idle;
         state.cancelled = false;
         // 让仍在阻塞选区捕获或 provider await 中的旧任务无法在关闭后写回状态。
         state.session_id = new_session_id();
     }
+    #[cfg(all(not(mobile), target_os = "windows"))]
+    super::selection_voice_session::clear_qa_bound_selection_voice_preview(inner);
     if let Some(app) = inner.app.lock().clone() {
         crate::hide_qa_window(&app);
     }
@@ -164,5 +184,6 @@ mod tests {
         assert!(st.qa_focus_target.is_none());
         assert!(!st.panel_visible, "浮窗默认不可见，等用户 toggle");
         assert!(st.messages.is_empty(), "新建会话历史必须为空");
+        assert!(!st.edit_instruction_mode, "默认不进入编辑指令模式");
     }
 }