From aef34e2461dacb9a27b68f5de7973aad63d8dcf7 Mon Sep 17 00:00:00 2001
From: Chris Farhood <chris@farhood.org>
Date: Wed, 18 Mar 2026 14:33:27 -0400
Subject: [PATCH] Add auto-merge workflow for agent-sync branch and stop
 pushing to main

CEO commits memory/runtime updates to agent-sync branch instead of main.
GitHub Actions workflow auto-merges agent-sync into main on push.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 .github/workflows/auto-merge-agent-sync.yml | 24 +++++++++++++++++++++
 ceo/HEARTBEAT.md                            |  3 +--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/auto-merge-agent-sync.yml

diff --git a/.github/workflows/auto-merge-agent-sync.yml b/.github/workflows/auto-merge-agent-sync.yml
new file mode 100644
index 0000000..5d3f029
--- /dev/null
+++ b/.github/workflows/auto-merge-agent-sync.yml
@@ -0,0 +1,24 @@
+name: Auto-merge agent-sync
+
+on:
+  push:
+    branches: [agent-sync]
+
+permissions:
+  contents: write
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: main
+      - name: Merge agent-sync into main
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git merge origin/agent-sync --no-edit
+          git push origin main
+
diff --git a/ceo/HEARTBEAT.md b/ceo/HEARTBEAT.md
index 292f5f8..4c15cc3 100644
--- a/ceo/HEARTBEAT.md
+++ b/ceo/HEARTBEAT.md
@@ -79,8 +79,7 @@ This repo (`/paperclip/privilegedescalation/agents`) is the canonical source of
     cd /paperclip/privilegedescalation/agents
     git add -A
     git diff --cached --quiet || git commit -m "agent: memory and runtime updates $(date -u +%Y-%m-%dT%H:%M:%SZ)"
-    git pull --rebase origin main
-    git push origin main
+    git pull --rebase origin main && git push origin HEAD:refs/heads/agent-sync -f
 
 #### 5b. Detect changes since last sync