diff --git a/crates/kebab-mcp/src/state.rs b/crates/kebab-mcp/src/state.rs
index 00560cf..30debf0 100644
--- a/crates/kebab-mcp/src/state.rs
+++ b/crates/kebab-mcp/src/state.rs
@@ -11,11 +11,8 @@ use kebab_config::Config;
 #[derive(Clone)]
 pub struct KebabAppState {
     pub config: Arc<Config>,
-    /// Original config file path passed via `--config <path>`, if any.
-    /// Forwarded to `kebab_app::doctor_with_config_path` so the doctor
-    /// report reflects the same config file the server was started with.
-    /// Plan Task 10 (Cmd::Mcp wiring) will pass the actual path; all
-    /// existing callers pass `None` which falls back to the XDG default.
+    /// `--config <path>` from CLI when present, else `None` (XDG default
+    /// fallback applies in `doctor_with_config_path`).
     pub config_path: Option<PathBuf>,
 }
 
diff --git a/crates/kebab-mcp/tests/tools_call_schema.rs b/crates/kebab-mcp/tests/tools_call_schema.rs
index f931508..c47a874 100644
--- a/crates/kebab-mcp/tests/tools_call_schema.rs
+++ b/crates/kebab-mcp/tests/tools_call_schema.rs
@@ -67,4 +67,9 @@ async fn schema_tool_returns_schema_v1_json() {
         Some("schema.v1"),
         "unexpected schema_version in: {v}"
     );
+    assert_eq!(
+        v.get("capabilities").and_then(|c| c.get("mcp_server")).and_then(|b| b.as_bool()),
+        Some(true),
+        "mcp_server capability flag should be true after fb-30",
+    );
 }
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 1e13e38..4bb499f 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -40,6 +40,7 @@ flowchart TB
     subgraph UI ["UI binary"]
         cli["kebab-cli"]
         tui["kebab-tui"]
+        mcp["kebab-mcp<br/>(P9-FB-30)"]
         desktop["kebab-desktop<br/>(P9-5)"]
     end
     app["kebab-app<br/>(facade)"]
@@ -71,6 +72,7 @@ flowchart TB
 
     cli --> app
     tui --> app
+    mcp --> app
     desktop --> app
 
     app --> srcfs
@@ -168,6 +170,7 @@ kebab/
 │   ├── kebab-parse-pdf/                               # lopdf per-page text extractor (P7-1)
 │   ├── kebab-app/                                     # facade (P0 시그니처 + P3-5/P6-4/P7-3 본체)
 │   ├── kebab-tui/                                     # Ratatui shell + Library 패널 (P9-1)
+│   ├── kebab-mcp/                                     # stdio MCP server — tools: search, ask, doctor (P9-FB-30)
 │   └── kebab-cli/                                     # binary (P0 → 핫픽스로 --config flag wiring 강화)
 ├── migrations/                                     # SQLite refinery V001/V002/V003
 └── fixtures/                                       # 테스트 fixture 트리