Merge branch 'feat/mcp-support' of github.com:BinarCode/laravel-restify into feat/mcp-support

binaryk · binaryk · commit a313a59cd4ff · 2025-08-23T19:48:23.000+03:00
diff --git a/src/Filters/MatchFilter.php b/src/Filters/MatchFilter.php
@@ -4,7 +4,6 @@
 
 use Binaryk\LaravelRestify\Contracts\RestifySearchable;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
-use Binaryk\LaravelRestify\MCP\Concerns\FieldMcpSchemaDetection;
 use Closure;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\Relation;
diff --git a/src/Filters/SearchablesCollection.php b/src/Filters/SearchablesCollection.php
@@ -2,7 +2,6 @@
 
 namespace Binaryk\LaravelRestify\Filters;
 
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@@ -43,7 +42,7 @@ public function __construct($items = [])
      */
     public function fieldNames(): array
     {
-        return $this->filter(fn($item) => is_string($item) && !empty($item))
+        return $this->filter(fn ($item) => is_string($item) && ! empty($item))
             ->unique()
             ->values()
             ->toArray();
@@ -55,7 +54,7 @@ public function fieldNames(): array
     public function formatForDocumentation(): string
     {
         $fields = $this->fieldNames();
-        
+
         if (empty($fields)) {
             return 'No searchable fields available';
         }
@@ -76,10 +75,10 @@ public function forSearch(Model $model, Repository $repository): Collection
 
             // Create SearchableFilter for string fields
             $columnName = is_numeric($key) ? $searchable : $key;
-            
+
             return SearchableFilter::make()
                 ->setColumn($model->qualifyColumn($columnName))
                 ->setRepository($repository);
         });
     }
-}
+}
diff --git a/src/MCP/Concerns/McpActionTool.php b/src/MCP/Concerns/McpActionTool.php
@@ -3,9 +3,7 @@
 namespace Binaryk\LaravelRestify\MCP\Concerns;
 
 use Binaryk\LaravelRestify\Actions\Action;
-use Binaryk\LaravelRestify\Http\Requests\ActionRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpActionRequest;
-use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
 /**
@@ -20,17 +18,16 @@ public function actionTool(Action $action, array $arguments, McpActionRequest $a
         $this->sanitizeToolRequest($actionRequest, $arguments);
 
         if ($id = $actionRequest->input('id')) {
-            if (!$action->authorizedToRun($actionRequest, $actionRequest->findModelOrFail($id))) {
+            if (! $action->authorizedToRun($actionRequest, $actionRequest->findModelOrFail($id))) {
                 return [
                     'error' => 'Not authorized to run this action',
                     'getter' => $action->uriKey(),
                 ];
             }
         }
 
-
         // Set up the action request context based on action type
-        if (!$action->isStandalone()) {
+        if (! $action->isStandalone()) {
             if (isset($arguments['id'])) {
                 // Single model action (show context)
                 $actionRequest->merge(['id' => $arguments['id']]);
@@ -41,7 +38,7 @@ public function actionTool(Action $action, array $arguments, McpActionRequest $a
         }
 
         // Check authorization
-        if (!$action->authorizedToSee($actionRequest)) {
+        if (! $action->authorizedToSee($actionRequest)) {
             return [
                 'error' => 'Not authorized to see this action',
                 'action' => $action->uriKey(),
@@ -102,7 +99,7 @@ public static function actionToolSchema(Action $action, ToolInputSchema $schema,
             $shownOnShow = $action->isShownOnShow($mcpRequest, app(static::class));
             $shownOnIndex = $action->isShownOnIndex($mcpRequest, app(static::class));
 
-            if ($shownOnShow && !$shownOnIndex) {
+            if ($shownOnShow && ! $shownOnIndex) {
                 // Show action - requires single ID
                 $schema->string('id')
                     ->description("The ID of the {$modelName} to perform the action on")
diff --git a/src/MCP/Concerns/McpDestroyTool.php b/src/MCP/Concerns/McpDestroyTool.php
@@ -31,4 +31,4 @@ public static function destroyToolSchema(ToolInputSchema $schema): void
             ->description("The ID of the $modelName to delete")
             ->required();
     }
-}
+}
diff --git a/src/MCP/Concerns/McpGetterTool.php b/src/MCP/Concerns/McpGetterTool.php
@@ -3,9 +3,7 @@
 namespace Binaryk\LaravelRestify\MCP\Concerns;
 
 use Binaryk\LaravelRestify\Getters\Getter;
-use Binaryk\LaravelRestify\Http\Requests\GetterRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpGetterRequest;
-use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Illuminate\Http\JsonResponse;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
@@ -21,7 +19,7 @@ public function getterTool(Getter $getter, array $arguments, McpGetterRequest $g
         $this->sanitizeToolRequest($getterRequest, $arguments);
 
         if ($id = $getterRequest->input('id')) {
-            if (!$getter->authorizedToRun($getterRequest, $getterRequest->findModelOrFail($id))) {
+            if (! $getter->authorizedToRun($getterRequest, $getterRequest->findModelOrFail($id))) {
                 return [
                     'error' => 'Not authorized to run this getter',
                     'getter' => $getter->uriKey(),
@@ -84,7 +82,7 @@ public static function getterToolSchema(Getter $getter, ToolInputSchema $schema,
         $shownOnShow = $getter->isShownOnShow($mcpRequest, app(static::class));
         $shownOnIndex = $getter->isShownOnIndex($mcpRequest, app(static::class));
 
-        if ($shownOnShow && !$shownOnIndex) {
+        if ($shownOnShow && ! $shownOnIndex) {
             // Show getter - requires single ID
             $schema->string('id')
                 ->description("The ID of the {$modelName} to execute the getter on")
diff --git a/src/MCP/Concerns/McpIndexTool.php b/src/MCP/Concerns/McpIndexTool.php
@@ -6,7 +6,6 @@
 use Binaryk\LaravelRestify\Filters\MatchesCollection;
 use Binaryk\LaravelRestify\Filters\MatchFilter;
 use Binaryk\LaravelRestify\Filters\SearchablesCollection;
-use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
@@ -57,7 +56,7 @@ public static function indexToolSchema(ToolInputSchema $schema): void
 
         $schema->string('sort')
             ->description("Sorting criteria for the $key. Available options: ".implode(', ',
-                    $sortOptions).' (e.g., sort=field or sort=-field for descending)');
+                $sortOptions).' (e.g., sort=field or sort=-field for descending)');
 
         MatchesCollection::make(static::matches())
             ->normalize()
diff --git a/src/MCP/Concerns/McpShowTool.php b/src/MCP/Concerns/McpShowTool.php
@@ -45,4 +45,4 @@ public static function showToolSchema(ToolInputSchema $schema): void
         $schema->string('include')
             ->description(static::formatRelationshipDocumentation());
     }
-}
+}
diff --git a/src/MCP/Concerns/McpStoreTool.php b/src/MCP/Concerns/McpStoreTool.php
@@ -30,4 +30,4 @@ public static function storeToolSchema(ToolInputSchema $schema): void
                 $field->resolveToolSchema($schema, $repository);
             });
     }
-}
+}
diff --git a/src/MCP/Concerns/McpToolHelpers.php b/src/MCP/Concerns/McpToolHelpers.php
@@ -33,7 +33,7 @@ protected static function getRelationshipFields(string $repositoryClass): array
             // This will call fieldsForMcpIndex if available, providing accurate MCP field documentation
             $fields = $repository->collectFields($request)
                 ->forMcpIndex($request, $repository)
-                ->map(fn($field) => $field->attribute)
+                ->map(fn ($field) => $field->attribute)
                 ->unique()
                 ->sort()
                 ->values()
@@ -92,9 +92,9 @@ protected static function formatRelationshipDocumentation(): string
             $firstFields = static::getRelationshipFields($firstRepositoryClass);
             $exampleFields = array_slice($firstFields, 0, 2);
 
-            if (!empty($exampleFields)) {
-                $documentation .= "- include={$firstRelationName}[" . implode(',', $exampleFields) . "] (selective fields with comma syntax)\n";
-                $documentation .= "- include={$firstRelationName}[" . implode('|', $exampleFields) . "] (selective fields with pipe syntax)\n";
+            if (! empty($exampleFields)) {
+                $documentation .= "- include={$firstRelationName}[".implode(',', $exampleFields)."] (selective fields with comma syntax)\n";
+                $documentation .= "- include={$firstRelationName}[".implode('|', $exampleFields)."] (selective fields with pipe syntax)\n";
             }
 
             // Add comprehensive nested relationship examples based on real test cases
@@ -137,4 +137,4 @@ protected static function extractRepositoryClass($relationConfig): ?string
 
         return null;
     }
-}
+}
diff --git a/src/MCP/Concerns/McpTools.php b/src/MCP/Concerns/McpTools.php
@@ -7,14 +7,14 @@
  */
 trait McpTools
 {
+    use McpActionTool;
+    use McpDestroyTool;
+    use McpGetterTool;
     use McpIndexTool;
     use McpShowTool;
     use McpStoreTool;
-    use McpUpdateTool;
-    use McpDestroyTool;
-    use McpActionTool;
-    use McpGetterTool;
     use McpToolHelpers;
+    use McpUpdateTool;
 
     public function mcpAllowsIndex(): bool
     {
diff --git a/src/MCP/Concerns/McpUpdateTool.php b/src/MCP/Concerns/McpUpdateTool.php
@@ -38,4 +38,4 @@ public static function updateToolSchema(ToolInputSchema $schema): void
                     ->description("Update the $attribute field");
             });
     }
-}
+}
diff --git a/src/MCP/Requests/McpActionRequest.php b/src/MCP/Requests/McpActionRequest.php
@@ -4,6 +4,4 @@
 
 use Binaryk\LaravelRestify\Http\Requests\ActionRequest;
 
-class McpActionRequest extends ActionRequest
-{
-}
+class McpActionRequest extends ActionRequest {}
diff --git a/src/MCP/Requests/McpGetterRequest.php b/src/MCP/Requests/McpGetterRequest.php
@@ -4,6 +4,4 @@
 
 use Binaryk\LaravelRestify\Http\Requests\GetterRequest;
 
-class McpGetterRequest extends GetterRequest
-{
-}
+class McpGetterRequest extends GetterRequest {}
diff --git a/src/MCP/Tools/GlobalSearchTool.php b/src/MCP/Tools/GlobalSearchTool.php
@@ -26,10 +26,11 @@ public function description(): string
     public function schema(ToolInputSchema $schema): ToolInputSchema
     {
         $searchableRepositories = collect(Restify::globallySearchableRepositories(app(McpRequest::class)));
-        
+
         // Build searchable fields documentation across all repositories
-        $searchableInfo = $searchableRepositories->map(function($repo) {
+        $searchableInfo = $searchableRepositories->map(function ($repo) {
             $searchableFields = (new SearchablesCollection($repo::searchables()))->formatForDocumentation();
+
             return "{$repo::uriKey()} ({$searchableFields})";
         })->implode(', ');
 
@@ -64,7 +65,7 @@ public function handle(array $arguments): ToolResult|Generator
         return ToolResult::json([
             'results' => $results,
             'total' => count($results),
-            'searched_repositories' => collect($globallySearchableRepositories)->map(fn($repo) => [
+            'searched_repositories' => collect($globallySearchableRepositories)->map(fn ($repo) => [
                 'name' => $repo::uriKey(),
                 'title' => $repo::label(),
             ])->values()->toArray(),
diff --git a/src/MCP/Tools/Operations/ActionTool.php b/src/MCP/Tools/Operations/ActionTool.php
@@ -3,9 +3,7 @@
 namespace Binaryk\LaravelRestify\MCP\Tools\Operations;
 
 use Binaryk\LaravelRestify\Actions\Action;
-use Binaryk\LaravelRestify\Http\Requests\ActionRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpActionRequest;
-use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Generator;
 use Laravel\Mcp\Server\Tool;
diff --git a/src/MCP/Tools/Operations/GetterTool.php b/src/MCP/Tools/Operations/GetterTool.php
@@ -3,9 +3,7 @@
 namespace Binaryk\LaravelRestify\MCP\Tools\Operations;
 
 use Binaryk\LaravelRestify\Getters\Getter;
-use Binaryk\LaravelRestify\Http\Requests\GetterRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpGetterRequest;
-use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Generator;
 use Laravel\Mcp\Server\Tool;
@@ -15,6 +13,7 @@
 class GetterTool extends Tool
 {
     protected Repository $repository;
+
     protected Getter $getter;
 
     public function __construct(string $repositoryClass, Getter $getter)
@@ -43,7 +42,7 @@ public function description(): string
         $shownOnShow = $this->getter->isShownOnShow($mcpRequest, $this->repository);
         $shownOnIndex = $this->getter->isShownOnIndex($mcpRequest, $this->repository);
 
-        if ($shownOnShow && !$shownOnIndex) {
+        if ($shownOnShow && ! $shownOnIndex) {
             return "Execute {$getterName} getter to retrieve data for a specific {$modelName} record in the {$repositoryUriKey} repository.";
         } else {
             return "Execute {$getterName} getter to retrieve data from the {$repositoryUriKey} repository.";
diff --git a/src/Services/Search/RepositorySearchService.php b/src/Services/Search/RepositorySearchService.php
@@ -8,7 +8,6 @@
 use Binaryk\LaravelRestify\Filters\AdvancedFiltersCollection;
 use Binaryk\LaravelRestify\Filters\Filter;
 use Binaryk\LaravelRestify\Filters\SearchableFilter;
-use Binaryk\LaravelRestify\Filters\SearchablesCollection;
 use Binaryk\LaravelRestify\Http\Requests\RestifyRequest;
 use Binaryk\LaravelRestify\Repositories\Repository;
 use Illuminate\Database\Eloquent\Builder;

Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,4 @@ public static function destroyToolSchema(ToolInputSchema $schema): void`
`31`	`31`	`->description("The ID of the $modelName to delete")`
`32`	`32`	`->required();`
`33`	`33`	`}`
`34`		`-}`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,4 @@ public static function showToolSchema(ToolInputSchema $schema): void`
`45`	`45`	`$schema->string('include')`
`46`	`46`	`->description(static::formatRelationshipDocumentation());`
`47`	`47`	`}`
`48`		`-}`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ public static function storeToolSchema(ToolInputSchema $schema): void`
`30`	`30`	`$field->resolveToolSchema($schema, $repository);`
`31`	`31`	`});`
`32`	`32`	`}`
`33`		`-}`
	`33`	`+}`