From 10b229ab9d3fa12c6443b6a55c5b3b10cd36d478 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sat, 18 Apr 2026 14:12:59 +0000
Subject: [PATCH] fix(marmot-interop): don't pass --socket to wnd; derive path
 from --data-dir

wnd only accepts --data-dir and --logs-dir. The socket path is
{data_dir}/release/wnd.sock (release build) or {data_dir}/dev/wnd.sock
(debug build) per src/cli/config.rs in whitenoise-rs. Updated the
script to point B_SOCKET / C_SOCKET at the correct release path and
dropped --socket from the wnd invocation.

Reported by user running the harness on macOS:
  error: unexpected argument '--socket' found
  Usage: wnd --data-dir <PATH> --logs-dir <PATH>

https://claude.ai/code/session_01PacmbE1KKWMSRmDw3bnCNo
---
 tools/marmot-interop/marmot-interop.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/marmot-interop/marmot-interop.sh b/tools/marmot-interop/marmot-interop.sh
index 4785643d8..1230d4b3f 100755
--- a/tools/marmot-interop/marmot-interop.sh
+++ b/tools/marmot-interop/marmot-interop.sh
@@ -14,8 +14,11 @@ STATE_DIR="$SCRIPT_DIR/state"
 LOG_DIR="$STATE_DIR/logs"
 B_DIR="$STATE_DIR/B"
 C_DIR="$STATE_DIR/C"
-B_SOCKET="$B_DIR/wnd.sock"
-C_SOCKET="$C_DIR/wnd.sock"
+# wnd derives its socket path as "{data_dir}/release/wnd.sock" for release
+# builds (and ".../dev/wnd.sock" for debug); our preflight always uses
+# --release, so we hardcode the "release" suffix here.
+B_SOCKET="$B_DIR/release/wnd.sock"
+C_SOCKET="$C_DIR/release/wnd.sock"
 
 RUN_TS="$(date +%Y%m%d-%H%M%S)"
 LOG_FILE="$LOG_DIR/run-$RUN_TS.log"
@@ -102,12 +105,14 @@ start_daemon() {
     return 0
   fi
   rm -f "$socket"
-  mkdir -p "$data_dir/logs"
-  nohup "$WND_BIN" --data-dir "$data_dir" --logs-dir "$data_dir/logs" --socket "$socket" \
+  mkdir -p "$data_dir/logs" "$data_dir/release"
+  # wnd puts its socket at {data_dir}/release/wnd.sock (release build) — we
+  # don't pass --socket because the daemon doesn't accept that flag.
+  nohup "$WND_BIN" --data-dir "$data_dir" --logs-dir "$data_dir/logs" \
     >"$data_dir/logs/stdout.log" 2>"$data_dir/logs/stderr.log" &
   local pid=$!
   echo "$pid" > "$data_dir/pid"
-  info "$name pid $pid; waiting for socket..."
+  info "$name pid $pid; waiting for socket at $socket ..."
   local deadline=$(( $(date +%s) + 30 ))
   while [[ $(date +%s) -lt $deadline ]]; do
     if [[ -S "$socket" ]] && "$WN_BIN" --socket "$socket" whoami >/dev/null 2>&1; then