fix: ignore deprecated skills extension (#7139)

Signed-off-by: anonwurcod <anonwurcod@proton.me>
Co-authored-by: Warp <agent@warp.dev>
This commit is contained in:
fre$h
2026-02-13 15:30:26 -05:00
committed by GitHub
parent 5ba5b9899d
commit 58d3431bf5
2 changed files with 92 additions and 8 deletions
+52 -8
View File
@@ -1,4 +1,5 @@
use super::base::Config;
use crate::agents::extension::PLATFORM_EXTENSIONS;
use crate::agents::ExtensionConfig;
use indexmap::IndexMap;
use serde::{Deserialize, Serialize};
@@ -31,6 +32,15 @@ pub fn name_to_key(name: &str) -> String {
result.to_lowercase()
}
pub(crate) fn is_extension_available(config: &ExtensionConfig) -> bool {
match config {
ExtensionConfig::Platform { name, .. } => {
PLATFORM_EXTENSIONS.contains_key(name_to_key(name).as_str())
}
_ => true,
}
}
fn get_extensions_map_with_config(config: &Config) -> IndexMap<String, ExtensionEntry> {
let raw: Mapping = config
.get_param(EXTENSIONS_CONFIG_KEY)
@@ -46,6 +56,9 @@ fn get_extensions_map_with_config(config: &Config) -> IndexMap<String, Extension
for (k, v) in raw {
match (k, serde_yaml::from_value::<ExtensionEntry>(v)) {
(serde_yaml::Value::String(key), Ok(entry)) => {
if !is_extension_available(&entry.config) {
continue;
}
extensions_map.insert(key, entry);
}
(k, v) => {
@@ -158,13 +171,44 @@ pub fn resolve_extensions_for_new_session(
recipe_extensions: Option<&[ExtensionConfig]>,
override_extensions: Option<Vec<ExtensionConfig>>,
) -> Vec<ExtensionConfig> {
if let Some(exts) = recipe_extensions {
return exts.to_vec();
}
let extensions = if let Some(exts) = recipe_extensions {
exts.to_vec()
} else if let Some(exts) = override_extensions {
exts
} else {
get_enabled_extensions()
};
if let Some(exts) = override_extensions {
return exts;
}
get_enabled_extensions()
extensions
.into_iter()
.filter(is_extension_available)
.collect()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_is_extension_available_filters_unknown_platform() {
let unknown_platform = ExtensionConfig::Platform {
name: "definitely_not_real_platform_extension".to_string(),
description: "unknown".to_string(),
display_name: None,
bundled: None,
available_tools: Vec::new(),
};
let builtin = ExtensionConfig::Builtin {
name: "developer".to_string(),
description: "".to_string(),
display_name: Some("Developer".to_string()),
timeout: None,
bundled: None,
available_tools: Vec::new(),
};
assert!(!is_extension_available(&unknown_platform));
assert!(is_extension_available(&builtin));
}
}
@@ -2,6 +2,7 @@
// Provides a simple way to store extension-specific data with versioned keys
use crate::config::base::Config;
use crate::config::extensions::is_extension_available;
use crate::config::ExtensionConfig;
use crate::session::SessionManager;
use anyhow::Result;
@@ -114,6 +115,12 @@ impl EnabledExtensionsState {
Self { extensions }
}
pub fn from_extension_data(extension_data: &ExtensionData) -> Option<Self> {
let mut state = <Self as ExtensionState>::from_extension_data(extension_data)?;
state.extensions.retain(is_extension_available);
Some(state)
}
pub fn extensions_or_default(
extension_data: Option<&ExtensionData>,
config: &Config,
@@ -259,4 +266,37 @@ mod tests {
Some(&json!({"key": "value"}))
);
}
#[test]
fn test_enabled_extensions_state_filters_unavailable_platform() {
let mut extension_data = ExtensionData::new();
let state = EnabledExtensionsState::new(vec![
ExtensionConfig::Platform {
name: "definitely_not_real_platform_extension".to_string(),
description: "unknown".to_string(),
display_name: None,
bundled: None,
available_tools: Vec::new(),
},
ExtensionConfig::Builtin {
name: "developer".to_string(),
description: "".to_string(),
display_name: Some("Developer".to_string()),
timeout: None,
bundled: None,
available_tools: Vec::new(),
},
]);
state.to_extension_data(&mut extension_data).unwrap();
let loaded =
EnabledExtensionsState::from_extension_data(&extension_data).expect("state present");
let names: Vec<String> = loaded.extensions.iter().map(|ext| ext.name()).collect();
assert!(names.iter().any(|name| name == "developer"));
assert!(!names
.iter()
.any(|name| name == "definitely_not_real_platform_extension"));
}
}