Merge branch 'main' into update_rector_rules

Author: pushpak1300

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/boost/compare/v1.5.1...main)
+## [Unreleased](https://github.com/laravel/boost/compare/v1.6.0...main)
+
+## [v1.6.0](https://github.com/laravel/boost/compare/v1.5.1...v1.6.0) - 2025-10-28
+
+* [1.x] Add support for markdown files by [@adrum](https://github.com/adrum) in https://github.com/laravel/boost/pull/319
 
 ## [v1.5.1](https://github.com/laravel/boost/compare/v1.5.0...v1.5.1) - 2025-10-25
 

README.md

@@ -145,7 +145,7 @@ You may also automate this process by adding it to your Composer "post-update-cm
 
 ## Adding Custom AI Guidelines
 
-To augment Laravel Boost with your own custom AI guidelines, add `.blade.php` files to your application's `.ai/guidelines/*` directory. These files will automatically be included with Laravel Boost's guidelines when you run `boost:install`.
+To augment Laravel Boost with your own custom AI guidelines, add `.blade.php` or `.md` files to your application's `.ai/guidelines/*` directory. These files will automatically be included with Laravel Boost's guidelines when you run `boost:install`.
 
 ### Overriding Boost AI Guidelines
 

src/BoostManager.php

@@ -10,6 +10,7 @@
 use Laravel\Boost\Install\CodeEnvironment\Codex;
 use Laravel\Boost\Install\CodeEnvironment\Copilot;
 use Laravel\Boost\Install\CodeEnvironment\Cursor;
+use Laravel\Boost\Install\CodeEnvironment\OpenCode;
 use Laravel\Boost\Install\CodeEnvironment\PhpStorm;
 use Laravel\Boost\Install\CodeEnvironment\VSCode;
 
@@ -23,6 +24,7 @@ class BoostManager
         'claudecode' => ClaudeCode::class,
         'codex' => Codex::class,
         'copilot' => Copilot::class,
+        'opencode' => OpenCode::class,
     ];
 
     /**

src/Install/CodeEnvironment/ClaudeCode.php

@@ -25,7 +25,7 @@ public function systemDetectionConfig(Platform $platform): array
     {
         return match ($platform) {
             Platform::Darwin, Platform::Linux => [
-                'command' => 'which claude',
+                'command' => 'command -v claude',
             ],
             Platform::Windows => [
                 'command' => 'where claude 2>nul',

src/Install/CodeEnvironment/CodeEnvironment.php

@@ -129,6 +129,12 @@ public function mcpConfigKey(): string
         return 'mcpServers';
     }
 
+    /** @return array<string, mixed> */
+    public function defaultMcpConfig(): array
+    {
+        return [];
+    }
+
     /**
      * Install MCP server using the appropriate strategy.
      *
@@ -144,6 +150,22 @@ public function installMcp(string $key, string $command, array $args = [], array
         };
     }
 
+    /**
+     * Build the MCP server configuration payload for file-based installation.
+     *
+     * @param  array<int, string>  $args
+     * @param  array<string, string>  $env
+     * @return array<string, mixed>
+     */
+    public function mcpServerConfig(string $command, array $args = [], array $env = []): array
+    {
+        return [
+            'command' => $command,
+            'args' => $args,
+            'env' => $env,
+        ];
+    }
+
     /**
      * Install MCP server using a shell command strategy.
      *
@@ -198,9 +220,9 @@ protected function installFileMcp(string $key, string $command, array $args = []
             return false;
         }
 
-        return (new FileWriter($path))
+        return (new FileWriter($path, $this->defaultMcpConfig()))
             ->configKey($this->mcpConfigKey())
-            ->addServer($key, $command, $args, $env)
+            ->addServerConfig($key, $this->mcpServerConfig($command, $args, $env))
             ->save();
     }
 }

src/Install/CodeEnvironment/OpenCode.php

@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Laravel\Boost\Install\CodeEnvironment;
+
+use Laravel\Boost\Contracts\Agent;
+use Laravel\Boost\Contracts\McpClient;
+use Laravel\Boost\Install\Enums\McpInstallationStrategy;
+use Laravel\Boost\Install\Enums\Platform;
+
+class OpenCode extends CodeEnvironment implements Agent, McpClient
+{
+    public function name(): string
+    {
+        return 'opencode';
+    }
+
+    public function displayName(): string
+    {
+        return 'OpenCode';
+    }
+
+    public function systemDetectionConfig(Platform $platform): array
+    {
+        return match ($platform) {
+            Platform::Darwin, Platform::Linux => [
+                'command' => 'command -v opencode',
+            ],
+            Platform::Windows => [
+                'command' => 'where opencode 2>nul',
+            ],
+        };
+    }
+
+    public function projectDetectionConfig(): array
+    {
+        return [
+            'files' => ['AGENTS.md', 'opencode.json'],
+        ];
+    }
+
+    public function mcpInstallationStrategy(): McpInstallationStrategy
+    {
+        return McpInstallationStrategy::FILE;
+    }
+
+    public function mcpConfigPath(): string
+    {
+        return 'opencode.json';
+    }
+
+    public function guidelinesPath(): string
+    {
+        return 'AGENTS.md';
+    }
+
+    public function mcpConfigKey(): string
+    {
+        return 'mcp';
+    }
+
+    /** {@inheritDoc} */
+    public function defaultMcpConfig(): array
+    {
+        return [
+            '$schema' => 'https://opencode.ai/config.json',
+        ];
+    }
+
+    /** {@inheritDoc} */
+    public function mcpServerConfig(string $command, array $args = [], array $env = []): array
+    {
+        return [
+            'type' => 'local',
+            'enabled' => true,
+            'command' => [$command, ...$args],
+            'environment' => $env,
+        ];
+    }
+}

src/Install/CodeEnvironment/VSCode.php

@@ -26,7 +26,7 @@ public function systemDetectionConfig(Platform $platform): array
                 'paths' => ['/Applications/Visual Studio Code.app'],
             ],
             Platform::Linux => [
-                'command' => 'which code',
+                'command' => 'command -v code',
             ],
             Platform::Windows => [
                 'paths' => [

src/Install/GuidelineComposer.php

@@ -244,14 +244,38 @@ protected function guidelinesDir(string $dirPath, bool $thirdParty = false): arr
             $finder = Finder::create()
                 ->files()
                 ->in($dirPath)
-                ->name('*.blade.php');
+                ->name('*.blade.php')
+                ->name('*.md');
         } catch (DirectoryNotFoundException) {
             return [];
         }
 
         return array_map(fn (SplFileInfo $file): array => $this->guideline($file->getRealPath(), $thirdParty), iterator_to_array($finder));
     }
 
+    protected function renderContent(string $content, string $path): string
+    {
+        $isBladeTemplate = str_ends_with($path, '.blade.php');
+
+        if (! $isBladeTemplate) {
+            return $content;
+        }
+
+        // Temporarily replace backticks and PHP opening tags with placeholders before Blade processing
+        // This prevents Blade from trying to execute PHP code examples and supports inline code
+        $placeholders = [
+            '`' => '___SINGLE_BACKTICK___',
+            '<?php' => '___OPEN_PHP_TAG___',
+        ];
+
+        $content = str_replace(array_keys($placeholders), array_values($placeholders), $content);
+        $rendered = Blade::render($content, [
+            'assist' => $this->guidelineAssist,
+        ]);
+
+        return str_replace(array_values($placeholders), array_keys($placeholders), $rendered);
+    }
+
     /**
      * @return array{content: string, name: string, description: string, path: ?string, custom: bool, third_party: bool}
      */
@@ -272,18 +296,8 @@ protected function guideline(string $path, bool $thirdParty = false): array
         $content = file_get_contents($path);
         $content = $this->processBoostSnippets($content);
 
-        // Temporarily replace backticks and PHP opening tags with placeholders before Blade processing
-        // This prevents Blade from trying to execute PHP code examples and supports inline code
-        $placeholders = [
-            '`' => '___SINGLE_BACKTICK___',
-            '<?php' => '___OPEN_PHP_TAG___',
-        ];
+        $rendered = $this->renderContent($content, $path);
 
-        $content = str_replace(array_keys($placeholders), array_values($placeholders), $content);
-        $rendered = Blade::render($content, [
-            'assist' => $this->guidelineAssist,
-        ]);
-        $rendered = str_replace(array_values($placeholders), array_keys($placeholders), $rendered);
         $rendered = str_replace(array_keys($this->storedSnippets), array_values($this->storedSnippets), $rendered);
 
         $this->storedSnippets = []; // Clear for next use
@@ -298,7 +312,7 @@ protected function guideline(string $path, bool $thirdParty = false): array
 
         return [
             'content' => trim($rendered),
-            'name' => str_replace('.blade.php', '', basename($path)),
+            'name' => str_replace(['.blade.php', '.md'], '', basename($path)),
             'description' => $description,
             'path' => $path,
             'custom' => str_contains($path, $this->customGuidelinePath()),
@@ -326,16 +340,21 @@ protected function processBoostSnippets(string $content): string
 
     protected function prependPackageGuidelinePath(string $path): string
     {
-        $path = preg_replace('/\.blade\.php$/', '', $path);
-
-        return str_replace('/', DIRECTORY_SEPARATOR, __DIR__.'/../../.ai/'.$path.'.blade.php');
+        return $this->prependGuidelinePath($path, __DIR__.'/../../.ai/');
     }
 
     protected function prependUserGuidelinePath(string $path): string
     {
-        $path = preg_replace('/\.blade\.php$/', '', $path);
+        return $this->prependGuidelinePath($path, $this->customGuidelinePath());
+    }
+
+    private function prependGuidelinePath(string $path, string $basePath): string
+    {
+        if (! str_ends_with($path, '.md') && ! str_ends_with($path, '.blade.php')) {
+            $path .= '.blade.php';
+        }
 
-        return str_replace('/', DIRECTORY_SEPARATOR, $this->customGuidelinePath($path.'.blade.php'));
+        return str_replace('/', DIRECTORY_SEPARATOR, $basePath.$path);
     }
 
     protected function guidelinePath(string $path): ?string

src/Install/Mcp/FileWriter.php

@@ -15,7 +15,7 @@ class FileWriter
 
     protected int $defaultIndentation = 8;
 
-    public function __construct(protected string $filePath) {}
+    public function __construct(protected string $filePath, protected array $baseConfig = []) {}
 
     public function configKey(string $key): self
     {
@@ -25,17 +25,28 @@ public function configKey(string $key): self
     }
 
     /**
-     * @param  string  $key  MCP Server Name
+     * @deprecated Use addServerConfig() for array-based configuration.
+     *
      * @param  array<int, string>  $args
      * @param  array<string, string>  $env
      */
     public function addServer(string $key, string $command, array $args = [], array $env = []): self
     {
-        $this->serversToAdd[$key] = collect([
+        return $this->addServerConfig($key, collect([
             'command' => $command,
             'args' => $args,
             'env' => $env,
-        ])->filter()->toArray();
+        ])->filter(fn ($value): bool => ! in_array($value, [[], null, ''], true))->toArray());
+    }
+
+    /**
+     * @param  array<string, mixed>  $config
+     */
+    public function addServerConfig(string $key, array $config): self
+    {
+        $this->serversToAdd[$key] = collect($config)
+            ->filter(fn ($value): bool => ! in_array($value, [[], null, ''], true))
+            ->toArray();
 
         return $this;
     }
@@ -358,7 +369,7 @@ protected function hasUnquotedComments(string $content): bool
 
     protected function createNewFile(): bool
     {
-        $config = [];
+        $config = $this->baseConfig;
         $this->addServersToConfig($config);
 
         return $this->writeJsonConfig($config);