Resolve remote lifecycle landing conflicts

2026-03-29 13:35:07 -07:00
parent d05830335f
commit 17ff374be7
2 changed files with 7 additions and 4 deletions
@@ -465,9 +465,12 @@ func (u *ui) describeActionError(label string, err error) string {
 		return ""
 	}
 	if errors.Is(err, webdav.ErrConflict) || strings.Contains(err.Error(), webdav.ErrConflict.Error()) {
-		return fmt.Sprintf("%s failed: remote vault changed on the server; reopen the remote vault and retry", label)
+		return "Save conflict: the remote vault changed. Reopen it and retry the save."
 	}
-	return fmt.Sprintf("%s failed: %v", label, err)
+	if label == "open remote vault" {
+		return fmt.Sprintf("%s failed: %v", label, err)
+	}
+	return err.Error()
 }

 func (u *ui) bannerSurface() uiBanner {