4runr-os 2.10.71 → 2.10.73

package/dist/tui-handlers.js

@@ -1571,22 +1571,32 @@ async function handleGatewayConnect(ctx) {
                     level: 'success',
                     message: `Gateway already listening on port ${port}.`,
                 });
-                // CRITICAL FIX: Check /ready to ensure DB/Redis are actually up (not just the process)
+                // Ensure Postgres + Redis are up before trusting /ready (disconnect stops containers).
+                if (bundleCheck.exists && bundleCheck.path) {
+                    activityLog.push({
+                        timestamp: getCurrentTime(),
+                        level: 'info',
+                        message: 'Ensuring Postgres + Redis Docker stack is running...',
+                    });
+                    const redisUrl = await tryTuiAutostartDockerComposeStack(bundleCheck.path, activityLog, getCurrentTime);
+                    if (redisUrl) {
+                        await new Promise((r) => setTimeout(r, 2000));
+                    }
+                }
                 activityLog.push({
                     timestamp: getCurrentTime(),
                     level: 'info',
                     message: 'Verifying dependencies (DB, Redis)...',
                 });
                 try {
-                    const verify = await client.verify({ readyTimeoutMs: 8000 });
+                    const verify = await client.verify({ readyTimeoutMs: 12000 });
                     if (!verify.ok || !verify.ready?.ready) {
                         const errMsg = verify.error || (verify.ready ? 'Dependencies not ready' : 'Ready check failed');
                         activityLog.push({
                             timestamp: getCurrentTime(),
                             level: 'error',
-                            message: `Gateway is alive but dependencies are down: ${errMsg}`,
+                            message: `Gateway is alive but dependencies are not ready: ${errMsg}`,
                         });
-                        // Show which dependencies are down
                         if (verify.readyChecks) {
                             for (const check of verify.readyChecks) {
                                 if (check.status === 'down') {
@@ -1599,74 +1609,29 @@ async function handleGatewayConnect(ctx) {
                                 }
                             }
                         }
-                        // Try to auto-restart Docker stack if we have the bundle
-                        if (bundleCheck.exists && bundleCheck.path) {
-                            activityLog.push({
-                                timestamp: getCurrentTime(),
-                                level: 'info',
-                                message: 'Attempting to restart Docker containers...',
-                            });
-                            const redisUrl = await tryTuiAutostartDockerComposeStack(bundleCheck.path, activityLog, getCurrentTime);
-                            if (redisUrl) {
-                                await new Promise((r) => setTimeout(r, 3000));
-                                // Re-verify
-                                const verifyRetry = await client.verify({ readyTimeoutMs: 8000 });
-                                if (verifyRetry.ok && verifyRetry.ready?.ready) {
-                                    activityLog.push({
-                                        timestamp: getCurrentTime(),
-                                        level: 'success',
-                                        message: 'Docker containers restarted — Gateway is now ready!',
-                                    });
-                                }
-                                else {
-                                    activityLog.push({
-                                        timestamp: getCurrentTime(),
-                                        level: 'error',
-                                        message: 'Docker restart did not fix the issue. Check containers manually: docker ps',
-                                    });
-                                    ctx.server.sendResponse(ctx.ws, ctx.id, {
-                                        success: false,
-                                        error: `Gateway dependencies (DB/Redis) are down. Docker restart failed. Run: docker compose -f "${path.join(bundleCheck.path, 'docker-compose.local.yml')}" up -d`,
-                                        data: { activityLog, bundleStatus: bundleCheck, portStatus: { inUse: true, process: processInfo } },
-                                    });
-                                    return;
-                                }
-                            }
-                            else {
-                                activityLog.push({
-                                    timestamp: getCurrentTime(),
-                                    level: 'error',
-                                    message: 'Could not restart Docker stack. Start manually: docker compose up -d',
-                                });
-                                ctx.server.sendResponse(ctx.ws, ctx.id, {
-                                    success: false,
-                                    error: `Gateway is alive but DB/Redis are down. Start Docker manually: docker compose -f "${path.join(bundleCheck.path, 'docker-compose.local.yml')}" up -d`,
-                                    data: { activityLog, bundleStatus: bundleCheck, portStatus: { inUse: true, process: processInfo } },
-                                });
-                                return;
-                            }
-                        }
-                        else {
-                            activityLog.push({
-                                timestamp: getCurrentTime(),
-                                level: 'error',
-                                message: 'Gateway dependencies down but cannot auto-restart (no bundle path).',
-                            });
-                            ctx.server.sendResponse(ctx.ws, ctx.id, {
-                                success: false,
-                                error: `Gateway is alive but DB/Redis are down. Start Docker manually or restart the Gateway.`,
-                                data: { activityLog, bundleStatus: bundleCheck, portStatus: { inUse: true, process: processInfo } },
-                            });
-                            return;
-                        }
+                        const composeHint = bundleCheck.path
+                            ? `docker compose -p 4runr -f "${path.join(bundleCheck.path, 'docker-compose.local.yml')}" up -d`
+                            : 'docker start 4runr-postgres 4runr-redis';
+                        ctx.server.sendResponse(ctx.ws, ctx.id, {
+                            success: false,
+                            error: `Gateway dependencies (DB/Redis) are not ready. Run: ${composeHint}`,
+                            data: { activityLog, bundleStatus: bundleCheck, portStatus: { inUse: true, process: processInfo } },
+                        });
+                        return;
                     }
                 }
                 catch (readyErr) {
                     activityLog.push({
                         timestamp: getCurrentTime(),
-                        level: 'warning',
-                        message: `/ready check failed: ${errorMessage(readyErr)}. Proceeding (Gateway may be in degraded state).`,
+                        level: 'error',
+                        message: `/ready check failed: ${errorMessage(readyErr)}`,
+                    });
+                    ctx.server.sendResponse(ctx.ws, ctx.id, {
+                        success: false,
+                        error: `Could not verify Gateway dependencies: ${errorMessage(readyErr)}`,
+                        data: { activityLog, bundleStatus: bundleCheck, portStatus: { inUse: true, process: processInfo } },
                     });
+                    return;
                 }
                 activityLog.push({
                     timestamp: getCurrentTime(),
@@ -2025,12 +1990,37 @@ async function handleGatewayConnect(ctx) {
         });
     }
 }
+function isLocalGatewayHost(url) {
+    const trimmed = url.trim();
+    if (!trimmed)
+        return false;
+    try {
+        const host = new URL(trimmed).hostname.toLowerCase();
+        return host === 'localhost' || host === '127.0.0.1' || host === '0.0.0.0' || host === '::1';
+    }
+    catch {
+        return false;
+    }
+}
 async function handleGatewayDisconnect(ctx) {
+    const url = process.env.GATEWAY_URL || '';
+    const wasLocalhost = isLocalGatewayHost(url);
     tuiActiveGatewayClient = null;
     delete process.env.GATEWAY_URL;
+    let message;
+    if (wasLocalhost) {
+        const { shutdownLocalGatewayStack } = await import('./watchdog.js');
+        shutdownLocalGatewayStack();
+        message =
+            'Disconnected — local Gateway stopped and Postgres/Redis containers stopped (data volumes kept).';
+    }
     ctx.server.sendResponse(ctx.ws, ctx.id, {
         success: true,
-        data: { connected: false },
+        data: {
+            connected: false,
+            localShutdown: wasLocalhost,
+            message,
+        },
     });
 }
 async function handleGatewayStatus(ctx) {