fix: Remove unused methods and redundant code across tools and config files

Author: butschster

composer.json

@@ -17,7 +17,8 @@
     "spiral/boot": "^3.15",
     "spiral/config": "^3.15",
     "spiral/console": "^3.15",
-    "spiral/files": "^3.15"
+    "spiral/files": "^3.15",
+    "symfony/yaml": "^7.2 || ^8.0"
   },
   "require-dev": {
     "spiral/code-style": "^2.2",

src/MCP/Tools/ListTemplatesToolAction.php

@@ -61,14 +61,12 @@ public function __invoke(ListTemplatesRequest $request): CallToolResult
             ]);
 
             return ToolResult::success($response);
-
         } catch (ResearchException $e) {
             $this->logger->error('Error listing research templates', [
                 'error' => $e->getMessage(),
             ]);
 
             return ToolResult::error($e->getMessage());
-
         } catch (\Throwable $e) {
             $this->logger->error('Unexpected error listing templates', [
                 'error' => $e->getMessage(),
@@ -98,7 +96,7 @@ private function applyFilters(array $templates, ListTemplatesRequest $request):
             // Filter by name (partial match, case insensitive)
             if ($request->nameContains !== null) {
                 $searchTerm = \strtolower(\trim($request->nameContains));
-                $templateName = \strtolower((string) $template->name);
+                $templateName = \strtolower((string)$template->name);
 
                 if (!\str_contains($templateName, $searchTerm)) {
                     return false;

src/MCP/Tools/UpdateEntryToolAction.php

@@ -84,7 +84,6 @@ public function __invoke(EntryUpdateRequest $request): CallToolResult
             ]);
 
             return ToolResult::error($e->getMessage());
-
         } catch (EntryNotFoundException $e) {
             $this->logger->error('Entry not found', [
                 'research_id' => $request->researchId,
@@ -93,7 +92,6 @@ public function __invoke(EntryUpdateRequest $request): CallToolResult
             ]);
 
             return ToolResult::error($e->getMessage());
-
         } catch (ResearchException $e) {
             $this->logger->error('Error during research entry update', [
                 'research_id' => $request->researchId,
@@ -102,7 +100,6 @@ public function __invoke(EntryUpdateRequest $request): CallToolResult
             ]);
 
             return ToolResult::error($e->getMessage());
-
         } catch (\Throwable $e) {
             $this->logger->error('Unexpected error updating entry', [
                 'research_id' => $request->researchId,
@@ -113,38 +110,4 @@ public function __invoke(EntryUpdateRequest $request): CallToolResult
             return ToolResult::error('Failed to update entry: ' . $e->getMessage());
         }
     }
-
-    /**
-     * Get list of changes applied based on the request
-     */
-    private function getAppliedChanges(EntryUpdateRequest $request): array
-    {
-        $changes = [];
-
-        if ($request->title !== null) {
-            $changes[] = 'title';
-        }
-
-        if ($request->description !== null) {
-            $changes[] = 'description';
-        }
-
-        if ($request->content !== null) {
-            $changes[] = 'content';
-        }
-
-        if ($request->status !== null) {
-            $changes[] = 'status';
-        }
-
-        if ($request->tags !== null) {
-            $changes[] = 'tags';
-        }
-
-        if ($request->textReplace !== null) {
-            $changes[] = 'text_replacement';
-        }
-
-        return $changes;
-    }
 }

src/MCP/Tools/UpdateResearchToolAction.php

@@ -88,38 +88,4 @@ public function __invoke(ResearchUpdateRequest $request): CallToolResult
             return ToolResult::error('Failed to update research: ' . $e->getMessage());
         }
     }
-
-    /**
-     * Get list of changes applied based on the request
-     */
-    private function getAppliedChanges(ResearchUpdateRequest $request): array
-    {
-        $changes = [];
-
-        if ($request->title !== null) {
-            $changes[] = 'title';
-        }
-
-        if ($request->description !== null) {
-            $changes[] = 'description';
-        }
-
-        if ($request->status !== null) {
-            $changes[] = 'status';
-        }
-
-        if ($request->tags !== null) {
-            $changes[] = 'tags';
-        }
-
-        if ($request->entryDirs !== null) {
-            $changes[] = 'entry_directories';
-        }
-
-        if ($request->memory !== null) {
-            $changes[] = 'memory';
-        }
-
-        return $changes;
-    }
 }

src/Storage/FileStorage/FileStorageConfig.php

@@ -20,53 +20,6 @@ public function __construct(
         public string $fileEncoding = 'utf-8',
     ) {}
 
-    /**
-     * Create from array configuration
-     */
-    public static function fromArray(array $config): self
-    {
-        return new self(
-            basePath: $config['base_path'] ?? '.researches',
-            templatesPath: $config['templates_path'] ?? '.templates',
-            defaultEntryStatus: $config['default_entry_status'] ?? 'draft',
-            createDirectoriesOnDemand: $config['create_directories_on_demand'] ?? true,
-            validateTemplatesOnBoot: $config['validate_templates_on_boot'] ?? true,
-            maxFileSize: $config['max_file_size'] ?? 10485760,
-            allowedExtensions: $config['allowed_extensions'] ?? ['md', 'yaml'],
-            fileEncoding: $config['file_encoding'] ?? 'utf-8',
-        );
-    }
-
-    /**
-     * Validate configuration values
-     */
-    public function validate(): array
-    {
-        $errors = [];
-
-        if (empty($this->basePath)) {
-            $errors[] = 'Base path cannot be empty';
-        }
-
-        if (empty($this->templatesPath)) {
-            $errors[] = 'Templates path cannot be empty';
-        }
-
-        if (empty($this->defaultEntryStatus)) {
-            $errors[] = 'Default entry status cannot be empty';
-        }
-
-        if ($this->maxFileSize <= 0) {
-            $errors[] = 'Max file size must be greater than 0';
-        }
-
-        if (empty($this->allowedExtensions)) {
-            $errors[] = 'At least one allowed extension must be specified';
-        }
-
-        return $errors;
-    }
-
     #[\Override]
     public function jsonSerialize(): array
     {

src/Storage/FileStorageBootloader.php

@@ -4,7 +4,6 @@
 
 namespace Butschster\ContextGenerator\Research\Storage;
 
-use Butschster\ContextGenerator\DirectoriesInterface;
 use Butschster\ContextGenerator\Research\Config\ResearchConfigInterface;
 use Butschster\ContextGenerator\Research\Repository\EntryRepositoryInterface;
 use Butschster\ContextGenerator\Research\Repository\ResearchRepositoryInterface;
@@ -38,16 +37,15 @@ public function defineSingletons(): array
                 FilesInterface $files,
                 LoggerInterface $logger,
                 ExceptionReporterInterface $reporter,
-                DirectoriesInterface $dirs,
                 TemplateRepositoryInterface $templateRepository,
                 ResearchRepositoryInterface $researchRepository,
                 EntryRepositoryInterface $entryRepository,
             ): StorageDriverInterface => new FileStorageDriver(
-                driverConfig: FileStorageConfig::fromArray([
-                    'base_path' => $config->getResearchesPath(),
-                    'templates_path' => $config->getTemplatesPath(),
-                    'default_entry_status' => $config->getDefaultEntryStatus(),
-                ]),
+                driverConfig: new FileStorageConfig(
+                    basePath: $config->getResearchesPath(),
+                    templatesPath: $config->getTemplatesPath(),
+                    defaultEntryStatus: $config->getDefaultEntryStatus(),
+                ),
                 templateRepository: $templateRepository,
                 researchRepository: $researchRepository,
                 entryRepository: $entryRepository,