Skip to content

merge queue: checking #1314 + #1309 + #1333 + #1336 together on main (2745ccd) - #1350

Closed
mergify[bot] wants to merge 26 commits into
mainfrom
mergify/merge-queue/9be82ad79a
Closed

mergify[bot] wants to merge 26 commits into
mainfrom
mergify/merge-queue/9be82ad79a

Conversation

@mergify

@mergify mergify Bot commented Oct 12, 2026 •

Copy link
Copy Markdown
Contributor

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

#1314 + #1309 + #1333 + #1336 are queued together for merge on branch main (2745ccd).

This pull request has been created by Mergify to check the mergeability of [#1314 + #1309 + #1333 + #1336].
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 = lint
  • check-success = test
  • check-success = validate

Required conditions to stay in the queue:

---
all_scopes: false
checking_base_sha: 2745ccd013b1c98144040c344fe9de84c47d29dd
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 1314
    scopes: []
  - number: 1309
    scopes: []
  - number: 1333
    scopes: []
  - number: 1336
    scopes: []
scopes: []
...

EdbertChan and others added 26 commits October 8, 2026 06:55
Agents kept narrating by-model health and patching charts before splitting volume, fill, resolve, and filter — lock that check into standing defaults.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: I8efc336daf9878751865cf3c4bac4d55cd50733f
Phrase-judge rejected leads that named only the trigger phrase; state the split and the stop-first catch as the lesson, with the triggers as examples.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: I7dad9e54f9d280bb4d8f41ac06662293e39c9e05
…mple phrasing.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: Idebc0f0ba74e47864bf479446a8e27b0574cdcde
…lesson.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: Iaa84683fcf5a66e8f70a0dbf99ebcf19acc1d7a7
The dashboard-health defaults name that audit flag in backticks; the
skill-existence check must treat it as a process token, not a skill path.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: I1afa1d44a91d2886300ab5f17843b8e583dbda0c
Rule-scope rejected a lead that named automate-mandate mid thrash; keep
named flags only as examples after the same-type-catch rule.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: Ieedc8823a35a6be02d6b392d5c704f1b817d7ea1
Co-authored-by: Cursor <cursoragent@cursor.com>
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>
… 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
…-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.
The fleet self-saturates: one SubagentStop burst spawned 15-30 processes
that each re-parsed the same transcript, measured at 15.1s p50 wall idle
against 1.55s for a single process, with per-hook durations escalating in
launch order.

dispatch.py now runs opted-in detectors in-process, sequentially, parsing
the event once and passing the same parsed payload to every detector. A
hook opts in with subagent_stop.dispatch in its manifest, naming a
MODULE:FUNCTION entry point (default detect:detect). A detector with no
resolvable entry point still runs as a subprocess and its metrics row is
marked subprocess_fallback. Each detector keeps its own verdict, its own
runs.jsonl row under its own hook name, and its own rule_ids; a detector
that raises, exits, or overruns its 4s soft budget is caught and recorded
without stopping its siblings. The event budget defaults to 9s for
SubagentStop. mirror_stop_hooks_to_subagent_stop.py emits one dispatcher
entry for the opted-in hooks and leaves every other hook's direct entry
alone.

(cherry picked from commit 531f5c8 on
plan/hook-fleet-dispatcher-measure-the-herd-then-dispatch-it)
…op hooks dispatch through one process that parses the event once and shares one transcript parse across all opted-in detectors, emitting the same per-detector metrics rows and verdicts as the subprocess fleet.

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/dispatch.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: aaa80940-f2d5-4d79-bb40-79c68fe333ad
…e5bede34 — Review claim: SubagentStop hooks dispatch through one process that parses the event once and shares one transcript parse across all opted-in detectors, emitting the same per-detector metrics rows and verdicts as the subprocess fleet.

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/dispatch.py
Change types: bugfix
Acceptance criteria: The branch contains only this claim, and the review step publishes one pull request.
Subprocess isolation was the hook fleet's free safety property, so the
dispatcher has to prove it reproduced that property rather than assume
it.

_run_sdk_one caught a raising detector but left exit_code at 0, so
outcome.classify saw a zero exit with a catstack-hook-error stderr line
and recorded caught_error instead of crashed; the except branch now sets
exit code 1. Four chaos fixtures under engine/hooks/_runner/tests/chaos
(raise, sleep past the soft budget, exit 3, and a sibling that speaks)
drive a dispatcher test asserting each failure gets its own row with the
right outcome and exit code while both sibling detectors still emit
their verdicts and rows.

The fixtures are test-only: they live under tests/ and are registered in
a scratch manifest, so the mirror script's name allowlist can never
install them into a live settings.json.

(cherry picked from commit b57f27c on
plan/hook-fleet-dispatcher-measure-the-herd-then-dispatch-it)
…tectors that raise, hang past the soft budget, and exit non-zero each produce their own failure row while every sibling detector's verdict and row is still emitted.

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/tests/chaos
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: 7ca2543e-d062-46fa-bbce-58264f6ae48f
…02624463 — Review claim: Fixture detectors that raise, hang past the soft budget, and exit non-zero each produce their own failure row while every sibling detector's verdict and row is still emitted.

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/tests/chaos
Change types: bugfix
Acceptance criteria: The branch contains only this claim, and the review step publishes one pull request.
The SubagentStop dispatcher records an in-process exception as exit 0. This pull request records that same exception as a crashed row, so a sibling can still speak while the failure stays visible.

Co-authored-by: Cursor <cursoragent@cursor.com>
Change-Id: If063e8ba2ce12336b8a515be81a05bb1885d2ba9
@mergify mergify Bot closed this Oct 12, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/9be82ad79a branch October 12, 2026 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant