From c2aa573bd72c1de9b98f449ed9aa0ffd7e5379c2 Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 15:47:16 -0700 Subject: [PATCH 1/2] Revert "Merge pull request #631 from AgentWorkforce/trunk" This reverts commit abf01b9550f3adf62addc20cff2d0c81b037e18f, reversing changes made to 3664c2fff93cf21bdf693e4e1afbb5912a8194ca. --- AGENTS.md | 40 ---------------------------------------- prpm.lock | 24 ------------------------ 2 files changed, 64 deletions(-) delete mode 100644 prpm.lock diff --git a/AGENTS.md b/AGENTS.md index d44e8c7e8..33fc0a99f 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -109,43 +109,3 @@ Therefore: The code being right does not rescue a report that is wrong. A reviewer can only judge what it can check. - - -## Merging: `trunk` + the `mergeable` label - -CI does **not** run on feature branches. It runs only on the `trunk` → `main` -pull request and on pushes to `main`. (Repos whose default branch is not -`main`, e.g. `master`, use that branch wherever this says `main`.) A merge -agent batches ready PRs into `trunk`, gets that one PR green, and merges it. - -**When you open a PR** -1. Branch from `trunk` and open the PR with **base `trunk`**, not `main`. - A PR into `main` from any other branch fails the `Trunk guard` check. -2. No CI runs on your PR, so verify locally before calling it ready: run the - typecheck, tests and lint this repo uses, and list the exact commands and - results in the PR body. - -**When the PR is ready** -3. Add the label **`mergeable`** once all of these are true: - - The change is complete and the local checks above pass. - - Review feedback (human and bot) is addressed or answered. - - It is not a draft and does not depend on an unmerged PR. -4. Remove `mergeable` if the PR stops being ready (new work, a failing check, a - blocking question). The label is read live from GitHub on every sweep. - -**What you must not do** -- Do not merge your own PR, and never merge into or push to `trunk` or `main` - directly. -- Do not re-enable CI for feature branches or edit the `trunk` gates in - `.github/workflows/`. - -**The merge agent** sweeps open `mergeable` PRs with base `trunk` about every -10 minutes. It reads each PR's linked sessions (the `Agent Relay sessions` -block in the PR body, then the session summary) for context, merges them into -`trunk`, opens or updates the `trunk` → `main` PR, fixes CI there, merges when -green, and posts a summary. If your PR conflicts with `trunk`, it may ask you -to rebase on `trunk`; do so and keep the label. - -> Interim: the sweep worker is not deployed yet. Until it is, a human or a -> designated agent performs the merge-agent steps manually. Labelling is unchanged. - diff --git a/prpm.lock b/prpm.lock deleted file mode 100644 index 0782903d6..000000000 --- a/prpm.lock +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.0", - "lockfileVersion": 1, - "packages": { - "@agent-relay/merge-train-snippet#agents.md:AGENTS.md": { - "version": "1.0.0", - "resolved": "https://registry.prpm.dev/api/v1/packages/%40agent-relay%2Fmerge-train-snippet/1.0.0.tar.gz", - "integrity": "sha256-a85e34747a332452ab6d8d7f814c828d404a3a77dd724f16878d26b91fb7d5bb", - "format": "agents.md", - "subtype": "snippet", - "sourceFormat": "generic", - "sourceSubtype": "snippet", - "installedPath": "AGENTS.md", - "snippetMetadata": { - "targetPath": "AGENTS.md", - "config": { - "target": "AGENTS.md", - "position": "append" - } - } - } - }, - "generated": "2026-10-08T22:29:27.849Z" -} \ No newline at end of file From 4cdc2662307620a87fca06ffbdb6a8942985de22 Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 15:47:17 -0700 Subject: [PATCH 2/2] Revert "Merge pull request #630 from AgentWorkforce/trunk" This reverts commit 3664c2fff93cf21bdf693e4e1afbb5912a8194ca, reversing changes made to bdeef16a2908dee28e5d91341d541678a92f2624. --- .github/workflows/cloud-runtime-artifact.yml | 1 - .../workflows/review-swarm-wrapper-guard.yml | 1 - .github/workflows/review-swarm.yml | 1 - .github/workflows/schema-publish.yml | 9 ++------- .github/workflows/surface-package.yml | 1 - .github/workflows/trunk-guard.yml | 17 ----------------- 6 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/trunk-guard.yml diff --git a/.github/workflows/cloud-runtime-artifact.yml b/.github/workflows/cloud-runtime-artifact.yml index 94421f34d..2235d25db 100644 --- a/.github/workflows/cloud-runtime-artifact.yml +++ b/.github/workflows/cloud-runtime-artifact.yml @@ -40,7 +40,6 @@ permissions: jobs: linux-x64-artifact: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-24.04 timeout-minutes: 30 steps: diff --git a/.github/workflows/review-swarm-wrapper-guard.yml b/.github/workflows/review-swarm-wrapper-guard.yml index 64d7d8de3..6904f6b46 100644 --- a/.github/workflows/review-swarm-wrapper-guard.yml +++ b/.github/workflows/review-swarm-wrapper-guard.yml @@ -10,7 +10,6 @@ permissions: jobs: guard: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-latest steps: # pull_request_target always reads this workflow and script from the PR diff --git a/.github/workflows/review-swarm.yml b/.github/workflows/review-swarm.yml index ff870d281..d5655263f 100644 --- a/.github/workflows/review-swarm.yml +++ b/.github/workflows/review-swarm.yml @@ -14,7 +14,6 @@ concurrency: jobs: review: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-latest # Ordering invariant: swarm 60m < poll 65m < job 75m. timeout-minutes: 75 diff --git a/.github/workflows/schema-publish.yml b/.github/workflows/schema-publish.yml index 26ed587c5..7446010b8 100644 --- a/.github/workflows/schema-publish.yml +++ b/.github/workflows/schema-publish.yml @@ -27,7 +27,6 @@ concurrency: jobs: validate: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-24.04 timeout-minutes: 10 outputs: @@ -82,9 +81,7 @@ jobs: if-no-files-found: error npm: - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && - (github.event_name != 'pull_request') + if: github.event_name != 'pull_request' needs: validate runs-on: ubuntu-24.04 timeout-minutes: 5 @@ -104,9 +101,7 @@ jobs: run: npm publish "release/relayflows-schema-${RELEASE_VERSION}.tgz" --access public --ignore-scripts pages: - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && - (github.event_name != 'pull_request') + if: github.event_name != 'pull_request' needs: [validate, npm] runs-on: ubuntu-24.04 timeout-minutes: 10 diff --git a/.github/workflows/surface-package.yml b/.github/workflows/surface-package.yml index 1e95506d9..000f3dbbb 100644 --- a/.github/workflows/surface-package.yml +++ b/.github/workflows/surface-package.yml @@ -24,7 +24,6 @@ permissions: jobs: packed-consumer: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-24.04 timeout-minutes: 15 steps: diff --git a/.github/workflows/trunk-guard.yml b/.github/workflows/trunk-guard.yml deleted file mode 100644 index 2ddb49758..000000000 --- a/.github/workflows/trunk-guard.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Trunk guard - -# Only the `trunk` branch may merge into main. Feature branches merge into -# `trunk` (via the merge train); CI runs only on the trunk -> main PR. -on: - pull_request: - branches: [main] - -jobs: - only-trunk-merges-to-main: - if: github.head_ref != 'trunk' - runs-on: ubuntu-latest - timeout-minutes: 1 - steps: - - run: | - echo "::error::Only the 'trunk' branch may merge into main. Retarget this PR to 'trunk'." - exit 1