From 1c5ce4731b491711b107ab839855df30538296b7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 14:59:00 +0000
Subject: [PATCH 1/7] Initial plan


From 9213b4a03a50d181cc2771eddb3d623a10b9d9d4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 15:09:15 +0000
Subject: [PATCH 2/7] Fix MCP gateway health check to enforce HTTP 200
 compliance

Remove acceptance of HTTP 204 (No Content) from health checks to comply with
MCP Gateway Specification v1.3.0 which requires /health endpoint to return
HTTP 200 with JSON body containing specVersion and gatewayVersion fields.

Changes:
- verify_mcp_gateway_health.sh: Only accept HTTP 200 (removed 204)
- start_mcp_gateway.sh: Explicitly check for HTTP 200 and non-empty response body

Fixes compliance with specification section 8.1.1 and tests T-HLT-006 through T-HLT-009.

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/sh/start_mcp_gateway.sh         | 9 +++++++--
 actions/setup/sh/verify_mcp_gateway_health.sh | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/actions/setup/sh/start_mcp_gateway.sh b/actions/setup/sh/start_mcp_gateway.sh
index 782b7528e50..097b76a330b 100755
--- a/actions/setup/sh/start_mcp_gateway.sh
+++ b/actions/setup/sh/start_mcp_gateway.sh
@@ -157,11 +157,16 @@ while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
   fi
   
   # Check health endpoint using localhost (since we're running on the host)
-  HEALTH_RESPONSE=$(curl -f -s "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1) && {
+  # Per MCP Gateway Specification v1.3.0, /health must return HTTP 200 with JSON body containing specVersion and gatewayVersion
+  RESPONSE=$(curl -s -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
+  HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
+  HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
+  
+  if [ "$HTTP_CODE" = "200" ] && [ -n "$HEALTH_RESPONSE" ]; then
     echo "Gateway is ready!"
     echo "Health response: $HEALTH_RESPONSE"
     break
-  }
+  fi
   ATTEMPT=$((ATTEMPT + 1))
   if [ $ATTEMPT -lt $MAX_ATTEMPTS ]; then
     echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Gateway not ready yet (curl response: $HEALTH_RESPONSE), waiting 1 second..."
diff --git a/actions/setup/sh/verify_mcp_gateway_health.sh b/actions/setup/sh/verify_mcp_gateway_health.sh
index d587e895687..28cea709b74 100755
--- a/actions/setup/sh/verify_mcp_gateway_health.sh
+++ b/actions/setup/sh/verify_mcp_gateway_health.sh
@@ -58,7 +58,7 @@ while [ $retry_count -lt $max_retries ]; do
   http_code=$(echo "$response" | tail -n 1)
   health_response=$(echo "$response" | head -n -1)
   
-  if echo "$http_code" | grep -q "200\|204"; then
+  if [ "$http_code" = "200" ]; then
     echo "✓ MCP Gateway is ready!"
     gateway_ready=true
     break

From 84bd8a4d3a6f28a983f392136175a97e91050e00 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 15:25:38 +0000
Subject: [PATCH 3/7] Always log health response and errors before returning

- Log health endpoint HTTP code and response body on every attempt
- Log last HTTP code and response before error exit
- Improve debugging when gateway health checks fail

This helps diagnose failures like "Process completed with exit code 7"
by showing what the health endpoint actually returned.

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/sh/start_mcp_gateway.sh         | 14 ++++++++++++--
 actions/setup/sh/verify_mcp_gateway_health.sh | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/actions/setup/sh/start_mcp_gateway.sh b/actions/setup/sh/start_mcp_gateway.sh
index 097b76a330b..cab140d0a99 100755
--- a/actions/setup/sh/start_mcp_gateway.sh
+++ b/actions/setup/sh/start_mcp_gateway.sh
@@ -162,20 +162,30 @@ while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
   HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
   HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
   
+  # Always log the health response for debugging
+  echo "Health endpoint HTTP code: $HTTP_CODE"
+  if [ -n "$HEALTH_RESPONSE" ]; then
+    echo "Health response body: $HEALTH_RESPONSE"
+  else
+    echo "Health response body: (empty)"
+  fi
+  
   if [ "$HTTP_CODE" = "200" ] && [ -n "$HEALTH_RESPONSE" ]; then
     echo "Gateway is ready!"
-    echo "Health response: $HEALTH_RESPONSE"
     break
   fi
   ATTEMPT=$((ATTEMPT + 1))
   if [ $ATTEMPT -lt $MAX_ATTEMPTS ]; then
-    echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Gateway not ready yet (curl response: $HEALTH_RESPONSE), waiting 1 second..."
+    echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Gateway not ready yet, waiting 1 second..."
     sleep 1
   fi
 done
 
 if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
+  echo ""
   echo "ERROR: Gateway failed to become ready after $MAX_ATTEMPTS attempts"
+  echo "Last HTTP code: $HTTP_CODE"
+  echo "Last health response: ${HEALTH_RESPONSE:-(empty)}"
   echo ""
   echo "Checking if gateway process is still alive..."
   if ps -p $GATEWAY_PID > /dev/null 2>&1; then
diff --git a/actions/setup/sh/verify_mcp_gateway_health.sh b/actions/setup/sh/verify_mcp_gateway_health.sh
index 28cea709b74..d0714f2eedf 100755
--- a/actions/setup/sh/verify_mcp_gateway_health.sh
+++ b/actions/setup/sh/verify_mcp_gateway_health.sh
@@ -58,6 +58,14 @@ while [ $retry_count -lt $max_retries ]; do
   http_code=$(echo "$response" | tail -n 1)
   health_response=$(echo "$response" | head -n -1)
   
+  # Always log the health response for debugging
+  echo "Health endpoint HTTP code: $http_code"
+  if [ -n "$health_response" ]; then
+    echo "Health response body: $health_response"
+  else
+    echo "Health response body: (empty)"
+  fi
+  
   if [ "$http_code" = "200" ]; then
     echo "✓ MCP Gateway is ready!"
     gateway_ready=true
@@ -69,7 +77,10 @@ while [ $retry_count -lt $max_retries ]; do
 done
 
 if [ "$gateway_ready" = false ]; then
+  echo ''
   echo "✗ Error: MCP Gateway failed to start after $max_retries attempts"
+  echo "Last HTTP code: $http_code"
+  echo "Last health response: ${health_response:-(empty)}"
   echo ''
   echo '=== Gateway Logs (Full) ==='
   cat "${logs_folder}/gateway.log" || echo 'No gateway logs found'
@@ -77,10 +88,8 @@ if [ "$gateway_ready" = false ]; then
 fi
 
 # Parse and display version information from health response
+echo ''
 if [ -n "$health_response" ]; then
-  echo "Health response: $health_response"
-  echo ''
-  
   # Extract version information using jq if available
   if command -v jq >/dev/null 2>&1; then
     spec_version=$(echo "$health_response" | jq -r '.specVersion // "unknown"')

From 930c6dfdec5d0e65d04ddbb362ebd3bffbc8d48c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 17:13:14 +0000
Subject: [PATCH 4/7] Log curl URL details before health check calls

- Add logging of health endpoint URL before each curl call
- Helps debug connection issues (hostname, port, path)
- Makes it clear which endpoint is being queried

Example output:
  Calling health endpoint: http://localhost:8080/health
  Health endpoint HTTP code: 200
  Health response body: {"status":"healthy"}

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/sh/start_mcp_gateway.sh         | 1 +
 actions/setup/sh/verify_mcp_gateway_health.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/actions/setup/sh/start_mcp_gateway.sh b/actions/setup/sh/start_mcp_gateway.sh
index cab140d0a99..b7ab5becd3b 100755
--- a/actions/setup/sh/start_mcp_gateway.sh
+++ b/actions/setup/sh/start_mcp_gateway.sh
@@ -158,6 +158,7 @@ while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
   
   # Check health endpoint using localhost (since we're running on the host)
   # Per MCP Gateway Specification v1.3.0, /health must return HTTP 200 with JSON body containing specVersion and gatewayVersion
+  echo "Calling health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health"
   RESPONSE=$(curl -s -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
   HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
   HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
diff --git a/actions/setup/sh/verify_mcp_gateway_health.sh b/actions/setup/sh/verify_mcp_gateway_health.sh
index d0714f2eedf..ceb421b39eb 100755
--- a/actions/setup/sh/verify_mcp_gateway_health.sh
+++ b/actions/setup/sh/verify_mcp_gateway_health.sh
@@ -54,6 +54,7 @@ health_response=""
 
 while [ $retry_count -lt $max_retries ]; do
   # Capture both response body and HTTP code in a single curl call
+  echo "Calling health endpoint: ${gateway_url}/health"
   response=$(curl -s -w "\n%{http_code}" "${gateway_url}/health")
   http_code=$(echo "$response" | tail -n 1)
   health_response=$(echo "$response" | head -n -1)

From 59dadc8d16251caf2ddac497212a5e250faab681 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 17:23:09 +0000
Subject: [PATCH 5/7] Add curl retry options to health check calls

- Add --retry 3 to retry failed requests up to 3 times
- Add --retry-delay 1 for 1 second delay between retries
- Add --retry-connrefused to retry on connection refused errors

This makes health checks more resilient to:
- Gateway startup delays
- Transient network issues
- Temporary connection failures

Each health check attempt now retries internally before the outer
loop retry, improving reliability without increasing total wait time.

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/sh/start_mcp_gateway.sh         | 3 ++-
 actions/setup/sh/verify_mcp_gateway_health.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/actions/setup/sh/start_mcp_gateway.sh b/actions/setup/sh/start_mcp_gateway.sh
index b7ab5becd3b..2617b62c942 100755
--- a/actions/setup/sh/start_mcp_gateway.sh
+++ b/actions/setup/sh/start_mcp_gateway.sh
@@ -158,8 +158,9 @@ while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
   
   # Check health endpoint using localhost (since we're running on the host)
   # Per MCP Gateway Specification v1.3.0, /health must return HTTP 200 with JSON body containing specVersion and gatewayVersion
+  # Use curl retry options: retry 3 times with 1 second delay between retries
   echo "Calling health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health"
-  RESPONSE=$(curl -s -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
+  RESPONSE=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
   HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
   HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
   
diff --git a/actions/setup/sh/verify_mcp_gateway_health.sh b/actions/setup/sh/verify_mcp_gateway_health.sh
index ceb421b39eb..b284b99f373 100755
--- a/actions/setup/sh/verify_mcp_gateway_health.sh
+++ b/actions/setup/sh/verify_mcp_gateway_health.sh
@@ -54,8 +54,9 @@ health_response=""
 
 while [ $retry_count -lt $max_retries ]; do
   # Capture both response body and HTTP code in a single curl call
+  # Use curl retry options: retry 3 times with 1 second delay between retries
   echo "Calling health endpoint: ${gateway_url}/health"
-  response=$(curl -s -w "\n%{http_code}" "${gateway_url}/health")
+  response=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused -w "\n%{http_code}" "${gateway_url}/health")
   http_code=$(echo "$response" | tail -n 1)
   health_response=$(echo "$response" | head -n -1)
   

From af591a3ecdb215845f5b468d10a775af91603e0c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 17:34:02 +0000
Subject: [PATCH 6/7] Implement 120s timeout with exponential backoff for
 health checks

- Increase total retry time from 30s to 120s
- Implement exponential backoff: 1s, 2s, 4s, 8s, 16s, 32s (capped at 32s)
- Use curl --retry-max-time to respect remaining time per attempt
- Track elapsed time and stop when 120s limit reached
- Quick retries initially (1-4s) for fast failures
- Longer waits later (16-32s) for slow gateway startup

Timeline: ~8 attempts over 120s vs previous 30 attempts over 30s
Benefits:
- Matches gateway startup requirements (40-50s typical)
- Efficient retry pattern for both fast and slow scenarios
- curl --retry-max-time prevents hanging beyond time limit

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/sh/start_mcp_gateway.sh         | 57 +++++++++++++++----
 actions/setup/sh/verify_mcp_gateway_health.sh | 51 ++++++++++++++---
 2 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/actions/setup/sh/start_mcp_gateway.sh b/actions/setup/sh/start_mcp_gateway.sh
index 2617b62c942..06ca9bfe73c 100755
--- a/actions/setup/sh/start_mcp_gateway.sh
+++ b/actions/setup/sh/start_mcp_gateway.sh
@@ -141,9 +141,20 @@ echo "Waiting for gateway to be ready..."
 HEALTH_CHECK_HOST="localhost"
 echo "Health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health"
 echo "(Note: MCP_GATEWAY_DOMAIN is '${MCP_GATEWAY_DOMAIN}' for container access)"
-MAX_ATTEMPTS=30
+MAX_WAIT_TIME=120  # Total maximum wait time in seconds
 ATTEMPT=0
-while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
+START_TIME=$(date +%s)
+BACKOFF_DELAY=1  # Initial backoff delay in seconds
+
+while true; do
+  # Check if we've exceeded the maximum wait time
+  CURRENT_TIME=$(date +%s)
+  ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
+  if [ $ELAPSED_TIME -ge $MAX_WAIT_TIME ]; then
+    echo "Maximum wait time of ${MAX_WAIT_TIME}s exceeded"
+    break
+  fi
+  
   # First check if the gateway process is still running
   if ! ps -p $GATEWAY_PID > /dev/null 2>&1; then
     echo "ERROR: Gateway process (PID: $GATEWAY_PID) has exited unexpectedly!"
@@ -158,9 +169,10 @@ while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
   
   # Check health endpoint using localhost (since we're running on the host)
   # Per MCP Gateway Specification v1.3.0, /health must return HTTP 200 with JSON body containing specVersion and gatewayVersion
-  # Use curl retry options: retry 3 times with 1 second delay between retries
-  echo "Calling health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health"
-  RESPONSE=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
+  # Use curl retry options with max time limit and exponential backoff
+  REMAINING_TIME=$((MAX_WAIT_TIME - ELAPSED_TIME))
+  echo "Calling health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health (attempt $((ATTEMPT + 1)), elapsed: ${ELAPSED_TIME}s)"
+  RESPONSE=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused --retry-max-time $REMAINING_TIME -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
   HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
   HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
   
@@ -176,16 +188,41 @@ while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
     echo "Gateway is ready!"
     break
   fi
+  
   ATTEMPT=$((ATTEMPT + 1))
-  if [ $ATTEMPT -lt $MAX_ATTEMPTS ]; then
-    echo "Attempt $ATTEMPT/$MAX_ATTEMPTS: Gateway not ready yet, waiting 1 second..."
-    sleep 1
+  
+  # Calculate remaining time
+  CURRENT_TIME=$(date +%s)
+  ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
+  REMAINING_TIME=$((MAX_WAIT_TIME - ELAPSED_TIME))
+  
+  if [ $REMAINING_TIME -le 0 ]; then
+    echo "No time remaining for retry"
+    break
+  fi
+  
+  # Use exponential backoff, but cap at remaining time
+  if [ $BACKOFF_DELAY -gt $REMAINING_TIME ]; then
+    BACKOFF_DELAY=$REMAINING_TIME
+  fi
+  
+  echo "Waiting ${BACKOFF_DELAY}s before retry (exponential backoff)..."
+  sleep $BACKOFF_DELAY
+  
+  # Double the backoff delay for next iteration (exponential backoff), cap at 32s
+  BACKOFF_DELAY=$((BACKOFF_DELAY * 2))
+  if [ $BACKOFF_DELAY -gt 32 ]; then
+    BACKOFF_DELAY=32
   fi
 done
 
-if [ $ATTEMPT -eq $MAX_ATTEMPTS ]; then
+# Check if we succeeded or ran out of time
+CURRENT_TIME=$(date +%s)
+ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
+
+if [ $ELAPSED_TIME -ge $MAX_WAIT_TIME ]; then
   echo ""
-  echo "ERROR: Gateway failed to become ready after $MAX_ATTEMPTS attempts"
+  echo "ERROR: Gateway failed to become ready after ${MAX_WAIT_TIME}s"
   echo "Last HTTP code: $HTTP_CODE"
   echo "Last health response: ${HEALTH_RESPONSE:-(empty)}"
   echo ""
diff --git a/actions/setup/sh/verify_mcp_gateway_health.sh b/actions/setup/sh/verify_mcp_gateway_health.sh
index b284b99f373..20bf4121ec3 100755
--- a/actions/setup/sh/verify_mcp_gateway_health.sh
+++ b/actions/setup/sh/verify_mcp_gateway_health.sh
@@ -47,16 +47,26 @@ echo ''
 
 # Wait for gateway to be ready FIRST before checking config
 echo '=== Testing Gateway Health ==='
-max_retries=30
+max_wait_time=120  # Total maximum wait time in seconds
 retry_count=0
 gateway_ready=false
 health_response=""
-
-while [ $retry_count -lt $max_retries ]; do
+start_time=$(date +%s)
+backoff_delay=1  # Initial backoff delay in seconds
+
+while true; do
+  # Check if we've exceeded the maximum wait time
+  current_time=$(date +%s)
+  elapsed_time=$((current_time - start_time))
+  if [ $elapsed_time -ge $max_wait_time ]; then
+    echo "Maximum wait time of ${max_wait_time}s exceeded"
+    break
+  fi
+  
   # Capture both response body and HTTP code in a single curl call
-  # Use curl retry options: retry 3 times with 1 second delay between retries
-  echo "Calling health endpoint: ${gateway_url}/health"
-  response=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused -w "\n%{http_code}" "${gateway_url}/health")
+  # Use curl retry options with max time limit and exponential backoff
+  echo "Calling health endpoint: ${gateway_url}/health (attempt $((retry_count + 1)), elapsed: ${elapsed_time}s)"
+  response=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused --retry-max-time $((max_wait_time - elapsed_time)) -w "\n%{http_code}" "${gateway_url}/health")
   http_code=$(echo "$response" | tail -n 1)
   health_response=$(echo "$response" | head -n -1)
   
@@ -73,14 +83,37 @@ while [ $retry_count -lt $max_retries ]; do
     gateway_ready=true
     break
   fi
+  
   retry_count=$((retry_count + 1))
-  echo "Waiting for gateway... (attempt $retry_count/$max_retries)"
-  sleep 1
+  
+  # Calculate remaining time
+  current_time=$(date +%s)
+  elapsed_time=$((current_time - start_time))
+  remaining_time=$((max_wait_time - elapsed_time))
+  
+  if [ $remaining_time -le 0 ]; then
+    echo "No time remaining for retry"
+    break
+  fi
+  
+  # Use exponential backoff, but cap at remaining time
+  if [ $backoff_delay -gt $remaining_time ]; then
+    backoff_delay=$remaining_time
+  fi
+  
+  echo "Waiting ${backoff_delay}s before retry (exponential backoff)..."
+  sleep $backoff_delay
+  
+  # Double the backoff delay for next iteration (exponential backoff), cap at 32s
+  backoff_delay=$((backoff_delay * 2))
+  if [ $backoff_delay -gt 32 ]; then
+    backoff_delay=32
+  fi
 done
 
 if [ "$gateway_ready" = false ]; then
   echo ''
-  echo "✗ Error: MCP Gateway failed to start after $max_retries attempts"
+  echo "✗ Error: MCP Gateway failed to start after ${max_wait_time}s"
   echo "Last HTTP code: $http_code"
   echo "Last health response: ${health_response:-(empty)}"
   echo ''

From 00496dcb05b0b94c044f387cba22a22e52aac22b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 17:41:28 +0000
Subject: [PATCH 7/7] Simplify health check: use curl --retry 120 with 1s delay
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove exponential backoff shell logic
- Use curl built-in retry: --retry 120 --retry-delay 1
- Total timeout: 120 seconds (120 attempts × 1s = 120s)
- Added --retry-all-errors to retry on any error condition
- Much simpler implementation: removed 145 lines, added 40 lines
- Same 120s total timeout, but using curl's native retry mechanism

Benefits:
- Simpler code, easier to understand and maintain
- Relies on curl's proven retry logic
- Consistent 1s delays throughout (no complexity)
- Same total timeout as before (120s)

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
---
 actions/setup/sh/start_mcp_gateway.sh         | 100 ++++--------------
 actions/setup/sh/verify_mcp_gateway_health.sh |  85 ++++-----------
 2 files changed, 40 insertions(+), 145 deletions(-)

diff --git a/actions/setup/sh/start_mcp_gateway.sh b/actions/setup/sh/start_mcp_gateway.sh
index 06ca9bfe73c..1f3e00bca78 100755
--- a/actions/setup/sh/start_mcp_gateway.sh
+++ b/actions/setup/sh/start_mcp_gateway.sh
@@ -141,88 +141,28 @@ echo "Waiting for gateway to be ready..."
 HEALTH_CHECK_HOST="localhost"
 echo "Health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health"
 echo "(Note: MCP_GATEWAY_DOMAIN is '${MCP_GATEWAY_DOMAIN}' for container access)"
-MAX_WAIT_TIME=120  # Total maximum wait time in seconds
-ATTEMPT=0
-START_TIME=$(date +%s)
-BACKOFF_DELAY=1  # Initial backoff delay in seconds
-
-while true; do
-  # Check if we've exceeded the maximum wait time
-  CURRENT_TIME=$(date +%s)
-  ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
-  if [ $ELAPSED_TIME -ge $MAX_WAIT_TIME ]; then
-    echo "Maximum wait time of ${MAX_WAIT_TIME}s exceeded"
-    break
-  fi
-  
-  # First check if the gateway process is still running
-  if ! ps -p $GATEWAY_PID > /dev/null 2>&1; then
-    echo "ERROR: Gateway process (PID: $GATEWAY_PID) has exited unexpectedly!"
-    echo ""
-    echo "Gateway stdout output:"
-    cat /tmp/gh-aw/mcp-config/gateway-output.json 2>/dev/null || echo "No stdout output available"
-    echo ""
-    echo "Gateway stderr logs:"
-    cat /tmp/gh-aw/mcp-logs/stderr.log 2>/dev/null || echo "No stderr logs available"
-    exit 1
-  fi
-  
-  # Check health endpoint using localhost (since we're running on the host)
-  # Per MCP Gateway Specification v1.3.0, /health must return HTTP 200 with JSON body containing specVersion and gatewayVersion
-  # Use curl retry options with max time limit and exponential backoff
-  REMAINING_TIME=$((MAX_WAIT_TIME - ELAPSED_TIME))
-  echo "Calling health endpoint: http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health (attempt $((ATTEMPT + 1)), elapsed: ${ELAPSED_TIME}s)"
-  RESPONSE=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused --retry-max-time $REMAINING_TIME -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
-  HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
-  HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
-  
-  # Always log the health response for debugging
-  echo "Health endpoint HTTP code: $HTTP_CODE"
-  if [ -n "$HEALTH_RESPONSE" ]; then
-    echo "Health response body: $HEALTH_RESPONSE"
-  else
-    echo "Health response body: (empty)"
-  fi
-  
-  if [ "$HTTP_CODE" = "200" ] && [ -n "$HEALTH_RESPONSE" ]; then
-    echo "Gateway is ready!"
-    break
-  fi
-  
-  ATTEMPT=$((ATTEMPT + 1))
-  
-  # Calculate remaining time
-  CURRENT_TIME=$(date +%s)
-  ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
-  REMAINING_TIME=$((MAX_WAIT_TIME - ELAPSED_TIME))
-  
-  if [ $REMAINING_TIME -le 0 ]; then
-    echo "No time remaining for retry"
-    break
-  fi
-  
-  # Use exponential backoff, but cap at remaining time
-  if [ $BACKOFF_DELAY -gt $REMAINING_TIME ]; then
-    BACKOFF_DELAY=$REMAINING_TIME
-  fi
-  
-  echo "Waiting ${BACKOFF_DELAY}s before retry (exponential backoff)..."
-  sleep $BACKOFF_DELAY
-  
-  # Double the backoff delay for next iteration (exponential backoff), cap at 32s
-  BACKOFF_DELAY=$((BACKOFF_DELAY * 2))
-  if [ $BACKOFF_DELAY -gt 32 ]; then
-    BACKOFF_DELAY=32
-  fi
-done
-
-# Check if we succeeded or ran out of time
-CURRENT_TIME=$(date +%s)
-ELAPSED_TIME=$((CURRENT_TIME - START_TIME))
+echo "Retrying up to 120 times with 1s delay (120s total timeout)"
+
+# Check health endpoint using localhost (since we're running on the host)
+# Per MCP Gateway Specification v1.3.0, /health must return HTTP 200 with JSON body containing specVersion and gatewayVersion
+# Use curl retry: 120 attempts with 1 second delay = 120s total
+RESPONSE=$(curl -s --retry 120 --retry-delay 1 --retry-connrefused --retry-all-errors -w "\n%{http_code}" "http://${HEALTH_CHECK_HOST}:${MCP_GATEWAY_PORT}/health" 2>&1)
+HTTP_CODE=$(echo "$RESPONSE" | tail -n 1)
+HEALTH_RESPONSE=$(echo "$RESPONSE" | head -n -1)
+
+# Always log the health response for debugging
+echo "Health endpoint HTTP code: $HTTP_CODE"
+if [ -n "$HEALTH_RESPONSE" ]; then
+  echo "Health response body: $HEALTH_RESPONSE"
+else
+  echo "Health response body: (empty)"
+fi
 
-if [ $ELAPSED_TIME -ge $MAX_WAIT_TIME ]; then
+if [ "$HTTP_CODE" = "200" ] && [ -n "$HEALTH_RESPONSE" ]; then
+  echo "Gateway is ready!"
+else
   echo ""
-  echo "ERROR: Gateway failed to become ready after ${MAX_WAIT_TIME}s"
+  echo "ERROR: Gateway failed to become ready"
   echo "Last HTTP code: $HTTP_CODE"
   echo "Last health response: ${HEALTH_RESPONSE:-(empty)}"
   echo ""
diff --git a/actions/setup/sh/verify_mcp_gateway_health.sh b/actions/setup/sh/verify_mcp_gateway_health.sh
index 20bf4121ec3..78240d31573 100755
--- a/actions/setup/sh/verify_mcp_gateway_health.sh
+++ b/actions/setup/sh/verify_mcp_gateway_health.sh
@@ -47,73 +47,28 @@ echo ''
 
 # Wait for gateway to be ready FIRST before checking config
 echo '=== Testing Gateway Health ==='
-max_wait_time=120  # Total maximum wait time in seconds
-retry_count=0
-gateway_ready=false
-health_response=""
-start_time=$(date +%s)
-backoff_delay=1  # Initial backoff delay in seconds
-
-while true; do
-  # Check if we've exceeded the maximum wait time
-  current_time=$(date +%s)
-  elapsed_time=$((current_time - start_time))
-  if [ $elapsed_time -ge $max_wait_time ]; then
-    echo "Maximum wait time of ${max_wait_time}s exceeded"
-    break
-  fi
-  
-  # Capture both response body and HTTP code in a single curl call
-  # Use curl retry options with max time limit and exponential backoff
-  echo "Calling health endpoint: ${gateway_url}/health (attempt $((retry_count + 1)), elapsed: ${elapsed_time}s)"
-  response=$(curl -s --retry 3 --retry-delay 1 --retry-connrefused --retry-max-time $((max_wait_time - elapsed_time)) -w "\n%{http_code}" "${gateway_url}/health")
-  http_code=$(echo "$response" | tail -n 1)
-  health_response=$(echo "$response" | head -n -1)
-  
-  # Always log the health response for debugging
-  echo "Health endpoint HTTP code: $http_code"
-  if [ -n "$health_response" ]; then
-    echo "Health response body: $health_response"
-  else
-    echo "Health response body: (empty)"
-  fi
-  
-  if [ "$http_code" = "200" ]; then
-    echo "✓ MCP Gateway is ready!"
-    gateway_ready=true
-    break
-  fi
-  
-  retry_count=$((retry_count + 1))
-  
-  # Calculate remaining time
-  current_time=$(date +%s)
-  elapsed_time=$((current_time - start_time))
-  remaining_time=$((max_wait_time - elapsed_time))
-  
-  if [ $remaining_time -le 0 ]; then
-    echo "No time remaining for retry"
-    break
-  fi
-  
-  # Use exponential backoff, but cap at remaining time
-  if [ $backoff_delay -gt $remaining_time ]; then
-    backoff_delay=$remaining_time
-  fi
-  
-  echo "Waiting ${backoff_delay}s before retry (exponential backoff)..."
-  sleep $backoff_delay
-  
-  # Double the backoff delay for next iteration (exponential backoff), cap at 32s
-  backoff_delay=$((backoff_delay * 2))
-  if [ $backoff_delay -gt 32 ]; then
-    backoff_delay=32
-  fi
-done
 
-if [ "$gateway_ready" = false ]; then
+# Capture both response body and HTTP code in a single curl call
+# Use curl retry: 120 attempts with 1 second delay = 120s total
+echo "Calling health endpoint: ${gateway_url}/health"
+echo "Retrying up to 120 times with 1s delay (120s total timeout)"
+response=$(curl -s --retry 120 --retry-delay 1 --retry-connrefused --retry-all-errors -w "\n%{http_code}" "${gateway_url}/health")
+http_code=$(echo "$response" | tail -n 1)
+health_response=$(echo "$response" | head -n -1)
+
+# Always log the health response for debugging
+echo "Health endpoint HTTP code: $http_code"
+if [ -n "$health_response" ]; then
+  echo "Health response body: $health_response"
+else
+  echo "Health response body: (empty)"
+fi
+
+if [ "$http_code" = "200" ]; then
+  echo "✓ MCP Gateway is ready!"
+else
   echo ''
-  echo "✗ Error: MCP Gateway failed to start after ${max_wait_time}s"
+  echo "✗ Error: MCP Gateway failed to start"
   echo "Last HTTP code: $http_code"
   echo "Last health response: ${health_response:-(empty)}"
   echo ''