feat: add tool call events

Author: Katalam

src/Server/Events/ToolCallFailed.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Laravel\Mcp\Server\Events;
+
+use Throwable;
+
+class ToolCallFailed
+{
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public string $toolName,
+        public array $arguments,
+        public Throwable $exception,
+    ) {}
+}

src/Server/Events/ToolCallFinished.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Laravel\Mcp\Server\Events;
+
+class ToolCallFinished
+{
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public string $toolName,
+        public array $arguments,
+    ) {}
+}

src/Server/Events/ToolCallStarting.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Laravel\Mcp\Server\Events;
+
+class ToolCallStarting
+{
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(
+        public string $toolName,
+        public array $arguments,
+    ) {}
+}

src/Server/Methods/CallTool.php

@@ -7,10 +7,14 @@
 use Generator;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Events\Dispatcher;
 use Illuminate\Support\ItemNotFoundException;
 use Illuminate\Validation\ValidationException;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Server\Contracts\Method;
+use Laravel\Mcp\Server\Events\ToolCallFailed;
+use Laravel\Mcp\Server\Events\ToolCallFinished;
+use Laravel\Mcp\Server\Events\ToolCallStarting;
 use Laravel\Mcp\Server\ServerContext;
 use Laravel\Mcp\Server\Tools\ToolNotification;
 use Laravel\Mcp\Server\Tools\ToolResult;
@@ -36,13 +40,21 @@ public function handle(JsonRpcRequest $request, ServerContext $context)
             );
         }
 
+        $events = app(Dispatcher::class);
+
         try {
+            $events->dispatch(new ToolCallStarting($request->params['name'], $request->params['arguments']));
+
             $result = Container::getInstance()->call([$tool, 'handle'], [
                 'request' => new Request(
                     $request->params['arguments'],
                 ),
             ]);
+
+            $events->dispatch(new ToolCallFinished($request->params['name'], $request->params['arguments']));
         } catch (ValidationException $e) {
+            $events->dispatch(new ToolCallFailed($request->params['name'], $request->params['arguments'], $e));
+
             $result = ToolResult::error(ValidationMessages::from($e));
         }
 

tests/Unit/Methods/CallToolTest.php

@@ -1,9 +1,14 @@
 <?php
 
+use Illuminate\Events\Dispatcher;
+use Laravel\Mcp\Server\Events\ToolCallFailed;
+use Laravel\Mcp\Server\Events\ToolCallFinished;
+use Laravel\Mcp\Server\Events\ToolCallStarting;
 use Laravel\Mcp\Server\Methods\CallTool;
 use Laravel\Mcp\Server\ServerContext;
 use Laravel\Mcp\Server\Transport\JsonRpcRequest;
 use Laravel\Mcp\Server\Transport\JsonRpcResponse;
+use Mockery as m;
 use Tests\Fixtures\CurrentTimeTool;
 use Tests\Fixtures\ExampleTool;
 
@@ -124,3 +129,101 @@
         ->and($type)->toEqual('text')
         ->and($text)->toContain('The current time is ');
 });
+
+it('will call the tool call starting and finished event', function () {
+    $request = JsonRpcRequest::fromJson(json_encode([
+        'jsonrpc' => '2.0',
+        'id' => 1,
+        'method' => 'tools/call',
+        'params' => [
+            'name' => 'example-tool',
+            'arguments' => ['name' => 'John Doe'],
+        ],
+    ]));
+
+    $context = new ServerContext(
+        supportedProtocolVersions: ['2025-03-26'],
+        serverCapabilities: [],
+        serverName: 'Test Server',
+        serverVersion: '1.0.0',
+        instructions: 'Test instructions',
+        maxPaginationLength: 50,
+        defaultPaginationLength: 10,
+        tools: [ExampleTool::class],
+        resources: [],
+        prompts: [],
+    );
+
+    $dispatcherMock = m::mock(Dispatcher::class);
+    $dispatcherMock->shouldReceive('dispatch')
+        ->once()
+        ->with(m::on(function ($event) {
+            return $event instanceof ToolCallStarting
+                && $event->toolName === 'example-tool'
+                && $event->arguments === ['name' => 'John Doe'];
+        }));
+    $dispatcherMock->shouldReceive('dispatch')
+        ->once()
+        ->with(m::on(function ($event) {
+            return $event instanceof ToolCallFinished
+                && $event->toolName === 'example-tool'
+                && $event->arguments === ['name' => 'John Doe'];
+        }));
+
+    app()->instance(Dispatcher::class, $dispatcherMock);
+
+    $method = new CallTool;
+
+    $method->handle($request, $context);
+
+    $this->addToAssertionCount(2);
+});
+
+it('will call the tool call starting and failed event', function () {
+    $request = JsonRpcRequest::fromJson(json_encode([
+        'jsonrpc' => '2.0',
+        'id' => 1,
+        'method' => 'tools/call',
+        'params' => [
+            'name' => 'example-tool',
+            'arguments' => [],
+        ],
+    ]));
+
+    $context = new ServerContext(
+        supportedProtocolVersions: ['2025-03-26'],
+        serverCapabilities: [],
+        serverName: 'Test Server',
+        serverVersion: '1.0.0',
+        instructions: 'Test instructions',
+        maxPaginationLength: 50,
+        defaultPaginationLength: 10,
+        tools: [ExampleTool::class],
+        resources: [],
+        prompts: [],
+    );
+
+    $dispatcherMock = m::mock(Dispatcher::class);
+    $dispatcherMock->shouldReceive('dispatch')
+        ->once()
+        ->with(m::on(function ($event) {
+            return $event instanceof ToolCallStarting
+                && $event->toolName === 'example-tool'
+                && $event->arguments === [];
+        }));
+    $dispatcherMock->shouldReceive('dispatch')
+        ->once()
+        ->with(m::on(function ($event) {
+            return $event instanceof ToolCallFailed
+                && $event->toolName === 'example-tool'
+                && $event->arguments === [];
+        }));
+
+    app()->instance(Dispatcher::class, $dispatcherMock);
+
+    $method = new CallTool;
+
+    $method->handle($request, $context);
+
+    $this->addToAssertionCount(2);
+});