Skip to content

merge queue: checking #1332 on main (73f06fb), stacked on #1323 and #1333 - #1342

Closed
mergify[bot] wants to merge 13 commits into
mainfrom
mergify/merge-queue/4452224c9b
Closed

merge queue: checking #1332 on main (73f06fb), stacked on #1323 and #1333#1342
mergify[bot] wants to merge 13 commits into
mainfrom
mergify/merge-queue/4452224c9b

Conversation

@mergify

@mergify mergify Bot commented Oct 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

✨ Pull request #1333 ahead in the queue was removed (reason: checks timeout). The pull request #1332 has been requeued. ✨

#1332 is queued for merge on branch main (73f06fb).

Stacked behind 2 pull requests queued ahead of this batch, not part of it. These checks run on a tip that also carries their commits, so a failure here can come from them as much as from #1332.

Queued ahead of this batch:

This pull request has been created by Mergify to speculatively check the mergeability of #1332.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule admin-bypass for merge:

  • check-success = test
  • check-success = lint
  • check-success = validate

Required conditions to stay in the queue:

---
all_scopes: false
checking_base_sha: 51e46b073de8ebf1029eebbd8a63fef833cac6ab
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 1332
    scopes: []
scopes: []
...

CI Bot and others added 13 commits October 11, 2026 14:27
CI Bot
Let the install tests read either hook layout.
5a9e5c1 
tests/test_install.py and engine/hooks/_runner/tests/test_wrap_installed.py
asserted one settings entry per hook, so every per-hook guarantee they check
failed once CATSTACK_HOOK_DISPATCHER (#1122) collapsed an event to a single
_runner/dispatch.py entry: 70 failures and 1 error on #1122's head, all in
these two files.

load_config() in tests/test_install.py now reads an installed config and
expands a collapsed event back into one entry per hook, resolving each hook's
registration the way dispatch.py itself does (dispatch.load_event_hooks: the
cursor registry, or the hook's own manifest for claude and codex). Each
assertion therefore sees the identical shape in both layouts and keeps
checking the same guarantee -- right event, right harness, Stop mirrored to
SubagentStop or opted out, dead entries pruned, non-catstack entries
untouched. test_wrap_installed.py's fixture pins the flag off, since it
asserts the settings bytes install writes rather than a hook's registration.

#1122's own test_default_is_off_and_byte_identical_to_no_flag_at_all now
compares the default install against an install that sets the flag to
whatever flags.py resolves as the default, and clears the key from its own
environment first, so the flag-on run of the full suite cannot leak into the
"default" side of the comparison.

The CATSTACK_HOOK_DISPATCHER default is left off. Flipping it on is gated on
both full-suite runs passing, and the source branch
plan/hook-backlog-1c-install-tests-accept-the-one-entry-per-event-layout-default-on-only-if-both-suites-pass
never changed engine/hooks/_flags/flags.py, so that gate was not met there
and this commit does not claim it.

Cherry-picked from 6330abf on that branch.
The branch's two other content commits (engine/hooks/_runner/doctor.py,
scripts/test/run_skill_scenarios.py) are unrelated to this claim and are
left behind.
Invoker Bot
invoker: wf-1791728053338-10/publish-both-layout-install-tests — Revi…
1b46a91 
…ew claim: tests.test_install and test_wrap_installed accept both install layouts (one entry per hook with CATSTACK_HOOK_DISPATCHER off, one dispatcher entry per event with it on), and the flag defaults to on only if bash scripts/test/run_all_tests.sh passes with the flag on and off.

Review lane: behavior
Safety invariant: If either suite run fails, the default stays off. Per-hook guarantees stay checked in the dispatcher layout.
Files: tests/test_install.py, tests/test_wrap_installed.py
Change types: test
Acceptance criteria: This workflow publishes one pull request for the install-layout claim only.

Exit code: 0
Invoker-Finalize-Id: f459f9c9-a623-4fd7-9708-21cc3ae4cbda
@EdbertChan
Merge experiment/wf-1791728053338-10/publish-both-layout-install-test…
0e6a50c 
…s/g0.t0.a-a464d403f-4908b6a4 — Review claim: tests.test_install and test_wrap_installed accept both install layouts (one entry per hook with CATSTACK_HOOK_DISPATCHER off, one dispatcher entry per event with it on), and the flag defaults to on only if bash scripts/test/run_all_tests.sh passes with the flag on and off.

Review lane: behavior
Safety invariant: If either suite run fails, the default stays off. Per-hook guarantees stay checked in the dispatcher layout.
Files: tests/test_install.py, tests/test_wrap_installed.py
Change types: test
Acceptance criteria: This workflow publishes one pull request for the install-layout claim only.
@EdbertChan @claude
Add an opt-in hook-payload recorder and a replay-equivalence harness
8001939 
Review claim:
- An opt-in payload recorder in the runner plus a replay script can
  feed recorded hook-event payloads through installed hook commands
  and produce a verdict-equivalence report (stdout/context/block/exit)
  per detector.
Review lane: behavior
Safety invariant:
- Recording is off unless CATSTACK_HOOK_PAYLOAD_DIR is set; when on it
  never alters hook stdin/stdout/exit and caps each payload (default
  256KB) and total dir (default 2000 files, oldest evicted).
- Replay runs against a scratch metrics/state dir, never live
  settings or the live runs.jsonl.
Goal:
- Runner: when env var set, append the raw stdin payload to
  $CATSTACK_HOOK_PAYLOAD_DIR/<payload_hash>-<hook>.json before spawning
  the hook child, where <payload_hash> is sha256(stdin)[:12].
- scripts/test/replay_hook_payloads.py: for each recorded payload, run
  the hook command under a scratch env, capture stdout/stderr/exit/
  findings; emit an equivalence report JSON + table comparing two
  command sets (fleet vs dispatcher args taken as parameters).
Motivation:
- The catastrophic regression risk of the dispatcher is a detector
  that silently stops speaking; the only credible gate is
  byte-identical verdicts on real payloads.

Cherry-picked from origin/plan/hook-fleet-dispatcher-measure-the-herd-then-dispatch-it
(e356e8c), scoped to only this claim's files. Dropped this slice's
dependency on the separate metrics-event-uid claim (17ef151, not on
this branch): the payload recorder computes its own local hash instead
of reusing a published `event_uid` metrics-row field, and the README
wording and test imports were adjusted to match.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Invoker Bot
invoker: wf-1791728212248-12/publish-replay — Review claim: An opt-in…
aa14b4f 
… payload recorder in the runner plus a replay script can feed recorded hook-event payloads through installed hook commands and produce a verdict-equivalence report per detector.

Review lane: behavior
Safety invariant: Hook stdout and exit codes stay the same. This slice does not change the other four claims.
Files: engine/hooks/_runner/run.py, scripts/test/replay_hook_payloads.py
Change types: bugfix
Acceptance criteria: The branch contains only this claim, and the review step publishes one pull request.

Exit code: 0
Invoker-Finalize-Id: 61e213a0-a6cd-4950-ba23-0acc17742997
@EdbertChan
Merge experiment/wf-1791728212248-12/publish-replay/g0.t0.a-a51426fd8…
b556594 
…-1bc38490 — Review claim: An opt-in payload recorder in the runner plus a replay script can feed recorded hook-event payloads through installed hook commands and produce a verdict-equivalence report per detector.

Review lane: behavior
Safety invariant: Hook stdout and exit codes stay the same. This slice does not change the other four claims.
Files: engine/hooks/_runner/run.py, scripts/test/replay_hook_payloads.py
Change types: bugfix
Acceptance criteria: The branch contains only this claim, and the review step publishes one pull request.
CI Bot
Fix replay hook payload lint
d63b1fc
CI Bot
invoker: wf-1791746491297-4/repair — Repair PR #1333 (failed check lint)
9787af8 
Exit code: 0
@EdbertChan @cursoragent CI Bot
Stop the same proof miss in Claude, Cursor, and Codex.
39dfc1d 
The checker only ran for Claude, so the other two editors could still end the turn.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: Ia24f6a11f6337ccc4310004e7a922bde00f250ff
CI Bot
invoker: wf-1791746852610-7/repair — Rebase PR #1323 onto main
4bf00fb 
Exit code: 0
@mergify @mergify-commit-signer
Merge of #1323
d10d4f7
@mergify @mergify-commit-signer
Merge of #1333
51e46b0
@mergify @mergify-commit-signer
Merge of #1332
cb73101
@mergify mergify Bot mentioned this pull request Oct 12, 2026
Merged
4 tasks done
@mergify mergify Bot closed this Oct 12, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/4452224c9b branch October 12, 2026 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@EdbertChan