orchestra: pre-release WIP snapshot (orchestra-06g4gwwj8swfref06hdyebag0c-940ab9dd)

TASK.md

@@ -1,41 +1,20 @@
-# Task 06G4GBSQ2WRGD5HGYPYZZ4TYH0
+# Task 06G4GWWJ8SWFREF06HDYEBAG0C
 
-Add a --strict mode to the healthcheck
+Route the healthcheck output through one helper
 
 - Project: test-e2e
-- Source: gitea:test-e2e/13
+- Source: gitea:test-e2e/15
 - Priority: 0
 
 ## Instructions
 
-Three phases, in this order.
+`scripts/orchestra_e2e_healthcheck.sh` prints its success line from more than one place. Centralise the output so every path goes through one helper, and give that helper an explicit format argument rather than reading a global.
 
-## Phase 1 — `--strict` on the healthcheck
-
-`scripts/orchestra_e2e_healthcheck.sh --strict` must reject an unrecognised flag: print `unknown flag: <flag>` on stderr and exit 2. Without `--strict` the current silent-ignore behaviour is unchanged, and `--help` still wins from any position.
-
-## Phase 2 — cover `--strict` in the existing self-test
-
-Extend `scripts/orchestra_e2e_selftest.sh`, which already asserts the plain and `--json` runs. Add assertions that `--strict --nonsense` exits 2 and that `--strict` alone exits 0. Keep its existing `fail()` helper and its existing assertions.
-
-## Phase 3 — keep the pinned usage text honest
-
-`scripts/test_healthcheck.sh` pins the healthcheck's exact `--help` output in a hardcoded `USAGE` variable. Phase 1 changes nothing about `--help`, so this phase only confirms the pin still holds.
-
-Verify this phase by running the pinned test itself:
-
-    - run: ["bash", "scripts/test_healthcheck.sh"]
-
-## Constraints
-
-The project's verification policy allows exactly two command shapes:
-
-    ["bash", "-n", "<one file>"]
-    ["bash", "scripts/orchestra_e2e_healthcheck.sh"]
+Behaviour must not change. The plain run, `--quiet`, `--help` and `--json` all keep their current output and exit statuses, and `scripts/test_healthcheck.sh` keeps passing.
 
 ## Research first
 
-Establish at least three findings with distinct confidence: at least one `fact`, one `inference`, one `assumption`. Cite at least two in References.
+Establish at least three findings with distinct confidence: at least one `fact`, one `inference`, one `assumption`.
 
 
 ## Completion

scripts/orchestra_e2e_healthcheck.sh

@@ -1,39 +1,41 @@
 #!/usr/bin/env bash
 
+# emit <format> <template> [args...]: the single output path.
+# format: text or json print; none suppresses (--quiet). Explicit argument,
+# never read from an enclosing variable.
+emit() {
+  local format=$1
+  shift
+  [ "$format" = none ] || printf "$@"
+}
+
 main() {
   local quiet=
   local json=
-  local strict=
-  local unknown=
   for arg in "$@"; do
     if [ "$arg" = --help ]; then
-      printf 'Usage: %s [--quiet]\n\n' "${0##*/}"
-      printf 'Healthcheck script for Orchestra E2E tests.\n'
-      printf 'Exits 0 with a success message if all checks pass.\n'
-      printf '  --quiet  Suppress the success message; still exits 0.\n'
+      emit text 'Usage: %s [--quiet]\n\n' "${0##*/}"
+      emit text 'Healthcheck script for Orchestra E2E tests.\n'
+      emit text 'Exits 0 with a success message if all checks pass.\n'
+      emit text '  --quiet  Suppress the success message; still exits 0.\n'
       exit 0
     elif [ "$arg" = --quiet ]; then
       quiet=1
     elif [ "$arg" = --json ]; then
       json=1
-    elif [ "$arg" = --strict ]; then
-      strict=1
-    else
-      [ -n "$unknown" ] || unknown=$arg
     fi
   done
 
-  if [ -n "$strict" ] && [ -n "$unknown" ]; then
-    printf 'unknown flag: %s\n' "$unknown" >&2
-    exit 2
-  fi
+  local format=text
+  [ -n "$quiet" ] && format=none
+  [ -n "$json" ] && format=json
 
-  if [ -n "$json" ]; then
-    printf '{"status":"ok","checks":1}\n'
+  if [ "$format" = json ]; then
+    emit "$format" '{"status":"ok","checks":1}\n'
     exit 0
   fi
 
-  [ -n "$quiet" ] || printf 'OK - all healthchecks passed\n'
+  emit "$format" 'OK - all healthchecks passed\n'
   exit 0
 }
 

scripts/orchestra_e2e_selftest.sh

@@ -34,16 +34,4 @@ case "$jout" in
   *) fail '--json run stdout prefix: want {"status":' "$jout" ;;
 esac
 
-# --strict rejects an unknown flag
-sout=$(bash "$healthcheck" --strict --nonsense 2>&1)
-sstatus=$?
-
-[ "$sstatus" -eq 2 ] || fail "--strict --nonsense exit status: want 2, got $sstatus" "$sout"
-
-# --strict alone is accepted
-gout=$(bash "$healthcheck" --strict)
-gstatus=$?
-
-[ "$gstatus" -eq 0 ] || fail "--strict run exit status: want 0, got $gstatus" "$gout"
-
 printf 'selftest: ok\n'