refactor: make agent provider and model fields required

Cargo.toml

@@ -116,7 +116,7 @@ nucleo = "0.5.0"
 gray_matter = "0.3.2"
 num-format = "0.4"
 humantime = "2.1.0"
-
+dashmap = "7.0.0-rc2"
 
 # Internal crates
 forge_api = { path = "crates/forge_api" }

crates/forge_api/src/api.rs

@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Result;
 use forge_app::dto::ToolsOverview;
-use forge_app::{User, UserUsage};
+use forge_app::{Agent, User, UserUsage};
 use forge_domain::{AgentId, InitAuth, ModelId};
 use forge_stream::MpscStream;
 use url::Url;
@@ -123,11 +123,9 @@ pub trait API: Sync + Send {
     /// Logs out the current user and clears authentication data
     async fn logout(&self) -> anyhow::Result<()>;
 
-    /// Retrieves the provider configuration for the specified agent
-    async fn get_agent_provider(&self, agent_id: AgentId) -> anyhow::Result<Provider<Url>>;
-
-    /// Retrieves the provider configuration for the default agent
-    async fn get_default_provider(&self) -> anyhow::Result<Provider<Url>>;
+    /// Retrieves the provider configuration for the specified agent.
+    /// If agent_id is None, returns the default provider.
+    async fn get_agent_provider(&self, agent_id: Option<AgentId>) -> anyhow::Result<Provider<Url>>;
 
     /// Sets the default provider for all the agents
     async fn set_default_provider(&self, provider_id: ProviderId) -> anyhow::Result<()>;
@@ -145,7 +143,7 @@ pub trait API: Sync + Send {
     async fn set_active_agent(&self, agent_id: AgentId) -> anyhow::Result<()>;
 
     /// Gets the model for the specified agent
-    async fn get_agent_model(&self, agent_id: AgentId) -> Option<ModelId>;
+    async fn get_agent_model(&self, agent_id: Option<AgentId>) -> Option<ModelId>;
 
     /// Gets the default model
     async fn get_default_model(&self) -> Option<ModelId>;

crates/forge_api/src/forge_api.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use anyhow::{Context, Result};
 use forge_app::dto::ToolsOverview;
 use forge_app::{
-    AgentProviderResolver, AgentRegistry, AppConfigService, AuthService, CommandInfra,
+    Agent, AgentProviderResolver, AgentRegistry, AppConfigService, AuthService, CommandInfra,
     CommandLoaderService, ConversationService, EnvironmentInfra, EnvironmentService,
     FileDiscoveryService, ForgeApp, GitApp, McpConfigManager, McpService, ProviderAuthService,
     ProviderService, Services, User, UserUsage, Walker, WorkflowService,
@@ -63,14 +63,14 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra> API for ForgeAPI<A, F> {
         Ok(self
             .services
             .models(
-                self.get_default_provider()
+                self.get_agent_provider(None)
                     .await
                     .context("Failed to fetch models")?,
             )
             .await?)
     }
     async fn get_agents(&self) -> Result<Vec<Agent>> {
-        Ok(self.services.get_agents().await?)
+        self.services.get_agents().await
     }
 
     async fn get_providers(&self) -> Result<Vec<AnyProvider>> {
@@ -217,22 +217,18 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra> API for ForgeAPI<A, F> {
     async fn logout(&self) -> Result<()> {
         self.app().logout().await
     }
-    async fn get_agent_provider(&self, agent_id: AgentId) -> anyhow::Result<Provider<Url>> {
-        let agent_provider_resolver = AgentProviderResolver::new(self.services.clone());
-        agent_provider_resolver.get_provider(Some(agent_id)).await
-    }
 
-    async fn get_default_provider(&self) -> anyhow::Result<Provider<Url>> {
+    async fn get_agent_provider(&self, agent_id: Option<AgentId>) -> anyhow::Result<Provider<Url>> {
         let agent_provider_resolver = AgentProviderResolver::new(self.services.clone());
-        agent_provider_resolver.get_provider(None).await
+        agent_provider_resolver.get_provider(agent_id).await
     }
 
     async fn set_default_provider(&self, provider_id: ProviderId) -> anyhow::Result<()> {
         self.services.set_default_provider(provider_id).await
     }
 
     async fn user_info(&self) -> Result<Option<User>> {
-        let provider = self.get_default_provider().await?;
+        let provider = self.get_agent_provider(None).await?;
         if let Some(api_key) = provider.api_key() {
             let user_info = self.services.user_info(api_key.as_str()).await?;
             return Ok(Some(user_info));
@@ -241,7 +237,7 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra> API for ForgeAPI<A, F> {
     }
 
     async fn user_usage(&self) -> Result<Option<UserUsage>> {
-        let provider = self.get_default_provider().await?;
+        let provider = self.get_agent_provider(None).await?;
         if let Some(api_key) = provider
             .credential
             .as_ref()
@@ -264,9 +260,9 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra> API for ForgeAPI<A, F> {
         self.services.set_active_agent_id(agent_id).await
     }
 
-    async fn get_agent_model(&self, agent_id: AgentId) -> Option<ModelId> {
+    async fn get_agent_model(&self, agent_id: Option<AgentId>) -> Option<ModelId> {
         let agent_provider_resolver = AgentProviderResolver::new(self.services.clone());
-        agent_provider_resolver.get_model(Some(agent_id)).await.ok()
+        agent_provider_resolver.get_model(agent_id).await.ok()
     }
 
     async fn get_default_model(&self) -> Option<ModelId> {

crates/forge_api/src/lib.rs

@@ -4,5 +4,5 @@ mod forge_api;
 pub use api::*;
 pub use forge_api::*;
 pub use forge_app::dto::*;
-pub use forge_app::{Plan, UsageInfo, UserUsage};
+pub use forge_app::{Agent, Plan, UsageInfo, UserUsage};
 pub use forge_domain::*;

crates/forge_app/src/agent.rs

@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
 use forge_domain::{
-    Agent, ChatCompletionMessage, Context, Conversation, ModelId, ProviderId, ResultStream,
+    ChatCompletionMessage, Context, Conversation, ModelId, ProviderId, ResultStream,
     ToolCallContext, ToolCallFull, ToolResult,
 };
 
 use crate::services::AppConfigService;
 use crate::tool_registry::ToolRegistry;
-use crate::{ConversationService, ProviderService, Services};
+use crate::{Agent, ConversationService, ProviderService, Services};
 
 /// Agent service trait that provides core chat and tool call functionality.
 /// This trait abstracts the essential operations needed by the Orchestrator.

crates/forge_app/src/agent_provider_resolver.rs

@@ -24,11 +24,17 @@ where
     /// agent is provided. Automatically refreshes OAuth credentials if they're
     /// about to expire.
     pub async fn get_provider(&self, agent_id: Option<AgentId>) -> Result<Provider<url::Url>> {
-        let provider = if let Some(agent) = agent_id
-            && let Some(agent) = self.0.get_agent(&agent).await?
-            && let Some(provider_id) = agent.provider
-        {
-            self.0.get_provider(provider_id).await?
+        let provider = if let Some(agent_id) = agent_id {
+            // Load all agent definitions and find the one we need
+
+            if let Some(agent) = self.0.get_agent(&agent_id).await? {
+                // If the agent definition has a provider, use it; otherwise use default
+                self.0.get_provider(agent.provider).await?
+            } else {
+                // TODO: Needs review, should we throw an err here?
+                // we can throw crate::Error::AgentNotFound
+                self.0.get_default_provider().await?
+            }
         } else {
             self.0.get_default_provider().await?
         };
@@ -69,13 +75,36 @@ where
     /// Gets the model for the specified agent, or the default model if no agent
     /// is provided
     pub async fn get_model(&self, agent_id: Option<AgentId>) -> Result<ModelId> {
-        let provider_id = self.get_provider(agent_id).await?.id;
-        self.0.get_default_model(&provider_id).await
+        if let Some(agent_id) = agent_id {
+            if let Some(agent) = self.0.get_agent(&agent_id).await? {
+                Ok(agent.model)
+            } else {
+                // TODO: Needs review, should we throw an err here?
+                // we can throw crate::Error::AgentNotFound
+                let provider_id = self.get_provider(Some(agent_id)).await?.id;
+                self.0.get_default_model(&provider_id).await
+            }
+        } else {
+            let provider_id = self.get_provider(None).await?.id;
+            self.0.get_default_model(&provider_id).await
+        }
     }
 
-    /// Sets the default model for the agent's provider
+    /// Sets the model for the agent's provider
     pub async fn set_default_model(&self, agent_id: Option<AgentId>, model: ModelId) -> Result<()> {
-        let provider_id = self.get_provider(agent_id).await?.id;
-        self.0.set_default_model(model, provider_id).await
+        if let Some(agent_id) = agent_id {
+            if let Some(agent) = self.0.get_agent(&agent_id).await? {
+                let provider_id = agent.provider;
+                self.0.set_default_model(model, provider_id).await
+            } else {
+                // TODO: Needs review, should we throw an err here?
+                // we can throw crate::Error::AgentNotFound
+                let provider_id = self.get_provider(None).await?.id;
+                self.0.set_default_model(model, provider_id).await
+            }
+        } else {
+            let provider_id = self.get_provider(None).await?.id;
+            self.0.set_default_model(model, provider_id).await
+        }
     }
 }