Add noCleanup parameter to improve process timeout handling in SSH operations

Author: antonmedv

src/Ssh/RunParams.php

@@ -11,6 +11,7 @@ public function __construct(
         public ?string $dotenv = null,
         public bool    $nothrow = false,
         public ?int    $timeout = null,
+        public bool    $noCleanup = false,
         public ?int    $idleTimeout = null,
         public bool    $forceOutput = false,
         #[\SensitiveParameter]
@@ -21,10 +22,12 @@ public function with(
         #[\SensitiveParameter]
         ?array $secrets = null,
         ?int $timeout = null,
+        ?bool $noCleanup = null,
     ): self {
         $params = clone $this;
         $params->secrets = array_merge($params->secrets ?? [], $secrets ?? []);
         $params->timeout = $timeout ?? $params->timeout;
+        $params->noCleanup = $noCleanup ?? $params->noCleanup;
         return $params;
     }
 }

src/Ssh/SshClient.php

@@ -46,7 +46,7 @@ public function run(Host $host, string $command, RunParams $params): string
         if ($this->output->isDebug()) {
             $sshString = $ssh[0];
             for ($i = 1; $i < count($ssh); $i++) {
-                $sshString .= ' ' . \Deployer\quote((string) $ssh[$i]);
+                $sshString .= ' ' . \Deployer\quote((string)$ssh[$i]);
             }
             $this->output->writeln("[$host] $sshString");
         }
@@ -76,9 +76,24 @@ public function run(Host $host, string $command, RunParams $params): string
             $process->run($callback);
         } catch (ProcessTimedOutException $exception) {
             // Let's try to kill all processes started by this command.
-            $pid = $this->run($host, "ps x | grep $shellId | grep -v grep | awk '{print \$1}'", $params->with(timeout: 10));
-            // Minus before pid means all processes in this group.
-            $this->run($host, "kill -9 -$pid", $params->with(timeout: 20));
+            // Cleanup runs pass noCleanup so a timeout here can't recurse,
+            // and cleanup failures must not mask the timeout, so swallow them.
+            if (!$params->noCleanup) {
+                try {
+                    $pid = trim($this->run(
+                        $host,
+                        "ps x | grep $shellId | grep -v grep | awk '{print \$1}'",
+                        $params->with(timeout: 10, noCleanup: true),
+                    ));
+                    if ($pid !== '') {
+                        // Minus before pid means all processes in this group.
+                        $this->run($host, "kill -9 -$pid", $params->with(timeout: 20, noCleanup: true));
+                    }
+                } catch (\Throwable) {
+                    // The shell may have already exited, or `ps`/`kill` may be
+                    // restricted. Either way, the timeout is the real error.
+                }
+            }
             throw new TimeoutException(
                 $command,
                 $exception->getExceededTimeout(),