.

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

Author: He-Pin

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

@@ -1668,16 +1668,107 @@ private static JsonSchema parseSchema(McpJsonMapper jsonMapper, String schema) {
 		}
 	}
 
-    /**
-     * Metadata about a task.
-     * */
-    @JsonInclude(JsonInclude.Include.NON_ABSENT)
-    @JsonIgnoreProperties(ignoreUnknown = true)
-    public record TaskMetaData(@JsonProperty("ttl") long ttl,
-                               @JsonProperty("extensions") Object extensions,
-                               @JsonProperty("bizContext") Object bizContext) {
+	/**
+	 * Metadata about a task.
+	 */
+	@JsonInclude(JsonInclude.Include.NON_ABSENT)
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public record TaskMetaData(@JsonProperty("ttl") long ttl, @JsonProperty("extensions") Object extensions,
+			@JsonProperty("bizContext") Object bizContext) {
+
+		public TaskMetaData(long ttl) {
+			this(ttl, null, null);
+		}
+	}
+
+	/**
+	 * The server's response to a tools/call request from the client when invoked as a
+	 * task.
+	 */
+	@JsonInclude(JsonInclude.Include.NON_ABSENT)
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public record Task( //@formatter:off
+        @JsonProperty("taskId") String taskId,
+        @JsonProperty("status") String status,
+        @JsonProperty("statusMessage") String statusMessage,
+        @JsonProperty("createdAt") String createdAt,
+        @JsonProperty("ttl") long ttl,
+        @JsonProperty("pollInterval") long pollInterval,
+        @JsonProperty("extensions") Object extensions,
+        @JsonProperty("bizContext") Object bizContext) { // @formatter:on
+
+		public Task(String taskId, String status, String statusMessage, String createdAt, long ttl) {
+			this(taskId, status, statusMessage, createdAt, ttl, 0L, null, null);
+		}
+
+		public static Builder builder() {
+			return new Builder();
+		}
+
+		public static class Builder {
+
+			private String taskId;
+
+			private String status;
+
+			private String statusMessage;
+
+			private String createdAt;
+
+			private long ttl;
+
+			private long pollInterval;
+
+			private Object extensions;
+
+			private Object bizContext;
+
+			public Builder taskId(String taskId) {
+				this.taskId = taskId;
+				return this;
+			}
+
+			public Builder status(String status) {
+				this.status = status;
+				return this;
+			}
+
+			public Builder statusMessage(String statusMessage) {
+				this.statusMessage = statusMessage;
+				return this;
+			}
+
+			public Builder createdAt(String createdAt) {
+				this.createdAt = createdAt;
+				return this;
+			}
+
+			public Builder ttl(long ttl) {
+				this.ttl = ttl;
+				return this;
+			}
+
+			public Builder pollInterval(long pollInterval) {
+				this.pollInterval = pollInterval;
+				return this;
+			}
+
+			public Builder extensions(Object extensions) {
+				this.extensions = extensions;
+				return this;
+			}
 
-    }
+			public Builder bizContext(Object bizContext) {
+				this.bizContext = bizContext;
+				return this;
+			}
+
+			public Task build() {
+				return new Task(taskId, status, statusMessage, createdAt, ttl, pollInterval, extensions, bizContext);
+			}
+
+		}
+	}
 
 	/**
 	 * Used by the client to call a tool provided by the server.
@@ -1724,7 +1815,7 @@ public static class Builder {
 
 			private Map<String, Object> arguments;
 
-            private TaskMetaData task;
+			private TaskMetaData task;
 
 			private Map<String, Object> meta;
 
@@ -1756,10 +1847,10 @@ public Builder progressToken(Object progressToken) {
 				return this;
 			}
 
-            public Builder task(TaskMetaData task) {
-                this.task = task;
-                return this;
-            }
+			public Builder task(TaskMetaData task) {
+				this.task = task;
+				return this;
+			}
 
 			public CallToolRequest build() {
 				Assert.hasText(name, "name must not be empty");
@@ -1815,22 +1906,23 @@ public record CallToolResult( // @formatter:off
 		@JsonProperty("content") List<Content> content,
 		@JsonProperty("isError") Boolean isError,
 		@JsonProperty("structuredContent") Object structuredContent,
+        @JsonProperty("task") Task task,
 		@JsonProperty("_meta") Map<String, Object> meta) implements Result { // @formatter:on
 
 		/**
 		 * @deprecated use the builder instead.
 		 */
 		@Deprecated
 		public CallToolResult(List<Content> content, Boolean isError) {
-			this(content, isError, (Object) null, null);
+			this(content, isError, (Object) null, null, null);
 		}
 
 		/**
 		 * @deprecated use the builder instead.
 		 */
 		@Deprecated
 		public CallToolResult(List<Content> content, Boolean isError, Map<String, Object> structuredContent) {
-			this(content, isError, structuredContent, null);
+			this(content, isError, structuredContent, null, null);
 		}
 
 		/**
@@ -1846,6 +1938,23 @@ public CallToolResult(String content, Boolean isError) {
 			this(List.of(new TextContent(content)), isError, null);
 		}
 
+		/**
+		 * Create a new instance of {@link CallToolResult} with a task.
+		 * @param task The task metadata.
+		 */
+		public CallToolResult(Task task) {
+			this(null, false, null, task, null);
+		}
+
+		/**
+		 * Create a new instance of {@link CallToolResult} with a task.
+		 * @param task The task metadata.
+		 * @param meta Optional metadata about the result.
+		 */
+		public CallToolResult(Task task, Map<String, Object> meta) {
+			this(null, false, null, task, meta);
+		}
+
 		/**
 		 * Creates a builder for {@link CallToolResult}.
 		 * @return a new builder instance
@@ -1865,6 +1974,8 @@ public static class Builder {
 
 			private Object structuredContent;
 
+			private Task task;
+
 			private Map<String, Object> meta;
 
 			/**
@@ -1951,12 +2062,17 @@ public Builder meta(Map<String, Object> meta) {
 				return this;
 			}
 
+			public Builder task(Task task) {
+				this.task = task;
+				return this;
+			}
+
 			/**
 			 * Builds a new {@link CallToolResult} instance.
 			 * @return a new CallToolResult instance
 			 */
 			public CallToolResult build() {
-				return new CallToolResult(content, isError, (Object) structuredContent, meta);
+				return new CallToolResult(content, isError, (Object) structuredContent, task, meta);
 			}
 
 		}