Apply recent changes

crates/owlen-cli/src/main.rs

@@ -1,9 +1,9 @@
 //! OWLEN CLI - Chat TUI client
 
 use anyhow::Result;
-use clap::{Arg, Command};
 use owlen_core::{session::SessionController, storage::StorageManager};
 use owlen_ollama::OllamaProvider;
+use owlen_tui::tui_controller::{TuiController, TuiRequest};
 use owlen_tui::{config, ui, AppState, ChatApp, Event, EventHandler, SessionEvent};
 use std::io;
 use std::sync::Arc;
@@ -15,49 +15,41 @@ use crossterm::{
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
-use ratatui::{backend::CrosstermBackend, Terminal};
+use ratatui::{prelude::CrosstermBackend, Terminal};
 
-#[tokio::main]
+#[tokio::main(flavor = "multi_thread")]
 async fn main() -> Result<()> {
-    let matches = Command::new("owlen")
-        .about("OWLEN - A chat-focused TUI client for Ollama")
-        .version(env!("CARGO_PKG_VERSION"))
-        .arg(
-            Arg::new("model")
-                .short('m')
-                .long("model")
-                .value_name("MODEL")
-                .help("Preferred model to use for this session"),
-        )
-        .get_matches();
+    // (imports completed above)
 
-    let mut config = config::try_load_config().unwrap_or_default();
+    // (main logic starts below)
+    // Set auto-consent for TUI mode to prevent blocking stdin reads
+    std::env::set_var("OWLEN_AUTO_CONSENT", "1");
 
-    if let Some(model) = matches.get_one::<String>("model") {
-        config.general.default_model = Some(model.clone());
-    }
-
-    // Prepare provider from configuration
-    let provider_name = config.general.default_provider.clone();
-    let provider_cfg = config::ensure_provider_config(&mut config, &provider_name).clone();
+    let (tui_tx, _tui_rx) = mpsc::unbounded_channel::<TuiRequest>();
+    let tui_controller = Arc::new(TuiController::new(tui_tx));
 
+    // Load configuration (or fall back to defaults) for the session controller.
+    let mut cfg = config::try_load_config().unwrap_or_default();
+    // Disable encryption for CLI to avoid password prompts in this environment.
+    cfg.privacy.encrypt_local_data = false;
+    // Determine provider configuration
+    let provider_name = cfg.general.default_provider.clone();
+    let provider_cfg = config::ensure_provider_config(&mut cfg, &provider_name).clone();
     let provider_type = provider_cfg.provider_type.to_ascii_lowercase();
     if provider_type != "ollama" && provider_type != "ollama-cloud" {
         anyhow::bail!(
             "Unsupported provider type '{}' configured for provider '{}'",
             provider_cfg.provider_type,
-            provider_name
+            provider_name,
         );
     }
-
     let provider = Arc::new(OllamaProvider::from_config(
         &provider_cfg,
-        Some(&config.general),
+        Some(&cfg.general),
     )?);
-
     let storage = Arc::new(StorageManager::new().await?);
-    // Chat client - code execution tools disabled (only available in code client)
-    let controller = SessionController::new(provider, config.clone(), storage.clone(), false)?;
+    let controller =
+        SessionController::new(provider, cfg, storage.clone(), tui_controller, false).await?;
     let (mut app, mut session_rx) = ChatApp::new(controller).await?;
     app.initialize_models().await?;
 
@@ -86,7 +78,7 @@ async fn main() -> Result<()> {
     event_handle.await?;
 
     // Persist configuration updates (e.g., selected model)
-    config::save_config(app.config())?;
+    config::save_config(&app.config())?;
 
     disable_raw_mode()?;
     execute!(