From 35bc9e22f490fef3c54b7bc52918ef37dc51b302 Mon Sep 17 00:00:00 2001
From: Adam Moussa <166072409+amoussa1229@users.noreply.github.com>
Date: Fri, 26 Jun 2026 11:20:10 -0400
Subject: [PATCH] =?UTF-8?q?ci:=20promote=20dev=20=E2=86=92=20prod=20via=20?=
 =?UTF-8?q?fast-forward=20(not=20force-push=20from=20main)=20(#2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci: promote dev to prod via fast-forward instead of force-pushing main

Repoints the daily promotion workflow to feed prod from the dev integration
trunk (prod <- dev) rather than force-pushing the upstream mirror (main).
Uses a fast-forward push so a release can never rewrite prod history.

* fix: sort imports in aegra_entry.py to unblock dev CI

The Sea Haven deployment commit left aegra_entry.py with an unsorted import
block (ruff I001), which fails the required 'Agent lint' check and blocks all
merges into dev. Apply the import-sort autofix.
---
 ...romote_main_to_prod.yml => promote_dev_to_prod.yml} | 10 +++++-----
 deploy/seahaven/aegra/aegra_entry.py                   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename .github/workflows/{promote_main_to_prod.yml => promote_dev_to_prod.yml} (62%)

diff --git a/.github/workflows/promote_main_to_prod.yml b/.github/workflows/promote_dev_to_prod.yml
similarity index 62%
rename from .github/workflows/promote_main_to_prod.yml
rename to .github/workflows/promote_dev_to_prod.yml
index 46574f8c..718fba74 100644
--- a/.github/workflows/promote_main_to_prod.yml
+++ b/.github/workflows/promote_dev_to_prod.yml
@@ -1,4 +1,4 @@
-name: Promote main to prod
+name: Promote dev to prod
 
 permissions:
   contents: write
@@ -9,7 +9,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: promote-main-to-prod
+  group: promote-dev-to-prod
   cancel-in-progress: false
 
 jobs:
@@ -18,8 +18,8 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: main
+          ref: dev
           fetch-depth: 0
-      - name: Force-push main to prod
+      - name: Fast-forward prod to dev
         run: |
-          git push --force origin HEAD:refs/heads/prod
+          git push origin HEAD:refs/heads/prod
diff --git a/deploy/seahaven/aegra/aegra_entry.py b/deploy/seahaven/aegra/aegra_entry.py
index 8833e026..a182f18d 100644
--- a/deploy/seahaven/aegra/aegra_entry.py
+++ b/deploy/seahaven/aegra/aegra_entry.py
@@ -7,9 +7,9 @@ through the installed ``agent`` package (absolute imports) restores correct
 ``__package__`` resolution, so the relative imports inside the agent modules work.
 """
 
-from agent.server import traced_agent as agent_graph
-from agent.reviewer import traced_reviewer_agent as reviewer_graph
 from agent.analyzer import traced_analyzer as analyzer_graph
+from agent.reviewer import traced_reviewer_agent as reviewer_graph
+from agent.server import traced_agent as agent_graph
 
 # Open SWE's FastAPI webapp (GitHub/Slack webhooks + dashboard API), mounted by
 # Aegra via the "http" key in aegra.json. Absolute import for the same reason as