emdash-emit 0.1.17 → 0.1.18

package/dist/sync/push/commit.js

@@ -0,0 +1,230 @@
+/*
+ * 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 { ApiError } from '../../client/error.js';
+import { createBaseSnapshot, readBaselineFrontmatter } from '../../db/baseline.js';
+import { computeArticleRelativePath, extractDatePrefixFromPath, serializeMarkdown, } from '../../utils/frontmatter.js';
+import { carriesDepthFreeMediaRef, localizeArticleMediaRefs } from '../../utils/media-body-refs.js';
+import { updateConfigSyncedVersion } from '../../utils/config.js';
+import { computeTaxonomyHash } from '../terms.js';
+import { calculateHash } from '../workspace/index.js';
+import { finalizePromotedDraftImages } from './media_stage.js';
+import { transitionContentStatus } from './transport.js';
+/**
+ * Computes sync state pending flags and conflict/taxonomy hashes symmetrically.
+ */
+export function pendingFlagsFor(params) {
+    const { mode, syncState, hasTaxFailures, hasBodyConflict, isTaxonomyConflict, conflictedHash, quarantineRelPath, remoteTaxonomyHash, } = params;
+    if (mode === 'create') {
+        return {
+            conflictPending: 0,
+            bodyConflictPending: 0,
+            taxonomyConflictPending: 0,
+            conflictCopyHash: null,
+            conflictCopyPath: null,
+            conflictAt: null,
+            taxonomyApplyPending: hasTaxFailures ? 1 : 0,
+            remoteTaxonomyHash: hasTaxFailures ? null : (remoteTaxonomyHash ?? null),
+        };
+    }
+    if (mode === 'conflict') {
+        const isTax = isTaxonomyConflict ? 1 : 0;
+        const isBody = hasBodyConflict ? 1 : 0;
+        const hasAnyConflict = isTax === 1 || isBody === 1;
+        return {
+            conflictPending: 1,
+            bodyConflictPending: isBody,
+            taxonomyConflictPending: isTax,
+            conflictCopyHash: hasAnyConflict ? (conflictedHash ?? null) : null,
+            conflictCopyPath: hasAnyConflict ? (quarantineRelPath ?? null) : null,
+            conflictAt: hasAnyConflict && quarantineRelPath ? Math.floor(Date.now() / 1000) : null,
+            taxonomyApplyPending: 0,
+            remoteTaxonomyHash: remoteTaxonomyHash ?? null,
+        };
+    }
+    // update mode
+    if (hasTaxFailures) {
+        return {
+            conflictPending: syncState?.conflictPending ?? 0,
+            bodyConflictPending: syncState?.bodyConflictPending ?? 0,
+            taxonomyConflictPending: syncState?.taxonomyConflictPending ?? 0,
+            conflictCopyHash: syncState?.conflictCopyHash ?? null,
+            conflictCopyPath: syncState?.conflictCopyPath ?? null,
+            conflictAt: syncState?.conflictAt ?? null,
+            taxonomyApplyPending: 1,
+            remoteTaxonomyHash: remoteTaxonomyHash ?? null,
+        };
+    }
+    return {
+        conflictPending: 0,
+        bodyConflictPending: 0,
+        taxonomyConflictPending: 0,
+        conflictCopyHash: null,
+        conflictCopyPath: null,
+        conflictAt: null,
+        taxonomyApplyPending: 0,
+        remoteTaxonomyHash: remoteTaxonomyHash ?? null,
+    };
+}
+/**
+ * Commits article push results: promotes draft media, serializes local markdown,
+ * transitions status if needed, updates base snapshots and sync state, and handles file moving.
+ */
+export async function commitPostPush(params) {
+    const { mode, actualId, originalId, originalRelPath, fullPath, newRev, parsed, rawContent, draftImages, uploadedByAbsPath, candidates, taxFailures, resolvedTaxonomies, options, fetchFn, warnings, syncState, baseSnapshot, createdItemCreatedAt, } = params;
+    const hasTaxFailures = taxFailures.length > 0;
+    const collection = parsed.frontmatter.collection;
+    const currentPrefix = extractDatePrefixFromPath(fullPath);
+    let dateInput = null;
+    if (mode === 'create') {
+        dateInput = parsed.frontmatter.publishedAt || currentPrefix || createdItemCreatedAt || null;
+    }
+    else {
+        const existingSync = options.cache.getSyncState(parsed.frontmatter.id);
+        dateInput =
+            parsed.frontmatter.publishedAt ||
+                currentPrefix ||
+                (existingSync?.lastSyncedAt ? new Date(existingSync.lastSyncedAt * 1000) : null);
+    }
+    const newRelPath = computeArticleRelativePath(parsed.frontmatter.collection, parsed.frontmatter.status, actualId, parsed.frontmatter.title || parsed.frontmatter.slug, dateInput);
+    const newFullPath = path.join(options.workspaceRoot, newRelPath);
+    const serializedCanonical = serializeMarkdown(parsed.frontmatter, parsed.body, candidates);
+    // [P6] Promote uploaded draft images from media/drafts/ into media/ and commit media_state.
+    finalizePromotedDraftImages(draftImages, uploadedByAbsPath, options, warnings);
+    const serializedContent = options.localMediaRefs
+        ? localizeArticleMediaRefs(serializedCanonical, {
+            workspaceRoot: options.workspaceRoot,
+            articleRelPath: newRelPath,
+            fs,
+            preferLegacyRef: carriesDepthFreeMediaRef(rawContent),
+        })
+        : serializedCanonical;
+    const newHash = calculateHash(serializedContent);
+    // Transition status to published / draft if requested
+    let finalRev = newRev;
+    if (mode === 'create') {
+        if (parsed.frontmatter.status === 'published' && options.allowPublish) {
+            finalRev = await transitionContentStatus(collection, actualId, 'published', newRev, parsed.frontmatter.publishedAt, options, fetchFn);
+        }
+    }
+    else {
+        const previousStatus = syncState?.status || 'draft';
+        if (parsed.frontmatter.status === 'published' && options.allowPublish) {
+            finalRev = await transitionContentStatus(collection, actualId, 'published', newRev, parsed.frontmatter.publishedAt, options, fetchFn);
+        }
+        else if (parsed.frontmatter.status === 'draft' && previousStatus === 'published') {
+            finalRev = await transitionContentStatus(collection, actualId, 'draft', newRev, null, options, fetchFn);
+        }
+    }
+    // File write & cleanup
+    if (mode === 'create') {
+        fs.mkdirSync(path.dirname(newFullPath), { recursive: true });
+        fs.writeFileSync(newFullPath, serializedContent, 'utf8');
+        if (fullPath !== newFullPath && fs.existsSync(fullPath)) {
+            try {
+                fs.unlinkSync(fullPath);
+            }
+            catch (unlinkErr) {
+                warnings.push(`Failed to remove provisional file at ${fullPath}: ${unlinkErr.message}.`);
+            }
+        }
+    }
+    else {
+        if (fullPath !== newFullPath) {
+            fs.mkdirSync(path.dirname(newFullPath), { recursive: true });
+            fs.writeFileSync(newFullPath, serializedContent, 'utf8');
+            if (fs.existsSync(fullPath)) {
+                try {
+                    fs.unlinkSync(fullPath);
+                }
+                catch (unlinkErr) {
+                    warnings.push(`Failed to remove old file at ${fullPath} after path transition: ${unlinkErr.message}. Please remove it manually to prevent duplicates.`);
+                }
+            }
+        }
+        else {
+            fs.writeFileSync(fullPath, serializedContent, 'utf8');
+        }
+    }
+    const baseFm = readBaselineFrontmatter(baseSnapshot);
+    // Update Base snapshot
+    const savedFrontmatter = { ...parsed.frontmatter };
+    if (mode === 'update' && hasTaxFailures && baseFm?.taxonomies) {
+        savedFrontmatter.taxonomies = { ...baseFm.taxonomies };
+    }
+    const calculatedTaxHash = computeTaxonomyHash(parsed.frontmatter.taxonomies?.categories, parsed.frontmatter.taxonomies?.tags);
+    const fallbackTaxHash = mode === 'update'
+        ? syncState?.remoteTaxonomyHash ||
+            (baseFm?.taxonomies
+                ? computeTaxonomyHash(baseFm.taxonomies.categories, baseFm.taxonomies.tags)
+                : null)
+        : null;
+    const targetRemoteTaxHash = hasTaxFailures ? fallbackTaxHash : calculatedTaxHash;
+    options.cache.saveBaseSnapshot(createBaseSnapshot({
+        id: actualId,
+        rev: finalRev,
+        bodyMarkdown: parsed.body,
+        frontmatter: savedFrontmatter,
+        hash: newHash,
+    }));
+    const flags = pendingFlagsFor({
+        mode,
+        syncState,
+        hasTaxFailures,
+        remoteTaxonomyHash: targetRemoteTaxHash,
+    });
+    options.cache.saveSyncState({
+        id: actualId,
+        localFilePath: newRelPath,
+        localHash: newHash,
+        remoteRev: finalRev,
+        status: parsed.frontmatter.status,
+        slug: parsed.frontmatter.slug,
+        lastSyncedAt: Math.floor(Date.now() / 1000),
+        ...flags,
+    });
+    if (mode === 'update') {
+        updateConfigSyncedVersion(options.workspaceRoot);
+    }
+    if (hasTaxFailures) {
+        throw new ApiError({
+            endpoint: taxFailures[0].endpoint,
+            code: 'TAXONOMY_UPDATE_FAILED',
+            status: taxFailures[0].status || 400,
+            message: `Failed to update ${taxFailures.map((f) => f.taxonomy).join(', ')} terms on remote: ${taxFailures.map((f) => f.error).join('; ')}`,
+            suggestion: 'Run "emit pull-taxonomies" to update local definitions, verify taxonomy permissions, and retry push.',
+        });
+    }
+    return {
+        success: true,
+        id: actualId,
+        rev: finalRev,
+        filePath: newRelPath,
+        ...(actualId !== originalId ? { previousId: originalId } : {}),
+        ...(originalRelPath !== newRelPath ? { previousFilePath: originalRelPath } : {}),
+        ...(Object.keys(resolvedTaxonomies).length > 0 ? { resolvedTaxonomies } : {}),
+        conflict: false,
+        warnings,
+    };
+}
+//# sourceMappingURL=commit.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"commit.js","sourceRoot":"","sources":["../../../src/sync/push/commit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEnF,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,iBAAiB,GAIlB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AACpG,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAezD;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,MAS/B;IACC,MAAM,EACJ,IAAI,EACJ,SAAS,EACT,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,GACnB,GAAG,MAAM,CAAC;IAEX,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,OAAO;YACL,eAAe,EAAE,CAAC;YAClB,mBAAmB,EAAE,CAAC;YACtB,uBAAuB,EAAE,CAAC;YAC1B,gBAAgB,EAAE,IAAI;YACtB,gBAAgB,EAAE,IAAI;YACtB,UAAU,EAAE,IAAI;YAChB,oBAAoB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,kBAAkB,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAkB,IAAI,IAAI,CAAC;SACzE,CAAC;IACJ,CAAC;IAED,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,cAAc,GAAG,KAAK,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,CAAC;QACnD,OAAO;YACL,eAAe,EAAE,CAAC;YAClB,mBAAmB,EAAE,MAAM;YAC3B,uBAAuB,EAAE,KAAK;YAC9B,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YAClE,gBAAgB,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,iBAAiB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACrE,UAAU,EAAE,cAAc,IAAI,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;YACtF,oBAAoB,EAAE,CAAC;YACvB,kBAAkB,EAAE,kBAAkB,IAAI,IAAI;SAC/C,CAAC;IACJ,CAAC;IAED,cAAc;IACd,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO;YACL,eAAe,EAAE,SAAS,EAAE,eAAe,IAAI,CAAC;YAChD,mBAAmB,EAAE,SAAS,EAAE,mBAAmB,IAAI,CAAC;YACxD,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,IAAI,CAAC;YAChE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAI,IAAI;YACrD,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,IAAI,IAAI;YACrD,UAAU,EAAE,SAAS,EAAE,UAAU,IAAI,IAAI;YACzC,oBAAoB,EAAE,CAAC;YACvB,kBAAkB,EAAE,kBAAkB,IAAI,IAAI;SAC/C,CAAC;IACJ,CAAC;IAED,OAAO;QACL,eAAe,EAAE,CAAC;QAClB,mBAAmB,EAAE,CAAC;QACtB,uBAAuB,EAAE,CAAC;QAC1B,gBAAgB,EAAE,IAAI;QACtB,gBAAgB,EAAE,IAAI;QACtB,UAAU,EAAE,IAAI;QAChB,oBAAoB,EAAE,CAAC;QACvB,kBAAkB,EAAE,kBAAkB,IAAI,IAAI;KAC/C,CAAC;AACJ,CAAC;AA4BD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAA4B;IAC/D,MAAM,EACJ,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,eAAe,EACf,QAAQ,EACR,MAAM,EACN,MAAM,EACN,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,OAAO,EACP,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,oBAAoB,GACrB,GAAG,MAAM,CAAC;IAEX,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;IAEjD,MAAM,aAAa,GAAG,yBAAyB,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,SAAS,GAAyB,IAAI,CAAC;IAC3C,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,IAAI,aAAa,IAAI,oBAAoB,IAAI,IAAI,CAAC;IAC9F,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACvE,SAAS;YACP,MAAM,CAAC,WAAW,CAAC,WAAW;gBAC9B,aAAa;gBACb,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,UAAU,GAAG,0BAA0B,CAC3C,MAAM,CAAC,WAAW,CAAC,UAAU,EAC7B,MAAM,CAAC,WAAW,CAAC,MAAM,EACzB,QAAQ,EACR,MAAM,CAAC,WAAW,CAAC,KAAK,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,EACnD,SAAS,CACV,CAAC;IACF,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAEjE,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAE3F,4FAA4F;IAC5F,2BAA2B,CAAC,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE/E,MAAM,iBAAiB,GAAG,OAAO,CAAC,cAAc;QAC9C,CAAC,CAAC,wBAAwB,CAAC,mBAAmB,EAAE;YAC5C,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,cAAc,EAAE,UAAU;YAC1B,EAAE;YACF,eAAe,EAAE,wBAAwB,CAAC,UAAU,CAAC;SACtD,CAAC;QACJ,CAAC,CAAC,mBAAmB,CAAC;IACxB,MAAM,OAAO,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAEjD,sDAAsD;IACtD,IAAI,QAAQ,GAAG,MAAM,CAAC;IACtB,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACtE,QAAQ,GAAG,MAAM,uBAAuB,CACtC,UAAU,EACV,QAAQ,EACR,WAAW,EACX,MAAM,EACN,MAAM,CAAC,WAAW,CAAC,WAAW,EAC9B,OAAO,EACP,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAG,SAAS,EAAE,MAAM,IAAI,OAAO,CAAC;QACpD,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,WAAW,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACtE,QAAQ,GAAG,MAAM,uBAAuB,CACtC,UAAU,EACV,QAAQ,EACR,WAAW,EACX,MAAM,EACN,MAAM,CAAC,WAAW,CAAC,WAAW,EAC9B,OAAO,EACP,OAAO,CACR,CAAC;QACJ,CAAC;aAAM,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM,KAAK,OAAO,IAAI,cAAc,KAAK,WAAW,EAAE,CAAC;YACnF,QAAQ,GAAG,MAAM,uBAAuB,CACtC,UAAU,EACV,QAAQ,EACR,OAAO,EACP,MAAM,EACN,IAAI,EACJ,OAAO,EACP,OAAO,CACR,CAAC;QACJ,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAEzD,IAAI,QAAQ,KAAK,WAAW,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC;gBACH,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC;YAAC,OAAO,SAAkB,EAAE,CAAC;gBAC5B,QAAQ,CAAC,IAAI,CACX,wCAAwC,QAAQ,KAAM,SAAmB,CAAC,OAAO,GAAG,CACrF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,QAAQ,KAAK,WAAW,EAAE,CAAC;YAC7B,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7D,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;YACzD,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC;oBACH,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAC1B,CAAC;gBAAC,OAAO,SAAkB,EAAE,CAAC;oBAC5B,QAAQ,CAAC,IAAI,CACX,gCAAgC,QAAQ,2BAA4B,SAAmB,CAAC,OAAO,oDAAoD,CACpJ,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAErD,uBAAuB;IACvB,MAAM,gBAAgB,GAAgB,EAAE,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;IAChE,IAAI,IAAI,KAAK,QAAQ,IAAI,cAAc,IAAI,MAAM,EAAE,UAAU,EAAE,CAAC;QAC9D,gBAAgB,CAAC,UAAU,GAAG,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACzD,CAAC;IAED,MAAM,iBAAiB,GAAG,mBAAmB,CAC3C,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,EACzC,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CACpC,CAAC;IAEF,MAAM,eAAe,GACnB,IAAI,KAAK,QAAQ;QACf,CAAC,CAAC,SAAS,EAAE,kBAAkB;YAC7B,CAAC,MAAM,EAAE,UAAU;gBACjB,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC3E,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,mBAAmB,GAAG,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAEjF,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAC5B,kBAAkB,CAAC;QACjB,EAAE,EAAE,QAAQ;QACZ,GAAG,EAAE,QAAQ;QACb,YAAY,EAAE,MAAM,CAAC,IAAI;QACzB,WAAW,EAAE,gBAAgB;QAC7B,IAAI,EAAE,OAAO;KACd,CAAC,CACH,CAAC;IAEF,MAAM,KAAK,GAAG,eAAe,CAAC;QAC5B,IAAI;QACJ,SAAS;QACT,cAAc;QACd,kBAAkB,EAAE,mBAAmB;KACxC,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;QAC1B,EAAE,EAAE,QAAQ;QACZ,aAAa,EAAE,UAAU;QACzB,SAAS,EAAE,OAAO;QAClB,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM;QACjC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI;QAC7B,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QAC3C,GAAG,KAAK;KACT,CAAC,CAAC;IAEH,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,yBAAyB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,IAAI,QAAQ,CAAC;YACjB,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ;YACjC,IAAI,EAAE,wBAAwB;YAC9B,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,GAAG;YACpC,OAAO,EAAE,oBAAoB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC3I,UAAU,EACR,sGAAsG;SACzG,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI;QACb,EAAE,EAAE,QAAQ;QACZ,GAAG,EAAE,QAAQ;QACb,QAAQ,EAAE,UAAU;QACpB,GAAG,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,GAAG,CAAC,eAAe,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,QAAQ,EAAE,KAAK;QACf,QAAQ;KACT,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,33 @@
+import type { SyncState } from '../../db/cache.js';
+import type { PreflightError } from '../preflight.js';
+import type { PushOptions } from './types.js';
+export declare class PushValidationError extends Error {
+    errors: PreflightError[];
+    constructor(message: string, errors: PreflightError[]);
+}
+/**
+ * Validates that the target file is not a quarantined rescue copy.
+ */
+export declare function assertNotQuarantinedCopy(originalRelPath: string): void;
+/**
+ * Guard G15: deletePending protection.
+ */
+export declare function checkDeletePendingGuard(syncState: SyncState | null | undefined, options: PushOptions, collection: string, id: string, targetFilePath: string): void;
+/**
+ * Guard G16: taxonomy conflict pending protection.
+ */
+export declare function checkTaxonomyConflictGuard(syncState: SyncState | null | undefined, options: PushOptions, collection: string, id: string, targetFilePath: string): void;
+/**
+ * Guard G17: taxonomy apply pending protection.
+ */
+export declare function checkTaxonomyApplyGuard(syncState: SyncState | null | undefined, options: PushOptions, collection: string, id: string, targetFilePath: string): void;
+/**
+ * Declarative pipeline: evaluates pre-preflight guards (G15).
+ */
+export declare function evaluatePrePreflightGuards(syncState: SyncState | null | undefined, options: PushOptions, collection: string, id: string, targetFilePath: string): void;
+/**
+ * Declarative pipeline: evaluates post-preflight guards (G16, G17).
+ * T2-1 invariant: preflight (including G6 conflict markers) MUST precede G16.
+ */
+export declare function evaluatePostPreflightGuards(syncState: SyncState | null | undefined, options: PushOptions, collection: string, id: string, targetFilePath: string): void;
+//# sourceMappingURL=guards.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"guards.d.ts","sourceRoot":"","sources":["../../../src/sync/push/guards.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,qBAAa,mBAAoB,SAAQ,KAAK;IACrC,MAAM,EAAE,cAAc,EAAE,CAAC;IAEhC,YAAY,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAIpD;CACF;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAetE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,GACrB,IAAI,CAUN;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,GACrB,IAAI,CAeN;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,GACrB,IAAI,CAcN;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,GACrB,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,EACvC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,MAAM,GACrB,IAAI,CAGN"}

package/dist/sync/push/guards.js

@@ -0,0 +1,110 @@
+/*
+ * 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 { ApiError } from '../../client/error.js';
+import { CONFLICTS_SUBDIR, isQuarantinedRelativePath } from '../workspace/index.js';
+export class PushValidationError extends Error {
+    errors;
+    constructor(message, errors) {
+        super(message);
+        this.name = 'PushValidationError';
+        this.errors = errors;
+    }
+}
+/**
+ * Validates that the target file is not a quarantined rescue copy.
+ */
+export function assertNotQuarantinedCopy(originalRelPath) {
+    if (isQuarantinedRelativePath(originalRelPath)) {
+        throw new PushValidationError(`Refusing to push a preserved rescue copy: ${originalRelPath}`, [
+            {
+                code: 'QUARANTINED_COPY_NOT_PUSHABLE',
+                message: `'${originalRelPath}' is a preserved rescue copy under "${CONFLICTS_SUBDIR}/". ` +
+                    'Rescue copies hold stale divergent content captured before a pull overwrote it; ' +
+                    'pushing one would overwrite the canonical article of the same ULID and recreate duplicate local files.',
+                suggestion: 'Merge the valuable lines into the canonical article file (posts/draft/... or posts/published/...), then delete this copy. ' +
+                    'To intentionally replace the remote version, copy the rescue file over the canonical path and push that canonical path instead.',
+            },
+        ]);
+    }
+}
+/**
+ * Guard G15: deletePending protection.
+ */
+export function checkDeletePendingGuard(syncState, options, collection, id, targetFilePath) {
+    if (syncState?.deletePending === 1 && !options.revive && !options.force) {
+        throw new ApiError({
+            endpoint: `/_emdash/api/content/${collection}/${id}`,
+            code: 'DELETE_PENDING_ARTICLE',
+            status: 409,
+            message: `Article ${id} (${targetFilePath}) is marked as delete-pending (previous remote deletion was unconfirmed).`,
+            suggestion: `To intentionally revive and push this article to remote, pass --revive (or --force): "emit push ${targetFilePath} --revive"`,
+        });
+    }
+}
+/**
+ * Guard G16: taxonomy conflict pending protection.
+ */
+export function checkTaxonomyConflictGuard(syncState, options, collection, id, targetFilePath) {
+    const isTaxConflictPending = syncState?.taxonomyConflictPending !== undefined
+        ? syncState.taxonomyConflictPending === 1
+        : syncState?.conflictPending === 1 && (syncState?.bodyConflictPending ?? 0) === 0;
+    if (isTaxConflictPending && !options.resolveTaxonomy && !options.force) {
+        throw new ApiError({
+            endpoint: `/_emdash/api/content/${collection}/${id}`,
+            code: 'TAXONOMY_CONFLICT_PENDING',
+            status: 409,
+            message: `Article ${id} (${targetFilePath}) has an unresolved taxonomy conflict from a previous sync.`,
+            suggestion: `Pass --resolve-taxonomy=union|local|remote (or --force) to explicitly resolve and confirm: "emit push ${targetFilePath} --resolve-taxonomy=union"`,
+        });
+    }
+}
+/**
+ * Guard G17: taxonomy apply pending protection.
+ */
+export function checkTaxonomyApplyGuard(syncState, options, collection, id, targetFilePath) {
+    if (syncState?.taxonomyApplyPending === 1 &&
+        !options.allowUnappliedTaxonomies &&
+        !options.force) {
+        throw new ApiError({
+            endpoint: `/_emdash/api/content/${collection}/${id}`,
+            code: 'TAXONOMY_APPLY_PENDING',
+            status: 409,
+            message: `Article ${id} (${targetFilePath}) has an unconfirmed taxonomy assignment from a previous failed update.`,
+            suggestion: `Run "emit pull-taxonomies" to synchronize taxonomy definitions, then re-push (or pass --allow-unapplied-taxonomies / --force).`,
+        });
+    }
+}
+/**
+ * Declarative pipeline: evaluates pre-preflight guards (G15).
+ */
+export function evaluatePrePreflightGuards(syncState, options, collection, id, targetFilePath) {
+    checkDeletePendingGuard(syncState, options, collection, id, targetFilePath);
+}
+/**
+ * Declarative pipeline: evaluates post-preflight guards (G16, G17).
+ * T2-1 invariant: preflight (including G6 conflict markers) MUST precede G16.
+ */
+export function evaluatePostPreflightGuards(syncState, options, collection, id, targetFilePath) {
+    checkTaxonomyConflictGuard(syncState, options, collection, id, targetFilePath);
+    checkTaxonomyApplyGuard(syncState, options, collection, id, targetFilePath);
+}
+//# sourceMappingURL=guards.js.map

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

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

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

@@ -0,0 +1,9 @@
+import { PushValidationError } from './guards.js';
+import type { PushOptions, PushResult, ResolvedTaxonomyItem, TaxonomyResolutionStrategy } from './types.js';
+export { PushValidationError, type PushOptions, type PushResult, type TaxonomyResolutionStrategy, type ResolvedTaxonomyItem, };
+/**
+ * Pushes a local markdown article to remote EmDash with full preflight guards,
+ * two-tier lock lease protection, and automatic 3-way merge on conflict.
+ */
+export declare function pushArticle(targetFilePath: string, options: PushOptions): Promise<PushResult>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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"}