Swapped Structured content implementation

Author: ineersa

.env

@@ -15,11 +15,11 @@
 # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
-APP_ENV=prod
-APP_DEBUG=false
+APP_ENV=dev
+APP_DEBUG=true
 LOG_LEVEL=info
 # Where to store logs
-APP_LOG_DIR="/tmp/mcp/browser-mcp/log"
+#APP_LOG_DIR="/tmp/mcp/browser-mcp/log"
 ###< symfony/framework-bundle ###
 
 BROWSER_BACKEND=searxng

composer.lock

@@ -80,8 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 logger: $this->logger,
             );
 
-            $server->connect($transport);
-            $transport->listen();
+            $server->run($transport);
         } catch (\Throwable $e) {
             $this->logger->error($e->getMessage(), [
                 'trace' => $e->getTrace(),

src/Command/BrowserMcpCommand.php

@@ -9,6 +9,8 @@
 use App\Service\FindService;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\Result\CallToolResult;
+use Mcp\Schema\Result\CallToolResultInterface;
+use Mcp\Schema\Result\CallToolStructuredContentResult;
 
 final class FindTool
 {
@@ -24,7 +26,7 @@ public function __construct(
     public function __invoke(
         string $url,
         string $regex,
-    ): CallToolResult {
+    ): CallToolResultInterface {
         try {
             if ('' === trim($url)) {
                 throw new ToolUsageError('Invalid URL provided. The FindTool requires a non-empty URL.')->setHint('Use an absolute URL from a previous search result or open call.');
@@ -38,12 +40,14 @@ public function __invoke(
 
             $content = new TextContent($result);
 
-            return new CallToolResult([$content], null, false);
+            $callToolResult = new CallToolResult([$content], false);
+
+            return new CallToolStructuredContentResult(['result' => $result], $callToolResult);
         } catch (ToolUsageError|BackendError $exception) {
             $result = "Result: error\n Error Message: ".$exception->getMessage()."\n Hint: ".$exception->getHint();
             $content = new TextContent(text: $result);
 
-            return new CallToolResult([$content], null, true);
+            return new CallToolStructuredContentResult(['result' => $result], new CallToolResult([$content], true));
         }
     }
 }

src/Tools/FindTool.php

@@ -9,6 +9,8 @@
 use App\Service\OpenService;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\Result\CallToolResult;
+use Mcp\Schema\Result\CallToolResultInterface;
+use Mcp\Schema\Result\CallToolStructuredContentResult;
 
 final class OpenTool
 {
@@ -25,7 +27,7 @@ public function __invoke(
         string $url,
         int $start_at_line,
         int $number_of_lines,
-    ): CallToolResult {
+    ): CallToolResultInterface {
         try {
             if ('' === trim($url)) {
                 throw new ToolUsageError('Invalid URL provided.')->setHint('Use an absolute URL such as `https://example.com/article`.');
@@ -43,12 +45,14 @@ public function __invoke(
 
             $content = new TextContent($result);
 
-            return new CallToolResult([$content], null, false);
+            $callToolResult = new CallToolResult([$content], false);
+
+            return new CallToolStructuredContentResult(['result' => $result], $callToolResult);
         } catch (ToolUsageError|BackendError $exception) {
             $result = "Result: error\n Error Message: ".$exception->getMessage()."\n Hint: ".$exception->getHint();
             $content = new TextContent(text: $result);
 
-            return new CallToolResult([$content], null, true);
+            return new CallToolStructuredContentResult(['result' => $result], new CallToolResult([$content], true));
         }
     }
 }

src/Tools/OpenTool.php

@@ -9,6 +9,8 @@
 use App\Service\SearchService;
 use Mcp\Schema\Content\TextContent;
 use Mcp\Schema\Result\CallToolResult;
+use Mcp\Schema\Result\CallToolResultInterface;
+use Mcp\Schema\Result\CallToolStructuredContentResult;
 
 final class SearchTool
 {
@@ -24,17 +26,19 @@ public function __construct(
     public function __invoke(
         string $query,
         int $topn = 5,
-    ): CallToolResult {
+    ): CallToolResultInterface {
         try {
             $result = $this->searchService->__invoke($query, $topn);
             $content = new TextContent($result);
 
-            return new CallToolResult([$content], null, false);
+            $callToolResult = new CallToolResult([$content], false);
+
+            return new CallToolStructuredContentResult(['result' => $result], $callToolResult);
         } catch (ToolUsageError|BackendError $exception) {
             $result = "Result: error\n Error Message: ".$exception->getMessage()."\n Hint: ".$exception->getHint();
             $content = new TextContent(text: $result);
 
-            return new CallToolResult([$content], null, true);
+            return new CallToolStructuredContentResult(['result' => $result], new CallToolResult([$content], true));
         }
     }
 }