Resolve conflicts & clippy fmt

Author: dk19y

crates/chat-cli/src/cli/chat/cli/usage/mod.rs

@@ -1,7 +1,11 @@
 use clap::Args;
 
 use crate::cli::chat::token_counter::TokenCount;
-use crate::cli::chat::{ChatError, ChatSession, ChatState};
+use crate::cli::chat::{
+    ChatError,
+    ChatSession,
+    ChatState,
+};
 use crate::os::Os;
 
 pub mod usage_data_provider;
@@ -32,6 +36,8 @@ impl UsageArgs {
     pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         let usage_data = usage_data_provider::get_detailed_usage_data(session, os).await?;
         usage_renderer::render_context_window(&usage_data, session).await?;
-        Ok(ChatState::PromptUser { skip_printing_tools: true })
+        Ok(ChatState::PromptUser {
+            skip_printing_tools: true,
+        })
     }
-}
+}

crates/chat-cli/src/cli/chat/cli/usage/usage_data_provider.rs

@@ -1,10 +1,19 @@
 use crate::cli::chat::cli::model::context_window_tokens;
-use crate::cli::chat::token_counter::{CharCount, TokenCount};
-use crate::cli::chat::{ChatError, ChatSession};
+use crate::cli::chat::token_counter::{
+    CharCount,
+    TokenCount,
+};
+use crate::cli::chat::{
+    ChatError,
+    ChatSession,
+};
 use crate::os::Os;
 
 /// Get detailed usage data for context window analysis
-pub(super) async fn get_detailed_usage_data(session: &mut ChatSession, os: &Os) -> Result<super::DetailedUsageData, ChatError> {
+pub(super) async fn get_detailed_usage_data(
+    session: &mut ChatSession,
+    os: &Os,
+) -> Result<super::DetailedUsageData, ChatError> {
     let context_window_size = context_window_tokens(session.conversation.model_info.as_ref());
 
     let state = session

crates/chat-cli/src/cli/chat/cli/usage/usage_renderer.rs

@@ -1,8 +1,15 @@
 use crossterm::style::Attribute;
-use crossterm::{execute, queue, style};
+use crossterm::{
+    execute,
+    queue,
+    style,
+};
 
 use crate::cli::chat::token_counter::TokenCount;
-use crate::cli::chat::{ChatError, ChatSession};
+use crate::cli::chat::{
+    ChatError,
+    ChatSession,
+};
 use crate::theme::StyledText;
 
 /// Calculate usage percentage from token counts (private utility)
@@ -11,7 +18,10 @@ fn calculate_usage_percentage(tokens: TokenCount, context_window_size: usize) ->
 }
 
 /// Render context window information section
-pub async fn render_context_window(usage_data: &super::DetailedUsageData, session: &mut ChatSession) -> Result<(), ChatError> {
+pub async fn render_context_window(
+    usage_data: &super::DetailedUsageData,
+    session: &mut ChatSession,
+) -> Result<(), ChatError> {
     if !usage_data.dropped_context_files.is_empty() {
         execute!(
             session.stderr,

crates/chat-cli/src/mcp_client/client.rs

@@ -59,8 +59,6 @@ use crate::cli::chat::tools::custom_tool::{
     TransportType,
 };
 use crate::os::Os;
-<<<<<<< HEAD
-use crate::util::directories::DirectoryError;
 use crate::util::env_var::get_all_env_vars;
 
 /// Fetches all pages of specified resources from a server
@@ -142,8 +140,6 @@ pub enum McpClientError {
     #[error("Client has not finished initializing")]
     NotReady,
     #[error(transparent)]
-    Directory(#[from] DirectoryError),
-    #[error(transparent)]
     OauthUtil(#[from] OauthUtilError),
     #[error(transparent)]
     Parse(#[from] url::ParseError),

crates/chat-cli/src/util/env_var.rs

@@ -1,4 +1,5 @@
 use std::ffi::OsString;
+
 use crate::os::Env;
 
 /// Get environment variable as String

crates/chat-cli/src/util/file_uri.rs

@@ -153,16 +153,24 @@ mod tests {
         // the expansion behavior using error messages
         let uri = "file://~/test.txt";
         let base = Path::new("/some/other/path");
-        
+
         // This will fail to find the file (expected), but the error should show
         // an expanded absolute path, not a path with literal ~
         let result = resolve_file_uri(uri, base);
-        
+
         match result {
             Err(FileUriError::FileNotFound { path }) => {
                 // Verify the path was expanded (should start with / not ~)
-                assert!(path.starts_with("/"), "Path should be absolute after tilde expansion, got: {:?}", path);
-                assert!(!path.to_string_lossy().contains("~"), "Path should not contain literal tilde, got: {:?}", path);
+                assert!(
+                    path.starts_with("/"),
+                    "Path should be absolute after tilde expansion, got: {:?}",
+                    path
+                );
+                assert!(
+                    !path.to_string_lossy().contains("~"),
+                    "Path should not contain literal tilde, got: {:?}",
+                    path
+                );
             },
             _ => panic!("Expected FileNotFound error"),
         }