omni-dev 0.41.0

AI-powered git commit rewriter, PR generator, and MCP server for Jira, Confluence, Datadog, Gmail, and Drive.
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
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
//! MCP tool handlers for Gmail read (and label-list) operations.
//!
//! Each tool builds a fresh [`GmailClient`] via
//! [`crate::cli::gmail::helpers::create_client_for`] and then delegates to
//! the same API façade (`MessagesApi`, `ThreadsApi`, `LabelsApi`) that the
//! CLI uses under `src/cli/gmail/`. Tool outputs are YAML serialisations of
//! the typed response structs, matching the CLI `-o yaml` output.
//!
//! `gmail auth login` has no MCP equivalent — it's an interactive browser
//! flow with no non-interactive analogue. `gmail_label_modify`
//! (`label add`/`remove`) is deferred to a fast-follow issue: the issue's
//! own "Initial tools" list names exactly five of the six tools below —
//! `gmail_account_list` (issue #1500) is the one addition, letting a client
//! discover account names before passing one to the other five. The
//! mutating `label add`/`remove` tool's confirm-gating deserves its own
//! focused review.
//!
//! Every tool below takes an optional `account` parameter (issue #1500,
//! [ADR-0066](../../docs/adrs/adr-0066.md)): `Some(name)` forces that
//! named Gmail account, `None` falls through to ambient
//! `--account`/`OMNI_DEV_GMAIL_ACCOUNT` resolution (relevant if the MCP
//! server process itself was launched with that env var pinned) — see
//! [`crate::gmail::account::resolve_account`].

use anyhow::{Context, Result};
use rmcp::{
    handler::server::wrapper::Parameters,
    model::{CallToolResult, ContentBlock as Content},
    schemars, tool, tool_router, ErrorData as McpError,
};
use serde::{Deserialize, Serialize};

use crate::cli::gmail::helpers::create_client_for;
use crate::gmail::account;
use crate::gmail::auth;
use crate::gmail::client::GmailClient;
use crate::gmail::labels_api::LabelsApi;
use crate::gmail::messages_api::{MessageFormat, MessagesApi, DEFAULT_SEARCH_LIMIT};
use crate::gmail::threads_api::{ThreadFormat, ThreadsApi};
use crate::utils::settings::Settings;

use super::error::tool_error;
use super::git_tools::build_truncated_result;
use super::output_file::write_to_file_yaml;
use super::server::OmniDevServer;

// ── Parameter structs ───────────────────────────────────────────────

/// Doc comment shared by every `account` parameter below (issue #1500) —
/// kept as one string so the five copies can't drift.
macro_rules! account_param_doc {
    () => {
        "Selects a named Gmail account instead of the ambient \
         `--account`/`OMNI_DEV_GMAIL_ACCOUNT` resolution — e.g. `work`. Omit to use the \
         resolved default account (or the legacy single-account credentials, if no named \
         accounts are configured). Call `gmail_account_list` to discover configured names."
    };
}

/// Parameters for `gmail_auth_status`.
#[derive(Debug, Default, Deserialize, schemars::JsonSchema)]
pub struct GmailAuthStatusParams {
    #[doc = account_param_doc!()]
    #[serde(default)]
    pub account: Option<String>,
}

/// Parameters for the `gmail_search` tool.
#[derive(Debug, Deserialize, schemars::JsonSchema)]
pub struct GmailSearchParams {
    /// Gmail search query, same syntax as the Gmail search box (e.g.
    /// `label:finance after:2026/01/01`). Required.
    pub query: String,
    /// Maximum results. Defaults to 50 when omitted; `0` explicitly means
    /// fetch every match up to the hard cap (10000).
    #[serde(default)]
    pub limit: Option<usize>,
    /// When `true`, enrich each hit with From/Subject/Date/snippet via one
    /// extra `messages.get` request per hit. Defaults to `false` (ids-only,
    /// the quota-safe default — `messages.get` costs 5 units against
    /// Gmail's 250 units/user/second budget).
    #[serde(default)]
    pub enrich: Option<bool>,
    /// Bounds concurrent `messages.get` calls when `enrich` is true (has no
    /// effect otherwise). Defaults to 4, clamped to 1-50 regardless of what
    /// is requested — Gmail's quota is 250 units/user/second and
    /// `messages.get` costs 5 units, so a higher value could burst past it.
    #[serde(default)]
    pub concurrency: Option<usize>,
    #[doc = account_param_doc!()]
    #[serde(default)]
    pub account: Option<String>,
}

/// Parameters for the `gmail_message_read` tool.
#[derive(Debug, Deserialize, schemars::JsonSchema)]
pub struct GmailMessageReadParams {
    /// Gmail message id. Required.
    pub message_id: String,
    /// `minimal` (ids/labels only), `metadata` (headers + snippet), `full`
    /// (default; parsed MIME structure), or `raw` (base64url RFC 2822
    /// source). Matches Gmail's own wire values verbatim.
    #[serde(default)]
    pub format: Option<String>,
    /// When set, writes the rendered message to this path and returns a
    /// short YAML summary (path/bytes/format) instead of the inline body —
    /// use for large messages/attachments that would blow past the context
    /// window.
    #[serde(default)]
    pub output_file: Option<String>,
    #[doc = account_param_doc!()]
    #[serde(default)]
    pub account: Option<String>,
}

/// Parameters for the `gmail_thread_read` tool.
#[derive(Debug, Deserialize, schemars::JsonSchema)]
pub struct GmailThreadReadParams {
    /// Gmail thread id. Required.
    pub thread_id: String,
    #[doc = account_param_doc!()]
    #[serde(default)]
    pub account: Option<String>,
}

/// Parameters for `gmail_label_list`.
#[derive(Debug, Default, Deserialize, schemars::JsonSchema)]
pub struct GmailLabelListParams {
    #[doc = account_param_doc!()]
    #[serde(default)]
    pub account: Option<String>,
}

/// Parameters for `gmail_account_list` (none — issue #1500).
#[derive(Debug, Default, Deserialize, schemars::JsonSchema)]
pub struct GmailAccountListParams {}

// ── Tool handlers ────────────────────────────────────────────────────

#[allow(missing_docs)] // #[tool_router] generates a pub `gmail_tool_router` fn.
#[tool_router(router = gmail_tool_router, vis = "pub")]
impl OmniDevServer {
    /// Reports whether Gmail OAuth2 credentials are configured.
    ///
    /// Presence flags only — never calls the Gmail API and never returns
    /// secret values.
    #[tool(
        description = "Report whether Gmail OAuth2 credentials are configured \
                       (GMAIL_CLIENT_ID/GMAIL_CLIENT_SECRET/refresh token present) and which \
                       scope was granted at login (readonly vs. modify). Returns presence flags \
                       and the granted scope only — NEVER the client secret, refresh token, or \
                       access token. Unlike the CLI `omni-dev gmail auth status`, this tool does \
                       not call the Gmail API and cannot confirm the refresh token is still \
                       accepted (a testing-mode Google Cloud project's refresh tokens expire \
                       after 7 days — use the CLI status command to actually verify). \
                       Read-only. Mirrors `omni-dev gmail auth status`."
    )]
    pub async fn gmail_auth_status(
        &self,
        Parameters(params): Parameters<GmailAuthStatusParams>,
    ) -> Result<CallToolResult, McpError> {
        let yaml = run_auth_status(params.account.as_deref()).map_err(tool_error)?;
        Ok(CallToolResult::success(vec![Content::text(yaml)]))
    }

    /// Tool: search Gmail messages.
    #[tool(
        description = "Search Gmail messages with a Gmail query (same syntax as the Gmail \
                       search box, e.g. `label:finance after:2026/01/01`). Returns only \
                       id/threadId per hit by default (ids-only, quota-safe). Set `enrich: true` \
                       to add From/Subject/Date/snippet — this costs one extra `messages.get` \
                       request per hit, bounded by `concurrency` (default 4). `limit` defaults \
                       to 50 when omitted; pass `0` explicitly to auto-paginate up to a hard cap \
                       (10000) — expensive combined with `enrich: true`, use deliberately. \
                       Read-only. Mirrors `omni-dev gmail search`. Output is YAML."
    )]
    pub async fn gmail_search(
        &self,
        Parameters(params): Parameters<GmailSearchParams>,
    ) -> Result<CallToolResult, McpError> {
        let client = create_client_for(params.account.as_deref()).map_err(tool_error)?;
        let yaml = run_search(&client, &params).await.map_err(tool_error)?;
        Ok(build_truncated_result(yaml))
    }

    /// Tool: read a single Gmail message.
    #[tool(
        description = "Read a single Gmail message by id. `format` is `minimal` (ids/labels \
                       only), `metadata` (headers + snippet only), `full` (default; parsed MIME \
                       structure), or `raw` (base64url-encoded RFC 2822 source) — Gmail's own \
                       wire values verbatim. When `output_file` is set, writes the rendered \
                       message to that path and returns a short YAML summary instead of the \
                       inline body — use it for large messages or ones with attachments that \
                       would exceed the response size limit. Read-only. \
                       Mirrors `omni-dev gmail read`. Output is YAML."
    )]
    pub async fn gmail_message_read(
        &self,
        Parameters(params): Parameters<GmailMessageReadParams>,
    ) -> Result<CallToolResult, McpError> {
        let client = create_client_for(params.account.as_deref()).map_err(tool_error)?;
        let wrote_to_file = params.output_file.is_some();
        let text = run_message_read(&client, &params)
            .await
            .map_err(tool_error)?;
        if wrote_to_file {
            Ok(CallToolResult::success(vec![Content::text(text)]))
        } else {
            Ok(build_truncated_result(text))
        }
    }

    /// Tool: read a Gmail thread.
    #[tool(
        description = "Read a full Gmail thread (conversation) by id, including every message \
                       in it. A thread is N messages, each potentially carrying attachments — \
                       the single highest-risk payload on the whole Gmail surface for exceeding \
                       the response size limit, so large threads are automatically truncated \
                       with a marker. Read-only. \
                       Mirrors `omni-dev gmail thread`. Output is YAML."
    )]
    pub async fn gmail_thread_read(
        &self,
        Parameters(params): Parameters<GmailThreadReadParams>,
    ) -> Result<CallToolResult, McpError> {
        let client = create_client_for(params.account.as_deref()).map_err(tool_error)?;
        let yaml = run_thread_read(&client, &params)
            .await
            .map_err(tool_error)?;
        Ok(build_truncated_result(yaml))
    }

    /// Tool: list Gmail labels.
    #[tool(
        description = "List every label on the Gmail mailbox (system labels like INBOX/TRASH \
                       and user-created ones), with unread/total message counts. Adding or \
                       removing labels on messages is CLI-only in this release \
                       (`omni-dev gmail label add`/`remove`) — no MCP tool mutates labels yet. \
                       Read-only. \
                       Mirrors `omni-dev gmail label list`. Output is YAML."
    )]
    pub async fn gmail_label_list(
        &self,
        Parameters(params): Parameters<GmailLabelListParams>,
    ) -> Result<CallToolResult, McpError> {
        let client = create_client_for(params.account.as_deref()).map_err(tool_error)?;
        let yaml = run_label_list(&client).await.map_err(tool_error)?;
        Ok(build_truncated_result(yaml))
    }

    /// Tool: list configured named Gmail accounts.
    #[tool(
        description = "List Gmail accounts configured in ~/.omni-dev/settings.json — name, \
                       cached email address (if known), granted scope, and which one is the \
                       default. Call this first to discover valid `account` values before \
                       passing one to `gmail_search`/`gmail_message_read`/`gmail_thread_read`/\
                       `gmail_label_list`/`gmail_auth_status`. Never returns a secret. \
                       Read-only, no parameters. Mirrors `omni-dev gmail account list`."
    )]
    pub async fn gmail_account_list(
        &self,
        Parameters(_params): Parameters<GmailAccountListParams>,
    ) -> Result<CallToolResult, McpError> {
        let yaml = run_account_list().map_err(tool_error)?;
        Ok(build_truncated_result(yaml))
    }
}

// ── Internal run_* implementations ──────────────────────────────────
//
// Split out from the tool handlers, taking an already-resolved
// `&GmailClient`, so they can be tested against a wiremock-backed client
// without needing real credentials (mirrors `run_jira_read` in
// `jira_core_tools.rs`; unlike the Datadog tools, Gmail has no
// `GMAIL_API_URL`-style env override to redirect `create_client()` itself).

/// Renders the credential-presence summary as YAML.
///
/// Pure: never touches the network and never reads any secret values.
/// `account`, when `Some`, forces that named account (issue #1500) instead
/// of falling through to ambient `--account`/`OMNI_DEV_GMAIL_ACCOUNT`
/// resolution.
fn run_auth_status(account: Option<&str>) -> Result<String> {
    let status = auth::status_for(account)?;
    serde_yaml::to_string(&status).context("Failed to serialize Gmail auth status")
}

/// Renders the configured Gmail accounts (name/email/scope/default) as
/// YAML — never a secret, never a network call.
fn run_account_list() -> Result<String> {
    let settings = Settings::load().unwrap_or_default();
    let accounts = account::list_accounts(&settings.gmail);
    yaml_result(&accounts)
}

async fn run_search(client: &GmailClient, params: &GmailSearchParams) -> Result<String> {
    let limit = params.limit.unwrap_or(DEFAULT_SEARCH_LIMIT);
    let api = MessagesApi::new(client);
    if params.enrich.unwrap_or(false) {
        let concurrency = params.concurrency.unwrap_or(4);
        let summaries = api
            .search_summaries(Some(&params.query), &[], limit, concurrency)
            .await?;
        yaml_result(&summaries)
    } else {
        let list = api.search_all(Some(&params.query), &[], limit).await?;
        yaml_result(&list.messages)
    }
}

async fn run_message_read(client: &GmailClient, params: &GmailMessageReadParams) -> Result<String> {
    let format = parse_message_format(params.format.as_deref())?;
    let message = MessagesApi::new(client)
        .get(&params.message_id, format, &[])
        .await?;
    let yaml = yaml_result(&message)?;
    match params.output_file.as_deref() {
        Some(path) => write_to_file_yaml(path, &yaml, message_format_label(format)),
        None => Ok(yaml),
    }
}

async fn run_thread_read(client: &GmailClient, params: &GmailThreadReadParams) -> Result<String> {
    let thread = ThreadsApi::new(client)
        .get(&params.thread_id, ThreadFormat::Full)
        .await?;
    yaml_result(&thread)
}

async fn run_label_list(client: &GmailClient) -> Result<String> {
    let response = LabelsApi::new(client).list().await?;
    yaml_result(&response.labels)
}

/// Parses an MCP-supplied message format string.
///
/// Accepts the same names as the CLI `--detail` arg (`minimal`/`metadata`/
/// `full`/`raw` — Gmail's own wire values verbatim); `None` defaults to
/// `full`.
fn parse_message_format(raw: Option<&str>) -> Result<MessageFormat> {
    match raw.map(str::to_ascii_lowercase).as_deref() {
        None | Some("full") => Ok(MessageFormat::Full),
        Some("minimal") => Ok(MessageFormat::Minimal),
        Some("metadata") => Ok(MessageFormat::Metadata),
        Some("raw") => Ok(MessageFormat::Raw),
        Some(other) => anyhow::bail!(
            "unknown format {other:?} (expected 'minimal', 'metadata', 'full', or 'raw')"
        ),
    }
}

/// String label used in [`super::output_file::WriteFileSummary`].
fn message_format_label(format: MessageFormat) -> &'static str {
    match format {
        MessageFormat::Minimal => "minimal",
        MessageFormat::Metadata => "metadata",
        MessageFormat::Full => "full",
        MessageFormat::Raw => "raw",
    }
}

fn yaml_result<T: Serialize>(data: &T) -> Result<String> {
    serde_yaml::to_string(data).context("Failed to serialize result as YAML")
}

#[cfg(test)]
#[allow(clippy::unwrap_used, clippy::expect_used)]
mod tests {
    use rmcp::handler::server::wrapper::Parameters;

    use super::*;
    use crate::gmail::auth::{GmailCredentials, GmailScope};
    use crate::gmail::test_support::EnvGuard;
    use crate::utils::secret::Secret;

    fn test_credentials() -> GmailCredentials {
        GmailCredentials {
            client_id: "client-1".to_string(),
            client_secret: Secret::new("secret-1"),
            refresh_token: Secret::new("refresh-1"),
            scope: GmailScope::ReadOnly,
        }
    }

    async fn client_with_bootstrapped_token(server: &wiremock::MockServer) -> GmailClient {
        wiremock::Mock::given(wiremock::matchers::method("POST"))
            .and(wiremock::matchers::path("/token"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "access_token": "test-token",
                    "expires_in": 3600,
                })),
            )
            .mount(server)
            .await;

        let mut client = GmailClient::new(&server.uri(), &test_credentials()).unwrap();
        crate::gmail::client::test_support::replace_session(
            &mut client,
            &test_credentials(),
            &format!("{}/token", server.uri()),
        );
        client
    }

    /// Pulls the text body out of a successful `CallToolResult`, panicking
    /// with a clear message if the result was an error or non-text payload.
    fn handler_text(result: &CallToolResult) -> String {
        assert!(!result.is_error.unwrap_or(false), "tool returned error");
        result.content[0]
            .as_text()
            .expect("expected text content")
            .text
            .clone()
    }

    // ── parse_message_format ─────────────────────────────────────────

    #[test]
    fn parse_message_format_defaults_to_full() {
        assert!(matches!(
            parse_message_format(None).unwrap(),
            MessageFormat::Full
        ));
    }

    #[test]
    fn parse_message_format_accepts_known_strings() {
        assert!(matches!(
            parse_message_format(Some("minimal")).unwrap(),
            MessageFormat::Minimal
        ));
        assert!(matches!(
            parse_message_format(Some("metadata")).unwrap(),
            MessageFormat::Metadata
        ));
        assert!(matches!(
            parse_message_format(Some("full")).unwrap(),
            MessageFormat::Full
        ));
        assert!(matches!(
            parse_message_format(Some("raw")).unwrap(),
            MessageFormat::Raw
        ));
    }

    #[test]
    fn parse_message_format_is_case_insensitive() {
        assert!(matches!(
            parse_message_format(Some("METADATA")).unwrap(),
            MessageFormat::Metadata
        ));
    }

    #[test]
    fn parse_message_format_rejects_unknown_value() {
        let err = parse_message_format(Some("meta")).unwrap_err();
        assert!(err.to_string().contains("format"));
    }

    // ── message_format_label ────────────────────────────────────────

    #[test]
    fn message_format_label_matches_wire_values() {
        assert_eq!(message_format_label(MessageFormat::Minimal), "minimal");
        assert_eq!(message_format_label(MessageFormat::Metadata), "metadata");
        assert_eq!(message_format_label(MessageFormat::Full), "full");
        assert_eq!(message_format_label(MessageFormat::Raw), "raw");
    }

    // ── run_auth_status ────────────────────────────────────────────────

    #[test]
    fn run_auth_status_reports_unconfigured_state() {
        let guard = EnvGuard::take();
        let _dir = guard.clear_credentials();

        let yaml = run_auth_status(None).unwrap();
        assert!(yaml.contains("has_client_id: false"));
        assert!(yaml.contains("has_refresh_token: false"));
    }

    #[test]
    fn run_auth_status_never_emits_secret_values() {
        let guard = EnvGuard::take();
        let dir = guard.clear_credentials();
        let omni_dir = dir.path().join(".omni-dev");
        std::fs::create_dir_all(&omni_dir).unwrap();
        std::fs::write(
            omni_dir.join("settings.json"),
            r#"{"env":{
                "GMAIL_CLIENT_ID":"client-visible",
                "GMAIL_CLIENT_SECRET":"sekret-do-not-leak",
                "GMAIL_REFRESH_TOKEN":"sekret-refresh-do-not-leak",
                "GMAIL_SCOPE":"https://www.googleapis.com/auth/gmail.readonly"
            }}"#,
        )
        .unwrap();
        std::env::remove_var(auth::GMAIL_CLIENT_ID);
        std::env::remove_var(auth::GMAIL_CLIENT_SECRET);
        std::env::remove_var(auth::GMAIL_REFRESH_TOKEN);
        std::env::remove_var(auth::GMAIL_SCOPE);

        let yaml = run_auth_status(None).unwrap();
        assert!(yaml.contains("has_client_id: true"));
        assert!(yaml.contains("client-visible") || yaml.contains("has_client_id: true"));
        assert!(!yaml.contains("sekret-do-not-leak"));
        assert!(!yaml.contains("sekret-refresh-do-not-leak"));
    }

    // ── run_search ───────────────────────────────────────────────────

    #[tokio::test]
    async fn run_search_defaults_to_ids_only_and_makes_no_hydration_call() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "messages": [{"id": "m1", "threadId": "t1"}]
                })),
            )
            .expect(1)
            .mount(&server)
            .await;
        // No mock for GET .../messages/m1 — if `run_search` hydrated by
        // default, wiremock would 404 and the call would fail.

        let yaml = run_search(
            &client,
            &GmailSearchParams {
                query: "label:finance".to_string(),
                limit: Some(10),
                enrich: None,
                concurrency: None,
                account: None,
            },
        )
        .await
        .unwrap();
        assert!(yaml.contains("id: m1"));
        assert!(yaml.contains("threadId: t1"));
    }

    #[tokio::test]
    async fn run_search_omitted_limit_defaults_to_50_not_hard_cap() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages"))
            .and(wiremock::matchers::query_param("maxResults", "50"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "messages": [{"id": "m1", "threadId": "t1"}]
                })),
            )
            .expect(1)
            .mount(&server)
            .await;
        // No mock matching any other `maxResults` value — if an omitted
        // `limit` fell back to 0 (fetch-to-HARD_CAP) instead of the CLI's
        // 50, the request above wouldn't match and wiremock would 404.

        let yaml = run_search(
            &client,
            &GmailSearchParams {
                query: "label:finance".to_string(),
                limit: None,
                enrich: None,
                concurrency: None,
                account: None,
            },
        )
        .await
        .unwrap();
        assert!(yaml.contains("id: m1"));
    }

    #[tokio::test]
    async fn run_search_enrich_true_hydrates_each_hit() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "messages": [{"id": "m1", "threadId": "t1"}]
                })),
            )
            .mount(&server)
            .await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages/m1"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "id": "m1",
                    "snippet": "Hi there",
                })),
            )
            .expect(1)
            .mount(&server)
            .await;

        let yaml = run_search(
            &client,
            &GmailSearchParams {
                query: "label:finance".to_string(),
                limit: Some(10),
                enrich: Some(true),
                concurrency: Some(2),
                account: None,
            },
        )
        .await
        .unwrap();
        assert!(yaml.contains("Hi there"));
    }

    #[tokio::test]
    async fn run_search_propagates_api_errors() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages"))
            .respond_with(wiremock::ResponseTemplate::new(403).set_body_string("forbidden"))
            .mount(&server)
            .await;

        let err = run_search(
            &client,
            &GmailSearchParams {
                query: "*".to_string(),
                limit: None,
                enrich: None,
                concurrency: None,
                account: None,
            },
        )
        .await
        .unwrap_err();
        assert!(err.to_string().contains("403"));
    }

    // ── run_message_read ───────────────────────────────────────────────

    #[tokio::test]
    async fn run_message_read_returns_yaml_object() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages/m1"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "id": "m1",
                    "snippet": "Hi",
                })),
            )
            .expect(1)
            .mount(&server)
            .await;

        let yaml = run_message_read(
            &client,
            &GmailMessageReadParams {
                message_id: "m1".to_string(),
                format: None,
                output_file: None,
                account: None,
            },
        )
        .await
        .unwrap();
        assert!(yaml.contains("id: m1"));
    }

    #[tokio::test]
    async fn run_message_read_writes_to_output_file() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/messages/m1"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({"id": "m1"})),
            )
            .mount(&server)
            .await;

        let temp_dir = tempfile::tempdir().unwrap();
        let path = temp_dir.path().join("message.yaml");
        let summary_yaml = run_message_read(
            &client,
            &GmailMessageReadParams {
                message_id: "m1".to_string(),
                format: None,
                output_file: Some(path.to_str().unwrap().to_string()),
                account: None,
            },
        )
        .await
        .unwrap();

        assert!(summary_yaml.contains("bytes:"));
        let content = std::fs::read_to_string(&path).unwrap();
        assert!(content.contains("id: m1"));
    }

    #[tokio::test]
    async fn run_message_read_rejects_invalid_format() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;

        let err = run_message_read(
            &client,
            &GmailMessageReadParams {
                message_id: "m1".to_string(),
                format: Some("bogus".to_string()),
                output_file: None,
                account: None,
            },
        )
        .await
        .unwrap_err();
        assert!(err.to_string().contains("format"));
    }

    // ── run_thread_read ────────────────────────────────────────────────

    #[tokio::test]
    async fn run_thread_read_returns_yaml_with_messages() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/threads/t1"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "id": "t1",
                    "messages": [{"id": "m1", "threadId": "t1"}],
                })),
            )
            .expect(1)
            .mount(&server)
            .await;

        let yaml = run_thread_read(
            &client,
            &GmailThreadReadParams {
                thread_id: "t1".to_string(),
                account: None,
            },
        )
        .await
        .unwrap();
        assert!(yaml.contains("id: t1"));
    }

    // ── run_label_list ─────────────────────────────────────────────────

    #[tokio::test]
    async fn run_label_list_returns_yaml_array() {
        let server = wiremock::MockServer::start().await;
        let client = client_with_bootstrapped_token(&server).await;
        wiremock::Mock::given(wiremock::matchers::method("GET"))
            .and(wiremock::matchers::path("/gmail/v1/users/me/labels"))
            .respond_with(
                wiremock::ResponseTemplate::new(200).set_body_json(serde_json::json!({
                    "labels": [{"id": "INBOX", "name": "INBOX", "type": "system"}]
                })),
            )
            .expect(1)
            .mount(&server)
            .await;

        let yaml = run_label_list(&client).await.unwrap();
        assert!(yaml.contains("INBOX"));
    }

    // ── Tool handler bodies (smoke + auth-status full path) ───────────

    #[tokio::test(flavor = "current_thread")]
    async fn gmail_auth_status_handler_returns_yaml_no_secrets() {
        let guard = EnvGuard::take();
        let dir = guard.clear_credentials();
        let omni_dir = dir.path().join(".omni-dev");
        std::fs::create_dir_all(&omni_dir).unwrap();
        std::fs::write(
            omni_dir.join("settings.json"),
            r#"{"env":{
                "GMAIL_CLIENT_ID":"client-1",
                "GMAIL_CLIENT_SECRET":"sekret-secret",
                "GMAIL_REFRESH_TOKEN":"sekret-refresh"
            }}"#,
        )
        .unwrap();
        std::env::remove_var(auth::GMAIL_CLIENT_ID);
        std::env::remove_var(auth::GMAIL_CLIENT_SECRET);
        std::env::remove_var(auth::GMAIL_REFRESH_TOKEN);

        let server = OmniDevServer::new();
        let result = server
            .gmail_auth_status(Parameters(GmailAuthStatusParams::default()))
            .await
            .unwrap();
        let body = handler_text(&result);
        assert!(body.contains("has_client_id: true"));
        assert!(!body.contains("sekret-secret"));
        assert!(!body.contains("sekret-refresh"));
    }

    #[tokio::test(flavor = "current_thread")]
    async fn gmail_search_handler_propagates_credentials_error() {
        let guard = EnvGuard::take();
        let _dir = guard.clear_credentials();

        let server = OmniDevServer::new();
        let err = server
            .gmail_search(Parameters(GmailSearchParams {
                query: "*".to_string(),
                limit: None,
                enrich: None,
                concurrency: None,
                account: None,
            }))
            .await
            .unwrap_err();
        assert!(err.message.contains("not configured"));
    }

    #[tokio::test(flavor = "current_thread")]
    async fn gmail_message_read_handler_rejects_invalid_format() {
        // Even with credentials missing, format parsing happens after
        // client creation in this handler, so this exercises the
        // credentials-error path — the invalid-format path is covered by
        // `run_message_read_rejects_invalid_format` above (client-level).
        let guard = EnvGuard::take();
        let _dir = guard.clear_credentials();

        let server = OmniDevServer::new();
        let err = server
            .gmail_message_read(Parameters(GmailMessageReadParams {
                message_id: "m1".to_string(),
                format: Some("bogus".to_string()),
                output_file: None,
                account: None,
            }))
            .await
            .unwrap_err();
        assert!(err.message.contains("not configured"));
    }

    #[tokio::test(flavor = "current_thread")]
    async fn gmail_search_handler_honors_named_account_param() {
        // A named `account` reaches `create_client_for` — an unknown name
        // surfaces as the account-resolution error, not the generic
        // "not configured" one, proving the param actually propagates
        // (issue #1500).
        let guard = EnvGuard::take();
        let dir = guard.clear_credentials();
        let settings_path = dir.path().join(".omni-dev").join("settings.json");
        Settings::upsert_gmail_account(
            &settings_path,
            "work",
            &[("client_id", serde_json::Value::String("id".to_string()))],
        )
        .unwrap();

        let server = OmniDevServer::new();
        let err = server
            .gmail_search(Parameters(GmailSearchParams {
                query: "*".to_string(),
                limit: None,
                enrich: None,
                concurrency: None,
                account: Some("bogus".to_string()),
            }))
            .await
            .unwrap_err();
        assert!(err.message.contains("unknown Gmail account 'bogus'"));
    }

    // ── run_account_list / gmail_account_list (issue #1500) ────────────

    #[test]
    fn run_account_list_renders_configured_accounts() {
        let guard = EnvGuard::take();
        let dir = guard.clear_credentials();
        let settings_path = dir.path().join(".omni-dev").join("settings.json");
        Settings::upsert_gmail_account(
            &settings_path,
            "work",
            &[
                ("client_id", serde_json::Value::String("id".to_string())),
                (
                    "email_address",
                    serde_json::Value::String("me@work.com".to_string()),
                ),
                ("scope", serde_json::Value::String("readonly".to_string())),
            ],
        )
        .unwrap();
        Settings::set_gmail_default_account(&settings_path, Some("work")).unwrap();

        let yaml = run_account_list().unwrap();
        assert!(yaml.contains("work"));
        assert!(yaml.contains("me@work.com"));
        assert!(yaml.contains("is_default: true"));
    }

    #[test]
    fn run_account_list_empty_when_none_configured() {
        let guard = EnvGuard::take();
        let _dir = guard.clear_credentials();

        let yaml = run_account_list().unwrap();
        assert_eq!(yaml.trim(), "[]");
    }

    #[tokio::test(flavor = "current_thread")]
    async fn gmail_account_list_handler_returns_yaml_no_client_needed() {
        let guard = EnvGuard::take();
        let dir = guard.clear_credentials();
        let settings_path = dir.path().join(".omni-dev").join("settings.json");
        Settings::upsert_gmail_account(
            &settings_path,
            "work",
            &[("client_id", serde_json::Value::String("id".to_string()))],
        )
        .unwrap();

        let server = OmniDevServer::new();
        // Succeeds with no legacy credentials configured at all — proving
        // this tool never resolves a client.
        let result = server
            .gmail_account_list(Parameters(GmailAccountListParams::default()))
            .await
            .unwrap();
        let body = handler_text(&result);
        assert!(body.contains("work"));
    }
}