feat: configurable exposure policy for direct, indirect and disabled tools

Introduces ExposurePolicy (option lit_mcp_exposure) deciding per ability
whether it is a direct MCP tool, only reachable via mcp-adapter's
execute-ability meta-tool, or disabled entirely (not registered with the
Abilities API at all). Ability::isDirect() remains the default when no
override applies. lit/guide can never be disabled or made indirect;
lit/media-preview and lit/media-download (image/embedded-resource results)
can never be made indirect, only direct or disabled.

AbilityRegistrar and ServerRegistrar take an optional ExposurePolicy and
use it to filter registered abilities / compute the direct tool list.
IntegrationRegistry::directAbilityNames() is removed (superseded by
ExposurePolicy::directNames()). InstructionsBuilder now also takes the
policy and lists the currently direct tools by name (lit-<name>), noting
the rest are reachable via mcp-adapter-execute-ability as lit/<name>.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01At3V6SjwbMe6eMzVGW3Hs7
This commit is contained in:
2026-09-26 03:04:14 +02:00
co-authored by Claude Opus 5.5
parent 7f136f6f4c
commit 2f8a9f0c61
11 changed files with 362 additions and 26 deletions
@@ -7,6 +7,7 @@ namespace LIT\MCP\Tests\Unit\Abilities;
use Brain\Monkey\Functions;
use LIT\MCP\Abilities\Ability;
use LIT\MCP\Abilities\AbilityRegistrar;
use LIT\MCP\Abilities\ExposurePolicy;
use LIT\MCP\Abilities\WriteFailed;
use LIT\MCP\Integrations\Integration;
use LIT\MCP\Integrations\IntegrationRegistry;
@@ -185,4 +186,17 @@ final class AbilityRegistrarTest extends TestCase
$this->registrarFor($ability)->registerAbilities();
}
public function testDisabledAbilitiesAreNotRegistered(): void
{
$ability = $this->ability();
$integration = Mockery::mock(Integration::class);
$integration->allows('id')->andReturn('core');
$integration->allows('isAvailable')->andReturn(true);
$integration->allows('abilities')->andReturn([$ability]);
Functions\expect('wp_register_ability')->never();
(new AbilityRegistrar(new IntegrationRegistry($integration), new ExposurePolicy(['lit/test' => 'disabled'])))
->registerAbilities();
}
}
+116
View File
@@ -0,0 +1,116 @@
<?php
declare(strict_types=1);
namespace LIT\MCP\Tests\Unit\Abilities;
use Brain\Monkey\Functions;
use LIT\MCP\Abilities\Ability;
use LIT\MCP\Abilities\ExposurePolicy;
use LIT\MCP\Tests\Unit\TestCase;
use Mockery;
final class ExposurePolicyTest extends TestCase
{
private function ability(string $name, bool $direct): Ability
{
$ability = Mockery::mock(Ability::class);
$ability->allows('name')->andReturn($name);
$ability->allows('isDirect')->andReturn($direct);
return $ability;
}
public function testDefaultFollowsIsDirect(): void
{
$policy = new ExposurePolicy();
self::assertSame('direct', $policy->mode($this->ability('lit/content-get', true)));
self::assertSame('indirect', $policy->mode($this->ability('lit/menu-list', false)));
}
public function testOverridesChangeTheMode(): void
{
$policy = new ExposurePolicy(['lit/content-get' => 'indirect', 'lit/menu-list' => 'disabled']);
self::assertSame('indirect', $policy->mode($this->ability('lit/content-get', true)));
self::assertSame('disabled', $policy->mode($this->ability('lit/menu-list', false)));
}
public function testImpossibleOrBrokenOverridesFallBackToTheDefault(): void
{
$policy = new ExposurePolicy([
'lit/media-preview' => 'indirect',
'lit/media-download' => 'indirect',
'lit/guide' => 'disabled',
'lit/content-get' => 'sometimes',
]);
self::assertSame('direct', $policy->mode($this->ability('lit/media-preview', true)));
self::assertSame('direct', $policy->mode($this->ability('lit/media-download', true)));
self::assertSame('direct', $policy->mode($this->ability('lit/guide', true)));
self::assertSame('direct', $policy->mode($this->ability('lit/content-get', true)));
}
public function testGuideCanNeitherBeDisabledNorMadeIndirect(): void
{
$policy = new ExposurePolicy(['lit/guide' => 'indirect']);
self::assertSame('direct', $policy->mode($this->ability('lit/guide', true)));
self::assertFalse(ExposurePolicy::isAllowed('lit/guide', 'indirect'));
self::assertFalse(ExposurePolicy::isAllowed('lit/guide', 'disabled'));
self::assertTrue(ExposurePolicy::isAllowed('lit/guide', 'direct'));
}
public function testMediaPreviewAndDownloadMayStillBeDisabled(): void
{
$policy = new ExposurePolicy(['lit/media-preview' => 'disabled', 'lit/media-download' => 'disabled']);
self::assertSame('disabled', $policy->mode($this->ability('lit/media-preview', true)));
self::assertSame('disabled', $policy->mode($this->ability('lit/media-download', true)));
}
public function testEnabledAndDirectNamesKeepTheRegistryOrder(): void
{
$a = $this->ability('lit/a', true);
$b = $this->ability('lit/b', false);
$c = $this->ability('lit/c', true);
$policy = new ExposurePolicy(['lit/b' => 'direct', 'lit/c' => 'disabled']);
self::assertSame([$a, $b], $policy->enabled([$a, $b, $c]));
self::assertSame(['lit/a', 'lit/b'], $policy->directNames([$a, $b, $c]));
}
public function testSanitizeKeepsOnlyValidEntries(): void
{
self::assertSame(
['lit/content-get' => 'indirect', 'lit/menu-list' => 'disabled'],
ExposurePolicy::sanitize([
'lit/menu-list' => 'disabled',
'lit/content-get' => 'indirect',
'lit/guide' => 'disabled',
'<script>' => 'direct',
'lit/x' => ['direct'],
])
);
self::assertSame([], ExposurePolicy::sanitize('garbage'));
}
public function testSanitizeRejectsIndirectForDirectOnlyAbilities(): void
{
self::assertSame(
['lit/media-preview' => 'disabled'],
ExposurePolicy::sanitize([
'lit/media-preview' => 'disabled',
'lit/media-download' => 'indirect',
])
);
}
public function testFromOptionToleratesACorruptOption(): void
{
Functions\when('get_option')->justReturn('garbage');
self::assertSame('direct', ExposurePolicy::fromOption()->mode($this->ability('lit/a', true)));
}
}
+48 -4
View File
@@ -4,6 +4,8 @@ declare(strict_types=1);
namespace LIT\MCP\Tests\Unit\Guides;
use LIT\MCP\Abilities\Ability;
use LIT\MCP\Abilities\ExposurePolicy;
use LIT\MCP\Guides\InstructionsBuilder;
use LIT\MCP\Integrations\Integration;
use LIT\MCP\Integrations\IntegrationRegistry;
@@ -12,11 +14,28 @@ use Mockery;
final class InstructionsBuilderTest extends TestCase
{
public function testNamesActiveIntegrationsAndCoreRules(): void
private function ability(string $name, bool $direct): Ability
{
$ability = Mockery::mock(Ability::class);
$ability->allows('name')->andReturn($name);
$ability->allows('isDirect')->andReturn($direct);
return $ability;
}
private function coreWith(Ability ...$abilities): Integration
{
$core = Mockery::mock(Integration::class);
$core->allows('id')->andReturn('core');
$core->allows('isAvailable')->andReturn(true);
$core->allows('abilities')->andReturn(array_values($abilities));
return $core;
}
public function testNamesActiveIntegrationsAndCoreRules(): void
{
$core = $this->coreWith($this->ability('lit/guide', true), $this->ability('lit/menu-list', false));
$text = (new InstructionsBuilder(new IntegrationRegistry($core)))->build();
@@ -28,9 +47,7 @@ final class InstructionsBuilderTest extends TestCase
public function testListsPostTypesWhenAProviderIsGiven(): void
{
$core = Mockery::mock(Integration::class);
$core->allows('id')->andReturn('core');
$core->allows('isAvailable')->andReturn(true);
$core = $this->coreWith($this->ability('lit/guide', true));
$text = (new InstructionsBuilder(new IntegrationRegistry($core), static fn (): array => ['page', 'post']))->build();
@@ -38,4 +55,31 @@ final class InstructionsBuilderTest extends TestCase
self::assertStringContainsString('lit-content-types', $text);
self::assertStringContainsString('confirm: true', $text);
}
public function testListsTheCurrentlyDirectToolsByToolNameAndNamesTheRestNeutrally(): void
{
$core = $this->coreWith(
$this->ability('lit/guide', true),
$this->ability('lit/menu-list', false)
);
$text = (new InstructionsBuilder(new IntegrationRegistry($core)))->build();
self::assertStringContainsString('Direkt aufrufbare Tools: lit-guide', $text);
self::assertStringContainsString('mcp-adapter-execute-ability', $text);
self::assertStringNotContainsString('lit-menu-list', $text);
}
public function testDirectToolListReflectsExposurePolicyOverrides(): void
{
$core = $this->coreWith(
$this->ability('lit/guide', true),
$this->ability('lit/menu-list', false)
);
$policy = new ExposurePolicy(['lit/menu-list' => 'direct']);
$text = (new InstructionsBuilder(new IntegrationRegistry($core), null, $policy))->build();
self::assertStringContainsString('lit-menu-list', $text);
}
}
@@ -25,7 +25,6 @@ final class IntegrationRegistryTest extends TestCase
self::assertSame(['core'], array_map(static fn ($i) => $i->id(), $registry->available()));
self::assertSame([$direct, $indirect], $registry->abilities());
self::assertSame(['lit/a'], $registry->directAbilityNames());
}
private function ability(string $name, bool $direct): Ability
+28
View File
@@ -7,6 +7,7 @@ namespace LIT\MCP\Tests\Unit\Server;
use Brain\Monkey\Filters;
use Brain\Monkey\Functions;
use LIT\MCP\Abilities\Ability;
use LIT\MCP\Abilities\ExposurePolicy;
use LIT\MCP\Guides\InstructionsBuilder;
use LIT\MCP\Integrations\Integration;
use LIT\MCP\Integrations\IntegrationRegistry;
@@ -61,6 +62,33 @@ final class ServerRegistrarTest extends TestCase
self::assertNotContains('lit/rare-tool', $args['tools']);
}
public function testExposurePolicyDecidesWhichToolsAreDirect(): void
{
// Deviation from the brief: the brief's original test demoted lit/guide to
// indirect, but the controller's fixed constraint for this task is that
// lit/guide can neither be disabled nor made indirect (see ExposurePolicy::
// REQUIRED / ExposurePolicyTest::testGuideCanNeitherBeDisabledNorMadeIndirect).
// Using a demotable direct ability here instead proves the same thing: the
// policy, not Ability::isDirect(), decides the tool list.
$optional = Mockery::mock(Ability::class);
$optional->allows('name')->andReturn('lit/optional-tool');
$optional->allows('isDirect')->andReturn(true);
$core = Mockery::mock(Integration::class);
$core->allows('id')->andReturn('core');
$core->allows('isAvailable')->andReturn(true);
$core->allows('abilities')->andReturn([$optional]);
$registry = new IntegrationRegistry($core, ...$this->registry()->available());
$policy = new ExposurePolicy(['lit/optional-tool' => 'indirect', 'lit/rare-tool' => 'direct']);
$registrar = new ServerRegistrar($registry, $this->instructions(), static fn () => true, null, null, $policy);
self::assertSame(
['lit/guide', 'lit/rare-tool', 'mcp-adapter/discover-abilities', 'mcp-adapter/get-ability-info', 'mcp-adapter/execute-ability'],
$registrar->serverArguments()['tools']
);
}
public function testNoServerWhenOauthIsDisabled(): void
{
$registrar = new ServerRegistrar($this->registry(), $this->instructions(), static fn () => false);