From c404f3ed7c70d26461dbfb1a9c3fe6be575f441a Mon Sep 17 00:00:00 2001
From: Kyrian Obikwelu <koshnawaza@gmail.com>
Date: Wed, 25 Jun 2025 04:36:21 +0100
Subject: [PATCH] fix: improve error handling in ServerBuilder manual
 registration

This fixes the poor error reporting where users would only see generic
"X error(s) occurred during manual registration" instead of the actual
underlying error that caused the registration failure.
---
 src/ServerBuilder.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/ServerBuilder.php b/src/ServerBuilder.php
index 041a16c..69f2320 100644
--- a/src/ServerBuilder.php
+++ b/src/ServerBuilder.php
@@ -17,7 +17,7 @@
 use PhpMcp\Server\Contracts\SessionHandlerInterface;
 use PhpMcp\Server\Defaults\BasicContainer;
 use PhpMcp\Server\Exception\ConfigurationException;
-use PhpMcp\Server\Exception\DefinitionException;
+
 use PhpMcp\Server\Session\ArraySessionHandler;
 use PhpMcp\Server\Session\CacheSessionHandler;
 use PhpMcp\Server\Session\SessionManager;
@@ -286,7 +286,6 @@ private function registerManualElements(Registry $registry, LoggerInterface $log
             return;
         }
 
-        $errorCount = 0;
         $docBlockParser = new Utils\DocBlockParser($logger);
         $schemaGenerator = new Utils\SchemaGenerator($docBlockParser);
 
@@ -308,8 +307,8 @@ private function registerManualElements(Registry $registry, LoggerInterface $log
 
                 $logger->debug("Registered manual tool {$name} from handler {$className}::{$methodName}");
             } catch (Throwable $e) {
-                $errorCount++;
                 $logger->error('Failed to register manual tool', ['handler' => $data['handler'], 'name' => $data['name'], 'exception' => $e]);
+                throw new ConfigurationException("Error registering manual tool '{$data['name']}': {$e->getMessage()}", 0, $e);
             }
         }
 
@@ -334,8 +333,8 @@ private function registerManualElements(Registry $registry, LoggerInterface $log
 
                 $logger->debug("Registered manual resource {$name} from handler {$className}::{$methodName}");
             } catch (Throwable $e) {
-                $errorCount++;
                 $logger->error('Failed to register manual resource', ['handler' => $data['handler'], 'uri' => $data['uri'], 'exception' => $e]);
+                throw new ConfigurationException("Error registering manual resource '{$data['uri']}': {$e->getMessage()}", 0, $e);
             }
         }
 
@@ -360,8 +359,8 @@ private function registerManualElements(Registry $registry, LoggerInterface $log
 
                 $logger->debug("Registered manual template {$name} from handler {$className}::{$methodName}");
             } catch (Throwable $e) {
-                $errorCount++;
                 $logger->error('Failed to register manual template', ['handler' => $data['handler'], 'uriTemplate' => $data['uriTemplate'], 'exception' => $e]);
+                throw new ConfigurationException("Error registering manual resource template '{$data['uriTemplate']}': {$e->getMessage()}", 0, $e);
             }
         }
 
@@ -401,15 +400,11 @@ private function registerManualElements(Registry $registry, LoggerInterface $log
 
                 $logger->debug("Registered manual prompt {$name} from handler {$className}::{$methodName}");
             } catch (Throwable $e) {
-                $errorCount++;
                 $logger->error('Failed to register manual prompt', ['handler' => $data['handler'], 'name' => $data['name'], 'exception' => $e]);
+                throw new ConfigurationException("Error registering manual prompt '{$data['name']}': {$e->getMessage()}", 0, $e);
             }
         }
 
-        if ($errorCount > 0) {
-            throw new DefinitionException("{$errorCount} error(s) occurred during manual element registration. Check logs.");
-        }
-
         $logger->debug('Manual element registration complete.');
     }