diff --git a/src/cortex-cli/src/agent_cmd/loader.rs b/src/cortex-cli/src/agent_cmd/loader.rs
index 86caca9..65dd143 100644
--- a/src/cortex-cli/src/agent_cmd/loader.rs
+++ b/src/cortex-cli/src/agent_cmd/loader.rs
@@ -413,7 +413,10 @@ pub fn load_agent_from_json(path: &Path, source: AgentSource) -> Result<AgentInf
     let prompt = if let Some(parent) = path.parent() {
         let prompt_file = parent.join("prompt.md");
         if prompt_file.exists() {
-            Some(std::fs::read_to_string(&prompt_file)?)
+            Some(
+                read_file_with_encoding(&prompt_file)
+                    .with_context(|| format!("Failed to read {}", prompt_file.display()))?,
+            )
         } else {
             None
         }
diff --git a/src/cortex-cli/src/agent_cmd/tests.rs b/src/cortex-cli/src/agent_cmd/tests.rs
index e2ff07f..e348f3c 100644
--- a/src/cortex-cli/src/agent_cmd/tests.rs
+++ b/src/cortex-cli/src/agent_cmd/tests.rs
@@ -4,9 +4,9 @@
 mod tests {
     use crate::agent_cmd::cli::{CopyArgs, ExportArgs};
     use crate::agent_cmd::loader::{
-        load_builtin_agents, parse_frontmatter, read_file_with_encoding,
+        load_agent_from_json, load_builtin_agents, parse_frontmatter, read_file_with_encoding,
     };
-    use crate::agent_cmd::types::AgentMode;
+    use crate::agent_cmd::types::{AgentMode, AgentSource};
 
     #[test]
     fn test_read_file_with_utf8() {
@@ -153,4 +153,38 @@ This is the system prompt.
         assert!(agents.iter().any(|a| a.name == "plan"));
         assert!(agents.iter().any(|a| a.name == "explore"));
     }
+
+    #[test]
+    fn test_load_agent_from_json_with_utf16_prompt_file() {
+        let temp_dir = std::env::temp_dir().join("cortex_utf16_prompt_agent_test");
+        let _ = std::fs::remove_dir_all(&temp_dir);
+        std::fs::create_dir_all(&temp_dir).unwrap();
+
+        let agent_json = temp_dir.join("agent.json");
+        let prompt_md = temp_dir.join("prompt.md");
+
+        let json_content = r#"{
+  "name": "utfprompt",
+  "mode": "primary",
+  "description": "UTF prompt agent"
+}"#;
+        std::fs::write(&agent_json, json_content).unwrap();
+
+        // Write UTF-16 LE + BOM prompt file
+        let prompt_content = "Hello from UTF-16 prompt";
+        let mut bytes = vec![0xFF, 0xFE];
+        for ch in prompt_content.encode_utf16() {
+            bytes.extend_from_slice(&ch.to_le_bytes());
+        }
+        std::fs::write(&prompt_md, bytes).unwrap();
+
+        let result = load_agent_from_json(&agent_json, AgentSource::Personal);
+
+        let _ = std::fs::remove_dir_all(&temp_dir);
+
+        assert!(result.is_ok());
+        let agent = result.unwrap();
+        assert_eq!(agent.name, "utfprompt");
+        assert_eq!(agent.prompt.as_deref(), Some(prompt_content));
+    }
 }
diff --git a/src/cortex-cli/src/stats_cmd.rs b/src/cortex-cli/src/stats_cmd.rs
index 1e40750..9992bbd 100644
--- a/src/cortex-cli/src/stats_cmd.rs
+++ b/src/cortex-cli/src/stats_cmd.rs
@@ -323,7 +323,7 @@ fn infer_provider(model: &str) -> String {
     } else if model_lower.contains("grok") {
         "xai".to_string()
     } else if model_lower.contains("qwen") {
-        "deepseek".to_string() // Qwen models often available via DeepSeek
+        "alibaba".to_string()
     } else {
         "unknown".to_string()
     }
@@ -722,6 +722,7 @@ mod tests {
         assert_eq!(infer_provider("gpt-4o"), "openai");
         assert_eq!(infer_provider("gemini-2.0-flash"), "google");
         assert_eq!(infer_provider("deepseek-chat"), "deepseek");
+        assert_eq!(infer_provider("qwen2.5-coder"), "alibaba");
     }
 
     #[test]