From ded248ff0ba69cf904994ed86017305922c00a3d Mon Sep 17 00:00:00 2001
From: centdix <40307056+centdix@users.noreply.github.com>
Date: Tue, 2 Sep 2025 08:50:14 +0200
Subject: [PATCH] fix(mcp): fix path transformation (#6508)

* fix path transformation

* fix mcp url copy

* safer code
---
 backend/windmill-api/src/mcp/server.rs        |  7 +++---
 .../windmill-api/src/mcp/utils/transform.rs   | 25 ++++++-------------
 .../components/settings/TokenDisplay.svelte   |  2 +-
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/backend/windmill-api/src/mcp/server.rs b/backend/windmill-api/src/mcp/server.rs
index 8bfe35a009..e51d008e3c 100644
--- a/backend/windmill-api/src/mcp/server.rs
+++ b/backend/windmill-api/src/mcp/server.rs
@@ -190,9 +190,10 @@ impl ServerHandler for Runner {
         }
 
         // Continue with script/flow logic
-        let (tool_type, path, is_hub) =
-            reverse_transform(&request.name).unwrap_or_default();
-
+        let (tool_type, path, is_hub) = reverse_transform(&request.name).map_err(|e| {
+            Error::internal_error(format!("Failed to reverse transform path: {}", e), None)
+        })?;
+        
         let item_schema = if is_hub {
             get_hub_script_schema(&format!("hub/{}", path), db).await?
         } else {
diff --git a/backend/windmill-api/src/mcp/utils/transform.rs b/backend/windmill-api/src/mcp/utils/transform.rs
index 6574173bc4..c40fe37263 100644
--- a/backend/windmill-api/src/mcp/utils/transform.rs
+++ b/backend/windmill-api/src/mcp/utils/transform.rs
@@ -12,16 +12,9 @@ use super::models::SchemaType;
 /// have names with slashes. Because we replace slashes with underscores, 
 /// we also need to escape underscores.
 pub fn transform_path(path: &str, type_str: &str) -> String {
-    // Only apply special underscore escaping for paths starting with "f/"
-    let transformed = if path.starts_with("f/") {
-        let escaped_path = path.replace('_', "__");
-        escaped_path.replace('/', "_")
-    } else {
-        path.replace('/', "_")
-    };
-
+    let escaped_path = path.replace('_', "__").replace('/', "_");
     // first letter of type_str is used as prefix, only one letter to avoid reaching 60 char name limit
-    format!("{}-{}", &type_str[..1], transformed)
+    format!("{}-{}", &type_str[..1], escaped_path)
 }
 
 /// Reverse the transformation of a path
@@ -53,19 +46,15 @@ pub fn reverse_transform(transformed_path: &str) -> Result<(&str, String, bool),
 
     let mangled_path = &transformed_path[2..];
 
-    // Check if this path was previously transformed with special underscore handling
-    let is_special_path = mangled_path.starts_with("f_");
-
     let original_path = if is_hub {
         let parts = mangled_path.split("-").collect::<Vec<&str>>();
+        if parts.is_empty() {
+            return Err(format!("Invalid transformed path: {}", transformed_path));
+        }
         parts[0].to_string()
-    } else if is_special_path {
-        const TEMP_PLACEHOLDER: &str = "@@UNDERSCORE@@";
-        let path_with_placeholder = mangled_path.replace("__", TEMP_PLACEHOLDER);
-        let path_with_slashes = path_with_placeholder.replace('_', "/");
-        path_with_slashes.replace(TEMP_PLACEHOLDER, "_")
     } else {
-        mangled_path.replacen('_', "/", 2)
+        const TEMP_PLACEHOLDER: &str = "@@UNDERSCORE@@";
+        mangled_path.replace("__", TEMP_PLACEHOLDER).replace('_', "/").replace(TEMP_PLACEHOLDER, "_")
     };
 
     Ok((type_str, original_path, is_hub))
diff --git a/frontend/src/lib/components/settings/TokenDisplay.svelte b/frontend/src/lib/components/settings/TokenDisplay.svelte
index cc24d50718..1a29fab407 100644
--- a/frontend/src/lib/components/settings/TokenDisplay.svelte
+++ b/frontend/src/lib/components/settings/TokenDisplay.svelte
@@ -18,7 +18,7 @@
 	}: Props = $props()
 
 	function handleCopyClick() {
-		copyToClipboard(token)
+		copyToClipboard(mcpUrl || token)
 		onCopy?.()
 	}