@deskwork/cli 0.12.0 → 0.13.0

package/dist/commands/approve.d.ts

@@ -1,14 +1,15 @@
 /**
  * deskwork-approve — terminal write step for the review loop.
  *
- * For **longform**, the SSOT invariant says disk is already the approved
- * content (the studio save handler writes disk first, approve annotation
- * captures the current version). This helper just transitions the
- * workflow to 'applied'. If disk has moved on since the approve click,
- * the helper refuses rather than silently rolling back.
+ * Phase 29 / pipeline redesign: longform approve goes through the
+ * entry-centric helper (`approveEntryStage`) which advances the per-entry
+ * sidecar's `currentStage` to its successor and emits a stage-transition
+ * journal event. The workflow-object model remains in place for shortform
+ * — that path is preserved as `runShortformApprove` intact, including the
+ * disk SSOT semantics for the rendered file.
  *
- * For **shortform**, the approved markdown is written into the matching
- * DistributionRecord's `shortform` field in the calendar.
+ * Dispatcher: `--platform` set → legacy shortform path; otherwise →
+ * entry-centric path.
  *
  * Usage:
  *   deskwork-approve <project-root> [--site <slug>] <slug>

package/dist/commands/approve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approve.d.ts","sourceRoot":"","sources":["../../src/commands/approve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AA6BH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA+MvD"}
+{"version":3,"file":"approve.d.ts","sourceRoot":"","sources":["../../src/commands/approve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AA+BH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCvD"}

package/dist/commands/approve.js

@@ -1,14 +1,15 @@
 /**
  * deskwork-approve — terminal write step for the review loop.
  *
- * For **longform**, the SSOT invariant says disk is already the approved
- * content (the studio save handler writes disk first, approve annotation
- * captures the current version). This helper just transitions the
- * workflow to 'applied'. If disk has moved on since the approve click,
- * the helper refuses rather than silently rolling back.
+ * Phase 29 / pipeline redesign: longform approve goes through the
+ * entry-centric helper (`approveEntryStage`) which advances the per-entry
+ * sidecar's `currentStage` to its successor and emits a stage-transition
+ * journal event. The workflow-object model remains in place for shortform
+ * — that path is preserved as `runShortformApprove` intact, including the
+ * disk SSOT semantics for the rendered file.
  *
- * For **shortform**, the approved markdown is written into the matching
- * DistributionRecord's `shortform` field in the calendar.
+ * Dispatcher: `--platform` set → legacy shortform path; otherwise →
+ * entry-centric path.
  *
  * Usage:
  *   deskwork-approve <project-root> [--site <slug>] <slug>
@@ -16,29 +17,98 @@
  */
 import { existsSync, readFileSync } from 'node:fs';
 import { readConfig } from '@deskwork/core/config';
-import { resolveSite, resolveCalendarPath, resolveEntryFilePath, resolveShortformFilePath, } from '@deskwork/core/paths';
+import { resolveSite, resolveCalendarPath, resolveShortformFilePath, } from '@deskwork/core/paths';
 import { readCalendar, writeCalendar } from '@deskwork/core/calendar';
 import { parseFrontmatter } from '@deskwork/core/frontmatter';
-import { handleGetWorkflow, } from '@deskwork/core/review/handlers';
+import { handleGetWorkflow } from '@deskwork/core/review/handlers';
 import { readAnnotations, transitionState, } from '@deskwork/core/review/pipeline';
 import { isPlatform } from '@deskwork/core/types';
 import { absolutize, emit, fail, parseArgs } from '@deskwork/core/cli-args';
+import { approveEntryStage } from '@deskwork/core/entry/approve';
+import { resolveEntryUuid } from '@deskwork/core/sidecar';
+const KNOWN_FLAGS = ['site', 'platform', 'channel'];
+const SLUG_RE = /^[a-z0-9][a-z0-9-]*(\/[a-z0-9][a-z0-9-]*)*$/;
 export async function run(argv) {
-    const KNOWN_FLAGS = ['site', 'platform', 'channel'];
-    const SLUG_RE = /^[a-z0-9][a-z0-9-]*(\/[a-z0-9][a-z0-9-]*)*$/;
-    const { positional, flags } = parse();
+    let parsed;
+    try {
+        parsed = parseArgs(argv, KNOWN_FLAGS);
+    }
+    catch (err) {
+        fail(err instanceof Error ? err.message : String(err), 2);
+    }
+    const { positional, flags } = parsed;
     if (positional.length < 2) {
         fail('Usage: deskwork-approve <project-root> [--site <slug>] <slug> ' +
             '[--platform <p>] [--channel <c>]', 2);
     }
-    const [rootArg, slug] = positional;
-    const projectRoot = absolutize(rootArg);
+    const [, slug] = positional;
     if (!SLUG_RE.test(slug)) {
         fail(`invalid slug: ${slug} (must match ${SLUG_RE})`);
     }
-    if (flags.platform !== undefined && !isPlatform(flags.platform)) {
-        fail(`Invalid --platform "${flags.platform}".`);
+    if (flags.platform !== undefined) {
+        if (!isPlatform(flags.platform)) {
+            fail(`Invalid --platform "${flags.platform}".`);
+        }
+        await runShortformApprove(positional, flags);
+        return;
+    }
+    if (flags.channel !== undefined) {
+        fail('--channel is only valid with --platform.');
     }
+    await runLongformApprove(positional, flags);
+}
+/**
+ * Entry-centric approve (longform / outline). Resolves the slug to a
+ * sidecar UUID and delegates to `approveEntryStage`, which advances
+ * `currentStage` to its successor and writes a stage-transition journal
+ * event. Refuses Final → Published (use `publish`), Published, Blocked,
+ * and Cancelled.
+ */
+async function runLongformApprove(positional, flags) {
+    const [rootArg, slug] = positional;
+    const projectRoot = absolutize(rootArg);
+    let config;
+    try {
+        config = readConfig(projectRoot);
+    }
+    catch (err) {
+        fail(err instanceof Error ? err.message : String(err));
+    }
+    // Validate --site (entries are project-global today, but failing on a
+    // bogus site keeps the CLI's error shape consistent with the legacy
+    // command).
+    const site = resolveSite(config, flags.site);
+    let uuid;
+    try {
+        uuid = await resolveEntryUuid(projectRoot, slug);
+    }
+    catch (err) {
+        fail(err instanceof Error ? err.message : String(err));
+    }
+    let result;
+    try {
+        result = await approveEntryStage(projectRoot, { uuid });
+    }
+    catch (err) {
+        fail(err instanceof Error ? err.message : String(err));
+    }
+    emit({
+        entryId: result.entryId,
+        site,
+        slug,
+        fromStage: result.fromStage,
+        toStage: result.toStage,
+    });
+}
+/**
+ * Legacy shortform approve (workflow-object model). Preserved intact
+ * across the Phase 29 pipeline redesign — shortform's workflow-object
+ * model migration is deferred. Reproduces the original `applyShortform`
+ * behavior verbatim.
+ */
+async function runShortformApprove(positional, flags) {
+    const [rootArg, slug] = positional;
+    const projectRoot = absolutize(rootArg);
     let config;
     try {
         config = readConfig(projectRoot);
@@ -47,17 +117,16 @@ export async function run(argv) {
         fail(err instanceof Error ? err.message : String(err));
     }
     const site = resolveSite(config, flags.site);
-    const contentKind = flags.platform ? 'shortform' : 'longform';
     const fetched = handleGetWorkflow(projectRoot, config, {
         id: null,
         site,
         slug,
-        contentKind,
+        contentKind: 'shortform',
         platform: flags.platform ?? null,
         channel: flags.channel ?? null,
     });
     if (fetched.status !== 200 || !isSuccessBody(fetched.body)) {
-        fail(`no ${contentKind} workflow for ${site}/${slug}: ${errorMessage(fetched.body)}`);
+        fail(`no shortform workflow for ${site}/${slug}: ${errorMessage(fetched.body)}`);
     }
     const workflow = fetched.body.workflow;
     const versions = fetched.body.versions;
@@ -68,112 +137,74 @@ export async function run(argv) {
     const annotations = readAnnotations(projectRoot, config, workflow.id);
     const approveAnn = latestApprove(annotations);
     const approvedVersion = approveAnn?.version ?? workflow.currentVersion;
-    if (contentKind === 'longform') {
-        applyLongform(workflow, approvedVersion);
-    }
-    else {
-        applyShortform(workflow, versions, approvedVersion);
+    if (!flags.platform)
+        fail('--platform is required for shortform workflows');
+    if (!isPlatform(flags.platform))
+        fail(`Invalid --platform "${flags.platform}".`);
+    // Phase 21a: shortform is now disk-backed. Read the on-disk file as
+    // the SSOT — the journal version is just the latest snapshot, but
+    // every save writes to disk first. Strip the frontmatter so the
+    // calendar's `## Shortform Copy` section captures the body only.
+    const filePath = resolveShortformFilePath(projectRoot, config, site, { slug }, flags.platform, flags.channel);
+    if (filePath === undefined || !existsSync(filePath)) {
+        const shown = filePath ?? '(unresolved)';
+        fail(`Shortform file missing at ${shown}. ` +
+            `The file is the SSOT — re-run /deskwork:shortform-start if needed.`);
     }
-    function applyLongform(workflow, approvedVersion) {
-        if (approvedVersion !== workflow.currentVersion) {
-            fail(`Approved v${approvedVersion}, but workflow is at v${workflow.currentVersion}. ` +
-                `Disk has moved on since the approve click — re-click Approve on v${workflow.currentVersion} or iterate back.`);
-        }
-        // The workflow already records the stable entry id; prefer it for
-        // path resolution so the UUID-bound file wins over the slug-template
-        // (Issue #67).
-        const blogFile = resolveEntryFilePath(projectRoot, config, site, slug, workflow.entryId);
-        if (!existsSync(blogFile)) {
-            fail(`Blog file missing at ${blogFile}. Nothing to approve against.`);
-        }
-        transitionState(projectRoot, config, workflow.id, 'applied');
-        emit({
-            workflowId: workflow.id,
-            site,
-            slug,
-            contentKind: 'longform',
-            state: 'applied',
-            version: approvedVersion,
-            filePath: blogFile,
-        });
-    }
-    function applyShortform(workflow, _versions, approvedVersion) {
-        if (!flags.platform)
-            fail('--platform is required for shortform workflows');
-        if (!isPlatform(flags.platform))
-            fail(`Invalid --platform "${flags.platform}".`);
-        // Phase 21a: shortform is now disk-backed. Read the on-disk file as
-        // the SSOT — the journal version is just the latest snapshot, but
-        // every save writes to disk first. Strip the frontmatter so the
-        // calendar's `## Shortform Copy` section captures the body only.
-        const filePath = resolveShortformFilePath(projectRoot, config, site, { slug }, flags.platform, flags.channel);
-        if (filePath === undefined || !existsSync(filePath)) {
-            const shown = filePath ?? '(unresolved)';
-            fail(`Shortform file missing at ${shown}. ` +
-                `The file is the SSOT — re-run /deskwork:shortform-start if needed.`);
-        }
-        const fileSrc = readFileSync(filePath, 'utf-8');
-        const approvedMarkdown = parseFrontmatter(fileSrc).body.replace(/^\n+/, '');
-        const calendarPath = resolveCalendarPath(projectRoot, config, site);
-        const cal = readCalendar(calendarPath);
-        const channelLower = flags.channel?.toLowerCase();
-        const match = cal.distributions.find((d) => {
-            if (d.slug !== slug)
-                return false;
-            if (d.platform !== flags.platform)
-                return false;
-            if (channelLower !== undefined) {
-                return (d.channel?.toLowerCase() ?? '') === channelLower;
-            }
-            return !d.channel;
-        });
-        if (!match) {
-            const channelBit = flags.channel ? ` · channel=${flags.channel}` : '';
-            fail(`No distribution record for (slug=${slug}, platform=${flags.platform}${channelBit}). ` +
-                `Create it with /deskwork:distribute first.`);
-        }
-        match.shortform = approvedMarkdown;
-        writeCalendar(calendarPath, cal);
-        transitionState(projectRoot, config, workflow.id, 'applied');
-        emit({
-            workflowId: workflow.id,
-            site,
-            slug,
-            contentKind: 'shortform',
-            state: 'applied',
-            version: approvedVersion,
-            platform: flags.platform,
-            channel: flags.channel,
-            calendarPath,
-            filePath,
-        });
-    }
-    function latestApprove(annotations) {
-        const approves = annotations.filter((a) => a.type === 'approve');
-        if (approves.length === 0)
-            return undefined;
-        return approves.reduce((a, b) => (a.createdAt > b.createdAt ? a : b));
-    }
-    function isSuccessBody(body) {
-        if (typeof body !== 'object' || body === null)
+    const fileSrc = readFileSync(filePath, 'utf-8');
+    const approvedMarkdown = parseFrontmatter(fileSrc).body.replace(/^\n+/, '');
+    const calendarPath = resolveCalendarPath(projectRoot, config, site);
+    const cal = readCalendar(calendarPath);
+    const channelLower = flags.channel?.toLowerCase();
+    const match = cal.distributions.find((d) => {
+        if (d.slug !== slug)
             return false;
-        return 'workflow' in body && 'versions' in body;
-    }
-    function errorMessage(body) {
-        if (typeof body === 'object' && body !== null) {
-            const value = Reflect.get(body, 'error');
-            if (typeof value === 'string')
-                return value;
+        if (d.platform !== flags.platform)
+            return false;
+        if (channelLower !== undefined) {
+            return (d.channel?.toLowerCase() ?? '') === channelLower;
         }
-        return 'unknown error';
+        return !d.channel;
+    });
+    if (!match) {
+        const channelBit = flags.channel ? ` · channel=${flags.channel}` : '';
+        fail(`No distribution record for (slug=${slug}, platform=${flags.platform}${channelBit}). ` +
+            `Create it with /deskwork:distribute first.`);
     }
-    function parse() {
-        try {
-            return parseArgs(argv, KNOWN_FLAGS);
-        }
-        catch (err) {
-            fail(err instanceof Error ? err.message : String(err), 2);
-        }
+    match.shortform = approvedMarkdown;
+    writeCalendar(calendarPath, cal);
+    transitionState(projectRoot, config, workflow.id, 'applied');
+    void versions;
+    emit({
+        workflowId: workflow.id,
+        site,
+        slug,
+        contentKind: 'shortform',
+        state: 'applied',
+        version: approvedVersion,
+        platform: flags.platform,
+        channel: flags.channel,
+        calendarPath,
+        filePath,
+    });
+}
+function latestApprove(annotations) {
+    const approves = annotations.filter((a) => a.type === 'approve');
+    if (approves.length === 0)
+        return undefined;
+    return approves.reduce((a, b) => (a.createdAt > b.createdAt ? a : b));
+}
+function isSuccessBody(body) {
+    if (typeof body !== 'object' || body === null)
+        return false;
+    return 'workflow' in body && 'versions' in body;
+}
+function errorMessage(body) {
+    if (typeof body === 'object' && body !== null) {
+        const value = Reflect.get(body, 'error');
+        if (typeof value === 'string')
+            return value;
     }
+    return 'unknown error';
 }
 //# sourceMappingURL=approve.js.map

package/dist/commands/approve.js.map

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

package/dist/commands/publish.d.ts

@@ -1,17 +1,26 @@
 /**
- * deskwork-publish — mark a Drafting/Review entry as Published.
+ * deskwork-publish — mark a Final entry as Published.
  *
- * For blog entries, the helper verifies that `<contentDir>/<slug>/index.md`
- * exists — refusing to publish a post whose file hasn't been written. For
- * youtube/tool entries, the helper requires `contentUrl` to be set on the
- * entry; if it's missing, pass --content-url to set it in the same call.
+ * Phase 29 / pipeline redesign: entry-centric publish goes through the
+ * `publishEntry` core helper, which writes the sidecar's currentStage
+ * to 'Published', stamps `datePublished`, emits a stage-transition
+ * journal event, and regenerates calendar.md (#148).
+ *
+ * Dispatcher: when the slug resolves to an entry sidecar, route to the
+ * entry-centric path. Otherwise (legacy data without sidecars,
+ * shortform-style externally-hosted content using `--content-url`),
+ * fall through to the legacy calendar-mutation path which preserves
+ * the pre-Phase-30 behavior verbatim.
  *
  * Usage:
  *   deskwork-publish <project-root> [--site <slug>] [--date YYYY-MM-DD]
  *                    [--content-url URL] <slug>
  *
- * Emits a JSON result:
- *   { slug, stage: "Published", datePublished, contentType, contentUrl?,
+ * Emits a JSON result. Entry-centric path:
+ *   { entryId, slug, fromStage, toStage: "Published", datePublished,
+ *     site, calendarPath, filePath? }
+ * Legacy path (unchanged):
+ *   { slug, title, stage, datePublished, contentType, contentUrl?,
  *     issueNumber?, filePath?, site, calendarPath }
  */
 export declare function run(argv: string[]): Promise<void>;

package/dist/commands/publish.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAsBH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuGvD"}
+{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AA4BH,wBAAsB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA8EvD"}

package/dist/commands/publish.js

@@ -1,30 +1,48 @@
 /**
- * deskwork-publish — mark a Drafting/Review entry as Published.
+ * deskwork-publish — mark a Final entry as Published.
  *
- * For blog entries, the helper verifies that `<contentDir>/<slug>/index.md`
- * exists — refusing to publish a post whose file hasn't been written. For
- * youtube/tool entries, the helper requires `contentUrl` to be set on the
- * entry; if it's missing, pass --content-url to set it in the same call.
+ * Phase 29 / pipeline redesign: entry-centric publish goes through the
+ * `publishEntry` core helper, which writes the sidecar's currentStage
+ * to 'Published', stamps `datePublished`, emits a stage-transition
+ * journal event, and regenerates calendar.md (#148).
+ *
+ * Dispatcher: when the slug resolves to an entry sidecar, route to the
+ * entry-centric path. Otherwise (legacy data without sidecars,
+ * shortform-style externally-hosted content using `--content-url`),
+ * fall through to the legacy calendar-mutation path which preserves
+ * the pre-Phase-30 behavior verbatim.
  *
  * Usage:
  *   deskwork-publish <project-root> [--site <slug>] [--date YYYY-MM-DD]
  *                    [--content-url URL] <slug>
  *
- * Emits a JSON result:
- *   { slug, stage: "Published", datePublished, contentType, contentUrl?,
+ * Emits a JSON result. Entry-centric path:
+ *   { entryId, slug, fromStage, toStage: "Published", datePublished,
+ *     site, calendarPath, filePath? }
+ * Legacy path (unchanged):
+ *   { slug, title, stage, datePublished, contentType, contentUrl?,
  *     issueNumber?, filePath?, site, calendarPath }
  */
 import { existsSync } from 'node:fs';
 import { readConfig } from '@deskwork/core/config';
 import { readCalendar, writeCalendar } from '@deskwork/core/calendar';
-import { findEntry, publishEntry, setContentUrl, } from '@deskwork/core/calendar-mutations';
+import { findEntry, publishEntry as publishCalendarEntry, setContentUrl, } from '@deskwork/core/calendar-mutations';
 import { effectiveContentType, hasRepoContent, requiresContentUrl, } from '@deskwork/core/types';
 import { resolveSite, resolveCalendarPath, resolveEntryFilePath, } from '@deskwork/core/paths';
 import { absolutize, emit, fail, parseArgs } from '@deskwork/core/cli-args';
+import { publishEntry as publishEntrySidecar } from '@deskwork/core/entry/publish';
+import { resolveEntryUuid } from '@deskwork/core/sidecar';
+const KNOWN_FLAGS = ['site', 'date', 'content-url'];
+const DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
 export async function run(argv) {
-    const KNOWN_FLAGS = ['site', 'date', 'content-url'];
-    const DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
-    const { positional, flags } = parse();
+    let parsed;
+    try {
+        parsed = parseArgs(argv, KNOWN_FLAGS);
+    }
+    catch (err) {
+        fail(err instanceof Error ? err.message : String(err), 2);
+    }
+    const { positional, flags } = parsed;
     if (positional.length < 2) {
         fail('Usage: deskwork-publish <project-root> [--site <slug>] [--date YYYY-MM-DD] ' +
             '[--content-url URL] <slug>', 2);
@@ -42,6 +60,55 @@ export async function run(argv) {
         fail(err instanceof Error ? err.message : String(err));
     }
     const site = resolveSite(config, flags.site);
+    // Try entry-centric path first. The slug-to-uuid resolver returns a
+    // structured error when no sidecar is bound; fall through to legacy
+    // only on that error so the rest of the publish pipeline still
+    // surfaces real problems (bad slug, missing artifact, etc.).
+    const uuid = await tryResolveEntryUuid(projectRoot, slug);
+    if (uuid !== undefined) {
+        // Entry-centric path. The new model doesn't have content-type info
+        // on the sidecar — content-url is a legacy-only concern, so we
+        // refuse to mix it with entry-centric publish to avoid silent
+        // drops. If an operator needs --content-url, they're on the
+        // legacy data path.
+        if (flags['content-url'] !== undefined) {
+            fail('--content-url is not supported on entry-centric entries. ' +
+                'Set contentUrl via the calendar mutation path before migrating.');
+        }
+        let result;
+        try {
+            result = await publishEntrySidecar(projectRoot, {
+                uuid,
+                ...(flags.date !== undefined ? { date: flags.date } : {}),
+            });
+        }
+        catch (err) {
+            fail(err instanceof Error ? err.message : String(err));
+        }
+        emit({
+            entryId: result.entryId,
+            site,
+            slug,
+            fromStage: result.fromStage,
+            toStage: result.toStage,
+            datePublished: result.datePublished,
+            calendarPath: resolveCalendarPath(projectRoot, config, site),
+            ...(result.artifactPath !== undefined ? { filePath: result.artifactPath } : {}),
+        });
+        return;
+    }
+    // Legacy path — unchanged.
+    await runLegacyPublish(projectRoot, config, site, slug, flags);
+}
+async function tryResolveEntryUuid(projectRoot, slug) {
+    try {
+        return await resolveEntryUuid(projectRoot, slug);
+    }
+    catch {
+        return undefined;
+    }
+}
+async function runLegacyPublish(projectRoot, config, site, slug, flags) {
     const calendarPath = resolveCalendarPath(projectRoot, config, site);
     const calendar = readCalendar(calendarPath);
     const existing = findEntry(calendar, slug);
@@ -56,15 +123,11 @@ export async function run(argv) {
         fail(`Entry "${slug}" is already Published (date: ${existing.datePublished}).`);
     }
     const contentType = effectiveContentType(existing);
-    // Persist a late-set content URL before validating.
     if (flags['content-url'] !== undefined) {
         setContentUrl(calendar, slug, flags['content-url']);
     }
     let filePath;
     if (hasRepoContent(contentType)) {
-        // Prefer the UUID-bound path so a refactored / non-template file
-        // location is honored (Issue #67). The slug-template fallback is
-        // automatic when no UUID binding exists.
         filePath = resolveEntryFilePath(projectRoot, config, site, slug, existing.id);
         if (!existsSync(filePath)) {
             fail(`Cannot publish blog post "${slug}": no file at ${filePath}. ` +
@@ -72,14 +135,13 @@ export async function run(argv) {
         }
     }
     else if (requiresContentUrl(contentType)) {
-        // Re-read after possible setContentUrl mutation above.
         const updated = findEntry(calendar, slug);
         if (!updated.contentUrl) {
             fail(`Cannot publish ${contentType} entry "${slug}": contentUrl is not set. ` +
                 `Pass --content-url <URL> to set it.`);
         }
     }
-    const published = publishEntry(calendar, slug, flags.date);
+    const published = publishCalendarEntry(calendar, slug, flags.date);
     writeCalendar(calendarPath, calendar);
     emit({
         slug: published.slug,
@@ -93,13 +155,5 @@ export async function run(argv) {
         site,
         calendarPath,
     });
-    function parse() {
-        try {
-            return parseArgs(argv, KNOWN_FLAGS);
-        }
-        catch (err) {
-            fail(err instanceof Error ? err.message : String(err), 2);
-        }
-    }
 }
 //# sourceMappingURL=publish.js.map

package/dist/commands/publish.js.map

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