Skip to content

Fix case-insensitive matching for builtin extension names #6825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DOsinga merged 2 commits into from
Jan 30, 2026
+32 −33
Merged

Fix case-insensitive matching for builtin extension names #6825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97d5062
Fix case-insensitive matching for builtin extension names
Jan 30, 2026
2cc49ff
Fix goose-acp extension loading during initialization
Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/goose-acp/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,11 @@ async fn add_builtins(agent: &Agent, builtins: Vec<String>) {
async fn add_extensions(agent: &Agent, extensions: Vec<ExtensionConfig>) {
for extension in extensions {
let name = extension.name().to_string();
match agent.add_extension(extension).await {
match agent
.extension_manager
.add_extension(extension, None, None)
.await
{
Ok(_) => info!(extension = %name, "extension loaded"),
Err(e) => warn!(extension = %name, error = %e, "extension load failed"),
}
Expand Down
44 changes: 17 additions & 27 deletions crates/goose/src/agents/extension_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ use super::types::SharedProvider;
use crate::agents::extension::{Envs, ProcessExit};
use crate::agents::extension_malware_check;
use crate::agents::mcp_client::{McpClient, McpClientTrait};
use crate::config::extensions::name_to_key;
use crate::config::search_path::SearchPaths;
use crate::config::{get_all_extensions, Config};
use crate::oauth::oauth_flow;
Expand Down Expand Up @@ -133,20 +134,6 @@ impl ResourceItem {
}
}

/// Sanitizes a string by replacing invalid characters with underscores.
/// Valid characters match [a-zA-Z0-9_-]
pub fn normalize(input: &str) -> String {
let mut result = String::with_capacity(input.len());
for c in input.chars() {
result.push(match c {
c if c.is_ascii_alphanumeric() || c == '_' || c == '-' => c,
c if c.is_whitespace() => continue, // effectively "strip" whitespace
_ => '_', // Replace any other non-ASCII character with '_'
});
}
result.to_lowercase()
}

/// Generates extension name from server info; adds random suffix on collision.
fn generate_extension_name(
server_info: Option<&ServerInfo>,
Expand All @@ -155,7 +142,7 @@ fn generate_extension_name(
let base = server_info
.and_then(|info| {
let name = info.server_info.name.as_str();
(!name.is_empty()).then(|| normalize(name))
(!name.is_empty()).then(|| name_to_key(name))
})
.unwrap_or_else(|| "unnamed".to_string());

Expand Down Expand Up @@ -491,7 +478,7 @@ impl ExtensionManager {
container: Option<&Container>,
) -> ExtensionResult<()> {
let config_name = config.key().to_string();
let sanitized_name = normalize(&config_name);
let sanitized_name = name_to_key(&config_name);

if self.extensions.lock().await.contains_key(&sanitized_name) {
return Ok(());
Expand Down Expand Up @@ -577,8 +564,9 @@ impl ExtensionManager {
}
ExtensionConfig::Builtin { name, timeout, .. } => {
let timeout_duration = Duration::from_secs(timeout.unwrap_or(300));
let normalized_name = name_to_key(name);

if !goose_mcp::BUILTIN_EXTENSIONS.contains_key(name.as_str()) {
if !goose_mcp::BUILTIN_EXTENSIONS.contains_key(normalized_name.as_str()) {
return Err(ExtensionError::ConfigError(format!(
"Unknown builtin extension: {}",
name
Expand All @@ -599,7 +587,7 @@ impl ExtensionManager {
.arg(container_id)
.arg("goose")
.arg("mcp")
.arg(name);
.arg(&normalized_name);
});

let client = child_process_client(
Expand All @@ -612,7 +600,9 @@ impl ExtensionManager {
.await?;
Box::new(client)
} else {
let def = goose_mcp::BUILTIN_EXTENSIONS.get(name.as_str()).unwrap();
let def = goose_mcp::BUILTIN_EXTENSIONS
.get(normalized_name.as_str())
.unwrap();

// Set GOOSE_WORKING_DIR in the current process for builtin extensions
// since they run in-process and read from std::env::var
Expand All @@ -638,7 +628,7 @@ impl ExtensionManager {
}
}
ExtensionConfig::Platform { name, .. } => {
let normalized_key = normalize(name);
let normalized_key = name_to_key(name);
let def = PLATFORM_EXTENSIONS
.get(normalized_key.as_str())
.ok_or_else(|| {
Expand Down Expand Up @@ -713,7 +703,7 @@ impl ExtensionManager {
info: Option<ServerInfo>,
temp_dir: Option<TempDir>,
) {
let normalized = normalize(&name);
let normalized = name_to_key(&name);
self.extensions
.lock()
.await
Expand All @@ -739,7 +729,7 @@ impl ExtensionManager {

/// Get aggregated usage statistics
pub async fn remove_extension(&self, name: &str) -> ExtensionResult<()> {
let sanitized_name = normalize(name);
let sanitized_name = name_to_key(name);
self.extensions.lock().await.remove(&sanitized_name);
self.invalidate_tools_cache_and_bump_version().await;
Ok(())
Expand All @@ -762,7 +752,7 @@ impl ExtensionManager {
}

pub async fn is_extension_enabled(&self, name: &str) -> bool {
let normalized = normalize(name);
let normalized = name_to_key(name);
self.extensions.lock().await.contains_key(&normalized)
}

Expand Down Expand Up @@ -800,8 +790,8 @@ impl ExtensionManager {
extension_name: Option<&str>,
exclude: Option<&str>,
) -> Vec<Tool> {
let extension_name_normalized = extension_name.map(normalize);
let exclude_normalized = exclude.map(normalize);
let extension_name_normalized = extension_name.map(name_to_key);
let exclude_normalized = exclude.map(name_to_key);

tools
.iter()
Expand Down Expand Up @@ -1449,7 +1439,7 @@ impl ExtensionManager {
}

async fn get_server_client(&self, name: impl Into<String>) -> Option<McpClientBox> {
let normalized = normalize(&name.into());
let normalized = name_to_key(&name.into());
self.extensions
.lock()
.await
Expand Down Expand Up @@ -1526,7 +1516,7 @@ mod tests {
client: McpClientBox,
available_tools: Vec<String>,
) {
let sanitized_name = normalize(&name);
let sanitized_name = name_to_key(&name);
let config = ExtensionConfig::Builtin {
name: name.clone(),
display_name: Some(name.clone()),
Expand Down
2 changes: 1 addition & 1 deletion crates/goose/src/agents/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub use agent::{Agent, AgentConfig, AgentEvent, ExtensionLoadResult};
pub use container::Container;
pub use execute_commands::COMPACT_TRIGGERS;
pub use extension::ExtensionConfig;
pub use extension_manager::{normalize, ExtensionManager};
pub use extension_manager::ExtensionManager;
pub use prompt_manager::PromptManager;
pub use subagent_task_config::TaskConfig;
pub use types::{FrontendTool, RetryConfig, SessionConfig, SuccessCheck};
13 changes: 9 additions & 4 deletions crates/goose/src/config/extensions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,15 @@ pub struct ExtensionEntry {
}

pub fn name_to_key(name: &str) -> String {
name.chars()
.filter(|c| !c.is_whitespace())
.collect::<String>()
.to_lowercase()
let mut result = String::with_capacity(name.len());
for c in name.chars() {
result.push(match c {
c if c.is_ascii_alphanumeric() || c == '_' || c == '-' => c,
c if c.is_whitespace() => continue,
_ => '_',
});
}
result.to_lowercase()
}

fn get_extensions_map_with_config(config: &Config) -> IndexMap<String, ExtensionEntry> {
Expand Down
Loading