# This is a combination of 2 commits.

# This is the 1st commit message:

feat: Add output schema support to MCP

Author: bigdevlarry

src/Capability/Registry/ToolReference.php

@@ -131,7 +131,23 @@ public function extractStructuredContent(mixed $toolExecutionResult): ?array
             return ['result' => $this->normalizeValue($toolExecutionResult)];
         }
 
-        if (isset($outputSchema['properties']) || isset($outputSchema['additionalProperties'])) {
+        if (isset($outputSchema['additionalProperties'])) {
+            if (\is_array($toolExecutionResult)) {
+                // Check if it's a numeric array (list)
+                if (array_is_list($toolExecutionResult)) {
+                    // Wrap list in "object" schema
+                    return ['items' => $toolExecutionResult];
+                }
+
+                return $toolExecutionResult;
+            }
+
+            if (\is_object($toolExecutionResult) && !($toolExecutionResult instanceof Content)) {
+                return $this->normalizeValue($toolExecutionResult);
+            }
+        }
+
+        if (isset($outputSchema['properties'])) {
             if (\is_array($toolExecutionResult)) {
                 return $toolExecutionResult;
             }

tests/Inspector/Http/snapshots/HttpCombinedRegistrationTest-tools_call-discovered_status_check.json

@@ -5,5 +5,8 @@
       "text": "System status: OK (discovered)"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "result": "System status: OK (discovered)"
+  }
 }

tests/Inspector/Http/snapshots/HttpCombinedRegistrationTest-tools_list.json

@@ -22,6 +22,18 @@
       "inputSchema": {
         "type": "object",
         "properties": {}
+      },
+      "outputSchema": {
+        "type": "object",
+        "properties": {
+          "result": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "result"
+        ],
+        "description": "a status message"
       }
     }
   ]

tests/Inspector/Http/snapshots/HttpComplexToolSchemaTest-tools_call-schedule_event_all_day_reminder.json

@@ -5,5 +5,18 @@
       "text": "{\n    \"success\": true,\n    \"message\": \"Event \\\"Project Deadline\\\" scheduled successfully for \\\"2024-12-15\\\".\",\n    \"event_details\": {\n        \"title\": \"Project Deadline\",\n        \"date\": \"2024-12-15\",\n        \"type\": \"reminder\",\n        \"time\": \"All day\",\n        \"priority\": \"Normal\",\n        \"attendees\": [],\n        \"invites_will_be_sent\": false\n    }\n}"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "success": true,
+    "message": "Event \"Project Deadline\" scheduled successfully for \"2024-12-15\".",
+    "event_details": {
+      "title": "Project Deadline",
+      "date": "2024-12-15",
+      "type": "reminder",
+      "time": "All day",
+      "priority": "Normal",
+      "attendees": [],
+      "invites_will_be_sent": false
+    }
+  }
 }

tests/Inspector/Http/snapshots/HttpComplexToolSchemaTest-tools_call-schedule_event_high_priority.json

@@ -5,5 +5,20 @@
       "text": "{\n    \"success\": true,\n    \"message\": \"Event \\\"Client Call\\\" scheduled successfully for \\\"2024-12-02\\\".\",\n    \"event_details\": {\n        \"title\": \"Client Call\",\n        \"date\": \"2024-12-02\",\n        \"type\": \"call\",\n        \"time\": \"14:30\",\n        \"priority\": \"Normal\",\n        \"attendees\": [\n            \"[email protected]\"\n        ],\n        \"invites_will_be_sent\": false\n    }\n}"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "success": true,
+    "message": "Event \"Client Call\" scheduled successfully for \"2024-12-02\".",
+    "event_details": {
+      "title": "Client Call",
+      "date": "2024-12-02",
+      "type": "call",
+      "time": "14:30",
+      "priority": "Normal",
+      "attendees": [
+        "[email protected]"
+      ],
+      "invites_will_be_sent": false
+    }
+  }
 }

tests/Inspector/Http/snapshots/HttpComplexToolSchemaTest-tools_call-schedule_event_low_priority.json

@@ -5,5 +5,20 @@
       "text": "{\n    \"success\": true,\n    \"message\": \"Event \\\"Office Party\\\" scheduled successfully for \\\"2024-12-20\\\".\",\n    \"event_details\": {\n        \"title\": \"Office Party\",\n        \"date\": \"2024-12-20\",\n        \"type\": \"other\",\n        \"time\": \"18:00\",\n        \"priority\": \"Normal\",\n        \"attendees\": [\n            \"[email protected]\"\n        ],\n        \"invites_will_be_sent\": true\n    }\n}"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "success": true,
+    "message": "Event \"Office Party\" scheduled successfully for \"2024-12-20\".",
+    "event_details": {
+      "title": "Office Party",
+      "date": "2024-12-20",
+      "type": "other",
+      "time": "18:00",
+      "priority": "Normal",
+      "attendees": [
+        "[email protected]"
+      ],
+      "invites_will_be_sent": true
+    }
+  }
 }

tests/Inspector/Http/snapshots/HttpComplexToolSchemaTest-tools_call-schedule_event_meeting_with_time.json

@@ -5,5 +5,21 @@
       "text": "{\n    \"success\": true,\n    \"message\": \"Event \\\"Team Standup\\\" scheduled successfully for \\\"2024-12-01\\\".\",\n    \"event_details\": {\n        \"title\": \"Team Standup\",\n        \"date\": \"2024-12-01\",\n        \"type\": \"meeting\",\n        \"time\": \"09:00\",\n        \"priority\": \"Normal\",\n        \"attendees\": [\n            \"[email protected]\",\n            \"[email protected]\"\n        ],\n        \"invites_will_be_sent\": true\n    }\n}"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "success": true,
+    "message": "Event \"Team Standup\" scheduled successfully for \"2024-12-01\".",
+    "event_details": {
+      "title": "Team Standup",
+      "date": "2024-12-01",
+      "type": "meeting",
+      "time": "09:00",
+      "priority": "Normal",
+      "attendees": [
+        "[email protected]",
+        "[email protected]"
+      ],
+      "invites_will_be_sent": true
+    }
+  }
 }

tests/Inspector/Http/snapshots/HttpComplexToolSchemaTest-tools_list.json

@@ -61,6 +61,11 @@
           "date",
           "type"
         ]
+      },
+      "outputSchema": {
+        "type": "object",
+        "additionalProperties": true,
+        "description": "confirmation of the scheduled event"
       }
     }
   ]

tests/Inspector/Http/snapshots/HttpDiscoveryUserProfileTest-tools_call-send_welcome.json

@@ -5,5 +5,9 @@
       "text": "{\n    \"success\": true,\n    \"message_sent\": \"Welcome, Alice! Welcome to our platform!\"\n}"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "success": true,
+    "message_sent": "Welcome, Alice! Welcome to our platform!"
+  }
 }

tests/Inspector/Http/snapshots/HttpDiscoveryUserProfileTest-tools_call-test_tool_without_params.json

@@ -5,5 +5,9 @@
       "text": "{\n    \"success\": true,\n    \"message\": \"Test tool without params\"\n}"
     }
   ],
-  "isError": false
+  "isError": false,
+  "structuredContent": {
+    "success": true,
+    "message": "Test tool without params"
+  }
 }