Merge branch 'next' into env-var-autocomplete

app/Livewire/ActivityMonitor.php

@@ -28,12 +28,20 @@ class ActivityMonitor extends Component
 
     protected $listeners = ['activityMonitor' => 'newMonitorActivity'];
 
-    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished', $eventData = null)
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished', $eventData = null, $header = null)
     {
+        // Reset event dispatched flag for new activity
+        self::$eventDispatched = false;
+
         $this->activityId = $activityId;
         $this->eventToDispatch = $eventToDispatch;
         $this->eventData = $eventData;
 
+        // Update header if provided
+        if ($header !== null) {
+            $this->header = $header;
+        }
+
         $this->hydrateActivity();
 
         $this->isPollingActive = true;

app/Livewire/Boarding/Index.php

@@ -14,7 +14,10 @@ use Visus\Cuid2\Cuid2;
 
 class Index extends Component
 {
-    protected $listeners = ['refreshBoardingIndex' => 'validateServer'];
+    protected $listeners = [
+        'refreshBoardingIndex' => 'validateServer',
+        'prerequisitesInstalled' => 'handlePrerequisitesInstalled',
+    ];
 
     #[\Livewire\Attributes\Url(as: 'step', history: true)]
     public string $currentState = 'welcome';
@@ -76,6 +79,10 @@ class Index extends Component
 
     public ?string $minDockerVersion = null;
 
+    public int $prerequisiteInstallAttempts = 0;
+
+    public int $maxPrerequisiteInstallAttempts = 3;
+
     public function mount()
     {
         if (auth()->user()?->isMember() && auth()->user()->currentTeam()->show_boarding === true) {
@@ -320,6 +327,62 @@ class Index extends Component
             return handleError(error: $e, livewire: $this);
         }
 
+        try {
+            // Check prerequisites
+            $validationResult = $this->createdServer->validatePrerequisites();
+            if (! $validationResult['success']) {
+                // Check if we've exceeded max attempts
+                if ($this->prerequisiteInstallAttempts >= $this->maxPrerequisiteInstallAttempts) {
+                    $missingCommands = implode(', ', $validationResult['missing']);
+                    throw new \Exception("Prerequisites ({$missingCommands}) could not be installed after {$this->maxPrerequisiteInstallAttempts} attempts. Please install them manually.");
+                }
+
+                // Start async installation and wait for completion via ActivityMonitor
+                $activity = $this->createdServer->installPrerequisites();
+                $this->prerequisiteInstallAttempts++;
+                $this->dispatch('activityMonitor', $activity->id, 'prerequisitesInstalled');
+
+                // Return early - handlePrerequisitesInstalled() will be called when installation completes
+                return;
+            }
+
+            // Prerequisites are already installed, continue with validation
+            $this->continueValidation();
+        } catch (\Throwable $e) {
+            return handleError(error: $e, livewire: $this);
+        }
+    }
+
+    public function handlePrerequisitesInstalled()
+    {
+        try {
+            // Revalidate prerequisites after installation completes
+            $validationResult = $this->createdServer->validatePrerequisites();
+            if (! $validationResult['success']) {
+                // Installation completed but prerequisites still missing - retry
+                $missingCommands = implode(', ', $validationResult['missing']);
+
+                if ($this->prerequisiteInstallAttempts >= $this->maxPrerequisiteInstallAttempts) {
+                    throw new \Exception("Prerequisites ({$missingCommands}) could not be installed after {$this->maxPrerequisiteInstallAttempts} attempts. Please install them manually.");
+                }
+
+                // Try again
+                $activity = $this->createdServer->installPrerequisites();
+                $this->prerequisiteInstallAttempts++;
+                $this->dispatch('activityMonitor', $activity->id, 'prerequisitesInstalled');
+
+                return;
+            }
+
+            // Prerequisites validated successfully - continue with Docker validation
+            $this->continueValidation();
+        } catch (\Throwable $e) {
+            return handleError(error: $e, livewire: $this);
+        }
+    }
+
+    private function continueValidation()
+    {
         try {
             $dockerVersion = instant_remote_process(["docker version|head -2|grep -i version| awk '{print $2}'"], $this->createdServer, true);
             $dockerVersion = checkMinimumDockerEngineVersion($dockerVersion);

app/Livewire/Server/ValidateAndInstall.php

@@ -25,6 +25,8 @@ class ValidateAndInstall extends Component
 
     public $supported_os_type = null;
 
+    public $prerequisites_installed = null;
+
     public $docker_installed = null;
 
     public $docker_compose_installed = null;
@@ -33,12 +35,15 @@ class ValidateAndInstall extends Component
 
     public $error = null;
 
+    public string $installationStep = 'Prerequisites';
+
     public bool $ask = false;
 
     protected $listeners = [
         'init',
         'validateConnection',
         'validateOS',
+        'validatePrerequisites',
         'validateDockerEngine',
         'validateDockerVersion',
         'refresh' => '$refresh',
@@ -48,6 +53,7 @@ class ValidateAndInstall extends Component
     {
         $this->uptime = null;
         $this->supported_os_type = null;
+        $this->prerequisites_installed = null;
         $this->docker_installed = null;
         $this->docker_version = null;
         $this->docker_compose_installed = null;
@@ -69,6 +75,7 @@ class ValidateAndInstall extends Component
         $this->authorize('update', $this->server);
         $this->uptime = null;
         $this->supported_os_type = null;
+        $this->prerequisites_installed = null;
         $this->docker_installed = null;
         $this->docker_compose_installed = null;
         $this->docker_version = null;
@@ -103,6 +110,43 @@ class ValidateAndInstall extends Component
 
             return;
         }
+        $this->dispatch('validatePrerequisites');
+    }
+
+    public function validatePrerequisites()
+    {
+        $validationResult = $this->server->validatePrerequisites();
+        $this->prerequisites_installed = $validationResult['success'];
+        if (! $validationResult['success']) {
+            if ($this->install) {
+                if ($this->number_of_tries == $this->max_tries) {
+                    $missingCommands = implode(', ', $validationResult['missing']);
+                    $this->error = "Prerequisites ({$missingCommands}) could not be installed. Please install them manually before continuing.";
+                    $this->server->update([
+                        'validation_logs' => $this->error,
+                    ]);
+
+                    return;
+                } else {
+                    if ($this->number_of_tries <= $this->max_tries) {
+                        $this->installationStep = 'Prerequisites';
+                        $activity = $this->server->installPrerequisites();
+                        $this->number_of_tries++;
+                        $this->dispatch('activityMonitor', $activity->id, 'init', $this->number_of_tries, "{$this->installationStep} Installation Logs");
+                    }
+
+                    return;
+                }
+            } else {
+                $missingCommands = implode(', ', $validationResult['missing']);
+                $this->error = "Prerequisites ({$missingCommands}) are not installed. Please install them before continuing.";
+                $this->server->update([
+                    'validation_logs' => $this->error,
+                ]);
+
+                return;
+            }
+        }
         $this->dispatch('validateDockerEngine');
     }
 
@@ -121,9 +165,10 @@ class ValidateAndInstall extends Component
                     return;
                 } else {
                     if ($this->number_of_tries <= $this->max_tries) {
+                        $this->installationStep = 'Docker';
                         $activity = $this->server->installDocker();
                         $this->number_of_tries++;
-                        $this->dispatch('activityMonitor', $activity->id, 'init', $this->number_of_tries);
+                        $this->dispatch('activityMonitor', $activity->id, 'init', $this->number_of_tries, "{$this->installationStep} Installation Logs");
                     }
 
                     return;