Merge remote-tracking branch 'upstream/main' into feat/anthropic-prompt-caching

Author: monotykamary

.gitignore

@@ -168,7 +168,7 @@ examples/mcp_root_test/test_data/*.png
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 uv.lock
 
 # File generated from promptify script (to create an LLM-friendly prompt for the repo)

README.md

@@ -38,11 +38,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.

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.28"
+version = "0.2.30"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -15,7 +15,7 @@ classifiers = [
 requires-python = ">=3.10"
 dependencies = [
     "fastapi>=0.115.6",
-    "mcp==1.9.1",
+    "mcp==1.9.3",
     "opentelemetry-distro>=0.50b0",
     "opentelemetry-exporter-otlp-proto-http>=1.29.0",
     "pydantic-settings>=2.7.0",
@@ -29,14 +29,14 @@ dependencies = [
     "prompt-toolkit>=3.0.50",
     "aiohttp>=3.11.13",
     "a2a-types>=0.1.0",
-    "opentelemetry-instrumentation-openai>=0.39.3; python_version >= '3.10' and python_version < '4.0'",
-    "opentelemetry-instrumentation-anthropic>=0.39.3; python_version >= '3.10' and python_version < '4.0'",
-    "opentelemetry-instrumentation-mcp>=0.40.3; python_version >= '3.10' and python_version < '4.0'",
+    "opentelemetry-instrumentation-openai>=0.0.40.7; python_version >= '3.10' and python_version < '4.0'",
+    "opentelemetry-instrumentation-anthropic>=0.40.7; python_version >= '3.10' and python_version < '4.0'",
+    "opentelemetry-instrumentation-mcp>=0.40.7; python_version >= '3.10' and python_version < '4.0'",
     "google-genai",
     "opentelemetry-instrumentation-google-genai>=0.2b0",
     "tensorzero>=2025.4.7",
-    "google-genai",
     "opentelemetry-instrumentation-google-genai>=0.2b0",
+    "deprecated>=1.2.18",
 ]
 
 [project.optional-dependencies]

src/mcp_agent/app.py

@@ -119,7 +119,7 @@ async def initialize(self) -> None:
         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

src/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", "")

src/mcp_agent/cli/commands/url_parser.py

@@ -8,6 +8,8 @@
 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
 

src/mcp_agent/config.py

@@ -230,6 +230,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.
@@ -330,6 +339,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"""
 

src/mcp_agent/context.py

@@ -12,7 +12,8 @@
 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 @@ async def cleanup_context() -> 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:

src/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 @@ def get_completions(self, document, complete_event):
                     )
 
 
+# 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 _(event) -> 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
 
 

src/mcp_agent/core/interactive_prompt.py

@@ -351,7 +351,7 @@ async def _select_prompt(
                 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 @@ async def _select_prompt(
                             "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,