Update sync-root-data.sh

sync-root-data.sh

@@ -23,21 +23,23 @@ data_available() {
   mkdir -p "$DATA_ROOT" 2>/dev/null || return 1
 }
 
-restore_root() {
+# /root → /data  (--update: hanya file lebih baru di root yg masuk data)
+persist_root() {
   if data_available; then
-    echo "Restoring persistent data from $DATA_ROOT to /root..."
-    rsync -rlptD --no-specials --no-devices --update "${EXCLUDES[@]}" "$DATA_ROOT/" /root/ || true
+    echo "Syncing /root → $DATA_ROOT (update: root wins if newer)..."
+    rsync -rlptD --no-specials --no-devices --update --delete "${EXCLUDES[@]}" /root/ "$DATA_ROOT/" || true
   else
-    echo "Persistent /data is not available; skipping restore."
+    echo "Persistent /data is not available; skipping persist."
   fi
 }
 
-persist_root() {
+# /data → /root  (FORCE: data selalu menang, tanpa --update)
+restore_root() {
   if data_available; then
-    echo "Syncing /root to $DATA_ROOT..."
-    rsync -rlptD --no-specials --no-devices --update --delete "${EXCLUDES[@]}" /root/ "$DATA_ROOT/" || true
+    echo "Restoring $DATA_ROOT → /root (force: data always wins)..."
+    rsync -rlptD --no-specials --no-devices "${EXCLUDES[@]}" "$DATA_ROOT/" /root/ || true
   else
-    echo "Persistent /data is not available; skipping sync."
+    echo "Persistent /data is not available; skipping restore."
   fi
 }
 
@@ -48,19 +50,27 @@ sync_config_newer() {
   if [ -f "$data_config" ] && { [ ! -f "$root_config" ] || [ "$data_config" -nt "$root_config" ]; }; then
     mkdir -p "$(dirname "$root_config")"
     cp -p "$data_config" "$root_config" || true
-    echo "Pulled newer OpenClaw config from $data_config to $root_config."
+    echo "Pulled newer OpenClaw config: $data_config → $root_config"
   elif [ -f "$root_config" ] && { [ ! -f "$data_config" ] || [ "$root_config" -nt "$data_config" ]; }; then
     mkdir -p "$(dirname "$data_config")"
     cp -p "$root_config" "$data_config" || true
-    echo "Persisted newer OpenClaw config from $root_config to $data_config."
+    echo "Persisted newer OpenClaw config: $root_config → $data_config"
   fi
 }
 
+# Urutan penting:
+#   1. persist  → /root → /data  (--update, perubahan root masuk data dulu)
+#   2. config   → two-way reconcile openclaw.json
+#   3. restore  → /data → /root  (force, data selalu menang sebagai sumber kebenaran)
+#
+# Efeknya:
+#   - Root berubah  → masuk data di step 1, restore step 3 no-op (sudah sama) ✓
+#   - Data berubah  → step 1 tidak tumpuk data (--update), step 3 force ke root   ✓
 reconcile_root_data() {
   if data_available; then
-    restore_root
-    sync_config_newer
     persist_root
+    sync_config_newer
+    restore_root
   else
     echo "Persistent /data is not available; skipping two-way sync."
   fi
@@ -83,7 +93,7 @@ case "${1:-loop}" in
     done
     ;;
   *)
-    echo "Usage: $0 {restore|persist|loop}"
+    echo "Usage: $0 {restore|persist|reconcile|loop}"
     exit 2
     ;;
-esac
+esac