fix: add policyName field to PolicyMatchInfo, fix copyright year, update CHANGELOG

Author: saurabhjain1592

CHANGELOG.md

@@ -9,20 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- **MCP Query and Execute methods**: New methods for MCP connector operations with policy enforcement
-  - `mcpQuery(MCPQueryRequest)` - Execute SQL query through MCP connector with policy enforcement
-  - `mcpExecute(MCPExecuteRequest)` - Execute non-query SQL statement through MCP connector
-  - Returns `ConnectorResponse` with `isRedacted()`, `getRedactedFields()`, and `getPolicyInfo()` methods
+- **MCP Policy Enforcement Response Fields**: `mcpQuery()` and `mcpExecute()` now return policy enforcement metadata
+  - `isRedacted()` - Whether any fields were redacted by PII policies
+  - `getRedactedFields()` - JSON paths of redacted fields (e.g., `rows[0].ssn`)
+  - `getPolicyInfo()` - Full policy evaluation metadata
 
-- **PolicyInfo types**: New types for policy enforcement metadata in responses
-  - `PolicyInfo` - Contains `getPoliciesEvaluated()`, `isBlocked()`, `getBlockReason()`, `getRedactionsApplied()`, `getProcessingTimeMs()`, `getMatchedPolicies()`
+- **PolicyInfo types**: New types for policy enforcement metadata
+  - `ConnectorPolicyInfo` - Contains `getPoliciesEvaluated()`, `isBlocked()`, `getBlockReason()`, `getRedactionsApplied()`, `getProcessingTimeMs()`, `getMatchedPolicies()`
   - `PolicyMatchInfo` - Details of matched policies including `getPolicyId()`, `getPolicyName()`, `getCategory()`, `getSeverity()`, `getAction()`
 
-- **ConnectorResponse fields**: New fields for redaction information
-  - `isRedacted()` - Whether any fields were redacted
-  - `getRedactedFields()` - JSON paths of redacted fields (e.g., `rows[0].ssn`)
-  - `getPolicyInfo()` - Policy enforcement metadata
-
 ---
 
 ## [2.2.0] - 2026-01-08

src/main/java/com/getaxonflow/sdk/AxonFlow.java

@@ -909,7 +909,10 @@ public ConnectorResponse queryConnector(ConnectorQuery query) {
                     clientResponse.getError(),
                     query.getConnectorId(),
                     query.getOperation(),
-                    null  // processingTime not available from ClientResponse
+                    null,  // processingTime not available from ClientResponse
+                    false, // redacted - not available from this endpoint
+                    null,  // redactedFields - not available from this endpoint
+                    null   // policyInfo - not available from this endpoint
                 );
 
                 if (!result.isSuccess()) {
@@ -935,6 +938,117 @@ public CompletableFuture<ConnectorResponse> queryConnectorAsync(ConnectorQuery q
         return CompletableFuture.supplyAsync(() -> queryConnector(query), asyncExecutor);
     }
 
+    /**
+     * Executes a query directly against the MCP connector endpoint.
+     *
+     * <p>This method calls the agent's /mcp/resources/query endpoint which provides:
+     * <ul>
+     *   <li>Request-phase policy evaluation (SQLi blocking, PII blocking)</li>
+     *   <li>Response-phase policy evaluation (PII redaction)</li>
+     *   <li>PolicyInfo metadata in responses</li>
+     * </ul>
+     *
+     * <p>Example usage:
+     * <pre>
+     * ConnectorResponse response = axonflow.mcpQuery("postgres", "SELECT * FROM customers LIMIT 10");
+     * if (response.isRedacted()) {
+     *     System.out.println("Fields redacted: " + response.getRedactedFields());
+     * }
+     * System.out.println("Policies evaluated: " + response.getPolicyInfo().getPoliciesEvaluated());
+     * </pre>
+     *
+     * @param connector name of the MCP connector (e.g., "postgres")
+     * @param statement SQL statement or query to execute
+     * @return ConnectorResponse with data, redaction info, and policy_info
+     * @throws ConnectorException if the request is blocked by policy or fails
+     */
+    public ConnectorResponse mcpQuery(String connector, String statement) {
+        return mcpQuery(connector, statement, null);
+    }
+
+    /**
+     * Executes a query directly against the MCP connector endpoint with options.
+     *
+     * @param connector name of the MCP connector (e.g., "postgres")
+     * @param statement SQL statement or query to execute
+     * @param options optional additional options for the query
+     * @return ConnectorResponse with data, redaction info, and policy_info
+     * @throws ConnectorException if the request is blocked by policy or fails
+     */
+    public ConnectorResponse mcpQuery(String connector, String statement, Map<String, Object> options) {
+        Objects.requireNonNull(connector, "connector cannot be null");
+        Objects.requireNonNull(statement, "statement cannot be null");
+
+        return retryExecutor.execute(() -> {
+            Map<String, Object> body = new HashMap<>();
+            body.put("connector", connector);
+            body.put("statement", statement);
+            if (options != null && !options.isEmpty()) {
+                body.put("options", options);
+            }
+
+            Request httpRequest = buildRequest("POST", "/mcp/resources/query", body);
+            try (Response response = httpClient.newCall(httpRequest).execute()) {
+                // Parse the response body
+                ResponseBody responseBody = response.body();
+                if (responseBody == null) {
+                    throw new ConnectorException("Empty response from MCP query", connector, "mcpQuery");
+                }
+                String responseJson = responseBody.string();
+
+                // Handle policy blocks (403 responses)
+                if (!response.isSuccessful()) {
+                    try {
+                        Map<String, Object> errorData = objectMapper.readValue(responseJson,
+                            new com.fasterxml.jackson.core.type.TypeReference<Map<String, Object>>() {});
+                        String errorMsg = errorData.get("error") != null ?
+                            errorData.get("error").toString() :
+                            "MCP query failed: " + response.code();
+                        throw new ConnectorException(errorMsg, connector, "mcpQuery");
+                    } catch (JsonProcessingException e) {
+                        throw new ConnectorException("MCP query failed: " + response.code(), connector, "mcpQuery");
+                    }
+                }
+
+                return objectMapper.readValue(responseJson, ConnectorResponse.class);
+            }
+        }, "mcpQuery");
+    }
+
+    /**
+     * Asynchronously executes a query against the MCP connector endpoint.
+     *
+     * @param connector name of the MCP connector
+     * @param statement SQL statement to execute
+     * @return a future containing the response
+     */
+    public CompletableFuture<ConnectorResponse> mcpQueryAsync(String connector, String statement) {
+        return CompletableFuture.supplyAsync(() -> mcpQuery(connector, statement), asyncExecutor);
+    }
+
+    /**
+     * Asynchronously executes a query against the MCP connector endpoint with options.
+     *
+     * @param connector name of the MCP connector
+     * @param statement SQL statement to execute
+     * @param options optional additional options
+     * @return a future containing the response
+     */
+    public CompletableFuture<ConnectorResponse> mcpQueryAsync(String connector, String statement, Map<String, Object> options) {
+        return CompletableFuture.supplyAsync(() -> mcpQuery(connector, statement, options), asyncExecutor);
+    }
+
+    /**
+     * Executes a statement against an MCP connector (alias for mcpQuery).
+     *
+     * @param connector name of the MCP connector
+     * @param statement SQL statement to execute
+     * @return ConnectorResponse with data, redaction info, and policy_info
+     */
+    public ConnectorResponse mcpExecute(String connector, String statement) {
+        return mcpQuery(connector, statement);
+    }
+
     // ========================================================================
     // Policy CRUD - Static Policies
     // ========================================================================

src/main/java/com/getaxonflow/sdk/types/ConnectorPolicyInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 AxonFlow
+ * Copyright 2026 AxonFlow
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/getaxonflow/sdk/types/PolicyMatchInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2025 AxonFlow
+ * Copyright 2026 AxonFlow
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,9 @@ public final class PolicyMatchInfo {
     @JsonProperty("policy_id")
     private final String policyId;
 
+    @JsonProperty("policy_name")
+    private final String policyName;
+
     @JsonProperty("category")
     private final String category;
 
@@ -40,10 +43,12 @@ public final class PolicyMatchInfo {
 
     public PolicyMatchInfo(
             @JsonProperty("policy_id") String policyId,
+            @JsonProperty("policy_name") String policyName,
             @JsonProperty("category") String category,
             @JsonProperty("severity") String severity,
             @JsonProperty("action") String action) {
         this.policyId = policyId;
+        this.policyName = policyName;
         this.category = category;
         this.severity = severity;
         this.action = action;
@@ -53,6 +58,10 @@ public String getPolicyId() {
         return policyId;
     }
 
+    public String getPolicyName() {
+        return policyName;
+    }
+
     public String getCategory() {
         return category;
     }
@@ -71,20 +80,22 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) return false;
         PolicyMatchInfo that = (PolicyMatchInfo) o;
         return Objects.equals(policyId, that.policyId) &&
+               Objects.equals(policyName, that.policyName) &&
                Objects.equals(category, that.category) &&
                Objects.equals(severity, that.severity) &&
                Objects.equals(action, that.action);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(policyId, category, severity, action);
+        return Objects.hash(policyId, policyName, category, severity, action);
     }
 
     @Override
     public String toString() {
         return "PolicyMatchInfo{" +
                "policyId='" + policyId + '\'' +
+               ", policyName='" + policyName + '\'' +
                ", category='" + category + '\'' +
                ", severity='" + severity + '\'' +
                ", action='" + action + '\'' +