fix: CI failing due to merges (#306)

Author: chaynabors

crates/chat-cli/src/api_client/credentials/mod.rs renamed to crates/chat-cli/src/api_client/credentials.rs

@@ -1,9 +1,9 @@
-pub(crate) mod credentials;
+mod credentials;
 pub mod customization;
 mod endpoints;
 mod error;
-pub(crate) mod interceptor;
 pub mod model;
+mod opt_out;
 pub mod profile;
 pub mod send_message_output;
 
@@ -38,11 +38,11 @@ use tracing::{
 };
 
 use crate::api_client::credentials::CredentialsChain;
-use crate::api_client::interceptor::opt_out::OptOutInterceptor;
 use crate::api_client::model::{
     ChatResponseStream,
     ConversationState,
 };
+use crate::api_client::opt_out::OptOutInterceptor;
 use crate::api_client::send_message_output::SendMessageOutput;
 use crate::auth::builder_id::BearerResolver;
 use crate::aws_common::{

crates/chat-cli/src/api_client/interceptor/mod.rs

@@ -77,12 +77,12 @@ impl PersistSubcommand {
             },
             Self::Load { path } => {
                 // Try the original path first
-                let original_result = ctx.fs.read_to_string(&path).await;
+                let original_result = os.fs.read_to_string(&path).await;
 
                 // If the original path fails and doesn't end with .json, try with .json appended
                 let contents = if original_result.is_err() && !path.ends_with(".json") {
                     let json_path = format!("{}.json", path);
-                    match ctx.fs.read_to_string(&json_path).await {
+                    match os.fs.read_to_string(&json_path).await {
                         Ok(content) => content,
                         Err(_) => {
                             // If both paths fail, return the original error for better user experience

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

@@ -4,7 +4,6 @@ use rustyline::error::ReadlineError;
 use super::prompt::rl;
 #[cfg(unix)]
 use super::skim_integration::SkimCommandSelector;
-#[cfg(unix)]
 use crate::os::Os;
 
 #[derive(Debug)]

crates/chat-cli/src/api_client/interceptor/opt_out.rs renamed to crates/chat-cli/src/api_client/opt_out.rs

@@ -1129,9 +1129,6 @@ impl ChatSession {
 
     /// Read input from the user.
     async fn prompt_user(&mut self, os: &Os, skip_printing_tools: bool) -> Result<ChatState, ChatError> {
-        #[cfg(windows)]
-        let _ = database;
-
         execute!(self.stderr, cursor::Show)?;
 
         // Check token usage and display warnings if needed

crates/chat-cli/src/cli/chat/cli/persist.rs

@@ -23,7 +23,7 @@ pub(super) fn append(a: impl AsRef<Path>, b: impl AsRef<Path>) -> PathBuf {
     let mut b_normal_path = PathBuf::new();
     for comp in b_path.components() {
         match comp {
-            Component::Prefix(_) | Component::RootDir => continue,
+            Component::Prefix(_) | Component::RootDir => (),
             _ => b_normal_path.push(comp.as_os_str()),
         }
     }

crates/chat-cli/src/cli/chat/input_source.rs

@@ -239,7 +239,6 @@ pub async fn handle_incoming(conn: &mut UnixStream, buf: &mut BytesMut, sway_sta
             },
             ParseResult::Incomplete => {
                 conn.read_buf(buf).await.unwrap();
-                continue;
             },
             ParseResult::Error(err) => {
                 error!(%err, "Failed to parse sway message");

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

@@ -227,7 +227,7 @@ async fn update_full_ctx(
     let temp_dir = ctx.fs().create_tempdir().await?;
     let file_name = download_url
         .path_segments()
-        .and_then(|path| path.last())
+        .and_then(|mut path| path.next_back())
         .unwrap_or(PRODUCT_NAME);
     let download_path = temp_dir.path().join(file_name);