From 649a3c91004e4f3056fc10c7ad51d99f5ba5c8fd Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 15:03:48 -0700 Subject: [PATCH 1/5] ci: run CI only for trunk PRs and main pushes Feature branches no longer run CI. Jobs triggered by pull_request(_target) run only when the head branch is `trunk`; push triggers are limited to main (release/env/tag pushes unchanged). trunk-guard.yml flags any PR into main that does not come from `trunk`. --- .github/workflows/cancel-on-merge.yml | 4 ++- .github/workflows/codegen-models.yml | 4 +-- .github/workflows/e2e-tests.yml | 1 + .github/workflows/fleet-e2e.yml | 3 ++- .github/workflows/large-files.yml | 1 + .github/workflows/node-compat.yml | 9 +++++-- .github/workflows/package-validation.yml | 14 +++++++---- .github/workflows/prettier-fmt-fix.yml | 4 ++- .github/workflows/relay-evals.yml | 1 + .../workflows/relayflow-pr-proof-broker.yml | 4 +-- .github/workflows/rust-ci.yml | 25 ++++++++++++++----- .github/workflows/rust-fmt-fix.yml | 4 ++- .github/workflows/security.yml | 18 ++++++++++--- .github/workflows/stress-tests.yml | 6 ++++- .../targeted-feature-verification.yml | 2 ++ .github/workflows/test-build.yml | 7 +++++- .github/workflows/test-install.yml | 10 +++++++- .github/workflows/test.yml | 21 ++++++++++++---- .github/workflows/trunk-guard.yml | 17 +++++++++++++ 19 files changed, 122 insertions(+), 33 deletions(-) create mode 100644 .github/workflows/trunk-guard.yml diff --git a/.github/workflows/cancel-on-merge.yml b/.github/workflows/cancel-on-merge.yml index a18c65315a..592ab6cad5 100644 --- a/.github/workflows/cancel-on-merge.yml +++ b/.github/workflows/cancel-on-merge.yml @@ -6,7 +6,9 @@ on: jobs: cancel: - if: github.event.pull_request.merged == true + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (github.event.pull_request.merged == true) runs-on: ubuntu-latest steps: - name: Cancel running workflows for this PR diff --git a/.github/workflows/codegen-models.yml b/.github/workflows/codegen-models.yml index b8c27c4672..4261bb366e 100644 --- a/.github/workflows/codegen-models.yml +++ b/.github/workflows/codegen-models.yml @@ -5,14 +5,14 @@ on: paths: - 'packages/utils/cli-registry.yaml' branches: - - main - - 'feature/**' + [main] pull_request: paths: - 'packages/utils/cli-registry.yaml' jobs: codegen: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 188accab94..a6b6842589 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -35,6 +35,7 @@ env: jobs: e2e-test: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: E2E Integration Test runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/fleet-e2e.yml b/.github/workflows/fleet-e2e.yml index 21e7221a36..df4f591cd1 100644 --- a/.github/workflows/fleet-e2e.yml +++ b/.github/workflows/fleet-e2e.yml @@ -15,7 +15,7 @@ name: Fleet E2E # only run after something reaches main). Update to `[main]` once the stack lands. on: push: - branches: [main, 'feat/fleet-**'] + branches: [main] paths: - 'packages/fleet/**' - 'packages/cli/**' @@ -54,6 +54,7 @@ env: jobs: fleet-e2e: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Two-node fleet matrix runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/large-files.yml b/.github/workflows/large-files.yml index ee6e2afb01..b4e35abb9d 100644 --- a/.github/workflows/large-files.yml +++ b/.github/workflows/large-files.yml @@ -2,6 +2,7 @@ name: Large File Check on: [pull_request] jobs: check: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/node-compat.yml b/.github/workflows/node-compat.yml index 4bc54e16c7..b49a24880c 100644 --- a/.github/workflows/node-compat.yml +++ b/.github/workflows/node-compat.yml @@ -18,11 +18,14 @@ concurrency: jobs: changes: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' uses: ./.github/workflows/detect-changes.yml install-test: name: Install Test (Node ${{ matrix.node-version }}) needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest strategy: matrix: @@ -83,7 +86,9 @@ jobs: fresh-install: name: Fresh Install (Node ${{ matrix.node-version }}) needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/package-validation.yml b/.github/workflows/package-validation.yml index 71fb731758..1e7a9adf14 100644 --- a/.github/workflows/package-validation.yml +++ b/.github/workflows/package-validation.yml @@ -21,11 +21,14 @@ env: jobs: changes: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' uses: ./.github/workflows/detect-changes.yml validate: name: Build & Validate needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest env: NPM_CONFIG_FUND: false @@ -199,7 +202,9 @@ jobs: publish-fresh-install-build: name: Publish Fresh Install Build needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest env: NPM_CONFIG_FUND: false @@ -248,9 +253,8 @@ jobs: # provisioning an undeletable workspace; other same-repository PRs and # main pushes must reuse the CI workspace. if: >- - needs.changes.outputs.node_changed == 'true' && - github.actor != 'dependabot[bot]' && - (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true' && github.actor != 'dependabot[bot]' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)) runs-on: macos-latest env: NPM_CONFIG_FUND: false diff --git a/.github/workflows/prettier-fmt-fix.yml b/.github/workflows/prettier-fmt-fix.yml index 4f85827b3c..763587d187 100644 --- a/.github/workflows/prettier-fmt-fix.yml +++ b/.github/workflows/prettier-fmt-fix.yml @@ -38,7 +38,9 @@ jobs: name: Auto-format Prettier files runs-on: ubuntu-latest # Only run on same-repo PRs where the bot can push back formatting commits. - if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) permissions: contents: write steps: diff --git a/.github/workflows/relay-evals.yml b/.github/workflows/relay-evals.yml index dc3ea0f592..48066368a4 100644 --- a/.github/workflows/relay-evals.yml +++ b/.github/workflows/relay-evals.yml @@ -38,6 +38,7 @@ env: jobs: evals: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Offline evals runs-on: ubuntu-latest diff --git a/.github/workflows/relayflow-pr-proof-broker.yml b/.github/workflows/relayflow-pr-proof-broker.yml index 6c152d9baa..d90146aa95 100644 --- a/.github/workflows/relayflow-pr-proof-broker.yml +++ b/.github/workflows/relayflow-pr-proof-broker.yml @@ -31,8 +31,8 @@ jobs: build: name: ${{ github.event_name == 'pull_request' && 'Validate PR-head Linux broker' || 'Build exact Linux broker' }} if: >- - github.event_name != 'pull_request_target' || - github.event.pull_request.head.repo.full_name == github.repository + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (github.event_name != 'pull_request_target' || github.event.pull_request.head.repo.full_name == github.repository) runs-on: ubuntu-latest timeout-minutes: 30 steps: diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index bf8833d3e9..662b275a7b 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -17,12 +17,15 @@ env: jobs: changes: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' uses: ./.github/workflows/detect-changes.yml rust-test: name: Rust Tests (${{ matrix.os }}) needs: changes - if: needs.changes.outputs.rust_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -42,7 +45,9 @@ jobs: relay-pty-windows-test: name: Relay PTY Synchronization Tests (windows-latest) needs: changes - if: needs.changes.outputs.rust_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.rust_changed == 'true') runs-on: windows-latest timeout-minutes: 10 steps: @@ -62,7 +67,9 @@ jobs: rust-cross-compile: name: Cross-compile check (${{ matrix.target }}) needs: changes - if: needs.changes.outputs.rust_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -96,7 +103,9 @@ jobs: rust-clippy: name: Clippy (${{ matrix.os }}) needs: changes - if: needs.changes.outputs.rust_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -115,7 +124,9 @@ jobs: rust-fmt: name: Format needs: changes - if: needs.changes.outputs.rust_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.rust_changed == 'true') runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -127,7 +138,9 @@ jobs: sdk-check: name: SDK TypeScript Check needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/rust-fmt-fix.yml b/.github/workflows/rust-fmt-fix.yml index 70472298f0..614ecc44a6 100644 --- a/.github/workflows/rust-fmt-fix.yml +++ b/.github/workflows/rust-fmt-fix.yml @@ -20,7 +20,9 @@ jobs: name: Auto-format Rust code runs-on: ubuntu-latest # Only run on same-repo PRs where the bot can push back formatting commits. - if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) permissions: contents: write steps: diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 13e4df2794..083b90b5cd 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -21,13 +21,16 @@ concurrency: jobs: changes: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' uses: ./.github/workflows/detect-changes.yml # NPM audit for known vulnerabilities npm-audit: name: NPM Audit needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: @@ -57,7 +60,9 @@ jobs: dependency-review: name: Dependency Review runs-on: ubuntu-latest - if: github.event_name == 'pull_request' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (github.event_name == 'pull_request') # This job requires the dependency graph to be enabled in repo settings # Make it non-blocking until that's configured continue-on-error: true @@ -77,7 +82,9 @@ jobs: codeql: name: CodeQL Analysis needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest permissions: security-events: write @@ -104,6 +111,7 @@ jobs: # Secret scanning (check for accidentally committed secrets) secrets-scan: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Secret Scanning runs-on: ubuntu-latest # Make non-blocking - review findings manually @@ -135,7 +143,9 @@ jobs: license-check: name: License Compliance needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml index 323dbbf0a2..035fe1c114 100644 --- a/.github/workflows/stress-tests.yml +++ b/.github/workflows/stress-tests.yml @@ -29,6 +29,7 @@ concurrency: jobs: stress-test-orchestrator: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Orchestrator Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -78,6 +79,7 @@ jobs: fi stress-test-orchestrator-integration: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Orchestrator Integration Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -161,7 +163,9 @@ jobs: name: Stress Test Summary needs: [stress-test-orchestrator, stress-test-orchestrator-integration] runs-on: ubuntu-latest - if: always() + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (always()) steps: - name: Download all artifacts diff --git a/.github/workflows/targeted-feature-verification.yml b/.github/workflows/targeted-feature-verification.yml index 3e9fc7f724..52aa4f1026 100644 --- a/.github/workflows/targeted-feature-verification.yml +++ b/.github/workflows/targeted-feature-verification.yml @@ -35,6 +35,7 @@ concurrency: jobs: select: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Select Flows v2 shards runs-on: ubuntu-24.04 timeout-minutes: 15 @@ -93,6 +94,7 @@ jobs: retention-days: 14 targeted: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Flows v2 shard ${{ matrix.shard }} needs: select runs-on: ubuntu-24.04 diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index abc1a1918f..19ea0e52a7 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -2,6 +2,7 @@ name: Test Build Scripts on: push: + branches: [main] paths: - 'scripts/build-bun.sh' - 'scripts/sign-macos-binary.sh' @@ -20,6 +21,7 @@ env: jobs: test-build-script: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Test build-bun.sh runs-on: ${{ matrix.os }} strategy: @@ -107,6 +109,7 @@ jobs: done test-build-edge-cases: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Test edge cases runs-on: ubuntu-latest @@ -154,7 +157,9 @@ jobs: name: Summary needs: [test-build-script, test-build-edge-cases] runs-on: ubuntu-latest - if: always() + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (always()) steps: - name: Summary diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 0e5a2b065a..de387c77df 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -2,6 +2,7 @@ name: Test Install Script on: push: + branches: [main] paths: - 'install.sh' - 'install.test.sh' @@ -25,6 +26,7 @@ env: jobs: test-install: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Test on ${{ matrix.os }} (${{ matrix.node }}) runs-on: ${{ matrix.os }} strategy: @@ -181,6 +183,7 @@ jobs: # Test fallback when gunzip is not available test-no-gunzip: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Test without gunzip runs-on: ubuntu-latest @@ -225,6 +228,7 @@ jobs: ' test-install-alpine: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Test on Alpine Linux runs-on: ubuntu-latest @@ -264,6 +268,7 @@ jobs: ' test-install-fedora: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Test on Fedora runs-on: ubuntu-latest @@ -299,6 +304,7 @@ jobs: # Test script syntax and edge cases test-script-quality: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' name: Script Quality Checks runs-on: ubuntu-latest @@ -345,7 +351,9 @@ jobs: name: Test Summary needs: [test-install, test-install-alpine, test-install-fedora, test-no-gunzip, test-script-quality] runs-on: ubuntu-latest - if: always() + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (always()) steps: - name: Summary diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 88db5acb99..3ec1dda0cf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,11 +21,14 @@ env: jobs: changes: + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' uses: ./.github/workflows/detect-changes.yml test: needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ${{ matrix.os }} strategy: matrix: @@ -61,7 +64,9 @@ jobs: windows-credential-acl: name: Windows credential ACL validation needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: windows-latest steps: - name: Checkout repository @@ -92,7 +97,9 @@ jobs: coverage: name: Coverage (upload) needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: - name: Checkout repository @@ -120,7 +127,9 @@ jobs: lint: needs: changes - if: needs.changes.outputs.node_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: - name: Checkout repository @@ -147,7 +156,9 @@ jobs: swift-test: name: Swift SDK Tests needs: changes - if: needs.changes.outputs.sdk_swift_changed == 'true' + if: >- + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + (needs.changes.outputs.sdk_swift_changed == 'true') runs-on: macos-latest defaults: run: diff --git a/.github/workflows/trunk-guard.yml b/.github/workflows/trunk-guard.yml new file mode 100644 index 0000000000..2ddb49758d --- /dev/null +++ b/.github/workflows/trunk-guard.yml @@ -0,0 +1,17 @@ +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 From d9a9f899bef48936686f46354b4921474a516632 Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 15:45:33 -0700 Subject: [PATCH 2/5] docs(agents): install @agent-relay/merge-train-snippet Feature PRs target trunk, verify locally, and get the `mergeable` label when ready; the merge agent promotes trunk -> main. --- AGENTS.md | 40 ++++++++++++++++++++++++++++++++++++++++ prpm.lock | 19 ++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index 032295138b..e7c795e817 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -313,3 +313,43 @@ Your trajectory helps others understand: Future agents can query past trajectories to learn from your decisions. + + +## 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 index cc6e826700..948135dc30 100644 --- a/prpm.lock +++ b/prpm.lock @@ -275,7 +275,24 @@ "sourceFormat": "claude", "sourceSubtype": "skill", "installedPath": ".agents/skills/writing-relayflows/SKILL.md" + }, + "@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-09-19T01:05:52.716Z" + "generated": "2026-10-08T22:45:33.057Z" } \ No newline at end of file From 9024ae34e5f405da530005f8814d041fee7f0077 Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 16:03:22 -0700 Subject: [PATCH 3/5] ci: harden trunk gating - CI gates also require the head repo to be this repository and the base to be main (a fork branch named trunk, or trunk into another branch, no longer runs CI). - Trunk guard runs via pull_request_target (loaded from the base branch, so a PR cannot edit it to pass), re-runs on base edits, and checks head repo. - Workflows that only react to a PR closing are no longer gated. --- .github/workflows/cancel-on-merge.yml | 4 +--- .github/workflows/codegen-models.yml | 2 +- .github/workflows/e2e-tests.yml | 2 +- .github/workflows/fleet-e2e.yml | 2 +- .github/workflows/large-files.yml | 2 +- .github/workflows/node-compat.yml | 6 +++--- .github/workflows/package-validation.yml | 8 ++++---- .github/workflows/prettier-fmt-fix.yml | 2 +- .github/workflows/relay-evals.yml | 2 +- .github/workflows/relayflow-pr-proof-broker.yml | 2 +- .github/workflows/rust-ci.yml | 14 +++++++------- .github/workflows/rust-fmt-fix.yml | 2 +- .github/workflows/security.yml | 12 ++++++------ .github/workflows/stress-tests.yml | 6 +++--- .../workflows/targeted-feature-verification.yml | 4 ++-- .github/workflows/test-build.yml | 6 +++--- .github/workflows/test-install.yml | 12 ++++++------ .github/workflows/test.yml | 12 ++++++------ .github/workflows/trunk-guard.yml | 15 ++++++++++----- 19 files changed, 59 insertions(+), 56 deletions(-) diff --git a/.github/workflows/cancel-on-merge.yml b/.github/workflows/cancel-on-merge.yml index 592ab6cad5..a18c65315a 100644 --- a/.github/workflows/cancel-on-merge.yml +++ b/.github/workflows/cancel-on-merge.yml @@ -6,9 +6,7 @@ on: jobs: cancel: - if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && - (github.event.pull_request.merged == true) + if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: - name: Cancel running workflows for this PR diff --git a/.github/workflows/codegen-models.yml b/.github/workflows/codegen-models.yml index 4261bb366e..72f21434cb 100644 --- a/.github/workflows/codegen-models.yml +++ b/.github/workflows/codegen-models.yml @@ -12,7 +12,7 @@ on: jobs: codegen: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index a6b6842589..6adfe08250 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -35,7 +35,7 @@ env: jobs: e2e-test: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: E2E Integration Test runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/fleet-e2e.yml b/.github/workflows/fleet-e2e.yml index df4f591cd1..54e08bcd62 100644 --- a/.github/workflows/fleet-e2e.yml +++ b/.github/workflows/fleet-e2e.yml @@ -54,7 +54,7 @@ env: jobs: fleet-e2e: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Two-node fleet matrix runs-on: ubuntu-latest timeout-minutes: 20 diff --git a/.github/workflows/large-files.yml b/.github/workflows/large-files.yml index b4e35abb9d..306839141b 100644 --- a/.github/workflows/large-files.yml +++ b/.github/workflows/large-files.yml @@ -2,7 +2,7 @@ name: Large File Check on: [pull_request] jobs: check: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/node-compat.yml b/.github/workflows/node-compat.yml index b49a24880c..cf365c1f21 100644 --- a/.github/workflows/node-compat.yml +++ b/.github/workflows/node-compat.yml @@ -18,13 +18,13 @@ concurrency: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml install-test: name: Install Test (Node ${{ matrix.node-version }}) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest strategy: @@ -87,7 +87,7 @@ jobs: name: Fresh Install (Node ${{ matrix.node-version }}) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/package-validation.yml b/.github/workflows/package-validation.yml index 1e7a9adf14..48f2414850 100644 --- a/.github/workflows/package-validation.yml +++ b/.github/workflows/package-validation.yml @@ -21,13 +21,13 @@ env: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml validate: name: Build & Validate needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest env: @@ -203,7 +203,7 @@ jobs: name: Publish Fresh Install Build needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest env: @@ -253,7 +253,7 @@ jobs: # provisioning an undeletable workspace; other same-repository PRs and # main pushes must reuse the CI workspace. if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true' && github.actor != 'dependabot[bot]' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)) runs-on: macos-latest env: diff --git a/.github/workflows/prettier-fmt-fix.yml b/.github/workflows/prettier-fmt-fix.yml index 763587d187..baa274e8ec 100644 --- a/.github/workflows/prettier-fmt-fix.yml +++ b/.github/workflows/prettier-fmt-fix.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest # Only run on same-repo PRs where the bot can push back formatting commits. if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) permissions: contents: write diff --git a/.github/workflows/relay-evals.yml b/.github/workflows/relay-evals.yml index 48066368a4..c646a2d136 100644 --- a/.github/workflows/relay-evals.yml +++ b/.github/workflows/relay-evals.yml @@ -38,7 +38,7 @@ env: jobs: evals: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Offline evals runs-on: ubuntu-latest diff --git a/.github/workflows/relayflow-pr-proof-broker.yml b/.github/workflows/relayflow-pr-proof-broker.yml index d90146aa95..3b3000b6e8 100644 --- a/.github/workflows/relayflow-pr-proof-broker.yml +++ b/.github/workflows/relayflow-pr-proof-broker.yml @@ -31,7 +31,7 @@ jobs: build: name: ${{ github.event_name == 'pull_request' && 'Validate PR-head Linux broker' || 'Build exact Linux broker' }} if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (github.event_name != 'pull_request_target' || github.event.pull_request.head.repo.full_name == github.repository) runs-on: ubuntu-latest timeout-minutes: 30 diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index 662b275a7b..21eb358cf3 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -17,14 +17,14 @@ env: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml rust-test: name: Rust Tests (${{ matrix.os }}) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -46,7 +46,7 @@ jobs: name: Relay PTY Synchronization Tests (windows-latest) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.rust_changed == 'true') runs-on: windows-latest timeout-minutes: 10 @@ -68,7 +68,7 @@ jobs: name: Cross-compile check (${{ matrix.target }}) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -104,7 +104,7 @@ jobs: name: Clippy (${{ matrix.os }}) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.rust_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -125,7 +125,7 @@ jobs: name: Format needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.rust_changed == 'true') runs-on: ubuntu-latest steps: @@ -139,7 +139,7 @@ jobs: name: SDK TypeScript Check needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: diff --git a/.github/workflows/rust-fmt-fix.yml b/.github/workflows/rust-fmt-fix.yml index 614ecc44a6..1df1a6ab78 100644 --- a/.github/workflows/rust-fmt-fix.yml +++ b/.github/workflows/rust-fmt-fix.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest # Only run on same-repo PRs where the bot can push back formatting commits. if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) permissions: contents: write diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 083b90b5cd..89d55e1c7c 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -21,7 +21,7 @@ concurrency: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml # NPM audit for known vulnerabilities @@ -29,7 +29,7 @@ jobs: name: NPM Audit needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest @@ -61,7 +61,7 @@ jobs: name: Dependency Review runs-on: ubuntu-latest if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (github.event_name == 'pull_request') # This job requires the dependency graph to be enabled in repo settings # Make it non-blocking until that's configured @@ -83,7 +83,7 @@ jobs: name: CodeQL Analysis needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest permissions: @@ -111,7 +111,7 @@ jobs: # Secret scanning (check for accidentally committed secrets) secrets-scan: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Secret Scanning runs-on: ubuntu-latest # Make non-blocking - review findings manually @@ -144,7 +144,7 @@ jobs: name: License Compliance needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml index 035fe1c114..ccaaa351d1 100644 --- a/.github/workflows/stress-tests.yml +++ b/.github/workflows/stress-tests.yml @@ -29,7 +29,7 @@ concurrency: jobs: stress-test-orchestrator: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Orchestrator Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -79,7 +79,7 @@ jobs: fi stress-test-orchestrator-integration: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Orchestrator Integration Stress Tests runs-on: ${{ matrix.os }} strategy: @@ -164,7 +164,7 @@ jobs: needs: [stress-test-orchestrator, stress-test-orchestrator-integration] runs-on: ubuntu-latest if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (always()) steps: diff --git a/.github/workflows/targeted-feature-verification.yml b/.github/workflows/targeted-feature-verification.yml index 52aa4f1026..429a8d8489 100644 --- a/.github/workflows/targeted-feature-verification.yml +++ b/.github/workflows/targeted-feature-verification.yml @@ -35,7 +35,7 @@ concurrency: jobs: select: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Select Flows v2 shards runs-on: ubuntu-24.04 timeout-minutes: 15 @@ -94,7 +94,7 @@ jobs: retention-days: 14 targeted: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Flows v2 shard ${{ matrix.shard }} needs: select runs-on: ubuntu-24.04 diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml index 19ea0e52a7..4a15760e00 100644 --- a/.github/workflows/test-build.yml +++ b/.github/workflows/test-build.yml @@ -21,7 +21,7 @@ env: jobs: test-build-script: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test build-bun.sh runs-on: ${{ matrix.os }} strategy: @@ -109,7 +109,7 @@ jobs: done test-build-edge-cases: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test edge cases runs-on: ubuntu-latest @@ -158,7 +158,7 @@ jobs: needs: [test-build-script, test-build-edge-cases] runs-on: ubuntu-latest if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (always()) steps: diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index de387c77df..47ab6edb4a 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -26,7 +26,7 @@ env: jobs: test-install: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test on ${{ matrix.os }} (${{ matrix.node }}) runs-on: ${{ matrix.os }} strategy: @@ -183,7 +183,7 @@ jobs: # Test fallback when gunzip is not available test-no-gunzip: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test without gunzip runs-on: ubuntu-latest @@ -228,7 +228,7 @@ jobs: ' test-install-alpine: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test on Alpine Linux runs-on: ubuntu-latest @@ -268,7 +268,7 @@ jobs: ' test-install-fedora: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Test on Fedora runs-on: ubuntu-latest @@ -304,7 +304,7 @@ jobs: # Test script syntax and edge cases test-script-quality: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') name: Script Quality Checks runs-on: ubuntu-latest @@ -352,7 +352,7 @@ jobs: needs: [test-install, test-install-alpine, test-install-fedora, test-no-gunzip, test-script-quality] runs-on: ubuntu-latest if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (always()) steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ec1dda0cf..785c27a46b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,13 +21,13 @@ env: jobs: changes: - if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk' + if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main') uses: ./.github/workflows/detect-changes.yml test: needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ${{ matrix.os }} strategy: @@ -65,7 +65,7 @@ jobs: name: Windows credential ACL validation needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: windows-latest steps: @@ -98,7 +98,7 @@ jobs: name: Coverage (upload) needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: @@ -128,7 +128,7 @@ jobs: lint: needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.node_changed == 'true') runs-on: ubuntu-latest steps: @@ -157,7 +157,7 @@ jobs: name: Swift SDK Tests needs: changes if: >- - ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') && + ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || (github.head_ref == 'trunk' && github.event.pull_request.head.repo.full_name == github.repository && github.base_ref == 'main')) && (needs.changes.outputs.sdk_swift_changed == 'true') runs-on: macos-latest defaults: diff --git a/.github/workflows/trunk-guard.yml b/.github/workflows/trunk-guard.yml index 2ddb49758d..fbe379e4bf 100644 --- a/.github/workflows/trunk-guard.yml +++ b/.github/workflows/trunk-guard.yml @@ -1,17 +1,22 @@ 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. +# Only this repository's `trunk` branch may merge into main. Feature branches +# merge into `trunk`; CI runs only on the trunk -> main PR. +# pull_request_target loads this workflow from the base branch, so a PR cannot +# edit the guard to pass itself. It never checks out PR code. on: - pull_request: + pull_request_target: branches: [main] + types: [opened, synchronize, reopened, edited] + +permissions: {} jobs: only-trunk-merges-to-main: - if: github.head_ref != 'trunk' + if: github.head_ref != 'trunk' || github.event.pull_request.head.repo.full_name != github.repository runs-on: ubuntu-latest timeout-minutes: 1 steps: - run: | - echo "::error::Only the 'trunk' branch may merge into main. Retarget this PR to 'trunk'." + echo "::error::Only this repository's 'trunk' branch may merge into main. Retarget this PR to 'trunk'." exit 1 From 6ef6f86c1cb35504db1c353789de4243bc71ed8d Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 16:06:25 -0700 Subject: [PATCH 4/5] ci(fleet-e2e): update stale branch note for trunk gating --- .github/workflows/fleet-e2e.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fleet-e2e.yml b/.github/workflows/fleet-e2e.yml index 54e08bcd62..f2dfe93c5f 100644 --- a/.github/workflows/fleet-e2e.yml +++ b/.github/workflows/fleet-e2e.yml @@ -9,10 +9,9 @@ name: Fleet E2E # engine build), which rust-cache amortises on warm runs. The 20-minute job # timeout is a cold-build ceiling, not the matrix runtime. -# NOTE on branches: the fleet stack is developed on `feat/fleet-*` branches that -# merge into each other before `main`, so the trigger must include them — gating -# on `[main]` alone leaves this job inert for the entire feature stack (it would -# only run after something reaches main). Update to `[main]` once the stack lands. +# NOTE on branches: CI runs only on this repository's `trunk` -> `main` PR and +# on pushes to `main` (see the job `if:`). Feature branches, including +# `feat/fleet-*`, merge into `trunk` without CI. on: push: branches: [main] From 2be9ab680e6f136f214efa12511a1d247a264860 Mon Sep 17 00:00:00 2001 From: KJGBot Date: Thu, 8 Oct 2026 16:07:13 -0700 Subject: [PATCH 5/5] docs(agents): install @agent-relay/merge-train-snippet Feature PRs target trunk, verify locally, and get the `mergeable` label when ready; the merge agent promotes trunk -> main. --- AGENTS.md | 11 +++++++---- prpm.lock | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index e7c795e817..b9bbd8cac9 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -314,11 +314,14 @@ Future agents can query past trajectories to learn from your decisions. - + ## 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 +CI suites do **not** run automatically on feature branches. They run only on +this repository's `trunk` → `main` pull request and on pushes to `main`. The +one check that does run on a feature PR into `main` is `Trunk guard`, which +fails it on purpose; manually dispatched workflows (`workflow_dispatch`) still +run on any branch. (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. @@ -352,4 +355,4 @@ 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 index 948135dc30..5f049c207d 100644 --- a/prpm.lock +++ b/prpm.lock @@ -277,9 +277,9 @@ "installedPath": ".agents/skills/writing-relayflows/SKILL.md" }, "@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", + "version": "1.0.1", + "resolved": "https://registry.prpm.dev/api/v1/packages/%40agent-relay%2Fmerge-train-snippet/1.0.1.tar.gz", + "integrity": "sha256-b993f4fd7a737b5788f10fca8b02d6eea02c803b1d4483f6536f3cfd3f85126e", "format": "agents.md", "subtype": "snippet", "sourceFormat": "generic", @@ -294,5 +294,5 @@ } } }, - "generated": "2026-10-08T22:45:33.057Z" + "generated": "2026-10-08T23:07:11.486Z" } \ No newline at end of file