Skip to content

process: anti-conflict operating procedure and silent-CI signal - #1416

Merged
BigSimmo merged 16 commits into
mainfrom
cursor/process-anti-conflict-speed-1edf
Jul 30, 2026
Merged

process: anti-conflict operating procedure and silent-CI signal#1416
BigSimmo merged 16 commits into
mainfrom
cursor/process-anti-conflict-speed-1edf

Conversation

@BigSimmo

@BigSimmoBigSimmo commented Jul 30, 2026

Copy link
Copy Markdown
Owner

Summary

  • Codify a future-only anti-conflict / CI-speed operating procedure in AGENTS.md and docs/process-hardening.md.
  • Close #116: read-only pull_request_target workflow PR mergeability fails explicitly when mergeable_state is dirty (no branch updates).
  • Complete #112 follow-up after PR feat(gates): make an outstanding-issues id collision a red gate #1410: keep main’s stronger structural check:outstanding-issues gate; add merge=union on docs/outstanding-issues.md plus a runtime attribute check.
  • Synced with current main (resolved overlap with feat(gates): make an outstanding-issues id collision a red gate #1410). Dropped the duplicate weaker checker/test from the earlier tip.
  • CI fix: shrink the zip-bomb unit fixture from 24MB to 1MB so Unit coverage no longer times out under the 30s Vitest limit while still exceeding the 150:1 admission ratio.

Verification

  • git merge-tree --write-tree origin/main HEAD — clean (no conflicts)
  • npm run check:outstanding-issues
  • npm run check:pr-mergeability
  • npm run check:gate-manifest
  • npm run check:github-actions
  • npm run docs:check-scripts
  • npm run verify:pr-localTest Files 431 passed; Tests 4480 passed | 4 skipped; offline RAG fixtures 36/21; client-bundle scan passed
  • npx vitest run tests/upload-structure.test.ts — 15/15 passed (3 consecutive runs after zip-bomb fixture shrink)
  • UI verification not run: no UI/routing/styling changes

Risk and rollout

  • Risk: operational — adds a pull_request_target workflow and wires check:pr-mergeability into static gates; extends the existing outstanding-issues gate with a merge=union attribute check. Workflow checks out only github.workflow_sha, read-only permissions, no PR-head execution, no update-branch. Test fixture size change only; product compression-ratio gate unchanged at 150:1.
  • Rollback: revert this PR.
  • Provider or production effects: None. Does not sync or mutate unrelated open PRs.

Notes

  • Does not weaken flake policy, required checks, or clinical/RAG safeguards.
  • Archives #116; updates #112 archive note for the merge=union follow-up.
Open in WebOpen in Cursor

Add outstanding-issues ID/marker/union guards (#112), a read-only
pull_request_target mergeability signal for dirty heads (#116), and an
anti-conflict CI-speed operating procedure that prefers bundling and
format-before-push without weakening required gates or touching active PRs.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
@supabase

supabaseBot commented Jul 30, 2026

Copy link
Copy Markdown

This pull request has been ignored for the connected project sjrfecxgysukkwxsowpy because there are no changes detected in supabase directory. You can change this behaviour in Project Integrations Settings ↗︎.


Preview Branches by Supabase.
Learn more about Supabase Branching ↗︎.

@coderabbitai

coderabbitaiBot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

You’ve reached a temporary PR review limit under our Fair Usage Limits Policy.

Your recent review volume is higher than typical usage, so adaptive limits are currently applied.

Next review available in:3 minutes

Your organization has reached its usage spending cap. Adjust your spending cap in the billing tab.

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: cc953b57-9fde-4d26-884b-4450236607a5

📥 Commits

Reviewing files that changed from the base of the PR and between b1f5718 and 9f5c322.

📒 Files selected for processing (17)
  • .claude/skills/issues/SKILL.md
  • .gitattributes
  • .github/workflows/ci.yml
  • .github/workflows/pr-mergeability.yml
  • AGENTS.md
  • docs/branch-review-ledger.md
  • docs/outstanding-issues.md
  • docs/process-hardening.md
  • docs/scripts-index.md
  • package.json
  • scripts/branch-review-ledger.mjs
  • scripts/check-outstanding-issues.mjs
  • scripts/check-pr-mergeability-workflow.mjs
  • scripts/merge-branch-review-ledger.mjs
  • scripts/pr-mergeability.mjs
  • tests/repo-hygiene.test.ts
  • tests/upload-structure.test.ts
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch

Comment @coderabbitai help to get the list of available commands.

cursoragentand others added 5 commits July 30, 2026 06:02
Main advanced with #1410 overlapping the outstanding-issues gate; merge-tree
is conflicting. Unique value remains the anti-conflict playbook, #116 signal,
and merge=union.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
Keep main's stronger structural checker, add merge=union + runtime attribute
check, retain the #116 PR mergeability signal and anti-conflict playbook, and
drop the duplicate weaker checker/test that conflicted with #1410.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
Prettier realigns the archive table after the #116 close and #112 note update.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
Record the post-sync review: merge-tree clean, unique #116/process value kept,
duplicate #112 checker dropped in favor of #1410.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
@BigSimmo
BigSimmo marked this pull request as ready for review July 30, 2026 06:08
@BigSimmo
BigSimmo enabled auto-merge (squash) July 30, 2026 06:08
@BigSimmo
BigSimmo disabled auto-merge July 30, 2026 06:12

@chatgpt-codex-connectorchatgpt-codex-connectorBot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit:d1170649ee

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread.github/workflows/pr-mergeability.yml
@BigSimmo

Copy link
Copy Markdown
OwnerAuthor

@codex resolve actionable Codex review findings for this pull request and current head using the repository instructions. This is the pull request's single automatic repair pass: do not perform a fresh review, create new standalone findings, or request another review. Work only the existing unresolved Codex threads on the current head. Always fix P0 and P1 findings. For P2 and lower findings, fix only clear, scoped, low-risk issues; otherwise disposition them with a concise reason. After fixing or dispositioning a thread, reply in that thread with as the first line, followed by a concise summary; that marker authorizes the workflow to close that exact thread. If human input or new authorization is required, do not use the marker and leave the thread open with the blocker. Finish only after every actionable thread is fixed or dispositioned and closed, or explicitly left open for a human decision. Do not update the branch from main, address unrelated reviews, broaden scope, or create more than one scoped fix commit. Do not use external APIs, paid services, credentials, dependency changes, or broad refactors unless explicitly authorized. Add targeted tests where behavior changes and run the narrowest relevant validation.

@github-actions

github-actionsBot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

CI triage

CI failed on this PR. Automated classification of the 2 failed job(s):

  • Static PR checksneeds investigation: inspect the failing step and uploaded diagnostics; rerun only after classifying the cause.
  • PR requiredneeds investigation: inspect the failing step and uploaded diagnostics; rerun only after classifying the cause.

Compared with main CI run #6794 (success).

Classification is evidence routing, not permission to ignore a failure. Exact quarantined Playwright identities remain governed by the flake ledger.

Unit coverage failed because reject-high-compression-ratio allocated and
deflated 24MB of zeros under the 30s Vitest timeout. 1MB still exceeds the
150:1 admission ratio (~480:1) without the CI flake.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit:d1170649ee

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Bring in #1405 mode-nav fix; merge-tree was clean.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
@BigSimmo
BigSimmo enabled auto-merge (squash) July 30, 2026 06:25
@BigSimmo
BigSimmo disabled auto-merge July 30, 2026 06:37
@BigSimmo
BigSimmo merged commit 9d0a516 into mainJul 30, 2026
22 checks passed
@BigSimmo
BigSimmo deleted the cursor/process-anti-conflict-speed-1edf branch July 30, 2026 08:58
Sign up for freeto 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.

2 participants

@BigSimmo@cursoragent