Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/shepherd-board.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ jobs:

- name: W7 session log
if: always()
run: python3 tools/shepherd.py --token-env GITHUB_TOKEN log --event board-refresh --verdict "ok" --note "board + labels refreshed"
run: python3 tools/shepherd.py --token-env GITHUB_TOKEN log --event board-refresh --verdict "ok" --note "board + labels refreshed" --job-status "${{ job.status }}"
2 changes: 1 addition & 1 deletion .github/workflows/shepherd-dup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ jobs:

- name: W7 session log
if: always()
run: python3 tools/shepherd.py --token-env GITHUB_TOKEN log --event dup-pass --note "phase A/B pass complete"
run: python3 tools/shepherd.py --token-env GITHUB_TOKEN log --event dup-pass --verdict "ok" --note "phase A/B pass complete" --job-status "${{ job.status }}"
2 changes: 1 addition & 1 deletion .github/workflows/shepherd-rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ jobs:

- name: W7 session log
if: always()
run: python3 tools/shepherd.py --token-env GITHUB_TOKEN log --event rebase-tick --note "rebase shepherd tick"
run: python3 tools/shepherd.py --token-env GITHUB_TOKEN log --event rebase-tick --verdict "ok" --note "rebase shepherd tick" --job-status "${{ job.status }}"
28 changes: 26 additions & 2 deletions tools/shepherd.py
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,25 @@ def cmd_comment(args):

# ------------------------------------------------------------------ W7 log

def resolve_log_outcome(verdict, note, job_status=None):
"""Bind if: always() session-log verdicts to actual workflow job status.

Without job_status (direct CLI calls), caller verdict/note pass through
unchanged. When job_status is supplied by a GitHub Actions `if: always()`
step (`${{ job.status }}`), any non-success job overrides optimistic
completion claims so failed/cancelled runs never record verdict='ok'."""
if not job_status:
return verdict, note
status = job_status.strip().lower()
if status == "success":
return (verdict if verdict is not None else "ok"), note
failure_note = (
"job %s before completion (intended: %s)" % (status, note)
if note else "job %s" % status
)
return status, failure_note


def cmd_log(args):
"""Structured session log: one JSON line per bot action, appended to
logs/SESSION.jsonl on the automation/session-log branch via the contents
Expand All @@ -576,9 +595,12 @@ def cmd_log(args):
cfg = load_cfg()
gh = tb.Gh(cfg["repo"], tb.load_token(args))
branch, path = cfg["log_branch"], cfg["log_path"]
verdict, note = resolve_log_outcome(
args.verdict, args.note, getattr(args, "job_status", None)
)
rec = {"ts": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
"event": args.event, "pr": args.pr, "verdict": args.verdict,
"sha": args.sha, "note": args.note, "run": run_url()}
"event": args.event, "pr": args.pr, "verdict": verdict,
"sha": args.sha, "note": note, "run": run_url()}
line = json.dumps(rec, ensure_ascii=False)
try:
st, ref = gh.req("GET", "/repos/%s/git/ref/heads/%s" % (gh.repo, branch))
Expand Down Expand Up @@ -696,6 +718,8 @@ def main():
p.add_argument("--verdict", default=None)
p.add_argument("--sha", default=None)
p.add_argument("--note", default=None)
p.add_argument("--job-status", default=None,
help="GitHub Actions ${{ job.status }} for if: always() steps")
p.set_defaults(fn=cmd_log)

args = ap.parse_args()
Expand Down
33 changes: 33 additions & 0 deletions tools/test_shepherd_gate.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,39 @@ def test_shepherd_verify_passes_manifest_and_hyb_bin(self):
self.assertIn("tools/corpus_harness.py --bin compiler/target/debug/hyb", src)
self.assertIn("tools/differential_loop.py --bin compiler/target/debug/hyb", src)

def test_always_w7_session_logs_bind_job_status(self):
for wf in ("shepherd-board.yml", "shepherd-dup.yml", "shepherd-rebase.yml"):
src = (self.ROOT / ".github" / "workflows" / wf).read_text(encoding="utf-8")
self.assertIn("--job-status", src, wf)
self.assertIn("${{ job.status }}", src, wf)


class W7LogOutcomeTests(unittest.TestCase):
"""if: always() W7 session-log steps must never record verdict='ok' or a
completion note when an earlier workflow step failed or cancelled
(reproduced in production run 43752174585 on shepherd-board)."""

def test_success_job_status_preserves_ok_verdict_and_note(self):
verdict, note = sh.resolve_log_outcome("ok", "board + labels refreshed", "success")
self.assertEqual(verdict, "ok")
self.assertEqual(note, "board + labels refreshed")

def test_failed_job_status_overrides_ok_verdict_and_completion_note(self):
verdict, note = sh.resolve_log_outcome("ok", "board + labels refreshed", "failure")
self.assertEqual(verdict, "failure")
self.assertNotEqual(note, "board + labels refreshed")
self.assertIn("failure", note)

def test_cancelled_job_status_overrides_unset_verdict(self):
verdict, note = sh.resolve_log_outcome(None, "phase A/B pass complete", "cancelled")
self.assertEqual(verdict, "cancelled")
self.assertIn("cancelled", note)

def test_unset_job_status_keeps_explicit_caller_fields(self):
verdict, note = sh.resolve_log_outcome("blocked", "probe evidence posted", None)
self.assertEqual(verdict, "blocked")
self.assertEqual(note, "probe evidence posted")


class CmdProbeTests(unittest.TestCase):
"""cmd_probe must not crash with NameError on unmatched diffs or TypeError
Expand Down
Loading