@contentful/experience-design-system-cli 2.37.1-dev-build-e051d273.0 → 2.37.1-dev-build-bdab4dbe.0

package/dist/app.js

@@ -2135,14 +2135,14 @@ var init_debug_mode_store = __esm({
   "packages/experience-design-system-cli/src/tui/settings/debug-mode/debug-mode-store.ts"() {
     "use strict";
     init_config();
-    RETENTION_CHOICES = [30, 60, 90];
+    RETENTION_CHOICES = [3, 14, 30];
     DEFAULT_RETENTION_DAYS = 30;
   }
 });
 
 // packages/experience-design-system-cli/src/tui/debug-prune.ts
-import { readdir as readdir3, rm, stat as stat5 } from "node:fs/promises";
-import { join as join24 } from "node:path";
+import { readdir as readdir3, rm, rmdir, stat as stat5 } from "node:fs/promises";
+import { dirname as dirname16, join as join24 } from "node:path";
 async function logFilesIn(dir) {
   const entries = await readdir3(dir, { withFileTypes: true });
   const nested = await Promise.all(
@@ -2154,10 +2154,24 @@ async function logFilesIn(dir) {
   );
   return nested.flat();
 }
+async function removeEmptyFolders(from, stop) {
+  let dir = from;
+  let removed = 0;
+  for (; ; ) {
+    try {
+      await rmdir(dir);
+    } catch {
+      return removed;
+    }
+    removed += 1;
+    if (dir === stop) return removed;
+    dir = dirname16(dir);
+  }
+}
 async function pruneExpiredLogs(base, retentionDays, now = Date.now()) {
   const cutoff = now - retentionDays * DAY_MS;
   const contentfulDir = join24(base, ".contentful");
-  let deleted = 0;
+  const result = { logs: 0, folders: 0 };
   try {
     const sessions = (await readdir3(contentfulDir)).filter((name) => SESSION_FOLDER.test(name));
     for (const session of sessions) {
@@ -2166,14 +2180,15 @@ async function pruneExpiredLogs(base, retentionDays, now = Date.now()) {
         try {
           if ((await stat5(file)).mtimeMs >= cutoff) continue;
           await rm(file);
-          deleted += 1;
+          result.logs += 1;
+          result.folders += await removeEmptyFolders(dirname16(file), join24(contentfulDir, session));
         } catch {
         }
       }
     }
   } catch {
   }
-  return deleted;
+  return result;
 }
 var DAY_MS, SESSION_FOLDER;
 var init_debug_prune = __esm({
@@ -2359,8 +2374,24 @@ var init_debug_store = __esm({
     init_debug_prune();
     void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(async ([enabled, base]) => {
       if (!base) return;
-      await readDebugModeSetting().then(({ retentionDays }) => pruneExpiredLogs(base, retentionDays)).catch(() => void 0);
-      if (enabled) await mkdir9(join25(startSession(base, { replace: false }), "debug"), { recursive: true });
+      const retention = await readDebugModeSetting().catch(() => void 0);
+      const pruned = retention ? await pruneExpiredLogs(base, retention.retentionDays).catch(() => void 0) : void 0;
+      if (!enabled) return;
+      const debugDir = join25(startSession(base, { replace: false }), "debug");
+      await mkdir9(debugDir, { recursive: true });
+      if (retention && pruned && pruned.logs + pruned.folders > 0) {
+        await writeFile8(
+          join25(debugDir, `${datePrefix()}-cleanup-${generateRunId()}.md`),
+          `# Debug Log Cleanup
+
+- Date: ${(/* @__PURE__ */ new Date()).toISOString()}
+- Retention: ${retention.retentionDays} days
+- Logs deleted: ${pruned.logs}
+- Empty folders removed: ${pruned.folders}
+`,
+          { mode: 384 }
+        );
+      }
     });
     process.once("uncaughtException", (err) => {
       void handleCrash().finally(() => {
@@ -2610,13 +2641,25 @@ function useWelcomeControls(onQuit) {
 
 // packages/experience-design-system-cli/src/tui/import/steps/01-welcome/screen.tsx
 import { jsx as jsx4, jsxs as jsxs3 } from "react/jsx-runtime";
-var RULE = "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+var OVERVIEW_BOX_MAX_WIDTH = 90;
+var AI_MARKER = "\u273B";
 var OVERVIEW = [
-  { label: "Step 1", description: "Extract components from your codebase" },
-  { label: "Step 2", description: "Review what was extracted" },
-  { label: "Step 3", description: "Generate CDF definitions with Claude" },
-  { label: "Step 4", description: "Review generated definitions" },
-  { label: "Step 5", description: "Push to Contentful" }
+  {
+    label: "Step 1",
+    description: "Extract components from your codebase",
+    ai: true
+  },
+  { label: "Step 2", description: "Review what was extracted", ai: false },
+  {
+    label: "Step 3",
+    description: "Generate component definitions",
+    ai: true
+  },
+  { label: "Step 4", description: "Review generated definitions", ai: false },
+  { label: "Step 5", description: "Push to Contentful", ai: false }
+];
+var AI_DISCLOSURE = [
+  "Steps marked \u273B use your local AI agent, which may send relevant code to your AI provider under your agreement with them. Contentful does not receive that code, or the prompts and responses. AI suggestions can be wrong or incomplete, so review and edit them before importing."
 ];
 function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
   const [projectPath, setProjectPath] = useState3(initialPath);
@@ -2626,18 +2669,37 @@ function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
     if (path5) onContinue(path5);
   };
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.success, children: "Let's import your design system into Contentful." }),
-    /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: RULE }),
-      OVERVIEW.map((item) => /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
-        /* @__PURE__ */ jsx4(Text4, { bold: true, children: item.label }),
-        /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: item.description })
-      ] }, item.label)),
-      /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: RULE })
-    ] }),
+    /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.accent, children: "Let's import your design system into Contentful." }),
+    /* @__PURE__ */ jsx4(Box3, { flexDirection: "row", children: /* @__PURE__ */ jsxs3(
+      Box3,
+      {
+        flexDirection: "column",
+        borderStyle: "round",
+        borderColor: PALETTE.border,
+        paddingX: 2,
+        paddingY: 1,
+        width: OVERVIEW_BOX_MAX_WIDTH,
+        flexShrink: 1,
+        children: [
+          OVERVIEW.map((item) => /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
+            /* @__PURE__ */ jsx4(Box3, { flexShrink: 0, children: /* @__PURE__ */ jsx4(Text4, { bold: true, children: item.label }) }),
+            /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, wrap: "truncate-end", children: item.description }),
+            item.ai && /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.accent, children: AI_MARKER })
+          ] }, item.label)),
+          /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ jsxs3(Text4, { bold: true, children: [
+              /* @__PURE__ */ jsx4(Text4, { color: PALETTE.accent, children: AI_MARKER }),
+              " AI disclosure"
+            ] }),
+            AI_DISCLOSURE.map((paragraph) => /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: paragraph }, paragraph))
+          ] })
+        ]
+      }
+    ) }),
     /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, children: [
       /* @__PURE__ */ jsx4(Text4, { children: "Where is your component library?" }),
       /* @__PURE__ */ jsxs3(Box3, { children: [
+        /* @__PURE__ */ jsx4(Text4, { color: PALETTE.accent, children: "? " }),
         /* @__PURE__ */ jsx4(Text4, { children: "Project path: " }),
         /* @__PURE__ */ jsx4(TextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
       ] })
@@ -17076,7 +17138,7 @@ function useElapsed() {
 
 // packages/experience-design-system-cli/src/tui/import/shared/running-step/running-step.tsx
 import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
-var RULE2 = "\u2500".repeat(40);
+var RULE = "\u2500".repeat(40);
 function Line({ line }) {
   if (line.progress) {
     return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, children: [
@@ -17106,9 +17168,9 @@ function RunningStep({
   const elapsed = useElapsed();
   return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE2 }),
+      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE }),
       /* @__PURE__ */ jsx10(Text10, { bold: true, children: stepLabel(stepNumber, totalSteps, title) }),
-      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE2 })
+      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE })
     ] }),
     /* @__PURE__ */ jsx10(Text10, { children: description }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, flexDirection: "column", gap: 1, children: lines.map((line, index) => /* @__PURE__ */ jsx10(Line, { line }, index)) }),
@@ -29233,19 +29295,29 @@ function OptInAnalyticsScreen({ onDone }) {
 }
 
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
-import { useEffect as useEffect26, useState as useState35 } from "react";
+import { useEffect as useEffect26, useRef as useRef15, useState as useState35 } from "react";
 import { Box as Box50, Text as Text53, useInput as useInput16 } from "ink";
 init_debug_mode_store();
 init_debug_store();
 import { Fragment as Fragment21, jsx as jsx62, jsxs as jsxs51 } from "react/jsx-runtime";
 var ROWS = ["enabled", "retentionDays"];
-var nextRetention = (current) => RETENTION_CHOICES[(RETENTION_CHOICES.indexOf(current) + 1) % RETENTION_CHOICES.length];
+var snapshotOf2 = (setting) => ({
+  enabled: String(setting.enabled),
+  retentionDays: String(setting.retentionDays)
+});
 function DebugModeScreen({ onDone }) {
   const [setting, setSetting] = useState35(null);
   const [focus, setFocus] = useState35("enabled");
+  const [pending, setPending] = useState35(
+    RETENTION_CHOICES[RETENTION_CHOICES.length - 1]
+  );
+  const [notice, setNotice] = useState35(null);
+  const visit = useRef15({ trail: createTrail(), before: void 0, error: "" }).current;
   useEffect26(() => {
     readDebugModeSetting().then((loaded) => {
       setSetting(loaded);
+      setPending(loaded.retentionDays);
+      visit.before = snapshotOf2(loaded);
       startDebugRun({
         flow: "settings/debug-mode",
         step: "01-debug-mode",
@@ -29254,49 +29326,95 @@ function DebugModeScreen({ onDone }) {
       });
     });
   }, []);
-  const change = (patch) => {
+  const save = (patch, saved) => {
     if (!setting) return;
-    setSetting({ ...setting, ...patch });
-    void writeDebugModeSetting(patch);
+    const fields2 = Object.keys(patch).join(", ");
+    writeDebugModeSetting(patch).then(() => {
+      setSetting({ ...setting, ...patch });
+      visit.trail.record(`saved ${fields2}`);
+      setNotice({ kind: "success", text: `Saved: ${saved}` });
+    }).catch((err) => {
+      visit.error = scrubError(err, []);
+      visit.trail.record(`saving ${fields2} failed`);
+      setNotice({ kind: "error", text: `Not saved: ${err instanceof Error ? err.message : String(err)}` });
+    });
+  };
+  const endVisit = (current) => {
+    const change = diffSnapshots(visit.before ?? snapshotOf2(current), snapshotOf2(current));
+    void finishDebugRun({
+      outputs: {
+        ...current,
+        ...change,
+        ...pending !== current.retentionDays ? { unsaved_retention_days: pending } : {},
+        actions: visit.trail.entries(),
+        ...visit.error ? { error: visit.error } : {}
+      },
+      status: visit.error ? "error" : "success",
+      exitMethod: change.changed ? "saved" : "discarded"
+    });
   };
   useInput16((input, key) => {
     if (!setting) return;
     if (key.upArrow || key.downArrow) {
       setFocus((current) => ROWS[(ROWS.indexOf(current) + (key.downArrow ? 1 : ROWS.length - 1)) % ROWS.length]);
+      setNotice(null);
       return;
     }
-    if (key.return || input === " ") {
-      if (focus === "enabled") change({ enabled: !setting.enabled });
-      else change({ retentionDays: nextRetention(setting.retentionDays) });
+    if ((key.leftArrow || key.rightArrow) && focus === "retentionDays") {
+      const index = RETENTION_CHOICES.indexOf(pending) + (key.rightArrow ? 1 : -1);
+      setPending(RETENTION_CHOICES[Math.min(Math.max(index, 0), RETENTION_CHOICES.length - 1)]);
+      setNotice(null);
+      return;
+    }
+    if (focus === "enabled" && (key.return || input === " ")) {
+      const enabled = !setting.enabled;
+      save({ enabled }, `debug logging is ${enabled ? "on" : "off"}`);
+      return;
+    }
+    if (focus === "retentionDays" && key.return) {
+      save({ retentionDays: pending }, `logs are deleted after ${pending} days`);
       return;
     }
     if (key.escape || input === "q") {
-      void finishDebugRun({ outputs: { ...setting }, status: "success", exitMethod: "saved" });
+      endVisit(setting);
       onDone();
     }
   });
-  const marker = (row) => focus === row ? "\u276F" : " ";
+  const marker = (row) => /* @__PURE__ */ jsx62(Text53, { color: focus === row ? PALETTE.accent : void 0, children: focus === row ? "\u276F" : " " });
+  const label = (row, text) => /* @__PURE__ */ jsx62(Text53, { bold: focus === row, color: focus === row ? PALETTE.accent : PALETTE.muted, children: text });
   return /* @__PURE__ */ jsxs51(Box50, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsx62(Text53, { bold: true, children: "Settings \u203A Debug Mode" }),
     /* @__PURE__ */ jsx62(Text53, { children: " " }),
     setting ? /* @__PURE__ */ jsxs51(Fragment21, { children: [
-      /* @__PURE__ */ jsxs51(Text53, { children: [
+      /* @__PURE__ */ jsxs51(Box50, { gap: 1, children: [
         marker("enabled"),
-        " Debug logging:",
-        " ",
+        label("enabled", "Debug logging:"),
         /* @__PURE__ */ jsx62(Text53, { bold: true, color: setting.enabled ? PALETTE.success : PALETTE.muted, children: setting.enabled ? "On" : "Off" })
       ] }),
-      /* @__PURE__ */ jsxs51(Text53, { children: [
+      /* @__PURE__ */ jsxs51(Box50, { gap: 1, children: [
         marker("retentionDays"),
-        " Delete logs after:",
-        " ",
-        /* @__PURE__ */ jsxs51(Text53, { bold: true, color: PALETTE.accent, children: [
-          setting.retentionDays,
-          " days"
-        ] })
+        label("retentionDays", "Delete logs after:"),
+        RETENTION_CHOICES.map((days) => {
+          const highlighted = focus === "retentionDays" && days === pending;
+          const saved = days === setting.retentionDays;
+          return /* @__PURE__ */ jsx62(
+            Text53,
+            {
+              bold: highlighted || saved,
+              underline: highlighted,
+              color: highlighted ? PALETTE.accent : saved ? PALETTE.success : PALETTE.muted,
+              children: `${saved ? "\u2713 " : ""}${days} days`
+            },
+            days
+          );
+        })
       ] }),
       /* @__PURE__ */ jsx62(Text53, { children: " " }),
-      /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "Older logs are deleted the next time the CLI starts." })
+      notice ? /* @__PURE__ */ jsxs51(Text53, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
+        notice.kind === "success" ? "\u2713" : "\u2717",
+        " ",
+        notice.text
+      ] }) : /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "\u2713 marks what is saved. Older logs are deleted the next time the CLI starts." })
     ] }) : /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "Loading\u2026" }),
     /* @__PURE__ */ jsx62(Text53, { children: " " }),
     /* @__PURE__ */ jsx62(
@@ -29304,7 +29422,10 @@ function DebugModeScreen({ onDone }) {
       {
         hints: [
           { keys: "\u2191/\u2193", label: "move" },
-          { keys: "\u23CE/Space", label: "change" },
+          ...focus === "retentionDays" ? [
+            { keys: "\u2190/\u2192", label: "choose" },
+            { keys: "\u23CE", label: "save" }
+          ] : [{ keys: "\u23CE/Space", label: "toggle" }],
           { keys: "Esc/q", label: "back" }
         ]
       }

package/dist/index.js

@@ -18561,18 +18561,37 @@ function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
     if (path5) onContinue(path5);
   };
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.success, children: "Let's import your design system into Contentful." }),
-    /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: RULE }),
-      OVERVIEW.map((item) => /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
-        /* @__PURE__ */ jsx4(Text4, { bold: true, children: item.label }),
-        /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: item.description })
-      ] }, item.label)),
-      /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: RULE })
-    ] }),
+    /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.accent, children: "Let's import your design system into Contentful." }),
+    /* @__PURE__ */ jsx4(Box3, { flexDirection: "row", children: /* @__PURE__ */ jsxs3(
+      Box3,
+      {
+        flexDirection: "column",
+        borderStyle: "round",
+        borderColor: PALETTE.border,
+        paddingX: 2,
+        paddingY: 1,
+        width: OVERVIEW_BOX_MAX_WIDTH,
+        flexShrink: 1,
+        children: [
+          OVERVIEW.map((item) => /* @__PURE__ */ jsxs3(Box3, { gap: 1, children: [
+            /* @__PURE__ */ jsx4(Box3, { flexShrink: 0, children: /* @__PURE__ */ jsx4(Text4, { bold: true, children: item.label }) }),
+            /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, wrap: "truncate-end", children: item.description }),
+            item.ai && /* @__PURE__ */ jsx4(Text4, { bold: true, color: PALETTE.accent, children: AI_MARKER })
+          ] }, item.label)),
+          /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ jsxs3(Text4, { bold: true, children: [
+              /* @__PURE__ */ jsx4(Text4, { color: PALETTE.accent, children: AI_MARKER }),
+              " AI disclosure"
+            ] }),
+            AI_DISCLOSURE.map((paragraph) => /* @__PURE__ */ jsx4(Text4, { color: PALETTE.muted, children: paragraph }, paragraph))
+          ] })
+        ]
+      }
+    ) }),
     /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", gap: 1, children: [
       /* @__PURE__ */ jsx4(Text4, { children: "Where is your component library?" }),
       /* @__PURE__ */ jsxs3(Box3, { children: [
+        /* @__PURE__ */ jsx4(Text4, { color: PALETTE.accent, children: "? " }),
         /* @__PURE__ */ jsx4(Text4, { children: "Project path: " }),
         /* @__PURE__ */ jsx4(TextInput, { value: projectPath, onChange: setProjectPath, onSubmit: submit })
       ] })
@@ -18585,20 +18604,32 @@ function WelcomeScreen({ onContinue, onQuit, initialPath = "" }) {
     ] }, control.keys)) })
   ] });
 }
-var RULE, OVERVIEW;
+var OVERVIEW_BOX_MAX_WIDTH, AI_MARKER, OVERVIEW, AI_DISCLOSURE;
 var init_screen = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/01-welcome/screen.tsx"() {
     "use strict";
     init_theme();
     init_controls();
     init_logic();
-    RULE = "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500";
+    OVERVIEW_BOX_MAX_WIDTH = 90;
+    AI_MARKER = "\u273B";
     OVERVIEW = [
-      { label: "Step 1", description: "Extract components from your codebase" },
-      { label: "Step 2", description: "Review what was extracted" },
-      { label: "Step 3", description: "Generate CDF definitions with Claude" },
-      { label: "Step 4", description: "Review generated definitions" },
-      { label: "Step 5", description: "Push to Contentful" }
+      {
+        label: "Step 1",
+        description: "Extract components from your codebase",
+        ai: true
+      },
+      { label: "Step 2", description: "Review what was extracted", ai: false },
+      {
+        label: "Step 3",
+        description: "Generate component definitions",
+        ai: true
+      },
+      { label: "Step 4", description: "Review generated definitions", ai: false },
+      { label: "Step 5", description: "Push to Contentful", ai: false }
+    ];
+    AI_DISCLOSURE = [
+      "Steps marked \u273B use your local AI agent, which may send relevant code to your AI provider under your agreement with them. Contentful does not receive that code, or the prompts and responses. AI suggestions can be wrong or incomplete, so review and edit them before importing."
     ];
   }
 });
@@ -19429,9 +19460,9 @@ function RunningStep({
   const elapsed = useElapsed();
   return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", gap: 1, paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE2 }),
+      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE }),
       /* @__PURE__ */ jsx10(Text10, { bold: true, children: stepLabel(stepNumber, totalSteps, title) }),
-      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE2 })
+      /* @__PURE__ */ jsx10(Text10, { color: PALETTE.muted, children: RULE })
     ] }),
     /* @__PURE__ */ jsx10(Text10, { children: description }),
     /* @__PURE__ */ jsx10(Box9, { marginTop: 1, flexDirection: "column", gap: 1, children: lines.map((line, index) => /* @__PURE__ */ jsx10(Line, { line }, index)) }),
@@ -19441,7 +19472,7 @@ function RunningStep({
     ] }) })
   ] });
 }
-var RULE2;
+var RULE;
 var init_running_step = __esm({
   "packages/experience-design-system-cli/src/tui/import/shared/running-step/running-step.tsx"() {
     "use strict";
@@ -19449,7 +19480,7 @@ var init_running_step = __esm({
     init_logic7();
     init_theme2();
     init_use_elapsed();
-    RULE2 = "\u2500".repeat(40);
+    RULE = "\u2500".repeat(40);
   }
 });
 
@@ -31271,14 +31302,14 @@ var init_debug_mode_store = __esm({
   "packages/experience-design-system-cli/src/tui/settings/debug-mode/debug-mode-store.ts"() {
     "use strict";
     init_config();
-    RETENTION_CHOICES = [30, 60, 90];
+    RETENTION_CHOICES = [3, 14, 30];
     DEFAULT_RETENTION_DAYS = 30;
   }
 });
 
 // packages/experience-design-system-cli/src/tui/debug-prune.ts
-import { readdir as readdir3, rm, stat as stat5 } from "node:fs/promises";
-import { join as join25 } from "node:path";
+import { readdir as readdir3, rm, rmdir, stat as stat5 } from "node:fs/promises";
+import { dirname as dirname16, join as join25 } from "node:path";
 async function logFilesIn(dir) {
   const entries = await readdir3(dir, { withFileTypes: true });
   const nested = await Promise.all(
@@ -31290,10 +31321,24 @@ async function logFilesIn(dir) {
   );
   return nested.flat();
 }
+async function removeEmptyFolders(from, stop) {
+  let dir = from;
+  let removed = 0;
+  for (; ; ) {
+    try {
+      await rmdir(dir);
+    } catch {
+      return removed;
+    }
+    removed += 1;
+    if (dir === stop) return removed;
+    dir = dirname16(dir);
+  }
+}
 async function pruneExpiredLogs(base, retentionDays, now = Date.now()) {
   const cutoff = now - retentionDays * DAY_MS;
   const contentfulDir = join25(base, ".contentful");
-  let deleted = 0;
+  const result = { logs: 0, folders: 0 };
   try {
     const sessions = (await readdir3(contentfulDir)).filter((name) => SESSION_FOLDER.test(name));
     for (const session of sessions) {
@@ -31302,14 +31347,15 @@ async function pruneExpiredLogs(base, retentionDays, now = Date.now()) {
         try {
           if ((await stat5(file)).mtimeMs >= cutoff) continue;
           await rm(file);
-          deleted += 1;
+          result.logs += 1;
+          result.folders += await removeEmptyFolders(dirname16(file), join25(contentfulDir, session));
         } catch {
         }
       }
     }
   } catch {
   }
-  return deleted;
+  return result;
 }
 var DAY_MS, SESSION_FOLDER;
 var init_debug_prune = __esm({
@@ -31495,8 +31541,24 @@ var init_debug_store = __esm({
     init_debug_prune();
     void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(async ([enabled, base]) => {
       if (!base) return;
-      await readDebugModeSetting().then(({ retentionDays }) => pruneExpiredLogs(base, retentionDays)).catch(() => void 0);
-      if (enabled) await mkdir9(join26(startSession(base, { replace: false }), "debug"), { recursive: true });
+      const retention = await readDebugModeSetting().catch(() => void 0);
+      const pruned = retention ? await pruneExpiredLogs(base, retention.retentionDays).catch(() => void 0) : void 0;
+      if (!enabled) return;
+      const debugDir = join26(startSession(base, { replace: false }), "debug");
+      await mkdir9(debugDir, { recursive: true });
+      if (retention && pruned && pruned.logs + pruned.folders > 0) {
+        await writeFile8(
+          join26(debugDir, `${datePrefix()}-cleanup-${generateRunId()}.md`),
+          `# Debug Log Cleanup
+
+- Date: ${(/* @__PURE__ */ new Date()).toISOString()}
+- Retention: ${retention.retentionDays} days
+- Logs deleted: ${pruned.logs}
+- Empty folders removed: ${pruned.folders}
+`,
+          { mode: 384 }
+        );
+      }
     });
     process.once("uncaughtException", (err) => {
       void handleCrash().finally(() => {
@@ -32813,15 +32875,22 @@ var init_screen11 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
-import { useEffect as useEffect26, useState as useState35 } from "react";
+import { useEffect as useEffect26, useRef as useRef15, useState as useState35 } from "react";
 import { Box as Box50, Text as Text53, useInput as useInput16 } from "ink";
 import { Fragment as Fragment21, jsx as jsx62, jsxs as jsxs51 } from "react/jsx-runtime";
 function DebugModeScreen({ onDone }) {
   const [setting, setSetting] = useState35(null);
   const [focus, setFocus] = useState35("enabled");
+  const [pending, setPending] = useState35(
+    RETENTION_CHOICES[RETENTION_CHOICES.length - 1]
+  );
+  const [notice, setNotice] = useState35(null);
+  const visit = useRef15({ trail: createTrail(), before: void 0, error: "" }).current;
   useEffect26(() => {
     readDebugModeSetting().then((loaded) => {
       setSetting(loaded);
+      setPending(loaded.retentionDays);
+      visit.before = snapshotOf2(loaded);
       startDebugRun({
         flow: "settings/debug-mode",
         step: "01-debug-mode",
@@ -32830,49 +32899,95 @@ function DebugModeScreen({ onDone }) {
       });
     });
   }, []);
-  const change = (patch) => {
+  const save = (patch, saved) => {
     if (!setting) return;
-    setSetting({ ...setting, ...patch });
-    void writeDebugModeSetting(patch);
+    const fields2 = Object.keys(patch).join(", ");
+    writeDebugModeSetting(patch).then(() => {
+      setSetting({ ...setting, ...patch });
+      visit.trail.record(`saved ${fields2}`);
+      setNotice({ kind: "success", text: `Saved: ${saved}` });
+    }).catch((err) => {
+      visit.error = scrubError(err, []);
+      visit.trail.record(`saving ${fields2} failed`);
+      setNotice({ kind: "error", text: `Not saved: ${err instanceof Error ? err.message : String(err)}` });
+    });
+  };
+  const endVisit = (current) => {
+    const change = diffSnapshots(visit.before ?? snapshotOf2(current), snapshotOf2(current));
+    void finishDebugRun({
+      outputs: {
+        ...current,
+        ...change,
+        ...pending !== current.retentionDays ? { unsaved_retention_days: pending } : {},
+        actions: visit.trail.entries(),
+        ...visit.error ? { error: visit.error } : {}
+      },
+      status: visit.error ? "error" : "success",
+      exitMethod: change.changed ? "saved" : "discarded"
+    });
   };
   useInput16((input, key) => {
     if (!setting) return;
     if (key.upArrow || key.downArrow) {
       setFocus((current) => ROWS[(ROWS.indexOf(current) + (key.downArrow ? 1 : ROWS.length - 1)) % ROWS.length]);
+      setNotice(null);
       return;
     }
-    if (key.return || input === " ") {
-      if (focus === "enabled") change({ enabled: !setting.enabled });
-      else change({ retentionDays: nextRetention(setting.retentionDays) });
+    if ((key.leftArrow || key.rightArrow) && focus === "retentionDays") {
+      const index = RETENTION_CHOICES.indexOf(pending) + (key.rightArrow ? 1 : -1);
+      setPending(RETENTION_CHOICES[Math.min(Math.max(index, 0), RETENTION_CHOICES.length - 1)]);
+      setNotice(null);
+      return;
+    }
+    if (focus === "enabled" && (key.return || input === " ")) {
+      const enabled = !setting.enabled;
+      save({ enabled }, `debug logging is ${enabled ? "on" : "off"}`);
+      return;
+    }
+    if (focus === "retentionDays" && key.return) {
+      save({ retentionDays: pending }, `logs are deleted after ${pending} days`);
       return;
     }
     if (key.escape || input === "q") {
-      void finishDebugRun({ outputs: { ...setting }, status: "success", exitMethod: "saved" });
+      endVisit(setting);
       onDone();
     }
   });
-  const marker = (row) => focus === row ? "\u276F" : " ";
+  const marker = (row) => /* @__PURE__ */ jsx62(Text53, { color: focus === row ? PALETTE.accent : void 0, children: focus === row ? "\u276F" : " " });
+  const label = (row, text) => /* @__PURE__ */ jsx62(Text53, { bold: focus === row, color: focus === row ? PALETTE.accent : PALETTE.muted, children: text });
   return /* @__PURE__ */ jsxs51(Box50, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsx62(Text53, { bold: true, children: "Settings \u203A Debug Mode" }),
     /* @__PURE__ */ jsx62(Text53, { children: " " }),
     setting ? /* @__PURE__ */ jsxs51(Fragment21, { children: [
-      /* @__PURE__ */ jsxs51(Text53, { children: [
+      /* @__PURE__ */ jsxs51(Box50, { gap: 1, children: [
         marker("enabled"),
-        " Debug logging:",
-        " ",
+        label("enabled", "Debug logging:"),
         /* @__PURE__ */ jsx62(Text53, { bold: true, color: setting.enabled ? PALETTE.success : PALETTE.muted, children: setting.enabled ? "On" : "Off" })
       ] }),
-      /* @__PURE__ */ jsxs51(Text53, { children: [
+      /* @__PURE__ */ jsxs51(Box50, { gap: 1, children: [
         marker("retentionDays"),
-        " Delete logs after:",
-        " ",
-        /* @__PURE__ */ jsxs51(Text53, { bold: true, color: PALETTE.accent, children: [
-          setting.retentionDays,
-          " days"
-        ] })
+        label("retentionDays", "Delete logs after:"),
+        RETENTION_CHOICES.map((days) => {
+          const highlighted = focus === "retentionDays" && days === pending;
+          const saved = days === setting.retentionDays;
+          return /* @__PURE__ */ jsx62(
+            Text53,
+            {
+              bold: highlighted || saved,
+              underline: highlighted,
+              color: highlighted ? PALETTE.accent : saved ? PALETTE.success : PALETTE.muted,
+              children: `${saved ? "\u2713 " : ""}${days} days`
+            },
+            days
+          );
+        })
       ] }),
       /* @__PURE__ */ jsx62(Text53, { children: " " }),
-      /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "Older logs are deleted the next time the CLI starts." })
+      notice ? /* @__PURE__ */ jsxs51(Text53, { color: notice.kind === "success" ? PALETTE.success : PALETTE.error, children: [
+        notice.kind === "success" ? "\u2713" : "\u2717",
+        " ",
+        notice.text
+      ] }) : /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "\u2713 marks what is saved. Older logs are deleted the next time the CLI starts." })
     ] }) : /* @__PURE__ */ jsx62(Text53, { color: PALETTE.muted, children: "Loading\u2026" }),
     /* @__PURE__ */ jsx62(Text53, { children: " " }),
     /* @__PURE__ */ jsx62(
@@ -32880,14 +32995,17 @@ function DebugModeScreen({ onDone }) {
       {
         hints: [
           { keys: "\u2191/\u2193", label: "move" },
-          { keys: "\u23CE/Space", label: "change" },
+          ...focus === "retentionDays" ? [
+            { keys: "\u2190/\u2192", label: "choose" },
+            { keys: "\u23CE", label: "save" }
+          ] : [{ keys: "\u23CE/Space", label: "toggle" }],
           { keys: "Esc/q", label: "back" }
         ]
       }
     )
   ] });
 }
-var ROWS, nextRetention;
+var ROWS, snapshotOf2;
 var init_screen12 = __esm({
   "packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx"() {
     "use strict";
@@ -32895,8 +33013,12 @@ var init_screen12 = __esm({
     init_debug_mode_store();
     init_debug_store();
     init_control_hints();
+    init_debug_trail();
     ROWS = ["enabled", "retentionDays"];
-    nextRetention = (current) => RETENTION_CHOICES[(RETENTION_CHOICES.indexOf(current) + 1) % RETENTION_CHOICES.length];
+    snapshotOf2 = (setting) => ({
+      enabled: String(setting.enabled),
+      retentionDays: String(setting.retentionDays)
+    });
   }
 });
 
@@ -33333,8 +33455,8 @@ function createProgram() {
 init_config();
 init_package_root();
 import { existsSync as existsSync12 } from "node:fs";
-import { mkdir as mkdir10, readFile as readFile19, rename as rename3, rmdir, unlink } from "node:fs/promises";
-import { dirname as dirname16, join as join30 } from "node:path";
+import { mkdir as mkdir10, readFile as readFile19, rename as rename3, rmdir as rmdir2, unlink } from "node:fs/promises";
+import { dirname as dirname17, join as join30 } from "node:path";
 var PACKAGE_NAME3 = "@contentful/experience-design-system-cli";
 async function readJson(path5) {
   try {
@@ -33360,14 +33482,14 @@ async function migrateOldConfig() {
     if (Object.keys(migrated).length > 0) await updateSettings2({ ...migrated, ...await readSettings2() });
     if (existsSync12(oldRuns)) {
       if (!existsSync12(runsFilePath2())) {
-        await mkdir10(dirname16(runsFilePath2()), { recursive: true });
+        await mkdir10(dirname17(runsFilePath2()), { recursive: true });
         await rename3(oldRuns, runsFilePath2());
       } else {
         await unlink(oldRuns);
       }
     }
     await Promise.all([oldCredentials, oldDebugMode].map((f) => unlink(f).catch(() => void 0)));
-    await rmdir(oldConfigDir2()).catch(() => void 0);
+    await rmdir2(oldConfigDir2()).catch(() => void 0);
   } catch {
   }
 }

package/dist/package.json

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

package/dist/src/tui/debug-prune.d.ts

@@ -1,7 +1,12 @@
+export type PruneResult = {
+    logs: number;
+    folders: number;
+};
 /**
  * Deletes the debug logs under `<base>/.contentful` that are older than `retentionDays`. It only looks at `.md` files
  * inside the `debug` folder of a session folder, so nothing the import produced or the user put there is touched. A file
- * that cannot be read or deleted is skipped: this runs at startup and must never get in the user's way. Returns how many
- * logs it deleted.
+ * that cannot be read or deleted is skipped: this runs at startup and must never get in the user's way. A folder the
+ * deletion left empty is removed too, up to the session folder; one that still holds anything stays. Returns how many
+ * logs and folders it deleted.
  */
-export declare function pruneExpiredLogs(base: string, retentionDays: number, now?: number): Promise<number>;
+export declare function pruneExpiredLogs(base: string, retentionDays: number, now?: number): Promise<PruneResult>;

package/dist/src/tui/settings/debug-mode/debug-mode-store.d.ts

@@ -1,5 +1,5 @@
 /** How long a debug log is kept before the CLI deletes it. Only these values are offered. */
-export declare const RETENTION_CHOICES: readonly [30, 60, 90];
+export declare const RETENTION_CHOICES: readonly [3, 14, 30];
 type RetentionDays = (typeof RETENTION_CHOICES)[number];
 export type DebugModeSetting = {
     enabled: boolean;

package/dist/src/tui/settings/debug-mode/screen.d.ts

@@ -1,4 +1,8 @@
 import React from 'react';
+/**
+ * Settings > Debug Mode. Logging is switched with Enter. The retention is chosen with ←/→, which only moves a highlight:
+ * nothing is saved until Enter, and then the screen says so.
+ */
 export declare function DebugModeScreen({ onDone }: {
     onDone: () => void;
 }): React.ReactElement;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-e051d273.0",
+  "version": "2.37.1-dev-build-bdab4dbe.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-e051d273.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-e051d273.0"
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-bdab4dbe.0",
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-bdab4dbe.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",