From c7bc68a6dcb2c5b036da80af5b031355c2bc1ba7 Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Wed, 24 Jun 2026 21:21:37 +0800
Subject: [PATCH] fix(acp_server_opencode): robust curl-retry for ACP endpoint
 readiness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The uri probe ran 1s after the service (re)start while the adapter still accepts
TCP but doesn't yet answer (read hangs); uri's default 30s timeout + retries/until
did not actually loop on a connection timeout, so it failed after one attempt.
Replace with a curl retry loop (5s per attempt, up to ~30 tries) — the adapter
answers acp.capabilities in ~4ms once ready.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../acp_server_opencode/tasks/validate.yml    | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/roles/vhosts/acp_server_opencode/tasks/validate.yml b/roles/vhosts/acp_server_opencode/tasks/validate.yml
index cf8ef70..1199b90 100644
--- a/roles/vhosts/acp_server_opencode/tasks/validate.yml
+++ b/roles/vhosts/acp_server_opencode/tasks/validate.yml
@@ -17,22 +17,30 @@
   changed_when: false
   failed_when: false
 
-- name: Validate OpenCode local ACP endpoint
-  ansible.builtin.uri:
-    url: "http://{{ acp_opencode_listen_host }}:{{ acp_opencode_listen_port }}/acp/rpc"
-    method: POST
-    body_format: json
-    body:
-      jsonrpc: "2.0"
-      id: 1
-      method: acp.capabilities
-      params: {}
-    return_content: true
-    status_code: 200
-  register: acp_opencode_adapter_http
-  retries: 30
-  delay: 2
-  until: acp_opencode_adapter_http.status == 200
+# 用 curl 重试循环替代 uri：服务刚 (重)启时 adapter 会先 accept TCP 但短时间内不
+# 应答(读挂起)，而 uri 默认 30s 超时 + retries/until 在连接超时上不可靠循环（实测
+# 仅试一次即失败）。每次 5s 上限、真重试，给冷启动足够时间（adapter 就绪后 ~4ms 回 200）。
+- name: Validate OpenCode local ACP endpoint (readiness retry)
+  ansible.builtin.shell: |
+    set -eu
+    url="http://{{ acp_opencode_listen_host }}:{{ acp_opencode_listen_port }}/acp/rpc"
+    body='{"jsonrpc":"2.0","id":1,"method":"acp.capabilities","params":{}}'
+    code=""
+    for i in $(seq 1 30); do
+      code="$(curl -s -m 5 -o /dev/null -w '%{http_code}' -X POST "$url" \
+        -H 'Content-Type: application/json' -d "$body" 2>/dev/null || true)"
+      if [ "$code" = "200" ]; then
+        echo "OpenCode ACP endpoint ready after ${i} attempt(s)"
+        exit 0
+      fi
+      sleep 2
+    done
+    echo "OpenCode ACP endpoint ${url} not ready after retries (last code: ${code:-none})" >&2
+    exit 1
+  args:
+    executable: /bin/bash
+  changed_when: false
+  register: acp_opencode_adapter_probe
 
 - name: Show OpenCode ACP status
   ansible.builtin.command: systemctl status "{{ acp_opencode_service_name }}" --no-pager