merge: resolve conflicts with origin/master

Author: echobt

Cargo.lock

@@ -80,9 +80,6 @@ members = [
     # CLI - LM Studio Integration
     "src/cortex-lmstudio",
 
-    # CLI - Ollama Integration
-    "src/cortex-ollama",
-    
     # CLI - TUI
     "src/cortex-core",
     "src/cortex-tui",
@@ -224,7 +221,6 @@ cortex-experimental = { path = "src/cortex-experimental" }
 cortex-linux-sandbox = { path = "src/cortex-linux-sandbox" }
 cortex-windows-sandbox = { path = "src/cortex-windows-sandbox" }
 cortex-lmstudio = { path = "src/cortex-lmstudio" }
-cortex-ollama = { path = "src/cortex-ollama" }
 cortex-skills = { path = "src/cortex-skills" }
 cortex-prompt-harness = { path = "src/cortex-prompt-harness" }
 
@@ -383,6 +379,7 @@ sysinfo = "0.32"
 hex = "0.4"
 urlencoding = "2.1"
 pin-project-lite = "0.2"
+rodio = { version = "0.19", default-features = false, features = ["wav"] }
 
 [workspace.lints.rust]
 unsafe_code = "allow"

Cargo.toml

@@ -3,10 +3,10 @@
 use crate::backend::TerminalBackend;
 use crate::renderer::{FramePacer, Renderer};
 use crate::CrosstermBackend;
-use crossterm::event::{poll, read};
 use cortex_tui_buffer::Buffer;
 use cortex_tui_core::Result;
 use cortex_tui_input::Event;
+use crossterm::event::{poll, read};
 use std::time::{Duration, Instant};
 
 /// Application state for the event loop.

cortex-tui-framework/crates/cortex-tui-terminal/src/application.rs

@@ -1,6 +1,7 @@
 //! Terminal backend abstraction and crossterm implementation.
 
 use crate::Capabilities;
+use cortex_tui_core::{Color, Error, Result, TextAttributes};
 use crossterm::{
     cursor::{Hide, MoveTo, Show},
     event::{
@@ -17,7 +18,6 @@ use crossterm::{
         LeaveAlternateScreen,
     },
 };
-use cortex_tui_core::{Color, Error, Result, TextAttributes};
 use std::io::{self, Stdout, Write};
 
 /// Trait for terminal backend implementations.

cortex-tui-framework/crates/cortex-tui-terminal/src/backend.rs

@@ -48,7 +48,9 @@ pub use cortex_tui_widgets as widgets;
 pub mod prelude {
     pub use cortex_tui_core::{Color, Point, Rect, Size, Style, TextAttributes};
     pub use cortex_tui_input::{Event, KeyCode, KeyModifiers, MouseButton, MouseEvent};
-    pub use cortex_tui_layout::{AlignContent, AlignItems, FlexDirection, FlexWrap, JustifyContent};
+    pub use cortex_tui_layout::{
+        AlignContent, AlignItems, FlexDirection, FlexWrap, JustifyContent,
+    };
     pub use cortex_tui_terminal::Application;
     pub use cortex_tui_widgets::{BoxWidget, Input, ScrollBox, TextWidget, Widget};
 }

cortex-tui-framework/src/lib.rs

@@ -2,7 +2,10 @@
 
 use std::sync::Arc;
 
-use axum::{Json, extract::{Path, State}};
+use axum::{
+    Json,
+    extract::{Path, State},
+};
 
 use crate::error::{AppError, AppResult};
 use crate::state::AppState;
@@ -344,9 +347,7 @@ fn parse_agent_content(content: &str, _format: &str) -> AppResult<(String, Agent
 }
 
 /// Import an agent from file content.
-pub async fn import_agent(
-    Json(req): Json<ImportAgentRequest>,
-) -> AppResult<Json<AgentDefinition>> {
+pub async fn import_agent(Json(req): Json<ImportAgentRequest>) -> AppResult<Json<AgentDefinition>> {
     // Parse the content to extract name and other metadata
     let (name, agent) = parse_agent_content(&req.content, &req.format)?;
 

src/cortex-app-server/src/api/agents.rs

@@ -3,7 +3,10 @@
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
-use axum::{Json, extract::{Query, State}};
+use axum::{
+    Json,
+    extract::{Query, State},
+};
 
 use crate::error::AppResult;
 use crate::mdns::MdnsDiscovery;

src/cortex-app-server/src/api/discovery.rs

@@ -2,7 +2,10 @@
 
 use std::sync::Arc;
 
-use axum::{Json, extract::{Query, State}};
+use axum::{
+    Json,
+    extract::{Query, State},
+};
 
 use crate::error::{AppError, AppResult};
 use crate::state::AppState;

src/cortex-app-server/src/api/files.rs

@@ -76,7 +76,10 @@ pub fn routes() -> Router<Arc<AppState>> {
         .route("/agents", post(agents::create_agent))
         .route("/agents/builtin", get(agents::list_builtin_agents))
         .route("/agents/import", post(agents::import_agent))
-        .route("/agents/generate-prompt", post(agents::generate_agent_prompt))
+        .route(
+            "/agents/generate-prompt",
+            post(agents::generate_agent_prompt),
+        )
         .route("/agents/:name", get(agents::get_agent))
         .route("/agents/:name", axum::routing::put(agents::update_agent))
         .route("/agents/:name", delete(agents::delete_agent))

src/cortex-app-server/src/api/mod.rs

@@ -2,7 +2,10 @@
 
 use std::sync::Arc;
 
-use axum::{Json, extract::{Path, State}};
+use axum::{
+    Json,
+    extract::{Path, State},
+};
 
 use crate::error::{AppError, AppResult};
 use crate::state::AppState;