fix: model picker shows real model IDs, MCP reads config files directly, shorten confirmed model display

Author: Swofty-Developments

crates/tauri-app/frontend/src/components/composer/ModelSelector.tsx

@@ -5,10 +5,12 @@ import { appStore } from "../../stores/app-store";
 // (e.g. 'sonnet' or 'opus') or a model's full name (e.g. 'claude-sonnet-4-6')."
 // These are suggestions, not exhaustive — users can type any model ID.
 const PRESETS = [
-  { value: null, label: "Default", desc: "Use CLI default" },
-  { value: "opus", label: "opus", desc: "Latest Opus (alias)" },
-  { value: "sonnet", label: "sonnet", desc: "Latest Sonnet (alias)" },
-  { value: "haiku", label: "haiku", desc: "Latest Haiku (alias)" },
+  { value: null, label: "Default", desc: "CLI default model" },
+  { value: "claude-opus-4-6", label: "Opus 4.6", desc: "Most capable, 1M context" },
+  { value: "claude-sonnet-4-6", label: "Sonnet 4.6", desc: "Fast + capable, 1M context" },
+  { value: "claude-opus-4-0", label: "Opus 4", desc: "Previous Opus" },
+  { value: "claude-sonnet-4-5", label: "Sonnet 4.5", desc: "Previous Sonnet" },
+  { value: "claude-haiku-4-5", label: "Haiku 4.5", desc: "Fast and lightweight" },
 ];
 
 export function ModelSelector() {
@@ -23,13 +25,15 @@ export function ModelSelector() {
     return preset ? preset.label : store.selectedModel;
   };
 
-  /** Show the confirmed model from the SDK, if it differs from the selected alias. */
+  /** Show the confirmed model from the SDK, shortened for display. */
   const confirmedLabel = () => {
     if (!store.activeModel) return null;
     const selected = store.selectedModel;
-    // Only show if it adds info (e.g. alias "opus" resolved to "claude-opus-4-6")
     if (store.activeModel === selected) return null;
-    return store.activeModel;
+    // Shorten "claude-opus-4-6[1m]" → "opus-4.6"
+    let m = store.activeModel;
+    m = m.replace("claude-", "").replace("[1m]", "").replace("[200k]", "");
+    return m;
   };
 
   function select(value: string | null) {

crates/tauri-app/src/commands/mcp.rs

@@ -25,14 +25,51 @@ pub async fn mcp_list_servers(provider: String) -> Result<Vec<McpServer>, String
         _ => "claude",
     };
 
+    // Try CLI first
     let output = Command::new(binary)
         .args(["mcp", "list"])
         .output()
         .await
         .map_err(|e| format!("Failed to run {binary} mcp list: {e}"))?;
 
     let stdout = String::from_utf8_lossy(&output.stdout).to_string();
-    let servers = parse_mcp_list(&stdout);
+    let mut servers = parse_mcp_list(&stdout);
+
+    // If CLI returned nothing, try reading config files directly
+    if servers.is_empty() && provider != "codex" {
+        let home = std::env::var("HOME").unwrap_or_default();
+        // Check ~/.claude/.mcp.json and project .mcp.json
+        for (path, scope) in [
+            (format!("{home}/.claude/.mcp.json"), "user"),
+            (".mcp.json".to_string(), "project"),
+        ] {
+            if let Ok(content) = std::fs::read_to_string(&path) {
+                if let Ok(json) = serde_json::from_str::<serde_json::Value>(&content) {
+                    if let Some(obj) = json.get("mcpServers").and_then(|s| s.as_object())
+                        .or_else(|| json.as_object()) {
+                        for (name, config) in obj {
+                            let url_or_cmd = config.get("url")
+                                .or_else(|| config.get("command"))
+                                .and_then(|v| v.as_str())
+                                .unwrap_or("")
+                                .to_string();
+                            let transport = if url_or_cmd.starts_with("http") { "http" }
+                                else if url_or_cmd.contains("sse") { "sse" }
+                                else { "stdio" };
+                            servers.push(McpServer {
+                                name: name.clone(),
+                                url_or_command: url_or_cmd,
+                                transport: transport.to_string(),
+                                scope: scope.to_string(),
+                                status: "unknown".to_string(),
+                            });
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     Ok(servers)
 }