@contentful/experience-design-system-cli 2.35.1-dev-build-c4a4d1cd.0 → 2.35.1-dev-build-57c625cc.0

package/dist/package.json

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

package/legacy/dist/src/index.js

@@ -2011,8 +2011,8 @@ function deleteRawTokensForSession(db, sessionId2) {
 }
 function createRawTokenGroups(db, sessionId2, groups) {
   const insertGroup = db.prepare(`INSERT INTO raw_token_groups (session_id, path, description) VALUES (?, ?, ?)`);
-  for (const group of groups) {
-    insertGroup.run(sessionId2, group.path, group.$description ?? null);
+  for (const group2 of groups) {
+    insertGroup.run(sessionId2, group2.path, group2.$description ?? null);
   }
 }
 function createRawTokens(db, sessionId2, tokens) {
@@ -6891,24 +6891,24 @@ function parseEdsiError(rawInput) {
     }
   }
   const cleaned = stripLambdaLogPrefix(body);
-  const json = parseJsonBody(cleaned) ?? parseJsonBody(body);
-  const bindingFromJson = typeof json?.message === "string" ? parseBindingDiagnostics(json.message) : null;
+  const json2 = parseJsonBody(cleaned) ?? parseJsonBody(body);
+  const bindingFromJson = typeof json2?.message === "string" ? parseBindingDiagnostics(json2.message) : null;
   if (bindingFromJson) {
     return {
-      code: bindingFromJson.code ?? json?.code ?? null,
+      code: bindingFromJson.code ?? json2?.code ?? null,
       message: bindingFromJson.message ?? cleaned,
       cycle: null,
       raw: false,
       ...bindingFromJson.diagnostics ? { diagnostics: bindingFromJson.diagnostics } : {}
     };
   }
-  if (json && (json.code || json.message || json.cycle)) {
+  if (json2 && (json2.code || json2.message || json2.cycle)) {
     return {
-      code: json.code ?? null,
-      message: json.message ?? (cleaned || prefix),
-      cycle: json.cycle ?? null,
+      code: json2.code ?? null,
+      message: json2.message ?? (cleaned || prefix),
+      cycle: json2.cycle ?? null,
       raw: false,
-      ...json.diagnostics ? { diagnostics: json.diagnostics } : {}
+      ...json2.diagnostics ? { diagnostics: json2.diagnostics } : {}
     };
   }
   const binding = parseBindingDiagnostics(cleaned);
@@ -8448,8 +8448,8 @@ async function resolveSession(sessionFlag, command) {
 }
 function rebuildDTCGTree(groups, tokens) {
   const root = {};
-  for (const group of groups) {
-    const segments = group.path.split(".");
+  for (const group2 of groups) {
+    const segments = group2.path.split(".");
     let node = root;
     for (const seg of segments) {
       if (typeof node[seg] !== "object" || node[seg] === null) {
@@ -8457,8 +8457,8 @@ function rebuildDTCGTree(groups, tokens) {
       }
       node = node[seg];
     }
-    if (group.$description) {
-      node["$description"] = group.$description;
+    if (group2.$description) {
+      node["$description"] = group2.$description;
     }
   }
   for (const token of tokens) {
@@ -9204,18 +9204,27 @@ var init_run_teaser = __esm({
 // packages/experience-design-system-cli-legacy/src/lib/push-debug-log.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, readdirSync, writeFileSync } from "node:fs";
 import { join as join10 } from "node:path";
-function scrub(_key, value) {
-  if (/^cma_?token$/i.test(_key))
+function scrub(key, value) {
+  if (/^cma_?token$/i.test(key)) {
     return typeof value === "string" && value ? `[present, ${value.length} chars]` : "[not set]";
+  }
   if (typeof value === "string" && SECRET_VALUE.test(value)) return "[redacted]";
   return value;
 }
-function pad(n) {
-  return String(n).padStart(2, "0");
+function json(value) {
+  const text = JSON.stringify(value, scrub, 2) ?? "null";
+  return text.length > MAX_BLOCK_CHARS ? `${text.slice(0, MAX_BLOCK_CHARS)}
+\u2026 truncated, ${text.length - MAX_BLOCK_CHARS} more characters` : text;
+}
+function pad(n, width = 2) {
+  return String(n).padStart(width, "0");
 }
 function datePrefix(now) {
   return `${pad(now.getMonth() + 1)}-${pad(now.getDate())}-${now.getFullYear()}`;
 }
+function clock(now) {
+  return `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}.${pad(now.getMilliseconds(), 3)}`;
+}
 function nextFilename(dir, now) {
   const today = datePrefix(now);
   const pattern = new RegExp(`^${today}-push-attempt-(\\d+)\\.md$`);
@@ -9226,59 +9235,176 @@ function nextFilename(dir, now) {
   }, 0);
   return `${today}-push-attempt-${max + 1}.md`;
 }
-function render2(runId, inputs, outputs, status, durationMs, now) {
-  return `# Debug Log
+function entityName(entry) {
+  if (typeof entry === "string") return entry;
+  if (entry && typeof entry === "object") {
+    const record = entry;
+    for (const field of ["key", "name", "$name", "id"]) {
+      if (typeof record[field] === "string") return record[field];
+    }
+    const current = record["current"];
+    if (current && typeof current === "object" && typeof current["name"] === "string") {
+      return current["name"];
+    }
+  }
+  return "unknown";
+}
+function group(diff) {
+  return {
+    new: diff.new.map(entityName),
+    changed: diff.changed.map((entry) => {
+      const breaking = entry && typeof entry === "object" && entry.changeClassification?.classification === "breaking";
+      return breaking ? `${entityName(entry)} (breaking)` : entityName(entry);
+    }),
+    unchanged: diff.unchanged,
+    removed: diff.removed.map(entityName)
+  };
+}
+function summarizePreview(preview) {
+  return { components: group(preview.components), tokens: group(preview.tokens) };
+}
+function summarizeCdf(cdf) {
+  return Object.entries(cdf).filter(([key]) => !key.startsWith("$") && key !== "allowDeletions").map(([key, value]) => {
+    const entry = value ?? {};
+    const properties = entry["$properties"];
+    const slots = entry["$slots"];
+    return {
+      name: key,
+      type: entry["$type"],
+      properties: properties && typeof properties === "object" ? Object.keys(properties) : [],
+      slots: slots && typeof slots === "object" ? Object.keys(slots) : []
+    };
+  });
+}
+function renderEvents(events) {
+  if (events.length === 0) return "_Nothing recorded yet._";
+  return events.map((event, index) => {
+    const note = event.note ? ` \u2014 ${event.note}` : "";
+    const request2 = event.requestId ? ` _(request ${event.requestId})_` : "";
+    return `${index + 1}. \`${clock(event.at)}\` (+${event.sinceStartMs}ms) **${event.title}**${note}${request2}`;
+  }).join("\n");
+}
+function renderDetails(events) {
+  const withData = events.map((event, index) => ({ event, index })).filter(({ event }) => event.data && Object.keys(event.data).length > 0);
+  if (withData.length === 0) return "";
+  return withData.map(
+    ({ event, index }) => `<details>
+<summary>${index + 1}. ${event.title}</summary>
+
+\`\`\`json
+${json(event.data)}
+\`\`\`
+
+</details>`
+  ).join("\n\n");
+}
+function render2(runId, inputs, events, startedAt, result, durationMs) {
+  const requestIds = [...new Set(events.map((event) => event.requestId).filter(Boolean))];
+  const text = (field) => String(inputs[field] ?? "\u2014");
+  const details = renderDetails(events);
+  return `# Push to Contentful \u2014 debug log
+
+## Summary
+
+| | |
+|---|---|
+| **Result** | ${OUTCOME_LABEL[result.outcome]} |
+| **What happened** | ${result.summary} |
+| **Space / environment** | \`${text("space_id")}\` / \`${text("environment_id")}\` |
+| **Host** | ${text("host")} |
+| **Started** | ${startedAt.toISOString()} |
+| **Duration** | ${durationMs}ms |
+| **Request IDs** | ${requestIds.length > 0 ? requestIds.map((id) => `\`${id}\``).join(", ") : "\u2014"} |
+| **CLI / runtime** | ${cliVersion()} \xB7 ${process.platform} \xB7 Node ${process.version} |
+| **Run ID** | ${runId} |
+
+## Timeline
 
-- Run ID: ${runId}
-- Flow: import
-- Step: 01 - push
-- Menu option: Push
-- Date: ${now.toISOString()}
-- CLI version: ${cliVersion()}
-- Platform: ${process.platform} / Node ${process.version}
-- Duration on screen: ${durationMs}ms
-- Status: ${status}
-- Exit method: completed
+${renderEvents(events)}
 
 ## Inputs
+
 \`\`\`json
-${JSON.stringify(inputs, scrub, 2)}
+${json(inputs)}
 \`\`\`
 
-## Outputs
+## Result
+
 \`\`\`json
-${JSON.stringify(outputs, scrub, 2)}
+${json({ outcome: result.outcome, summary: result.summary, ...result.details ?? {} })}
 \`\`\`
-`;
+${details ? `
+## Details
+
+${details}
+` : ""}`;
 }
 function startPushDebugRun(inputs) {
   const sessionDir = process.env[DEBUG_SESSION_DIR_ENV];
   if (!sessionDir) return NOOP_RUN;
-  const startedAt = Date.now();
+  const startedAt = /* @__PURE__ */ new Date();
+  const runId = `${startedAt.getFullYear()}${pad(startedAt.getMonth() + 1)}${pad(startedAt.getDate())}-${pad(startedAt.getHours())}${pad(startedAt.getMinutes())}${pad(startedAt.getSeconds())}`;
+  const events = [];
+  let result = {
+    outcome: "in-progress",
+    summary: "The push started but no final result was recorded."
+  };
   let finished = false;
-  return {
-    finish(outputs, status) {
-      if (finished) return;
-      finished = true;
-      try {
-        const now = /* @__PURE__ */ new Date();
+  let path;
+  const flush = () => {
+    try {
+      if (!path) {
         const dir = join10(sessionDir, "import");
         mkdirSync3(dir, { recursive: true });
-        const runId = `${now.getFullYear()}${pad(now.getMonth() + 1)}${pad(now.getDate())}-${pad(now.getHours())}${pad(now.getMinutes())}${pad(now.getSeconds())}`;
-        const content = render2(runId, inputs, outputs, status, Date.now() - startedAt, now);
-        writeFileSync(join10(dir, nextFilename(dir, now)), content, { mode: 384 });
-      } catch {
+        path = join10(dir, nextFilename(dir, startedAt));
       }
+      writeFileSync(path, render2(runId, inputs, events, startedAt, result, Date.now() - startedAt.getTime()), {
+        mode: 384
+      });
+    } catch {
+    }
+  };
+  flush();
+  return {
+    event(title, options = {}) {
+      if (finished) return;
+      const at = /* @__PURE__ */ new Date();
+      events.push({ at, sinceStartMs: at.getTime() - startedAt.getTime(), title, ...options });
+      flush();
+    },
+    finish(final) {
+      if (finished) return;
+      finished = true;
+      result = final;
+      const at = /* @__PURE__ */ new Date();
+      events.push({
+        at,
+        sinceStartMs: at.getTime() - startedAt.getTime(),
+        title: OUTCOME_LABEL[final.outcome].replace(/^\S+\s/, ""),
+        note: final.summary
+      });
+      flush();
     }
   };
 }
-var DEBUG_SESSION_DIR_ENV, NOOP_RUN, SECRET_VALUE;
+var DEBUG_SESSION_DIR_ENV, NOOP_RUN, OUTCOME_LABEL, MAX_BLOCK_CHARS, SECRET_VALUE;
 var init_push_debug_log = __esm({
   "packages/experience-design-system-cli-legacy/src/lib/push-debug-log.ts"() {
     "use strict";
     init_client();
     DEBUG_SESSION_DIR_ENV = "EDS_DEBUG_SESSION_DIR";
-    NOOP_RUN = { finish: () => void 0 };
+    NOOP_RUN = { event: () => void 0, finish: () => void 0 };
+    OUTCOME_LABEL = {
+      "in-progress": "\u23F3 In progress (the process ended before the push finished)",
+      pushed: "\u2705 Pushed",
+      partial: "\u26A0\uFE0F Partly pushed (some items failed)",
+      failed: "\u274C Push failed",
+      "preview-failed": "\u274C Preview failed (nothing was sent to apply)",
+      "nothing-to-push": "\u2139\uFE0F Nothing to push (the server says the space already matches)",
+      skipped: "\u23ED\uFE0F Skipped",
+      superseded: "\u21A9\uFE0F Superseded by a newer attempt"
+    };
+    MAX_BLOCK_CHARS = 1e5;
     SECRET_VALUE = /CFPAT-[A-Za-z0-9_-]{20,}|^Bearer\s+\S+/;
   }
 });
@@ -20208,17 +20334,17 @@ function buildCycleUnits(slotCycles) {
   const groups = /* @__PURE__ */ new Map();
   for (const node of parent.keys()) {
     const root = find(node);
-    let group = groups.get(root);
-    if (!group) {
-      group = /* @__PURE__ */ new Set();
-      groups.set(root, group);
+    let group2 = groups.get(root);
+    if (!group2) {
+      group2 = /* @__PURE__ */ new Set();
+      groups.set(root, group2);
     }
-    group.add(node);
+    group2.add(node);
   }
   const out = /* @__PURE__ */ new Map();
-  for (const group of groups.values()) {
-    for (const node of group) {
-      out.set(node, group);
+  for (const group2 of groups.values()) {
+    for (const node of group2) {
+      out.set(node, group2);
     }
   }
   return out;
@@ -21712,10 +21838,10 @@ function swapValues(values, firstIndex, secondIndex) {
   [next[firstIndex], next[secondIndex]] = [next[secondIndex], next[firstIndex]];
   return next;
 }
-function parseToState(json) {
+function parseToState(json2) {
   let parsed;
   try {
-    parsed = JSON.parse(json);
+    parsed = JSON.parse(json2);
   } catch (e) {
     return {
       state: { componentDescription: "", props: [], slots: [] },
@@ -22568,11 +22694,11 @@ function FieldEditor({
     setEditorState(next);
     onChange(serializeState(next, value));
   };
-  const canonicalize = React14.useCallback((json) => {
+  const canonicalize = React14.useCallback((json2) => {
     try {
-      return JSON.stringify(JSON.parse(json));
+      return JSON.stringify(JSON.parse(json2));
     } catch {
-      return `__unparseable__:${json}`;
+      return `__unparseable__:${json2}`;
     }
   }, []);
   const initialStateRef = React14.useRef(initialState);
@@ -23146,14 +23272,14 @@ function FieldEditor({
   })();
   const rows = [];
   rows.push({ kind: "component-description" });
-  for (const group of propGroups.filter((candidate) => candidate.kind !== "hidden")) {
-    if (group.indexes.length === 0) continue;
+  for (const group2 of propGroups.filter((candidate) => candidate.kind !== "hidden")) {
+    if (group2.indexes.length === 0) continue;
     rows.push({
       kind: "header",
-      label: `${group.label} (${group.indexes.length}) `,
-      section: group.kind
+      label: `${group2.label} (${group2.indexes.length}) `,
+      section: group2.kind
     });
-    group.indexes.forEach((idx) => rows.push({ kind: "prop", idx }));
+    group2.indexes.forEach((idx) => rows.push({ kind: "prop", idx }));
   }
   if (slots.length > 0) {
     rows.push({
@@ -23163,7 +23289,7 @@ function FieldEditor({
     });
     slots.forEach((_, i) => rows.push({ kind: "slot", idx: i }));
   }
-  const hiddenGroup = propGroups.find((group) => group.kind === "hidden");
+  const hiddenGroup = propGroups.find((group2) => group2.kind === "hidden");
   if (hiddenGroup && hiddenGroup.indexes.length > 0) {
     rows.push({
       kind: "header",
@@ -27287,6 +27413,7 @@ function WizardApp({
     tokensPath: ""
   });
   const allowEmptyDeleteAllRef = useRef10(false);
+  const pushDebugRef = useRef10(null);
   const generateChildRef = useRef10(null);
   const generationCachePreflightRef = useRef10(null);
   const selectionToReviewStartedAtRef = useRef10(null);
@@ -28341,12 +28468,30 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
     void runSaveAndPush();
   };
   const runPreview = async (extractSessionId, tokensPath, spaceId, environmentId, cmaToken, host2) => {
+    const resolvedHost = resolveWizardHost(host2);
+    pushDebugRef.current?.finish({
+      outcome: "superseded",
+      summary: "A new push attempt started before this one finished."
+    });
+    const pushDebug = startPushDebugRun({
+      space_id: spaceId,
+      environment_id: environmentId,
+      host: resolvedHost,
+      cma_token: cmaToken,
+      extract_session_id: extractSessionId,
+      tokens_file: tokensPath || null,
+      delete_everything_not_listed: allowEmptyDeleteAllRef.current
+    });
+    pushDebugRef.current = pushDebug;
     if (shouldBypassPreview(state)) {
+      pushDebug.finish({
+        outcome: "skipped",
+        summary: "Credentials were skipped, so nothing is previewed or pushed. Files were saved only."
+      });
       update(buildSkippedPreviewTransition());
       return;
     }
     update({ step: "previewing" });
-    const resolvedHost = resolveWizardHost(host2);
     try {
       const client2 = new ImportApiClient({
         cmaToken,
@@ -28354,6 +28499,7 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         environmentId,
         host: resolvedHost
       });
+      pushDebug.event("Preview started", { note: `POST ${resolvedHost}/\u2026/design_systems/imports/preview` });
       let components = [];
       if (extractSessionId) {
         const db = openPipelineDb();
@@ -28369,7 +28515,16 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         tokens = await readTokensFromPath("tokens", tokensPath);
       }
       let cdf = buildCDF3(components, toCDFTokens(tokens), { deleteAll: allowEmptyDeleteAllRef.current });
+      pushDebug.event("Built the CDF to send", {
+        note: `${summarizeCdf(cdf).length} entries`,
+        data: { entries: summarizeCdf(cdf), tokens_loaded: tokens.length }
+      });
       let preview = await client2.previewImport(cdf);
+      pushDebug.event("Server previewed the CDF", {
+        note: "what the server would create, change, leave alone or remove",
+        data: summarizePreview(preview),
+        requestId: client2.getLastRequestId()
+      });
       if (extractSessionId) {
         let needsRepreview = false;
         const db = openPipelineDb();
@@ -28389,15 +28544,27 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
             if (seededDefaults > 0) needsRepreview = true;
           }
           if (needsRepreview) {
+            pushDebug.event("Re-previewing", {
+              note: "the server listed components as removed or changed that exist locally, so defaults were filled in"
+            });
             components = loadCDFComponents(db, extractSessionId);
             cdf = buildCDF3(components, toCDFTokens(tokens), { deleteAll: allowEmptyDeleteAllRef.current });
             preview = await client2.previewImport(cdf);
+            pushDebug.event("Server previewed the updated CDF", {
+              data: summarizePreview(preview),
+              requestId: client2.getLastRequestId()
+            });
           }
         } finally {
           db.close();
         }
       }
       if (isEmptyPreview(preview)) {
+        pushDebug.finish({
+          outcome: "nothing-to-push",
+          summary: "The server says every component and token in the CDF already matches what is in this space, so no apply request was sent. If the space looks empty, check that this is the space and environment you are viewing.",
+          details: { preview: summarizePreview(preview), request_id: client2.getLastRequestId() }
+        });
         update({
           step: "done",
           serverPreview: preview,
@@ -28409,6 +28576,9 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         });
         return;
       }
+      pushDebug.event("Waiting for confirmation", {
+        note: "the preview shows changes, so the wizard asks before pushing"
+      });
       update({
         step: "preview-gate",
         serverPreview: preview,
@@ -28417,6 +28587,11 @@ Make sure this path contains TypeScript/React/Vue component files (.tsx, .ts, .v
         ...clearedValidationErrorState()
       });
     } catch (e) {
+      pushDebug.finish({
+        outcome: "preview-failed",
+        summary: e instanceof ApiError ? `The preview request was rejected with HTTP ${e.status}.` : `The preview failed before the server answered: ${e instanceof Error ? e.message : String(e)}`,
+        details: e instanceof ApiError ? { status: e.status, body: (e.body ?? "").slice(0, 4e3) } : { error: e instanceof Error ? e.message : String(e) }
+      });
       if (e instanceof ApiError) {
         if (e.status === 401 || e.status === 403) {
           let bodyMsg = "";
@@ -28479,7 +28654,18 @@ If using a custom host configuration, make sure the space exists on that host.`
     }
   };
   const runPush = async (cdf, spaceId, environmentId, cmaToken, host2, acknowledgeBreakingChanges, preview) => {
+    const pushDebug = pushDebugRef.current ?? startPushDebugRun({
+      space_id: spaceId,
+      environment_id: environmentId,
+      host: resolveWizardHost(host2),
+      cma_token: cmaToken
+    });
+    pushDebugRef.current = pushDebug;
     if (shouldRefusePush(state)) {
+      pushDebug.finish({
+        outcome: "skipped",
+        summary: "Credentials were skipped, so the push was refused. Files were saved only."
+      });
       update(buildSkippedPushTransition());
       return;
     }
@@ -28487,6 +28673,11 @@ If using a custom host configuration, make sure the space exists on that host.`
       const hasComponentChanges = preview.components.new.length > 0 || preview.components.changed.length > 0 || preview.components.removed.length > 0;
       const hasTokenChanges = preview.tokens.new.length > 0 || preview.tokens.changed.length > 0 || preview.tokens.removed.length > 0;
       if (!hasComponentChanges && !hasTokenChanges) {
+        pushDebug.finish({
+          outcome: "nothing-to-push",
+          summary: "The preview had no new, changed or removed items, so no apply request was sent.",
+          details: { preview: summarizePreview(preview) }
+        });
         update({
           step: "done",
           pushResult: {
@@ -28499,6 +28690,11 @@ If using a custom host configuration, make sure the space exists on that host.`
     }
     const cycles = detectSlotCycles(extractComponents(cdf));
     if (cycles.length > 0) {
+      pushDebug.finish({
+        outcome: "failed",
+        summary: "The push was blocked locally because components slot each other in a cycle.",
+        details: { cycles: formatSlotCycleReport(cycles) }
+      });
       update({
         step: "error",
         errorStep: "apply",
@@ -28509,6 +28705,11 @@ If using a custom host configuration, make sure the space exists on that host.`
     }
     const unresolvedSlotReferences = validateSlotReferences2(extractComponents(cdf));
     if (unresolvedSlotReferences.length > 0) {
+      pushDebug.finish({
+        outcome: "failed",
+        summary: "The push was blocked locally because a slot refers to a component that is not in the CDF.",
+        details: { unresolved: formatUnresolvedSlotReferences(unresolvedSlotReferences) }
+      });
       update({
         step: "error",
         errorStep: "apply",
@@ -28518,27 +28719,13 @@ If using a custom host configuration, make sure the space exists on that host.`
       return;
     }
     update({ step: "pushing", pushProgress: null, errorAllowBreakingChangeAcknowledgment: false });
-    const cdfEntries = Object.entries(cdf).filter(([key]) => !key.startsWith("$") && key !== "allowDeletions");
-    const pushDebug = startPushDebugRun({
-      space_id: spaceId,
-      environment_id: environmentId,
-      host: resolveWizardHost(host2),
-      cma_token: cmaToken,
-      acknowledge_breaking_changes: acknowledgeBreakingChanges,
-      cdf_keys: cdfEntries.map(([key]) => key),
-      cdf_entry_count: cdfEntries.length,
-      preview: preview ? {
-        components: {
-          new: preview.components.new.length,
-          changed: preview.components.changed.length,
-          removed: preview.components.removed.length
-        },
-        tokens: {
-          new: preview.tokens.new.length,
-          changed: preview.tokens.changed.length,
-          removed: preview.tokens.removed.length
-        }
-      } : null
+    pushDebug.event("Apply started", {
+      note: `POST ${resolveWizardHost(host2)}/\u2026/design_systems/imports/apply`,
+      data: {
+        acknowledge_breaking_changes: acknowledgeBreakingChanges,
+        sending: summarizeCdf(cdf),
+        expected: preview ? summarizePreview(preview) : null
+      }
     });
     try {
       const resolvedHost = resolveWizardHost(host2);
@@ -28549,6 +28736,11 @@ If using a custom host configuration, make sure the space exists on that host.`
         host: resolvedHost
       });
       let operation = await client2.applyImport(cdf, { acknowledgeBreakingChanges });
+      pushDebug.event("Server accepted the apply request", {
+        note: `operation ${operation.sys.id} is ${operation.sys.status}`,
+        data: { operation_id: operation.sys.id, status: operation.sys.status, summary: operation.summary },
+        requestId: client2.getLastRequestId()
+      });
       try {
         logStep({
           applyResponse: {
@@ -28565,9 +28757,15 @@ If using a custom host configuration, make sure the space exists on that host.`
         pushProgress: { kind: "queued", operationId: operation.sys.id }
       });
       let pollCount = 0;
+      let lastPolledStatus = "";
       operation = await client2.pollOperation(operation.sys.id, {
         onProgress: (op) => {
           pollCount++;
+          const polled = `${op.sys.status} ${op.summary ? `${op.summary.total - op.summary.pending}/${op.summary.total}` : ""}`;
+          if (polled !== lastPolledStatus) {
+            lastPolledStatus = polled;
+            pushDebug.event("Operation status changed", { note: polled.trim(), requestId: client2.getLastRequestId() });
+          }
           const s = op.summary;
           if (s) {
             const done = s.total - s.pending;
@@ -28672,27 +28870,29 @@ If using a custom host configuration, make sure the space exists on that host.`
           );
         }
       }
-      pushDebug.finish(
-        {
+      const failedItems = items.filter((item) => item.status === "failed");
+      const pushedCount = items.filter((item) => item.status === "succeeded").length;
+      pushDebug.finish({
+        outcome: pushSucceeded ? "pushed" : pushedCount > 0 ? "partial" : "failed",
+        summary: pushSucceeded ? items.length > 0 ? `The server reports ${pushedCount} of ${items.length} items applied.` : `The operation finished as ${operation.sys.status}, but the server returned no per-item results, so the counts come from the preview.` : `The operation finished as ${operation.sys.status}; ${failedItems.length} item(s) failed.`,
+        details: {
           operation_id: operation.sys.id,
           operation_status: operation.sys.status,
-          summary: operation.summary,
-          item_count: items.length,
+          server_summary: operation.summary,
           items: items.map((item) => ({
-            entityType: item.entityType,
+            type: item.entityType,
             id: item.id,
             action: item.action,
             status: item.status,
             ...item.error ? { error: formatEdsiError(item.error) } : {}
           })),
-          push_result: {
+          shown_to_user: {
             component_types: pushResult.componentTypes,
             design_tokens: pushResult.designTokens
           },
-          succeeded: pushSucceeded
-        },
-        pushSucceeded ? "success" : "error"
-      );
+          request_id: client2.getLastRequestId()
+        }
+      });
       update({ step: "done", pushResult });
     } catch (e) {
       let msg;
@@ -28703,13 +28903,14 @@ If using a custom host configuration, make sure the space exists on that host.`
       } else {
         msg = "Push failed";
       }
-      pushDebug.finish(
-        {
-          error: msg,
-          ...e instanceof ApiError ? { status: e.status, body: (e.body ?? "").slice(0, 2e3) } : {}
-        },
-        "error"
-      );
+      pushDebug.finish({
+        outcome: "failed",
+        summary: e instanceof ApiError ? `The apply request failed with HTTP ${e.status}.` : `The apply request failed before the server answered: ${msg}`,
+        details: {
+          message: msg,
+          ...e instanceof ApiError ? { status: e.status, body: (e.body ?? "").slice(0, 4e3) } : {}
+        }
+      });
       update({
         step: "error",
         errorStep: "apply",

package/legacy/dist/src/lib/push-debug-log.d.ts

@@ -1,11 +1,29 @@
+import type { ServerPreviewResponse } from '@contentful/experience-design-system-types';
 export declare const DEBUG_SESSION_DIR_ENV = "EDS_DEBUG_SESSION_DIR";
-export type PushDebugStatus = 'success' | 'error';
+export type PushOutcome = 'in-progress' | 'pushed' | 'partial' | 'failed' | 'preview-failed' | 'nothing-to-push' | 'skipped' | 'superseded';
+export interface PushDebugResult {
+    outcome: PushOutcome;
+    /** One plain-English sentence that says what happened and why. */
+    summary: string;
+    details?: Record<string, unknown>;
+}
+export interface PushDebugEventOptions {
+    note?: string;
+    data?: Record<string, unknown>;
+    requestId?: string;
+}
 export interface PushDebugRun {
-    finish(outputs: Record<string, unknown>, status: PushDebugStatus): void;
+    event(title: string, options?: PushDebugEventOptions): void;
+    finish(result: PushDebugResult): void;
 }
+/** The server's preview, reduced to the names in each group so it is easy to read. */
+export declare function summarizePreview(preview: ServerPreviewResponse): Record<string, unknown>;
+/** The entries of a CDF that will be sent: name, type and the properties and slots each has. */
+export declare function summarizeCdf(cdf: Record<string, unknown>): Array<Record<string, unknown>>;
 /**
- * Records the inputs and outputs of the push step in the v2 debug session folder.
- * It does nothing unless the v2 CLI set EDS_DEBUG_SESSION_DIR, which it only does
- * when Debug Mode is on. Logging never throws.
+ * Records the push step (preview, confirmation and apply) in the v2 debug session folder.
+ * The file is rewritten after every event, so a push that dies partway still leaves a log.
+ * It does nothing unless the v2 CLI set EDS_DEBUG_SESSION_DIR, which it only does when
+ * Debug Mode is on. Logging never throws.
  */
 export declare function startPushDebugRun(inputs: Record<string, unknown>): PushDebugRun;

package/legacy/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.35.1-dev-build-c4a4d1cd.0",
+  "version": "2.35.1-dev-build-57c625cc.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -41,7 +41,7 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "@contentful/experience-design-system-types": "2.35.1-dev-build-c4a4d1cd.0"
+    "@contentful/experience-design-system-types": "2.35.1-dev-build-57c625cc.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",