fix: fixing store and update via mcp

Author: binaryk

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        run: composer install --no-dev --prefer-dist --no-interaction --optimize-autoloader
+        run: composer install --prefer-dist --no-interaction --optimize-autoloader
 
       - name: Run tests
         run: |

src/Eager/Related.php

@@ -64,7 +64,7 @@ public function resolveField(Repository $repository): EagerField
     {
         return $this
             ->field
-            ->forMcp($repository->isForMcp())
+            ->forMcp($repository->detectMcpRequest())
             ->columns($this->getColumns())
             ->resolve($repository);
     }

src/Eager/RelatedCollection.php

@@ -184,7 +184,7 @@ public function forRequest(RestifyRequest $request, Repository $repository): sel
             ->inRequest($request, $repository)
             ->when($request->isShowRequest(), fn (self $collection) => $collection->forShow($request, $repository))
             ->when($request->isIndexRequest(), fn (self $collection) => $collection->forIndex($request, $repository))
-            ->when($repository->isForMcp(), fn (self $collection) => $collection->forIndex($request, $repository));
+            ->when($repository->detectMcpRequest(), fn (self $collection) => $collection->forIndex($request, $repository));
     }
 
     public function unserialized(RestifyRequest $request, Repository $repository)

src/Fields/BelongsToMany.php

@@ -58,7 +58,7 @@ public function resolve($repository, $attribute = null)
 
                 return $repositoryFromClass
                     ->allowToShow(
-                        $this->isForMcp() ? app(McpRequest::class) : app(RestifyRequest::class)
+                        $this->detectMcpRequest() ? app(McpRequest::class) : app(RestifyRequest::class)
                     )
                     ->withPivots(
                         PivotsCollection::make($this->pivotFields)

src/Fields/EagerField.php

@@ -31,7 +31,7 @@ class EagerField extends Field
 
     private RelatedQuery $relatedQuery;
 
-    public bool $forMcp = false;
+    public ?string $forMcp = null;
 
     public function __construct($attribute, ?string $parentRepository = null)
     {
@@ -88,7 +88,7 @@ public function resolve($repository, $attribute = null)
             $serializableRepository = $this->repositoryClass::resolveWith($relatedModel);
 
             $this->value = $serializableRepository
-                ->allowToShow($this->isForMcp() ? app(McpRequest::class) : app(RestifyRequest::class))
+                ->allowToShow($this->detectMcpRequest() ? app(McpRequest::class) : app(RestifyRequest::class))
                 ->columns()
                 ->eager($this);
         } catch (AuthorizationException) {
@@ -164,7 +164,7 @@ public function qualifySortable(RestifyRequest $request): ?string
         return $table.'.attributes.'.$this->sortableColumn;
     }
 
-    public function forMcp(bool|callable $forMcp = false): self
+    public function forMcp(null|string|callable $forMcp = null): self
     {
         if (is_callable($forMcp)) {
             $this->forMcp = $forMcp();
@@ -177,7 +177,7 @@ public function forMcp(bool|callable $forMcp = false): self
         return $this;
     }
 
-    public function isForMcp(): bool
+    public function detectMcpRequest(): ?string
     {
         return $this->forMcp;
     }

src/MCP/Concerns/HasMcpTools.php

@@ -48,6 +48,6 @@ public function mcpAllowsActions(): bool
 
     public function mcpAllowsGetters(): bool
     {
-        return true;
+        return false;
     }
 }

src/MCP/Concerns/McpDestroyTool.php

@@ -2,6 +2,7 @@
 
 namespace Binaryk\LaravelRestify\MCP\Concerns;
 
+use Binaryk\LaravelRestify\MCP\Requests\McpDestroyRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
@@ -10,7 +11,7 @@
  */
 trait McpDestroyTool
 {
-    public function deleteTool(array $arguments, McpRequest $request): array
+    public function deleteTool(array $arguments, McpDestroyRequest $request): array
     {
         $id = $arguments['id'] ?? null;
         unset($arguments['id']);

src/MCP/Concerns/McpIndexTool.php

@@ -6,6 +6,7 @@
 use Binaryk\LaravelRestify\Filters\MatchesCollection;
 use Binaryk\LaravelRestify\Filters\MatchFilter;
 use Binaryk\LaravelRestify\Filters\SearchablesCollection;
+use Binaryk\LaravelRestify\MCP\Requests\McpIndexRequest;
 use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
@@ -14,7 +15,7 @@
  */
 trait McpIndexTool
 {
-    public function indexTool(array $arguments, McpRequest $request): array
+    public function indexTool(array $arguments, McpIndexRequest $request): array
     {
         $request->merge($arguments);
         $this->sanitizeToolRequest($request, $arguments);
@@ -33,7 +34,7 @@ public static function indexToolSchema(ToolInputSchema $schema): void
             ->description("Number of $key per page");
 
         $schema->string('include')
-            ->description(static::formatRelationshipDocumentation());
+            ->description(static::formatRelationshipDocumentation(app(McpIndexRequest::class)));
 
         $searchableFields = (new SearchablesCollection(static::searchables()))->formatForDocumentation();
 
@@ -66,11 +67,11 @@ public static function indexToolSchema(ToolInputSchema $schema): void
 
                 return match ($matchFilter->getType()) {
                     RestifySearchable::MATCH_INTEGER, 'integer' => $schema->integer($filterKey)
-                        ->description("Filter $key resource. Filter scription: ".$matchFilter->description()),
+                        ->description("Filter $key resource. Description: ".$matchFilter->description()),
                     RestifySearchable::MATCH_BOOL, 'boolean' => $schema->boolean($filterKey)
-                        ->description("Filter $key resource. Filter scription: ".$matchFilter->description()),
+                        ->description("Filter $key resource. Description: ".$matchFilter->description()),
                     default => $schema->string($filterKey)
-                        ->description("Filter $key resource. Filter scription: ".$matchFilter->description())
+                        ->description("Filter $key resource. Description: ".$matchFilter->description())
                 };
             });
     }

src/MCP/Concerns/McpShowTool.php

@@ -3,14 +3,15 @@
 namespace Binaryk\LaravelRestify\MCP\Concerns;
 
 use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
+use Binaryk\LaravelRestify\MCP\Requests\McpShowRequest;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
 /**
  * @mixin \Binaryk\LaravelRestify\Repositories\Repository
  */
 trait McpShowTool
 {
-    public function showTool(array $arguments, McpRequest $request): array
+    public function showTool(array $arguments, McpShowRequest $request): array
     {
         $id = $arguments['id'] ?? null;
         unset($arguments['id']);

src/MCP/Concerns/McpStoreTool.php

@@ -4,26 +4,30 @@
 
 use Binaryk\LaravelRestify\Fields\Field;
 use Binaryk\LaravelRestify\MCP\Requests\McpRequest;
+use Binaryk\LaravelRestify\MCP\Requests\McpStoreRequest;
 use Laravel\Mcp\Server\Tools\ToolInputSchema;
 
 /**
  * @mixin \Binaryk\LaravelRestify\Repositories\Repository
  */
 trait McpStoreTool
 {
-    public function storeTool(array $arguments, McpRequest $request): array
+    public function storeTool(array $arguments, McpStoreRequest $request): array
     {
         $request->merge($arguments);
         $this->sanitizeToolRequest($request, $arguments);
 
-        return $this->store($request);
+        return $this
+            ->allowToStore($request)
+            ->store($request)
+            ->getData(true);
     }
 
     public static function storeToolSchema(ToolInputSchema $schema): void
     {
         $repository = static::resolveWith(static::newModel());
 
-        $repository->collectFields($request = app(McpRequest::class))
+        $repository->collectFields($request = app(McpStoreRequest::class))
             ->forStore($request, $repository)
             ->withoutActions($request, $repository)
             ->each(function (Field $field) use ($schema, $repository) {