Skip to content

Catch-up: sync missing v1.5.8 + v1.5.9 changes to public repo#5

Merged
dayyanj merged 1 commit into
mainfrom
docs-and-fix-catchup
Jul 12, 2026
Merged

Catch-up: sync missing v1.5.8 + v1.5.9 changes to public repo#5
dayyanj merged 1 commit into
mainfrom
docs-and-fix-catchup

Conversation

@dayyanj

@dayyanj dayyanj commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

What / why

PRs #3 and #4 landed the OSS-side transitions but silently dropped 8
files during their sync + branch + commit flows. shop/main at
v1.5.9 has always had the correct content — the public tree has
been running stale.

Impact: the public repo has claimed to be v1.5.9 in its Release
notes since the v1.5.9 tag was cut, but the CHANGELOG.md still
shows v1.5.7 at the top, core/version.py still says 1.5.7, and
several v1.5.9 bug fixes are simply absent (storefront add-to-cart
500, guest wishlist 401, admin help search 500, POS parked-cart beat
schedule).

How

Copied 8 files verbatim from git archive shop@v1.5.9, the same
source the earlier syncs should have used:

  • CHANGELOG.md — restores v1.5.8 + v1.5.9 entries
  • core/version.py — 1.5.7 → 1.5.9
  • cart/models.py (+51 lines), cart/views.py (+12 lines) —
    v1.5.9 storefront regression fixes
  • core/api/help_views.py, core/services/semantic_search.py
    v1.5.9 admin help search 500 fix
  • core/settings.py (+15 lines) — v1.5.9 parked-cart cleanup
  • core/fixtures/help_embeddings.jsonl.gz — regenerated embeddings
    for backfilled help topics

Sync-script blocklist rules unchanged; no forbidden strings surfaced.

Root cause of the earlier drops is under investigation — likely a
race in sync-to-open + branch + commit that reset the working tree
back to origin/main state after the sync rsync'd new content. A
harder-to-corrupt sync flow will follow.

Test plan

  • Explicit file-by-file diff between shop@v1.5.9 and public main
    HEAD — only these 8 files differ
  • No missing new files (Only in scratch = 0)
  • No extra files on public (Only in target filtered to .git only)
  • Files copied verbatim — no re-typing, no manual edits

Local tests already ran against these files at v1.5.8 / v1.5.9 tag
time (166 tests pass); CI will re-verify on this branch.

Checklist

  • Every commit is signed off (git commit -s)
  • Docs updated (that's the whole point — CHANGELOG catch-up)
  • No new inline <style> or <script>
  • No hardcoded paths or IPs
  • No accidental secrets

Screenshots

None.

Related issues

Follow-up post-mortem needed on the sync workflow so this doesn't
recur.

The earlier PRs #3 (v1.5.8) and #4 (v1.5.9) both landed the OSS-side
work but silently dropped 8 files during the sync + branch + commit
flow. shop/main has the correct content since those tags were cut,
but the public tree has been running stale on:

- CHANGELOG.md — v1.5.8 + v1.5.9 entries were missing (public still
  showed v1.5.7 at top)
- core/version.py — stuck at 1.5.7 (should be 1.5.9)
- cart/models.py, cart/views.py — v1.5.9 storefront add-to-cart /
  guest wishlist regression fixes
- core/api/help_views.py, core/services/semantic_search.py — v1.5.9
  admin help search 500 fix (unquoted numeric YAML in help
  frontmatter)
- core/settings.py — v1.5.9 hourly cleanup-expired-parked-carts beat
  schedule (plus any settings drift between 1.5.7 and 1.5.9)
- core/fixtures/help_embeddings.jsonl.gz — regenerated embeddings
  for the backfilled voucher / hosted-services / POS help topics

Files were copied verbatim from git-archive of shop@v1.5.9 (same
source the earlier syncs should have used). Blocklist rules
unchanged; verified no forbidden strings.

Root cause of the earlier drops is under investigation — likely a
race in the sync-to-open + branch + commit flow that reset the
working tree back to origin/main state after the sync rsync'd new
content. Follow-up work will harden the sync script.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: Dayyan James <dayyan.james@gmail.com>
@dayyanj dayyanj self-assigned this Jul 12, 2026
@dayyanj dayyanj merged commit 41a881a into main Jul 12, 2026
5 of 7 checks passed
@dayyanj dayyanj deleted the docs-and-fix-catchup branch July 12, 2026 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant