fix(cli): clean up desktop server process on shutdown

Author: GaspardKirira

src/commands/DesktopCommand.cpp

@@ -68,7 +68,7 @@ namespace
 
     bool startServer{false};
     bool waitForServer{true};
-    std::chrono::milliseconds startupTimeout{5000};
+    std::chrono::milliseconds startupTimeout{30000};
 
     std::string serverCommand{};
     std::string serverWorkingDirectory{};
@@ -102,6 +102,53 @@ namespace
     return true;
   }
 
+  std::string shell_quote_env_value(const std::string &value)
+  {
+    std::string out;
+    out.reserve(value.size() + 2);
+
+    out += "'";
+
+    for (char ch : value)
+    {
+      if (ch == '\'')
+      {
+        out += "'\\''";
+      }
+      else
+      {
+        out += ch;
+      }
+    }
+
+    out += "'";
+    return out;
+  }
+
+  std::string with_desktop_server_env(
+      const DesktopOptions &options,
+      const std::string &command)
+  {
+    if (command.empty())
+    {
+      return command;
+    }
+
+    std::string out;
+
+    out += "SERVER_HOST=";
+    out += shell_quote_env_value(options.host);
+    out += " ";
+
+    out += "SERVER_PORT=";
+    out += std::to_string(options.port);
+    out += " ";
+
+    out += command;
+
+    return out;
+  }
+
   bool parse_positive_int(const std::string &value, int &out)
   {
     if (value.empty())
@@ -651,7 +698,8 @@ namespace
 
     if (!options.serverCommand.empty())
     {
-      config.set_server_command(options.serverCommand);
+      config.set_server_command(
+          with_desktop_server_env(options, options.serverCommand));
     }
 
     if (!options.serverWorkingDirectory.empty())
@@ -684,8 +732,8 @@ namespace
 
     vix::ui::AppShell shell(config);
 
-    info("Starting Vix desktop shell.");
-    step(shell.target_url());
+    info("Preparing Vix desktop shell.");
+    step("target: " + shell.target_url());
 
     vix::ui::Result<void> result = shell.start();
 
@@ -786,7 +834,7 @@ namespace vix::commands
         << "  --working-directory <dir>   Same as --cwd <dir>\n"
         << "  --wait                      Wait for the server to become reachable, default\n"
         << "  --no-wait                   Do not wait for server readiness\n"
-        << "  --timeout-ms <ms>           Server startup timeout. Default: 5000\n\n"
+        << "  --timeout-ms <ms>           Server startup timeout. Default: 30000\n\n"
 
         << "Metadata options:\n"
         << "  --app-id <id>               Stable desktop application id\n"

src/commands/run/RunProcess.cpp

@@ -191,11 +191,13 @@ namespace vix::commands::RunCommand::detail
 
   namespace
   {
-    static volatile sig_atomic_t g_sigint_requested = 0;
+    static volatile sig_atomic_t g_signal_requested = 0;
+    static volatile sig_atomic_t g_requested_signal = 0;
 
-    void on_sigint(int)
+    void on_runtime_signal(int sig)
     {
-      g_sigint_requested = 1;
+      g_signal_requested = 1;
+      g_requested_signal = sig;
     }
 
     bool is_runtime_crash_noise_line(std::string_view line) noexcept
@@ -236,28 +238,58 @@ namespace vix::commands::RunCommand::detail
       return out;
     }
 
-    struct SigintGuard
+    struct RuntimeSignalGuard
     {
-      struct sigaction oldAction{};
-      bool installed = false;
+      struct sigaction oldInt{};
+      struct sigaction oldTerm{};
+      struct sigaction oldHup{};
 
-      SigintGuard()
+      bool installedInt = false;
+      bool installedTerm = false;
+      bool installedHup = false;
+
+      RuntimeSignalGuard()
       {
-        g_sigint_requested = 0;
+        g_signal_requested = 0;
+        g_requested_signal = 0;
 
         struct sigaction sa{};
-        sa.sa_handler = on_sigint;
+        sa.sa_handler = on_runtime_signal;
         sigemptyset(&sa.sa_mask);
         sa.sa_flags = 0;
 
-        if (sigaction(SIGINT, &sa, &oldAction) == 0)
-          installed = true;
+        if (sigaction(SIGINT, &sa, &oldInt) == 0)
+        {
+          installedInt = true;
+        }
+
+        if (sigaction(SIGTERM, &sa, &oldTerm) == 0)
+        {
+          installedTerm = true;
+        }
+
+        if (sigaction(SIGHUP, &sa, &oldHup) == 0)
+        {
+          installedHup = true;
+        }
       }
 
-      ~SigintGuard()
+      ~RuntimeSignalGuard()
       {
-        if (installed)
-          sigaction(SIGINT, &oldAction, nullptr);
+        if (installedInt)
+        {
+          sigaction(SIGINT, &oldInt, nullptr);
+        }
+
+        if (installedTerm)
+        {
+          sigaction(SIGTERM, &oldTerm, nullptr);
+        }
+
+        if (installedHup)
+        {
+          sigaction(SIGHUP, &oldHup, nullptr);
+        }
       }
     };
 
@@ -1297,7 +1329,7 @@ namespace vix::commands::RunCommand::detail
       bool captureOnly,
       vix::commands::replay::ReplayCapture *replayCapture)
   {
-    SigintGuard sigGuard;
+    RuntimeSignalGuard signalGuard;
     LiveRunResult result;
 
     PtySession pty;
@@ -1465,10 +1497,15 @@ namespace vix::commands::RunCommand::detail
 
     while (running)
     {
-      if (!sentInt && g_sigint_requested)
+      if (!sentInt && g_signal_requested)
       {
-        userInterrupted = true;
-        kill_group_or_pid(pid, SIGINT);
+        const int requestedSignal =
+            g_requested_signal > 0 ? static_cast<int>(g_requested_signal) : SIGTERM;
+
+        userInterrupted = requestedSignal == SIGINT;
+
+        kill_group_or_pid(pid, requestedSignal);
+
         sentInt = true;
         intTime = std::chrono::steady_clock::now();
       }

src/commands/run/RunScript.cpp

@@ -1088,12 +1088,23 @@ namespace vix::commands::RunCommand::detail
           (rr.terminatedBySignal && rr.termSignal == SIGINT) ||
           log_looks_like_interrupt(runtimeLog);
 
+      const bool stoppedByDesktopOrSupervisor =
+          opt.forceServerLike &&
+          ((rr.terminatedBySignal &&
+            (rr.termSignal == SIGTERM || rr.termSignal == SIGHUP)) ||
+           runCode == 143 ||
+           runCode == 129);
+
       if (interruptedBySigint)
       {
         hint("ℹ Program interrupted by user (SIGINT).");
         return 0;
       }
 
+      if (stoppedByDesktopOrSupervisor)
+      {
+        return 0;
+      }
       const bool looksSanOrUb =
           !runtimeLog.empty() && log_looks_like_sanitizer_or_ub(runtimeLog);