Merge branch 'main' into af-fix-ngrok

Author: aarondfrancis

config/solo.php

@@ -52,7 +52,7 @@
         'Make' => new MakeCommand,
         // 'HTTP' => 'php artisan serve',
 
-        // Lazy commands do no automatically start when Solo starts.
+        // Lazy commands do not automatically start when Solo starts.
         'Dumps' => Command::from('php artisan solo:dumps')->lazy(),
         'Reverb' => Command::from('php artisan reverb:start --debug')->lazy(),
         'Pint' => Command::from('./vendor/bin/pint --ansi')->lazy(),

src/Commands/Concerns/ManagesProcess.php

@@ -244,9 +244,14 @@ public function stop(): void
             // Keep track of when we tried to stop.
             $this->stopInitiatedAt ??= Carbon::now();
 
-            // Ask for a graceful shutdown. If it isn't
-            // respected, we'll force kill it later.
-            $this->process->signal(SIGTERM);
+            foreach ($this->children as $pid) {
+                $command = trim(shell_exec("ps -o command= -p $pid"));
+
+                // If it doesn't contain 'screen' or 'SCREEN', it's likely our actual command
+                if (!Str::startsWith($command, 'screen') && !Str::startsWith($command, 'SCREEN')) {
+                    posix_kill((int) $pid, SIGTERM);
+                }
+            }
         }
     }
 

src/Support/Frames.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * @author Aaron Francis <[email protected]>
- *
- * @link https://aaronfrancis.com
- * @link https://twitter.com/aarondfrancis
- */
-
 declare(strict_types=1);
 
 /**

src/Support/KeyPressListener.php

@@ -1,7 +1,10 @@
 <?php
 
 /**
- * @author Aaron Francis <[email protected]|https://twitter.com/aarondfrancis>
+ * @author Aaron Francis <[email protected]>
+ *
+ * @link https://aaronfrancis.com
+ * @link https://x.com/aarondfrancis
  */
 
 namespace SoloTerm\Solo\Support;

workbench/config/solo.php

@@ -1,7 +1,10 @@
 <?php
 
 /**
- * @author Aaron Francis <[email protected]|https://twitter.com/aarondfrancis>
+ * @author Aaron Francis <[email protected]>
+ *
+ * @link https://aaronfrancis.com
+ * @link https://x.com/aarondfrancis
  */
 
 use SoloTerm\Solo\Commands\Command;