diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index afe2e08..67d809d 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -3,5 +3,14 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 fn main() {
+    // `whispassist.exe --mcp-stdio` (FR-MCP-6): the stdio "adapter the agent
+    // spawns" is this same binary, in headless mode -- it serves one MCP
+    // session over its own stdin/stdout and exits, instead of opening the
+    // GUI window. A coding agent's MCP client config spawns this exact
+    // command line (see `mcp_status`/`set_mcp_enabled`'s returned endpoint).
+    if std::env::args().any(|a| a == "--mcp-stdio") {
+        whispassist_lib::run_mcp_stdio();
+        return;
+    }
     whispassist_lib::run();
 }