) options.get("metadata") : null;
int rowCount = options != null ? (int) options.getOrDefault("row_count", 0) : 0;
+ // tool identifies the specific tool/action invoked on the MCP server, distinct
+ // from connectorType which identifies the server/connector itself (epic #2905 /
+ // #2904).
+ String tool = options != null ? (String) options.get("tool") : null;
MCPCheckOutputRequest request =
- new MCPCheckOutputRequest(connectorType, responseData, message, metadata, rowCount);
+ new MCPCheckOutputRequest(
+ connectorType, responseData, message, metadata, rowCount, tool);
Request httpRequest = buildRequest("POST", "/api/v1/mcp/check-output", request);
try (Response response = executeHttp(httpClient, httpRequest)) {
diff --git a/src/main/java/com/getaxonflow/sdk/adapters/LangGraphAdapter.java b/src/main/java/com/getaxonflow/sdk/adapters/LangGraphAdapter.java
index fa7569c..695693d 100644
--- a/src/main/java/com/getaxonflow/sdk/adapters/LangGraphAdapter.java
+++ b/src/main/java/com/getaxonflow/sdk/adapters/LangGraphAdapter.java
@@ -449,13 +449,15 @@ public MCPToolInterceptor mcpToolInterceptor(MCPInterceptorOptions options) {
connectorTypeFn =
options.getConnectorTypeFn() != null
? options.getConnectorTypeFn()
- : req -> req.getServerName() + "." + req.getName();
+ : MCPToolRequest::getServerName;
operation = options.getOperation();
} else {
- connectorTypeFn = req -> req.getServerName() + "." + req.getName();
+ connectorTypeFn = MCPToolRequest::getServerName;
operation = "execute";
}
+ // The tool identity is always the request's tool name (epic #2905,
+ // RULING 3); there is no caller-supplied tool override.
return new MCPToolInterceptor(client, connectorTypeFn, operation);
}
diff --git a/src/main/java/com/getaxonflow/sdk/adapters/MCPInterceptorOptions.java b/src/main/java/com/getaxonflow/sdk/adapters/MCPInterceptorOptions.java
index c419e35..36248e9 100644
--- a/src/main/java/com/getaxonflow/sdk/adapters/MCPInterceptorOptions.java
+++ b/src/main/java/com/getaxonflow/sdk/adapters/MCPInterceptorOptions.java
@@ -34,8 +34,12 @@ private MCPInterceptorOptions(Builder builder) {
}
/**
- * Returns the function that maps an MCP request to a connector type string. May be null, in which
- * case the default "{serverName}.{toolName}" is used.
+ * Returns the function that maps an MCP request to a connector type string. May be null, in
+ * which case the default {@link MCPToolRequest#getServerName()} is used.
+ *
+ * Connector type identifies the MCP server/connector itself; it is sent separately from the
+ * tool name (which is always {@link MCPToolRequest#getName()}) so policies can match on server
+ * identity, tool identity, or both.
*
* @return the connector type function, or null
*/
@@ -63,7 +67,12 @@ public static final class Builder {
private Builder() {}
/**
- * Sets a custom function to derive the connector type from an MCP request.
+ * Sets a custom function to derive the connector type (MCP server identity) from an MCP
+ * request. Defaults to {@link MCPToolRequest#getServerName()}.
+ *
+ *
There is deliberately no {@code toolFn} override: the tool identity is always {@link
+ * MCPToolRequest#getName()} so a caller cannot write an arbitrary tool identity into the audit
+ * trail (epic #2905, RULING 3).
*
* @param connectorTypeFn mapping function
* @return this builder
diff --git a/src/main/java/com/getaxonflow/sdk/adapters/MCPToolInterceptor.java b/src/main/java/com/getaxonflow/sdk/adapters/MCPToolInterceptor.java
index b79fcf3..5f406b9 100644
--- a/src/main/java/com/getaxonflow/sdk/adapters/MCPToolInterceptor.java
+++ b/src/main/java/com/getaxonflow/sdk/adapters/MCPToolInterceptor.java
@@ -79,12 +79,18 @@ public final class MCPToolInterceptor {
*/
public Object intercept(MCPToolRequest request, MCPToolHandler handler) throws Exception {
String connectorType = connectorTypeFn.apply(request);
+ // The tool identity is always the request's tool name (epic #2905,
+ // RULING 3): there is no caller-supplied tool override, so an arbitrary
+ // identity can never be written into the audit trail. connectorTypeFn
+ // remains the escape hatch for the server/connector dimension only.
+ String tool = request.getName();
String argsStr = serializeArgs(request.getArgs());
- String statement = connectorType + "(" + argsStr + ")";
+ String statement = connectorType + "." + tool + "(" + argsStr + ")";
// Pre-check: validate input
Map inputOptions = new HashMap<>();
inputOptions.put("operation", operation);
+ inputOptions.put("tool", tool);
if (request.getArgs() != null && !request.getArgs().isEmpty()) {
inputOptions.put("parameters", request.getArgs());
}
@@ -111,6 +117,7 @@ public Object intercept(MCPToolRequest request, MCPToolHandler handler) throws E
Map outputOptions = new HashMap<>();
outputOptions.put("message", resultStr);
+ outputOptions.put("tool", tool);
MCPCheckOutputResponse outputCheck = client.mcpCheckOutput(connectorType, null, outputOptions);
if (!outputCheck.isAllowed()) {
diff --git a/src/main/java/com/getaxonflow/sdk/types/MCPCheckInputRequest.java b/src/main/java/com/getaxonflow/sdk/types/MCPCheckInputRequest.java
index b0bfe8c..579d188 100644
--- a/src/main/java/com/getaxonflow/sdk/types/MCPCheckInputRequest.java
+++ b/src/main/java/com/getaxonflow/sdk/types/MCPCheckInputRequest.java
@@ -51,6 +51,17 @@ public final class MCPCheckInputRequest {
@JsonProperty("content_type")
private final String contentType;
+ /**
+ * The specific tool/action name being invoked on the MCP server (e.g., "query", "search_docs").
+ * Distinct from {@code connectorType}, which identifies the MCP server/connector itself.
+ * Optional; null when the caller doesn't distinguish per-tool identity from the connector.
+ * Consumed on {@code POST /api/v1/mcp/check-input} by platform v9.10.0+ (enterprise c8df2006b);
+ * silently ignored by platforms below v9.10.0. Source of truth: {@code platform/agent}
+ * {@code MCPCheckInputRequest.Tool} (epic #2905 / #2904).
+ */
+ @JsonProperty("tool")
+ private final String tool;
+
/**
* Creates a request with connector type and statement only. Operation defaults to "execute".
*
@@ -76,7 +87,7 @@ public MCPCheckInputRequest(
}
/**
- * Creates a request with all fields, including the redaction content type.
+ * Creates a request with all fields, including the redaction content type. Tool is left null.
*
* @param connectorType the MCP connector type (e.g., "postgres")
* @param statement the statement to validate
@@ -91,11 +102,35 @@ public MCPCheckInputRequest(
Map parameters,
String operation,
String contentType) {
+ this(connectorType, statement, parameters, operation, contentType, null);
+ }
+
+ /**
+ * Creates a request with all fields, including the redaction content type and the specific tool
+ * name.
+ *
+ * @param connectorType the MCP connector type/server (e.g., "postgres")
+ * @param statement the statement to validate
+ * @param parameters optional query parameters
+ * @param operation the operation type (e.g., "query", "execute")
+ * @param contentType the redaction content type (e.g., {@code text/plain}); null defaults
+ * server-side
+ * @param tool the specific tool/action name (e.g., "query"); null when not distinguished from
+ * {@code connectorType}
+ */
+ public MCPCheckInputRequest(
+ String connectorType,
+ String statement,
+ Map parameters,
+ String operation,
+ String contentType,
+ String tool) {
this.connectorType = connectorType;
this.statement = statement;
this.parameters = parameters;
this.operation = operation;
this.contentType = contentType;
+ this.tool = tool;
}
public String getConnectorType() {
@@ -119,6 +154,14 @@ public String getContentType() {
return contentType;
}
+ /**
+ * Returns the specific tool/action name being invoked, or null when not distinguished from
+ * {@code connectorType}.
+ */
+ public String getTool() {
+ return tool;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -128,12 +171,13 @@ public boolean equals(Object o) {
&& Objects.equals(statement, that.statement)
&& Objects.equals(parameters, that.parameters)
&& Objects.equals(operation, that.operation)
- && Objects.equals(contentType, that.contentType);
+ && Objects.equals(contentType, that.contentType)
+ && Objects.equals(tool, that.tool);
}
@Override
public int hashCode() {
- return Objects.hash(connectorType, statement, parameters, operation, contentType);
+ return Objects.hash(connectorType, statement, parameters, operation, contentType, tool);
}
@Override
diff --git a/src/main/java/com/getaxonflow/sdk/types/MCPCheckOutputRequest.java b/src/main/java/com/getaxonflow/sdk/types/MCPCheckOutputRequest.java
index 160985e..50191e7 100644
--- a/src/main/java/com/getaxonflow/sdk/types/MCPCheckOutputRequest.java
+++ b/src/main/java/com/getaxonflow/sdk/types/MCPCheckOutputRequest.java
@@ -45,6 +45,20 @@ public final class MCPCheckOutputRequest {
@JsonProperty("row_count")
private final int rowCount;
+ /**
+ * The specific tool/action name being invoked on the MCP server (e.g., "query", "search_docs").
+ * Distinct from {@code connectorType}, which identifies the MCP server/connector itself.
+ * Optional; null when the caller doesn't distinguish per-tool identity from the connector.
+ *
+ * NOTE: unlike the input plane, the platform's check-output schema has NO {@code tool} field
+ * on any released version yet — #2904 added it input-side only, and check-output support is
+ * tracked by #2955 (targeted for v9.11.0). Sending it here is forward-compatible and harmless
+ * (the agent ignores unknown keys), but it is not consumed server-side on any platform today.
+ * Source of truth: {@code platform/agent} {@code MCPCheckInputRequest.Tool} (epic #2905 / #2904).
+ */
+ @JsonProperty("tool")
+ private final String tool;
+
/**
* Creates a request with connector type and response data only.
*
@@ -56,7 +70,7 @@ public MCPCheckOutputRequest(String connectorType, List> res
}
/**
- * Creates a request with all fields.
+ * Creates a request with all fields. Tool is left null.
*
* @param connectorType the MCP connector type (e.g., "postgres")
* @param responseData the response data rows to validate
@@ -70,11 +84,33 @@ public MCPCheckOutputRequest(
String message,
Map metadata,
int rowCount) {
+ this(connectorType, responseData, message, metadata, rowCount, null);
+ }
+
+ /**
+ * Creates a request with all fields, including the specific tool name.
+ *
+ * @param connectorType the MCP connector type/server (e.g., "postgres")
+ * @param responseData the response data rows to validate
+ * @param message optional message context
+ * @param metadata optional metadata
+ * @param rowCount the number of rows in the response
+ * @param tool the specific tool/action name (e.g., "query"); null when not distinguished from
+ * {@code connectorType}
+ */
+ public MCPCheckOutputRequest(
+ String connectorType,
+ List> responseData,
+ String message,
+ Map metadata,
+ int rowCount,
+ String tool) {
this.connectorType = connectorType;
this.responseData = responseData;
this.message = message;
this.metadata = metadata;
this.rowCount = rowCount;
+ this.tool = tool;
}
public String getConnectorType() {
@@ -97,6 +133,14 @@ public int getRowCount() {
return rowCount;
}
+ /**
+ * Returns the specific tool/action name being invoked, or null when not distinguished from
+ * {@code connectorType}.
+ */
+ public String getTool() {
+ return tool;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) return true;
@@ -106,12 +150,13 @@ public boolean equals(Object o) {
&& Objects.equals(connectorType, that.connectorType)
&& Objects.equals(responseData, that.responseData)
&& Objects.equals(message, that.message)
- && Objects.equals(metadata, that.metadata);
+ && Objects.equals(metadata, that.metadata)
+ && Objects.equals(tool, that.tool);
}
@Override
public int hashCode() {
- return Objects.hash(connectorType, responseData, message, metadata, rowCount);
+ return Objects.hash(connectorType, responseData, message, metadata, rowCount, tool);
}
@Override
diff --git a/src/test/java/com/getaxonflow/sdk/AxonFlowTest.java b/src/test/java/com/getaxonflow/sdk/AxonFlowTest.java
index 226b241..2c23113 100644
--- a/src/test/java/com/getaxonflow/sdk/AxonFlowTest.java
+++ b/src/test/java/com/getaxonflow/sdk/AxonFlowTest.java
@@ -2175,6 +2175,33 @@ void mcpCheckInputWithOptionsShouldSendOperationAndParameters() {
.withRequestBody(containing("\"operation\":\"execute\"")));
}
+ @Test
+ @DisplayName("mcpCheckInput with a \"tool\" option should send connector_type and tool as "
+ + "separate fields")
+ void mcpCheckInputWithToolOptionShouldSendConnectorTypeAndToolSeparately() {
+ stubFor(
+ post(urlEqualTo("/api/v1/mcp/check-input"))
+ .willReturn(
+ aResponse()
+ .withStatus(200)
+ .withHeader("Content-Type", "application/json")
+ .withBody(
+ "{\"allowed\": true, \"policies_evaluated\": 5, "
+ + "\"policy_info\": {\"policies_evaluated\": 5, \"blocked\": false, "
+ + "\"redactions_applied\": 0, \"processing_time_ms\": 2}}")));
+
+ Map options = Map.of("operation", "execute", "tool", "mytool");
+ MCPCheckInputResponse response =
+ axonflow.mcpCheckInput("myserver", "myserver.mytool({})", options);
+
+ assertThat(response.isAllowed()).isTrue();
+
+ verify(
+ postRequestedFor(urlEqualTo("/api/v1/mcp/check-input"))
+ .withRequestBody(containing("\"connector_type\":\"myserver\""))
+ .withRequestBody(containing("\"tool\":\"mytool\"")));
+ }
+
@Test
@DisplayName("mcpCheckInput should handle 403 as blocked result")
void mcpCheckInputShouldHandle403AsBlockedResult() {
@@ -2311,6 +2338,32 @@ void mcpCheckOutputWithOptionsShouldSendOptions() {
.withRequestBody(containing("\"row_count\":1")));
}
+ @Test
+ @DisplayName("mcpCheckOutput with a \"tool\" option should send connector_type and tool as "
+ + "separate fields")
+ void mcpCheckOutputWithToolOptionShouldSendConnectorTypeAndToolSeparately() {
+ stubFor(
+ post(urlEqualTo("/api/v1/mcp/check-output"))
+ .willReturn(
+ aResponse()
+ .withStatus(200)
+ .withHeader("Content-Type", "application/json")
+ .withBody(
+ "{\"allowed\": true, \"policies_evaluated\": 6, "
+ + "\"policy_info\": {\"policies_evaluated\": 6, \"blocked\": false, "
+ + "\"redactions_applied\": 0, \"processing_time_ms\": 2}}")));
+
+ Map options = Map.of("message", "ok", "tool", "mytool");
+ MCPCheckOutputResponse response = axonflow.mcpCheckOutput("myserver", null, options);
+
+ assertThat(response.isAllowed()).isTrue();
+
+ verify(
+ postRequestedFor(urlEqualTo("/api/v1/mcp/check-output"))
+ .withRequestBody(containing("\"connector_type\":\"myserver\""))
+ .withRequestBody(containing("\"tool\":\"mytool\"")));
+ }
+
@Test
@DisplayName("mcpCheckOutput should handle 403 as blocked result")
void mcpCheckOutputShouldHandle403AsBlockedResult() {
diff --git a/src/test/java/com/getaxonflow/sdk/adapters/LangGraphAdapterTest.java b/src/test/java/com/getaxonflow/sdk/adapters/LangGraphAdapterTest.java
index 1963ad4..fcd1de0 100644
--- a/src/test/java/com/getaxonflow/sdk/adapters/LangGraphAdapterTest.java
+++ b/src/test/java/com/getaxonflow/sdk/adapters/LangGraphAdapterTest.java
@@ -874,7 +874,7 @@ void shouldReturnRedactedData() throws Exception {
}
@Test
- @DisplayName("should use default connector type serverName.toolName")
+ @DisplayName("should use serverName as connectorType and name as tool, not concatenated")
void shouldUseDefaultConnectorType() throws Exception {
MCPCheckInputResponse inputOk = new MCPCheckInputResponse(true, null, 1, null);
MCPCheckOutputResponse outputOk = new MCPCheckOutputResponse(true, null, null, 1, null, null);
@@ -887,8 +887,16 @@ void shouldUseDefaultConnectorType() throws Exception {
interceptor.intercept(request, req -> "ok");
- verify(client).mcpCheckInput(eq("myserver.mytool"), anyString(), any());
- verify(client).mcpCheckOutput(eq("myserver.mytool"), isNull(), any());
+ // connectorType is the bare MCP server name -- NOT "myserver.mytool" -- and the tool
+ // name is threaded separately via the "tool" option, so policies can match on server
+ // identity, tool identity, or both instead of a single opaque concatenated string.
+ ArgumentCaptor> inputOptsCaptor = ArgumentCaptor.forClass(Map.class);
+ verify(client).mcpCheckInput(eq("myserver"), anyString(), inputOptsCaptor.capture());
+ assertThat(inputOptsCaptor.getValue()).containsEntry("tool", "mytool");
+
+ ArgumentCaptor> outputOptsCaptor = ArgumentCaptor.forClass(Map.class);
+ verify(client).mcpCheckOutput(eq("myserver"), isNull(), outputOptsCaptor.capture());
+ assertThat(outputOptsCaptor.getValue()).containsEntry("tool", "mytool");
}
@Test
@@ -914,6 +922,62 @@ void shouldUseCustomConnectorTypeFn() throws Exception {
ArgumentCaptor> inputOptsCaptor = ArgumentCaptor.forClass(Map.class);
verify(client).mcpCheckInput(eq("custom-pg"), anyString(), inputOptsCaptor.capture());
assertThat(inputOptsCaptor.getValue()).containsEntry("operation", "query");
+ // Even with a custom connectorTypeFn, the tool name still defaults to
+ // MCPToolRequest#getName() and is threaded separately.
+ assertThat(inputOptsCaptor.getValue()).containsEntry("tool", "read");
+ }
+
+ @Test
+ @DisplayName("tool name is always getName(), never a caller override (RULING 3)")
+ void toolNameIsAlwaysRequestName() throws Exception {
+ MCPCheckInputResponse inputOk = new MCPCheckInputResponse(true, null, 1, null);
+ MCPCheckOutputResponse outputOk = new MCPCheckOutputResponse(true, null, null, 1, null, null);
+
+ when(client.mcpCheckInput(anyString(), anyString(), any())).thenReturn(inputOk);
+ when(client.mcpCheckOutput(anyString(), isNull(), any())).thenReturn(outputOk);
+
+ // A custom connectorTypeFn overrides only the connector/server dimension;
+ // the tool identity is always MCPToolRequest#getName() — there is no
+ // toolFn escape hatch that could write an arbitrary tool identity into
+ // the audit trail (epic #2905, RULING 3).
+ MCPInterceptorOptions opts =
+ MCPInterceptorOptions.builder().connectorTypeFn(req -> "renamed-server").build();
+
+ MCPToolInterceptor interceptor = adapter.mcpToolInterceptor(opts);
+ MCPToolRequest request = new MCPToolRequest("pg", "read", null);
+
+ interceptor.intercept(request, req -> "data");
+
+ ArgumentCaptor> inputOptsCaptor = ArgumentCaptor.forClass(Map.class);
+ verify(client).mcpCheckInput(eq("renamed-server"), anyString(), inputOptsCaptor.capture());
+ assertThat(inputOptsCaptor.getValue()).containsEntry("tool", "read");
+ }
+
+ @Test
+ @DisplayName("empty server name sends empty connector_type with the tool name (missing-server)")
+ void emptyServerNameSendsEmptyConnectorTypeAndTool() throws Exception {
+ // Missing-server edge (epic #2905): with the default resolver,
+ // connector_type is the server name, so an empty serverName sends
+ // connector_type="" while the tool name still travels in the "tool"
+ // option. A real platform rejects an empty connector_type with HTTP 400,
+ // which surfaces as an exception — the tool call is blocked (fail-closed)
+ // and the handler never runs. Before the de-concatenation the value was
+ // ".tool" (a non-empty string the platform accepted), so this is a
+ // deliberate, surfaced change for server-less tools.
+ MCPCheckInputResponse inputOk = new MCPCheckInputResponse(true, null, 1, null);
+ MCPCheckOutputResponse outputOk = new MCPCheckOutputResponse(true, null, null, 1, null, null);
+
+ when(client.mcpCheckInput(anyString(), anyString(), any())).thenReturn(inputOk);
+ when(client.mcpCheckOutput(anyString(), isNull(), any())).thenReturn(outputOk);
+
+ MCPToolInterceptor interceptor = adapter.mcpToolInterceptor();
+ MCPToolRequest request = new MCPToolRequest("", "tool", null);
+
+ interceptor.intercept(request, req -> "data");
+
+ ArgumentCaptor> inputOptsCaptor = ArgumentCaptor.forClass(Map.class);
+ verify(client).mcpCheckInput(eq(""), anyString(), inputOptsCaptor.capture());
+ assertThat(inputOptsCaptor.getValue()).containsEntry("tool", "tool");
}
@Test
diff --git a/src/test/java/com/getaxonflow/sdk/types/MoreTypesTest.java b/src/test/java/com/getaxonflow/sdk/types/MoreTypesTest.java
index 1a6af0f..8117667 100644
--- a/src/test/java/com/getaxonflow/sdk/types/MoreTypesTest.java
+++ b/src/test/java/com/getaxonflow/sdk/types/MoreTypesTest.java
@@ -1640,6 +1640,39 @@ void shouldHaveToString() {
assertThat(request.toString()).contains("MCPCheckInputRequest");
assertThat(request.toString()).contains("postgres");
}
+
+ @Test
+ @DisplayName("should carry connector type and tool as separate fields, not concatenated")
+ void shouldCarryConnectorTypeAndToolSeparately() {
+ MCPCheckInputRequest request =
+ new MCPCheckInputRequest(
+ "myserver", "myserver.mytool({})", Map.of("timeout", 30), "execute", null, "mytool");
+
+ assertThat(request.getConnectorType()).isEqualTo("myserver");
+ assertThat(request.getTool()).isEqualTo("mytool");
+ }
+
+ @Test
+ @DisplayName("should default tool to null and omit it from JSON when not supplied")
+ void shouldDefaultToolToNullAndOmitFromJson() throws Exception {
+ MCPCheckInputRequest request = new MCPCheckInputRequest("postgres", "SELECT 1");
+
+ assertThat(request.getTool()).isNull();
+ String json = objectMapper.writeValueAsString(request);
+ assertThat(json).doesNotContain("\"tool\"");
+ }
+
+ @Test
+ @DisplayName("should serialize tool field to JSON when present")
+ void shouldSerializeToolToJson() throws Exception {
+ MCPCheckInputRequest request =
+ new MCPCheckInputRequest("myserver", "SELECT 1", null, "execute", null, "mytool");
+
+ String json = objectMapper.writeValueAsString(request);
+
+ assertThat(json).contains("\"connector_type\":\"myserver\"");
+ assertThat(json).contains("\"tool\":\"mytool\"");
+ }
}
@Nested
@@ -1810,6 +1843,41 @@ void shouldHaveToString() {
assertThat(request.toString()).contains("MCPCheckOutputRequest");
assertThat(request.toString()).contains("postgres");
}
+
+ @Test
+ @DisplayName("should carry connector type and tool as separate fields, not concatenated")
+ void shouldCarryConnectorTypeAndToolSeparately() {
+ List> data = List.of(Map.of("id", 1));
+ MCPCheckOutputRequest request =
+ new MCPCheckOutputRequest("myserver", data, "done", null, 1, "mytool");
+
+ assertThat(request.getConnectorType()).isEqualTo("myserver");
+ assertThat(request.getTool()).isEqualTo("mytool");
+ }
+
+ @Test
+ @DisplayName("should default tool to null and omit it from JSON when not supplied")
+ void shouldDefaultToolToNullAndOmitFromJson() throws Exception {
+ List> data = List.of(Map.of("id", 1));
+ MCPCheckOutputRequest request = new MCPCheckOutputRequest("postgres", data);
+
+ assertThat(request.getTool()).isNull();
+ String json = objectMapper.writeValueAsString(request);
+ assertThat(json).doesNotContain("\"tool\"");
+ }
+
+ @Test
+ @DisplayName("should serialize tool field to JSON when present")
+ void shouldSerializeToolToJson() throws Exception {
+ List> data = List.of(Map.of("id", 1));
+ MCPCheckOutputRequest request =
+ new MCPCheckOutputRequest("myserver", data, null, null, 0, "mytool");
+
+ String json = objectMapper.writeValueAsString(request);
+
+ assertThat(json).contains("\"connector_type\":\"myserver\"");
+ assertThat(json).contains("\"tool\":\"mytool\"");
+ }
}
@Nested
diff --git a/tests/fixtures/wire-shape-baseline.json b/tests/fixtures/wire-shape-baseline.json
index 70e0417..d09fe4c 100644
--- a/tests/fixtures/wire-shape-baseline.json
+++ b/tests/fixtures/wire-shape-baseline.json
@@ -373,7 +373,8 @@
},
"MCPCheckInputRequest": {
"sdk_only": [
- "content_type"
+ "content_type",
+ "tool"
],
"spec_only": [
"client_id",
@@ -392,7 +393,9 @@
"spec_only": []
},
"MCPCheckOutputRequest": {
- "sdk_only": [],
+ "sdk_only": [
+ "tool"
+ ],
"spec_only": [
"client_id",
"tenant_id",