Merge branch 'main' into fix/agents_selection

Author: pushpak1300

composer.json

@@ -15,11 +15,11 @@
     "require": {
         "php": "^8.1",
         "guzzlehttp/guzzle": "^7.9",
-        "illuminate/console": "^10.49.0|^11.45.3|^12.28.1",
-        "illuminate/contracts": "^10.49.0|^11.45.3|^12.28.1",
-        "illuminate/routing": "^10.49.0|^11.45.3|^12.28.1",
-        "illuminate/support": "^10.49.0|^11.45.3|^12.28.1",
-        "laravel/mcp": "^0.4.1",
+        "illuminate/console": "^10.49.0|^11.45.3|^12.41.1",
+        "illuminate/contracts": "^10.49.0|^11.45.3|^12.41.1",
+        "illuminate/routing": "^10.49.0|^11.45.3|^12.41.1",
+        "illuminate/support": "^10.49.0|^11.45.3|^12.41.1",
+        "laravel/mcp": "^0.5.1",
         "laravel/prompts": "0.1.25|^0.3.6",
         "laravel/roster": "^0.2.9"
     },

src/Concerns/ReadsLogs.php

@@ -4,6 +4,7 @@
 
 namespace Laravel\Boost\Concerns;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Config;
 
 trait ReadsLogs
@@ -45,11 +46,67 @@ protected function resolveLogFilePath(): string
         $channel = Config::get('logging.default');
         $channelConfig = Config::get("logging.channels.{$channel}");
 
-        if (($channelConfig['driver'] ?? null) === 'daily') {
-            return storage_path('logs/laravel-'.date('Y-m-d').'.log');
+        $channelConfig = $this->resolveChannelWithPath($channelConfig);
+
+        $baseLogPath = Arr::get($channelConfig, 'path', storage_path('logs/laravel.log'));
+
+        if (Arr::get($channelConfig, 'driver') === 'daily') {
+            return $this->resolveDailyLogFilePath($baseLogPath);
+        }
+
+        return $baseLogPath;
+    }
+
+    /**
+     * @param  array<string, mixed>|null  $channelConfig
+     * @return array<string, mixed>|null
+     */
+    protected function resolveChannelWithPath(?array $channelConfig, int $depth = 0): ?array
+    {
+        if ($channelConfig === null || $depth > 2) {
+            return $channelConfig;
         }
 
-        return storage_path('logs/laravel.log');
+        if (isset($channelConfig['path'])) {
+            return $channelConfig;
+        }
+
+        if (($channelConfig['driver'] ?? null) !== 'stack') {
+            return $channelConfig;
+        }
+
+        $firstValidLoggerConfig = collect($channelConfig['channels'] ?? [])
+            ->map(fn (string $name) => Config::get("logging.channels.{$name}"))
+            ->filter(fn ($config): bool => is_array($config))
+            ->map(fn (array $config) => $this->resolveChannelWithPath($config, $depth + 1))
+            ->first(fn (?array $config): bool => isset($config['path']));
+
+        return $firstValidLoggerConfig ?? $channelConfig;
+    }
+
+    protected function resolveDailyLogFilePath(string $basePath): string
+    {
+        $pathInfo = pathinfo($basePath);
+        $directory = $pathInfo['dirname'];
+        $filename = $pathInfo['filename'];
+        $extension = isset($pathInfo['extension']) ? '.'.$pathInfo['extension'] : '';
+
+        $todayLogFile = $directory.DIRECTORY_SEPARATOR.$filename.'-'.date('Y-m-d').$extension;
+
+        if (file_exists($todayLogFile)) {
+            return $todayLogFile;
+        }
+
+        $pattern = $directory.DIRECTORY_SEPARATOR.$filename.'-*'.$extension;
+        $files = glob($pattern) ?: [];
+
+        $datePattern = '/^'.preg_quote($filename, '/').'-\d{4}-\d{2}-\d{2}'.preg_quote($extension, '/').'$/';
+        $latestFile = collect($files)
+            ->filter(fn ($file): int|false => preg_match($datePattern, basename($file)))
+            ->sortDesc()
+            ->first();
+
+        return $latestFile ?? $todayLogFile;
     }
 
     /**
@@ -130,7 +187,7 @@ protected function scanLogChunkForEntries(string $logFile, int $chunkSize): arra
             $offset = max($fileSize - $chunkSize, 0);
             fseek($handle, $offset);
 
-            // If we started mid-line, discard the partial line to align to next newline.
+            // If we started mid-line, discard the partial line to align to the next newline.
             if ($offset > 0) {
                 fgets($handle);
             }

src/Install/CodeEnvironment/ClaudeCode.php

@@ -53,6 +53,6 @@ public function mcpConfigPath(): string
 
     public function guidelinesPath(): string
     {
-        return 'CLAUDE.md';
+        return config('boost.code_environments.claude_code.guidelines_path', 'CLAUDE.md');
     }
 }

src/Install/CodeEnvironment/Codex.php

@@ -43,7 +43,7 @@ public function projectDetectionConfig(): array
 
     public function guidelinesPath(): string
     {
-        return 'AGENTS.md';
+        return config('boost.code_environments.codex.guidelines_path', 'AGENTS.md');
     }
 
     public function mcpInstallationStrategy(): McpInstallationStrategy

src/Install/CodeEnvironment/Copilot.php

@@ -46,6 +46,6 @@ public function mcpClientName(): ?string
 
     public function guidelinesPath(): string
     {
-        return '.github/copilot-instructions.md';
+        return config('boost.code_environments.copilot.guidelines_path', '.github/copilot-instructions.md');
     }
 }

src/Install/CodeEnvironment/Cursor.php

@@ -56,7 +56,7 @@ public function mcpConfigPath(): string
 
     public function guidelinesPath(): string
     {
-        return '.cursor/rules/laravel-boost.mdc';
+        return config('boost.code_environments.cursor.guidelines_path', '.cursor/rules/laravel-boost.mdc');
     }
 
     public function frontmatter(): bool

src/Install/CodeEnvironment/Gemini.php

@@ -47,6 +47,6 @@ public function mcpConfigPath(): string
 
     public function guidelinesPath(): string
     {
-        return 'GEMINI.md';
+        return config('boost.code_environments.gemini.guidelines_path', 'GEMINI.md');
     }
 }

src/Install/CodeEnvironment/OpenCode.php

@@ -52,7 +52,7 @@ public function mcpConfigPath(): string
 
     public function guidelinesPath(): string
     {
-        return 'AGENTS.md';
+        return config('boost.code_environments.opencode.guidelines_path', 'AGENTS.md');
     }
 
     public function mcpConfigKey(): string

src/Install/CodeEnvironment/PhpStorm.php

@@ -65,6 +65,6 @@ public function mcpConfigPath(): string
 
     public function guidelinesPath(): string
     {
-        return '.junie/guidelines.md';
+        return config('boost.code_environments.phpstorm.guidelines_path', '.junie/guidelines.md');
     }
 }