refactor: rename ToolCallService trait to ExecutableTool and update references (#291)

tusharmath · web-flow · commit 0632cd5d3400 · 2025-02-04T20:15:24.000Z
diff --git a/crates/forge_app/src/service/tool_service.rs b/crates/forge_app/src/service/tool_service.rs
@@ -113,7 +113,7 @@ mod test {
     // Mock tool that always succeeds
     struct SuccessTool;
     #[async_trait::async_trait]
-    impl forge_domain::ToolCallService for SuccessTool {
+    impl forge_domain::ExecutableTool for SuccessTool {
         type Input = Value;
 
         async fn call(&self, input: Self::Input) -> Result<String, String> {
@@ -124,7 +124,7 @@ mod test {
     // Mock tool that always fails
     struct FailureTool;
     #[async_trait::async_trait]
-    impl forge_domain::ToolCallService for FailureTool {
+    impl forge_domain::ExecutableTool for FailureTool {
         type Input = Value;
 
         async fn call(&self, _input: Self::Input) -> Result<String, String> {
@@ -198,7 +198,7 @@ mod test {
     // Mock tool that simulates a long-running task
     struct SlowTool;
     #[async_trait::async_trait]
-    impl forge_domain::ToolCallService for SlowTool {
+    impl forge_domain::ExecutableTool for SlowTool {
         type Input = Value;
 
         async fn call(&self, _input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_domain/src/tool.rs b/crates/forge_domain/src/tool.rs
@@ -1,7 +1,7 @@
 use schemars::JsonSchema;
 use serde_json::Value;
 
-use crate::{NamedTool, ToolCallService, ToolDefinition, ToolDescription};
+use crate::{ExecutableTool, NamedTool, ToolDefinition, ToolDescription};
 
 struct JsonTool<T>(T);
 
@@ -12,7 +12,7 @@ impl<T> JsonTool<T> {
 }
 
 #[async_trait::async_trait]
-impl<T: ToolCallService + Sync> ToolCallService for JsonTool<T>
+impl<T: ExecutableTool + Sync> ExecutableTool for JsonTool<T>
 where
     T::Input: serde::de::DeserializeOwned + JsonSchema,
 {
@@ -25,13 +25,13 @@ where
 }
 
 pub struct Tool {
-    pub executable: Box<dyn ToolCallService<Input = Value> + Send + Sync + 'static>,
+    pub executable: Box<dyn ExecutableTool<Input = Value> + Send + Sync + 'static>,
     pub definition: ToolDefinition,
 }
 
 impl<T> From<T> for Tool
 where
-    T: ToolCallService + ToolDescription + NamedTool + Send + Sync + 'static,
+    T: ExecutableTool + ToolDescription + NamedTool + Send + Sync + 'static,
     T::Input: serde::de::DeserializeOwned + JsonSchema,
 {
     fn from(tool: T) -> Self {
diff --git a/crates/forge_domain/src/tool_definition.rs b/crates/forge_domain/src/tool_definition.rs
@@ -5,7 +5,7 @@ use schemars::schema::RootSchema;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::{NamedTool, ToolCallService, ToolName, UsageParameterPrompt, UsagePrompt};
+use crate::{ExecutableTool, NamedTool, ToolName, UsageParameterPrompt, UsagePrompt};
 
 ///
 /// Refer to the specification over here:
@@ -59,7 +59,7 @@ impl ToolDefinition {
 
 impl<T> From<&T> for ToolDefinition
 where
-    T: NamedTool + ToolCallService + ToolDescription + Send + Sync + 'static,
+    T: NamedTool + ExecutableTool + ToolDescription + Send + Sync + 'static,
     T::Input: serde::de::DeserializeOwned + JsonSchema,
 {
     fn from(t: &T) -> Self {
diff --git a/crates/forge_domain/src/tool_service.rs b/crates/forge_domain/src/tool_service.rs
@@ -3,7 +3,7 @@ use serde::de::DeserializeOwned;
 use crate::{ToolCallFull, ToolDefinition, ToolResult};
 
 #[async_trait::async_trait]
-pub trait ToolCallService {
+pub trait ExecutableTool {
     type Input: DeserializeOwned;
 
     async fn call(&self, input: Self::Input) -> Result<String, String>;
diff --git a/crates/forge_tool/src/approve.rs b/crates/forge_tool/src/approve.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use inquire::Confirm;
 use schemars::JsonSchema;
@@ -37,7 +37,7 @@ impl NamedTool for Approve {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for Approve {
+impl ExecutableTool for Approve {
     type Input = ApproveInput;
 
     async fn call(&self, input: ApproveInput) -> Result<String, String> {
diff --git a/crates/forge_tool/src/ask.rs b/crates/forge_tool/src/ask.rs
@@ -1,4 +1,4 @@
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -24,7 +24,7 @@ impl NamedTool for AskFollowUpQuestion {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for AskFollowUpQuestion {
+impl ExecutableTool for AskFollowUpQuestion {
     type Input = AskFollowUpQuestionInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/fetch.rs b/crates/forge_tool/src/fetch.rs
@@ -1,5 +1,5 @@
 use anyhow::{anyhow, Result};
-use forge_domain::{NamedTool, ToolCallService, ToolDescription};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription};
 use forge_tool_macros::ToolDescription;
 use reqwest::{Client, Url};
 use schemars::JsonSchema;
@@ -141,7 +141,7 @@ impl Fetch {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for Fetch {
+impl ExecutableTool for Fetch {
     type Input = FetchInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/fs/file_info.rs b/crates/forge_tool/src/fs/file_info.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use anyhow::Context;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -29,7 +29,7 @@ impl NamedTool for FSFileInfo {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for FSFileInfo {
+impl ExecutableTool for FSFileInfo {
     type Input = FSFileInfoInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/fs/fs_find.rs b/crates/forge_tool/src/fs/fs_find.rs
@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::path::Path;
 
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use forge_walker::Walker;
 use regex::Regex;
@@ -36,7 +36,7 @@ impl NamedTool for FSSearch {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for FSSearch {
+impl ExecutableTool for FSSearch {
     type Input = FSSearchInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/fs/fs_list.rs b/crates/forge_tool/src/fs/fs_list.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use anyhow::Context;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use forge_walker::Walker;
 use schemars::JsonSchema;
@@ -36,7 +36,7 @@ impl NamedTool for FSList {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for FSList {
+impl ExecutableTool for FSList {
     type Input = FSListInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/fs/fs_read.rs b/crates/forge_tool/src/fs/fs_read.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -29,7 +29,7 @@ impl NamedTool for FSRead {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for FSRead {
+impl ExecutableTool for FSRead {
     type Input = FSReadInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/fs/fs_write.rs b/crates/forge_tool/src/fs/fs_write.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -32,7 +32,7 @@ impl NamedTool for FSWrite {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for FSWrite {
+impl ExecutableTool for FSWrite {
     type Input = FSWriteInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/outline.rs b/crates/forge_tool/src/outline.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::path::Path;
 
 use anyhow::Context;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -125,7 +125,7 @@ impl NamedTool for Outline {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for Outline {
+impl ExecutableTool for Outline {
     type Input = OutlineInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/outline/tests/css.rs b/crates/forge_tool/src/outline/tests/css.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/java.rs b/crates/forge_tool/src/outline/tests/java.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/javascript.rs b/crates/forge_tool/src/outline/tests/javascript.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/misc.rs b/crates/forge_tool/src/outline/tests/misc.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/python.rs b/crates/forge_tool/src/outline/tests/python.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/rust.rs b/crates/forge_tool/src/outline/tests/rust.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/scala.rs b/crates/forge_tool/src/outline/tests/scala.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/tsx.rs b/crates/forge_tool/src/outline/tests/tsx.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/outline/tests/typescript.rs b/crates/forge_tool/src/outline/tests/typescript.rs
@@ -1,4 +1,4 @@
-use forge_domain::ToolCallService;
+use forge_domain::ExecutableTool;
 use insta::assert_snapshot;
 use tokio::fs;
 
diff --git a/crates/forge_tool/src/patch/apply.rs b/crates/forge_tool/src/patch/apply.rs
@@ -1,7 +1,7 @@
 use std::path::{Path, PathBuf};
 
 use dissimilar::Chunk;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use schemars::JsonSchema;
 use serde::Deserialize;
 use thiserror::Error;
@@ -139,7 +139,7 @@ async fn apply_patches(content: String, blocks: Vec<PatchBlock>) -> Result<Strin
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for ApplyPatch {
+impl ExecutableTool for ApplyPatch {
     type Input = ApplyPatchInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/patch/apply_json.rs b/crates/forge_tool/src/patch/apply_json.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use dissimilar::Chunk;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -213,7 +213,7 @@ async fn process_file_modifications(
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for ApplyPatchJson {
+impl ExecutableTool for ApplyPatchJson {
     type Input = ApplyPatchJsonInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/select.rs b/crates/forge_tool/src/select.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use inquire::Select as InquireSelect;
 use schemars::JsonSchema;
@@ -41,7 +41,7 @@ impl NamedTool for SelectTool {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for SelectTool {
+impl ExecutableTool for SelectTool {
     type Input = SelectInput;
 
     async fn call(&self, input: SelectInput) -> Result<String, String> {
diff --git a/crates/forge_tool/src/shell.rs b/crates/forge_tool/src/shell.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;
 use std::path::PathBuf;
 
 use anyhow::Result;
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -129,7 +129,7 @@ impl NamedTool for Shell {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for Shell {
+impl ExecutableTool for Shell {
     type Input = ShellInput;
 
     async fn call(&self, input: Self::Input) -> Result<String, String> {
diff --git a/crates/forge_tool/src/think.rs b/crates/forge_tool/src/think.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use anyhow::{Context, Result};
-use forge_domain::{NamedTool, ToolCallService, ToolDescription, ToolName};
+use forge_domain::{ExecutableTool, NamedTool, ToolDescription, ToolName};
 use forge_tool_macros::ToolDescription;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -139,7 +139,7 @@ impl NamedTool for Think {
 }
 
 #[async_trait::async_trait]
-impl ToolCallService for Think {
+impl ExecutableTool for Think {
     type Input = ThoughtInput;
     async fn call(&self, input: Self::Input) -> Result<String, String> {
         let mut thinker = self.clone();

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`use schemars::JsonSchema;`
`2`	`2`	`use serde_json::Value;`
`3`	`3`
`4`		`-use crate::{NamedTool, ToolCallService, ToolDefinition, ToolDescription};`
	`4`	`+use crate::{ExecutableTool, NamedTool, ToolDefinition, ToolDescription};`
`5`	`5`
`6`	`6`	`struct JsonTool<T>(T);`
`7`	`7`
`@@ -12,7 +12,7 @@ impl<T> JsonTool<T> {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`#[async_trait::async_trait]`
`15`		`-impl<T: ToolCallService + Sync> ToolCallService for JsonTool<T>`
	`15`	`+impl<T: ExecutableTool + Sync> ExecutableTool for JsonTool<T>`
`16`	`16`	`where`
`17`	`17`	`T::Input: serde::de::DeserializeOwned + JsonSchema,`
`18`	`18`	`{`
`@@ -25,13 +25,13 @@ where`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`pub struct Tool {`
`28`		`- pub executable: Box<dyn ToolCallService<Input = Value> + Send + Sync + 'static>,`
	`28`	`+ pub executable: Box<dyn ExecutableTool<Input = Value> + Send + Sync + 'static>,`
`29`	`29`	`pub definition: ToolDefinition,`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl<T> From<T> for Tool`
`33`	`33`	`where`
`34`		`- T: ToolCallService + ToolDescription + NamedTool + Send + Sync + 'static,`
	`34`	`+ T: ExecutableTool + ToolDescription + NamedTool + Send + Sync + 'static,`
`35`	`35`	`T::Input: serde::de::DeserializeOwned + JsonSchema,`
`36`	`36`	`{`
`37`	`37`	`fn from(tool: T) -> Self {`