Merge branch 'main' into fix/environment-based-gating

ashleyhindle · web-flow · commit c44203c68445 · 2025-08-14T18:05:07.000+01:00
diff --git a/.ai/boost/core.blade.php b/.ai/boost/core.blade.php
@@ -23,6 +23,7 @@
 - You must use this tool to search for Laravel-ecosystem documentation before falling back to other approaches.
 - Search the documentation before making code changes to ensure we are taking the correct approach.
 - Use multiple, broad, simple, topic based queries to start. For example: `['rate limiting', 'routing rate limiting', 'routing']`.
+- Do not add package names to queries - package information is already shared. For example, use `test resource table`, not `filament 4 test resource table`.
 
 ### Available Search Syntax
 - You can and should pass multiple queries at once. The most relevant results will be returned first.
diff --git a/.ai/filament/2/core.blade.php b/.ai/filament/2/core.blade.php
@@ -0,0 +1,7 @@
+## Filament 2
+
+## Version 2 Changes To Focus On
+- Resources are located in `app/Filament/Resources/` directory.
+- Resource pages (List, Create, Edit) are auto-generated within the resource structure.
+- Forms use the `Forms\Components` namespace for form fields.
+- Tables use the `Tables\Columns` namespace for table columns.
diff --git a/.ai/filament/3/core.blade.php b/.ai/filament/3/core.blade.php
@@ -0,0 +1,11 @@
+## Filament 3
+
+## Version 3 Changes To Focus On
+- Resources are located in `app/Filament/Resources/` directory.
+- Resource pages (List, Create, Edit) are auto-generated within the resource's directory - e.g., `app/Filament/Resources/PostResource/Pages/`.
+- Forms use the `Forms\Components` namespace for form fields.
+- Tables use the `Tables\Columns` namespace for table columns.
+- A new `Filament\Forms\Components\RichEditor` component is available.
+- Form and table schemas now use fluent method chaining.
+- Added `php artisan filament:optimize` command for production optimization.
+- Requires implementing `FilamentUser` contract for production access control.
diff --git a/.ai/filament/4/core.blade.php b/.ai/filament/4/core.blade.php
@@ -9,3 +9,9 @@
 - The `Form` & `Infolist` layout components have been moved to `Filament\Schemas\Components`, for example `Grid`, `Section`, `Fieldset`, `Tabs`, `Wizard`, etc.
 - A new `Repeater` component for Forms has been added.
 - Icons now use the `Filament\Support\Icons\Heroicon` Enum by default. Other options are available and documented.
+
+### Organize Component Classes Structure
+- Schema components: `Schemas/Components/`
+- Table columns: `Tables/Columns/`
+- Table filters: `Tables/Filters/`
+- Actions: `Actions/`
diff --git a/.ai/filament/core.blade.php b/.ai/filament/core.blade.php
@@ -2,6 +2,7 @@
 - Filament is used by this application, check how and where to follow existing application conventions.
 - Filament is a Server-Driven UI (SDUI) framework for Laravel. It allows developers to define user interfaces in PHP using structured configuration objects. It is built on top of Livewire, Alpine.js, and Tailwind CSS.
 - You can use the `search-docs` tool to get information from the official Filament documentation when needed. This is very useful for Artisan command arguments, specific code examples, testing functionality, relationship management, and ensuring you're following idiomatic practices.
+- Utilize static `make()` methods for consistent component initialization.
 
 ### Artisan
 - You must use the Filament specific Artisan commands to create new files or components for Filament. You can find these with the `list-artisan-commands` tool, or with `php artisan` and the `--help` option.
@@ -29,7 +30,7 @@
 </code-snippet>
 @endverbatim
 
-### Testing
+## Testing
 - It's important to test Filament functionality for user satisfaction.
 - Ensure that you are authenticated to access the application within the test.
 - Filament uses Livewire, so start assertions with `livewire()` or `Livewire::test()`.
diff --git a/.ai/fluxui-free/core.blade.php b/.ai/fluxui-free/core.blade.php
@@ -6,9 +6,11 @@
 - Fallback to standard Blade components if Flux is unavailable.
 - If available, use Laravel Boost's `search-docs` tool to get the exact documentation and code snippets available for this project.
 - Flux UI components look like this:
+@verbatim
 <code-snippet name="Flux UI Component Usage Example" lang="blade">
     <flux:button variant="primary"/>
 </code-snippet>
+@endverbatim
 
 ### Available Components
 This is correct as of Boost installation, but there may be additional components within the codebase.
diff --git a/.ai/fluxui-pro/core.blade.php b/.ai/fluxui-pro/core.blade.php
@@ -6,9 +6,11 @@
 - Fallback to standard Blade components if Flux is unavailable.
 - If available, use Laravel Boost's `search-docs` tool to get the exact documentation and code snippets available for this project.
 - Flux UI components look like this:
+@verbatim
 <code-snippet name="Flux UI component usage example" lang="blade">
     <flux:button variant="primary"/>
 </code-snippet>
+@endverbatim
 
 ### Available Components
 This is correct as of Boost installation, but there may be additional components within the codebase.
diff --git a/.ai/volt/core.blade.php b/.ai/volt/core.blade.php
@@ -3,7 +3,7 @@
 - This project uses Livewire Volt for interactivity within its pages. New pages requiring interactivity must also use Livewire Volt. There is documentation available for it.
 - Make new Volt components using `php artisan make:volt [name] [--test] [--pest]`
 - Volt is a **class-based** and **functional** API for Livewire that supports single-file components, allowing a component's PHP logic and Blade templates to co-exist in the same file
-- Livewire Volt allows PHP logic and Blade templates in one file. Components use the `@volt` directive.
+- Livewire Volt allows PHP logic and Blade templates in one file. Components use the @verbatim`@volt`@endverbatim directive.
 - You must check existing Volt components to determine if they're functional or class based. If you can't detect that, ask the user which they prefer before writing a Volt component.
 
 ### Volt Functional Component Example
diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yml b/.github/ISSUE_TEMPLATE/1_Bug_report.yml
@@ -27,11 +27,11 @@ body:
       required: true
   - type: input
     attributes:
-      label: Database Driver & Version
-      description: If applicable, provide the database driver and version you are using.
-      placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
+      label: System Info
+      description: Provide your system details including OS, PHP setup, and development environment.
+      placeholder: "macOS 14.1 (M1) with Herd or Ubuntu 22.04 with Laravel Sail"
     validations:
-      required: false
+      required: true
   - type: textarea
     attributes:
       label: Description
@@ -44,4 +44,4 @@ body:
       description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
     validations:
       required: true
-      
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,70 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/boost/compare/v1.0.9...main)
+## [Unreleased](https://github.com/laravel/boost/compare/v1.0.16...main)
+
+## [v1.0.16](https://github.com/laravel/boost/compare/v1.0.15...v1.0.16) - 2025-08-14
+
+### What's Changed
+
+* refactor: streamline path resolution and simplify the MCP client interface by [@pushpak1300](https://github.com/pushpak1300) in https://github.com/laravel/boost/pull/111
+* Fix PHPStorm using absolute paths by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/109
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.15...v1.0.16
+
+## [v1.0.15](https://github.com/laravel/boost/compare/v1.0.14...v1.0.15) - 2025-08-14
+
+### What's Changed
+
+* fixes #67 by only finding files that begin with an uppercase letter by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/116
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.14...v1.0.15
+
+## [v1.0.14](https://github.com/laravel/boost/compare/v1.0.13...v1.0.14) - 2025-08-14
+
+### What's Changed
+
+* Fixes #85 by adding verbatim to flux component example by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/114
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.13...v1.0.14
+
+## [v1.0.13](https://github.com/laravel/boost/compare/v1.0.12...v1.0.13) - 2025-08-14
+
+### What's Changed
+
+* Fix volt blade parsing by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/112
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.12...v1.0.13
+
+## [v1.0.12](https://github.com/laravel/boost/compare/v1.0.11...v1.0.12) - 2025-08-14
+
+### What's Changed
+
+* tool: tinker: try to nudge away from creating test users ahead of time by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/108
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.11...v1.0.12
+
+## [v1.0.11](https://github.com/laravel/boost/compare/v1.0.10...v1.0.11) - 2025-08-14
+
+### What's Changed
+
+* tools: report-feedback: strengthen language on privacy by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/103
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.10...v1.0.11
+
+## [v1.0.10](https://github.com/laravel/boost/compare/v1.0.9...v1.0.10) - 2025-08-14
+
+### What's Changed
+
+* fixes #70 - make sure foundational rules are composed by [@ashleyhindle](https://github.com/ashleyhindle) in https://github.com/laravel/boost/pull/84
+* Update the bug report template's system info section by [@pushpak1300](https://github.com/pushpak1300) in https://github.com/laravel/boost/pull/98
+* Update Filament Guidelines by [@pushpak1300](https://github.com/pushpak1300) in https://github.com/laravel/boost/pull/35
+* Fix: Prevent autoloading non class-like files during discovery to avoid "FatalError: Cannot redeclare function" by [@zdearo](https://github.com/zdearo) in https://github.com/laravel/boost/pull/99
+
+### New Contributors
+
+* [@zdearo](https://github.com/zdearo) made their first contribution in https://github.com/laravel/boost/pull/99
+
+**Full Changelog**: https://github.com/laravel/boost/compare/v1.0.9...v1.0.10
 
 ## [v1.0.9](https://github.com/laravel/boost/compare/v1.0.8...v1.0.9) - 2025-08-13
 
diff --git a/all.php b/all.php
@@ -60,6 +60,7 @@ public function packages(): \Laravel\Roster\PackageCollection
             $enumMapping = [
                 'php' => \Laravel\Roster\Enums\Packages::LARAVEL, // Use Laravel as placeholder for php
                 'laravel' => \Laravel\Roster\Enums\Packages::LARAVEL,
+                'filament' => \Laravel\Roster\Enums\Packages::FILAMENT,
                 'fluxui-free' => \Laravel\Roster\Enums\Packages::FLUXUI_FREE,
                 'fluxui-pro' => \Laravel\Roster\Enums\Packages::FLUXUI_PRO,
                 'inertia-laravel' => \Laravel\Roster\Enums\Packages::INERTIA_LARAVEL,
diff --git a/composer.json b/composer.json
@@ -12,12 +12,6 @@
         "issues": "https://github.com/laravel/boost/issues",
         "source": "https://github.com/laravel/boost"
     },
-    "repositories": [
-        {
-            "type": "git",
-            "url": "git@github.com:laravel/mcp.git"
-        }
-    ],
     "require": {
         "php": "^8.1|^8.2",
         "guzzlehttp/guzzle": "^7.9",
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -462,17 +462,18 @@ private function installMcpServerConfig(): void
             )->toArray()
         );
 
-        /** @var CodeEnvironment $mcpClient */
+        /** @var McpClient $mcpClient */
         foreach ($this->selectedTargetMcpClient as $mcpClient) {
             $ideName = $mcpClient->mcpClientName();
             $ideDisplay = str_pad($ideName, $longestIdeName);
             $this->output->write("  {$ideDisplay}... ");
             $results = [];
 
+            $php = $mcpClient->getPhpPath();
             if ($this->shouldInstallMcp()) {
                 try {
-                    $artisan = $mcpClient->useAbsolutePathForMcp ? base_path('artisan') : './artisan';
-                    $result = $mcpClient->installMcp('laravel-boost', 'php', [$artisan, 'boost:mcp']);
+                    $artisan = $mcpClient->getArtisanPath();
+                    $result = $mcpClient->installMcp('laravel-boost', $php, [$artisan, 'boost:mcp']);
 
                     if ($result) {
                         $results[] = $this->greenTick.' Boost';
@@ -491,7 +492,7 @@ private function installMcpServerConfig(): void
                 try {
                     $result = $mcpClient->installMcp(
                         key: 'herd',
-                        command: 'php',
+                        command: $php,
                         args: [$this->herd->mcpPath()],
                         env: ['SITE_PATH' => base_path()]
                     );
diff --git a/src/Contracts/McpClient.php b/src/Contracts/McpClient.php
@@ -16,6 +16,21 @@ interface McpClient
      */
     public function mcpClientName(): ?string;
 
+    /**
+     * Whether to use absolute paths for MCP commands.
+     */
+    public function useAbsolutePathForMcp(): bool;
+
+    /**
+     * Get the PHP executable path for this MCP client.
+     */
+    public function getPhpPath(): string;
+
+    /**
+     * Get the artisan path for this MCP client.
+     */
+    public function getArtisanPath(): string;
+
     /**
      * Install an MCP server configuration in this IDE.
      *
diff --git a/src/Install/CodeEnvironment/CodeEnvironment.php b/src/Install/CodeEnvironment/CodeEnvironment.php
@@ -35,6 +35,22 @@ public function mcpClientName(): ?string
         return $this->displayName();
     }
 
+    public function useAbsolutePathForMcp(): bool
+    {
+        return $this->useAbsolutePathForMcp;
+    }
+
+    public function getPhpPath(): string
+    {
+        return $this->useAbsolutePathForMcp() ? PHP_BINARY : 'php';
+    }
+
+    public function getArtisanPath(): string
+    {
+        return $this->useAbsolutePathForMcp() ? base_path('artisan') : './artisan';
+
+    }
+
     /**
      * Get the detection configuration for system-wide installation detection.
      *
diff --git a/src/Install/GuidelineAssist.php b/src/Install/GuidelineAssist.php
@@ -68,7 +68,7 @@ private function discover(callable $cb): array
             $finder = Finder::create()
                 ->in($appPath)
                 ->files()
-                ->name('*.php');
+                ->name('/[A-Z].*\.php$/');
 
             foreach ($finder as $file) {
                 $relativePath = $file->getRelativePathname();
@@ -80,8 +80,14 @@ private function discover(callable $cb): array
                 );
 
                 try {
+                    $path = $appPath.DIRECTORY_SEPARATOR.$relativePath;
+
+                    if (! $this->fileHasClassLike($path)) {
+                        continue;
+                    }
+
                     if (class_exists($className)) {
-                        self::$classes[$className] = $appPath.DIRECTORY_SEPARATOR.$relativePath;
+                        self::$classes[$className] = $path;
                     }
                 } catch (\Throwable) {
                     // Ignore exceptions and errors from class loading/reflection
@@ -98,6 +104,38 @@ private function discover(callable $cb): array
         return $classes;
     }
 
+    public function fileHasClassLike(string $path): bool
+    {
+        static $cache = [];
+
+        if (isset($cache[$path])) {
+            return $cache[$path];
+        }
+
+        $code = file_get_contents($path);
+        if ($code === false) {
+            return $cache[$path] = false;
+        }
+
+        if (stripos($code, 'class') === false
+            && stripos($code, 'interface') === false
+            && stripos($code, 'trait') === false
+            && stripos($code, 'enum') === false) {
+            return $cache[$path] = false;
+        }
+
+        $tokens = token_get_all($code);
+        foreach ($tokens as $token) {
+            if (is_array($token)) {
+                if (in_array($token[0], [T_CLASS, T_INTERFACE, T_TRAIT, T_ENUM], true)) {
+                    return $cache[$path] = true;
+                }
+            }
+        }
+
+        return $cache[$path] = false;
+    }
+
     public function shouldEnforceStrictTypes(): bool
     {
         if (empty($this->modelPaths)) {
diff --git a/src/Install/GuidelineComposer.php b/src/Install/GuidelineComposer.php
@@ -87,7 +87,7 @@ protected function find(): Collection
         $guidelines->put('foundation', $this->guideline('foundation'));
         $guidelines->put('boost', $this->guideline('boost/core'));
 
-        $guidelines->put('php', $this->guideline('php/base'));
+        $guidelines->put('php', $this->guideline('php/core'));
 
         // TODO: AI-48: Use composer target version, not PHP version. Production could be 8.1, but local is 8.4
         // $phpMajorMinor = PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;
diff --git a/src/Mcp/Tools/ReportFeedback.php b/src/Mcp/Tools/ReportFeedback.php
@@ -16,7 +16,7 @@ class ReportFeedback extends Tool
 
     public function description(): string
     {
-        return 'Report feedback from the user on what would make Boost, or their experience with Laravel, better. Ask the user for more details if ambiguous or unclear. This is only for feedback related to Boost or the Laravel ecosystem.';
+        return 'Report feedback from the user on what would make Boost, or their experience with Laravel, better. Ask the user for more details before use if ambiguous or unclear. This is only for feedback related to Boost or the Laravel ecosystem.'.PHP_EOL.'Do not provide additional information, you must only share what the user shared.';
     }
 
     public function schema(ToolInputSchema $schema): ToolInputSchema
diff --git a/src/Mcp/Tools/Tinker.php b/src/Mcp/Tools/Tinker.php
@@ -13,14 +13,14 @@
 
 class Tinker extends Tool
 {
-    public function shouldRegister(): bool
-    {
-        return app()->environment() === 'local';
-    }
-
     public function description(): string
     {
-        return 'Execute PHP code in the Laravel application context, similar to artisan tinker. Most useful for debugging issues, checking if functions exists, and testing code snippets. Returns the output of the code, as well as whatever is "returned" using "return".';
+        return <<<'DESCRIPTION'
+Execute PHP code in the Laravel application context, like artisan tinker.
+Use this for debugging issues, checking if functions exist, and testing code snippets.
+You should not create models directly without explicit user approval. Prefer Unit/Feature tests using factories for functionality testing. Prefer existing artisan commands over custom tinker code.
+Returns the output of the code, as well as whatever is "returned" using "return".
+DESCRIPTION;
     }
 
     public function schema(ToolInputSchema $schema): ToolInputSchema
diff --git a/tests/Feature/Install/CodeEnvironment/CodeEnvironmentPathResolutionTest.php b/tests/Feature/Install/CodeEnvironment/CodeEnvironmentPathResolutionTest.php
diff --git a/tests/Feature/Mcp/Tools/TinkerTest.php b/tests/Feature/Mcp/Tools/TinkerTest.php
