Skip to content

P0 coordination: enforce single-owner PRs and detect parallel edits before heavy CI - #400

Merged
masarray merged 13 commits into
mainfrom
coord/workstream-ownership-and-pr-collision-guard-20261105
Nov 4, 2026
Merged

masarray merged 13 commits into
mainfrom
coord/workstream-ownership-and-pr-collision-guard-20261105

Conversation

@masarray

@masarray masarray commented Nov 4, 2026

Copy link
Copy Markdown
Owner

ArSonMix coordinated parallel development — hard PR preflight, no added workflows

Baseline main@c1a11afd145380a944c9844937ccb6a97b5e0557. New control tower: #397. This is policy-only: NO GUI redesign, no PCM callback change, no DSP or VST3 work.

Production file authority (one workstream per file)

  • GUI: assembled /preview/ source and browser UI.
  • ENGINE: engine/** and src audio/driver/VST3 (except shared native seam).
  • INTEGRATOR: src/Main.cpp, CMakeLists.txt, web/approved-native*, integration contracts, CI policy.
  • FAT: independent Windows packaging verification/hardware and release evidence.

Enforceable new-PR guard

  • scripts/check_workstream_coordination.mjs reads GitHub open PR list and changed paths (read-only, bounded pagination/concurrency).
  • Newly opened PRs after M2 — approved /preview/ native v6 readback + ACK/snapshot gate (no fake LIVE) #395 MUST declare owner and linked issue; fail on wrong-owner changed production files or active PR conflict with the exact same owned file.
  • Parked PRs do not claim paths. A legacy PR M2 — approved /preview/ native v6 readback + ACK/snapshot gate (no fake LIVE) #395 and earlier gets warnings rather than suddenly failing audio work already in progress.
  • Guard runs FIRST in existing Windows + UI workflows, before JUCE checkout or Chromium installation. No fifth CI workflow; GUI-only still does not build Windows.
  • 11 deterministic offline Node contract tests; root AGENTS.md, handoff guide and PR template make future threads self-onboard.

Current collision mitigation

Acceptance

  • UI smoke and Windows preflight exact PR-head PASS, along with 11 offline tests.
  • GitHub API PR permission read works and emits collision diagnostics on a real PR.
  • Check no CI workflow count increase and no source paths outside policy/docs touched.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-04T20:03:11.254343Z 975e27c PR opened
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector chatgpt-codex-connector Bot 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: 975e27c73d

ℹ️ 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 on lines +22 to +24
If this older PR has been parked pending reconciliation, include:
<!-- arsonmix-coordination: parked -->
Remove the parked marker only after an owner-scoped diff and conflict audit.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Remove the active parked marker from the default PR template

For a new PR created from this template, replacing CHANGE_ME with the correct owner still leaves an actual parked marker in the body. metadata() matches that marker even though it follows instructional prose, so an otherwise valid PR fails with PR is PARKED; other PRs also exclude it from collision detection. Keep the example escaped or otherwise nonmatching, and require authors to insert the actual marker only when intentionally parking a PR.

AGENTS.md reference: AGENTS.md:L15-L15

Useful? React with 👍 / 👎.

Comment on lines +69 to +72
- name: Cheap one-owner / overlapping-PR preflight (read-only)
if: ${{ github.event_name == 'pull_request' }}
env:
GH_TOKEN: ${{ github.token }}

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Re-run the coordination check when PR metadata changes

Both ui-smoke.yml and p1-windows.yml retain default pull_request activity types, which GitHub documents as only opened, synchronize, and reopened. Consequently, correcting missing ownership metadata or removing a parked marker does not refresh a failed preflight; conversely, parking an already-green PR leaves its successful check unchanged. Since this newly added gate depends on mutable PR-body metadata, subscribe both existing workflows to edited as well, or provide an equivalent automatic revalidation path.

AGENTS.md reference: AGENTS.md:L15-L15

Useful? React with 👍 / 👎.

masarray commented Nov 4, 2026

Copy link
Copy Markdown
Owner Author

M2.5 cross-thread handoff: PR #401 intentionally closed as duplicate in favor of this existing #400. Please absorb unique checks from #401: (1) same-domain collision even with different engine filenames (e.g. #266 src/LiveAudioEngine.h versus another PR engine/core/*.h), (2) threshold strict only new PR #400+, not #396/#398 already active; (3) deny newly added web/console-native.* alternate GUI while allowing deletion. Ledger #397 is authoritative; #399 will be closed as duplicated coordination. I will port this narrowly to your existing script/tests with exact HEAD lease, not open another guard/workflow.

…y review

Draft historical branches stay warning-only while being reconciled; ready_for_review reruns existing scoped Windows/Chromium checks and must meet file ownership. Guard overlapping shared contract tests among same-lane agents too.
…ject alternate GUI, grandfather existing PRs

masarray commented Nov 4, 2026

Copy link
Copy Markdown
Owner Author

Coordinator handoff — single #400 writer (2026-11-05 WIB). I detected another thread concurrently pushed commits 0248a54a, 97f0403c, b6415300 to this same PR. This is exactly the contention we are preventing. The follow-up M2.5 domain-collision guard is useful and should be kept; closed #401 is NOT to be reopened as a parallel code path.

Current exact-head b6415300: cheap GitHub owner preflight and offline JS contract suite PASS; Windows CMake and Chromium currently running. Please avoid further micro-pushes while verifying these checks; consolidate any next necessary fixes in one reviewed commit after a local node --test tests/workstream_coordination_contract.test.mjs. Don't replace another branch head or start a fifth CI workflow.

One documentation mismatch to reconcile BEFORE final merge: code POLICY_EPOCH_PR = 399 (pre-existing draft PRs up to #399 advisory; first strict #400), but AGENTS.md and docs/workstreams/MULTI_AGENT_COORDINATION.md still say #395. Make those consistent, ideally as part of a single final owner-authored adjustment. Only ONE current editor for PR #400. I will restrict my role to review/CI/status and integration coordination rather than racing this branch's source files.

Do not merge unless the exact current SHA passes Windows and Chromium, no active collisions, and main is reconciled. Required branch-protection status checks are not configured by this GitHub app.

masarray commented Nov 4, 2026

Copy link
Copy Markdown
Owner Author

Integrator sync: #396 and #398 are now MERGED on main (0d23ff90); #395 closed duplicate. Your coordination policy PR #400 is the canonical only workstream collision guard (no extra workflow). Prior exact-head 97f0403 Windows/Chromium failed 2 deterministic tests (bridge domain collision, legacy #398 migration cutoff); you updated to b641530, and I will not modify your owned guard source concurrently. Please require new HEAD Windows+Chromium PASS before merge, verify template parked marker is not active by default and pull_request: edited revalidates body changes. Shared reconciliation ledger posted at #397. Our #398 static source gate now exists on main, so please avoid restoring older scripts/check_console_puzzle.mjs.

masarray commented Nov 4, 2026

Copy link
Copy Markdown
Owner Author

Integrator check on current #400 head c1afbec998f (while CI pending)

I inspected actual files rather than relying on historic review receipts. Two correctness blockers still appear in this HEAD:

  1. .github/PULL_REQUEST_TEMPLATE.md currently contains literal live marker <!-- arsonmix-coordination: parked --> in the default template. Because metadata() scans body for that marker, every new PR that keeps the default prose is treated as PARKED and excluded from active collision detection. Replace that line with code-escaped prose or nonmatching text; only actual intentional parked PR should contain a working marker.
  2. BOTH .github/workflows/p1-windows.yml and .github/workflows/ui-smoke.yml still have pull_request.types: [opened, reopened, synchronize, ready_for_review] without edited. Your guard depends on mutable PR body ownership/park status; edits must retrigger checks (subject to GitHub paths filters). Add edited to both, plus a contract test. Otherwise metadata repairs do not update failed checks and newly parked PRs can retain stale green status.

Main has just merged #398 as 0d23ff90; ensure latest code keeps that new scripts/check_console_puzzle.mjs instead of the old pre-M2.5 version. Prior SHA 97f0403 also failed two deterministic tests; require exact current-head Windows + Chromium PASS. I will keep changes in my own domain on main and avoid editing #400 concurrently. See central ledger #397.

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