Skip to content

[Server] Fixed Discoverer file processing for PHAR #94

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

Merged
merged 1 commit into from
Oct 8, 2025
+22 −29
Merged

[Server] Fixed Discoverer file processing for PHAR #94

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
51 changes: 22 additions & 29 deletions src/Capability/Discovery/Discoverer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,9 @@ public function discover(string $basePath, array $directories, array $excludeDir
*/
private function processFile(SplFileInfo $file, array &$discoveredCount, array &$tools, array &$resources, array &$prompts, array &$resourceTemplates): void
{
$filePath = $file->getRealPath();
if (false === $filePath) {
$this->logger->warning('Could not get real path for file', ['path' => $file->getPathname()]);

return;
}

$className = $this->getClassFromFile($filePath);
$className = $this->getClassFromFile($file);
if (!$className) {
$this->logger->warning('No valid class found in file', ['file' => $filePath]);
$this->logger->warning('No valid class found in file', ['file' => $file->getPathname()]);

return;
}
Expand Down Expand Up @@ -199,10 +192,10 @@ private function processFile(SplFileInfo $file, array &$discoveredCount, array &
}
}
} catch (\ReflectionException $e) {
$this->logger->error('Reflection error processing file for MCP discovery', ['file' => $filePath, 'class' => $className, 'exception' => $e->getMessage()]);
$this->logger->error('Reflection error processing file for MCP discovery', ['file' => $file->getPathname(), 'class' => $className, 'exception' => $e->getMessage()]);
} catch (\Throwable $e) {
$this->logger->error('Unexpected error processing file for MCP discovery', [
'file' => $filePath,
'file' => $file->getPathname(),
'class' => $className,
'exception' => $e->getMessage(),
'trace' => $e->getTraceAsString(),
Expand Down Expand Up @@ -329,34 +322,34 @@ private function getCompletionProviders(\ReflectionMethod $reflectionMethod): ar
* Attempt to determine the FQCN from a PHP file path.
* Uses tokenization to extract namespace and class name.
*
* @param string $filePath absolute path to the PHP file
*
* @return class-string|null the FQCN or null if not found/determinable
*/
private function getClassFromFile(string $filePath): ?string
private function getClassFromFile(SplFileInfo $file): ?string
{
if (!file_exists($filePath) || !is_readable($filePath)) {
$this->logger->warning('File does not exist or is not readable.', ['file' => $filePath]);
$this->logger->debug('Processing file', ['path' => $file->getPathname()]);

try {
$content = $file->getContents();
} catch (\Throwable $e) {
$this->logger->warning("Failed to read file content during class discovery: {$file->getPathname()}", [
'exception' => $e->getMessage(),
]);

return null;
}

try {
$content = file_get_contents($filePath);
if (false === $content) {
$this->logger->warning('Failed to read file content.', ['file' => $filePath]);

return null;
}
if (\strlen($content) > 500 * 1024) {
$this->logger->debug('Skipping large file during class discovery.', ['file' => $filePath]);
if (\strlen($content) > 500 * 1024) {
$this->logger->warning('Skipping large file during class discovery.', ['file' => $file->getPathname()]);

return null;
}
return null;
}

try {
$tokens = token_get_all($content);
} catch (\Throwable $e) {
$this->logger->warning("Failed to read or tokenize file during class discovery: {$filePath}", ['exception' => $e->getMessage()]);
$this->logger->warning("Failed to tokenize file during class discovery: {$file->getPathname()}", [
'exception' => $e->getMessage(),
]);

return null;
}
Expand Down Expand Up @@ -427,7 +420,7 @@ private function getClassFromFile(string $filePath): ?string

if (!empty($potentialClasses)) {
if (!class_exists($potentialClasses[0], false)) {
$this->logger->debug('getClassFromFile returning potential non-class type. Are you sure this class has been autoloaded?', ['file' => $filePath, 'type' => $potentialClasses[0]]);
$this->logger->debug('getClassFromFile returning potential non-class type. Are you sure this class has been autoloaded?', ['file' => $file->getPathname(), 'type' => $potentialClasses[0]]);
}

return $potentialClasses[0];
Expand Down