[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.
This commit is contained in:
Nariman Gardi 2026-07-06 01:09:45 +03:00 • committed by GitHub
commit 00a568e8d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 111 additions and 4 deletions

View file

@ -12,6 +12,7 @@
namespace Mcp\Server\Handler\Request;
use Mcp\Capability\Completion\ProviderInterface;
use Mcp\Capability\Registry\ResourceTemplateReference;
use Mcp\Capability\RegistryInterface;
use Mcp\Exception\PromptNotFoundException;
use Mcp\Exception\ResourceNotFoundException;
@ -56,12 +57,11 @@ final class CompletionCompleteHandler implements RequestHandlerInterface
$value = $request->argument['value'] ?? '';
try {
$reference = match (true) {
$request->ref instanceof PromptReference => $this->registry->getPrompt($request->ref->name),
$request->ref instanceof ResourceReference => $this->registry->getResource($request->ref->uri),
$providers = match (true) {
$request->ref instanceof PromptReference => $this->registry->getPrompt($request->ref->name)->completionProviders,
$request->ref instanceof ResourceReference => $this->resourceCompletionProviders($request->ref->uri),
};
$providers = $reference->completionProviders;
$provider = $providers[$name] ?? null;
if (null === $provider) {
return new Response($request->getId(), new CompletionCompleteResult([]));
@ -90,4 +90,14 @@ final class CompletionCompleteHandler implements RequestHandlerInterface
return Error::forInternalError('Error while handling completion request', $request->getId());
}
}
/**
* @return array<string, class-string|object>
*/
private function resourceCompletionProviders(string $uri): array
{
$reference = $this->registry->getResource($uri);
return $reference instanceof ResourceTemplateReference ? $reference->completionProviders : [];
}
}

View file

@ -0,0 +1,97 @@
<?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\Server\Handler\Request;
use Mcp\Capability\Registry\ResourceReference;
use Mcp\Capability\Registry\ResourceTemplateReference;
use Mcp\Capability\RegistryInterface;
use Mcp\Schema\JsonRpc\Response;
use Mcp\Schema\Request\CompletionCompleteRequest;
use Mcp\Schema\ResourceTemplate;
use Mcp\Schema\Result\CompletionCompleteResult;
use Mcp\Server\Handler\Request\CompletionCompleteHandler;
use Mcp\Server\Session\SessionInterface;
use Mcp\Tests\Unit\Capability\Attribute\CompletionProviderFixture;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
class CompletionCompleteHandlerTest extends TestCase
{
private CompletionCompleteHandler $handler;
private RegistryInterface&MockObject $registry;
private SessionInterface&MockObject $session;
protected function setUp(): void
{
$this->registry = $this->createMock(RegistryInterface::class);
$this->session = $this->createMock(SessionInterface::class);
$this->handler = new CompletionCompleteHandler($this->registry);
}
public function testReturnsEmptyCompletionForResourceWithoutTemplate(): void
{
$uri = 'file://static/readme.txt';
$request = $this->createCompletionRequest($uri, ['name' => 'arg', 'value' => 'a']);
$this->registry
->expects($this->once())
->method('getResource')
->with($uri)
->willReturn($this->createMock(ResourceReference::class));
$response = $this->handler->handle($request, $this->session);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals($request->getId(), $response->id);
$this->assertEquals(new CompletionCompleteResult([]), $response->result);
}
public function testReturnsCompletionsForResourceTemplate(): void
{
$uri = 'file://users/alice';
$request = $this->createCompletionRequest($uri, ['name' => 'id', 'value' => 'al']);
$templateReference = new ResourceTemplateReference(
new ResourceTemplate('file://users/{id}', 'user'),
static fn () => null,
['id' => new CompletionProviderFixture()],
);
$this->registry
->expects($this->once())
->method('getResource')
->with($uri)
->willReturn($templateReference);
$response = $this->handler->handle($request, $this->session);
$this->assertInstanceOf(Response::class, $response);
$this->assertEquals(new CompletionCompleteResult(['alpha'], 1, false), $response->result);
}
/**
* @param array{ name: string, value: string } $argument
*/
private function createCompletionRequest(string $uri, array $argument): CompletionCompleteRequest
{
return CompletionCompleteRequest::fromArray([
'jsonrpc' => '2.0',
'method' => CompletionCompleteRequest::getMethod(),
'id' => 'test-completion-'.uniqid(),
'params' => [
'ref' => ['type' => 'ref/resource', 'uri' => $uri],
'argument' => $argument,
],
]);
}
}