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

TASK.md

@@ -1,14 +1,21 @@
-# Task 06G4E6F69AKP2PA00S28D7ASBC
+# Task 06G4GWWJ8SWFREF06HDYEBAG0C
 
-Add a --quiet flag to the healthcheck script
+Route the healthcheck output through one helper
 
 - Project: test-e2e
-- Source: gitea:test-e2e/7
+- Source: gitea:test-e2e/15
 - Priority: 0
 
 ## Instructions
 
-scripts/orchestra_e2e_healthcheck.sh already handles --help. Add a --quiet flag alongside it that suppresses the success line and still exits 0. Leave the default behaviour and the --help output unchanged.
+`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.
+
+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`.
+
 
 ## Completion
 

scripts/orchestra_e2e_healthcheck.sh

@@ -1,20 +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=
   for arg in "$@"; do
     if [ "$arg" = --help ]; then
-      printf 'Usage: %s [--quiet]\n\n' "${0##*/}"
+      emit text 'Usage: %s [--quiet]\n\n' "${0##*/}"
-      printf 'Healthcheck script for Orchestra E2E tests.\n'
+      emit text 'Healthcheck script for Orchestra E2E tests.\n'
-      printf 'Exits 0 with a success message if all checks pass.\n'
+      emit text 'Exits 0 with a success message if all checks pass.\n'
-      printf '  --quiet  Suppress the success message; still exits 0.\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
     fi
   done
 
-  [ -n "$quiet" ] || printf 'OK - all healthchecks passed\n'
+  local format=text
+  [ -n "$quiet" ] && format=none
+  [ -n "$json" ] && format=json
+
+  if [ "$format" = json ]; then
+    emit "$format" '{"status":"ok","checks":1}\n'
+    exit 0
+  fi
+
+  emit "$format" 'OK - all healthchecks passed\n'
   exit 0
 }
 

scripts/orchestra_e2e_selftest.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Self-test for the Orchestra E2E healthcheck.
+
+here=$(cd "$(dirname "$0")" && pwd)
+healthcheck="$here/orchestra_e2e_healthcheck.sh"
+
+# fail <assertion> <captured stdout>: always echo what the healthcheck printed,
+# so a red run is diagnosable without rerunning it by hand.
+fail() {
+  printf 'selftest: FAILED %s\n' "$1" >&2
+  printf 'selftest: healthcheck stdout was:\n%s\n' "$2" >&2
+  exit 1
+}
+
+# plain run
+out=$(bash "$healthcheck")
+status=$?
+
+[ "$status" -eq 0 ] || fail "plain run exit status: want 0, got $status" "$out"
+case "$out" in
+  *OK*) ;;
+  *) fail "plain run stdout contains OK" "$out" ;;
+esac
+
+# --json run
+jout=$(bash "$healthcheck" --json)
+jstatus=$?
+
+[ "$jstatus" -eq 0 ] || fail "--json run exit status: want 0, got $jstatus" "$jout"
+jlines=$(printf '%s\n' "$jout" | wc -l)
+[ "$jlines" -eq 1 ] || fail "--json run line count: want 1, got $jlines" "$jout"
+case "$jout" in
+  '{"status":'*) ;;
+  *) fail '--json run stdout prefix: want {"status":' "$jout" ;;
+esac
+
+printf 'selftest: ok\n'