[sidecar] move properties to tool use agent

Author: theskcd

sidecar/src/agentic/tool/session/service.rs

@@ -390,11 +390,10 @@ impl SessionService {
         tool_box: Arc<ToolBox>,
         llm_broker: Arc<LLMBroker>,
         user_context: UserContext,
-        aide_rules: Option<String>,
         reasoning: bool,
         running_in_editor: bool,
         mcts_log_directory: Option<String>,
-        repo_name: Option<String>,
+        tool_use_agent_properties: ToolUseAgentProperties,
         message_properties: SymbolEventMessageProperties,
         context_crunching_llm: Option<LLMProperties>,
     ) -> Result<(), SymbolError> {
@@ -431,8 +430,7 @@ impl SessionService {
             // close to the vscode server
             // we should ideally get this information from the vscode-server side setting
             std::env::consts::OS.to_owned(),
-            shell.to_owned(),
-            ToolUseAgentProperties::new(running_in_editor, repo_name, aide_rules),
+            tool_use_agent_properties,
         )
         .set_context_crunching_llm(context_crunching_llm.clone());
 

sidecar/src/agentic/tool/session/tool_use_agent.rs

@@ -337,14 +337,21 @@ pub enum ToolUseAgentOutputType {
 #[derive(Clone)]
 pub struct ToolUseAgentProperties {
     in_editor: bool,
+    shell: String,
     repo_name: Option<String>,
     aide_rules: Option<String>,
 }
 
 impl ToolUseAgentProperties {
-    pub fn new(in_editor: bool, repo_name: Option<String>, aide_rules: Option<String>) -> Self {
+    pub fn new(
+        in_editor: bool,
+        shell: String,
+        repo_name: Option<String>,
+        aide_rules: Option<String>,
+    ) -> Self {
         Self {
             in_editor,
+            shell,
             repo_name,
             aide_rules,
         }
@@ -356,7 +363,6 @@ pub struct ToolUseAgent {
     llm_client: Arc<LLMBroker>,
     working_directory: String,
     operating_system: String,
-    shell: String,
     properties: ToolUseAgentProperties,
     temperature: f32,
     context_crunching_llm: Option<LLMProperties>,
@@ -367,14 +373,12 @@ impl ToolUseAgent {
         llm_client: Arc<LLMBroker>,
         working_directory: String,
         operating_system: String,
-        shell: String,
         properties: ToolUseAgentProperties,
     ) -> Self {
         Self {
             llm_client,
             working_directory,
             operating_system,
-            shell,
             properties,
             // we always default to 0.2 temp to start with
             temperature: 0.2,
@@ -732,7 +736,7 @@ You are NOT ALLOWED to install any new packages. The dev environment has already
     fn system_message_for_context_crunching(&self) -> String {
         let working_directory = self.working_directory.to_owned();
         let operating_system = self.operating_system.to_owned();
-        let default_shell = self.shell.to_owned();
+        let default_shell = self.properties.shell.to_owned();
         let repo_name = self
             .properties
             .repo_name
@@ -886,7 +890,7 @@ Additional guildelines and rules the user has provided which must be followed:
             }
             None => "".to_owned(),
         };
-        let default_shell = self.shell.to_owned();
+        let default_shell = self.properties.shell.to_owned();
         format!(
             r#"You are SOTA-agent, a highly skilled AI software engineer with extensive knowledge in all programming languages, frameworks, design patterns, and best practices. Your primary goal is to accomplish tasks related to software development, file manipulation, and system operations within the specified project directory.
 

sidecar/src/agentic/tool/type.rs

@@ -158,6 +158,8 @@ pub enum ToolType {
     RequestScreenshot,
     // Context crunching
     ContextCrunching,
+    // Think tool
+    ThinkTool,
     // dynamically configured MCP servers
     McpTool(String),
 }
@@ -264,6 +266,7 @@ impl std::fmt::Display for ToolType {
             ToolType::FindFiles => write!(f, "find_file"),
             ToolType::RequestScreenshot => write!(f, "request_screenshot"),
             ToolType::ContextCrunching => write!(f, "context_crunching"),
+            ToolType::ThinkTool => write!(f, "think_tool"),
             ToolType::McpTool(name) => write!(f, "{}", name),
         }
     }

sidecar/src/bin/agent_bin.rs

@@ -14,7 +14,7 @@ use sidecar::{
             events::{input::SymbolEventRequestId, message_event::SymbolEventMessageProperties},
             identifier::LLMProperties,
         },
-        tool::r#type::ToolType,
+        tool::{r#type::ToolType, session::tool_use_agent::ToolUseAgentProperties},
     },
     application::{application::Application, config::configuration::Configuration},
     repo::types::RepoRef,
@@ -201,6 +201,13 @@ Your thinking should be thorough and so it's fine if it's very long."#,
         ToolType::FindFiles,
     ];
 
+    let tool_use_agent_properties = ToolUseAgentProperties::new(
+        false,
+        "bash".to_owned(),
+        Some(args.repo_name.clone()),
+        aide_rules,
+    );
+
     // wait for the agent to finish over here while busy looping
     println!("agent::tool_use::start");
     let _ = session_service
@@ -219,11 +226,10 @@ Your thinking should be thorough and so it's fine if it's very long."#,
             tool_box,
             llm_broker,
             UserContext::default(),
-            aide_rules,
             false,
             false,
             Some(args.log_directory.clone()),
-            Some(args.repo_name.clone()),
+            tool_use_agent_properties,
             message_properties,
             None, // No context crunching LLM for agent_bin
         )

sidecar/src/bin/agent_bin_reasoning.rs

@@ -14,7 +14,7 @@ use sidecar::{
             events::{input::SymbolEventRequestId, message_event::SymbolEventMessageProperties},
             identifier::LLMProperties,
         },
-        tool::r#type::ToolType,
+        tool::{r#type::ToolType, session::tool_use_agent::ToolUseAgentProperties},
     },
     application::{application::Application, config::configuration::Configuration},
     repo::types::RepoRef,
@@ -194,6 +194,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         ToolType::FindFiles,
     ];
 
+    let tool_use_agent_properties = ToolUseAgentProperties::new(
+        false,
+        "bash".to_owned(),
+        Some(args.repo_name.to_owned()),
+        None,
+    );
+
     // wait for the agent to finish over here while busy looping
     println!("agent::tool_use::start");
     let _ = session_service
@@ -212,11 +219,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             tool_box,
             llm_broker,
             UserContext::default(),
-            None,
             true, // turn on reasoning
             false,
             Some(args.log_directory.clone()),
-            Some(args.repo_name.clone()),
+            tool_use_agent_properties,
             message_properties,
             None, // No context crunching LLM for agent_bin_reasoning
         )

sidecar/src/bin/swe_bench_agent_bin.rs

@@ -14,7 +14,7 @@ use sidecar::{
             events::{input::SymbolEventRequestId, message_event::SymbolEventMessageProperties},
             identifier::LLMProperties,
         },
-        tool::r#type::ToolType,
+        tool::{r#type::ToolType, session::tool_use_agent::ToolUseAgentProperties},
     },
     application::{application::Application, config::configuration::Configuration},
     repo::types::RepoRef,
@@ -203,6 +203,13 @@ Your thinking should be thorough and so it's fine if it's very long."#,
         ToolType::FindFiles,
     ];
 
+    let tool_use_agent_properties = ToolUseAgentProperties::new(
+        false,
+        "bash".to_owned(),
+        Some(args.repo_name.to_owned()),
+        aide_rules.clone(),
+    );
+
     // wait for the agent to finish over here while busy looping
     println!("agent::tool_use::start");
     let _ = session_service
@@ -221,11 +228,10 @@ Your thinking should be thorough and so it's fine if it's very long."#,
             tool_box,
             llm_broker,
             UserContext::default(),
-            aide_rules,
             false,
             false,
             Some(args.log_directory.clone()),
-            Some(args.repo_name.clone()),
+            tool_use_agent_properties,
             message_properties,
             None, // No context crunching LLM for agent_bin
         )

sidecar/src/mcts/execution/inference.rs

@@ -257,8 +257,12 @@ impl InferenceEngine {
             search_tree.llm_client(),
             search_tree.root_directory(),
             "linux".to_owned(),
-            "bash".to_owned(),
-            ToolUseAgentProperties::new(true, Some(search_tree.repo_name()), None),
+            ToolUseAgentProperties::new(
+                true,
+                "bash".to_owned(),
+                Some(search_tree.repo_name()),
+                None,
+            ),
         );
 
         let session_messages = messages
@@ -441,8 +445,12 @@ impl InferenceEngine {
             search_tree.llm_client(),
             search_tree.root_directory(),
             "linux".to_owned(),
-            "bash".to_owned(),
-            ToolUseAgentProperties::new(true, Some(search_tree.repo_name()), None),
+            ToolUseAgentProperties::new(
+                true,
+                "bash".to_owned(),
+                Some(search_tree.repo_name()),
+                None,
+            ),
         );
 
         let mut session_messages = messages

sidecar/src/webserver/agentic.rs

@@ -35,6 +35,7 @@ use crate::agentic::tool::errors::ToolError;
 use crate::agentic::tool::lsp::open_file::OpenFileResponse;
 use crate::agentic::tool::plan::service::PlanService;
 use crate::agentic::tool::session::session::AideAgentMode;
+use crate::agentic::tool::session::tool_use_agent::ToolUseAgentProperties;
 use crate::chunking::text_document::Range;
 use crate::repo::types::RepoRef;
 use crate::webserver::plan::{
@@ -1783,6 +1784,9 @@ pub async fn agent_tool_use(
         vec![]
     })
     .collect();
+
+    let tool_use_agent_properties =
+        ToolUseAgentProperties::new(true, shell.to_owned(), Some(repo_name), aide_rules);
     let _ = tokio::spawn({
         let sender = sender.clone();
         let session_id = session_id.clone();
@@ -1804,11 +1808,10 @@ pub async fn agent_tool_use(
                         tool_box,
                         llm_broker,
                         user_context,
-                        aide_rules,
                         reasoning,
                         true, // we are running inside the editor over here
                         mcts_log_directory,
-                        Some(repo_name),
+                        tool_use_agent_properties,
                         message_properties,
                         None, // No context crunching LLM for web requests
                     )