emdash-emit 0.1.18 → 0.1.25

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/sync/push/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EACL,mBAAmB,EAIpB,MAAM,aAAa,CAAC;AAQrB,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,GAC1B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC,CAwYrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/sync/push/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EACL,mBAAmB,EAIpB,MAAM,aAAa,CAAC;AAYrB,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,GAC1B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC,CAgbrB"}

package/dist/sync/push/index.js

@@ -33,7 +33,7 @@ import { loadLocalTaxonomyCandidates, loadLocalTaxonomyMaps } from '../taxonomie
 import { PushValidationError, assertNotQuarantinedCopy, evaluatePrePreflightGuards, evaluatePostPreflightGuards, } from './guards.js';
 import { executePreflightStage } from './preflight_stage.js';
 import { canonicalizeFrontmatterTaxonomies, syncArticleTaxonomies } from './taxonomy_plan.js';
-import { preserveOrResolveFeaturedImage, uploadAndRewriteDraftImages } from './media_stage.js';
+import { preserveOrResolveFeaturedImage, resolveFeaturedImageMediaId, uploadAndRewriteDraftImages, } from './media_stage.js';
 import { auditRemoteTaxonomies } from './tax_audit.js';
 import { resolveConflictAndMerge } from './merge_stage.js';
 import { commitPostPush } from './commit.js';
@@ -85,7 +85,8 @@ export async function pushArticle(targetFilePath, options) {
     const preflight = executePreflightStage(targetFilePath, parsed, options, syncState, baseSnapshot, knownTaxonomies);
     // 3 & 4. Post-preflight guards (G16: taxonomy conflict pending, G17: taxonomy apply pending)
     evaluatePostPreflightGuards(syncState, options, collection, id, targetFilePath);
-    const currentRev = syncState?.remoteRev || baseSnapshot?.rev || '';
+    // Track 1 (Transport Token): baseSnapshot holds the raw token from server. Prioritize it to prevent 409 conflicts.
+    const currentRev = baseSnapshot?.rev || syncState?.remoteRev || '';
     const warnings = [...preflight.warnings];
     // Load local bylines map for converting frontmatter byline slugs to ULIDs
     let bylineSlugToId = options.bylineSlugToId;
@@ -114,8 +115,16 @@ export async function pushArticle(targetFilePath, options) {
         // Upload/resolve standalone draft images and rewrite body
         const { body: rewrittenBody, uploadedByAbsPath } = await uploadAndRewriteDraftImages(parsed.body, preflight.draftImages, options, fetchFn);
         parsed.body = rewrittenBody;
+        const fiResolution = resolveFeaturedImageMediaId(parsed.frontmatter.featuredImage, uploadedByAbsPath, targetFilePath, options.workspaceRoot);
+        if (fiResolution) {
+            parsed.frontmatter.featuredImage = fiResolution.mediaId;
+        }
+        else if (parsed.frontmatter.featuredImage) {
+            // Defensive guard (W1): preflight guarantees resolution, but fail-fast if an unresolved value reaches push
+            throw new Error(`Failed to resolve featuredImage '${parsed.frontmatter.featuredImage}' to a media record ID during push.`);
+        }
         const payload = localToApiPayload(parsed, '', effectiveOptions);
-        warnings.push(...preserveOrResolveFeaturedImage(payload, parsed.frontmatter.featuredImage, options.cache, id, options.workspaceRoot));
+        warnings.push(...preserveOrResolveFeaturedImage(payload, parsed.frontmatter.featuredImage, options.cache, id, options.workspaceRoot, { skipCompanionCheck: fiResolution?.autoUploaded }));
         const postUrl = articleContentEndpoint(options.origin, collection);
         const res = await fetchFn(postUrl, {
             method: 'POST',
@@ -200,14 +209,23 @@ export async function pushArticle(targetFilePath, options) {
             fetchFn,
             warnings,
             createdItemCreatedAt: createdItem.createdAt || null,
+            updatedRawItem: createdJson,
         });
     }
     // Existing article: execute within full 7-minute entry lock lease
     return await withEntryLock(collection, id, options, async () => {
         const { body: rewrittenBody, uploadedByAbsPath } = await uploadAndRewriteDraftImages(parsed.body, preflight.draftImages, options, fetchFn);
         parsed.body = rewrittenBody;
+        const fiResolution = resolveFeaturedImageMediaId(parsed.frontmatter.featuredImage, uploadedByAbsPath, targetFilePath, options.workspaceRoot);
+        if (fiResolution) {
+            parsed.frontmatter.featuredImage = fiResolution.mediaId;
+        }
+        else if (parsed.frontmatter.featuredImage) {
+            // Defensive guard (W1): preflight guarantees resolution, but fail-fast if an unresolved value reaches push
+            throw new Error(`Failed to resolve featuredImage '${parsed.frontmatter.featuredImage}' to a media record ID during push.`);
+        }
         let payload = localToApiPayload(parsed, currentRev, effectiveOptions);
-        warnings.push(...preserveOrResolveFeaturedImage(payload, parsed.frontmatter.featuredImage, options.cache, id, options.workspaceRoot));
+        warnings.push(...preserveOrResolveFeaturedImage(payload, parsed.frontmatter.featuredImage, options.cache, id, options.workspaceRoot, { skipCompanionCheck: fiResolution?.autoUploaded }));
         const putUrl = articleContentEndpoint(options.origin, collection, id);
         // Pre-PUT Taxonomy Audit
         const { remoteTaxAudit, taxonomyDivergenceDetected } = await auditRemoteTaxonomies({
@@ -260,7 +278,10 @@ export async function pushArticle(targetFilePath, options) {
                 parsed.frontmatter = conflictOutcome.mergedParsed.frontmatter;
                 parsed.body = conflictOutcome.mergedParsed.body;
                 payload = localToApiPayload(parsed, conflictOutcome.remoteParsedRev, effectiveOptions);
-                warnings.push(...preserveOrResolveFeaturedImage(payload, parsed.frontmatter.featuredImage, options.cache, id, options.workspaceRoot));
+                warnings.push(...preserveOrResolveFeaturedImage(payload, parsed.frontmatter.featuredImage, options.cache, id, options.workspaceRoot, {
+                    skipCompanionCheck: fiResolution?.mediaId === parsed.frontmatter.featuredImage &&
+                        fiResolution?.autoUploaded,
+                }));
                 res = await fetchFn(putUrl, {
                     method: 'PUT',
                     headers: {
@@ -344,6 +365,7 @@ export async function pushArticle(targetFilePath, options) {
             warnings,
             syncState,
             baseSnapshot,
+            updatedRawItem: updatedJson,
         });
     });
 }

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

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

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

@@ -1,8 +1,23 @@
 import { type localToApiPayload } from '../../client/mapper.js';
 import { type UploadMediaResult } from '../../client/media.js';
 import type { CacheDatabase } from '../../db/cache.js';
-import type { DraftImageReference } from '../preflight.js';
+import { type DraftImageReference } from '../preflight.js';
 import type { PushOptions } from './types.js';
+export interface FeaturedImageResolveOptions {
+    skipCompanionCheck?: boolean;
+}
+/**
+ * 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 declare function resolveFeaturedImageMediaId(featuredImage: string | null | undefined, uploadedByAbsPath: Map<string, UploadMediaResult>, filePath: string, workspaceRoot?: string): {
+    mediaId: string;
+    autoUploaded: boolean;
+} | null;
 /**
  * Featured-image preservation / resolution helper.
  *
@@ -11,7 +26,7 @@ import type { PushOptions } from './types.js';
  * referenced media exists locally (or was mirrored), and preserves the exact remote object structure
  * from the cache when unchanged.
  */
-export declare function preserveOrResolveFeaturedImage(payload: ReturnType<typeof localToApiPayload>, featuredImage: string | null | undefined, cache: CacheDatabase | undefined, id: string, workspaceRoot?: string): string[];
+export declare function preserveOrResolveFeaturedImage(payload: ReturnType<typeof localToApiPayload>, featuredImage: string | null | undefined, cache: CacheDatabase | undefined, id: string, workspaceRoot?: string, options?: FeaturedImageResolveOptions): string[];
 /**
  * Rewrites standalone local draft image lines in Markdown body to their confirmed
  * canonical root-relative URLs (`/_emdash/api/media/file/<storageKey>`), skipping

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

@@ -1 +1 @@
-{"version":3,"file":"media_stage.d.ts","sourceRoot":"","sources":["../../../src/sync/push/media_stage.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAC7C,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACxC,KAAK,EAAE,aAAa,GAAG,SAAS,EAChC,EAAE,EAAE,MAAM,EACV,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,EAAE,CAyFV;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,mBAAmB,EAAE,EAClC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAChD,MAAM,CA8CR;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,mBAAmB,EAAE,EAClC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAAE,GACjB,IAAI,CA4FN;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,mBAAmB,EAAE,EAClC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,OAAO,KAAK,GACpB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CAAE,CAAC,CAwE9E"}
+{"version":3,"file":"media_stage.d.ts","sourceRoot":"","sources":["../../../src/sync/push/media_stage.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAKL,KAAK,iBAAiB,EACvB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAyB,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAElF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,2BAA2B;IAC1C,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACxC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,MAAM,GACrB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAkBnD;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,EAC7C,aAAa,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACxC,KAAK,EAAE,aAAa,GAAG,SAAS,EAChC,EAAE,EAAE,MAAM,EACV,aAAa,CAAC,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,2BAA2B,GACpC,MAAM,EAAE,CA0FV;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,mBAAmB,EAAE,EAClC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAChD,MAAM,CA8CR;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,mBAAmB,EAAE,EAClC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,EACjD,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAAE,GACjB,IAAI,CA4FN;AAED;;;;;GAKG;AACH,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,mBAAmB,EAAE,EAClC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,OAAO,KAAK,GACpB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAA;CAAE,CAAC,CAwE9E"}

package/dist/sync/push/media_stage.js

@@ -27,6 +27,34 @@ import { toRootRelativeMediaUrl, resolveImageMimeType, uploadMediaFile, fetchRem
 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.
  *
@@ -35,7 +63,7 @@ import { ApiError } from '../../client/error.js';
  * 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) {
+export function preserveOrResolveFeaturedImage(payload, featuredImage, cache, id, workspaceRoot, options) {
     const warnings = [];
     if (featuredImage === undefined)
         return warnings;
@@ -71,7 +99,8 @@ export function preserveOrResolveFeaturedImage(payload, featuredImage, cache, id
     //    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.
-    if (workspaceRoot) {
+    //    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) {

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

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

@@ -1 +1 @@
-{"version":3,"file":"merge_stage.d.ts","sourceRoot":"","sources":["../../../src/sync/push/merge_stage.ts"],"names":[],"mappings":"AA4BA,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;AAKhE,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,CA6QrC"}
+{"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

@@ -21,14 +21,17 @@
  */
 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, createBaseSnapshot } from '../../db/baseline.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 } from '../workspace/index.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';
 /**
@@ -174,13 +177,28 @@ export async function resolveConflictAndMerge(params) {
         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 conflictedMarkdown = serializeMarkdown(mergeResult.frontmatter, mergeResult.body, options.candidates);
+        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 });
-            fs.writeFileSync(fullPath, conflictedMarkdown, 'utf8');
+            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) {
@@ -198,25 +216,21 @@ export async function resolveConflictAndMerge(params) {
             quarantineRelPath: quarantineRel,
             remoteTaxonomyHash: remoteTaxHash,
         });
-        // Update sync state:
-        // Do NOT overwrite localHash with marker hash, so `status` remains clean when markers are cleaned up!
-        options.cache.saveSyncState({
-            id,
-            localFilePath: targetFilePath,
-            localHash: syncState?.localHash || '',
-            remoteRev: remoteParsed.rev,
-            status: parsed.frontmatter.status,
-            slug: parsed.frontmatter.slug,
-            lastSyncedAt: Math.floor(Date.now() / 1000),
-            ...flags,
-        });
-        options.cache.saveBaseSnapshot(createBaseSnapshot({
+        // Update sync state and base snapshot via centralized commitArticleSnapshot
+        commitArticleSnapshot(options.cache, options.workspaceRoot, {
             id,
-            rev: remoteParsed.rev,
-            bodyMarkdown: remoteParsed.body,
+            relPath: targetFilePath,
+            diskContent: activeDiskContent,
+            canonicalContent: serializeMarkdown(remoteParsed.frontmatter, remoteParsed.body, candidates, {
+                hasDraftRevision: hasDraft,
+            }),
             frontmatter: remoteParsed.frontmatter,
-            hash: calculateHash(serializeMarkdown(remoteParsed.frontmatter, remoteParsed.body, candidates)),
-        }));
+            bodyMarkdown: remoteParsed.body,
+            revForTransport: remoteParsed.rev,
+            revForComparison: remoteComparisonRev,
+            flags,
+            skipDiskWrite: true,
+        });
         return {
             handled: true,
             pushResult: {

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

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

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

@@ -2,7 +2,11 @@ import type { PushOptions } from './types.js';
 /**
  * Transitions article publish/draft status via dedicated EmDash endpoints.
  */
-export declare function transitionContentStatus(collection: string, id: string, targetStatus: 'draft' | 'published', currentRev: string, publishedAt: string | null | undefined, options: PushOptions, fetchFn: typeof fetch): Promise<string>;
+export interface StatusTransitionResult {
+    rev: string;
+    rawJson?: Record<string, unknown>;
+}
+export declare function transitionContentStatus(collection: string, id: string, targetStatus: 'draft' | 'published', currentRev: string, publishedAt: string | null | undefined, options: PushOptions, fetchFn: typeof fetch): Promise<StatusTransitionResult>;
 /**
  * Standardized error thrower when a remote article 404s or 410s on update.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/sync/push/transport.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,YAAY,EAAE,OAAO,GAAG,WAAW,EACnC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,OAAO,KAAK,GACpB,OAAO,CAAC,MAAM,CAAC,CAsCjB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,KAAK,CAYP"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/sync/push/transport.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,YAAY,EAAE,OAAO,GAAG,WAAW,EACnC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,OAAO,KAAK,GACpB,OAAO,CAAC,sBAAsB,CAAC,CAyCjC;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf,KAAK,CAYP"}

package/dist/sync/push/transport.js

@@ -22,9 +22,6 @@
 import { ApiError } from '../../client/error.js';
 import { extractRev } from '../../client/api.js';
 import { articleStatusTransitionEndpoint } from '../../client/endpoints.js';
-/**
- * Transitions article publish/draft status via dedicated EmDash endpoints.
- */
 export async function transitionContentStatus(collection, id, targetStatus, currentRev, publishedAt, options, fetchFn) {
     const isPublishing = targetStatus === 'published';
     const endpoint = articleStatusTransitionEndpoint(options.origin, collection, id, isPublishing ? 'publish' : 'unpublish');
@@ -53,7 +50,10 @@ export async function transitionContentStatus(collection, id, targetStatus, curr
         });
     }
     const json = (await res.json().catch(() => ({})));
-    return extractRev(json, currentRev);
+    return {
+        rev: extractRev(json, currentRev),
+        rawJson: json,
+    };
 }
 /**
  * Standardized error thrower when a remote article 404s or 410s on update.

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

@@ -1 +1 @@
-{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/sync/push/transport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,2BAA2B,CAAC;AAG5E;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,UAAkB,EAClB,EAAU,EACV,YAAmC,EACnC,UAAkB,EAClB,WAAsC,EACtC,OAAoB,EACpB,OAAqB;IAErB,MAAM,YAAY,GAAG,YAAY,KAAK,WAAW,CAAC;IAClD,MAAM,QAAQ,GAAG,+BAA+B,CAC9C,OAAO,CAAC,MAAM,EACd,UAAU,EACV,EAAE,EACF,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CACvC,CAAC;IAEF,MAAM,IAAI,GAA4B,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC3D,IAAI,YAAY,IAAI,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE;QAClC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,KAAK,EAAE;YACxC,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,QAAQ,CAAC;YACjB,OAAO,EAAE,aAAa,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,aAAa,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1H,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB;YAC1D,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,QAAQ;YACR,UAAU,EAAE,YAAY;gBACtB,CAAC,CAAC,gDAAgD;gBAClD,CAAC,CAAC,kDAAkD;SACvD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAA4B,CAAC;IAC7E,OAAO,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AACtC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,EAAU,EACV,cAAsB,EACtB,QAAgB;IAEhB,MAAM,IAAI,QAAQ,CAAC;QACjB,QAAQ;QACR,IAAI,EAAE,wBAAwB;QAC9B,MAAM,EAAE,GAAG;QACX,OAAO,EAAE,WAAW,EAAE,KAAK,cAAc,qCAAqC;QAC9E,UAAU,EAAE;YACV,sHAAsH;YACtH,kDAAkD,EAAE,8DAA8D;YAClH,8CAA8C,cAAc,yBAAyB;SACtF,CAAC,IAAI,CAAC,MAAM,CAAC;KACf,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/sync/push/transport.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,+BAA+B,EAAE,MAAM,2BAA2B,CAAC;AAW5E,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,UAAkB,EAClB,EAAU,EACV,YAAmC,EACnC,UAAkB,EAClB,WAAsC,EACtC,OAAoB,EACpB,OAAqB;IAErB,MAAM,YAAY,GAAG,YAAY,KAAK,WAAW,CAAC;IAClD,MAAM,QAAQ,GAAG,+BAA+B,CAC9C,OAAO,CAAC,MAAM,EACd,UAAU,EACV,EAAE,EACF,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CACvC,CAAC;IAEF,MAAM,IAAI,GAA4B,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC3D,IAAI,YAAY,IAAI,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE;QAClC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,aAAa,EAAE,UAAU,OAAO,CAAC,KAAK,EAAE;YACxC,cAAc,EAAE,kBAAkB;SACnC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,QAAQ,CAAC;YACjB,OAAO,EAAE,aAAa,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,aAAa,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;YAC1H,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB;YAC1D,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,QAAQ;YACR,UAAU,EAAE,YAAY;gBACtB,CAAC,CAAC,gDAAgD;gBAClD,CAAC,CAAC,kDAAkD;SACvD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAA4B,CAAC;IAC7E,OAAO;QACL,GAAG,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC;QACjC,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAkB,EAClB,EAAU,EACV,cAAsB,EACtB,QAAgB;IAEhB,MAAM,IAAI,QAAQ,CAAC;QACjB,QAAQ;QACR,IAAI,EAAE,wBAAwB;QAC9B,MAAM,EAAE,GAAG;QACX,OAAO,EAAE,WAAW,EAAE,KAAK,cAAc,qCAAqC;QAC9E,UAAU,EAAE;YACV,sHAAsH;YACtH,kDAAkD,EAAE,8DAA8D;YAClH,8CAA8C,cAAc,yBAAyB;SACtF,CAAC,IAAI,CAAC,MAAM,CAAC;KACf,CAAC,CAAC;AACL,CAAC"}

package/dist/sync/status.d.ts

@@ -15,6 +15,8 @@ export interface ArticleStatusItem {
     deletePending?: boolean;
     orphan?: boolean;
     taxonomyApplyPending?: boolean;
+    /** True when a published article has unpublished draft changes on remote (@draft: composite rev). */
+    hasUnpublishedDraft?: boolean;
 }
 export interface WorkspaceStatusResult {
     items: ArticleStatusItem[];
@@ -34,6 +36,7 @@ export interface WorkspaceStatusResult {
             orphan: number;
             deletePending: number;
             taxonomyApplyPending: number;
+            hasUnpublishedDraft?: number;
         };
     };
 }

package/dist/sync/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/sync/status.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAgBpD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;IAC9B,UAAU,EAAE,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mHAAmH;IACnH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,qFAAqF;QACrF,eAAe,EAAE,MAAM,CAAC;QACxB,sFAAsF;QACtF,SAAS,EAAE,MAAM,CAAC;QAClB,0FAA0F;QAC1F,KAAK,CAAC,EAAE;YACN,eAAe,EAAE,MAAM,CAAC;YACxB,MAAM,EAAE,MAAM,CAAC;YACf,aAAa,EAAE,MAAM,CAAC;YACtB,oBAAoB,EAAE,MAAM,CAAC;SAC9B,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/B,UAAU,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC;CAC9D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,iBAAiB,EAAE,EAC1B,OAAO,EAAE,mBAAmB,GAC3B,iBAAiB,EAAE,CAmBrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,EACrB,UAAU,GAAE,MAAgB,GAC3B,MAAM,CAQR;AAwCD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,aAAa,EACpB,UAAU,GAAE,MAAgB,GAC3B,qBAAqB,CA+HvB"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/sync/status.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAmBpD,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,OAAO,GAAG,WAAW,CAAC;IAC9B,UAAU,EAAE,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mHAAmH;IACnH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qGAAqG;IACrG,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,qFAAqF;QACrF,eAAe,EAAE,MAAM,CAAC;QACxB,sFAAsF;QACtF,SAAS,EAAE,MAAM,CAAC;QAClB,0FAA0F;QAC1F,KAAK,CAAC,EAAE;YACN,eAAe,EAAE,MAAM,CAAC;YACxB,MAAM,EAAE,MAAM,CAAC;YACf,aAAa,EAAE,MAAM,CAAC;YACtB,oBAAoB,EAAE,MAAM,CAAC;YAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;SAC9B,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC;IAC/B,UAAU,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAAC;CAC9D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,iBAAiB,EAAE,EAC1B,OAAO,EAAE,mBAAmB,GAC3B,iBAAiB,EAAE,CAmBrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,EACrB,UAAU,GAAE,MAAgB,GAC3B,MAAM,CAQR;AA4CD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,aAAa,EACpB,UAAU,GAAE,MAAgB,GAC3B,qBAAqB,CAkIvB"}

package/dist/sync/status.js

@@ -24,8 +24,10 @@ import path from 'node:path';
 import { baselineMarkdown } from '../db/baseline.js';
 import { formatFrontmatterParseError, lenientRepairMarkdownFrontmatter, parseMarkdown, } from '../utils/frontmatter.js';
 import { calculateHash, CONFLICTS_SUBDIR } from './workspace/index.js';
-import { carriesDepthFreeMediaRef, localizeArticleMediaRefs } from '../utils/media-body-refs.js';
+import { resolveDiskSpelling, renderForDisk } from '../utils/disk-spelling.js';
+import { hasUncommittedDraftRevision } from '../utils/draft-revision.js';
 import { loadLocalTaxonomyCandidates } from './taxonomies.js';
+import { formatRevForDisplay } from '../client/api.js';
 import { compareArticleFilenameDesc, extractUlidFromFilename, stripDatePrefix, } from '../utils/naming.js';
 /**
  * Filters a list of article status items based on search term, slug, publication status, or sync status.
@@ -86,13 +88,17 @@ function isBaselineSpellingMatch(workspaceRoot, cache, relPath, localContent, cu
     if (!snapshot)
         return false;
     try {
+        const syncState = cache.getSyncState(id);
         const candidates = loadLocalTaxonomyCandidates(workspaceRoot);
-        const baseMarkdown = baselineMarkdown(snapshot, candidates);
-        const localizedBase = localizeArticleMediaRefs(baseMarkdown, {
+        const spelling = resolveDiskSpelling(localContent, syncState);
+        const baseMarkdown = baselineMarkdown(snapshot, candidates, {
+            preferEncodedTaxonomy: spelling.preferEncodedTaxonomy,
+            hasDraftRevision: spelling.hasDraftRevision,
+        });
+        const localizedBase = renderForDisk(baseMarkdown, spelling, {
             workspaceRoot,
             articleRelPath: relPath,
             fs,
-            preferLegacyRef: carriesDepthFreeMediaRef(localContent),
         });
         return calculateHash(localizedBase) === currentHash;
     }
@@ -140,6 +146,7 @@ export function getWorkspaceStatus(workspaceRoot, cache, collection = 'posts') {
                 const conflictPending = syncState?.conflictPending === 1;
                 const deletePending = syncState?.deletePending === 1;
                 const taxonomyApplyPending = syncState?.taxonomyApplyPending === 1;
+                const hasUnpublishedDraft = hasUncommittedDraftRevision(syncState);
                 if (syncState) {
                     // `local_hash` is supposed to record the exact bytes on disk, but a workspace whose articles were
                     // written before media-ref localization existed keeps a hash of the *canonical* spelling while the
@@ -171,7 +178,8 @@ export function getWorkspaceStatus(workspaceRoot, cache, collection = 'posts') {
                     status: parsed.frontmatter.status,
                     syncStatus,
                     filePath: relPath,
-                    rev: syncState?.remoteRev,
+                    rev: formatRevForDisplay(syncState?.remoteRev),
+                    hasUnpublishedDraft: hasUnpublishedDraft || undefined,
                     conflictPending: conflictPending || undefined,
                     deletePending: deletePending || undefined,
                     taxonomyApplyPending: taxonomyApplyPending || undefined,
@@ -195,7 +203,7 @@ export function getWorkspaceStatus(workspaceRoot, cache, collection = 'posts') {
                     status: sub,
                     syncStatus: 'invalid',
                     filePath: relPath,
-                    rev: syncState?.remoteRev,
+                    rev: formatRevForDisplay(syncState?.remoteRev),
                     cached: Boolean(syncState),
                     healable: healable || undefined,
                     error: errorMsg,
@@ -218,6 +226,7 @@ export function getWorkspaceStatus(workspaceRoot, cache, collection = 'posts') {
             orphan: items.filter((i) => i.orphan).length,
             deletePending: items.filter((i) => i.deletePending).length,
             taxonomyApplyPending: items.filter((i) => i.taxonomyApplyPending).length,
+            hasUnpublishedDraft: items.filter((i) => i.hasUnpublishedDraft).length,
         },
     };
     return { items, summary };