refactor: drop max_walker_depth from the configuration (#2080)

Author: tusharmath

crates/forge_app/src/app.rs

@@ -22,7 +22,7 @@ use crate::tool_resolver::ToolResolver;
 use crate::user_prompt::UserPromptGenerator;
 use crate::{
     AgentProviderResolver, ConversationService, EnvironmentService, FileDiscoveryService,
-    ProviderService, Services, Walker, WorkflowService,
+    ProviderService, Services, WorkflowService,
 };
 
 /// ForgeApp handles the core chat functionality by orchestrating various
@@ -62,22 +62,9 @@ impl<S: Services> ForgeApp<S> {
 
         // Discover files using the discovery service
         let workflow = self.services.read_merged(None).await.unwrap_or_default();
-        let max_depth = workflow.max_walker_depth;
         let environment = services.get_environment();
 
-        let mut walker = Walker::conservative().cwd(environment.cwd.clone());
-
-        if let Some(depth) = max_depth {
-            walker = walker.max_depth(depth);
-        };
-
-        let files = services
-            .collect_files(walker)
-            .await?
-            .into_iter()
-            .filter(|f| !f.is_dir)
-            .map(|f| f.path)
-            .collect::<Vec<_>>();
+        let files = services.list_current_directory().await?;
 
         // Register templates using workflow path or environment fallback
         let template_path = workflow

crates/forge_app/src/command_generator.rs

@@ -5,7 +5,6 @@ use forge_domain::{extract_tag_content, *};
 
 use crate::{
     AppConfigService, EnvironmentService, FileDiscoveryService, ProviderService, TemplateEngine,
-    Walker,
 };
 
 /// CommandGenerator handles shell command generation from natural language
@@ -27,18 +26,7 @@ where
         // Get system information for context
         let env = self.services.get_environment();
 
-        let walker = Walker::conservative()
-            .cwd(env.cwd.clone())
-            .max_depth(1usize);
-        let mut files = self
-            .services
-            .collect_files(walker)
-            .await?
-            .into_iter()
-            .filter(|f| !f.is_dir)
-            .map(|f| f.path)
-            .collect::<Vec<_>>();
-        files.sort();
+        let files = self.services.list_current_directory().await?;
 
         let rendered_system_prompt = TemplateEngine::default().render(
             "forge-command-generator-prompt.md",
@@ -93,6 +81,7 @@ mod tests {
     use url::Url;
 
     use super::*;
+    use crate::Walker;
 
     struct MockServices {
         files: Vec<(String, bool)>,
@@ -135,6 +124,23 @@ mod tests {
                 .map(|(path, is_dir)| File { path: path.clone(), is_dir: *is_dir })
                 .collect())
         }
+
+        async fn list_current_directory(&self) -> Result<Vec<File>> {
+            let mut files: Vec<File> = self
+                .files
+                .iter()
+                .map(|(path, is_dir)| File { path: path.clone(), is_dir: *is_dir })
+                .collect();
+
+            // Sort: directories first (alphabetically), then files (alphabetically)
+            files.sort_by(|a, b| match (a.is_dir, b.is_dir) {
+                (true, false) => std::cmp::Ordering::Less,
+                (false, true) => std::cmp::Ordering::Greater,
+                _ => a.path.cmp(&b.path),
+            });
+
+            Ok(files)
+        }
     }
 
     #[async_trait::async_trait]

crates/forge_app/src/orch_spec/orch_setup.rs

@@ -5,8 +5,8 @@ use chrono::{DateTime, Local};
 use derive_setters::Setters;
 use forge_domain::{
     Agent, AgentId, Attachment, ChatCompletionMessage, ChatResponse, ContextMessage, Conversation,
-    Environment, Event, HttpConfig, ModelId, ProviderId, RetryConfig, Role, Template, ToolCallFull,
-    ToolDefinition, ToolResult, Workflow,
+    Environment, Event, File, HttpConfig, ModelId, ProviderId, RetryConfig, Role, Template,
+    ToolCallFull, ToolDefinition, ToolResult, Workflow,
 };
 use url::Url;
 
@@ -25,7 +25,7 @@ pub struct TestContext {
     pub mock_assistant_responses: Vec<ChatCompletionMessage>,
     pub workflow: Workflow,
     pub templates: HashMap<String, String>,
-    pub files: Vec<String>,
+    pub files: Vec<File>,
     pub env: Environment,
     pub current_time: DateTime<Local>,
     pub title: Option<String>,

crates/forge_app/src/orch_spec/orch_system_spec.rs

@@ -26,8 +26,8 @@ async fn test_system_prompt_tool_supported() {
                 .custom_rules("Do it nicely"),
         )
         .files(vec![
-            "/users/john/foo.txt".to_string(),
-            "/users/jason/bar.txt".to_string(),
+            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 },
         ])
         .mock_assistant_responses(vec![
             ChatCompletionMessage::assistant(Content::full("Sure"))

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

@@ -10,8 +10,8 @@ You are Forge
 <default_shell>bash</default_shell>
 <home_directory>/Users/tushar</home_directory>
 <file_list>
- - /users/jason/bar.txt
  - /users/john/foo.txt
+ - /users/jason/bar.txt
 </file_list>
 </system_information>
 

crates/forge_app/src/services.rs

@@ -308,6 +308,10 @@ pub trait WorkflowService {
 #[async_trait::async_trait]
 pub trait FileDiscoveryService: Send + Sync {
     async fn collect_files(&self, config: Walker) -> anyhow::Result<Vec<File>>;
+
+    /// Lists all entries (files and directories) in the current directory
+    /// Returns a sorted vector of File entries with directories first
+    async fn list_current_directory(&self) -> anyhow::Result<Vec<File>>;
 }
 
 #[async_trait::async_trait]
@@ -713,6 +717,10 @@ impl<I: Services> FileDiscoveryService for I {
     async fn collect_files(&self, config: Walker) -> anyhow::Result<Vec<File>> {
         self.file_discovery_service().collect_files(config).await
     }
+
+    async fn list_current_directory(&self) -> anyhow::Result<Vec<File>> {
+        self.file_discovery_service().list_current_directory().await
+    }
 }
 
 #[async_trait::async_trait]

crates/forge_app/src/system_prompt.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use derive_setters::Setters;
 use forge_domain::{
-    Agent, Conversation, Environment, Model, SystemContext, Template, ToolDefinition,
+    Agent, Conversation, Environment, File, Model, SystemContext, Template, ToolDefinition,
     ToolUsagePrompt,
 };
 use tracing::debug;
@@ -15,7 +15,7 @@ pub struct SystemPrompt<S> {
     environment: Environment,
     agent: Agent,
     tool_definitions: Vec<ToolDefinition>,
-    files: Vec<String>,
+    files: Vec<File>,
     models: Vec<Model>,
     custom_instructions: Vec<String>,
 }
@@ -41,8 +41,7 @@ impl<S: SkillFetchService> SystemPrompt<S> {
         let agent = &self.agent;
         let context = if let Some(system_prompt) = &agent.system_prompt {
             let env = self.environment.clone();
-            let mut files = self.files.clone();
-            files.sort();
+            let files = self.files.clone();
 
             let tool_supported = self.is_tool_supported()?;
             let supports_parallel_tool_calls = self.is_parallel_tool_call_supported();

crates/forge_domain/src/agent.rs

@@ -45,9 +45,6 @@ pub struct Agent {
     /// Maximum number of turns the agent can take
     pub max_turns: Option<u64>,
 
-    /// Maximum depth to which the file walker should traverse for this agent
-    pub max_walker_depth: Option<usize>,
-
     /// Configuration for automatic context compaction
     pub compact: Option<Compact>,
 
@@ -90,7 +87,6 @@ impl Agent {
             user_prompt: Default::default(),
             tools: Default::default(),
             max_turns: Default::default(),
-            max_walker_depth: Default::default(),
             compact: Default::default(),
             custom_rules: Default::default(),
             temperature: Default::default(),
@@ -138,10 +134,6 @@ impl Agent {
             }
         }
 
-        if let Some(max_walker_depth) = workflow.max_walker_depth {
-            agent.max_walker_depth = Some(max_walker_depth);
-        }
-
         if let Some(temperature) = workflow.temperature {
             agent.temperature = Some(temperature);
         }
@@ -231,7 +223,6 @@ impl Agent {
             reasoning: def.reasoning,
             compact: def.compact,
             max_turns: def.max_turns,
-            max_walker_depth: def.max_walker_depth,
             custom_rules: def.custom_rules,
             max_tool_failure_per_turn: def.max_tool_failure_per_turn,
             max_requests_per_turn: def.max_requests_per_turn,

crates/forge_domain/src/agent_definition.rs

@@ -104,12 +104,6 @@ pub struct AgentDefinition {
     #[merge(strategy = crate::merge::option)]
     pub max_turns: Option<u64>,
 
-    /// Maximum depth to which the file walker should traverse for this agent
-    /// If not provided, the maximum possible depth will be used
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[merge(strategy = crate::merge::option)]
-    pub max_walker_depth: Option<usize>,
-
     /// Configuration for automatic context compaction
     #[serde(default, skip_serializing_if = "Option::is_none")]
     #[merge(strategy = crate::merge::option)]
@@ -249,7 +243,6 @@ impl AgentDefinition {
             user_prompt: Default::default(),
             tools: Default::default(),
             max_turns: Default::default(),
-            max_walker_depth: Default::default(),
             compact: Default::default(),
             custom_rules: Default::default(),
             temperature: Default::default(),

crates/forge_domain/src/file.rs

@@ -1,6 +1,6 @@
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Serialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct File {
     pub path: String,
     pub is_dir: bool,