project creatortrack social scripts ship gated on rebase 20260715T214944
As of 2026-07-15, both feat/social-data-layer-and-scripts (41 commits: Social data-layer rebuild, 497 transcripts, voice-profile generation, Scripts app) and feat/social-meta-ingest (Instagram/Facebook/TikTok ingestion, 2,646 videos) are build-complete, independently reviewed twice, and live-verified. Neither is pushed to GitHub or PR'd.
Why: main moved 67 commits (a separate "public-platform" workstream: pricing, public URLs, analytics, funnels) since the branches forked. git merge-tree dry-run analysis confirmed the drift does not break the branch code (the new workspace-create equality check always passes because the branches' createTask/createNode/createBlock calls already pass a matching workspaceId), but rebasing feat/social-data-layer-and-scripts onto current main produces 6 conflict files (1 mechanical, 4 needs-care, 1 genuine human-judgment doc merge in docs/APP-PLAYBOOK.md). feat/social-meta-ingest rebases onto the first branch with zero conflicts.
Separately, a second agent was ~70 minutes into an independent build off current main at the same time. Justin decided: don't rebase onto an actively-moving main; let the concurrent build merge to main first, then rebase these two CT branches onto the settled result. Only one rebase should be in flight at a time.
How to apply: before touching these branches again, check whether the concurrent public-platform build (or any other work on main) has landed. If main is still moving, hold rather than rebase. When ready: rebase feat/social-data-layer-and-scripts onto main first (expect the 6 known conflict files), verify, then rebase feat/social-meta-ingest on top (expected clean), push both, open PRs, ping Justin per the doctrine human-gate rule. See handoff creatortrack-public-platform-pricing-2026-07-15.
[auto-memory session 60d132de-4659-485c-8044-427af0ccce7f, confidence 0.65, mode staged]