From 7d1b199161291384b0fb27532f993f1b29fad95d Mon Sep 17 00:00:00 2001
From: Yohjisakamoto <Yohjisakamoto@users.noreply.github.com>
Date: Sun, 13 Sep 2026 16:48:07 +0200
Subject: [PATCH] hotfix: probe target gateway URL during TUI startup launch

---
 apps/tui/src/gateway/autostart.ts | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/tui/src/gateway/autostart.ts b/apps/tui/src/gateway/autostart.ts
index d9521655..c3f8f528 100644
--- a/apps/tui/src/gateway/autostart.ts
+++ b/apps/tui/src/gateway/autostart.ts
@@ -304,14 +304,15 @@ async function launchGatewayProcess(request: GatewayLaunchRequest): Promise<stri
         ),
       );
     }
-    const activeUrl = readActiveGatewayUrl(request.instanceHome);
-    const candidateUrl = activeUrl ? stripTrailingSlash(activeUrl) : targetUrl;
-    const identity = await gatewayIdentityWithProbeTimeout(candidateUrl);
-    if (
-      identity &&
-      gatewayMatchesInstance(identity, request.instanceHome, request.projectRoot, false)
-    ) {
-      return candidateUrl;
+    const candidateUrls = launchCandidateGatewayUrls(request.instanceHome, targetUrl);
+    for (const candidateUrl of candidateUrls) {
+      const identity = await gatewayIdentityWithProbeTimeout(candidateUrl);
+      if (
+        identity &&
+        gatewayMatchesInstance(identity, request.instanceHome, request.projectRoot, false)
+      ) {
+        return candidateUrl;
+      }
     }
     await delay(HEALTH_POLL_INTERVAL_MS);
   }
@@ -319,6 +320,14 @@ async function launchGatewayProcess(request: GatewayLaunchRequest): Promise<stri
   throw new Error(gatewayLaunchError(t("gatewayStartTimeout"), stderrPath, stderrOffset));
 }
 
+function launchCandidateGatewayUrls(instanceHome: string, targetUrl: string): string[] {
+  const activeUrl = readActiveGatewayUrl(instanceHome);
+  const candidates = new Set<string>();
+  if (activeUrl) candidates.add(stripTrailingSlash(activeUrl));
+  candidates.add(targetUrl);
+  return Array.from(candidates);
+}
+
 function gatewayProcessEnv(request: GatewayLaunchRequest): NodeJS.ProcessEnv {
   const port = portFromGatewayUrl(request.targetUrl);
   return {