Skip to content

Commit 00a568e

Browse files
authored
[Server] Fix completion/complete crash for plain ref/resource (#388)
A non-template resource resolves to a ResourceReference, which has no completionProviders property; only prompts and resource templates do. Read providers from those instead, returning an empty completion result when a resource has none.
1 parent 30e520a commit 00a568e

2 files changed

Lines changed: 111 additions & 4 deletions

File tree

src/Server/Handler/Request/CompletionCompleteHandler.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Mcp\Server\Handler\Request;
1313

1414
use Mcp\Capability\Completion\ProviderInterface;
15+
use Mcp\Capability\Registry\ResourceTemplateReference;
1516
use Mcp\Capability\RegistryInterface;
1617
use Mcp\Exception\PromptNotFoundException;
1718
use Mcp\Exception\ResourceNotFoundException;
@@ -56,12 +57,11 @@ public function handle(Request $request, SessionInterface $session): Response|Er
5657
$value = $request->argument['value'] ?? '';
5758

5859
try {
59-
$reference = match (true) {
60-
$request->ref instanceof PromptReference => $this->registry->getPrompt($request->ref->name),
61-
$request->ref instanceof ResourceReference => $this->registry->getResource($request->ref->uri),
60+
$providers = match (true) {
61+
$request->ref instanceof PromptReference => $this->registry->getPrompt($request->ref->name)->completionProviders,
62+
$request->ref instanceof ResourceReference => $this->resourceCompletionProviders($request->ref->uri),
6263
};
6364

64-
$providers = $reference->completionProviders;
6565
$provider = $providers[$name] ?? null;
6666
if (null === $provider) {
6767
return new Response($request->getId(), new CompletionCompleteResult([]));
@@ -90,4 +90,14 @@ public function handle(Request $request, SessionInterface $session): Response|Er
9090
return Error::forInternalError('Error while handling completion request', $request->getId());
9191
}
9292
}
93+
94+
/**
95+
* @return array<string, class-string|object>
96+
*/
97+
private function resourceCompletionProviders(string $uri): array
98+
{
99+
$reference = $this->registry->getResource($uri);
100+
101+
return $reference instanceof ResourceTemplateReference ? $reference->completionProviders : [];
102+
}
93103
}
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the official PHP MCP SDK.
5+
*
6+
* A collaboration between Symfony and the PHP Foundation.
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Mcp\Tests\Unit\Server\Handler\Request;
13+
14+
use Mcp\Capability\Registry\ResourceReference;
15+
use Mcp\Capability\Registry\ResourceTemplateReference;
16+
use Mcp\Capability\RegistryInterface;
17+
use Mcp\Schema\JsonRpc\Response;
18+
use Mcp\Schema\Request\CompletionCompleteRequest;
19+
use Mcp\Schema\ResourceTemplate;
20+
use Mcp\Schema\Result\CompletionCompleteResult;
21+
use Mcp\Server\Handler\Request\CompletionCompleteHandler;
22+
use Mcp\Server\Session\SessionInterface;
23+
use Mcp\Tests\Unit\Capability\Attribute\CompletionProviderFixture;
24+
use PHPUnit\Framework\MockObject\MockObject;
25+
use PHPUnit\Framework\TestCase;
26+
27+
class CompletionCompleteHandlerTest extends TestCase
28+
{
29+
private CompletionCompleteHandler $handler;
30+
private RegistryInterface&MockObject $registry;
31+
private SessionInterface&MockObject $session;
32+
33+
protected function setUp(): void
34+
{
35+
$this->registry = $this->createMock(RegistryInterface::class);
36+
$this->session = $this->createMock(SessionInterface::class);
37+
38+
$this->handler = new CompletionCompleteHandler($this->registry);
39+
}
40+
41+
public function testReturnsEmptyCompletionForResourceWithoutTemplate(): void
42+
{
43+
$uri = 'file://static/readme.txt';
44+
$request = $this->createCompletionRequest($uri, ['name' => 'arg', 'value' => 'a']);
45+
46+
$this->registry
47+
->expects($this->once())
48+
->method('getResource')
49+
->with($uri)
50+
->willReturn($this->createMock(ResourceReference::class));
51+
52+
$response = $this->handler->handle($request, $this->session);
53+
54+
$this->assertInstanceOf(Response::class, $response);
55+
$this->assertEquals($request->getId(), $response->id);
56+
$this->assertEquals(new CompletionCompleteResult([]), $response->result);
57+
}
58+
59+
public function testReturnsCompletionsForResourceTemplate(): void
60+
{
61+
$uri = 'file://users/alice';
62+
$request = $this->createCompletionRequest($uri, ['name' => 'id', 'value' => 'al']);
63+
64+
$templateReference = new ResourceTemplateReference(
65+
new ResourceTemplate('file://users/{id}', 'user'),
66+
static fn () => null,
67+
['id' => new CompletionProviderFixture()],
68+
);
69+
70+
$this->registry
71+
->expects($this->once())
72+
->method('getResource')
73+
->with($uri)
74+
->willReturn($templateReference);
75+
76+
$response = $this->handler->handle($request, $this->session);
77+
78+
$this->assertInstanceOf(Response::class, $response);
79+
$this->assertEquals(new CompletionCompleteResult(['alpha'], 1, false), $response->result);
80+
}
81+
82+
/**
83+
* @param array{ name: string, value: string } $argument
84+
*/
85+
private function createCompletionRequest(string $uri, array $argument): CompletionCompleteRequest
86+
{
87+
return CompletionCompleteRequest::fromArray([
88+
'jsonrpc' => '2.0',
89+
'method' => CompletionCompleteRequest::getMethod(),
90+
'id' => 'test-completion-'.uniqid(),
91+
'params' => [
92+
'ref' => ['type' => 'ref/resource', 'uri' => $uri],
93+
'argument' => $argument,
94+
],
95+
]);
96+
}
97+
}

0 commit comments

Comments
 (0)