Repository navigation
merge queue: checking #749 + #767 together on main (a1d9a5f), stacked on #728 and #752 - #776
Closed
mergify[bot] wants to merge 14 commits into
Closed
mergify[bot] wants to merge 14 commits into
mergify[bot] wants to merge 14 commits into
Conversation
Extract 11 app-settings Tauri commands from main.rs into settings_cmds.rs so preferences stay out of the command monolith. Names, signatures and JSON shapes are unchanged; generate_handler! still registers them. Test-First: scripts/ci/architecture-drift.test.mjs::contract: all 11 settings commands are properly moved to settings_cmds.rs and exported in main.rs Co-authored-by: Cursor <cursoragent@cursor.com>
No-Test: adds coverage for existing behaviour (R728-K1); red shown against a scratch copy without the strip No-Test: comment-only doc update for verdict_token_from_app (R728-K2) Co-authored-by: Cursor <cursoragent@cursor.com>
Park cleanup work after v1.6 and bind the AGENTS slim contract after DR-12. Preserve completed evidence and record the tester dry-run decision. No-Test: PLAN decisions and documentation contracts only Co-Authored-By: Codex GPT-6.1-Sol <noreply@openai.com>
Resolve the real main conflict while preserving DR-07 port contracts. Record Root-approved DR-16 cuts and five bounded independent reserve contracts. No-Test: documentation only Co-Authored-By: Codex <codex@openai.com>
Name each regression test and preserve the fixed Z2 table schema. No-Test: documentation only Co-Authored-By: Codex <codex@openai.com>
No-Test: documentation only (PLAN status sync)
Test-First: scripts/lib/dev-spec-close.test.mjs::SPEC-STATUS: unknown status refuses without write
Test-First: scripts/lib/dev-spec-close.test.mjs::SPEC-STATUS: unknown status refuses without write
No-Test: documentation only (PLAN status sync)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ Pull request #777 with higher priority has been queued. The pull requests [#749 + #767] have been requeued. ✨
#749 + #767 are queued together for merge on branch main (a1d9a5f).
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 #749 + #767.
Queued ahead of this batch:
This pull request has been created by Mergify to speculatively check the mergeability of [#749 + #767].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:check-success = gates (windows)main-pr-required-checks]:check-neutral = @github-actions/gates (windows)check-skipped = @github-actions/gates (windows)check-success = @github-actions/gates (windows)check-success = gates (linux)check-success = red-firstgithub-review-approved[🛡 GitHub repository ruleset rulemain-pr-required-checks]label != do-not-mergemain-pr-required-checks]:check-success = @github-actions/gates (linux)check-neutral = @github-actions/gates (linux)check-skipped = @github-actions/gates (linux)main-pr-required-checks]:check-success = @github-actions/red-firstcheck-neutral = @github-actions/red-firstcheck-skipped = @github-actions/red-firstmain-pr-required-checks]:check-neutral = @mergify/Mergify Merge Protectionscheck-skipped = @mergify/Mergify Merge Protectionscheck-success = @mergify/Mergify Merge ProtectionsRequired conditions to stay in the queue:
-conflict-draftbase = maincheck-success = gates (linux)check-success = gates (windows)check-success = red-firstgithub-review-approved[🛡 GitHub repository ruleset rulemain-pr-required-checks]label != do-not-mergelabel = review-okmain-pr-required-checks]:check-success = @github-actions/gates (linux)check-neutral = @github-actions/gates (linux)check-skipped = @github-actions/gates (linux)main-pr-required-checks]:check-success = @github-actions/gates (windows)check-neutral = @github-actions/gates (windows)check-skipped = @github-actions/gates (windows)main-pr-required-checks]:check-success = @github-actions/red-firstcheck-neutral = @github-actions/red-firstcheck-skipped = @github-actions/red-firstmain-pr-required-checks]:check-neutral = @mergify/Mergify Merge Protectionscheck-skipped = @mergify/Mergify Merge Protectionscheck-success = @mergify/Mergify Merge Protections