@lesliechan721/aw 0.1.0-beta.6 → 0.1.0-beta.8

package/dist/src/commands/catalog-dev-source.js

@@ -0,0 +1,481 @@
+import crypto from 'node:crypto';
+import path from 'node:path';
+import { DEFAULT_CATALOG_OUTPUT_PATH, readCatalogWorkspace, resolveCatalogWorkspaceRoot, validateCatalogSnapshotComplete, } from '@lesliechan721/aw-plugin-core';
+import { runCatalogBuildCommand } from '../authoring/workspace-commands.js';
+import { withAwHomeMutationLock } from '../utils/aw-home-mutation-lock.js';
+import { calculateCatalogSourceIdentity } from '../utils/catalog-source-identity.js';
+import { catalogSourceCacheInternal } from '../utils/catalog-source-cache.js';
+import { CLI_RESERVED_IMPORTS } from '../utils/manifest.js';
+import { CATALOG_SOURCE_ID_PATTERN, isDefaultOfficialCatalogSource, readCatalogSourcesConfigSnapshot, } from '../utils/catalog-sources.js';
+import { addCatalogSourceCommand, refreshCatalogSourceCommand, removeCatalogSourceCommand, setPrimaryCatalogSourceCommand, updateCatalogSourceCommand, } from './catalog-source.js';
+import { getCatalogStatus } from './catalog-status.js';
+function managedSources(sources, workspaceIdentity) {
+    return sources.filter((source) => source.type === 'path'
+        && source.managedBy?.kind === 'catalog-workspace'
+        && source.managedBy.workspaceIdentity === workspaceIdentity);
+}
+function normalizeSuggestedSourceId(workspaceRoot) {
+    const stem = path.basename(workspaceRoot)
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/gu, '-')
+        .replace(/^-+|-+$/gu, '');
+    const prefixed = /^[a-z]/u.test(stem) ? stem : `catalog-${stem}`;
+    const basename = (prefixed || 'catalog').slice(0, 28).replace(/-+$/u, '') || 'catalog';
+    return `${basename}-dev`;
+}
+function suffixedSourceId(base, workspaceIdentity) {
+    const suffix = crypto.createHash('sha256').update(workspaceIdentity).digest('hex').slice(0, 6);
+    const prefix = base.slice(0, 32 - suffix.length - 1).replace(/-+$/u, '');
+    return `${prefix}-${suffix}`;
+}
+export function suggestedCatalogDevSourceId(workspaceRoot, workspaceIdentity, occupiedSourceIds = []) {
+    const base = normalizeSuggestedSourceId(workspaceRoot);
+    return workspaceIdentity && occupiedSourceIds.includes(base)
+        ? suffixedSourceId(base, workspaceIdentity)
+        : base;
+}
+function assertExplicitSourceId(sourceId) {
+    if (!CATALOG_SOURCE_ID_PATTERN.test(sourceId)) {
+        throw new CatalogDevSourceError('invalidSourceId', `Invalid catalog development source ID: expected ${CATALOG_SOURCE_ID_PATTERN}.`);
+    }
+}
+class CatalogDevSourceError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+        this.name = 'CatalogDevSourceError';
+    }
+}
+export function createCatalogDevFailureReceipt(options) {
+    const workspaceRoot = path.resolve(options.cwd, options.workspaceRoot ?? '.');
+    const snapshotPath = path.join(workspaceRoot, DEFAULT_CATALOG_OUTPUT_PATH);
+    if (options.command === 'activate') {
+        return {
+            receiptSchemaVersion: 1,
+            command: 'catalog:dev:activate',
+            ok: false,
+            state: 'completed',
+            workspaceIdentity: null,
+            snapshot: { path: snapshotPath, action: 'reused', digest: null },
+            source: {
+                id: options.sourceId ?? suggestedCatalogDevSourceId(workspaceRoot),
+                action: 'reused',
+                primary: false,
+            },
+            recovery: ['Fix the reported problem, then rerun catalog dev activate.'],
+            errors: [{ code: options.code, message: options.message }],
+        };
+    }
+    if (options.command === 'status') {
+        return {
+            receiptSchemaVersion: 1,
+            command: 'catalog:dev:status',
+            ok: false,
+            workspaceIdentity: null,
+            workspaceRoot,
+            snapshot: { path: snapshotPath, state: 'absent', valid: false, digest: null },
+            source: { exists: false, id: null, pathMatches: null, primary: null },
+            cache: { state: 'not-applicable', validatedAt: null, snapshotDigest: null },
+            issues: [{ code: options.code, message: options.message, blocking: true }],
+        };
+    }
+    return {
+        receiptSchemaVersion: 1,
+        command: 'catalog:dev:deactivate',
+        ok: false,
+        state: 'completed',
+        workspaceIdentity: null,
+        snapshotPath,
+        source: { id: null, action: 'absent', previousPrimary: false },
+        replacementPrimarySourceId: null,
+        recovery: ['Fix the reported problem, then rerun catalog dev deactivate.'],
+        errors: [{ code: options.code, message: options.message }],
+    };
+}
+function codedFailure(error, fallbackCode) {
+    return {
+        code: error instanceof CatalogDevSourceError ? error.code : fallbackCode,
+        message: error instanceof Error ? error.message : String(error),
+    };
+}
+async function resolveWorkspace(cwd, workspaceRoot) {
+    try {
+        const resolved = await resolveCatalogWorkspaceRoot({
+            cwd,
+            ...(workspaceRoot === undefined ? {} : { explicitRoot: workspaceRoot }),
+            mode: 'existing',
+        });
+        const workspace = await readCatalogWorkspace(resolved.workspaceRoot, { reservedImports: CLI_RESERVED_IMPORTS });
+        return { resolved, workspace };
+    }
+    catch (error) {
+        throw new CatalogDevSourceError('workspaceInvalid', error instanceof Error ? error.message : String(error));
+    }
+}
+export function catalogDevSourceError(error, fallbackCode = 'catalogDevSourceFailed') {
+    return codedFailure(error, fallbackCode);
+}
+export async function activateCatalogDevSource(options) {
+    const { resolved, workspace } = await resolveWorkspace(options.cwd, options.workspaceRoot);
+    const snapshotPath = path.join(workspace.workspaceRoot, DEFAULT_CATALOG_OUTPUT_PATH);
+    const staticStatus = await getCatalogStatus({
+        cwd: options.cwd,
+        workspaceRoot: workspace.workspaceRoot,
+        env: options.env,
+    });
+    let snapshotAction = 'reused';
+    let snapshotDigest = staticStatus.snapshot.snapshotDigest;
+    const shouldBuild = options.forceBuild === true || staticStatus.snapshot.state !== 'current';
+    if (shouldBuild) {
+        try {
+            await runCatalogBuildCommand({
+                workspaceRoot: workspace.workspaceRoot,
+                workspaceRootResolvedFrom: resolved.workspaceRootResolvedFrom,
+                force: options.forceBuild === true || staticStatus.snapshot.state !== 'absent',
+                io: { stdout: () => undefined, stderr: () => undefined },
+            });
+            snapshotDigest = (await validateCatalogSnapshotComplete(snapshotPath)).snapshotDigest;
+            snapshotAction = 'built';
+        }
+        catch (error) {
+            return {
+                receiptSchemaVersion: 1,
+                command: 'catalog:dev:activate',
+                ok: false,
+                state: 'completed',
+                workspaceIdentity: workspace.workspaceIdentity,
+                snapshot: { path: snapshotPath, action: 'built', digest: null },
+                source: { id: options.sourceId ?? normalizeSuggestedSourceId(workspace.workspaceRoot), action: 'reused', primary: false },
+                recovery: ['Fix the Catalog Workspace or snapshot output, then rerun catalog dev activate.'],
+                errors: [codedFailure(error, 'snapshotBuildFailed')],
+            };
+        }
+    }
+    let selectedId = options.sourceId ?? normalizeSuggestedSourceId(workspace.workspaceRoot);
+    let sourceAction = 'reused';
+    try {
+        const result = await withAwHomeMutationLock({
+            env: options.env,
+            action: async (awHomeMutationToken) => {
+                const configSnapshot = await readCatalogSourcesConfigSnapshot(options.env);
+                const owned = managedSources(configSnapshot.config.sources, workspace.workspaceIdentity);
+                if (owned.length > 1) {
+                    throw new CatalogDevSourceError('multipleManagedSources', `Catalog Workspace identity ${workspace.workspaceIdentity} owns multiple development sources: ${owned.map((source) => source.id).join(', ')}.`);
+                }
+                const existing = owned[0];
+                selectedId = options.sourceId ?? normalizeSuggestedSourceId(workspace.workspaceRoot);
+                if (options.sourceId !== undefined) {
+                    assertExplicitSourceId(options.sourceId);
+                    if (existing && existing.id !== options.sourceId) {
+                        throw new CatalogDevSourceError('sourceIdConflict', `Catalog Workspace already owns development source "${existing.id}"; it cannot also own "${options.sourceId}".`);
+                    }
+                    const collision = configSnapshot.config.sources.find((source) => source.id === options.sourceId);
+                    if (collision && collision !== existing) {
+                        throw new CatalogDevSourceError('sourceIdConflict', `Catalog source "${options.sourceId}" is owned by another Workspace or is foreign.`);
+                    }
+                }
+                else if (!existing && configSnapshot.config.sources.some((source) => source.id === selectedId)) {
+                    selectedId = suffixedSourceId(selectedId, workspace.workspaceIdentity);
+                    if (configSnapshot.config.sources.some((source) => source.id === selectedId)) {
+                        throw new CatalogDevSourceError('sourceIdConflict', `Deterministic Catalog development source ID "${selectedId}" is already in use.`);
+                    }
+                }
+                if (existing)
+                    selectedId = existing.id;
+                const runtime = { ...options.runtime?.sourceRuntime, awHomeMutationToken };
+                if (!existing) {
+                    sourceAction = 'added';
+                    return addCatalogSourceCommand({
+                        source: {
+                            id: selectedId,
+                            type: 'path',
+                            path: snapshotPath,
+                            primary: options.primary === true,
+                            managedBy: { kind: 'catalog-workspace', workspaceIdentity: workspace.workspaceIdentity },
+                        },
+                        cliVersion: options.cliVersion,
+                        cwd: workspace.workspaceRoot,
+                        env: options.env,
+                        runtime,
+                        managedByWorkspaceIdentity: workspace.workspaceIdentity,
+                    });
+                }
+                if (existing.path !== snapshotPath || (options.primary === true && !existing.primary)) {
+                    sourceAction = 'updated';
+                    const updated = existing.path === snapshotPath
+                        ? { errors: [] }
+                        : await updateCatalogSourceCommand({
+                            sourceId: existing.id,
+                            update: { type: 'path', path: snapshotPath },
+                            cliVersion: options.cliVersion,
+                            cwd: workspace.workspaceRoot,
+                            env: options.env,
+                            runtime,
+                            managedByWorkspaceIdentity: workspace.workspaceIdentity,
+                        });
+                    if (options.primary === true && !existing.primary) {
+                        await setPrimaryCatalogSourceCommand({
+                            sourceId: existing.id,
+                            cwd: workspace.workspaceRoot,
+                            env: options.env,
+                            runtime,
+                        });
+                    }
+                    if (existing.path !== snapshotPath)
+                        return updated;
+                    const refreshed = await refreshCatalogSourceCommand({
+                        sourceId: existing.id,
+                        cliVersion: options.cliVersion,
+                        env: options.env,
+                        runtime,
+                    });
+                    return { errors: refreshed.errors };
+                }
+                const refreshed = await refreshCatalogSourceCommand({
+                    sourceId: existing.id,
+                    cliVersion: options.cliVersion,
+                    env: options.env,
+                    runtime,
+                });
+                return { errors: refreshed.errors };
+            },
+        });
+        const configured = (await readCatalogSourcesConfigSnapshot(options.env)).config.sources
+            .find((source) => source.id === selectedId);
+        const refreshErrors = result.errors.length === 0 ? [] : [{
+                code: 'sourceRefreshFailed',
+                message: result.errors.map((error) => error.message).join('; '),
+            }];
+        return {
+            receiptSchemaVersion: 1,
+            command: 'catalog:dev:activate',
+            ok: refreshErrors.length === 0,
+            state: refreshErrors.length === 0 ? 'completed' : 'partial',
+            workspaceIdentity: workspace.workspaceIdentity,
+            snapshot: { path: snapshotPath, action: snapshotAction, digest: snapshotDigest },
+            source: { id: selectedId, action: sourceAction, primary: configured.primary },
+            recovery: refreshErrors.length === 0 ? [] : [
+                'Fix the Catalog snapshot, then rerun catalog dev activate or refresh the source.',
+            ],
+            errors: refreshErrors,
+        };
+    }
+    catch (error) {
+        return {
+            receiptSchemaVersion: 1,
+            command: 'catalog:dev:activate',
+            ok: false,
+            state: 'completed',
+            workspaceIdentity: workspace.workspaceIdentity,
+            snapshot: { path: snapshotPath, action: snapshotAction, digest: snapshotDigest },
+            source: { id: selectedId, action: sourceAction, primary: false },
+            recovery: ['The snapshot was kept. Fix the source configuration, then rerun catalog dev activate.'],
+            errors: [codedFailure(error, 'sourceConfigFailed')],
+        };
+    }
+}
+export async function getCatalogDevSourceStatus(options) {
+    const requestedRoot = path.resolve(options.cwd, options.workspaceRoot ?? '.');
+    const empty = {
+        receiptSchemaVersion: 1,
+        command: 'catalog:dev:status',
+        ok: false,
+        workspaceIdentity: null,
+        workspaceRoot: requestedRoot,
+        snapshot: { path: path.join(requestedRoot, DEFAULT_CATALOG_OUTPUT_PATH), state: 'absent', valid: false, digest: null },
+        source: { exists: false, id: null, pathMatches: null, primary: null },
+        cache: { state: 'not-applicable', validatedAt: null, snapshotDigest: null },
+        issues: [],
+    };
+    let workspace;
+    try {
+        workspace = await resolveWorkspace(options.cwd, options.workspaceRoot);
+    }
+    catch (error) {
+        empty.issues.push({ code: 'workspaceInvalid', message: codedFailure(error, 'workspaceInvalid').message, blocking: true });
+        return empty;
+    }
+    const staticStatus = await getCatalogStatus({
+        cwd: options.cwd,
+        workspaceRoot: workspace.workspace.workspaceRoot,
+        env: options.env,
+    });
+    const receipt = {
+        ...empty,
+        workspaceIdentity: workspace.workspace.workspaceIdentity,
+        workspaceRoot: workspace.workspace.workspaceRoot,
+        snapshot: {
+            path: staticStatus.snapshot.path,
+            state: staticStatus.snapshot.state,
+            valid: staticStatus.snapshot.valid,
+            digest: staticStatus.snapshot.snapshotDigest,
+        },
+    };
+    if (staticStatus.snapshot.state !== 'current') {
+        receipt.issues.push({
+            code: `snapshot${staticStatus.snapshot.state[0].toUpperCase()}${staticStatus.snapshot.state.slice(1)}`,
+            message: `Catalog development snapshot is ${staticStatus.snapshot.state}.`,
+            blocking: true,
+        });
+    }
+    try {
+        const config = await readCatalogSourcesConfigSnapshot(options.env);
+        const owned = managedSources(config.config.sources, workspace.workspace.workspaceIdentity);
+        if (owned.length > 1) {
+            receipt.issues.push({
+                code: 'multipleManagedSources',
+                message: `Workspace owns multiple development sources: ${owned.map((source) => source.id).join(', ')}.`,
+                blocking: true,
+            });
+        }
+        const source = owned.length === 1 ? owned[0] : null;
+        if (!source) {
+            receipt.issues.push({ code: 'sourceInactive', message: 'Workspace has no active development source.', blocking: false });
+            const suggested = normalizeSuggestedSourceId(workspace.workspace.workspaceRoot);
+            const collision = config.config.sources.find((entry) => entry.id === suggested);
+            if (collision) {
+                receipt.issues.push({
+                    code: 'suggestedSourceIdCollision',
+                    message: `Suggested source ID "${suggested}" is owned by another Workspace or is foreign.`,
+                    blocking: false,
+                });
+            }
+        }
+        else {
+            const pathMatches = source.path === receipt.snapshot.path;
+            receipt.source = { exists: true, id: source.id, pathMatches, primary: source.primary };
+            if (!pathMatches) {
+                receipt.issues.push({
+                    code: 'sourcePathMismatch',
+                    message: 'Managed development source path does not match the current Workspace snapshot.',
+                    blocking: true,
+                });
+            }
+            const sourceIdentity = await calculateCatalogSourceIdentity(source);
+            const location = catalogSourceCacheInternal.resolveCatalogSourceCacheLocation({
+                sourceId: source.id,
+                sourceIdentity,
+                env: options.env,
+            });
+            const entry = await catalogSourceCacheInternal.readCatalogSourceCache({
+                location,
+                sourceId: source.id,
+                sourceIdentity,
+                requestedRef: 'path',
+                cliVersion: options.cliVersion,
+            });
+            receipt.cache = entry ? {
+                state: entry.entryDir === location.currentDir ? 'current' : 'last-good',
+                validatedAt: entry.metadata.validatedAt,
+                snapshotDigest: entry.metadata.snapshotDigest,
+            } : { state: 'absent', validatedAt: null, snapshotDigest: null };
+        }
+    }
+    catch (error) {
+        receipt.issues.push({ code: 'sourceConfigInvalid', message: codedFailure(error, 'sourceConfigInvalid').message, blocking: true });
+    }
+    receipt.ok = !receipt.issues.some((issue) => issue.blocking);
+    return receipt;
+}
+export async function deactivateCatalogDevSource(options) {
+    const { workspace } = await resolveWorkspace(options.cwd, options.workspaceRoot);
+    const snapshotPath = path.join(workspace.workspaceRoot, DEFAULT_CATALOG_OUTPUT_PATH);
+    const config = await readCatalogSourcesConfigSnapshot(options.env).catch((error) => {
+        throw new CatalogDevSourceError('sourceConfigInvalid', error instanceof Error ? error.message : String(error));
+    });
+    const owned = managedSources(config.config.sources, workspace.workspaceIdentity);
+    const base = {
+        receiptSchemaVersion: 1,
+        command: 'catalog:dev:deactivate',
+        workspaceIdentity: workspace.workspaceIdentity,
+        snapshotPath,
+    };
+    if (owned.length > 1) {
+        return {
+            ...base, ok: false, state: 'completed',
+            source: { id: null, action: 'retained', previousPrimary: false },
+            replacementPrimarySourceId: null,
+            recovery: ['Resolve the duplicate managed source configuration, then rerun catalog dev deactivate.'],
+            errors: [{ code: 'multipleManagedSources', message: `Workspace owns multiple development sources: ${owned.map((source) => source.id).join(', ')}.` }],
+        };
+    }
+    const source = owned[0];
+    if (!source) {
+        return {
+            ...base, ok: true, state: 'completed',
+            source: { id: null, action: 'absent', previousPrimary: false },
+            replacementPrimarySourceId: null,
+            recovery: [], errors: [],
+        };
+    }
+    let replacementPrimarySourceId = null;
+    if (source.primary) {
+        const otherSources = config.config.sources.filter((entry) => entry.id !== source.id);
+        const official = otherSources.find(isDefaultOfficialCatalogSource);
+        if (official)
+            replacementPrimarySourceId = official.id;
+        else if (otherSources.length === 1)
+            replacementPrimarySourceId = otherSources[0].id;
+        else {
+            return {
+                ...base, ok: false, state: 'completed',
+                source: { id: source.id, action: 'retained', previousPrimary: true },
+                replacementPrimarySourceId: null,
+                recovery: ['Select a replacement primary source, then rerun catalog dev deactivate.'],
+                errors: [{
+                        code: otherSources.length === 0 ? 'replacementPrimaryUnavailable' : 'replacementPrimaryAmbiguous',
+                        message: otherSources.length === 0
+                            ? 'No replacement primary Catalog source is available.'
+                            : `Replacement primary Catalog source is ambiguous: ${otherSources.map((entry) => entry.id).join(', ')}.`,
+                    }],
+            };
+        }
+    }
+    try {
+        await withAwHomeMutationLock({
+            env: options.env,
+            action: async (awHomeMutationToken) => {
+                const lockedConfig = await readCatalogSourcesConfigSnapshot(options.env);
+                if (lockedConfig.digest !== config.digest) {
+                    throw new CatalogDevSourceError('sourceConfigChanged', 'Catalog sources config changed before development source deactivation. Rerun the command.');
+                }
+                const runtime = { ...options.runtime?.sourceRuntime, awHomeMutationToken };
+                if (replacementPrimarySourceId) {
+                    await setPrimaryCatalogSourceCommand({
+                        sourceId: replacementPrimarySourceId,
+                        cwd: workspace.workspaceRoot,
+                        env: options.env,
+                        runtime,
+                    });
+                }
+                await removeCatalogSourceCommand({
+                    sourceId: source.id,
+                    cwd: workspace.workspaceRoot,
+                    env: options.env,
+                    runtime,
+                    managedByWorkspaceIdentity: workspace.workspaceIdentity,
+                });
+            },
+        });
+        return {
+            ...base, ok: true, state: 'completed',
+            source: { id: source.id, action: 'removed', previousPrimary: source.primary },
+            replacementPrimarySourceId,
+            recovery: [], errors: [],
+        };
+    }
+    catch (error) {
+        const after = await readCatalogSourcesConfigSnapshot(options.env).catch(() => null);
+        const sourceStillExists = after?.config.sources.some((entry) => entry.id === source.id) ?? true;
+        const configChanged = after !== null && after.digest !== config.digest;
+        return {
+            ...base, ok: false, state: configChanged ? 'partial' : 'completed',
+            source: { id: source.id, action: sourceStillExists ? 'retained' : 'removed', previousPrimary: source.primary },
+            replacementPrimarySourceId,
+            recovery: ['The snapshot was kept. Fix the source configuration or cache, then rerun catalog dev deactivate.'],
+            errors: [codedFailure(error, 'sourceConfigFailed')],
+        };
+    }
+}
+//# sourceMappingURL=catalog-dev-source.js.map

package/dist/src/commands/catalog-dev-source.js.map

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

package/dist/src/commands/catalog-generation.d.ts

@@ -0,0 +1,26 @@
+import type { CatalogGenerationActivationResult, CatalogGenerationRefreshResult } from '../types.js';
+import { type CatalogGenerationServiceRuntime, type CatalogGenerationStatusPayload, type CatalogGenerationStatusEntry } from '../utils/catalog-generation-service.js';
+import type { AwHomeMutationToken } from '../utils/aw-home-mutation-lock.js';
+export declare function refreshCatalogSourceGenerationCommand(options: {
+    sourceId: string;
+    cliVersion: string;
+    env?: NodeJS.ProcessEnv;
+    signal?: AbortSignal;
+    runtime?: CatalogGenerationServiceRuntime;
+}): Promise<CatalogGenerationRefreshResult>;
+export declare function activateCatalogSourceCandidateCommand(options: {
+    sourceId: string;
+    expectedCandidateGenerationKey?: string;
+    env?: NodeJS.ProcessEnv;
+    awHomeMutationToken?: AwHomeMutationToken;
+    runtime?: Pick<CatalogGenerationServiceRuntime, 'now'>;
+}): Promise<CatalogGenerationActivationResult>;
+export declare function setCatalogSourceRefreshPolicyCommand(options: {
+    sourceId: string;
+    refreshPolicy: 'startup' | 'manual';
+    env?: NodeJS.ProcessEnv;
+}): Promise<CatalogGenerationStatusEntry>;
+export declare function catalogGenerationStatusCommand(options?: {
+    sourceId?: string;
+    env?: NodeJS.ProcessEnv;
+}): Promise<CatalogGenerationStatusPayload>;

package/dist/src/commands/catalog-generation.js

@@ -0,0 +1,14 @@
+import { activateCatalogSourceCandidate, readCatalogGenerationStatus, refreshCatalogSourceGeneration, setCatalogSourceRefreshPolicy, } from '../utils/catalog-generation-service.js';
+export async function refreshCatalogSourceGenerationCommand(options) {
+    return refreshCatalogSourceGeneration(options);
+}
+export async function activateCatalogSourceCandidateCommand(options) {
+    return activateCatalogSourceCandidate(options);
+}
+export async function setCatalogSourceRefreshPolicyCommand(options) {
+    return setCatalogSourceRefreshPolicy(options);
+}
+export async function catalogGenerationStatusCommand(options = {}) {
+    return readCatalogGenerationStatus(options);
+}
+//# sourceMappingURL=catalog-generation.js.map

package/dist/src/commands/catalog-generation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"catalog-generation.js","sourceRoot":"","sources":["../../../src/commands/catalog-generation.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,8BAA8B,EAC9B,2BAA2B,EAC3B,8BAA8B,EAC9B,6BAA6B,GAI9B,MAAM,wCAAwC,CAAC;AAGhD,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,OAM3D;IACC,OAAO,8BAA8B,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,OAM3D;IACC,OAAO,8BAA8B,CAAC,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oCAAoC,CAAC,OAI1D;IACC,OAAO,6BAA6B,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,UAGjD,EAAE;IACJ,OAAO,2BAA2B,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC"}

package/dist/src/commands/catalog-publication-inspection.d.ts

@@ -2,6 +2,7 @@ import { validatePublishedCatalogSnapshot, type CatalogWorkspace } from '@leslie
 export interface CatalogPublicationIssue {
     code: string;
     message: string;
+    blocking: boolean;
 }
 export declare class CatalogPublicationInspectionError extends Error {
     readonly code: string;
@@ -59,7 +60,6 @@ export interface CatalogPublicationDescriptor {
     contentDigest: string;
     planId: string;
     ledgerDigest: string;
-    minCliVersion: string;
     pluginNames: string[];
 }
 export declare function sanitizedGitEnvironment(source: NodeJS.ProcessEnv): NodeJS.ProcessEnv;

package/dist/src/commands/catalog-publication-inspection.js

@@ -4,7 +4,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import fs from 'fs-extra';
-import { preparePublishedCatalogWorkspace, readCatalogWorkspace, validatePublishedCatalogSnapshot, } from '@lesliechan721/aw-plugin-core';
+import { preparePublishedCatalogWorkspace, readCatalogWorkspace, validatePublishedCatalogPublicationParent, validatePublishedCatalogSnapshot, } from '@lesliechan721/aw-plugin-core';
 import { bundleLocalPlugin, createCatalogRuntimeImportResolver } from '../../scripts/plugin-staging.js';
 import { CLI_RESERVED_IMPORTS } from '../utils/manifest.js';
 import { resolveCliPackageRoot } from '../utils/paths.js';
@@ -263,8 +263,8 @@ export async function prepareCatalogPublicationInspection(options) {
                 '--work-tree', previousSnapshotRoot, 'checkout', '--quiet', 'refs/aw/catalog-parent', '--', '.',
             ], env, 'remoteBranchInvalid', 'Could not read the published Catalog snapshot.');
             try {
-                const previous = await validatePublishedCatalogSnapshot(previousSnapshotRoot);
-                publishedVersion = previous.manifest.catalogVersion;
+                const previous = await validatePublishedCatalogPublicationParent(previousSnapshotRoot);
+                publishedVersion = previous.catalogVersion;
             }
             catch (error) {
                 throw inspectionError('remoteSnapshotInvalid', error);
@@ -298,7 +298,7 @@ export async function prepareCatalogPublicationInspection(options) {
             || finalRefs.has(`${tagRef}^{}`) !== initialRefs.has(`${tagRef}^{}`)) {
             throw new CatalogPublicationInspectionError('remoteDrift', 'Catalog remote changed during preparation. Increase the Catalog version before publishing again.');
         }
-        const [preparedValidation, ledgerBytes] = await Promise.all([
+        const [, ledgerBytes] = await Promise.all([
             validatePublishedCatalogSnapshot(prepared.outputRoot),
             fs.readFile(path.join(prepared.outputRoot, 'plugin-release-ledger.json')),
         ]);
@@ -320,7 +320,6 @@ export async function prepareCatalogPublicationInspection(options) {
             contentDigest: prepared.contentDigest,
             planId: prepared.planId,
             ledgerDigest,
-            minCliVersion: preparedValidation.manifest.compatibility.aw.minVersion,
             pluginNames: [...prepared.pluginNames],
         };
         return {