Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions src/Api/ApiRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,7 @@ public function getMethodDescriptor(string $method, ?ApiCallContext $context = n
return null;
}

return new MethodDescriptor(
name: $interface . '.' . $descriptor->name,
description: $descriptor->description,
parameters: $descriptor->parameters,
returnType: $descriptor->returnType,
permissions: $descriptor->permissions,
);
return $this->prefixDescriptor($interface, $descriptor);
}

/**
Expand All @@ -88,13 +82,7 @@ public function listMethods(?ApiCallContext $context = null): array
$all = [];
foreach ($this->providers as $interface => $provider) {
foreach ($provider->listMethods($context) as $descriptor) {
$all[] = new MethodDescriptor(
name: $interface . '.' . $descriptor->name,
description: $descriptor->description,
parameters: $descriptor->parameters,
returnType: $descriptor->returnType,
permissions: $descriptor->permissions,
);
$all[] = $this->prefixDescriptor($interface, $descriptor);
}
}

Expand Down Expand Up @@ -153,6 +141,24 @@ public function getProviderForInterface(string $interface): ApiProvider|MethodIn
return $this->providers[$interface] ?? null;
}

/**
* Re-wrap a provider-local descriptor with the interface-prefixed name,
* preserving all other metadata (including the JSON schemas needed by
* MCP tool listings).
*/
private function prefixDescriptor(string $interface, MethodDescriptor $descriptor): MethodDescriptor
{
return new MethodDescriptor(
name: $interface . '.' . $descriptor->name,
description: $descriptor->description,
parameters: $descriptor->parameters,
returnType: $descriptor->returnType,
inputSchema: $descriptor->inputSchema,
outputSchema: $descriptor->outputSchema,
permissions: $descriptor->permissions,
);
}

/**
* @return array{string, string}|null
*/
Expand Down
36 changes: 36 additions & 0 deletions test/Unit/Api/ApiRegistryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,42 @@ public function testGetMethodDescriptorPrefixed(): void
$this->assertSame('List items', $desc->description);
}

public function testDescriptorSchemasPreserved(): void
{
$inputSchema = [
'type' => 'object',
'properties' => [
'pagename' => ['type' => 'string', 'description' => 'Page to edit'],
],
'required' => ['pagename'],
];
$outputSchema = ['type' => 'object'];
$provider = $this->makeProvider(
['edit' => fn() => null],
['edit' => new MethodDescriptor(
'edit',
description: 'Edit a page',
inputSchema: $inputSchema,
outputSchema: $outputSchema,
)],
);
$registry = new ApiRegistry();
$registry->registerProvider('wiki', $provider);

$desc = $registry->getMethodDescriptor('wiki.edit');

$this->assertNotNull($desc);
$this->assertSame($inputSchema, $desc->inputSchema);
$this->assertSame($outputSchema, $desc->outputSchema);

$listed = $registry->listMethods();

$this->assertCount(1, $listed);
$this->assertSame('wiki.edit', $listed[0]->name);
$this->assertSame($inputSchema, $listed[0]->inputSchema);
$this->assertSame($outputSchema, $listed[0]->outputSchema);
}

public function testUnknownInterfaceHasMethodReturnsFalse(): void
{
$registry = new ApiRegistry();
Expand Down
Loading