refactor: use ForgeConfig for Workflow (#2716)

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

Author: tusharmath

Cargo.lock

@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 use anyhow::Result;
 use forge_app::dto::ToolsOverview;
@@ -53,19 +53,6 @@ pub trait API: Sync + Send {
     /// Adds a new conversation to the conversation store
     async fn upsert_conversation(&self, conversation: Conversation) -> Result<()>;
 
-    /// Initializes a workflow configuration from the given path
-    /// The workflow at the specified path is merged with the default
-    /// configuration If no path is provided, it will try to find forge.yaml
-    /// in the current directory or its parent directories
-    async fn read_workflow(&self, path: Option<&Path>) -> Result<Workflow>;
-
-    /// Reads the workflow from the given path and merges it with a default
-    /// workflow. This provides a convenient way to get a complete workflow
-    /// configuration without having to manually handle the merge logic.
-    /// If no path is provided, it will try to find forge.yaml in the current
-    /// directory or its parent directories
-    async fn read_merged(&self, path: Option<&Path>) -> Result<Workflow>;
-
     /// Returns the conversation with the given ID
     async fn conversation(&self, conversation_id: &ConversationId) -> Result<Option<Conversation>>;
 

crates/forge_api/src/api.rs

@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -146,14 +146,6 @@ impl<A: Services, F: CommandInfra + EnvironmentInfra + SkillRepository + GrpcInf
         self.services.get_environment().clone()
     }
 
-    async fn read_workflow(&self, path: Option<&Path>) -> anyhow::Result<Workflow> {
-        self.app().read_workflow(path).await
-    }
-
-    async fn read_merged(&self, path: Option<&Path>) -> anyhow::Result<Workflow> {
-        self.app().read_workflow_merged(path).await
-    }
-
     async fn conversation(
         &self,
         conversation_id: &ConversationId,

crates/forge_api/src/forge_api.rs

@@ -1,4 +1,3 @@
-use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use anyhow::Result;
@@ -12,17 +11,14 @@ use crate::dto::ToolsOverview;
 use crate::hooks::{CompactionHandler, DoomLoopDetector, TitleGenerationHandler, TracingHandler};
 use crate::init_conversation_metrics::InitConversationMetrics;
 use crate::orch::Orchestrator;
-use crate::services::{
-    AgentRegistry, CustomInstructionsService, ProviderAuthService, TemplateService,
-};
+use crate::services::{AgentRegistry, CustomInstructionsService, ProviderAuthService};
 use crate::set_conversation_id::SetConversationId;
 use crate::system_prompt::SystemPrompt;
 use crate::tool_registry::ToolRegistry;
 use crate::tool_resolver::ToolResolver;
 use crate::user_prompt::UserPromptGenerator;
 use crate::{
     AgentProviderResolver, ConversationService, FileDiscoveryService, ProviderService, Services,
-    WorkflowService,
 };
 
 /// ForgeApp handles the core chat functionality by orchestrating various
@@ -56,21 +52,11 @@ impl<S: Services> ForgeApp<S> {
             .expect("conversation for the request should've been created at this point.");
 
         // Discover files using the discovery service
-        let workflow = self.services.read_merged(None).await.unwrap_or_default();
+        let workflow = services.get_environment();
         let environment = services.get_environment();
 
         let files = services.list_current_directory().await?;
 
-        // Register templates using workflow path or environment fallback
-        let template_path = workflow
-            .templates
-            .as_ref()
-            .map_or(environment.templates(), |templates| {
-                PathBuf::from(templates)
-            });
-
-        services.register_template(template_path).await?;
-
         let custom_instructions = services.get_custom_instructions().await;
 
         // Prepare agents with user configuration
@@ -82,7 +68,7 @@ impl<S: Services> ForgeApp<S> {
             .get_agent(&agent_id)
             .await?
             .ok_or(crate::Error::AgentNotFound(agent_id.clone()))?
-            .apply_workflow_config(&workflow)
+            .apply_env(&workflow)
             .set_compact_model_if_none();
 
         let agent_provider = agent_provider_resolver
@@ -212,7 +198,7 @@ impl<S: Services> ForgeApp<S> {
         let original_messages = context.messages.len();
         let original_token_count = *context.token_count();
 
-        let workflow = self.services.read_merged(None).await.unwrap_or_default();
+        let workflow = self.services.get_environment();
 
         // Get agent and apply workflow config
         let agent = self.services.get_agent(&active_agent_id).await?;
@@ -228,7 +214,7 @@ impl<S: Services> ForgeApp<S> {
 
         // Get compact config from the agent
         let compact = agent
-            .apply_workflow_config(&workflow)
+            .apply_env(&workflow)
             .set_compact_model_if_none()
             .compact;
 
@@ -307,12 +293,4 @@ impl<S: Services> ForgeApp<S> {
 
         Ok(results)
     }
-
-    pub async fn read_workflow(&self, path: Option<&Path>) -> Result<Workflow> {
-        self.services.read_workflow(path).await
-    }
-
-    pub async fn read_workflow_merged(&self, path: Option<&Path>) -> Result<Workflow> {
-        self.services.read_merged(path).await
-    }
 }

crates/forge_app/src/app.rs

@@ -91,9 +91,7 @@ impl Runner {
 
         let agent = setup.agent.clone();
         let system_tools = setup.tools.clone();
-        let agent = agent
-            .apply_workflow_config(&setup.workflow)
-            .model(setup.model.clone());
+        let agent = agent.apply_env(&setup.env).model(setup.model.clone());
 
         // Render system prompt into context.
         let conversation = SystemPrompt::new(services.clone(), setup.env.clone(), agent.clone())

crates/forge_app/src/orch_spec/orch_runner.rs

@@ -6,7 +6,7 @@ use derive_setters::Setters;
 use forge_domain::{
     Agent, AgentId, Attachment, ChatCompletionMessage, ChatResponse, Conversation, Environment,
     Event, File, HttpConfig, MessageEntry, ModelId, ProviderId, RetryConfig, Role, Template,
-    ToolCallFull, ToolDefinition, ToolResult, Workflow,
+    ToolCallFull, ToolDefinition, ToolResult,
 };
 use url::Url;
 
@@ -25,7 +25,6 @@ pub struct TestContext {
     pub mock_tool_call_responses: Vec<(ToolCallFull, ToolResult)>,
     pub mock_assistant_responses: Vec<ChatCompletionMessage>,
     pub mock_shell_outputs: Vec<ShellOutput>,
-    pub workflow: Workflow,
     pub templates: HashMap<String, String>,
     pub files: Vec<File>,
     pub env: Environment,
@@ -49,7 +48,6 @@ impl Default for TestContext {
             mock_assistant_responses: Default::default(),
             mock_tool_call_responses: Default::default(),
             mock_shell_outputs: Default::default(),
-            workflow: Workflow::new().tool_supported(true),
             templates: Default::default(),
             files: Default::default(),
             attachments: Default::default(),
@@ -61,6 +59,7 @@ impl Default for TestContext {
                 shell: "bash".to_string(),
                 base_path: PathBuf::from("/Users/tushar/projects"),
                 service_url: Url::parse("http://localhost:8000").unwrap(),
+                tool_supported: true,
 
                 // No retry policy by default
                 retry_config: RetryConfig {
@@ -99,6 +98,14 @@ impl Default for TestContext {
                 commit: None,
                 suggest: None,
                 is_restricted: false,
+                temperature: None,
+                top_p: None,
+                top_k: None,
+                max_tokens: None,
+                max_tool_failure_per_turn: None,
+                max_requests_per_turn: None,
+                compact: None,
+                updates: None,
             },
             title: Some("test-conversation".into()),
             agent: Agent::new(

crates/forge_app/src/orch_spec/orch_setup.rs

@@ -1,17 +1,14 @@
-use forge_domain::{ChatCompletionMessage, CommandOutput, Content, FinishReason, Workflow};
+use forge_domain::{ChatCompletionMessage, CommandOutput, Content, FinishReason};
 use insta::assert_snapshot;
 
 use crate::ShellOutput;
 use crate::orch_spec::orch_runner::TestContext;
 
 #[tokio::test]
 async fn test_system_prompt() {
-    let mut ctx = TestContext::default()
-        .workflow(Workflow::default().tool_supported(false))
-        .mock_assistant_responses(vec![
-            ChatCompletionMessage::assistant(Content::full("Sure"))
-                .finish_reason(FinishReason::Stop),
-        ]);
+    let mut ctx = TestContext::default().mock_assistant_responses(vec![
+        ChatCompletionMessage::assistant(Content::full("Sure")).finish_reason(FinishReason::Stop),
+    ]);
 
     ctx.run("This is a test").await.unwrap();
     let system_messages = ctx.output.system_messages().unwrap().join("\n\n");
@@ -21,11 +18,6 @@ async fn test_system_prompt() {
 #[tokio::test]
 async fn test_system_prompt_tool_supported() {
     let mut ctx = TestContext::default()
-        .workflow(
-            Workflow::default()
-                .tool_supported(true)
-                .custom_rules("Do it nicely"),
-        )
         .files(vec![
             forge_domain::File { path: "/users/john/foo.txt".to_string(), is_dir: false },
             forge_domain::File { path: "/users/jason/bar.txt".to_string(), is_dir: false },
@@ -55,7 +47,6 @@ async fn test_system_prompt_with_extensions() {
     };
 
     let mut ctx = TestContext::default()
-        .workflow(Workflow::default().tool_supported(true))
         .mock_shell_outputs(vec![shell_output])
         .mock_assistant_responses(vec![
             ChatCompletionMessage::assistant(Content::full("Sure"))
@@ -92,7 +83,6 @@ async fn test_system_prompt_with_extensions_truncated() {
     };
 
     let mut ctx = TestContext::default()
-        .workflow(Workflow::default().tool_supported(true))
         .mock_shell_outputs(vec![shell_output])
         .mock_assistant_responses(vec![
             ChatCompletionMessage::assistant(Content::full("Sure"))

crates/forge_app/src/orch_spec/orch_system_spec.rs

@@ -11,44 +11,9 @@ You are Forge
 <home_directory>/Users/tushar</home_directory>
 </system_information>
 
-<available_tools>
-<tool>{"name":"fs_read","description":"","arguments":{}}</tool>
-<tool>{"name":"fs_write","description":"","arguments":{}}</tool>
-</available_tools>
-
-<tool_usage_example>
-1. You can only make one tool call per message.
-2. Each tool call must be wrapped in `<forge_tool_call>` tags.
-3. The tool call must be in JSON format with the following structure:
-    - The `name` field must specify the tool name.
-    - The `arguments` field must contain the required parameters for the tool.
-
-Here's a correct example structure:
-
-Example 1:
-<forge_tool_call>
-{"name": "read", "arguments": {"path": "/a/b/c.txt"}}
-</forge_tool_call>
-
-Example 2:
-<forge_tool_call>
-{"name": "write", "arguments": {"path": "/a/b/c.txt", "content": "Hello World!"}}
-</forge_tool_call>
-
-Important:
-1. ALWAYS use JSON format inside `forge_tool_call` tags.
-2. Specify the name of tool in the `name` field.
-3. Specify the tool arguments in the `arguments` field.
-4. If you need to make multiple tool calls, send them in separate messages.
-
-Before using a tool, ensure all required arguments are available. 
-If any required arguments are missing, do not attempt to use the tool.
-</tool_usage_example>
 
 <tool_usage_instructions>
-- You have access to set of tools as described in the <available_tools> tag.
-- You can use one tool per message, and will receive the result of that tool use in the user's response.
-- You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
+- For maximum efficiency, whenever you need to perform multiple independent operations, invoke all relevant tools (for eg: `patch`, `read`) simultaneously rather than sequentially.
 - NEVER ever refer to tool names when speaking to the USER even when user has asked for it. For example, instead of saying 'I need to use the edit_file tool to edit your file', just say 'I will edit your file'.
 - If you need to read a file, prefer to read larger sections of the file at once over multiple smaller calls.
 </tool_usage_instructions>

crates/forge_app/src/orch_spec/snapshots/forge_app__orch_spec__orch_system_spec__system_prompt.snap

@@ -22,9 +22,6 @@ You are Forge
 - If you need to read a file, prefer to read larger sections of the file at once over multiple smaller calls.
 </tool_usage_instructions>
 
-<project_guidelines>
-Do it nicely
-</project_guidelines>
 
 <non_negotiable_rules>
 - ALWAYS present the result of your work in a neatly structured format (using markdown syntax in your response) to the user at the end of every task.
@@ -51,5 +48,5 @@ Do it nicely
 
 - User may tag files using the format @[<file name>] and send it as a part of the message. Do not attempt to reread those files.
 - Only use emojis if the user explicitly requests it. Avoid using emojis in all communication unless asked.
-- Always follow all the `project_guidelines` without exception.
+
 </non_negotiable_rules>