fix: resolve merge conflicts and fix API changes

- Fixed duplicate import of get_cortex_home in login.rs
- Updated fabric_home to cortex_home in debug_cmd.rs
- Fixed run_logout call to include skip_confirmation parameter
- Re-added yes flag to LogoutCommand struct

Author: factorydroid

cortex-cli/src/debug_cmd.rs

@@ -227,7 +227,7 @@ async fn run_config(args: ConfigArgs) -> Result<()> {
         println!("Config Diff (Global vs Local)");
         println!("{}", "=".repeat(50));
 
-        let global_path = config.fabric_home.join("config.toml");
+        let global_path = config.cortex_home.join("config.toml");
         let local_path = std::env::current_dir()
             .ok()
             .map(|d| d.join(".cortex/config.toml"));

cortex-cli/src/login.rs

@@ -1,12 +1,12 @@
 //! Login command handlers.
 
-use cortex_common::{CliConfigOverrides, get_cortex_home};
+use cortex_common::CliConfigOverrides;
 use cortex_login::{
     AuthMode, CredentialsStoreMode, SecureAuthData, load_auth_with_fallback, logout,
     safe_format_key, save_auth_with_fallback,
 };
 use std::collections::HashSet;
-use std::io::{BufRead, IsTerminal, Read};
+use std::io::{IsTerminal, Read};
 use std::path::PathBuf;
 
 /// Check for duplicate config override keys and warn the user.
@@ -33,7 +33,7 @@ fn check_duplicate_config_overrides(config_overrides: &CliConfigOverrides) {
 
 /// Get the cortex home directory using unified directory management.
 fn get_cortex_home() -> PathBuf {
-    get_cortex_home().unwrap_or_else(|| {
+    cortex_common::get_cortex_home().unwrap_or_else(|| {
         dirs::home_dir()
             .map(|h| h.join(".cortex"))
             .unwrap_or_else(|| PathBuf::from(".cortex"))

cortex-cli/src/main.rs

@@ -347,6 +347,11 @@ enum LoginSubcommand {
 struct LogoutCommand {
     #[clap(skip)]
     config_overrides: CliConfigOverrides,
+
+    /// Skip confirmation prompt and log out immediately.
+    /// Useful for scripting and automation.
+    #[arg(short = 'y', long = "yes")]
+    yes: bool,
 }
 
 /// Completion command.
@@ -575,7 +580,7 @@ async fn main() -> Result<()> {
             Ok(())
         }
         Some(Commands::Logout(logout_cli)) => {
-            run_logout(logout_cli.config_overrides).await;
+            run_logout(logout_cli.config_overrides, logout_cli.yes).await;
             Ok(())
         }
         Some(Commands::Mcp(mcp_cli)) => mcp_cli.run().await,