fix(run-meeting): apply round-8 debate findings (regressions in prior fix)

666f05db6b5c39fbff920cac60ea3abe412fce0e · 2026-05-01 14:49:05 -0700 · Steve

The 8-round 3-way debate (codex+claude+qwen) found 5 net-new issues with
the patches landed in 858ca1f. All real, all applied here:

CRITICAL (round-8 C1) — claimed-atomic symlink wasn't:
- `ln -sfn` is unlink+symlink on macOS/BSD, NOT a single rename(2). The
  prior comment lied. Replaced with tmp-link + `mv -f` so the swap is
  truly atomic via rename(2).

HIGH (round-8 H1) — email POST status not gated:
- I dropped curl -f for the health probe (so 401 reaches the grep gate)
  but never re-added an HTTP-status check on the POST itself. Now capture
  both response body AND HTTP status via `-w '__HTTP_STATUS__%{http_code}'`
  and gate the "email queued" log line on POST=200. NDJSON record gains
  an `http` field for downstream filtering.

HIGH (round-8 H1 fallback) — empty $RESP produced invalid JSON:
- If curl times out or gets a 502 with empty body, `$RESP=""` produced
  `"resp":}` — kills any NDJSON consumer downstream. Falls back to "null"
  literal so the line stays parseable.

HIGH (round-8 H2) — leaked-meta detector was phrase-only:
- Added positive-content assertion: output MUST contain at least one
  `### ` or `## ` markdown heading, or it's flagged as malformed. This
  catches future failure phrasings the blacklist doesn't enumerate
  ("I will paste", "Here is the digest:" without "paste", etc.).
  Also expanded blacklist with "I will paste", "Here is the…:", "I cannot
  generate", "attempted to write but".

HIGH (round-8 H3) — detector vs sanitizer regex drift:
- Factored `$LEAK_RE` as a single shared variable. Detector and sanitizer
  now use the same pattern; the awk sanitizer is rewritten to consume it
  via -v re=$LEAK_RE so a line that trips detection cannot survive
  sanitization.

MEDIUM (round-8 M1) — secrets-manager .env quote stripping was overbroad:
- `tr -d '"' | tr -d "'"` stripped ALL quotes anywhere in the value,
  corrupting tokens with embedded quotes. Replaced with sed pattern that
  strips only outer matching pairs.

MEDIUM (round-8 M2) — wc -c whitespace-padded the chars field:
- macOS `wc -c < file` emits leading spaces. While the resulting NDJSON
  is technically valid (JSON allows whitespace between tokens), naive
  parsers tripped. Pipe through `tr -d ' '`.

MEDIUM (round-8 M3) — dead code + lying doc:
- LOCK= variable removed (flock was already dropped, file already gone
  via 5300bcd .gitignore).
- Header comment line 14 corrected: "atomic via tmp+rename" not "via flock".

Verified end-to-end on the 14:47:29 morning re-fire:
- status=ok (positive heading-check passed)
- symlink atomic-swap landed (mv from .tmp.PID)
- email POST=200, NDJSON record clean: `{"ts","meeting","type","chars",
  "http":200,"resp":{success:true,messageId:19de583d2975e1a1,...}}`

Debate run logs (final): ~/.claude/skills/claude-codex/runs/codex-meeting-3way-2026-05-01/

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Files touched

M run-meeting.sh

Diff

commit 666f05db6b5c39fbff920cac60ea3abe412fce0e
Author: Steve <steve@designerwallcoverings.com>
Date:   Fri May 1 14:49:05 2026 -0700

    fix(run-meeting): apply round-8 debate findings (regressions in prior fix)
    
    The 8-round 3-way debate (codex+claude+qwen) found 5 net-new issues with
    the patches landed in 858ca1f. All real, all applied here:
    
    CRITICAL (round-8 C1) — claimed-atomic symlink wasn't:
    - `ln -sfn` is unlink+symlink on macOS/BSD, NOT a single rename(2). The
      prior comment lied. Replaced with tmp-link + `mv -f` so the swap is
      truly atomic via rename(2).
    
    HIGH (round-8 H1) — email POST status not gated:
    - I dropped curl -f for the health probe (so 401 reaches the grep gate)
      but never re-added an HTTP-status check on the POST itself. Now capture
      both response body AND HTTP status via `-w '__HTTP_STATUS__%{http_code}'`
      and gate the "email queued" log line on POST=200. NDJSON record gains
      an `http` field for downstream filtering.
    
    HIGH (round-8 H1 fallback) — empty $RESP produced invalid JSON:
    - If curl times out or gets a 502 with empty body, `$RESP=""` produced
      `"resp":}` — kills any NDJSON consumer downstream. Falls back to "null"
      literal so the line stays parseable.
    
    HIGH (round-8 H2) — leaked-meta detector was phrase-only:
    - Added positive-content assertion: output MUST contain at least one
      `### ` or `## ` markdown heading, or it's flagged as malformed. This
      catches future failure phrasings the blacklist doesn't enumerate
      ("I will paste", "Here is the digest:" without "paste", etc.).
      Also expanded blacklist with "I will paste", "Here is the…:", "I cannot
      generate", "attempted to write but".
    
    HIGH (round-8 H3) — detector vs sanitizer regex drift:
    - Factored `$LEAK_RE` as a single shared variable. Detector and sanitizer
      now use the same pattern; the awk sanitizer is rewritten to consume it
      via -v re=$LEAK_RE so a line that trips detection cannot survive
      sanitization.
    
    MEDIUM (round-8 M1) — secrets-manager .env quote stripping was overbroad:
    - `tr -d '"' | tr -d "'"` stripped ALL quotes anywhere in the value,
      corrupting tokens with embedded quotes. Replaced with sed pattern that
      strips only outer matching pairs.
    
    MEDIUM (round-8 M2) — wc -c whitespace-padded the chars field:
    - macOS `wc -c < file` emits leading spaces. While the resulting NDJSON
      is technically valid (JSON allows whitespace between tokens), naive
      parsers tripped. Pipe through `tr -d ' '`.
    
    MEDIUM (round-8 M3) — dead code + lying doc:
    - LOCK= variable removed (flock was already dropped, file already gone
      via 5300bcd .gitignore).
    - Header comment line 14 corrected: "atomic via tmp+rename" not "via flock".
    
    Verified end-to-end on the 14:47:29 morning re-fire:
    - status=ok (positive heading-check passed)
    - symlink atomic-swap landed (mv from .tmp.PID)
    - email POST=200, NDJSON record clean: `{"ts","meeting","type","chars",
      "http":200,"resp":{success:true,messageId:19de583d2975e1a1,...}}`
    
    Debate run logs (final): ~/.claude/skills/claude-codex/runs/codex-meeting-3way-2026-05-01/
    
    Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 run-meeting.sh | 79 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/run-meeting.sh b/run-meeting.sh
index 8f1f394..8ae40d8 100755
--- a/run-meeting.sh
+++ b/run-meeting.sh
@@ -11,7 +11,7 @@
 #   3. Hands the bundle to `claude --print` with the meeting-type prompt
 #   4. Content-sniffs the output for hallucinated tool-failure footers; on hit,
 #      marks status=leaked-meta and DOES NOT update last-meeting symlink or email
-#   5. Updates last-meeting.md symlink (relative + atomic via flock)
+#   5. Updates last-meeting.md symlink (relative + atomic via tmp+rename)
 #   6. Emails the result to Steve via George (info@ → steve@designerwallcoverings.com)
 set +x
 set -uo pipefail
@@ -30,7 +30,6 @@ DOW="$(date +%A)"
 OUT="$MEETINGS/${TS}-${TYPE}.md"
 CTX="$LOGS/${TS}-${TYPE}.context.md"
 LAST="$DIR/last-meeting.md"
-LOCK="$DIR/.symlink.lock"
 
 # Cadence/day-of-week assertion — sunday-digest must only ever fire on Sunday
 # unless explicitly forced. Caught in the round-2 cross-exam.
@@ -47,24 +46,40 @@ log "===== meeting start type=$TYPE ts=$TS dow=$DOW ====="
 
 # ---------- helpers ----------
 
-# Detect the leaked-meta failure mode where the model writes a tool-failure
-# preamble or footer instead of the actual content. Returns 0 if leaked, 1 if clean.
+# Single shared regex for leak-phrase detection — used by both detector and
+# sanitizer so they can't drift (round-8 finding H3). Negative blacklist:
+# patterns the model uses when its Write/Edit tool call got blocked headless.
+LEAK_RE='(Here.{0,5}s the (digest|meeting).*paste|I.{0,2}ll paste|I will paste|Here is the (digest|meeting):|The write.*was blocked|^I (cannot|can.{0,2}t) (write|save|paste|generate)|write.{0,5}was blocked by permission|Approve it.*if you|attempted to (write|save) but)'
+
+# Detect the leaked-meta failure mode. Two-part check (round-8 H2):
+#   1. negative — must NOT contain a leak-phrase
+#   2. positive — MUST contain at least one markdown heading line so a
+#      legitimate-but-unfamiliar failure mode is still flagged as malformed
+# Returns 0 if leaked/malformed, 1 if clean.
 is_leaked_meta() {
   local f="$1"
-  # Line-anchored matches against the patterns the model uses when it tried
-  # to call a Write/Edit tool inside the headless prompt and got blocked.
-  grep -qiE '^(Here.{0,5}s the (digest|meeting).*paste|I.{0,2}ll paste|The write.*was blocked|^I (cannot|can.{0,2}t)|write.{0,5}was blocked by permission)' "$f" 2>/dev/null
+  # Negative: any leak phrase line-anchored
+  if grep -qiE "^$LEAK_RE" "$f" 2>/dev/null; then
+    return 0
+  fi
+  # Positive: must contain at least one markdown heading (### or ##) and
+  # be at least 5 lines. A "clean" output that's just prose without headings
+  # is also flagged — meeting templates always include section headings.
+  if ! grep -qE '^#{2,3} ' "$f" 2>/dev/null; then
+    return 0
+  fi
+  return 1
 }
 
 # Strip the leaked-meta wrapper from a contaminated file so the carryover
-# content can still be partially used. Returns the cleaned text on stdout.
+# content can still be partially used. Uses the SAME regex as the detector.
 strip_leaked_meta() {
   local f="$1"
-  # Drop the 1st N lines if they match the preamble; drop the last paragraph
-  # if it matches the footer. Conservative: only the lines that match.
-  awk '
-    NR<=3 && /^(Here.s the (digest|meeting)|I.{0,2}ll paste|The write.*was blocked)/ { next }
-    /^The write.*was blocked|^Approve it.*if you/ { skip=1 }
+  awk -v re="$LEAK_RE" '
+    BEGIN { IGNORECASE = 1 }
+    NR<=3 && $0 ~ "^"re { next }
+    $0 ~ re && /(was blocked|approve it.*if you|attempted to)/ { skip=1 }
+    skip && /^$/ { skip=0; next }
     skip { next }
     { print }
   ' "$f"
@@ -171,11 +186,13 @@ log "meeting written lines=$LINES status=$STATUS → $OUT"
 
 # ---------- 4. Update last-meeting symlink (only on clean status) ----------
 if [[ "$STATUS" == "ok" ]]; then
-  # Relative target (so the symlink survives clone/move). `ln -sfn` is atomic
-  # via rename(2) under the hood — no flock needed (and macOS lacks flock).
-  # Seconds-precision timestamps already prevent $OUT collisions.
+  # Truly atomic swap: write a tmp symlink, then rename(2) over the target.
+  # `ln -sfn` on macOS/BSD is unlink+symlink (NOT atomic — round-8 C1) so
+  # we use the tmp+mv pattern. Relative target survives clone/move.
   cd "$DIR"
-  ln -sfn "meetings/$(basename "$OUT")" "last-meeting.md"
+  TMP_LINK="last-meeting.md.tmp.$$"
+  ln -s "meetings/$(basename "$OUT")" "$TMP_LINK"
+  mv -f "$TMP_LINK" "last-meeting.md"
   log "symlink updated last-meeting.md → $(basename "$OUT")"
 else
   log "symlink NOT updated — status=$STATUS (this run quarantined; carryover stays clean)"
@@ -191,7 +208,9 @@ fi
 GEORGE="${GEORGE_URL:-http://localhost:9850}"
 # No password fallback — env-only. Bring up secrets-manager .env or skip email.
 if [[ -z "${GEORGE_AUTH:-}" && -f "$HOME/Projects/secrets-manager/.env" ]]; then
-  GEORGE_AUTH_VAL=$(grep -E '^GEORGE_AUTH=' "$HOME/Projects/secrets-manager/.env" 2>/dev/null | head -1 | cut -d= -f2- | tr -d '"' | tr -d "'")
+  # Strip only outer matching quote pair (round-8 M1 — bare tr corrupts
+  # tokens that legitimately contain quotes inside).
+  GEORGE_AUTH_VAL=$(grep -E '^GEORGE_AUTH=' "$HOME/Projects/secrets-manager/.env" 2>/dev/null | head -1 | cut -d= -f2- | sed -E "s/^['\"](.*)['\"]\$/\1/")
   [[ -n "$GEORGE_AUTH_VAL" ]] && GEORGE_AUTH="$GEORGE_AUTH_VAL"
 fi
 if [[ -z "${GEORGE_AUTH:-}" ]]; then
@@ -202,17 +221,29 @@ fi
 
 SUBJECT="[Codex-Claude Meeting] ${TYPE} — $(date '+%a %b %-d')"
 
-# Health probe — drop -f so 401 status reaches grep (the round-1 finding)
+# Health probe — drop -f so 401 status reaches the gate (the round-1 finding)
 HEALTH_CODE=$(curl -s -o /dev/null -w '%{http_code}' --max-time 5 "$GEORGE/health" 2>/dev/null)
 if [[ "$HEALTH_CODE" == "200" || "$HEALTH_CODE" == "401" ]]; then
-  RESP=$(curl -s --max-time 30 \
+  # Capture both response body and HTTP status — round-8 H1 caught that
+  # we were logging "email queued" even on a POST 401/500.
+  POST_BODY=$(node -e 'const fs=require("fs");const b=fs.readFileSync(process.argv[1],"utf8");process.stdout.write(JSON.stringify({to:"steve@designerwallcoverings.com",subject:process.argv[2],body:b}))' "$OUT" "$SUBJECT")
+  RESP_AND_CODE=$(curl -s --max-time 30 -w '\n__HTTP_STATUS__%{http_code}' \
     -H "Authorization: $GEORGE_AUTH" \
     -H "Content-Type: application/json" \
     -X POST "$GEORGE/api/send?account=info" \
-    -d "$(node -e 'const fs=require("fs");const b=fs.readFileSync(process.argv[1],"utf8");process.stdout.write(JSON.stringify({to:"steve@designerwallcoverings.com",subject:process.argv[2],body:b}))' "$OUT" "$SUBJECT")")
-  # NDJSON: one record per line, with our own metadata for joinability
-  printf '%s\n' "{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"meeting\":\"$(basename "$OUT")\",\"type\":\"$TYPE\",\"chars\":$(wc -c < "$OUT"),\"resp\":$RESP}" >> "$LOGS/email.log"
-  log "email queued via george (health=$HEALTH_CODE)"
+    -d "$POST_BODY")
+  POST_CODE=$(printf '%s' "$RESP_AND_CODE" | sed -n 's/.*__HTTP_STATUS__\([0-9]*\)$/\1/p' | tail -1)
+  RESP=$(printf '%s' "$RESP_AND_CODE" | sed 's/__HTTP_STATUS__[0-9]*$//')
+  # Round-8 H1 fallback — empty body produces invalid JSON in NDJSON.
+  RESP="${RESP:-null}"
+  # Round-8 M2 — wc -c on macOS pads whitespace.
+  CHARS=$(wc -c < "$OUT" | tr -d ' ')
+  printf '%s\n' "{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"meeting\":\"$(basename "$OUT")\",\"type\":\"$TYPE\",\"chars\":$CHARS,\"http\":$POST_CODE,\"resp\":$RESP}" >> "$LOGS/email.log"
+  if [[ "$POST_CODE" == "200" ]]; then
+    log "email queued via george (health=$HEALTH_CODE post=$POST_CODE)"
+  else
+    log "email POST FAILED (health=$HEALTH_CODE post=$POST_CODE) — george reachable but rejected"
+  fi
 else
   log "george unreachable (health=$HEALTH_CODE); meeting saved locally only"
 fi

← 5300bcd chore: add .gitignore for runtime state (context bundles, la · back to Claude Codex Meeting · fix(email): convert markdown→HTML so Gmail renders properly 724a66e →