From 00b72b11369338f2afdd9a4e8b24b64b6aa23c11 Mon Sep 17 00:00:00 2001
From: KJGBot <khaliqgant+kjgbot@gmail.com>
Date: Thu, 8 Oct 2026 15:54:24 -0700
Subject: [PATCH] Revert "Merge pull request #40 from AgentWorkforce/trunk"

This reverts commit 8df818ed07d3f363deb3145eeaf78a298a6c9d46, reversing
changes made to f682efbf7493365fa872d632a05f30d6094e5334.
---
 .github/workflows/ci.yml               |  8 +-------
 .github/workflows/compact-on-merge.yml |  4 +---
 .github/workflows/trunk-guard.yml      | 17 -----------------
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/trunk-guard.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c67d461..dc37c38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,6 @@ on:
 
 jobs:
   lint:
-    if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk'
     name: Lint
     runs-on: ubuntu-latest
     steps:
@@ -28,7 +27,6 @@ jobs:
         run: npm run lint
 
   typecheck:
-    if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk'
     name: Type Check
     runs-on: ubuntu-latest
     steps:
@@ -48,7 +46,6 @@ jobs:
         run: npm run typecheck
 
   test:
-    if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk'
     name: Test (Node ${{ matrix.node-version }})
     runs-on: ubuntu-latest
     strategy:
@@ -78,7 +75,6 @@ jobs:
         run: npm run test:run
 
   build:
-    if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk'
     name: Build
     runs-on: ubuntu-latest
     steps:
@@ -107,9 +103,7 @@ jobs:
     name: CI Success
     needs: [lint, typecheck, test, build]
     runs-on: ubuntu-latest
-    if: >-
-      ((github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || github.head_ref == 'trunk') &&
-      (always())
+    if: always()
     steps:
       - name: Check all jobs passed
         run: |
diff --git a/.github/workflows/compact-on-merge.yml b/.github/workflows/compact-on-merge.yml
index fbf5b31..baa6548 100644
--- a/.github/workflows/compact-on-merge.yml
+++ b/.github/workflows/compact-on-merge.yml
@@ -9,9 +9,7 @@ on:
 jobs:
   compact:
     # Only run when PR is actually merged, not just closed
-    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
 
     permissions:
diff --git a/.github/workflows/trunk-guard.yml b/.github/workflows/trunk-guard.yml
deleted file mode 100644
index 2ddb497..0000000
--- 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