Fix Issues

Author: pushpak1300

src/Server.php

@@ -233,19 +233,23 @@ public function createContext(): ServerContext
      */
     protected function handleMessage(JsonRpcRequest $request, ServerContext $context): void
     {
-        $response = $this->runMethodHandle($request, $context);
-
-        if (! is_iterable($response)) {
-            $this->transport->send($response->toJson());
+        try {
+            $response = $this->runMethodHandle($request, $context);
 
-            return;
-        }
+            if (! is_iterable($response)) {
+                $this->transport->send($response->toJson());
 
-        $this->transport->stream(function () use ($response): void {
-            foreach ($response as $message) {
-                $this->transport->send($message->toJson());
+                return;
             }
-        });
+
+            $this->transport->stream(function () use ($response): void {
+                foreach ($response as $message) {
+                    $this->transport->send($message->toJson());
+                }
+            });
+        } finally {
+            Container::getInstance()->forgetInstance('mcp.request');
+        }
     }
 
     /**
@@ -257,20 +261,14 @@ protected function runMethodHandle(JsonRpcRequest $request, ServerContext $conte
     {
         $container = Container::getInstance();
 
+        $container->instance('mcp.request', $request->toRequest());
+
         /** @var Method $methodClass */
         $methodClass = $container->make(
             $this->methods[$request->method],
         );
 
-        $container->instance('mcp.request', $request->toRequest());
-
-        try {
-            $response = $methodClass->handle($request, $context);
-        } finally {
-            $container->forgetInstance('mcp.request');
-        }
-
-        return $response;
+        return $methodClass->handle($request, $context);
     }
 
     protected function handleInitializeMessage(JsonRpcRequest $request, ServerContext $context): void

src/Server/Methods/Initialize.php

@@ -9,6 +9,7 @@
 use Laravel\Mcp\Server\ServerContext;
 use Laravel\Mcp\Server\Transport\JsonRpcRequest;
 use Laravel\Mcp\Server\Transport\JsonRpcResponse;
+use stdClass;
 
 class Initialize implements Method
 {
@@ -31,7 +32,7 @@ public function handle(JsonRpcRequest $request, ServerContext $context): JsonRpc
         $protocolVersion = $requestedVersion ?? $context->supportedProtocolVersions[0];
         $initResult = [
             'protocolVersion' => $protocolVersion,
-            'capabilities' => $context->serverCapabilities,
+            'capabilities' => $this->normalizeCapabilities($context->serverCapabilities),
             'serverInfo' => [
                 'name' => $context->serverName,
                 'version' => $context->serverVersion,
@@ -45,4 +46,13 @@ public function handle(JsonRpcRequest $request, ServerContext $context): JsonRpc
 
         return JsonRpcResponse::result($request->id, $initResult);
     }
+
+    /**
+     * @param  array<string, array<string, bool>|stdClass|string>  $capabilities
+     * @return array<string, array<string, bool>|stdClass|string>
+     */
+    protected function normalizeCapabilities(array $capabilities): array
+    {
+        return array_map(fn (array|stdClass|string $value) => $value === [] ? (object) [] : $value, $capabilities);
+    }
 }

tests/Feature/Logging/SetLogLevelTest.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\Cache;
+use Laravel\Mcp\Enums\LogLevel;
+use Laravel\Mcp\Server\Support\LoggingManager;
+use Laravel\Mcp\Server\Support\SessionStoreManager;
+use Tests\Fixtures\ArrayTransport;
+use Tests\Fixtures\ExampleServer;
+
+it('persists log level to cache through server request flow', function (): void {
+    $transport = new ArrayTransport;
+    $server = new ExampleServer($transport);
+
+    $server->start();
+
+    $sessionId = 'test-session-'.uniqid();
+    $transport->sessionId = $sessionId;
+
+    $payload = json_encode([
+        'jsonrpc' => '2.0',
+        'id' => 1,
+        'method' => 'logging/setLevel',
+        'params' => [
+            'level' => 'error',
+        ],
+    ]);
+
+    ($transport->handler)($payload);
+
+    $response = json_decode((string) $transport->sent[0], true);
+
+    expect($response)->toHaveKey('result')
+        ->and($response['id'])->toBe(1);
+
+    $manager = new LoggingManager(new SessionStoreManager(Cache::driver(), $sessionId));
+    expect($manager->getLevel())->toBe(LogLevel::Error);
+});
+
+it('correctly isolates log levels per session', function (): void {
+    $transport1 = new ArrayTransport;
+    $server1 = new ExampleServer($transport1);
+    $server1->start();
+
+    $transport2 = new ArrayTransport;
+    $server2 = new ExampleServer($transport2);
+    $server2->start();
+
+    $sessionId1 = 'session-1-'.uniqid();
+    $sessionId2 = 'session-2-'.uniqid();
+
+    $transport1->sessionId = $sessionId1;
+    ($transport1->handler)(json_encode([
+        'jsonrpc' => '2.0',
+        'id' => 1,
+        'method' => 'logging/setLevel',
+        'params' => ['level' => 'debug'],
+    ]));
+
+    $transport2->sessionId = $sessionId2;
+    ($transport2->handler)(json_encode([
+        'jsonrpc' => '2.0',
+        'id' => 2,
+        'method' => 'logging/setLevel',
+        'params' => ['level' => 'error'],
+    ]));
+
+    $manager1 = new LoggingManager(new SessionStoreManager(Cache::driver(), $sessionId1));
+    $manager2 = new LoggingManager(new SessionStoreManager(Cache::driver(), $sessionId2));
+
+    expect($manager1->getLevel())->toBe(LogLevel::Debug)
+        ->and($manager2->getLevel())->toBe(LogLevel::Error);
+});

tests/Unit/ServerTest.php

@@ -32,18 +32,22 @@
 
     ($transport->handler)($payload);
 
-    $jsonResponse = $transport->sent[0];
+    $response = json_decode((string) $transport->sent[0], true);
 
-    $capabilities = (fn (): array => $this->capabilities)->call($server);
+    expect($response)->toHaveKey('result.capabilities');
 
-    $expectedCapabilitiesJson = json_encode(array_merge($capabilities, [
-        'customFeature' => [
-            'enabled' => true,
-        ],
-        'anotherFeature' => (object) [],
-    ]));
+    $capabilities = $response['result']['capabilities'];
+
+    expect($capabilities)->toHaveKey('customFeature')
+        ->and($capabilities['customFeature'])->toBeArray()
+        ->and($capabilities['customFeature']['enabled'])->toBeTrue()
+        ->and($capabilities)->toHaveKey('anotherFeature')
+        ->and($capabilities['anotherFeature'])->toBeArray()
+        ->and($capabilities)->toHaveKey('tools')
+        ->and($capabilities)->toHaveKey('resources')
+        ->and($capabilities)->toHaveKey('prompts')
+        ->and($capabilities)->toHaveKey('logging');
 
-    $this->assertStringContainsString($expectedCapabilitiesJson, $jsonResponse);
 });
 
 it('can handle a list tools message', function (): void {