From 51f2f04b47b77299847e720f9bcc0a7a4a4bffc5 Mon Sep 17 00:00:00 2001 From: Hunter Bown Date: Fri, 8 May 2026 19:38:14 -0500 Subject: [PATCH] Revert "Potential fix for pull request finding 'CodeQL / Uncontrolled data used in path expression'" This reverts commit 326a1dacb93a4b76dfea3880dfc4f5a488c392bc. --- crates/tui/src/runtime_api.rs | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/crates/tui/src/runtime_api.rs b/crates/tui/src/runtime_api.rs index 8662032b..998cafe8 100644 --- a/crates/tui/src/runtime_api.rs +++ b/crates/tui/src/runtime_api.rs @@ -1658,30 +1658,18 @@ fn run_git(workspace: &std::path::Path, args: &[&str]) -> Option { } fn resolve_skills_dir(config: &Config, workspace: &std::path::Path) -> PathBuf { - let configured_skills_dir = config.skills_dir(); - let trusted_root = fs::canonicalize(&configured_skills_dir).unwrap_or(configured_skills_dir.clone()); - - let workspace = match fs::canonicalize(workspace) { - Ok(path) => path, - Err(_) => return configured_skills_dir, - }; - - if !workspace.starts_with(&trusted_root) { - return configured_skills_dir; - } - + let workspace = fs::canonicalize(workspace).unwrap_or_else(|_| workspace.to_path_buf()); for candidate in [ workspace.join(".agents").join("skills"), workspace.join("skills"), ] { if let Ok(candidate) = fs::canonicalize(candidate) - && candidate.starts_with(&trusted_root) && candidate.is_dir() { return candidate; } } - configured_skills_dir + config.skills_dir() } fn load_mcp_config_or_default(path: &std::path::Path) -> Result {