add FunASR model

Author: showkeyjar

.gitignore

@@ -34,7 +34,9 @@ bld/
 [Ll]ogs/
 
 # Visual Studio 2015/2017 cache/options directory
+.cursor/
 .vs/
+.funasr_bundle_build/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 

AddTaskWindow.xaml.cs

@@ -14,6 +14,7 @@ public partial class AddTaskWindow : Window
         private bool _isClarificationRound = false; // State for clarification
         private string _originalTaskDescription = string.Empty; // To store original task if clarification is needed
         private bool _isLlmConfigErrorNotified = false; // Flag to track if user has been notified of LLM config error
+        private readonly IntentRecognizer _intentRecognizer = new IntentRecognizer();
 
         public string TaskDescription { get; private set; }
         public int SelectedListIndex { get; private set; } // 0-indexed
@@ -128,7 +129,7 @@ private void ResetClarificationButton_Click(object sender, RoutedEventArgs e)
 
         private async void AddTaskButton_Click(object sender, RoutedEventArgs e)
         {
-            string currentTaskDescription = TaskDescriptionTextBox.Text.Trim();
+            string currentTaskDescription = NormalizeTaskText(TaskDescriptionTextBox.Text);
             SelectedListIndex = ListSelectorComboBox.SelectedIndex;
             string configErrorSubstring = "LLM dummy response (Configuration Error: API key missing or placeholder)";
 
@@ -182,6 +183,7 @@ private async void AddTaskButton_Click(object sender, RoutedEventArgs e)
                 // Prioritization & Task Creation (either directly or after clarification)
                 TaskDescription = currentTaskDescription; // Final task description
                 var (llmImportance, llmUrgency) = await _llmService.GetTaskPriorityAsync(TaskDescription);
+                var (ruleImportance, ruleUrgency) = _intentRecognizer.EstimatePriority(TaskDescription);
 
                 // Check for LLM configuration error after priority analysis
                 // string configErrorSubstring has been defined above
@@ -195,18 +197,20 @@ private async void AddTaskButton_Click(object sender, RoutedEventArgs e)
                 }
 
                 // --- LLM Suggestion Logic ---
-                int suggestedIndex = GetIndexFromPriority(llmImportance, llmUrgency);
+                var (finalImportanceByAi, finalUrgencyByAi, sourceTag) = MergePriority(llmImportance, llmUrgency, ruleImportance, ruleUrgency);
+                int suggestedIndex = GetIndexFromPriority(finalImportanceByAi, finalUrgencyByAi);
                 ListSelectorComboBox.SelectedIndex = suggestedIndex;
 
                 if (suggestedIndex != -1 && ListSelectorComboBox.SelectedItem != null)
                 {
-                    LlmSuggestionText.Text = $"LLM Suggests: {ListSelectorComboBox.SelectedItem as string}";
+                    string label = ListSelectorComboBox.SelectedItem as string;
+                    LlmSuggestionText.Text = $"AI建议象限（{sourceTag}）: {label}";
                     LlmSuggestionText.Visibility = Visibility.Visible;
                 }
                 else
                 {
                     // Handle cases where suggestion is ambiguous or mapping fails
-                    LlmSuggestionText.Text = "LLM suggestion unavailable.";
+                    LlmSuggestionText.Text = "AI建议暂不可用，请手动选择象限。";
                     LlmSuggestionText.Visibility = Visibility.Collapsed; // Or Visible with a different message
                 }
                 // --- End LLM Suggestion Logic ---
@@ -283,7 +287,7 @@ public static int GetIndexFromPriority(string importance, string urgency)
 
             // Default or fallback for Medium/Unknown - could be -1 to indicate no selection
             // Or a specific category like "Important & Urgent"
-            return 0; // Defaulting to "Important & Urgent" for now
+            return 1; // 对未知结果偏向“重要不紧急”，降低默认紧急打扰
         }
 
         // Helper method to map ComboBox index back to Importance/Urgency strings
@@ -312,5 +316,59 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
             this.DialogResult = false;
             this.Close();
         }
+
+        private static bool IsKnownPriority(string value)
+        {
+            if (string.IsNullOrWhiteSpace(value))
+                return false;
+
+            string v = value.Trim().ToLowerInvariant();
+            return v == "high" || v == "medium" || v == "low";
+        }
+
+        private (string importance, string urgency, string sourceTag) MergePriority(
+            string llmImportance,
+            string llmUrgency,
+            string ruleImportance,
+            string ruleUrgency)
+        {
+            bool llmValid = IsKnownPriority(llmImportance) && IsKnownPriority(llmUrgency)
+                && !ContainsDummy(llmImportance)
+                && !ContainsDummy(llmUrgency);
+
+            if (llmValid)
+            {
+                return (llmImportance, llmUrgency, "LLM");
+            }
+
+            bool ruleValid = IsKnownPriority(ruleImportance) && IsKnownPriority(ruleUrgency);
+            if (ruleValid)
+            {
+                return (ruleImportance, ruleUrgency, "规则");
+            }
+
+            return ("Medium", "Low", "默认");
+        }
+
+        private static bool ContainsDummy(string value)
+        {
+            return !string.IsNullOrWhiteSpace(value) &&
+                   value.IndexOf("dummy response", StringComparison.OrdinalIgnoreCase) >= 0;
+        }
+
+        private string NormalizeTaskText(string raw)
+        {
+            if (string.IsNullOrWhiteSpace(raw))
+                return string.Empty;
+
+            string trimmed = raw.Trim();
+            string extracted = _intentRecognizer.ExtractTaskDescription(trimmed);
+            if (!string.IsNullOrWhiteSpace(extracted))
+            {
+                return extracted.Trim();
+            }
+
+            return trimmed;
+        }
     }
 } // Closing brace for namespace TimeTask

App.config

@@ -20,6 +20,40 @@
 		<add key="SpeechModelName" value="vosk-model-cn-0.22" />
 		<!-- 可留空使用内置默认下载地址；或配置为你自己的模型 zip 地址 -->
 		<add key="SpeechModelUrl" value="" />
+		<!-- 默认 false：热词仅用于重排序，不强约束识别词表（可显著减少漏识别） -->
+		<add key="VoiceUseStrictVoskGrammar" value="false" />
+		<!-- System.Speech 回退时是否加载 hints grammar；默认关闭可避免部分中文引擎异常 -->
+		<add key="VoiceSystemSpeechUseHints" value="false" />
+		<!-- 语音识别提供方: funasr / hybrid -->
+		<add key="VoiceAsrProvider" value="funasr" />
+		<add key="FunAsrPythonExe" value="python" />
+		<add key="FunAsrScriptPath" value="scripts\funasr_asr.py" />
+		<add key="FunAsrModel" value="iic/SenseVoiceSmall" />
+		<add key="FunAsrDevice" value="cpu" />
+		<add key="FunAsrAutoBootstrap" value="true" />
+		<add key="FunAsrBootstrapTimeoutSeconds" value="900" />
+		<!-- FunASR 建议 Python 3.10/3.11/3.12；默认不使用 3.13+ -->
+		<add key="FunAsrMaxPythonMinor" value="12" />
+		<!-- 若当前 Python 不兼容，自动用 Conda 创建兼容 Python 环境 -->
+		<add key="FunAsrAutoProvisionCondaPython" value="true" />
+		<add key="FunAsrCondaPythonVersion" value="3.11" />
+		<!-- 可选：手动指定 conda.exe 全路径 -->
+		<add key="FunAsrCondaExe" value="" />
+		<add key="FunAsrPipPackages" value="funasr modelscope torch torchaudio" />
+		<!-- 预置运行时优先：推荐将可用 Python 环境打包为 zip，运行时解压即用 -->
+		<add key="FunAsrPreferPrebuiltRuntime" value="true" />
+		<add key="FunAsrRuntimeBundlePath" value="funasr-runtime-bundle.zip" />
+		<!-- 默认关闭在线安装回退，避免复杂自动步骤 -->
+		<add key="FunAsrAllowOnlineInstallFallback" value="false" />
+		<add key="FunAsrInstallUseNoDepsStrategy" value="true" />
+		<add key="FunAsrInstallRetryCooldownMinutes" value="30" />
+		<add key="FunAsrRetryPollSeconds" value="60" />
+		<add key="FunAsrHealthCacheHours" value="72" />
+		<add key="FunAsrBaseDependencies" value="modelscope torch torchaudio" />
+		<add key="FunAsrTimeoutSeconds" value="60" />
+		<add key="FunAsrUsePersistentWorker" value="true" />
+		<add key="FunAsrWorkerStartupTimeoutSeconds" value="600" />
+		<add key="FunAsrMinSegmentSeconds" value="0.5" />
 		<!-- 语音草稿自动加入四象限 -->
 		<add key="VoiceAutoAddToQuadrant" value="false" />
 		<add key="VoiceAutoAddMinConfidence" value="0.65" />

App.xaml.cs

@@ -30,6 +30,9 @@ protected override void OnStartup(StartupEventArgs e)
             VoiceRuntimeLog.Info("App startup.");
             VoiceRuntimeLog.Info($"ProcessBitness: {(Environment.Is64BitProcess ? "x64" : "x86")}, OS: {(Environment.Is64BitOperatingSystem ? "x64" : "x86")}");
             VoiceRuntimeLog.Info($"BaseDirectory: {AppDomain.CurrentDomain.BaseDirectory}");
+            VoiceRuntimeLog.Info($"Config: VoiceAsrProvider={ConfigurationManager.AppSettings["VoiceAsrProvider"]}, FunAsrAutoBootstrap={ConfigurationManager.AppSettings["FunAsrAutoBootstrap"]}");
+            VoiceListenerStatusCenter.Publish(VoiceListenerState.Unavailable, "语音监听不可用（启动初始化中）");
+            FunAsrRuntimeManager.KickoffIfNeeded();
 
             // Check for API Key configuration
             string apiKey = System.Configuration.ConfigurationManager.AppSettings["OpenAIApiKey"];
@@ -90,11 +93,13 @@ protected override void OnStartup(StartupEventArgs e)
                     _legacyAudioService = new AudioCaptureService();
                     _legacyAudioService.Start();
                     VoiceRuntimeLog.Info("Legacy AudioCaptureService started as fallback.");
+                    VoiceListenerStatusCenter.Publish(VoiceListenerState.Ready, "已回退到系统语音引擎，监听可用");
                 }
                 catch (Exception ex2)
                 {
                     Console.WriteLine($"[App] Legacy AudioCaptureService also failed: {ex2.Message}");
                     VoiceRuntimeLog.Error("Legacy AudioCaptureService start failed.", ex2);
+                    VoiceListenerStatusCenter.Publish(VoiceListenerState.Unavailable, "语音监听不可用");
                     MessageBox.Show(
                         "语音识别初始化失败，系统未检测到可用语音识别引擎或麦克风权限异常。\n" +
                         $"请查看日志：{VoiceRuntimeLog.LogFilePath}",