State
Main has 10 commits not in beta. Conversely beta has ~25 commits not in main. They've diverged.
Main commits missing from beta
3af81a1 chore(deps): bump claude-agent-sdk >=0.1.77 → >=0.1.80 (#416)
b7409bd fix(discord-poller): allow peer agents/bots to reach us (#411) (#412)
cec4f90 Merge pull request #408 from bradbrok/feat/outreach-outcome-enum
b67667a fix(broker): bucket FileNotFoundError as `rejected`, not `error_upstream` (#408)
41618f6 feat(broker): split outreach outcome into success/rejected/error_upstream/error_internal (#81)
cba5c0f Merge pull request #397 from bradbrok/fix/broker-send-gif-voice-animation-error-handling
d93faab fix(broker): widen send_gif try/finally to cover search + no-results paths
5f30b99 chore(pollers): asyncio.get_event_loop() → asyncio.get_running_loop() (#74) (#398)
a26703e feat(docker): containerize PinkyBot for portable deploys (#407)
db08dda Release 26.05.068: auth-failure alerts + structured detection (SDK 0.1.77) (#406)
Beta commits missing from main (after #448 lands)
#432 auto-deps drift, #431 codex resurrection follow-up, #429 effort.level hook, ferry features (#413/#418/#419), discord polling (#383/#386), auth-alerts (#400), SDK 0.1.76 floor (#402), refactor outreach (#403/#404), etc.
Merge conflicts when trying beta ← main
3 files with real content conflicts:
src/pinky_daemon/api.py — 5 hunkssrc/pinky_daemon/agent_registry.py — 5 hunkstests/test_admin_update.py — 3 hunks- Plus
pyproject.toml (SDK floor mismatch)
These need careful resolution — not a mechanical merge. The hotfixes on main touch the same code paths that beta is rewriting.
Recommendation
-
First: decide the policy. Are hotfix-to-main + delayed-backport-to-beta the standard pattern? If so, beta should regularly pull from main. If not, all changes should land on beta first.
-
Backport plan: open a chore/sync-beta-with-main branch off beta, merge origin/main, resolve conflicts (likely api.py is the worst — auth-alerts + outreach-outcome-enum overlap with ferry/discord-polling changes), commit. PR back to beta.
-
Then: the next beta → main promotion is clean.
Blocking?
Not blocking #446 — that's been cherry-picked via #448. But the next beta → main promotion will hit this until reconciled.
🤖 Opened by Barsik
State
Main has 10 commits not in beta. Conversely beta has ~25 commits not in main. They've diverged.
Main commits missing from beta
Beta commits missing from main (after #448 lands)
#432 auto-deps drift, #431 codex resurrection follow-up, #429 effort.level hook, ferry features (#413/#418/#419), discord polling (#383/#386), auth-alerts (#400), SDK 0.1.76 floor (#402), refactor outreach (#403/#404), etc.
Merge conflicts when trying beta ← main
3 files with real content conflicts:
src/pinky_daemon/api.py— 5 hunkssrc/pinky_daemon/agent_registry.py— 5 hunkstests/test_admin_update.py— 3 hunkspyproject.toml(SDK floor mismatch)These need careful resolution — not a mechanical merge. The hotfixes on main touch the same code paths that beta is rewriting.
Recommendation
First: decide the policy. Are hotfix-to-main + delayed-backport-to-beta the standard pattern? If so, beta should regularly pull from main. If not, all changes should land on beta first.
Backport plan: open a
chore/sync-beta-with-mainbranch off beta, mergeorigin/main, resolve conflicts (likely api.py is the worst — auth-alerts + outreach-outcome-enum overlap with ferry/discord-polling changes), commit. PR back to beta.Then: the next beta → main promotion is clean.
Blocking?
Not blocking #446 — that's been cherry-picked via #448. But the next beta → main promotion will hit this until reconciled.
🤖 Opened by Barsik