psimaker
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 9 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 6 deletions b/‎README.md‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎docs/sync-filters-ux.md‎
Lines changed: 18 additions & 6 deletions b/‎docs/sync-filters-ux.md‎
Lines changed: 18 additions & 6 deletions
diff --git a/‎go/bridge/conflicts.go‎
Lines changed: 98 additions & 0 deletions b/‎go/bridge/conflicts.go‎
Lines changed: 98 additions & 0 deletions
diff --git a/‎go/bridge/conflicts_test.go‎
Lines changed: 169 additions & 0 deletions b/‎go/bridge/conflicts_test.go‎
Lines changed: 169 additions & 0 deletions
@@ -45,3 +45,4 @@ appstore/
 
 # Internal process docs
 docs/release-checklist.md
+docs/superpowers/
@@ -4,6 +4,15 @@ All notable changes to VaultSync are documented here.
 
 ---
 
+## [1.3.2] — 2026-05-23
+
+### Fixed
+
+- **Skip on iPhone now actually skips returning conflicts** ([#8](https://github.com/psimaker/vaultsync/issues/8)) — Tapping "Always skip on this iPhone" in the conflict resolver previously added only the original file's path to `.stignore`, so a fresh `sync-conflict-…` copy with a new timestamp would arrive from the desktop and the conflict reappeared. The Skip flow now also writes a `<path>.sync-conflict-*` glob, deletes any conflict copies of the file already sitting in the vault, and rescans so the conflict disappears from the Sync Issues list immediately. The Sync Filters → Custom Patterns list groups the pair as a single row with a "+ conflict copies" caption.
+- **"Reconnecting…" replaces the transient "device disconnected" warning** — When VaultSync resumes after the app has been away from the foreground for a while, the home screen no longer briefly flashes a "1 Required Device Is Disconnected" warning while the embedded Syncthing process is still rebuilding its connection. Instead, the sync status reads "Reconnecting…" with a calm system spinner for up to 30 seconds. If the peer is genuinely offline beyond that window, the existing warning surfaces normally.
+
+---
+
 ## [1.3.1] — 2026-05-17
 
 ### Fixed
 
@@ -99,13 +99,9 @@ VaultSync is also not a magic always-on Syncthing daemon for iOS. Apple’s back
 
 ---
 
-## What’s New — v1.3.1
+## What’s New — v1.3.2
 
-> **Conflict button no longer also opens the browser** — Tapping "Resolve Conflicts" on the home screen now just opens the conflict list, instead of also launching Safari at the same time.
->
-> **Cleaner home screen and settings** — The "VaultSync" page title is gone, devices show just their name, and Settings no longer surfaces per-device rows for relay peers that are already provisioned.
->
-> **German and Simplified Chinese fixes** — The Sync Issues titles ("1 Konflikt muss gelöst werden", "1 个冲突待解决", …) are now translated instead of falling back to English.
+> **Skip on iPhone now actually skips returning conflicts** — Tapping "Always skip on this iPhone" in the conflict resolver previously added only the original file's path to the ignore list, so a fresh sync-conflict copy with a new timestamp would arrive from the desktop and the conflict reappeared. Skip now also covers future conflict copies of the same file, removes any existing copies on disk, and groups the pair as a single row in Sync Filters.
 
 See [CHANGELOG.md](CHANGELOG.md) for full details.
 
 
@@ -1,7 +1,7 @@
 # Sync Filters — UX Spec
 
 > Status: **implemented** (issue [#1](https://github.com/psimaker/vaultsync/issues/1), shipped in v1.2.0)
-> Last updated: 2026-05-09
+> Last updated: 2026-05-23
 
 This document is the design reference for the Sync Filters feature — the UI for excluding files and folders from sync requested in issue #1 by @vitaly74. It captures the rationale behind the layout, preset catalog, migration path, and multi-vault behavior; refer to it when extending or modifying the feature.
 
@@ -116,18 +116,30 @@ The Recommended set is also auto-applied silently when a new folder is added (so
 
 ## 6. Conflict → Ignore
 
-In `ConflictDiffView`, a new toolbar menu appears (top-right `⋯`):
+In `ConflictDiffView`, a toolbar menu appears (top-right `⋯`):
 
-```
+```text
 ⋯ menu
 └─ Always skip on this iPhone
 ```
 
-Tapping it adds the conflict's *exact relative path* to the folder's ignore list. Then a confirmation alert:
+Tapping it performs a **Skip Family** action (added in v1.3.2, see issue [#8](https://github.com/psimaker/vaultsync/issues/8)):
+
+1. Writes a *pair* of patterns to `.stignore`: the file's exact relative path and a matching `<path>.sync-conflict-*` glob.
+2. Deletes any sync-conflict copies of that file currently on disk.
+3. Rescans the folder and refreshes the conflict cache so the conflict disappears from the home-screen Sync Issues list immediately.
+
+Confirmation alert:
+
+> "`'.obsidian/plugins/dataview/cache.db'` and its conflict copies will no longer sync to this iPhone. You can undo this in Sync Filters."
+
+If existing conflict copies were removed, a second line is appended:
+
+> "2 existing conflict copies were removed."
 
-> "`'.obsidian/plugins/dataview/cache.db'` will no longer sync to this iPhone. You can undo this in Sync Filters."
+Reasoning behind the family approach: the v1.2.0 design used an exact-path pattern for predictability, but that left a hole — a fresh `sync-conflict-…` copy with a new timestamp would arrive from the desktop and the conflict reappeared. Pairing the original path with the conflict-copy glob makes "skip" actually mean skip, without sacrificing predictability: the two `.stignore` lines are still plain, no smart-glob heuristics, no hidden state. In the Sync Filters list the pair is presented as a single row with a `+ conflict copies` caption.
 
-Reasoning behind exact-path (not smart-glob): predictable. The user knows exactly what they ignored. If they later want to widen to `*.cache.db` or `.obsidian/plugins/dataview/*`, they can do that in the editor.
+The original file itself is **not** deleted from disk — only the conflict-copy variants. Users who later want to revert can swipe-to-delete the row in Sync Filters; both lines are removed atomically.
 
 ## 6.5 Multi-vault setups
 
 
@@ -243,3 +243,101 @@ func ResolveConflict(folderID, conflictFileName string, keepConflict bool) strin
 
 	return ""
 }
+
+// RemoveConflictFilesForOriginal removes every sync-conflict copy of the file
+// at originalPath inside the given folder. The original file is NOT touched.
+//
+// Returns a JSON string of the form:
+//
+//	{"removed": <int>, "error": "<msg or empty>"}
+//
+// Possible error envelopes: "syncthing not running", "folder not found",
+// "invalid path: outside folder root", or "remove <name>: <err>" if an
+// individual deletion failed mid-loop.
+//
+// Symmetric with GetConflictFilesJSON's JSON-return style — keeps the gomobile
+// surface uniform (no tuple returns across the bridge).
+func RemoveConflictFilesForOriginal(folderID, originalPath string) string {
+	type result struct {
+		Removed int    `json:"removed"`
+		Error   string `json:"error"`
+	}
+	emit := func(r result) string {
+		data, err := json.Marshal(r)
+		if err != nil {
+			return `{"removed":0,"error":"marshal failed"}`
+		}
+		return string(data)
+	}
+
+	folders := getFolderConfigs()
+	if folders == nil {
+		return emit(result{Error: "syncthing not running"})
+	}
+
+	folder, exists := folders[folderID]
+	if !exists {
+		return emit(result{Error: "folder not found"})
+	}
+
+	// Validate the original path is inside the folder root.
+	absOriginal, err := safePath(folder.Path, originalPath)
+	if err != nil {
+		return emit(result{Error: "invalid path: outside folder root"})
+	}
+	// Reject paths that resolve to the folder root itself — there is no
+	// "original file" at the root, and walking its parent would scan
+	// outside the folder.
+	if absOriginal == folder.Path {
+		return emit(result{Error: "invalid path: outside folder root"})
+	}
+
+	dir := filepath.Dir(absOriginal)
+	baseName := filepath.Base(originalPath)
+	ext := filepath.Ext(baseName)
+	stem := strings.TrimSuffix(baseName, ext)
+	// Common prefix of every conflict copy of this file.
+	conflictPrefix := stem + ".sync-conflict-"
+
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		// If the directory does not exist there are simply no conflicts to remove.
+		if os.IsNotExist(err) {
+			return emit(result{Removed: 0})
+		}
+		return emit(result{Error: fmt.Sprintf("read dir: %v", err)})
+	}
+
+	removed := 0
+	for _, e := range entries {
+		if e.IsDir() {
+			continue
+		}
+		name := e.Name()
+		if !strings.HasPrefix(name, conflictPrefix) {
+			continue
+		}
+		// Must also match the canonical conflict regex so we only delete real
+		// Syncthing-generated copies, not user files that happen to share the prefix.
+		matches := conflictPattern.FindStringSubmatch(name)
+		if matches == nil {
+			continue
+		}
+		// Defensive: matched stem must equal what we expected.
+		if matches[1] != stem {
+			continue
+		}
+		// Extension on the conflict copy must equal the original's extension
+		// (handles files where stem itself contains dots).
+		if matches[4] != ext {
+			continue
+		}
+		fullPath := filepath.Join(dir, name)
+		if err := os.Remove(fullPath); err != nil {
+			return emit(result{Removed: removed, Error: fmt.Sprintf("remove %s: %v", name, err)})
+		}
+		removed++
+	}
+
+	return emit(result{Removed: removed})
+}
@@ -341,3 +341,172 @@ func TestRenameDevice(t *testing.T) {
 		t.Errorf("rename when stopped = %q, want 'syncthing not running'", errMsg)
 	}
 }
+
+func TestRemoveConflictFilesForOriginal(t *testing.T) {
+	configDir := testConfigDir(t)
+
+	if errMsg := StartSyncthing(configDir); errMsg != "" {
+		t.Fatalf("StartSyncthing() failed: %s", errMsg)
+	}
+	defer StopSyncthing()
+
+	folderPath := filepath.Join(configDir, "skipfamily")
+	if errMsg := AddFolder("skipfamily", "Skip Family", folderPath); errMsg != "" {
+		t.Fatalf("AddFolder failed: %s", errMsg)
+	}
+
+	// Root-level original + two conflict copies (different timestamps/devices).
+	if err := os.WriteFile(filepath.Join(folderPath, "notes.md"), []byte("original"), 0o644); err != nil {
+		t.Fatalf("write notes.md: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(folderPath, "notes.sync-conflict-20260520-120000-AAA1111.md"), []byte("c1"), 0o644); err != nil {
+		t.Fatalf("write notes conflict c1: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(folderPath, "notes.sync-conflict-20260521-130000-BBB2222.md"), []byte("c2"), 0o644); err != nil {
+		t.Fatalf("write notes conflict c2: %v", err)
+	}
+
+	// Unrelated file that must not be touched.
+	if err := os.WriteFile(filepath.Join(folderPath, "other.md"), []byte("other"), 0o644); err != nil {
+		t.Fatalf("write other.md: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(folderPath, "other.sync-conflict-20260520-120000-CCC3333.md"), []byte("o1"), 0o644); err != nil {
+		t.Fatalf("write other conflict: %v", err)
+	}
+
+	// Nested original + nested conflict.
+	subDir := filepath.Join(folderPath, "Personal")
+	if err := os.MkdirAll(subDir, 0o755); err != nil {
+		t.Fatalf("mkdir subDir: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(subDir, "diary.md"), []byte("d"), 0o644); err != nil {
+		t.Fatalf("write diary.md: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(subDir, "diary.sync-conflict-20260520-120000-DDD4444.md"), []byte("d1"), 0o644); err != nil {
+		t.Fatalf("write diary conflict: %v", err)
+	}
+
+	// Remove conflict copies for "notes.md" only.
+	got := RemoveConflictFilesForOriginal("skipfamily", "notes.md")
+	var result struct {
+		Removed int    `json:"removed"`
+		Error   string `json:"error"`
+	}
+	if err := json.Unmarshal([]byte(got), &result); err != nil {
+		t.Fatalf("unmarshal: %v (raw: %s)", err, got)
+	}
+	if result.Error != "" {
+		t.Fatalf("unexpected error: %s", result.Error)
+	}
+	if result.Removed != 2 {
+		t.Errorf("removed = %d, want 2", result.Removed)
+	}
+
+	// Original "notes.md" must survive.
+	if _, err := os.Stat(filepath.Join(folderPath, "notes.md")); err != nil {
+		t.Errorf("notes.md should still exist: %v", err)
+	}
+
+	// Both notes conflict copies must be gone.
+	for _, name := range []string{
+		"notes.sync-conflict-20260520-120000-AAA1111.md",
+		"notes.sync-conflict-20260521-130000-BBB2222.md",
+	} {
+		if _, err := os.Stat(filepath.Join(folderPath, name)); !os.IsNotExist(err) {
+			t.Errorf("%s should have been deleted", name)
+		}
+	}
+
+	// Unrelated "other.*" files must survive.
+	if _, err := os.Stat(filepath.Join(folderPath, "other.md")); err != nil {
+		t.Errorf("other.md should still exist: %v", err)
+	}
+	if _, err := os.Stat(filepath.Join(folderPath, "other.sync-conflict-20260520-120000-CCC3333.md")); err != nil {
+		t.Errorf("other.sync-conflict-* should still exist: %v", err)
+	}
+
+	// Nested originals and their conflicts in another directory must survive
+	// when we ask for the root file only.
+	if _, err := os.Stat(filepath.Join(subDir, "diary.sync-conflict-20260520-120000-DDD4444.md")); err != nil {
+		t.Errorf("nested conflict should still exist: %v", err)
+	}
+
+	// Now ask for nested "Personal/diary.md" and verify only the nested copy goes.
+	got = RemoveConflictFilesForOriginal("skipfamily", filepath.Join("Personal", "diary.md"))
+	if err := json.Unmarshal([]byte(got), &result); err != nil {
+		t.Fatalf("unmarshal nested: %v (raw: %s)", err, got)
+	}
+	if result.Removed != 1 || result.Error != "" {
+		t.Errorf("nested call result = %+v, want removed=1 error=\"\"", result)
+	}
+
+	// Dotted-stem regression: archive.tar.gz must match its own conflict copy
+	// but not a sibling that happens to share the inner stem.
+	if err := os.WriteFile(filepath.Join(folderPath, "archive.tar.gz"), []byte("a"), 0o644); err != nil {
+		t.Fatalf("write archive.tar.gz: %v", err)
+	}
+	if err := os.WriteFile(filepath.Join(folderPath, "archive.tar.sync-conflict-20260520-120000-EEE5555.gz"), []byte("ac"), 0o644); err != nil {
+		t.Fatalf("write archive conflict copy: %v", err)
+	}
+	// Same inner stem but different extension — must NOT match.
+	if err := os.WriteFile(filepath.Join(folderPath, "archive.tar.sync-conflict-20260520-120000-FFF6666.md"), []byte("decoy"), 0o644); err != nil {
+		t.Fatalf("write decoy: %v", err)
+	}
+
+	got = RemoveConflictFilesForOriginal("skipfamily", "archive.tar.gz")
+	if err := json.Unmarshal([]byte(got), &result); err != nil {
+		t.Fatalf("unmarshal dotted: %v (raw: %s)", err, got)
+	}
+	if result.Removed != 1 || result.Error != "" {
+		t.Errorf("dotted-stem call result = %+v, want removed=1 error=\"\"", result)
+	}
+	if _, err := os.Stat(filepath.Join(folderPath, "archive.tar.sync-conflict-20260520-120000-EEE5555.gz")); !os.IsNotExist(err) {
+		t.Error("archive.tar.gz conflict copy should have been deleted")
+	}
+	if _, err := os.Stat(filepath.Join(folderPath, "archive.tar.sync-conflict-20260520-120000-FFF6666.md")); err != nil {
+		t.Errorf("decoy with different extension should still exist: %v", err)
+	}
+
+	// Idempotency: running again returns removed=0, no error.
+	got = RemoveConflictFilesForOriginal("skipfamily", "notes.md")
+	if err := json.Unmarshal([]byte(got), &result); err != nil {
+		t.Fatalf("unmarshal idempotent: %v (raw: %s)", err, got)
+	}
+	if result.Removed != 0 || result.Error != "" {
+		t.Errorf("idempotent call = %+v, want removed=0 error=\"\"", result)
+	}
+}
+
+func TestRemoveConflictFilesForOriginalErrors(t *testing.T) {
+	configDir := testConfigDir(t)
+
+	if errMsg := StartSyncthing(configDir); errMsg != "" {
+		t.Fatalf("StartSyncthing() failed: %s", errMsg)
+	}
+	defer StopSyncthing()
+
+	folderPath := filepath.Join(configDir, "skipfamilyerr")
+	if errMsg := AddFolder("skipfamilyerr", "Skip Family Err", folderPath); errMsg != "" {
+		t.Fatalf("AddFolder failed: %s", errMsg)
+	}
+
+	// Unknown folder.
+	got := RemoveConflictFilesForOriginal("nonexistent", "x.md")
+	if !strings.Contains(got, `"error":"folder not found"`) {
+		t.Errorf("unknown folder result = %q, want error 'folder not found'", got)
+	}
+
+	// Path traversal.
+	got = RemoveConflictFilesForOriginal("skipfamilyerr", "../../etc/passwd")
+	if !strings.Contains(got, `"error":"invalid path: outside folder root"`) {
+		t.Errorf("traversal result = %q, want invalid-path error", got)
+	}
+
+	// Empty / root-equivalent paths must be rejected (would otherwise scan outside folder root).
+	for _, rp := range []string{"", ".", "/"} {
+		got := RemoveConflictFilesForOriginal("skipfamilyerr", rp)
+		if !strings.Contains(got, `"error":"invalid path: outside folder root"`) {
+			t.Errorf("root path %q result = %q, want invalid-path error", rp, got)
+		}
+	}
+}
Original file line number	Diff line number	Diff line change
`@@ -45,3 +45,4 @@ appstore/`
`45`	`45`
`46`	`46`	`# Internal process docs`
`47`	`47`	`docs/release-checklist.md`
	`48`	`+docs/superpowers/`