Sprint 0: Foundation scaffolding rebased onto latest main - #372
Merged
Conversation
- docs/DATA_MODEL.md: full Firestore collection audit with document shapes - docs/AGENT_STATUS.md: Gamma/Charlie coordination sync artifact - src/lib/sharedTypes.ts: append-only shared contract (DailyStreak, Mission, BattlePassState, Crew, RankedSeason, RankedEntry, ShareLink) - src/lib/featureFlags.ts: central feature-flag registry, all 6 flags default false - server/battlePass.js, ranked.js, crews.js, dailyRewards.js: no-op handler stubs - firestore.rules: read-only stub rules for 6 new collections, all writes false Rebased cleanly onto main (post PRs #362-#369). No conflicts. lint: clean, tsc --noEmit: clean, test:server: 30/30 pass. Agent-Logs-Url: https://github.com/driver727-pixel/Punch-Skater/sessions/8b3a03af-5b62-4db0-ab0c-d79cc4ef7773 Co-authored-by: driver727-pixel <269849721+driver727-pixel@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Rebase foundation branch onto latest main and resolve conflicts
Sprint 0: Foundation scaffolding rebased onto latest main
Apr 24, 2026
driver727-pixel
marked this pull request as ready for review
April 24, 2026 05:56
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rebases PR #353 (
gamma/sprint0-foundation-dc01) cleanly ontomainpost-PRs #362–#369. No conflicts. Scope is identical to the original draft — pure scaffolding, zero behavior change.What's added
docs/DATA_MODEL.md— Firestore collection audit (shapes, access patterns, composite indexes + stubs for 6 new collections)docs/AGENT_STATUS.md— Gamma/Charlie sprint sync artifactsrc/lib/sharedTypes.ts— Append-only shared contract:DailyStreak,Mission,BattlePassState,Crew,RankedSeason,RankedEntry,ShareLink, XP constantssrc/lib/featureFlags.ts— Central flag registry; all 6 flags defaultfalse, toggleable viaVITE_FF_*server/{battlePass,ranked,crews,dailyRewards}.js— No-op handler stubs, all return501firestore.rules— Read-only stub rules for 6 new collections; all writesfalseWhat this PR is NOT
trueEngagement-loop consumers
PRs #354–#358 build on this scaffolding and will land incrementally on their own merits, not as a batch sprint push.
Warning
Firewall rules blocked me from connecting to one or more addresses (expand for details)
I tried to connect to the following addresses, but was blocked by firewall rules:
https://api.github.com/graphql/usr/bin/gh gh auth status --shared-client-connection(http block)/usr/bin/gh gh pr ready 353 _mod�� get --global rgo/bin/git ame(http block)Sprint 0 foundation scaffolding, rebased cleanly onto the latest
main(post PRs #362���#369). Zero behavior change ��� this PR is pure scaffolding.> Rebase note: Branch rebased onto
mainas of commit6504e4e(post-PR #369). No --global ndor/bin/git user.name` (http block)Original prompt
Background
PR #353 ("Sprint 0: Foundation scaffolding — data model, shared types, feature flags, server stubs, Firestore rules") is currently a draft branched from an older
main. The repo owner wants to land this foundation so future engagement-loop work can build on it incrementally, without rushing.PR: #353
Branch:
gamma/sprint0-foundation-dc01Task
Rebase
gamma/sprint0-foundation-dc01onto the latestmain.server/index.js(route wiring),firestore.rules, possiblysrc/index.css. Preserve both sides — keep the new stub registrations from Sprint 0: Foundation scaffolding — data model, shared types, feature flags, server stubs, Firestore rules #353 alongside any newer changes frommain.Verify the foundation remains scope-pure. PR Sprint 0: Foundation scaffolding — data model, shared types, feature flags, server stubs, Firestore rules #353 should still only add:
docs/DATA_MODEL.md,docs/AGENT_STATUS.mdsrc/lib/sharedTypes.ts(append-only contract)src/lib/featureFlags.ts(all flags defaultfalse)server/battlePass.js,server/ranked.js,server/crews.js,server/dailyRewards.js(no-op handlers only)false)If during the rebase you find any commits that snuck in actual feature behavior, drop them. The point of this PR is zero behavior change.
Run validation locally:
npm installnpm run lint— must be cleannpx tsc --noEmit— must be cleannpm run test:server— should pass at the same level asmain(note: there is one known pre-existing failure being addressed in a separate PR; do not let that block you, but do not make it worse)Mark the PR ready for review (un-draft it).
Update the PR description with:
false).Out of scope (very important)
falsetotrue.mainneeds to coexist).Deliverable
A clean, conflict-free, ready-for-review (non-draft) PR #353 that the owner can merge with confidence as a pure-scaffolding change.
The following is the prior conversation context from the user's chat exploration (may be truncated):
User: Take a look at the total repo, and help me figure out what to do next?
Assistant: # What to do next — a triage + roadmap
Here's my read on the current state of the repo and a concrete action plan, ordered by impact and urgency.
Snapshot
README.mdThe picture
You're in a rapid-iteration polish phase on the existing forge (board art, card layout, weather rate limits) while a coordinated "engagement loop" expansion (streaks, missions, weekly heat, battle pass, charge-up) is staged but not landed. That tension is the thing to resolve next.
Recommended order of work
1. Triage open PRs first (do this today)
You have 9 open PRs. Decide each: