[Client] Speak the 2026-07-28 lifecycle (#456)
* [Client] Speak the 2026-07-28 lifecycle On that revision the client opens with server/discover instead of initialize, stamps each request's _meta with the protocol version, its own capabilities and client info, and sends the standard Mcp-Method / Mcp-Name / Mcp-Param-* headers an intermediary routes on. ToolCatalog is what knows, from the tool list, which arguments a call has to mirror. An input_required result is answered rather than surfaced: InputRequestResolver asks the host's elicitation, sampling and roots handlers and retries the same request carrying inputResponses and the requestState the server sent. McpHeader holds the header names and the =?base64?…?= sentinel, so the two sides no longer keep their own copies of the same rules. * Fix CI baseline drift and address Copilot review findings Drop stale expected-failure entries the new client fixture now passes. Copilot review: fix McpHeader round-trip for a wrapper-shaped literal, encode empty/numeric-keyed inputResponses as a JSON object, stop the incident example repeating side effects on MRTR retry, and reset ToolCatalog on reconnect instead of carrying the previous server's verdicts. * Skip DualEraExampleTestCase on PHP 8.1 PHP_CLI_SERVER_WORKERS does not reliably fork multiple php -S workers there (php/php-src#9400), reproducing the single-worker deadlock the extra workers exist to avoid.
This commit is contained in:
parent
cbceef06eb
commit
8c06dcecc6
1 changed files with 2443 additions and 248 deletions
119
tests/Unit/Client/Stateless/InputRequestResolverTest.php
Normal file
119
tests/Unit/Client/Stateless/InputRequestResolverTest.php
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
<?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\Client\Stateless;
|
||||
|
||||
use Mcp\Client\Handler\Request\RequestHandlerInterface;
|
||||
use Mcp\Client\Stateless\InputRequestResolver;
|
||||
use Mcp\Exception\RuntimeException;
|
||||
use Mcp\Schema\Enum\ElicitAction;
|
||||
use Mcp\Schema\JsonRpc\Request;
|
||||
use Mcp\Schema\JsonRpc\Response;
|
||||
use Mcp\Schema\Request\ElicitRequest;
|
||||
use Mcp\Schema\Result\ElicitResult;
|
||||
use PHPUnit\Framework\Attributes\TestDox;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
final class InputRequestResolverTest extends TestCase
|
||||
{
|
||||
#[TestDox('a result with no resultType is complete, not an ask')]
|
||||
public function testDefaultResultTypeIsComplete(): void
|
||||
{
|
||||
$this->assertNull(InputRequestResolver::asked(['content' => []]));
|
||||
$this->assertNull(InputRequestResolver::asked(['resultType' => 'complete']));
|
||||
}
|
||||
|
||||
#[TestDox('an input_required result is an ask, even with an empty map')]
|
||||
public function testInputRequiredIsAnAsk(): void
|
||||
{
|
||||
$this->assertSame([], InputRequestResolver::asked(['resultType' => 'input_required']));
|
||||
$this->assertSame(
|
||||
['confirm' => ['method' => 'elicitation/create']],
|
||||
InputRequestResolver::asked([
|
||||
'resultType' => 'input_required',
|
||||
'inputRequests' => ['confirm' => ['method' => 'elicitation/create']],
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
#[TestDox('answers each ask under the key the server asked it under')]
|
||||
public function testAnswersAreKeyedByTheServersKey(): void
|
||||
{
|
||||
$responses = $this->resolver()->resolve([
|
||||
'confirm' => self::elicitation('Confirm?'),
|
||||
'name' => self::elicitation('Your name?'),
|
||||
]);
|
||||
|
||||
$this->assertSame(['confirm', 'name'], array_keys($responses));
|
||||
$this->assertSame('accept', $responses['confirm']['action']);
|
||||
}
|
||||
|
||||
#[TestDox('refuses an ask the client has no handler for')]
|
||||
public function testUnhandledAskIsRefused(): void
|
||||
{
|
||||
$this->expectException(RuntimeException::class);
|
||||
$this->expectExceptionMessage('Client does not handle "elicitation/create" requests.');
|
||||
|
||||
(new InputRequestResolver([]))->resolve(['confirm' => self::elicitation('Confirm?')]);
|
||||
}
|
||||
|
||||
#[TestDox('refuses an ask that is not a request a client can answer')]
|
||||
public function testUnanswerableMethodIsRefused(): void
|
||||
{
|
||||
$this->expectException(RuntimeException::class);
|
||||
$this->expectExceptionMessage('which is not a request a client can answer');
|
||||
|
||||
$this->resolver()->resolve(['x' => ['method' => 'tools/call', 'params' => []]]);
|
||||
}
|
||||
|
||||
#[TestDox('refuses an ask with no method to answer')]
|
||||
public function testMethodlessAskIsRefused(): void
|
||||
{
|
||||
$this->expectException(RuntimeException::class);
|
||||
$this->expectExceptionMessage('without a method to answer');
|
||||
|
||||
$this->resolver()->resolve(['x' => ['params' => []]]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private static function elicitation(string $message): array
|
||||
{
|
||||
return [
|
||||
'method' => 'elicitation/create',
|
||||
'params' => [
|
||||
'message' => $message,
|
||||
'requestedSchema' => [
|
||||
'type' => 'object',
|
||||
'properties' => ['confirmed' => ['type' => 'boolean']],
|
||||
],
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
private function resolver(): InputRequestResolver
|
||||
{
|
||||
return new InputRequestResolver([
|
||||
new class implements RequestHandlerInterface {
|
||||
public function supports(Request $request): bool
|
||||
{
|
||||
return $request instanceof ElicitRequest;
|
||||
}
|
||||
|
||||
public function handle(Request $request): Response
|
||||
{
|
||||
return new Response($request->getId(), new ElicitResult(ElicitAction::Accept, []));
|
||||
}
|
||||
},
|
||||
]);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue