* 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>
215 lines
7.5 KiB
PHP
215 lines
7.5 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\Tests\Unit\Capability\Formatter;
|
|
|
|
use Mcp\Capability\Formatter\PromptResultFormatter;
|
|
use Mcp\Exception\RuntimeException;
|
|
use Mcp\Schema\Content\AudioContent;
|
|
use Mcp\Schema\Content\EmbeddedResource;
|
|
use Mcp\Schema\Content\ImageContent;
|
|
use Mcp\Schema\Content\PromptMessage;
|
|
use Mcp\Schema\Content\ResourceLink;
|
|
use Mcp\Schema\Content\TextContent;
|
|
use Mcp\Schema\Enum\Role;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
class PromptResultFormatterTest extends TestCase
|
|
{
|
|
public function testFormatPromptMessage(): void
|
|
{
|
|
$message = new PromptMessage(Role::User, new TextContent('hello'));
|
|
$result = (new PromptResultFormatter())->format($message);
|
|
$this->assertCount(1, $result);
|
|
$this->assertSame($message, $result[0]);
|
|
}
|
|
|
|
public function testFormatPromptMessageWithResourceLinkContent(): void
|
|
{
|
|
$message = new PromptMessage(Role::User, new ResourceLink('file:///a.png', 'a.png'));
|
|
$result = (new PromptResultFormatter())->format($message);
|
|
$this->assertCount(1, $result);
|
|
$this->assertSame($message, $result[0]);
|
|
}
|
|
|
|
public function testFormatRoleContentArrayWithResourceLinkContent(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => ['type' => 'resource_link', 'uri' => 'file:///a.png', 'name' => 'a.png'],
|
|
],
|
|
]);
|
|
$this->assertCount(1, $result);
|
|
$this->assertSame(Role::User, $result[0]->role);
|
|
$this->assertInstanceOf(ResourceLink::class, $result[0]->content);
|
|
$this->assertSame('file:///a.png', $result[0]->content->uri);
|
|
$this->assertSame('a.png', $result[0]->content->name);
|
|
}
|
|
|
|
public function testFormatUserAssistantShorthand(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
'user' => 'Hello',
|
|
'assistant' => 'Hi there',
|
|
]);
|
|
$this->assertCount(2, $result);
|
|
$this->assertSame(Role::User, $result[0]->role);
|
|
$this->assertSame(Role::Assistant, $result[1]->role);
|
|
}
|
|
|
|
public function testFormatRoleContentArray(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
['role' => 'user', 'content' => 'Hello'],
|
|
]);
|
|
$this->assertCount(1, $result);
|
|
$this->assertSame(Role::User, $result[0]->role);
|
|
}
|
|
|
|
public function testFormatTypedTextContentPreservesAnnotations(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => [
|
|
'type' => 'text',
|
|
'text' => 'Hello',
|
|
'annotations' => ['audience' => ['user'], 'priority' => 0.5],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$content = $result[0]->content;
|
|
$this->assertInstanceOf(TextContent::class, $content);
|
|
$this->assertSame('Hello', $content->text);
|
|
$this->assertNotNull($content->annotations);
|
|
$this->assertSame([Role::User], $content->annotations->audience);
|
|
$this->assertSame(0.5, $content->annotations->priority);
|
|
}
|
|
|
|
public function testFormatTypedImageContentPreservesAnnotations(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => [
|
|
'type' => 'image',
|
|
'data' => base64_encode('binary'),
|
|
'mimeType' => 'image/png',
|
|
'annotations' => ['audience' => ['assistant']],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$content = $result[0]->content;
|
|
$this->assertInstanceOf(ImageContent::class, $content);
|
|
$this->assertSame('image/png', $content->mimeType);
|
|
$this->assertNotNull($content->annotations);
|
|
$this->assertSame([Role::Assistant], $content->annotations->audience);
|
|
}
|
|
|
|
public function testFormatTypedAudioContentPreservesAnnotations(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => [
|
|
'type' => 'audio',
|
|
'data' => base64_encode('binary'),
|
|
'mimeType' => 'audio/mpeg',
|
|
'annotations' => ['priority' => 1.0],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$content = $result[0]->content;
|
|
$this->assertInstanceOf(AudioContent::class, $content);
|
|
$this->assertNotNull($content->annotations);
|
|
$this->assertSame(1.0, $content->annotations->priority);
|
|
}
|
|
|
|
public function testFormatTypedResourceContentPreservesOptionalFields(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => [
|
|
'type' => 'resource',
|
|
'resource' => [
|
|
'uri' => 'file://data.json',
|
|
'mimeType' => 'application/json',
|
|
'text' => '{"key": "value"}',
|
|
'_meta' => ['origin' => 'test'],
|
|
],
|
|
'annotations' => ['audience' => ['user']],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$content = $result[0]->content;
|
|
$this->assertInstanceOf(EmbeddedResource::class, $content);
|
|
$this->assertSame('application/json', $content->resource->mimeType);
|
|
$this->assertSame(['origin' => 'test'], $content->resource->meta);
|
|
$this->assertNotNull($content->annotations);
|
|
$this->assertSame([Role::User], $content->annotations->audience);
|
|
}
|
|
|
|
public function testFormatTypedTextResourceContentDefaultsMimeType(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => [
|
|
'type' => 'resource',
|
|
'resource' => ['uri' => 'file://a.txt', 'text' => 'plain'],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$this->assertSame('text/plain', $result[0]->content->resource->mimeType);
|
|
}
|
|
|
|
public function testFormatTypedBlobResourceContentDefaultsMimeType(): void
|
|
{
|
|
$result = (new PromptResultFormatter())->format([
|
|
[
|
|
'role' => 'user',
|
|
'content' => [
|
|
'type' => 'resource',
|
|
'resource' => ['uri' => 'file://a.bin', 'blob' => base64_encode('binary')],
|
|
],
|
|
],
|
|
]);
|
|
|
|
$this->assertSame('application/octet-stream', $result[0]->content->resource->mimeType);
|
|
}
|
|
|
|
public function testFormatTypedContentRejectsInvalidDataWithIndexContext(): void
|
|
{
|
|
$this->expectException(RuntimeException::class);
|
|
$this->expectExceptionMessage("Invalid 'text' content at index 0");
|
|
|
|
(new PromptResultFormatter())->format([
|
|
['role' => 'user', 'content' => ['type' => 'text']],
|
|
]);
|
|
}
|
|
|
|
public function testFormatTypedContentRejectsUnknownType(): void
|
|
{
|
|
$this->expectException(RuntimeException::class);
|
|
$this->expectExceptionMessage("Invalid content type 'video' at index 0.");
|
|
|
|
(new PromptResultFormatter())->format([
|
|
['role' => 'user', 'content' => ['type' => 'video']],
|
|
]);
|
|
}
|
|
}
|