Remove ClientAwareInterface

Author: Nyholm

docs/client-communication.md

@@ -13,44 +13,21 @@ MCP supports various ways a server can communicate back to a server on top of th
 ## ClientGateway
 
 Every communication back to client is handled using the `Mcp\Server\ClientGateway` and its dedicated methods per
-operation. To use the `ClientGateway` in your code, there are two ways to do so:
+operation. To use the `ClientGateway` in your code, you need to use method argument injection for `RequestContext`.
 
-### 1. Method Argument Injection
-
-Every refernce of a MCP element, that translates to an actual method call, can just add an type-hinted argument for the
-`ClientGateway` and the SDK will take care to include the gateway in the arguments of the method call:
+Every reference of a MCP element, that translates to an actual method call, can just add an type-hinted argument for the
+`RequestContext` and the SDK will take care to include the gateway in the arguments of the method call:
 
 ```php
 use Mcp\Capability\Attribute\McpTool;
-use Mcp\Server\ClientGateway;
+use Mcp\Server\RequestContext;
 
 class MyService
 {
     #[McpTool('my_tool', 'My Tool Description')]
-    public function myTool(ClientGateway $client): string
-    {
-        $client->log(...);
-```
-
-### 2. Implementing `ClientAwareInterface`
-
-Whenever a service class of an MCP element implements the interface `Mcp\Server\ClientAwareInterface` the `setClient`
-method of that class will get called while handling the reference, and in combination with `Mcp\Server\ClientAwareTrait`
-this ends up with code like this:
-
-```php
-use Mcp\Capability\Attribute\McpTool;
-use Mcp\Server\ClientAwareInterface;
-use Mcp\Server\ClientAwareTrait;
-
-class MyService implements ClientAwareInterface
-{
-    use ClientAwareTrait;
-
-    #[McpTool('my_tool', 'My Tool Description')]
-    public function myTool(): string
+    public function myTool(RequestContext $context): string
     {
-        $this->log(...);
+        $context->getClientGateway()->log(...);
 ```
 
 ## Sampling

docs/examples.md

@@ -166,11 +166,10 @@ $server = Server::builder()
 
 **File**: `examples/client-communication/`
 
-**What it demostrates:**
-- Server initiated communcation back to the client
+**What it demonstrates:**
+- Server initiated communication back to the client
 - Logging, sampling, progress and notifications
-- Using `ClientGateway` in service class via `ClientAwareInterface` and corresponding trait
-- Using `ClientGateway` in tool method via method argument injection
+- Using `ClientGateway` in tool method via method argument injection of `RequestContext`
 
 ### Discovery User Profile
 

examples/client-communication/ClientAwareService.php

@@ -14,14 +14,11 @@
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\Enum\LoggingLevel;
-use Mcp\Server\ClientAwareInterface;
-use Mcp\Server\ClientAwareTrait;
+use Mcp\Server\RequestContext;
 use Psr\Log\LoggerInterface;
 
-final class ClientAwareService implements ClientAwareInterface
+final class ClientAwareService
 {
-    use ClientAwareTrait;
-
     public function __construct(
         private readonly LoggerInterface $logger,
     ) {
@@ -32,9 +29,10 @@ public function __construct(
      * @return array{incident: string, recommended_actions: string, model: string}
      */
     #[McpTool('coordinate_incident_response', 'Coordinate an incident response with logging, progress, and sampling.')]
-    public function coordinateIncident(string $incidentTitle): array
+    public function coordinateIncident(RequestContext $context, string $incidentTitle): array
     {
-        $this->log(LoggingLevel::Warning, \sprintf('Incident triage started: %s', $incidentTitle));
+        $clientGateway = $context->getClientGateway();
+        $clientGateway->log(LoggingLevel::Warning, \sprintf('Incident triage started: %s', $incidentTitle));
 
         $steps = [
             'Collecting telemetry',
@@ -45,7 +43,7 @@ public function coordinateIncident(string $incidentTitle): array
         foreach ($steps as $index => $step) {
             $progress = ($index + 1) / \count($steps);
 
-            $this->progress($progress, 1, $step);
+            $clientGateway->progress($progress, 1, $step);
 
             usleep(180_000); // Simulate work being done
         }
@@ -56,11 +54,11 @@ public function coordinateIncident(string $incidentTitle): array
             implode(', ', $steps)
         );
 
-        $result = $this->sample($prompt, 350, 90, ['temperature' => 0.5]);
+        $result = $clientGateway->sample($prompt, 350, 90, ['temperature' => 0.5]);
 
         $recommendation = $result->content instanceof TextContent ? trim((string) $result->content->text) : '';
 
-        $this->log(LoggingLevel::Info, \sprintf('Incident triage completed for %s', $incidentTitle));
+        $clientGateway->log(LoggingLevel::Info, \sprintf('Incident triage completed for %s', $incidentTitle));
 
         return [
             'incident' => $incidentTitle,

src/Capability/Registry/ReferenceHandler.php

@@ -13,7 +13,6 @@
 
 use Mcp\Exception\InvalidArgumentException;
 use Mcp\Exception\RegistryException;
-use Mcp\Server\ClientAwareInterface;
 use Mcp\Server\ClientGateway;
 use Mcp\Server\RequestContext;
 use Mcp\Server\Session\SessionInterface;
@@ -42,10 +41,6 @@ public function handle(ElementReference $reference, array $arguments): mixed
                 $instance = $this->getClassInstance($reference->handler);
                 $arguments = $this->prepareArguments($reflection, $arguments);
 
-                if ($instance instanceof ClientAwareInterface) {
-                    $instance->setClient(new ClientGateway($session));
-                }
-
                 return \call_user_func($instance, ...$arguments);
             }
 
@@ -68,11 +63,6 @@ public function handle(ElementReference $reference, array $arguments): mixed
             [$className, $methodName] = $reference->handler;
             $reflection = new \ReflectionMethod($className, $methodName);
             $instance = $this->getClassInstance($className);
-
-            if ($instance instanceof ClientAwareInterface) {
-                $instance->setClient(new ClientGateway($session));
-            }
-
             $arguments = $this->prepareArguments($reflection, $arguments);
 
             return \call_user_func([$instance, $methodName], ...$arguments);
@@ -109,12 +99,6 @@ private function prepareArguments(\ReflectionFunctionAbstract $reflection, array
             if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
                 $typeName = $type->getName();
 
-                if (ClientGateway::class === $typeName && isset($arguments['_session'])) {
-                    // Deprecated, use RequestContext instead
-                    $finalArgs[$paramPosition] = new ClientGateway($arguments['_session']);
-                    continue;
-                }
-
                 if (RequestContext::class === $typeName && isset($arguments['_session'], $arguments['_request'])) {
                     $finalArgs[$paramPosition] = new RequestContext($arguments['_session'], $arguments['_request']);
                     continue;
@@ -163,10 +147,6 @@ private function getReflectionForCallable(callable $handler, SessionInterface $s
         if (\is_array($handler) && 2 === \count($handler)) {
             [$class, $method] = $handler;
 
-            if ($class instanceof ClientAwareInterface) {
-                $class->setClient(new ClientGateway($session));
-            }
-
             return new \ReflectionMethod($class, $method);
         }