Reconcile concurrent Week Ahead edits per day #1184

Closed
opened 2026-08-20 15:23:24 +00:00 by timmy · 0 comments
Owner

Problem

Week Ahead conflict recovery currently offers only “keep this phone’s complete week” or “use the saved account week.” Two devices editing different dates therefore force the operator to discard valid work even though those edits can be merged safely.

Evidence

  • frontend/week-plan.js stores the pending complete week without its base snapshot and exposes only whole-week keepLocal / useRemote resolution.
  • frontend/dashboard.js renders two complete-week choices.
  • Historical issue #1180 added durable whole-week conflict preservation but not three-way, per-day reconciliation. A title/behavior search across all 593 historical issues and recent commits found no duplicate.

Acceptance

  • Persist the base week snapshot with account-bound pending edits.
  • Automatically merge edits made to different dates on phone and account.
  • Present only genuinely divergent dates for touch-safe per-day phone/account selection.
  • Submit one rebased complete-week PUT and retain all recovery state on repeated 409/failure.
  • Preserve legacy pending-record whole-week fallback and account isolation.
  • Cover merge, same-day conflict, retry, mobile controls, focused tests, full suite, and packaged release journey.
## Problem Week Ahead conflict recovery currently offers only “keep this phone’s complete week” or “use the saved account week.” Two devices editing different dates therefore force the operator to discard valid work even though those edits can be merged safely. ## Evidence - `frontend/week-plan.js` stores the pending complete week without its base snapshot and exposes only whole-week `keepLocal` / `useRemote` resolution. - `frontend/dashboard.js` renders two complete-week choices. - Historical issue #1180 added durable whole-week conflict preservation but not three-way, per-day reconciliation. A title/behavior search across all 593 historical issues and recent commits found no duplicate. ## Acceptance - Persist the base week snapshot with account-bound pending edits. - Automatically merge edits made to different dates on phone and account. - Present only genuinely divergent dates for touch-safe per-day phone/account selection. - Submit one rebased complete-week PUT and retain all recovery state on repeated 409/failure. - Preserve legacy pending-record whole-week fallback and account isolation. - Cover merge, same-day conflict, retry, mobile controls, focused tests, full suite, and packaged release journey.
timmy closed this issue 2026-08-20 15:54:54 +00:00
Sign in to join this conversation.
No Milestone
No project
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: stackchain/stackchain-dashboard#1184
No description provided.