@contentful/experience-design-system-cli 2.37.1-dev-build-7652d7c0.0 → 2.37.1-dev-build-6fb2b08b.0

package/dist/index.js

@@ -1500,7 +1500,7 @@ async function runAgent(options) {
     promptLen: prompt.length,
     promptHead: prompt.slice(0, 500)
   });
-  return new Promise((resolve25) => {
+  return new Promise((resolve27) => {
     const bedrockEnv = bedrock ? BEDROCK_ENV_BY_AGENT[agent] : void 0;
     const child = spawn(binary, args, {
       stdio: ["pipe", "pipe", "pipe"],
@@ -1549,7 +1549,7 @@ async function runAgent(options) {
         stderrLen: stderr.length,
         stderrTail: stderr.slice(-1e3)
       });
-      resolve25(result);
+      resolve27(result);
     });
   });
 }
@@ -1571,7 +1571,7 @@ async function checkAgentAuth(agent) {
     return "not-found";
   if (agent !== "claude")
     return "ok";
-  return new Promise((resolve25) => {
+  return new Promise((resolve27) => {
     const child = spawn2(binary, ["auth", "status", "--json"], { stdio: ["ignore", "pipe", "pipe"] });
     let stdout = "";
     let done = false;
@@ -1580,7 +1580,7 @@ async function checkAgentAuth(agent) {
         return;
       done = true;
       child.kill("SIGTERM");
-      resolve25("unauthenticated");
+      resolve27("unauthenticated");
     }, 5e3);
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
@@ -1591,14 +1591,14 @@ async function checkAgentAuth(agent) {
       done = true;
       clearTimeout(timer);
       if (code !== 0) {
-        resolve25("unauthenticated");
+        resolve27("unauthenticated");
         return;
       }
       try {
         const status = JSON.parse(stdout);
-        resolve25(status.loggedIn ? "ok" : "unauthenticated");
+        resolve27(status.loggedIn ? "ok" : "unauthenticated");
       } catch {
-        resolve25("unauthenticated");
+        resolve27("unauthenticated");
       }
     });
   });
@@ -1608,9 +1608,9 @@ async function binaryIsOnPath(binary) {
     const fs = await import("node:fs/promises");
     return fs.access(binary).then(() => true, () => false);
   }
-  return new Promise((resolve25) => {
+  return new Promise((resolve27) => {
     const child = spawn2(process.platform === "win32" ? "where" : "which", [binary], { stdio: "ignore" });
-    child.on("close", (code) => resolve25(code === 0));
+    child.on("close", (code) => resolve27(code === 0));
   });
 }
 var init_check_agent_auth = __esm({
@@ -12523,11 +12523,11 @@ var init_load_and_validate_for_review = __esm({
 // packages/experience-design-system-backend-pipeline/dist/src/persistence/src/review-session/repositories/review-session-paths.js
 import { resolve as resolve14 } from "node:path";
 async function getRefineSessionPaths(sessionId, artifactsRoot) {
-  const sessionDir = resolve14(artifactsRoot, sessionId);
+  const sessionDir2 = resolve14(artifactsRoot, sessionId);
   return {
-    sessionDir,
-    eventsPath: resolve14(sessionDir, "events.jsonl"),
-    statePath: resolve14(sessionDir, "current-review-state.json")
+    sessionDir: sessionDir2,
+    eventsPath: resolve14(sessionDir2, "events.jsonl"),
+    statePath: resolve14(sessionDir2, "current-review-state.json")
   };
 }
 var init_review_session_paths = __esm({
@@ -14333,7 +14333,7 @@ function errorMessage(error) {
   return error instanceof Error && error.message ? error.message : String(error);
 }
 function defaultSleep(delayMs) {
-  return new Promise((resolve25) => setTimeout(resolve25, delayMs));
+  return new Promise((resolve27) => setTimeout(resolve27, delayMs));
 }
 var MAX_RETRY_AFTER_MS;
 var init_http_utils = __esm({
@@ -14609,7 +14609,7 @@ var init_api_client = __esm({
             const progress = maxAttempts > 1 ? attempt / (maxAttempts - 1) : 0;
             const baseDelay = intervalMs + (maxIntervalMs - intervalMs) * progress;
             const jitter = Math.random() * baseDelay * 0.15;
-            await new Promise((resolve25) => setTimeout(resolve25, baseDelay + jitter));
+            await new Promise((resolve27) => setTimeout(resolve27, baseDelay + jitter));
           }
         }
         throw new Error(`Operation ${operationId} timed out after ${maxAttempts} attempts`);
@@ -16302,31 +16302,21 @@ async function runMapTokens(request) {
     await bindAnalyticsSessionId(sessionId);
     const tokenLeaves = loadTokenLeaves(db, sessionId);
     const knownTokenPaths = new Set(tokenLeaves.map((t) => t.path));
-    const diagnostics = [];
     if (request.tokenMapInline) {
       const validMappings = {};
       for (const [rawName, path5] of Object.entries(request.tokenMapInline)) {
-        if (knownTokenPaths.has(path5)) {
+        if (knownTokenPaths.has(path5))
           validMappings[rawName] = path5;
-        } else {
-          diagnostics.push(`Token map '${rawName}' -> '${path5}': path not found in session tokens \u2014 skipped.`);
-        }
       }
       replaceRawTokenNamePaths(db, sessionId, validMappings, "manual");
     }
     const rawDefaults = loadRawDefaults(db, sessionId);
     const defaultResolution = resolveTokenDefaults(rawDefaults.map((row) => ({ rawDefault: row.default_reference, tokenKind: row.cdf_token_kind })), tokenLeaves);
-    for (const diagnostic of defaultResolution.diagnostics)
-      diagnostics.push(diagnostic.message);
     const manualMappings = new Map(getRawTokenNamePathRows(db, sessionId).filter((row) => row.source === "manual").map((row) => [row.rawName, row.path]));
     const automaticMappings = {};
     for (const [rawName, path5] of Object.entries(defaultResolution.mappings)) {
-      const manualPath = manualMappings.get(rawName);
-      if (manualPath === void 0) {
+      if (manualMappings.get(rawName) === void 0)
         automaticMappings[rawName] = path5;
-      } else if (manualPath !== path5) {
-        diagnostics.push(`Token default '${rawName}' automatically resolves to '${path5}', but manual mapping '${manualPath}' is retained.`);
-      }
     }
     replaceRawTokenNamePaths(db, sessionId, automaticMappings, "automatic");
     const cdfEntries = loadCDFComponents(db, sessionId);
@@ -16337,7 +16327,7 @@ async function runMapTokens(request) {
     const { groups, tokens } = getDtcgTokensForSession(db, sessionId);
     const tokenCount = tokens.length;
     if (mappablePropCount === 0 || tokenCount === 0) {
-      return { type: "nothing-to-map", sessionId, mappablePropCount, tokenCount, diagnostics };
+      return { type: "nothing-to-map", sessionId, mappablePropCount, tokenCount };
     }
     const generatedCdf = Object.fromEntries(cdfEntries.map((c2) => [c2.key, c2.entry]));
     const tokenTree = rebuildDTCGTree(groups, tokens);
@@ -16355,7 +16345,7 @@ async function runMapTokens(request) {
     });
     if (request.printPrompt) {
       const prompt2 = await buildMapPrompt();
-      return { type: "printed-prompt", sessionId, prompt: prompt2, diagnostics };
+      return { type: "printed-prompt", sessionId, prompt: prompt2 };
     }
     if (request.skipAgent) {
       const stepId2 = createStep(db, sessionId, "map tokens", {
@@ -16364,7 +16354,7 @@ async function runMapTokens(request) {
         skipAgent: "true"
       });
       updateStep(db, stepId2, "complete", { applied: "0", skipAgent: "true" });
-      return { type: "skipped", sessionId, stepId: stepId2, diagnostics };
+      return { type: "skipped", sessionId, stepId: stepId2 };
     }
     const agent = request.agent;
     const noCache = request.cache === false || process.env["EDS_NO_CACHE"] === "1";
@@ -16376,7 +16366,7 @@ async function runMapTokens(request) {
         const applied2 = copyMapTokensFromCache(db, cached.sourceSessionId, sessionId);
         const stepId2 = createStep(db, sessionId, "map tokens", { agent, model: request.model ?? "" });
         updateStep(db, stepId2, "complete", { cached: "true", applied: String(applied2) });
-        return { type: "cached", sessionId, applied: applied2, stepId: stepId2, diagnostics };
+        return { type: "cached", sessionId, applied: applied2, stepId: stepId2 };
       }
     }
     const binary = resolveBinary(agent);
@@ -16403,7 +16393,7 @@ async function runMapTokens(request) {
       storeCache(db, inputHash, "token_mapping", "__map_tokens__", sessionId, false, promptHash);
     }
     updateStep(db, stepId, "complete", { applied: String(applied), warnings: String(warnings.length) });
-    return { type: "applied", sessionId, applied, warnings, stepId, diagnostics };
+    return { type: "applied", sessionId, applied, warnings, stepId };
   } finally {
     db.close();
   }
@@ -18510,7 +18500,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((resolve25) => setTimeout(resolve25, Math.min(250 * attempt, 2e3)));
+      await new Promise((resolve27) => setTimeout(resolve27, Math.min(250 * attempt, 2e3)));
     }
   }
 }
@@ -19527,13 +19517,12 @@ async function writeSettings2(settings) {
 async function updateSettings2(patch) {
   await writeSettings2({ ...await readSettings2(), ...patch });
 }
-var configFilePath2, runsFilePath2, debugSessionsDir2, oldConfigDir2;
+var configFilePath2, runsFilePath2, oldConfigDir2;
 var init_config = __esm({
   "packages/experience-design-system-types/dist/src/config/index.js"() {
     "use strict";
     configFilePath2 = () => join17(configRoot2(), "config.json");
     runsFilePath2 = () => join17(configRoot2(), "state", "runs.json");
-    debugSessionsDir2 = () => join17(configRoot2(), "debug", "sessions");
     oldConfigDir2 = () => join17(homedir2(), ".config", "experiences");
   }
 });
@@ -20777,11 +20766,34 @@ var init_shared2 = __esm({
 });
 
 // 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 join19 } from "node:path";
-async function inspectTokens({ rawTokensPath, outDir, cache }) {
+async function findLatestTokens(contentfulDir) {
+  const candidates = [join19(contentfulDir, "tokens.json")];
+  try {
+    for (const session of await readdir2(contentfulDir, { withFileTypes: true })) {
+      if (!session.isDirectory()) continue;
+      for (const run of await readdir2(join19(contentfulDir, session.name), { withFileTypes: true }).catch(() => [])) {
+        if (run.isDirectory() && /^dsi-import-\d+$/.test(run.name)) {
+          candidates.push(join19(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 = join19(outDir, "tokens.json");
+  const tokensPath = await findLatestTokens(contentfulDir);
+  if (!tokensPath) return { kind: "none" };
   try {
     await access5(tokensPath);
   } catch {
@@ -21093,7 +21105,7 @@ var init_selection2 = __esm({
 import { mkdir as mkdir7 } from "node:fs/promises";
 import { join as join21, resolve as resolve22 } from "node:path";
 async function runExtraction(input, onProgress, deps = realDeps) {
-  const outDir = join21(resolve22(input.projectPath), ".contentful");
+  const outDir = input.outDir ?? join21(resolve22(input.projectPath), ".contentful");
   let progress = initialProgress({
     hasCredentials: input.credentials !== null,
     hasRawTokens: input.rawTokensPath !== "",
@@ -24535,7 +24547,7 @@ async function runGeneration(input, onProgress, deps = realDeps3) {
     update({ mapTokens: "running" });
     try {
       const mapTokensOptions = await buildMapTokensOptions(input);
-      const mapResult = await deps.runMapTokens({
+      await deps.runMapTokens({
         sessionId: input.sessionId,
         agent: input.agent,
         ...input.agentModel ? { model: input.agentModel } : {},
@@ -24543,11 +24555,6 @@ async function runGeneration(input, onProgress, deps = realDeps3) {
         skillPathOverride: MAP_TOKENS_SKILL_PATH,
         ...mapTokensOptions
       });
-      if (mapResult.diagnostics.length > 0) {
-        process.stderr.write(`Unresolved token defaults:
-${mapResult.diagnostics.map((d) => `  ${d}`).join("\n")}
-`);
-      }
     } catch (error) {
       const message = error instanceof MapTokensRunFailure ? error.message : error instanceof Error ? error.message : String(error);
       return fail2("map tokens", message);
@@ -32218,7 +32225,7 @@ var init_save = __esm({
       writeFile: (path5, contents) => writeFile7(path5, contents),
       appendRun,
       buildSourceFingerprint,
-      sleep: (ms) => new Promise((resolve25) => setTimeout(resolve25, ms)),
+      sleep: (ms) => new Promise((resolve27) => setTimeout(resolve27, ms)),
       warn: (message) => process.stderr.write(message)
     });
   }
@@ -32240,7 +32247,7 @@ var init_types9 = __esm({
 import { appendFileSync, writeFileSync } from "node:fs";
 import { mkdir as mkdir8 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join as join25 } from "node:path";
+import { join as join25, resolve as resolve25 } from "node:path";
 function appendWizardLog(entry) {
   appendFileSync(WIZARD_LOG, JSON.stringify({ ts: (/* @__PURE__ */ new Date()).toISOString(), ...entry }) + "\n");
 }
@@ -32488,7 +32495,7 @@ function createFlowController(start, deps) {
     },
     async submitPath(submitted) {
       await deps.mkdir(submitted);
-      if (await deps.detectSaveConflict(submitted)) {
+      if (resolve25(submitted) !== resolve25(state2.outDir) && await deps.detectSaveConflict(submitted)) {
         const subdir = deps.buildTimestampedSubdir(submitted);
         await deps.mkdir(subdir);
         await proceedToWrite(subdir);
@@ -32576,9 +32583,18 @@ var init_debug_mode_store = __esm({
 });
 
 // packages/experience-design-system-cli/src/tui/debug-store.ts
+var debug_store_exports = {};
+__export(debug_store_exports, {
+  currentDebugSessionDir: () => currentDebugSessionDir,
+  currentSessionDir: () => currentSessionDir,
+  finishDebugRun: () => finishDebugRun,
+  startDebugRun: () => startDebugRun,
+  startDebugSessionIn: () => startDebugSessionIn,
+  startImportRun: () => startImportRun
+});
 import { mkdir as mkdir9, writeFile as writeFile8 } from "node:fs/promises";
 import { existsSync as existsSync11, readdirSync as readdirSync4 } from "node:fs";
-import { join as join26 } from "node:path";
+import { join as join26, resolve as resolve26 } from "node:path";
 function generateRunId() {
   const now = /* @__PURE__ */ new Date();
   const pad = (n) => String(n).padStart(2, "0");
@@ -32591,10 +32607,17 @@ function datePrefix(now = /* @__PURE__ */ new Date()) {
 function slugify(value) {
   return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
 }
-function generateSessionId3() {
+async function readBaseDir() {
+  try {
+    const dir = (await readSettings2())["contentfulBaseDir"];
+    return typeof dir === "string" && dir !== "" ? resolve26(dir) : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function nextSessionId(contentfulDir) {
   const today = datePrefix();
-  const root = debugSessionsDir2();
-  const existing = existsSync11(root) ? readdirSync4(root) : [];
+  const existing = existsSync11(contentfulDir) ? readdirSync4(contentfulDir) : [];
   const seqPattern = new RegExp(`^${today}-session-(\\d+)$`);
   const maxSeq = existing.reduce((max, entry) => {
     const match2 = seqPattern.exec(entry);
@@ -32602,11 +32625,38 @@ function generateSessionId3() {
   }, 0);
   return `${today}-session-${maxSeq + 1}`;
 }
-function sessionDebugDir() {
-  return join26(debugSessionsDir2(), SESSION_ID);
+function startSession(base, { replace }) {
+  const contentfulDir = join26(base, ".contentful");
+  if (replace || !sessionDir) sessionDir = join26(contentfulDir, nextSessionId(contentfulDir));
+  return sessionDir;
 }
 function currentDebugSessionDir() {
-  return sessionDebugDir();
+  return sessionDir && join26(sessionDir, "debug");
+}
+function currentSessionDir() {
+  return sessionDir;
+}
+async function startDebugSessionIn(base, { replace = false } = {}) {
+  try {
+    if (!await isDebugModeEnabled()) return;
+    await mkdir9(join26(startSession(resolve26(base), { replace }), "debug"), { recursive: true });
+  } catch {
+  }
+}
+function nextImportRunDir(session) {
+  const existing = existsSync11(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 join26(session, `dsi-import-${maxRun + 1}`);
+}
+async function startImportRun(projectPath) {
+  await startDebugSessionIn(projectPath);
+  if (!sessionDir) return join26(resolve26(projectPath), ".contentful");
+  const dir = nextImportRunDir(sessionDir);
+  await mkdir9(dir, { recursive: true });
+  return dir;
 }
 async function isDebugModeEnabled() {
   try {
@@ -32647,8 +32697,10 @@ async function finishDebugRun({
   pendingRun = void 0;
   const durationMs = Date.now() - run.startedAt;
   const content = renderMarkdown(run, { outputs: redact(outputs), status, exitMethod, durationMs });
+  const root = currentDebugSessionDir();
+  if (!root) return;
   const flowSegments = run.flow.split("/");
-  const dir = join26(sessionDebugDir(), ...flowSegments);
+  const dir = join26(root, ...flowSegments);
   await mkdir9(dir, { recursive: true });
   const filename = nextAttemptFilename(dir, run.menuOption);
   await writeFile8(join26(dir, filename), content, { mode: 384 });
@@ -32695,17 +32747,16 @@ ${JSON.stringify(finish.outputs, null, 2)}
 function handleCrash() {
   return finishDebugRun({ outputs: {}, status: "error", exitMethod: "crashed" });
 }
-var pendingRun, SESSION_ID;
+var pendingRun, sessionDir;
 var init_debug_store = __esm({
   "packages/experience-design-system-cli/src/tui/debug-store.ts"() {
     "use strict";
     init_config();
     init_version();
     init_debug_mode_store();
-    SESSION_ID = generateSessionId3();
-    void isDebugModeEnabled().then((enabled) => {
-      if (!enabled) return void 0;
-      return mkdir9(sessionDebugDir(), { recursive: true });
+    void Promise.all([isDebugModeEnabled(), readBaseDir()]).then(([enabled, base]) => {
+      if (!enabled || !base) return void 0;
+      return mkdir9(join26(startSession(base, { replace: false }), "debug"), { recursive: true });
     });
     process.once("uncaughtException", (err) => {
       void handleCrash().finally(() => {
@@ -32731,8 +32782,7 @@ async function readHelpInfo() {
   return {
     storage: [
       { label: "Config folder", value: configRoot2() },
-      { label: "Settings file", value: configFilePath2() },
-      { label: "Debug logs", value: debugSessionsDir2() }
+      { label: "Settings file", value: configFilePath2() }
     ],
     troubleshooting: [
       { label: "CLI version", value: readPackageVersion() },
@@ -32741,7 +32791,7 @@ async function readHelpInfo() {
       { label: "Debug Mode", value: debugMode.enabled ? "on" : "off" },
       {
         label: "This session",
-        value: debugMode.enabled ? currentDebugSessionDir() : "no logs written while Debug Mode is off"
+        value: !debugMode.enabled ? "no logs written while Debug Mode is off" : currentDebugSessionDir() ?? "not started: set the Root Project Directory in Settings, or start an import"
       }
     ]
   };
@@ -32887,7 +32937,8 @@ async function readCredentials() {
     cmaToken: store.cmaToken || "",
     host: store.host || "",
     defaultComponentDir: store.defaultComponentDir || "",
-    defaultTokenFile: store.defaultTokenFile || ""
+    defaultTokenFile: store.defaultTokenFile || "",
+    contentfulBaseDir: store.contentfulBaseDir || ""
   };
 }
 async function writeCredentials(config) {
@@ -32920,7 +32971,8 @@ function debugFields(config) {
     cma_token: config?.cmaToken ?? "",
     host: config?.host ?? "",
     default_component_dir: config?.defaultComponentDir ?? "",
-    default_token_file: config?.defaultTokenFile ?? ""
+    default_token_file: config?.defaultTokenFile ?? "",
+    contentful_base_dir: config?.contentfulBaseDir ?? ""
   };
 }
 function ConfigurationScreen({ onDone }) {
@@ -32958,6 +33010,7 @@ function ConfigurationScreen({ onDone }) {
     setNotice(null);
     writeCredentials(config).then(() => {
       setLastSaved(config);
+      if (config.contentfulBaseDir) void startDebugSessionIn(config.contentfulBaseDir, { replace: true });
       setNotice({ kind: "success", text: "Configuration saved" });
       setStage("form");
     }).catch((err) => {
@@ -33023,10 +33076,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,
           {
@@ -33035,7 +33085,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: [
@@ -33066,7 +33117,7 @@ function ConfigurationScreen({ onDone }) {
     )
   ] });
 }
-var FIELD_ORDER, FIELD_LABELS;
+var FIELD_ORDER, FIELD_LABELS, FIELD_HINTS, LABEL_WIDTH;
 var init_ContentfulConfigScreen = __esm({
   "packages/experience-design-system-cli/src/tui/settings/contentful-configuration/ContentfulConfigScreen.tsx"() {
     "use strict";
@@ -33080,16 +33131,22 @@ var init_ContentfulConfigScreen = __esm({
       "cmaToken",
       "host",
       "defaultComponentDir",
-      "defaultTokenFile"
+      "defaultTokenFile",
+      "contentfulBaseDir"
     ];
     FIELD_LABELS = {
       spaceId: "Space ID",
       environmentId: "Environment ID",
       cmaToken: "CMA Token",
-      host: "API Host (optional)",
-      defaultComponentDir: "Default component directory (optional)",
-      defaultTokenFile: "Default token file (optional)"
+      host: "API Host",
+      defaultComponentDir: "Default component directory",
+      defaultTokenFile: "Default token file",
+      contentfulBaseDir: "Root Project Directory"
+    };
+    FIELD_HINTS = {
+      contentfulBaseDir: "(where .contentful goes)"
     };
+    LABEL_WIDTH = Math.max(...Object.values(FIELD_LABELS).map((label) => label.length));
   }
 });
 
@@ -33362,7 +33419,7 @@ function App({ importOptions, inkClear }) {
     const launch = { projectPath: projectPath2, tokens, filePaths, ...importOptions };
     const state2 = await inspectTokens({
       rawTokensPath: tokens,
-      outDir: join27(resolveUserPath(projectPath2), ".contentful"),
+      contentfulDir: join27(resolveUserPath(projectPath2), ".contentful"),
       cache: importOptions.cache
     });
     if (state2.kind === "cached") {
@@ -33383,6 +33440,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
@@ -33391,6 +33449,7 @@ function App({ importOptions, inkClear }) {
       tokenStrategy,
       input: {
         projectPath: resolveUserPath(launch.projectPath ?? ""),
+        outDir,
         filePaths: launch.filePaths ?? [],
         rawTokensPath: launch.tokens ?? "",
         tokenStrategy,
@@ -33738,14 +33797,14 @@ function runDevWatch(args) {
     process.stderr.write("--watch only works from a checkout of the repo (scripts/dev.mjs is not in the package).\n");
     return Promise.resolve(1);
   }
-  return new Promise((resolve25) => {
+  return new Promise((resolve27) => {
     const child = spawn4(process.execPath, [script, ...args], { stdio: "inherit" });
     process.on("SIGINT", () => void 0);
-    child.on("exit", (code) => resolve25(code ?? 0));
+    child.on("exit", (code) => resolve27(code ?? 0));
     child.on("error", (err) => {
       process.stderr.write(`${err.message}
 `);
-      resolve25(1);
+      resolve27(1);
     });
   });
 }

package/dist/package.json

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

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

@@ -1,6 +1,23 @@
 type Status = 'success' | 'error';
 type ExitMethod = 'saved' | 'discarded' | 'crashed';
-export declare function currentDebugSessionDir(): string;
+export declare function currentDebugSessionDir(): string | undefined;
+/** This terminal session's folder, `<base>/.contentful/<session>/`, or undefined until it is known. */
+export declare function currentSessionDir(): string | undefined;
+/**
+ * Starts this terminal session's folder in `base`. The base directory setting being saved passes `replace` so the new
+ * location wins; the import passes nothing and only starts a session when none exists yet. Fail-open like the rest of
+ * the logger.
+ */
+export declare function startDebugSessionIn(base: string, { replace }?: {
+    replace?: boolean | undefined;
+}): Promise<void>;
+/**
+ * Where this import run writes everything it produces (tokens.json, .existing-entities.json, components.json): a new
+ * `dsi-import-N` folder in this session's folder, next to the debug logs. The session is started here, and waited for,
+ * so the answer does not depend on how quickly the boot-time start finished. Without a session (Debug Mode off, or a
+ * folder that cannot be created) the files stay in `<project>/.contentful`, as before.
+ */
+export declare function startImportRun(projectPath: string): Promise<string>;
 export declare function startDebugRun({ flow, step, menuOption, inputs, }: {
     flow: string;
     step: string;

package/dist/src/tui/import/steps/05-token-reuse/logic.d.ts

@@ -8,10 +8,11 @@ export type TokensState = {
 };
 interface InspectInput {
     rawTokensPath: string;
-    outDir: string;
+    /** The `.contentful` folder: the sessions' `dsi-import` folders sit inside it, and an older `tokens.json` may sit in it. */
+    contentfulDir: string;
     cache: boolean;
 }
-export declare function inspectTokens({ rawTokensPath, outDir, cache }: InspectInput): Promise<TokensState>;
+export declare function inspectTokens({ rawTokensPath, contentfulDir, cache }: InspectInput): Promise<TokensState>;
 export declare function gateText({ tokensPath, sourceChanged }: {
     tokensPath: string;
     sourceChanged: boolean;

package/dist/src/tui/import/steps/06-extraction/types.d.ts

@@ -2,6 +2,8 @@ import type { ExtractionHandoff, ImportHandoff } from '@contentful/experience-de
 export type TokenStrategy = ImportHandoff['tokens']['strategy'];
 export interface ExtractionInput {
     projectPath: string;
+    /** Where the stage writes tokens.json and the other files. Defaults to `<projectPath>/.contentful`. */
+    outDir?: string;
     /** Absolute source files from the path-validation step (collectFiles output). */
     filePaths: string[];
     /** Raw tokens file the user pointed at (always set: v2 asks for one). */

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

@@ -5,6 +5,7 @@ export type V1Credentials = {
     host?: string;
     defaultComponentDir?: string;
     defaultTokenFile?: string;
+    contentfulBaseDir?: 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.37.1-dev-build-7652d7c0.0",
+  "version": "2.37.1-dev-build-6fb2b08b.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-7652d7c0.0",
+  "version": "2.37.1-dev-build-6fb2b08b.0",
   "description": "Contentful Experiences design system import CLI",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "ts-morph": "^27.0.2",
     "typescript": "^5.9.3",
     "zod": "^4.6.5",
-    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-7652d7c0.0",
-    "@contentful/experience-design-system-types": "2.37.1-dev-build-7652d7c0.0"
+    "@contentful/experience-design-system-backend-pipeline": "2.37.1-dev-build-6fb2b08b.0",
+    "@contentful/experience-design-system-types": "2.37.1-dev-build-6fb2b08b.0"
   },
   "devDependencies": {
     "@tsconfig/node24": "^24.0.4",