Track Google Tasks sync conflicts #443

Merged

barrettruth merged 1 commit from feat/google-tasks-sync-conflicts into main

2026-05-13 04:09:52 +00:00

barrettruth commented

2026-05-13 04:09:39 +00:00

Owner

Summary

add Google Tasks last-applied snapshot metadata and three-way merge protection for mapped fields
preserve local edits, track conflicts/outdated remote values, and protect local changes from remote deletions
surface pull result and sync issue counts in settings/status output
document pull-only merge behavior and operator count meanings

Closes #442

Verification

direnv exec . pnpm vitest run tests/core/google/tasks-pull.test.ts tests/core/google/tasks-mapper.test.ts tests/api/integrations-google-pull.test.ts tests/lib/calendar-settings-section.test.ts
direnv exec . pnpm exec biome check src/core/external-links.ts src/core/google/tasks-sync.ts src/core/google/tasks-pull.ts src/core/google/types.ts src/core/google/oauth.ts src/components/settings/calendar-settings-section.tsx tests/core/google/tasks-pull.test.ts tests/api/integrations-google-pull.test.ts tests/lib/calendar-settings-section.test.ts docs/operations/google-integration.md docs/operations/self-hosting.md
direnv exec . pnpm tsc --noEmit
direnv exec . just ci

Review loop

Review pass found data-loss risks around held remote snapshots, clean deletion tombstones, and broad unseen-link auditing; fixed and covered with tests.
Second review pass found no remaining focused correctness or UI/docs/API issues.

## Summary - add Google Tasks last-applied snapshot metadata and three-way merge protection for mapped fields - preserve local edits, track conflicts/outdated remote values, and protect local changes from remote deletions - surface pull result and sync issue counts in settings/status output - document pull-only merge behavior and operator count meanings Closes #442 ## Verification - direnv exec . pnpm vitest run tests/core/google/tasks-pull.test.ts tests/core/google/tasks-mapper.test.ts tests/api/integrations-google-pull.test.ts tests/lib/calendar-settings-section.test.ts - direnv exec . pnpm exec biome check src/core/external-links.ts src/core/google/tasks-sync.ts src/core/google/tasks-pull.ts src/core/google/types.ts src/core/google/oauth.ts src/components/settings/calendar-settings-section.tsx tests/core/google/tasks-pull.test.ts tests/api/integrations-google-pull.test.ts tests/lib/calendar-settings-section.test.ts docs/operations/google-integration.md docs/operations/self-hosting.md - direnv exec . pnpm tsc --noEmit - direnv exec . just ci ## Review loop - Review pass found data-loss risks around held remote snapshots, clean deletion tombstones, and broad unseen-link auditing; fixed and covered with tests. - Second review pass found no remaining focused correctness or UI/docs/API issues.

barrettruth added 1 commit

2026-05-13 04:09:39 +00:00

feat(google): track tasks sync conflicts

quality / Test (pull_request) Successful in 19s

Details

quality / Lint (pull_request) Successful in 22s

Details

quality / Build (pull_request) Successful in 51s

Details

27fe0828ce

barrettruth merged commit b4c667e5ff into main

2026-05-13 04:09:52 +00:00

barrettruth referenced this pull request from a commit

2026-05-13 04:09:54 +00:00

Track Google Tasks sync conflicts (#443)

No reviewers

No milestone

No project

No assignees

1 participant

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

barrettruth/delta!443

No description provided.

Rows
Columns