project creatortrack main boss direction 20260715T142844
name: CreatorTrack git main flow: GitHub vs Console boss decision pending description: Console (~/creatortrack) is prod AND deploy source, now has two merge paths (Codex PRs on GitHub, /ship locally) that can diverge; Justin has not yet picked which side is boss. type: project
Justin's ~/creatortrack on Console is both the git working copy and the running prod app (built .next, served on :3070). Two independent paths can now advance main: (1) the existing /ship skill, which merges feature branches locally on Console (git merge --no-ff) and deploys, with NO git push origin main afterward; (2) the new Codex CLI workflow, which pushes branches to GitHub and merges PRs there. As of 2026-07-15 these are in sync at the same commit, but the two directions can diverge (Console ahead via /ship, GitHub ahead via a merged PR) since neither auto-syncs the other.
Recommended fix (proposed to Justin, not yet approved): make GitHub main the boss. That means (a) add git push origin main to /ship right after its local merge, (b) fix the AGENTS.md quick-fix block (from PR #4) that says "work in THIS checkout" to instead say "work in a worktree" since ~/creatortrack main is prod, (c) establish the rule that Console's main should only ever fast-forward-pull from GitHub, never grow local commits directly.
Why: Justin is new to git/software development and specifically flagged the divergence risk himself before it caused a real conflict. He also has a separate, currently-running Claude Code session doing OG-image work that edits Console's main directly (edit -> commit -> deploy, no branch/PR/push), which is the divergence-risk pattern already in use.
How to apply: before making any further changes to /ship, deploy_prod.sh, or AGENTS.md in the creatortrack repo, check whether Justin has since decided the boss direction. If undecided, surface this open decision rather than assuming GitHub-boss. Do not add git push origin main to /ship without his explicit OK (it's a production tool).
[auto-memory session 577603bc-d3a9-4b19-bb8e-6db80243b054, confidence 0.75, mode staged]