@pantheon-systems/puck-css 0.4.0

package/dist/merge/components/merge-resolution/ResolutionStrategyPicker.d.ts

@@ -0,0 +1,16 @@
+/**
+ * ResolutionStrategyPicker Component
+ *
+ * Three-button toggle group for choosing a merge resolution strategy.
+ * Cherry-pick is disabled for delete-type conflicts.
+ */
+import React from 'react';
+import type { DocumentConflictType } from '@pantheon-systems/css-client';
+import type { DocumentResolutionStrategy } from '../../useMergeResolution.js';
+export interface ResolutionStrategyPickerProps {
+    currentStrategy: DocumentResolutionStrategy;
+    conflictType: DocumentConflictType;
+    onSelect: (strategy: DocumentResolutionStrategy) => void;
+}
+export declare function ResolutionStrategyPicker({ currentStrategy, conflictType, onSelect, }: ResolutionStrategyPickerProps): React.ReactElement;
+//# sourceMappingURL=ResolutionStrategyPicker.d.ts.map

package/dist/merge/components/merge-resolution/ResolutionStrategyPicker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResolutionStrategyPicker.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/ResolutionStrategyPicker.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,MAAM,WAAW,6BAA6B;IAC5C,eAAe,EAAE,0BAA0B,CAAC;IAC5C,YAAY,EAAE,oBAAoB,CAAC;IACnC,QAAQ,EAAE,CAAC,QAAQ,EAAE,0BAA0B,KAAK,IAAI,CAAC;CAC1D;AAMD,wBAAgB,wBAAwB,CAAC,EACvC,eAAe,EACf,YAAY,EACZ,QAAQ,GACT,EAAE,6BAA6B,GAAG,KAAK,CAAC,YAAY,CAmBpD"}

package/dist/merge/components/merge-resolution/ResolutionStrategyPicker.js

@@ -0,0 +1,15 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { SegmentedButton } from '@pantheon-systems/pds-toolkit-react';
+function isDeleteConflict(conflictType) {
+    return conflictType === 'deleted-in-source' || conflictType === 'deleted-in-target';
+}
+export function ResolutionStrategyPicker({ currentStrategy, conflictType, onSelect, }) {
+    const isDelete = isDeleteConflict(conflictType);
+    const options = [
+        { label: 'Accept Draft', value: 'accept-draft' },
+        { label: 'Accept Live', value: 'accept-live' },
+        { label: 'Cherry-pick', value: 'cherry-pick', disabled: isDelete },
+    ];
+    return (_jsx(SegmentedButton, { id: "resolution-strategy", label: "Resolution strategy", size: "s", value: currentStrategy, options: options, onChange: (value) => onSelect(value) }));
+}
+//# sourceMappingURL=ResolutionStrategyPicker.js.map

package/dist/merge/components/merge-resolution/ResolutionStrategyPicker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResolutionStrategyPicker.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/ResolutionStrategyPicker.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAUtE,SAAS,gBAAgB,CAAC,YAAkC;IAC1D,OAAO,YAAY,KAAK,mBAAmB,IAAI,YAAY,KAAK,mBAAmB,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EACvC,eAAe,EACf,YAAY,EACZ,QAAQ,GACsB;IAC9B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAG;QACd,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,cAAc,EAAE;QAChD,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE;QAC9C,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE;KACnE,CAAC;IAEF,OAAO,CACL,KAAC,eAAe,IACd,EAAE,EAAC,qBAAqB,EACxB,KAAK,EAAC,qBAAqB,EAC3B,IAAI,EAAC,GAAG,EACR,KAAK,EAAE,eAAe,EACtB,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAmC,CAAC,GAClE,CACH,CAAC;AACJ,CAAC"}

package/dist/merge/components/merge-resolution/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Merge Resolution Components - Barrel Export
+ */
+export { MergeReviewPage } from './MergeReviewPage.js';
+export type { MergeReviewPageProps } from './MergeReviewPage.js';
+export { MergeResolutionPage } from './MergeResolutionPage.js';
+export type { MergeResolutionPageProps } from './MergeResolutionPage.js';
+export { DocumentResolutionList } from './DocumentResolutionList.js';
+export type { DocumentResolutionListProps, DiffCounts } from './DocumentResolutionList.js';
+export { DocumentResolutionDetail } from './DocumentResolutionDetail.js';
+export type { DocumentResolutionDetailProps } from './DocumentResolutionDetail.js';
+export { ResolutionStrategyPicker } from './ResolutionStrategyPicker.js';
+export type { ResolutionStrategyPickerProps } from './ResolutionStrategyPicker.js';
+export { MergeResolutionToolbar } from './MergeResolutionToolbar.js';
+export type { MergeResolutionToolbarProps } from './MergeResolutionToolbar.js';
+export { ComponentClickOverlay } from './ComponentClickOverlay.js';
+export type { ComponentClickOverlayProps } from './ComponentClickOverlay.js';
+export { CherryPickVisualPanel } from './CherryPickVisualPanel.js';
+export type { CherryPickVisualPanelProps } from './CherryPickVisualPanel.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/merge/components/merge-resolution/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,YAAY,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,YAAY,EAAE,2BAA2B,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAE3F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAEnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EAAE,6BAA6B,EAAE,MAAM,+BAA+B,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,YAAY,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAE/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,YAAY,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAE7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,YAAY,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/merge/components/merge-resolution/index.js

@@ -0,0 +1,12 @@
+/**
+ * Merge Resolution Components - Barrel Export
+ */
+export { MergeReviewPage } from './MergeReviewPage.js';
+export { MergeResolutionPage } from './MergeResolutionPage.js';
+export { DocumentResolutionList } from './DocumentResolutionList.js';
+export { DocumentResolutionDetail } from './DocumentResolutionDetail.js';
+export { ResolutionStrategyPicker } from './ResolutionStrategyPicker.js';
+export { MergeResolutionToolbar } from './MergeResolutionToolbar.js';
+export { ComponentClickOverlay } from './ComponentClickOverlay.js';
+export { CherryPickVisualPanel } from './CherryPickVisualPanel.js';
+//# sourceMappingURL=index.js.map

package/dist/merge/components/merge-resolution/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/merge/components/merge-resolution/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAGnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/merge/index.d.ts

@@ -0,0 +1,8 @@
+export { useMergeResolution } from './useMergeResolution.js';
+export type { UseMergeResolutionOptions, UseMergeResolutionReturn } from './useMergeResolution.js';
+export * from './components/merge-resolution/index.js';
+export * from './components/conflict-resolution/index.js';
+export * from './components/conflict-notifications/index.js';
+export { classifyPuckFields } from './utils/puckFieldClassifier.js';
+export type { PuckFieldClassification, PuckComponentConflict, ResolutionMap } from './utils/puckFieldClassifier.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/merge/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,YAAY,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAEnG,cAAc,wCAAwC,CAAC;AACvD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8CAA8C,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,YAAY,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC"}

package/dist/merge/index.js

@@ -0,0 +1,6 @@
+export { useMergeResolution } from './useMergeResolution.js';
+export * from './components/merge-resolution/index.js';
+export * from './components/conflict-resolution/index.js';
+export * from './components/conflict-notifications/index.js';
+export { classifyPuckFields } from './utils/puckFieldClassifier.js';
+//# sourceMappingURL=index.js.map

package/dist/merge/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,cAAc,wCAAwC,CAAC;AACvD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8CAA8C,CAAC;AAE7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC"}

package/dist/merge/useMergeResolution.d.ts

@@ -0,0 +1,65 @@
+/**
+ * useMergeResolution Hook
+ *
+ * Central state machine for multi-document merge conflict resolution.
+ * Manages document list, per-document strategy selection, cherry-pick
+ * state, CRDT preview fetching, navigation, and merge execution.
+ */
+import type { P1Client, PuckData, DocumentConflictType, MergeRequest } from '@pantheon-systems/css-client';
+import type { PuckFieldClassification } from './utils/puckFieldClassifier.js';
+export type DocumentResolutionStrategy = 'accept-draft' | 'accept-live' | 'cherry-pick' | 'unresolved';
+/** How this document changed in the merge */
+export type DocumentChangeType = 'new-on-draft' | 'draft-changed' | 'conflicting' | 'deleted-on-draft' | 'deleted-on-main';
+export interface DocumentResolution {
+    documentId: string;
+    documentPath: string;
+    strategy: DocumentResolutionStrategy;
+    /** How this document changed in the merge */
+    changeType: DocumentChangeType;
+    cherryPickSelections: Record<string, 'source' | 'target'>;
+    mergedSnapshot: PuckData | null;
+    sourceSnapshot: PuckData | null;
+    targetSnapshot: PuckData | null;
+    conflictType: DocumentConflictType;
+    classifiedFields: PuckFieldClassification[] | null;
+}
+export interface UseMergeResolutionOptions {
+    client: P1Client;
+    siteId: string;
+    sourceBranchId: string;
+    targetBranchId: string;
+    sourceBranchName: string;
+    targetBranchName: string;
+}
+export interface UseMergeResolutionReturn {
+    documents: DocumentResolution[];
+    currentIndex: number;
+    currentDocument: DocumentResolution | null;
+    totalCount: number;
+    resolvedCount: number;
+    unresolvedCount: number;
+    allResolved: boolean;
+    previewLoading: boolean;
+    previewError: string | null;
+    mergeExecuting: boolean;
+    mergeError: string | null;
+    mergeSuccess: boolean;
+    mergeRequest: MergeRequest | null;
+    mergeRequestCreating: boolean;
+    mergeRequestError: string | null;
+    createMergeRequest: (title?: string) => Promise<void>;
+    approveMergeRequest: () => Promise<void>;
+    goToDocument: (index: number) => void;
+    goToNext: () => void;
+    goToPrevious: () => void;
+    goToNextUnresolved: () => void;
+    setStrategy: (documentId: string, strategy: DocumentResolutionStrategy) => void;
+    setAllStrategy: (strategy: 'accept-draft' | 'accept-live') => void;
+    setRemainingStrategy: (strategy: 'accept-draft' | 'accept-live') => void;
+    setCherryPickSelection: (documentId: string, componentId: string, propName: string, choice: 'source' | 'target') => void;
+    acceptAllComponentProps: (documentId: string, componentId: string, choice: 'source' | 'target') => void;
+    executeMerge: (message?: string) => Promise<void>;
+    loadPreview: () => Promise<void>;
+}
+export declare function useMergeResolution(options: UseMergeResolutionOptions): UseMergeResolutionReturn;
+//# sourceMappingURL=useMergeResolution.d.ts.map

package/dist/merge/useMergeResolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useMergeResolution.d.ts","sourceRoot":"","sources":["../../src/merge/useMergeResolution.ts"],"names":[],"mappings":"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"}

package/dist/merge/useMergeResolution.js

@@ -0,0 +1,444 @@
+/**
+ * useMergeResolution Hook
+ *
+ * Central state machine for multi-document merge conflict resolution.
+ * Manages document list, per-document strategy selection, cherry-pick
+ * state, CRDT preview fetching, navigation, and merge execution.
+ */
+import { useState, useCallback, useMemo } from 'react';
+import { classifyPuckFields, buildMergedSnapshot, } from './utils/puckFieldClassifier.js';
+// =============================================================================
+// Helper: determine if a conflict type allows cherry-pick / CRDT
+// =============================================================================
+function isDeleteConflict(conflictType) {
+    return conflictType === 'deleted-in-source' || conflictType === 'deleted-in-target';
+}
+// =============================================================================
+// Hook Implementation
+// =============================================================================
+export function useMergeResolution(options) {
+    const { client, siteId, sourceBranchId, targetBranchId } = options;
+    const [documents, setDocuments] = useState([]);
+    const [currentIndex, setCurrentIndex] = useState(0);
+    const [previewLoading, setPreviewLoading] = useState(false);
+    const [previewError, setPreviewError] = useState(null);
+    const [mergeExecuting, setMergeExecuting] = useState(false);
+    const [mergeError, setMergeError] = useState(null);
+    const [mergeSuccess, setMergeSuccess] = useState(false);
+    const [mergeRequest, setMergeRequest] = useState(null);
+    const [mergeRequestCreating, setMergeRequestCreating] = useState(false);
+    const [mergeRequestError, setMergeRequestError] = useState(null);
+    // Derived state
+    const currentDocument = useMemo(() => documents[currentIndex] ?? null, [documents, currentIndex]);
+    const totalCount = documents.length;
+    const resolvedCount = useMemo(() => documents.filter((d) => d.strategy !== 'unresolved').length, [documents]);
+    const unresolvedCount = useMemo(() => documents.filter((d) => d.strategy === 'unresolved').length, [documents]);
+    const allResolved = useMemo(() => documents.length > 0 && unresolvedCount === 0, [documents.length, unresolvedCount]);
+    // =========================================================================
+    // Load preview
+    // =========================================================================
+    const loadPreview = useCallback(async () => {
+        setPreviewLoading(true);
+        setPreviewError(null);
+        try {
+            const preview = await client.merge.preview(siteId, sourceBranchId, targetBranchId, { includeContent: true, excludePathPrefixes: ['_registry/'] });
+            // Build conflict set for quick lookup
+            const conflictDocIds = new Set(preview.conflicts.documentConflicts.map((c) => c.documentId));
+            const conflictMap = new Map(preview.conflicts.documentConflicts.map((c) => [c.documentId, c]));
+            // Build source and target change sets
+            const sourceChangeMap = new Map(preview.sourceChanges.map((c) => [c.documentId, c]));
+            const targetChangeMap = new Map(preview.targetChanges.map((c) => [c.documentId, c]));
+            // Build diff map for quick lookup
+            const diffMap = new Map((preview.documentDiffs ?? []).map((d) => [d.documentId, d]));
+            // Collect document IDs from conflicts and source (Draft) changes only.
+            // Target-only changes are already on Live and are not part of the merge.
+            const allDocIds = new Set();
+            for (const c of preview.conflicts.documentConflicts) {
+                allDocIds.add(c.documentId);
+            }
+            for (const sc of preview.sourceChanges) {
+                allDocIds.add(sc.documentId);
+            }
+            // Fetch snapshots for non-conflicting documents in parallel
+            const snapshotFetches = new Map();
+            for (const docId of allDocIds) {
+                // Skip fetching only when the conflict diff already has both snapshots.
+                // When a snapshot is missing from the diff (backend may return null for
+                // targetSnapshot even for both-modified conflicts), fall through so we
+                // can fetch it via getLatest as a fallback.
+                if (conflictDocIds.has(docId) && diffMap.has(docId)) {
+                    const d = diffMap.get(docId);
+                    if (d?.sourceSnapshot && d.targetSnapshot) {
+                        continue;
+                    }
+                }
+                // For non-conflicting docs (and conflicting docs with incomplete diff
+                // snapshots), fetch snapshots via versions API.
+                // Always try both branches — a doc may exist on the other branch
+                // via COW inheritance even if it wasn't changed there.
+                snapshotFetches.set(docId, (async () => {
+                    const results = await Promise.allSettled([
+                        client.versions.getLatest(siteId, sourceBranchId, docId),
+                        client.versions.getLatest(siteId, targetBranchId, docId),
+                    ]);
+                    const sourceResult = results[0];
+                    const targetResult = results[1];
+                    return {
+                        source: sourceResult.status === 'fulfilled'
+                            ? sourceResult.value.snapshot
+                            : null,
+                        target: targetResult.status === 'fulfilled'
+                            ? targetResult.value.snapshot
+                            : null,
+                    };
+                })());
+            }
+            // Wait for all snapshot fetches
+            const fetchedSnapshots = new Map();
+            for (const [docId, fetchPromise] of snapshotFetches) {
+                try {
+                    fetchedSnapshots.set(docId, await fetchPromise);
+                }
+                catch {
+                    fetchedSnapshots.set(docId, { source: null, target: null });
+                }
+            }
+            // Build document resolutions for all documents
+            const docs = [];
+            for (const docId of allDocIds) {
+                const conflict = conflictMap.get(docId);
+                const diff = diffMap.get(docId);
+                const inSource = sourceChangeMap.has(docId);
+                const inTarget = targetChangeMap.has(docId);
+                const isConflicting = conflictDocIds.has(docId);
+                // Determine change path info
+                const docPath = conflict?.documentPath
+                    ?? diff?.documentPath
+                    ?? sourceChangeMap.get(docId)?.documentPath
+                    ?? targetChangeMap.get(docId)?.documentPath
+                    ?? docId;
+                // Determine changeType, strategy, and conflictType
+                let changeType;
+                let strategy;
+                let conflictType;
+                if (isConflicting) {
+                    if (conflict?.conflictType === 'deleted-in-target') {
+                        changeType = 'deleted-on-main';
+                    }
+                    else {
+                        changeType = 'conflicting';
+                    }
+                    strategy = 'unresolved';
+                    conflictType = conflict?.conflictType ?? 'both-modified';
+                }
+                else if (inSource && !inTarget) {
+                    const sourceChange = sourceChangeMap.get(docId);
+                    const snapshots = fetchedSnapshots.get(docId);
+                    if (sourceChange?.isDeleted) {
+                        // State 5: Document deleted on Draft
+                        changeType = 'deleted-on-draft';
+                        strategy = 'accept-draft'; // Will delete on merge
+                    }
+                    else if (snapshots?.target === null) {
+                        // State 1: New document on Draft, doesn't exist on Live
+                        changeType = 'new-on-draft';
+                        strategy = 'accept-draft';
+                    }
+                    else {
+                        // State 3: Document changed on Draft, Live version is older
+                        changeType = 'draft-changed';
+                        strategy = 'accept-draft';
+                    }
+                    conflictType = 'both-modified'; // Not actually a conflict
+                }
+                else {
+                    // In both sourceChanges and targetChanges but not in conflicts
+                    // (shouldn't normally happen, but handle gracefully as a source change)
+                    changeType = 'draft-changed';
+                    strategy = 'accept-draft';
+                    conflictType = 'both-modified';
+                }
+                // Get snapshots
+                let sourceSnapshot = null;
+                let targetSnapshot = null;
+                if (isConflicting && diff) {
+                    // Use snapshots from documentDiffs for conflicting docs
+                    sourceSnapshot = diff.sourceSnapshot ?? null;
+                    targetSnapshot = diff.targetSnapshot ?? null;
+                    // Fall back to separately-fetched snapshots when the conflict diff is
+                    // missing one (backend may return null targetSnapshot even for
+                    // both-modified conflicts when the version isn't directly accessible).
+                    const fetched = fetchedSnapshots.get(docId);
+                    if (fetched) {
+                        if (!sourceSnapshot)
+                            sourceSnapshot = fetched.source;
+                        if (!targetSnapshot)
+                            targetSnapshot = fetched.target;
+                    }
+                }
+                else {
+                    // Use fetched snapshots for non-conflicting docs
+                    const snapshots = fetchedSnapshots.get(docId);
+                    if (snapshots) {
+                        sourceSnapshot = snapshots.source;
+                        targetSnapshot = snapshots.target;
+                    }
+                }
+                // Skip conflicts where source and target content is identical —
+                // no user action needed, the merge can proceed with either version.
+                if (isConflicting &&
+                    sourceSnapshot &&
+                    targetSnapshot &&
+                    JSON.stringify(sourceSnapshot) === JSON.stringify(targetSnapshot)) {
+                    continue;
+                }
+                // Skip internal component registry documents — these are managed
+                // automatically by useComponentRegistry and must not appear in
+                // the merge resolution UI.
+                if (docPath.startsWith('_registry/')) {
+                    continue;
+                }
+                docs.push({
+                    documentId: docId,
+                    documentPath: docPath,
+                    strategy,
+                    changeType,
+                    cherryPickSelections: {},
+                    mergedSnapshot: null,
+                    sourceSnapshot,
+                    targetSnapshot,
+                    conflictType,
+                    classifiedFields: null,
+                });
+            }
+            // Sort: conflicting first, then deleted-on-main, new, changed, deleted-on-draft
+            const changeTypeOrder = {
+                conflicting: 0,
+                'deleted-on-main': 1,
+                'new-on-draft': 2,
+                'draft-changed': 3,
+                'deleted-on-draft': 4,
+            };
+            docs.sort((a, b) => changeTypeOrder[a.changeType] - changeTypeOrder[b.changeType]);
+            setDocuments(docs);
+            setCurrentIndex(0);
+        }
+        catch (err) {
+            setPreviewError(err instanceof Error ? err.message : 'Failed to load merge preview');
+            setDocuments([]);
+        }
+        finally {
+            setPreviewLoading(false);
+        }
+    }, [client, siteId, sourceBranchId, targetBranchId]);
+    // =========================================================================
+    // Navigation
+    // =========================================================================
+    const goToDocument = useCallback((index) => {
+        if (index >= 0 && index < documents.length) {
+            setCurrentIndex(index);
+        }
+    }, [documents.length]);
+    const goToNext = useCallback(() => {
+        setCurrentIndex((prev) => Math.min(prev + 1, documents.length - 1));
+    }, [documents.length]);
+    const goToPrevious = useCallback(() => {
+        setCurrentIndex((prev) => Math.max(prev - 1, 0));
+    }, []);
+    const goToNextUnresolved = useCallback(() => {
+        if (documents.length === 0)
+            return;
+        // Search from currentIndex+1, wrapping around
+        for (let i = 1; i <= documents.length; i++) {
+            const idx = (currentIndex + i) % documents.length;
+            if (documents[idx]?.strategy === 'unresolved') {
+                setCurrentIndex(idx);
+                return;
+            }
+        }
+        // No unresolved documents found — stay put
+    }, [documents, currentIndex]);
+    // =========================================================================
+    // Strategy selection
+    // =========================================================================
+    const setStrategy = useCallback((documentId, strategy) => {
+        setDocuments((prev) => prev.map((doc) => {
+            if (doc.documentId !== documentId)
+                return doc;
+            // Disallow cherry-pick for delete conflicts
+            if (isDeleteConflict(doc.conflictType) &&
+                strategy === 'cherry-pick') {
+                return doc;
+            }
+            const updates = { strategy };
+            // When switching to cherry-pick, populate classifiedFields
+            if (strategy === 'cherry-pick' &&
+                doc.sourceSnapshot &&
+                doc.targetSnapshot) {
+                updates.classifiedFields = classifyPuckFields(doc.sourceSnapshot, doc.targetSnapshot, null);
+            }
+            return { ...doc, ...updates };
+        }));
+    }, []);
+    const setAllStrategy = useCallback((strategy) => {
+        setDocuments((prev) => prev.map((doc) => ({ ...doc, strategy })));
+    }, []);
+    const setRemainingStrategy = useCallback((strategy) => {
+        setDocuments((prev) => prev.map((doc) => doc.strategy === 'unresolved' ? { ...doc, strategy } : doc));
+    }, []);
+    // =========================================================================
+    // Cherry-pick
+    // =========================================================================
+    const setCherryPickSelection = useCallback((documentId, componentId, propName, choice) => {
+        setDocuments((prev) => prev.map((doc) => {
+            if (doc.documentId !== documentId)
+                return doc;
+            const key = `${componentId}:${propName}`;
+            const newSelections = {
+                ...doc.cherryPickSelections,
+                [key]: choice,
+            };
+            // Recompute merged snapshot
+            let mergedSnapshot = null;
+            if (doc.sourceSnapshot && doc.targetSnapshot && doc.classifiedFields) {
+                mergedSnapshot = buildMergedSnapshot(doc.sourceSnapshot, doc.targetSnapshot, doc.classifiedFields, newSelections);
+            }
+            return {
+                ...doc,
+                cherryPickSelections: newSelections,
+                mergedSnapshot,
+            };
+        }));
+    }, []);
+    const acceptAllComponentProps = useCallback((documentId, componentId, choice) => {
+        setDocuments((prev) => prev.map((doc) => {
+            if (doc.documentId !== documentId)
+                return doc;
+            if (!doc.classifiedFields)
+                return doc;
+            const newSelections = { ...doc.cherryPickSelections };
+            for (const field of doc.classifiedFields) {
+                if (field.componentId === componentId &&
+                    field.classification === 'conflicting') {
+                    newSelections[`${field.componentId}:${field.propName}`] = choice;
+                }
+            }
+            let mergedSnapshot = null;
+            if (doc.sourceSnapshot && doc.targetSnapshot) {
+                mergedSnapshot = buildMergedSnapshot(doc.sourceSnapshot, doc.targetSnapshot, doc.classifiedFields, newSelections);
+            }
+            return {
+                ...doc,
+                cherryPickSelections: newSelections,
+                mergedSnapshot,
+            };
+        }));
+    }, []);
+    // =========================================================================
+    // Merge request lifecycle
+    // =========================================================================
+    const createMergeRequest = useCallback(async (title) => {
+        setMergeRequestCreating(true);
+        setMergeRequestError(null);
+        try {
+            const mr = await client.merge.createRequest(siteId, {
+                sourceBranchId,
+                targetBranchId,
+                title: title ?? `Merge Draft → Live`,
+            });
+            setMergeRequest(mr);
+        }
+        catch (err) {
+            setMergeRequestError(err instanceof Error ? err.message : 'Failed to create merge request');
+        }
+        finally {
+            setMergeRequestCreating(false);
+        }
+    }, [client, siteId, sourceBranchId, targetBranchId]);
+    const approveMergeRequest = useCallback(async () => {
+        if (!mergeRequest)
+            return;
+        setMergeRequestError(null);
+        try {
+            const updated = await client.merge.updateRequest(siteId, mergeRequest.id, { status: 'approved' });
+            setMergeRequest(updated);
+        }
+        catch (err) {
+            setMergeRequestError(err instanceof Error ? err.message : 'Failed to approve merge request');
+        }
+    }, [client, siteId, mergeRequest]);
+    // =========================================================================
+    // Merge execution (via merge request)
+    // =========================================================================
+    const executeMerge = useCallback(async (_message) => {
+        if (!mergeRequest) {
+            setMergeError('No merge request created. Create and approve a merge request first.');
+            return;
+        }
+        if (mergeRequest.status !== 'approved' && mergeRequest.status !== 'conflicted') {
+            setMergeError(`Merge request must be approved before executing. Current status: ${mergeRequest.status}`);
+            return;
+        }
+        setMergeExecuting(true);
+        setMergeError(null);
+        setMergeSuccess(false);
+        try {
+            const resolutions = documents.map((doc) => {
+                switch (doc.strategy) {
+                    case 'accept-draft':
+                        return { documentId: doc.documentId, strategy: 'take-source' };
+                    case 'accept-live':
+                        return { documentId: doc.documentId, strategy: 'take-target' };
+                    case 'cherry-pick':
+                        return {
+                            documentId: doc.documentId,
+                            strategy: 'manual',
+                            resolvedSnapshot: doc.mergedSnapshot,
+                        };
+                    default:
+                        throw new Error(`Cannot execute merge: document "${doc.documentPath}" (${doc.documentId}) is still unresolved`);
+                }
+            });
+            await client.merge.executeRequest(siteId, mergeRequest.id, { resolutions });
+            setMergeSuccess(true);
+            setMergeRequest((prev) => prev ? { ...prev, status: 'merged' } : null);
+        }
+        catch (err) {
+            setMergeError(err instanceof Error ? err.message : 'Merge execution failed');
+        }
+        finally {
+            setMergeExecuting(false);
+        }
+    }, [client, siteId, mergeRequest, documents]);
+    return {
+        documents,
+        currentIndex,
+        currentDocument,
+        totalCount,
+        resolvedCount,
+        unresolvedCount,
+        allResolved,
+        previewLoading,
+        previewError,
+        mergeExecuting,
+        mergeError,
+        mergeSuccess,
+        mergeRequest,
+        mergeRequestCreating,
+        mergeRequestError,
+        createMergeRequest,
+        approveMergeRequest,
+        goToDocument,
+        goToNext,
+        goToPrevious,
+        goToNextUnresolved,
+        setStrategy,
+        setAllStrategy,
+        setRemainingStrategy,
+        setCherryPickSelection,
+        acceptAllComponentProps,
+        executeMerge,
+        loadPreview,
+    };
+}
+//# sourceMappingURL=useMergeResolution.js.map