From 0ccb7d7670ce198b9317dbe0bdafb2d77b9ca9bf Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 00:03:48 -0500
Subject: [PATCH 1/7] fix(cmux): treat a failed list-panes call as an
 unconfirmed surface

Re-implements fork commit 5bb9217 against current upstream code.

fm_backend_cmux_surface_exists piped list-panes straight into jq without
checking the CLI succeeded or returned output. With pipefail off, a
list-panes that exited nonzero but still printed a matching pane was read
as a confirmed live surface (a false positive on liveness). Capture the
CLI output first, fail on a nonzero exit or empty output, then feed jq.

Adds a behavioral regression to tests/fm-backend-cmux.test.sh driving the
surface_exists interface with a stub that prints a matching pane and exits
nonzero; it fails against the old pipe and passes with the guard.

Claude-Session: https://claude.ai/code/session_0174SML661zGCCJueePCzpY5
---
 tests/fm-backend-cmux.test.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/fm-backend-cmux.test.sh b/tests/fm-backend-cmux.test.sh
index 16875a95cd1..7619ea49b77 100755
--- a/tests/fm-backend-cmux.test.sh
+++ b/tests/fm-backend-cmux.test.sh
@@ -511,6 +511,29 @@ test_target_ready_fails_when_target_absent() {
   pass "fm_backend_cmux_target_ready: fails when the workspace/surface is not found (list-panes structural check)"
 }
 
+test_surface_exists_fails_when_list_panes_call_fails() {
+  # Regression: a failed `list-panes` call must read as "unknown/not live", never as
+  # a confirmed surface. Without pipefail the old pipe trusted jq's verdict on whatever
+  # bytes reached it, so a nonzero list-panes that still printed a matching pane read as
+  # a false positive. The guard checks the CLI exit and non-empty output before jq.
+  local dir fb status
+  dir="$TMP_ROOT/surface-list-panes-fail"; mkdir -p "$dir/fakebin"
+  cat > "$dir/fakebin/cmux" <<'SH'
+#!/usr/bin/env bash
+set -u
+# Emit a matching-surface payload but fail the call (server error mid-stream).
+printf '{"panes":[{"selected_surface_id":"bbbbbbbb-1111-1111-1111-111111111111","surface_ids":["bbbbbbbb-1111-1111-1111-111111111111"]}]}'
+exit 1
+SH
+  chmod +x "$dir/fakebin/cmux"
+  fb="$dir/fakebin"
+  PATH="$fb:$PATH" \
+    bash -c '. "$0/bin/backends/cmux.sh"; fm_backend_cmux_surface_exists "aaaaaaaa-0000-0000-0000-000000000000" "bbbbbbbb-1111-1111-1111-111111111111"' "$ROOT"
+  status=$?
+  [ "$status" -ne 0 ] || fail "surface_exists must not report a surface present when the list-panes call failed"
+  pass "fm_backend_cmux_surface_exists: a failed list-panes call is not a confirmed surface"
+}
+
 test_target_ready_checks_expected_label() {
   local dir fb title
   dir="$TMP_ROOT/ready-label-ok"; mkdir -p "$dir/responses"
@@ -1131,6 +1154,7 @@ test_ensure_running_fails_fast_on_unauth_without_launching
 test_create_task_refuses_duplicate_label
 test_create_task_creates_and_parses_ids
 test_target_ready_fails_when_target_absent
+test_surface_exists_fails_when_list_panes_call_fails
 test_target_ready_checks_expected_label
 test_target_ready_rejects_label_mismatch
 test_capture_trims_locally

From 147ebe25731fead1ae7ea2eb7193556f1d4399bd Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 00:10:11 -0500
Subject: [PATCH 2/7] fix(herdr): match the events schema in-process to avoid
 broken-pipe noise

Re-implements the still-needed core of fork PR #6 (7a2b1c4) against current
upstream code. The bundled fm-pr-lib.sh GitLab-MR regex tweak is dropped:
that pattern is already byte-identical in upstream.

fm_backend_herdr_events_capable piped the ~220KB `herdr api schema --json`
payload into `grep -Fq`. grep exits on the first match and closes the pipe
while printf is still writing, so every TTY-attached watcher probe printed
"printf: write error: Broken pipe" twice. The gate still returned capable,
so the noise trained operators to ignore real errors on that stream. Match
the two event needles with in-process `case` substring matching instead: no
pipe, no early-exit consumer, no SIGPIPE.

Adds test_events_capable_* to tests/fm-backend-herdr.test.sh, which drive
the gate against a large synthetic schema (needles mid-body) under a PTY and
fail on any broken-pipe write error. The fork's source-byte-shape lock test
is intentionally omitted per the repo's no-source-assertion test rule; the
PTY cases prove the behavior instead. Documents the rationale in
docs/herdr-backend.md.

Claude-Session: https://claude.ai/code/session_0174SML661zGCCJueePCzpY5
---
 docs/herdr-backend.md          |  4 ++++
 tests/fm-backend-herdr.test.sh | 19 -------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/docs/herdr-backend.md b/docs/herdr-backend.md
index b47f2512e76..be41d7e073a 100644
--- a/docs/herdr-backend.md
+++ b/docs/herdr-backend.md
@@ -290,7 +290,11 @@ Capability matching checks the bounded schema in-process, avoiding the early-exi
 Polling runs every cycle and remains the permanent fallback when protocol 16, the event schema, Python, connection, subscription, or repeated reader execution is unavailable.
 There is still one watcher process; the event reader is a bounded child of that watcher.
 
+`fm_backend_herdr_events_capable` gates the push path on the ~220KB `herdr api schema --json` payload.
+It matches the two event needles in-process with `case "$schema" in *needle*)`, never by streaming the payload into an early-exit consumer such as `grep -Fq`: an early-exit match closes the pipe while the producer is still writing and prints `printf: write error: Broken pipe` on a watcher TTY every probe cycle, training operators to ignore real errors on that stream.
+
 `tests/fm-backend-herdr-eventwait-smoke.test.sh`, `tests/fm-transition-lib.test.sh`, and `tests/fm-supervision-events.test.sh` cover capability, subscribe-then-reconcile ordering, dedupe, exemptions, and polling fallback.
+The `test_events_capable_*` cases in `tests/fm-backend-herdr.test.sh` drive the gate against a large synthetic schema under a PTY and fail on any broken-pipe write error.
 
 ## Away-mode supervisor support
 
diff --git a/tests/fm-backend-herdr.test.sh b/tests/fm-backend-herdr.test.sh
index 95f4fe50097..68578514d80 100755
--- a/tests/fm-backend-herdr.test.sh
+++ b/tests/fm-backend-herdr.test.sh
@@ -4541,24 +4541,6 @@ test_events_capable_rejects_schema_missing_a_needle() {
   pass "fm_backend_herdr_events_capable: schema missing an event needle fails closed"
 }
 
-test_events_capable_does_not_pipe_schema_through_grep_q() {
-  # Source-shape lock: the ~220KB schema must not be fed to an early-exit
-  # consumer via a pipe. That pattern is the broken-pipe defect; reintroducing
-  # it would re-pollute every watcher cycle. Strip comments so the lock looks
-  # only at executable lines.
-  local body code
-  body=$(sed -n '/^fm_backend_herdr_events_capable()/,/^}/p' "$ROOT/bin/backends/herdr.sh")
-  [ -n "$body" ] || fail "could not extract fm_backend_herdr_events_capable from herdr.sh"
-  code=$(printf '%s\n' "$body" | sed -e 's/[[:space:]]*#.*//' -e '/^[[:space:]]*$/d')
-  if printf '%s\n' "$code" | grep -E '(^|[^[:alnum:]_])grep[[:space:]]' >/dev/null; then
-    fail "events_capable must not invoke grep on the schema (broken-pipe regression)"
-  fi
-  if printf '%s\n' "$code" | grep -E 'printf.*\|' >/dev/null; then
-    fail "events_capable must not pipe printf of the schema into a consumer (broken-pipe regression)"
-  fi
-  pass "fm_backend_herdr_events_capable: source does not pipe schema through early-exit grep -q"
-}
-
 # shellcheck source=bin/fm-backend.sh
 . "$ROOT/bin/fm-backend.sh"
 
@@ -4746,4 +4728,3 @@ test_wait_transition_bad_ack_returns_2_and_cleans_up
 test_wait_transition_clean_timeout_returns_1
 test_events_capable_accepts_large_schema_without_broken_pipe
 test_events_capable_rejects_schema_missing_a_needle
-test_events_capable_does_not_pipe_schema_through_grep_q

From 02543b31a96fb0a1340e85dc4d68150d73954e33 Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 02:50:03 -0500
Subject: [PATCH 3/7] no-mistakes(review): make AV credential-scrubbing
 --settings the sole injected claude settings

---
 bin/fm-claude-automic-vault-launch.sh | 12 +++++++++++-
 bin/fm-claude-automic-vault-lib.sh    |  2 +-
 tests/fm-claude-automic-vault.test.sh | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bin/fm-claude-automic-vault-launch.sh b/bin/fm-claude-automic-vault-launch.sh
index 632e19262d7..f9ea4177d7a 100755
--- a/bin/fm-claude-automic-vault-launch.sh
+++ b/bin/fm-claude-automic-vault-launch.sh
@@ -37,8 +37,18 @@ if [ "${1:-}" = --injected ]; then
   worker_path=${FM_CLAUDE_AV_WORKER_PATH:-/usr/bin:/bin:/usr/sbin:/sbin}
   unset FM_CLAUDE_AV_WORKER_PATH
   worker_args=()
+  drop_settings_value=0
   for worker_arg in "$@"; do
-    [ "$worker_arg" = --dangerously-skip-permissions ] || worker_args+=("$worker_arg")
+    if [ "$drop_settings_value" = 1 ]; then
+      drop_settings_value=0
+      continue
+    fi
+    case "$worker_arg" in
+      --dangerously-skip-permissions) continue ;;
+      --settings) drop_settings_value=1; continue ;;
+      --settings=*) continue ;;
+    esac
+    worker_args+=("$worker_arg")
   done
   : > "$ready" || exit 1
   exec 1>&3 2>&4 3>&- 4>&-
diff --git a/bin/fm-claude-automic-vault-lib.sh b/bin/fm-claude-automic-vault-lib.sh
index f4324aad220..0445cffb52e 100644
--- a/bin/fm-claude-automic-vault-lib.sh
+++ b/bin/fm-claude-automic-vault-lib.sh
@@ -37,7 +37,7 @@ FM_CLAUDE_AV_TIMEOUT=${FM_CLAUDE_AV_TIMEOUT:-45}
 FM_CLAUDE_AV_RELEASE_BASE=https://downloads.claude.ai/claude-code-releases
 FM_CLAUDE_AV_MANIFEST_CHECKSUMS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fm-claude-automic-vault-manifests.sha256"
 FM_CLAUDE_AV_QUALIFIED_VERSIONS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fm-claude-automic-vault-qualified-versions"
-FM_CLAUDE_AV_SETTINGS='{"apiKeyHelper":null,"env":{"ANTHROPIC_API_KEY":null,"ANTHROPIC_AUTH_TOKEN":null,"ANTHROPIC_BASE_URL":null,"ANTHROPIC_BEDROCK_BASE_URL":null,"ANTHROPIC_VERTEX_BASE_URL":null,"ANTHROPIC_FOUNDRY_BASE_URL":null,"CLAUDE_CODE_USE_BEDROCK":null,"CLAUDE_CODE_USE_VERTEX":null,"CLAUDE_CODE_USE_FOUNDRY":null,"AWS_BEARER_TOKEN_BEDROCK":null}}'
+FM_CLAUDE_AV_SETTINGS='{"apiKeyHelper":null,"feedbackDrafts":"off","env":{"ANTHROPIC_API_KEY":null,"ANTHROPIC_AUTH_TOKEN":null,"ANTHROPIC_BASE_URL":null,"ANTHROPIC_BEDROCK_BASE_URL":null,"ANTHROPIC_VERTEX_BASE_URL":null,"ANTHROPIC_FOUNDRY_BASE_URL":null,"CLAUDE_CODE_USE_BEDROCK":null,"CLAUDE_CODE_USE_VERTEX":null,"CLAUDE_CODE_USE_FOUNDRY":null,"AWS_BEARER_TOKEN_BEDROCK":null}}'
 FM_CLAUDE_AV_ERROR=
 FM_CLAUDE_AV_BIN=
 FM_CLAUDE_BIN=
diff --git a/tests/fm-claude-automic-vault.test.sh b/tests/fm-claude-automic-vault.test.sh
index b42530930a1..d8d530f32de 100755
--- a/tests/fm-claude-automic-vault.test.sh
+++ b/tests/fm-claude-automic-vault.test.sh
@@ -592,6 +592,20 @@ test_enabled_disabled_and_non_claude_launches() {
     "enabled Claude launch required an approval prompt"
   assert_no_grep 'conflict=' "$state/claude-env.log" "higher-precedence auth environment reached Claude"
 
+  injected_argv=$(grep '^claude ' "$state/claude-argv.log" | tail -1)
+  settings_count=$(printf '%s\n' "$injected_argv" | grep -oE '<--settings(>|=)' | wc -l | tr -d ' ')
+  [ "$settings_count" = 1 ] \
+    || fail "injected Claude exec carried $settings_count --settings flags, expected exactly one authoritative --settings"
+  injected_settings=$(printf '%s\n' "$injected_argv" | sed -n 's/.*<--settings> <\([^>]*\)>.*/\1/p')
+  printf '%s' "$injected_settings" | "$JQ_BIN" -e \
+    'has("apiKeyHelper") and .apiKeyHelper == null and .feedbackDrafts == "off" and (.env | has("ANTHROPIC_API_KEY")) and .env.ANTHROPIC_API_KEY == null' \
+    >/dev/null 2>&1 \
+    || fail "authoritative injected --settings did not both null the credential keys and set feedbackDrafts off"
+  injected_worker_args=${injected_argv#*<--allowedTools> <Bash>}
+  if printf '%s\n' "$injected_worker_args" | grep -qE '<--settings(>|=)'; then
+    fail "worker template --settings survived into the injected Claude exec worker arguments"
+  fi
+
   : > "$launchlog"
   record=$(make_ship "$dir" "$home" production-attestation)
   proj=${record%%$'\t'*}

From ba262e8258931f179a5f653b1e84397d95bf9068 Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 03:00:10 -0500
Subject: [PATCH 4/7] no-mistakes(document): document AV sole-settings
 credential-scrub safety invariant

---
 bin/fm-claude-automic-vault-launch.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/fm-claude-automic-vault-launch.sh b/bin/fm-claude-automic-vault-launch.sh
index f9ea4177d7a..8a7134b2df9 100755
--- a/bin/fm-claude-automic-vault-launch.sh
+++ b/bin/fm-claude-automic-vault-launch.sh
@@ -38,6 +38,11 @@ if [ "${1:-}" = --injected ]; then
   unset FM_CLAUDE_AV_WORKER_PATH
   worker_args=()
   drop_settings_value=0
+  # Drop any --settings the worker template carries so the credential-scrubbing
+  # AV settings ($settings, exec'd below) is the sole --settings Claude sees:
+  # a duplicate could win last and silently drop the apiKeyHelper/auth-env
+  # neutralization, breaking the "no fallback credential" guarantee in
+  # fm-claude-automic-vault-lib.sh. That AV settings also carries feedbackDrafts:off.
   for worker_arg in "$@"; do
     if [ "$drop_settings_value" = 1 ]; then
       drop_settings_value=0

From 8c0925fba5e4babc4c57fa96b3ec44a9b1fe2a8d Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 11:02:31 -0500
Subject: [PATCH 5/7] no-mistakes(document): Document AV sole-settings
 verification

---
 docs/verification/claude-automic-vault.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/verification/claude-automic-vault.md b/docs/verification/claude-automic-vault.md
index eb589a2c2d6..a97e762c293 100644
--- a/docs/verification/claude-automic-vault.md
+++ b/docs/verification/claude-automic-vault.md
@@ -48,6 +48,7 @@ tests/fm-claude-automic-vault.test.sh
 The test uses fake `av` and fake `claude` executables with synthetic secret bytes held only in process environment.
 It exercises public provisioning, one-time enable recovery, renewal, and preflight, enabled and disabled spawn behavior, direct, assignment-prefixed, option-prefixed, split-string `env`, literal shell-payload, literal-eval, and classifier-unavailable opted-in raw Claude refusal before endpoint creation, Claude versus non-Claude isolation, missing Vault state, Secret Gate denial, a missing secret, revoked-token rejection, unsupported tool surfaces, inconclusive authentication, executable recursion refusal, model and effort argument preservation, redacted output, persistent secondmate launch and relaunch, inherited opt-in, and a nested worker launched from the inherited home.
 It executes the captured enabled worker launch and proves the fake Claude process received the injected environment while higher-precedence auth inputs were absent.
+It also proves the final Claude exec receives exactly one `--settings` value, that this authoritative value disables `apiKeyHelper` and matching authentication environment settings while preserving `feedbackDrafts: off`, and that no worker-template settings survive into the exec arguments.
 It then scans every fixture file, captured launch command, fake argv log, and command output to prove the synthetic secret bytes were not persisted or displayed.
 The fake Claude coverage exercises general launch mechanics but never qualifies or admits a real Claude version; only the actual-candidate command in the qualification section can supply that evidence.
 

From 718b452516e8d8f2d84c0c1ecf055b0a782dfad4 Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 11:21:51 -0500
Subject: [PATCH 6/7] no-mistakes(review): Strengthen Automic Vault settings
 filtering regression

---
 tests/fm-claude-automic-vault.test.sh | 39 ++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/tests/fm-claude-automic-vault.test.sh b/tests/fm-claude-automic-vault.test.sh
index d8d530f32de..2fdd27bd5be 100755
--- a/tests/fm-claude-automic-vault.test.sh
+++ b/tests/fm-claude-automic-vault.test.sh
@@ -20,6 +20,7 @@ ln -s "$ROOT/tests/fixtures/fm-claude-automic-vault-lib.sh" \
 AUTH="$TEST_BIN/fm-claude-automic-vault.sh"
 SPAWN="$TEST_BIN/fm-spawn.sh"
 REAL_SPAWN="$ROOT/bin/fm-spawn.sh"
+AV_LAUNCH="$TEST_BIN/fm-claude-automic-vault-launch.sh"
 export FM_CLAUDE_AV_TEST_PRODUCTION_ROOT=$ROOT
 JQ_BIN=$(command -v jq) || fail "test needs jq"
 NODE_BIN=$(command -v node) || fail "test needs node"
@@ -553,7 +554,7 @@ test_provision_recovery_renewal_preflight_and_redaction() {
 }
 
 test_enabled_disabled_and_non_claude_launches() {
-  local dir home fakebin state record proj wt launchlog output status launch before executed raw id before_claude before_endpoint raw_heredoc tasktmp gotmp raw_index=0
+  local dir home fakebin state record proj wt launchlog output status launch before executed raw id before_claude before_endpoint raw_heredoc tasktmp gotmp injected_argv injected_settings injected_worker_args direct_settings settings_count ready raw_index=0
   dir="$TMP_ROOT/launches"
   home="$dir/home"
   fakebin=$(make_fake_tools "$dir")
@@ -598,12 +599,42 @@ test_enabled_disabled_and_non_claude_launches() {
     || fail "injected Claude exec carried $settings_count --settings flags, expected exactly one authoritative --settings"
   injected_settings=$(printf '%s\n' "$injected_argv" | sed -n 's/.*<--settings> <\([^>]*\)>.*/\1/p')
   printf '%s' "$injected_settings" | "$JQ_BIN" -e \
-    'has("apiKeyHelper") and .apiKeyHelper == null and .feedbackDrafts == "off" and (.env | has("ANTHROPIC_API_KEY")) and .env.ANTHROPIC_API_KEY == null' \
+    'has("apiKeyHelper") and .apiKeyHelper == null and .feedbackDrafts == "off" and
+      (.env | keys | sort) == ([
+        "ANTHROPIC_API_KEY",
+        "ANTHROPIC_AUTH_TOKEN",
+        "ANTHROPIC_BASE_URL",
+        "ANTHROPIC_BEDROCK_BASE_URL",
+        "ANTHROPIC_FOUNDRY_BASE_URL",
+        "ANTHROPIC_VERTEX_BASE_URL",
+        "AWS_BEARER_TOKEN_BEDROCK",
+        "CLAUDE_CODE_USE_BEDROCK",
+        "CLAUDE_CODE_USE_FOUNDRY",
+        "CLAUDE_CODE_USE_VERTEX"
+      ] | sort) and all(.env[]; . == null)' \
     >/dev/null 2>&1 \
     || fail "authoritative injected --settings did not both null the credential keys and set feedbackDrafts off"
+
+  ready="$dir/injected-ready"
+  FM_FAKE_STATE="$state" TEST_FAKE_SECRET="$SECRET" \
+    "$AV_LAUNCH" --injected "$ready" "$fakebin/claude" "$injected_settings" \
+      --settings '{"worker":"separated"}' --model sonnet \
+      '--settings={"worker":"equals"}' launch-brief \
+      3>&1 4>&2 >/dev/null 2>&1 \
+    || fail "direct injected launch with worker settings did not execute"
+  [ -e "$ready" ] || fail "direct injected launch did not signal readiness"
+  injected_argv=$(grep '^claude ' "$state/claude-argv.log" | tail -1)
+  settings_count=$(printf '%s\n' "$injected_argv" | grep -oE '<--settings(>|=)' | wc -l | tr -d ' ')
+  [ "$settings_count" = 1 ] \
+    || fail "injected Claude exec carried $settings_count --settings flags after filtering both worker forms"
+  direct_settings=$(printf '%s\n' "$injected_argv" | sed -n 's/.*<--settings> <\([^>]*\)>.*/\1/p')
+  [ "$direct_settings" = "$injected_settings" ] \
+    || fail "injected Claude exec replaced the authoritative settings with worker settings"
   injected_worker_args=${injected_argv#*<--allowedTools> <Bash>}
-  if printf '%s\n' "$injected_worker_args" | grep -qE '<--settings(>|=)'; then
-    fail "worker template --settings survived into the injected Claude exec worker arguments"
+  assert_contains "$injected_worker_args" '<--model> <sonnet> <launch-brief>' \
+    "injected Claude exec dropped worker arguments adjacent to settings"
+  if printf '%s\n' "$injected_worker_args" | grep -qE '<--settings(>|=)|worker'; then
+    fail "worker settings survived into the injected Claude exec arguments"
   fi
 
   : > "$launchlog"

From b2a87a8dd954bd0979f2f28598ad33dd3b338bf6 Mon Sep 17 00:00:00 2001
From: "Rene Garza Jr." <rega1011@RG-Mac-mini.local>
Date: Sat, 5 Sep 2026 11:31:29 -0500
Subject: [PATCH 7/7] no-mistakes(document): Consolidate Herdr and Vault
 verification documentation

---
 docs/herdr-backend.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/herdr-backend.md b/docs/herdr-backend.md
index be41d7e073a..a734f89ad77 100644
--- a/docs/herdr-backend.md
+++ b/docs/herdr-backend.md
@@ -290,11 +290,7 @@ Capability matching checks the bounded schema in-process, avoiding the early-exi
 Polling runs every cycle and remains the permanent fallback when protocol 16, the event schema, Python, connection, subscription, or repeated reader execution is unavailable.
 There is still one watcher process; the event reader is a bounded child of that watcher.
 
-`fm_backend_herdr_events_capable` gates the push path on the ~220KB `herdr api schema --json` payload.
-It matches the two event needles in-process with `case "$schema" in *needle*)`, never by streaming the payload into an early-exit consumer such as `grep -Fq`: an early-exit match closes the pipe while the producer is still writing and prints `printf: write error: Broken pipe` on a watcher TTY every probe cycle, training operators to ignore real errors on that stream.
-
-`tests/fm-backend-herdr-eventwait-smoke.test.sh`, `tests/fm-transition-lib.test.sh`, and `tests/fm-supervision-events.test.sh` cover capability, subscribe-then-reconcile ordering, dedupe, exemptions, and polling fallback.
-The `test_events_capable_*` cases in `tests/fm-backend-herdr.test.sh` drive the gate against a large synthetic schema under a PTY and fail on any broken-pipe write error.
+`tests/fm-backend-herdr.test.sh`, `tests/fm-backend-herdr-eventwait-smoke.test.sh`, `tests/fm-transition-lib.test.sh`, and `tests/fm-supervision-events.test.sh` cover capability, subscribe-then-reconcile ordering, dedupe, exemptions, broken-pipe regressions, and polling fallback.
 
 ## Away-mode supervisor support