vtcode-mcp 0.181.1

Model Context Protocol (MCP) client, connection pooling, and tool discovery for VT Code
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
use super::rmcp_transport::create_stdio_transport_with_stderr;
use super::{McpElicitationHandler, McpSandboxContext, convert_to_rmcp, create_env_for_mcp_server};
use anyhow::{Context, Result, anyhow};
use futures::FutureExt;
use hashbrown::HashMap;
use jsonschema::Validator;
use rmcp::handler::client::ClientHandler;
#[allow(
    deprecated,
    reason = "Intentional compatibility, platform, or test-only suppression."
)]
use rmcp::model::{
    CallToolRequestParams, CallToolResult, CancelledNotificationParam, ClientResult, CustomResult, ElicitRequestParams,
    ElicitationAction, GetPromptRequestParams, GetPromptResult, InitializeRequestParams, ListRootsResult, LoggingLevel,
    LoggingMessageNotificationParam, MetaObject, ProgressNotificationParam, Prompt, ReadResourceRequestParams,
    ReadResourceResult, RequestMetaObject, Resource, ResourceTemplate, ResourceUpdatedNotificationParam, Root,
    ServerNotification, ServerPeerInfo, ServerRequest, Tool,
};
use rmcp::service::{
    self, ClientCacheConfig, ClientLifecycleMode, NotificationContext, RequestContext, RoleClient, RunningService,
    Service,
};
use rmcp::transport::child_process::TokioChildProcess;
use rmcp::transport::streamable_http_client::{StreamableHttpClientTransport, StreamableHttpClientTransportConfig};
use rmcp_reqwest::header::HeaderMap;
use serde_json::{Value, json};
use std::ffi::OsString;
use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex as StdMutex};
use std::time::Duration;

const DISCOVER_PREFERRED_VERSIONS: &[rmcp::model::ProtocolVersion] = &[
    rmcp::model::ProtocolVersion::V_2025_11_25,
    rmcp::model::ProtocolVersion::V_2025_06_18,
    rmcp::model::ProtocolVersion::V_2025_03_26,
    rmcp::model::ProtocolVersion::V_2024_11_05,
];
use tokio::io::AsyncReadExt;
use tokio::sync::Mutex;
use tokio::time;
use tracing::{debug, error, info, warn};
use url::Url;
use vtcode_commons::sanitizer::sanitize_provider_diagnostic;

/// Response-cache policy for the rmcp peer (SEP-2549 `server/discover` TTL
/// framework: `tools/list` and friends are cached per peer and refreshed on
/// `list_changed`).
///
/// Bounds entries, keeps stale-serving off so transport errors surface instead
/// of resurrecting pruned tool catalogs (fail-closed: our registry already
/// prunes proxies on disconnect), and partitions by provider so credential
/// changes cannot cross-contaminate cached private responses.
pub(crate) fn peer_cache_config(provider_name: &str) -> ClientCacheConfig {
    ClientCacheConfig::default()
        .with_max_entries(128)
        .with_serve_stale_on_error(false)
        .with_private_partition(provider_name)
}

/// Central pinned MCP protocol versions (typed rmcp counterparts).
///
/// The string counterparts live in `vtcode-config::mcp`
/// (`MCP_STABLE_PROTOCOL_VERSION`, `MCP_LEGACY_PROTOCOL_VERSION`); keep both
/// sides aligned when the spec publishes a new stable revision.
/// (`SUPPORTED_PROTOCOL_VERSIONS` in `lib.rs` instead tracks rmcp's known
/// versions and is pinned to them by test.)
pub(crate) fn stable_protocol_version() -> rmcp::model::ProtocolVersion {
    rmcp::model::ProtocolVersion::V_2025_11_25
}

/// Last-resort version for legacy fallbacks (stdio `Auto` mode and HTTP
/// providers that opt in to discover-then-fallback).
pub(crate) fn legacy_fallback_protocol_version() -> rmcp::model::ProtocolVersion {
    rmcp::model::ProtocolVersion::V_2024_11_05
}

/// Newest known version, used as the opening offer before negotiation or
/// clamping settles it down.
pub(crate) fn latest_protocol_version() -> rmcp::model::ProtocolVersion {
    rmcp::model::ProtocolVersion::V_2026_07_28
}

/// Discover-then-legacy lifecycle shared by stdio transports and HTTP
/// providers that opt in via `handshake = "auto"`.
pub(crate) fn auto_lifecycle_mode() -> ClientLifecycleMode {
    ClientLifecycleMode::Auto {
        preferred_versions: DISCOVER_PREFERRED_VERSIONS.to_vec(),
        legacy_version: Some(legacy_fallback_protocol_version()),
    }
}

/// Highest protocol version sent on the wire for the legacy `initialize`
/// handshake.
///
/// The `2026-07-28` draft is excluded: legacy streamable-HTTP servers (e.g.
/// DeepWiki, max `2025-11-25`) reject unknown versions with HTTP 400 whose
/// JSON-RPC error carries the non-correlated id `"server-error"`, surfacing in
/// rmcp as `UncorrelatedErrorResponse { expected: 0, received: "server-error" }`
/// with the real validation payload discarded. Capping here keeps every
/// handshake path (`connect_server`, pool startup, `reconnect`) on a version
/// legacy servers accept; negotiation can still settle lower.
fn clamp_initialize_protocol_version(version: rmcp::model::ProtocolVersion) -> rmcp::model::ProtocolVersion {
    if version > stable_protocol_version() {
        stable_protocol_version()
    } else {
        version
    }
}

const MCP_PROGRESS_TOKEN_META_KEY: &str = "progressToken";
const MCP_STDERR_MAX_BYTES: usize = 8 * 1024;
const LIST_CHANGED_BUCKET_CAPACITY: u8 = 4;
const LIST_CHANGED_REFILL_INTERVAL: Duration = Duration::from_secs(1);

/// High level MCP client responsible for managing multiple providers and
/// enforcing VT Code specific policies like tool allow lists.
mod elicitation;

use elicitation::{ElicitationClientService, LoggingClientHandler};

pub(crate) use elicitation::{build_elicitation_validator, directory_to_file_uri, validate_elicitation_payload};

pub(crate) struct RmcpClient {
    provider_name: String,
    state: Mutex<ClientState>,
    elicitation_handler: Option<Arc<dyn McpElicitationHandler>>,
    list_changed_state: Arc<ListChangedState>,
    /// Handle for the background stderr reader task (stdio transports only).
    /// Stored so we can abort it when the client is shut down or replaced.
    stderr_task: Option<tokio::task::JoinHandle<()>>,
}

enum ClientState {
    Connecting {
        transport: Option<PendingTransport>,
    },
    Ready {
        service: Arc<RunningService<RoleClient, ElicitationClientService>>,
    },
    /// The underlying transport has disconnected (server crash, network loss).
    /// The client can potentially be replaced by a new one via `McpProvider::reconnect()`.
    Disconnected,
    Stopped,
}

enum PendingTransport {
    ChildProcess(TokioChildProcess),
    StreamableHttp(StreamableHttpClientTransport<rmcp_reqwest::Client>),
}

struct ListChangedState {
    tools: AtomicBool,
    resources: AtomicBool,
    prompts: AtomicBool,
    tools_dirty: AtomicBool,
    resources_dirty: AtomicBool,
    prompts_dirty: AtomicBool,
    limiter: StdMutex<ListChangedLimiter>,
}

#[derive(Clone, Copy)]
enum ListChangedNamespace {
    Tools,
    Resources,
    Prompts,
}

#[derive(Default)]
struct ListChangedLimiter {
    tools: TokenBucket,
    resources: TokenBucket,
    prompts: TokenBucket,
}

struct TokenBucket {
    tokens: u8,
    last_refill: std::time::Instant,
}

impl Default for ListChangedState {
    fn default() -> Self {
        Self {
            tools: AtomicBool::new(false),
            resources: AtomicBool::new(false),
            prompts: AtomicBool::new(false),
            tools_dirty: AtomicBool::new(false),
            resources_dirty: AtomicBool::new(false),
            prompts_dirty: AtomicBool::new(false),
            limiter: StdMutex::new(ListChangedLimiter::default()),
        }
    }
}

impl Default for TokenBucket {
    fn default() -> Self {
        Self {
            tokens: LIST_CHANGED_BUCKET_CAPACITY,
            last_refill: std::time::Instant::now(),
        }
    }
}

impl TokenBucket {
    fn try_take_at(&mut self, now: std::time::Instant) -> bool {
        let elapsed = now.saturating_duration_since(self.last_refill);
        let refill_count = elapsed.as_secs() / LIST_CHANGED_REFILL_INTERVAL.as_secs();
        if refill_count > 0 {
            self.tokens = self
                .tokens
                .saturating_add(u8::try_from(refill_count).unwrap_or(u8::MAX))
                .min(LIST_CHANGED_BUCKET_CAPACITY);
            self.last_refill +=
                LIST_CHANGED_REFILL_INTERVAL.saturating_mul(u32::try_from(refill_count).unwrap_or(u32::MAX));
        }

        if self.tokens == 0 {
            return false;
        }
        self.tokens -= 1;
        true
    }
}

impl ListChangedState {
    fn mark_tools_changed(&self) {
        self.mark_changed(ListChangedNamespace::Tools, std::time::Instant::now());
    }

    fn mark_resources_changed(&self) {
        self.mark_changed(ListChangedNamespace::Resources, std::time::Instant::now());
    }

    fn mark_prompts_changed(&self) {
        self.mark_changed(ListChangedNamespace::Prompts, std::time::Instant::now());
    }

    fn mark_changed(&self, namespace: ListChangedNamespace, now: std::time::Instant) {
        // Preserve burst coalescing: multiple notifications before the cache
        // consumer observes one pending signal do not consume bucket tokens.
        let (flag, dirty) = self.state_for(namespace);
        dirty.store(true, Ordering::Relaxed);
        if flag.load(Ordering::Relaxed) {
            return;
        }

        self.schedule_changed(namespace, now);
    }

    fn schedule_changed(&self, namespace: ListChangedNamespace, now: std::time::Instant) {
        let (flag, dirty) = self.state_for(namespace);
        if flag.load(Ordering::Relaxed) || !dirty.load(Ordering::Relaxed) {
            return;
        }

        let Ok(mut limiter) = self.limiter.lock() else {
            // A poisoned limiter must not turn an unbounded notification
            // stream into repeated refresh work.
            return;
        };
        let bucket = match namespace {
            ListChangedNamespace::Tools => &mut limiter.tools,
            ListChangedNamespace::Resources => &mut limiter.resources,
            ListChangedNamespace::Prompts => &mut limiter.prompts,
        };
        if bucket.try_take_at(now) {
            dirty.store(false, Ordering::Relaxed);
            flag.store(true, Ordering::Relaxed);
        }
    }

    fn state_for(&self, namespace: ListChangedNamespace) -> (&AtomicBool, &AtomicBool) {
        match namespace {
            ListChangedNamespace::Tools => (&self.tools, &self.tools_dirty),
            ListChangedNamespace::Resources => (&self.resources, &self.resources_dirty),
            ListChangedNamespace::Prompts => (&self.prompts, &self.prompts_dirty),
        }
    }

    fn take_tools_changed(&self) -> bool {
        self.take_changed(ListChangedNamespace::Tools, std::time::Instant::now())
    }

    fn take_resources_changed(&self) -> bool {
        self.take_changed(ListChangedNamespace::Resources, std::time::Instant::now())
    }

    fn take_prompts_changed(&self) -> bool {
        self.take_changed(ListChangedNamespace::Prompts, std::time::Instant::now())
    }

    fn take_changed(&self, namespace: ListChangedNamespace, now: std::time::Instant) -> bool {
        let (flag, _) = self.state_for(namespace);
        let notified = flag.swap(false, Ordering::Relaxed);
        self.schedule_changed(namespace, now);
        notified || flag.swap(false, Ordering::Relaxed)
    }
}

impl RmcpClient {
    pub(super) async fn new_stdio_client(
        provider_name: String,
        program: OsString,
        args: Vec<OsString>,
        working_dir: Option<PathBuf>,
        env: Option<HashMap<OsString, OsString>>,
        elicitation_handler: Option<Arc<dyn McpElicitationHandler>>,
        sandbox_context: Option<McpSandboxContext>,
    ) -> Result<Self> {
        let env = create_env_for_mcp_server(env);
        let (program, args, working_dir, env) = if let Some(context) = sandbox_context {
            let transformed = context.transform_stdio(program, args, working_dir.as_deref(), env)?;
            (transformed.program, transformed.args, Some(transformed.working_dir), transformed.env)
        } else {
            (program, args, working_dir, env)
        };

        // Use rmcp_transport helper to create transport with stderr capture
        let (transport, stderr) = create_stdio_transport_with_stderr(&program, &args, working_dir.as_deref(), &env)?;

        // Spawn async task to log MCP server stderr
        let stderr_task = if let Some(stderr) = stderr {
            let program_name = program.to_string_lossy().into_owned();
            let provider_label = provider_name.clone();
            Some(tokio::spawn(async move {
                let mut reader = stderr;
                let mut chunk = [0_u8; 1024];
                let mut line = Vec::with_capacity(MCP_STDERR_MAX_BYTES);
                let mut truncated = false;

                let log_line = |line: &[u8], truncated: bool| {
                    let message = sanitize_provider_diagnostic(line);
                    info!(
                        provider = provider_label.as_str(),
                        program = program_name.as_str(),
                        message = message.as_str(),
                        truncated,
                        "MCP server stderr"
                    );
                };

                loop {
                    match reader.read(&mut chunk).await {
                        Ok(0) => break,
                        Ok(bytes_read) => {
                            // `.get(..bytes_read)` runs once per 1 KiB chunk to build the
                            // slice; the hot per-byte scan below is already bounds-check
                            // free, so keep the safe accessor here.
                            for byte in chunk.get(..bytes_read).unwrap_or_default() {
                                if *byte == b'\n' {
                                    if !line.is_empty() || truncated {
                                        log_line(&line, truncated);
                                    }
                                    line.clear();
                                    truncated = false;
                                } else if line.len() < MCP_STDERR_MAX_BYTES {
                                    line.push(*byte);
                                } else {
                                    truncated = true;
                                }
                            }
                        }
                        Err(error) => {
                            warn!(
                                provider = provider_label.as_str(),
                                program = program_name.as_str(),
                                error = %error,
                                "Failed to read MCP server stderr"
                            );
                            break;
                        }
                    }
                }
                if !line.is_empty() || truncated {
                    log_line(&line, truncated);
                }
            }))
        } else {
            None
        };

        Ok(Self {
            provider_name,
            state: Mutex::new(ClientState::Connecting {
                transport: Some(PendingTransport::ChildProcess(transport)),
            }),
            elicitation_handler,
            list_changed_state: Arc::new(ListChangedState::default()),
            stderr_task,
        })
    }

    pub(super) async fn new_streamable_http_client(
        provider_name: String,
        url: &str,
        bearer_token: Option<String>,
        headers: HeaderMap,
        elicitation_handler: Option<Arc<dyn McpElicitationHandler>>,
    ) -> Result<Self> {
        let mut config = StreamableHttpClientTransportConfig::with_uri(url.to_string());
        if let Some(token) = bearer_token {
            config = config.auth_header(token);
        }

        info!("Connecting to MCP HTTP provider '{}' at {}", provider_name, url);

        let mut client_builder = rmcp_reqwest::Client::builder();
        if !headers.is_empty() {
            client_builder = client_builder.default_headers(headers);
        }
        client_builder = client_builder
            .pool_max_idle_per_host(2)
            .pool_idle_timeout(Duration::from_secs(300))
            .tcp_keepalive(Some(Duration::from_secs(60)))
            // Security (CVE-2026-64684 / GHSA-9g45-5xwm-f3wc): never follow
            // redirects automatically. reqwest's default `limited(10)` policy
            // forwards caller-supplied custom headers (API keys via
            // `http_headers` / `env_http_headers`) to cross-origin redirect
            // targets, stripping only `Authorization`/`Cookie`. A compromised
            // MCP server answering `307` to an attacker origin would capture
            // those secrets. Surface `3xx` as a transport error instead; MCP
            // has no legitimate redirect flow on this path.
            .redirect(rmcp_reqwest::redirect::Policy::none());

        let http_client = client_builder
            .build()
            .with_context(|| format!("failed to construct reqwest client for MCP provider '{provider_name}'"))?;

        let transport = StreamableHttpClientTransport::with_client(http_client, config);
        Ok(Self {
            provider_name,
            state: Mutex::new(ClientState::Connecting {
                transport: Some(PendingTransport::StreamableHttp(transport)),
            }),
            elicitation_handler,
            list_changed_state: Arc::new(ListChangedState::default()),
            stderr_task: None,
        })
    }

    pub(super) async fn initialize(
        &self,
        params: InitializeRequestParams,
        timeout: Option<Duration>,
        lifecycle: ClientLifecycleMode,
    ) -> Result<ServerPeerInfo> {
        let mut params = params;
        params.protocol_version = clamp_initialize_protocol_version(params.protocol_version);
        let handler = LoggingClientHandler::new(
            self.provider_name.clone(),
            params,
            self.elicitation_handler.clone(),
            Arc::clone(&self.list_changed_state),
        );
        let service_handler = ElicitationClientService::new(handler.clone());

        let (transport_future, service_label) = {
            let mut guard = self.state.lock().await;
            match &mut *guard {
                ClientState::Connecting { transport } => match transport.take() {
                    Some(PendingTransport::ChildProcess(transport)) => (
                        service::serve_client_with_lifecycle(service_handler.clone(), transport, lifecycle).boxed(),
                        "stdio",
                    ),
                    Some(PendingTransport::StreamableHttp(transport)) => (
                        service::serve_client_with_lifecycle(service_handler.clone(), transport, lifecycle).boxed(),
                        "http",
                    ),
                    None => {
                        return Err(anyhow!("MCP client for {} already initializing", handler.provider_name()));
                    }
                },
                ClientState::Ready { .. } => {
                    return Err(anyhow!("MCP client for {} already initialized", handler.provider_name()));
                }
                ClientState::Stopped => return Err(anyhow!("MCP client has been shut down")),
                ClientState::Disconnected => {
                    return Err(anyhow!(
                        "MCP client for {} is disconnected — use reconnect()",
                        handler.provider_name()
                    ));
                }
            }
        };

        let service = match timeout {
            Some(duration) => time::timeout(duration, transport_future)
                .await
                .with_context(|| format!("Timed out establishing {service_label} MCP transport"))??,
            None => transport_future.await?,
        };

        let initialize_result = service
            .peer()
            .peer_info()
            .ok_or_else(|| anyhow!("Handshake succeeded but server info missing"))?
            .as_ref()
            .clone();

        service
            .peer()
            .set_response_cache_config(peer_cache_config(&self.provider_name))
            .await;

        let mut guard = self.state.lock().await;
        *guard = ClientState::Ready { service: Arc::new(service) };

        Ok(initialize_result)
    }

    pub(super) async fn list_all_tools(&self, timeout: Option<Duration>) -> Result<Vec<Tool>> {
        let service = self.service().await?;
        let rmcp_future = service.peer().list_all_tools();
        let tools = run_with_timeout(rmcp_future, timeout, "tools/list").await?;
        Ok(tools)
    }

    pub(super) async fn list_all_prompts(&self, timeout: Option<Duration>) -> Result<Vec<Prompt>> {
        let service = self.service().await?;
        let rmcp_future = service.peer().list_all_prompts();
        let prompts = run_with_timeout(rmcp_future, timeout, "prompts/list").await?;
        Ok(prompts)
    }

    pub(super) async fn list_all_resources(&self, timeout: Option<Duration>) -> Result<Vec<Resource>> {
        let service = self.service().await?;
        let rmcp_future = service.peer().list_all_resources();
        let resources = run_with_timeout(rmcp_future, timeout, "resources/list").await?;
        Ok(resources)
    }

    #[expect(
        dead_code,
        reason = "Intentional compatibility, platform, test, or API-shape suppression."
    )]
    async fn list_all_resource_templates(&self, timeout: Option<Duration>) -> Result<Vec<ResourceTemplate>> {
        let service = self.service().await?;
        let rmcp_future = service.peer().list_all_resource_templates();
        let templates = run_with_timeout(rmcp_future, timeout, "resources/templates/list").await?;
        Ok(templates)
    }

    pub(super) async fn call_tool(
        &self,
        params: CallToolRequestParams,
        timeout: Option<Duration>,
    ) -> Result<CallToolResult> {
        let service = self.service().await?;
        let result = run_with_timeout(service.call_tool(params), timeout, "tools/call").await?;
        Ok(result)
    }

    pub(super) async fn read_resource(
        &self,
        params: ReadResourceRequestParams,
        timeout: Option<Duration>,
    ) -> Result<ReadResourceResult> {
        let service = self.service().await?;
        let result = run_with_timeout(service.peer().read_resource(params), timeout, "resources/read").await?;
        Ok(result)
    }

    pub(super) async fn get_prompt(
        &self,
        params: GetPromptRequestParams,
        timeout: Option<Duration>,
    ) -> Result<GetPromptResult> {
        let service = self.service().await?;
        let result = run_with_timeout(service.peer().get_prompt(params), timeout, "prompts/get").await?;
        Ok(result)
    }

    pub(super) async fn shutdown(&self) -> Result<()> {
        let mut guard = self.state.lock().await;
        let state = std::mem::replace(&mut *guard, ClientState::Stopped);
        drop(guard);

        match state {
            ClientState::Ready { service } => {
                service.cancellation_token().cancel();
                Ok(())
            }
            ClientState::Connecting { mut transport } => {
                drop(transport.take());
                Ok(())
            }
            ClientState::Disconnected | ClientState::Stopped => Ok(()),
        }
    }

    async fn service(&self) -> Result<Arc<RunningService<RoleClient, ElicitationClientService>>> {
        let mut guard = self.state.lock().await;
        match &*guard {
            ClientState::Ready { service } => {
                // Detect if the underlying transport has died (server crash / network loss).
                if service.is_closed() {
                    warn!(provider = self.provider_name.as_str(), "MCP service closed — marking disconnected");
                    *guard = ClientState::Disconnected;
                    return Err(anyhow!("MCP client for '{}' has disconnected", self.provider_name));
                }
                Ok(service.clone())
            }
            ClientState::Connecting { .. } => Err(anyhow!("MCP client not initialized")),
            ClientState::Disconnected => Err(anyhow!("MCP client for '{}' has disconnected", self.provider_name)),
            ClientState::Stopped => Err(anyhow!("MCP client has been shut down")),
        }
    }

    /// Returns `true` when the client is in the `Ready` state and the
    /// underlying transport has not been closed.
    pub(super) async fn is_healthy(&self) -> bool {
        let guard = self.state.lock().await;
        matches!(&*guard, ClientState::Ready { service } if !service.is_closed())
    }

    pub(super) fn take_tool_list_changed(&self) -> bool {
        self.list_changed_state.take_tools_changed()
    }

    pub(super) fn take_resource_list_changed(&self) -> bool {
        self.list_changed_state.take_resources_changed()
    }

    pub(super) fn take_prompt_list_changed(&self) -> bool {
        self.list_changed_state.take_prompts_changed()
    }
}

impl Drop for RmcpClient {
    fn drop(&mut self) {
        // Abort the background stderr reader task so it doesn't outlive the client.
        if let Some(task) = self.stderr_task.take() {
            task.abort();
        }
    }
}

async fn run_with_timeout<F, T>(fut: F, timeout: Option<Duration>, label: &str) -> Result<T>
where
    F: Future<Output = Result<T, service::ServiceError>>,
{
    if let Some(duration) = timeout {
        let result = time::timeout(duration, fut)
            .await
            .with_context(|| anyhow!("Timed out awaiting {label} after {duration:?}"))?;
        result.map_err(|err| anyhow!("{label} failed: {err}"))
    } else {
        fut.await.map_err(|err| anyhow!("{label} failed: {err}"))
    }
}

#[cfg(test)]
mod tests;