chore: update MCP package to v1.12.2 and fix merge conflicts

Author: yamanahlawat

mcp-run-python/pyproject.toml

@@ -10,7 +10,7 @@ dev = [
     "dirty-equals>=0.9.0",
     "httpx>=0.28.1",
     "inline-snapshot>=0.19.3",
-    "mcp>=1.4.1; python_version >= '3.10'",
+    "mcp>=1.12.2; python_version >= '3.10'",
     "micropip>=0.9.0; python_version >= '3.12'",
     "pytest>=8.3.3",
     "pytest-pretty>=1.2.0",

mcp-run-python/src/main.ts

@@ -106,19 +106,13 @@ The tools are injected into the global namespace automatically - no discovery fu
         .array(z.string())
         .optional()
         .describe('List of available tools for injection (enables tool injection when provided)'),
-      tool_name_mapping: z
-        .record(z.string())
-        .optional()
-        .describe('Mapping of python_name -> original_mcp_name for tool name conversion'),
     },
     async ({
       python_code,
       tools = [],
-      tool_name_mapping = {},
     }: {
       python_code: string
       tools?: string[]
-      tool_name_mapping?: Record<string, string>
     }) => {
       const logPromises: Promise<void>[] = []
 
@@ -185,7 +179,6 @@ The tools are injected into the global namespace automatically - no discovery fu
           {
             enableToolInjection: true,
             availableTools: tools,
-            toolNameMapping: tool_name_mapping,
             timeoutSeconds: 30,
             elicitationCallback,
           } as ToolInjectionConfig,

mcp-run-python/src/runCode.ts

@@ -13,7 +13,6 @@ export interface CodeFile {
 export interface ToolInjectionConfig {
   enableToolInjection: boolean
   availableTools: string[]
-  toolNameMapping?: Record<string, string> // python_name -> original_mcp_name
   timeoutSeconds: number
   // deno-lint-ignore no-explicit-any
   elicitationCallback?: (request: any) => Promise<any>
@@ -158,7 +157,6 @@ function injectToolFunctions(
     globals,
     config.availableTools,
     tool_callback,
-    config.toolNameMapping,
   )
 
   log('info', `Tool injection complete. Available tools: ${config.availableTools.join(', ')}`)

pydantic_ai_slim/pydantic_ai/mcp.py

@@ -699,6 +699,8 @@ def __init__(
         allow_sampling: bool = True,
         max_retries: int = 1,
         sampling_model: models.Model | None = None,
+        allow_elicitation: bool = True,
+        elicitation_callback: ElicitationFnT | None = None,
         **kwargs: Any,
     ):
         # Handle deprecated sse_read_timeout parameter
@@ -727,6 +729,8 @@ def __init__(
         self.allow_sampling = allow_sampling
         self.max_retries = max_retries
         self.sampling_model = sampling_model
+        self.allow_elicitation = allow_elicitation
+        self.elicitation_callback = elicitation_callback
         self.read_timeout = read_timeout
 
     @property

pydantic_ai_slim/pyproject.toml

@@ -77,7 +77,7 @@ tavily = ["tavily-python>=0.5.0"]
 # CLI
 cli = ["rich>=13", "prompt-toolkit>=3", "argcomplete>=3.5.0"]
 # MCP
-mcp = ["mcp>=1.11.0; python_version >= '3.10'"]
+mcp = ["mcp>=1.12.2; python_version >= '3.10'"]
 # Evals
 evals = ["pydantic-evals=={{ version }}"]
 # A2A