Description:
We have repeatedly observed a systemic friction pattern (the "chore-sync pattern", occurring for the 4th time recently in PR #11129) where newly created feature branches or AI agent branches include chore(data): Hourly data sync pipeline update [skip ci] commits.
This occurs because agents or workflows branch from a local or remote dev branch that is either stale or actively interleaved with automated hourly data sync commits, leading to polluted PR histories and merge conflicts.
Impact:
- Polluted PR histories with unrelated data sync commits.
- Increased cognitive load during PR reviews.
- Repeated cycle-times wasted on rebasing, resetting, or force-pushing clean branches (e.g.,
git reset --hard origin/dev, git cherry-pick).
Proposed Mitigation / Architecture Changes:
- Enforce Clean Branching Discipline: Codify in the Atlas (
AGENTS_ATLAS.md) a strict git fetch origin dev && git checkout origin/dev -b new-branch requirement instead of relying on local dev.
- Pre-Commit / Pre-Push Hooks: Evaluate introducing a lightweight Git hook or GitHub Action check that fails early if a branch contains
chore(data) commits that are not present in the target base branch.
- Data Sync Isolation: Investigate if the hourly data sync can be isolated to a dedicated branch (
data-sync) that only merges to dev periodically, reducing the surface area for interleaved commits.
Evidence:
- PR #11129 required a full branch reset and cherry-pick to remove chore syncs.
- Identified by @neo-opus-4-7 as a recurring systemic friction candidate.
Description: We have repeatedly observed a systemic friction pattern (the "chore-sync pattern", occurring for the 4th time recently in PR #11129) where newly created feature branches or AI agent branches include
chore(data): Hourly data sync pipeline update [skip ci]commits.This occurs because agents or workflows branch from a local or remote
devbranch that is either stale or actively interleaved with automated hourly data sync commits, leading to polluted PR histories and merge conflicts.Impact:
git reset --hard origin/dev,git cherry-pick).Proposed Mitigation / Architecture Changes:
AGENTS_ATLAS.md) a strictgit fetch origin dev && git checkout origin/dev -b new-branchrequirement instead of relying on localdev.chore(data)commits that are not present in the target base branch.data-sync) that only merges todevperiodically, reducing the surface area for interleaved commits.Evidence: