Merge branch 'main' into sail_guidline_support

Author: pushpak1300

CHANGELOG.md

@@ -1,6 +1,24 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/boost/compare/v1.6.0...main)
+## [Unreleased](https://github.com/laravel/boost/compare/v1.7.0...main)
+
+## [v1.7.0](https://github.com/laravel/boost/compare/v1.6.0...v1.7.0) - 2025-11-04
+
+### What's Changed
+
+* feat: add opencode support by [@calebdw](https://github.com/calebdw) in https://github.com/laravel/boost/pull/88
+* Fix Invalid Argument Error with MCP tool by [@pushpak1300](https://github.com/pushpak1300) in https://github.com/laravel/boost/pull/323
+* [1.x] Refactor to use first-class callable by [@pushpak1300](https://github.com/pushpak1300) in https://github.com/laravel/boost/pull/315
+* [1.x] Sail Support for Boost by [@NIAN97](https://github.com/NIAN97) in https://github.com/laravel/boost/pull/303
+* Remove duplicate code in GuidelineComposer.php by [@phpfour](https://github.com/phpfour) in https://github.com/laravel/boost/pull/331
+* Handle `@volt` directives in GuidelineComposer by [@pushpak1300](https://github.com/pushpak1300) in https://github.com/laravel/boost/pull/333
+
+### New Contributors
+
+* [@NIAN97](https://github.com/NIAN97) made their first contribution in https://github.com/laravel/boost/pull/303
+* [@phpfour](https://github.com/phpfour) made their first contribution in https://github.com/laravel/boost/pull/331
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.6.0...v1.7.0
 
 ## [v1.6.0](https://github.com/laravel/boost/compare/v1.5.1...v1.6.0) - 2025-10-28
 

src/Install/GuidelineComposer.php

@@ -183,16 +183,6 @@ protected function find(): Collection
             $guidelines->put('.ai/'.$guideline['name'], $guideline);
         }
 
-        $pathsUsed = $guidelines->pluck('path');
-
-        foreach ($userGuidelines as $guideline) {
-            if ($pathsUsed->contains($guideline['path'])) {
-                continue; // Don't include this twice if it's an override
-            }
-
-            $guidelines->put('.ai/'.$guideline['name'], $guideline);
-        }
-
         collect(Composer::packagesDirectoriesWithBoostGuidelines())
             ->each(function (string $path, string $package) use ($guidelines): void {
                 $packageGuidelines = $this->guidelinesDir($path, true);
@@ -268,6 +258,8 @@ protected function renderContent(string $content, string $path): string
         $placeholders = [
             '`' => '___SINGLE_BACKTICK___',
             '<?php' => '___OPEN_PHP_TAG___',
+            '@volt' => '___VOLT_DIRECTIVE___',
+            '@endvolt' => '___ENDVOLT_DIRECTIVE___',
         ];
 
         $content = str_replace(array_keys($placeholders), array_values($placeholders), $content);

tests/Feature/Install/GuidelineComposerTest.php

@@ -433,6 +433,7 @@
 test('renderContent handles blade and markdown files correctly', function (): void {
     $packages = new PackageCollection([
         new Package(Packages::LARAVEL, 'laravel/framework', '11.0.0'),
+        new Package(Packages::VOLT, 'laravel/volt', '1.0.0'),
     ]);
 
     $this->roster->shouldReceive('packages')->andReturn($packages);
@@ -469,5 +470,10 @@
         // Processes blade variables correctly
         ->toContain('=== .ai/test-blade-with-assist rules ===')
         ->toContain('Run `npm install` to install dependencies')
-        ->toContain('Package manager: npm');
+        ->toContain('Package manager: npm')
+        // Preserves @volt directives in blade templates
+        ->toContain('`@volt`')
+        ->toContain('@endvolt')
+        ->not->toContain('volt-anonymous-fragment')
+        ->not->toContain('@livewire');
 });