Skip to content

Hide inactive tools and block calls to them #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
traien wants to merge 1 commit into from
Closed

Hide inactive tools and block calls to them #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion src/files/custom/Espo/Modules/Mcp/Tools/Mcp/Tool/ToolProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public function __construct(
$tools = [];

foreach ($this->endpoint->getFeatures() as $feature) {
if (!$feature->isActive()) {
continue;
}

$tool = $this->getForFeature($feature);

if (!$tool) {
Expand Down Expand Up @@ -117,7 +121,19 @@ public function getAll(): array
*/
private function getEnvelopeAll(): array
{
return $this->dataCacheAccess->get();
$activeFeatureIds = [];

foreach ($this->endpoint->getFeatures() as $feature) {
if ($feature->isActive()) {
$activeFeatureIds[$feature->getId()] = true;
}
}

// Cached definitions must not restore a feature that was revoked or unlinked.
return array_values(array_filter(
$this->dataCacheAccess->get(),
fn (ToolEnvelope $item) => isset($activeFeatureIds[$item->featureId]),
));
}

/**
Expand Down
9 changes: 7 additions & 2 deletions src/files/custom/Espo/Modules/Mcp/Tools/Mcp/ToolsCall/ToolsCallGeneralProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ public function process(CallToolRequestParams $params): CallToolResult
{
$toolEnvelope = $this->toolProvider->get($params->name);

$this->jsonSchemaValidator->assert($toolEnvelope->tool->inputSchema, $params->arguments);

$feature = $this->getFeature($toolEnvelope->featureId, $params->name);

$this->jsonSchemaValidator->assert($toolEnvelope->tool->inputSchema, $params->arguments);

$processor = $this->processorFactory->create($params->name);

try {
Expand All @@ -76,6 +76,7 @@ public function process(CallToolRequestParams $params): CallToolResult

/**
* @throws InternalError
* @throws InvalidParamsError
*/
private function getFeature(string $id, string $name): Feature
{
Expand All @@ -85,6 +86,10 @@ private function getFeature(string $id, string $name): Feature
throw new InternalError("Feature `$id` for tool `$name` not found.");
}

if (!$feature->isActive()) {
throw new InvalidParamsError("Tool `$name` not found.");
}

return $feature;
}
}