@contentful/experience-design-system-cli 2.15.2-dev-build-7aee0f8.0 → 2.15.2

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.15.2-dev-build-7aee0f8.0",
+  "version": "2.15.2",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",

package/dist/src/apply/command.js

@@ -4,6 +4,7 @@ import { access, readFile, readdir, stat } from 'node:fs/promises';
 import { join } from 'node:path';
 import { validateCDF, flattenDTCG, validateDTCG, buildManifest, buildFilteredManifest, } from '@contentful/experience-design-system-types';
 import { ApiError, ImportApiClient } from './api-client.js';
+import { formatApiError, formatEdsiError } from '../lib/error-parser.js';
 import { openPipelineDb, loadCDFComponents } from '../session/db.js';
 import { findSlotCycles, suggestCycleBreakEdge, formatCyclePath } from '../analyze/cycle-detection.js';
 import { isEmptyPreview } from './preview-utils.js';
@@ -289,7 +290,7 @@ function buildApplyOutput(operation, spaceId, environmentId, host) {
             .map((item) => ({
             entityType: item.entityType,
             entityId: item.id,
-            error: item.error,
+            error: formatEdsiError(item.error),
         })),
     };
 }
@@ -435,7 +436,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e)}`);
             throw e;
         }
         const { components, tokens, client } = inputs;
@@ -444,7 +445,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e)}`);
             const cause = e instanceof Error && e.cause instanceof Error ? e.cause.message : '';
             die(`Error: unable to connect to API host${cause ? `: ${cause}` : ''}`);
         }
@@ -455,7 +456,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e)}`);
             throw e;
         }
         const spaceId = opts.spaceId;
@@ -501,7 +502,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e, opts.verbose)}`);
             throw e;
         }
         const { components, tokens, client } = inputs;
@@ -511,7 +512,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e, opts.verbose)}`);
             throw e;
         }
         const manifest = buildManifest(components, tokens);
@@ -521,7 +522,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e, opts.verbose)}`);
             throw e;
         }
         const spaceId = opts.spaceId;
@@ -566,7 +567,7 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${e.message}`);
+                    die(`Error: ${formatApiError(e, opts.verbose)}`);
                 throw e;
             }
             process.stderr.write(`Apply operation started: ${operation.sys.id}\n`);
@@ -575,7 +576,7 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${e.message}`);
+                    die(`Error: ${formatApiError(e, opts.verbose)}`);
                 throw e;
             }
             const summary = buildApplyOutput(operation, spaceId, environmentId, opts.host);
@@ -600,7 +601,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e, opts.verbose),
                         }));
                         return;
                     }
@@ -621,7 +622,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e, opts.verbose),
                         }));
                         return;
                     }
@@ -677,7 +678,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e)}`);
             throw e;
         }
         const { components, tokens, client } = inputs;
@@ -687,7 +688,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e)}`);
             throw e;
         }
         const fullManifest = buildManifest(components, tokens);
@@ -697,7 +698,7 @@ export function registerApplyCommand(program) {
         }
         catch (e) {
             if (e instanceof ApiError)
-                die(`Error: ${e.message}`);
+                die(`Error: ${formatApiError(e)}`);
             throw e;
         }
         const spaceId = opts.spaceId;
@@ -735,7 +736,7 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${e.message}`);
+                    die(`Error: ${formatApiError(e)}`);
                 throw e;
             }
             process.stderr.write(`Apply operation started: ${operation.sys.id}\n`);
@@ -744,7 +745,7 @@ export function registerApplyCommand(program) {
             }
             catch (e) {
                 if (e instanceof ApiError)
-                    die(`Error: ${e.message}`);
+                    die(`Error: ${formatApiError(e)}`);
                 throw e;
             }
             const summary = buildApplyOutput(operation, spaceId, environmentId, opts.host);
@@ -781,7 +782,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e),
                         }));
                         return;
                     }
@@ -802,7 +803,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e),
                         }));
                         return;
                     }

package/dist/src/apply/tui/ServerApplyView.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text, useInput } from 'ink';
 import { ServerPreviewView } from './ServerPreviewView.js';
 import { buildPostPushUrl } from '../../lib/contentful-urls.js';
+import { formatEdsiError } from '../../lib/error-parser.js';
 export function ServerPreviewConfirm({ preview, spaceId, environmentId, breakingWithImpact, onConfirm, onCancel, }) {
     useInput((input, key) => {
         if (key.return)
@@ -35,9 +36,5 @@ export function ServerApplyDone({ operation, spaceId, environmentId, host }) {
     return (_jsxs(Box, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [_jsxs(Text, { bold: true, children: ["Import complete \u2014 ", environmentId, " @ ", spaceId] }), _jsx(Text, { children: " " }), _jsxs(Text, { color: "green", children: [" \u2713 ", operation.summary.succeeded, " succeeded"] }), operation.summary.failed > 0 && _jsxs(Text, { color: "red", children: [" \u2717 ", operation.summary.failed, " failed"] }), operation.summary.failed === 0 && _jsx(Text, { dimColor: true, children: " All entities imported successfully." }), failures.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: " Failures:" }), failures.map((item, i) => (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "red", children: [' ', "\u2717 ", item.entityType, ": ", item.id] }), item.error && _jsxs(Text, { dimColor: true, children: [" ", formatItemError(item.error)] })] }, i)))] })), operation.sys.status === 'succeeded' && operation.summary.succeeded > 0 && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: " View your design system:" }), _jsxs(Text, { color: "cyan", children: [" ", buildPostPushUrl({ host: host ?? 'api.contentful.com', spaceId, environmentId })] })] })), _jsx(Text, { children: " " }), _jsx(Text, { dimColor: true, children: " Press Q to exit." })] }));
 }
 function formatItemError(error) {
-    if (!error)
-        return '';
-    if (typeof error === 'string')
-        return error;
-    return `${error.code}: ${error.message}`;
+    return formatEdsiError(error);
 }

package/dist/src/import/orchestrator.js

@@ -61,16 +61,20 @@ export function parseCycleComponentNames(report) {
     return [...new Set(names)];
 }
 export function isPreviewValidationError(result) {
-    return (result.exitCode !== 0 &&
-        result.stderr.includes(`${PREVIEW_ERROR_PREFIX} 422`) &&
-        result.stderr.includes(VALIDATION_FAILED_CODE));
+    if (result.exitCode === 0 || !result.stderr.includes(`${PREVIEW_ERROR_PREFIX} 422`))
+        return false;
+    return result.stderr.includes(VALIDATION_FAILED_CODE) || result.stderr.includes('[ValidationFailed]');
 }
 export function parseOffendingComponentNames(output) {
     const jsonStart = output.indexOf('{');
-    if (jsonStart === -1)
-        return [];
-    const errors = parsePreviewValidationErrors(output.slice(jsonStart));
-    return [...new Set(errors.map((e) => e.componentName))];
+    if (jsonStart !== -1) {
+        const errors = parsePreviewValidationErrors(output.slice(jsonStart));
+        const names = [...new Set(errors.map((error) => error.componentName))];
+        if (names.length > 0)
+            return names;
+    }
+    const names = [...output.matchAll(/Component:\s*([^;\n)]+)/g)].map((match) => match[1].trim()).filter(Boolean);
+    return [...new Set(names)];
 }
 export function buildPushStepResult(args) {
     const { created, updated, failed, durationMs, stderr, excludedByRetry, totalFailure } = args;

package/dist/src/import/tui/WizardApp.js

@@ -37,7 +37,7 @@ import { ImportApiClient, ApiError } from '../../apply/api-client.js';
 import { detectSlotCycles, extractComponentsFromManifest, formatSlotCycleReport } from '../../apply/command.js';
 import { findSlotCycles } from '../../analyze/cycle-detection.js';
 import { buildComponentGraph } from '../../analyze/slot-graph.js';
-import { parseEdsiError, formatParsedEdsiError } from '../../apply/error-parser.js';
+import { parseEdsiError, formatEdsiError, formatParsedEdsiError } from '../../lib/error-parser.js';
 import { handlePreview422, applySkipValidationErrors, clearedValidationErrorState } from './wizard-422-helpers.js';
 import { parseGenerateStderrChunk } from './wizard-generate-progress.js';
 import { spawnGenerateChild } from './spawn-generate.js';
@@ -927,7 +927,10 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
                 update({
                     step: 'error',
                     errorStep: 'apply preview',
-                    errorMessage: e.message,
+                    errorMessage: formatParsedEdsiError(parseEdsiError(e.body || e.message), {
+                        verbose: process.env['EDSI_VERBOSE_ERRORS'] === '1',
+                        raw: e.body,
+                    }) || e.message,
                     errorAllowCredentialRetry: true,
                 });
                 return;
@@ -1056,6 +1059,13 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
                         failed: items.filter((i) => i.entityType === 'DesignToken' && i.status === 'failed').length,
                     },
                     summary: operation.summary,
+                    failures: items
+                        .filter((item) => item.status === 'failed')
+                        .map((item) => ({
+                        entityType: item.entityType,
+                        entityId: item.id,
+                        message: formatEdsiError(item.error),
+                    })),
                 };
             }
             else {
@@ -1645,7 +1655,7 @@ export function WizardApp({ initialSpaceId = '', initialEnvironmentId = 'master'
             case 'done': {
                 const totalFailed = state.pushResult.componentTypes.failed + state.pushResult.designTokens.failed;
                 const teaser = buildRunTeaserLine(state.lastRunId);
-                return (_jsx(DoneStep, { componentTypes: state.pushResult.componentTypes, designTokens: state.pushResult.designTokens, summary: state.pushResult.summary, spaceId: state.spaceId, environmentId: state.environmentId, host: state.host, ...(teaser ? { runTeaser: teaser } : {}), onExit: () => process.exit(totalFailed > 0 ? 1 : 0) }));
+                return (_jsx(DoneStep, { componentTypes: state.pushResult.componentTypes, designTokens: state.pushResult.designTokens, summary: state.pushResult.summary, failures: state.pushResult.failures, spaceId: state.spaceId, environmentId: state.environmentId, host: state.host, ...(teaser ? { runTeaser: teaser } : {}), onExit: () => process.exit(totalFailed > 0 ? 1 : 0) }));
             }
             case 'preview-validation-error': {
                 return (_jsx(PreviewValidationErrorStep, { errors: state.previewValidationErrors, missingNames: state.previewValidationMissingNames, onEdit: () => {

package/dist/src/import/tui/steps/DoneStep.d.ts

@@ -17,7 +17,12 @@ type DoneStepProps = {
     environmentId: string;
     host?: string;
     runTeaser?: string;
+    failures?: Array<{
+        entityType: string;
+        entityId: string;
+        message: string;
+    }>;
     onExit: () => void;
 };
-export declare function DoneStep({ componentTypes, designTokens, summary, spaceId, environmentId, host, runTeaser, onExit, }: DoneStepProps): React.ReactElement;
+export declare function DoneStep({ componentTypes, designTokens, summary, spaceId, environmentId, host, runTeaser, failures, onExit, }: DoneStepProps): React.ReactElement;
 export {};

package/dist/src/import/tui/steps/DoneStep.js

@@ -3,7 +3,7 @@ import { PALETTE } from '../../../analyze/select/tui/theme.js';
 import { Box, Text } from 'ink';
 import { useImmediateInput } from '../../../analyze/select/tui/hooks/useImmediateInput.js';
 import { buildPostPushUrl } from '../../../lib/contentful-urls.js';
-export function DoneStep({ componentTypes, designTokens, summary, spaceId, environmentId, host, runTeaser, onExit, }) {
+export function DoneStep({ componentTypes, designTokens, summary, spaceId, environmentId, host, runTeaser, failures = [], onExit, }) {
     useImmediateInput((input, key) => {
         if (key.return || input === 'q' || key.escape) {
             onExit();
@@ -20,5 +20,5 @@ export function DoneStep({ componentTypes, designTokens, summary, spaceId, envir
     function EntityRows({ entity, label }) {
         return (_jsxs(_Fragment, { children: [entity.created > 0 && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: PALETTE.success, children: "\u2713" }), _jsxs(Text, { children: [entity.created, " ", label, entity.created !== 1 ? 's' : '', " created"] })] })), entity.updated > 0 && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: PALETTE.success, children: "\u2713" }), _jsxs(Text, { children: [entity.updated, " ", label, entity.updated !== 1 ? 's' : '', " updated"] })] })), entity.removed > 0 && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: PALETTE.success, children: "\u2713" }), _jsxs(Text, { children: [entity.removed, " ", label, entity.removed !== 1 ? 's' : '', " removed"] })] })), entity.failed > 0 && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { color: PALETTE.error, children: "\u2717" }), _jsxs(Text, { color: PALETTE.error, children: [entity.failed, " ", label, entity.failed !== 1 ? 's' : '', " failed \u2014 check logs above"] })] }))] }));
     }
-    return (_jsxs(Box, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [success ? (_jsx(Text, { bold: true, color: PALETTE.success, children: "Done!" })) : (_jsx(Text, { bold: true, color: PALETTE.warning, children: "\u26A0 Finished with errors" })), totalPushed === 0 && totalFailed === 0 && !summary ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Nothing was pushed \u2014 everything was already up to date." }) })) : (_jsxs(Box, { flexDirection: "column", gap: 0, marginTop: 1, children: [_jsx(EntityRows, { entity: componentTypes, label: "Component Type" }), _jsx(EntityRows, { entity: designTokens, label: "Design Token" }), summary && (_jsxs(Box, { gap: 1, marginTop: 1, children: [_jsxs(Text, { dimColor: true, children: ["Server: ", summary.succeeded, "/", summary.total, " succeeded"] }), summary.failed > 0 && _jsxs(Text, { color: PALETTE.error, children: [", ", summary.failed, " failed"] })] }))] })), _jsxs(Box, { gap: 1, marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Space:" }), _jsx(Text, { children: spaceId }), _jsx(Text, { dimColor: true, children: "/" }), _jsx(Text, { dimColor: true, children: "Environment:" }), _jsx(Text, { children: environmentId })] }), success && totalPushed > 0 && (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Your design system is now in Contentful ExO." }), _jsxs(Box, { flexDirection: "column", gap: 0, children: [_jsx(Text, { dimColor: true, children: "View it here:" }), _jsx(Text, { color: PALETTE.info, children: buildPostPushUrl({ host: host ?? 'api.contentful.com', spaceId, environmentId }) })] })] })), runTeaser && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: runTeaser }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "[Enter / q] Exit" }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [success ? (_jsx(Text, { bold: true, color: PALETTE.success, children: "Done!" })) : (_jsx(Text, { bold: true, color: PALETTE.warning, children: "\u26A0 Finished with errors" })), totalPushed === 0 && totalFailed === 0 && !summary ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Nothing was pushed \u2014 everything was already up to date." }) })) : (_jsxs(Box, { flexDirection: "column", gap: 0, marginTop: 1, children: [_jsx(EntityRows, { entity: componentTypes, label: "Component Type" }), _jsx(EntityRows, { entity: designTokens, label: "Design Token" }), summary && (_jsxs(Box, { gap: 1, marginTop: 1, children: [_jsxs(Text, { dimColor: true, children: ["Server: ", summary.succeeded, "/", summary.total, " succeeded"] }), summary.failed > 0 && _jsxs(Text, { color: PALETTE.error, children: [", ", summary.failed, " failed"] })] }))] })), failures.length > 0 && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { bold: true, color: PALETTE.error, children: "Failure details" }), failures.map((failure) => (_jsxs(Text, { color: PALETTE.error, children: [failure.entityType, " ", failure.entityId, ": ", failure.message] }, `${failure.entityType}:${failure.entityId}`)))] })), _jsxs(Box, { gap: 1, marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Space:" }), _jsx(Text, { children: spaceId }), _jsx(Text, { dimColor: true, children: "/" }), _jsx(Text, { dimColor: true, children: "Environment:" }), _jsx(Text, { children: environmentId })] }), success && totalPushed > 0 && (_jsxs(Box, { flexDirection: "column", gap: 1, marginTop: 1, children: [_jsx(Text, { dimColor: true, children: "Your design system is now in Contentful ExO." }), _jsxs(Box, { flexDirection: "column", gap: 0, children: [_jsx(Text, { dimColor: true, children: "View it here:" }), _jsx(Text, { color: PALETTE.info, children: buildPostPushUrl({ host: host ?? 'api.contentful.com', spaceId, environmentId }) })] })] })), runTeaser && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: runTeaser }) })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "[Enter / q] Exit" }) })] }));
 }

package/dist/src/import/tui/steps/PreviewValidationErrorStep.js

@@ -1,9 +1,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { GateStep } from './GateStep.js';
+import { formatParsedEdsiError } from '../../../lib/error-parser.js';
 export function PreviewValidationErrorStep({ errors, missingNames, onEdit, onSkip, onQuit, }) {
     const uniqueNames = [...new Set(errors.map((e) => e.componentName))];
     const matchedNames = uniqueNames.filter((n) => !missingNames.includes(n));
-    const errorLines = errors.map((e) => `  ${e.componentName}: ${e.message}`).join('\n');
+    const errorLines = errors
+        .map((error) => formatParsedEdsiError({
+        code: null,
+        message: '',
+        cycle: null,
+        raw: false,
+        diagnostics: [{ message: error.message, component: error.componentName, path: error.path }],
+    }))
+        .join('\n');
     const missingNote = missingNames.length > 0
         ? `\n\nNote: ${missingNames.length} component name${missingNames.length === 1 ? '' : 's'} from the server (${missingNames.join(', ')}) ${missingNames.length === 1 ? 'does' : 'do'} not match anything in this session — they cannot be edited or skipped from here.`
         : '';

package/dist/src/lib/error-parser.d.ts

@@ -0,0 +1,38 @@
+export interface ParsedEdsiError {
+    /** Server-side error code, if we could extract one. */
+    code: string | null;
+    /** Human-readable message, stripped of log/trace decoration. */
+    message: string;
+    /** Cycle participants, when `code === 'TopoSortCycleError'`. */
+    cycle: string[] | null;
+    /** True when the message survived cleaning as-is (no parseable structure). */
+    raw: boolean;
+    /** Validation details supplied by the API, normalized for terminal output. */
+    diagnostics?: ErrorDiagnostic[];
+}
+export interface ErrorDiagnostic {
+    message: string;
+    component?: string;
+    /**
+     * A null path means that the API supplied a location but it contained no
+     * usable segments. An undefined path means the API did not provide one.
+     */
+    path?: string | null;
+    /** The API field that supplied the diagnostic message, for verbose output. */
+    messageSource?: 'message' | 'details' | 'error' | 'name';
+}
+export interface ApiErrorLike {
+    body?: string;
+    message: string;
+}
+export declare function stripLambdaLogPrefix(body: string): string;
+export declare function parseEdsiError(rawInput: string | undefined | null): ParsedEdsiError;
+export declare function formatParsedEdsiError(parsed: ParsedEdsiError, opts?: {
+    verbose?: boolean;
+    raw?: string;
+}): string;
+export declare function formatEdsiError(raw: unknown, opts?: {
+    verbose?: boolean;
+    raw?: string;
+}): string;
+export declare function formatApiError(error: ApiErrorLike, verbose?: boolean): string;

package/dist/src/lib/error-parser.js

@@ -0,0 +1,264 @@
+const LAMBDA_LOG_PREFIX_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z\s+[0-9a-f-]+\s+ERROR\s+(?:\[dd\.[^\]]*\]\s*)?/;
+const DD_TAG_RE = /\[dd\.(?:trace_id|span_id)=[^\]]*\]\s*/g;
+export function stripLambdaLogPrefix(body) {
+    let out = body.replace(LAMBDA_LOG_PREFIX_RE, '');
+    out = out.replace(DD_TAG_RE, '');
+    return out.trim();
+}
+function parseObjectLiteralTail(body) {
+    const braceStart = body.lastIndexOf('{');
+    if (braceStart === -1)
+        return null;
+    const tail = body.slice(braceStart);
+    const codeMatch = tail.match(/code:\s*['"]([^'"]+)['"]/);
+    const cycleMatch = tail.match(/cycle:\s*\[\s*([^\]]*)\s*\]/);
+    if (!codeMatch && !cycleMatch)
+        return null;
+    const code = codeMatch ? codeMatch[1] : null;
+    let cycle = null;
+    if (cycleMatch) {
+        cycle = cycleMatch[1]
+            .split(',')
+            .map((s) => s.trim().replace(/^['"]|['"]$/g, ''))
+            .filter((s) => s.length > 0);
+        if (cycle.length === 0)
+            cycle = null;
+    }
+    return { code, cycle };
+}
+function asRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value)
+        ? value
+        : null;
+}
+function displayValue(value) {
+    if (typeof value === 'string')
+        return value;
+    if (typeof value === 'number' || typeof value === 'boolean')
+        return String(value);
+    if (value === null || value === undefined)
+        return null;
+    try {
+        return JSON.stringify(value);
+    }
+    catch {
+        return null;
+    }
+}
+function isPathSegment(value) {
+    return typeof value === 'string' || (typeof value === 'number' && Number.isFinite(value));
+}
+function formatPath(value) {
+    if (isPathSegment(value))
+        return String(value) ? { path: String(value) } : { path: null };
+    if (Array.isArray(value)) {
+        const parts = value.filter(isPathSegment);
+        return parts.length > 0 ? { path: parts.join(' › ') } : { path: null };
+    }
+    return {};
+}
+function componentFromPath(path) {
+    if (!path)
+        return undefined;
+    const manifestMatch = path.match(/manifest:components\/([^/›]+)/);
+    if (manifestMatch?.[1])
+        return manifestMatch[1];
+    const parts = path
+        .split(/[›/]/)
+        .map((part) => part.trim())
+        .filter(Boolean);
+    const componentsIndex = parts.findIndex((part) => part === 'components');
+    return componentsIndex === -1 ? undefined : parts[componentsIndex + 1];
+}
+function diagnosticMessage(error) {
+    const candidates = [
+        ['message', error.message],
+        ['details', error.details],
+        ['error', error.error],
+        ['name', error.name],
+    ];
+    for (const [messageSource, value] of candidates) {
+        const message = displayValue(value);
+        if (message !== null)
+            return { message, messageSource };
+    }
+    return { message: 'Validation failed' };
+}
+function parseValidationDiagnostics(details) {
+    if (!Array.isArray(details.errors))
+        return [];
+    const diagnostics = [];
+    for (const rawError of details.errors) {
+        const error = asRecord(rawError);
+        if (!error)
+            continue;
+        const location = formatPath(error.path);
+        const component = displayValue(error.component ?? error.componentName ?? error.componentId) ?? componentFromPath(location.path);
+        diagnostics.push({ ...diagnosticMessage(error), ...location, ...(component ? { component } : {}) });
+    }
+    return diagnostics;
+}
+function parseJsonBody(body) {
+    let parsed;
+    try {
+        parsed = JSON.parse(body);
+    }
+    catch {
+        return null;
+    }
+    const p = asRecord(parsed);
+    if (!p)
+        return null;
+    const details = asRecord(p.details) ?? {};
+    const pick = (k) => (p[k] !== undefined ? p[k] : details[k]);
+    const codeRaw = pick('code') ?? asRecord(p.sys)?.id;
+    const messageRaw = pick('message');
+    const cycleRaw = pick('cycle');
+    const out = {};
+    if (typeof codeRaw === 'string')
+        out.code = codeRaw;
+    if (typeof messageRaw === 'string')
+        out.message = messageRaw;
+    if (Array.isArray(cycleRaw)) {
+        const strs = cycleRaw.filter((x) => typeof x === 'string');
+        if (strs.length > 0)
+            out.cycle = strs;
+    }
+    const diagnostics = parseValidationDiagnostics(details);
+    if (diagnostics.length > 0)
+        out.diagnostics = diagnostics;
+    return out;
+}
+function parseBindingDiagnostics(body) {
+    if (!/binding configurations are invalid|Pointer path does not exist/i.test(body))
+        return null;
+    const locationMatches = [...body.matchAll(/(?:^|\.\s)([A-Za-z0-9_$-]+(?:\s*›\s*[A-Za-z0-9_$-]+){2,})/g)];
+    const location = locationMatches.at(-1)?.[1];
+    const pointerMessage = body.match(/Pointer path does not exist for '\[object Object\]':\s*(.+?)(?=\.\s*Default\s*›|$)/i)?.[1];
+    const graphQlMessage = body.match(/return GraphQL validation error:\s*(.+?)(?=\.\s*Default\s*›|$)/i)?.[1];
+    const heading = body.match(/^(.*?)(?=\.?\s*Pointer path does not exist|\.?\s*Default\s*›)/i)?.[1]?.trim();
+    const diagnostics = [];
+    if (pointerMessage)
+        diagnostics.push({ message: pointerMessage.trim(), ...(location ? { path: location } : {}) });
+    if (graphQlMessage)
+        diagnostics.push({ message: graphQlMessage.trim(), ...(location ? { path: location } : {}) });
+    return {
+        code: 'BindingValidationFailed',
+        message: heading || 'One or more binding configurations are invalid.',
+        ...(diagnostics.length > 0 ? { diagnostics } : {}),
+    };
+}
+// ApiError.message shape: `${phasePrefix}\n${body}` where phasePrefix looks
+// like `apply failed: 400`, `preview failed: 422`, `poll failed: 500`. We
+// only strip the prefix line when the first line matches this shape —
+// otherwise a raw body that happens to contain a newline (e.g. a Lambda log
+// spill with a multi-line object literal) gets truncated mid-structure.
+const API_ERROR_PREFIX_RE = /^(?:apply|preview|poll) failed: \d+$/;
+export function parseEdsiError(rawInput) {
+    if (!rawInput)
+        return { code: null, message: '', cycle: null, raw: true };
+    const nlIndex = rawInput.indexOf('\n');
+    let body = rawInput;
+    let prefix = '';
+    if (nlIndex !== -1) {
+        const firstLine = rawInput.slice(0, nlIndex);
+        if (API_ERROR_PREFIX_RE.test(firstLine)) {
+            prefix = firstLine;
+            body = rawInput.slice(nlIndex + 1);
+        }
+    }
+    const cleaned = stripLambdaLogPrefix(body);
+    const json = parseJsonBody(cleaned) ?? parseJsonBody(body);
+    const bindingFromJson = typeof json?.message === 'string' ? parseBindingDiagnostics(json.message) : null;
+    if (bindingFromJson) {
+        return {
+            code: bindingFromJson.code ?? json?.code ?? null,
+            message: bindingFromJson.message ?? cleaned,
+            cycle: null,
+            raw: false,
+            ...(bindingFromJson.diagnostics ? { diagnostics: bindingFromJson.diagnostics } : {}),
+        };
+    }
+    if (json && (json.code || json.message || json.cycle)) {
+        return {
+            code: json.code ?? null,
+            message: json.message ?? (cleaned || prefix),
+            cycle: json.cycle ?? null,
+            raw: false,
+            ...(json.diagnostics ? { diagnostics: json.diagnostics } : {}),
+        };
+    }
+    const binding = parseBindingDiagnostics(cleaned);
+    if (binding) {
+        return {
+            code: binding.code ?? null,
+            message: binding.message ?? cleaned,
+            cycle: null,
+            raw: false,
+            ...(binding.diagnostics ? { diagnostics: binding.diagnostics } : {}),
+        };
+    }
+    const literal = parseObjectLiteralTail(cleaned);
+    if (literal && (literal.code || literal.cycle)) {
+        const braceStart = cleaned.lastIndexOf('{');
+        const head = braceStart === -1 ? cleaned : cleaned.slice(0, braceStart).trim();
+        return {
+            code: literal.code ?? null,
+            message: head || cleaned,
+            cycle: literal.cycle ?? null,
+            raw: false,
+        };
+    }
+    return { code: null, message: cleaned || prefix || rawInput, cycle: null, raw: true };
+}
+export function formatParsedEdsiError(parsed, opts = {}) {
+    const lines = [];
+    if (parsed.code) {
+        lines.push(`[${parsed.code}]`);
+    }
+    if (parsed.message) {
+        lines.push(parsed.message);
+    }
+    for (const diagnostic of parsed.diagnostics ?? []) {
+        const context = [
+            diagnostic.component ? `Component: ${diagnostic.component}` : null,
+            diagnostic.path ? `Path: ${diagnostic.path}` : null,
+        ].filter(Boolean);
+        lines.push(`- ${diagnostic.message}${context.length > 0 ? ` (${context.join('; ')})` : ''}`);
+        if (diagnostic.path === null) {
+            lines.push('  Location: not provided by the server. Review the submitted manifest; no component or field was identified.');
+        }
+        if (opts.verbose && diagnostic.messageSource) {
+            lines.push(`  Message field: ${diagnostic.messageSource}`);
+        }
+    }
+    if (parsed.code === 'BindingValidationFailed') {
+        const location = parsed.diagnostics?.find((diagnostic) => diagnostic.path)?.path;
+        lines.push(location
+            ? `Next action: review the binding at ${location} and correct its pointer or GraphQL selection.`
+            : 'Next action: review the binding pointer and GraphQL selection.');
+    }
+    if (parsed.cycle && parsed.cycle.length > 0) {
+        lines.push(`Cycle: ${parsed.cycle.join(' → ')} → ${parsed.cycle[0]}`);
+        lines.push('Break the cycle by removing at least one $allowedComponents entry.');
+    }
+    if (opts.verbose && opts.raw) {
+        lines.push('');
+        lines.push('--- raw ---');
+        lines.push(opts.raw);
+    }
+    return lines.filter(Boolean).join('\n');
+}
+export function formatEdsiError(raw, opts = {}) {
+    const input = typeof raw === 'string' ? raw : displayValue(raw);
+    if (!input)
+        return '';
+    return formatParsedEdsiError(parseEdsiError(input), { ...opts, raw: opts.raw ?? input });
+}
+export function formatApiError(error, verbose = false) {
+    const formatted = formatEdsiError(error.body || error.message, { verbose, raw: error.body }) || error.message;
+    const phase = error.message.split('\n', 1)[0];
+    return /^(?:apply|preview|poll) failed: \d+$/.test(phase) && formatted !== phase
+        ? `${phase}\n${formatted}`
+        : formatted;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.15.2-dev-build-7aee0f8.0",
+  "version": "2.15.2",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -34,8 +34,8 @@
     "react": "^18.3.1",
     "react-devtools-core": "^4.19.1",
     "react-dom": "^18.3.1",
-    "@contentful/experience-design-system-extraction": "2.15.2-dev-build-7aee0f8.0",
-    "@contentful/experience-design-system-types": "2.15.2-dev-build-7aee0f8.0"
+    "@contentful/experience-design-system-extraction": "2.15.2",
+    "@contentful/experience-design-system-types": "2.15.2"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",

package/dist/src/apply/error-parser.d.ts

@@ -1,16 +0,0 @@
-export interface ParsedEdsiError {
-    /** Server-side error code, if we could extract one. */
-    code: string | null;
-    /** Human-readable message, stripped of log/trace decoration. */
-    message: string;
-    /** Cycle participants, when `code === 'TopoSortCycleError'`. */
-    cycle: string[] | null;
-    /** True when the message survived cleaning as-is (no parseable structure). */
-    raw: boolean;
-}
-export declare function stripLambdaLogPrefix(body: string): string;
-export declare function parseEdsiError(rawInput: string | undefined | null): ParsedEdsiError;
-export declare function formatParsedEdsiError(parsed: ParsedEdsiError, opts?: {
-    verbose?: boolean;
-    raw?: string;
-}): string;

package/dist/src/apply/error-parser.js

@@ -1,117 +0,0 @@
-const LAMBDA_LOG_PREFIX_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z\s+[0-9a-f-]+\s+ERROR\s+(?:\[dd\.[^\]]*\]\s*)?/;
-const DD_TAG_RE = /\[dd\.(?:trace_id|span_id)=[^\]]*\]\s*/g;
-export function stripLambdaLogPrefix(body) {
-    let out = body.replace(LAMBDA_LOG_PREFIX_RE, '');
-    out = out.replace(DD_TAG_RE, '');
-    return out.trim();
-}
-function parseObjectLiteralTail(body) {
-    const braceStart = body.lastIndexOf('{');
-    if (braceStart === -1)
-        return null;
-    const tail = body.slice(braceStart);
-    const codeMatch = tail.match(/code:\s*['"]([^'"]+)['"]/);
-    const cycleMatch = tail.match(/cycle:\s*\[\s*([^\]]*)\s*\]/);
-    if (!codeMatch && !cycleMatch)
-        return null;
-    const code = codeMatch ? codeMatch[1] : null;
-    let cycle = null;
-    if (cycleMatch) {
-        cycle = cycleMatch[1]
-            .split(',')
-            .map((s) => s.trim().replace(/^['"]|['"]$/g, ''))
-            .filter((s) => s.length > 0);
-        if (cycle.length === 0)
-            cycle = null;
-    }
-    return { code, cycle };
-}
-function parseJsonBody(body) {
-    let parsed;
-    try {
-        parsed = JSON.parse(body);
-    }
-    catch {
-        return null;
-    }
-    if (!parsed || typeof parsed !== 'object')
-        return null;
-    const p = parsed;
-    const details = (p.details && typeof p.details === 'object' ? p.details : {});
-    const pick = (k) => (p[k] !== undefined ? p[k] : details[k]);
-    const codeRaw = pick('code');
-    const messageRaw = pick('message');
-    const cycleRaw = pick('cycle');
-    const out = {};
-    if (typeof codeRaw === 'string')
-        out.code = codeRaw;
-    if (typeof messageRaw === 'string')
-        out.message = messageRaw;
-    if (Array.isArray(cycleRaw)) {
-        const strs = cycleRaw.filter((x) => typeof x === 'string');
-        if (strs.length > 0)
-            out.cycle = strs;
-    }
-    return out;
-}
-// ApiError.message shape: `${phasePrefix}\n${body}` where phasePrefix looks
-// like `apply failed: 400`, `preview failed: 422`, `poll failed: 500`. We
-// only strip the prefix line when the first line matches this shape —
-// otherwise a raw body that happens to contain a newline (e.g. a Lambda log
-// spill with a multi-line object literal) gets truncated mid-structure.
-const API_ERROR_PREFIX_RE = /^(?:apply|preview|poll) failed: \d+$/;
-export function parseEdsiError(rawInput) {
-    if (!rawInput)
-        return { code: null, message: '', cycle: null, raw: true };
-    const nlIndex = rawInput.indexOf('\n');
-    let body = rawInput;
-    let prefix = '';
-    if (nlIndex !== -1) {
-        const firstLine = rawInput.slice(0, nlIndex);
-        if (API_ERROR_PREFIX_RE.test(firstLine)) {
-            prefix = firstLine;
-            body = rawInput.slice(nlIndex + 1);
-        }
-    }
-    const cleaned = stripLambdaLogPrefix(body);
-    const json = parseJsonBody(cleaned) ?? parseJsonBody(body);
-    if (json && (json.code || json.message || json.cycle)) {
-        return {
-            code: json.code ?? null,
-            message: json.message ?? (cleaned || prefix),
-            cycle: json.cycle ?? null,
-            raw: false,
-        };
-    }
-    const literal = parseObjectLiteralTail(cleaned);
-    if (literal && (literal.code || literal.cycle)) {
-        const braceStart = cleaned.lastIndexOf('{');
-        const head = braceStart === -1 ? cleaned : cleaned.slice(0, braceStart).trim();
-        return {
-            code: literal.code ?? null,
-            message: head || cleaned,
-            cycle: literal.cycle ?? null,
-            raw: false,
-        };
-    }
-    return { code: null, message: cleaned || prefix || rawInput, cycle: null, raw: true };
-}
-export function formatParsedEdsiError(parsed, opts = {}) {
-    const lines = [];
-    if (parsed.code) {
-        lines.push(`[${parsed.code}]`);
-    }
-    if (parsed.message) {
-        lines.push(parsed.message);
-    }
-    if (parsed.cycle && parsed.cycle.length > 0) {
-        lines.push(`Cycle: ${parsed.cycle.join(' → ')} → ${parsed.cycle[0]}`);
-        lines.push('Break the cycle by removing at least one $allowedComponents entry.');
-    }
-    if (opts.verbose && opts.raw) {
-        lines.push('');
-        lines.push('--- raw ---');
-        lines.push(opts.raw);
-    }
-    return lines.filter(Boolean).join('\n');
-}