@riverbankcms/sdk 0.62.4 → 0.64.0

package/dist/cli/init-docs/content/cli-reference.md

@@ -162,6 +162,7 @@ riverbankcms push --dry-run --json-diff=full
 | `--with-theme`         | Also push theme when pushing all content                                             |
 | `--sync-media`         | Sync media files from local to remote environment                                    |
 | `--overwrite-media`    | When using `--sync-media`, overwrite target media on checksum mismatch               |
+| `--merge-remote`       | Plan an entries-only three-way merge for `--env=remote` that preserves remote edits  |
 | `--delete-orphaned`    | Delete CMS entries not present in local files                                        |
 | `--auto-pull-stale`    | Automatically pull stale content and retry push                                      |
 | `--no-meta`            | Skip writing `.meta/` and media manifest files (content files still written)         |
@@ -190,6 +191,23 @@ riverbankcms push entries service-tile --env=remote --yes --delete-orphaned
 
 **Warning:** This is a destructive operation. Always use `--dry-run` first to preview which entries will be deleted.
 
+**Remote-aware entry merge:**
+
+Use `--merge-remote` when pushing entries to production and you want to preserve remote dashboard edits instead of treating local files as the whole source of truth. The CLI compares the last pulled base snapshot, local entry files, and current remote entries, then prints a merge plan. Remote runs still default to dry-run; add `--yes` only after reviewing the plan.
+
+```bash
+# Preview a merge for one content type
+riverbankcms push entries blog-post --env=remote --merge-remote
+
+# Apply after reviewing the plan
+riverbankcms push entries blog-post --env=remote --merge-remote --yes
+
+# Target a single entry
+riverbankcms push entries blog-post welcome --env=remote --merge-remote --yes
+```
+
+In v1 this mode only supports `entries` with `--env=remote`. It rejects `--env=both`, non-entry scopes, `--force`, `--delete-orphaned`, and `--auto-pull-stale`.
+
 **Stale Content Detection:**
 
 Push compares local metadata timestamps against the remote CMS. If the remote has newer changes than your last pull, push aborts by default to prevent overwriting someone else's edits.

package/dist/client/bookings.mjs

@@ -4125,10 +4125,10 @@ function SpinnerNode({
 function okWith(data) {
   return { ok: true, data };
 }
-function err2(error) {
+function err(error) {
   return { ok: false, error };
 }
-function assertNever4(value, message) {
+function assertNever3(value, message) {
   throw new Error(message ?? `Unexpected value: ${String(value)}`);
 }
 
@@ -4269,7 +4269,7 @@ function deriveBookingFormViewState(input) {
         resourceName: input.verificationState.resourceName
       };
     default:
-      return assertNever4(input.verificationState);
+      return assertNever3(input.verificationState);
   }
 }
 function resolveBookingSiteId(siteId, form) {
@@ -4319,7 +4319,7 @@ function getBookingServicePaymentSelectionMode(service) {
       case "flexible_balance":
         return "implicit_flexible_balance";
       default:
-        return assertNever4(onlyKind);
+        return assertNever3(onlyKind);
     }
   }
   if (allowedKinds.length === 2 && allowedKinds.includes("upfront") && (allowedKinds.includes("deferred_manual") || allowedKinds.includes("instalment_plan") || allowedKinds.includes("flexible_balance"))) {
@@ -4521,7 +4521,7 @@ function formatBookingSubmissionPreparationError(error) {
     case "service-missing-duration":
       return `Service "${error.serviceTitle}" is missing duration. Please update the service in the dashboard to include a duration (e.g., 30 minutes).`;
     default:
-      return assertNever4(error);
+      return assertNever3(error);
   }
 }
 function getBookingSuccessMessage(successMessage) {
@@ -4938,8 +4938,8 @@ function AltchaWidget({
       }));
       containerRef.current.appendChild(widget);
       setIsLoaded(true);
-    }).catch((err3) => {
-      console.error("Failed to load ALTCHA widget:", err3);
+    }).catch((err2) => {
+      console.error("Failed to load ALTCHA widget:", err2);
     });
     return () => {
       if (widget && containerRef.current) {
@@ -5066,7 +5066,7 @@ function multiStepReducer(state, action) {
     case "reset":
       return createInitialMultiStepState(action.initialData);
     default:
-      return assertNever4(action);
+      return assertNever3(action);
   }
 }
 function getVisibleSteps(steps, data) {
@@ -5582,8 +5582,8 @@ function ServiceResourceSelector({
           displayName: opt.label
         })) || [];
         setResources(loadedResources);
-      } catch (err3) {
-        console.error("Failed to load resources:", err3);
+      } catch (err2) {
+        console.error("Failed to load resources:", err2);
         setResourceError("Failed to load practitioners. Please try again.");
         setResources([]);
       } finally {
@@ -6015,8 +6015,8 @@ function useAvailableSlots({
             resourceId: asAppointmentResourceId(slot.resourceId)
           }))
         );
-      } catch (err3) {
-        setError(err3 instanceof Error ? err3.message : "Failed to load available times");
+      } catch (err2) {
+        setError(err2 instanceof Error ? err2.message : "Failed to load available times");
       } finally {
         setIsLoading(false);
       }
@@ -6070,9 +6070,9 @@ function useAvailableDates({
           start: append && prev ? prev.start : data.startDate,
           end: data.endDate
         }));
-      } catch (err3) {
+      } catch (err2) {
         if (requestId !== requestIdRef.current) return;
-        setError(err3 instanceof Error ? err3.message : "Failed to load available dates");
+        setError(err2 instanceof Error ? err2.message : "Failed to load available dates");
       } finally {
         if (requestId === requestIdRef.current) {
           setIsLoading(false);
@@ -6397,7 +6397,7 @@ function buildBookingPaymentOptionViewModel(input) {
       };
     }
     default:
-      return assertNever4(input.option);
+      return assertNever3(input.option);
   }
 }
 function buildInstalmentSchedulePreview(input) {
@@ -6454,7 +6454,7 @@ function buildInstalmentSchedulePreview(input) {
       })));
     }
     default:
-      return assertNever4(input.option.plan);
+      return assertNever3(input.option.plan);
   }
 }
 function getPaymentCadenceLabel(plan) {
@@ -7246,7 +7246,7 @@ function pollingReducer(state, action) {
         case "timeout":
           return state;
         default:
-          return assertNever4(state);
+          return assertNever3(state);
       }
     case "polling-timed-out":
       return {
@@ -7255,7 +7255,7 @@ function pollingReducer(state, action) {
         error: new Error("Polling timed out")
       };
     default:
-      return assertNever4(action);
+      return assertNever3(action);
   }
 }
 
@@ -7320,13 +7320,13 @@ function usePolling(config) {
       dispatch({ type: "polling-progressed", result: data });
       isPollingRef.current = false;
       return false;
-    } catch (err3) {
+    } catch (err2) {
       if (generation !== generationRef.current || !isActiveRef.current) {
         isPollingRef.current = false;
         return true;
       }
-      if (err3 instanceof Error) {
-        dispatch({ type: "polling-request-failed", error: err3 });
+      if (err2 instanceof Error) {
+        dispatch({ type: "polling-request-failed", error: err2 });
       }
       isPollingRef.current = false;
       return false;
@@ -7429,7 +7429,7 @@ function bookingSubmissionReducer(state, action) {
         feedback: { tag: "idle" }
       };
     default:
-      return assertNever4(action);
+      return assertNever3(action);
   }
 }
 function selectIsSubmitting2(state) {
@@ -7481,7 +7481,7 @@ function useBookingSubmission(_siteId) {
         type: "submission-failed",
         message
       });
-      return err2(message);
+      return err(message);
     }
   };
   return {
@@ -8557,8 +8557,8 @@ function useBookingFormConfig(siteId, formId) {
           } catch {
           }
         }
-      } catch (err3) {
-        console.error("Failed to load form:", err3);
+      } catch (err2) {
+        console.error("Failed to load form:", err2);
         if (mounted) {
           setError("Failed to load booking form. Please try again later.");
         }