Merge pull request #26 from laravel/feat/essence

Refactors schema input

Author: nunomaduro

README.md

@@ -101,13 +101,15 @@ php artisan make:mcp-tool ExampleTool
 Your tools can request arguments from the MCP client using a tool input schema:
 
 ```php
-public function schema(ToolInputSchema $schema): ToolInputSchema
-{
-    $schema->string('iso_country_code')
-        ->description('2 character country code')
-        ->required();
+use Illuminate\JsonSchema\JsonSchema;
 
-    return $schema;
+public function schema(JsonSchema $schema): array
+{
+    return [
+        'name' => $schema->string()
+            ->description('The name of the user')
+            ->required(),
+    ];
 }
 ```
 

composer.json

@@ -24,7 +24,8 @@
         "illuminate/http": "^10.0|^11.0|^12.0",
         "illuminate/routing": "^10.0|^11.0|^12.0",
         "illuminate/support": "^10.0|^11.0|^12.0",
-        "illuminate/validation": "^10.0|^11.0|^12.0"
+        "illuminate/validation": "^10.0|^11.0|^12.0",
+        "illuminate/json-schema": "^12.28"
     },
     "require-dev": {
         "laravel/pint": "^1.20",

src/Server/Tool.php

@@ -6,8 +6,8 @@
 
 use Generator;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\JsonSchema\JsonSchema;
 use Illuminate\Support\Str;
-use Laravel\Mcp\Server\Tools\ToolInputSchema;
 use Laravel\Mcp\Server\Tools\ToolNotification;
 use Laravel\Mcp\Server\Tools\ToolResult;
 use ReflectionClass;
@@ -21,9 +21,12 @@ public function name(): string
         return Str::kebab(class_basename($this));
     }
 
-    public function schema(ToolInputSchema $schema): ToolInputSchema
+    /**
+     `* Get the tool input schema.
+     */
+    public function schema(JsonSchema $schema): array
     {
-        return $schema;
+        return [];
     }
 
     public function description(): string
@@ -53,7 +56,9 @@ public function toArray(): array
         return [
             'name' => $this->name(),
             'description' => $this->description(),
-            'inputSchema' => $this->schema(new ToolInputSchema)->toArray(),
+            'inputSchema' => JsonSchema::object(
+                fn (JsonSchema $schema) => $this->schema($schema),
+            )->toArray(),
             'annotations' => $this->annotations() ?: (object) [],
         ];
     }

src/Server/Tools/ToolInputSchema.php

@@ -3,9 +3,9 @@
 namespace {{ namespace }};
 
 use Generator;
+use Illuminate\JsonSchema\JsonSchema;
 use Laravel\Mcp\Server\Tools\Annotations\Title;
 use Laravel\Mcp\Server\Tool;
-use Laravel\Mcp\Server\Tools\ToolInputSchema;
 use Laravel\Mcp\Server\Tools\ToolResult;
 
 #[Title('{{ title }}')]
@@ -27,12 +27,12 @@ class {{ class }} extends Tool
     /**
      * Get the tool's input schema.
      */
-    public function schema(ToolInputSchema $schema): ToolInputSchema
+    public function schema(JsonSchema $schema): array
     {
-        $schema->string('example')
-            ->description('An example input description.')
-            ->required();
-
-        return $schema;
+        return [
+            'example' => $schema->string()
+                ->description('An example input description.')
+                ->required(),
+        ];
     }
 }

stubs/tool.stub

@@ -4,20 +4,24 @@
 
 use Generator;
 use Illuminate\Contracts\Validation\Validator;
+use Illuminate\JsonSchema\JsonSchema;
 use Illuminate\Support\MessageBag;
 use Illuminate\Validation\ValidationException;
 use Laravel\Mcp\Server\Tool;
-use Laravel\Mcp\Server\Tools\ToolInputSchema;
 use Laravel\Mcp\Server\Tools\ToolResult;
 use Mockery;
 
 class ExampleTool extends Tool
 {
     protected string $description = 'This tool says hello to a person';
 
-    public function schema(ToolInputSchema $schema): ToolInputSchema
+    public function schema(JsonSchema $schema): array
     {
-        return $schema->string('name')->description('The name of the person to greet')->required();
+        return [
+            'name' => $schema->string()
+                ->description('The name of the person to greet')
+                ->required(),
+        ];
     }
 
     public function handle(array $arguments): ToolResult|Generator

tests/Fixtures/ExampleTool.php

@@ -3,20 +3,22 @@
 namespace Tests\Fixtures;
 
 use Generator;
+use Illuminate\JsonSchema\JsonSchema;
 use Laravel\Mcp\Server\Tool;
-use Laravel\Mcp\Server\Tools\ToolInputSchema;
 use Laravel\Mcp\Server\Tools\ToolNotification;
 use Laravel\Mcp\Server\Tools\ToolResult;
 
 class StreamingTool extends Tool
 {
     protected string $description = 'A tool that streams multiple responses.';
 
-    public function schema(ToolInputSchema $schema): ToolInputSchema
+    public function schema(JsonSchema $schema): array
     {
-        return $schema->integer('count')
-            ->description('Number of messages to stream.')
-            ->required();
+        return [
+            'count' => $schema->integer()
+                ->description('Number of messages to stream.')
+                ->required(),
+        ];
     }
 
     public function handle(array $arguments): Generator

tests/Fixtures/StreamingTool.php

@@ -11,12 +11,11 @@
         eval("
             namespace Tests\\Unit\\Methods;
             use Generator;
+            use Illuminate\JsonSchema\JsonSchema;
             use Laravel\\Mcp\\Server\\Tool;
             use Laravel\\Mcp\\Server\\Tools\\ToolResult;
-            use Laravel\\Mcp\\Server\\Tools\\ToolInputSchema;
             class DummyTool{$i} extends Tool {
                 public function description(): string { return 'Description for dummy tool {$i}'; }
-                public function schema(ToolInputSchema \$schema): ToolInputSchema { return \$schema; }
                 public function handle(array \$arguments): ToolResult|Generator { return []; }
             }
         ");