File size: 16,664 Bytes
e5034c3 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 | use std::collections::{HashMap, HashSet};
use forge_domain::{Agent, ToolDefinition, ToolName};
use glob::Pattern;
/// Service that resolves tool definitions for agents based on their configured
/// tool list
pub struct ToolResolver {
all_tool_definitions: Vec<ToolDefinition>,
}
/// Maps deprecated tool names to their current names for backward compatibility
fn deprecated_tool_aliases() -> HashMap<&'static str, ToolName> {
HashMap::from([
("search", ToolName::new("fs_search")),
("Read", ToolName::new("read")),
("Write", ToolName::new("write")),
("Task", ToolName::new("task")),
])
}
impl ToolResolver {
/// Creates a new ToolResolver with all available tool definitions
pub fn new(all_tool_definitions: Vec<ToolDefinition>) -> Self {
Self { all_tool_definitions }
}
/// Resolves the tool definitions for a specific agent by filtering
/// based on the agent's configured tool list. Supports both exact matches
/// and glob patterns (e.g., "fs_*" matches "fs_read", "fs_write").
/// Filters and deduplicates tool definitions based on agent's tools
/// configuration. Returns only the tool definitions that are specified
/// in the agent's tools list. Maintains deduplication to avoid
/// duplicate tool definitions. Returns tools sorted according to the
/// agent's tool order (derived from the tools list).
/// Returns references to avoid unnecessary cloning.
pub fn resolve<'a>(&'a self, agent: &Agent) -> Vec<&'a ToolDefinition> {
let patterns = Self::build_patterns(agent);
let mut resolved = self.match_tools(&patterns);
self.dedupe_tools(&mut resolved);
agent.tool_order().sort_refs(&mut resolved);
resolved
}
fn is_allowed_pattern(patterns: &[Pattern], tool_name: &ToolName) -> bool {
patterns
.iter()
.any(|pattern| pattern.matches(tool_name.as_str()))
}
pub fn is_allowed(agent: &Agent, tool_name: &ToolName) -> bool {
let aliases = deprecated_tool_aliases();
let normalized_tool_name = aliases.get(tool_name.as_str()).unwrap_or(tool_name);
let legacy_mcp_tool_name = normalized_tool_name.to_legacy_mcp_name();
let patterns = Self::build_patterns(agent);
Self::is_allowed_pattern(&patterns, normalized_tool_name)
|| legacy_mcp_tool_name
.as_ref()
.is_some_and(|legacy_tool_name| {
Self::is_allowed_pattern(&patterns, legacy_tool_name)
})
}
/// Builds glob patterns from the agent's tool patterns, deduplicating
/// patterns. Supports backward compatibility by automatically adding
/// current tool names when deprecated aliases are used.
fn build_patterns(agent: &Agent) -> Vec<Pattern> {
let aliases = deprecated_tool_aliases();
let tool_names = agent
.tools
.iter()
.flatten()
.map(|name| {
// Resolve deprecated tool name via aliases
aliases.get(name.as_str()).unwrap_or(name)
})
.collect::<HashSet<_>>();
tool_names
.into_iter()
.filter_map(|pattern| Pattern::new(pattern.as_str()).ok())
.collect()
}
/// Matches tool definitions against glob patterns
fn match_tools<'a>(&'a self, patterns: &[Pattern]) -> Vec<&'a ToolDefinition> {
self.all_tool_definitions
.iter()
.filter(|tool| Self::is_allowed_pattern(patterns, &tool.name))
.collect()
}
/// Deduplicates tool definitions by name, keeping the first occurrence
fn dedupe_tools(&self, resolved: &mut Vec<&ToolDefinition>) {
let mut seen = HashSet::new();
resolved.retain(|tool| seen.insert(&tool.name));
}
}
#[cfg(test)]
mod tests {
use forge_domain::{Agent, AgentId, ModelId, ProviderId, ToolDefinition, ToolName};
use pretty_assertions::assert_eq;
use super::ToolResolver;
#[test]
fn test_resolve_filters_agent_tools() {
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
ToolDefinition::new("fs_search").description("Search Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("read"), ToolName::new("fs_search")]);
let actual = tool_resolver.resolve(&fixture);
// Tools are ordered based on the tools list order: read, then fs_search
let expected = vec![
&tool_resolver.all_tool_definitions[0], // read
&tool_resolver.all_tool_definitions[2], // fs_search
];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_no_agent_tools() {
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
);
let actual = tool_resolver.resolve(&fixture);
let expected: Vec<&ToolDefinition> = vec![];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_nonexistent_tools() {
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![
ToolName::new("nonexistent1"),
ToolName::new("nonexistent2"),
]);
let actual = tool_resolver.resolve(&fixture);
let expected: Vec<&ToolDefinition> = vec![];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_duplicate_agent_tools() {
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![
ToolName::new("read"),
ToolName::new("read"), // Duplicate
ToolName::new("write"),
]);
let actual = tool_resolver.resolve(&fixture);
let expected = vec![
&tool_resolver.all_tool_definitions[0], // read
&tool_resolver.all_tool_definitions[1], // write
];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_glob_pattern_wildcard() {
let all_tool_definitions = vec![
ToolDefinition::new("fs_read").description("Read Tool"),
ToolDefinition::new("fs_write").description("Write Tool"),
ToolDefinition::new("fs_search").description("Search Tool"),
ToolDefinition::new("net_fetch").description("Fetch Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("fs_*")]);
let actual = tool_resolver.resolve(&fixture);
let expected = vec![
&tool_resolver.all_tool_definitions[0], // fs_read
&tool_resolver.all_tool_definitions[2], // fs_search
&tool_resolver.all_tool_definitions[1], // fs_write
];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_glob_pattern_no_matches() {
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("fs_*")]);
let actual = tool_resolver.resolve(&fixture);
let expected: Vec<&ToolDefinition> = vec![];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_mixed_exact_and_glob() {
let all_tool_definitions = vec![
ToolDefinition::new("fs_read").description("FS Read Tool"),
ToolDefinition::new("fs_write").description("FS Write Tool"),
ToolDefinition::new("net_fetch").description("Net Fetch Tool"),
ToolDefinition::new("shell").description("Shell Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("fs_*"), ToolName::new("shell")]);
let actual = tool_resolver.resolve(&fixture);
let expected = vec![
&tool_resolver.all_tool_definitions[0], // fs_read
&tool_resolver.all_tool_definitions[1], // fs_write
&tool_resolver.all_tool_definitions[3], // shell
];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_question_mark_wildcard() {
let all_tool_definitions = vec![
ToolDefinition::new("read1").description("Read 1 Tool"),
ToolDefinition::new("read2").description("Read 2 Tool"),
ToolDefinition::new("read10").description("Read 10 Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("read?")]);
let actual = tool_resolver.resolve(&fixture);
let expected = vec![
&tool_resolver.all_tool_definitions[0], // read1
&tool_resolver.all_tool_definitions[1], // read2
];
assert_eq!(actual, expected);
}
#[test]
fn test_resolve_with_overlapping_glob_patterns() {
let all_tool_definitions = vec![
ToolDefinition::new("fs_read").description("FS Read Tool"),
ToolDefinition::new("fs_write").description("FS Write Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![
ToolName::new("fs_*"),
ToolName::new("fs_read"),
ToolName::new("*_read"),
]);
let actual = tool_resolver.resolve(&fixture);
// fs_write matches fs_* at pos 0
// fs_read has exact match at pos 1 (takes precedence over pattern matches)
// So order is: fs_write (pos 0), fs_read (pos 1)
let expected = vec![
&tool_resolver.all_tool_definitions[1], // fs_write
&tool_resolver.all_tool_definitions[0], // fs_read
];
assert_eq!(actual, expected);
}
#[test]
fn test_exact_legacy_mcp_tool_allows_claude_code_name() {
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("mcp_github_tool_create_issue")]);
assert!(ToolResolver::is_allowed(
&fixture,
&ToolName::new("mcp__github__create_issue"),
));
}
#[test]
fn test_glob_legacy_mcp_tool_allows_claude_code_name() {
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("mcp_github_tool_*")]);
assert!(ToolResolver::is_allowed(
&fixture,
&ToolName::new("mcp__github__create_issue"),
));
}
#[test]
fn test_backward_compatibility_search_alias() {
// Test that deprecated "search" name resolves to "fs_search"
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("fs_search").description("Search Tool"),
];
let tool_resolver = ToolResolver::new(all_tool_definitions);
// Agent uses old "search" name
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("read"), ToolName::new("search")]);
let actual = tool_resolver.resolve(&fixture);
// Tools are ordered as specified in the tools list: read, then search (->
// fs_search)
let expected = vec![
&tool_resolver.all_tool_definitions[0], // read
&tool_resolver.all_tool_definitions[1], // fs_search (from "search" alias)
];
assert_eq!(actual, expected);
}
#[test]
fn test_capitalized_read_alias() {
// Test that capitalized "Read" resolves to "read"
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
];
let _tool_resolver = ToolResolver::new(all_tool_definitions);
// Agent configuration with lowercase
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("read"), ToolName::new("write")]);
// Validation should accept both capitalized and lowercase
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("read")));
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("Read")));
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("write")));
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("Write")));
}
#[test]
fn test_capitalized_write_alias() {
// Test that capitalized "Write" resolves to "write"
let all_tool_definitions = vec![
ToolDefinition::new("read").description("Read Tool"),
ToolDefinition::new("write").description("Write Tool"),
];
let _tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("write")]);
// Both lowercase and capitalized should be allowed
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("write")));
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("Write")));
}
#[test]
fn test_capitalized_task_alias() {
// Test that capitalized "Task" resolves to "task"
let all_tool_definitions = vec![ToolDefinition::new("task").description("Task Tool")];
let _tool_resolver = ToolResolver::new(all_tool_definitions);
let fixture = Agent::new(
AgentId::new("test-agent"),
ProviderId::ANTHROPIC,
ModelId::new("claude-3-5-sonnet-20241022"),
)
.tools(vec![ToolName::new("task")]);
// Both lowercase and capitalized should be allowed
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("task")));
assert!(ToolResolver::is_allowed(&fixture, &ToolName::new("Task")));
}
}
|