@contentful/experience-design-system-cli 2.37.1-dev-build-9da0d812.0 → 2.37.1-dev-build-8757f66c.0

package/dist/index.js

@@ -3202,9 +3202,11 @@ var init_resolve_session_id = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/persistence/src/credentials/helpers/host-utils.js
+var DEFAULT_CONFIGURED_HOST;
 var init_host_utils = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/persistence/src/credentials/helpers/host-utils.js"() {
     "use strict";
+    DEFAULT_CONFIGURED_HOST = "api.contentful.com";
   }
 });
 
@@ -3679,9 +3681,9 @@ var init_utils_gen = __esm({
       config.headers = mergeHeaders(a.headers, b.headers);
       return config;
     };
-    mergeHeaders = (...headers2) => {
+    mergeHeaders = (...headers) => {
       const mergedHeaders = new Headers();
-      for (const header of headers2) {
+      for (const header of headers) {
         if (!header || typeof header !== "object") {
           continue;
         }
@@ -3928,10 +3930,37 @@ var init_client_gen2 = __esm({
 });
 
 // packages/experience-design-system-client/dist/src/generated/sdk.gen.js
+var designSystemImportSourcelessPreview, designSystemImportApply, designSystemImportGetOperation;
 var init_sdk_gen = __esm({
   "packages/experience-design-system-client/dist/src/generated/sdk.gen.js"() {
     "use strict";
     init_client_gen2();
+    designSystemImportSourcelessPreview = (options) => {
+      return (options.client ?? client).post({
+        url: "/spaces/{spaceId}/environments/{environmentId}/design_systems/imports/preview",
+        ...options,
+        headers: {
+          "Content-Type": "application/json",
+          ...options.headers
+        }
+      });
+    };
+    designSystemImportApply = (options) => {
+      return (options.client ?? client).post({
+        url: "/spaces/{spaceId}/environments/{environmentId}/design_systems/imports/apply",
+        ...options,
+        headers: {
+          "Content-Type": "application/json",
+          ...options.headers
+        }
+      });
+    };
+    designSystemImportGetOperation = (options) => {
+      return (options.client ?? client).get({
+        url: "/spaces/{spaceId}/environments/{environmentId}/design_systems/imports/apply/{operationId}",
+        ...options
+      });
+    };
   }
 });
 
@@ -3954,9 +3983,13 @@ var init_src2 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/constants/api.js
+var PREVIEW_ERROR_PREFIX, APPLY_ERROR_PREFIX, USER_AGENT;
 var init_api = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/constants/api.js"() {
     "use strict";
+    PREVIEW_ERROR_PREFIX = "preview failed:";
+    APPLY_ERROR_PREFIX = "apply failed:";
+    USER_AGENT = "experience-design-system-backend-pipeline";
   }
 });
 
@@ -3969,34 +4002,153 @@ var init_constants5 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/http-utils.js
+function isTransientStatus(status) {
+  return status >= 500 && status <= 599;
+}
+function retryAfterMs(response) {
+  const value = response.headers?.get("retry-after")?.trim();
+  if (!value)
+    return void 0;
+  const seconds = Number(value);
+  const delayMs = Number.isFinite(seconds) ? seconds * 1e3 : Date.parse(value) - Date.now();
+  if (!Number.isFinite(delayMs) || delayMs < 0 || delayMs > MAX_RETRY_AFTER_MS)
+    return void 0;
+  return Math.round(delayMs);
+}
+function isApsDenialBody(body) {
+  if (!body)
+    return false;
+  try {
+    const parsed = JSON.parse(body);
+    const id = parsed?.sys?.id;
+    return id === "NotFound" || id === "AccessDenied";
+  } catch {
+    return false;
+  }
+}
+function stringifyError(error) {
+  return typeof error === "string" ? error : JSON.stringify(error ?? {});
+}
+function errorMessage(error) {
+  return error instanceof Error && error.message ? error.message : String(error);
+}
+function defaultSleep(delayMs) {
+  return new Promise((resolve2) => setTimeout(resolve2, delayMs));
+}
+var MAX_RETRY_AFTER_MS;
 var init_http_utils = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/http-utils.js"() {
     "use strict";
+    MAX_RETRY_AFTER_MS = 6e4;
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js
+function sanitizeBreakingChanges(raw) {
+  if (!Array.isArray(raw))
+    return [];
+  const out = [];
+  for (const bc of raw) {
+    if (typeof bc !== "object" || bc === null)
+      continue;
+    const reason = bc.reason;
+    if (typeof reason !== "string")
+      continue;
+    if ("propertyId" in bc && typeof bc.propertyId === "string") {
+      if (PROPERTY_BREAKING_REASONS.has(reason))
+        out.push(bc);
+      continue;
+    }
+    if ("slotId" in bc && typeof bc.slotId === "string") {
+      if (SLOT_BREAKING_REASONS.has(reason))
+        out.push(bc);
+      continue;
+    }
+  }
+  return out;
+}
+function sanitizePreviewResponse(res) {
+  for (const item of res.components?.changed ?? []) {
+    const cc = item.changeClassification;
+    if (cc && Array.isArray(cc.breakingChanges)) {
+      cc.breakingChanges = sanitizeBreakingChanges(cc.breakingChanges);
+    }
+  }
+  return res;
+}
+var PROPERTY_BREAKING_REASONS, SLOT_BREAKING_REASONS;
 var init_sanitize_preview = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js"() {
     "use strict";
+    PROPERTY_BREAKING_REASONS = /* @__PURE__ */ new Set([
+      "removed",
+      "added_required_no_default",
+      "type_changed",
+      "validation_narrowed"
+    ]);
+    SLOT_BREAKING_REASONS = /* @__PURE__ */ new Set(["slot_removed", "slot_allowed_components_narrowed"]);
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/host-utils.js
+function trimTrailingSlashes(value) {
+  return value.replace(/\/+$/, "");
+}
+function normalizeHostInput(host) {
+  const value = host?.trim();
+  if (!value)
+    return void 0;
+  return trimTrailingSlashes(value);
+}
+function toConfiguredHost2(host) {
+  const normalized = normalizeHostInput(host);
+  if (!normalized)
+    return void 0;
+  return normalized.replace(/^https:\/\//i, "");
+}
+function toApiHost2(host) {
+  const normalized = normalizeHostInput(host);
+  if (!normalized)
+    return DEFAULT_API_HOST;
+  if (/^[a-z][a-z\d+\-.]*:\/\//i.test(normalized))
+    return normalized;
+  return `https://${normalized}`;
+}
+var DEFAULT_API_HOST;
 var init_host_utils2 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/host-utils.js"() {
     "use strict";
+    DEFAULT_API_HOST = "https://api.contentful.com";
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/types/api-error.js
+var ERROR_BODY_LOG_CAP, ApiError;
 var init_api_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/types/api-error.js"() {
     "use strict";
+    ERROR_BODY_LOG_CAP = 16384;
+    ApiError = class extends Error {
+      status;
+      body;
+      guidance;
+      constructor(message, status, body, guidance) {
+        super(message);
+        this.status = status;
+        this.body = body;
+        this.guidance = guidance;
+        if (body) {
+          const trimmed = body.length > ERROR_BODY_LOG_CAP ? body.slice(0, ERROR_BODY_LOG_CAP) + "\u2026" : body;
+          this.message = `${message}
+${trimmed}`;
+        }
+      }
+    };
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/api-client/api-client.js
+var ApiClient;
 var init_api_client = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/api-client/api-client.js"() {
     "use strict";
@@ -4006,6 +4158,161 @@ var init_api_client = __esm({
     init_sanitize_preview();
     init_host_utils2();
     init_api_error();
+    ApiClient = class {
+      host;
+      token;
+      spaceId;
+      environmentId;
+      retry;
+      lastRequestId;
+      constructor(opts) {
+        this.host = toApiHost2(opts.host);
+        this.token = opts.cmaToken;
+        this.spaceId = opts.spaceId;
+        this.environmentId = opts.environmentId;
+        const initialDelayMs = Math.max(0, opts.retry?.initialDelayMs ?? 250);
+        this.retry = {
+          maxAttempts: Math.max(1, Math.floor(opts.retry?.maxAttempts ?? 3)),
+          initialDelayMs,
+          maxDelayMs: Math.max(initialDelayMs, opts.retry?.maxDelayMs ?? 2e3),
+          sleep: opts.retry?.sleep ?? defaultSleep
+        };
+      }
+      getLastRequestId() {
+        return this.lastRequestId;
+      }
+      noteRequestId(response) {
+        const id = response.headers.get("x-contentful-request-id");
+        if (id)
+          this.lastRequestId = id;
+      }
+      headers() {
+        return {
+          Authorization: `Bearer ${this.token}`,
+          "Content-Type": "application/json",
+          "X-Contentful-User-Agent": USER_AGENT
+        };
+      }
+      async requestWithRetry(phase, errorPrefix, makeCall) {
+        for (let attempt = 1; attempt <= this.retry.maxAttempts; attempt++) {
+          let result;
+          try {
+            result = await makeCall();
+          } catch (error) {
+            if (attempt === this.retry.maxAttempts) {
+              const body = `The request failed after ${attempt} attempts because of a network error: ${errorMessage(error)}. Check your connection and try again.`;
+              throw new ApiError(`${errorPrefix} 0`, 0, body);
+            }
+            await this.retry.sleep(Math.min(this.retry.initialDelayMs * 2 ** (attempt - 1), this.retry.maxDelayMs));
+            continue;
+          }
+          if (!isTransientStatus(result.response.status)) {
+            this.noteRequestId(result.response);
+            return result;
+          }
+          if (attempt === this.retry.maxAttempts) {
+            const body = stringifyError(result.error);
+            const guidance = `The ${phase} request failed after ${attempt} attempts because the service remained unavailable. Wait a moment and try again.`;
+            throw new ApiError(`${errorPrefix} ${result.response.status}`, result.response.status, body, guidance);
+          }
+          const backoffMs = Math.min(this.retry.initialDelayMs * 2 ** (attempt - 1), this.retry.maxDelayMs);
+          await this.retry.sleep(retryAfterMs(result.response) ?? backoffMs);
+        }
+        throw new Error("Retry attempts exhausted");
+      }
+      async validateToken() {
+        const res = await fetch(`${this.host}/users/me`, { headers: this.headers() });
+        this.noteRequestId(res);
+        if (res.status === 401) {
+          throw new ApiError("CMA token is invalid or revoked", res.status, await res.text());
+        }
+        if (!res.ok) {
+          throw new ApiError(`unexpected error validating token: ${res.status}`, res.status, await res.text());
+        }
+        await this.checkPreflight();
+      }
+      async checkPreflight() {
+        const url = `${this.host}/spaces/${this.spaceId}/environments/${this.environmentId}/design_systems/preflight`;
+        let res;
+        try {
+          res = await fetch(url, { headers: this.headers() });
+        } catch {
+          return;
+        }
+        this.noteRequestId(res);
+        if (res.ok)
+          return;
+        if (res.status >= 500)
+          return;
+        const body = await res.text();
+        if (res.status === 404 && !isApsDenialBody(body))
+          return;
+        throw new ApiError(`preflight failed: ${res.status}`, res.status, body);
+      }
+      async previewImport(cdf) {
+        const result = await this.requestWithRetry("preview", PREVIEW_ERROR_PREFIX, () => designSystemImportSourcelessPreview({
+          baseUrl: this.host,
+          headers: this.headers(),
+          path: { spaceId: this.spaceId, environmentId: this.environmentId },
+          body: cdf,
+          parseAs: "json"
+        }));
+        if (!result.response.ok) {
+          throw new ApiError(`${PREVIEW_ERROR_PREFIX} ${result.response.status}`, result.response.status, stringifyError(result.error));
+        }
+        return sanitizePreviewResponse(result.data);
+      }
+      async applyImport(cdf, opts) {
+        let result;
+        try {
+          result = await designSystemImportApply({
+            baseUrl: this.host,
+            headers: this.headers(),
+            path: { spaceId: this.spaceId, environmentId: this.environmentId },
+            body: { ...cdf, acknowledgeBreakingChanges: opts.acknowledgeBreakingChanges },
+            parseAs: "json"
+          });
+        } catch (error) {
+          const body = `The apply request was not retried because its outcome is unknown and retrying could start a duplicate operation. Cause: ${errorMessage(error)}`;
+          throw new ApiError(`${APPLY_ERROR_PREFIX} 0`, 0, body);
+        }
+        if (!result.response.ok) {
+          const body = stringifyError(result.error);
+          const guidance = isTransientStatus(result.response.status) ? "The apply request was not retried because the server may already have started an operation and retrying could create a duplicate." : void 0;
+          throw new ApiError(`${APPLY_ERROR_PREFIX} ${result.response.status}`, result.response.status, body, guidance);
+        }
+        this.noteRequestId(result.response);
+        return result.data;
+      }
+      async pollOperation(operationId, opts = {}) {
+        const intervalMs = opts.intervalMs ?? 2e3;
+        const maxIntervalMs = opts.maxIntervalMs ?? Math.round(intervalMs * 2.5);
+        const maxAttempts = opts.maxAttempts ?? 150;
+        const terminalStatuses = /* @__PURE__ */ new Set(["succeeded", "partial", "failed"]);
+        for (let attempt = 0; attempt < maxAttempts; attempt++) {
+          const result = await this.requestWithRetry("poll", "poll failed:", () => designSystemImportGetOperation({
+            baseUrl: this.host,
+            headers: this.headers(),
+            path: { spaceId: this.spaceId, environmentId: this.environmentId, operationId },
+            parseAs: "json"
+          }));
+          if (!result.response.ok) {
+            throw new ApiError(`poll failed: ${result.response.status}`, result.response.status, stringifyError(result.error));
+          }
+          const op = result.data;
+          opts.onProgress?.(op);
+          if (terminalStatuses.has(op.sys.status))
+            return op;
+          if (attempt < maxAttempts - 1) {
+            const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
+            const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
+            const jitter = Math.random() * baseDelay * 0.15;
+            await new Promise((resolve2) => setTimeout(resolve2, baseDelay + jitter));
+          }
+        }
+        throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
+      }
+    };
   }
 });
 
@@ -4208,6 +4515,25 @@ var init_annotate_preview2 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-binding-diagnostics.js
+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 } : {}
+  };
+}
 var init_parse_binding_diagnostics = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-binding-diagnostics.js"() {
     "use strict";
@@ -4215,6 +4541,76 @@ var init_parse_binding_diagnostics = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/helpers.js
+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 === void 0)
+    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(" \u203A ") } : { path: null };
+  }
+  return {};
+}
+function componentFromPath(path5) {
+  if (!path5)
+    return void 0;
+  const manifestMatch = path5.match(/manifest:components\/([^/›]+)/);
+  if (manifestMatch?.[1])
+    return manifestMatch[1];
+  const parts = path5.split(/[›/]/).map((part) => part.trim()).filter(Boolean);
+  const componentsIndex = parts.findIndex((part) => part === "components");
+  return componentsIndex === -1 ? void 0 : 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 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 };
+}
 var init_helpers3 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/helpers.js"() {
     "use strict";
@@ -4222,6 +4618,50 @@ var init_helpers3 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-json-body.js
+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] !== void 0 ? 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;
+}
 var init_parse_json_body = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-json-body.js"() {
     "use strict";
@@ -4230,13 +4670,72 @@ var init_parse_json_body = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/strip-lambda-log-prefix.js
+function stripLambdaLogPrefix(body) {
+  return body.replace(LAMBDA_LOG_PREFIX_RE, "").replace(DD_TAG_RE, "").trim();
+}
+var LAMBDA_LOG_PREFIX_RE, DD_TAG_RE;
 var init_strip_lambda_log_prefix = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/strip-lambda-log-prefix.js"() {
     "use strict";
+    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*)?/;
+    DD_TAG_RE = /\[dd\.(?:trace_id|span_id)=[^\]]*\]\s*/g;
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-edsi-error.js
+function parseEdsiError(rawInput) {
+  if (!rawInput)
+    return { code: null, message: "", cycle: null, raw: true };
+  const { body, prefix } = splitPhasePrefix(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 literal2 = parseObjectLiteralTail(cleaned);
+  if (literal2 && (literal2.code || literal2.cycle)) {
+    const braceStart = cleaned.lastIndexOf("{");
+    const head = braceStart === -1 ? cleaned : cleaned.slice(0, braceStart).trim();
+    return { code: literal2.code ?? null, message: head || cleaned, cycle: literal2.cycle ?? null, raw: false };
+  }
+  return { code: null, message: cleaned || prefix || rawInput, cycle: null, raw: true };
+}
+function splitPhasePrefix(input) {
+  const nlIndex = input.indexOf("\n");
+  if (nlIndex === -1)
+    return { body: input, prefix: "" };
+  const firstLine = input.slice(0, nlIndex);
+  if (!API_ERROR_PREFIX_RE.test(firstLine))
+    return { body: input, prefix: "" };
+  return { body: input.slice(nlIndex + 1), prefix: firstLine };
+}
+var API_ERROR_PREFIX_RE;
 var init_parse_edsi_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/parse-edsi-error.js"() {
     "use strict";
@@ -4244,10 +4743,51 @@ var init_parse_edsi_error = __esm({
     init_parse_json_body();
     init_helpers3();
     init_strip_lambda_log_prefix();
+    API_ERROR_PREFIX_RE = /^(?:apply|preview|poll) failed: \d+$/;
   }
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-parsed-edsi-error.js
+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 CDF file; 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((d) => d.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.code === "AccessDenied") {
+    lines.push("Next action: this operation requires DesignToken and Component permissions in this environment. Ask a Contentful admin to grant both on your role.");
+  }
+  if (parsed.code === "NotFound") {
+    lines.push("Next action: verify the resource id is correct. If it should exist, your role may lack read permission on DesignToken or Component.");
+  }
+  if (parsed.cycle && parsed.cycle.length > 0) {
+    lines.push(`Cycle: ${parsed.cycle.join(" \u2192 ")} \u2192 ${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");
+}
 var init_format_parsed_edsi_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-parsed-edsi-error.js"() {
     "use strict";
@@ -4255,6 +4795,12 @@ var init_format_parsed_edsi_error = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-edsi-error.js
+function formatEdsiError(raw, opts = {}) {
+  const input = typeof raw === "string" ? raw : displayValue(raw);
+  if (!input)
+    return "";
+  return formatParsedEdsiError(parseEdsiError(input), { ...opts, raw: opts.raw ?? input });
+}
 var init_format_edsi_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-edsi-error.js"() {
     "use strict";
@@ -4265,6 +4811,14 @@ var init_format_edsi_error = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-api-error.js
+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];
+  const withPhase = /^(?:apply|preview|poll) failed: \d+$/.test(phase) && formatted !== phase ? `${phase}
+${formatted}` : formatted;
+  return error.guidance ? `${withPhase}
+${error.guidance}` : withPhase;
+}
 var init_format_api_error = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/edsi-errors/format-api-error.js"() {
     "use strict";
@@ -4301,6 +4855,9 @@ var init_format_edsi_error2 = __esm({
 });
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/controller/errors/format-api-error.js
+function formatApiError2(request) {
+  return formatApiError(request.error, request.verbose ?? false);
+}
 var init_format_api_error2 = __esm({
   "packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/controller/errors/format-api-error.js"() {
     "use strict";
@@ -4810,21 +5367,12 @@ function keyAction2(input, key) {
 function nextField(field) {
   return FIELDS[(FIELDS.indexOf(field) + 1) % FIELDS.length];
 }
-function toConfiguredHost3(host) {
-  const value = (host ?? "").trim().replace(/\/+$/, "");
-  return value === "" ? DEFAULT_HOST : value.replace(/^https:\/\//i, "");
-}
-function toApiHost3(host) {
-  const value = host.trim().replace(/\/+$/, "");
-  if (value === "") return `https://${DEFAULT_HOST}`;
-  return /^[a-z][a-z\d+\-.]*:\/\//i.test(value) ? value : `https://${value}`;
-}
 function normalize(values) {
   return {
     spaceId: values.spaceId.trim(),
     environmentId: values.environmentId.trim(),
     cmaToken: values.cmaToken.trim(),
-    host: toConfiguredHost3(values.host)
+    host: toConfiguredHost2(values.host) ?? DEFAULT_CONFIGURED_HOST
   };
 }
 function missingField(values) {
@@ -4833,12 +5381,12 @@ function missingField(values) {
 function isUnchanged(current, initial) {
   return FIELDS.every((field) => current[field] === initial[field]);
 }
-var FIELDS, DEFAULT_HOST;
+var FIELDS;
 var init_logic4 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/04-credentials/logic.ts"() {
     "use strict";
+    init_src3();
     FIELDS = ["spaceId", "environmentId", "cmaToken", "host"];
-    DEFAULT_HOST = "api.contentful.com";
   }
 });
 
@@ -4868,65 +5416,35 @@ var init_controls4 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/04-credentials/validate.ts
-function headers(token) {
-  return { Authorization: `Bearer ${token}`, "X-Contentful-User-Agent": USER_AGENT2 };
-}
-function isApsDenial(body) {
-  try {
-    const id = JSON.parse(body).sys?.id;
-    return id === "NotFound" || id === "AccessDenied";
-  } catch {
-    return false;
-  }
-}
-function messageFrom(body) {
-  try {
-    const message = JSON.parse(body).message;
-    return typeof message === "string" && message !== "" ? message : void 0;
-  } catch {
-    return void 0;
-  }
-}
 async function validateCredentials(values) {
-  const base = toApiHost3(values.host);
-  let me;
-  try {
-    me = await fetch(`${base}/users/me`, { headers: headers(values.cmaToken) });
-  } catch (error) {
-    return { ok: false, error: `Could not reach ${base}: ${error instanceof Error ? error.message : String(error)}` };
-  }
-  if (me.status === 401) return { ok: false, error: "CMA token is invalid or revoked." };
-  if (!me.ok) return { ok: false, error: `Unexpected error validating the token (${me.status}).` };
-  let preflight;
+  const host = toApiHost2(values.host);
+  const client2 = new ApiClient({
+    host,
+    spaceId: values.spaceId,
+    environmentId: values.environmentId,
+    cmaToken: values.cmaToken
+  });
   try {
-    preflight = await fetch(
-      `${base}/spaces/${values.spaceId}/environments/${values.environmentId}/design_systems/preflight`,
-      { headers: headers(values.cmaToken) }
-    );
-  } catch {
+    await client2.validateToken();
     return { ok: true };
+  } catch (error) {
+    return { ok: false, error: toUserError(error, host) };
   }
-  if (preflight.ok || preflight.status >= 500) return { ok: true };
-  const body = await preflight.text();
-  if (preflight.status === 404 && !isApsDenial(body)) return { ok: true };
-  const detail = messageFrom(body);
-  if (preflight.status === 403) {
-    return { ok: false, error: `Access denied. ${detail ?? "Your token cannot write design system components here."}` };
-  }
-  if (preflight.status === 404) {
-    return {
-      ok: false,
-      error: `Not found. Check the space ID, environment and API host.${detail ? ` (${detail})` : ""}`
-    };
+}
+function toUserError(error, host) {
+  if (error instanceof ApiError) {
+    if (error.status === 404 && error.message.startsWith("preflight failed:")) {
+      return "Not found. Check the space ID, environment and API host.";
+    }
+    return formatApiError2({ error });
   }
-  return { ok: false, error: `Credential check failed (${preflight.status}).${detail ? ` ${detail}` : ""}` };
+  if (error instanceof Error) return `Could not reach ${host}: ${error.message}`;
+  return String(error);
 }
-var USER_AGENT2;
 var init_validate4 = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/04-credentials/validate.ts"() {
     "use strict";
-    init_logic4();
-    USER_AGENT2 = "app contentful.experience-design-system-cli";
+    init_src3();
   }
 });
 
@@ -5001,7 +5519,7 @@ function CredentialsScreen({
           value: values[field],
           focus: active === field && !validating,
           mask: field === "cmaToken" ? "\u2022" : void 0,
-          placeholder: field === "host" ? DEFAULT_HOST : void 0,
+          placeholder: field === "host" ? DEFAULT_CONFIGURED_HOST : void 0,
           onChange: change(field),
           onSubmit: () => void submit(field)
         }
@@ -5028,6 +5546,7 @@ var init_screen4 = __esm({
     "use strict";
     init_home_theme();
     init_controls4();
+    init_src3();
     init_logic4();
     init_validate4();
     LABELS = {