From c0afe96f56da6fc9ac060fc9b871d09b00b151e5 Mon Sep 17 00:00:00 2001
From: Joe Julian <me@joejulian.name>
Date: Wed, 1 Apr 2026 17:38:39 -0700
Subject: [PATCH] Move sync defaults into vault settings

---
 main.go           | 2 --
 main_test.go      | 2 +-
 ui_preferences.go | 7 ++++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index f98c8bb..0aa1a1d 100644
--- a/main.go
+++ b/main.go
@@ -151,8 +151,6 @@ type uiPreferences struct {
 	GroupControlsHidden     bool                    `json:"groupControlsHidden"`
 	LifecycleAdvancedHidden bool                    `json:"lifecycleAdvancedHidden"`
 	HistoryHidden           bool                    `json:"historyHidden"`
-	SyncSourceDefault       string                  `json:"syncSourceDefault,omitempty"`
-	SyncDirectionDefault    string                  `json:"syncDirectionDefault,omitempty"`
 	DenseLayout             bool                    `json:"denseLayout"`
 	StatusBannerMillis      int                     `json:"statusBannerMillis,omitempty"`
 	AutofillNoticeMode      string                  `json:"autofillNoticeMode,omitempty"`
diff --git a/main_test.go b/main_test.go
index 827adc7..a8f84a1 100644
--- a/main_test.go
+++ b/main_test.go
@@ -3595,7 +3595,7 @@ func TestUILoadSettingsFallsBackToLegacySyncDefaultsInUIPreferences(t *testing.T
 
 	dir := t.TempDir()
 	legacyPath := filepath.Join(dir, "ui-prefs.json")
-	content, err := json.MarshalIndent(uiPreferences{
+	content, err := json.MarshalIndent(legacySyncPreferences{
 		SyncSourceDefault:    string(syncSourceRemote),
 		SyncDirectionDefault: string(syncDirectionPush),
 	}, "", "  ")
diff --git a/ui_preferences.go b/ui_preferences.go
index 6853ce5..e823d09 100644
--- a/ui_preferences.go
+++ b/ui_preferences.go
@@ -52,6 +52,11 @@ type settingsDraft struct {
 	Sync          syncSettingsDraft
 }
 
+type legacySyncPreferences struct {
+	SyncSourceDefault    string `json:"syncSourceDefault,omitempty"`
+	SyncDirectionDefault string `json:"syncDirectionDefault,omitempty"`
+}
+
 type choiceSpec struct {
 	Click  *widget.Clickable
 	Label  string
@@ -161,7 +166,7 @@ func (u *ui) loadLegacySyncDefaultsFromUIPreferences() {
 	if err != nil {
 		return
 	}
-	var prefs uiPreferences
+	var prefs legacySyncPreferences
 	if err := json.Unmarshal(content, &prefs); err != nil {
 		return
 	}