@contentful/experience-design-system-cli 2.37.1-dev-build-1e90e088.0 → 2.37.1-dev-build-f57f8147.0

package/dist/app.js

@@ -837,7 +837,7 @@ async function runAgent(options) {
     promptLen: prompt.length,
     promptHead: prompt.slice(0, 500)
   });
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -886,7 +886,7 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve26(result);
+      resolve27(result);
     });
   });
 }
@@ -908,7 +908,7 @@ async function checkAgentAuth(agent) {
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const child = spawn2(binary, ["auth", "status", "--json"], { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
     let done = false;
@@ -917,7 +917,7 @@ async function checkAgentAuth(agent) {
         return;
       done = true;
       child.kill("SIGTERM");
-      resolve26("unauthenticated");
+      resolve27("unauthenticated");
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
@@ -928,14 +928,14 @@ async function checkAgentAuth(agent) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve26("unauthenticated");
+        resolve27("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve26(status.loggedIn ? "ok" : "unauthenticated");
+        resolve27(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve26("unauthenticated");
+        resolve27("unauthenticated");
       }
     });
   });
@@ -945,9 +945,9 @@ async function binaryIsOnPath(binary) {
     const fs = await import("node:fs/promises");
     return fs.access(binary).then(() => true, () => false);
   }
-  return new Promise((resolve26) => {
+  return new Promise((resolve27) => {
     const child = spawn2(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve26(code === 0));
+    child.on("close", (code) => resolve27(code === 0));
   });
 }
 var init_check_agent_auth = __esm({
@@ -2141,11 +2141,12 @@ __export(debug_store_exports, {
   currentSessionDir: () => currentSessionDir,
   finishDebugRun: () => finishDebugRun,
   startDebugRun: () => startDebugRun,
-  startDebugSessionIn: () => startDebugSessionIn
+  startDebugSessionIn: () => startDebugSessionIn,
+  startImportRun: () => startImportRun
 });
-import { mkdir as mkdir8, writeFile as writeFile7 } from "node:fs/promises";
-import { existsSync as existsSync9, readdirSync as readdirSync3 } from "node:fs";
-import { join as join20, resolve as resolve23 } from "node:path";
+import { mkdir as mkdir9, writeFile as writeFile8 } from "node:fs/promises";
+import { existsSync as existsSync9, readdirSync as readdirSync4 } from "node:fs";
+import { join as join24, resolve as resolve26 } from "node:path";
 function generateRunId() {
   const now = /* @__PURE__ */ new Date();
   const pad = (n) => String(n).padStart(2, "0");
@@ -2161,14 +2162,14 @@ function slugify(value) {
 async function readBaseDir() {
   try {
     const dir = (await readSettings2())["contentfulBaseDir"];
-    return typeof dir === "string" && dir !== "" ? resolve23(dir) : void 0;
+    return typeof dir === "string" && dir !== "" ? resolve26(dir) : void 0;
   } catch {
     return void 0;
   }
 }
 function nextSessionId(contentfulDir) {
   const today = datePrefix();
-  const existing = existsSync9(contentfulDir) ? readdirSync3(contentfulDir) : [];
+  const existing = existsSync9(contentfulDir) ? readdirSync4(contentfulDir) : [];
   const seqPattern = new RegExp(`^${today}-session-(\\d+)$`);
   const maxSeq = existing.reduce((max, entry) => {
     const match2 = seqPattern.exec(entry);
@@ -2177,12 +2178,12 @@ function nextSessionId(contentfulDir) {
   return `${today}-session-${maxSeq + 1}`;
 }
 function startSession(base, { replace }) {
-  const contentfulDir = join20(base, ".contentful");
-  if (replace || !sessionDir) sessionDir = join20(contentfulDir, nextSessionId(contentfulDir));
+  const contentfulDir = join24(base, ".contentful");
+  if (replace || !sessionDir) sessionDir = join24(contentfulDir, nextSessionId(contentfulDir));
   return sessionDir;
 }
 function currentDebugSessionDir() {
-  return sessionDir && join20(sessionDir, "debug");
+  return sessionDir && join24(sessionDir, "debug");
 }
 function currentSessionDir() {
   return sessionDir;
@@ -2190,10 +2191,25 @@ function currentSessionDir() {
 async function startDebugSessionIn(base, { replace = false } = {}) {
   try {
     if (!await isDebugModeEnabled()) return;
-    await mkdir8(join20(startSession(resolve23(base), { replace }), "debug"), { recursive: true });
+    await mkdir9(join24(startSession(resolve26(base), { replace }), "debug"), { recursive: true });
   } catch {
   }
 }
+function nextImportRunDir(session) {
+  const existing = existsSync9(session) ? readdirSync4(session) : [];
+  const maxRun = existing.reduce((max, entry) => {
+    const match2 = /^dsi-import-(\d+)$/.exec(entry);
+    return match2 ? Math.max(max, Number(match2[1])) : max;
+  }, 0);
+  return join24(session, `dsi-import-${maxRun + 1}`);
+}
+async function startImportRun(projectPath) {
+  await startDebugSessionIn(projectPath);
+  if (!sessionDir) return join24(resolve26(projectPath), ".contentful");
+  const dir = nextImportRunDir(sessionDir);
+  await mkdir9(dir, { recursive: true });
+  return dir;
+}
 async function isDebugModeEnabled() {
   try {
     return (await readDebugModeSetting()).enabled;
@@ -2236,15 +2252,15 @@ async function finishDebugRun({
   const root = currentDebugSessionDir();
   if (!root) return;
   const flowSegments = run.flow.split("/");
-  const dir = join20(root, ...flowSegments);
-  await mkdir8(dir, { recursive: true });
+  const dir = join24(root, ...flowSegments);
+  await mkdir9(dir, { recursive: true });
   const filename = nextAttemptFilename(dir, run.menuOption);
-  await writeFile7(join20(dir, filename), content, { mode: 384 });
+  await writeFile8(join24(dir, filename), content, { mode: 384 });
 }
 function nextAttemptFilename(dir, menuOption) {
   const today = datePrefix();
   const optionSlug = slugify(menuOption);
-  const existing = existsSync9(dir) ? readdirSync3(dir) : [];
+  const existing = existsSync9(dir) ? readdirSync4(dir) : [];
   const attemptPattern = new RegExp(`^${today}-${optionSlug}-attempt-(\\d+)\\.md$`);
   const maxAttempt = existing.reduce((max, entry) => {
     const match2 = attemptPattern.exec(entry);
@@ -2292,7 +2308,7 @@ var init_debug_store = __esm({
     init_debug_mode_store();
     void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(([enabled, base]) => {
       if (!enabled || !base) return void 0;
-      return mkdir8(join20(startSession(base, { replace: false }), "debug"), { recursive: true });
+      return mkdir9(join24(startSession(base, { replace: false }), "debug"), { recursive: true });
     });
     process.once("uncaughtException", (err) => {
       void handleCrash().finally(() => {
@@ -13754,7 +13770,7 @@ function errorMessage(error) {
   return error instanceof Error && error.message ? error.message : String(error);
 }
 function defaultSleep(delayMs) {
-  return new Promise((resolve26) => setTimeout(resolve26, delayMs));
+  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
 }
 
 // packages/experience-design-system-backend-pipeline/dist/src/steps/apply/src/helpers/sanitize-preview.js
@@ -13995,7 +14011,7 @@ var ApiClient = class {
         const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
         const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
         const jitter = Math.random() * baseDelay * 0.15;
-        await new Promise((resolve26) => setTimeout(resolve26, baseDelay + jitter));
+        await new Promise((resolve27) => setTimeout(resolve27, baseDelay + jitter));
       }
     }
     throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -16108,7 +16124,7 @@ async function retryDatabaseWrite(operation, attempts = 8) {
       const message = error instanceof Error ? error.message : String(error);
       if (!/database is locked|database is busy/i.test(message) || attempt >= attempts)
         throw error;
-      await new Promise((resolve26) => setTimeout(resolve26, Math.min(250 * attempt, 2e3)));
+      await new Promise((resolve27) => setTimeout(resolve27, Math.min(250 * attempt, 2e3)));
     }
   }
 }
@@ -17280,11 +17296,34 @@ function RunningStep({
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/05-token-reuse/logic.ts
-import { access as access5, stat as stat4 } from "node:fs/promises";
+import { access as access5, readdir as readdir2, stat as stat4 } from "node:fs/promises";
 import { join as join16 } from "node:path";
-async function inspectTokens({ rawTokensPath, outDir, cache }) {
+async function findLatestTokens(contentfulDir) {
+  const candidates = [join16(contentfulDir, "tokens.json")];
+  try {
+    for (const session of await readdir2(contentfulDir, { withFileTypes: true })) {
+      if (!session.isDirectory()) continue;
+      for (const run of await readdir2(join16(contentfulDir, session.name), { withFileTypes: true }).catch(() => [])) {
+        if (run.isDirectory() && /^dsi-import-\d+$/.test(run.name)) {
+          candidates.push(join16(contentfulDir, session.name, run.name, "tokens.json"));
+        }
+      }
+    }
+  } catch {
+  }
+  const found = [];
+  for (const path5 of candidates) {
+    try {
+      found.push({ path: path5, mtimeMs: (await stat4(path5)).mtimeMs });
+    } catch {
+    }
+  }
+  return found.sort((a, b) => b.mtimeMs - a.mtimeMs)[0]?.path ?? null;
+}
+async function inspectTokens({ rawTokensPath, contentfulDir, cache }) {
   if (!cache) return { kind: "none" };
-  const tokensPath = join16(outDir, "tokens.json");
+  const tokensPath = await findLatestTokens(contentfulDir);
+  if (!tokensPath) return { kind: "none" };
   try {
     await access5(tokensPath);
   } catch {
@@ -17563,7 +17602,7 @@ var realDeps = {
 var fail = (step, message) => ({ ok: false, step, message });
 var errorMessage2 = (error) => error instanceof Error ? error.message : String(error);
 async function runExtraction(input, onProgress, deps = realDeps) {
-  const outDir = join19(resolve22(input.projectPath), ".contentful");
+  const outDir = input.outDir ?? join19(resolve22(input.projectPath), ".contentful");
   let progress = initialProgress({
     hasCredentials: input.credentials !== null,
     hasRawTokens: input.rawTokensPath !== "",
@@ -17712,7 +17751,6 @@ function useExtraction(input) {
         reuseTokens: input.tokenStrategy === "reuse"
       })
     });
-    void Promise.resolve().then(() => (init_debug_store(), debug_store_exports)).then((store) => store.startDebugSessionIn(input.projectPath));
     void runExtraction(input, (progress) => {
       if (current.current === input) setState({ status: "running", progress });
     }).then((result) => {
@@ -20599,7 +20637,7 @@ function GenerationScreen({
 import { useEffect as useEffect9, useRef as useRef6, useState as useState14 } from "react";
 
 // packages/experience-design-system-cli/src/tui/import/steps/08-generation/run.ts
-import { resolve as resolve24 } from "node:path";
+import { resolve as resolve23 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/08-generation/map-tokens.ts
 async function prepareMapTokens(input, generatedSessionId) {
@@ -20734,7 +20772,7 @@ async function buildMapTokensOptions(input) {
   if (mapOverride?.kind === "text") prompt.skillContentOverride = mapOverride.value;
   if (mapOverride?.kind === "path") {
     await resolvePromptOverride(mapOverride);
-    prompt.skillPathOverride = resolve24(mapOverride.value);
+    prompt.skillPathOverride = resolve23(mapOverride.value);
   }
   if (input.existingEntitiesPath) {
     const entities = await readExistingContentfulEntitiesFromSession({ path: input.existingEntitiesPath });
@@ -20782,7 +20820,7 @@ function useGeneration(input) {
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/build-flow-start.ts
-import { join as join21 } from "node:path";
+import { join as join20 } from "node:path";
 function buildFlowStart(input) {
   const { extraction, handoff, saved, generatePromptPath } = input;
   const credentials = extraction.credentials ?? {
@@ -20795,7 +20833,7 @@ function buildFlowStart(input) {
     handoff,
     agent: extraction.agent,
     projectPath: extraction.projectPath,
-    outDir: extraction.projectPath ? join21(extraction.projectPath, ".contentful") : "",
+    outDir: extraction.projectPath ? join20(extraction.projectPath, ".contentful") : "",
     rawTokensPath: extraction.rawTokensPath,
     credentials: {
       spaceId: credentials.spaceId,
@@ -26538,11 +26576,11 @@ function DoneStep({
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/screens/PathPrompt.tsx
 import { useState as useState24 } from "react";
 import { Box as Box37, Text as Text40 } from "ink";
-import { readdirSync as readdirSync4 } from "node:fs";
-import { dirname as dirname15, basename as basename6, join as join22 } from "node:path";
+import { readdirSync as readdirSync3 } from "node:fs";
+import { dirname as dirname15, basename as basename6, join as join21 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/path-utils.ts
-import { resolve as resolve25 } from "node:path";
+import { resolve as resolve24 } from "node:path";
 import { homedir as homedir4 } from "node:os";
 function expandTilde(input) {
   if (input === "~" || input.startsWith("~/") || input.startsWith("~\\")) {
@@ -26556,7 +26594,7 @@ function normalizePath(input) {
     p = p.slice(1, -1);
   }
   p = expandTilde(p);
-  return resolve25(p);
+  return resolve24(p);
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/use-blinking-cursor.ts
@@ -26579,19 +26617,19 @@ function autocomplete(partial) {
   const base = basename6(normalized);
   let entries;
   try {
-    entries = readdirSync4(dir);
+    entries = readdirSync3(dir);
   } catch {
     return null;
   }
   const matches = entries.filter((e) => e.startsWith(base));
   if (matches.length === 0) return null;
-  if (matches.length === 1) return join22(dir, matches[0]);
+  if (matches.length === 1) return join21(dir, matches[0]);
   let prefix = matches[0];
   for (const m of matches) {
     while (!m.startsWith(prefix)) prefix = prefix.slice(0, -1);
     if (!prefix) break;
   }
-  return prefix.length > base.length ? join22(dir, prefix) : null;
+  return prefix.length > base.length ? join21(dir, prefix) : null;
 }
 function PathPrompt({
   defaultPath,
@@ -27350,9 +27388,9 @@ import { useEffect as useEffect21, useRef as useRef13, useSyncExternalStore } fr
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/controller.ts
 import { appendFileSync, writeFileSync } from "node:fs";
-import { mkdir as mkdir9 } from "node:fs/promises";
+import { mkdir as mkdir8 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join24 } from "node:path";
+import { join as join23, resolve as resolve25 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/wizard-state-transitions.ts
 function shouldBypassPreview(state) {
@@ -27696,8 +27734,8 @@ function pushFailure(e, deps) {
 }
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/save.ts
-import { writeFile as writeFile8 } from "node:fs/promises";
-import { join as join23 } from "node:path";
+import { writeFile as writeFile7 } from "node:fs/promises";
+import { join as join22 } from "node:path";
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/support/run-print-files-helpers.ts
 function nextStateAfterPrint(opts) {
@@ -27720,15 +27758,15 @@ function buildSavedCDF(components, tokens, opts = {}) {
 var realSaveDeps = () => ({
   openDb: openPipelineDb,
   readTokens: (path5) => readTokensFromPath2({ flag: "tokens", path: path5 }),
-  writeFile: (path5, contents) => writeFile8(path5, contents),
+  writeFile: (path5, contents) => writeFile7(path5, contents),
   appendRun,
   buildSourceFingerprint,
-  sleep: (ms) => new Promise((resolve26) => setTimeout(resolve26, ms)),
+  sleep: (ms) => new Promise((resolve27) => setTimeout(resolve27, ms)),
   warn: (message) => process.stderr.write(message)
 });
 async function runPrintFiles(input, deps, onPatch) {
   onPatch({ step: "printing" });
-  const componentsPath = join23(input.outDir, "components.json");
+  const componentsPath = join22(input.outDir, "components.json");
   try {
     const db = deps.openDb();
     let components = [];
@@ -27809,7 +27847,7 @@ var EMPTY_PUSH_RESULT = {
 };
 
 // packages/experience-design-system-cli/src/tui/import/steps/10-flow/flow/controller.ts
-var WIZARD_LOG = join24(tmpdir(), "experiences-import-wizard.log");
+var WIZARD_LOG = join23(tmpdir(), "experiences-import-wizard.log");
 function appendWizardLog(entry) {
   appendFileSync(WIZARD_LOG, JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), ...entry }) + "\n");
 }
@@ -27817,9 +27855,6 @@ function startWizardLog() {
   writeFileSync(WIZARD_LOG, `--- experiences import session ${(/* @__PURE__ */ new Date()).toISOString()} ---
 `);
 }
-async function realSessionDir() {
-  return (await Promise.resolve().then(() => (init_debug_store(), debug_store_exports))).currentSessionDir();
-}
 function realFlowDeps() {
   const log = (entry) => appendWizardLog(entry);
   return {
@@ -27835,14 +27870,13 @@ function realFlowDeps() {
       }
     },
     mkdir: async (path5) => {
-      await mkdir9(path5, { recursive: true });
+      await mkdir8(path5, { recursive: true });
     },
     detectSaveConflict,
     buildTimestampedSubdir,
     rejectComponentsByName,
     log,
-    stderr: (text) => process.stderr.write(text),
-    sessionDir: realSessionDir
+    stderr: (text) => process.stderr.write(text)
   };
 }
 function initialFlowState(start) {
@@ -27983,9 +28017,6 @@ function createFlowController(start, deps) {
   const startSave = (opts, patch = {}) => {
     pendingSave = opts;
     update({ ...patch, step: "path-prompt" });
-    void deps.sessionDir?.().then((session) => {
-      if (session && state.step === "path-prompt") update({ outDir: join24(session, "dsi-import") });
-    });
   };
   const proceedToWrite = async (path5) => {
     update({ outDir: path5 });
@@ -28058,7 +28089,7 @@ function createFlowController(start, deps) {
     },
     async submitPath(submitted) {
       await deps.mkdir(submitted);
-      if (await deps.detectSaveConflict(submitted)) {
+      if (resolve25(submitted) !== resolve25(state.outDir) && await deps.detectSaveConflict(submitted)) {
         const subdir = deps.buildTimestampedSubdir(submitted);
         await deps.mkdir(subdir);
         await proceedToWrite(subdir);
@@ -28300,8 +28331,12 @@ var FIELD_LABELS = {
   host: "API Host",
   defaultComponentDir: "Default component directory",
   defaultTokenFile: "Default token file",
-  contentfulBaseDir: "Root Project Directory (where .contentful goes)"
+  contentfulBaseDir: "Root Project Directory"
 };
+var FIELD_HINTS = {
+  contentfulBaseDir: "(where .contentful goes)"
+};
+var LABEL_WIDTH = Math.max(...Object.values(FIELD_LABELS).map((label) => label.length));
 function ConfigurationScreen({ onDone }) {
   const [stage, setStage] = useState29("loading");
   const [config, setConfig] = useState29(null);
@@ -28403,10 +28438,7 @@ function ConfigurationScreen({ onDone }) {
       const display = field === "cmaToken" ? "\u2022".repeat(value.length) : value;
       return /* @__PURE__ */ jsxs45(Box44, { gap: 1, children: [
         /* @__PURE__ */ jsx55(Text46, { color: isActive ? PALETTE.accent : void 0, children: isActive ? "\u276F" : " " }),
-        /* @__PURE__ */ jsxs45(Text46, { bold: isActive, children: [
-          FIELD_LABELS[field],
-          ":"
-        ] }),
+        /* @__PURE__ */ jsx55(Box44, { width: LABEL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ jsx55(Text46, { bold: isActive, color: isActive ? PALETTE.accent : PALETTE.muted, children: FIELD_LABELS[field] }) }),
         isActive && editing ? /* @__PURE__ */ jsx55(
           TextInput4,
           {
@@ -28415,7 +28447,8 @@ function ConfigurationScreen({ onDone }) {
             onSubmit: () => setEditing(false),
             mask: field === "cmaToken" ? "\u2022" : void 0
           }
-        ) : /* @__PURE__ */ jsx55(Text46, { children: display || /* @__PURE__ */ jsx55(Text46, { color: PALETTE.muted, children: "(empty)" }) })
+        ) : /* @__PURE__ */ jsx55(Text46, { bold: !!display, children: display || (FIELD_HINTS[field] ? "" : /* @__PURE__ */ jsx55(Text46, { color: PALETTE.muted, children: "(empty)" })) }),
+        FIELD_HINTS[field] && /* @__PURE__ */ jsx55(Text46, { color: PALETTE.muted, children: FIELD_HINTS[field] })
       ] }, field);
     }) }),
     notice && /* @__PURE__ */ jsxs45(Fragment17, { children: [
@@ -28705,7 +28738,7 @@ function App({ importOptions, inkClear }) {
     const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
     const state = await inspectTokens({
       rawTokensPath: tokens,
-      outDir: join25(resolveUserPath(projectPath2), ".contentful"),
+      contentfulDir: join25(resolveUserPath(projectPath2), ".contentful"),
       cache: importOptions.cache
     });
     if (state.kind === "cached") {
@@ -28726,6 +28759,7 @@ function App({ importOptions, inkClear }) {
     const settings = await readSettings2();
     const { agent, agentModel } = resolveAgentChoice(launch.agent, settings);
     const generatePromptPath = typeof settings.generatePromptPath === "string" ? settings.generatePromptPath : void 0;
+    const outDir = await (await Promise.resolve().then(() => (init_debug_store(), debug_store_exports))).startImportRun(resolveUserPath(launch.projectPath ?? ""));
     setExtractionRun({
       ...generatePromptPath ? { generatePromptPath } : {},
       // the later steps get the same agent, so they use what the stage used
@@ -28734,6 +28768,7 @@ function App({ importOptions, inkClear }) {
       tokenStrategy,
       input: {
         projectPath: resolveUserPath(launch.projectPath ?? ""),
+        outDir,
         filePaths: launch.filePaths ?? [],
         rawTokensPath: launch.tokens ?? "",
         tokenStrategy,