Merge pull request #94 from context-hub/issue/91

MCP improvements

Author: butschster

.gitignore

@@ -10,4 +10,5 @@ vendor
 node_modules
 .php-cs-fixer.cache
 .context
-runtime
+runtime
+mcp-*.log

composer.json

@@ -31,7 +31,10 @@
     "nikic/php-parser": "^v4.0 | ^v5.0",
     "vlucas/phpdotenv": "^5.6",
     "symfony/yaml": "^7.2",
-    "logiscape/mcp-sdk-php": "^1.0"
+    "logiscape/mcp-sdk-php": "^1.0",
+    "league/route": "^6.2",
+    "laminas/laminas-diactoros": "^3.5",
+    "spiral/core": "^3.15"
   },
   "require-dev": {
     "buggregator/trap": "^1.13",

context-generator

@@ -15,11 +15,24 @@ use Butschster\ContextGenerator\Console\SelfUpdateCommand;
 use Butschster\ContextGenerator\Console\VersionCommand;
 use Butschster\ContextGenerator\Lib\Content\ContentBuilderFactory;
 use Butschster\ContextGenerator\Lib\Content\Renderer\MarkdownRenderer;
+use Butschster\ContextGenerator\Lib\Content\Renderer\RendererInterface;
 use Butschster\ContextGenerator\Lib\Files;
+use Butschster\ContextGenerator\Lib\GithubClient\GithubClientInterface;
 use Butschster\ContextGenerator\Lib\HttpClient\HttpClientFactory;
+use Butschster\ContextGenerator\Lib\HttpClient\HttpClientInterface;
+use Butschster\ContextGenerator\Lib\Logger\ConsoleLogger;
 use Butschster\ContextGenerator\Lib\Logger\LoggerFactory;
+use Butschster\ContextGenerator\McpServer\Registry\McpItemsRegistry;
+use Butschster\ContextGenerator\McpServer\Routing\McpResponseStrategy;
+use Butschster\ContextGenerator\McpServer\Routing\RouteRegistrar;
+use Butschster\ContextGenerator\Modifier\SourceModifierRegistry;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\HttpFactory;
+use League\Route\Router;
+use League\Route\Strategy\StrategyInterface;
+use Monolog\ErrorHandler;
+use Psr\Container\ContainerInterface;
+use Spiral\Core\Container;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -29,7 +42,7 @@ use Symfony\Component\Console\Style\SymfonyStyle;
 //  Prepare Global Environment
 // -----------------------------------------------------------------------------
 
-\error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
+\error_reporting(E_ERROR);
 
 
 // -----------------------------------------------------------------------------
@@ -85,6 +98,11 @@ $application->setDefaultCommand('generate');
 $input = new ArgvInput();
 $output = new SymfonyStyle($input, new ConsoleOutput());
 
+$errorHandler = new ErrorHandler(new ConsoleLogger($output));
+$errorHandler->registerExceptionHandler();
+$errorHandler->registerErrorHandler();
+$errorHandler->registerFatalHandler();
+
 $vendorPath = \dirname($vendorPath) . '/../';
 $versionFile = $vendorPath . '/version.json';
 $appPath = \realpath($vendorPath);
@@ -102,109 +120,87 @@ if ($insidePhar) {
     $appPath = \getcwd();
 }
 
-// Create base services
-$files = new Files();
-$httpClient = new Client();
-$httpMessageFactory = new HttpFactory();
-$httpClientAdapter = HttpClientFactory::create(
-    $httpClient,
-    $httpMessageFactory,
+$container = new Container();
+$container->bindSingleton(
+    Directories::class,
+    new Directories(
+        rootPath: $appPath,
+        outputPath: $appPath . '/.context',
+        configPath: $appPath,
+        jsonSchemaPath: __DIR__ . '/json-schema.json',
+    ),
 );
 
-// Create the factory chain for the GenerateCommand
-$contentBuilderFactory = new ContentBuilderFactory(
-    defaultRenderer: new MarkdownRenderer(),
+$container->bindSingleton(ParserPluginRegistry::class, static fn() => ParserPluginRegistry::createDefault());
+$container->bindSingleton(ConfigurationProviderFactory::class, ConfigurationProviderFactory::class);
+$container->bindSingleton(FilesInterface::class, Files::class);
+$container->bindSingleton(StrategyInterface::class, McpResponseStrategy::class);
+$container->bindSingleton(
+    SourceModifierRegistry::class,
+    static fn(ModifierRegistryFactory $factory) => $factory->create(),
 );
-
-$githubClientFactory = new GithubClientFactory(
-    httpClient: $httpClientAdapter,
-    defaultToken: \getenv('GITHUB_TOKEN') ?: null,
+$container->bindSingleton(
+    HttpClientInterface::class,
+    static function (Client $httpClient, HttpFactory $httpMessageFactory) {
+        return HttpClientFactory::create(
+            $httpClient,
+            $httpMessageFactory,
+        );
+    },
 );
-
-$variableResolverFactory = new VariableResolverFactory();
-$modifierRegistryFactory = new ModifierRegistryFactory();
-
-// Create the source fetcher registry factory with its dependencies
-$sourceFetcherRegistryFactory = new SourceFetcherRegistryFactory(
-    httpClient: $httpClientAdapter,
-    contentBuilderFactory: $contentBuilderFactory,
-    variableResolverFactory: $variableResolverFactory,
-    githubClientFactory: $githubClientFactory,
-);
-
-// Create the document compiler factory with its dependencies
-$documentCompilerFactory = new DocumentCompilerFactory(
-    files: $files,
-    sourceFetcherRegistryFactory: $sourceFetcherRegistryFactory,
-    modifierRegistryFactory: $modifierRegistryFactory,
-    contentBuilderFactory: $contentBuilderFactory,
+$container->bindSingleton(RendererInterface::class, MarkdownRenderer::class);
+$container->bindSingleton(ContentBuilderFactory::class, ContentBuilderFactory::class);
+$container->bindSingleton(
+    GithubClientInterface::class,
+    static fn(HttpClientInterface $httpClient) => new GithubClientFactory(
+        httpClient: $httpClient,
+        defaultToken: \getenv('GITHUB_TOKEN') ?: null,
+    ),
 );
 
-$configProviderFactory = new ConfigurationProviderFactory(
-    parserPluginRegistry: ParserPluginRegistry::createDefault(),
-);
+$container->bindSingleton(LoggerFactory::class, LoggerFactory::class);
+$container->bindSingleton(Router::class, static function (StrategyInterface $strategy, ContainerInterface $container) {
+    $router = new Router();
+    $strategy->setContainer($container);
+    $router->setStrategy($strategy);
 
-$logger = LoggerFactory::create(
-    output: $output,
-    loggingEnabled: $output->isVerbose() || $output->isDebug() || $output->isVeryVerbose(),
-);
+    return $router;
+});
+$container->bindSingleton(RouteRegistrar::class, RouteRegistrar::class);
+$container->bindSingleton(McpItemsRegistry::class, McpItemsRegistry::class);
 
 // Register all commands
 $application->add(
-    new VersionCommand(
-        version: $version['version'] ?? 'dev',
-        httpClient: $httpClientAdapter,
-    ),
+    $container->make(VersionCommand::class, [
+        'version' => $version['version'] ?? 'dev',
+    ]),
 );
 
 $application->add(
-    new InitCommand(
-        baseDir: $appPath,
-        files: $files,
-    ),
+    $container->make(InitCommand::class),
 );
 
 $application->add(
-    new SchemaCommand(
-        httpClient: $httpClientAdapter,
-    ),
+    $container->make(SchemaCommand::class),
 );
 
 $application->add(
-    new SelfUpdateCommand(
-        version: $version['version'] ?? 'dev',
-        httpClient: $httpClientAdapter,
-        files: $files,
-        binaryType: $type,
-    ),
+    $container->make(SelfUpdateCommand::class, [
+        'version' => $version['version'] ?? 'dev',
+        'binaryType' => $type,
+    ]),
 );
 
 $application->add(
-    new GenerateCommand(
-        rootPath: $appPath,
-        outputPath: $appPath . '/.context',
-        files: $files,
-        documentCompilerFactory: $documentCompilerFactory,
-        configurationProviderFactory: $configProviderFactory,
-    ),
+    $container->make(GenerateCommand::class),
 );
 
 $application->add(
-    new DisplayCommand(
-        rootPath: $appPath,
-        files: $files,
-        configurationProviderFactory: $configProviderFactory,
-    ),
+    $container->make(DisplayCommand::class),
 );
 
 $application->add(
-    new MCPServerCommand(
-        rootPath: $appPath,
-        jsonSchemaPath: __DIR__ . '/json-schema.json',
-        files: $files,
-        documentCompilerFactory: $documentCompilerFactory,
-        configurationProviderFactory: $configProviderFactory,
-    ),
+    $container->make(MCPServerCommand::class),
 );
 
 $application->run($input, $output);

context.yaml

@@ -252,6 +252,22 @@ documents:
         sourcePaths:
           - tests
 
+  - description: "MCP Server Actions"
+    outputPath: "mcp/actions.md"
+    sources:
+      - type: file
+        sourcePaths:
+          - src/McpServer/Action
+
+  - description: "MCP Server routing"
+    outputPath: "mcp/routing.md"
+    sources:
+      - type: file
+        sourcePaths:
+          - src/McpServer/Routing
+          - src/McpServer/Server.php
+          - src/McpServer/ServerFactory.php
+
   - description: "Changes in the Project"
     outputPath: "changes.md"
     sources:

src/ConfigLoader/context.yaml

@@ -0,0 +1,8 @@
+documents:
+  - description: Configuration System
+    outputPath: core/config-loader.md
+    sources:
+      - type: file
+        sourcePaths: .
+        filePattern: '*.php'
+        showTreeView: true

src/ConfigurationProviderConfig.php

@@ -4,24 +4,13 @@
 
 namespace Butschster\ContextGenerator;
 
-use Butschster\ContextGenerator\ConfigLoader\Parser\ConfigParserPluginInterface;
-use Butschster\ContextGenerator\Lib\Logger\HasPrefixLoggerInterface;
-use Psr\Log\LoggerInterface;
-
+/**
+ * @deprecated
+ */
 final readonly class ConfigurationProviderConfig
 {
-    /**
-     * @param string $rootPath The root path for configuration files
-     * @param FilesInterface $files File system interface
-     * @param string|null $configPath Specific configuration file path
-     * @param string|null $inlineConfig Inline JSON configuration
-     * @param HasPrefixLoggerInterface&LoggerInterface $logger Logger instance
-     * @param array<ConfigParserPluginInterface> $parserPlugins Parser plugins for configuration
-     */
     public function __construct(
         public string $rootPath,
-        public FilesInterface $files,
-        public LoggerInterface $logger,
         public ?string $configPath = null,
         public ?string $inlineConfig = null,
         public array $parserPlugins = [],

src/ConfigurationProviderFactory.php

@@ -7,31 +7,28 @@
 use Butschster\ContextGenerator\ConfigLoader\ConfigLoaderFactory;
 use Butschster\ContextGenerator\ConfigLoader\ConfigurationProvider;
 use Butschster\ContextGenerator\ConfigLoader\Parser\ParserPluginRegistry;
+use Butschster\ContextGenerator\Lib\Logger\HasPrefixLoggerInterface;
 
 final readonly class ConfigurationProviderFactory
 {
     public function __construct(
         private ParserPluginRegistry $parserPluginRegistry,
+        private FilesInterface $files,
+        private HasPrefixLoggerInterface $logger,
     ) {}
 
-    public function create(ConfigurationProviderConfig $config): ConfigurationProvider
+    public function create(Directories $dirs): ConfigurationProvider
     {
-        // If custom parser plugins are not provided, use the ones from the registry
-        $parserPlugins = $config->parserPlugins;
-        if (empty($parserPlugins)) {
-            $parserPlugins = $this->parserPluginRegistry->getPlugins();
-        }
-
         return new ConfigurationProvider(
             loaderFactory: new ConfigLoaderFactory(
-                files: $config->files,
-                rootPath: $config->rootPath,
-                logger: $config->logger->withPrefix('config-loader'),
+                files: $this->files,
+                rootPath: $dirs->rootPath,
+                logger: $this->logger->withPrefix('config-loader'),
             ),
-            files: $config->files,
-            rootPath: $config->rootPath,
-            logger: $config->logger->withPrefix('config-provider'),
-            parserPlugins: $parserPlugins,
+            files: $this->files,
+            rootPath: $dirs->rootPath,
+            logger: $this->logger->withPrefix('config-provider'),
+            parserPlugins: $this->parserPluginRegistry->getPlugins(),
         );
     }
 }