From 71685ab8ec8fdfc3c62c84decf621744f4d7afba Mon Sep 17 00:00:00 2001 From: Timothy Austin <121047756+tacitup@users.noreply.github.com> Date: Tue, 10 Nov 2026 08:04:11 -0800 Subject: [PATCH] fix(local-mcp): adapt to upstream CraftApp changes; apply rustfmt Upstream main added the mac_bundle_name field to the CraftApp struct; add it to the local_mcp test fixture so the crate compiles. Also apply rustfmt to files whose formatting drifted after rebasing onto main (use-statement wrapping, method-chain reflow, struct-variant collapse). No logic changes. --- crates/native/src/backend.rs | 22 ++-- crates/native/src/local_mcp.rs | 154 +++++++------------------- crates/ui-egui/src/app.rs | 3 +- crates/ui-egui/src/settings_dialog.rs | 7 +- 4 files changed, 53 insertions(+), 133 deletions(-) diff --git a/crates/native/src/backend.rs b/crates/native/src/backend.rs index 5d12f303..71baf382 100644 --- a/crates/native/src/backend.rs +++ b/crates/native/src/backend.rs @@ -9,8 +9,8 @@ use artcraft_launcher_core::catalog::{LAUNCHER, LAUNCHER_ID}; use artcraft_launcher_core::feed::{Feed, FeedAnswer}; use artcraft_launcher_core::platform::{Arch, Os, Platform, pick_asset}; use artcraft_launcher_core::protocol::{ - Backend, BackendOptions, CANCELLED, Capabilities, Command, Event, INSTALL_CANCELLED, JobPhase, LatestRelease, McpBridge, McpService, Origin, PAUSED, PausedDownload, - Source, VersionTrack, + Backend, BackendOptions, CANCELLED, Capabilities, Command, Event, INSTALL_CANCELLED, JobPhase, LatestRelease, McpBridge, McpService, Origin, + PAUSED, PausedDownload, Source, VersionTrack, }; use artcraft_launcher_core::release::{Asset, Release}; use artcraft_launcher_core::{CraftApp, Installed, PackageKind, SUITE, version}; @@ -1675,16 +1675,14 @@ fn mcp_state(shared: &Shared) -> Event { None => vec![], }; - let services = detected.into_iter().map(|s| { - // Read the current on/off state before moving `name` into the struct. - let enabled = local_mcp::service_enabled(&existing, &s.name); - McpService { - id: s.id, - name: s.name, - command: s.cli_path.map(|c| c.display().to_string()).unwrap_or_default(), - enabled, - } - }).collect(); + let services = detected + .into_iter() + .map(|s| { + // Read the current on/off state before moving `name` into the struct. + let enabled = local_mcp::service_enabled(&existing, &s.name); + McpService { id: s.id, name: s.name, command: s.cli_path.map(|c| c.display().to_string()).unwrap_or_default(), enabled } + }) + .collect(); let bridge_path = local_mcp::locate_bridge(); Event::Mcp { diff --git a/crates/native/src/local_mcp.rs b/crates/native/src/local_mcp.rs index b66fdde0..5119e459 100644 --- a/crates/native/src/local_mcp.rs +++ b/crates/native/src/local_mcp.rs @@ -48,18 +48,10 @@ pub struct ServerEntry { pub enum Connection { /// A local process the host spawns. `command` is the CLI path; `args` are its arguments. #[serde(rename = "stdio")] - Stdio { - command: String, - args: Vec, - env: HashMap, - }, + Stdio { command: String, args: Vec, env: HashMap }, /// A network endpoint the host connects to (reserved for HTTP-based services like the bridge). #[serde(rename = "streamableHttp")] - StreamableHttp { - url: String, - headers: HashMap, - auth: Option, - }, + StreamableHttp { url: String, headers: HashMap, auth: Option }, } /// Credentials a streamable-HTTP host sends. `None` means no auth; Bionic writes this field only @@ -81,14 +73,7 @@ pub fn mcp_config_path() -> Option { if let Ok(p) = std::env::var("ARTCRAFT_LAUNCHER_MCP_CONFIG") { return Some(PathBuf::from(&p)); } - Some( - dirs::home_dir()? - .join(".lmstudio") - .join("apps") - .join("bionic") - .join(".internal") - .join("ng-mcp.json"), - ) + Some(dirs::home_dir()?.join(".lmstudio").join("apps").join("bionic").join(".internal").join("ng-mcp.json")) } /// Load the `servers` array from a config file. A missing, unreadable, or malformed file yields an @@ -103,10 +88,7 @@ pub fn load_servers(path: &Path) -> Vec { Err(_) => return vec![], }; match value.get("servers").and_then(|s| s.as_array()) { - Some(arr) => arr - .iter() - .filter_map(|e| serde_json::from_value(e.clone()).ok()) - .collect(), + Some(arr) => arr.iter().filter_map(|e| serde_json::from_value(e.clone()).ok()).collect(), None => vec![], } } @@ -114,9 +96,7 @@ pub fn load_servers(path: &Path) -> Vec { /// Save `servers` back to the config file, preserving any top-level keys other than `servers`. /// Writes atomically (temp file + rename) so a crash never leaves a half-written config. pub fn save_servers(path: &Path, servers: &[ServerEntry]) -> Result<(), String> { - let existing: Option = std::fs::read(path) - .ok() - .and_then(|b| serde_json::from_slice(&b).ok()); + let existing: Option = std::fs::read(path).ok().and_then(|b| serde_json::from_slice(&b).ok()); let array = match servers.iter().map(serde_json::to_value).collect::, _>>() { Ok(a) => a, Err(e) => return Err(e.to_string()), @@ -134,8 +114,7 @@ pub fn save_servers(path: &Path, servers: &[ServerEntry]) -> Result<(), String> } } map.insert("servers".to_string(), serde_json::json!(array)); - let out = serde_json::to_string_pretty(&serde_json::Value::Object(map)) - .map_err(|e| e.to_string())?; + let out = serde_json::to_string_pretty(&serde_json::Value::Object(map)).map_err(|e| e.to_string())?; crate::paths::write_atomic(path, out.as_bytes()) } @@ -186,11 +165,7 @@ pub fn entry_for(service: &LocalService) -> Option { name: service.name.clone(), description: format!("{} built-in tools over MCP.", service.name), enabled: true, - connection: Connection::Stdio { - command: cli.display().to_string(), - args: vec!["mcp".into()], - env: HashMap::new(), - }, + connection: Connection::Stdio { command: cli.display().to_string(), args: vec!["mcp".into()], env: HashMap::new() }, }) } @@ -218,11 +193,7 @@ pub fn enable_service(servers: &mut Vec, service: &LocalService) -> name: service.name.clone(), description: format!("{} built-in tools over MCP.", service.name), enabled: true, - connection: Connection::Stdio { - command: cli.display().to_string(), - args: vec!["mcp".into()], - env: HashMap::new(), - }, + connection: Connection::Stdio { command: cli.display().to_string(), args: vec!["mcp".into()], env: HashMap::new() }, }), } true @@ -300,7 +271,8 @@ fn first_existing(override_path: Option<&Path>, candidates: &[PathBuf]) -> Optio fn candidate_bridge_paths() -> Vec { let mut out = Vec::new(); if let Some(exe) = std::env::current_exe().ok() - && let Some(dir) = exe.parent() { + && let Some(dir) = exe.parent() + { for name in ["craft-ai-mcp.exe", "craft-ai-mcp"] { out.push(dir.join(name)); } @@ -328,23 +300,17 @@ pub fn bridge_entry(port: u16) -> ServerEntry { name: "Craft AI".to_string(), description: "All Craft AI tools over one MCP endpoint.".to_string(), enabled: true, - connection: Connection::StreamableHttp { - url: format!("http://127.0.0.1:{port}/mcp"), - headers: HashMap::new(), - auth: Some(Auth::None), - }, + connection: Connection::StreamableHttp { url: format!("http://127.0.0.1:{port}/mcp"), headers: HashMap::new(), auth: Some(Auth::None) }, } } /// Index of the unified-bridge entry, or None: one whose id is the deterministic bridge id, or a /// `streamableHttp` entry named "Craft AI" (created by an earlier launcher version under a UUID). fn find_bridge(servers: &[ServerEntry]) -> Option { - servers.iter().position(|e| e.id == BRIDGE_ID) - .or_else(|| { - servers.iter().position(|e| { - matches!(&e.connection, Connection::StreamableHttp { .. }) && e.name == "Craft AI" - }) - }) + servers + .iter() + .position(|e| e.id == BRIDGE_ID) + .or_else(|| servers.iter().position(|e| matches!(&e.connection, Connection::StreamableHttp { .. }) && e.name == "Craft AI")) } /// The current port of the unified-bridge entry (parsed from its `streamableHttp` URL), or None @@ -437,6 +403,7 @@ mod tests { repo: "storyteller/example", former_ids, former_names: &[], + mac_bundle_name: None, kind: AppKind::Official, publisher: "ArtCraft", msi_publisher: None, @@ -454,10 +421,7 @@ mod tests { std::fs::write(dir.path().join("wordcraft.exe"), b"").unwrap(); std::fs::write(dir.path().join("wordcraft-cli.exe"), b"cli").unwrap(); let app = fake_app("wordcraft", &[]); - assert_eq!( - cli_path_for(&dir.path().join("wordcraft.exe").display().to_string(), &app), - Some(dir.path().join("wordcraft-cli.exe")) - ); + assert_eq!(cli_path_for(&dir.path().join("wordcraft.exe").display().to_string(), &app), Some(dir.path().join("wordcraft-cli.exe"))); } #[test] @@ -467,10 +431,7 @@ mod tests { // Only the former stem's CLI exists (e.g. an older install renamed to printcraft). std::fs::write(dir.path().join("printcraft-cli.exe"), b"cli").unwrap(); let app = fake_app("pdfcraft", &["printcraft"]); - assert_eq!( - cli_path_for(&dir.path().join("pdfcraft.exe").display().to_string(), &app), - Some(dir.path().join("printcraft-cli.exe")) - ); + assert_eq!(cli_path_for(&dir.path().join("pdfcraft.exe").display().to_string(), &app), Some(dir.path().join("printcraft-cli.exe"))); } #[test] @@ -495,19 +456,17 @@ mod tests { // Seed a top-level key that is not `servers` to prove it survives. std::fs::write(&path, r#"{"meta":{"note":"keep me"},"servers":[]}"#).unwrap(); - let servers = vec![ - ServerEntry { - id: entry_id("wordcraft"), - name: "WordCraft".into(), - description: "WordCraft built-in tools over MCP.".into(), - enabled: true, - connection: Connection::Stdio { - command: dir.path().join("wordcraft-cli.exe").display().to_string(), - args: vec!["mcp".into()], - env: HashMap::new(), - }, + let servers = vec![ServerEntry { + id: entry_id("wordcraft"), + name: "WordCraft".into(), + description: "WordCraft built-in tools over MCP.".into(), + enabled: true, + connection: Connection::Stdio { + command: dir.path().join("wordcraft-cli.exe").display().to_string(), + args: vec!["mcp".into()], + env: HashMap::new(), }, - ]; + }]; assert!(save_servers(&path, &servers).is_ok()); let loaded = load_servers(&path); @@ -523,8 +482,7 @@ mod tests { }; // The non-`servers` top-level key must survive the round trip. - let raw: serde_json::Value = - serde_json::from_slice(&std::fs::read(path).unwrap()).unwrap(); + let raw: serde_json::Value = serde_json::from_slice(&std::fs::read(path).unwrap()).unwrap(); assert_eq!(raw["meta"]["note"], serde_json::json!("keep me")); } @@ -589,12 +547,7 @@ mod tests { #[test] fn entry_for_is_none_without_a_cli() { - let service = LocalService { - id: "wordcraft".into(), - name: "WordCraft".into(), - location: "/x/wordcraft.exe".into(), - cli_path: None, - }; + let service = LocalService { id: "wordcraft".into(), name: "WordCraft".into(), location: "/x/wordcraft.exe".into(), cli_path: None }; assert!(entry_for(&service).is_none()); } @@ -675,10 +628,7 @@ mod tests { std::fs::write(&present, b"").unwrap(); let missing = dir.path().join("nope.exe"); // Override wins even when a candidate also exists. - assert_eq!( - first_existing(Some(present.as_ref()), &[missing.clone(), present.clone()]), - Some(present), - ); + assert_eq!(first_existing(Some(present.as_ref()), &[missing.clone(), present.clone()]), Some(present),); } #[test] @@ -702,11 +652,7 @@ mod tests { name: "WordCraft".into(), description: "old".into(), enabled: false, - connection: Connection::Stdio { - command: "/old/wordcraft-cli.exe".into(), - args: vec!["mcp".into()], - env: HashMap::new(), - }, + connection: Connection::Stdio { command: "/old/wordcraft-cli.exe".into(), args: vec!["mcp".into()], env: HashMap::new() }, }]; let service = LocalService { id: "wordcraft".into(), @@ -733,11 +679,7 @@ mod tests { name: "WordCraft".into(), description: String::new(), enabled: true, - connection: Connection::Stdio { - command: "/x/wordcraft-cli.exe".into(), - args: vec!["mcp".into()], - env: HashMap::new(), - }, + connection: Connection::Stdio { command: "/x/wordcraft-cli.exe".into(), args: vec!["mcp".into()], env: HashMap::new() }, }]; let service = LocalService { id: "wordcraft".into(), @@ -759,11 +701,7 @@ mod tests { name: "WordCraft".into(), description: String::new(), enabled: true, - connection: Connection::Stdio { - command: "/x/wordcraft-cli.exe".into(), - args: vec!["mcp".into()], - env: HashMap::new(), - }, + connection: Connection::Stdio { command: "/x/wordcraft-cli.exe".into(), args: vec!["mcp".into()], env: HashMap::new() }, }]; let service = LocalService { id: "wordcraft".into(), @@ -784,11 +722,7 @@ mod tests { name: "Craft AI".into(), description: String::new(), enabled: false, - connection: Connection::StreamableHttp { - url: "http://127.0.0.1:9999/mcp".into(), - headers: HashMap::new(), - auth: Some(Auth::None), - }, + connection: Connection::StreamableHttp { url: "http://127.0.0.1:9999/mcp".into(), headers: HashMap::new(), auth: Some(Auth::None) }, }]; assert!(enable_bridge(&mut servers, BRIDGE_PORT)); assert_eq!(servers.len(), 1); @@ -808,11 +742,7 @@ mod tests { name: "Craft AI".into(), description: String::new(), enabled: true, - connection: Connection::StreamableHttp { - url: "http://127.0.0.1:9876/mcp".into(), - headers: HashMap::new(), - auth: Some(Auth::None), - }, + connection: Connection::StreamableHttp { url: "http://127.0.0.1:9876/mcp".into(), headers: HashMap::new(), auth: Some(Auth::None) }, }]; assert_eq!(bridge_port_current(&servers), Some(9876)); } @@ -825,11 +755,7 @@ mod tests { name: "Craft AI".into(), description: String::new(), enabled: true, - connection: Connection::StreamableHttp { - url: "http://127.0.0.1:12345/mcp".into(), - headers: HashMap::new(), - auth: Some(Auth::None), - }, + connection: Connection::StreamableHttp { url: "http://127.0.0.1:12345/mcp".into(), headers: HashMap::new(), auth: Some(Auth::None) }, }]; assert!(bridge_enabled(&servers)); servers[0].enabled = false; @@ -848,10 +774,8 @@ mod tests { let Some(path) = mcp_config_path() else { return }; let servers = load_servers(&path); // WordCraft and PdfCraft are installed here and already present as enabled stdio entries. - assert!(service_enabled(&servers, "WordCraft"), - "WordCraft entry not recognized (by name) or disabled"); - assert!(service_enabled(&servers, "PdfCraft"), - "PdfCraft entry not recognized (by name) or disabled"); + assert!(service_enabled(&servers, "WordCraft"), "WordCraft entry not recognized (by name) or disabled"); + assert!(service_enabled(&servers, "PdfCraft"), "PdfCraft entry not recognized (by name) or disabled"); // The unified bridge is present at the default port and enabled. assert_eq!(bridge_port_current(&servers), Some(BRIDGE_PORT)); assert!(bridge_enabled(&servers), "bridge entry not recognized (by name) or disabled"); diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs index 3679eab5..cf1e429b 100644 --- a/crates/ui-egui/src/app.rs +++ b/crates/ui-egui/src/app.rs @@ -3,7 +3,8 @@ use std::time::Duration; use artcraft_launcher_core::protocol::{ - Backend, BackendOptions, CANCELLED, Capabilities, Command, Event, INSTALL_CANCELLED, JobPhase, LatestRelease, McpBridge, McpService, PAUSED, Source, + Backend, BackendOptions, CANCELLED, Capabilities, Command, Event, INSTALL_CANCELLED, JobPhase, LatestRelease, McpBridge, McpService, PAUSED, + Source, }; use artcraft_launcher_core::release::Release; use artcraft_launcher_core::status::AppStatus; diff --git a/crates/ui-egui/src/settings_dialog.rs b/crates/ui-egui/src/settings_dialog.rs index 6344f29f..f271aab0 100644 --- a/crates/ui-egui/src/settings_dialog.rs +++ b/crates/ui-egui/src/settings_dialog.rs @@ -1,8 +1,8 @@ //! The Settings dialog: a large card in the shape of the app page (see `sheet.rs`), with the //! groups of settings in boxes, two columns once the window is wide enough. -use artcraft_launcher_core::{Os, PackageKind}; use artcraft_launcher_core::protocol::{Command, McpService}; +use artcraft_launcher_core::{Os, PackageKind}; use egui::{RichText, Ui, vec2}; use crate::app::{Host, LauncherUi}; @@ -416,10 +416,7 @@ impl LauncherUi { ui.add_space(8.0); // The port field needs an accessible name for screen readers (kittest). let port_label = ui.label(tl!("Port")); - ui.add(egui::TextEdit::singleline(&mut self.bridge_port) - .id_salt("mcp-bridge-port") - .desired_width(72.0)) - .labelled_by(port_label.id); + ui.add(egui::TextEdit::singleline(&mut self.bridge_port).id_salt("mcp-bridge-port").desired_width(72.0)).labelled_by(port_label.id); ui.label(RichText::new(self.bridge_status()).size(12.0).color(t.muted)); }