wip

Author: sixlive

composer.json

@@ -4,7 +4,7 @@
   "type": "library",
   "require": {
     "php": "^8.3",
-    "prism-php/prism": ">=0.56 ^0",
+    "prism-php/prism": "dev-main",
     "laravel/framework": "^11.0|^12.0"
   },
   "require-dev": {

src/Relay.php

@@ -178,8 +178,30 @@ protected function createHandlerFunction(string $toolName, array $definition): c
             return fn ($script = null): string => $this->callMCPTool($toolName, ['script' => $script]);
         }
 
-        // Default generic handler for any other tool
-        return fn ($parameters = []): string => $this->callMCPTool($toolName, $parameters);
+        // Default generic handler for any other tool - handle both individual params and array
+        return function (...$args) use ($toolName, $definition): string {
+            // Check if we have named parameters (associative array)
+            if ($args !== [] && array_keys($args) !== range(0, count($args) - 1)) {
+                // We have named parameters, use them directly
+                return $this->callMCPTool($toolName, $args);
+            }
+            // If first argument is an array, use it as parameters
+            if (count($args) === 1 && isset($args[0]) && is_array($args[0])) {
+                return $this->callMCPTool($toolName, $args[0]);
+            }
+
+            // Otherwise, map positional arguments to parameter names
+            $requiredParams = $this->getRequiredParameters($definition);
+            $parameters = [];
+
+            foreach ($requiredParams as $index => $paramName) {
+                if (isset($args[$index])) {
+                    $parameters[$paramName] = $args[$index];
+                }
+            }
+
+            return $this->callMCPTool($toolName, $parameters);
+        };
     }
 
     /**
@@ -319,7 +341,7 @@ protected function addParameter(Tool $tool, string $name, string $type, string $
     }
 
     /**
-     * @param  array<string, mixed>|object|string  $parameters
+     * @param  array<string|int, mixed>|object|string  $parameters
      *
      * @throws ToolCallException
      */
@@ -350,7 +372,7 @@ protected function extractBaseToolName(string $toolName): string
     }
 
     /**
-     * @param  array<string, mixed>|object|string  $parameters
+     * @param  array<string|int, mixed>|object|string  $parameters
      * @return array<string, mixed>
      */
     protected function normalizeParameters(string $baseToolName, $parameters): array
@@ -395,11 +417,13 @@ protected function executeMCPToolCall(string $toolName, array $parameters): arra
         // MCP requires arguments to be an object, not an array
         $normalizedParamsObject = (object) $parameters;
 
-        // Call the tool using JSON-RPC format with correct MCP endpoint: tools/call
-        return $this->transport->sendRequest('tools/call', [
+        $requestParams = [
             'name' => $toolName,
             'arguments' => $normalizedParamsObject,
-        ]);
+        ];
+
+        // Call the tool using JSON-RPC format with correct MCP endpoint: tools/call
+        return $this->transport->sendRequest('tools/call', $requestParams);
     }
 
     /**

src/Transport/StdioTransport.php

@@ -81,13 +81,15 @@ public function close(): void
 
     public function command(): string
     {
+        $command = $this->config['command'];
+
         $parts = array_map(function (string|array $part): string {
             if (is_array($part)) {
                 return addslashes(json_encode($part) ?: '');
             }
 
             return $part;
-        }, $this->config['command']);
+        }, $command);
 
         return implode(' ', $parts);
     }
@@ -196,16 +198,29 @@ protected function sendPingRequest(): void
             throw new TransportException('Input stream not initialized');
         }
 
+        // Send proper MCP initialize request instead of ping
         $this->requestId++;
-        $pingRequest = json_encode([
+        $initializeRequest = json_encode([
             'jsonrpc' => '2.0',
             'id' => (string) $this->requestId,
-            'method' => 'ping',
+            'method' => 'initialize',
+            'params' => [
+                'protocolVersion' => '2024-11-05',
+                'capabilities' => new \stdClass,
+            ],
         ]).PHP_EOL;
-        $this->inputStream->write($pingRequest);
 
-        // Reset the request ID as this was just a ping
-        $this->requestId--;
+        $this->inputStream->write($initializeRequest);
+
+        // Send initialized notification
+        $initializedNotification = json_encode([
+            'jsonrpc' => '2.0',
+            'method' => 'notifications/initialized',
+        ]).PHP_EOL;
+
+        $this->inputStream->write($initializedNotification);
+
+        // Don't reset the request ID - we expect a response to initialize
     }
 
     /**
@@ -246,6 +261,7 @@ protected function prepareRequest(string $method, array $params = []): void
         }
 
         $jsonRequest = json_encode($requestPayload, JSON_UNESCAPED_SLASHES).PHP_EOL;
+
         $this->inputStream->write($jsonRequest);
         $this->process->clearErrorOutput();
         $this->process->clearOutput();