@pheem49/mint 1.14.0 → 1.15.0

package/crates/mint-cli/src/main.rs

@@ -21,6 +21,7 @@ mod plugins_cli;
 mod setup;
 mod skills;
 mod subagent_wizard;
+pub(crate) mod terminal_theme;
 mod updater;
 
 pub use commands::Command;
@@ -29,12 +30,13 @@ pub use interactive::{
     run_interactive_chat, run_interactive_chat_with_options,
 };
 
-pub const RESET: &str = "\x1b[0m";
-pub const MINT: &str = "\x1b[32m";
-pub const BLUE: &str = "\x1b[38;2;78;201;216m";
-pub const DIM: &str = "\x1b[90m";
-pub const ERROR: &str = "\x1b[31m";
-pub const WARN: &str = "\x1b[33m";
+pub const RESET: &str = terminal_theme::ANSI_RESET;
+pub const BOLD: &str = terminal_theme::ANSI_BOLD;
+pub const MINT: &str = terminal_theme::ANSI_ACCENT;
+pub const BLUE: &str = terminal_theme::ANSI_BLUE;
+pub const DIM: &str = terminal_theme::ANSI_MUTED;
+pub const ERROR: &str = terminal_theme::ANSI_ERROR;
+pub const WARN: &str = terminal_theme::ANSI_WARNING;
 
 pub(crate) async fn run_code_agent_with_saved_image(
     task: &str,
@@ -46,16 +48,29 @@ pub(crate) async fn run_code_agent_with_saved_image(
 ) -> Result<(Vec<String>, Option<String>)> {
     let sent_image = image_data_uri.clone();
     let sent_video = video_data_uri.clone();
+    let tui_handle = options.tui.clone();
     // Follow-up messages the user typed into the queueing box while this
     // turn was still running (see `agent::run_code_agent_with_options`)
     // land here; the caller is responsible for dispatching them. On error
     // the queue is dropped along with the interrupted turn.
     let queue = std::sync::Arc::new(std::sync::Mutex::new(Vec::new()));
-    // The box's leftover, not-yet-submitted text (typed but no Enter yet) at
-    // the moment the turn ended — same idea as `queue` above, but for the one
-    // partial entry that was never confirmed, so the caller can hand it back
-    // as the next prompt's starting text instead of dropping it silently.
     let draft = std::sync::Arc::new(std::sync::Mutex::new(None));
+    let target_chat_id = options
+        .chat_id
+        .clone()
+        .unwrap_or_else(|| mint_core::CHAT_CLI_ID.to_string());
+    if mint_core::is_cli_chat_id(&target_chat_id)
+        && let Ok(memory) = mint_core::MemoryStore::open_default()
+    {
+        let branch = mint_core::git::get_current_branch(current_dir);
+        let lang = mint_core::git::detect_project_language(current_dir);
+        let _ = memory.register_cli_session(
+            &target_chat_id,
+            Some(&current_dir.to_string_lossy()),
+            branch.as_deref(),
+            lang.as_deref(),
+        );
+    }
     let result = agent::run_code_agent_with_options(
         task,
         current_dir,
@@ -68,16 +83,12 @@ pub(crate) async fn run_code_agent_with_saved_image(
     )
     .await;
     result?;
-    // This turn just committed a row to the workspace-scoped "cli" chat_id
-    // (see `scoped_chat_id`) — raise live_sync's watermark past it so the
-    // next poll tick doesn't mistake the user's own just-sent message for
-    // one that arrived from another surface (web/desktop).
+    // This turn just committed a row to the session's chat_id
+    // — raise live_sync's watermark past it so the next poll tick doesn't mistake
+    // the user's own just-sent message for one that arrived from another surface.
     if let Ok(memory) = mint_core::MemoryStore::open_default()
         && let Ok(rows) = memory.recent_interactions_for_chat(
-            &mint_core::scoped_chat_id(
-                mint_core::CHAT_CLI_ID,
-                Some(&current_dir.to_string_lossy()),
-            ),
+            &mint_core::scoped_chat_id(&target_chat_id, Some(&current_dir.to_string_lossy())),
             1,
         )
         && let Some(row) = rows.first()
@@ -85,8 +96,8 @@ pub(crate) async fn run_code_agent_with_saved_image(
         mint_core::live_sync::note_own_interaction(row.id);
     }
     // Save any attached images and videos that were sent with the task
-    image::save_sent_image_after_send(sent_image.as_deref(), task);
-    image::save_sent_image_after_send(sent_video.as_deref(), task);
+    image::save_sent_image_after_send(sent_image.as_deref(), task, tui_handle.as_ref());
+    image::save_sent_image_after_send(sent_video.as_deref(), task, tui_handle.as_ref());
     let queued = queue
         .lock()
         .map(|mut q| std::mem::take(&mut *q))
@@ -160,6 +171,8 @@ pub(crate) async fn run_oneshot_agent_task(
         plan_mode,
         queueing: false,
         pinned_mcp_server,
+        chat_id: None,
+        tui: None,
     };
 
     let queue = std::sync::Arc::new(std::sync::Mutex::new(Vec::new()));
@@ -199,7 +212,7 @@ pub(crate) async fn run_oneshot_agent_task(
         mint_core::live_sync::note_own_interaction(row.id);
     }
 
-    image::save_sent_image_after_send(image_data_uri.as_deref(), task);
+    image::save_sent_image_after_send(image_data_uri.as_deref(), task, None);
     Ok(())
 }
 
@@ -250,10 +263,22 @@ pub struct Cli {
     #[arg(long, global = true)]
     pub plan: bool,
 
+    /// Explicitly use the full-screen interactive chat interface
+    #[arg(long, global = true, conflicts_with = "classic")]
+    pub tui: bool,
+
+    /// Use the classic scrolling interactive interface
+    #[arg(long, global = true, conflicts_with = "tui")]
+    pub classic: bool,
+
     /// Attach an image file to the prompt
     #[arg(long, global = true)]
     pub image: Option<PathBuf>,
 
+    /// Resume a previous conversation session, or open the interactive session picker
+    #[arg(short = 'r', long, global = true)]
+    pub resume: Option<Option<String>>,
+
     #[command(subcommand)]
     pub command: Option<Command>,
 
@@ -266,7 +291,7 @@ pub struct Cli {
 fn install_panic_hook() {
     let default_hook = std::panic::take_hook();
     std::panic::set_hook(Box::new(move |info| {
-        let _ = crossterm::terminal::disable_raw_mode();
+        interactive::restore_terminal();
         log_panic_to_file(&info.to_string());
         default_hook(info);
     }));
@@ -327,7 +352,22 @@ async fn main() -> Result<()> {
             } else {
                 mint_core::channels::start_channels();
                 mint_core::start_cron_scheduler();
-                run_interactive_chat_with_options(cli.model, cli.fast, cli.plan).await?;
+                let resume_id = if let Some(ref r_opt) = cli.resume {
+                    match r_opt {
+                        Some(id) => Some(id.clone()),
+                        None => Some("__prompt__".to_string()),
+                    }
+                } else {
+                    None
+                };
+                interactive::run_interactive_chat_with_session(
+                    cli.model,
+                    cli.fast,
+                    cli.plan,
+                    resume_id,
+                    !cli.classic,
+                )
+                .await?;
             }
         }
         Some(cmd) => {
@@ -361,6 +401,27 @@ mod cli_tests {
         assert_eq!(cli.prompt, vec!["explain this function"]);
     }
 
+    #[test]
+    fn parse_tui_flag() {
+        let cli = Cli::try_parse_from(["mint", "--tui"]).unwrap();
+        assert!(cli.tui);
+        assert!(!cli.classic);
+        assert!(cli.command.is_none());
+        assert!(cli.prompt.is_empty());
+    }
+
+    #[test]
+    fn parse_classic_flag() {
+        let cli = Cli::try_parse_from(["mint", "--classic"]).unwrap();
+        assert!(cli.classic);
+        assert!(!cli.tui);
+    }
+
+    #[test]
+    fn tui_and_classic_conflict() {
+        assert!(Cli::try_parse_from(["mint", "--tui", "--classic"]).is_err());
+    }
+
     #[test]
     fn parse_oneshot_unquoted_prompt_words() {
         let cli = Cli::try_parse_from(["mint", "fix", "all", "tests"]).unwrap();

package/crates/mint-cli/src/markdown.rs

@@ -146,6 +146,11 @@ pub(crate) fn hard_wrap(text: &str, max_width: usize) -> Vec<String> {
 }
 
 pub fn render_markdown_table(table_lines: &[String]) -> String {
+    let (term_width, _) = terminal_size_or_default();
+    render_markdown_table_with_width(table_lines, term_width)
+}
+
+fn render_markdown_table_with_width(table_lines: &[String], term_width: u16) -> String {
     let mut rows: Vec<Vec<String>> = Vec::new();
     for line in table_lines {
         let trimmed = line.trim();
@@ -229,7 +234,6 @@ pub fn render_markdown_table(table_lines: &[String]) -> String {
     // that no longer fits gets word-wrapped below rather than left to overflow
     // and break the border characters (see `wrap_cell_text`).
     if num_cols > 0 {
-        let (term_width, _) = terminal_size_or_default();
         // Each column contributes `width + 2` (one space of padding either
         // side) plus one border character; there's one extra border character
         // closing the row.
@@ -310,7 +314,10 @@ pub fn render_markdown_table(table_lines: &[String]) -> String {
         rendered.push_str(&render_wrapped_row(
             header,
             &col_widths,
-            Some(("\x1b[1;36m", "\x1b[0m")),
+            Some((
+                crate::terminal_theme::ANSI_BLUE_BOLD,
+                crate::terminal_theme::ANSI_RESET,
+            )),
         ));
         rendered.push_str(&draw_border("├", "┼", "┤", "─", &col_widths));
     }
@@ -368,10 +375,10 @@ mod table_tests {
             "| --- | --- |",
             &format!("| x | {long_cell} |"),
         ]);
-        let rendered = render_markdown_table(&table);
+        let rendered = render_markdown_table_with_width(&table, 80);
         assert_borders_aligned(&rendered);
-        // Falls back to 80 columns when no real terminal is attached (test
-        // harness has no TTY), so every physical line must fit within that.
+        // The test pins the renderer to 80 columns so its result does not
+        // depend on whether the test process inherited a real TTY.
         for line in rendered.lines() {
             assert!(
                 unicode_width(line) <= 80,

package/crates/mint-cli/src/onboard.rs

@@ -1,3 +1,5 @@
+const ANSI_BLUE: &str = crate::terminal_theme::ANSI_BLUE;
+
 use anyhow::{Result, bail};
 use crossterm::event::{self, Event, KeyCode};
 use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
@@ -92,9 +94,9 @@ async fn fetch_live_models_with_notice(api_key: &str) -> Vec<String> {
 pub async fn run() -> Result<()> {
     let mut config = load_config()?;
 
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("\x1b[32m       Mint CLI Onboarding Wizard\x1b[0m");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("Welcome to Mint! Let's get your workspace configured.");
     println!();
 
@@ -419,7 +421,7 @@ pub async fn run() -> Result<()> {
 
     // Anthropic
     if is_selected("anthropic", &services) {
-        println!("\n\x1b[36m--- Anthropic (Claude) API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Anthropic (Claude) API ---\x1b[0m");
         config.anthropic_api_key =
             prompt_sensitive("Anthropic API Key", &config.anthropic_api_key)?;
         let anthropic_models = fetch_models_with_notice(&config, "anthropic").await;
@@ -435,7 +437,7 @@ pub async fn run() -> Result<()> {
 
     // OpenAI
     if is_selected("openai", &services) {
-        println!("\n\x1b[36m--- OpenAI API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- OpenAI API ---\x1b[0m");
         config.openai_api_key = prompt_sensitive("OpenAI API Key", &config.openai_api_key)?;
         let openai_models = fetch_models_with_notice(&config, "openai").await;
         config.openai_model = prompt_select_or_custom(
@@ -450,7 +452,7 @@ pub async fn run() -> Result<()> {
 
     // OpenRouter
     if is_selected("openrouter", &services) {
-        println!("\n\x1b[36m--- OpenRouter API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- OpenRouter API ---\x1b[0m");
         println!(
             "\x1b[90mOpenRouter model uses a provider/model slug, for example: openai/gpt-4o-mini, anthropic/claude-3.5-sonnet, google/gemini-2.5-flash, meta-llama/llama-3.3-70b-instruct, mistralai/mistral-large\x1b[0m"
         );
@@ -469,7 +471,7 @@ pub async fn run() -> Result<()> {
 
     // DeepSeek
     if is_selected("deepseek", &services) {
-        println!("\n\x1b[36m--- DeepSeek API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- DeepSeek API ---\x1b[0m");
         println!(
             "\x1b[90mDeepSeek uses OpenAI-compatible model names. Prefer deepseek-v4-flash or deepseek-v4-pro; deepseek-chat and deepseek-reasoner are compatibility aliases scheduled for deprecation on 2026-07-24.\x1b[0m"
         );
@@ -487,7 +489,7 @@ pub async fn run() -> Result<()> {
 
     // Hugging Face
     if is_selected("huggingface", &services) {
-        println!("\n\x1b[36m--- Hugging Face API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Hugging Face API ---\x1b[0m");
         config.hf_api_key = prompt_sensitive("Hugging Face API Key", &config.hf_api_key)?;
         config.hf_model = prompt_select_or_custom(
             "Hugging Face Model",
@@ -501,7 +503,7 @@ pub async fn run() -> Result<()> {
 
     // Local OpenAI
     if is_selected("local_openai", &services) {
-        println!("\n\x1b[36m--- Local OpenAI (e.g. LM Studio) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Local OpenAI (e.g. LM Studio) ---\x1b[0m");
         config.local_api_base_url =
             prompt_input("Local OpenAI Base URL", Some(&config.local_api_base_url))?;
         config.local_model_name = prompt_input("Local Model Name", Some(&config.local_model_name))?;
@@ -511,7 +513,7 @@ pub async fn run() -> Result<()> {
 
     // Ollama
     if is_selected("ollama", &services) {
-        println!("\n\x1b[36m--- Ollama ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Ollama ---\x1b[0m");
         config.ollama_host = prompt_input("Ollama Host", Some(&config.ollama_host))?;
         // Get the server up first, so the model list below can actually see it.
         ensure_ollama_serving(&config.ollama_host);
@@ -540,7 +542,7 @@ pub async fn run() -> Result<()> {
 
     // Google Search
     if is_selected("google_search", &services) {
-        println!("\n\x1b[36m--- Google Search API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Google Search API ---\x1b[0m");
         let current_key = config
             .extra
             .get("googleSearchApiKey")
@@ -573,7 +575,7 @@ pub async fn run() -> Result<()> {
 
     // Brave Search
     if is_selected("brave_search", &services) {
-        println!("\n\x1b[36m--- Brave Search API ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Brave Search API ---\x1b[0m");
         let current_key = config
             .extra
             .get("braveSearchApiKey")
@@ -593,7 +595,7 @@ pub async fn run() -> Result<()> {
 
     // SearXNG
     if is_selected("searxng", &services) {
-        println!("\n\x1b[36m--- SearXNG (self-hosted) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- SearXNG (self-hosted) ---\x1b[0m");
         let current_url = config
             .extra
             .get("searxngBaseUrl")
@@ -645,7 +647,7 @@ pub async fn run() -> Result<()> {
         .collect();
 
         let provider = if configured.len() > 1 {
-            println!("\n\x1b[36m--- Preferred Search Provider ---\x1b[0m");
+            println!("\n{ANSI_BLUE}--- Preferred Search Provider ---\x1b[0m");
             let current = config
                 .extra
                 .get("searchProvider")
@@ -681,7 +683,7 @@ pub async fn run() -> Result<()> {
 
     // Telegram Bot
     if is_selected("telegram", &services) {
-        println!("\n\x1b[36m--- Telegram Bot Bridge ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Telegram Bot Bridge ---\x1b[0m");
         let current_token = config
             .extra
             .get("telegramBotToken")
@@ -705,7 +707,7 @@ pub async fn run() -> Result<()> {
 
     // Discord Bot
     if is_selected("discord", &services) {
-        println!("\n\x1b[36m--- Discord Bot Bridge ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Discord Bot Bridge ---\x1b[0m");
         let current_token = config
             .extra
             .get("discordBotToken")
@@ -739,7 +741,7 @@ pub async fn run() -> Result<()> {
 
     // Slack Bot
     if is_selected("slack", &services) {
-        println!("\n\x1b[36m--- Slack Bot Bridge ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Slack Bot Bridge ---\x1b[0m");
         let current_token = config
             .extra
             .get("slackBotToken")
@@ -773,7 +775,7 @@ pub async fn run() -> Result<()> {
 
     // LINE Bot
     if is_selected("line", &services) {
-        println!("\n\x1b[36m--- LINE Bot Bridge ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- LINE Bot Bridge ---\x1b[0m");
         let current_token = config
             .extra
             .get("lineChannelAccessToken")
@@ -807,7 +809,7 @@ pub async fn run() -> Result<()> {
 
     // WhatsApp Cloud
     if is_selected("whatsapp", &services) {
-        println!("\n\x1b[36m--- WhatsApp Cloud Bridge ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- WhatsApp Cloud Bridge ---\x1b[0m");
         let current_token = config
             .extra
             .get("whatsappCloudAccessToken")
@@ -863,7 +865,7 @@ pub async fn run() -> Result<()> {
     // has no official bot API, so unlike the other bridges here Mint is the
     // one polling a REST endpoint rather than receiving a webhook/socket push)
     if is_selected("signal", &services) {
-        println!("\n\x1b[36m--- Signal Bridge ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Signal Bridge ---\x1b[0m");
         println!(
             "Needs a self-hosted signal-cli-rest-api instance with a number already \
              linked/registered: https://github.com/bbernhard/signal-cli-rest-api"
@@ -906,7 +908,7 @@ pub async fn run() -> Result<()> {
     // plugin — see `mint gmail auth` — rather than asking for separate
     // IMAP/SMTP credentials)
     if is_selected("email", &services) {
-        println!("\n\x1b[36m--- Email Bridge (via Gmail) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Email Bridge (via Gmail) ---\x1b[0m");
         println!(
             "Reuses the same Gmail OAuth connection as the `gmail` plugin. Needs a \
              Google Cloud OAuth client (Client ID/Secret) — see \
@@ -960,7 +962,7 @@ pub async fn run() -> Result<()> {
 
     // NanoBanana (Gemini Images)
     if is_selected("img_nanobanana", &services) {
-        println!("\n\x1b[36m--- Google NanoBanana (Gemini Images) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Google NanoBanana (Gemini Images) ---\x1b[0m");
         println!(
             "\x1b[90mUses the same Gemini API key as Step 1. Select the image generation model.\x1b[0m"
         );
@@ -975,7 +977,7 @@ pub async fn run() -> Result<()> {
 
     // DALL·E
     if is_selected("img_dalle", &services) {
-        println!("\n\x1b[36m--- OpenAI DALL·E ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- OpenAI DALL·E ---\x1b[0m");
         println!(
             "\x1b[90mUses the same OpenAI API key. DALL·E 3 supports only 1 image per request; DALL·E 2 supports up to 10.\x1b[0m"
         );
@@ -990,7 +992,7 @@ pub async fn run() -> Result<()> {
 
     // Stability AI
     if is_selected("img_stability", &services) {
-        println!("\n\x1b[36m--- Stability AI ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Stability AI ---\x1b[0m");
         println!(
             "\x1b[90mGet your API key at https://platform.stability.ai/. Supports SD3.5 Large, SD3 Medium, and Stable Image Core.\x1b[0m"
         );
@@ -1009,7 +1011,7 @@ pub async fn run() -> Result<()> {
 
     // Ideogram
     if is_selected("img_ideogram", &services) {
-        println!("\n\x1b[36m--- Ideogram ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Ideogram ---\x1b[0m");
         println!(
             "\x1b[90mGet your API key at https://ideogram.ai/api. Supports V_3, V_2, and V_2_TURBO.\x1b[0m"
         );
@@ -1027,7 +1029,7 @@ pub async fn run() -> Result<()> {
 
     // Replicate
     if is_selected("img_replicate", &services) {
-        println!("\n\x1b[36m--- Replicate ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Replicate ---\x1b[0m");
         println!(
             "\x1b[90mGet your API token at https://replicate.com/account/api-tokens. Works with FLUX, SDXL, and any public image model.\x1b[0m"
         );
@@ -1046,7 +1048,7 @@ pub async fn run() -> Result<()> {
 
     // Black Forest Labs (FLUX API)
     if is_selected("img_bfl", &services) {
-        println!("\n\x1b[36m--- Black Forest Labs (FLUX API) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Black Forest Labs (FLUX API) ---\x1b[0m");
         println!(
             "\x1b[90mGet your API key at https://api.bfl.ml. Supports flux-pro-1.1, flux-pro-1.1-ultra, flux-dev, and flux-pro-1.0-fill.\x1b[0m"
         );
@@ -1064,7 +1066,7 @@ pub async fn run() -> Result<()> {
 
     // Google Veo (Gemini Videos)
     if is_selected("vid_veo", &services) {
-        println!("\n\x1b[36m--- Google Veo (Gemini Videos) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Google Veo (Gemini Videos) ---\x1b[0m");
         println!(
             "\x1b[90mUses the same Gemini API key as Step 1. Select the video generation model.\x1b[0m"
         );
@@ -1099,7 +1101,7 @@ pub async fn run() -> Result<()> {
     }
 
     if is_selected("gemini_live", &services) {
-        println!("\n\x1b[36m--- Realtime Live Model (Gemini Live) ---\x1b[0m");
+        println!("\n{ANSI_BLUE}--- Realtime Live Model (Gemini Live) ---\x1b[0m");
         println!(
             "\x1b[90mUses the same Gemini API key as Step 1. Select the model used for realtime voice conversations.\x1b[0m"
         );
@@ -1152,7 +1154,7 @@ fn print_services(services: &[OnboardService], cursor: usize) {
         };
         if i == cursor {
             println!(
-                "    \x1b[36m❯\x1b[0m {} \x1b[36m{}\x1b[0m",
+                "    {ANSI_BLUE}❯\x1b[0m {} {ANSI_BLUE}{}\x1b[0m",
                 checkbox, svc.name
             );
         } else {
@@ -1503,7 +1505,7 @@ fn ensure_ollama_serving(host: &str) {
 pub(crate) fn print_select_options(options: &[String], cursor: usize) {
     for (i, option) in options.iter().enumerate() {
         if i == cursor {
-            println!("  \x1b[36m❯\x1b[0m \x1b[36m{}\x1b[0m", option);
+            println!("  {ANSI_BLUE}❯\x1b[0m {ANSI_BLUE}{}\x1b[0m", option);
         } else {
             println!("    {}", option);
         }

package/crates/mint-cli/src/plugins_cli.rs

@@ -2,6 +2,9 @@
 //! Provides commands for listing, enabling/disabling, configuring API credentials,
 //! and managing OAuth sign-in for all Built-in Plugins.
 
+const ANSI_BLUE: &str = crate::terminal_theme::ANSI_BLUE;
+const ANSI_BLUE_BOLD: &str = crate::terminal_theme::ANSI_BLUE_BOLD;
+
 use anyhow::{Result, anyhow};
 use clap::Subcommand;
 use crossterm::event::{self, Event, KeyCode};
@@ -222,7 +225,7 @@ pub fn list_plugins(config: &MintConfig) -> Result<()> {
             if let Some(st) = matched {
                 if st.connected {
                     format!(
-                        "\x1b[36mConnected ({})\x1b[0m",
+                        "{ANSI_BLUE}Connected ({})\x1b[0m",
                         st.account_email.as_deref().unwrap_or("Yes")
                     )
                 } else {
@@ -342,7 +345,7 @@ async fn login_plugin_oauth(provider: &str) -> Result<()> {
     let (auth_url, _state) = build_auth_url(provider, redirect_uri, client_id.as_deref())
         .ok_or_else(|| anyhow!("Invalid OAuth provider: {provider}"))?;
 
-    println!("\x1b[1;36m🔑 Mint OAuth Sign-In Authorization\x1b[0m");
+    println!("{ANSI_BLUE_BOLD}🔑 Mint OAuth Sign-In Authorization\x1b[0m");
     println!(
         "  Opening browser for provider: \x1b[32m{}\x1b[0m",
         provider
@@ -532,7 +535,7 @@ pub async fn run_interactive_plugins_wizard(config: &mut MintConfig) -> Result<(
     for (plugin, enabled) in &items {
         if *enabled {
             let title = format!(
-                "\x1b[1;36m⚙️ Authentication Setup for {}\x1b[0m",
+                "{ANSI_BLUE_BOLD}⚙️ Authentication Setup for {}\x1b[0m",
                 plugin.name
             );
             if plugin.is_oauth {
@@ -627,7 +630,7 @@ fn prompt_select_option_menu(title: &str, options: &[&str]) -> Result<usize> {
 fn print_select_options_list(options: &[&str], cursor: usize) {
     for (i, option) in options.iter().enumerate() {
         if i == cursor {
-            println!("  \x1b[36m❯\x1b[0m \x1b[36m{}\x1b[0m", option);
+            println!("  {ANSI_BLUE}❯\x1b[0m {ANSI_BLUE}{}\x1b[0m", option);
         } else {
             println!("    {}", option);
         }
@@ -734,7 +737,7 @@ fn print_plugin_checkbox_items(items: &[(&BuiltinPluginInfo, bool)], cursor: usi
         };
         if i == cursor {
             println!(
-                "  \x1b[36m❯\x1b[0m {} \x1b[36m{:<18}\x1b[0m \x1b[90m({})\x1b[0m",
+                "  {ANSI_BLUE}❯\x1b[0m {} {ANSI_BLUE}{:<18}\x1b[0m \x1b[90m({})\x1b[0m",
                 checkbox, plugin.name, plugin.description
             );
         } else {

package/crates/mint-cli/src/setup.rs

@@ -1,3 +1,5 @@
+const ANSI_BLUE: &str = crate::terminal_theme::ANSI_BLUE;
+
 use anyhow::Result;
 use crossterm::event::{self, Event, KeyCode};
 use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
@@ -599,7 +601,7 @@ fn print_options(options: &[ToolOption], cursor: usize) {
         };
         if i == cursor {
             println!(
-                "  \x1b[36m❯\x1b[0m {} \x1b[36m{}\x1b[0m",
+                "  {ANSI_BLUE}❯\x1b[0m {} {ANSI_BLUE}{}\x1b[0m",
                 checkbox, opt.name
             );
         } else {
@@ -612,7 +614,7 @@ fn print_options(options: &[ToolOption], cursor: usize) {
 fn print_run_options(options: &[ToolOption], cursor: usize) {
     for (i, opt) in options.iter().enumerate() {
         if i == cursor {
-            println!("  \x1b[36m❯\x1b[0m \x1b[36m{}\x1b[0m", opt.name);
+            println!("  {ANSI_BLUE}❯\x1b[0m {ANSI_BLUE}{}\x1b[0m", opt.name);
         } else {
             println!("    {}", opt.name);
         }
@@ -622,9 +624,9 @@ fn print_run_options(options: &[ToolOption], cursor: usize) {
 
 fn redraw_phase_1(options: &[ToolOption], cursor: usize) {
     print!("\x1b[2J\x1b[1;1H");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("\x1b[32m       Mint CLI Tool Manager Wizard\x1b[0m");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("Configure which agent tools are enabled or disabled:");
     println!(
         "  \x1b[90m[Keyboard Controls: ↑/↓: Navigate | Space: Toggle | a: All | i: Invert | Enter: Confirm]\x1b[0m"
@@ -635,9 +637,9 @@ fn redraw_phase_1(options: &[ToolOption], cursor: usize) {
 
 fn redraw_phase_2(options: &[ToolOption], cursor: usize) {
     print!("\x1b[2J\x1b[1;1H");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("\x1b[32m       Configure Native Plugins Access\x1b[0m");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("Select which native plugins are allowed to run:");
     println!(
         "  \x1b[90m[Keyboard Controls: ↑/↓: Navigate | Space: Toggle | a: All | i: Invert | Enter: Confirm]\x1b[0m"
@@ -648,9 +650,9 @@ fn redraw_phase_2(options: &[ToolOption], cursor: usize) {
 
 fn redraw_phase_3(options: &[ToolOption], cursor: usize) {
     print!("\x1b[2J\x1b[1;1H");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("\x1b[32m       Choose where to run Mint AI Agent\x1b[0m");
-    println!("\x1b[36m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
+    println!("{ANSI_BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\x1b[0m");
     println!("Select the environment you want to launch:");
     println!("  \x1b[90m[Keyboard Controls: ↑/↓: Navigate | Enter: Confirm]\x1b[0m");
     println!();