Merge origin/master and resolve conflicts

Keep Cortex naming convention, remove legacy FABRIC_ backward compatibility

Author: factorydroid

AMELIORATIONS.md

@@ -242,6 +242,7 @@ toml_edit = "0.23"
 # CLI - Arguments
 clap = { version = "4", features = ["derive", "wrap_help", "env"] }
 clap_complete = "4"
+clap_mangen = "0.2"
 
 # CLI - TUI
 ratatui = { version = "0.29", features = ["scrolling-regions", "unstable-backend-writer", "unstable-rendered-line-info", "unstable-widget-ref"] }

Cargo.lock

@@ -20,6 +20,8 @@ workspace = true
 default = ["cortex-tui"]
 # Use the new Cortex TUI (120 FPS, Cortex theme)
 cortex-tui = ["dep:cortex-tui"]
+# Enable HTTP transport for MCP server
+mcp-http = ["cortex-mcp-server/http"]
 
 [dependencies]
 cortex-engine = { workspace = true }
@@ -31,9 +33,11 @@ cortex-login = { workspace = true }
 cortex-process-hardening = { workspace = true }
 cortex-app-server = { workspace = true }
 cortex-update = { workspace = true }
+cortex-mcp-server = { workspace = true }
 
 clap = { workspace = true }
 clap_complete = { workspace = true }
+clap_mangen = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 anyhow = { workspace = true }
 tracing = { workspace = true }
@@ -61,3 +65,6 @@ scraper = "0.22"
 
 # For mDNS service discovery
 hostname = { workspace = true }
+
+# For finding binary location in PATH
+which = { workspace = true }

Cargo.toml

@@ -5,6 +5,7 @@
 
 use anyhow::Result;
 use clap::Parser;
+use cortex_common::resolve_model_alias;
 use std::net::SocketAddr;
 use std::path::PathBuf;
 
@@ -53,7 +54,8 @@ impl AcpCli {
         }
 
         if let Some(model) = &self.model {
-            config.model = model.clone();
+            // Resolve model alias (e.g., "sonnet" -> "anthropic/claude-sonnet-4-20250514")
+            config.model = resolve_model_alias(model).to_string();
         }
 
         // Decide transport mode

cortex-cli/Cargo.toml

@@ -810,7 +810,15 @@ async fn run_show(args: ShowArgs) -> Result<()> {
 
     println!("Mode: {}", agent.mode);
     println!("Source: {}", agent.source);
-    println!("Native: {}", agent.native);
+    println!(
+        "Native: {} ({})",
+        if agent.native { "yes" } else { "no" },
+        if agent.native {
+            "built-in agent bundled with Cortex"
+        } else {
+            "user-defined agent"
+        }
+    );
     println!("Hidden: {}", agent.hidden);
     println!(
         "Can Delegate: {} ({})",
@@ -839,7 +847,9 @@ async fn run_show(args: ShowArgs) -> Result<()> {
     }
 
     if let Some(ref color) = agent.color {
-        println!("Color: {color}");
+        // Display color with preview (colored block using ANSI escape codes)
+        let color_preview = format_color_preview(color);
+        println!("Color: {color} {color_preview}");
     }
 
     if !agent.tags.is_empty() {
@@ -1512,6 +1522,30 @@ Provide architectural recommendations with:
 - Implementation roadmap
 "#;
 
+/// Format a hex color as an ANSI-colored preview block.
+///
+/// Converts a hex color like "#FF5733" to an ANSI escape sequence that
+/// displays a colored block (using true color if supported).
+fn format_color_preview(hex_color: &str) -> String {
+    // Parse hex color (strip leading # if present)
+    let hex = hex_color.trim_start_matches('#');
+
+    // Only process valid 6-character hex colors
+    if hex.len() != 6 {
+        return String::new();
+    }
+
+    // Parse RGB components
+    let r = u8::from_str_radix(&hex[0..2], 16).unwrap_or(128);
+    let g = u8::from_str_radix(&hex[2..4], 16).unwrap_or(128);
+    let b = u8::from_str_radix(&hex[4..6], 16).unwrap_or(128);
+
+    // Create ANSI true color (24-bit) escape sequence for background
+    // Format: \x1b[48;2;R;G;Bm (background color)
+    // Use 2 space characters as the "block" with reset at end
+    format!("\x1b[48;2;{};{};{}m  \x1b[0m", r, g, b)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;