Refactor test

Signed-off-by: Pushpak Chhajed <[email protected]>

src/BoostServiceProvider.php

@@ -12,6 +12,8 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Compilers\BladeCompiler;
+use Laravel\Boost\Install\GuidelineAssist;
+use Laravel\Boost\Install\GuidelineConfig;
 use Laravel\Boost\Mcp\Boost;
 use Laravel\Boost\Middleware\InjectBoost;
 use Laravel\Mcp\Facades\Mcp;
@@ -58,6 +60,13 @@ public function register(): void
 
             return $roster;
         });
+
+        $this->app->singleton(GuidelineConfig::class, fn (): GuidelineConfig => new GuidelineConfig);
+
+        $this->app->singleton(GuidelineAssist::class, fn ($app): GuidelineAssist => new GuidelineAssist(
+            $app->make(Roster::class),
+            $app->make(GuidelineConfig::class)
+        ));
     }
 
     public function boot(Router $router): void

src/Mcp/Boost.php

@@ -5,7 +5,6 @@
 namespace Laravel\Boost\Mcp;
 
 use InvalidArgumentException;
-use Laravel\Boost\Install\GuidelineAssist;
 use Laravel\Boost\Mcp\Methods\CallToolWithExecutor;
 use Laravel\Boost\Mcp\Prompts\ThirdPartyPrompt;
 use Laravel\Boost\Mcp\Resources\ThirdPartyResource;
@@ -148,13 +147,12 @@ private function discoverThirdPartyPrimitives(string $primitiveType): array
         };
 
         $primitives = [];
-        $guidelineAssist = app(GuidelineAssist::class);
 
         foreach (Composer::packagesDirectoriesWithBoostGuidelines() as $package => $path) {
             $corePath = $path.DIRECTORY_SEPARATOR.'core.blade.php';
 
             if (file_exists($corePath)) {
-                $primitives[] = new $primitiveClass($guidelineAssist, $package, $corePath);
+                $primitives[] = new $primitiveClass($package, $corePath);
             }
         }
 

src/Mcp/Prompts/Concerns/RendersBladeGuidelines.php

@@ -62,8 +62,15 @@ protected function renderBlade(string $bladePath): string
 
         $rendered = $this->renderContent($content, $bladePath);
 
-        return str_replace(array_keys($this->storedSnippets), array_values($this->storedSnippets), $rendered);
+        $rendered = str_replace(array_keys($this->storedSnippets), array_values($this->storedSnippets), $rendered);
+
+        $this->storedSnippets = [];
+
+        return $rendered;
     }
 
-    abstract protected function getGuidelineAssist(): GuidelineAssist;
+    protected function getGuidelineAssist(): GuidelineAssist
+    {
+        return app(GuidelineAssist::class);
+    }
 }

src/Mcp/Prompts/ThirdPartyPrompt.php

@@ -4,7 +4,6 @@
 
 namespace Laravel\Boost\Mcp\Prompts;
 
-use Laravel\Boost\Install\GuidelineAssist;
 use Laravel\Boost\Mcp\Prompts\Concerns\RendersBladeGuidelines;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Prompt;
@@ -14,7 +13,6 @@ class ThirdPartyPrompt extends Prompt
     use RendersBladeGuidelines;
 
     public function __construct(
-        protected GuidelineAssist $guidelineAssist,
         protected string $packageName,
         protected string $bladePath,
     ) {
@@ -30,9 +28,4 @@ public function handle(): Response
 
         return Response::text($content);
     }
-
-    protected function getGuidelineAssist(): GuidelineAssist
-    {
-        return $this->guidelineAssist;
-    }
 }

src/Mcp/Resources/ThirdPartyResource.php

@@ -4,7 +4,6 @@
 
 namespace Laravel\Boost\Mcp\Resources;
 
-use Laravel\Boost\Install\GuidelineAssist;
 use Laravel\Boost\Mcp\Prompts\Concerns\RendersBladeGuidelines;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Resource;
@@ -14,10 +13,11 @@ class ThirdPartyResource extends Resource
     use RendersBladeGuidelines;
 
     public function __construct(
-        protected GuidelineAssist $guidelineAssist,
         protected string $packageName,
         protected string $bladePath,
     ) {
+        $this->name = $this->packageName;
+        $this->title = $this->packageName;
         $this->uri = "file://instructions/{$packageName}.md";
         $this->description = "Guidelines for {$packageName}";
         $this->mimeType = 'text/markdown';
@@ -29,9 +29,4 @@ public function handle(): Response
 
         return Response::text($content);
     }
-
-    protected function getGuidelineAssist(): GuidelineAssist
-    {
-        return $this->guidelineAssist;
-    }
 }

tests/Feature/Mcp/Prompts/BladePromptTest.php

@@ -2,26 +2,17 @@
 
 declare(strict_types=1);
 
-use Laravel\Boost\Install\GuidelineAssist;
-use Laravel\Boost\Install\GuidelineConfig;
-use Laravel\Boost\Install\Herd;
 use Laravel\Boost\Mcp\Prompts\ThirdPartyPrompt;
-use Laravel\Roster\Roster;
 
 beforeEach(function (): void {
-    // Create a test blade file
     $this->testBladePath = sys_get_temp_dir().'/test-guideline.blade.php';
     file_put_contents($this->testBladePath, '# Test Guideline
 
-This is a test guideline for testing.
+    This is a test guideline for testing.
 
-## Rules
-- Follow best practices
-- Write clean code');
-
-    $roster = app(Roster::class);
-    $herd = app(Herd::class);
-    $this->guidelineAssist = new GuidelineAssist($roster, new GuidelineConfig, $herd);
+    ## Rules
+    - Follow best practices
+    - Write clean code');
 });
 
 afterEach(function (): void {
@@ -30,8 +21,8 @@
     }
 });
 
-test('it renders blade file as prompt', function (): void {
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'acme/payments', $this->testBladePath);
+it('renders a blade file as a prompt', function (): void {
+    $prompt = new ThirdPartyPrompt('acme/payments', $this->testBladePath);
 
     $response = $prompt->handle();
 
@@ -42,30 +33,24 @@
         ->toolTextContains('Write clean code');
 });
 
-test('it generates correct prompt name from package', function (): void {
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'acme/payments', $this->testBladePath);
+it('generates correct metadata from the package name', function (): void {
+    $prompt = new ThirdPartyPrompt('acme/payments', $this->testBladePath);
 
-    expect($prompt->name())->toBe('acme/payments');
+    expect($prompt->name())->toBe('acme/payments')
+        ->and($prompt->description())->toBe('Guidelines for acme/payments');
 });
 
-test('it generates correct description from package', function (): void {
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'acme/payments', $this->testBladePath);
-
-    expect($prompt->description())->toBe('Guidelines for acme/payments');
-});
-
-test('it handles non-existent blade file gracefully', function (): void {
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'acme/test', '/non/existent/path.blade.php');
+it('handles a non-existent blade file gracefully', function (): void {
+    $prompt = new ThirdPartyPrompt('acme/test', '/non/existent/path.blade.php');
 
     $response = $prompt->handle();
 
-    expect($response)->isToolResult()
-        ->toolHasNoError();
+    expect($response)->isToolResult()->toolHasNoError()
+        ->and((string) $response->content())->toBe('');
 
-    expect((string) $response->content())->toBe('');
 });
 
-test('it processes backticks in blade content', function (): void {
+it('processes backticks in blade content', function (): void {
     $bladeContent = '# Guideline
 
 Use `Model::factory()` to create models.
@@ -76,15 +61,15 @@
 
     file_put_contents($this->testBladePath, $bladeContent);
 
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'test/package', $this->testBladePath);
+    $prompt = new ThirdPartyPrompt('test/package', $this->testBladePath);
     $response = $prompt->handle();
 
     expect($response)->isToolResult()
         ->toolTextContains('`Model::factory()`')
         ->toolTextContains('```php');
 });
 
-test('it processes php tags in blade content', function (): void {
+it('processes php tags in blade content', function (): void {
     $bladeContent = '# Guideline
 
 Example code:
@@ -95,15 +80,15 @@
 
     file_put_contents($this->testBladePath, $bladeContent);
 
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'test/package', $this->testBladePath);
+    $prompt = new ThirdPartyPrompt('test/package', $this->testBladePath);
     $response = $prompt->handle();
 
     expect($response)->isToolResult()
         ->toolTextContains('<?php')
         ->toolTextContains('echo "Hello World"');
 });
 
-test('it processes boost snippets', function (): void {
+it('processes boost snippets', function (): void {
     $bladeContent = '# Guideline
 
 @boostsnippet(\'example\', \'php\')
@@ -114,10 +99,34 @@ function example() {
 
     file_put_contents($this->testBladePath, $bladeContent);
 
-    $prompt = new ThirdPartyPrompt($this->guidelineAssist, 'test/package', $this->testBladePath);
+    $prompt = new ThirdPartyPrompt('test/package', $this->testBladePath);
     $response = $prompt->handle();
 
     expect($response)->isToolResult()
         ->toolTextContains('<code-snippet name="example" lang="php">')
         ->toolTextContains('function example()');
 });
+
+it('clears stored snippets between multiple handle calls', function (): void {
+    $bladeContent = '# Guideline
+
+@boostsnippet(\'example\', \'php\')
+function example() {
+    return true;
+}
+@endboostsnippet';
+
+    file_put_contents($this->testBladePath, $bladeContent);
+
+    $prompt = new ThirdPartyPrompt('test/package', $this->testBladePath);
+
+    $response1 = $prompt->handle();
+    $content1 = (string) $response1->content();
+
+    $response2 = $prompt->handle();
+    $content2 = (string) $response2->content();
+
+    expect($content1)->toBe($content2)
+        ->and($content1)->toContain('<code-snippet name="example" lang="php">')
+        ->and($content1)->not->toContain('___BOOST_SNIPPET_');
+});