From 852d6d373c050ba7b10510683e06cb5012a024b2 Mon Sep 17 00:00:00 2001
From: mirivlad <mirvtop@yandex.ru>
Date: Tue, 2 Jun 2026 08:02:07 +0800
Subject: [PATCH] fix(sync): send LastSeenServerSeq from CLI push, report
 conflicts

---
 cmd/verstak/main.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cmd/verstak/main.go b/cmd/verstak/main.go
index 9be6b03..a83fbbd 100644
--- a/cmd/verstak/main.go
+++ b/cmd/verstak/main.go
@@ -672,6 +672,11 @@ func runSyncPush(args []string) {
 		return
 	}
 
+	_, _, lastSeq, _, _ := syncSvc.GetState()
+	for i := range unpushed {
+		unpushed[i].LastSeenServerSeq = lastSeq
+	}
+
 	result, err := client.Push(unpushed)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Push failed: %v\n", err)
@@ -684,6 +689,9 @@ func runSyncPush(args []string) {
 	}
 
 	fmt.Printf("Pushed %d ops, accepted %d\n", len(unpushed), len(result.Accepted))
+	if len(result.Conflicts) > 0 {
+		fmt.Printf("WARNING: %d conflict(s) detected\n", len(result.Conflicts))
+	}
 }
 
 func runSyncPull(args []string) {