* Add resource_link content block The spec's `resource_link` content type (protocol revision 2025-06-18, still present in 2025-11-25) had no corresponding schema class: it lets a tool result or prompt message reference a resource by URI/name without embedding its full contents, the way `EmbeddedResource` does. Without it, tools returning many or large resource references (e.g. search results over a DAM) are stuck smuggling URIs through text/structured content. Add `Mcp\Schema\Content\ResourceLink`, mirroring the spec's `Resource` shape (uri, name, title, description, mimeType, annotations, size, icons, _meta) with a fixed `type: "resource_link"`, following the conventions of the sibling `EmbeddedResource`/`ResourceDefinition` classes. Register it everywhere `resource` content blocks are (de)serialized by type per the spec's `ContentBlock` union: - `CallToolResult::fromArray()` - `PromptMessage` (constructor type, `fromArray()`, phpstan types) - `PromptResultFormatter` (typed-array and direct-instance paths) `SamplingMessage`/`CreateSamplingMessageResult` are intentionally left unchanged: the spec's `SamplingMessageContentBlock` does not include `ResourceLink`. Fixes #399 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Add resource_link example coverage to discovery-userprofile Add a lookup_user tool to the discovery-userprofile example: given a userId, it returns a short text summary plus a resource_link pointing at the existing user://{userId}/profile resource template, instead of embedding the profile. This mirrors the PR's motivating use case (a tool referencing many/large resources by URI rather than inlining them) and exercises resource_link through the example's own inspector snapshot tests (tools_call-lookup_user[_not_found], tools_list). Wiring this up surfaced a real bug: ToolReference::extractStructuredContent() passed any raw array return value straight through as structuredContent, even when it held Content instances (e.g. the TextContent/ResourceLink pair above). That serializes to a JSON list, which fails the spec's requirement that structuredContent be an object - the inspector's MCP client rejected the tool call outright until fixed. Skip structuredContent extraction whenever the raw result contains a Content item, since those are already represented in `content` and were never meant to double as structured data. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Alex Rothberg <51059+cancan101@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
157 lines
5.4 KiB
PHP
157 lines
5.4 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of the official PHP MCP SDK.
|
|
*
|
|
* A collaboration between Symfony and the PHP Foundation.
|
|
*
|
|
* For the full copyright and license information, please view the LICENSE
|
|
* file that was distributed with this source code.
|
|
*/
|
|
|
|
namespace Mcp\Schema\Result;
|
|
|
|
use Mcp\Exception\InvalidArgumentException;
|
|
use Mcp\Schema\Content\AudioContent;
|
|
use Mcp\Schema\Content\Content;
|
|
use Mcp\Schema\Content\EmbeddedResource;
|
|
use Mcp\Schema\Content\ImageContent;
|
|
use Mcp\Schema\Content\ResourceLink;
|
|
use Mcp\Schema\Content\TextContent;
|
|
use Mcp\Schema\JsonRpc\ResultInterface;
|
|
|
|
/**
|
|
* The server's response to a tool call.
|
|
*
|
|
* Any errors that originate from the tool SHOULD be reported inside the result
|
|
* object, with `isError` set to true, _not_ as an MCP protocol-level error
|
|
* response. Otherwise, the LLM would not be able to see that an error occurred
|
|
* and self-correct.
|
|
*
|
|
* However, any errors in _finding_ the tool, an error indicating that the
|
|
* server does not support tool calls, or any other exceptional conditions,
|
|
* should be reported as an MCP error response.
|
|
*
|
|
* @author Kyrian Obikwelu <koshnawaza@gmail.com>
|
|
*/
|
|
class CallToolResult implements ResultInterface
|
|
{
|
|
/**
|
|
* Create a new CallToolResult.
|
|
*
|
|
* @param Content[] $content The content of the tool result
|
|
* @param bool $isError Whether the tool execution resulted in an error. If not set, this is assumed to be false (the call was successful).
|
|
* @param mixed[] $structuredContent JSON content for `structuredContent`
|
|
* @param array<string, mixed>|null $meta Optional metadata
|
|
*/
|
|
public function __construct(
|
|
public readonly array $content,
|
|
public readonly bool $isError = false,
|
|
public readonly ?array $structuredContent = null,
|
|
public readonly ?array $meta = null,
|
|
) {
|
|
foreach ($this->content as $item) {
|
|
if (!$item instanceof Content) {
|
|
throw new InvalidArgumentException('Content must be an array of Content objects.');
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Create a new CallToolResult with success status.
|
|
*
|
|
* @param Content[] $content The content of the tool result
|
|
* @param array<string, mixed>|null $meta Optional metadata
|
|
*/
|
|
public static function success(array $content, ?array $meta = null): self
|
|
{
|
|
return new self($content, false, null, $meta);
|
|
}
|
|
|
|
/**
|
|
* Create a new CallToolResult with error status.
|
|
*
|
|
* @param Content[] $content The content of the tool result
|
|
* @param array<string, mixed>|null $meta Optional metadata
|
|
*/
|
|
public static function error(array $content, ?array $meta = null): self
|
|
{
|
|
return new self($content, true, null, $meta);
|
|
}
|
|
|
|
/**
|
|
* @param array{
|
|
* content: array<mixed>,
|
|
* isError?: bool,
|
|
* _meta?: array<string, mixed>,
|
|
* structuredContent?: array<string, mixed>
|
|
* } $data
|
|
*/
|
|
public static function fromArray(array $data): self
|
|
{
|
|
if (!isset($data['content']) || !\is_array($data['content'])) {
|
|
throw new InvalidArgumentException('Missing or invalid "content" array in CallToolResult data.');
|
|
}
|
|
|
|
$contents = [];
|
|
|
|
foreach ($data['content'] as $item) {
|
|
$type = \is_array($item) ? $item['type'] ?? null : null;
|
|
if (!\is_string($type)) {
|
|
throw new InvalidArgumentException('Missing or invalid content "type" in CallToolResult data.');
|
|
}
|
|
|
|
$contents[] = match ($type) {
|
|
'text' => TextContent::fromArray($item),
|
|
'image' => ImageContent::fromArray($item),
|
|
'audio' => AudioContent::fromArray($item),
|
|
'resource' => EmbeddedResource::fromArray($item),
|
|
'resource_link' => ResourceLink::fromArray($item),
|
|
default => throw new InvalidArgumentException(\sprintf('Invalid content type in CallToolResult data: "%s".', $type)),
|
|
};
|
|
}
|
|
|
|
if (isset($data['isError']) && !\is_bool($data['isError'])) {
|
|
throw new InvalidArgumentException('Invalid "isError" in CallToolResult data.');
|
|
}
|
|
if (isset($data['structuredContent']) && !\is_array($data['structuredContent'])) {
|
|
throw new InvalidArgumentException('Invalid "structuredContent" in CallToolResult data.');
|
|
}
|
|
if (isset($data['_meta']) && !\is_array($data['_meta'])) {
|
|
throw new InvalidArgumentException('Invalid "_meta" in CallToolResult data.');
|
|
}
|
|
|
|
return new self(
|
|
$contents,
|
|
$data['isError'] ?? false,
|
|
$data['structuredContent'] ?? null,
|
|
$data['_meta'] ?? null
|
|
);
|
|
}
|
|
|
|
/**
|
|
* @return array{
|
|
* content: array<mixed>,
|
|
* isError: bool,
|
|
* structuredContent?: array<mixed>,
|
|
* _meta?: array<string, mixed>,
|
|
* }
|
|
*/
|
|
public function jsonSerialize(): array
|
|
{
|
|
$result = [
|
|
'content' => $this->content,
|
|
'isError' => $this->isError,
|
|
];
|
|
|
|
if ($this->structuredContent) {
|
|
$result['structuredContent'] = $this->structuredContent;
|
|
}
|
|
|
|
if ($this->meta) {
|
|
$result['_meta'] = $this->meta;
|
|
}
|
|
|
|
return $result;
|
|
}
|
|
}
|