From 42d6cec1e0d9e4695bbfea2a86cf21bfad5c8082 Mon Sep 17 00:00:00 2001
From: Felix <24791380+vcfgv@users.noreply.github.com>
Date: Thu, 2 Apr 2026 17:45:07 +0800
Subject: [PATCH] Revert "fix(gateway): refine process termination and wait
 logic on retry" (#754)

---
 electron/gateway/manager.ts              |  4 +---
 electron/gateway/startup-orchestrator.ts | 13 +++----------
 electron/gateway/supervisor.ts           |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/electron/gateway/manager.ts b/electron/gateway/manager.ts
index e61172087..415274a6a 100644
--- a/electron/gateway/manager.ts
+++ b/electron/gateway/manager.ts
@@ -297,13 +297,11 @@ export class GatewayManager extends EventEmitter {
                 process.kill(pid, 0);
                 // Still alive — keep this.process so later cleanup can reach it
               } catch {
-                // Process is gone — safe to clear the handle and ownership flag
+                // Process is gone — safe to clear the handle
                 this.process = null;
-                this.ownsProcess = false;
               }
             } else {
               this.process = null;
-              this.ownsProcess = false;
             }
           }
         },
diff --git a/electron/gateway/startup-orchestrator.ts b/electron/gateway/startup-orchestrator.ts
index 4036a6efe..102618554 100644
--- a/electron/gateway/startup-orchestrator.ts
+++ b/electron/gateway/startup-orchestrator.ts
@@ -98,15 +98,14 @@ export async function runGatewayStartupSequence(hooks: StartupHooks): Promise<vo
 
       if (recoveryAction === 'retry') {
         logger.warn(`Transient start error: ${String(error)}. Retrying... (${startAttempts}/${maxStartAttempts})`);
-        // Terminate the previously spawned process before the backoff delay so
-        // it releases the port as early as possible; the subsequent delay gives
-        // the OS time to recycle the port (especially TCP TIME_WAIT on Windows).
+        await hooks.delay(1000);
+        // Terminate the previously spawned process before retrying so it doesn't
+        // hold the port and cause another handshake failure.
         if (hooks.terminateOwnedProcess) {
           await hooks.terminateOwnedProcess().catch((err) => {
             logger.warn('Failed to terminate owned process before retry:', err);
           });
         }
-        await hooks.delay(1000);
         hooks.assertLifecycle('start/retry-pre-port-wait');
         // Wait for port to become free before retrying (handles lingering processes).
         // Use a short-polling AbortController so that a superseding stop()/restart()
@@ -123,12 +122,6 @@ export async function runGatewayStartupSequence(hooks: StartupHooks): Promise<vo
           }, 500);
           try {
             await hooks.waitForPortFree(hooks.port, abortController.signal);
-          } catch (portWaitError) {
-            // If the wait was aborted due to lifecycle supersede, convert to
-            // LifecycleSupersededError so the outer handler propagates correctly.
-            hooks.assertLifecycle('start/retry-port-wait-aborted');
-            // If assertLifecycle didn't throw, it's a genuine port-wait error — rethrow.
-            throw portWaitError;
           } finally {
             clearInterval(lifecyclePollInterval);
           }
diff --git a/electron/gateway/supervisor.ts b/electron/gateway/supervisor.ts
index 9186986fd..272380348 100644
--- a/electron/gateway/supervisor.ts
+++ b/electron/gateway/supervisor.ts
@@ -137,7 +137,7 @@ export async function waitForPortFree(port: number, timeoutMs = 30000, signal?:
   while (Date.now() - start < timeoutMs) {
     if (signal?.aborted) {
       logger.debug(`waitForPortFree: aborted while waiting for port ${port}`);
-      throw new Error(`waitForPortFree: aborted while waiting for port ${port}`);
+      return;
     }
 
     const available = await new Promise<boolean>((resolve) => {