refactor(config): read ForgeConfig once at startup and thread it through the stack (#2850)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: tusharmath

crates/forge_api/src/api.rs

@@ -3,7 +3,6 @@ use std::path::PathBuf;
 use anyhow::Result;
 use forge_app::dto::ToolsOverview;
 use forge_app::{User, UserUsage};
-use forge_config::ForgeConfig;
 use forge_domain::{AgentId, Effort, ModelId, ProviderModels};
 use forge_stream::MpscStream;
 use futures::stream::BoxStream;
@@ -51,9 +50,6 @@ pub trait API: Sync + Send {
     /// Returns the current environment
     fn environment(&self) -> Environment;
 
-    /// Returns the full application configuration.
-    fn get_config(&self) -> ForgeConfig;
-
     /// Adds a new conversation to the conversation store
     async fn upsert_conversation(&self, conversation: Conversation) -> Result<()>;
 

crates/forge_api/src/forge_api.rs

@@ -24,28 +24,35 @@ use crate::API;
 pub struct ForgeAPI<S, F> {
     services: Arc<S>,
     infra: Arc<F>,
+    config: forge_config::ForgeConfig,
 }
 
 impl<A, F> ForgeAPI<A, F> {
-    pub fn new(services: Arc<A>, infra: Arc<F>) -> Self {
-        Self { services, infra }
+    pub fn new(services: Arc<A>, infra: Arc<F>, config: forge_config::ForgeConfig) -> Self {
+        Self { services, infra, config }
     }
 
     /// Creates a ForgeApp instance with the current services
     fn app(&self) -> ForgeApp<A>
     where
         A: Services,
     {
-        ForgeApp::new(self.services.clone())
+        ForgeApp::new(self.services.clone(), self.config.clone())
     }
 }
 
 impl ForgeAPI<ForgeServices<ForgeRepo<ForgeInfra>>, ForgeRepo<ForgeInfra>> {
-    pub fn init(cwd: PathBuf) -> Self {
-        let infra = Arc::new(ForgeInfra::new(cwd));
-        let repo = Arc::new(ForgeRepo::new(infra.clone()));
-        let app = Arc::new(ForgeServices::new(repo.clone()));
-        ForgeAPI::new(app, repo)
+    /// Creates a fully-initialized [`ForgeAPI`] from a pre-read configuration.
+    ///
+    /// # Arguments
+    /// * `cwd` - The working directory path for environment and file resolution
+    /// * `config` - Pre-read application configuration (from startup)
+    /// * `services_url` - Pre-validated URL for the gRPC workspace server
+    pub fn init(cwd: PathBuf, config: ForgeConfig, services_url: Url) -> Self {
+        let infra = Arc::new(ForgeInfra::new(cwd, config.clone(), services_url));
+        let repo = Arc::new(ForgeRepo::new(infra.clone(), config.clone()));
+        let app = Arc::new(ForgeServices::new(repo.clone(), config.clone()));
+        ForgeAPI::new(app, repo, config)
     }
 
     pub async fn get_skills_internal(&self) -> Result<Vec<Skill>> {
@@ -91,7 +98,7 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra + SkillRepository + GrpcInf
         diff: Option<String>,
         additional_context: Option<String>,
     ) -> Result<forge_app::CommitResult> {
-        let git_app = GitApp::new(self.services.clone());
+        let git_app = GitApp::new(self.services.clone(), self.config.clone());
         let result = git_app
             .commit_message(max_diff_size, diff, additional_context)
             .await?;
@@ -147,10 +154,6 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra + SkillRepository + GrpcInf
         self.services.get_environment().clone()
     }
 
-    fn get_config(&self) -> ForgeConfig {
-        self.infra.get_config()
-    }
-
     async fn conversation(
         &self,
         conversation_id: &ConversationId,

crates/forge_app/src/agent.rs

@@ -30,6 +30,7 @@ pub trait AgentService: Send + Sync + 'static {
         agent: &Agent,
         context: &ToolCallContext,
         call: ToolCallFull,
+        config: &ForgeConfig,
     ) -> ToolResult;
 
     /// Synchronize the on-going conversation
@@ -60,8 +61,9 @@ impl<T: Services> AgentService for T {
         agent: &Agent,
         context: &ToolCallContext,
         call: ToolCallFull,
+        config: &ForgeConfig,
     ) -> ToolResult {
-        let registry = ToolRegistry::new(Arc::new(self.clone()));
+        let registry = ToolRegistry::new(Arc::new(self.clone()), config.clone());
         registry.call(agent, context, call).await
     }
 

crates/forge_app/src/agent_executor.rs

@@ -2,6 +2,7 @@ use std::sync::Arc;
 
 use anyhow::Context;
 use convert_case::{Case, Casing};
+use forge_config::ForgeConfig;
 use forge_domain::{
     AgentId, ChatRequest, ChatResponse, ChatResponseContent, Conversation, Event, TitleFormat,
     ToolCallContext, ToolDefinition, ToolName, ToolOutput,
@@ -16,12 +17,13 @@ use crate::{AgentRegistry, ConversationService, Services};
 #[derive(Clone)]
 pub struct AgentExecutor<S> {
     services: Arc<S>,
+    config: ForgeConfig,
     pub tool_agents: Arc<RwLock<Option<Vec<ToolDefinition>>>>,
 }
 
 impl<S: Services> AgentExecutor<S> {
-    pub fn new(services: Arc<S>) -> Self {
-        Self { services, tool_agents: Arc::new(RwLock::new(None)) }
+    pub fn new(services: Arc<S>, config: ForgeConfig) -> Self {
+        Self { services, config, tool_agents: Arc::new(RwLock::new(None)) }
     }
 
     /// Returns a list of tool definitions for all available agents.
@@ -63,7 +65,7 @@ impl<S: Services> AgentExecutor<S> {
             .upsert_conversation(conversation.clone())
             .await?;
         // Execute the request through the ForgeApp
-        let app = crate::ForgeApp::new(self.services.clone());
+        let app = crate::ForgeApp::new(self.services.clone(), self.config.clone());
         let mut response_stream = app
             .chat(
                 agent_id.clone(),

crates/forge_app/src/app.rs

@@ -44,12 +44,17 @@ pub(crate) fn build_template_config(config: &ForgeConfig) -> forge_domain::Templ
 pub struct ForgeApp<S> {
     services: Arc<S>,
     tool_registry: ToolRegistry<S>,
+    config: ForgeConfig,
 }
 
 impl<S: Services> ForgeApp<S> {
-    /// Creates a new ForgeApp instance with the provided services.
-    pub fn new(services: Arc<S>) -> Self {
-        Self { tool_registry: ToolRegistry::new(services.clone()), services }
+    /// Creates a new ForgeApp instance with the provided services and config.
+    pub fn new(services: Arc<S>, config: ForgeConfig) -> Self {
+        Self {
+            tool_registry: ToolRegistry::new(services.clone(), config.clone()),
+            services,
+            config,
+        }
     }
 
     /// Executes a chat request and returns a stream of responses.
@@ -69,7 +74,7 @@ impl<S: Services> ForgeApp<S> {
             .expect("conversation for the request should've been created at this point.");
 
         // Discover files using the discovery service
-        let forge_config = services.get_config();
+        let forge_config = self.config.clone();
         let environment = services.get_environment();
 
         let files = services.list_current_directory().await?;
@@ -132,7 +137,7 @@ impl<S: Services> ForgeApp<S> {
 
         // Detect and render externally changed files notification
         let conversation = ChangedFiles::new(services.clone(), agent.clone())
-            .update_file_stats(conversation)
+            .update_file_stats(conversation, forge_config.max_parallel_file_reads)
             .await;
 
         let conversation = InitConversationMetrics::new(current_time).apply(conversation);
@@ -157,11 +162,17 @@ impl<S: Services> ForgeApp<S> {
 
         let retry_config = forge_config.retry.clone().unwrap_or_default();
 
-        let orch = Orchestrator::new(services.clone(), retry_config, conversation, agent)
-            .error_tracker(ToolErrorTracker::new(max_tool_failure_per_turn))
-            .tool_definitions(tool_definitions)
-            .models(models)
-            .hook(Arc::new(hook));
+        let orch = Orchestrator::new(
+            services.clone(),
+            retry_config,
+            conversation,
+            agent,
+            forge_config,
+        )
+        .error_tracker(ToolErrorTracker::new(max_tool_failure_per_turn))
+        .tool_definitions(tool_definitions)
+        .models(models)
+        .hook(Arc::new(hook));
 
         // Create and return the stream
         let stream = MpscStream::spawn(
@@ -219,7 +230,7 @@ impl<S: Services> ForgeApp<S> {
         let original_messages = context.messages.len();
         let original_token_count = *context.token_count();
 
-        let forge_config = self.services.get_config();
+        let forge_config = self.config.clone();
 
         // Get agent and apply workflow config
         let agent = self.services.get_agent(&active_agent_id).await?;

crates/forge_app/src/changed_files.rs

@@ -24,9 +24,12 @@ impl<S: FsReadService + EnvironmentInfra> ChangedFiles<S> {
     /// Detects externally changed files and renders a notification if changes
     /// are found. Updates file hashes in conversation metrics to prevent
     /// duplicate notifications.
-    pub async fn update_file_stats(&self, mut conversation: Conversation) -> Conversation {
+    pub async fn update_file_stats(
+        &self,
+        mut conversation: Conversation,
+        parallel_file_reads: usize,
+    ) -> Conversation {
         use crate::file_tracking::FileChangeDetector;
-        let parallel_file_reads = self.services.get_config().max_parallel_file_reads;
         let changes = FileChangeDetector::new(self.services.clone(), parallel_file_reads)
             .detect(&conversation.metrics)
             .await;
@@ -133,13 +136,6 @@ mod tests {
             env
         }
 
-        fn get_config(&self) -> forge_config::ForgeConfig {
-            forge_config::ConfigReader::default()
-                .read_defaults()
-                .build()
-                .unwrap()
-        }
-
         async fn update_environment(
             &self,
             _ops: Vec<forge_domain::ConfigOperation>,
@@ -203,7 +199,7 @@ mod tests {
             Some(ModelId::new("test")),
         )));
 
-        let actual = service.update_file_stats(conversation.clone()).await;
+        let actual = service.update_file_stats(conversation.clone(), 4).await;
 
         assert_eq!(actual.context.clone().unwrap_or_default().messages.len(), 1);
         assert_eq!(actual.context, conversation.context);
@@ -219,7 +215,7 @@ mod tests {
             [("/test/file.txt".into(), Some(old_hash))].into(),
         );
 
-        let actual = service.update_file_stats(conversation).await;
+        let actual = service.update_file_stats(conversation, 4).await;
 
         let messages = &actual.context.unwrap().messages;
         assert_eq!(messages.len(), 1);
@@ -239,7 +235,7 @@ mod tests {
             [("/test/file.txt".into(), Some(old_hash))].into(),
         );
 
-        let actual = service.update_file_stats(conversation).await;
+        let actual = service.update_file_stats(conversation, 4).await;
 
         let updated_hash = actual
             .metrics
@@ -265,7 +261,7 @@ mod tests {
             .into(),
         );
 
-        let actual = service.update_file_stats(conversation).await;
+        let actual = service.update_file_stats(conversation, 4).await;
 
         let message = actual.context.unwrap().messages[0]
             .content()
@@ -288,7 +284,7 @@ mod tests {
             Some(cwd),
         );
 
-        let actual = service.update_file_stats(conversation).await;
+        let actual = service.update_file_stats(conversation, 4).await;
 
         let message = actual.context.unwrap().messages[0]
             .content()

crates/forge_app/src/command_generator.rs

@@ -144,13 +144,6 @@ mod tests {
             self.environment.clone()
         }
 
-        fn get_config(&self) -> forge_config::ForgeConfig {
-            forge_config::ConfigReader::default()
-                .read_defaults()
-                .build()
-                .unwrap()
-        }
-
         async fn update_environment(
             &self,
             _ops: Vec<forge_domain::ConfigOperation>,

crates/forge_app/src/git_app.rs

@@ -6,10 +6,11 @@ use forge_domain::*;
 use schemars::JsonSchema;
 use serde::Deserialize;
 
-use crate::{
-    AgentProviderResolver, AgentRegistry, AppConfigService, EnvironmentInfra, ProviderAuthService,
-    ProviderService, ShellService, TemplateService,
+use crate::services::{
+    AgentRegistry, AppConfigService, ProviderAuthService, ProviderService, ShellService,
+    TemplateService,
 };
+use crate::{AgentProviderResolver, Services};
 
 /// Errors specific to GitApp operations
 #[derive(thiserror::Error, Debug)]
@@ -21,6 +22,7 @@ pub enum GitAppError {
 /// GitApp handles git-related operations like commit message generation.
 pub struct GitApp<S> {
     services: Arc<S>,
+    config: forge_config::ForgeConfig,
 }
 
 /// Result of a commit operation
@@ -65,9 +67,9 @@ struct DiffContext {
 }
 
 impl<S> GitApp<S> {
-    /// Creates a new GitApp instance with the provided services.
-    pub fn new(services: Arc<S>) -> Self {
-        Self { services }
+    /// Creates a new GitApp instance with the provided services and config.
+    pub fn new(services: Arc<S>, config: forge_config::ForgeConfig) -> Self {
+        Self { services, config }
     }
 
     /// Truncates diff content if it exceeds the maximum size
@@ -92,16 +94,7 @@ impl<S> GitApp<S> {
     }
 }
 
-impl<S> GitApp<S>
-where
-    S: EnvironmentInfra
-        + ShellService
-        + AgentRegistry
-        + TemplateService
-        + ProviderService
-        + AppConfigService
-        + ProviderAuthService,
-{
+impl<S: Services> GitApp<S> {
     /// Generates a commit message without committing
     ///
     /// # Arguments
@@ -220,7 +213,7 @@ where
             additional_context,
         };
 
-        let retry_config = self.services.get_config().retry.unwrap_or_default();
+        let retry_config = self.config.retry.clone().unwrap_or_default();
         crate::retry::retry_with_config(
             &retry_config,
             || self.generate_message_from_diff(ctx.clone()),
@@ -231,7 +224,7 @@ where
 
     /// Fetches git context (branch name and recent commits)
     async fn fetch_git_context(&self, cwd: &Path) -> Result<(String, String)> {
-        let max_commit_count = self.services.get_config().max_commit_count;
+        let max_commit_count = self.config.max_commit_count;
         let git_log_cmd =
             format!("git log --pretty=format:%s --abbrev-commit --max-count={max_commit_count}");
         let (recent_commits, branch_name) = tokio::join!(

crates/forge_app/src/hooks/title_generation.rs

@@ -189,6 +189,7 @@ mod tests {
             _agent: &Agent,
             _context: &ToolCallContext,
             _call: ToolCallFull,
+            _config: &forge_config::ForgeConfig,
         ) -> ToolResult {
             unreachable!("Not used in tests")
         }