@contentful/experience-design-system-cli 2.35.1-dev-build-657a08f3.0 → 2.35.1-dev-build-beaac232.0

package/dist/app.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export type Screen = 'start' | 'import' | 'help' | 'settings' | 'settings-configuration' | 'settings-opt-in-analytics' | 'settings-debug-mode' | 'settings-import-defaults' | 'upgrade';
+export type Screen = 'start' | 'import' | 'help' | 'settings' | 'settings-configuration' | 'settings-opt-in-analytics' | 'settings-debug-mode' | 'upgrade';
 interface AppInstance {
     unmount: () => void;
     waitUntilExit: () => Promise<unknown>;

package/dist/app.js

@@ -1,5 +1,5 @@
 // packages/experience-design-system-cli/app.tsx
-import { useEffect as useEffect9, useState as useState11 } from "react";
+import { useEffect as useEffect8, useState as useState10 } from "react";
 
 // packages/experience-design-system-cli/src/tui/home/home.tsx
 import { useEffect as useEffect2, useState as useState2 } from "react";
@@ -718,7 +718,6 @@ function SettingsScreen({
   const [focusIdx, setFocusIdx] = useState5(0);
   const items = [
     { label: "Configuration", screen: "settings-configuration" },
-    { label: "Import Defaults", screen: "settings-import-defaults" },
     { label: "Opt-in Analytics", screen: "settings-opt-in-analytics" },
     { label: "Debug Mode", screen: "settings-debug-mode" }
   ];
@@ -757,6 +756,7 @@ function SettingsScreen({
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
 import { useEffect as useEffect4, useState as useState6 } from "react";
 import { Box as Box7, Text as Text7, useInput as useInput7 } from "ink";
+import TextInput3 from "ink-text-input";
 
 // packages/experience-design-system-cli/src/tui/settings/utils/v1-store.ts
 var readV1Store = readSettings;
@@ -769,7 +769,9 @@ async function readCredentials() {
     spaceId: store.spaceId || "",
     environmentId: store.environmentId || "",
     cmaToken: store.cmaToken || "",
-    host: store.host || ""
+    host: store.host || "",
+    defaultComponentDir: store.defaultComponentDir || "",
+    defaultTokenFile: store.defaultTokenFile || ""
   };
 }
 async function writeCredentials(config) {
@@ -786,26 +788,39 @@ async function writeCredentials(config) {
 
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
 import { Fragment, jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
-var FIELD_ORDER = ["spaceId", "environmentId", "cmaToken", "host"];
+var FIELD_ORDER = [
+  "spaceId",
+  "environmentId",
+  "cmaToken",
+  "host",
+  "defaultComponentDir",
+  "defaultTokenFile"
+];
 function debugFields(config) {
   return {
     space_id: config?.spaceId ?? "",
     environment_id: config?.environmentId ?? "",
     cma_token: config?.cmaToken ?? "",
-    host: config?.host ?? ""
+    host: config?.host ?? "",
+    default_component_dir: config?.defaultComponentDir ?? "",
+    default_token_file: config?.defaultTokenFile ?? ""
   };
 }
 var FIELD_LABELS = {
   spaceId: "Space ID",
   environmentId: "Environment ID",
   cmaToken: "CMA Token",
-  host: "API Host (optional)"
+  host: "API Host (optional)",
+  defaultComponentDir: "Default component directory (optional)",
+  defaultTokenFile: "Default token file (optional)"
 };
 function ConfigurationScreen({ onDone }) {
   const [stage, setStage] = useState6("loading");
   const [config, setConfig] = useState6(null);
   const [activeField, setActiveField] = useState6("spaceId");
   const [message, setMessage] = useState6(null);
+  const [editing, setEditing] = useState6(false);
+  const [valueBeforeEdit, setValueBeforeEdit] = useState6("");
   useEffect4(() => {
     readCredentials().then((cfg) => {
       setConfig(cfg);
@@ -826,13 +841,13 @@ function ConfigurationScreen({ onDone }) {
     if (!config) return;
     setConfig({ ...config, [field]: value });
   }
-  function handleSave() {
+  function saveAndLeave() {
     if (!config) return;
     setStage("saving");
     setMessage(null);
     writeCredentials(config).then(() => {
-      setStage("saved");
-      setMessage("Configuration saved");
+      void finishDebugRun({ outputs: debugFields(config), status: "success", exitMethod: "saved" });
+      onDone();
     }).catch((err) => {
       setMessage(err instanceof Error ? err.message : "Failed to save");
       setStage("form");
@@ -840,16 +855,15 @@ function ConfigurationScreen({ onDone }) {
   }
   useInput7((input, key) => {
     if (stage === "loading" || stage === "saving") return;
-    if (stage === "saved") {
-      if (key.return || key.escape || input === "q") {
-        void finishDebugRun({ outputs: debugFields(config), status: "success", exitMethod: "saved" });
-        onDone();
+    if (editing) {
+      if (key.escape) {
+        setFieldValue(activeField, valueBeforeEdit);
+        setEditing(false);
       }
       return;
     }
     if (key.escape || input === "q") {
-      void finishDebugRun({ outputs: {}, status: "success", exitMethod: "discarded" });
-      onDone();
+      saveAndLeave();
       return;
     }
     if (key.tab || key.downArrow) {
@@ -863,21 +877,8 @@ function ConfigurationScreen({ onDone }) {
       return;
     }
     if (key.return) {
-      const idx = FIELD_ORDER.indexOf(activeField);
-      if (idx < FIELD_ORDER.length - 1) {
-        setActiveField(FIELD_ORDER[idx + 1]);
-      } else {
-        handleSave();
-      }
-      return;
-    }
-    if (key.backspace || key.delete) {
-      const current = fieldValue(activeField);
-      setFieldValue(activeField, current.slice(0, -1));
-      return;
-    }
-    if (input && !key.ctrl && !key.meta) {
-      setFieldValue(activeField, fieldValue(activeField) + input);
+      setValueBeforeEdit(fieldValue(activeField));
+      setEditing(true);
     }
   });
   if (stage === "loading") {
@@ -887,18 +888,6 @@ function ConfigurationScreen({ onDone }) {
       /* @__PURE__ */ jsx7(Text7, { color: PALETTE.accent, children: "Loading..." })
     ] });
   }
-  if (stage === "saved") {
-    return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx7(Text7, { bold: true, children: "Configuration" }),
-      /* @__PURE__ */ jsx7(Text7, { children: " " }),
-      /* @__PURE__ */ jsxs7(Text7, { color: PALETTE.success, children: [
-        "\u2713 ",
-        message
-      ] }),
-      /* @__PURE__ */ jsx7(Text7, { children: " " }),
-      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "[Enter] Back to Settings" })
-    ] });
-  }
   return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsx7(Text7, { bold: true, children: "Configuration" }),
     /* @__PURE__ */ jsx7(Text7, { children: " " }),
@@ -914,7 +903,15 @@ function ConfigurationScreen({ onDone }) {
           FIELD_LABELS[field],
           ":"
         ] }),
-        /* @__PURE__ */ jsx7(Text7, { children: display || /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "(empty)" }) })
+        isActive && editing ? /* @__PURE__ */ jsx7(
+          TextInput3,
+          {
+            value,
+            onChange: (next) => setFieldValue(field, next),
+            onSubmit: () => setEditing(false),
+            mask: field === "cmaToken" ? "\u2022" : void 0
+          }
+        ) : /* @__PURE__ */ jsx7(Text7, { children: display || /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "(empty)" }) })
       ] }, field);
     }) }),
     message && /* @__PURE__ */ jsxs7(Fragment, { children: [
@@ -925,7 +922,7 @@ function ConfigurationScreen({ onDone }) {
       ] })
     ] }),
     /* @__PURE__ */ jsx7(Text7, { children: " " }),
-    /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "[\u2191/\u2193] Switch field \xB7 [Enter] Save/Next \xB7 [Esc/q] Back" })
+    /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: editing ? "[type] Edit \xB7 [\u2190/\u2192] Move cursor \xB7 [Enter] Done \xB7 [Esc] Cancel edit" : "[\u2191/\u2193] Switch field \xB7 [Enter] Edit \xB7 [Esc/q] Save & back" })
   ] });
 }
 
@@ -1116,162 +1113,22 @@ function DebugModeScreen({ onDone }) {
   ] });
 }
 
-// packages/experience-design-system-cli/src/tui/settings/import-defaults/screen.tsx
-import { useEffect as useEffect8, useState as useState10 } from "react";
-import { Box as Box11, Text as Text11, useInput as useInput11 } from "ink";
-
-// packages/experience-design-system-cli/src/tui/settings/import-defaults/defaults-store.ts
-async function readImportDefaults() {
-  const { defaultComponentDir, defaultTokenFile } = await readSettings();
-  return {
-    componentDir: typeof defaultComponentDir === "string" ? defaultComponentDir : "",
-    tokenFile: typeof defaultTokenFile === "string" ? defaultTokenFile : ""
-  };
-}
-async function writeImportDefaults(defaults) {
-  const current = await readSettings();
-  const { defaultComponentDir: _dir, defaultTokenFile: _file, ...rest } = current;
-  const componentDir = defaults.componentDir.trim();
-  const tokenFile = defaults.tokenFile.trim();
-  await writeSettings({
-    ...rest,
-    ...componentDir ? { defaultComponentDir: componentDir } : {},
-    ...tokenFile ? { defaultTokenFile: tokenFile } : {}
-  });
-}
-
-// packages/experience-design-system-cli/src/tui/settings/import-defaults/screen.tsx
-import { Fragment as Fragment3, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
-var FIELD_ORDER2 = ["componentDir", "tokenFile"];
-var FIELD_LABELS2 = {
-  componentDir: "Component directory",
-  tokenFile: "Token file"
-};
-function ImportDefaultsScreen({ onDone }) {
-  const [stage, setStage] = useState10("loading");
-  const [defaults, setDefaults] = useState10({ componentDir: "", tokenFile: "" });
-  const [activeField, setActiveField] = useState10("componentDir");
-  const [message, setMessage] = useState10(null);
-  useEffect8(() => {
-    readImportDefaults().then((saved) => {
-      setDefaults(saved);
-      setStage("form");
-      startDebugRun({
-        flow: "settings/import-defaults",
-        step: "01-import-defaults",
-        menuOption: "Import Defaults",
-        inputs: { ...saved }
-      });
-    });
-  }, []);
-  function handleSave() {
-    setStage("saving");
-    setMessage(null);
-    writeImportDefaults(defaults).then(() => {
-      setStage("saved");
-      setMessage("Import defaults saved");
-    }).catch((err) => {
-      setMessage(err instanceof Error ? err.message : "Failed to save");
-      setStage("form");
-    });
-  }
-  useInput11((input, key) => {
-    if (stage === "loading" || stage === "saving") return;
-    if (stage === "saved") {
-      if (key.return || key.escape || input === "q") {
-        void finishDebugRun({ outputs: { ...defaults }, status: "success", exitMethod: "saved" });
-        onDone();
-      }
-      return;
-    }
-    if (key.escape) {
-      void finishDebugRun({ outputs: {}, status: "success", exitMethod: "discarded" });
-      onDone();
-      return;
-    }
-    const idx = FIELD_ORDER2.indexOf(activeField);
-    if (key.tab || key.downArrow) {
-      setActiveField(FIELD_ORDER2[(idx + 1) % FIELD_ORDER2.length]);
-      return;
-    }
-    if (key.upArrow) {
-      setActiveField(FIELD_ORDER2[(idx - 1 + FIELD_ORDER2.length) % FIELD_ORDER2.length]);
-      return;
-    }
-    if (key.return) {
-      if (idx < FIELD_ORDER2.length - 1) setActiveField(FIELD_ORDER2[idx + 1]);
-      else handleSave();
-      return;
-    }
-    if (key.backspace || key.delete) {
-      setDefaults((d) => ({ ...d, [activeField]: d[activeField].slice(0, -1) }));
-      return;
-    }
-    if (input && !key.ctrl && !key.meta) {
-      setDefaults((d) => ({ ...d, [activeField]: d[activeField] + input }));
-    }
-  });
-  if (stage === "loading") {
-    return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Import Defaults" }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsx11(Text11, { color: PALETTE.accent, children: "Loading..." })
-    ] });
-  }
-  if (stage === "saved") {
-    return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Import Defaults" }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsxs11(Text11, { color: PALETTE.success, children: [
-        "\u2713 ",
-        message
-      ] }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "[Enter/Esc] Back" })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Import Defaults" }),
-    /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "Pre-filled when you start an import. Leave a field empty for no default." }),
-    /* @__PURE__ */ jsx11(Text11, { children: " " }),
-    /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: FIELD_ORDER2.map((field) => {
-      const isActive = activeField === field;
-      const value = defaults[field];
-      return /* @__PURE__ */ jsxs11(Box11, { gap: 1, children: [
-        /* @__PURE__ */ jsx11(Text11, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
-        /* @__PURE__ */ jsxs11(Text11, { bold: isActive, children: [
-          FIELD_LABELS2[field],
-          ":"
-        ] }),
-        /* @__PURE__ */ jsx11(Text11, { children: value || /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "(empty)" }) })
-      ] }, field);
-    }) }),
-    message && /* @__PURE__ */ jsxs11(Fragment3, { children: [
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsxs11(Text11, { color: PALETTE.error, children: [
-        "\u2717 ",
-        message
-      ] })
-    ] }),
-    /* @__PURE__ */ jsx11(Text11, { children: " " }),
-    /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "[\u2191/\u2193] Switch field \xB7 [Enter] Save/Next \xB7 [Esc] Back" })
-  ] });
-}
-
 // packages/experience-design-system-cli/app.tsx
-import { Fragment as Fragment4, jsx as jsx12 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx11 } from "react/jsx-runtime";
 function App({ onLaunchImport, importExitCode }) {
   const returnedFromImport = importExitCode !== void 0;
-  const [screen, setScreen] = useState11(returnedFromImport ? "import" : "start");
-  const [showImportResult, setShowImportResult] = useState11(returnedFromImport);
-  const [projectPath, setProjectPath] = useState11();
-  const [importDefaults, setImportDefaults] = useState11();
-  useEffect9(() => {
+  const [screen, setScreen] = useState10(returnedFromImport ? "import" : "start");
+  const [showImportResult, setShowImportResult] = useState10(returnedFromImport);
+  const [projectPath, setProjectPath] = useState10();
+  const [importDefaults, setImportDefaults] = useState10();
+  useEffect8(() => {
     if (screen !== "import") {
       setImportDefaults(void 0);
       return;
     }
-    void readImportDefaults().then(setImportDefaults);
+    void readCredentials().then(
+      (saved) => setImportDefaults({ componentDir: saved.defaultComponentDir ?? "", tokenFile: saved.defaultTokenFile ?? "" })
+    );
   }, [screen]);
   const goToStart = () => setScreen("start");
   const goToSettings = () => setScreen("settings");
@@ -1286,12 +1143,12 @@ function App({ onLaunchImport, importExitCode }) {
   };
   switch (screen) {
     case "import":
-      if (showImportResult) return /* @__PURE__ */ jsx12(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
-      if (importDefaults === void 0) return /* @__PURE__ */ jsx12(Fragment4, {});
+      if (showImportResult) return /* @__PURE__ */ jsx11(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
+      if (importDefaults === void 0) return /* @__PURE__ */ jsx11(Fragment3, {});
       if (projectPath === void 0) {
-        return /* @__PURE__ */ jsx12(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
+        return /* @__PURE__ */ jsx11(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
       }
-      return /* @__PURE__ */ jsx12(
+      return /* @__PURE__ */ jsx11(
         TokenInputScreen,
         {
           initialPath: importDefaults.tokenFile,
@@ -1301,27 +1158,25 @@ function App({ onLaunchImport, importExitCode }) {
         }
       );
     case "help":
-      return /* @__PURE__ */ jsx12(HelpScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx11(HelpScreen, { onDone: goToStart });
     case "upgrade":
-      return /* @__PURE__ */ jsx12(UpgradeScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx11(UpgradeScreen, { onDone: goToStart });
     case "settings":
-      return /* @__PURE__ */ jsx12(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
+      return /* @__PURE__ */ jsx11(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
     case "settings-configuration":
-      return /* @__PURE__ */ jsx12(ConfigurationScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx11(ConfigurationScreen, { onDone: goToSettings });
     case "settings-opt-in-analytics":
-      return /* @__PURE__ */ jsx12(OptInAnalyticsScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx11(OptInAnalyticsScreen, { onDone: goToSettings });
     case "settings-debug-mode":
-      return /* @__PURE__ */ jsx12(DebugModeScreen, { onDone: goToSettings });
-    case "settings-import-defaults":
-      return /* @__PURE__ */ jsx12(ImportDefaultsScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx11(DebugModeScreen, { onDone: goToSettings });
     case "start":
-      return /* @__PURE__ */ jsx12(HomeScreen, { onNavigate: setScreen });
+      return /* @__PURE__ */ jsx11(HomeScreen, { onNavigate: setScreen });
   }
 }
 async function renderUntilImportRequestedOrExit(renderApp, importExitCode) {
   let requestedImport;
   const instance = renderApp(
-    /* @__PURE__ */ jsx12(
+    /* @__PURE__ */ jsx11(
       App,
       {
         importExitCode,

package/dist/index.js

@@ -849,7 +849,6 @@ function SettingsScreen({
   const [focusIdx, setFocusIdx] = useState5(0);
   const items = [
     { label: "Configuration", screen: "settings-configuration" },
-    { label: "Import Defaults", screen: "settings-import-defaults" },
     { label: "Opt-in Analytics", screen: "settings-opt-in-analytics" },
     { label: "Debug Mode", screen: "settings-debug-mode" }
   ];
@@ -908,7 +907,9 @@ async function readCredentials() {
     spaceId: store.spaceId || "",
     environmentId: store.environmentId || "",
     cmaToken: store.cmaToken || "",
-    host: store.host || ""
+    host: store.host || "",
+    defaultComponentDir: store.defaultComponentDir || "",
+    defaultTokenFile: store.defaultTokenFile || ""
   };
 }
 async function writeCredentials(config) {
@@ -932,13 +933,16 @@ var init_config_store = __esm({
 // packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx
 import { useEffect as useEffect4, useState as useState6 } from "react";
 import { Box as Box7, Text as Text7, useInput as useInput7 } from "ink";
+import TextInput3 from "ink-text-input";
 import { Fragment, jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 function debugFields(config) {
   return {
     space_id: config?.spaceId ?? "",
     environment_id: config?.environmentId ?? "",
     cma_token: config?.cmaToken ?? "",
-    host: config?.host ?? ""
+    host: config?.host ?? "",
+    default_component_dir: config?.defaultComponentDir ?? "",
+    default_token_file: config?.defaultTokenFile ?? ""
   };
 }
 function ConfigurationScreen({ onDone }) {
@@ -946,6 +950,8 @@ function ConfigurationScreen({ onDone }) {
   const [config, setConfig] = useState6(null);
   const [activeField, setActiveField] = useState6("spaceId");
   const [message, setMessage] = useState6(null);
+  const [editing, setEditing] = useState6(false);
+  const [valueBeforeEdit, setValueBeforeEdit] = useState6("");
   useEffect4(() => {
     readCredentials().then((cfg) => {
       setConfig(cfg);
@@ -966,13 +972,13 @@ function ConfigurationScreen({ onDone }) {
     if (!config) return;
     setConfig({ ...config, [field]: value });
   }
-  function handleSave() {
+  function saveAndLeave() {
     if (!config) return;
     setStage("saving");
     setMessage(null);
     writeCredentials(config).then(() => {
-      setStage("saved");
-      setMessage("Configuration saved");
+      void finishDebugRun({ outputs: debugFields(config), status: "success", exitMethod: "saved" });
+      onDone();
     }).catch((err) => {
       setMessage(err instanceof Error ? err.message : "Failed to save");
       setStage("form");
@@ -980,16 +986,15 @@ function ConfigurationScreen({ onDone }) {
   }
   useInput7((input, key) => {
     if (stage === "loading" || stage === "saving") return;
-    if (stage === "saved") {
-      if (key.return || key.escape || input === "q") {
-        void finishDebugRun({ outputs: debugFields(config), status: "success", exitMethod: "saved" });
-        onDone();
+    if (editing) {
+      if (key.escape) {
+        setFieldValue(activeField, valueBeforeEdit);
+        setEditing(false);
       }
       return;
     }
     if (key.escape || input === "q") {
-      void finishDebugRun({ outputs: {}, status: "success", exitMethod: "discarded" });
-      onDone();
+      saveAndLeave();
       return;
     }
     if (key.tab || key.downArrow) {
@@ -1003,21 +1008,8 @@ function ConfigurationScreen({ onDone }) {
       return;
     }
     if (key.return) {
-      const idx = FIELD_ORDER.indexOf(activeField);
-      if (idx < FIELD_ORDER.length - 1) {
-        setActiveField(FIELD_ORDER[idx + 1]);
-      } else {
-        handleSave();
-      }
-      return;
-    }
-    if (key.backspace || key.delete) {
-      const current = fieldValue(activeField);
-      setFieldValue(activeField, current.slice(0, -1));
-      return;
-    }
-    if (input && !key.ctrl && !key.meta) {
-      setFieldValue(activeField, fieldValue(activeField) + input);
+      setValueBeforeEdit(fieldValue(activeField));
+      setEditing(true);
     }
   });
   if (stage === "loading") {
@@ -1027,18 +1019,6 @@ function ConfigurationScreen({ onDone }) {
       /* @__PURE__ */ jsx7(Text7, { color: PALETTE.accent, children: "Loading..." })
     ] });
   }
-  if (stage === "saved") {
-    return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx7(Text7, { bold: true, children: "Configuration" }),
-      /* @__PURE__ */ jsx7(Text7, { children: " " }),
-      /* @__PURE__ */ jsxs7(Text7, { color: PALETTE.success, children: [
-        "\u2713 ",
-        message
-      ] }),
-      /* @__PURE__ */ jsx7(Text7, { children: " " }),
-      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "[Enter] Back to Settings" })
-    ] });
-  }
   return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
     /* @__PURE__ */ jsx7(Text7, { bold: true, children: "Configuration" }),
     /* @__PURE__ */ jsx7(Text7, { children: " " }),
@@ -1054,7 +1034,15 @@ function ConfigurationScreen({ onDone }) {
           FIELD_LABELS[field],
           ":"
         ] }),
-        /* @__PURE__ */ jsx7(Text7, { children: display || /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "(empty)" }) })
+        isActive && editing ? /* @__PURE__ */ jsx7(
+          TextInput3,
+          {
+            value,
+            onChange: (next) => setFieldValue(field, next),
+            onSubmit: () => setEditing(false),
+            mask: field === "cmaToken" ? "\u2022" : void 0
+          }
+        ) : /* @__PURE__ */ jsx7(Text7, { children: display || /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "(empty)" }) })
       ] }, field);
     }) }),
     message && /* @__PURE__ */ jsxs7(Fragment, { children: [
@@ -1065,7 +1053,7 @@ function ConfigurationScreen({ onDone }) {
       ] })
     ] }),
     /* @__PURE__ */ jsx7(Text7, { children: " " }),
-    /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "[\u2191/\u2193] Switch field \xB7 [Enter] Save/Next \xB7 [Esc/q] Back" })
+    /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: editing ? "[type] Edit \xB7 [\u2190/\u2192] Move cursor \xB7 [Enter] Done \xB7 [Esc] Cancel edit" : "[\u2191/\u2193] Switch field \xB7 [Enter] Edit \xB7 [Esc/q] Save & back" })
   ] });
 }
 var FIELD_ORDER, FIELD_LABELS;
@@ -1075,12 +1063,21 @@ var init_ContentfulConfigScreen = __esm({
     init_home_theme();
     init_config_store();
     init_debug_store();
-    FIELD_ORDER = ["spaceId", "environmentId", "cmaToken", "host"];
+    FIELD_ORDER = [
+      "spaceId",
+      "environmentId",
+      "cmaToken",
+      "host",
+      "defaultComponentDir",
+      "defaultTokenFile"
+    ];
     FIELD_LABELS = {
       spaceId: "Space ID",
       environmentId: "Environment ID",
       cmaToken: "CMA Token",
-      host: "API Host (optional)"
+      host: "API Host (optional)",
+      defaultComponentDir: "Default component directory (optional)",
+      defaultTokenFile: "Default token file (optional)"
     };
   }
 });
@@ -1301,180 +1298,27 @@ var init_screen4 = __esm({
   }
 });
 
-// packages/experience-design-system-cli/src/tui/settings/import-defaults/defaults-store.ts
-async function readImportDefaults() {
-  const { defaultComponentDir, defaultTokenFile } = await readSettings();
-  return {
-    componentDir: typeof defaultComponentDir === "string" ? defaultComponentDir : "",
-    tokenFile: typeof defaultTokenFile === "string" ? defaultTokenFile : ""
-  };
-}
-async function writeImportDefaults(defaults) {
-  const current = await readSettings();
-  const { defaultComponentDir: _dir, defaultTokenFile: _file, ...rest } = current;
-  const componentDir = defaults.componentDir.trim();
-  const tokenFile = defaults.tokenFile.trim();
-  await writeSettings({
-    ...rest,
-    ...componentDir ? { defaultComponentDir: componentDir } : {},
-    ...tokenFile ? { defaultTokenFile: tokenFile } : {}
-  });
-}
-var init_defaults_store = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/import-defaults/defaults-store.ts"() {
-    "use strict";
-    init_config();
-  }
-});
-
-// packages/experience-design-system-cli/src/tui/settings/import-defaults/screen.tsx
-import { useEffect as useEffect8, useState as useState10 } from "react";
-import { Box as Box11, Text as Text11, useInput as useInput11 } from "ink";
-import { Fragment as Fragment3, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
-function ImportDefaultsScreen({ onDone }) {
-  const [stage, setStage] = useState10("loading");
-  const [defaults, setDefaults] = useState10({ componentDir: "", tokenFile: "" });
-  const [activeField, setActiveField] = useState10("componentDir");
-  const [message, setMessage] = useState10(null);
-  useEffect8(() => {
-    readImportDefaults().then((saved) => {
-      setDefaults(saved);
-      setStage("form");
-      startDebugRun({
-        flow: "settings/import-defaults",
-        step: "01-import-defaults",
-        menuOption: "Import Defaults",
-        inputs: { ...saved }
-      });
-    });
-  }, []);
-  function handleSave() {
-    setStage("saving");
-    setMessage(null);
-    writeImportDefaults(defaults).then(() => {
-      setStage("saved");
-      setMessage("Import defaults saved");
-    }).catch((err) => {
-      setMessage(err instanceof Error ? err.message : "Failed to save");
-      setStage("form");
-    });
-  }
-  useInput11((input, key) => {
-    if (stage === "loading" || stage === "saving") return;
-    if (stage === "saved") {
-      if (key.return || key.escape || input === "q") {
-        void finishDebugRun({ outputs: { ...defaults }, status: "success", exitMethod: "saved" });
-        onDone();
-      }
-      return;
-    }
-    if (key.escape) {
-      void finishDebugRun({ outputs: {}, status: "success", exitMethod: "discarded" });
-      onDone();
-      return;
-    }
-    const idx = FIELD_ORDER2.indexOf(activeField);
-    if (key.tab || key.downArrow) {
-      setActiveField(FIELD_ORDER2[(idx + 1) % FIELD_ORDER2.length]);
-      return;
-    }
-    if (key.upArrow) {
-      setActiveField(FIELD_ORDER2[(idx - 1 + FIELD_ORDER2.length) % FIELD_ORDER2.length]);
-      return;
-    }
-    if (key.return) {
-      if (idx < FIELD_ORDER2.length - 1) setActiveField(FIELD_ORDER2[idx + 1]);
-      else handleSave();
-      return;
-    }
-    if (key.backspace || key.delete) {
-      setDefaults((d) => ({ ...d, [activeField]: d[activeField].slice(0, -1) }));
-      return;
-    }
-    if (input && !key.ctrl && !key.meta) {
-      setDefaults((d) => ({ ...d, [activeField]: d[activeField] + input }));
-    }
-  });
-  if (stage === "loading") {
-    return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Import Defaults" }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsx11(Text11, { color: PALETTE.accent, children: "Loading..." })
-    ] });
-  }
-  if (stage === "saved") {
-    return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-      /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Import Defaults" }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsxs11(Text11, { color: PALETTE.success, children: [
-        "\u2713 ",
-        message
-      ] }),
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "[Enter/Esc] Back" })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", paddingX: 2, paddingY: 1, children: [
-    /* @__PURE__ */ jsx11(Text11, { bold: true, children: "Import Defaults" }),
-    /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "Pre-filled when you start an import. Leave a field empty for no default." }),
-    /* @__PURE__ */ jsx11(Text11, { children: " " }),
-    /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", children: FIELD_ORDER2.map((field) => {
-      const isActive = activeField === field;
-      const value = defaults[field];
-      return /* @__PURE__ */ jsxs11(Box11, { gap: 1, children: [
-        /* @__PURE__ */ jsx11(Text11, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
-        /* @__PURE__ */ jsxs11(Text11, { bold: isActive, children: [
-          FIELD_LABELS2[field],
-          ":"
-        ] }),
-        /* @__PURE__ */ jsx11(Text11, { children: value || /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "(empty)" }) })
-      ] }, field);
-    }) }),
-    message && /* @__PURE__ */ jsxs11(Fragment3, { children: [
-      /* @__PURE__ */ jsx11(Text11, { children: " " }),
-      /* @__PURE__ */ jsxs11(Text11, { color: PALETTE.error, children: [
-        "\u2717 ",
-        message
-      ] })
-    ] }),
-    /* @__PURE__ */ jsx11(Text11, { children: " " }),
-    /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "[\u2191/\u2193] Switch field \xB7 [Enter] Save/Next \xB7 [Esc] Back" })
-  ] });
-}
-var FIELD_ORDER2, FIELD_LABELS2;
-var init_screen5 = __esm({
-  "packages/experience-design-system-cli/src/tui/settings/import-defaults/screen.tsx"() {
-    "use strict";
-    init_home_theme();
-    init_debug_store();
-    init_defaults_store();
-    FIELD_ORDER2 = ["componentDir", "tokenFile"];
-    FIELD_LABELS2 = {
-      componentDir: "Component directory",
-      tokenFile: "Token file"
-    };
-  }
-});
-
 // packages/experience-design-system-cli/app.tsx
 var app_exports = {};
 __export(app_exports, {
   runApp: () => runApp
 });
-import { useEffect as useEffect9, useState as useState11 } from "react";
-import { Fragment as Fragment4, jsx as jsx12 } from "react/jsx-runtime";
+import { useEffect as useEffect8, useState as useState10 } from "react";
+import { Fragment as Fragment3, jsx as jsx11 } from "react/jsx-runtime";
 function App({ onLaunchImport, importExitCode }) {
   const returnedFromImport = importExitCode !== void 0;
-  const [screen, setScreen] = useState11(returnedFromImport ? "import" : "start");
-  const [showImportResult, setShowImportResult] = useState11(returnedFromImport);
-  const [projectPath, setProjectPath] = useState11();
-  const [importDefaults, setImportDefaults] = useState11();
-  useEffect9(() => {
+  const [screen, setScreen] = useState10(returnedFromImport ? "import" : "start");
+  const [showImportResult, setShowImportResult] = useState10(returnedFromImport);
+  const [projectPath, setProjectPath] = useState10();
+  const [importDefaults, setImportDefaults] = useState10();
+  useEffect8(() => {
     if (screen !== "import") {
       setImportDefaults(void 0);
       return;
     }
-    void readImportDefaults().then(setImportDefaults);
+    void readCredentials().then(
+      (saved) => setImportDefaults({ componentDir: saved.defaultComponentDir ?? "", tokenFile: saved.defaultTokenFile ?? "" })
+    );
   }, [screen]);
   const goToStart = () => setScreen("start");
   const goToSettings = () => setScreen("settings");
@@ -1489,12 +1333,12 @@ function App({ onLaunchImport, importExitCode }) {
   };
   switch (screen) {
     case "import":
-      if (showImportResult) return /* @__PURE__ */ jsx12(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
-      if (importDefaults === void 0) return /* @__PURE__ */ jsx12(Fragment4, {});
+      if (showImportResult) return /* @__PURE__ */ jsx11(ImportScreen, { exitCode: importExitCode, onDone: finishImportResult });
+      if (importDefaults === void 0) return /* @__PURE__ */ jsx11(Fragment3, {});
       if (projectPath === void 0) {
-        return /* @__PURE__ */ jsx12(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
+        return /* @__PURE__ */ jsx11(WelcomeScreen, { onContinue: setProjectPath, onQuit: leaveImport, initialPath: importDefaults.componentDir });
       }
-      return /* @__PURE__ */ jsx12(
+      return /* @__PURE__ */ jsx11(
         TokenInputScreen,
         {
           initialPath: importDefaults.tokenFile,
@@ -1504,27 +1348,25 @@ function App({ onLaunchImport, importExitCode }) {
         }
       );
     case "help":
-      return /* @__PURE__ */ jsx12(HelpScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx11(HelpScreen, { onDone: goToStart });
     case "upgrade":
-      return /* @__PURE__ */ jsx12(UpgradeScreen, { onDone: goToStart });
+      return /* @__PURE__ */ jsx11(UpgradeScreen, { onDone: goToStart });
     case "settings":
-      return /* @__PURE__ */ jsx12(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
+      return /* @__PURE__ */ jsx11(SettingsScreen, { onNavigate: setScreen, onBack: goToStart });
     case "settings-configuration":
-      return /* @__PURE__ */ jsx12(ConfigurationScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx11(ConfigurationScreen, { onDone: goToSettings });
     case "settings-opt-in-analytics":
-      return /* @__PURE__ */ jsx12(OptInAnalyticsScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx11(OptInAnalyticsScreen, { onDone: goToSettings });
     case "settings-debug-mode":
-      return /* @__PURE__ */ jsx12(DebugModeScreen, { onDone: goToSettings });
-    case "settings-import-defaults":
-      return /* @__PURE__ */ jsx12(ImportDefaultsScreen, { onDone: goToSettings });
+      return /* @__PURE__ */ jsx11(DebugModeScreen, { onDone: goToSettings });
     case "start":
-      return /* @__PURE__ */ jsx12(HomeScreen, { onNavigate: setScreen });
+      return /* @__PURE__ */ jsx11(HomeScreen, { onNavigate: setScreen });
   }
 }
 async function renderUntilImportRequestedOrExit(renderApp, importExitCode) {
   let requestedImport;
   const instance = renderApp(
-    /* @__PURE__ */ jsx12(
+    /* @__PURE__ */ jsx11(
       App,
       {
         importExitCode,
@@ -1562,8 +1404,7 @@ var init_app = __esm({
     init_screen3();
     init_PageContainer4();
     init_screen4();
-    init_screen5();
-    init_defaults_store();
+    init_config_store();
   }
 });
 

package/dist/package.json

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

package/dist/src/tui/settings/contentful-configuration/config-store.d.ts

@@ -3,6 +3,8 @@ export type V1Credentials = {
     environmentId?: string;
     cmaToken?: string;
     host?: string;
+    defaultComponentDir?: string;
+    defaultTokenFile?: string;
     [key: string]: string | undefined;
 };
 export declare function readCredentials(): Promise<V1Credentials>;

package/legacy/package.json

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

package/package.json

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

package/dist/src/tui/settings/import-defaults/defaults-store.d.ts

@@ -1,6 +0,0 @@
-export type ImportDefaults = {
-    componentDir: string;
-    tokenFile: string;
-};
-export declare function readImportDefaults(): Promise<ImportDefaults>;
-export declare function writeImportDefaults(defaults: ImportDefaults): Promise<void>;

package/dist/src/tui/settings/import-defaults/screen.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-export declare function ImportDefaultsScreen({ onDone }: {
-    onDone: () => void;
-}): React.ReactElement;