4 files changed, 59 insertions, 29 deletions

diff --git a/AGENTS.md b/AGENTS.md
index d7d2cfe..368fd83 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -204,5 +204,8 @@ make flash-b        # flash to Board B
 - Wifistr event signing uses `secp256k1_schnorrsig_sign32()` — verify with `_verify()` in tests
 - Portal HTML has server-side template substitution (`__AP_IP__`, `__PRICE__`, `__MINT_URL__`) — no JS fetch
 - **WiFi country code:** Must set `esp_wifi_set_country_code("DE")` before `esp_wifi_start()` — defaults to CN which causes auth failures on EU APs
+- **Board A WiFi is broken** — hardware issue confirmed: `WIFI_REASON_AUTH_EXPIRED` on all APs in all modes (APSTA, STA-only, factory MAC). Board B with identical firmware connects instantly. Do not waste time debugging Board A WiFi.
 - Default nsec: `a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2c3d4e5f6a1b2`
 - Board A nsec: `9af47906b45aca5e238390f3d03c8274e154198e81aa2095065627d1e61ca968`
+- CVM relay: `relay.primal.net` — relay disconnects every ~15s by default, now has 60s timeout + WS ping/pong keepalive
+- MCP responses sent via existing WS connection (not new TLS) — ESP32 can't handle multiple simultaneous TLS sessions
diff --git a/CHECKLIST.md b/CHECKLIST.md
index b0a842c..7fcc4b7 100644
--- a/CHECKLIST.md
+++ b/CHECKLIST.md
@@ -98,10 +98,15 @@
 - [x] MCP initialize roundtrip via kind 25910 — PASS
 - [x] tools/call get_config via kind 25910 — PASS
 - [x] tools/call get_balance via kind 25910 — PASS
-- [ ] tools/call set_price via kind 25910
-- [ ] End-to-end CVM test: full initialize → tools/list → tools/call sequence
-- [ ] End-to-end MCP tools/call roundtrip via kind 25910
+- [x] tools/list response via kind 25910 — PASS
+- [x] tools/call set_price via kind 25910 — PASS (price updated to 42)
+- [ ] tools/call get_sessions via kind 25910
+- [ ] tools/call get_usage via kind 25910
+- [ ] Non-owner auth rejection via live relay (unit test only so far)
 - [ ] Verify board npub on contextvm.org/servers
+- [ ] Fix relay disconnect cycle (rlen=-26880 every ~15s)
+- [ ] Clean up debug logging (reduce INFO→DEBUG for verbose messages)
+- [ ] Document Board A hardware issue in AGENTS.md
 
 ### WiFi Debugging Findings (Board A — 94:a9:90:2e:37:7c)
 - **Symptom:** `WIFI_REASON_AUTH_EXPIRED` (0x200) on all upstream APs
diff --git a/PLAN.md b/PLAN.md
index 0be2355..9f286a9 100644
--- a/PLAN.md
+++ b/PLAN.md
@@ -575,31 +575,38 @@ Only accept kind 25910 requests from owner npub (derived from nsec in config.jso
 | 66 | MCP initialize roundtrip | Integration | Response received via nak | PASS |
 | 67 | get_config via CVM | Integration | Returns valid JSON config | PASS |
 | 68 | get_balance via CVM | Integration | Returns balance + proofs | PASS |
-| 69 | set_price via CVM | Integration | Price updated on device | TODO |
-| 70 | Kind 11317 on relay | Integration | Tools list found on relay | PASS* |
-| 71 | Kind 10002 on relay | Integration | Relay list found on relay | PASS* |
+| 69 | set_price via CVM | Integration | Price updated on device | PASS |
+| 70 | Kind 11317 on relay | Integration | Tools list found on relay | PASS |
+| 71 | Kind 10002 on relay | Integration | Relay list found on relay | PASS |
 | 72 | API reachability from host | Integration | HTTP 200 from board AP | PASS |
 | 73 | CVM event publish from host | Integration | Kind 25910 published to relay | PASS |
-
-*Passes when board has upstream WiFi and SNTP is synced. Events expire without valid `created_at` timestamp.
-
-#### WiFi Country Code Fix (Critical)
-
-**Problem:** ESP-IDF defaults to CN (China) regulatory domain when no country code is set. The boards are in DE (Germany/EU). Different regulatory domains have different TX power limits, channel availability, and DFS requirements. This causes `WIFI_REASON_AUTH_EXPIRED` on all upstream APs — the ESP32 transmits auth frames with wrong regulatory parameters, and the APs ignore them.
-
-**Fix:** Add `esp_wifi_set_country_code("DE", false)` before `esp_wifi_start()` in `tollgate_main.c`.
-
-**Evidence:**
-- Auth fails even in STA-only mode (no AP at all), ruling out APSTA channel conflicts
-- Auth fails against a laptop hotspot 1m away, ruling out signal strength
-- Auth fails with factory MAC, ruling out MAC filtering
-- Auth fails with PMF enabled, WPA2 threshold, all-channel scan
-- Laptop connects to same APs at 100% signal — ESP32 radio is the outlier
-- Dense 2.4GHz spectrum (ch1: 2 APs, ch6: 4 APs, ch11: 4 APs) but not exhausted
-
-**Alternative hypothesis:** Hardware antenna issue on Board A. Need to test Board B/C to confirm.
-
-## Total: 81 Tests across 8 phases
+| 74 | tools/list via CVM | Integration | All 10 tools listed | PASS |
+| 75 | get_sessions via CVM | Integration | Returns session array | TODO |
+| 76 | get_usage via CVM | Integration | Returns usage stats | TODO |
+| 77 | Non-owner rejection (live) | Integration | Unauthorized event ignored | TODO |
+| 78 | Relay reconnect resilience | Integration | Board reconnects after disconnect | PASS |
+
+## Total: 85 Tests across 8 phases
+
+## Merge Readiness Checklist
+
+### Code Quality
+- [ ] Fix relay disconnect cycle (rlen=-26880 every ~15s, WS read has no timeout)
+- [ ] Clean up debug logging (Sending WS response, WS send result → DEBUG level)
+- [ ] Document Board A hardware WiFi issue in AGENTS.md
+
+### Integration Testing (needs Board B + relay.primal.net)
+- [ ] tools/list response via kind 25910
+- [ ] tools/call set_price via kind 25910
+- [ ] tools/call get_sessions via kind 25910
+- [ ] tools/call get_usage via kind 25910
+- [ ] Non-owner auth rejection via live relay
+- [ ] Verify board npub on contextvm.org/servers
+
+### Pre-merge
+- [ ] `make test-unit` — all 282 unit tests pass
+- [ ] Rebase feature/cvm-integration onto master (1 commit behind)
+- [ ] Verify no conflicts with feature branches (display-fix, multi-mint, price-discovery)
 
 ## Post-Phase 7: Bug Fixes & Architecture Improvements
 
diff --git a/main/cvm_server.c b/main/cvm_server.c
index 96ce7d3..b93e176 100644
--- a/main/cvm_server.c
+++ b/main/cvm_server.c
@@ -11,6 +11,7 @@
 #include "esp_tls.h"
 #include "esp_crt_bundle.h"
 #include "esp_random.h"
+#include "esp_timer.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include <string.h>
@@ -30,6 +31,8 @@ static void publish_announcements_via_ws(esp_tls_t *tls);
 #define CVM_WS_BUF_SIZE 8192
 #define CVM_MAX_RESPONSE_SIZE 4096
 #define CVM_RECONNECT_DELAY_MS 5000
+#define CVM_WS_READ_TIMEOUT_MS 60000
+#define CVM_WS_PING_INTERVAL_S 30
 
 static char *parse_ws_text_frame(const uint8_t *buf, int len)
 {
@@ -148,7 +151,7 @@ static esp_err_t ws_connect(const char *relay_url, esp_tls_t **tls_out)
 
     esp_tls_cfg_t tls_cfg = {
         .crt_bundle_attach = esp_crt_bundle_attach,
-        .timeout_ms = 15000,
+        .timeout_ms = CVM_WS_READ_TIMEOUT_MS,
     };
     esp_tls_t *tls = esp_tls_init();
     if (!tls) return ESP_ERR_NO_MEM;
@@ -363,9 +366,9 @@ static esp_err_t publish_kind_25910_response_ws(esp_tls_t *tls,
         return ESP_ERR_NO_MEM;
     }
     snprintf(msg, msg_len, "[\"EVENT\",%s]", event_json);
-    ESP_LOGI(TAG, "Sending WS response (%d bytes)", (int)strlen(msg));
+    ESP_LOGD(TAG, "Sending WS response (%d bytes)", (int)strlen(msg));
     int rc = ws_send_text(tls, msg);
-    ESP_LOGI(TAG, "WS send result: %d", rc);
+    ESP_LOGD(TAG, "WS send result: %d", rc);
     free(msg);
     free(event_json);
     return ESP_OK;
@@ -613,6 +616,8 @@ static void cvm_relay_task(void *arg)
             return;
         }
 
+        int64_t last_ping_time = 0;
+
         while (g_running) {
             int rlen = esp_tls_conn_read(tls, buf, CVM_WS_BUF_SIZE - 1);
             if (rlen < 0) {
@@ -631,6 +636,16 @@ static void cvm_relay_task(void *arg)
                     }
                     free(text);
                 }
+            } else if ((buf[0] & 0x0F) == 0x09) {
+                uint8_t pong[2] = {0x8A, 0x00};
+                esp_tls_conn_write(tls, pong, 2);
+            }
+
+            int64_t now = (int64_t)esp_timer_get_time() / 1000000;
+            if (now - last_ping_time >= CVM_WS_PING_INTERVAL_S) {
+                uint8_t ping[2] = {0x89, 0x00};
+                esp_tls_conn_write(tls, ping, 2);
+                last_ping_time = now;
             }
         }