Merge pull request #109 from openSVM/copilot/fix-108

Add markdown rendering for AI responses in CLI

Author: 0xrinegade

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "osvm"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 license = "MIT"
 description = "OpenSVM CLI tool for managing SVM nodes and deployments"
@@ -61,6 +61,8 @@ solana-sdk-ids = "3.0.0"
 solana-program = "3.0.0"
 solana-system-interface = "2.0.0"
 solana-loader-v3-interface = { version = "6.1.0", features = ["bincode"] }
+# Terminal markdown rendering
+termimad = "0.30"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

Cargo.toml

@@ -2,13 +2,18 @@
 #![allow(unused)]
 
 use {
-    crate::config::Config, // Added
+    crate::config::Config,
     crate::utils::diagnostics::DiagnosticCoordinator,
     crate::utils::{dashboard, ebpf_deploy, examples, nodes, ssh_deploy, svm_info},
+    crate::utils::markdown_renderer::MarkdownRenderer,
     clparse::parse_command_line,
     solana_client::rpc_client::RpcClient,
-    solana_sdk::{native_token::Sol, pubkey::Pubkey, signature::Signer}, // Modified (removed CommitmentConfig) - bad formatting
-    std::{process::exit, str::FromStr},                                 // Modified
+    solana_sdk::{
+        native_token::Sol, 
+        pubkey::Pubkey, 
+        signature::Signer
+    },
+    std::{process::exit, str::FromStr},
 };
 
 // Helper function to handle the type mismatch between clap v2 and v4
@@ -56,22 +61,30 @@ async fn handle_ai_query(
     sub_matches: &clap::ArgMatches,
     app_matches: &clap::ArgMatches,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    // For external subcommands, clap provides the additional arguments differently
-    // We need to collect them from the raw args since clap doesn't know about them
-    let args: Vec<String> = std::env::args().collect();
-
-    // Find where our subcommand starts and collect everything after osvm
-    let mut query_parts = Vec::new();
-    let mut found_osvm = false;
-
-    for arg in args.iter().skip(1) {
-        // Skip the binary name
-        if !found_osvm {
-            found_osvm = true;
-        }
-        // Skip global flags like --help, --version, etc.
-        if !arg.starts_with('-') {
-            query_parts.push(arg.clone());
+    // For external subcommands, clap collects additional arguments in subcommand_value
+    // This is the proper way to handle external subcommands with clap
+    let mut query_parts = vec![sub_command.to_string()];
+    
+    // Get additional arguments from clap's external subcommand handling
+    if let Some(external_args) = sub_matches.get_many::<String>("") {
+        query_parts.extend(external_args.cloned());
+    }
+    
+    // If clap doesn't provide args (fallback), parse from environment
+    // This maintains compatibility while documenting the limitation
+    if query_parts.len() == 1 {
+        let args: Vec<String> = std::env::args().collect();
+        
+        // Collect non-flag arguments starting from the subcommand
+        let mut found_subcommand = false;
+        for arg in args.iter().skip(1) {
+            if found_subcommand {
+                if !arg.starts_with('-') {
+                    query_parts.push(arg.clone());
+                }
+            } else if arg == sub_command {
+                found_subcommand = true;
+            }
         }
     }
 
@@ -91,7 +104,9 @@ async fn handle_ai_query(
             if debug_mode {
                 println!("🤖 AI Response:");
             }
-            println!("{}", response);
+            // Render the response as markdown for better formatting
+            let renderer = MarkdownRenderer::new();
+            renderer.render(&response);
         }
         Err(e) => {
             eprintln!("❌ AI query failed: {}", e);

src/main.rs

@@ -0,0 +1,68 @@
+use termimad::{MadSkin};
+
+/// A markdown renderer for CLI output
+#[derive(Debug, Clone)]
+pub struct MarkdownRenderer {
+    skin: MadSkin,
+}
+
+impl MarkdownRenderer {
+    /// Create a new markdown renderer with default styling
+    pub fn new() -> Self {
+        let skin = MadSkin::default();
+        Self { skin }
+    }
+
+    /// Create a new markdown renderer with custom theme configuration
+    pub fn with_theme() -> Self {
+        // For now, use default theme since termimad color API is complex
+        // TODO: Implement proper color configuration once termimad usage is clarified
+        let skin = MadSkin::default();
+        Self { skin }
+    }
+
+    /// Render markdown text to the terminal
+    /// Note: termimad's print_text never actually fails, so we return unit type
+    pub fn render(&self, markdown: &str) {
+        self.skin.print_text(markdown);
+    }
+
+    /// Render markdown text and return as string (for testing)
+    pub fn render_to_string(&self, markdown: &str) -> String {
+        let fmt_text = self.skin.text(markdown, None);
+        fmt_text.to_string()
+    }
+}
+
+impl Default for MarkdownRenderer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_markdown_renderer_creation() {
+        let renderer = MarkdownRenderer::new();
+        let result = renderer.render_to_string("# Test");
+        assert!(result.contains("Test"));
+    }
+
+    #[test]
+    fn test_basic_markdown_rendering() {
+        let renderer = MarkdownRenderer::new();
+        let markdown = "# Header\nSome **bold** text\n```rust\nlet x = 5;\n```";
+        let output = renderer.render_to_string(markdown);
+        assert!(output.contains("Header"));
+    }
+
+    #[test]
+    fn test_themed_renderer() {
+        let renderer = MarkdownRenderer::with_theme();
+        let result = renderer.render_to_string("# Themed Test");
+        assert!(result.contains("Themed Test"));
+    }
+}

src/utils/markdown_renderer.rs

@@ -52,6 +52,8 @@ pub mod git_manager;
 pub mod local_rpc;
 /// Mainnet RPC connectivity
 pub mod mainnet_rpc;
+/// Markdown rendering for terminal output
+pub mod markdown_renderer;
 /// Node management utilities for monitoring and controlling nodes
 pub mod nodes;
 /// Configurable AI prompt templates system