Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 77e1017d09 | |||
| c528067c79 | |||
| 433032701e | |||
| 4334420625 |
+1
-1
@@ -1,2 +1,2 @@
|
||||
parameters:
|
||||
app.version: '0.4.14'
|
||||
app.version: '0.4.16'
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\DependencyInjection\Compiler;
|
||||
|
||||
use App\Mcp\Schema\CoercingSchemaGenerator;
|
||||
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
|
||||
/**
|
||||
* Wires the CoercingSchemaGenerator into the MCP server builder so that
|
||||
* generated tool input schemas accept stringified scalar arguments.
|
||||
*/
|
||||
final class McpSchemaGeneratorPass implements CompilerPassInterface
|
||||
{
|
||||
public function process(ContainerBuilder $container): void
|
||||
{
|
||||
if (!$container->hasDefinition('mcp.server.builder')) {
|
||||
return;
|
||||
}
|
||||
|
||||
$container->getDefinition('mcp.server.builder')
|
||||
->addMethodCall('setSchemaGenerator', [new Reference(CoercingSchemaGenerator::class)])
|
||||
;
|
||||
}
|
||||
}
|
||||
@@ -4,10 +4,17 @@ declare(strict_types=1);
|
||||
|
||||
namespace App;
|
||||
|
||||
use App\DependencyInjection\Compiler\McpSchemaGeneratorPass;
|
||||
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
|
||||
|
||||
class Kernel extends BaseKernel
|
||||
{
|
||||
use MicroKernelTrait;
|
||||
|
||||
protected function build(ContainerBuilder $container): void
|
||||
{
|
||||
$container->addCompilerPass(new McpSchemaGeneratorPass());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Mcp\Schema;
|
||||
|
||||
use Mcp\Capability\Discovery\DocBlockParser;
|
||||
use Mcp\Capability\Discovery\SchemaGenerator;
|
||||
use Mcp\Capability\Discovery\SchemaGeneratorInterface;
|
||||
use Reflector;
|
||||
|
||||
use function count;
|
||||
use function in_array;
|
||||
use function is_array;
|
||||
|
||||
/**
|
||||
* Wraps the SDK SchemaGenerator and relaxes scalar parameter schemas so that
|
||||
* numeric/boolean parameters also accept their string representation.
|
||||
*
|
||||
* Rationale: some MCP clients serialize every JSON-RPC argument as a string
|
||||
* (e.g. `"22"` instead of `22`). The SDK validates arguments against the
|
||||
* generated JSON Schema BEFORE casting them (see CallToolHandler), so a strict
|
||||
* `integer` schema rejects `"22"` with a 422 even though the SDK's
|
||||
* ReferenceHandler::castArgumentType would happily coerce it afterwards.
|
||||
*
|
||||
* By advertising `["integer", "string"]` (resp. number/boolean) we let opis
|
||||
* accept the stringified value; the reflected PHP type hint (`int`, `bool`, ...)
|
||||
* still drives the actual coercion in ReferenceHandler. Non-numeric strings are
|
||||
* rejected later with a clear "cannot cast" error.
|
||||
*/
|
||||
final class CoercingSchemaGenerator implements SchemaGeneratorInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly SchemaGeneratorInterface $inner = new SchemaGenerator(new DocBlockParser()),
|
||||
) {}
|
||||
|
||||
public function generate(Reflector $reflection): array
|
||||
{
|
||||
$schema = $this->inner->generate($reflection);
|
||||
|
||||
if (isset($schema['properties']) && is_array($schema['properties'])) {
|
||||
foreach ($schema['properties'] as $name => $property) {
|
||||
if (is_array($property)) {
|
||||
$schema['properties'][$name] = $this->relaxNode($property);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $schema;
|
||||
}
|
||||
|
||||
public function generateOutputSchema(Reflector $reflection): ?array
|
||||
{
|
||||
return $this->inner->generateOutputSchema($reflection);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $node
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
private function relaxNode(array $node): array
|
||||
{
|
||||
if (isset($node['type'])) {
|
||||
$node['type'] = $this->relaxType($node['type']);
|
||||
}
|
||||
|
||||
// Relax array element types too (stringified IDs inside tagIds, etc.).
|
||||
if (isset($node['items']) && is_array($node['items'])) {
|
||||
$node['items'] = $this->relaxNode($node['items']);
|
||||
}
|
||||
|
||||
return $node;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds "string" to a type definition that allows integer/number/boolean.
|
||||
*
|
||||
* @param string|string[] $type
|
||||
*
|
||||
* @return string|string[]
|
||||
*/
|
||||
private function relaxType(array|string $type): array|string
|
||||
{
|
||||
$types = (array) $type;
|
||||
|
||||
$isNumericOrBool = in_array('integer', $types, true)
|
||||
|| in_array('number', $types, true)
|
||||
|| in_array('boolean', $types, true);
|
||||
|
||||
if ($isNumericOrBool && !in_array('string', $types, true)) {
|
||||
$types[] = 'string';
|
||||
}
|
||||
|
||||
return 1 === count($types) ? $types[0] : array_values($types);
|
||||
}
|
||||
}
|
||||
@@ -41,6 +41,10 @@ class CreateTaskTool
|
||||
private readonly CalDavService $calDavService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param int[] $tagIds IDs of the tags to attach
|
||||
* @param int[] $collaboratorIds IDs of the collaborators to attach
|
||||
*/
|
||||
public function __invoke(
|
||||
int $projectId,
|
||||
string $title,
|
||||
|
||||
@@ -18,6 +18,9 @@ class ListTasksTool
|
||||
private readonly Security $security,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param int[] $tagIds IDs of the tags to filter by
|
||||
*/
|
||||
public function __invoke(
|
||||
?int $projectId = null,
|
||||
?int $statusId = null,
|
||||
|
||||
@@ -38,6 +38,10 @@ class UpdateTaskTool
|
||||
private readonly CalDavService $calDavService,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param int[] $tagIds IDs of the tags to attach
|
||||
* @param int[] $collaboratorIds IDs of the collaborators to attach
|
||||
*/
|
||||
public function __invoke(
|
||||
int $id,
|
||||
?string $title = null,
|
||||
|
||||
@@ -33,6 +33,9 @@ class CreateTimeEntryTool
|
||||
private readonly Security $security,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param int[] $tagIds IDs of the tags to attach
|
||||
*/
|
||||
public function __invoke(
|
||||
int $userId,
|
||||
string $startedAt,
|
||||
|
||||
@@ -30,6 +30,9 @@ class UpdateTimeEntryTool
|
||||
private readonly Security $security,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* @param int[] $tagIds IDs of the tags to attach
|
||||
*/
|
||||
public function __invoke(
|
||||
int $id,
|
||||
?string $title = null,
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Unit\Mcp;
|
||||
|
||||
use App\Mcp\Schema\CoercingSchemaGenerator;
|
||||
use App\Mcp\Tool\Task\CreateTaskTool;
|
||||
use App\Mcp\Tool\Task\ListTasksTool;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use ReflectionMethod;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
*/
|
||||
class CoercingSchemaGeneratorTest extends TestCase
|
||||
{
|
||||
private CoercingSchemaGenerator $generator;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
$this->generator = new CoercingSchemaGenerator();
|
||||
}
|
||||
|
||||
public function testNullableIntegerScalarAlsoAcceptsString(): void
|
||||
{
|
||||
$schema = $this->generator->generate(new ReflectionMethod(ListTasksTool::class, '__invoke'));
|
||||
|
||||
// ?int $projectId -> ["null","integer"] relaxed with "string".
|
||||
self::assertSame(['null', 'integer', 'string'], $schema['properties']['projectId']['type']);
|
||||
}
|
||||
|
||||
public function testRequiredIntegerScalarAlsoAcceptsString(): void
|
||||
{
|
||||
$schema = $this->generator->generate(new ReflectionMethod(ListTasksTool::class, '__invoke'));
|
||||
|
||||
// int $limit = 100 -> "integer" relaxed to ["integer","string"].
|
||||
self::assertSame(['integer', 'string'], $schema['properties']['limit']['type']);
|
||||
}
|
||||
|
||||
public function testBooleanScalarAlsoAcceptsString(): void
|
||||
{
|
||||
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
|
||||
|
||||
// ?bool $syncToCalendar -> ["boolean","null"] relaxed with "string".
|
||||
$type = $schema['properties']['syncToCalendar']['type'];
|
||||
self::assertContains('boolean', $type);
|
||||
self::assertContains('string', $type);
|
||||
self::assertContains('null', $type);
|
||||
}
|
||||
|
||||
public function testArrayItemTypeAlsoAcceptsString(): void
|
||||
{
|
||||
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
|
||||
|
||||
// int[] $tagIds -> items {type: integer} relaxed to {type: [integer, string]}.
|
||||
self::assertSame(['integer', 'string'], $schema['properties']['tagIds']['items']['type']);
|
||||
}
|
||||
|
||||
public function testStringScalarIsLeftUntouched(): void
|
||||
{
|
||||
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
|
||||
|
||||
// string $title stays a plain string (no spurious relaxation).
|
||||
self::assertSame('string', $schema['properties']['title']['type']);
|
||||
}
|
||||
|
||||
public function testArrayContainerTypeIsNotRelaxed(): void
|
||||
{
|
||||
$schema = $this->generator->generate(new ReflectionMethod(CreateTaskTool::class, '__invoke'));
|
||||
|
||||
// The array container itself must not gain "string".
|
||||
self::assertSame(['array', 'null'], $schema['properties']['tagIds']['type']);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user