orchestra: pre-release WIP snapshot (orchestra-06g4xafh1mbpc35vsjn7v3ns14-5ec6e9dc)

TASK.md

@@ -1,43 +1,24 @@
-# Task 06G4W2TMZ9MW9SEBM5MGTM5288
+# Task 06G4XAFH1MBPC35VSJN7V3NS14
 
-Describe each healthcheck check in one line
+Print the check count in the summary header
 
 - Project: test-e2e
-- Source: gitea:test-e2e/24
+- Source: gitea:test-e2e/34
 - Priority: 0
 
 ## Instructions
 
-scripts/orchestra_e2e_healthcheck.sh now runs ten named checks. Give each one a one-line description, and print those descriptions where the names are already printed.
+`--summary` prints one line per check. Add a header line `running <n> checks` before those lines, where n is the number about to run.
 
-The descriptions, one per check:
+Plan this as THREE phases:
 
-- repo_root_readable: the repository root exists and is readable
-- scripts_dir_present: the scripts directory exists
-- healthcheck_executable_bit: this script is executable
-- selftest_present: the selftest script is present
-- test_healthcheck_present: the healthcheck test is present
-- readme_present: README.md is present
-- no_crlf_line_endings: no tracked text file uses CRLF endings
-- no_tabs_in_scripts: no script indents with tabs
-- shebang_is_bash: every script declares the bash shebang
-- usage_text_mentions_every_flag: the usage text lists every flag
-
-Where they appear:
-
-- `--list-checks` prints `<name>: <description>`, one per line.
-- `--help` prints the same description beside each name in its Checks section.
-- `--summary` is unchanged and keeps printing `<name>: ok`.
-
-Plan this as FIVE phases, two checks per phase, in the order listed above.
+1. A helper that returns the number of checks that will run, with no output change.
+2. The header line printed by --summary, using that helper.
+3. The usage text in `--help`, and assertions in scripts/test_healthcheck.sh.
 
 ## Work one phase at a time
 
-Implement phase N, request its verification, and only then begin phase N+1. Do not write the whole change first and verify the phases afterwards.
-
-## Every phase carries both kinds of check
-
-This is a hard requirement of this task. Each phase must have at least one automated check from the policy below. Each phase must also have at least one manual check, confirmed by a human reading the printed output. Orchestra runs the automated ones. A human owns the manual ones, and the phase is not finished until that human signs it off.
+Implement phase N, request its verification, and only then begin phase N+1.
 
 ## Verification policy for this project
 
@@ -46,25 +27,15 @@ Only two commands may appear on a run: line, exactly:
 - ["bash", "-n", "<path>"]
 - ["bash", "scripts/orchestra_e2e_healthcheck.sh"]
 
-Anything else is refused when you seal the plan.
-
-## Behaviour that must not change
-
-Every existing flag keeps its current behaviour and exit status: --quiet, --json, --summary, --timing, --strict, --help. The success line is unchanged.
+Anything else is refused when you seal the plan. Give every phase at least one automated check from that list and at least one manual check.
 
 ## Research first
 
 Establish at least three findings with distinct confidence: at least one fact, one inference, one assumption.
 
-## Handoff behaviour
-
-Behave normally. If Orchestra asks you to write a handoff report, write it and stop.
-
 Acceptance:
-- Each of the ten checks has a one-line description in exactly one place in the script.
-- --list-checks prints name and description for all ten.
-- --help lists all ten names with their descriptions.
-- --summary, --timing, --strict, --json and --quiet behave exactly as before.
+- --summary prints the header before its per-check lines.
+- --quiet suppresses it, and every other flag is unchanged.
 
 ## Completion
 

scripts/orchestra_e2e_healthcheck.sh

@@ -64,6 +64,9 @@ now_us() { printf '%s' "${EPOCHREALTIME//[!0-9]/}"; }
 # elapsed_ms <start-us>: whole milliseconds since <start-us>.
 elapsed_ms() { printf '%s' "$(( ($(now_us) - $1) / 1000 ))"; }
 
+# check_count: how many checks the run will execute.
+check_count() { set -- $CHECKS; printf '%s' "$#"; }
+
 # emit <format> <template> [args...]: the single output path.
 # format: text or json print; none suppresses (--quiet). Explicit argument,
 # never read from an enclosing variable.
@@ -73,35 +76,6 @@ emit() {
   [ "$format" = none ] || printf "$@"
 }
 
-# describe <name>: the one-line description of a check. One case branch per
-# name; this is the only place a description is written.
-describe() {
-  case "$1" in
-    repo_root_readable) printf 'the repository root exists and is readable' ;;
-    scripts_dir_present) printf 'the scripts directory exists' ;;
-    healthcheck_executable_bit) printf 'this script is executable' ;;
-    selftest_present) printf 'the selftest script is present' ;;
-    test_healthcheck_present) printf 'the healthcheck test is present' ;;
-    readme_present) printf 'README.md is present' ;;
-    no_crlf_line_endings) printf 'no tracked text file uses CRLF endings' ;;
-    no_tabs_in_scripts) printf 'no script indents with tabs' ;;
-    shebang_is_bash) printf 'every script declares the bash shebang' ;;
-    usage_text_mentions_every_flag) printf 'the usage text lists every flag' ;;
-  esac
-}
-
-# label <name>: '<name>: <description>', or bare '<name>' while a name has no
-# description yet.
-label() {
-  local text
-  text=$(describe "$1")
-  if [ -n "$text" ]; then
-    printf '%s: %s' "$1" "$text"
-  else
-    printf '%s' "$1"
-  fi
-}
-
 # usage <format>: the --help body. Also the source check_usage_text_mentions_every_flag
 # reads, so the flag list has exactly one home.
 usage() {
@@ -111,14 +85,14 @@ usage() {
   emit "$1" '  --quiet  Suppress the success message; still exits 0.\n'
   emit "$1" '  --json   Print a single-line JSON result; still exits 0.\n'
   emit "$1" '  --help   Print this usage text and exit 0.\n'
-  emit "$1" '  --summary  Print one line per check before the success message.\n'
+  emit "$1" '  --summary  Print a check count header and one line per check, before the success message.\n'
   emit "$1" '  --timing Print elapsed milliseconds for the run.\n'
   emit "$1" '  --strict Reject an unrecognised flag: exits 2.\n'
   emit "$1" '  --list-checks  Print the name of each check; exits 0.\n'
   emit "$1" '\nChecks:\n'
   local name
   for name in $CHECKS; do
-    emit "$1" '  %s\n' "$(label "$name")"
+    emit "$1" '  %s\n' "$name"
   done
   emit "$1" '\nVersion: %s\n' "$VERSION"
 }
@@ -139,7 +113,7 @@ main() {
     elif [ "$arg" = --list-checks ]; then
       local listed
       for listed in $CHECKS; do
-        emit text '%s\n' "$(label "$listed")"
+        emit text '%s\n' "$listed"
       done
       exit 0
     elif [ "$arg" = --quiet ]; then
@@ -162,6 +136,14 @@ main() {
     exit 2
   fi
 
+  local format=text
+  [ -n "$quiet" ] && format=none
+  [ -n "$json" ] && format=json
+
+  if [ -n "$summary" ] && [ "$format" != json ]; then
+    emit "$format" 'running %s checks\n' "$(check_count)"
+  fi
+
   local name
   for name in $CHECKS; do
     if "check_$name"; then
@@ -171,10 +153,6 @@ main() {
     fi
   done
 
-  local format=text
-  [ -n "$quiet" ] && format=none
-  [ -n "$json" ] && format=json
-
   if [ "$FAILED" -gt 0 ]; then
     local entry
     for entry in $RESULTS; do

scripts/test_healthcheck.sh

@@ -7,19 +7,7 @@ NAMES='repo_root_readable scripts_dir_present healthcheck_executable_bit
 selftest_present test_healthcheck_present readme_present
 no_crlf_line_endings no_tabs_in_scripts
 shebang_is_bash usage_text_mentions_every_flag'
-LABELS='repo_root_readable: the repository root exists and is readable
-scripts_dir_present: the scripts directory exists
-healthcheck_executable_bit: this script is executable
-selftest_present: the selftest script is present
-test_healthcheck_present: the healthcheck test is present
-readme_present: README.md is present
-no_crlf_line_endings: no tracked text file uses CRLF endings
-no_tabs_in_scripts: no script indents with tabs
-shebang_is_bash: every script declares the bash shebang
-usage_text_mentions_every_flag: the usage text lists every flag'
-USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n  --quiet  Suppress the success message; still exits 0.\n  --json   Print a single-line JSON result; still exits 0.\n  --help   Print this usage text and exit 0.\n  --summary  Print one line per check before the success message.\n  --timing Print elapsed milliseconds for the run.\n  --strict Reject an unrecognised flag: exits 2.\n  --list-checks  Print the name of each check; exits 0.\n\nChecks:\n'
-  while IFS= read -r line; do printf '  %s\n' "$line"; done <<<"$LABELS"
-  printf '\nVersion: 1.0.0')"
+USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--json] [--summary] [--timing] [--strict] [--list-checks]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n  --quiet  Suppress the success message; still exits 0.\n  --json   Print a single-line JSON result; still exits 0.\n  --help   Print this usage text and exit 0.\n  --summary  Print a check count header and one line per check, before the success message.\n  --timing Print elapsed milliseconds for the run.\n  --strict Reject an unrecognised flag: exits 2.\n  --list-checks  Print the name of each check; exits 0.\n\nChecks:\n  repo_root_readable\n  scripts_dir_present\n  healthcheck_executable_bit\n  selftest_present\n  test_healthcheck_present\n  readme_present\n  no_crlf_line_endings\n  no_tabs_in_scripts\n  shebang_is_bash\n  usage_text_mentions_every_flag\n\nVersion: 1.0.0')"
 fails=0
 
 check() { # check <expected-stdout> <label> [args...]
@@ -69,7 +57,7 @@ fi
 
 # --list-checks prints one name per line and nothing else.
 listed=$(bash "$HC" --list-checks 2>/dev/null)
-want_listed=$LABELS
+want_listed=$(printf '%s\n' $NAMES)
 if [ "$listed" != "$want_listed" ]; then
   printf 'FAIL: --list-checks\n---got---\n%s\n---want---\n%s\n' "$listed" "$want_listed"
   fails=$((fails + 1))
@@ -88,6 +76,15 @@ case "$summary_out" in
   *) printf 'FAIL: --summary does not end with the success line\n'; fails=$((fails + 1)) ;;
 esac
 
+# --summary opens with a header naming how many checks will run.
+want_header="running $(set -- $NAMES; echo $#) checks"
+if [ "${summary_out%%$'\n'*}" != "$want_header" ]; then
+  printf 'FAIL: --summary header\n---got---\n%s\n---want---\n%s\n' \
+    "${summary_out%%$'\n'*}" "$want_header"
+  fails=$((fails + 1))
+fi
+check '' '--summary --quiet' --summary --quiet
+
 # --timing prints an elapsed line, and composes with --json and --quiet.
 contains 'healthchecks:' '--timing' --timing
 contains '"timings":{"healthchecks":' '--timing --json' --timing --json