fast-agent-mcp 0.2.28__py3-none-any.whl → 0.2.30__py3-none-any.whl

{fast_agent_mcp-0.2.28.dist-info → fast_agent_mcp-0.2.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.28
+Version: 0.2.30
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -213,16 +213,17 @@ Requires-Dist: a2a-types>=0.1.0
 Requires-Dist: aiohttp>=3.11.13
 Requires-Dist: anthropic>=0.49.0
 Requires-Dist: azure-identity>=1.14.0
+Requires-Dist: deprecated>=1.2.18
 Requires-Dist: fastapi>=0.115.6
 Requires-Dist: google-genai
-Requires-Dist: mcp==1.9.1
+Requires-Dist: mcp==1.9.3
 Requires-Dist: openai>=1.63.2
 Requires-Dist: opentelemetry-distro>=0.50b0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.29.0
-Requires-Dist: opentelemetry-instrumentation-anthropic>=0.39.3; python_version >= '3.10' and python_version < '4.0'
+Requires-Dist: opentelemetry-instrumentation-anthropic>=0.40.7; python_version >= '3.10' and python_version < '4.0'
 Requires-Dist: opentelemetry-instrumentation-google-genai>=0.2b0
-Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.3; python_version >= '3.10' and python_version < '4.0'
-Requires-Dist: opentelemetry-instrumentation-openai>=0.39.3; python_version >= '3.10' and python_version < '4.0'
+Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.7; python_version >= '3.10' and python_version < '4.0'
+Requires-Dist: opentelemetry-instrumentation-openai>=0.0.40.7; python_version >= '3.10' and python_version < '4.0'
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pydantic-settings>=2.7.0
 Requires-Dist: pydantic>=2.10.4
@@ -286,11 +287,13 @@ Start by installing the [uv package manager](https://docs.astral.sh/uv/) for Pyt
 
 ```bash
 uv pip install fast-agent-mcp          # install fast-agent!
-
-uv run fast-agent setup                # create an example agent and config files
+fast-agent go                          # start an interactive session
+fast-agent go https://hf.co/mcp        # with a remote MCP
+fast-agent go --model=generic.qwen2.5  # use ollama qwen 2.5
+fast-agent setup                       # create an example agent and config files
 uv run agent.py                        # run your first agent
 uv run agent.py --model=o3-mini.low    # specify a model
-uv run fast-agent quickstart workflow  # create "building effective agents" examples
+fast-agent quickstart workflow  # create "building effective agents" examples
 ```
 
 Other quickstart examples include a Researcher Agent (with Evaluator-Optimizer workflow) and Data Analysis Agent (similar to the ChatGPT experience), demonstrating MCP Roots support.

{fast_agent_mcp-0.2.28.dist-info → fast_agent_mcp-0.2.30.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mcp_agent/__init__.py,sha256=18T0AG0W9sJhTY38O9GFFOzliDhxx9p87CvRyti9zbw,1620
-mcp_agent/app.py,sha256=WRsiUdwy_9IAnaGRDwuLm7pzgQpt2wgsg10vBOpfcwM,5539
-mcp_agent/config.py,sha256=ITwLZ-Wzn8I2xYOMDP9XvNwZTLzzUbvQNnnna7PxflQ,13438
+mcp_agent/app.py,sha256=3mtHP1nRQcRaKhhxgTmCOv00alh70nT7UxNA8bN47QE,5560
+mcp_agent/config.py,sha256=c3KxDNXuOhLSBQ7InVw6sUaTc_5K5YbzVPnTMxgF_34,13924
 mcp_agent/console.py,sha256=Gjf2QLFumwG1Lav__c07X_kZxxEUSkzV-1_-YbAwcwo,813
-mcp_agent/context.py,sha256=W9a91UVrpaT-GgoCtJp_ccHXnhmr8HaATDw7srm9NpU,7559
+mcp_agent/context.py,sha256=H7JbaZ_8SzzTagLmIgUPUPxX5370C5qjQAsasFPZG2Y,7510
 mcp_agent/context_dependent.py,sha256=QXfhw3RaQCKfscEEBRGuZ3sdMWqkgShz2jJ1ivGGX1I,1455
 mcp_agent/event_progress.py,sha256=040lrCCclcOuryi07YGSej25kTQF5_JMXY12Yj-3u1U,2773
-mcp_agent/mcp_server_registry.py,sha256=cZJJEXvN_FEUlTFWPtr2q2mRcDjPGBWVmRifc1TnLa0,12042
+mcp_agent/mcp_server_registry.py,sha256=b3iSb-0ULYc5yUG2KHav41WGwSYWiJCGQsOwWHWByxo,12346
 mcp_agent/progress_display.py,sha256=GeJU9VUt6qKsFVymG688hCMVCsAygG9ifiiEb5IcbN4,361
 mcp_agent/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/agents/agent.py,sha256=EAYlcP1qqI1D0_CS808I806z1048FBjZQxxpcCZPeIU,3154
@@ -22,21 +22,21 @@ mcp_agent/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/cli/__main__.py,sha256=AVZ7tQFhU_sDOGuUGJq8ujgKtcxsYJBJwHbVaaiRDlI,166
 mcp_agent/cli/main.py,sha256=XjrgXMBaPKkVqAFo8T9LJz6Tp1-ivrKDOuNYWke99YA,3090
 mcp_agent/cli/terminal.py,sha256=GRwD-RGW7saIz2IOWZn5vD6JjiArscELBThm1GTFkuI,1065
-mcp_agent/cli/commands/check_config.py,sha256=KJbXUFx5Qih3lb_r-Fcx_uAjgHhgD7qqPewQtIDofKM,18321
+mcp_agent/cli/commands/check_config.py,sha256=JKOHniuMlU1bJ5vmyY7g05HDP7ZYGSQktl19bNx5I4Y,18775
 mcp_agent/cli/commands/go.py,sha256=LIsOJQuTdfCUcNm7JT-NQDU8cI-GCnYwYjN2VOWxvqs,8658
 mcp_agent/cli/commands/quickstart.py,sha256=SM3CHMzDgvTxIpKjFuX9BrS_N1vRoXNBDaO90aWx1Rk,14586
 mcp_agent/cli/commands/setup.py,sha256=eOEd4TL-b0DaDeSJMGOfNOsTEItoZ67W88eTP4aP-bo,6482
-mcp_agent/cli/commands/url_parser.py,sha256=7QL9bp9tO7w0cPnwhbpt8GwjbOJ1Rrry1o71uVJhSss,5655
+mcp_agent/cli/commands/url_parser.py,sha256=5VdtcHRHzi67YignStVbz7u-rcvNNErw9oJLAUFOtEY,5855
 mcp_agent/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/core/agent_app.py,sha256=aVvOzMrXZ3TfRGyAsnvcrMMYZxBf8Saa0UuHiA7DV0w,9922
 mcp_agent/core/agent_types.py,sha256=bQVQMTwKH7qHIJsNglj4C_d6PNFBBzC_0RIkcENSII4,1459
 mcp_agent/core/direct_decorators.py,sha256=aaVR4G6a8H9pVg6X_PGEZ8GzreP0ZO1-48ksIKvMNDI,14452
 mcp_agent/core/direct_factory.py,sha256=d96OM1yS3eIocIiaA9FQt6C2zr6VDUyCJBTZCp_D4bs,17912
-mcp_agent/core/enhanced_prompt.py,sha256=bzvcengS7XzHWB7NWhyxHM3hhO2HI4zP5DbGXAOw0Jw,19155
+mcp_agent/core/enhanced_prompt.py,sha256=_JlX_7tBpWm1rScBaprD9Tvcep1qPPfXrUsFlnWrTpE,23497
 mcp_agent/core/error_handling.py,sha256=xoyS2kLe0eG0bj2eSJCJ2odIhGUve2SbDR7jP-A-uRw,624
 mcp_agent/core/exceptions.py,sha256=ENAD_qGG67foxy6vDkIvc-lgopIUQy6O7zvNPpPXaQg,2289
 mcp_agent/core/fastagent.py,sha256=uS_NSXeniUYFu6xce8OHGJ9PbEYNU-gm1XVpa1r0rZc,22893
-mcp_agent/core/interactive_prompt.py,sha256=QuPdJQTBwXnnKyp52QjeVGyaXMiMm3fZK6g1ly2X7v4,24696
+mcp_agent/core/interactive_prompt.py,sha256=JKEU1Gvq6zXaLniDPx8wll08ZTC6g1rQflL7khmnhs8,24710
 mcp_agent/core/mcp_content.py,sha256=2D7KHY9mG_vxoDwFLKvsPQV9VRIzHItM7V-jcEnACh8,8878
 mcp_agent/core/prompt.py,sha256=qnintOUGEoDPYLI9bu9G2OlgVMCe5ZPUZilgMzydXhc,7919
 mcp_agent/core/request_params.py,sha256=qmFWZXeYEJyYw2IwonyrTnZWxQG7qX6bKpOPcqETa60,1603
@@ -54,24 +54,25 @@ mcp_agent/llm/augmented_llm_passthrough.py,sha256=zHcctNpwg4EFJvD1x9Eg443SVX-uyz
 mcp_agent/llm/augmented_llm_playback.py,sha256=6L_RWIK__R67oZK7u3Xt3hWy1T2LnHXIO-efqgP3tPw,4177
 mcp_agent/llm/augmented_llm_slow.py,sha256=6h4LXdBGBzDfKnvPBcfBh0RdfYl-UXo50EimA-W3tOY,1586
 mcp_agent/llm/memory.py,sha256=HQ_c1QemOUjrkY6Z2omE6BG5fXga7y4jN7KCMOuGjPs,3345
-mcp_agent/llm/model_factory.py,sha256=KkOBpn_G118DijJYu4Iwm_CXgG9FeZQ9PZj9f-q3vlI,10413
+mcp_agent/llm/model_factory.py,sha256=gR_MBL74f-KF9PvYbVjXc9Qv5GyoMrRR7biXO6oGDvk,10686
 mcp_agent/llm/prompt_utils.py,sha256=yWQHykoK13QRF7evHUKxVF0SpVLN-Bsft0Yixzvn0g0,4825
-mcp_agent/llm/provider_key_manager.py,sha256=-K_FuibN6hdSnweT32lB8mKTfCARnbja6zYYs0ErTKg,2802
-mcp_agent/llm/provider_types.py,sha256=t44U2ShXHCHdReV2xWNLGCtchp3TuEyI3BbhwbwpRK8,511
+mcp_agent/llm/provider_key_manager.py,sha256=usMWozSMhek_FIlM1MeVDwAbs-P96SrEVPGd3YwF9E4,2833
+mcp_agent/llm/provider_types.py,sha256=AkQl1r67wZ0gSIY6CXsiZiS3uw5DBF9E5yhIn3THayk,633
 mcp_agent/llm/sampling_converter.py,sha256=C7wPBlmT0eD90XWabC22zkxsrVHKCrjwIwg6cG628cI,2926
 mcp_agent/llm/sampling_format_converter.py,sha256=xGz4odHpOcP7--eFaJaFtUR8eR9jxZS7MnLH6J7n0EU,1263
 mcp_agent/llm/providers/__init__.py,sha256=heVxtmuqFJOnjjxHz4bWSqTAxXoN1E8twC_gQ_yJpHk,265
 mcp_agent/llm/providers/anthropic_utils.py,sha256=vYDN5G5jKMhD2CQg8veJYab7tvvzYkDMq8M1g_hUAQg,3275
+mcp_agent/llm/providers/augmented_llm_aliyun.py,sha256=XylkJKZ9theSVUxJKOZkf1244hgzng4Ng4Dr209Qb-w,1101
 mcp_agent/llm/providers/augmented_llm_anthropic.py,sha256=gK_IvllVBNJUUrSfpgFpdhM-d4liCt0MLq7d2lXS7RI,15510
 mcp_agent/llm/providers/augmented_llm_azure.py,sha256=VPrD6lNrEw6EdYUTa9MDvHDNIPjJU5CG5xnKCM3JYdA,5878
-mcp_agent/llm/providers/augmented_llm_deepseek.py,sha256=NiZK5nv91ZS2VgVFXpbsFNFYLsLcppcbo_RstlRMd7I,1145
+mcp_agent/llm/providers/augmented_llm_deepseek.py,sha256=zI9a90dwT4r6E1f_xp4K50Cj9sD7y7kNRgjo0s1pd5w,3804
 mcp_agent/llm/providers/augmented_llm_generic.py,sha256=5Uq8ZBhcFuQTt7koP_5ykolREh2iWu8zKhNbh3pM9lQ,1210
 mcp_agent/llm/providers/augmented_llm_google_native.py,sha256=Axk6oKH5ctB6rXGnCjRKVkJq6O7rRqlD7aJ2He6UuZ8,20406
 mcp_agent/llm/providers/augmented_llm_google_oai.py,sha256=cO4dvjTl9ymqEurCOo5nP09ATfXVjgkuk1yZAlWpS1s,1137
 mcp_agent/llm/providers/augmented_llm_openai.py,sha256=5CFHKayjm-aeCBpohIK3WelAEuX7_LDGZIKnWR_rq-s,14577
 mcp_agent/llm/providers/augmented_llm_openrouter.py,sha256=V_TlVKm92GHBxYIo6gpvH_6cAaIdppS25Tz6x5T7LW0,2341
 mcp_agent/llm/providers/augmented_llm_tensorzero.py,sha256=Mol_Wzj_ZtccW-LMw0oFwWUt1m1yfofloay9QYNP23c,20729
-mcp_agent/llm/providers/google_converter.py,sha256=bA0oYdB6tfRX_iuwTr8xTBYWlzNNskwYIS3Y9aFyEbo,16643
+mcp_agent/llm/providers/google_converter.py,sha256=zsqxJJ636WzCL2K6w-yB94O8bdNR6mo8f5mQEnUJFyg,16831
 mcp_agent/llm/providers/multipart_converter_anthropic.py,sha256=t5lHYGfFUacJldnrVtMNW-8gEMoto8Y7hJkDrnyZR-Y,16650
 mcp_agent/llm/providers/multipart_converter_openai.py,sha256=XPIulWntNpZWNGWrc240StPzok2RqrDAV7OigDwQ1uU,15850
 mcp_agent/llm/providers/multipart_converter_tensorzero.py,sha256=BFTdyVk42HZskDAuTHicfDTUJq89d1fz8C9nAOuHxlE,8646
@@ -87,12 +88,13 @@ mcp_agent/logging/logger.py,sha256=l02OGX_c5FOyH0rspd4ZvnkJcbb0FahhUhlh2KI8mqE,1
 mcp_agent/logging/rich_progress.py,sha256=oY9fjb4Tyw6887v8sgO6EGIK4lnmIoR3NNxhA_-Ln_M,4893
 mcp_agent/logging/transport.py,sha256=m8YsLLu5T8eof_ndpLQs4gHOzqqEL98xsVwBwDsBfxI,17335
 mcp_agent/mcp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/mcp/common.py,sha256=DiWLH9rxWvCgkKRsHQehY9mDhQl9gki1-q7LVUflDvI,425
+mcp_agent/mcp/common.py,sha256=MpSC0fLO21RcDz4VApah4C8_LisVGz7OXkR17Xw-9mY,431
 mcp_agent/mcp/gen_client.py,sha256=fAVwFVCgSamw4PwoWOV4wrK9TABx1S_zZv8BctRyF2k,3030
+mcp_agent/mcp/hf_auth.py,sha256=YwEt7hMDJODFUIc6Zi1HLYsfVnvANGvyhpQwcPCMAgI,3379
 mcp_agent/mcp/interfaces.py,sha256=PAou8znAl2HgtvfCpLQOZFbKra9F72OcVRfBJbboNX8,6965
 mcp_agent/mcp/logger_textio.py,sha256=vljC1BtNTCxBAda9ExqNB-FwVNUZIuJT3h1nWmCjMws,3172
-mcp_agent/mcp/mcp_agent_client_session.py,sha256=1zlBZaGRvCHuflrTd4dUeC4BzcPXxfPuciulJB0DIFI,7900
-mcp_agent/mcp/mcp_aggregator.py,sha256=Mdmr-6gNlrcofHzhHZloz1QVbC5ZAnCSPNFY5fwm-Bs,47075
+mcp_agent/mcp/mcp_agent_client_session.py,sha256=V17Lj21rMGIKKVAIyNx5l5gmC8jQuohjJGpRcoCXfVA,6862
+mcp_agent/mcp/mcp_aggregator.py,sha256=CrUtj-BHXXCb7sUlc_MF1d7HkiF9rjh6MKaGprflBB4,47076
 mcp_agent/mcp/mcp_connection_manager.py,sha256=5JekxOJsB46spHsiXt7pyRPicg8TGHMiSJRtXRW2JB8,17074
 mcp_agent/mcp/mime_utils.py,sha256=difepNR_gpb4MpMLkBRAoyhDk-AjXUHTiqKvT_VwS1o,1805
 mcp_agent/mcp/prompt_message_multipart.py,sha256=BDwRdNwyWHb2q2bccDb2iR2VlORqVvkvoG3xYzcMpCE,4403
@@ -153,8 +155,8 @@ mcp_agent/resources/examples/workflows/router.py,sha256=E4x_-c3l4YW9w1i4ARcDtkde
 mcp_agent/resources/examples/workflows/short_story.txt,sha256=X3y_1AyhLFN2AKzCKvucJtDgAFIJfnlbsbGZO5bBWu0,1187
 mcp_agent/tools/tool_definition.py,sha256=L3Pxl-uLEXqlVoo-bYuFTFALeI-2pIU44YgFhsTKEtM,398
 mcp_agent/ui/console_display.py,sha256=UKqax5V2TC0hkZZORmmd6UqUk0DGX7A25E3h1k9f42k,10982
-fast_agent_mcp-0.2.28.dist-info/METADATA,sha256=DbIbErJ9uZh6NnL6Tl-OD4ihPgzSRXR_ExDpafUwGKQ,30581
-fast_agent_mcp-0.2.28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.2.28.dist-info/entry_points.txt,sha256=bRniFM5zk3Kix5z7scX0gf9VnmGQ2Cz_Q1Gh7Ir4W00,186
-fast_agent_mcp-0.2.28.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
-fast_agent_mcp-0.2.28.dist-info/RECORD,,
+fast_agent_mcp-0.2.30.dist-info/METADATA,sha256=7q7NZipQQtERgEt6C6t60vtvEwqzyvjadJllHE5KOC4,30799
+fast_agent_mcp-0.2.30.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.2.30.dist-info/entry_points.txt,sha256=bRniFM5zk3Kix5z7scX0gf9VnmGQ2Cz_Q1Gh7Ir4W00,186
+fast_agent_mcp-0.2.30.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
+fast_agent_mcp-0.2.30.dist-info/RECORD,,

mcp_agent/app.py

@@ -119,7 +119,7 @@ class MCPApp:
         if self._initialized:
             return
 
-        self._context = await initialize_context(self._config_or_path)
+        self._context = await initialize_context(self._config_or_path, store_globally=True)
 
         # Set the properties that were passed in the constructor
         self._context.human_input_handler = self._human_input_callback

mcp_agent/cli/commands/check_config.py

@@ -226,8 +226,17 @@ def get_config_summary(config_path: Optional[Path]) -> dict:
 
                 # Determine transport type
                 if "url" in server_config:
-                    server_info["transport"] = "SSE"
-                    server_info["url"] = server_config.get("url", "")
+                    url = server_config.get("url", "")
+                    server_info["url"] = url
+                    
+                    # Use URL path to determine transport type
+                    try:
+                        from .url_parser import parse_server_url
+                        _, transport_type, _ = parse_server_url(url)
+                        server_info["transport"] = transport_type.upper()
+                    except Exception:
+                        # Fallback to HTTP if URL parsing fails
+                        server_info["transport"] = "HTTP"
 
                 # Get command and args
                 command = server_config.get("command", "")

mcp_agent/cli/commands/url_parser.py

@@ -8,6 +8,8 @@ import re
 from typing import Dict, List, Literal, Tuple
 from urllib.parse import urlparse
 
+from mcp_agent.mcp.hf_auth import add_hf_auth_header
+
 
 def parse_server_url(
     url: str,
@@ -131,7 +133,11 @@ def parse_server_urls(
     result = []
     for url in url_list:
         server_name, transport_type, parsed_url = parse_server_url(url)
-        result.append((server_name, transport_type, parsed_url, headers))
+        
+        # Apply HuggingFace authentication if appropriate
+        final_headers = add_hf_auth_header(parsed_url, headers)
+        
+        result.append((server_name, transport_type, parsed_url, final_headers))
 
     return result
 

mcp_agent/config.py

@@ -222,6 +222,15 @@ class TensorZeroSettings(BaseModel):
     model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
 
 
+class HuggingFaceSettings(BaseModel):
+    """
+    Settings for HuggingFace authentication (used for MCP connections).
+    """
+
+    api_key: Optional[str] = None
+    model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
+
+
 class LoggerSettings(BaseModel):
     """
     Logger settings for the fast-agent application.
@@ -291,7 +300,7 @@ class Settings(BaseSettings):
     Default model for agents. Format is provider.model_name.<reasoning_effort>, for example openai.o3-mini.low
     Aliases are provided for common models e.g. sonnet, haiku, gpt-4.1, o3-mini etc.
     """
-    
+
     auto_sampling: bool = True
     """Enable automatic sampling model selection if not explicitly configured"""
 
@@ -322,6 +331,12 @@ class Settings(BaseSettings):
     azure: AzureSettings | None = None
     """Settings for using Azure OpenAI Service in the fast-agent application"""
 
+    aliyun: OpenAISettings | None = None
+    """Settings for using Aliyun OpenAI Service in the fast-agent application"""
+
+    huggingface: HuggingFaceSettings | None = None
+    """Settings for HuggingFace authentication (used for MCP connections)"""
+
     logger: LoggerSettings | None = LoggerSettings()
     """Logger settings for the fast-agent application"""
 

mcp_agent/context.py

@@ -12,7 +12,8 @@ from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.instrumentation.anthropic import AnthropicInstrumentor
 from opentelemetry.instrumentation.google_genai import GoogleGenAiSdkInstrumentor
-from opentelemetry.instrumentation.mcp import McpInstrumentor
+
+# from opentelemetry.instrumentation.mcp import McpInstrumentor
 from opentelemetry.instrumentation.openai import OpenAIInstrumentor
 from opentelemetry.propagate import set_global_textmap
 from opentelemetry.sdk.resources import Resource
@@ -114,7 +115,9 @@ async def configure_otel(config: "Settings") -> None:
     AnthropicInstrumentor().instrument()
     OpenAIInstrumentor().instrument()
     GoogleGenAiSdkInstrumentor().instrument()
-    McpInstrumentor().instrument()
+
+
+#    McpInstrumentor().instrument()
 
 
 async def configure_logger(config: "Settings") -> None:
@@ -198,7 +201,6 @@ _global_context: Context | None = None
 def get_current_context() -> Context:
     """
     Synchronous initializer/getter for global application context.
-    For async usage, use aget_current_context instead.
     """
     global _global_context
     if _global_context is None:

mcp_agent/core/enhanced_prompt.py

@@ -2,6 +2,11 @@
 Enhanced prompt functionality with advanced prompt_toolkit features.
 """
 
+import asyncio
+import os
+import shlex
+import subprocess
+import tempfile
 from importlib.metadata import version
 from typing import List, Optional
 
@@ -96,6 +101,85 @@ class AgentCompleter(Completer):
                     )
 
 
+# Helper function to open text in an external editor
+def get_text_from_editor(initial_text: str = "") -> str:
+    """
+    Opens the user\'s configured editor ($VISUAL or $EDITOR) to edit the initial_text.
+    Falls back to \'nano\' (Unix) or \'notepad\' (Windows) if neither is set.
+    Returns the edited text, or the original text if an error occurs.
+    """
+    editor_cmd_str = os.environ.get("VISUAL") or os.environ.get("EDITOR")
+
+    if not editor_cmd_str:
+        if os.name == "nt":  # Windows
+            editor_cmd_str = "notepad"
+        else:  # Unix-like (Linux, macOS)
+            editor_cmd_str = "nano"  # A common, usually available, simple editor
+
+    # Use shlex.split to handle editors with arguments (e.g., "code --wait")
+    try:
+        editor_cmd_list = shlex.split(editor_cmd_str)
+        if not editor_cmd_list:  # Handle empty string from shlex.split
+            raise ValueError("Editor command string is empty or invalid.")
+    except ValueError as e:
+        rich_print(f"[red]Error: Invalid editor command string ('{editor_cmd_str}'): {e}[/red]")
+        return initial_text
+
+    # Create a temporary file for the editor to use.
+    # Using a suffix can help some editors with syntax highlighting or mode.
+    try:
+        with tempfile.NamedTemporaryFile(
+            mode="w+", delete=False, suffix=".txt", encoding="utf-8"
+        ) as tmp_file:
+            if initial_text:
+                tmp_file.write(initial_text)
+                tmp_file.flush()  # Ensure content is written to disk before editor opens it
+            temp_file_path = tmp_file.name
+    except Exception as e:
+        rich_print(f"[red]Error: Could not create temporary file for editor: {e}[/red]")
+        return initial_text
+
+    try:
+        # Construct the full command: editor_parts + [temp_file_path]
+        # e.g., [\'vim\', \'/tmp/somefile.txt\'] or [\'code\', \'--wait\', \'/tmp/somefile.txt\']
+        full_cmd = editor_cmd_list + [temp_file_path]
+
+        # Run the editor. This is a blocking call.
+        subprocess.run(full_cmd, check=True)
+
+        # Read the content back from the temporary file.
+        with open(temp_file_path, "r", encoding="utf-8") as f:
+            edited_text = f.read()
+
+    except FileNotFoundError:
+        rich_print(
+            f"[red]Error: Editor command '{editor_cmd_list[0]}' not found. "
+            f"Please set $VISUAL or $EDITOR correctly, or install '{editor_cmd_list[0]}'.[/red]"
+        )
+        return initial_text
+    except subprocess.CalledProcessError as e:
+        rich_print(
+            f"[red]Error: Editor '{editor_cmd_list[0]}' closed with an error (code {e.returncode}).[/red]"
+        )
+        return initial_text
+    except Exception as e:
+        rich_print(
+            f"[red]An unexpected error occurred while launching or using the editor: {e}[/red]"
+        )
+        return initial_text
+    finally:
+        # Always attempt to clean up the temporary file.
+        if "temp_file_path" in locals() and os.path.exists(temp_file_path):
+            try:
+                os.remove(temp_file_path)
+            except Exception as e:
+                rich_print(
+                    f"[yellow]Warning: Could not remove temporary file {temp_file_path}: {e}[/yellow]"
+                )
+
+    return edited_text.strip()  # Added strip() to remove trailing newlines often added by editors
+
+
 def create_keybindings(on_toggle_multiline=None, app=None):
     """Create custom key bindings."""
     kb = KeyBindings()
@@ -140,6 +224,27 @@ def create_keybindings(on_toggle_multiline=None, app=None):
         """Ctrl+L: Clear the input buffer."""
         event.current_buffer.text = ""
 
+    @kb.add("c-e")
+    async def _(event) -> None:
+        """Ctrl+E: Edit current buffer in $EDITOR."""
+        current_text = event.app.current_buffer.text
+        try:
+            # Run the synchronous editor function in a thread
+            edited_text = await event.app.loop.run_in_executor(
+                None, get_text_from_editor, current_text
+            )
+            event.app.current_buffer.text = edited_text
+            # Optionally, move cursor to the end of the edited text
+            event.app.current_buffer.cursor_position = len(edited_text)
+        except asyncio.CancelledError:
+            rich_print("[yellow]Editor interaction cancelled.[/yellow]")
+        except Exception as e:
+            rich_print(f"[red]Error during editor interaction: {e}[/red]")
+        finally:
+            # Ensure the UI is updated
+            if event.app:
+                event.app.invalidate()
+
     return kb
 
 

mcp_agent/core/interactive_prompt.py

@@ -351,7 +351,7 @@ class InteractivePrompt:
                 for prompt in prompts:
                     # Get basic prompt info
                     prompt_name = getattr(prompt, "name", "Unknown")
-                    description = getattr(prompt, "description", "No description")
+                    prompt_description = getattr(prompt, "description", "No description")
 
                     # Extract argument information
                     arg_names = []
@@ -387,7 +387,7 @@ class InteractivePrompt:
                             "server": server_name,
                             "name": prompt_name,
                             "namespaced_name": namespaced_name,
-                            "description": description,
+                            "description": prompt_description,
                             "arg_count": len(arg_names),
                             "arg_names": arg_names,
                             "required_args": required_args,

mcp_agent/llm/model_factory.py

@@ -10,6 +10,7 @@ from mcp_agent.llm.augmented_llm_passthrough import PassthroughLLM
 from mcp_agent.llm.augmented_llm_playback import PlaybackLLM
 from mcp_agent.llm.augmented_llm_slow import SlowLLM
 from mcp_agent.llm.provider_types import Provider
+from mcp_agent.llm.providers.augmented_llm_aliyun import AliyunAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_anthropic import AnthropicAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_azure import AzureOpenAIAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_deepseek import DeepSeekAugmentedLLM
@@ -103,6 +104,10 @@ class ModelFactory:
         "gemini-2.0-flash": Provider.GOOGLE,
         "gemini-2.5-flash-preview-05-20": Provider.GOOGLE,
         "gemini-2.5-pro-preview-05-06": Provider.GOOGLE,
+        "qwen-turbo": Provider.ALIYUN,
+        "qwen-plus": Provider.ALIYUN,
+        "qwen-max": Provider.ALIYUN,
+        "qwen-long": Provider.ALIYUN,
     }
 
     MODEL_ALIASES = {
@@ -136,6 +141,7 @@ class ModelFactory:
         Provider.OPENROUTER: OpenRouterAugmentedLLM,
         Provider.TENSORZERO: TensorZeroAugmentedLLM,
         Provider.AZURE: AzureOpenAIAugmentedLLM,
+        Provider.ALIYUN: AliyunAugmentedLLM,
     }
 
     # Mapping of special model names to their specific LLM classes

mcp_agent/llm/provider_key_manager.py

@@ -17,6 +17,7 @@ PROVIDER_ENVIRONMENT_MAP: Dict[str, str] = {
     "google": "GOOGLE_API_KEY",
     "openrouter": "OPENROUTER_API_KEY",
     "generic": "GENERIC_API_KEY",
+    "huggingface": "HF_TOKEN",
 }
 API_KEY_HINT_TEXT = "<your-api-key-here>"
 

mcp_agent/llm/provider_types.py

@@ -18,3 +18,5 @@ class Provider(Enum):
     OPENROUTER = "openrouter"
     TENSORZERO = "tensorzero"  # For TensorZero Gateway
     AZURE = "azure"  # Azure OpenAI Service
+    ALIYUN = "aliyun"  # Aliyun Bailian OpenAI Service
+    HUGGINGFACE = "huggingface"  # For HuggingFace MCP connections

mcp_agent/llm/providers/augmented_llm_aliyun.py

@@ -0,0 +1,30 @@
+from mcp_agent.core.request_params import RequestParams
+from mcp_agent.llm.provider_types import Provider
+from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
+
+ALIYUN_BASE_URL = "https://dashscope.aliyuncs.com/compatible-mode/v1"
+DEFAULT_QWEN_MODEL = "qwen-turbo"
+
+
+class AliyunAugmentedLLM(OpenAIAugmentedLLM):
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, provider=Provider.ALIYUN, **kwargs)
+
+    def _initialize_default_params(self, kwargs: dict) -> RequestParams:
+        """Initialize Aliyun-specific default parameters"""
+        chosen_model = kwargs.get("model", DEFAULT_QWEN_MODEL)
+
+        return RequestParams(
+            model=chosen_model,
+            systemPrompt=self.instruction,
+            parallel_tool_calls=True,
+            max_iterations=10,
+            use_history=True,
+        )
+
+    def _base_url(self) -> str:
+        base_url = None
+        if self.context.config and self.context.config.aliyun:
+            base_url = self.context.config.aliyun.base_url
+
+        return base_url if base_url else ALIYUN_BASE_URL

mcp_agent/llm/providers/augmented_llm_deepseek.py

@@ -1,6 +1,16 @@
+from copy import copy
+from typing import List, Tuple, Type, cast
+
+from openai.types.chat import (
+    ChatCompletionAssistantMessageParam,
+    ChatCompletionMessage,
+)
+
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
+from mcp_agent.mcp.interfaces import ModelT
+from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
 DEEPSEEK_BASE_URL = "https://api.deepseek.com"
 DEFAULT_DEEPSEEK_MODEL = "deepseekchat"  # current Deepseek only has two type models
@@ -28,3 +38,56 @@ class DeepSeekAugmentedLLM(OpenAIAugmentedLLM):
             base_url = self.context.config.deepseek.base_url
 
         return base_url if base_url else DEEPSEEK_BASE_URL
+
+    async def _apply_prompt_provider_specific_structured(
+        self,
+        multipart_messages: List[PromptMessageMultipart],
+        model: Type[ModelT],
+        request_params: RequestParams | None = None,
+    ) -> Tuple[ModelT | None, PromptMessageMultipart]:  # noqa: F821
+        request_params = self.get_request_params(request_params)
+
+        request_params.response_format = {"type": "json_object"}
+
+        # Get the full schema and extract just the properties
+        full_schema = model.model_json_schema()
+        properties = full_schema.get("properties", {})
+        required_fields = full_schema.get("required", [])
+
+        # Create a cleaner format description
+        format_description = "{\n"
+        for field_name, field_info in properties.items():
+            field_type = field_info.get("type", "string")
+            description = field_info.get("description", "")
+            format_description += f'  "{field_name}": "{field_type}"'
+            if description:
+                format_description += f"  // {description}"
+            if field_name in required_fields:
+                format_description += "  // REQUIRED"
+            format_description += "\n"
+        format_description += "}"
+
+        multipart_messages[-1].add_text(
+            f"""YOU MUST RESPOND WITH A JSON OBJECT IN EXACTLY THIS FORMAT:
+            {format_description}
+
+            IMPORTANT RULES:
+            - Respond ONLY with the JSON object, no other text
+            - Do NOT include "properties" or "schema" wrappers
+            - Do NOT use code fences or markdown
+            - The response must be valid JSON that matches the format above
+            - All required fields must be included"""
+        )
+
+        result: PromptMessageMultipart = await self._apply_prompt_provider_specific(
+            multipart_messages, request_params
+        )
+        return self._structured_from_multipart(result, model)
+
+    @classmethod
+    def convert_message_to_message_param(cls, message: ChatCompletionMessage, **kwargs) -> ChatCompletionAssistantMessageParam:
+        """Convert a response object to an input parameter object to allow LLM calls to be chained."""
+        if hasattr(message, "reasoning_content"):
+            message = copy(message)
+            del message.reasoning_content
+        return cast("ChatCompletionAssistantMessageParam", message)

mcp_agent/llm/providers/google_converter.py

@@ -166,6 +166,10 @@ class GoogleConverter:
         fast_agent_parts: List[
             TextContent | ImageContent | EmbeddedResource | CallToolRequestParams
         ] = []
+
+        if content is None or not hasattr(content, 'parts') or content.parts is None:
+                    return [] # Google API response 'content' object is None. Cannot extract parts.
+
         for part in content.parts:
             if part.text:
                 fast_agent_parts.append(TextContent(type="text", text=part.text))

mcp_agent/mcp/common.py

@@ -8,9 +8,9 @@ SEP = "-"
 
 def create_namespaced_name(server_name: str, resource_name: str) -> str:
     """Create a namespaced resource name from server and resource names"""
-    return f"{server_name}{SEP}{resource_name}"
+    return f"{server_name}{SEP}{resource_name}"[:64]
 
 
 def is_namespaced_name(name: str) -> bool:
     """Check if a name is already namespaced"""
-    return SEP in name
+    return SEP in name

mcp_agent/mcp/hf_auth.py

@@ -0,0 +1,106 @@
+"""HuggingFace authentication utilities for MCP connections."""
+
+import os
+from typing import Dict, Optional
+from urllib.parse import urlparse
+
+
+def is_huggingface_url(url: str) -> bool:
+    """
+    Check if a URL is a HuggingFace URL that should receive HF_TOKEN authentication.
+    
+    Args:
+        url: The URL to check
+        
+    Returns:
+        True if the URL is a HuggingFace URL, False otherwise
+    """
+    try:
+        parsed = urlparse(url)
+        hostname = parsed.hostname
+        if hostname is None:
+            return False
+        
+        # Check for HuggingFace domains
+        if hostname in {"hf.co", "huggingface.co"}:
+            return True
+            
+        # Check for HuggingFace Spaces (*.hf.space)
+        # Use endswith to match subdomains like space-name.hf.space
+        # but ensure exact match to prevent spoofing like evil.hf.space.com
+        if hostname.endswith(".hf.space") and hostname.count(".") >= 2:
+            # Additional validation: ensure it's a valid HF Space domain
+            # Format should be: {space-name}.hf.space
+            parts = hostname.split(".")
+            if len(parts) == 3 and parts[-2:] == ["hf", "space"]:
+                space_name = parts[0]
+                # Validate space name: not empty, not just hyphens/dots, no spaces
+                return (len(space_name) > 0 and 
+                        space_name != "-" and 
+                        not space_name.startswith(".") and
+                        not space_name.endswith(".") and
+                        " " not in space_name)
+            
+        return False
+    except Exception:
+        return False
+
+
+def get_hf_token_from_env() -> Optional[str]:
+    """
+    Get the HuggingFace token from the HF_TOKEN environment variable.
+    
+    Returns:
+        The HF_TOKEN value if set, None otherwise
+    """
+    return os.environ.get("HF_TOKEN")
+
+
+def should_add_hf_auth(url: str, existing_headers: Optional[Dict[str, str]]) -> bool:
+    """
+    Determine if HuggingFace authentication should be added to the headers.
+    
+    Args:
+        url: The URL to check
+        existing_headers: Existing headers dictionary (may be None)
+        
+    Returns:
+        True if HF auth should be added, False otherwise
+    """
+    # Only add HF auth if:
+    # 1. URL is a HuggingFace URL
+    # 2. No existing Authorization header is set
+    # 3. HF_TOKEN environment variable is available
+    
+    if not is_huggingface_url(url):
+        return False
+        
+    if existing_headers and "Authorization" in existing_headers:
+        return False
+        
+    return get_hf_token_from_env() is not None
+
+
+def add_hf_auth_header(url: str, headers: Optional[Dict[str, str]]) -> Optional[Dict[str, str]]:
+    """
+    Add HuggingFace authentication header if appropriate.
+    
+    Args:
+        url: The URL to check
+        headers: Existing headers dictionary (may be None)
+        
+    Returns:
+        Updated headers dictionary with HF auth if appropriate, or original headers
+    """
+    if not should_add_hf_auth(url, headers):
+        return headers
+        
+    hf_token = get_hf_token_from_env()
+    if hf_token is None:
+        return headers
+        
+    # Create new headers dict or copy existing one
+    result_headers = dict(headers) if headers else {}
+    result_headers["Authorization"] = f"Bearer {hf_token}"
+    
+    return result_headers

mcp_agent/mcp/mcp_agent_client_session.py

@@ -7,15 +7,13 @@ from datetime import timedelta
 from typing import TYPE_CHECKING
 
 from mcp import ClientSession, ServerNotification
+from mcp.shared.message import MessageMetadata
 from mcp.shared.session import (
     ProgressFnT,
     ReceiveResultT,
-    RequestId,
-    SendNotificationT,
     SendRequestT,
-    SendResultT,
 )
-from mcp.types import ErrorData, Implementation, ListRootsResult, Root, ToolListChangedNotification
+from mcp.types import Implementation, ListRootsResult, Root, ToolListChangedNotification
 from pydantic import FileUrl
 
 from mcp_agent.context_dependent import ContextDependent
@@ -76,12 +74,16 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
 
         # Only register callbacks if the server_config has the relevant settings
         list_roots_cb = list_roots if (self.server_config and self.server_config.roots) else None
-        
+
         # Register sampling callback if either:
         # 1. Sampling is explicitly configured, OR
         # 2. Application-level auto_sampling is enabled
         sampling_cb = None
-        if self.server_config and hasattr(self.server_config, "sampling") and self.server_config.sampling:
+        if (
+            self.server_config
+            and hasattr(self.server_config, "sampling")
+            and self.server_config.sampling
+        ):
             # Explicit sampling configuration
             sampling_cb = sample
         elif self._should_enable_auto_sampling():
@@ -100,9 +102,10 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
         """Check if auto_sampling is enabled at the application level."""
         try:
             from mcp_agent.context import get_current_context
+
             context = get_current_context()
             if context and context.config:
-                return getattr(context.config, 'auto_sampling', True)
+                return getattr(context.config, "auto_sampling", True)
         except Exception:
             pass
         return True  # Default to True if can't access config
@@ -112,6 +115,7 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
         request: SendRequestT,
         result_type: type[ReceiveResultT],
         request_read_timeout_seconds: timedelta | None = None,
+        metadata: MessageMetadata | None = None,
         progress_callback: ProgressFnT | None = None,
     ) -> ReceiveResultT:
         logger.debug("send_request: request=", data=request.model_dump())
@@ -120,32 +124,18 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
                 request=request,
                 result_type=result_type,
                 request_read_timeout_seconds=request_read_timeout_seconds,
+                metadata=metadata,
                 progress_callback=progress_callback,
-                metadata=None,
             )
-            logger.debug("send_request: response=", data=result.model_dump())
+            logger.debug(
+                "send_request: response=",
+                data=result.model_dump() if result is not None else "no response returned",
+            )
             return result
         except Exception as e:
             logger.error(f"send_request failed: {str(e)}")
             raise
 
-    async def send_notification(self, notification: SendNotificationT) -> None:
-        logger.debug("send_notification:", data=notification.model_dump())
-        try:
-            return await super().send_notification(notification)
-        except Exception as e:
-            logger.error("send_notification failed", data=e)
-            raise
-
-    async def _send_response(
-        self, request_id: RequestId, response: SendResultT | ErrorData
-    ) -> None:
-        logger.debug(
-            f"send_response: request_id={request_id}, response=",
-            data=response.model_dump(),
-        )
-        return await super()._send_response(request_id, response)
-
     async def _received_notification(self, notification: ServerNotification) -> None:
         """
         Can be overridden by subclasses to handle a notification without needing
@@ -189,17 +179,3 @@ class MCPAgentClientSession(ClientSession, ContextDependent):
             await self._tool_list_changed_callback(server_name)
         except Exception as e:
             logger.error(f"Error in tool list changed callback: {e}")
-
-    async def send_progress_notification(
-        self, progress_token: str | int, progress: float, total: float | None = None
-    ) -> None:
-        """
-        Sends a progress notification for a request that is currently being
-        processed.
-        """
-        logger.debug(
-            "send_progress_notification: progress_token={progress_token}, progress={progress}, total={total}"
-        )
-        return await super().send_progress_notification(
-            progress_token=progress_token, progress=progress, total=total
-        )

mcp_agent/mcp/mcp_aggregator.py

@@ -82,13 +82,14 @@ class MCPAggregator(ContextDependent):
                 await self.context._connection_manager.__aenter__()
             self._persistent_connection_manager = self.context._connection_manager
 
-        await self.load_servers()
         # Import the display component here to avoid circular imports
         from mcp_agent.ui.console_display import ConsoleDisplay
 
         # Initialize the display component
         self.display = ConsoleDisplay(config=self.context.config)
 
+        await self.load_servers()
+
         return self
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):

mcp_agent/mcp_server_registry.py

@@ -27,6 +27,7 @@ from mcp_agent.config import (
     get_settings,
 )
 from mcp_agent.logging.logger import get_logger
+from mcp_agent.mcp.hf_auth import add_hf_auth_header
 from mcp_agent.mcp.logger_textio import get_stderr_handler
 from mcp_agent.mcp.mcp_connection_manager import (
     MCPConnectionManager,
@@ -176,11 +177,14 @@ class ServerRegistry:
             if not config.url:
                 raise ValueError(f"URL is required for SSE transport: {server_name}")
 
+            # Apply HuggingFace authentication if appropriate
+            headers = add_hf_auth_header(config.url, config.headers)
+
             # Use sse_client to get the read and write streams
             async with _add_none_to_context(
                 sse_client(
                     config.url,
-                    config.headers,
+                    headers,
                     sse_read_timeout=config.read_transport_sse_timeout_seconds,
                 )
             ) as (read_stream, write_stream, _):
@@ -198,9 +202,12 @@ class ServerRegistry:
                         logger.debug(f"{server_name}: Closed session to server")
         elif config.transport == "http":
             if not config.url:
-                raise ValueError(f"URL is required for SSE transport: {server_name}")
+                raise ValueError(f"URL is required for HTTP transport: {server_name}")
+
+            # Apply HuggingFace authentication if appropriate
+            headers = add_hf_auth_header(config.url, config.headers)
 
-            async with streamablehttp_client(config.url, config.headers) as (
+            async with streamablehttp_client(config.url, headers) as (
                 read_stream,
                 write_stream,
                 _,