@contentful/experience-design-system-cli 2.37.1-dev-build-e2dab518.0 → 2.37.1-dev-build-97b615d3.0

package/dist/app.js

@@ -2018,7 +2018,7 @@ var init_cache_keys = __esm({
 
 // packages/experience-design-system-cli/app.tsx
 import { join as join25 } from "node:path";
-import { useEffect as useEffect27, useState as useState33 } from "react";
+import { useEffect as useEffect26, useState as useState33 } from "react";
 
 // packages/experience-design-system-cli/src/tui/home/home.tsx
 import { useEffect as useEffect2, useState as useState2 } from "react";
@@ -4365,30 +4365,8 @@ function applyScopeDecisions(db, sessionId, decisions) {
     const placeholders = accepted.map(() => "?").join(",");
     db.prepare(`UPDATE raw_components SET status = 'generated' WHERE session_id = ? AND name IN (${placeholders})`).run(sessionId, ...accepted);
   }
-  removeSlotAllowedComponents(db, sessionId, decisions.excludedSlotEdges ?? [], rejected);
   db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId);
 }
-function removeSlotAllowedComponents(db, sessionId, edges, rejectedNames) {
-  if (edges.length === 0 && rejectedNames.length === 0)
-    return;
-  const componentId = db.prepare("SELECT component_id FROM raw_components WHERE session_id = ? AND name = ?");
-  const removeEdge = db.prepare("DELETE FROM raw_slot_allowed_components WHERE session_id = ? AND component_id = ? AND allowed_component = ?");
-  const removeEverywhere = db.prepare("DELETE FROM raw_slot_allowed_components WHERE session_id = ? AND allowed_component = ?");
-  db.exec("BEGIN");
-  try {
-    for (const edge of edges) {
-      const row = componentId.get(sessionId, edge.parent);
-      if (row)
-        removeEdge.run(sessionId, row.component_id, edge.child);
-    }
-    for (const name of rejectedNames)
-      removeEverywhere.run(sessionId, name);
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-}
 function findLatestSessionForCommand(db, command) {
   return getLatestCompletedSessionForCommand(db, command);
 }
@@ -18392,7 +18370,7 @@ function buildVisibleRows(props) {
         if (visited.has(target)) continue;
         visited.add(target);
         const isCycleMember = cycleParticipants.has(target);
-        out.push({ name: target, depth: cur.depth + 1, isCycleMember, parent: cur.name });
+        out.push({ name: target, depth: cur.depth + 1, isCycleMember });
         queue.push({ name: target, depth: cur.depth + 1 });
       }
     }
@@ -18439,8 +18417,7 @@ function buildVisibleRows(props) {
         sharedSuffix,
         cycleChild: child.isCycleMember || void 0,
         itemIdx: childRec?.idx ?? -1,
-        rootName: key,
-        parentName: child.parent
+        rootName: key
       });
     });
   }
@@ -18523,19 +18500,13 @@ function buildVisibleRows(props) {
         injectedChildren.push({
           name: target,
           depth: parentDepth + 1,
-          isCycleChild: true,
-          parent: parentName
+          isCycleChild: true
         });
       }
     };
     emitCycleChildrenOf(root, 0);
     for (const c2 of closureChildren) {
-      injectedChildren.push({
-        name: c2.name,
-        depth: c2.depth,
-        isCycleChild: false,
-        parent: c2.path[c2.path.length - 2] ?? root
-      });
+      injectedChildren.push({ name: c2.name, depth: c2.depth, isCycleChild: false });
       emitCycleChildrenOf(c2.name, c2.depth);
     }
     const isLastAtDepth = (idx) => {
@@ -18569,8 +18540,7 @@ function buildVisibleRows(props) {
         sharedSuffix,
         cycleChild: child.isCycleChild || void 0,
         itemIdx: childRec?.idx ?? -1,
-        rootName: root,
-        parentName: child.parent
+        rootName: root
       });
     });
   }
@@ -18723,7 +18693,7 @@ function GroupedSidebar(props) {
       const rs = itemName ? renderStatusByKey?.get(itemName) : void 0;
       const badge = itemName ? previewBadge(previewAnnotationByKey?.get(itemName)) : null;
       const showInheritance = rs !== void 0 && row.kind !== "cycle" && row.kind !== "empty" && row.kind !== "group-root";
-      const supportsSelectionGlyph = selectionStateByKey !== void 0 && itemName !== void 0 && (row.kind === "standalone" || row.kind === "group-root" || row.kind === "group-child" || row.kind === "flat" || row.kind === "empty" || row.kind === "cycle");
+      const supportsSelectionGlyph = selectionStateByKey !== void 0 && itemName !== void 0 && (row.kind === "standalone" || row.kind === "group-root" || row.kind === "group-child" || row.kind === "flat" || row.kind === "cycle");
       const selState = supportsSelectionGlyph ? selectionStateByKey.get(itemName) ?? "undecided" : void 0;
       const isCycleRow = row.kind === "cycle";
       const selStyle = selectionGlyphStyleFor(selState, isCycleRow);
@@ -18753,7 +18723,7 @@ function GroupedSidebar(props) {
             color: isSelected ? PALETTE2.info : labelStyle.dim ? PALETTE2.muted : labelStyle.color,
             bold: isSelected || labelStyle.bold,
             inverse: false,
-            underline: isSelected && focused,
+            underline: isSelected && !focused,
             wrap: wrapLabels ? "wrap" : "truncate",
             children: [
               " ",
@@ -19412,7 +19382,6 @@ function resolveKey(mode, key, ctx) {
 function resolveMain(key, ctx) {
   const { input } = key;
   const inMain = ctx.focusedColumn === "main";
-  if (key.ctrl && input === "z") return { type: "undo" };
   if (input === "q" || key.escape) {
     if (key.escape && ctx.jumpFilterActive) return { type: "clear-jump-filter" };
     if (key.escape && ctx.searchActive) return { type: "clear-search" };
@@ -19671,42 +19640,21 @@ function rejectNeedsConfirmation(graph, name, state) {
   const ancestors = toReject.filter((n) => n !== name);
   return ancestors.length + toDeselect.length >= 2;
 }
-function removeSlotChild(components, edge) {
-  return components.map(
-    (component) => component.name === edge.parent ? {
-      ...component,
-      slots: component.slots?.map((slot) => ({
-        ...slot,
-        allowedComponents: slot.allowedComponents.filter((name) => name !== edge.child)
-      }))
-    } : component
-  );
-}
-function withoutSlotChildren(components, removedEdges) {
-  return removedEdges.reduce(removeSlotChild, components);
-}
-function partitionDecisions(components, state, removedEdges) {
+function partitionDecisions(components, state) {
   const accepted = [];
   const rejected = [];
   for (const c2 of components) {
     if (state.get(c2.name) === "accepted") accepted.push(c2.name);
     else rejected.push(c2.name);
   }
-  const rejectedNames = new Set(rejected);
-  const excludedSlotEdges = removedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
-  return { accepted, rejected, excludedSlotEdges };
+  return { accepted, rejected };
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/use-scope-gate.ts
-function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
+function useScopeGate({ components, onConfirm, onQuit }) {
   const { columns: totalWidth, rows: terminalRows } = useTerminalSize();
   const columnPlan = useMemo2(() => computeColumnWidths(totalWidth), [totalWidth]);
   const [decisions, setDecisions] = useState12(/* @__PURE__ */ new Map());
-  const [removedEdges, setRemovedEdges] = useState12([]);
-  const components = useMemo2(
-    () => withoutSlotChildren(loadedComponents, removedEdges),
-    [loadedComponents, removedEdges]
-  );
   const [nav, setNav] = useState12({ cursor: 0, scrollOffset: 0 });
   const [focusedColumn, setFocusedColumn] = useState12("main");
   const [addedComponentsCursor, setAddedComponentsCursor] = useState12(0);
@@ -19878,14 +19826,6 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
         return void 0;
     }
   };
-  const focusedNestedEdge = () => {
-    const row = visibleRows[safeCursor];
-    if (row?.kind !== "group-child" || !row.parentName || row.itemIdx < 0) return void 0;
-    const child = groupedItems[row.itemIdx]?.key;
-    return child ? { parent: row.parentName, child } : void 0;
-  };
-  const removeFromParentSlot = (edge) => setRemovedEdges((edges) => [...edges, edge]);
-  const undoSlotRemoval = () => setRemovedEdges((edges) => edges.slice(0, -1));
   const jumpCursorTo = (name) => {
     let idx = -1;
     for (let i = 0; i < visibleRows.length; i++) {
@@ -19985,7 +19925,7 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
         onQuit();
         return;
       case "confirm":
-        onConfirm(partitionDecisions(components, decisions, removedEdges));
+        onConfirm(partitionDecisions(components, decisions));
         return;
       case "close-help":
         setShowHelp(false);
@@ -20038,11 +19978,6 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
         return;
       }
       case "reject": {
-        const edge = focusedColumn === "main" ? focusedNestedEdge() : void 0;
-        if (edge) {
-          removeFromParentSlot(edge);
-          return;
-        }
         const key = focusedColumn === "added-components" ? addedComponents[safeAddedComponentsCursor]?.name : focusedRowKey();
         if (key) requestReject(key);
         return;
@@ -20050,9 +19985,6 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
       case "toggle-all":
         decide({ type: "toggle-all" });
         return;
-      case "undo":
-        undoSlotRemoval();
-        return;
       case "accept-unflagged":
         decide({ type: "accept-unflagged" });
         return;
@@ -20652,7 +20584,6 @@ function buildFlowStart(input) {
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/screen.tsx
-import { useEffect as useEffect20, useRef as useRef12 } from "react";
 import { Box as Box41 } from "ink";
 
 // packages/experience-design-system-types/dist/src/cdf/validate.js
@@ -22695,8 +22626,8 @@ function FieldEditor({
     return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", width, borderStyle: "single", borderColor: PALETTE3.warning, children: [
       /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE3.warning, children: "FIELD EDITOR \u2014 no fields" }),
       /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify." }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "There is nothing to edit here." }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: active ? "[Esc] go back to the list" : "In the list: [r] reject this component \xB7 [a] accept it" })
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "You can add fields manually below or reject this component." }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "Enter to save \xB7 Esc to discard" })
     ] });
   }
   const hasEmptyProperties = props.length === 0 && slots.length === 0;
@@ -22911,7 +22842,7 @@ function FieldEditor({
       children: [
         hasEmptyProperties && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify. Reject this component or add fields manually." }),
         header,
-        /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", width: innerWidth, flexShrink: 0, children: focusLevel === "field" && !inComponentDesc && !inSlots && currentProp ? /* @__PURE__ */ jsx27(
+        /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", width: innerWidth, flexShrink: 0, children: focusLevel === "field" && !inComponentDesc && currentProp ? /* @__PURE__ */ jsx27(
           PropRow,
           {
             prop: currentProp,
@@ -23820,7 +23751,6 @@ function finalizeReviewSession(extractSessionId, components) {
         db.exec("ROLLBACK");
         throw error;
       }
-      removeSlotAllowedComponents(db, extractSessionId, [], toReject);
     } finally {
       db.close();
     }
@@ -25552,50 +25482,33 @@ function GenerateReviewStepView({
     const cycle = cycleRows[cyclesCursor];
     return cycle ? enumerateCycleBreaks(cycle, components) : [];
   }, [cycleRows, cyclesCursor, components]);
-  const saveSlotChange = (parentKey, nextEntry, historyLabel) => {
+  const handleBreakEdge = (edge) => {
+    const target = components.find((component) => component.key === edge.fromComponent);
+    const slot = target?.entry.$slots?.[edge.slotName];
+    if (!target || !slot || !Array.isArray(slot.$allowedComponents)) return;
+    const nextEntry = {
+      ...target.entry,
+      $slots: {
+        ...target.entry.$slots,
+        [edge.slotName]: {
+          ...slot,
+          $allowedComponents: slot.$allowedComponents.filter((value) => value !== edge.toComponent)
+        }
+      }
+    };
     const next = components.map(
-      (component) => component.key === parentKey ? { ...component, entry: nextEntry } : component
+      (component) => component.key === target.key ? { ...component, entry: nextEntry } : component
     );
     setComponents(next);
     const db = openPipelineDb();
     try {
-      storeCDFComponents(db, extractSessionId, [{ key: parentKey, entry: nextEntry }]);
+      storeCDFComponents(db, extractSessionId, [{ key: target.key, entry: nextEntry }]);
     } finally {
       db.close();
     }
     recomputeCycles(next);
     livePreviewHook.trigger();
-    pushHistorySnapshot(next, historyLabel);
-  };
-  const handleBreakEdge = (edge) => {
-    const target = components.find((component) => component.key === edge.fromComponent);
-    const slot = target?.entry.$slots?.[edge.slotName];
-    if (!target || !slot || !Array.isArray(slot.$allowedComponents)) return;
-    saveSlotChange(
-      target.key,
-      {
-        ...target.entry,
-        $slots: {
-          ...target.entry.$slots,
-          [edge.slotName]: {
-            ...slot,
-            $allowedComponents: slot.$allowedComponents.filter((value) => value !== edge.toComponent)
-          }
-        }
-      },
-      "break-cycle-edge"
-    );
-  };
-  const handleRemoveSlotChild = (parentKey, childKey) => {
-    const parent = components.find((component) => component.key === parentKey);
-    if (!parent?.entry.$slots) return;
-    const slots = Object.fromEntries(
-      Object.entries(parent.entry.$slots).map(([slotName, slot]) => [
-        slotName,
-        Array.isArray(slot.$allowedComponents) ? { ...slot, $allowedComponents: slot.$allowedComponents.filter((value) => value !== childKey) } : slot
-      ])
-    );
-    saveSlotChange(parentKey, { ...parent.entry, $slots: slots }, "remove-slot-child");
+    pushHistorySnapshot(next, "break-cycle-edge");
   };
   const handleRejectComponent = (key) => {
     const rejectCascade2 = computeRejectCascade(key, componentGraph);
@@ -25925,11 +25838,6 @@ function GenerateReviewStepView({
     if (input === "r") {
       const current = components[selectedIdx];
       if (!current) return;
-      const row = visibleRowsMemo[cursorRowIdx];
-      if (row?.kind === "group-child" && row.parentName) {
-        handleRemoveSlotChild(row.parentName, current.key);
-        return;
-      }
       handleRejectComponent(current.key);
       return;
     }
@@ -27076,18 +26984,10 @@ function FlowScreen({
   controller,
   livePreview = true,
   generatePromptPath,
-  onExit,
-  onStepChange
+  onExit
 }) {
   const totalSteps = totalStepsFor(state);
   const quit = () => onExit(0);
-  const previousStep = useRef12(state.step);
-  useEffect20(() => {
-    if (previousStep.current !== state.step) {
-      onStepChange?.();
-      previousStep.current = state.step;
-    }
-  }, [state.step, onStepChange]);
   const content = (() => {
     switch (state.step) {
       case "final-review":
@@ -27213,7 +27113,7 @@ function FlowScreen({
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/use-flow.ts
-import { useEffect as useEffect21, useRef as useRef13, useSyncExternalStore } from "react";
+import { useEffect as useEffect20, useRef as useRef12, useSyncExternalStore } from "react";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/controller.ts
 import { appendFileSync, writeFileSync } from "node:fs";
@@ -27803,6 +27703,12 @@ function createFlowController(start, deps) {
       deps.log({ update: sanitizeForLog(patch) });
     } catch {
     }
+    if (patch.step !== void 0 && patch.step !== state.step) {
+      try {
+        deps.beforeStepChange?.();
+      } catch {
+      }
+    }
     state = { ...state, ...patch };
     for (const listener of listeners) listener();
   };
@@ -27940,28 +27846,32 @@ function createFlowController(start, deps) {
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/use-flow.ts
-function useFlow(start, deps = realFlowDeps) {
-  const controller = useRef13();
+function useFlow(start, options = {}) {
+  const controller = useRef12();
   if (start && !controller.current) {
     try {
       startWizardLog();
     } catch {
     }
-    controller.current = createFlowController(start, deps());
+    const flowDeps = (options.deps ?? realFlowDeps)();
+    controller.current = createFlowController(start, {
+      ...flowDeps,
+      ...options.beforeStepChange ? { beforeStepChange: options.beforeStepChange } : {}
+    });
   }
   const current = controller.current;
   const state = useSyncExternalStore(
     (listener) => current?.subscribe(listener) ?? (() => void 0),
     () => current?.getState()
   );
-  useEffect21(() => {
+  useEffect20(() => {
     if (!start) controller.current = void 0;
   }, [start]);
   return current && state ? { controller: current, state } : void 0;
 }
 
 // packages/experience-design-system-cli/src/tui/help/PageContainer.tsx
-import { useEffect as useEffect22, useState as useState27 } from "react";
+import { useEffect as useEffect21, useState as useState27 } from "react";
 import { Box as Box42, Text as Text44, useInput as useInput9 } from "ink";
 
 // packages/experience-design-system-cli/src/tui/debug-store.ts
@@ -28155,7 +28065,7 @@ function Section({ title, rows }) {
 }
 function HelpScreen({ onDone }) {
   const [info, setInfo] = useState27();
-  useEffect22(() => {
+  useEffect21(() => {
     startDebugRun({ flow: "help", step: "01-help", menuOption: "Help", inputs: {} });
     void readHelpInfo().then(setInfo);
   }, []);
@@ -28248,7 +28158,7 @@ function SettingsScreen({
 }
 
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
-import { useEffect as useEffect23, useState as useState29 } from "react";
+import { useEffect as useEffect22, useState as useState29 } from "react";
 import { Box as Box44, Text as Text46, useInput as useInput11 } from "ink";
 import TextInput4 from "ink-text-input";
 
@@ -28316,7 +28226,7 @@ function ConfigurationScreen({ onDone }) {
   const [lastSaved, setLastSaved] = useState29(null);
   const [editing, setEditing] = useState29(false);
   const [valueBeforeEdit, setValueBeforeEdit] = useState29("");
-  useEffect23(() => {
+  useEffect22(() => {
     readCredentials().then((cfg) => {
       setConfig(cfg);
       setStage("form");
@@ -28453,7 +28363,7 @@ function ConfigurationScreen({ onDone }) {
 }
 
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx
-import { useEffect as useEffect24, useState as useState30 } from "react";
+import { useEffect as useEffect23, useState as useState30 } from "react";
 import { Box as Box45, Text as Text47, useInput as useInput12 } from "ink";
 
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/analytics-store.ts
@@ -28476,7 +28386,7 @@ import { Fragment as Fragment18, jsx as jsx56, jsxs as jsxs46 } from "react/jsx-
 function OptInAnalyticsScreen({ onDone }) {
   const [loading, setLoading] = useState30(true);
   const [enabled, setEnabled] = useState30(true);
-  useEffect24(() => {
+  useEffect23(() => {
     readAnalyticsSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -28530,13 +28440,13 @@ function OptInAnalyticsScreen({ onDone }) {
 }
 
 // packages/experience-design-system-cli/src/tui/upgrade/PageContainer.tsx
-import { useEffect as useEffect25, useState as useState31 } from "react";
+import { useEffect as useEffect24, useState as useState31 } from "react";
 import { Box as Box46, Text as Text48, useInput as useInput13 } from "ink";
 import { jsx as jsx57, jsxs as jsxs47 } from "react/jsx-runtime";
 var UPGRADE_COMMANDS = ["git pull", "pnpm install", "pnpm build"];
 function UpgradeScreen({ onDone }) {
   const [upgradeCheck, setUpgradeCheck] = useState31();
-  useEffect25(() => {
+  useEffect24(() => {
     startDebugRun({
       flow: "upgrade",
       step: "01-upgrade",
@@ -28601,13 +28511,13 @@ function renderBody(upgradeCheck) {
 }
 
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
-import { useEffect as useEffect26, useState as useState32 } from "react";
+import { useEffect as useEffect25, useState as useState32 } from "react";
 import { Box as Box47, Text as Text49, useInput as useInput14 } from "ink";
 import { jsx as jsx58, jsxs as jsxs48 } from "react/jsx-runtime";
 function DebugModeScreen({ onDone }) {
   const [loading, setLoading] = useState32(true);
   const [enabled, setEnabled] = useState32(true);
-  useEffect26(() => {
+  useEffect25(() => {
     readDebugModeSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -28685,9 +28595,9 @@ function App({ importOptions, inkClear }) {
   const [generationInput, setGenerationInput] = useState33();
   const generation = useGeneration(generationInput);
   const [flowStart, setFlowStart] = useState33();
-  const flow = useFlow(flowStart);
+  const flow = useFlow(flowStart, { beforeStepChange: inkClear });
   const [importDefaults, setImportDefaults] = useState33();
-  useEffect27(() => {
+  useEffect26(() => {
     if (screen !== "import") {
       setImportDefaults(void 0);
       return;
@@ -28745,12 +28655,12 @@ function App({ importOptions, inkClear }) {
       }
     });
   };
-  useEffect27(() => {
+  useEffect26(() => {
     if (!extractionRun || extraction?.status !== "done" || !extraction.result.ok) return;
     setExtractionRun(void 0);
     setScopeRun({ ...extractionRun, extraction: extraction.result.extraction });
   }, [extraction, extractionRun]);
-  useEffect27(() => {
+  useEffect26(() => {
     if (!scopeRun || scopeFlow?.status !== "confirmed" || generationInput) return;
     const { extraction: produced, input, generatePromptPath } = scopeRun;
     setGenerationInput({
@@ -28768,7 +28678,7 @@ function App({ importOptions, inkClear }) {
       ...generatePromptPath ? { generatePromptPath } : {}
     });
   }, [scopeFlow, scopeRun, generationInput]);
-  useEffect27(() => {
+  useEffect26(() => {
     if (!scopeRun || generation?.status !== "done" || !generation.result.ok) return;
     const { credentialsSkipped, tokenStrategy, extraction: produced, input, generatePromptPath } = scopeRun;
     inkClear();
@@ -28819,8 +28729,7 @@ function App({ importOptions, inkClear }) {
             state: flow.state,
             controller: flow.controller,
             generatePromptPath: flowStart.generatePromptPath,
-            onExit: setImportExitCode,
-            onStepChange: inkClear
+            onExit: setImportExitCode
           }
         );
       }

package/dist/index.js

@@ -4386,30 +4386,8 @@ function applyScopeDecisions(db, sessionId, decisions) {
     const placeholders = accepted.map(() => "?").join(",");
     db.prepare(`UPDATE raw_components SET status = 'generated' WHERE session_id = ? AND name IN (${placeholders})`).run(sessionId, ...accepted);
   }
-  removeSlotAllowedComponents(db, sessionId, decisions.excludedSlotEdges ?? [], rejected);
   db.prepare("UPDATE sessions SET updated_at = ? WHERE id = ?").run(now, sessionId);
 }
-function removeSlotAllowedComponents(db, sessionId, edges, rejectedNames) {
-  if (edges.length === 0 && rejectedNames.length === 0)
-    return;
-  const componentId = db.prepare("SELECT component_id FROM raw_components WHERE session_id = ? AND name = ?");
-  const removeEdge = db.prepare("DELETE FROM raw_slot_allowed_components WHERE session_id = ? AND component_id = ? AND allowed_component = ?");
-  const removeEverywhere = db.prepare("DELETE FROM raw_slot_allowed_components WHERE session_id = ? AND allowed_component = ?");
-  db.exec("BEGIN");
-  try {
-    for (const edge of edges) {
-      const row = componentId.get(sessionId, edge.parent);
-      if (row)
-        removeEdge.run(sessionId, row.component_id, edge.child);
-    }
-    for (const name of rejectedNames)
-      removeEverywhere.run(sessionId, name);
-    db.exec("COMMIT");
-  } catch (e) {
-    db.exec("ROLLBACK");
-    throw e;
-  }
-}
 function findLatestSessionForCommand(db, command) {
   return getLatestCompletedSessionForCommand(db, command);
 }
@@ -21799,7 +21777,7 @@ function buildVisibleRows(props) {
         if (visited.has(target)) continue;
         visited.add(target);
         const isCycleMember = cycleParticipants.has(target);
-        out.push({ name: target, depth: cur.depth + 1, isCycleMember, parent: cur.name });
+        out.push({ name: target, depth: cur.depth + 1, isCycleMember });
         queue.push({ name: target, depth: cur.depth + 1 });
       }
     }
@@ -21846,8 +21824,7 @@ function buildVisibleRows(props) {
         sharedSuffix,
         cycleChild: child.isCycleMember || void 0,
         itemIdx: childRec?.idx ?? -1,
-        rootName: key,
-        parentName: child.parent
+        rootName: key
       });
     });
   }
@@ -21930,19 +21907,13 @@ function buildVisibleRows(props) {
         injectedChildren.push({
           name: target,
           depth: parentDepth + 1,
-          isCycleChild: true,
-          parent: parentName
+          isCycleChild: true
         });
       }
     };
     emitCycleChildrenOf(root, 0);
     for (const c2 of closureChildren) {
-      injectedChildren.push({
-        name: c2.name,
-        depth: c2.depth,
-        isCycleChild: false,
-        parent: c2.path[c2.path.length - 2] ?? root
-      });
+      injectedChildren.push({ name: c2.name, depth: c2.depth, isCycleChild: false });
       emitCycleChildrenOf(c2.name, c2.depth);
     }
     const isLastAtDepth = (idx) => {
@@ -21976,8 +21947,7 @@ function buildVisibleRows(props) {
         sharedSuffix,
         cycleChild: child.isCycleChild || void 0,
         itemIdx: childRec?.idx ?? -1,
-        rootName: root,
-        parentName: child.parent
+        rootName: root
       });
     });
   }
@@ -22130,7 +22100,7 @@ function GroupedSidebar(props) {
       const rs = itemName ? renderStatusByKey?.get(itemName) : void 0;
       const badge = itemName ? previewBadge(previewAnnotationByKey?.get(itemName)) : null;
       const showInheritance = rs !== void 0 && row.kind !== "cycle" && row.kind !== "empty" && row.kind !== "group-root";
-      const supportsSelectionGlyph = selectionStateByKey !== void 0 && itemName !== void 0 && (row.kind === "standalone" || row.kind === "group-root" || row.kind === "group-child" || row.kind === "flat" || row.kind === "empty" || row.kind === "cycle");
+      const supportsSelectionGlyph = selectionStateByKey !== void 0 && itemName !== void 0 && (row.kind === "standalone" || row.kind === "group-root" || row.kind === "group-child" || row.kind === "flat" || row.kind === "cycle");
       const selState = supportsSelectionGlyph ? selectionStateByKey.get(itemName) ?? "undecided" : void 0;
       const isCycleRow = row.kind === "cycle";
       const selStyle = selectionGlyphStyleFor(selState, isCycleRow);
@@ -22160,7 +22130,7 @@ function GroupedSidebar(props) {
             color: isSelected ? PALETTE2.info : labelStyle.dim ? PALETTE2.muted : labelStyle.color,
             bold: isSelected || labelStyle.bold,
             inverse: false,
-            underline: isSelected && focused,
+            underline: isSelected && !focused,
             wrap: wrapLabels ? "wrap" : "truncate",
             children: [
               " ",
@@ -22911,7 +22881,6 @@ function resolveKey(mode, key, ctx) {
 function resolveMain(key, ctx) {
   const { input } = key;
   const inMain = ctx.focusedColumn === "main";
-  if (key.ctrl && input === "z") return { type: "undo" };
   if (input === "q" || key.escape) {
     if (key.escape && ctx.jumpFilterActive) return { type: "clear-jump-filter" };
     if (key.escape && ctx.searchActive) return { type: "clear-search" };
@@ -23210,30 +23179,14 @@ function rejectNeedsConfirmation(graph, name, state) {
   const ancestors = toReject.filter((n) => n !== name);
   return ancestors.length + toDeselect.length >= 2;
 }
-function removeSlotChild(components, edge) {
-  return components.map(
-    (component) => component.name === edge.parent ? {
-      ...component,
-      slots: component.slots?.map((slot) => ({
-        ...slot,
-        allowedComponents: slot.allowedComponents.filter((name) => name !== edge.child)
-      }))
-    } : component
-  );
-}
-function withoutSlotChildren(components, removedEdges) {
-  return removedEdges.reduce(removeSlotChild, components);
-}
-function partitionDecisions(components, state, removedEdges) {
+function partitionDecisions(components, state) {
   const accepted = [];
   const rejected = [];
   for (const c2 of components) {
     if (state.get(c2.name) === "accepted") accepted.push(c2.name);
     else rejected.push(c2.name);
   }
-  const rejectedNames = new Set(rejected);
-  const excludedSlotEdges = removedEdges.filter((e) => !rejectedNames.has(e.parent) && !rejectedNames.has(e.child));
-  return { accepted, rejected, excludedSlotEdges };
+  return { accepted, rejected };
 }
 var init_state = __esm({
   "packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/state.ts"() {
@@ -23245,15 +23198,10 @@ var init_state = __esm({
 
 // packages/experience-design-system-cli/src/tui/import/steps/07-scope-gate/use-scope-gate.ts
 import { useEffect as useEffect7, useMemo as useMemo2, useRef as useRef4, useState as useState12 } from "react";
-function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
+function useScopeGate({ components, onConfirm, onQuit }) {
   const { columns: totalWidth, rows: terminalRows } = useTerminalSize();
   const columnPlan = useMemo2(() => computeColumnWidths(totalWidth), [totalWidth]);
   const [decisions, setDecisions] = useState12(/* @__PURE__ */ new Map());
-  const [removedEdges, setRemovedEdges] = useState12([]);
-  const components = useMemo2(
-    () => withoutSlotChildren(loadedComponents, removedEdges),
-    [loadedComponents, removedEdges]
-  );
   const [nav, setNav] = useState12({ cursor: 0, scrollOffset: 0 });
   const [focusedColumn, setFocusedColumn] = useState12("main");
   const [addedComponentsCursor, setAddedComponentsCursor] = useState12(0);
@@ -23425,14 +23373,6 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
         return void 0;
     }
   };
-  const focusedNestedEdge = () => {
-    const row = visibleRows[safeCursor];
-    if (row?.kind !== "group-child" || !row.parentName || row.itemIdx < 0) return void 0;
-    const child = groupedItems[row.itemIdx]?.key;
-    return child ? { parent: row.parentName, child } : void 0;
-  };
-  const removeFromParentSlot = (edge) => setRemovedEdges((edges) => [...edges, edge]);
-  const undoSlotRemoval = () => setRemovedEdges((edges) => edges.slice(0, -1));
   const jumpCursorTo = (name) => {
     let idx = -1;
     for (let i = 0; i < visibleRows.length; i++) {
@@ -23532,7 +23472,7 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
         onQuit();
         return;
       case "confirm":
-        onConfirm(partitionDecisions(components, decisions, removedEdges));
+        onConfirm(partitionDecisions(components, decisions));
         return;
       case "close-help":
         setShowHelp(false);
@@ -23585,11 +23525,6 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
         return;
       }
       case "reject": {
-        const edge = focusedColumn === "main" ? focusedNestedEdge() : void 0;
-        if (edge) {
-          removeFromParentSlot(edge);
-          return;
-        }
         const key = focusedColumn === "added-components" ? addedComponents[safeAddedComponentsCursor]?.name : focusedRowKey();
         if (key) requestReject(key);
         return;
@@ -23597,9 +23532,6 @@ function useScopeGate({ components: loadedComponents, onConfirm, onQuit }) {
       case "toggle-all":
         decide({ type: "toggle-all" });
         return;
-      case "undo":
-        undoSlotRemoval();
-        return;
       case "accept-unflagged":
         decide({ type: "accept-unflagged" });
         return;
@@ -26514,8 +26446,8 @@ function FieldEditor({
     return /* @__PURE__ */ jsxs22(Box21, { flexDirection: "column", width, borderStyle: "single", borderColor: PALETTE3.warning, children: [
       /* @__PURE__ */ jsx27(Text23, { bold: true, color: PALETTE3.warning, children: "FIELD EDITOR \u2014 no fields" }),
       /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify." }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "There is nothing to edit here." }),
-      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: active ? "[Esc] go back to the list" : "In the list: [r] reject this component \xB7 [a] accept it" })
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "You can add fields manually below or reject this component." }),
+      /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.muted, children: "Enter to save \xB7 Esc to discard" })
     ] });
   }
   const hasEmptyProperties = props.length === 0 && slots.length === 0;
@@ -26730,7 +26662,7 @@ function FieldEditor({
       children: [
         hasEmptyProperties && /* @__PURE__ */ jsx27(Text23, { color: PALETTE3.warning, children: "\u26A0 No properties classified for this component. The LLM didn't find anything to classify. Reject this component or add fields manually." }),
         header,
-        /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", width: innerWidth, flexShrink: 0, children: focusLevel === "field" && !inComponentDesc && !inSlots && currentProp ? /* @__PURE__ */ jsx27(
+        /* @__PURE__ */ jsx27(Box21, { flexDirection: "column", width: innerWidth, flexShrink: 0, children: focusLevel === "field" && !inComponentDesc && currentProp ? /* @__PURE__ */ jsx27(
           PropRow,
           {
             prop: currentProp,
@@ -27734,7 +27666,6 @@ function finalizeReviewSession(extractSessionId, components) {
         db.exec("ROLLBACK");
         throw error;
       }
-      removeSlotAllowedComponents(db, extractSessionId, [], toReject);
     } finally {
       db.close();
     }
@@ -29513,50 +29444,33 @@ function GenerateReviewStepView({
     const cycle = cycleRows[cyclesCursor];
     return cycle ? enumerateCycleBreaks(cycle, components) : [];
   }, [cycleRows, cyclesCursor, components]);
-  const saveSlotChange = (parentKey, nextEntry, historyLabel) => {
+  const handleBreakEdge = (edge) => {
+    const target = components.find((component) => component.key === edge.fromComponent);
+    const slot = target?.entry.$slots?.[edge.slotName];
+    if (!target || !slot || !Array.isArray(slot.$allowedComponents)) return;
+    const nextEntry = {
+      ...target.entry,
+      $slots: {
+        ...target.entry.$slots,
+        [edge.slotName]: {
+          ...slot,
+          $allowedComponents: slot.$allowedComponents.filter((value) => value !== edge.toComponent)
+        }
+      }
+    };
     const next = components.map(
-      (component) => component.key === parentKey ? { ...component, entry: nextEntry } : component
+      (component) => component.key === target.key ? { ...component, entry: nextEntry } : component
     );
     setComponents(next);
     const db = openPipelineDb();
     try {
-      storeCDFComponents(db, extractSessionId, [{ key: parentKey, entry: nextEntry }]);
+      storeCDFComponents(db, extractSessionId, [{ key: target.key, entry: nextEntry }]);
     } finally {
       db.close();
     }
     recomputeCycles(next);
     livePreviewHook.trigger();
-    pushHistorySnapshot(next, historyLabel);
-  };
-  const handleBreakEdge = (edge) => {
-    const target = components.find((component) => component.key === edge.fromComponent);
-    const slot = target?.entry.$slots?.[edge.slotName];
-    if (!target || !slot || !Array.isArray(slot.$allowedComponents)) return;
-    saveSlotChange(
-      target.key,
-      {
-        ...target.entry,
-        $slots: {
-          ...target.entry.$slots,
-          [edge.slotName]: {
-            ...slot,
-            $allowedComponents: slot.$allowedComponents.filter((value) => value !== edge.toComponent)
-          }
-        }
-      },
-      "break-cycle-edge"
-    );
-  };
-  const handleRemoveSlotChild = (parentKey, childKey) => {
-    const parent = components.find((component) => component.key === parentKey);
-    if (!parent?.entry.$slots) return;
-    const slots = Object.fromEntries(
-      Object.entries(parent.entry.$slots).map(([slotName, slot]) => [
-        slotName,
-        Array.isArray(slot.$allowedComponents) ? { ...slot, $allowedComponents: slot.$allowedComponents.filter((value) => value !== childKey) } : slot
-      ])
-    );
-    saveSlotChange(parentKey, { ...parent.entry, $slots: slots }, "remove-slot-child");
+    pushHistorySnapshot(next, "break-cycle-edge");
   };
   const handleRejectComponent = (key) => {
     const rejectCascade2 = computeRejectCascade(key, componentGraph);
@@ -29886,11 +29800,6 @@ function GenerateReviewStepView({
     if (input === "r") {
       const current = components[selectedIdx];
       if (!current) return;
-      const row = visibleRowsMemo[cursorRowIdx];
-      if (row?.kind === "group-child" && row.parentName) {
-        handleRemoveSlotChild(row.parentName, current.key);
-        return;
-      }
       handleRejectComponent(current.key);
       return;
     }
@@ -31225,7 +31134,6 @@ var init_run_teaser = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/screen.tsx
-import { useEffect as useEffect20, useRef as useRef12 } from "react";
 import { Box as Box41 } from "ink";
 import { jsx as jsx52, jsxs as jsxs42 } from "react/jsx-runtime";
 function totalStepsFor(state) {
@@ -31241,18 +31149,10 @@ function FlowScreen({
   controller,
   livePreview = true,
   generatePromptPath,
-  onExit,
-  onStepChange
+  onExit
 }) {
   const totalSteps = totalStepsFor(state);
   const quit = () => onExit(0);
-  const previousStep = useRef12(state.step);
-  useEffect20(() => {
-    if (previousStep.current !== state.step) {
-      onStepChange?.();
-      previousStep.current = state.step;
-    }
-  }, [state.step, onStepChange]);
   const content = (() => {
     switch (state.step) {
       case "final-review":
@@ -32020,6 +31920,12 @@ function createFlowController(start, deps) {
       deps.log({ update: sanitizeForLog(patch) });
     } catch {
     }
+    if (patch.step !== void 0 && patch.step !== state.step) {
+      try {
+        deps.beforeStepChange?.();
+      } catch {
+      }
+    }
     state = { ...state, ...patch };
     for (const listener of listeners) listener();
   };
@@ -32172,22 +32078,26 @@ var init_controller = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/use-flow.ts
-import { useEffect as useEffect21, useRef as useRef13, useSyncExternalStore } from "react";
-function useFlow(start, deps = realFlowDeps) {
-  const controller = useRef13();
+import { useEffect as useEffect20, useRef as useRef12, useSyncExternalStore } from "react";
+function useFlow(start, options = {}) {
+  const controller = useRef12();
   if (start && !controller.current) {
     try {
       startWizardLog();
     } catch {
     }
-    controller.current = createFlowController(start, deps());
+    const flowDeps = (options.deps ?? realFlowDeps)();
+    controller.current = createFlowController(start, {
+      ...flowDeps,
+      ...options.beforeStepChange ? { beforeStepChange: options.beforeStepChange } : {}
+    });
   }
   const current = controller.current;
   const state = useSyncExternalStore(
     (listener) => current?.subscribe(listener) ?? (() => void 0),
     () => current?.getState()
   );
-  useEffect21(() => {
+  useEffect20(() => {
     if (!start) controller.current = void 0;
   }, [start]);
   return current && state ? { controller: current, state } : void 0;
@@ -32400,7 +32310,7 @@ var init_help_info = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/help/PageContainer.tsx
-import { useEffect as useEffect22, useState as useState27 } from "react";
+import { useEffect as useEffect21, useState as useState27 } from "react";
 import { Box as Box42, Text as Text44, useInput as useInput9 } from "ink";
 import { Fragment as Fragment16, jsx as jsx53, jsxs as jsxs43 } from "react/jsx-runtime";
 function Section({ title, rows }) {
@@ -32414,7 +32324,7 @@ function Section({ title, rows }) {
 }
 function HelpScreen({ onDone }) {
   const [info, setInfo] = useState27();
-  useEffect22(() => {
+  useEffect21(() => {
     startDebugRun({ flow: "help", step: "01-help", menuOption: "Help", inputs: {} });
     void readHelpInfo().then(setInfo);
   }, []);
@@ -32563,7 +32473,7 @@ var init_config_store = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
-import { useEffect as useEffect23, useState as useState29 } from "react";
+import { useEffect as useEffect22, useState as useState29 } from "react";
 import { Box as Box44, Text as Text46, useInput as useInput11 } from "ink";
 import TextInput4 from "ink-text-input";
 import { Fragment as Fragment17, jsx as jsx55, jsxs as jsxs45 } from "react/jsx-runtime";
@@ -32585,7 +32495,7 @@ function ConfigurationScreen({ onDone }) {
   const [lastSaved, setLastSaved] = useState29(null);
   const [editing, setEditing] = useState29(false);
   const [valueBeforeEdit, setValueBeforeEdit] = useState29("");
-  useEffect23(() => {
+  useEffect22(() => {
     readCredentials().then((cfg) => {
       setConfig(cfg);
       setStage("form");
@@ -32769,13 +32679,13 @@ var init_analytics_store = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/opt-in-analytics/screen.tsx
-import { useEffect as useEffect24, useState as useState30 } from "react";
+import { useEffect as useEffect23, useState as useState30 } from "react";
 import { Box as Box45, Text as Text47, useInput as useInput12 } from "ink";
 import { Fragment as Fragment18, jsx as jsx56, jsxs as jsxs46 } from "react/jsx-runtime";
 function OptInAnalyticsScreen({ onDone }) {
   const [loading, setLoading] = useState30(true);
   const [enabled, setEnabled] = useState30(true);
-  useEffect24(() => {
+  useEffect23(() => {
     readAnalyticsSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -32838,12 +32748,12 @@ var init_screen11 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/upgrade/PageContainer.tsx
-import { useEffect as useEffect25, useState as useState31 } from "react";
+import { useEffect as useEffect24, useState as useState31 } from "react";
 import { Box as Box46, Text as Text48, useInput as useInput13 } from "ink";
 import { jsx as jsx57, jsxs as jsxs47 } from "react/jsx-runtime";
 function UpgradeScreen({ onDone }) {
   const [upgradeCheck, setUpgradeCheck] = useState31();
-  useEffect25(() => {
+  useEffect24(() => {
     startDebugRun({
       flow: "upgrade",
       step: "01-upgrade",
@@ -32918,13 +32828,13 @@ var init_PageContainer4 = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/settings/debug-mode/screen.tsx
-import { useEffect as useEffect26, useState as useState32 } from "react";
+import { useEffect as useEffect25, useState as useState32 } from "react";
 import { Box as Box47, Text as Text49, useInput as useInput14 } from "ink";
 import { jsx as jsx58, jsxs as jsxs48 } from "react/jsx-runtime";
 function DebugModeScreen({ onDone }) {
   const [loading, setLoading] = useState32(true);
   const [enabled, setEnabled] = useState32(true);
-  useEffect26(() => {
+  useEffect25(() => {
     readDebugModeSetting().then((setting) => {
       setEnabled(setting.enabled);
       setLoading(false);
@@ -32987,7 +32897,7 @@ __export(app_exports, {
   runApp: () => runApp
 });
 import { join as join27 } from "node:path";
-import { useEffect as useEffect27, useState as useState33 } from "react";
+import { useEffect as useEffect26, useState as useState33 } from "react";
 import { Fragment as Fragment19, jsx as jsx59 } from "react/jsx-runtime";
 function App({ importOptions, inkClear }) {
   const [screen, setScreen] = useState33("start");
@@ -33017,9 +32927,9 @@ function App({ importOptions, inkClear }) {
   const [generationInput, setGenerationInput] = useState33();
   const generation = useGeneration(generationInput);
   const [flowStart, setFlowStart] = useState33();
-  const flow = useFlow(flowStart);
+  const flow = useFlow(flowStart, { beforeStepChange: inkClear });
   const [importDefaults, setImportDefaults] = useState33();
-  useEffect27(() => {
+  useEffect26(() => {
     if (screen !== "import") {
       setImportDefaults(void 0);
       return;
@@ -33077,12 +32987,12 @@ function App({ importOptions, inkClear }) {
       }
     });
   };
-  useEffect27(() => {
+  useEffect26(() => {
     if (!extractionRun || extraction?.status !== "done" || !extraction.result.ok) return;
     setExtractionRun(void 0);
     setScopeRun({ ...extractionRun, extraction: extraction.result.extraction });
   }, [extraction, extractionRun]);
-  useEffect27(() => {
+  useEffect26(() => {
     if (!scopeRun || scopeFlow?.status !== "confirmed" || generationInput) return;
     const { extraction: produced, input, generatePromptPath } = scopeRun;
     setGenerationInput({
@@ -33100,7 +33010,7 @@ function App({ importOptions, inkClear }) {
       ...generatePromptPath ? { generatePromptPath } : {}
     });
   }, [scopeFlow, scopeRun, generationInput]);
-  useEffect27(() => {
+  useEffect26(() => {
     if (!scopeRun || generation?.status !== "done" || !generation.result.ok) return;
     const { credentialsSkipped, tokenStrategy, extraction: produced, input, generatePromptPath } = scopeRun;
     inkClear();
@@ -33151,8 +33061,7 @@ function App({ importOptions, inkClear }) {
             state: flow.state,
             controller: flow.controller,
             generatePromptPath: flowStart.generatePromptPath,
-            onExit: setImportExitCode,
-            onStepChange: inkClear
+            onExit: setImportExitCode
           }
         );
       }

package/dist/package.json

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

package/dist/src/tui/import/steps/07-scope-gate/keymap.d.ts

@@ -80,7 +80,5 @@ export type GateAction = {
     type: 'toggle-jump-filter';
 } | {
     type: 'toggle-view';
-} | {
-    type: 'undo';
 };
 export declare function resolveKey(mode: GateMode, key: KeyPress, ctx: GateContext): GateAction;

package/dist/src/tui/import/steps/07-scope-gate/sidebar/components/CompactControlBar.d.ts

@@ -1,4 +1,4 @@
 export declare function CompactControlBar({ hasGroupRoots, searchActive }: {
     hasGroupRoots: boolean;
     searchActive: boolean;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;

package/dist/src/tui/import/steps/07-scope-gate/sidebar/components/GroupedSidebar.d.ts

@@ -45,8 +45,6 @@ export interface VisibleRow {
     cycleChild?: boolean;
     itemIdx: number;
     rootName?: string;
-    /** The parent whose slot the nested row sits in. */
-    parentName?: string;
 }
 export declare function buildVisibleRows(props: {
     items: GroupedSidebarItem[];

package/dist/src/tui/import/steps/07-scope-gate/state.d.ts

@@ -1,5 +1,5 @@
 import { type ScopeGraph } from './graph/index.js';
-import type { Decision, ParentChildEdge, ScopeComponent, ScopeDecisions } from './types.js';
+import type { Decision, ScopeComponent, ScopeDecisions } from './types.js';
 export type DecisionState = Map<string, Decision>;
 export type DecisionAction = {
     type: 'accept';
@@ -15,6 +15,5 @@ export type DecisionAction = {
 export declare function reduceDecisions(state: DecisionState, action: DecisionAction, components: ScopeComponent[], graph: ScopeGraph): DecisionState;
 /** Whether rejecting `name` touches 2 or more other components, so the screen has to ask first. */
 export declare function rejectNeedsConfirmation(graph: ScopeGraph, name: string, state: DecisionState): boolean;
-export declare function withoutSlotChildren(components: ScopeComponent[], removedEdges: ParentChildEdge[]): ScopeComponent[];
 /** Everything not accepted counts as rejected, as legacy's `partition` did. */
-export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState, removedEdges: ParentChildEdge[]): ScopeDecisions;
+export declare function partitionDecisions(components: ScopeComponent[], state: DecisionState): ScopeDecisions;

package/dist/src/tui/import/steps/07-scope-gate/types.d.ts

@@ -10,17 +10,10 @@ export type ScopeComponent = Omit<ScopeComponentRow, 'aiDecision' | 'aiReason' |
     slots?: ScopeComponentRow['slots'];
 };
 export type Decision = 'accepted' | 'rejected' | 'undecided';
-/** One slot edge: `parent` allows `child` in a slot. */
-export interface ParentChildEdge {
-    parent: string;
-    child: string;
-}
 /** What the user confirmed. Becomes `ImportHandoff.scope`; the legacy wizard saves it and starts generation. */
 export interface ScopeDecisions {
     accepted: string[];
     rejected: string[];
-    /** Slot edges removed at the gate. The child keeps its own decision. Missing means none were removed. */
-    excludedSlotEdges?: ParentChildEdge[];
 }
 export type ScopeGateLoad = {
     ok: true;

package/dist/src/tui/import/steps/07-scope-gate/use-scope-gate.d.ts

@@ -10,7 +10,7 @@ export interface PendingRejectCascade {
     ancestors: string[];
     descendants: string[];
 }
-export declare function useScopeGate({ components: loadedComponents, onConfirm, onQuit }: UseScopeGateOptions): {
+export declare function useScopeGate({ components, onConfirm, onQuit }: UseScopeGateOptions): {
     totalWidth: number;
     columnPlan: {
         layout: "single" | "two-column";

package/dist/src/tui/import/steps/08-generation/types.d.ts

@@ -1,9 +1,11 @@
 import type { GenerationHandoff } from '@contentful/experience-design-system-types/handoff';
-import type { ScopeDecisions } from '../07-scope-gate/types.js';
 export interface GenerationInput {
     /** The extraction session the scope was decided on. */
     sessionId: string;
-    decisions: ScopeDecisions;
+    decisions: {
+        accepted: string[];
+        rejected: string[];
+    };
     /**
      * The cache check that ran while the scope gate was open, which restores cached definitions into the pipeline
      * database. The stage waits for it before saving the decisions, since both write to that database.

package/dist/src/tui/import/steps/10-flow/flow/controller.d.ts

@@ -38,6 +38,12 @@ export interface FlowDeps {
     /** Writes one line of the wizard's step log. */
     log: (entry: Record<string, unknown>) => void;
     stderr: (text: string) => void;
+    /**
+     * Called when the step is about to change, before anything is told about the new one. The host clears the terminal
+     * here so the next screen is drawn on a clean one. It has to be before: Ink paints as soon as it is told, and a clear
+     * after the paint wipes a static screen like the done step, which nothing draws again.
+     */
+    beforeStepChange?: () => void;
 }
 export declare function startWizardLog(): void;
 export declare function realFlowDeps(): FlowDeps;

package/dist/src/tui/import/steps/10-flow/flow/screen.d.ts

@@ -8,12 +8,10 @@ interface FlowScreenProps {
     generatePromptPath?: string;
     /** Leaves the import with the exit code the wizard would have exited with. */
     onExit: (exitCode: number) => void;
-    /** Called when the step changes so the host can clear Ink's render buffer without scrollback pollution. */
-    onStepChange?: () => void;
 }
 /** How many steps the import has, as the wizard counted them. */
 export declare function totalStepsFor(state: Pick<FlowState, 'tokensPath' | 'rawTokensPath' | 'mapTokensEligible'>): number;
 /** Whether the preview gate offers "[e] Edit definitions": only when the document has components to edit. */
 export declare function canEditFromPreview(cdf: FlowState['cdf']): boolean;
-export declare function FlowScreen({ state, controller, livePreview, generatePromptPath, onExit, onStepChange, }: FlowScreenProps): React.ReactElement;
+export declare function FlowScreen({ state, controller, livePreview, generatePromptPath, onExit, }: FlowScreenProps): React.ReactElement;
 export {};

package/dist/src/tui/import/steps/10-flow/flow/use-flow.d.ts

@@ -3,7 +3,10 @@ import { type FlowController, type FlowDeps, type FlowStart } from './controller
  * The flow for a start, once. `start` is undefined until the generation stage has finished, so the hook can be called
  * unconditionally; the step log is started with the controller, as the wizard started it with its first render.
  */
-export declare function useFlow(start: FlowStart | undefined, deps?: () => FlowDeps): {
+export declare function useFlow(start: FlowStart | undefined, options?: {
+    beforeStepChange?: () => void;
+    deps?: () => FlowDeps;
+}): {
     controller: FlowController;
     state: ReturnType<FlowController['getState']>;
 } | undefined;

package/legacy/dist/src/setup/steps/preferences/PreferencesMenu.d.ts

@@ -6,19 +6,19 @@ type PreferenceScreenProps = {
 export declare const PREFERENCE_OPTIONS: readonly [{
     readonly key: "customPrompts";
     readonly label: "Custom prompts";
-    readonly Screen: ({ onDone }: PreferenceScreenProps) => import("react/jsx-runtime").JSX.Element;
+    readonly Screen: ({ onDone }: PreferenceScreenProps) => React.JSX.Element;
 }, {
     readonly key: "debug";
     readonly label: "Debug logging";
-    readonly Screen: ({ onDone }: PreferenceScreenProps) => import("react/jsx-runtime").JSX.Element;
+    readonly Screen: ({ onDone }: PreferenceScreenProps) => React.JSX.Element;
 }, {
     readonly key: "analytics";
     readonly label: "Usage analytics";
-    readonly Screen: ({ onDone }: PreferenceScreenProps) => import("react/jsx-runtime").JSX.Element;
+    readonly Screen: ({ onDone }: PreferenceScreenProps) => React.JSX.Element;
 }, {
     readonly key: "noColor";
     readonly label: "Terminal colors";
-    readonly Screen: ({ onDone }: PreferenceScreenProps) => import("react/jsx-runtime").JSX.Element;
+    readonly Screen: ({ onDone }: PreferenceScreenProps) => React.JSX.Element;
 }];
 export declare function PreferencesMenu({ onDone }: {
     onDone: StepDone;

package/legacy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/experience-design-system-cli",
-  "version": "2.37.1-dev-build-e2dab518.0",
+  "version": "2.37.1-dev-build-97b615d3.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.37.1-dev-build-e2dab518.0",
+  "version": "2.37.1-dev-build-97b615d3.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -29,6 +29,8 @@
     "skills/"
   ],
   "dependencies": {
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-97b615d3.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-97b615d3.0",
     "@inkjs/ui": "^2.0.0",
     "@segment/analytics-node": "^3.0.0",
     "@vue/compiler-sfc": "^3.5.31",
@@ -44,9 +46,7 @@
     "svelte": "^5.56.4",
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
-    "zod": "^4.6.5",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-e2dab518.0",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-e2dab518.0"
+    "zod": "^4.6.5"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",