* [Schema][Server] Close the 2025-11-25 schema gaps and add the 2026-07-28 surface Ports the type definitions this SDK still misses outside of sampling tool use, which #409 and #420 already cover. Every addition is optional and defaults to current behaviour, so a connection negotiated on an older revision is unaffected. From 2025-11-25, elicitation gains modes. ElicitationMode splits `form` — build a form from the requested schema — from `url`, which sends the user out of band and returns only the accept/decline/cancel outcome. That is why requestedSchema becomes optional and `url` appears beside it. ClientCapabilities learns the matching sub-capabilities, where an `elicitation` naming no mode declares form, the only shape that existed before. Icon gains `theme` from the same revision, and Implementation gains the `title` BaseMetadata has carried since 2025-06-18. From 2026-07-28, schemas loosen where the revision loosens them: SEP-2106 drops the object-only restriction, so Tool::outputSchema may describe any JSON value and CallToolResult::structuredContent follows. The same revision defines three error codes (-32020 header mismatch, -32021 missing required client capability, -32022 unsupported protocol version). ProtocolVersionMiddleware switches to the last of them, so a rejected version carries the supported set as structured data the client can retry from rather than only as prose. * [Schema] Reject what the 2026-07-28 types cannot represent `Implementation::title` reached the typed constructor unchecked, so malformed wire data raised a TypeError instead of InvalidArgumentException. `ToolUseContent::input` accepted a list and serialized it as a JSON array, where the protocol requires an object. The empty array stays exempt: it is also an empty map and still emits `{}`. `ToolChoice` and `ElicitRequest` read their mode with isset(), which is false for an explicit null, so `{"mode": null}` silently became the default instead of being rejected. Both use array_key_exists() now, letting the existing type check refuse null. * [Client][Server] Advertise the implementation title through both builders `Implementation::title` could be parsed but never sent: neither `Client\Builder::setClientInfo()` nor `Server\Builder::setServerInfo()` accepted one, so every SDK user emitted null. Both gain a trailing optional `$title`. On the server it sits where the Implementation constructor already puts it, so existing positional calls keep their meaning; the client builder forwards it by name, leaving the icons and websiteUrl slots defaulted. * [Schema] Serialize every non-null structuredContent The object-only hydration guard was never that: `!is_array()` admitted `[1, 2, 3]` and `[]`, which serialize to JSON arrays, while rejecting the scalars 2026-07-28 permits. The truthiness emission gate was backwards in the same way — it dropped `[]`, `0`, `false` and `""`, yet emitted lists, strings and an empty stdClass. Hydration now accepts any JSON value, and `null` alone means absent, matching `ToolResultContent` which already carries this field that way. Which values a given revision permits is a question for version-aware serialization, which results cannot answer yet. * [Schema][Server] Make url elicitation reachable `ElicitRequest::forUrl()` built a request no SDK user could send: the only public gateway method always constructed form mode from an ElicitationSchema, and `request()` is private. `elicitUrl()` joins `elicit()`, and both funnel through one send path that hydrates the result with the request's own mode. Without that, a url-mode accept — contentless by design — threw, because ElicitResult requires content whenever the action is accept. The result carries no discriminator of its own, so the mode has to come from the request it answers. `supportsElicitationUrl()` reports whether the client named the mode, reusing the sub-capability reader the sampling checks already use. * [Schema] Add CHANGELOG entry for the 2026-07-28 surface * [Capability][Schema][Server] Carry the widened structuredContent end to end Review follow-up on the SEP-2106 widening, which stopped at the type. `ToolReference::extractStructuredContent()` returned `?array`, so a tool declaring a scalar `outputSchema` had its result dropped and logged as unsendable. It returns `mixed` now and keeps a scalar — but only from 2026-07-28 on, and only when the tool declared an outputSchema: without one the value is already carried in `content`, and advertising it twice is not an improvement. `CallToolHandler` only warned about list-shaped `structuredContent` on a self-built `CallToolResult`, so a scalar reached revisions that require an object unremarked. The check is on the shape now, not on the list case alone. `ElicitResult` retained a `content` the spec says is absent from url-mode results, leaving a malformed response indistinguishable from a valid one. `Tool::jsonSerialize()` emitted the empty root schema as `[]`, which is not a schema at all. Sub-schemas already had this treatment.
179 lines
4.6 KiB
PHP
179 lines
4.6 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\Client;
|
|
|
|
use Mcp\Client;
|
|
use Mcp\Client\Handler\Notification\NotificationHandlerInterface;
|
|
use Mcp\Client\Handler\Request\RequestHandlerInterface;
|
|
use Mcp\Schema\ClientCapabilities;
|
|
use Mcp\Schema\Enum\ProtocolVersion;
|
|
use Mcp\Schema\Implementation;
|
|
use Psr\Log\LoggerInterface;
|
|
use Psr\Log\NullLogger;
|
|
|
|
/**
|
|
* Fluent builder for creating Client instances.
|
|
*
|
|
* @author Kyrian Obikwelu <koshnawaza@gmail.com>
|
|
*/
|
|
final class Builder
|
|
{
|
|
private string $name = 'mcp-php-client';
|
|
private string $version = '1.0.0';
|
|
private ?string $description = null;
|
|
private ?string $title = null;
|
|
private ?ProtocolVersion $protocolVersion = null;
|
|
private ?ClientCapabilities $capabilities = null;
|
|
private int $initTimeout = 30;
|
|
private int $requestTimeout = 120;
|
|
private int $maxRetries = 3;
|
|
private ?LoggerInterface $logger = null;
|
|
|
|
/** @var NotificationHandlerInterface[] */
|
|
private array $notificationHandlers = [];
|
|
|
|
/** @var RequestHandlerInterface<mixed>[] */
|
|
private array $requestHandlers = [];
|
|
|
|
/**
|
|
* Set the client name and version.
|
|
*
|
|
* @param ?string $title Display name for UI and end-user contexts. Falls back to $name when absent.
|
|
*/
|
|
public function setClientInfo(string $name, string $version, ?string $description = null, ?string $title = null): self
|
|
{
|
|
$this->name = $name;
|
|
$this->version = $version;
|
|
$this->description = $description;
|
|
$this->title = $title;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Set the protocol version to use.
|
|
*/
|
|
public function setProtocolVersion(ProtocolVersion $protocolVersion): self
|
|
{
|
|
$this->protocolVersion = $protocolVersion;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Set client capabilities.
|
|
*/
|
|
public function setCapabilities(ClientCapabilities $capabilities): self
|
|
{
|
|
$this->capabilities = $capabilities;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Set initialization timeout in seconds.
|
|
*/
|
|
public function setInitTimeout(int $seconds): self
|
|
{
|
|
$this->initTimeout = $seconds;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Set request timeout in seconds.
|
|
*/
|
|
public function setRequestTimeout(int $seconds): self
|
|
{
|
|
$this->requestTimeout = $seconds;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Set the number of times a failed connection attempt is retried.
|
|
*
|
|
* Counts retries, not attempts: 3 means one initial attempt plus up to three
|
|
* retries. Pass 0 to fail on the first failure. Only applies to
|
|
* {@see Client::connect()}; individual requests are never retried.
|
|
*/
|
|
public function setMaxRetries(int $retries): self
|
|
{
|
|
$this->maxRetries = $retries;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Set the logger.
|
|
*/
|
|
public function setLogger(LoggerInterface $logger): self
|
|
{
|
|
$this->logger = $logger;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Add a notification handler for server notifications.
|
|
*/
|
|
public function addNotificationHandler(NotificationHandlerInterface $handler): self
|
|
{
|
|
$this->notificationHandlers[] = $handler;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Add a request handler for server requests (e.g., sampling).
|
|
*
|
|
* @param RequestHandlerInterface<mixed> $handler
|
|
*/
|
|
public function addRequestHandler(RequestHandlerInterface $handler): self
|
|
{
|
|
$this->requestHandlers[] = $handler;
|
|
|
|
return $this;
|
|
}
|
|
|
|
/**
|
|
* Build the client instance.
|
|
*/
|
|
public function build(): Client
|
|
{
|
|
$logger = $this->logger ?? new NullLogger();
|
|
|
|
$clientInfo = new Implementation(
|
|
$this->name,
|
|
$this->version,
|
|
$this->description,
|
|
title: $this->title,
|
|
);
|
|
|
|
$config = new Configuration(
|
|
clientInfo: $clientInfo,
|
|
capabilities: $this->capabilities ?? new ClientCapabilities(),
|
|
protocolVersion: $this->protocolVersion ?? ProtocolVersion::V2025_11_25,
|
|
initTimeout: $this->initTimeout,
|
|
requestTimeout: $this->requestTimeout,
|
|
maxRetries: $this->maxRetries,
|
|
);
|
|
|
|
$protocol = new Protocol(
|
|
requestHandlers: $this->requestHandlers,
|
|
notificationHandlers: $this->notificationHandlers,
|
|
logger: $logger,
|
|
);
|
|
|
|
return new Client($protocol, $config, $logger);
|
|
}
|
|
}
|