diff --git a/api/core/tools/plugin_tool/tool.py b/api/core/tools/plugin_tool/tool.py
index 898e8a552d..dd47f11ba2 100644
--- a/api/core/tools/plugin_tool/tool.py
+++ b/api/core/tools/plugin_tool/tool.py
@@ -38,4 +38,4 @@ class PluginTool(Tool):
             runtime=runtime,
             tenant_id=self.tenant_id,
             plugin_unique_identifier=self.plugin_unique_identifier,
-        )
\ No newline at end of file
+        )
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index 76c7232e01..a4b834e8d8 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -485,7 +485,7 @@ class ToolManager:
         return cls._builtin_tools_labels[tool_name]
 
     @classmethod
-    def user_list_providers(
+    def list_providers_from_api(
         cls, user_id: str, tenant_id: str, typ: ToolProviderTypeApiLiteral
     ) -> list[ToolProviderApiEntity]:
         result_providers: dict[str, ToolProviderApiEntity] = {}
@@ -526,7 +526,14 @@ class ToolManager:
                     decrypt_credentials=False,
                 )
 
-                result_providers[provider.entity.identity.name] = user_provider
+                if isinstance(provider, PluginToolProviderController):
+                    result_providers[f"plugin_provider.{user_provider.name}.{provider.plugin_unique_identifier}"] = (
+                        user_provider
+                    )
+                else:
+                    result_providers[f"builtin_provider.{user_provider.name}"] = (
+                        user_provider
+                    )
 
         # get db api providers