@contentful/experience-design-system-cli 2.15.2-dev-build-a2c2d9e.0 → 2.15.2-dev-build-31eb989.0

package/dist/package.json

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

package/dist/src/analyze/command.js

@@ -2,7 +2,6 @@ import { createElement } from 'react';
 import { render } from 'ink';
 import { mkdir, readdir, readFile, stat, writeFile } from 'node:fs/promises';
 import { isAbsolute, join, relative, resolve } from 'node:path';
-import { addAgentModelOptions } from '../lib/agent-model-options.js';
 import { extractComponents, preClassifyComponent, isNonAuthorableComponent, computeExtractionScore, deriveNeedsReview, describeReviewReasons, inspectComponentSource, validateExtractedComponents, } from '@contentful/experience-design-system-extraction';
 import { AnalyzeView } from './tui/AnalyzeView.js';
 import { registerAnalyzeEditCommand } from './select/command.js';
@@ -166,7 +165,7 @@ export function registerAnalyzeCommand(program) {
     const analyze = program
         .command('analyze')
         .description('Extract component definitions from a project, or correct analysis output');
-    const extractCmd = analyze
+    analyze
         .command('extract')
         .description('Extract component definitions from a project')
         .requiredOption('--project <path>', 'Path to the project root')
@@ -178,11 +177,8 @@ export function registerAnalyzeCommand(program) {
         .option('--composition-agent', 'Opt into agentic mapping resolution when deterministic sources find no groups (implies --composite)')
         .option('--composition-refresh', 'Force the mapping agent to run even where deterministic sources answered (implies --composite)')
         .option('--generate-map <path>', 'Write a skeleton interchange map from resolved composition (implies --composite)')
-        .option('--prompt <stage=value>', 'Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md', (v, acc) => [...acc, v], []);
-    addAgentModelOptions(extractCmd, {
-        includeModel: false,
-        agentDescription: 'Coding agent for composition mapping resolution (claude|codex|opencode|cursor)',
-    })
+        .option('--prompt <stage=value>', 'Override a stage prompt (repeatable). value is a file path or literal text, e.g. --prompt composition=./p.md', (v, acc) => [...acc, v], [])
+        .option('--agent <name>', 'Coding agent for composition mapping resolution (claude|codex|opencode|cursor)')
         .option('--composition-agent-mode <mode>', "Agent resolution mode: 'parser' (agent writes a sandboxed parser — deterministic, default) or 'edges' (agent lists edges directly)", 'parser')
         .action(async (opts) => {
         const resolveUnreachable = (() => {

package/dist/src/analyze/select-agent/command.js

@@ -1,4 +1,3 @@
-import { addAgentModelOptions } from '../../lib/agent-model-options.js';
 import { openPipelineDb, loadRawComponents, loadScannedFiles, createStep, updateStep, computeComponentInputHash, lookupSelectCache, storeSelectCache, getCliCacheVersion, } from '../../session/db.js';
 import { hashPromptForSkill } from '../../session/cache-keys.js';
 import { appendReviewEvent, getRefineArtifactsRoot, ensureRefineSession, getRefineSessionPaths, saveReviewState, } from '../select/persistence.js';
@@ -301,12 +300,13 @@ async function selectAllComponents(agent, model, components, verbose, skillPathO
     return results;
 }
 export function registerAnalyzeSelectAgentCommand(program) {
-    const cmd = program
+    program
         .command('select-agent')
         .description('Use an AI agent to select components for Contentful Experience Orchestration')
         .option('--session <id>', 'Session ID from analyze extract (defaults to most recent)')
-        .option('--project-root <path>', 'Project root for resolving component source files');
-    addAgentModelOptions(cmd)
+        .option('--project-root <path>', 'Project root for resolving component source files')
+        .option('--agent <name>', 'Agent to use: claude, codex, opencode, cursor (defaults to value saved by experiences setup)')
+        .option('--model <name>', 'Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)')
         .option('--verbose', 'Show full agent output including reasoning text')
         .option('--dry-run', 'Print the prompt for the first component without invoking the agent')
         .option('--exclude-invalid', 'Auto-reject components with validation errors instead of failing loud (LLM cannot fix structural issues)')

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 { formatEdsiError } from './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';
@@ -17,6 +18,13 @@ function die(message) {
     process.stderr.write(`${message}\n`);
     process.exit(1);
 }
+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;
+}
 async function pathExists(p) {
     return access(p)
         .then(() => true)
@@ -289,7 +297,7 @@ function buildApplyOutput(operation, spaceId, environmentId, host) {
             .map((item) => ({
             entityType: item.entityType,
             entityId: item.id,
-            error: item.error,
+            error: formatEdsiError(item.error),
         })),
     };
 }
@@ -435,7 +443,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 +452,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 +463,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 +509,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 +519,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 +529,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 +574,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 +583,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 +608,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e, opts.verbose),
                         }));
                         return;
                     }
@@ -621,7 +629,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e, opts.verbose),
                         }));
                         return;
                     }
@@ -677,7 +685,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 +695,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 +705,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 +743,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 +752,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 +789,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e),
                         }));
                         return;
                     }
@@ -802,7 +810,7 @@ export function registerApplyCommand(program) {
                             spaceId,
                             environmentId,
                             status: 'error',
-                            error: e.message,
+                            error: formatApiError(e),
                         }));
                         return;
                     }

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

@@ -7,6 +7,14 @@ export interface ParsedEdsiError {
     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;
+    path?: string;
+    pathMissing?: boolean;
 }
 export declare function stripLambdaLogPrefix(body: string): string;
 export declare function parseEdsiError(rawInput: string | undefined | null): ParsedEdsiError;
@@ -14,3 +22,7 @@ export declare function formatParsedEdsiError(parsed: ParsedEdsiError, opts?: {
     verbose?: boolean;
     raw?: string;
 }): string;
+export declare function formatEdsiError(raw: unknown, opts?: {
+    verbose?: boolean;
+    raw?: string;
+}): string;

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

@@ -26,6 +26,66 @@ function parseObjectLiteralTail(body) {
     }
     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 formatPath(value) {
+    if (typeof value === 'string')
+        return value ? { path: value } : { pathMissing: true };
+    if (Array.isArray(value)) {
+        const parts = value.filter((part) => typeof part === 'string' || typeof part === 'number');
+        return parts.length > 0 ? { path: parts.join(' › ') } : { pathMissing: true };
+    }
+    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 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);
+        const message = displayValue(error.message) ??
+            displayValue(error.details) ??
+            displayValue(error.error) ??
+            displayValue(error.name) ??
+            'Validation failed';
+        diagnostics.push({ message, ...location, ...(component ? { component } : {}) });
+    }
+    return diagnostics;
+}
 function parseJsonBody(body) {
     let parsed;
     try {
@@ -34,12 +94,12 @@ function parseJsonBody(body) {
     catch {
         return null;
     }
-    if (!parsed || typeof parsed !== 'object')
+    const p = asRecord(parsed);
+    if (!p)
         return null;
-    const p = parsed;
-    const details = (p.details && typeof p.details === 'object' ? p.details : {});
+    const details = asRecord(p.details) ?? {};
     const pick = (k) => (p[k] !== undefined ? p[k] : details[k]);
-    const codeRaw = pick('code');
+    const codeRaw = pick('code') ?? asRecord(p.sys)?.id;
     const messageRaw = pick('message');
     const cycleRaw = pick('cycle');
     const out = {};
@@ -52,8 +112,30 @@ function parseJsonBody(body) {
         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 —
@@ -75,12 +157,33 @@ export function parseEdsiError(rawInput) {
     }
     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);
@@ -104,6 +207,22 @@ export function formatParsedEdsiError(parsed, opts = {}) {
     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.pathMissing) {
+            lines.push('  Location: not provided by the server. Review the submitted manifest; no component or field was identified.');
+        }
+    }
+    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.');
@@ -115,3 +234,9 @@ export function formatParsedEdsiError(parsed, opts = {}) {
     }
     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 });
+}

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 '../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/generate/command.js

@@ -14,7 +14,6 @@ import { openPipelineDb, loadRawComponents, applyToolCalls, applyTokenToolCalls,
 import { hashPromptForSkill } from '../session/cache-keys.js';
 import { getRefineArtifactsRoot, getRefineSessionPaths } from '../analyze/select/persistence.js';
 import { readExperiencesCredentials } from '../credentials-store.js';
-import { addAgentModelOptions } from '../lib/agent-model-options.js';
 const execFileAsync = promisify(execFile);
 const VALID_AGENTS = new Set(['claude', 'codex', 'opencode', 'cursor']);
 const DEFAULT_TIMEOUT_MS = Number(process.env.EDS_AGENT_TIMEOUT_MS ?? 3 * 60 * 1000);
@@ -569,7 +568,9 @@ async function runGenerateSkill(skill, opts, verbose = false) {
     }
 }
 function addAgentFlags(cmd) {
-    return addAgentModelOptions(cmd)
+    return cmd
+        .option('--agent <name>', 'Agent to use: claude, codex, opencode, cursor (defaults to value saved by experiences setup)')
+        .option('--model <name>', 'Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)')
         .option('--verbose', 'Show full agent output including reasoning text')
         .option('--dry-run', 'Print the prompt without invoking the agent')
         .option('--no-cache', 'Bypass ALL fine-grained caches (extract, select, generate) and force AI re-run. ' +

package/dist/src/import/command.js

@@ -2,7 +2,6 @@ import { resolve, join } from 'node:path';
 import { runPipeline } from './orchestrator.js';
 import { resolveAutoFilter } from './auto-filter-resolve.js';
 import { resolveAgent, resolveModel } from './agent-model-resolve.js';
-import { addAgentModelOptions } from '../lib/agent-model-options.js';
 import { resolveCompositionMode } from '../lib/composition-mode.js';
 import { readExperiencesCredentials } from '../credentials-store.js';
 import { DEFAULT_CONFIGURED_HOST, toConfiguredHost } from '../host-utils.js';
@@ -12,18 +11,16 @@ import { resolvePromptFlags } from './print-prompt.js';
 import { shouldShowRunPicker } from '../runs/run-picker-mount.js';
 import { dispatchPickerSelection } from './picker-dispatch.js';
 export function registerImportCommand(program) {
-    const cmd = program
+    program
         .command('import')
         .description('Run the full pipeline: analyze → select → generate → push')
         .option('--space-id <id>', 'Contentful space ID (required unless --skip-apply)')
         .option('--environment-id <id>', 'Contentful environment ID (required unless --skip-apply)')
         .option('--cma-token <token>', 'CMA personal access token (or set CONTENTFUL_MANAGEMENT_TOKEN)')
         .option('--project <path>', 'Path to the project root to analyze', '.')
-        .option('--out <path>', 'Output directory for pipeline artifacts');
-    addAgentModelOptions(cmd, {
-        agentDescription: 'Agent to use for generate components (overrides credentials.json; falls back to "claude")',
-        modelDescription: 'Model to use for generate components (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)',
-    })
+        .option('--out <path>', 'Output directory for pipeline artifacts')
+        .option('--agent <name>', 'Agent to use for generate components (overrides credentials.json; falls back to "claude")')
+        .option('--model <name>', 'Model to use for generate components (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)')
         .option('--tokens <path>', 'Path to a DTCG tokens.json file to push alongside generated components')
         .option('--raw-tokens <path>', 'Path to a raw token source file (SCSS, CSS variables, JS/TS, Style Dictionary, etc.) to classify and import alongside components. Bypasses the interactive token prompt.')
         .option('--select-all', 'Select all extracted components for generation (default)')

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 '../../apply/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 '../../../apply/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.15.2-dev-build-a2c2d9e.0",
+  "version": "2.15.2-dev-build-31eb989.0",
   "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-types": "2.15.2-dev-build-a2c2d9e.0",
-    "@contentful/experience-design-system-extraction": "2.15.2-dev-build-a2c2d9e.0"
+    "@contentful/experience-design-system-extraction": "2.15.2-dev-build-31eb989.0",
+    "@contentful/experience-design-system-types": "2.15.2-dev-build-31eb989.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.3",

package/dist/src/lib/agent-model-options.d.ts

@@ -1,13 +0,0 @@
-import type { Command } from 'commander';
-export declare const AGENT_DESCRIPTION = "Agent to use: claude, codex, opencode, cursor (defaults to value saved by experiences setup)";
-export declare const MODEL_DESCRIPTION = "Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)";
-export interface AgentModelOptionsConfig {
-    agentDescription?: string;
-    includeModel?: boolean;
-    modelDescription?: string;
-}
-/**
- * Register --agent and optionally --model flags to a Commander command, with customizable descriptions.
- * Pass `includeModel: false` for commands where the model dimension is not applicable (e.g., mapping-resolution agents that select an agent for logic, not model choice).
- */
-export declare function addAgentModelOptions(cmd: Command, config?: AgentModelOptionsConfig): Command;

package/dist/src/lib/agent-model-options.js

@@ -1,14 +0,0 @@
-export const AGENT_DESCRIPTION = 'Agent to use: claude, codex, opencode, cursor (defaults to value saved by experiences setup)';
-export const MODEL_DESCRIPTION = 'Model to use (defaults to a lightweight per-agent model; override with EDS_AGENT_MODEL_<AGENT>)';
-/**
- * Register --agent and optionally --model flags to a Commander command, with customizable descriptions.
- * Pass `includeModel: false` for commands where the model dimension is not applicable (e.g., mapping-resolution agents that select an agent for logic, not model choice).
- */
-export function addAgentModelOptions(cmd, config = {}) {
-    const { agentDescription = AGENT_DESCRIPTION, includeModel = true, modelDescription = MODEL_DESCRIPTION } = config;
-    cmd.option('--agent <name>', agentDescription);
-    if (includeModel) {
-        cmd.option('--model <name>', modelDescription);
-    }
-    return cmd;
-}