diff --git a/scripts/mcp.sh b/scripts/mcp.sh
index 556bb95..0cc4297 100755
--- a/scripts/mcp.sh
+++ b/scripts/mcp.sh
@@ -129,7 +129,7 @@ merge-functions() {
 
         jq -s 'add | unique' \
             <(jq '.' <<< "$tool_json") \
-            <(jq --argjson prefixes "$mcp_function_prefixes" 'map(select(.name as $s | $prefixes | any(. as $p | $s | startswith($p))))' "$FUNCTIONS_JSON_PATH") \
+            <(jq --argjson prefixes "$mcp_function_prefixes" 'map(select(.mcp as $mcp | $prefixes | index($mcp)))' "$FUNCTIONS_JSON_PATH") \
             >> "${agent}/functions.json"
     done
 }