taskhint gone

Author: maxisbey

src/mcp/types.py

@@ -1264,7 +1264,15 @@ class ToolAnnotations(BaseModel):
     Default: true
     """
 
-    taskHint: TaskHint | None = None
+    model_config = ConfigDict(extra="allow")
+
+
+class ToolExecution(BaseModel):
+    """Execution-related properties for a tool."""
+
+    model_config = ConfigDict(extra="allow")
+
+    task: Literal["never", "optional", "always"] | None = None
     """
     Indicates whether this tool supports task-augmented execution.
     This allows clients to handle long-running operations through polling
@@ -1277,8 +1285,6 @@ class ToolAnnotations(BaseModel):
     Default: "never"
     """
 
-    model_config = ConfigDict(extra="allow")
-
 
 class Tool(BaseMetadata):
     """Definition for a tool the client can call."""
@@ -1301,6 +1307,9 @@ class Tool(BaseMetadata):
     See [MCP specification](https://github.com/modelcontextprotocol/modelcontextprotocol/blob/47339c03c143bb4ec01a26e721a1b8fe66634ebe/docs/specification/draft/basic/index.mdx#general-fields)
     for notes on _meta usage.
     """
+
+    execution: ToolExecution | None = None
+
     model_config = ConfigDict(extra="allow")
 
 

tests/experimental/tasks/server/test_integration.py

@@ -44,7 +44,7 @@
     TaskMetadata,
     TextContent,
     Tool,
-    ToolAnnotations,
+    ToolExecution,
 )
 
 
@@ -83,7 +83,7 @@ async def list_tools():
                     "type": "object",
                     "properties": {"input": {"type": "string"}},
                 },
-                annotations=ToolAnnotations(taskHint="always"),
+                execution=ToolExecution(task="always"),
             )
         ]
 

tests/experimental/tasks/server/test_server.py

@@ -39,7 +39,7 @@
     TaskMetadata,
     TextContent,
     Tool,
-    ToolAnnotations,
+    ToolExecution,
 )
 
 # --- Experimental handler tests ---
@@ -215,8 +215,8 @@ async def handle_list_tasks(request: ListTasksRequest) -> ListTasksResult:
 
 
 @pytest.mark.anyio
-async def test_tool_with_task_hint_annotation() -> None:
-    """Test that tools can declare taskHint in annotations."""
+async def test_tool_with_task_execution_metadata() -> None:
+    """Test that tools can declare task execution mode."""
     server = Server("test")
 
     @server.list_tools()
@@ -226,19 +226,19 @@ async def list_tools():
                 name="quick_tool",
                 description="Fast tool",
                 inputSchema={"type": "object", "properties": {}},
-                annotations=ToolAnnotations(taskHint="never"),
+                execution=ToolExecution(task="never"),
             ),
             Tool(
                 name="long_tool",
                 description="Long running tool",
                 inputSchema={"type": "object", "properties": {}},
-                annotations=ToolAnnotations(taskHint="always"),
+                execution=ToolExecution(task="always"),
             ),
             Tool(
                 name="flexible_tool",
                 description="Can be either",
                 inputSchema={"type": "object", "properties": {}},
-                annotations=ToolAnnotations(taskHint="optional"),
+                execution=ToolExecution(task="optional"),
             ),
         ]
 
@@ -250,12 +250,12 @@ async def list_tools():
     assert isinstance(result.root, ListToolsResult)
     tools = result.root.tools
 
-    assert tools[0].annotations is not None
-    assert tools[0].annotations.taskHint == "never"
-    assert tools[1].annotations is not None
-    assert tools[1].annotations.taskHint == "always"
-    assert tools[2].annotations is not None
-    assert tools[2].annotations.taskHint == "optional"
+    assert tools[0].execution is not None
+    assert tools[0].execution.task == "never"
+    assert tools[1].execution is not None
+    assert tools[1].execution.task == "always"
+    assert tools[2].execution is not None
+    assert tools[2].execution.task == "optional"
 
 
 # --- Integration tests ---
@@ -274,7 +274,7 @@ async def list_tools():
                 name="long_task",
                 description="A long running task",
                 inputSchema={"type": "object", "properties": {}},
-                annotations=ToolAnnotations(taskHint="optional"),
+                execution=ToolExecution(task="optional"),
             )
         ]