Add RequestContext

Author: Nyholm

composer.json

@@ -63,7 +63,7 @@
       "Mcp\\Example\\EnvVariables\\": "examples/env-variables/",
       "Mcp\\Example\\ExplicitRegistration\\": "examples/explicit-registration/",
       "Mcp\\Example\\SchemaShowcase\\": "examples/schema-showcase/",
-      "Mcp\\Example\\StdioLoggingShowcase\\": "examples/stdio-logging-showcase/",a
+      "Mcp\\Example\\ClientLogging\\": "examples/client-logging/",
       "Mcp\\Tests\\": "tests/"
     }
   },

docs/mcp-elements.md

@@ -507,32 +507,21 @@ public function generatePrompt(string $topic, string $style): array
 
 ## Logging
 
-The SDK provides automatic logging support, handlers can receive logger instances automatically to send structured log messages to clients.
+The SDK provides support to send structured log messages to clients. All standard PSR-3 log levels are supported.
+Level **warning** as the default level.
 
-### Configuration
+### Usage
 
-Logging is **enabled by default**. Use `disableClientLogging()` to turn it off:
-
-```php
-// Logging enabled (default)
-$server = Server::builder()->build();
-
-// Disable logging
-$server = Server::builder()
-    ->disableClientLogging()
-    ->build();
-```
-
-### Auto-injection
-
-The SDK automatically injects logger instances into handlers:
+The SDK automatically injects a `RequestContext` instance into handlers. This can be used to create a `ClientLogger`.
 
 ```php
 use Mcp\Capability\Logger\ClientLogger;
 use Psr\Log\LoggerInterface;
 
 #[McpTool]
-public function processData(string $input, ClientLogger $logger): array {
+public function processData(string $input, RequestContext $context): array {
+    $logger = $context->getClientLogger();
+
     $logger->info('Processing started', ['input' => $input]);
     $logger->warning('Deprecated API used');
 
@@ -541,19 +530,8 @@ public function processData(string $input, ClientLogger $logger): array {
     $logger->info('Processing completed');
     return ['result' => 'processed'];
 }
-
-// Also works with PSR-3 LoggerInterface
-#[McpResource(uri: 'data://config')]
-public function getConfig(LoggerInterface $logger): array {
-    $logger->info('Configuration accessed');
-    return ['setting' => 'value'];
-}
 ```
 
-### Log Levels
-
-The SDK supports all standard PSR-3 log levels with **warning** as the default level:
-
 ## Completion Providers
 
 Completion providers help MCP clients offer auto-completion suggestions for Resource Templates and Prompts. Unlike Tools and static Resources (which can be listed via `tools/list` and `resources/list`), Resource Templates and Prompts have dynamic parameters that benefit from completion hints.

docs/server-builder.md

@@ -577,7 +577,6 @@ $server = Server::builder()
 | `addRequestHandlers()` | handlers | Prepend multiple custom request handlers |
 | `addNotificationHandler()` | handler | Prepend a single custom notification handler |
 | `addNotificationHandlers()` | handlers | Prepend multiple custom notification handlers |
-| `disableClientLogging()` | - | Disable MCP client logging (enabled by default) |
 | `addTool()` | handler, name?, description?, annotations?, inputSchema? | Register tool |
 | `addResource()` | handler, uri, name?, description?, mimeType?, size?, annotations? | Register resource |
 | `addResourceTemplate()` | handler, uriTemplate, name?, description?, mimeType?, annotations? | Register resource template |

…ing-showcase/LoggingShowcaseHandlers.php …ient-logging/LoggingShowcaseHandlers.phpexamples/stdio-logging-showcase/LoggingShowcaseHandlers.php renamed to examples/client-logging/LoggingShowcaseHandlers.php examples/stdio-logging-showcase/LoggingShowcaseHandlers.php renamed to examples/client-logging/LoggingShowcaseHandlers.php

@@ -9,10 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Mcp\Example\StdioLoggingShowcase;
+namespace Mcp\Example\ClientLogging;
 
 use Mcp\Capability\Attribute\McpTool;
 use Mcp\Capability\Logger\ClientLogger;
+use Mcp\Server\RequestContext;
 
 /**
  * Example handlers showcasing auto-injected MCP logging capabilities.
@@ -23,17 +24,17 @@
 final class LoggingShowcaseHandlers
 {
     /**
-     * Tool that demonstrates different logging levels with auto-injected ClientLogger.
+     * Tool that demonstrates different logging levels.
      *
-     * @param string       $message The message to log
-     * @param string       $level   The logging level (debug, info, warning, error)
-     * @param ClientLogger $logger  Auto-injected MCP logger
+     * @param string $message The message to log
+     * @param string $level   The logging level (debug, info, warning, error)
      *
      * @return array<string, mixed>
      */
     #[McpTool(name: 'log_message', description: 'Demonstrates MCP logging with different levels')]
-    public function logMessage(string $message, string $level, ClientLogger $logger): array
+    public function logMessage(RequestContext $context, string $message, string $level): array
     {
+        $logger = $context->getClientLogger();
         $logger->info('🚀 Starting log_message tool', [
             'requested_level' => $level,
             'message_length' => \strlen($message),

examples/client-logging/server.php

@@ -0,0 +1,29 @@
+#!/usr/bin/env 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.
+ */
+
+require_once dirname(__DIR__).'/bootstrap.php';
+chdir(__DIR__);
+
+use Mcp\Server;
+
+$server = Server::builder()
+    ->setServerInfo('Client Logging', '1.0.0', 'Demonstration of MCP logging in capability handlers.')
+    ->setContainer(container())
+    ->setLogger(logger())
+    ->setDiscovery(__DIR__)
+    ->build();
+
+$result = $server->run(transport());
+
+logger()->info('Server listener stopped gracefully.', ['result' => $result]);
+
+shutdown($result);

examples/stdio-logging-showcase/server.php

@@ -13,6 +13,7 @@
 
 use Mcp\Capability\Attribute\Schema;
 use Mcp\Server\ClientGateway;
+use Mcp\Server\RequestContext;
 use phpDocumentor\Reflection\DocBlock\Tags\Param;
 
 /**
@@ -415,7 +416,7 @@ private function parseParametersInfo(\ReflectionMethod|\ReflectionFunction $refl
             if ($reflectionType instanceof \ReflectionNamedType && !$reflectionType->isBuiltin()) {
                 $typeName = $reflectionType->getName();
 
-                if (is_a($typeName, ClientGateway::class, true)) {
+                if (is_a($typeName, ClientGateway::class, true) || is_a($typeName, RequestContext::class, true)) {
                     continue;
                 }
             }

src/Capability/Discovery/SchemaGenerator.php

@@ -12,24 +12,22 @@
 namespace Mcp\Capability\Logger;
 
 use Mcp\Schema\Enum\LoggingLevel;
-use Mcp\Server\NotificationSender;
+use Mcp\Server\ClientGateway;
+use Mcp\Server\Protocol;
+use Mcp\Server\Session\SessionInterface;
 use Psr\Log\AbstractLogger;
-use Psr\Log\LoggerInterface;
 
 /**
  * MCP-aware PSR-3 logger that sends log messages as MCP notifications.
  *
- * This logger implements the standard PSR-3 LoggerInterface and forwards
- * log messages to the NotificationSender. The NotificationHandler will
- * decide whether to actually send the notification based on capabilities.
- *
  * @author Adam Jamiu <jamiuadam120@gmail.com>
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
 final class ClientLogger extends AbstractLogger
 {
     public function __construct(
-        private readonly NotificationSender $notificationSender,
-        private readonly ?LoggerInterface $fallbackLogger = null,
+        private ClientGateway $client,
+        private SessionInterface $session,
     ) {
     }
 
@@ -41,30 +39,20 @@ public function __construct(
      */
     public function log($level, $message, array $context = []): void
     {
-        // Always log to fallback logger if provided (for local debugging)
-        $this->fallbackLogger?->log($level, $message, $context);
-
         // Convert PSR-3 level to MCP LoggingLevel
         $mcpLevel = $this->convertToMcpLevel($level);
         if (null === $mcpLevel) {
             return; // Unknown level, skip MCP notification
         }
 
-        // Send MCP logging notification - let NotificationHandler decide if it should be sent
-        try {
-            $this->notificationSender->send('notifications/message', [
-                'level' => $mcpLevel->value,
-                'data' => (string) $message,
-                'logger' => $context['logger'] ?? null,
-            ]);
-        } catch (\Throwable $e) {
-            // If MCP notification fails, at least log to fallback
-            $this->fallbackLogger?->error('Failed to send MCP log notification', [
-                'original_level' => $level,
-                'original_message' => $message,
-                'error' => $e->getMessage(),
-            ]);
+        $minimumLevel = $this->session->get(Protocol::SESSION_LOGGING_LEVEL, '');
+        $minimumLevel = LoggingLevel::tryFrom($minimumLevel) ?? LoggingLevel::Warning;
+
+        if ($this->getSeverityIndex($minimumLevel) > $this->getSeverityIndex($mcpLevel)) {
+            return;
         }
+
+        $this->client->log($mcpLevel, $message);
     }
 
     /**
@@ -88,4 +76,24 @@ private function convertToMcpLevel($level): ?LoggingLevel
             default => null,
         };
     }
+
+    /**
+     * Gets the severity index for this log level.
+     * Higher values indicate more severe log levels.
+     *
+     * @return int Severity index (0-7, where 7 is most severe)
+     */
+    private function getSeverityIndex(LoggingLevel $level): int
+    {
+        return match ($level) {
+            LoggingLevel::Debug => 0,
+            LoggingLevel::Info => 1,
+            LoggingLevel::Notice => 2,
+            LoggingLevel::Warning => 3,
+            LoggingLevel::Error => 4,
+            LoggingLevel::Critical => 5,
+            LoggingLevel::Alert => 6,
+            LoggingLevel::Emergency => 7,
+        };
+    }
 }

src/Capability/Logger/ClientLogger.php

@@ -25,7 +25,6 @@
 use Mcp\Exception\PromptNotFoundException;
 use Mcp\Exception\ResourceNotFoundException;
 use Mcp\Exception\ToolNotFoundException;
-use Mcp\Schema\Enum\LoggingLevel;
 use Mcp\Schema\Page;
 use Mcp\Schema\Prompt;
 use Mcp\Schema\Resource;
@@ -62,10 +61,6 @@ final class Registry implements RegistryInterface
      */
     private array $resourceTemplates = [];
 
-    private bool $logging = true;
-
-    private LoggingLevel $loggingLevel = LoggingLevel::Warning;
-
     public function __construct(
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
         private readonly LoggerInterface $logger = new NullLogger(),
@@ -396,46 +391,6 @@ public function setDiscoveryState(DiscoveryState $state): void
         }
     }
 
-
-    /**
-     * Disable logging message notifications for this registry.
-     */
-    public function disableLogging(): void
-    {
-        $this->logging = false;
-    }
-
-    /**
-     * Checks if logging message notification capability is enabled.
-     *
-     * @return bool True if logging capability is enabled, false otherwise
-     */
-    public function isLoggingEnabled(): bool
-    {
-        return $this->logging;
-    }
-
-    /**
-     * Sets the current logging message notification level for the client.
-     *
-     * This determines which log messages should be sent to the client.
-     * Only messages at this level and higher (more severe) will be sent.
-     */
-    public function setLoggingLevel(LoggingLevel $level): void
-    {
-        $this->loggingLevel = $level;
-    }
-
-    /**
-     * Gets the current logging message notification level set by the client.
-     *
-     * @return LoggingLevel The current log level
-     */
-    public function getLoggingLevel(): LoggingLevel
-    {
-        return $this->loggingLevel;
-    }
-
     /**
      * Calculate next cursor for pagination.
      *

src/Capability/Registry.php

@@ -15,6 +15,7 @@
 use Mcp\Exception\RegistryException;
 use Mcp\Server\ClientAwareInterface;
 use Mcp\Server\ClientGateway;
+use Mcp\Server\RequestContext;
 use Mcp\Server\Session\SessionInterface;
 use Psr\Container\ContainerInterface;
 
@@ -109,9 +110,15 @@ private function prepareArguments(\ReflectionFunctionAbstract $reflection, array
                 $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;
+                }
             }
 
             if (isset($arguments[$paramName])) {