Marc-André Bombeck 98f7d11861 chore: resolve parallel-agent merge conflicts + sweep up loose edits ...

7 conflict files resolved by taking the upstream/HEAD side (which carries
the W4d/W5/W6c/W3f feature additions). Stashed-side changes that were
genuine new features re-land in subsequent commits if any were lost.

This sweeps up the loose state the W4e+W5e+W5d combined agent left
mid-stash. Resolves develop's working tree for clean push.

2026-05-14 14:19:08 +02:00

..

achievements-expansion.test.ts

feat(achievements): worker re-evaluates new + hidden achievements on data change

2026-05-10 10:34:32 +02:00

admin-backups-audit.test.ts

fix(notifications): auto-disable channels on persistent hard rejects (410, etc.)

2026-05-09 21:00:23 +02:00

admin-backups-download.test.ts

fix(admin): /admin/users mobile layout — card-list at < md, no truncation

2026-05-09 20:46:20 +02:00

admin-backups-restore.test.ts

feat(admin): restore from backup with full data replacement + triple-confirm

2026-05-09 20:58:33 +02:00

admin-backups-upload.test.ts

fix(mobile): bump chart controls + medication primary buttons + mood list icons to 44px

2026-05-09 20:50:08 +02:00

admin-data-wipe.test.ts

fix(tests): share next/headers cookieJar across integration suite

2026-05-09 18:08:11 +02:00

admin-host-metrics.test.ts

style(prettier): sweep formatting across the tree

2026-05-10 11:05:40 +02:00

analytics-bp-aggregate-paged.test.ts

perf(analytics): groupBy + cursor-paged BP aggregate

2026-05-11 02:37:49 +02:00

analytics-health-score.test.ts

feat(api): emit Health Score from /api/analytics

2026-05-10 17:37:20 +02:00

analytics-sleep-stages.test.ts

chore(release): v1.4.24

2026-05-12 22:33:35 +02:00

apns-dispatch.test.ts

chore(format): prettier sweep across develop

2026-05-11 08:27:51 +02:00

auth-flow.test.ts

style: prettier on W5 reconcile touchpoints

2026-05-10 22:30:53 +02:00

bp-in-target.test.ts

perf(api): chunked BP aggregate replaces unbounded findMany

2026-05-11 01:21:20 +02:00

cascade-delete.test.ts

feat(db): RecommendationFeedback model with GDPR cascade + provider attribution

2026-05-10 01:25:57 +02:00

chart-overlay-prefs.test.ts

style(prettier): sweep formatting across the tree

2026-05-10 11:05:40 +02:00

coach-chat.test.ts

fix(coach): graceful fallback when sentinel-only output strips empty

2026-05-10 22:05:14 +02:00

coach-conversations.test.ts

feat(coach): GET list, GET single, DELETE conversation endpoints

2026-05-10 16:11:12 +02:00

coach-feedback.test.ts

fix(coach): feedback references coach_messages, drops plaintext column

2026-05-11 02:38:17 +02:00

coach-prefs.test.ts

test(coach-prefs): fix NextRequest URL mock — v1.4.22 carryover

2026-05-14 11:36:27 +02:00

dashboard-widgets-save.test.ts

chore: resolve parallel-agent merge conflicts + sweep up loose edits

2026-05-14 14:19:08 +02:00

device-register.test.ts

chore(format): prettier sweep across develop

2026-05-11 08:27:51 +02:00

doctor-report-sections.test.ts

feat(doctor-report): server filter respects per-section toggles + PDF skips disabled sections

2026-05-14 13:29:53 +02:00

export-per-type.test.ts

test(export): integration test points at the new plain-segment endpoints

2026-05-10 00:11:36 +02:00

global-setup.ts

release: v1.4.2 — resurrect v1.4.1 work + bug-fix triple (#152)

2026-05-08 17:46:31 +02:00

idempotency-replay.test.ts

fix(tests): share next/headers cookieJar across integration suite

2026-05-09 18:08:11 +02:00

insights-feedback.test.ts

feat(api): /api/insights/feedback persists thumbs with provider attribution

2026-05-10 01:30:06 +02:00

insights-provider-chain-put.test.ts

style(prettier): sweep formatting across the tree

2026-05-10 11:05:40 +02:00

insights-provider-chain.test.ts

style(prettier): sweep formatting across the tree

2026-05-10 11:05:40 +02:00

integration-status.test.ts

feat(audit): sync failures logged with structured meta

2026-05-09 21:07:44 +02:00

measurements-batch-delete.test.ts

feat(api): DELETE /api/measurements/by-external-ids for iOS deletion-sync

2026-05-14 13:07:05 +02:00

measurements-batch.test.ts

feat(api): batch measurement ingest for the iOS Apple Health sync

2026-05-11 00:20:37 +02:00

mock-next-headers.ts

fix(tests): share next/headers cookieJar across integration suite

2026-05-09 18:08:11 +02:00

rate-limit.test.ts

release: v1.4.2 — resurrect v1.4.1 work + bug-fix triple (#152)

2026-05-08 17:46:31 +02:00

setup.ts

feat(coach): add CoachConversation, CoachMessage, CoachUsage models

2026-05-10 15:54:28 +02:00

timezone-per-user.test.ts

feat(coach): snapshot anchors yesterday/this-week to user displayTimezone

2026-05-14 13:19:17 +02:00