From e27995a85bba558e84ee258ee70d3bb0bb193adf Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Mon, 11 May 2026 13:00:36 +0800
Subject: [PATCH] Queue OpenClaw admission before gateway connect

---
 internal/acp/orchestrator.go      |  9 ++++++---
 internal/acp/web_contract_test.go | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/internal/acp/orchestrator.go b/internal/acp/orchestrator.go
index 19aaa6b..8a73a45 100644
--- a/internal/acp/orchestrator.go
+++ b/internal/acp/orchestrator.go
@@ -142,9 +142,6 @@ func (o *SessionOrchestrator) runGateway(
 	if gatewayProvider == "" {
 		return nil, &shared.RPCError{Code: -32602, Message: "GATEWAY_PROVIDER_REQUIRED"}
 	}
-	if rpcErr := ensureProductionGatewayConnected(o.server, gatewayProvider, notify); rpcErr != nil {
-		return nil, rpcErr
-	}
 	params = withResolvedGatewayProvider(params, gatewayProvider)
 	if isOpenClawMode(gatewayProvider) && isSessionTaskMethod(method) {
 		sessionID := strings.TrimSpace(shared.StringArg(params, "sessionId", ""))
@@ -185,8 +182,14 @@ func (o *SessionOrchestrator) runGateway(
 			return nil, rpcErr
 		}
 		defer release()
+		if rpcErr := ensureProductionGatewayConnected(o.server, gatewayProvider, notify); rpcErr != nil {
+			return nil, rpcErr
+		}
 		return o.runOpenClawGatewayChat(ctx, params, gatewayProvider, turnID, notify)
 	}
+	if rpcErr := ensureProductionGatewayConnected(o.server, gatewayProvider, notify); rpcErr != nil {
+		return nil, rpcErr
+	}
 	result := o.server.gateway.RequestByMode(
 		gatewayProvider,
 		method,
diff --git a/internal/acp/web_contract_test.go b/internal/acp/web_contract_test.go
index c949a3b..265e271 100644
--- a/internal/acp/web_contract_test.go
+++ b/internal/acp/web_contract_test.go
@@ -281,12 +281,12 @@ func TestHTTPHandlerGatewayOpenClawSSEKeepaliveBeforeFinalEnvelopeAndDone(t *tes
 func TestHTTPHandlerGatewayOpenClawAdmissionQueuesExcessConcurrentSSE(t *testing.T) {
 	gateway := newAcpFakeOpenClawGateway(t)
 	defer gateway.Close()
-	gateway.agentWaitDelayMs.Store(300)
+	gateway.agentWaitDelayMs.Store(1500)
 
 	t.Setenv("GATEWAY_RPC_URL", gateway.URL())
 	t.Setenv("BRIDGE_AUTH_TOKEN", "bridge-test-token")
 	t.Setenv("BRIDGE_CONFIG_PATH", filepath.Join(t.TempDir(), "missing-config.yaml"))
-	t.Setenv("XWORKMATE_BRIDGE_OPENCLAW_GATEWAY_MAX_ACTIVE", "2")
+	t.Setenv("XWORKMATE_BRIDGE_OPENCLAW_GATEWAY_MAX_ACTIVE", "1")
 	t.Setenv("XWORKMATE_BRIDGE_OPENCLAW_GATEWAY_MAX_QUEUED", "2")
 	t.Setenv("XWORKMATE_BRIDGE_OPENCLAW_GATEWAY_QUEUE_TIMEOUT", "5s")
 	server := NewServer()
@@ -297,10 +297,10 @@ func TestHTTPHandlerGatewayOpenClawAdmissionQueuesExcessConcurrentSSE(t *testing
 		body string
 		err  error
 	}
-	results := make(chan result, 3)
+	results := make(chan result, 2)
 	start := make(chan struct{})
 	var wg sync.WaitGroup
-	for index := 0; index < 3; index++ {
+	for index := 0; index < 2; index++ {
 		wg.Add(1)
 		go func(index int) {
 			defer wg.Done()
@@ -336,10 +336,10 @@ func TestHTTPHandlerGatewayOpenClawAdmissionQueuesExcessConcurrentSSE(t *testing
 		}(index)
 	}
 	close(start)
-	waitForOpenClawGatewayCount(t, func() int { return gateway.ChatSendCount() }, 2)
+	waitForOpenClawGatewayCount(t, func() int { return gateway.ChatSendCount() }, 1)
 	time.Sleep(75 * time.Millisecond)
-	if got := gateway.ChatSendCount(); got != 2 {
-		t.Fatalf("expected admission gate to hold third chat.send while two are active, got %d", got)
+	if got := gateway.ChatSendCount(); got != 1 {
+		t.Fatalf("expected admission gate to hold queued chat.send while one is active, got %d", got)
 	}
 	wg.Wait()
 	close(results)
@@ -360,10 +360,10 @@ func TestHTTPHandlerGatewayOpenClawAdmissionQueuesExcessConcurrentSSE(t *testing
 	if !sawQueued {
 		t.Fatalf("expected one queued session.update event")
 	}
-	if finalCount != 3 {
-		t.Fatalf("expected all three requests to return final result, got %d", finalCount)
+	if finalCount != 2 {
+		t.Fatalf("expected both requests to return final result, got %d", finalCount)
 	}
-	if got := gateway.ChatSendCount(); got != 3 {
+	if got := gateway.ChatSendCount(); got != 2 {
 		t.Fatalf("expected queued request to run after a slot releases, got %d chat.send calls", got)
 	}
 }