refactor: Add fields to Os type to reduce dependency injection burden (#298)

Author: chaynabors

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

@@ -5,9 +5,7 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-use crate::database::Database;
 use crate::os::Os;
-use crate::telemetry::TelemetryThread;
 
 #[deny(missing_docs)]
 #[derive(Debug, PartialEq, Args)]
@@ -36,15 +34,7 @@ pub struct CompactArgs {
 }
 
 impl CompactArgs {
-    pub async fn execute(
-        self,
-        os: &Os,
-        database: &mut Database,
-        telemetry: &TelemetryThread,
-        session: &mut ChatSession,
-    ) -> Result<ChatState, ChatError> {
-        session
-            .compact_history(os, database, telemetry, self.prompt, self.show_summary)
-            .await
+    pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        session.compact_history(os, self.prompt, self.show_summary).await
     }
 }

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

@@ -782,7 +782,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_add_hook() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
         let hook = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
 
@@ -811,7 +811,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_remove_hook() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
         let hook = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
 
@@ -829,7 +829,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_set_hook_disabled() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
         let hook = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
 
@@ -856,7 +856,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_set_all_hooks_disabled() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
         let hook1 = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
         let hook2 = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
@@ -877,7 +877,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_run_hooks() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
         let hook1 = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
         let hook2 = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
@@ -894,7 +894,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_hooks_across_profiles() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
         let hook1 = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());
         let hook2 = Hook::new_inline_hook(HookTrigger::ConversationStart, "echo test".to_string());

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

@@ -19,7 +19,6 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-use crate::database::Database;
 use crate::database::settings::Setting;
 use crate::os::Os;
 use crate::util::knowledge_store::KnowledgeStore;
@@ -56,13 +55,8 @@ enum OperationResult {
 }
 
 impl KnowledgeSubcommand {
-    pub async fn execute(
-        self,
-        os: &Os,
-        database: &Database,
-        session: &mut ChatSession,
-    ) -> Result<ChatState, ChatError> {
-        if !Self::is_feature_enabled(database) {
+    pub async fn execute(self, os: &Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        if !Self::is_feature_enabled(os) {
             Self::write_feature_disabled_message(session)?;
             return Ok(Self::default_chat_state());
         }
@@ -74,8 +68,11 @@ impl KnowledgeSubcommand {
         Ok(Self::default_chat_state())
     }
 
-    fn is_feature_enabled(database: &Database) -> bool {
-        database.settings.get_bool(Setting::EnabledKnowledge).unwrap_or(false)
+    fn is_feature_enabled(os: &Os) -> bool {
+        os.database
+            .settings
+            .get_bool(Setting::EnabledKnowledge)
+            .unwrap_or(false)
     }
 
     fn write_feature_disabled_message(session: &mut ChatSession) -> Result<(), std::io::Error> {

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

@@ -35,9 +35,7 @@ use crate::cli::chat::{
     ChatState,
 };
 use crate::cli::issue;
-use crate::database::Database;
 use crate::os::Os;
-use crate::telemetry::TelemetryThread;
 
 /// q (Amazon Q Chat)
 #[derive(Debug, PartialEq, Parser)]
@@ -85,24 +83,18 @@ pub enum SlashCommand {
 }
 
 impl SlashCommand {
-    pub async fn execute(
-        self,
-        os: &mut Os,
-        database: &mut Database,
-        telemetry: &TelemetryThread,
-        session: &mut ChatSession,
-    ) -> Result<ChatState, ChatError> {
+    pub async fn execute(self, os: &mut Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
         match self {
             Self::Quit => Ok(ChatState::Exit),
             Self::Clear(args) => args.execute(session).await,
             Self::Profile(subcommand) => subcommand.execute(os, session).await,
             Self::Context(args) => args.execute(os, session).await,
-            Self::Knowledge(subcommand) => subcommand.execute(os, database, session).await,
+            Self::Knowledge(subcommand) => subcommand.execute(os, session).await,
             Self::PromptEditor(args) => args.execute(session).await,
-            Self::Compact(args) => args.execute(os, database, telemetry, session).await,
+            Self::Compact(args) => args.execute(os, session).await,
             Self::Tools(args) => args.execute(session).await,
             Self::Issue(args) => {
-                if let Err(err) = args.execute().await {
+                if let Err(err) = args.execute(os).await {
                     return Err(ChatError::Custom(err.to_string().into()));
                 }
 
@@ -115,7 +107,7 @@ impl SlashCommand {
             Self::Usage(args) => args.execute(os, session).await,
             Self::Mcp(args) => args.execute(session).await,
             Self::Model(args) => args.execute(session).await,
-            Self::Subscribe(args) => args.execute(database, session).await,
+            Self::Subscribe(args) => args.execute(os, session).await,
             Self::Persist(subcommand) => subcommand.execute(os, session).await,
             // Self::Root(subcommand) => {
             //     if let Err(err) = subcommand.execute(os, database, telemetry).await {

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

@@ -14,7 +14,7 @@ use crate::cli::chat::{
     ChatSession,
     ChatState,
 };
-use crate::database::Database;
+use crate::os::Os;
 
 pub struct ModelOption {
     pub name: &'static str,
@@ -99,8 +99,8 @@ impl ModelArgs {
 }
 
 /// Currently, Sonnet 4 is set as the default model for non-FRA users.
-pub fn default_model_id(database: &Database) -> &'static str {
-    match database.get_auth_profile() {
+pub fn default_model_id(os: &Os) -> &'static str {
+    match os.database.get_auth_profile() {
         Ok(Some(profile)) if profile.arn.split(':').nth(3) == Some("eu-central-1") => "CLAUDE_3_7_SONNET_20250219_V1_0",
         _ => "CLAUDE_SONNET_4_20250514_V1_0",
     }

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

@@ -20,7 +20,7 @@ use crate::cli::chat::{
     get_subscription_status_with_spinner,
     with_spinner,
 };
-use crate::database::Database;
+use crate::os::Os;
 use crate::util::system_info::is_remote;
 
 const SUBSCRIBE_TITLE_TEXT: &str = color_print::cstr! { "<white!,bold>Subscribe to Q Developer Pro</white!,bold>" };
@@ -37,8 +37,8 @@ pub struct SubscribeArgs {
 }
 
 impl SubscribeArgs {
-    pub async fn execute(self, database: &mut Database, session: &mut ChatSession) -> Result<ChatState, ChatError> {
-        if is_idc_user(database)
+    pub async fn execute(self, os: &mut Os, session: &mut ChatSession) -> Result<ChatState, ChatError> {
+        if is_idc_user(&os.database)
             .await
             .map_err(|e| ChatError::Custom(e.to_string().into()))?
         {
@@ -50,7 +50,7 @@ impl SubscribeArgs {
             )?;
         } else if self.manage {
             queue!(session.stderr, style::Print("\n"),)?;
-            match get_subscription_status_with_spinner(&mut session.stderr, database).await {
+            match get_subscription_status_with_spinner(os, &mut session.stderr).await {
                 Ok(status) => {
                     if status != ActualSubscriptionStatus::Active {
                         queue!(
@@ -79,7 +79,7 @@ impl SubscribeArgs {
 
             let url = format!(
                 "https://{}.console.aws.amazon.com/amazonq/developer/home#/subscriptions",
-                database
+                os.database
                     .get_idc_region()
                     .ok()
                     .flatten()
@@ -94,7 +94,7 @@ impl SubscribeArgs {
                 )?;
             }
         } else {
-            upgrade_to_pro(database, session).await?;
+            upgrade_to_pro(os, session).await?;
         }
 
         Ok(ChatState::PromptUser {
@@ -103,11 +103,11 @@ impl SubscribeArgs {
     }
 }
 
-async fn upgrade_to_pro(database: &mut Database, session: &mut ChatSession) -> Result<(), ChatError> {
+async fn upgrade_to_pro(os: &mut Os, session: &mut ChatSession) -> Result<(), ChatError> {
     queue!(session.stderr, style::Print("\n"),)?;
 
     // Get current subscription status
-    match get_subscription_status_with_spinner(&mut session.stderr, database).await {
+    match get_subscription_status_with_spinner(os, &mut session.stderr).await {
         Ok(status) => {
             if status == ActualSubscriptionStatus::Active {
                 queue!(
@@ -167,8 +167,12 @@ async fn upgrade_to_pro(database: &mut Database, session: &mut ChatSession) -> R
     }
 
     // Create a subscription token and open the webpage
-    let url = with_spinner(&mut session.stderr, "Preparing to upgrade...", || async {
-        let r = Client::new(database, None).await?.create_subscription_token().await?;
+    let r = Client::new(&mut os.database, None)
+        .await?
+        .create_subscription_token()
+        .await?;
+
+    let url = with_spinner(&mut session.stderr, "Preparing to upgrade...", || async move {
         Ok::<String, ChatError>(r.encoded_verification_url().to_string())
     })
     .await?;

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

@@ -813,7 +813,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_profile_ops() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
 
         assert_eq!(manager.current_profile, "default");
@@ -852,7 +852,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_collect_exceeds_limit() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(Some(2)).await?;
 
         os.fs.create_dir_all("test").await?;
@@ -872,7 +872,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_path_ops() -> Result<()> {
-        let os = Os::new();
+        let os = Os::new().await.unwrap();
         let mut manager = create_test_context_manager(None).await?;
 
         // Create some test files for matching.