emdash-emit 0.1.17 → 0.1.25

package/dist/sync/push/media_stage.js

@@ -0,0 +1,338 @@
+/*
+ * Copyright (C) 2026 SPORT-SERVICE RS★R
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import yaml from 'js-yaml';
+import { extractMediaUlid } from '../../client/mapper.js';
+import { toRootRelativeMediaUrl, resolveImageMimeType, uploadMediaFile, fetchRemoteMediaDetail, } from '../../client/media.js';
+import { classifyCodeFenceLines } from '../../client/portable-text.js';
+import { promoteDraftMediaFile } from '../media.js';
+import { ApiError } from '../../client/error.js';
+import { resolveDraftImagePath } from '../preflight.js';
+import { CANONICAL_ULID_REGEX } from '../../utils/ulid.js';
+/**
+ * Resolves the canonical media record ULID for frontmatter featuredImage.
+ *
+ * If featuredImage is a local path (draft or promoted), it resolves the mediaId from
+ * the shared uploadedByAbsPath map. Returns autoUploaded: true when resolved from
+ * a newly uploaded or reused draft image reference so that advisory verification
+ * warnings can be suppressed.
+ */
+export function resolveFeaturedImageMediaId(featuredImage, uploadedByAbsPath, filePath, workspaceRoot) {
+    if (!featuredImage)
+        return null;
+    const trimmed = featuredImage.trim();
+    if (CANONICAL_ULID_REGEX.test(trimmed)) {
+        return { mediaId: trimmed.toUpperCase(), autoUploaded: false };
+    }
+    const extracted = extractMediaUlid(trimmed);
+    if (extracted) {
+        return { mediaId: extracted.toUpperCase(), autoUploaded: false };
+    }
+    const resolved = resolveDraftImagePath(filePath, trimmed, workspaceRoot);
+    const uploaded = uploadedByAbsPath.get(resolved.candidateAbs);
+    if (uploaded) {
+        return { mediaId: uploaded.mediaId, autoUploaded: true };
+    }
+    return null;
+}
+/**
+ * Featured-image preservation / resolution helper.
+ *
+ * EmDash stores `featured_image: { id: "<ULID>" }`.
+ * When pushing an article whose frontmatter sets `featuredImage: <ULID>`, Emit cross-checks that the
+ * referenced media exists locally (or was mirrored), and preserves the exact remote object structure
+ * from the cache when unchanged.
+ */
+export function preserveOrResolveFeaturedImage(payload, featuredImage, cache, id, workspaceRoot, options) {
+    const warnings = [];
+    if (featuredImage === undefined)
+        return warnings;
+    if (featuredImage === null) {
+        payload.data.featured_image = null;
+        return warnings;
+    }
+    // Canonicalize once: uppercase Crockford base32. extractMediaUlid() also folds a media
+    // URL-shaped value back to its ULID so cached-remote comparison still succeeds.
+    const targetUlid = (extractMediaUlid(featuredImage) ?? featuredImage.trim()).toUpperCase();
+    // 1. Resend the exact remote object when it already points at this media ULID.
+    if (cache) {
+        try {
+            const cachedEntry = cache.getEntry(id);
+            if (cachedEntry) {
+                const raw = JSON.parse(cachedEntry.rawJson);
+                const item = (raw.item || raw);
+                const itemData = (item.data || {});
+                const remoteFi = itemData.featured_image;
+                if (remoteFi && extractMediaUlid(remoteFi) === targetUlid) {
+                    payload.data.featured_image = remoteFi;
+                    return warnings;
+                }
+            }
+        }
+        catch (err) {
+            // Non-fatal: cache inspection failure falls through to canonical minimal payload.
+            warnings.push(`[push] Unable to inspect cache for featured_image restoration: ${err.message}`);
+        }
+    }
+    // 2. Cross-check the reference against the workspace media mirror (verification only).
+    //    A missing entry here is NOT a payload problem - { id: <ULID> } is a valid request that
+    //    EmDash resolves. It only means Emit cannot confirm the media exists, which is exactly
+    //    where a hallucinated or mistyped ULID would surface. A workspace that does not mirror
+    //    media (no media/, or an empty one) is not warned about.
+    //    Skipped when featuredImage was just auto-uploaded from drafts (R1).
+    if (workspaceRoot && !options?.skipCompanionCheck) {
+        const mediaDir = path.join(workspaceRoot, 'media');
+        const mirrored = fs.existsSync(mediaDir) ? fs.readdirSync(mediaDir) : [];
+        if (mirrored.length > 0) {
+            let companionFound = false;
+            let mismatchedCompanion = null;
+            for (const f of mirrored) {
+                if (!f.endsWith('.yaml') || f.startsWith('legacy_'))
+                    continue;
+                try {
+                    const meta = yaml.load(fs.readFileSync(path.join(mediaDir, f), 'utf8'));
+                    const metaId = typeof meta?.id === 'string' ? meta.id.trim().toUpperCase() : undefined;
+                    if (metaId === targetUlid) {
+                        companionFound = true;
+                        break;
+                    }
+                    if ((f.includes(`_${targetUlid}-`) || f.startsWith(`${targetUlid}-`)) &&
+                        metaId &&
+                        metaId !== targetUlid) {
+                        mismatchedCompanion = { name: f, metaId };
+                    }
+                }
+                catch (err) {
+                    // Non-fatal: metadata inspection is advisory only.
+                    warnings.push(`[push] Failed to read local media metadata '${f}': ${err.message}`);
+                }
+            }
+            if (!companionFound) {
+                if (mismatchedCompanion) {
+                    warnings.push(`Local media metadata '${mismatchedCompanion.name}' describes a different media ID (${mismatchedCompanion.metaId}); it was ignored for featuredImage ${targetUlid}.`);
+                }
+                warnings.push(`featuredImage ${targetUlid} was not found in the mirrored media under media/, so Emit could not confirm this media ID exists. The ID is sent as-is and EmDash resolves it, but if the ID is wrong the hero image will be missing. Upload the image first (EmDash Admin or media_upload) and use the ULID it returns, or run "emit pull-media" to mirror remote media locally.`);
+            }
+        }
+    }
+    // 3. Canonical minimal payload (identical to what localToApiPayload produces).
+    payload.data.featured_image = { id: targetUlid };
+    return warnings;
+}
+/**
+ * Rewrites standalone local draft image lines in Markdown body to their confirmed
+ * canonical root-relative URLs (`/_emdash/api/media/file/<storageKey>`), skipping
+ * fenced code blocks and opaque block fences.
+ */
+export function rewriteDraftImagesInBody(body, draftImages, uploadedByAbsPath) {
+    if (draftImages.length === 0)
+        return body;
+    const rawPathToResult = new Map();
+    for (const ref of draftImages) {
+        const res = uploadedByAbsPath.get(ref.resolvedAbsPath);
+        if (res) {
+            rawPathToResult.set(ref.rawPath, res);
+            rawPathToResult.set(ref.rawPath.trim(), res);
+        }
+    }
+    const lines = body.split('\n');
+    // Same CommonMark-aware fence walker that G5 / G11 use, so a line can never be
+    // rewritten here while being skipped there (or vice versa).
+    const fenceStates = classifyCodeFenceLines(body);
+    const standaloneRegex = /^!\[([^\]]*)\]\(([^)]+)\)$/;
+    return lines
+        .map((line, index) => {
+        const state = fenceStates[index];
+        if (state.isFenceDelimiter || state.insideCodeFence) {
+            return line;
+        }
+        const hasCr = line.endsWith('\r');
+        const cleanLine = hasCr ? line.slice(0, -1) : line;
+        const trimmed = cleanLine.trim();
+        // Opaque EmDash block fences are managed by G9 and must stay untouched
+        if (/^<!--ec:block .+ -->$/.test(trimmed)) {
+            return line;
+        }
+        const match = trimmed.match(standaloneRegex);
+        if (!match)
+            return line;
+        const alt = match[1];
+        const rawPath = match[2];
+        const uploaded = rawPathToResult.get(rawPath) ?? rawPathToResult.get(rawPath.trim());
+        if (!uploaded)
+            return line;
+        const replaced = `![${alt}](${uploaded.url})`;
+        return hasCr ? `${replaced}\r` : replaced;
+    })
+        .join('\n');
+}
+/**
+ * Promotes uploaded draft images from `media/drafts/<filename>` into
+ * `media/<markdownRef>.<ext>` along with companion `.yaml` metadata, where markdownRef is derived from the
+ * and commits `status = 'ready'` in `media_state`.
+ *
+ * Protected by try/catch per asset (C-2) so that any local filesystem failure
+ * after a successful remote article PUT/POST is downgraded to a warning rather than
+ * aborting `saveBaseSnapshot` / `saveSyncState`.
+ */
+export function finalizePromotedDraftImages(draftImages, uploadedByAbsPath, options, warnings) {
+    if (draftImages.length === 0)
+        return;
+    const processedAbsPaths = new Set();
+    const promotedRelPaths = [];
+    const reusedRelPaths = [];
+    const unverifiedAssets = [];
+    for (const ref of draftImages) {
+        if (processedAbsPaths.has(ref.resolvedAbsPath))
+            continue;
+        processedAbsPaths.add(ref.resolvedAbsPath);
+        const uploaded = uploadedByAbsPath.get(ref.resolvedAbsPath);
+        if (ref.alreadyPromoted) {
+            reusedRelPaths.push(ref.alreadyPromoted.promotedRelPath);
+            if (uploaded?.remoteVerification === 'unknown') {
+                unverifiedAssets.push(`${ref.alreadyPromoted.promotedRelPath} (${ref.alreadyPromoted.mediaId})${uploaded.remoteVerificationNote ? `: ${uploaded.remoteVerificationNote}` : ''}`);
+            }
+            continue;
+        }
+        if (!uploaded)
+            continue;
+        if (uploaded.remoteVerification === 'unknown') {
+            unverifiedAssets.push(`${uploaded.filename} (${uploaded.mediaId})${uploaded.remoteVerificationNote ? `: ${uploaded.remoteVerificationNote}` : ''}`);
+        }
+        try {
+            const promoted = promoteDraftMediaFile({
+                workspaceRoot: options.workspaceRoot,
+                origin: options.origin,
+                draftAbsPath: ref.resolvedAbsPath,
+                item: {
+                    id: uploaded.mediaId,
+                    filename: uploaded.filename,
+                    mimeType: uploaded.mimeType,
+                    size: uploaded.size,
+                    width: uploaded.width ?? null,
+                    height: uploaded.height ?? null,
+                    alt: ref.alt || '',
+                    caption: '',
+                    storageKey: uploaded.storageKey,
+                    contentHash: uploaded.contentHash,
+                    status: 'ready',
+                    url: uploaded.url,
+                    createdAt: uploaded.createdAt || new Date().toISOString(),
+                },
+                removeDraft: true,
+            });
+            options.cache.saveMediaState({
+                localHash: uploaded.localHash,
+                mediaId: uploaded.mediaId,
+                storageKey: uploaded.storageKey,
+                url: uploaded.url,
+                workspacePath: promoted.filePath,
+                markdownRef: promoted.markdownRef,
+                status: 'ready',
+            });
+            promotedRelPaths.push(promoted.filePath);
+        }
+        catch (err) {
+            // Keep status='uploaded' in media_state so subsequent runs know the remote upload succeeded
+            warnings.push(`[LOCAL_IMAGE_AUTO_UPLOAD] Uploaded '${ref.filename}' (${uploaded.mediaId}) to remote, but failed to promote local file to media/: ${err.message}`);
+        }
+    }
+    if (promotedRelPaths.length > 0) {
+        warnings.push(`[LOCAL_IMAGE_AUTO_UPLOAD] Auto-uploaded ${promotedRelPaths.length} draft image(s) and promoted to: ${promotedRelPaths.join(', ')}`);
+    }
+    if (reusedRelPaths.length > 0) {
+        warnings.push(`[LOCAL_IMAGE_AUTO_UPLOAD] Reused ${reusedRelPaths.length} already-promoted media asset(s): ${reusedRelPaths.join(', ')}`);
+    }
+    if (unverifiedAssets.length > 0) {
+        warnings.push(`[MEDIA_EXISTENCE_UNVERIFIED] The remote server did not confirm these reused media records (GET /_emdash/api/media/{id} unsupported or failed): ${unverifiedAssets.join(', ')}. The cached /_emdash/api/media/file/<storageKey> URL was reused as-is; run "emit pull-media" to re-verify or re-upload if the images 404.`);
+    }
+}
+/**
+ * Executes P2–P4 (upload/resolve draft images and rewrite Markdown body in-memory).
+ * Already-promoted assets are verified against the remote before their canonical URL is
+ * baked into the body, so a media record deleted on the EmDash side can never produce an
+ * article that renders HTTP 404 images in production.
+ */
+export async function uploadAndRewriteDraftImages(body, draftImages, options, fetchFn) {
+    const uploadedByAbsPath = new Map();
+    if (draftImages.length === 0) {
+        return { body, uploadedByAbsPath };
+    }
+    for (const draftRef of draftImages) {
+        if (uploadedByAbsPath.has(draftRef.resolvedAbsPath)) {
+            continue;
+        }
+        if (draftRef.alreadyPromoted) {
+            const promoted = draftRef.alreadyPromoted;
+            const remoteCheck = await fetchRemoteMediaDetail(promoted.mediaId, {
+                origin: options.origin,
+                token: options.token,
+                fetchFn,
+            });
+            if (remoteCheck.exists === false) {
+                // Purge the stale local record so the next run does not keep reusing a dead URL
+                const staleState = options.cache.getMediaStateByMediaId(promoted.mediaId);
+                if (staleState) {
+                    options.cache.deleteMediaState(staleState.storageKey);
+                }
+                throw new ApiError({
+                    message: `Image '${draftRef.filename}' was already promoted to '${promoted.promotedRelPath}' (media id ${promoted.mediaId}), but that media record no longer exists on remote.`,
+                    code: 'PROMOTED_MEDIA_NOT_FOUND_REMOTE',
+                    status: 404,
+                    endpoint: `/_emdash/api/media/${promoted.mediaId}`,
+                    suggestion: 'Restore the media on the EmDash side (then run "emit pull-media"), or place the image back under media/drafts/ and push again so Emit uploads a fresh record.',
+                });
+            }
+            const detail = remoteCheck.exists === true ? remoteCheck.item : undefined;
+            const promotedStorageKey = detail?.storageKey || promoted.storageKey;
+            uploadedByAbsPath.set(draftRef.resolvedAbsPath, {
+                mediaId: promoted.mediaId,
+                storageKey: promotedStorageKey,
+                url: toRootRelativeMediaUrl(detail?.url || promoted.url, promotedStorageKey, options.origin),
+                localHash: '',
+                contentHash: '',
+                size: 0,
+                mimeType: resolveImageMimeType(draftRef.filename) || 'image/png',
+                filename: draftRef.filename,
+                deduplicated: true,
+                remoteVerification: remoteCheck.exists === true ? 'verified' : 'unknown',
+                remoteVerificationNote: remoteCheck.exists === 'unknown' ? remoteCheck.reason : undefined,
+            });
+            continue;
+        }
+        const uploadRes = await uploadMediaFile({
+            filePath: draftRef.resolvedAbsPath,
+            filename: draftRef.filename,
+            alt: draftRef.alt || undefined,
+            origin: options.origin,
+            token: options.token,
+            refreshToken: options.refreshToken,
+            cache: options.cache,
+            fetchFn: options.fetchFn,
+        });
+        uploadedByAbsPath.set(draftRef.resolvedAbsPath, uploadRes);
+    }
+    const rewrittenBody = rewriteDraftImagesInBody(body, draftImages, uploadedByAbsPath);
+    return { body: rewrittenBody, uploadedByAbsPath };
+}
+//# sourceMappingURL=media_stage.js.map

package/dist/sync/push/media_stage.js.map

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

package/dist/sync/push/merge_stage.d.ts

@@ -0,0 +1,37 @@
+import type { BaseSnapshot, SyncState } from '../../db/cache.js';
+import { type ParsedMarkdown, type TaxonomyCandidates } from '../../utils/frontmatter.js';
+import { type MergeResult } from '../merge.js';
+import type { PushOptions, PushResult } from './types.js';
+export interface ConflictResolutionOutcome {
+    handled: boolean;
+    pushResult?: PushResult;
+    mergedParsed?: ParsedMarkdown;
+    remoteParsedRev?: string;
+    mergeResult?: MergeResult;
+}
+/**
+ * Handles 409 conflict, performs GET remote, and executes Hybrid 3-Way Merge.
+ * If conflicts remain unresolved, writes conflict markers, saves quarantine copy and returns PushResult.
+ * If merged cleanly, returns mergedParsed and remoteParsedRev for PUT retry.
+ */
+export declare function resolveConflictAndMerge(params: {
+    collection: string;
+    id: string;
+    targetFilePath: string;
+    fullPath: string;
+    putUrl: string;
+    res?: Response | null;
+    taxonomyDivergenceDetected?: boolean;
+    parsed: ParsedMarkdown;
+    syncState: SyncState | null | undefined;
+    baseSnapshot: BaseSnapshot | null | undefined;
+    remoteTaxAudit: {
+        categories: string[] | null;
+        tags: string[] | null;
+    } | null;
+    candidates: TaxonomyCandidates;
+    options: PushOptions;
+    fetchFn: typeof fetch;
+    warnings: string[];
+}): Promise<ConflictResolutionOutcome>;
+//# sourceMappingURL=merge_stage.d.ts.map

package/dist/sync/push/merge_stage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge_stage.d.ts","sourceRoot":"","sources":["../../../src/sync/push/merge_stage.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAOhE,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE1D,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,UAAU,EAAE,MAAM,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,YAAY,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC;IAC9C,cAAc,EAAE;QAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC9E,UAAU,EAAE,kBAAkB,CAAC;IAC/B,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,OAAO,KAAK,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAqRrC"}

package/dist/sync/push/merge_stage.js

@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2026 SPORT-SERVICE RS★R
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import { extractComparisonRev } from '../../client/api.js';
+import { ApiError } from '../../client/error.js';
+import { apiResponseToLocal } from '../../client/mapper.js';
+import { articleContentEndpoint } from '../../client/endpoints.js';
+import { readBaseline, readBaselineFrontmatter } from '../../db/baseline.js';
+import { serializeMarkdown, } from '../../utils/frontmatter.js';
+import { hybrid3WayMerge } from '../merge.js';
+import { fetchAssignedTaxonomies, computeTaxonomyHash } from '../terms.js';
+import { calculateHash, quarantineLocalCopy, commitArticleSnapshot } from '../workspace/index.js';
+import { hasUncommittedDraftRevision } from '../../utils/draft-revision.js';
+import { resolveDiskSpelling, renderForDisk } from '../../utils/disk-spelling.js';
+import { throwRemoteArticleDeleted } from './transport.js';
+import { pendingFlagsFor } from './commit.js';
+/**
+ * Handles 409 conflict, performs GET remote, and executes Hybrid 3-Way Merge.
+ * If conflicts remain unresolved, writes conflict markers, saves quarantine copy and returns PushResult.
+ * If merged cleanly, returns mergedParsed and remoteParsedRev for PUT retry.
+ */
+export async function resolveConflictAndMerge(params) {
+    const { collection, id, targetFilePath, fullPath, putUrl, res, taxonomyDivergenceDetected, parsed, syncState, baseSnapshot, remoteTaxAudit, candidates, options, fetchFn, warnings, } = params;
+    if (res && !taxonomyDivergenceDetected) {
+        const errJson = (await res.json().catch(() => ({})));
+        const errorCode = errJson.error?.code || 'CONFLICT';
+        if (errorCode === 'ENTRY_LOCKED') {
+            throw new ApiError({
+                message: `Entry is currently locked by another user. (${errJson.error?.message || ''})`,
+                code: 'ENTRY_LOCKED',
+                status: 409,
+                endpoint: putUrl,
+                suggestion: 'Wait for the other user to finish editing or release their lock before retrying.',
+            });
+        }
+    }
+    // True revision mismatch conflict or taxonomy divergence: fetch remote latest and run Hybrid 3-Way Merge
+    const getUrl = articleContentEndpoint(options.origin, collection, id);
+    const getRes = await fetchFn(getUrl, {
+        method: 'GET',
+        headers: {
+            Authorization: `Bearer ${options.token}`,
+            Accept: 'application/json',
+        },
+    });
+    if (!getRes.ok) {
+        if (getRes.status === 404 || getRes.status === 410) {
+            throwRemoteArticleDeleted(collection, id, targetFilePath, getUrl);
+        }
+        throw new ApiError({
+            message: `Failed to fetch latest remote version during conflict resolution: ${getRes.statusText}`,
+            code: 'CONFLICT_REMOTE_FETCH_FAILED',
+            status: getRes.status,
+            endpoint: getUrl,
+            suggestion: 'Check remote server availability to resolve conflict.',
+        });
+    }
+    const remoteItem = (await getRes.json());
+    const remoteParsed = apiResponseToLocal(remoteItem, options);
+    // Fetch remote taxonomy assignments (reuse remoteTaxAudit if available)
+    const remoteTax = remoteTaxAudit ||
+        (await fetchAssignedTaxonomies({
+            origin: options.origin,
+            token: options.token,
+            collection,
+            id,
+            fetchFn,
+        }));
+    if (!remoteParsed.frontmatter.taxonomies) {
+        remoteParsed.frontmatter.taxonomies = {};
+    }
+    const baseFm = readBaselineFrontmatter(baseSnapshot);
+    if (remoteTax.categories !== null) {
+        remoteParsed.frontmatter.taxonomies.categories = remoteTax.categories;
+    }
+    else if (baseFm?.taxonomies?.categories) {
+        remoteParsed.frontmatter.taxonomies.categories = baseFm.taxonomies.categories;
+    }
+    if (remoteTax.tags !== null) {
+        remoteParsed.frontmatter.taxonomies.tags = remoteTax.tags;
+    }
+    else if (baseFm?.taxonomies?.tags) {
+        remoteParsed.frontmatter.taxonomies.tags = baseFm.taxonomies.tags;
+    }
+    // Perform Hybrid 3-Way Merge
+    const baseInfo = baseSnapshot ? readBaseline(baseSnapshot) : null;
+    const mergeResult = hybrid3WayMerge(parsed, baseInfo, {
+        frontmatter: remoteParsed.frontmatter,
+        body: remoteParsed.body,
+    }, {
+        strategy: options.resolveTaxonomy,
+    });
+    warnings.push(...mergeResult.warnings);
+    // Check destructive taxonomy wipe guard during 3-way merge (exempt if strategy is explicitly specified)
+    if (!options.resolveTaxonomy && mergeResult.wipeWarnings && mergeResult.wipeWarnings.length > 0) {
+        if (!options.allowWipeTaxonomies && !options.force) {
+            const details = mergeResult.wipeWarnings
+                .map((w) => `${w.name}: clearing ${w.remoteTerms.length} assignment(s)`)
+                .join(', ');
+            throw new ApiError({
+                endpoint: `/_emdash/api/content/${collection}/${id}`,
+                code: 'DESTRUCTIVE_TAXONOMY_WIPE',
+                status: 400,
+                message: `Local article specified empty array for taxonomies (${details}), which would wipe existing remote assignments.`,
+                suggestion: `Pass --allow-wipe-taxonomies (or --force) to confirm clearing: "emit push ${targetFilePath} --allow-wipe-taxonomies"`,
+            });
+        }
+    }
+    // Log clean auto-merged taxonomy changes
+    if (mergeResult.autoMergedTaxonomies && mergeResult.autoMergedTaxonomies.length > 0) {
+        for (const item of mergeResult.autoMergedTaxonomies) {
+            const parts = [];
+            if (item.remoteAdded.length > 0)
+                parts.push(`+${item.remoteAdded.join(', ')}`);
+            if (item.remoteRemoved.length > 0)
+                parts.push(`-${item.remoteRemoved.join(', ')}`);
+            warnings.push(`🏷️ Merged remote taxonomy change(s) for ${item.name}: ${parts.join(' ')}`);
+        }
+    }
+    // Log strategy adoptions
+    if (mergeResult.strategyAdoptions && mergeResult.strategyAdoptions.length > 0) {
+        for (const item of mergeResult.strategyAdoptions) {
+            const parts = [];
+            if (item.discardedAdded.length > 0)
+                parts.push(`+${item.discardedAdded.join(', ')}`);
+            if (item.discardedRemoved.length > 0)
+                parts.push(`-${item.discardedRemoved.join(', ')}`);
+            const discardedStr = parts.length > 0 ? `: discarded ${parts.join(' ')}` : '';
+            warnings.push(`🏷️ Resolved '${item.name}' with strategy '${item.side}'${discardedStr}.`);
+        }
+    }
+    // Fallback post-merge resolution only if strategy was NOT specified and taxonomy conflicts occurred
+    if (!options.resolveTaxonomy &&
+        mergeResult.taxonomyConflicts &&
+        mergeResult.taxonomyConflicts.length > 0) {
+        if (options.force) {
+            const strategy = 'union';
+            const unionTaxonomies = {};
+            const allTaxNames = new Set([
+                ...Object.keys(parsed.frontmatter.taxonomies || {}),
+                ...Object.keys(remoteParsed.frontmatter.taxonomies || {}),
+            ]);
+            for (const tName of allTaxNames) {
+                const lTerms = parsed.frontmatter.taxonomies?.[tName] || [];
+                const rTerms = remoteParsed.frontmatter.taxonomies?.[tName] || [];
+                unionTaxonomies[tName] = Array.from(new Set([...lTerms, ...rTerms]));
+            }
+            mergeResult.frontmatter.taxonomies = unionTaxonomies;
+            warnings.push(`Resolved taxonomy conflicts using strategy '${strategy}'.`);
+        }
+        else {
+            mergeResult.hasConflict = true;
+            warnings.push(`Conflict on taxonomies (${mergeResult.taxonomyConflicts.join(', ')}): local and remote changes could not be cleanly merged. Push aborted to prevent data loss.`);
+        }
+    }
+    if (mergeResult.hasConflict) {
+        const isTaxonomyConflict = Boolean(mergeResult.taxonomyConflicts && mergeResult.taxonomyConflicts.length > 0);
+        const hasBodyConflict = Boolean(mergeResult.body.includes('<<<<<<< LOCAL') || mergeResult.body.includes('<<<<<<< local'));
+        const isTaxonomyOnlyConflict = isTaxonomyConflict && !hasBodyConflict;
+        const remoteComparisonRev = extractComparisonRev(remoteItem, remoteParsed.rev);
+        const hasDraft = hasUncommittedDraftRevision({
+            status: remoteParsed.frontmatter.status,
+            remoteRev: remoteComparisonRev,
+        });
+        const conflictedMarkdown = serializeMarkdown(mergeResult.frontmatter, mergeResult.body, options.candidates, { hasDraftRevision: hasDraft });
+        let quarantineRel = null;
+        let activeDiskContent = conflictedMarkdown;
+        // Only write conflict markers into the article body if body actually has conflicts
+        if (!isTaxonomyOnlyConflict) {
+            const currentDisk = fs.readFileSync(fullPath, 'utf8');
+            quarantineRel = quarantineLocalCopy(options.workspaceRoot, collection, targetFilePath, currentDisk, { isForce: false });
+            const spelling = resolveDiskSpelling(currentDisk, syncState);
+            activeDiskContent = renderForDisk(conflictedMarkdown, spelling, {
+                workspaceRoot: options.workspaceRoot,
+                articleRelPath: targetFilePath,
+                fs,
+            });
+            fs.writeFileSync(fullPath, activeDiskContent, 'utf8');
+        }
+        else {
+            activeDiskContent = fs.readFileSync(fullPath, 'utf8');
+        }
+        let actualConflictCopyHash = null;
+        if (quarantineRel) {
+            const qFull = path.join(options.workspaceRoot, quarantineRel);
+            if (fs.existsSync(qFull)) {
+                actualConflictCopyHash = calculateHash(fs.readFileSync(qFull, 'utf8'));
+            }
+        }
+        const remoteTaxHash = computeTaxonomyHash(remoteParsed.frontmatter.taxonomies?.categories, remoteParsed.frontmatter.taxonomies?.tags);
+        const flags = pendingFlagsFor({
+            mode: 'conflict',
+            hasBodyConflict,
+            isTaxonomyConflict,
+            conflictedHash: actualConflictCopyHash,
+            quarantineRelPath: quarantineRel,
+            remoteTaxonomyHash: remoteTaxHash,
+        });
+        // Update sync state and base snapshot via centralized commitArticleSnapshot
+        commitArticleSnapshot(options.cache, options.workspaceRoot, {
+            id,
+            relPath: targetFilePath,
+            diskContent: activeDiskContent,
+            canonicalContent: serializeMarkdown(remoteParsed.frontmatter, remoteParsed.body, candidates, {
+                hasDraftRevision: hasDraft,
+            }),
+            frontmatter: remoteParsed.frontmatter,
+            bodyMarkdown: remoteParsed.body,
+            revForTransport: remoteParsed.rev,
+            revForComparison: remoteComparisonRev,
+            flags,
+            skipDiskWrite: true,
+        });
+        return {
+            handled: true,
+            pushResult: {
+                success: false,
+                id,
+                rev: remoteParsed.rev,
+                filePath: targetFilePath,
+                conflict: true,
+                taxonomyConflict: isTaxonomyOnlyConflict,
+                warnings,
+            },
+        };
+    }
+    // Cleanly merged: return mergedParsed for PUT retry
+    parsed.frontmatter = mergeResult.frontmatter;
+    parsed.body = mergeResult.body;
+    return {
+        handled: false,
+        mergedParsed: parsed,
+        remoteParsedRev: remoteParsed.rev,
+        mergeResult,
+    };
+}
+//# sourceMappingURL=merge_stage.js.map