chore: rename taskHint to TaskSupport

Signed-off-by: He-Pin <[email protected]>

Author: He-Pin

mcp-core/src/main/java/io/modelcontextprotocol/spec/McpSchema.java

@@ -1438,20 +1438,28 @@ public record JsonSchema( // @formatter:off
 	}
 
 	/**
-	 * The task hint.
+	 * Execution behavior for a tool.
+	 */
+	@JsonInclude(JsonInclude.Include.NON_ABSENT)
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public record ToolExecution(TaskSupport task) {
+	}
+
+	/**
+	 * The task augmented support mode for a tool.
 	 * <p>
-	 * If taskHint is {@code always}, clients SHOULD invoke the tool as a task. Servers
-	 * MAY return a -32601 (Method not found) error if a client does not attempt to do so.
+	 * If mode is {@code always}, clients SHOULD invoke the tool as a task. Servers MAY
+	 * return a -32601 (Method not found) error if a client does not attempt to do so.
 	 * <p>
-	 * If taskHint is {@code optional}, clients MAY invoke the tool as a task or as a
-	 * normal request.
+	 * If mode is {@code optional}, clients MAY invoke the tool as a task or as a normal
+	 * request.
 	 * <p>
-	 * If taskHint is not present or {@code never}, clients MUST NOT attempt to invoke the
+	 * If mode is not present or {@code never}, clients MUST NOT attempt to invoke the
 	 * tool as a task. Servers SHOULD return a -32601 (Method not found) error if a client
 	 * attempts to do so. This is the default behavior.
 	 *
 	 */
-	public enum TaskHint {
+	public enum TaskSupport {
 
 		// @formatter:off
         @JsonProperty("always") ALWAYS("always"),
@@ -1461,21 +1469,21 @@ public enum TaskHint {
 
 		private final String value;
 
-		TaskHint(final String value) {
+		TaskSupport(final String value) {
 			this.value = value;
 		}
 
 		public String getValue() {
 			return value;
 		}
 
-		public static TaskHint fromValue(String value) {
-			for (TaskHint hint : TaskHint.values()) {
+		public static TaskSupport fromValue(String value) {
+			for (TaskSupport hint : TaskSupport.values()) {
 				if (hint.value.equalsIgnoreCase(value)) {
 					return hint;
 				}
 			}
-			throw new IllegalArgumentException("Unknown TaskHint value: " + value);
+			throw new IllegalArgumentException("Unknown task support value: " + value);
 		}
 
 	}
@@ -1498,8 +1506,7 @@ public record ToolAnnotations( // @formatter:off
 		@JsonProperty("destructiveHint") Boolean destructiveHint,
 		@JsonProperty("idempotentHint") Boolean idempotentHint,
 		@JsonProperty("openWorldHint") Boolean openWorldHint,
-		@JsonProperty("returnDirect") Boolean returnDirect,
-        @JsonProperty("taskHint") TaskHint taskHint) { // @formatter:on
+		@JsonProperty("returnDirect") Boolean returnDirect) { // @formatter:on
 
 		public static Builder builder() {
 			return new Builder();
@@ -1519,8 +1526,6 @@ public static class Builder {
 
 			private boolean returnDirect;
 
-			private TaskHint taskHint;
-
 			public Builder title(String title) {
 				this.title = title;
 				return this;
@@ -1551,14 +1556,9 @@ public Builder returnDirect(boolean returnDirect) {
 				return this;
 			}
 
-			public Builder taskHint(TaskHint taskHint) {
-				this.taskHint = taskHint;
-				return this;
-			}
-
 			public ToolAnnotations build() {
 				return new ToolAnnotations(title, readOnlyHint, destructiveHint, idempotentHint, openWorldHint,
-						returnDirect, taskHint);
+						returnDirect);
 			}
 
 		}
@@ -1576,6 +1576,7 @@ public ToolAnnotations build() {
 	 * used by clients to improve the LLM's understanding of available tools.
 	 * @param inputSchema A JSON Schema object that describes the expected structure of
 	 * the arguments when calling this tool. This allows clients to validate tool
+	 * @param execution The execution behavior for the tool.
 	 * @param outputSchema An optional JSON Schema object defining the structure of the
 	 * tool's output returned in the structuredContent field of a CallToolResult.
 	 * @param annotations Optional additional tool information.
@@ -1589,9 +1590,24 @@ public record Tool( // @formatter:off
 		@JsonProperty("description") String description,
 		@JsonProperty("inputSchema") JsonSchema inputSchema,
 		@JsonProperty("outputSchema") Map<String, Object> outputSchema,
+        @JsonProperty("execution") ToolExecution execution,
 		@JsonProperty("annotations") ToolAnnotations annotations,
 		@JsonProperty("_meta") Map<String, Object> meta) { // @formatter:on
 
+		/**
+		 * @deprecated keep for backwards compatibility
+		 */
+		public Tool( // @formatter:off
+            String name,
+            String title,
+            String description,
+            JsonSchema inputSchema,
+            Map<String, Object> outputSchema,
+            ToolAnnotations annotations,
+            Map<String, Object> meta) { // @formatter:on
+			this(name, title, description, inputSchema, outputSchema, null, annotations, meta);
+		}
+
 		public static Builder builder() {
 			return new Builder();
 		}
@@ -1608,6 +1624,8 @@ public static class Builder {
 
 			private Map<String, Object> outputSchema;
 
+			private ToolExecution execution;
+
 			private ToolAnnotations annotations;
 
 			private Map<String, Object> meta;
@@ -1647,6 +1665,11 @@ public Builder outputSchema(McpJsonMapper jsonMapper, String outputSchema) {
 				return this;
 			}
 
+			public Builder execution(ToolExecution execution) {
+				this.execution = execution;
+				return this;
+			}
+
 			public Builder annotations(ToolAnnotations annotations) {
 				this.annotations = annotations;
 				return this;
@@ -1659,7 +1682,7 @@ public Builder meta(Map<String, Object> meta) {
 
 			public Tool build() {
 				Assert.hasText(name, "name must not be empty");
-				return new Tool(name, title, description, inputSchema, outputSchema, annotations, meta);
+				return new Tool(name, title, description, inputSchema, outputSchema, execution, annotations, meta);
 			}
 
 		}

mcp-core/src/test/java/io/modelcontextprotocol/spec/McpSchemaTests.java

@@ -879,10 +879,7 @@ void testToolWithAnnotations() throws Exception {
 					"required": ["name"]
 				}
 				""";
-		McpSchema.ToolAnnotations annotations = McpSchema.ToolAnnotations.builder()
-			.title("A test tool")
-			.taskHint(McpSchema.TaskHint.OPTIONAL)
-			.build();
+		McpSchema.ToolAnnotations annotations = McpSchema.ToolAnnotations.builder().title("A test tool").build();
 
 		McpSchema.Tool tool = McpSchema.Tool.builder()
 			.name("test-tool")
@@ -913,8 +910,7 @@ void testToolWithAnnotations() throws Exception {
 							"destructiveHint":false,
 							"idempotentHint":false,
 							"openWorldHint":false,
-							"returnDirect":false,
-							"taskHint":"optional"
+							"returnDirect":false
 						}
 					}
 					"""));
@@ -1022,7 +1018,6 @@ void testToolWithOutputSchemaAndAnnotations() throws Exception {
 			.readOnlyHint(true)
 			.idempotentHint(true)
 			.returnDirect(true)
-			.taskHint(McpSchema.TaskHint.OPTIONAL)
 			.build();
 
 		McpSchema.Tool tool = McpSchema.Tool.builder()
@@ -1061,8 +1056,7 @@ void testToolWithOutputSchemaAndAnnotations() throws Exception {
 							"destructiveHint":false,
 							"idempotentHint":true,
 							"openWorldHint":false,
-							"returnDirect":true,
-							"taskHint":"optional"
+							"returnDirect":true
 						}
 					}"""));
 	}